Changeset 68859 in vbox

Timestamp:

Sep 25, 2017 4:23:02 PM (7 years ago)

Author:

vboxsync

Message:

Additions/WDDM: Loading of DEBUG versions of VBoxOGL*.dll libraries corrected, bugref:8998

Location:

trunk/src/VBox

Files:

• Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispD3DIf.cpp (modified) (2 diffs)
• GuestHost/OpenGL/util/dll.c (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispD3DIf.cpp

@@ -39 +39 @@
 static HMODULE loadSystemDll(const char *pszName)
 {
+    /* Assumed here that DEBUG version of VBoxDispD3D.dll will not be installed system wide 
+       but will be loaded from local folder of an application being debugged. */
+#ifndef DEBUG
     char   szPath[MAX_PATH];
     UINT   cchPath = GetSystemDirectoryA(szPath, sizeof(szPath));
@@ -50 +53 @@
     memcpy(&szPath[cchPath + 1], pszName, cbName);
     return LoadLibraryA(szPath);
+#else
+    return LoadLibraryA(pszName);
+#endif
 }
 

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

@@ -220 +220 @@
         ++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 */
+        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