Fixed crash in detach sequence.

b785ce12 · Juergen Schmied · Alexandre Julliard · 1e0eaed1 · b785ce12
Commit b785ce12 authored Sep 10, 1999 by Juergen Schmied Committed by Alexandre Julliard Sep 10, 1999
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

shell32_main.c dlls/shell32/shell32_main.c +4 -4

No files found.
--- a/dlls/shell32/shell32_main.c
+++ b/dlls/shell32/shell32_main.c
@@ -857,10 +857,6 @@ BOOL WINAPI Shell32LibMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
 	  case DLL_PROCESS_DETACH:
 	    shell32_RefCount--;

-	    pOleUninitialize();
-	    FreeLibrary(hOle32);
-	    FreeLibrary(hComctl32);
-
 	    if ( !shell32_RefCount )
 	    { 
 	      shell32_hInstance = 0;
@@ -879,6 +875,10 @@ BOOL WINAPI Shell32LibMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
 	        WARN_(shell)("leaving with %u objects left (memory leak)\n", shell32_ObjCount);
 	      }
 	    }
+
+	    FreeLibrary(hOle32);
+	    FreeLibrary(hComctl32);
+
 	    TRACE_(shell)("refcount=%u objcount=%u \n", shell32_RefCount, shell32_ObjCount);
 	    break;
 	}