Changeset 33929 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Display

Timestamp:

Nov 10, 2010 9:31:48 AM (14 years ago)

Author:

vboxsync

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

67586

Message:

wddm: fix guest misbehave on driver update, bugfixing

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm

Files:

• VBoxDispCm.cpp (modified) (2 diffs)
• VBoxUhgsmiKmt.cpp (modified) (2 diffs)
• VBoxUhgsmiKmt.h (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxDispCm.cpp

@@ -137 +137 @@
         pContext->pDevice = pDevice;
     }
+    else
+    {
+        exit(1);
+    }
+
     return hr;
 }
@@ -190 +195 @@
             if (!pCmd->Hdr.cbCmdsReturned && !pCmd->Hdr.cbRemainingFirstCmd)
                 hr = S_FALSE;
+        }
+        else
+        {
+            exit(1);
         }
     }

trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxUhgsmiKmt.cpp

@@ -572 +572 @@
 }
 
+HRESULT vboxDispKmtAdpHdcCreate(HDC *phDc)
+{
+    HRESULT hr = E_FAIL;
+    DISPLAY_DEVICE DDev;
+    memset(&DDev, 0, sizeof (DDev));
+    DDev.cb = sizeof (DDev);
+
+    for (int i = 0; ; ++i)
+    {
+        if (EnumDisplayDevices(NULL, /* LPCTSTR lpDevice */ i, /* DWORD iDevNum */
+                &DDev, 0 /* DWORD dwFlags*/))
+        {
+            if (DDev.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE)
+            {
+                HDC hDc = CreateDC(NULL, DDev.DeviceName, NULL, NULL);
+                if (hDc)
+                {
+                    *phDc = hDc;
+                    return S_OK;
+                }
+                else
+                {
+                    DWORD winEr = GetLastError();
+                    Assert(0);
+                    hr = HRESULT_FROM_WIN32(winEr);
+                    Assert(FAILED(hr));
+                    break;
+                }
+            }
+        }
+        else
+        {
+            DWORD winEr = GetLastError();
+            Assert(0);
+            hr = HRESULT_FROM_WIN32(winEr);
+            Assert(FAILED(hr));
+            break;
+        }
+    }
+
+    return hr;
+}
+
 HRESULT vboxDispKmtOpenAdapter(PVBOXDISPKMT_CALLBACKS pCallbacks, PVBOXDISPKMT_ADAPTER pAdapter)
 {
-    D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME OpenAdapterData = {0};
-    wcsncpy(OpenAdapterData.DeviceName, L"\\\\.\\DISPLAY1", RT_ELEMENTS(OpenAdapterData.DeviceName) - 1 /* the last one is always \0 */);
-    HRESULT hr = S_OK;
-    NTSTATUS Status = pCallbacks->pfnD3DKMTOpenAdapterFromGdiDisplayName(&OpenAdapterData);
-    Assert(!Status);
-    if (!Status)
-    {
-        pAdapter->hAdapter = OpenAdapterData.hAdapter;
-        pAdapter->pCallbacks = pCallbacks;
-        return S_OK;
-    }
-    else
-    {
-        Log((__FUNCTION__": pfnD3DKMTOpenAdapterFromGdiDisplayName failed, Status (0x%x)\n", Status));
-        hr = E_FAIL;
+    D3DKMT_OPENADAPTERFROMHDC OpenAdapterData = {0};
+    OpenAdapterData.hDc = GetWindowDC(NULL);
+    HRESULT hr = vboxDispKmtAdpHdcCreate(&OpenAdapterData.hDc);
+    if (OpenAdapterData.hDc)
+    {
+        NTSTATUS Status = pCallbacks->pfnD3DKMTOpenAdapterFromHdc(&OpenAdapterData);
+        Assert(!Status);
+        if (!Status)
+        {
+            pAdapter->hAdapter = OpenAdapterData.hAdapter;
+            pAdapter->hDc = OpenAdapterData.hDc;
+            pAdapter->pCallbacks = pCallbacks;
+            return S_OK;
+        }
+        else
+        {
+            Log((__FUNCTION__": pfnD3DKMTOpenAdapterFromGdiDisplayName failed, Status (0x%x)\n", Status));
+            hr = E_FAIL;
+        }
+
+        ReleaseDC(NULL, OpenAdapterData.hDc);
     }
 
     return hr;
-
 }
 
@@ -603 +651 @@
     if (!Status)
     {
+        ReleaseDC(NULL, pAdapter->hDc);
         return S_OK;
     }
 
     Log((__FUNCTION__": pfnD3DKMTCloseAdapter failed, Status (0x%x)\n", Status));
-    /* ignore */
-    Status = 0;
+
     return E_FAIL;
 }

trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxUhgsmiKmt.h

@@ -52 +52 @@
 {
     D3DKMT_HANDLE hAdapter;
+    HDC hDc;
     PVBOXDISPKMT_CALLBACKS pCallbacks;
 }VBOXDISPKMT_ADAPTER, *PVBOXDISPKMT_ADAPTER;