mshtml: Use NSContainer as 'This' of its window.

This commit is contained in:
Jacek Caban 2006-03-01 22:03:00 +01:00 committed by Alexandre Julliard
parent 4f75f8469b
commit 2be7ffdf59
1 changed files with 5 additions and 6 deletions

View File

@ -81,23 +81,23 @@ static ATOM nscontainer_class;
static LRESULT WINAPI nsembed_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) static LRESULT WINAPI nsembed_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{ {
HTMLDocument *This; NSContainer *This;
nsresult nsres; nsresult nsres;
static const WCHAR wszTHIS[] = {'T','H','I','S',0}; static const WCHAR wszTHIS[] = {'T','H','I','S',0};
if(msg == WM_CREATE) { if(msg == WM_CREATE) {
This = *(HTMLDocument**)lParam; This = *(NSContainer**)lParam;
SetPropW(hwnd, wszTHIS, This); SetPropW(hwnd, wszTHIS, This);
}else { }else {
This = (HTMLDocument*)GetPropW(hwnd, wszTHIS); This = (NSContainer*)GetPropW(hwnd, wszTHIS);
} }
switch(msg) { switch(msg) {
case WM_SIZE: case WM_SIZE:
TRACE("(%p)->(WM_SIZE)\n", This); TRACE("(%p)->(WM_SIZE)\n", This);
nsres = nsIBaseWindow_SetSize(This->nscontainer->window, nsres = nsIBaseWindow_SetSize(This->window,
LOWORD(lParam), HIWORD(lParam), TRUE); LOWORD(lParam), HIWORD(lParam), TRUE);
if(NS_FAILED(nsres)) if(NS_FAILED(nsres))
WARN("SetSize failed: %08lx\n", nsres); WARN("SetSize failed: %08lx\n", nsres);
@ -106,7 +106,6 @@ static LRESULT WINAPI nsembed_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
return DefWindowProcW(hwnd, msg, wParam, lParam); return DefWindowProcW(hwnd, msg, wParam, lParam);
} }
static void register_nscontainer_class(void) static void register_nscontainer_class(void)
{ {
static WNDCLASSEXW wndclass = { static WNDCLASSEXW wndclass = {
@ -1034,7 +1033,7 @@ void NSContainer_Create(HTMLDocument *doc)
ret->hwnd = CreateWindowExW(0, wszNsContainer, NULL, ret->hwnd = CreateWindowExW(0, wszNsContainer, NULL,
WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, 0, 0, 100, 100, WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, 0, 0, 100, 100,
GetDesktopWindow(), NULL, hInst, doc); GetDesktopWindow(), NULL, hInst, ret);
nsres = nsIBaseWindow_InitWindow(ret->window, ret->hwnd, NULL, 0, 0, 100, 100); nsres = nsIBaseWindow_InitWindow(ret->window, ret->hwnd, NULL, 0, 0, 100, 100);
if(NS_SUCCEEDED(nsres)) { if(NS_SUCCEEDED(nsres)) {