Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 17:56:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

[RAPPS] CDownloadManager: simplify canceling

Browse source
This commit is contained in:
Giannis Adamopoulos 2019-04-29 14:21:08 +03:00 • committed by Mark Jansen
parent 6803490a4d
commit db8f1d6f6a
No known key found for this signature in database
GPG key ID: B39240EE84BEAE8B
1 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

21
base/applications/rapps/loaddlg.cpp
View file

@ -223,7 +223,6 @@ class CDownloadDialog :
public IBindStatusCallback public IBindStatusCallback
{ {
HWND m_hDialog; HWND m_hDialog;
PBOOL m_pbCancelled;
BOOL m_UrlHasBeenCopied; BOOL m_UrlHasBeenCopied;
CDownloaderProgress* m_progress; CDownloaderProgress* m_progress;
@ -233,10 +232,9 @@ public:
//DestroyWindow(m_hDialog); //DestroyWindow(m_hDialog);
} }
HRESULT Initialize(HWND Dlg, BOOL *pbCancelled, CDownloaderProgress* pProgress) HRESULT Initialize(HWND Dlg, CDownloaderProgress* pProgress)
{ {
m_hDialog = Dlg; m_hDialog = Dlg;
m_pbCancelled = pbCancelled;
m_UrlHasBeenCopied = FALSE; m_UrlHasBeenCopied = FALSE;
m_progress = pProgress; m_progress = pProgress;
return S_OK; return S_OK;
@ -300,7 +298,6 @@ public:
r = GetWindowLongPtrW(m_hDialog, GWLP_USERDATA); r = GetWindowLongPtrW(m_hDialog, GWLP_USERDATA);
if (r || GetLastError() != ERROR_SUCCESS) if (r || GetLastError() != ERROR_SUCCESS)
{ {
*m_pbCancelled = TRUE;
return E_ABORT; return E_ABORT;
} }
@ -410,9 +407,9 @@ public:
}; };
extern "C" extern "C"
HRESULT WINAPI CDownloadDialog_Constructor(HWND Dlg, BOOL *pbCancelled, CDownloaderProgress* pProgress, REFIID riid, LPVOID *ppv) HRESULT WINAPI CDownloadDialog_Constructor(HWND Dlg, CDownloaderProgress* pProgress, REFIID riid, LPVOID *ppv)
{ {
return ShellObjectCreatorInit<CDownloadDialog>(Dlg, pbCancelled, pProgress, riid, ppv); return ShellObjectCreatorInit<CDownloadDialog>(Dlg, pProgress, riid, ppv);
} }
#ifdef USE_CERT_PINNING #ifdef USE_CERT_PINNING
@ -468,14 +465,13 @@ inline VOID MessageBox_LoadString(HWND hMainWnd, INT StringID)
} }
} }
// Download dialog (loaddlg.cpp) // Download dialog (loaddlg.cpp)
class CDownloadManager class CDownloadManager
{ {
static ATL::CSimpleArray<DownloadInfo> AppsToInstallList; static ATL::CSimpleArray<DownloadInfo> AppsToInstallList;
static CDowloadingAppsListView DownloadsListView; static CDowloadingAppsListView DownloadsListView;
static CDownloaderProgress ProgressBar; static CDownloaderProgress ProgressBar;
static BOOL bCancelled;
public: public:
static VOID Add(DownloadInfo info); static VOID Add(DownloadInfo info);
static VOID Download(const DownloadInfo& DLInfo, BOOL bIsModal = FALSE); static VOID Download(const DownloadInfo& DLInfo, BOOL bIsModal = FALSE);
@ -492,7 +488,7 @@ public:
ATL::CSimpleArray<DownloadInfo> CDownloadManager::AppsToInstallList; ATL::CSimpleArray<DownloadInfo> CDownloadManager::AppsToInstallList;
CDowloadingAppsListView CDownloadManager::DownloadsListView; CDowloadingAppsListView CDownloadManager::DownloadsListView;
CDownloaderProgress CDownloadManager::ProgressBar; CDownloaderProgress CDownloadManager::ProgressBar;
BOOL CDownloadManager::bCancelled;
VOID CDownloadManager::Add(DownloadInfo info) VOID CDownloadManager::Add(DownloadInfo info)
{ {
@ -517,6 +513,8 @@ INT_PTR CALLBACK CDownloadManager::DownloadDlgProc(HWND Dlg, UINT uMsg, WPARAM w
HICON hIconSm, hIconBg; HICON hIconSm, hIconBg;
ATL::CStringW szTempCaption; ATL::CStringW szTempCaption;
bCancelled = FALSE;
hIconBg = (HICON) GetClassLongPtrW(hMainWnd, GCLP_HICON); hIconBg = (HICON) GetClassLongPtrW(hMainWnd, GCLP_HICON);
hIconSm = (HICON) GetClassLongPtrW(hMainWnd, GCLP_HICONSM); hIconSm = (HICON) GetClassLongPtrW(hMainWnd, GCLP_HICONSM);
@ -573,7 +571,7 @@ INT_PTR CALLBACK CDownloadManager::DownloadDlgProc(HWND Dlg, UINT uMsg, WPARAM w
case WM_COMMAND: case WM_COMMAND:
if (wParam == IDCANCEL) if (wParam == IDCANCEL)
{ {
SetWindowLongW(Dlg, GWLP_USERDATA, 1); bCancelled = TRUE;
PostMessageW(Dlg, WM_CLOSE, 0, 0); PostMessageW(Dlg, WM_CLOSE, 0, 0);
} }
return FALSE; return FALSE;
@ -602,7 +600,6 @@ DWORD WINAPI CDownloadManager::ThreadFunc(LPVOID param)
ULONG dwCurrentBytesRead = 0; ULONG dwCurrentBytesRead = 0;
ULONG dwStatusLen = sizeof(dwStatus); ULONG dwStatusLen = sizeof(dwStatus);
BOOL bCancelled = FALSE;
BOOL bTempfile = FALSE; BOOL bTempfile = FALSE;
BOOL bCab = FALSE; BOOL bCab = FALSE;
@ -704,7 +701,7 @@ DWORD WINAPI CDownloadManager::ThreadFunc(LPVOID param)
// download it // download it
bTempfile = TRUE; bTempfile = TRUE;
CDownloadDialog_Constructor(hDlg, &bCancelled, &ProgressBar, IID_PPV_ARG(IBindStatusCallback, &dl)); CDownloadDialog_Constructor(hDlg, &ProgressBar, IID_PPV_ARG(IBindStatusCallback, &dl));
if (dl == NULL) if (dl == NULL)
goto end; goto end;