https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a23db39c8a422b40c3deab...
commit a23db39c8a422b40c3deab643996aac6e775217d Author: Whindmar Saksit whindsaks@proton.me AuthorDate: Thu Jan 30 17:46:39 2025 +0100 Commit: GitHub noreply@github.com CommitDate: Thu Jan 30 17:46:39 2025 +0100
[RAPPS] Allow database to override download filename (#7668)
http://example.com/setup.exe?foo=bar needs to use be able to use setup.exe as the filename. --- base/applications/rapps/include/appinfo.h | 1 + base/applications/rapps/loaddlg.cpp | 26 ++++++++++++-------------- 2 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/base/applications/rapps/include/appinfo.h b/base/applications/rapps/include/appinfo.h index 175048b6008..32cfc20b3dd 100644 --- a/base/applications/rapps/include/appinfo.h +++ b/base/applications/rapps/include/appinfo.h @@ -82,6 +82,7 @@ enum InstallerType #define DB_REGNAME L"RegName" #define DB_INSTALLER L"Installer" #define DB_SCOPE L"Scope" // User or Machine +#define DB_SAVEAS L"SaveAs"
#define DB_GENINSTSECTION L"Generate" #define GENERATE_ARPSUBKEY L"RApps" // Our uninstall data is stored here diff --git a/base/applications/rapps/loaddlg.cpp b/base/applications/rapps/loaddlg.cpp index df8afcbeeea..c863a5e2165 100644 --- a/base/applications/rapps/loaddlg.cpp +++ b/base/applications/rapps/loaddlg.cpp @@ -144,6 +144,10 @@ struct DownloadInfo IType = AppInfo.GetInstallerType(); if (IType == INSTALLER_GENERATE) szPackageName = AppInfo.szIdentifier; + + CConfigParser *cfg = static_cast<const CAvailableApplicationInfo&>(AppInfo).GetConfigParser(); + if (cfg) + cfg->GetString(DB_SAVEAS, szFileName); }
bool Equal(const DownloadInfo &other) const @@ -157,6 +161,7 @@ struct DownloadInfo CStringW szName; CStringW szSHA1; CStringW szPackageName; + CStringW szFileName; ULONG SizeInBytes; };
@@ -719,7 +724,7 @@ CDownloadManager::PerformDownloadAndInstall(const DownloadInfo &Info)
CStringW str; CPathW Path; - PCWSTR p, q; + PCWSTR p;
ULONG dwContentLen, dwBytesWritten, dwBytesRead, dwStatus, dwStatusLen; ULONG dwCurrentBytesRead = 0; @@ -734,7 +739,7 @@ CDownloadManager::PerformDownloadAndInstall(const DownloadInfo &Info) const DWORD dwUrlConnectFlags = INTERNET_FLAG_DONT_CACHE | INTERNET_FLAG_PRAGMA_NOCACHE | INTERNET_FLAG_KEEP_CONNECTION; URL_COMPONENTSW urlComponents; - size_t urlLength, filenameLength; + size_t urlLength; unsigned char lpBuffer[4096];
// Change caption to show the currently downloaded app @@ -768,7 +773,6 @@ CDownloadManager::PerformDownloadAndInstall(const DownloadInfo &Info)
// build the path for the download p = wcsrchr(Info.szUrl.GetString(), L'/'); - q = wcsrchr(Info.szUrl.GetString(), L'?');
// do we have a final slash separator? if (!p) @@ -777,14 +781,6 @@ CDownloadManager::PerformDownloadAndInstall(const DownloadInfo &Info) 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 the path valid? can we access it? if (GetFileAttributesW(Path) == INVALID_FILE_ATTRIBUTES) { @@ -803,9 +799,11 @@ CDownloadManager::PerformDownloadAndInstall(const DownloadInfo &Info) break; case DLTYPE_APPLICATION: { - CStringW str = p + 1; // use the filename retrieved from URL - UrlUnescapeAndMakeFileNameValid(str); - Path += str; + CStringW name = Info.szFileName; + if (name.IsEmpty()) + name = p + 1; // use the filename retrieved from URL + UrlUnescapeAndMakeFileNameValid(name); + Path += name; break; } }
-
Whindmar Saksit