[ros-diffs] [reactos] 01/01: [ZIPFLDR] Show icon on the taskbar (#4670)

[Thamatip Chitpong]

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

commit d5382f91e605b6917d71d3077bf761a83691e541
Author:     Thamatip Chitpong <tangaming123456(a)outlook.com>
AuthorDate: Sat Sep 10 01:26:39 2022 +0700
Commit:     GitHub <noreply(a)github.com>
CommitDate: Fri Sep 9 20:26:39 2022 +0200

    [ZIPFLDR] Show icon on the taskbar (#4670)
---
 dll/shellext/zipfldr/CZipExtract.cpp | 3 ++-
 dll/shellext/zipfldr/resource.h      | 5 ++++-
 dll/shellext/zipfldr/zipfldr.rc      | 9 +++++----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/dll/shellext/zipfldr/CZipExtract.cpp b/dll/shellext/zipfldr/CZipExtract.cpp
index 8f9381e9f83..24a744f2e2d 100644
--- a/dll/shellext/zipfldr/CZipExtract.cpp
+++ b/dll/shellext/zipfldr/CZipExtract.cpp
@@ -334,7 +334,7 @@ public:
     void runWizard()
     {
         PROPSHEETHEADERW psh = { sizeof(psh), 0 };
-        psh.dwFlags = PSH_WIZARD97 | PSH_HEADER;
+        psh.dwFlags = PSH_WIZARD97 | PSH_HEADER | PSH_USEICONID;
         psh.hInstance = _AtlBaseModule.GetResourceInstance();
 
         CExtractSettingsPage extractPage(this, &m_Password);
@@ -347,6 +347,7 @@ public:
 
         psh.phpage = hpsp;
         psh.nPages = _countof(hpsp);
+        psh.pszIcon = MAKEINTRESOURCE(IDI_ZIPFLDR);
         psh.pszbmWatermark = MAKEINTRESOURCE(IDB_WATERMARK);
         psh.pszbmHeader = MAKEINTRESOURCE(IDB_HEADER);
 
diff --git a/dll/shellext/zipfldr/resource.h b/dll/shellext/zipfldr/resource.h
index 7a9566e1f47..d8e2861fd88 100644
--- a/dll/shellext/zipfldr/resource.h
+++ b/dll/shellext/zipfldr/resource.h
@@ -1,12 +1,15 @@
 #pragma once
 
+/* Icons */
+#define IDI_ZIPFLDR                    1
+
 /* Bitmaps */
 #define IDB_ZIPFLDR                    164
 #define IDB_HEADER                     200
 #define IDB_WATERMARK                  201
 
 /* registry stuff */
-#define IDR_ZIPFLDR                     8000
+#define IDR_ZIPFLDR                    8000
 
 
 /* Dialogs */
diff --git a/dll/shellext/zipfldr/zipfldr.rc b/dll/shellext/zipfldr/zipfldr.rc
index 420f8d9e358..83d736fefd4 100644
--- a/dll/shellext/zipfldr/zipfldr.rc
+++ b/dll/shellext/zipfldr/zipfldr.rc
@@ -3,10 +3,11 @@
 
 #include "resource.h"
 
-164 BITMAP "res/zipfldr.bmp"
-200 BITMAP "res/header.bmp"
-201 BITMAP "res/watermark.bmp"
-1 ICON "res/zipfldr.ico"
+IDI_ZIPFLDR ICON "res/zipfldr.ico"
+
+IDB_ZIPFLDR BITMAP "res/zipfldr.bmp"
+IDB_HEADER BITMAP "res/header.bmp"
+IDB_WATERMARK BITMAP "res/watermark.bmp"
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION  "ReactOS Zip Shell Extension"