Fix a crash if the Mozilla ActiveX control doesn't implement

DllCanUnloadNow.

Fix a crash if the Mozilla ActiveX control doesn't implement
6f87386a · Juan Lang · Alexandre Julliard · 23805995 · 6f87386a
Commit 6f87386a authored Mar 10, 2005 by Juan Lang Committed by Alexandre Julliard Mar 10, 2005
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

shdocvw_main.c dlls/shdocvw/shdocvw_main.c +3 -4

No files found.
--- a/dlls/shdocvw/shdocvw_main.c
+++ b/dlls/shdocvw/shdocvw_main.c
@@ -130,17 +130,16 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad)
 */
 HRESULT WINAPI SHDOCVW_DllCanUnloadNow(void)
 {
-    HRESULT moz_can_unload = S_FALSE;
+    HRESULT moz_can_unload = S_OK;
    fnCanUnloadNow pCanUnloadNow;

    if (hMozCtl)
    {
        pCanUnloadNow = (fnCanUnloadNow)
            GetProcAddress(hMozCtl, "DllCanUnloadNow");
-        moz_can_unload = pCanUnloadNow();
+        if (pCanUnloadNow)
+            moz_can_unload = pCanUnloadNow();
    }
-    else
-        moz_can_unload = S_OK;

    if (moz_can_unload == S_OK && SHDOCVW_refCount == 0)
        return S_OK;