Changeset 46805 in vbox for trunk/src/VBox/GuestHost/OpenGL/util

Timestamp:

Jun 26, 2013 2:24:02 PM (12 years ago)

Author:

vboxsync

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

86742

Message:

crOpenGL: fail if GetModuleFileName or GetSystemDirectory fail, and switch to unicode

File:

• trunk/src/VBox/GuestHost/OpenGL/util/dll.c (modified) (4 diffs)

trunk/src/VBox/GuestHost/OpenGL/util/dll.c

@@ -167 +167 @@
         char *dll_err;
 #if defined(WINDOWS)
-    char   szPath[MAX_PATH];
+    WCHAR   szwPath[MAX_PATH];
+    UINT   cwcPath = 0;
 
     (void) resolveGlobal;
@@ -174 +175 @@
     if (PathIsRelative(dllname))
     {
-        size_t cbName  = strlen(dllname) + 1;
+        size_t cName  = strlen(dllname) + 1;
 #  ifdef IN_GUEST
-        UINT   cchPath = GetSystemDirectoryA(szPath, sizeof(szPath));
+        cwcPath = GetSystemDirectoryW(szwPath, RT_ELEMENTS(szwPath));
+        if (!cwcPath || cwcPath >= MAX_PATH)
+        {
+            DWORD winEr = GetLastError();
+            crError("GetSystemDirectoryW failed err %d", winEr);
+            SetLastError(winEr);
+            return NULL;
+        }
 #  else
-        UINT   cchPath = GetModuleFileNameA(NULL, szPath, sizeof(szPath));
-        if (cchPath != 0 && cchPath <= sizeof(szPath))
+        WCHAR * pszwSlashFile;
+        cwcPath = GetModuleFileNameW(NULL, szwPath, RT_ELEMENTS(szwPath));
+        if (!cwcPath || cwcPath >= MAX_PATH)
         {
-            char * pszSlashFile = strrchr(szPath, '\\');
-            if (pszSlashFile)
-            {
-                cchPath = pszSlashFile - szPath;
-            }
+            DWORD winEr = GetLastError();
+            crError("GetModuleFileNameW failed err %d", winEr);
+            SetLastError(winEr);
+            return NULL;
         }
+
+        pszwSlashFile = wcsrchr(szwPath, L'\\');
+        if (!pszwSlashFile)
+        {
+            crError("failed to match file name");
+            SetLastError(ERROR_PATH_NOT_FOUND);
+            return NULL;
+        }
+
+        cwcPath = pszwSlashFile - szwPath;
 #  endif
 
-        if (cchPath + 1 + cbName > sizeof(szPath))
+        if (cwcPath + 1 + cName > MAX_PATH)
         {
             crError("invalid path specified");
@@ -195 +213 @@
             return NULL;
         }
-        szPath[cchPath] = '\\';
-        memcpy(&szPath[cchPath + 1], dllname, cbName);
-
-        dllname = szPath;
+        szwPath[cwcPath] = '\\';
+        ++cwcPath;
+    }
+
+    if (!MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, dllname, -1, &szwPath[cwcPath], MAX_PATH - cwcPath))
+    {
+        DWORD winEr = GetLastError();
+        crError("MultiByteToWideChar failed err %d", winEr);
+        SetLastError(winEr);
+        return NULL;
     }
 # endif // CR_NO_GL_SYSTEM_PATH
@@ -207 +231 @@
 
 #if defined(WINDOWS)
-    dll->hinstLib = LoadLibrary( dllname );
+    dll->hinstLib = LoadLibraryW( szwPath );
     if (!dll->hinstLib)
     {