[WLANWIZ] Pick the 'Favorites' icon from shell32

Saving 1.1 KB of storage, that's why.
SigmaTel71 · Sep 28, 2024 · ac7a8cc · ac7a8cc
1 parent 523625c
commit ac7a8cc
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/dll/shellext/wlanwiz/draw.cpp b/dll/shellext/wlanwiz/draw.cpp
@@ -93,15 +93,23 @@ LRESULT CWlanWizard::OnDrawItem(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& b
                  * The +20 offset originates from resource.h, the IDs are laid out in a way
                  * they can be safely batch processed in loops, as the range is fixed. */
                 if (wParam >= IDC_WLANWIZ_SCAN_NETWORKS && wParam <= IDC_WLANWIZ_ADVANCED_SETTINGS)
+                {
+                    HICON hSidebarIcon = NULL;
+
+                    wParam == IDC_WLANWIZ_PREFERRED_APS
+                        ? hSidebarIcon = LoadIconW(GetModuleHandleW(L"shell32.dll"), MAKEINTRESOURCE(44)) /* 'Favorites' icon */
+                        : hSidebarIcon = LoadIconW(wlanwiz_hInstance, MAKEINTRESOURCEW(wParam + 20));
+
                     DrawIconEx(this->hThemeEB ? hDCBtn : pdis->hDC,
                                pdis->rcItem.left + 2,
                                pdis->rcItem.top + 2,
-                               LoadIconW(wlanwiz_hInstance, MAKEINTRESOURCEW(wParam + 20)),
+                               hSidebarIcon,
                                16,
                                16,
                                NULL,
                                NULL,
                                DI_NORMAL);
+                }
 
                 /* Step 3: Draw button text */
                 HFONT hfBtnCaption = NULL;

diff --git a/dll/shellext/wlanwiz/res/favorite.ico b/dll/shellext/wlanwiz/res/favorite.ico
diff --git a/dll/shellext/wlanwiz/resource.h b/dll/shellext/wlanwiz/resource.h
@@ -40,7 +40,6 @@
 /* Sidebar dialog controls icons */
 #define IDI_WLANWIZ_SCAN_NETWORKS		431
 #define IDI_WLANWIZ_INSTALL_WLAN		432
-#define IDI_WLANWIZ_PREFERRED_APS		441
 #define IDI_WLANWIZ_ADVANCED_SETTINGS	442
 
 /* Sidebar dialog controls toolip strings */

diff --git a/dll/shellext/wlanwiz/wlanwiz.rc b/dll/shellext/wlanwiz/wlanwiz.rc
@@ -30,7 +30,6 @@ IDI_BSS_ADHOC ICON "res/bss_adhoc.ico"
 
 IDI_WLANWIZ_SCAN_NETWORKS ICON "res/refresh.ico"
 IDI_WLANWIZ_INSTALL_WLAN ICON "res/wlanwiz.ico"
-IDI_WLANWIZ_PREFERRED_APS ICON "res/favorite.ico"
 IDI_WLANWIZ_ADVANCED_SETTINGS ICON "res/advanced_settings.ico"
 
 #include <reactos/manifest_hosted.rc>