commit 068fa0aa212a0c8a3eac5c0ef3e62a1ae96e2144
author Jacek Caban <jack@itma.pwr.wroc.pl> Mon Aug 01 10:59:45 2005 +0000
committer Alexandre Julliard <julliard@winehq.org> Mon Aug 01 10:59:45 2005 +0000
tree 58b751b4c553d356dcde6a49dc498a131a4f08ce
parent 38d350ef00b6a0c2667dec40ee003f844290ebb2

- Use Gecko to render HTML.
- Get rid of Mozilla ActiveX Control in MSHTML.

dlls/mshtml/view.c

diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c
index d2f8ce6..f4d8b14 100644
--- a/dlls/mshtml/view.c
+++ b/dlls/mshtml/view.c
@@ -69,10 +69,73 @@
     DeleteObject(brush);
 }
 
+static void activate_gecko(HTMLDocument *This)
+{
+    RECT rect;
+    nsresult nsres;
+
+    TRACE("(%p) %p\n", This, This->nscontainer->window);
+
+    GetClientRect(This->hwnd, &rect);
+
+    nsres = nsIBaseWindow_InitWindow(This->nscontainer->window, This->hwnd, NULL,
+            0, 0, rect.right, rect.bottom);
+
+    if(nsres == NS_OK) {
+        nsres = nsIBaseWindow_Create(This->nscontainer->window);
+        if(NS_FAILED(nsres))
+            WARN("Creating window failed: %08lx\n", nsres);
+
+        nsIBaseWindow_SetVisibility(This->nscontainer->window, TRUE);
+        nsIBaseWindow_SetEnabled(This->nscontainer->window, TRUE);
+    }else {
+        ERR("Initializing window failed: %08lx\n", nsres);
+    }
+
+    if(This->nscontainer->url) {
+        TRACE("Loading  url: %s\n", debugstr_w(This->nscontainer->url));
+        nsres = nsIWebNavigation_LoadURI(This->nscontainer->navigation, This->nscontainer->url,
+                LOAD_FLAGS_NONE, NULL, NULL, NULL);
+        if(NS_FAILED(nsres))
+            ERR("LoadURI failed: %08lx\n", nsres);
+        This->nscontainer->url = NULL;
+    }
+}
+
 static LRESULT WINAPI serverwnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
-    if(msg == WM_PAINT)
-        paint_disabled(hwnd);
+    HTMLDocument *This;
+
+    static const WCHAR wszTHIS[] = {'T','H','I','S',0};
+
+    if(msg == WM_CREATE) {
+        This = *(HTMLDocument**)lParam;
+        SetPropW(hwnd, wszTHIS, This);
+    }else {
+        This = (HTMLDocument*)GetPropW(hwnd, wszTHIS);
+    }
+
+    switch(msg) {
+    case WM_CREATE:
+        This->hwnd = hwnd;
+        if(This->nscontainer)
+            activate_gecko(This);
+        break;
+    case WM_PAINT:
+        if(!This->nscontainer)
+            paint_disabled(hwnd);
+        break;
+    case WM_SIZE:
+        TRACE("(%p)->(WM_SIZE)\n", This);
+
+        if(This->nscontainer) {
+            nsresult nsres;
+            nsres = nsIBaseWindow_SetSize(This->nscontainer->window,
+                    LOWORD(lParam), HIWORD(lParam), TRUE);
+            if(NS_FAILED(nsres))
+                WARN("SetSize failed: %08lx\n", nsres);
+        }
+    }
         
     return DefWindowProcW(hwnd, msg, wParam, lParam);
 }
@@ -91,7 +154,6 @@
     serverwnd_class = RegisterClassExW(&wndclass);
 }
 
-
 /**********************************************************
  * IOleDocumentView implementation
  */
@@ -269,10 +331,13 @@
                     posrect.left, posrect.top, posrect.right-posrect.left, posrect.bottom-posrect.top,
                     SWP_NOACTIVATE | SWP_SHOWWINDOW);
         }else {
-            This->hwnd = CreateWindowExW(0, wszInternetExplorer_Server, NULL,
+            CreateWindowExW(0, wszInternetExplorer_Server, NULL,
                     WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN,
                     posrect.left, posrect.top, posrect.right-posrect.left, posrect.bottom-posrect.top,
                     parent_hwnd, NULL, hInst, This);
+
+            TRACE("Created window %p\n", This->hwnd);
+
             SetWindowPos(This->hwnd, NULL, 0, 0, 0, 0,
                     SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER | SWP_NOREDRAW | SWP_NOACTIVATE | SWP_SHOWWINDOW);
             RedrawWindow(This->hwnd, NULL, NULL, RDW_INVALIDATE | RDW_NOERASE | RDW_ALLCHILDREN);