Jacek Caban : shdocvw: Better window handling.

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: b81b614da824e54c80f7e32dcf2672519bbe20ce
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=b81b614da824e54c80f7e32d...

Author: Jacek Caban 
Date:   Fri Apr 14 14:40:33 2006 +0200

shdocvw: Better window handling.

Use unicode version of DefWindowProc in unicode window procs.
Fix window styles.

---

dlls/shdocvw/dochost.c   |    4 ++--
 dlls/shdocvw/oleobject.c |   12 +++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c
index 2a679e7..ee4a0c4 100644
--- a/dlls/shdocvw/dochost.c
+++ b/dlls/shdocvw/dochost.c
@@ -120,7 +120,7 @@ static LRESULT WINAPI doc_view_proc(HWND
         return navigate2(This);
     }

-    return DefWindowProcA(hwnd, msg, wParam, lParam);
+    return DefWindowProcW(hwnd, msg, wParam, lParam);
 }

void create_doc_view_hwnd(WebBrowser *This)
@@ -149,7 +149,7 @@ void create_doc_view_hwnd(WebBrowser *Th
     GetClientRect(This->shell_embedding_hwnd, &rect);
     This->doc_view_hwnd = CreateWindowExW(0, wszShell_DocObject_View,
          wszShell_DocObject_View,
-         WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_TABSTOP | WS_MAXIMIZEBOX,
+         WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_TABSTOP,
          rect.left, rect.top, rect.right, rect.bottom, This->shell_embedding_hwnd,
          NULL, shdocvw_hinstance, This);
 }
diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c
index 32d7452..5adb88e 100644
--- a/dlls/shdocvw/oleobject.c
+++ b/dlls/shdocvw/oleobject.c
@@ -58,7 +58,7 @@ static LRESULT WINAPI shell_embedding_pr
         return resize_window(This, LOWORD(lParam), HIWORD(lParam));
     }

-    return DefWindowProcA(hwnd, msg, wParam, lParam);
+    return DefWindowProcW(hwnd, msg, wParam, lParam);
 }

static void create_shell_embedding_hwnd(WebBrowser *This)
@@ -91,10 +91,12 @@ static void create_shell_embedding_hwnd(
         IOleInPlaceSite_Release(inplace);
     }

-    This->shell_embedding_hwnd = CreateWindowExW(0, wszShellEmbedding, wszShellEmbedding,
-         WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_TABSTOP | WS_MAXIMIZEBOX,
-         0, 0, 0, 0, parent,
-         NULL, shdocvw_hinstance, This);
+    This->shell_embedding_hwnd = CreateWindowExW(
+            WS_EX_WINDOWEDGE,
+            wszShellEmbedding, wszShellEmbedding,
+            WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_TABSTOP,
+            0, 0, 0, 0, parent,
+            NULL, shdocvw_hinstance, This);
 }

/**********************************************************************