commit 6f87386a989f775fd27a5335c5252e406dab44bd
author Juan Lang <juan_lang@yahoo.com> Thu Mar 10 17:25:23 2005 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu Mar 10 17:25:23 2005 +0000
tree 195fad2f3f24efcd7118c06062143df9f9984512
parent 23805995a691239242cf478b7edae381fa07a6bd

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

dlls/shdocvw/shdocvw_main.c

diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c
index 458ad9d..bfb73ea 100644
--- a/dlls/shdocvw/shdocvw_main.c
+++ b/dlls/shdocvw/shdocvw_main.c
@@ -130,17 +130,16 @@
  */
 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;