Changeset 46709 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Jun 20, 2013 2:51:52 PM (12 years ago)

Author:

vboxsync

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

86624

Message:

Additions/win: fix location

File:

• trunk/src/VBox/Additions/WINNT/Installer/VBoxDrvInst.cpp (modified) (2 diffs)

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

@@ -138 +138 @@
  * @param   pszName             The DLL name.
  */
-static HMODULE loadSystemDll(const char *pszName)
+static HMODULE loadInstalledDll(const char *pszName)
 {
     char   szPath[MAX_PATH];
-    UINT   cchPath = GetSystemDirectoryA(szPath, sizeof(szPath));
-    size_t cbName  = strlen(pszName) + 1;
+    UINT   cchPath = GetModuleFileNameA(NULL, szPath, sizeof(szPath));
+    if (cchPath && cchPath <= sizeof(szPath))
+    {
+        char *pszSlashFile = strrchr(szPath, '\\');
+        if (pszSlashFile)
+            cchPath = pszSlashFile - szPath;
+    }
     if (cchPath + 1 + cbName > sizeof(szPath))
         return NULL;
@@ -164 +169 @@
 {
     HRESULT hr = S_OK;
-    HMODULE hDIFxAPI = loadSystemDll("DIFxAPI.dll");
+    HMODULE hDIFxAPI = loadInstalledDll("DIFxAPI.dll");
     if (NULL == hDIFxAPI)
     {