Changeset 46593 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Wine_new

Timestamp:

Jun 17, 2013 2:32:51 PM (12 years ago)

Author:

vboxsync

Message:

updates

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Wine_new

Files:

• switcher/sw_common.c (modified) (5 diffs)
• wined3d/directx.c (modified) (3 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/switcher/sw_common.c

@@ -1 +1 @@
 /* $Id$ */
-
 /** @file
  * VBox D3D8/9 dll switcher
@@ -6 +5 @@
 
 /*
- * Copyright (C) 2009 Oracle Corporation
+ * Copyright (C) 2009-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -23 +22 @@
 static char* gsBlackListDll[] = {"awt.dll", "wpfgfx_v0400.dll", "wpfgfx_v0300.dll", NULL};
 
+/**
+ * Loads a system DLL.
+ *
+ * @returns Module handle or NULL
+ * @param   pszName             The DLL name.
+ */
+static HMODULE loadSystemDll(const char *pszName)
+{
+    char   szPath[MAX_PATH];
+    UINT   cchPath = GetSystemDirectoryA(szPath, sizeof(szPath));
+    size_t cbName  = strlen(pszName) + 1;
+    if (cchPath + 1 + cbName > sizeof(szPath))
+        return NULL;
+    szPath[cchPath] = '\\';
+    memcpy(&szPath[cchPath + 1], pszName, cbName);
+    return LoadLibraryA(szPath);
+}
+
 /* Checks if 3D is enabled for VM and it works on host machine */
 BOOL isVBox3DEnabled(void)
@@ -31 +48 @@
 
 #ifdef VBOX_WDDM_WOW64
-    hDLL = LoadLibrary("VBoxOGL-x86.dll");
+    hDLL = loadSystemDll("VBoxOGL-x86.dll");
 #else
-    hDLL = LoadLibrary("VBoxOGL.dll");
+    hDLL = loadSystemDll("VBoxOGL.dll");
 #endif
 
@@ -108 +125 @@
 
     if (isVBox3DEnabled() && checkOptions())
-    {
         dllName = vboxName;
-    } else
-    {
+    else
         dllName = msName;
-    }
 
-    hDLL = LoadLibrary(dllName);
+    hDLL = loadSystemDll(dllName);
     FillD3DExports(hDLL); 
 }
+

trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/directx.c

@@ -5121 +5121 @@
 }
 
+/**
+ * Loads a system DLL.
+ *
+ * @returns Module handle or NULL
+ * @param   pszName             The DLL name.
+ */
+static HMODULE loadSystemDll(const char *pszName)
+{
+    char   szPath[MAX_PATH];
+    UINT   cchPath = GetSystemDirectoryA(szPath, sizeof(szPath));
+    size_t cbName  = strlen(pszName) + 1;
+    if (cchPath + 1 + cbName > sizeof(szPath))
+        return NULL;
+    szPath[cchPath] = '\\';
+    memcpy(&szPath[cchPath + 1], pszName, cbName);
+    return LoadLibraryA(szPath);
+}
+
 /* Do not call while under the GL lock. */
 static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal)
@@ -5142 +5160 @@
 #ifdef USE_WIN32_OPENGL
     {
-#ifndef VBOX
+# ifndef VBOX
         HMODULE mod_gl = GetModuleHandleA("opengl32.dll");
-#else
+# else
         BOOL (APIENTRY *pDrvValidateVersion)(DWORD) DECLSPEC_HIDDEN;
-# ifdef VBOX_WDDM_WOW64
-        HMODULE mod_gl = LoadLibraryA("VBoxOGL-x86.dll");
-# else
-        HMODULE mod_gl = LoadLibraryA("VBoxOGL.dll");
-# endif
+#  ifdef VBOX_WDDM_WOW64
+        HMODULE mod_gl = loadSystemDll("VBoxOGL-x86.dll");
+#  else
+        HMODULE mod_gl = loadSystemDll("VBoxOGL.dll");
+#  endif
         if (!mod_gl)
         {
@@ -5169 +5187 @@
         }
 
-# define VBOX_USE_FUNC(f) p##f = (void *)GetProcAddress(mod_gl, #f);
+#  define VBOX_USE_FUNC(f) p##f = (void *)GetProcAddress(mod_gl, #f);
         VBOX_GL_FUNCS_GEN
-# undef VBOX_USE_FUNC
-#endif
-#define USE_GL_FUNC(f) gl_info->gl_ops.gl.p_##f = (void *)GetProcAddress(mod_gl, #f);
+#  undef VBOX_USE_FUNC
+# endif
+# define USE_GL_FUNC(f) gl_info->gl_ops.gl.p_##f = (void *)GetProcAddress(mod_gl, #f);
         ALL_WGL_FUNCS
-#undef USE_GL_FUNC
+# undef USE_GL_FUNC
         gl_info->gl_ops.wgl.p_wglSwapBuffers = (void *)GetProcAddress(mod_gl, "wglSwapBuffers");
     }