[RAPPS] some renaming

This commit is contained in:
赫杨 2020-08-05 17:22:07 +08:00 committed by Mark Jansen
parent d29fba7f7a
commit 4c524ee3d5
No known key found for this signature in database
GPG key ID: B39240EE84BEAE8B

View file

@ -357,7 +357,7 @@ 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> AppsDownloadList;
static CDowloadingAppsListView DownloadsListView; static CDowloadingAppsListView DownloadsListView;
static CDownloaderProgress ProgressBar; static CDownloaderProgress ProgressBar;
static BOOL bCancelled; static BOOL bCancelled;
@ -373,7 +373,7 @@ public:
// CDownloadManager // CDownloadManager
ATL::CSimpleArray<DownloadInfo> CDownloadManager::AppsToInstallList; ATL::CSimpleArray<DownloadInfo> CDownloadManager::AppsDownloadList;
CDowloadingAppsListView CDownloadManager::DownloadsListView; CDowloadingAppsListView CDownloadManager::DownloadsListView;
CDownloaderProgress CDownloadManager::ProgressBar; CDownloaderProgress CDownloadManager::ProgressBar;
BOOL CDownloadManager::bCancelled = FALSE; BOOL CDownloadManager::bCancelled = FALSE;
@ -381,13 +381,13 @@ BOOL CDownloadManager::bModal = FALSE;
VOID CDownloadManager::Add(DownloadInfo info) VOID CDownloadManager::Add(DownloadInfo info)
{ {
AppsToInstallList.Add(info); AppsDownloadList.Add(info);
} }
VOID CDownloadManager::Download(const DownloadInfo &DLInfo, BOOL bIsModal) VOID CDownloadManager::Download(const DownloadInfo &DLInfo, BOOL bIsModal)
{ {
AppsToInstallList.RemoveAll(); AppsDownloadList.RemoveAll();
AppsToInstallList.Add(DLInfo); AppsDownloadList.Add(DLInfo);
LaunchDownloadDialog(bIsModal); LaunchDownloadDialog(bIsModal);
} }
@ -430,7 +430,7 @@ INT_PTR CALLBACK CDownloadManager::DownloadDlgProc(HWND Dlg, UINT uMsg, WPARAM w
{ {
return FALSE; return FALSE;
} }
DownloadsListView.LoadList(AppsToInstallList); DownloadsListView.LoadList(AppsDownloadList);
// Get a dlg string for later use // Get a dlg string for later use
GetWindowTextW(Dlg, szCaption, _countof(szCaption)); GetWindowTextW(Dlg, szCaption, _countof(szCaption));
@ -443,7 +443,7 @@ INT_PTR CALLBACK CDownloadManager::DownloadDlgProc(HWND Dlg, UINT uMsg, WPARAM w
ShowWindow(Dlg, SW_SHOW); ShowWindow(Dlg, SW_SHOW);
// Start download process // Start download process
DownloadParam *param = new DownloadParam(Dlg, AppsToInstallList, szCaption); DownloadParam *param = new DownloadParam(Dlg, AppsDownloadList, szCaption);
unsigned int ThreadId; unsigned int ThreadId;
HANDLE Thread = (HANDLE)_beginthreadex(NULL, 0, ThreadFunc, (void *) param, 0, &ThreadId); HANDLE Thread = (HANDLE)_beginthreadex(NULL, 0, ThreadFunc, (void *) param, 0, &ThreadId);
@ -453,7 +453,7 @@ INT_PTR CALLBACK CDownloadManager::DownloadDlgProc(HWND Dlg, UINT uMsg, WPARAM w
} }
CloseHandle(Thread); CloseHandle(Thread);
AppsToInstallList.RemoveAll(); AppsDownloadList.RemoveAll();
return TRUE; return TRUE;
} }