Move FreeLibrary call to win32_global_cleanup()

diff --git a/src/wim.c b/src/wim.c
index ac869302358aa283a562f68d218d888a284632fa..823d3a4423024d7155c0c2bbe97a14d8c211488f 100644 (file)
--- a/src/wim.c
+++ b/src/wim.c
@@ -704,4 +704,7 @@ wimlib_global_cleanup()
 {
        libxml_global_cleanup();
        iconv_global_cleanup();
 {
        libxml_global_cleanup();
        iconv_global_cleanup();

+#ifdef __WIN32__
+       win32_global_cleanup();
+#endif

 }
 }

diff --git a/src/win32.c b/src/win32.c
index 75867e89d9d86b99c1124343cebb086f04c1bef2..ce94b049106dd4b1a57ed060b9be45fa1bfb9802 100644 (file)
--- a/src/win32.c
+++ b/src/win32.c
@@ -60,6 +60,8 @@ static HANDLE (WINAPI *win32func_FindFirstStreamW)(LPCWSTR lpFileName,
 static BOOL (WINAPI *win32func_FindNextStreamW)(HANDLE hFindStream,
                                         LPVOID lpFindStreamData) = NULL;
 
 static BOOL (WINAPI *win32func_FindNextStreamW)(HANDLE hFindStream,
                                         LPVOID lpFindStreamData) = NULL;
 

+static HMODULE hKernel32 = NULL;
+

 /* Try to dynamically load some functions */
 void
 win32_global_init()
 /* Try to dynamically load some functions */
 void
 win32_global_init()


@@ -67,34 +69,43 @@ win32_global_init()
        DWORD err;
        bool warned;
 
        DWORD err;
        bool warned;
 

-       DEBUG("Loading Kernel32.dll");

 
 

-       HMODULE lib = LoadLibraryA("Kernel32.dll");
-       if (lib == NULL) {
-               err = GetLastError();
-               WARNING("Can't load Kernel32.dll");
-               win32_error(err);
-               return;
+       if (hKernel32 == NULL) {
+               DEBUG("Loading Kernel32.dll");
+               hKernel32 = LoadLibraryA("Kernel32.dll");
+               if (hKernel32 == NULL) {
+                       err = GetLastError();
+                       WARNING("Can't load Kernel32.dll");
+                       win32_error(err);
+                       return;
+               }

        }
 
        DEBUG("Looking for FindFirstStreamW");
        }
 
        DEBUG("Looking for FindFirstStreamW");

-       win32func_FindFirstStreamW = (void*)GetProcAddress(lib, "FindFirstStreamW");
+       win32func_FindFirstStreamW = (void*)GetProcAddress(hKernel32, "FindFirstStreamW");

        if (!win32func_FindFirstStreamW) {
                WARNING("Could not find function FindFirstStreamW() in Kernel32.dll!");
                WARNING("Capturing alternate data streams will not be supported.");
        if (!win32func_FindFirstStreamW) {
                WARNING("Could not find function FindFirstStreamW() in Kernel32.dll!");
                WARNING("Capturing alternate data streams will not be supported.");

-               goto out_free_lib;
+               return;

        }
 
        DEBUG("Looking for FindNextStreamW");
        }
 
        DEBUG("Looking for FindNextStreamW");

-       win32func_FindNextStreamW = (void*)GetProcAddress(lib, "FindNextStreamW");
+       win32func_FindNextStreamW = (void*)GetProcAddress(hKernel32, "FindNextStreamW");

        if (!win32func_FindNextStreamW) {
                WARNING("Could not find function FindNextStreamW() in Kernel32.dll!");
                WARNING("Capturing alternate data streams will not be supported.");
                win32func_FindFirstStreamW = NULL;
        }
        if (!win32func_FindNextStreamW) {
                WARNING("Could not find function FindNextStreamW() in Kernel32.dll!");
                WARNING("Capturing alternate data streams will not be supported.");
                win32func_FindFirstStreamW = NULL;
        }

-out_free_lib:
-       DEBUG("Closing Kernel32.dll");
-       FreeLibrary(lib);
+}
+
+void
+win32_global_cleanup()
+{
+       if (hKernel32 != NULL) {
+               DEBUG("Closing Kernel32.dll");
+               FreeLibrary(hKernel32);
+               hKernel32 = NULL;
+       }

 }
 
 static const char *access_denied_msg =
 }
 
 static const char *access_denied_msg =

diff --git a/src/win32.h b/src/win32.h
index 8b5a9dfb362b79daec2b58eb566b2bdae14c6d41..bef8da65fd946550cd4e6c12791606e367364245 100644 (file)
--- a/src/win32.h
+++ b/src/win32.h
@@ -80,4 +80,7 @@ rename_replacement(const char *oldpath, const char *newpath);
 extern void
 win32_global_init();
 
 extern void
 win32_global_init();
 

+extern void
+win32_global_cleanup();
+

 #endif /* _WIMLIB_WIN32_H */
 #endif /* _WIMLIB_WIN32_H */