Alexandre Julliard : shell32: Make use of the control panel icon.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: fa29e0f2907bcd04ac75ed91677ac5853738e76f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=fa29e0f2907bcd04ac75ed9167...

Author: Alexandre Julliard 
Date:   Thu May  6 14:44:09 2010 +0200

shell32: Make use of the control panel icon.

---

dlls/shell32/control.c  |    8 ++++----
 dlls/shell32/shresdef.h |    2 --
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c
index 898e0ed..b0d4089 100644
--- a/dlls/shell32/control.c
+++ b/dlls/shell32/control.c
@@ -475,8 +475,8 @@ static LRESULT WINAPI	Control_WndProc(HWND hWnd, UINT wMsg,
              case IDM_CPANEL_ABOUT:
                  {
                      WCHAR appName[MAX_STRING_LEN];
-                     HICON icon = LoadImageW((HINSTANCE)GetWindowLongPtrW(hWnd, GWLP_HINSTANCE),
-                                             MAKEINTRESOURCEW(IDI_APPICON), IMAGE_ICON, 48, 48, LR_SHARED);
+                     HICON icon = LoadImageW(shell32_hInstance, MAKEINTRESOURCEW(IDI_SHELL_CONTROL_PANEL),
+                                             IMAGE_ICON, 48, 48, LR_SHARED);

LoadStringW(shell32_hInstance, IDS_CPANEL_TITLE, appName,
                          sizeof(appName) / sizeof(appName[0]));
@@ -627,12 +627,12 @@ static void    Control_DoInterface(CPanel* panel, HWND hWnd, HINSTANCE hInst)
     wc.cbClsExtra = 0;
     wc.cbWndExtra = sizeof(CPlApplet*);
     wc.hInstance = panel->hInst = hInst;
-    wc.hIcon = LoadIconW( hInst, MAKEINTRESOURCEW(IDI_APPICON) );
+    wc.hIcon = LoadIconW( shell32_hInstance, MAKEINTRESOURCEW(IDI_SHELL_CONTROL_PANEL) );
     wc.hCursor = LoadCursorW( 0, (LPWSTR)IDC_ARROW );
     wc.hbrBackground = GetStockObject(WHITE_BRUSH);
     wc.lpszMenuName = NULL;
     wc.lpszClassName = className;
-    wc.hIconSm = LoadImageW( hInst, MAKEINTRESOURCEW(IDI_APPICON), IMAGE_ICON,
+    wc.hIconSm = LoadImageW( shell32_hInstance, MAKEINTRESOURCEW(IDI_SHELL_CONTROL_PANEL), IMAGE_ICON,
                              GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_SHARED);

if (!RegisterClassExW(&wc)) return;
diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h
index 93fb518..88c93c8 100644
--- a/dlls/shell32/shresdef.h
+++ b/dlls/shell32/shresdef.h
@@ -178,8 +178,6 @@
 #define IDI_SHELL_CONFIRM_DELETE   161
 #define IDI_SHELL_MY_DOCUMENTS     235

-#define IDI_APPICON                101
-
 /* 
 AVI resources, windows shell32 has 14 of them: 150-152 and 160-170
 FIXME: Need to add them, but for now just let them use the same: searching.avi