Changeset 82629 in vbox for trunk/src

Timestamp:

Dec 20, 2019 3:46:48 PM (5 years ago)

Author:

vboxsync

Message:

Windows Additions/Installer: initialize IPRT, do mot mix FreeLibrary with RTLdrClose.

File:

• trunk/src/VBox/Additions/WINNT/Installer/InstallHelper/VBoxGuestInstallHelper.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/WINNT/Installer/InstallHelper/VBoxGuestInstallHelper.cpp

@@ -62 +62 @@
 HINSTANCE               g_hInstance;
 HWND                    g_hwndParent;
-PFNSFCFILEEXCEPTION     g_pfnSfcFileException = NULL;
 
 /**
@@ -241 +240 @@
     if (RT_SUCCESS(rc))
     {
-        HMODULE hSFCNative = NULL; /* Native fallback. */
-
         RTLDRMOD hSFC;
-        rc = RTLdrLoadSystem("sfc_os.dll", true /* fNoUnload */, &hSFC);
+        rc = RTLdrLoadSystem("sfc_os.dll", false /* fNoUnload */, &hSFC);
         if (RT_SUCCESS(rc))
         {
-            rc = RTLdrGetSymbol(hSFC, "SfcFileException", (void **)&g_pfnSfcFileException);
+            PFNSFCFILEEXCEPTION pfnSfcFileException = NULL;
+            rc = RTLdrGetSymbol(hSFC, "SfcFileException", (void **)&pfnSfcFileException);
             if (RT_FAILURE(rc))
             {
-                hSFCNative = (HMODULE)RTLdrGetNativeHandle(hSFC);
+                /* Native fallback. */
+                HMODULE hSFCNative = (HMODULE)RTLdrGetNativeHandle(hSFC);
 
                 /* If we didn't get the proc address with the call above, try it harder with
                  * the (zero based) index of the function list (ordinal). */
-                g_pfnSfcFileException = (PFNSFCFILEEXCEPTION)GetProcAddress(hSFCNative, (LPCSTR)5);
-                if (g_pfnSfcFileException)
+                pfnSfcFileException = (PFNSFCFILEEXCEPTION)GetProcAddress(hSFCNative, (LPCSTR)5);
+                if (pfnSfcFileException)
                     rc = VINF_SUCCESS;
             }
 
-            RTLdrClose(hSFC);
-        }
-
-        if (RT_SUCCESS(rc))
-        {
-#ifndef UNICODE
-            WCHAR *pwszFile;
-            rc = vboxChar2WCharAlloc(szFile, &pwszFile);
             if (RT_SUCCESS(rc))
             {
+#ifndef UNICODE
+                WCHAR *pwszFile;
+                rc = vboxChar2WCharAlloc(szFile, &pwszFile);
+                if (RT_SUCCESS(rc))
+                {
 #else
-                TCHAR *pwszFile = szFile;
-#endif
-                if (g_pfnSfcFileException(0, pwszFile, UINT32_MAX) != 0)
-                    rc = VERR_ACCESS_DENIED; /** @todo Find a better rc. */
+                    TCHAR *pwszFile = szFile;
+#endif
+                    if (pfnSfcFileException(0, pwszFile, UINT32_MAX) != 0)
+                        rc = VERR_ACCESS_DENIED; /** @todo Find a better rc. */
 #ifndef UNICODE
-                vboxChar2WCharFree(pwszFile);
+                    vboxChar2WCharFree(pwszFile);
+                }
+#endif
             }
-#endif
-        }
-
-        if (hSFCNative)
-            FreeLibrary(hSFCNative);
+
+            RTLdrClose(hSFC);
+        }
     }
 
@@ -512 +508 @@
 BOOL WINAPI DllMain(HANDLE hInst, ULONG uReason, LPVOID pReserved)
 {
-    RT_NOREF(uReason, pReserved);
+    RT_NOREF(pReserved);
+
     g_hInstance = (HINSTANCE)hInst;
+
+    switch (uReason)
+    {
+        case DLL_PROCESS_ATTACH:
+            RTR3InitDll(RTR3INIT_FLAGS_UNOBTRUSIVE);
+            break;
+
+        case DLL_PROCESS_DETACH:
+            break;
+
+        case DLL_THREAD_ATTACH:
+            break;
+
+        case DLL_THREAD_DETACH:
+            break;
+
+        default:
+            break;
+    }
+
     return TRUE;
 }