[ros-diffs] [reactos] 01/01: [RAPPS] Allow .zip generated installers to skip writing the DisplayIcon value (#7609)

[Whindmar Saksit]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=91b8923601ff4ef4cf47c…

commit 91b8923601ff4ef4cf47c4fd0b004de1f1db3aa2
Author:     Whindmar Saksit <whindsaks(a)proton.me>
AuthorDate: Tue Jan 14 18:09:48 2025 +0100
Commit:     GitHub <noreply(a)github.com>
CommitDate: Tue Jan 14 18:09:48 2025 +0100

    [RAPPS] Allow .zip generated installers to skip writing the DisplayIcon value (#7609)
    
    This is useful for wallpaper and theme packs.
---
 base/applications/rapps/geninst.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/base/applications/rapps/geninst.cpp b/base/applications/rapps/geninst.cpp
index 9fff1d2b264..ba57b53b502 100644
--- a/base/applications/rapps/geninst.cpp
+++ b/base/applications/rapps/geninst.cpp
@@ -28,6 +28,7 @@ extern "C" {
 
 #define REGPATH_UNINSTALL
L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall"
 
+#define DB_NONE L"!" // Skip/Ignore
 #define DB_GENINST_FILES L"Files"
 #define DB_GENINST_DIR L"Dir"
 #define DB_GENINST_ICON L"Icon"
@@ -230,6 +231,8 @@ GetCustomIconPath(InstallInfo &Info, CStringW &Path)
 {
     if (*GetGenerateString(DB_GENINST_ICON, Path))
     {
+        if (Path.Compare(DB_NONE) == 0)
+            return HRESULT_FROM_WIN32(ERROR_CAN_NOT_COMPLETE);
         Path = BuildPath(Info.InstallDir, Path);
         int idx = PathParseIconLocation(Path.GetBuffer());
         Path.ReleaseBuffer();
@@ -432,7 +435,7 @@ ExtractAndInstallThread(LPVOID Parameter)
 {
     const BOOL PerUserModeDefault = TRUE;
     InstallInfo &Info = *static_cast<InstallInfo *>(g_pInfo);
-    LPCWSTR AppName = Info.AppName, Archive = Info.ArchivePath, None = L"!";
+    LPCWSTR AppName = Info.AppName, Archive = Info.ArchivePath, None = DB_NONE;
     CStringW installdir, tempdir, files, shortcut, tmp;
     HRESULT hr;
     CRegKey arpkey;
@@ -534,9 +537,9 @@ ExtractAndInstallThread(LPVOID Parameter)
             (tmp = tmp.Mid(0, cch)).AppendFormat(unparamsfmt, L" /S", modechar,
bitness, arpkeyname);
             WriteArpEntry(L"QuietUninstallString", tmp);
 
-            if (GetCustomIconPath(Info, tmp) != S_OK)
-                tmp = Info.MainApp;
-            WriteArpEntry(L"DisplayIcon", tmp);
+            hr = GetCustomIconPath(Info, tmp);
+            if (hr != HRESULT_FROM_WIN32(ERROR_CAN_NOT_COMPLETE))
+                WriteArpEntry(L"DisplayIcon", hr == S_OK ? tmp :
Info.MainApp);
 
             if (*GetCommonString(DB_VERSION, tmp))
                 WriteArpEntry(L"DisplayVersion", tmp);