Changeset 75556 in vbox

Timestamp:

Nov 18, 2018 7:21:02 PM (6 years ago)

Author:

vboxsync

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

126715

Message:

VBoxWddmUmHlp: update.

Location:

trunk/src/VBox/Additions/3D/win

Files:

• VBoxGL/VBoxGL.c (modified) (5 diffs)
• VBoxWddmUmHlp/D3DKMT.cpp (modified) (3 diffs)
• VBoxWddmUmHlp/VBoxWddmUmHlp.h (modified) (1 diff)

trunk/src/VBox/Additions/3D/win/VBoxGL/VBoxGL.c

@@ -61 +61 @@
     };
 
-    HMODULE hmod = VBoxWddmLoadAdresses(g_pszSvgaDll, aDrvProcs);
+    HMODULE hmod = VBoxWddmLoadSystemDll(g_pszSvgaDll);
+    if (hmod)
+    {
+        VBoxWddmLoadAdresses(hmod, aDrvProcs);
+    }
     return hmod;
 }
@@ -222 +226 @@
              HDC hDC)
 {
-ASMBreakpoint();
     struct stw_context *ctx = stw_current_context();
     struct pipe_context *pipe = ctx->st->pipe;
@@ -260 +263 @@
                          HANDLE hSharedSurface)
 {
-ASMBreakpoint();
     struct stw_shared_surface *surface = NULL;
 
@@ -285 +287 @@
                          struct stw_shared_surface *surface)
 {
-ASMBreakpoint();
     const WDDMGalliumDriverEnv *pEnv = g_drvfuncs.pfnGaDrvGetWDDMEnv(screen);
     if (pEnv)
@@ -302 +303 @@
              ULONGLONG PresentHistoryToken)
 {
-ASMBreakpoint();
     struct stw_context *ctx = stw_current_context();
     struct pipe_context *pipe = ctx->st->pipe;

trunk/src/VBox/Additions/3D/win/VBoxWddmUmHlp/D3DKMT.cpp

@@ -45 +45 @@
 }
 
-DECLCALLBACK(HMODULE) VBoxWddmLoadAdresses(const char *pszModName, VBOXWDDMDLLPROC *paProcs)
-{
-    HMODULE hmod = VBoxWddmLoadSystemDll(pszModName);
-    if (!hmod)
-        return NULL;
-
+DECLCALLBACK(void) VBoxWddmLoadAdresses(HMODULE hmod, VBOXWDDMDLLPROC *paProcs)
+{
     struct VBOXWDDMDLLPROC *pIter = paProcs;
     while (pIter->pszName)
@@ -58 +54 @@
         ++pIter;
     }
-
-    return hmod;
 }
 
@@ -100 +94 @@
 DECLCALLBACK(int) D3DKMTLoad(void)
 {
-    HMODULE hmod = VBoxWddmLoadAdresses("gdi32.dll", g_D3DKMTLoadTable);
+    /* Modules which use D3DKMT must link with gdi32. */
+    HMODULE hmod = GetModuleHandleA("gdi32.dll");
+    Assert(hmod);
+    if (hmod)
+    {
+        VBoxWddmLoadAdresses(hmod, g_D3DKMTLoadTable);
+    }
     return hmod != NULL;
 }

trunk/src/VBox/Additions/3D/win/VBoxWddmUmHlp/VBoxWddmUmHlp.h

@@ -80 +80 @@
 
 DECLCALLBACK(HMODULE) VBoxWddmLoadSystemDll(const char *pszName);
-DECLCALLBACK(HMODULE) VBoxWddmLoadAdresses(const char *pszModName, VBOXWDDMDLLPROC *paProcs);
+DECLCALLBACK(void) VBoxWddmLoadAdresses(HMODULE hmod, VBOXWDDMDLLPROC *paProcs);
 
 DECLCALLBACK(int) D3DKMTLoad(void);