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

Timestamp:

Jun 23, 2013 6:22:49 PM (12 years ago)

Author:

vboxsync

Message:

VBoxDrvInst.cpp: changed loadInstalledDll to fail of GetModuleFileName fails. Also converted it to unicode since we cannot make the same assumption regarding user controlled install/temp dirs as we about the microsoft dictated c:\windows\system32 dir.

File:

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

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

@@ -136 +136 @@
  *
  * @returns Module handle or NULL
- * @param   pszName             The DLL name.
+ * @param   pwszName            The DLL name.
  */
-static HMODULE loadInstalledDll(const char *pszName)
-{
-    char   szPath[MAX_PATH];
-    UINT   cchPath = GetModuleFileNameA(NULL, szPath, sizeof(szPath));
-    size_t cbName = strlen(pszName) + 1;
-    if (cchPath && cchPath <= sizeof(szPath))
-    {
-        char *pszSlashFile = strrchr(szPath, '\\');
-        if (pszSlashFile)
-            cchPath = pszSlashFile - szPath;
-    }
-    if (cchPath + 1 + cbName > sizeof(szPath))
+static HMODULE loadInstalledDll(const wchar_t *pwszName)
+{
+    /* Get the process image path. */
+    WCHAR  wszPath[MAX_PATH];
+    UINT   cwcPath = GetModuleFileNameW(NULL, wszPath, MAX_PATH);
+    if (!cwcPath || cwcPath >= MAX_PATH)
         return NULL;
-    szPath[cchPath] = '\\';
-    memcpy(&szPath[cchPath + 1], pszName, cbName);
-    return LoadLibraryA(szPath);
+
+    /* Drop the image filename. */
+    UINT   off = cwcPath - 1;
+    for (;;)
+    {
+        if (   wszPath[off] == '\\'
+            || wszPath[off] == '/'
+            || wszPath[off] == ':')
+        {
+            wszPath[off] = '\0';
+            cwcPath = off;
+            break;
+        }
+        if (!off--)
+            return NULL; /* No path? Shouldn't ever happen! */
+    }
+
+    /* Check if there is room in the buffer to construct the desired name. */
+    size_t cwcName = 0;
+    while (pwszName[cwcName])
+        cwcName++;
+    if (cwcPath + 1 + cwcName + 1 > MAX_PATH)
+        return NULL;
+
+    wszPath[cwcPath] = '\\';
+    memcpy(&wszPath[cwcPath + 1], pwszName, (cwcName + 1) * sizeof(wszPath[0]));
+    return LoadLibraryW(wszPath);
 }
 
@@ -170 +188 @@
 {
     HRESULT hr = S_OK;
-    HMODULE hDIFxAPI = loadInstalledDll("DIFxAPI.dll");
+    HMODULE hDIFxAPI = loadInstalledDll(L"DIFxAPI.dll");
     if (NULL == hDIFxAPI)
     {