Changeset 49180 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm

Timestamp:

Oct 18, 2013 12:35:36 PM (11 years ago)

Author:

vboxsync

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

90053

Message:

wddm/3d: ref d3d rt to avoid calling unloaded lib

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm

Files:

• VBoxDispD3D.cpp (modified) (6 diffs)
• VBoxDispD3D.h (modified) (1 diff)

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

@@ -39 +39 @@
 
 /* the number of frames to collect data before doing dump/reset */
-#define VBOXDISPPROFILE_DDI_DUMP_FRAME_COUNT 0xffffffff
+#define VBOXDISPPROFILE_DDI_DUMP_FRAME_COUNT 0x20
 
 struct VBOXDISPPROFILE_GLOBAL {
@@ -5459 +5459 @@
     Assert(hr == S_OK);
     if (hr == S_OK)
+    {
+        if (pDevice->hHgsmiTransportModule)
+            FreeLibrary(pDevice->hHgsmiTransportModule);
         RTMemFree(pDevice);
+    }
     vboxVDbgPrintF(("<== "__FUNCTION__", hDevice(0x%p)\n", hDevice));
     return hr;
@@ -6009 +6013 @@
                     if (hr == S_OK)
                     {
-    #ifdef VBOXDISP_EARLYCREATEDEVICE
+#ifdef VBOXDISP_EARLYCREATEDEVICE
                         PVBOXWDDMDISP_RESOURCE pRc = vboxResourceAlloc(2);
                         Assert(pRc);
@@ -6045 +6049 @@
                             hr = E_OUTOFMEMORY;
                         }
-    #else
+#else
 //# define VBOXDISP_TEST_SWAPCHAIN
 # ifdef VBOXDISP_TEST_SWAPCHAIN
@@ -6051 +6055 @@
 # endif
                         break;
-    #endif
+#endif
 
                         HRESULT tmpHr = vboxDispCmCtxDestroy(pDevice, &pDevice->DefaultContext);
@@ -6073 +6077 @@
         vboxVDbgPrintR((__FUNCTION__": RTMemAllocZ returned NULL\n"));
         hr = E_OUTOFMEMORY;
+    }
+
+    if (SUCCEEDED(hr))
+    {
+        if (GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS,
+                                (LPCWSTR)pDevice->RtCallbacks.pfnAllocateCb,
+                                &pDevice->hHgsmiTransportModule))
+        {
+            Assert(pDevice->hHgsmiTransportModule);
+        }
+        else
+        {
+            DWORD winEr = GetLastError();
+            WARN(("GetModuleHandleEx failed winEr %d, ignoring", winEr));
+            pDevice->hHgsmiTransportModule = 0;
+        }
     }
 

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispD3D.h

@@ -212 +212 @@
     struct VBOXWDDMDISP_RESOURCE *aSamplerTextures[VBOXWDDMDISP_TOTAL_SAMPLERS];
 
+    HMODULE hHgsmiTransportModule;
+
 #ifdef VBOX_WDDMDISP_WITH_PROFILE
     VBoxDispProfileFpsCounter ProfileDdiFps;