Alexandre Julliard : setupapi: Don' t bother to free libraries at process exit.

Alexandre Julliard julliard at winehq.org
Fri May 17 14:24:33 CDT 2013


Module: wine
Branch: master
Commit: 2aa3d2b0e193cb50e2c345d28c266f59823da350
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2aa3d2b0e193cb50e2c345d28c266f59823da350

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Fri May 17 12:24:41 2013 +0200

setupapi: Don't bother to free libraries at process exit.

---

 dlls/setupapi/setupcab.c |   11 ++---------
 1 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/dlls/setupapi/setupcab.c b/dlls/setupapi/setupcab.c
index 8fcd989..21336d7 100644
--- a/dlls/setupapi/setupcab.c
+++ b/dlls/setupapi/setupcab.c
@@ -114,14 +114,6 @@ static BOOL LoadCABINETDll(void)
     return TRUE;
 }
 
-static void UnloadCABINETDll(void)
-{
-  if (CABINET_hInstance) {
-    FreeLibrary(CABINET_hInstance);
-    CABINET_hInstance = 0;
-  }
-}
-
 /* FDICreate callbacks */
 
 static void * CDECL sc_cb_alloc(ULONG cb)
@@ -701,7 +693,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
         SETUPAPI_hInstance = hinstDLL;
         break;
     case DLL_PROCESS_DETACH:
-        UnloadCABINETDll();
+        if (lpvReserved) break;
+        if (CABINET_hInstance) FreeLibrary(CABINET_hInstance);
         break;
     }
 




More information about the wine-cvs mailing list