https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4c524ee3d56d44177d3bfe...
commit 4c524ee3d56d44177d3bfe29c541d2c6a9435331 Author: 赫杨 1160386205@qq.com AuthorDate: Wed Aug 5 17:22:07 2020 +0800 Commit: Mark Jansen mark.jansen@reactos.org CommitDate: Sun Sep 6 17:10:16 2020 +0200
[RAPPS] some renaming --- base/applications/rapps/loaddlg.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/base/applications/rapps/loaddlg.cpp b/base/applications/rapps/loaddlg.cpp index 0d75c29c4cc..dce708347bf 100644 --- a/base/applications/rapps/loaddlg.cpp +++ b/base/applications/rapps/loaddlg.cpp @@ -357,7 +357,7 @@ inline VOID MessageBox_LoadString(HWND hMainWnd, INT StringID) // Download dialog (loaddlg.cpp) class CDownloadManager { - static ATL::CSimpleArray<DownloadInfo> AppsToInstallList; + static ATL::CSimpleArray<DownloadInfo> AppsDownloadList; static CDowloadingAppsListView DownloadsListView; static CDownloaderProgress ProgressBar; static BOOL bCancelled; @@ -373,7 +373,7 @@ public:
// CDownloadManager -ATL::CSimpleArray<DownloadInfo> CDownloadManager::AppsToInstallList; +ATL::CSimpleArray<DownloadInfo> CDownloadManager::AppsDownloadList; CDowloadingAppsListView CDownloadManager::DownloadsListView; CDownloaderProgress CDownloadManager::ProgressBar; BOOL CDownloadManager::bCancelled = FALSE; @@ -381,13 +381,13 @@ BOOL CDownloadManager::bModal = FALSE;
VOID CDownloadManager::Add(DownloadInfo info) { - AppsToInstallList.Add(info); + AppsDownloadList.Add(info); }
VOID CDownloadManager::Download(const DownloadInfo &DLInfo, BOOL bIsModal) { - AppsToInstallList.RemoveAll(); - AppsToInstallList.Add(DLInfo); + AppsDownloadList.RemoveAll(); + AppsDownloadList.Add(DLInfo); LaunchDownloadDialog(bIsModal); }
@@ -430,7 +430,7 @@ INT_PTR CALLBACK CDownloadManager::DownloadDlgProc(HWND Dlg, UINT uMsg, WPARAM w { return FALSE; } - DownloadsListView.LoadList(AppsToInstallList); + DownloadsListView.LoadList(AppsDownloadList);
// Get a dlg string for later use GetWindowTextW(Dlg, szCaption, _countof(szCaption)); @@ -443,7 +443,7 @@ INT_PTR CALLBACK CDownloadManager::DownloadDlgProc(HWND Dlg, UINT uMsg, WPARAM w ShowWindow(Dlg, SW_SHOW);
// Start download process - DownloadParam *param = new DownloadParam(Dlg, AppsToInstallList, szCaption); + DownloadParam *param = new DownloadParam(Dlg, AppsDownloadList, szCaption); unsigned int 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); - AppsToInstallList.RemoveAll(); + AppsDownloadList.RemoveAll(); return TRUE; }