Alexandre Julliard : shdocvw: Support setting an icon on the main iexplore window.

[Alexandre Julliard]

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

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Wed May  5 11:00:19 2010 +0200

shdocvw: Support setting an icon on the main iexplore window.

---

 dlls/shdocvw/iexplore.c |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c
index d65810f..9c14cfc 100644
--- a/dlls/shdocvw/iexplore.c
+++ b/dlls/shdocvw/iexplore.c
@@ -37,6 +37,8 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(shdocvw);
 
+#define IDI_APPICON 101
+
 static const WCHAR szIEWinFrame[] = { 'I','E','F','r','a','m','e',0 };
 
 static LRESULT iewnd_OnCreate(HWND hwnd, LPCREATESTRUCTW lpcs)
@@ -85,7 +87,7 @@ ie_window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)
 
 void register_iewindow_class(void)
 {
-    WNDCLASSW wc;
+    WNDCLASSEXW wc;
 
     memset(&wc, 0, sizeof wc);
     wc.style = 0;
@@ -93,13 +95,15 @@ void register_iewindow_class(void)
     wc.cbClsExtra = 0;
     wc.cbWndExtra = sizeof(InternetExplorer*);
     wc.hInstance = shdocvw_hinstance;
-    wc.hIcon = 0;
-    wc.hCursor = LoadCursorW(0, MAKEINTRESOURCEW(IDI_APPLICATION));
+    wc.hIcon = LoadIconW(GetModuleHandleW(0), MAKEINTRESOURCEW(IDI_APPICON));
+    wc.hIconSm = LoadImageW(GetModuleHandleW(0), MAKEINTRESOURCEW(IDI_APPICON), IMAGE_ICON,
+                            GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_SHARED);
+    wc.hCursor = LoadCursorW(0, MAKEINTRESOURCEW(IDC_ARROW));
     wc.hbrBackground = 0;
     wc.lpszClassName = szIEWinFrame;
     wc.lpszMenuName = NULL;
 
-    RegisterClassW(&wc);
+    RegisterClassExW(&wc);
 }
 
 void unregister_iewindow_class(void)