Changeset 46660 in vbox for trunk/src/VBox/GuestHost

Timestamp:

Jun 19, 2013 2:09:23 PM (12 years ago)

Author:

vboxsync

Message:

crOpenGL: bugfix

Location:

trunk/src/VBox/GuestHost/OpenGL

Files:

• Makefile.kmk (modified) (1 diff)
• spu_loader/glloader.py (modified) (1 diff)
• util/dll.c (modified) (4 diffs)

trunk/src/VBox/GuestHost/OpenGL/Makefile.kmk

@@ -115 +115 @@
 VBoxOGLcrutil_LIBS.win = \
         $(PATH_SDK_$(VBOX_WINDDK)_LIB)/ddraw.lib \
-        $(PATH_SDK_$(VBOX_WINDDK)_LIB)/dxguid.lib
+        $(PATH_SDK_$(VBOX_WINDDK)_LIB)/dxguid.lib \
+        $(PATH_SDK_$(VBOX_WINDDK)_LIB)/shlwapi.lib
 VBoxOGLcrutil_LIBS = \
         $(VBOX_LIB_IPRT_GUEST_R3_SHARED) \
         $(VBOX_LIB_VBGL_R3_SHARED)
+
+# Needed by GDEbuger
+ifdef CR_NO_GL_SYSTEM_PATH
+VBoxOGLcrutil_DEFS       += CR_NO_GL_SYSTEM_PATH
+endif 
 ifdef VBOX_WITH_CRHGSMI
 VBoxOGLcrutil_DEFS.win    += VBOX_WITH_CRHGSMI

trunk/src/VBox/GuestHost/OpenGL/spu_loader/glloader.py

@@ -64 +64 @@
 #else
 #define GLLOADER_APIENTRY
-#endif
-
-#if defined(WINDOWS) && (defined(DEBUG_leo) || defined(DEBUG_ll158262) || defined(DEBUG_misha))
-# define CR_NO_GL_SYSTEM_PATH 1
 #endif
 

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

@@ -17 +17 @@
 #if defined(IRIX) || defined(IRIX64) || defined(Linux) || defined(FreeBSD) || defined(AIX) || defined(DARWIN) || defined(SunOS) || defined(OSF1)
 #include <dlfcn.h>
+#endif
+
+#ifdef WINDOWS
+#include <Shlwapi.h>
 #endif
 
@@ -147 +151 @@
 
 #endif
-
 
 /*
@@ -163 +166 @@
         CRDLL *dll;
         char *dll_err;
+#if defined(WINDOWS)
+    char   szPath[MAX_PATH];
+
+    (void) resolveGlobal;
+
+# ifndef CR_NO_GL_SYSTEM_PATH
+    if (PathIsRelative(dllname))
+    {
+        size_t cbName  = strlen(dllname) + 1;
+#  ifdef IN_GUEST
+        UINT   cchPath = GetSystemDirectoryA(szPath, sizeof(szPath));
+#  else
+        UINT   cchPath = GetModuleFileNameA(NULL, szPath, sizeof(szPath));
+        if (cchPath != 0 && cchPath <= sizeof(szPath))
+        {
+            char * pszSlashFile = strrchr(szPath, '\\');
+            if (pszSlashFile)
+            {
+                cchPath = pszSlashFile - szPath;
+            }
+        }
+#  endif
+
+        if (cchPath + 1 + cbName > sizeof(szPath))
+        {
+            crError("invalid path specified");
+            SetLastError(ERROR_FILENAME_EXCED_RANGE);
+            return NULL;
+        }
+        szPath[cchPath] = '\\';
+        memcpy(&szPath[cchPath + 1], dllname, cbName);
+
+        dllname = szPath;
+    }
+# endif // CR_NO_GL_SYSTEM_PATH
+#endif
 
         dll = (CRDLL *) crAlloc( sizeof( CRDLL ) );
@@ -168 +207 @@
 
 #if defined(WINDOWS)
-        (void) resolveGlobal;
-        dll->hinstLib = LoadLibrary( dllname );
-        dll_err = NULL;
+    dll->hinstLib = LoadLibrary( dllname );
+    if (!dll->hinstLib)
+    {
+        crError("failed to load dll %s", dllname);
+    }
+    dll_err = NULL;
 #elif defined(DARWIN)
         /* XXX \todo Get better error handling in here */