Stub implementation of HTMLDocument2 interface.

dlls/mshtml/Makefile.in

@@ -8,6 +8,7 @@ EXTRALIBS = $(LIBUNICODE) -lstrmiids -luuid
 EXTRADEFS = -DCOM_NO_WINDOWS_H
 
 C_SRCS = \
+	htmldoc.c \
 	main.c
 
 @MAKE_DLL_RULES@

dlls/mshtml/main.c

@@ -3,6 +3,7 @@
  *
  * Copyright 2002 Lionel Ulmer
  * Copyright 2003 Mike McCormack
+ * Copyright 2005 Jacek Caban
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -24,6 +25,8 @@
 #include <stdarg.h>
 #include <stdio.h>
 
+#define COBJMACROS
+
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"
@@ -32,6 +35,7 @@
 #include "ole2.h"
 
 #include "mshtml.h"
+#include "mshtml_private.h"
 
 #include "wine/unicode.h"
 #include "wine/debug.h"
@@ -45,7 +49,7 @@ DEFINE_GUID( CLSID_MozillaBrowser, 0x1339B54C,0x3453,0x11D2,0x93,0xB9,0x00,0x00,
 typedef HRESULT (WINAPI *fnGetClassObject)(REFCLSID rclsid, REFIID iid, LPVOID *ppv);
 typedef BOOL (WINAPI *fnCanUnloadNow)();
 
-HMODULE hMozCtl;
+static HMODULE hMozCtl;
 
 
 /* convert a guid to a wide character string */
@@ -96,61 +100,150 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
 
     switch(fdwReason) {
         case DLL_PROCESS_ATTACH:
-            if( !MSHTML_GetMozctlPath( szPath, sizeof szPath ) )
-            {
+            if(MSHTML_GetMozctlPath(szPath, sizeof szPath)) {
+                hMozCtl = LoadLibraryExW(szPath, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
+                if(!hMozCtl)
+                    ERR("Can't load the Mozilla ActiveX control\n");
+            }else {
                 MESSAGE("You need to install the Mozilla ActiveX control to\n");
                 MESSAGE("use Wine's builtin MSHTML dll.\n");
-                return FALSE;
-            }
-            hMozCtl = LoadLibraryExW(szPath, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
-            if( !hMozCtl )
-            {
-                ERR("Can't load the Mozilla ActiveX control\n");
-                return FALSE;
             }
 	    break;
 	case DLL_PROCESS_DETACH:
-            FreeLibrary( hMozCtl );
+            if(hMozCtl)
+                FreeLibrary( hMozCtl );
 	    break;
     }
     return TRUE;
 }
 
-HRESULT WINAPI MSHTML_DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv)
+/***********************************************************
+ *    ClassFactory implementation
+ */
+typedef HRESULT (*CreateInstanceFunc)(IUnknown*,REFIID,void**);
+typedef struct {
+    const IClassFactoryVtbl *lpVtbl;
+    ULONG ref;
+    CreateInstanceFunc fnCreateInstance;
+} ClassFactory;
+
+static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFGUID riid, void **ppvObject)
 {
-    HRESULT r;
-    fnGetClassObject pGetClassObject;
+    if(IsEqualGUID(&IID_IClassFactory, riid) || IsEqualGUID(&IID_IUnknown, riid)) {
+        IClassFactory_AddRef(iface);
+        *ppvObject = iface;
+        return S_OK;
+    }
+
+    WARN("not supported iid %s\n", debugstr_guid(riid));
+    *ppvObject = NULL;
+    return E_NOINTERFACE;
+}
+
+static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface)
+{
+    ClassFactory *This = (ClassFactory*)iface;
+    ULONG ref = InterlockedIncrement(&This->ref);
+    TRACE("(%p) ref = %lu\n", This, ref);
+    return ref;
+}
 
-    TRACE("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv );
+static ULONG WINAPI ClassFactory_Release(IClassFactory *iface)
+{
+    ClassFactory *This = (ClassFactory*)iface;
+    ULONG ref = InterlockedDecrement(&This->ref);
 
-    if( !IsEqualGUID( &CLSID_HTMLDocument, rclsid ) )
-        WARN("Unknown class %s\n", debugstr_guid(rclsid) );
+    TRACE("(%p) ref = %lu\n", This, ref);
 
-    pGetClassObject = (fnGetClassObject) GetProcAddress( hMozCtl, "DllGetClassObject" );
-    if( !pGetClassObject )
-        return CLASS_E_CLASSNOTAVAILABLE;
-    r = pGetClassObject( &CLSID_MozillaBrowser, iid, ppv );
+    if(!ref)
+        HeapFree(GetProcessHeap(), 0, This);
 
-    TRACE("r = %08lx  *ppv = %p\n", r, *ppv );
+    return ref;
+}
 
+static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown *pUnkOuter,
+        REFIID riid, void **ppvObject)
+{
+    ClassFactory *This = (ClassFactory*)iface;
+    return This->fnCreateInstance(pUnkOuter, riid, ppvObject);
+}
+
+static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL dolock)
+{
+    FIXME("(%p)->(%x) stub\n", iface, dolock);
     return S_OK;
 }
 
-BOOL WINAPI MSHTML_DllCanUnloadNow(void)
+static const IClassFactoryVtbl HTMLClassFactoryVtbl = {
+    ClassFactory_QueryInterface,
+    ClassFactory_AddRef,
+    ClassFactory_Release,
+    ClassFactory_CreateInstance,
+    ClassFactory_LockServer
+};
+
+static HRESULT ClassFactory_Create(REFIID riid, void **ppv, CreateInstanceFunc fnCreateInstance)
 {
-    fnCanUnloadNow pCanUnloadNow;
-    BOOL r;
+    ClassFactory *ret = HeapAlloc(GetProcessHeap(), 0, sizeof(ClassFactory));
+    HRESULT hres;
 
-    TRACE("\n");
+    ret->lpVtbl = &HTMLClassFactoryVtbl;
+    ret->ref = 0;
+    ret->fnCreateInstance = fnCreateInstance;
 
-    pCanUnloadNow = (fnCanUnloadNow) GetProcAddress( hMozCtl, "DllCanUnloadNow" );
-    if( !pCanUnloadNow )
-        return FALSE;
-    r = pCanUnloadNow();
+    hres = IClassFactory_QueryInterface((IClassFactory*)ret, riid, ppv);
+    if(FAILED(hres)) {
+        HeapFree(GetProcessHeap(), 0, ret);
+        *ppv = NULL;
+    }
+    return hres;
+}
+
+HRESULT WINAPI MSHTML_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
+{
+    HRESULT hres;
+    fnGetClassObject pGetClassObject;
+
+    TRACE("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv );
+
+    if(hMozCtl && IsEqualGUID(&CLSID_HTMLDocument, rclsid)) {
+        pGetClassObject = (fnGetClassObject) GetProcAddress(hMozCtl, "DllGetClassObject");
+        if(pGetClassObject) {
+            hres = pGetClassObject(&CLSID_MozillaBrowser, riid, ppv);
+            if(SUCCEEDED(hres)) {
+                TRACE("returning Mozilla ActiveX Control hres = %08lx  *ppv = %p\n", hres, *ppv);
+                return hres;
+            }
+        }
+    }
+
+    if(IsEqualGUID(&CLSID_HTMLDocument, rclsid)) {
+        hres = ClassFactory_Create(riid, ppv, HTMLDocument_Create);
+        TRACE("hres = %08lx\n", hres);
+        return hres;
+    }
+
+    FIXME("Unknown class %s\n", debugstr_guid(rclsid));
+    return CLASS_E_CLASSNOTAVAILABLE;
+}
+
+HRESULT WINAPI MSHTML_DllCanUnloadNow(void)
+{
+    fnCanUnloadNow pCanUnloadNow = NULL;
+    HRESULT hres;
+
+    TRACE("()\n");
+
+    if(hMozCtl)
+        pCanUnloadNow = (fnCanUnloadNow) GetProcAddress(hMozCtl, "DllCanUnloadNow");
+    if(!pCanUnloadNow)
+        return S_FALSE;
+
+    hres = pCanUnloadNow();
 
-    TRACE("r = %d\n", r);
+    TRACE("hres = %08lx\n", hres);
 
-    return r;
+    return hres;
 }
 
 /* appears to have the same prototype as WinMain */

dlls/mshtml/mshtml_private.h

+/*
+ * Copyright 2005 Jacek Caban
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+HRESULT HTMLDocument_Create(IUnknown*,REFIID,void**);