Changeset 82627 in vbox for trunk/src

Timestamp:

Dec 20, 2019 9:22:17 AM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

135514

Message:

Windows Additions/Installer: Got rid of own system library loading code and use RTLdrLoadSystem() and friends instead.

File:

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

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

@@ -221 +221 @@
 
 /**
- * Loads a system DLL.
- *
- * @returns Module handle or NULL
- * @param   pszName             The DLL name.
- */
-static HMODULE loadSystemDll(const char *pszName)
-{
-    char   szPath[MAX_PATH];
-    UINT   cchPath = GetSystemDirectoryA(szPath, sizeof(szPath));
-    size_t cbName  = strlen(pszName) + 1;
-    if (cchPath + 1 + cbName > sizeof(szPath))
-        return NULL;
-    szPath[cchPath] = '\\';
-    memcpy(&szPath[cchPath + 1], pszName, cbName);
-    return LoadLibraryA(szPath);
-}
-
-/**
  * Disables the Windows File Protection for a specified file
  * using an undocumented SFC API call. Don't try this at home!
@@ -259 +241 @@
     if (RT_SUCCESS(rc))
     {
-        HMODULE hSFC = loadSystemDll("sfc_os.dll"); /** @todo Replace this by RTLdr APIs. */
-        if (NULL != hSFC)
-        {
-            g_pfnSfcFileException = (PFNSFCFILEEXCEPTION)GetProcAddress(hSFC, "SfcFileException");
-            if (g_pfnSfcFileException == NULL)
+        HMODULE hSFCNative = NULL; /* Native fallback. */
+
+        RTLDRMOD hSFC;
+        rc = RTLdrLoadSystem("sfc_os.dll", true /* fNoUnload */, &hSFC);
+        if (RT_SUCCESS(rc))
+        {
+            rc = RTLdrGetSymbol(hSFC, "SfcFileException", (void **)&g_pfnSfcFileException);
+            if (RT_FAILURE(rc))
             {
+                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. */
-                g_pfnSfcFileException = (PFNSFCFILEEXCEPTION)GetProcAddress(hSFC, (LPCSTR)5);
-                if (g_pfnSfcFileException == NULL)
-                    rc = VERR_SYMBOL_NOT_FOUND;
+                 * the (zero based) index of the function list (ordinal). */
+                g_pfnSfcFileException = (PFNSFCFILEEXCEPTION)GetProcAddress(hSFCNative, (LPCSTR)5);
+                if (g_pfnSfcFileException)
+                    rc = VINF_SUCCESS;
             }
-        }
-        else
-            rc = VERR_FILE_NOT_FOUND;
+
+            RTLdrClose(hSFC);
+        }
 
         if (RT_SUCCESS(rc))
@@ -283 +270 @@
             {
 #else
-            TCHAR *pwszFile = szFile;
+                TCHAR *pwszFile = szFile;
 #endif
                 if (g_pfnSfcFileException(0, pwszFile, UINT32_MAX) != 0)
@@ -293 +280 @@
         }
 
-        if (hSFC)
-            FreeLibrary(hSFC);
+        if (hSFCNative)
+            FreeLibrary(hSFCNative);
     }