ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

shdocvw: Better window handling.

Browse Source 
Use unicode version of DefWindowProc in unicode window procs.
Fix window styles.
This commit is contained in:
Jacek Caban 2006-04-14 14:40:33 +02:00 committed by Alexandre Julliard
parent 150bd5442c
commit b81b614da8
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/shdocvw/dochost.c
View File

@ -120,7 +120,7 @@ static LRESULT WINAPI doc_view_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l
return navigate2(This); return navigate2(This);
} }
return DefWindowProcA(hwnd, msg, wParam, lParam); return DefWindowProcW(hwnd, msg, wParam, lParam);
} }
void create_doc_view_hwnd(WebBrowser *This) void create_doc_view_hwnd(WebBrowser *This)
@ -149,7 +149,7 @@ void create_doc_view_hwnd(WebBrowser *This)
GetClientRect(This->shell_embedding_hwnd, &rect); GetClientRect(This->shell_embedding_hwnd, &rect);
This->doc_view_hwnd = CreateWindowExW(0, wszShell_DocObject_View, This->doc_view_hwnd = CreateWindowExW(0, wszShell_DocObject_View,
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, rect.left, rect.top, rect.right, rect.bottom, This->shell_embedding_hwnd,
NULL, shdocvw_hinstance, This); NULL, shdocvw_hinstance, This);
} }

8
dlls/shdocvw/oleobject.c
View File

@ -58,7 +58,7 @@ static LRESULT WINAPI shell_embedding_proc(HWND hwnd, UINT msg, WPARAM wParam, L
return resize_window(This, LOWORD(lParam), HIWORD(lParam)); 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) static void create_shell_embedding_hwnd(WebBrowser *This)
@ -91,8 +91,10 @@ static void create_shell_embedding_hwnd(WebBrowser *This)
IOleInPlaceSite_Release(inplace); IOleInPlaceSite_Release(inplace);
} }
This->shell_embedding_hwnd = CreateWindowExW(0, wszShellEmbedding, wszShellEmbedding, This->shell_embedding_hwnd = CreateWindowExW(
WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_TABSTOP | WS_MAXIMIZEBOX, WS_EX_WINDOWEDGE,
wszShellEmbedding, wszShellEmbedding,
WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_TABSTOP,
0, 0, 0, 0, parent, 0, 0, 0, 0, parent,
NULL, shdocvw_hinstance, This); NULL, shdocvw_hinstance, This);
} }