Changeset 46593 in vbox for trunk/src/VBox/Additions/WINNT/Installer

Timestamp:

Jun 17, 2013 2:32:51 PM (12 years ago)

Author:

vboxsync

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

86471

Message:

updates

Location:

trunk/src/VBox/Additions/WINNT/Installer

Files:

• InstallHelper/VBoxGuestInstallHelper.cpp (modified) (2 diffs)
• VBoxDrvInst.cpp (modified) (2 diffs)

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

@@ -197 +197 @@
 
 /**
+ * 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!
@@ -214 +232 @@
     if (SUCCEEDED(hr))
     {
-        HMODULE hSFC = LoadLibrary("sfc_os.dll");
+        HMODULE hSFC = loadSystemDll("sfc_os.dll");
         if (NULL != hSFC)
         {

trunk/src/VBox/Additions/WINNT/Installer/VBoxDrvInst.cpp

@@ -130 +130 @@
      if (pCallbackContext)
          fwprintf((FILE*)pCallbackContext, _T("(%u) %u - %s\n"), Event, dwError, pEventDescription);
+}
+
+/**
+ * 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);
 }
 
@@ -146 +164 @@
 {
     HRESULT hr = S_OK;
-    HMODULE hDIFxAPI = LoadLibrary(_T("DIFxAPI.dll"));
+    HMODULE hDIFxAPI = loadSystemDll("DIFxAPI.dll");
     if (NULL == hDIFxAPI)
     {