mapi32: Pass DllGetClassObject through to Extended MAPI provider.

dlls/mapi32/mapi32_main.c

@@ -61,8 +61,17 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
  */
 HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv)
 {
-    *ppv = NULL;
+    if (mapiFunctions.DllGetClassObject)
+    {
+        HRESULT ret = mapiFunctions.DllGetClassObject(rclsid, iid, ppv);
+
+        TRACE("ret: %x\n", ret);
+        return ret;
+    }
+
     FIXME("\n\tCLSID:\t%s,\n\tIID:\t%s\n", debugstr_guid(rclsid), debugstr_guid(iid));
+
+    *ppv = NULL;
     return CLASS_E_CLASSNOTAVAILABLE;
 }
 

dlls/mapi32/util.c

@@ -1056,6 +1056,8 @@ void load_mapi_providers(void)
         mapiFunctions.MAPIInitialize = (void*) GetProcAddress(mapi_ex_provider, "MAPIInitialize");
         mapiFunctions.MAPILogonEx = (void*) GetProcAddress(mapi_ex_provider, "MAPILogonEx");
         mapiFunctions.MAPIUninitialize = (void*) GetProcAddress(mapi_ex_provider, "MAPIUninitialize");
+
+        mapiFunctions.DllGetClassObject = (void*) GetProcAddress(mapi_ex_provider, "DllGetClassObject");
     }
 
 cleanUp:

dlls/mapi32/util.h

@@ -43,6 +43,8 @@ typedef struct MAPI_FUNCTIONS {
     LPMAPISENDMAIL       MAPISendMail;
     LPMAPISENDDOCUMENTS  MAPISendDocuments;
     LPMAPIUNINITIALIZE   MAPIUninitialize;
+
+    HRESULT (WINAPI *DllGetClassObject)(REFCLSID, REFIID, LPVOID *);
 } MAPI_FUNCTIONS;
 
 extern MAPI_FUNCTIONS mapiFunctions;