https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d564b4afc393fb0a98e61d9c23f689daf8bfbd90
commit d564b4afc393fb0a98e61d9c23f689daf8bfbd90 Author: Mark Jansen <[email protected]> AuthorDate: Sun Sep 20 22:12:19 2020 +0200 Commit: Mark Jansen <[email protected]> CommitDate: Sun Oct 11 17:01:06 2020 +0200 [RAPPS] Update rapps DB location to the new database --- base/applications/rapps/available.cpp | 2 +- base/applications/rapps/include/defines.h | 3 ++- base/applications/rapps/loaddlg.cpp | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/base/applications/rapps/available.cpp b/base/applications/rapps/available.cpp index 89f4ec5a255..d32e5f8d74a 100644 --- a/base/applications/rapps/available.cpp +++ b/base/applications/rapps/available.cpp @@ -308,7 +308,7 @@ AvailableStrings::AvailableStrings() PathAppendW(szAppsPath.GetBuffer(MAX_PATH), L"rapps"); szAppsPath.ReleaseBuffer(); - szCabName = L"rappmgr.cab"; + szCabName = APPLICATION_DATABASE_NAME; szCabDir = szPath; szCabPath = szCabDir; PathAppendW(szCabPath.GetBuffer(MAX_PATH), szCabName); diff --git a/base/applications/rapps/include/defines.h b/base/applications/rapps/include/defines.h index cf045923e39..d5247963725 100644 --- a/base/applications/rapps/include/defines.h +++ b/base/applications/rapps/include/defines.h @@ -30,7 +30,8 @@ #include "resource.h" #include "winmain.h" -#define APPLICATION_DATABASE_URL L"https://rapps.reactos.org/rappmgr.cab"; +#define APPLICATION_DATABASE_URL L"https://rapps.reactos.org/rappmgr2.cab"; +#define APPLICATION_DATABASE_NAME L"rappmgr2.cab" #define MAX_STR_LEN 256 enum AppsCategories diff --git a/base/applications/rapps/loaddlg.cpp b/base/applications/rapps/loaddlg.cpp index 22f47597c38..c845257428e 100644 --- a/base/applications/rapps/loaddlg.cpp +++ b/base/applications/rapps/loaddlg.cpp @@ -658,7 +658,7 @@ unsigned int WINAPI CDownloadManager::ThreadFunc(LPVOID param) { case DLTYPE_DBUPDATE: case DLTYPE_DBUPDATE_UNOFFICIAL: - PathAppendW(Path.GetBuffer(), L"rappmgr.cab"); // whatever the URL is, use the file name L"rappmgr.cab" + PathAppendW(Path.GetBuffer(), APPLICATION_DATABASE_NAME); break; case DLTYPE_APPLICATION: PathAppendW(Path.GetBuffer(), (LPWSTR)(p + 1)); // use the filename retrieved from URL
