-/*
+/*
* PROJECT: ReactOS Applications Manager
* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
* FILE: base/applications/rapps/gui.cpp
ATL::CStringW szLicense;
switch (Info->m_LicenseType)
{
- case LicenseType::LICENSE_OPENSOURCE:
+ case LICENSE_OPENSOURCE:
szLicense.LoadStringW(IDS_LICENSE_OPENSOURCE);
break;
- case LicenseType::LICENSE_FREEWARE:
+ case LICENSE_FREEWARE:
szLicense.LoadStringW(IDS_LICENSE_FREEWARE);
break;
- case LicenseType::LICENSE_TRIAL:
+ case LICENSE_TRIAL:
szLicense.LoadStringW(IDS_LICENSE_TRIAL);
break;
default:
public:
CAppsListView() :
- bAscending(TRUE),
bHasAllChecked(FALSE),
+ bAscending(TRUE),
bHasCheckboxes(FALSE)
{
}
class CSideTreeView :
public CUiWindow<CTreeView>
{
- HIMAGELIST hImageTreeView = ImageList_Create(TREEVIEW_ICON_SIZE, TREEVIEW_ICON_SIZE,
- GetSystemColorDepth() | ILC_MASK,
- 0, 1);
+ HIMAGELIST hImageTreeView;
public:
+ CSideTreeView() :
+ CUiWindow(),
+ hImageTreeView(ImageList_Create(TREEVIEW_ICON_SIZE, TREEVIEW_ICON_SIZE,
+ GetSystemColorDepth() | ILC_MASK,
+ 0, 1))
+ {
+ }
+
HTREEITEM AddItem(HTREEITEM hParent, ATL::CStringW &Text, INT Image, INT SelectedImage, LPARAM lParam)
{
return CUiWindow<CTreeView>::AddItem(hParent, const_cast<LPWSTR>(Text.GetString()), Image, SelectedImage, lParam);
~CSideTreeView()
{
DestroyImageList();
- CUiWindow<CTreeView>::~CUiWindow();
}
};
UpdateApplicationsList(-1);
}
- }
+ }
break;
case ID_UNINSTALL:
}
}
- static BOOL SearchPatternMatch(PCWSTR szHaystack, PCWSTR szNeedle)
+ static BOOL SearchPatternMatch(LPCWSTR szHaystack, LPCWSTR szNeedle)
{
if (!*szNeedle)
return TRUE;
HIMAGELIST hImageListView = ListView_GetImageList(hListView, LVSIL_SMALL);
- if (!SearchPatternMatch(Info->m_szName, szSearchPattern) &&
- !SearchPatternMatch(Info->m_szDesc, szSearchPattern))
+ if (!SearchPatternMatch(Info->m_szName.GetString(), szSearchPattern) &&
+ !SearchPatternMatch(Info->m_szDesc.GetString(), szSearchPattern))
{
return TRUE;
}
/* Load icon from file */
ATL::CStringW szIconPath;
- szIconPath.Format(L"%lsicons\\%ls.ico", szFolderPath, Info->m_szName);
+ szIconPath.Format(L"%lsicons\\%ls.ico", szFolderPath, Info->m_szName.GetString());
hIcon = (HICON) LoadImageW(NULL,
szIconPath.GetString(),
IMAGE_ICON,
Index = ImageList_AddIcon(hImageListView, hIcon);
DestroyIcon(hIcon);
- Index = ListViewAddItem(Info->m_Category, Index, Info->m_szName, (LPARAM) Info);
+ Index = ListViewAddItem(Info->m_Category, Index, Info->m_szName.GetString(), (LPARAM) Info);
ListView_SetImageList(hListView, hImageListView, LVSIL_SMALL);
ListView_SetItemText(hListView, Index, 1, const_cast<LPWSTR>(Info->m_szVersion.GetString()));
{
EnumType = SelectedEnumType;
}
-
+
//if previous one was INSTALLED purge the list
//TODO: make the Installed category a separate class to avoid doing this
if (bWasInInstalled)
-/*
+/*
* PROJECT: ReactOS Applications Manager
* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
* FILE: base/applications/rapps/loaddlg.cpp
#define CERT_SUBJECT_INFO "Domain Control Validated\r\n*.reactos.org"
#endif
-typedef enum
+enum DownloadStatus
{
- DLWaiting = IDS_STATUS_WAITING,
- DLDownloading = IDS_STATUS_DOWNLOADING,
- DLWaitingToInstall = IDS_STATUS_DOWNLOADED,
- DLInstalling = IDS_STATUS_INSTALLING,
- DLInstalled = IDS_STATUS_INSTALLED,
- DLFinished = IDS_STATUS_FINISHED
-} DOWNLOAD_STATUS;
-
-ATL::CStringW LoadStatusString(DOWNLOAD_STATUS StatusParam)
+ DLSTATUS_WAITING = IDS_STATUS_WAITING,
+ DLSTATUS_DOWNLOADING = IDS_STATUS_DOWNLOADING,
+ DLSTATUS_WAITING_INSTALL = IDS_STATUS_DOWNLOADED,
+ DLSTATUS_INSTALLING = IDS_STATUS_INSTALLING,
+ DLSTATUS_INSTALLED = IDS_STATUS_INSTALLED,
+ DLSTATUS_FINISHED = IDS_STATUS_FINISHED
+};
+
+ATL::CStringW LoadStatusString(DownloadStatus StatusParam)
{
ATL::CStringW szString;
szString.LoadStringW(StatusParam);
{
for (INT i = 0; i < arrInfo.GetSize(); ++i)
{
- AddRow(i, arrInfo[i].szName.GetString(), DOWNLOAD_STATUS::DLWaiting);
+ AddRow(i, arrInfo[i].szName.GetString(), DLSTATUS_WAITING);
}
}
- VOID SetDownloadStatus(INT ItemIndex, DOWNLOAD_STATUS Status)
+ VOID SetDownloadStatus(INT ItemIndex, DownloadStatus Status)
{
HWND hListView = GetWindow();
ATL::CStringW szBuffer = LoadStatusString(Status);
return InsertItem(&Item);
}
- VOID AddRow(INT RowIndex, LPCWSTR szAppName, const DOWNLOAD_STATUS Status)
+ VOID AddRow(INT RowIndex, LPCWSTR szAppName, const DownloadStatus Status)
{
ATL::CStringW szStatus = LoadStatusString(Status);
AddItem(RowIndex,
// CDownloadManager
ATL::CSimpleArray<DownloadInfo> CDownloadManager::AppsToInstallList;
CDowloadingAppsListView CDownloadManager::DownloadsListView;
-INT CDownloadManager::iCurrentApp;
VOID CDownloadManager::Download(const DownloadInfo &DLInfo, BOOL bIsModal)
{
PWSTR p, q;
HWND hDlg = static_cast<DownloadParam*>(param)->Dialog;
+ HWND Item;
+ INT iAppId;
ULONG dwContentLen, dwBytesWritten, dwBytesRead, dwStatus;
ULONG dwCurrentBytesRead = 0;
URL_COMPONENTS urlComponents;
size_t urlLength, filenameLength;
- const INT iAppId = iCurrentApp;
const ATL::CSimpleArray<DownloadInfo> &InfoArray = static_cast<DownloadParam*>(param)->AppInfo;
LPCWSTR szCaption = static_cast<DownloadParam*>(param)->szCaption;
ATL::CStringW szNewCaption;
-
if (InfoArray.GetSize() <= 0)
{
MessageBox_LoadString(hMainWnd, IDS_UNABLE_TO_DOWNLOAD);
goto end;
}
- for (INT iAppId = 0; iAppId < InfoArray.GetSize(); ++iAppId)
+ for (iAppId = 0; iAppId < InfoArray.GetSize(); ++iAppId)
{
- const DownloadInfo &CurrentInfo = InfoArray[iAppId];
-
// build the path for the download
- p = wcsrchr(CurrentInfo.szUrl.GetString(), L'/');
- q = wcsrchr(CurrentInfo.szUrl.GetString(), L'?');
+ p = wcsrchr(InfoArray[iAppId].szUrl.GetString(), L'/');
+ q = wcsrchr(InfoArray[iAppId].szUrl.GetString(), L'?');
// do we have a final slash separator?
if (!p)
filenameLength -= wcslen(q - 1) * sizeof(WCHAR);
// is this URL an update package for RAPPS? if so store it in a different place
- if (CurrentInfo.szUrl == APPLICATION_DATABASE_URL)
+ if (InfoArray[iAppId].szUrl == APPLICATION_DATABASE_URL)
{
bCab = TRUE;
if (!GetStorageDirectory(Path))
Path += L"\\";
Path += (LPWSTR) (p + 1);
- if (!bCab && CurrentInfo.szSHA1[0] && GetFileAttributesW(Path.GetString()) != INVALID_FILE_ATTRIBUTES)
+ if (!bCab && InfoArray[iAppId].szSHA1[0] && GetFileAttributesW(Path.GetString()) != INVALID_FILE_ATTRIBUTES)
{
// only open it in case of total correctness
- if (VerifyInteg(CurrentInfo.szSHA1.GetString(), Path))
+ if (VerifyInteg(InfoArray[iAppId].szSHA1.GetString(), Path))
goto run;
}
// Reset progress bar
- HWND Item = GetDlgItem(hDlg, IDC_DOWNLOAD_PROGRESS);
+ Item = GetDlgItem(hDlg, IDC_DOWNLOAD_PROGRESS);
if (Item)
{
SendMessageW(Item, PBM_SETPOS, 0, 0);
// Change caption to show the currently downloaded app
if (!bCab)
{
- szNewCaption.Format(szCaption, CurrentInfo.szName.GetString());
+ szNewCaption.Format(szCaption, InfoArray[iAppId].szName.GetString());
}
else
{
SetWindowTextW(hDlg, szNewCaption.GetString());
// Add the download URL
- SetDlgItemTextW(hDlg, IDC_DOWNLOAD_STATUS, CurrentInfo.szUrl.GetString());
+ SetDlgItemTextW(hDlg, IDC_DOWNLOAD_STATUS, InfoArray[iAppId].szUrl.GetString());
- DownloadsListView.SetDownloadStatus(iAppId, DOWNLOAD_STATUS::DLDownloading);
+ DownloadsListView.SetDownloadStatus(iAppId, DLSTATUS_DOWNLOADING);
// download it
bTempfile = TRUE;
if (!hOpen)
goto end;
- hFile = InternetOpenUrlW(hOpen, CurrentInfo.szUrl.GetString(), NULL, 0, INTERNET_FLAG_PRAGMA_NOCACHE | INTERNET_FLAG_KEEP_CONNECTION, 0);
+ hFile = InternetOpenUrlW(hOpen, InfoArray[iAppId].szUrl.GetString(), NULL, 0, INTERNET_FLAG_PRAGMA_NOCACHE | INTERNET_FLAG_KEEP_CONNECTION, 0);
if (!hFile)
{
memset(&urlComponents, 0, sizeof(urlComponents));
urlComponents.dwStructSize = sizeof(urlComponents);
- urlLength = CurrentInfo.szUrl.GetLength();
+ urlLength = InfoArray[iAppId].szUrl.GetLength();
urlComponents.dwSchemeLength = urlLength + 1;
urlComponents.lpszScheme = (LPWSTR) malloc(urlComponents.dwSchemeLength * sizeof(WCHAR));
urlComponents.dwHostNameLength = urlLength + 1;
urlComponents.lpszHostName = (LPWSTR) malloc(urlComponents.dwHostNameLength * sizeof(WCHAR));
- if (!InternetCrackUrlW(CurrentInfo.szUrl, urlLength + 1, ICU_DECODE | ICU_ESCAPE, &urlComponents))
+ if (!InternetCrackUrlW(InfoArray[iAppId].szUrl, urlLength + 1, ICU_DECODE | ICU_ESCAPE, &urlComponents))
goto end;
if (urlComponents.nScheme == INTERNET_SCHEME_HTTP || urlComponents.nScheme == INTERNET_SCHEME_HTTPS)
#ifdef USE_CERT_PINNING
// are we using HTTPS to download the RAPPS update package? check if the certificate is original
if ((urlComponents.nScheme == INTERNET_SCHEME_HTTPS) &&
- (wcscmp(CurrentInfo.szUrl, APPLICATION_DATABASE_URL) == 0) &&
+ (wcscmp(InfoArray[iAppId].szUrl, APPLICATION_DATABASE_URL) == 0) &&
(!CertIsValid(hOpen, urlComponents.lpszHostName)))
{
MessageBox_LoadString(hMainWnd, IDS_CERT_DOES_NOT_MATCH);
}
dwCurrentBytesRead += dwBytesRead;
- dl->OnProgress(dwCurrentBytesRead, dwContentLen, 0, CurrentInfo.szUrl.GetString());
+ dl->OnProgress(dwCurrentBytesRead, dwContentLen, 0, InfoArray[iAppId].szUrl.GetString());
} while (dwBytesRead && !bCancelled);
CloseHandle(hOut);
/* if this thing isn't a RAPPS update and it has a SHA-1 checksum
verify its integrity by using the native advapi32.A_SHA1 functions */
- if (!bCab && CurrentInfo.szSHA1[0] != 0)
+ if (!bCab && InfoArray[iAppId].szSHA1[0] != 0)
{
ATL::CStringW szMsgText;
SendMessageW(GetDlgItem(hDlg, IDC_DOWNLOAD_STATUS), WM_SETTEXT, 0, (LPARAM) Path.GetString());
// this may take a while, depending on the file size
- if (!VerifyInteg(CurrentInfo.szSHA1.GetString(), Path.GetString()))
+ if (!VerifyInteg(InfoArray[iAppId].szSHA1.GetString(), Path.GetString()))
{
if (!szMsgText.LoadStringW(IDS_INTEG_CHECK_FAIL))
goto end;
}
run:
- DownloadsListView.SetDownloadStatus(iAppId, DOWNLOAD_STATUS::DLWaitingToInstall);
+ DownloadsListView.SetDownloadStatus(iAppId, DLSTATUS_WAITING_INSTALL);
// run it
if (!bCab)
if (ShellExecuteExW(&shExInfo))
{
- DownloadsListView.SetDownloadStatus(iAppId, DOWNLOAD_STATUS::DLInstalling);
+ DownloadsListView.SetDownloadStatus(iAppId, DLSTATUS_INSTALLING);
//TODO: issue an install operation separately so that the apps could be downloaded in the background
WaitForSingleObject(shExInfo.hProcess, INFINITE);
CloseHandle(shExInfo.hProcess);
DeleteFileW(Path.GetString());
}
- DownloadsListView.SetDownloadStatus(iAppId, DOWNLOAD_STATUS::DLFinished);
+ DownloadsListView.SetDownloadStatus(iAppId, DLSTATUS_FINISHED);
}
- delete param;
+ delete static_cast<DownloadParam*>(param);
SendMessageW(hDlg, WM_CLOSE, 0, 0);
return 0;
}