Author: ashaposhnikov
Date: Thu Aug 24 18:46:39 2017
New Revision: 75659
URL: http://svn.reactos.org/svn/reactos?rev=75659&view=rev
Log:
[RAPPS]
- Changed the download process - now ThreadFunc handles the download loop
- Passing values to ThreadFunc as a parameter rather than static members
- Declared .cab download AppInfo static so it won't fade away during the
download
- Fixed .cab extraction failing while no rapps folder present
- Visual improvements to the .cab dialog
Modified:
branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp
branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp
branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/available.h
branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/dialogs.h
branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp
branches/GSoC_2017/rapps/reactos/base/applications/rapps/misc.cpp
branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp
Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp?rev=75659&r1=75658&r2=75659&view=diff
==============================================================================
--- branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp
[iso-8859-1] (original)
+++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp
[iso-8859-1] Thu Aug 24 18:46:39 2017
@@ -227,43 +227,38 @@
}
}
-BOOL CAvailableApps::DeleteCurrentAppsDB()
+VOID CAvailableApps::DeleteCurrentAppsDB()
{
HANDLE hFind = INVALID_HANDLE_VALUE;
WIN32_FIND_DATAW FindFileData;
- BOOL result = TRUE;
+
+ if (m_szPath.IsEmpty())
+ return;
+
+ DeleteFileW(m_szCabPath.GetString());
+ hFind = FindFirstFileW(m_szSearchPath.GetString(), &FindFileData);
+
+ if (hFind != INVALID_HANDLE_VALUE)
+ {
+ ATL::CStringW szTmp;
+ do
+ {
+ szTmp = m_szPath + FindFileData.cFileName;
+ DeleteFileW(szTmp.GetString());
+ } while (FindNextFileW(hFind, &FindFileData) != 0);
+ FindClose(hFind);
+ }
+}
+
+BOOL CAvailableApps::UpdateAppsDB()
+{
+ DeleteCurrentAppsDB();
+
+ CDownloadManager::DownloadApplicationsDB(APPLICATION_DATABASE_URL);
if (m_szPath.IsEmpty())
return FALSE;
- result = result && DeleteFileW(m_szCabPath.GetString());
- hFind = FindFirstFileW(m_szSearchPath.GetString(), &FindFileData);
-
- if (hFind == INVALID_HANDLE_VALUE)
- return result;
-
- ATL::CStringW szTmp;
- do
- {
- szTmp = m_szPath + FindFileData.cFileName;
- result = result && DeleteFileW(szTmp.GetString());
- } while (FindNextFileW(hFind, &FindFileData) != 0);
-
- FindClose(hFind);
-
- return result;
-}
-
-BOOL CAvailableApps::UpdateAppsDB()
-{
- if (!DeleteCurrentAppsDB())
- return FALSE;
-
- CDownloadManager::DownloadApplicationsDB(APPLICATION_DATABASE_URL);
-
- if (m_szPath.IsEmpty())
- return FALSE;
-
if (!ExtractFilesFromCab(m_szCabPath, m_szAppsPath))
{
return FALSE;
@@ -287,12 +282,10 @@
if (hFind == INVALID_HANDLE_VALUE)
{
- if (GetFileAttributesW(m_szCabPath) == INVALID_FILE_ATTRIBUTES)
- {
- CDownloadManager::DownloadApplicationsDB(APPLICATION_DATABASE_URL);
- }
-
- ExtractFilesFromCab(m_szCabPath, m_szAppsPath);
+ if(!UpdateAppsDB()) {
+ return FALSE;
+ }
+
hFind = FindFirstFileW(m_szSearchPath.GetString(), &FindFileData);
if (hFind == INVALID_HANDLE_VALUE)
Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp?rev=75659&r1=75658&r2=75659&view=diff
==============================================================================
--- branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp
[iso-8859-1] (original)
+++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp
[iso-8859-1] Thu Aug 24 18:46:39 2017
@@ -1461,7 +1461,7 @@
nSelectedApps = 0;
if (EnumType < 0) EnumType = SelectedEnumType;
- if (IS_INSTALLED_ENUM(SelectedEnumType))
+ if (IS_INSTALLED_ENUM(EnumType))
{
FreeInstalledAppList();
}
@@ -1482,7 +1482,10 @@
if (isAvailableEnum(EnumType))
{
/* Enum available applications */
- m_AvailableApps.EnumAvailableApplications(EnumType,
s_EnumAvailableAppProc);
+ if (!m_AvailableApps.EnumAvailableApplications(EnumType,
s_EnumAvailableAppProc))
+ {
+ return;
+ }
}
SelectedEnumType = EnumType;
Modified:
branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/available.h
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/available.h?rev=75659&r1=75658&r2=75659&view=diff
==============================================================================
---
branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/available.h
[iso-8859-1] (original)
+++
branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/available.h
[iso-8859-1] Thu Aug 24 18:46:39 2017
@@ -115,7 +115,7 @@
public:
CAvailableApps();
VOID FreeCachedEntries();
- BOOL DeleteCurrentAppsDB();
+ VOID DeleteCurrentAppsDB();
BOOL UpdateAppsDB();
BOOL EnumAvailableApplications(INT EnumType, AVAILENUMPROC lpEnumProc);
const PAPPLICATION_INFO FindInfo(const ATL::CStringW& szAppName);
Modified:
branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/dialogs.h
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/dialogs.h?rev=75659&r1=75658&r2=75659&view=diff
==============================================================================
--- branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/dialogs.h
[iso-8859-1] (original)
+++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/dialogs.h
[iso-8859-1] Thu Aug 24 18:46:39 2017
@@ -10,7 +10,6 @@
class CDownloadManager
{
- static PAPPLICATION_INFO AppInfo;
static ATL::CSimpleArray<PAPPLICATION_INFO> AppsToInstallList;
static CDowloadingAppsListView DownloadsListView;
static INT iCurrentApp;
Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp?rev=75659&r1=75658&r2=75659&view=diff
==============================================================================
--- branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp
[iso-8859-1] (original)
+++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp
[iso-8859-1] Thu Aug 24 18:46:39 2017
@@ -346,19 +346,26 @@
}
}
+struct DownloadParam
+{
+ DownloadParam() : Dialog(NULL), AppInfo(), szCaption(NULL) {}
+ DownloadParam(HWND dlg, const ATL::CSimpleArray<PAPPLICATION_INFO> &info,
LPCWSTR caption)
+ : Dialog(dlg), AppInfo(info), szCaption(caption)
+ {
+ }
+
+ HWND Dialog;
+ ATL::CSimpleArray<PAPPLICATION_INFO> AppInfo;
+ LPCWSTR szCaption;
+};
+
// CDownloadManager
-PAPPLICATION_INFO CDownloadManager::AppInfo;
ATL::CSimpleArray<PAPPLICATION_INFO> CDownloadManager::AppsToInstallList;
CDowloadingAppsListView CDownloadManager::DownloadsListView;
INT CDownloadManager::iCurrentApp;
-#define DL_START_NEW WM_APP + 1
-
INT_PTR CALLBACK CDownloadManager::DownloadDlgProc(HWND Dlg, UINT uMsg, WPARAM
wParam, LPARAM lParam)
{
- HANDLE Thread;
- DWORD ThreadId;
- HWND Item;
static WCHAR szCaption[MAX_PATH];
switch (uMsg)
@@ -377,7 +384,7 @@
}
SetWindowLongW(Dlg, GWLP_USERDATA, 0);
- Item = GetDlgItem(Dlg, IDC_DOWNLOAD_PROGRESS);
+ HWND Item = GetDlgItem(Dlg, IDC_DOWNLOAD_PROGRESS);
if (Item)
{
// initialize the default values for our nifty progress bar
@@ -387,8 +394,6 @@
SetWindowSubclass(Item, DownloadProgressProc, 0, 0);
}
- // Get a dlg string for later use
- GetWindowTextW(Dlg, szCaption, MAX_PATH);
// Add a ListView
HWND hListView = DownloadsListView.Create(Dlg);
@@ -397,15 +402,26 @@
return FALSE;
}
DownloadsListView.LoadList(AppsToInstallList);
- iCurrentApp = -1;
ShowWindow(Dlg, SW_SHOW);
- // Start new download
- SendMessageW(Dlg, DL_START_NEW, 0, 0);
-
+ // Get a dlg string for later use
+ GetWindowTextW(Dlg, szCaption, MAX_PATH);
+
+ // Start download process
+ DownloadParam *param = new DownloadParam(Dlg, AppsToInstallList,
szCaption);
+ DWORD ThreadId;
+ HANDLE Thread = CreateThread(NULL, 0, ThreadFunc, (LPVOID) param, 0,
&ThreadId);
+
+ if (!Thread)
+ {
+ return FALSE;
+ }
+
+ CloseHandle(Thread);
return TRUE;
}
+
case WM_COMMAND:
if (wParam == IDCANCEL)
{
@@ -413,45 +429,6 @@
PostMessageW(Dlg, WM_CLOSE, 0, 0);
}
return FALSE;
-
- case DL_START_NEW:
-
- ++iCurrentApp;
- // If some downloads left we issue it
- if (iCurrentApp < AppsToInstallList.GetSize())
- {
- AppInfo = AppsToInstallList[iCurrentApp];
- if (!AppInfo)
- {
- return FALSE;
- }
-
- ATL::CStringW szNewCaption;
-
- // Reset progress bar
- Item = GetDlgItem(Dlg, IDC_DOWNLOAD_PROGRESS);
- if (Item)
- {
- SendMessageW(Item, PBM_SETPOS, 0, 0);
- }
-
- // Change caption to show the currently downloaded app
- szNewCaption.Format(szCaption, AppInfo->szName.GetString());
- SetWindowTextW(Dlg, szNewCaption.GetString());
-
- // Add a neat placeholder until the download URL is retrieved
- SetDlgItemTextW(Dlg, IDC_DOWNLOAD_STATUS, L"\x2022 \x2022 \x2022");
- Thread = CreateThread(NULL, 0, ThreadFunc, Dlg, 0, &ThreadId);
-
- if (!Thread)
- {
- return FALSE;
- }
-
- CloseHandle(Thread);
- return TRUE;
- }
- // No downloads left, closing (fallthrough)
case WM_CLOSE:
EndDialog(Dlg, 0);
@@ -463,7 +440,12 @@
}
}
-LRESULT CALLBACK CDownloadManager::DownloadProgressProc(HWND hWnd, UINT uMsg,
WPARAM wParam, LPARAM lParam, UINT_PTR uIdSubclass, DWORD_PTR dwRefData)
+LRESULT CALLBACK CDownloadManager::DownloadProgressProc(HWND hWnd,
+ UINT uMsg,
+ WPARAM wParam,
+ LPARAM lParam,
+ UINT_PTR uIdSubclass,
+ DWORD_PTR dwRefData)
{
static ATL::CStringW szProgressText;
@@ -538,12 +520,13 @@
}
}
-DWORD WINAPI CDownloadManager::ThreadFunc(LPVOID Context)
+DWORD WINAPI CDownloadManager::ThreadFunc(LPVOID param)
{
CComPtr<IBindStatusCallback> dl;
ATL::CStringW Path;
PWSTR p, q;
- HWND Dlg = (HWND) Context;
+
+ HWND hDlg = static_cast<DownloadParam*>(param)->Dialog;
ULONG dwContentLen, dwBytesWritten, dwBytesRead, dwStatus;
ULONG dwCurrentBytesRead = 0;
@@ -563,233 +546,272 @@
size_t urlLength, filenameLength;
const INT iAppId = iCurrentApp;
- const PAPPLICATION_INFO pCurrentInfo = AppInfo;
- if (!AppInfo)
+ const ATL::CSimpleArray<PAPPLICATION_INFO> InfoArray =
static_cast<DownloadParam*>(param)->AppInfo;
+ LPCWSTR szCaption = static_cast<DownloadParam*>(param)->szCaption;
+
+ delete param;
+ if (InfoArray.GetSize() <= 0)
{
MessageBox_LoadString(hMainWnd, IDS_UNABLE_TO_DOWNLOAD);
goto end;
}
- DownloadsListView.SetDownloadStatus(iAppId,
DOWNLOAD_STATUS::DLDownloading);
-
- // build the path for the download
- p = wcsrchr(pCurrentInfo->szUrlDownload.GetString(), L'/');
- q = wcsrchr(pCurrentInfo->szUrlDownload.GetString(), L'?');
-
- // do we have a final slash separator?
- if (!p)
- goto end;
-
- // prepare the tentative length of the filename, maybe we've to remove
part of it later on
- filenameLength = wcslen(p) * sizeof(WCHAR);
-
- /* do we have query arguments in the target URL after the filename?
account for them
- (e.g. https://example.org/myfile.exe?no_adware_plz) */
- if (q && q > p && (q - p) > 0)
- filenameLength -= wcslen(q - 1) * sizeof(WCHAR);
-
- // is this URL an update package for RAPPS? if so store it in a different
place
- if (pCurrentInfo->szUrlDownload == APPLICATION_DATABASE_URL)
- {
- bCab = TRUE;
- if (!GetStorageDirectory(Path))
- goto end;
- }
- else
- {
- Path = SettingsInfo.szDownloadDir;
- }
-
- // is the path valid? can we access it?
- if (GetFileAttributesW(Path.GetString()) == INVALID_FILE_ATTRIBUTES)
- {
- if (!CreateDirectoryW(Path.GetString(), NULL))
- goto end;
- }
-
- // append a \ to the provided file system path, and the filename portion
from the URL after that
- Path += L"\\";
- Path += (LPWSTR) (p + 1);
-
- if (!bCab && pCurrentInfo->szSHA1[0] &&
GetFileAttributesW(Path.GetString()) != INVALID_FILE_ATTRIBUTES)
- {
- // only open it in case of total correctness
- if (VerifyInteg(pCurrentInfo->szSHA1, Path))
- goto run;
- }
-
- // download it
- bTempfile = TRUE;
- CDownloadDialog_Constructor(Dlg, &bCancelled,
IID_PPV_ARG(IBindStatusCallback, &dl));
-
- if (dl == NULL)
- goto end;
-
- /* FIXME: this should just be using the system-wide proxy settings */
- switch (SettingsInfo.Proxy)
- {
- case 0: // preconfig
- hOpen = InternetOpenW(lpszAgent, INTERNET_OPEN_TYPE_PRECONFIG, NULL,
NULL, 0);
- break;
- case 1: // direct (no proxy)
- hOpen = InternetOpenW(lpszAgent, INTERNET_OPEN_TYPE_DIRECT, NULL,
NULL, 0);
- break;
- case 2: // use proxy
- hOpen = InternetOpenW(lpszAgent, INTERNET_OPEN_TYPE_PROXY,
SettingsInfo.szProxyServer, SettingsInfo.szNoProxyFor, 0);
- break;
- default: // preconfig
- hOpen = InternetOpenW(lpszAgent, INTERNET_OPEN_TYPE_PRECONFIG, NULL,
NULL, 0);
- break;
- }
-
- if (!hOpen)
- goto end;
-
- hFile = InternetOpenUrlW(hOpen, pCurrentInfo->szUrlDownload, NULL, 0,
INTERNET_FLAG_PRAGMA_NOCACHE | INTERNET_FLAG_KEEP_CONNECTION, 0);
- if (!hFile)
- {
- MessageBox_LoadString(hMainWnd, IDS_UNABLE_TO_DOWNLOAD2);
- goto end;
- }
-
- if (!HttpQueryInfoW(hFile, HTTP_QUERY_STATUS_CODE |
HTTP_QUERY_FLAG_NUMBER, &dwStatus, &dwStatusLen, NULL))
- goto end;
-
- if (dwStatus != HTTP_STATUS_OK)
- {
- MessageBox_LoadString(hMainWnd, IDS_UNABLE_TO_DOWNLOAD);
- goto end;
- }
-
- dwStatusLen = sizeof(dwStatus);
-
- memset(&urlComponents, 0, sizeof(urlComponents));
- urlComponents.dwStructSize = sizeof(urlComponents);
-
- urlLength = pCurrentInfo->szUrlDownload.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(pCurrentInfo->szUrlDownload, urlLength + 1,
ICU_DECODE | ICU_ESCAPE, &urlComponents))
- goto end;
-
- if (urlComponents.nScheme == INTERNET_SCHEME_HTTP || urlComponents.nScheme
== INTERNET_SCHEME_HTTPS)
- HttpQueryInfoW(hFile, HTTP_QUERY_CONTENT_LENGTH |
HTTP_QUERY_FLAG_NUMBER, &dwContentLen, &dwStatus, 0);
-
- if (urlComponents.nScheme == INTERNET_SCHEME_FTP)
- dwContentLen = FtpGetFileSize(hFile, &dwStatus);
+ for (INT iAppId = 0; iAppId < InfoArray.GetSize(); ++iAppId)
+ {
+ PAPPLICATION_INFO pCurrentInfo = AppsToInstallList[iAppId];
+ if (!pCurrentInfo)
+ {
+ MessageBox_LoadString(hMainWnd, IDS_UNABLE_TO_DOWNLOAD);
+ continue;
+ }
+
+
+ // build the path for the download
+ p = wcsrchr(pCurrentInfo->szUrlDownload.GetString(), L'/');
+ q = wcsrchr(pCurrentInfo->szUrlDownload.GetString(), L'?');
+
+ // do we have a final slash separator?
+ if (!p)
+ goto end;
+
+ // prepare the tentative length of the filename, maybe we've to remove
part of it later on
+ filenameLength = wcslen(p) * sizeof(WCHAR);
+
+ /* do we have query arguments in the target URL after the filename?
account for them
+ (e.g. https://example.org/myfile.exe?no_adware_plz) */
+ if (q && q > p && (q - p) > 0)
+ filenameLength -= wcslen(q - 1) * sizeof(WCHAR);
+
+ // is this URL an update package for RAPPS? if so store it in a
different place
+ if (pCurrentInfo->szUrlDownload == APPLICATION_DATABASE_URL)
+ {
+ bCab = TRUE;
+ if (!GetStorageDirectory(Path))
+ goto end;
+ }
+ else
+ {
+ Path = SettingsInfo.szDownloadDir;
+ }
+
+ // is the path valid? can we access it?
+ if (GetFileAttributesW(Path.GetString()) == INVALID_FILE_ATTRIBUTES)
+ {
+ if (!CreateDirectoryW(Path.GetString(), NULL))
+ goto end;
+ }
+
+ // append a \ to the provided file system path, and the filename
portion from the URL after that
+ Path += L"\\";
+ Path += (LPWSTR) (p + 1);
+
+ if (!bCab && pCurrentInfo->szSHA1[0] &&
GetFileAttributesW(Path.GetString()) != INVALID_FILE_ATTRIBUTES)
+ {
+ // only open it in case of total correctness
+ if (VerifyInteg(pCurrentInfo->szSHA1, Path))
+ goto run;
+ }
+
+ // Reset progress bar
+ HWND Item = GetDlgItem(hDlg, IDC_DOWNLOAD_PROGRESS);
+ if (Item)
+ {
+ SendMessageW(Item, PBM_SETPOS, 0, 0);
+ }
+
+ // Change caption to show the currently downloaded app
+ if (!bCab)
+ {
+ ATL::CStringW szNewCaption = "";
+ szNewCaption.Format(szCaption, pCurrentInfo->szName.GetString());
+ SetWindowTextW(hDlg, szNewCaption.GetString());
+ }
+ else
+ {
+ //TODO: add this string to .rc
+ SetWindowTextW(hDlg, L"Downloading Database...");
+ }
+
+ // Add the download URL
+ SetDlgItemTextW(hDlg, IDC_DOWNLOAD_STATUS,
pCurrentInfo->szUrlDownload.GetString());
+
+ DownloadsListView.SetDownloadStatus(iAppId,
DOWNLOAD_STATUS::DLDownloading);
+
+ // download it
+ bTempfile = TRUE;
+ CDownloadDialog_Constructor(hDlg, &bCancelled,
IID_PPV_ARG(IBindStatusCallback, &dl));
+
+ if (dl == NULL)
+ goto end;
+
+ /* FIXME: this should just be using the system-wide proxy settings */
+ switch (SettingsInfo.Proxy)
+ {
+ case 0: // preconfig
+ hOpen = InternetOpenW(lpszAgent, INTERNET_OPEN_TYPE_PRECONFIG,
NULL, NULL, 0);
+ break;
+ case 1: // direct (no proxy)
+ hOpen = InternetOpenW(lpszAgent, INTERNET_OPEN_TYPE_DIRECT, NULL,
NULL, 0);
+ break;
+ case 2: // use proxy
+ hOpen = InternetOpenW(lpszAgent, INTERNET_OPEN_TYPE_PROXY,
SettingsInfo.szProxyServer, SettingsInfo.szNoProxyFor, 0);
+ break;
+ default: // preconfig
+ hOpen = InternetOpenW(lpszAgent, INTERNET_OPEN_TYPE_PRECONFIG,
NULL, NULL, 0);
+ break;
+ }
+
+ if (!hOpen)
+ goto end;
+
+ hFile = InternetOpenUrlW(hOpen,
pCurrentInfo->szUrlDownload.GetString(), NULL, 0, INTERNET_FLAG_PRAGMA_NOCACHE
| INTERNET_FLAG_KEEP_CONNECTION, 0);
+
+ if (!hFile)
+ {
+ MessageBox_LoadString(hMainWnd, IDS_UNABLE_TO_DOWNLOAD2);
+ goto end;
+ }
+
+ if (!HttpQueryInfoW(hFile, HTTP_QUERY_STATUS_CODE |
HTTP_QUERY_FLAG_NUMBER, &dwStatus, &dwStatusLen, NULL))
+ goto end;
+
+ if (dwStatus != HTTP_STATUS_OK)
+ {
+ MessageBox_LoadString(hMainWnd, IDS_UNABLE_TO_DOWNLOAD);
+ goto end;
+ }
+
+ dwStatusLen = sizeof(dwStatus);
+
+ memset(&urlComponents, 0, sizeof(urlComponents));
+ urlComponents.dwStructSize = sizeof(urlComponents);
+
+ urlLength = pCurrentInfo->szUrlDownload.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(pCurrentInfo->szUrlDownload, urlLength + 1,
ICU_DECODE | ICU_ESCAPE, &urlComponents))
+ goto end;
+
+ if (urlComponents.nScheme == INTERNET_SCHEME_HTTP ||
urlComponents.nScheme == INTERNET_SCHEME_HTTPS)
+ HttpQueryInfoW(hFile, HTTP_QUERY_CONTENT_LENGTH |
HTTP_QUERY_FLAG_NUMBER, &dwContentLen, &dwStatus, 0);
+
+ if (urlComponents.nScheme == INTERNET_SCHEME_FTP)
+ dwContentLen = FtpGetFileSize(hFile, &dwStatus);
#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(pCurrentInfo->szUrlDownload, APPLICATION_DATABASE_URL) == 0) &&
- (!CertIsValid(hOpen, urlComponents.lpszHostName)))
- {
- MessageBox_LoadString(hMainWnd, IDS_CERT_DOES_NOT_MATCH);
- goto end;
- }
+ // are we using HTTPS to download the RAPPS update package? check if
the certificate is original
+ if ((urlComponents.nScheme == INTERNET_SCHEME_HTTPS) &&
+ (wcscmp(pCurrentInfo->szUrlDownload, APPLICATION_DATABASE_URL) ==
0) &&
+ (!CertIsValid(hOpen, urlComponents.lpszHostName)))
+ {
+ MessageBox_LoadString(hMainWnd, IDS_CERT_DOES_NOT_MATCH);
+ goto end;
+ }
#endif
- free(urlComponents.lpszScheme);
- free(urlComponents.lpszHostName);
-
- hOut = CreateFileW(Path.GetString(), GENERIC_WRITE, FILE_SHARE_READ |
FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, NULL);
-
- if (hOut == INVALID_HANDLE_VALUE)
- goto end;
-
- do
- {
- if (!InternetReadFile(hFile, lpBuffer, _countof(lpBuffer),
&dwBytesRead))
- {
- MessageBox_LoadString(hMainWnd, IDS_INTERRUPTED_DOWNLOAD);
- goto end;
- }
-
- if (!WriteFile(hOut, &lpBuffer[0], dwBytesRead, &dwBytesWritten, NULL))
- {
- MessageBox_LoadString(hMainWnd, IDS_UNABLE_TO_WRITE);
- goto end;
- }
-
- dwCurrentBytesRead += dwBytesRead;
- dl->OnProgress(dwCurrentBytesRead, dwContentLen, 0,
pCurrentInfo->szUrlDownload);
- } while (dwBytesRead && !bCancelled);
-
- CloseHandle(hOut);
- hOut = INVALID_HANDLE_VALUE;
-
- if (bCancelled)
- goto end;
-
- /* 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 && pCurrentInfo->szSHA1[0] != 0)
- {
- ATL::CStringW szMsgText;
-
- // change a few strings in the download dialog to reflect the
verification process
- if (!szMsgText.LoadStringW(hInst, IDS_INTEG_CHECK_TITLE))
- goto end;
-
- SetWindowTextW(Dlg, szMsgText.GetString());
- SendMessageW(GetDlgItem(Dlg, IDC_DOWNLOAD_STATUS), WM_SETTEXT, 0,
(LPARAM) Path.GetString());
-
- // this may take a while, depending on the file size
- if (!VerifyInteg(pCurrentInfo->szSHA1, Path.GetString()))
- {
- if (!szMsgText.LoadStringW(hInst, IDS_INTEG_CHECK_FAIL))
+ free(urlComponents.lpszScheme);
+ free(urlComponents.lpszHostName);
+
+ hOut = CreateFileW(Path.GetString(), GENERIC_WRITE, FILE_SHARE_READ |
FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, NULL);
+
+ if (hOut == INVALID_HANDLE_VALUE)
+ goto end;
+
+ do
+ {
+ if (!InternetReadFile(hFile, lpBuffer, _countof(lpBuffer),
&dwBytesRead))
+ {
+ MessageBox_LoadString(hMainWnd, IDS_INTERRUPTED_DOWNLOAD);
goto end;
-
- MessageBoxW(Dlg, szMsgText.GetString(), NULL, MB_OK |
MB_ICONERROR);
- goto end;
- }
- }
-
+ }
+
+ if (!WriteFile(hOut, &lpBuffer[0], dwBytesRead, &dwBytesWritten,
NULL))
+ {
+ MessageBox_LoadString(hMainWnd, IDS_UNABLE_TO_WRITE);
+ goto end;
+ }
+
+ dwCurrentBytesRead += dwBytesRead;
+ dl->OnProgress(dwCurrentBytesRead, dwContentLen, 0,
pCurrentInfo->szUrlDownload);
+ } while (dwBytesRead && !bCancelled);
+
+ CloseHandle(hOut);
+ hOut = INVALID_HANDLE_VALUE;
+
+ if (bCancelled)
+ goto end;
+
+ /* 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 && pCurrentInfo->szSHA1[0] != 0)
+ {
+ ATL::CStringW szMsgText;
+
+ // change a few strings in the download dialog to reflect the
verification process
+ if (!szMsgText.LoadStringW(hInst, IDS_INTEG_CHECK_TITLE))
+ goto end;
+
+ SetWindowTextW(hDlg, szMsgText.GetString());
+ SendMessageW(GetDlgItem(hDlg, IDC_DOWNLOAD_STATUS), WM_SETTEXT, 0,
(LPARAM) Path.GetString());
+
+ // this may take a while, depending on the file size
+ if (!VerifyInteg(pCurrentInfo->szSHA1, Path.GetString()))
+ {
+ if (!szMsgText.LoadStringW(hInst, IDS_INTEG_CHECK_FAIL))
+ goto end;
+
+ MessageBoxW(hDlg, szMsgText.GetString(), NULL, MB_OK |
MB_ICONERROR);
+ goto end;
+ }
+ }
run:
- DownloadsListView.SetDownloadStatus(iAppId,
DOWNLOAD_STATUS::DLWaitingToInstall);
-
- // run it
- if (!bCab)
- {
- SHELLEXECUTEINFOW shExInfo = {0};
- shExInfo.cbSize = sizeof(shExInfo);
- shExInfo.fMask = SEE_MASK_NOCLOSEPROCESS;
- shExInfo.lpVerb = L"open";
- shExInfo.lpFile = Path.GetString();
- shExInfo.lpParameters = L"";
- shExInfo.nShow = SW_SHOW;
-
- if (ShellExecuteExW(&shExInfo))
- {
- DownloadsListView.SetDownloadStatus(iAppId,
DOWNLOAD_STATUS::DLInstalling);
- //TODO: issue an install operation separately so that the apps
could be downloaded in the background
- WaitForSingleObject(shExInfo.hProcess, INFINITE);
- CloseHandle(shExInfo.hProcess);
- }
- else
- {
- MessageBox_LoadString(hMainWnd, IDS_UNABLE_TO_INSTALL);
- }
- }
+ DownloadsListView.SetDownloadStatus(iAppId,
DOWNLOAD_STATUS::DLWaitingToInstall);
+
+ // run it
+ if (!bCab)
+ {
+ SHELLEXECUTEINFOW shExInfo = {0};
+ shExInfo.cbSize = sizeof(shExInfo);
+ shExInfo.fMask = SEE_MASK_NOCLOSEPROCESS;
+ shExInfo.lpVerb = L"open";
+ shExInfo.lpFile = Path.GetString();
+ shExInfo.lpParameters = L"";
+ shExInfo.nShow = SW_SHOW;
+
+ if (ShellExecuteExW(&shExInfo))
+ {
+ DownloadsListView.SetDownloadStatus(iAppId,
DOWNLOAD_STATUS::DLInstalling);
+ //TODO: issue an install operation separately so that the apps
could be downloaded in the background
+ WaitForSingleObject(shExInfo.hProcess, INFINITE);
+ CloseHandle(shExInfo.hProcess);
+ }
+ else
+ {
+ MessageBox_LoadString(hMainWnd, IDS_UNABLE_TO_INSTALL);
+ }
+ }
end:
- if (hOut != INVALID_HANDLE_VALUE)
- CloseHandle(hOut);
-
- InternetCloseHandle(hFile);
- InternetCloseHandle(hOpen);
-
- if (bTempfile)
- {
- if (bCancelled || (SettingsInfo.bDelInstaller && !bCab))
- DeleteFileW(Path.GetString());
- }
- DownloadsListView.SetDownloadStatus(iAppId, DOWNLOAD_STATUS::DLFinished);
- SendMessageW(Dlg, DL_START_NEW, 0, 0);
+ if (hOut != INVALID_HANDLE_VALUE)
+ CloseHandle(hOut);
+
+ InternetCloseHandle(hFile);
+ InternetCloseHandle(hOpen);
+
+ if (bTempfile)
+ {
+ if (bCancelled || (SettingsInfo.bDelInstaller && !bCab))
+ DeleteFileW(Path.GetString());
+ }
+
+ DownloadsListView.SetDownloadStatus(iAppId,
DOWNLOAD_STATUS::DLFinished);
+ }
+
+ SendMessageW(hDlg, WM_CLOSE, 0, 0);
return 0;
}
@@ -825,10 +847,11 @@
VOID CDownloadManager::DownloadApplicationsDB(LPCWSTR lpUrl)
{
- APPLICATION_INFO IntInfo;
+ static APPLICATION_INFO IntInfo;
IntInfo.szUrlDownload = lpUrl;
-
- DownloadApplication(&IntInfo);
+ //TODO: add this string to .rc
+ IntInfo.szName = L"RAPPS DB";
+ DownloadApplication(&IntInfo, TRUE);
}
//TODO: Reuse the dialog
Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/misc.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/applications/rapps/misc.cpp?rev=75659&r1=75658&r2=75659&view=diff
==============================================================================
--- branches/GSoC_2017/rapps/reactos/base/applications/rapps/misc.cpp
[iso-8859-1] (original)
+++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/misc.cpp
[iso-8859-1] Thu Aug 24 18:46:39 2017
@@ -260,6 +260,8 @@
if (Result == S_OK)
{
Dest.Operation = EXTRACT_EXTRACTFILES;
+ CreateDirectoryW(lpOutputPath, NULL);
+
Result = pfnExtract(&Dest, szCabName);
if (Result == S_OK)
{
Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp?rev=75659&r1=75658&r2=75659&view=diff
==============================================================================
--- branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp
[iso-8859-1] (original)
+++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp
[iso-8859-1] Thu Aug 24 18:46:39 2017
@@ -156,7 +156,6 @@
}
InitLogs();
-
InitCommonControls();
//skip window creation if there were some keys
