Changeset 32930 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoMisc.cpp

Timestamp:

Oct 5, 2010 8:12:46 PM (14 years ago)

Author:

vboxsync

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

66416

Message:

wddm: bugfix

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoMisc.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoMisc.cpp

@@ -511 +511 @@
     const WCHAR* pKeyPrefix;
     UINT cbKeyPrefix;
+    UNICODE_STRING* pVGuid = vboxWddmVGuidGet(pDevExt);
+    Assert(pVGuid);
+    if (!pVGuid)
+        return STATUS_UNSUCCESSFUL;
+
     winVersion_t ver = vboxQueryWinVersion();
     if (ver == WINVISTA)
@@ -524 +529 @@
     }
 
-    ULONG cbResult = cbKeyPrefix + pDevExt->VideoGuid.Length + 2 + 8; // L"\\" + "XXXX"
+    ULONG cbResult = cbKeyPrefix + pVGuid->Length + 2 + 8; // L"\\" + "XXXX"
     if (cbBuf >= cbResult)
     {
         wcscpy(pBuf, pKeyPrefix);
         pSuffix = pBuf + (cbKeyPrefix-2)/2;
-        memcpy(pSuffix, pDevExt->VideoGuid.Buffer, pDevExt->VideoGuid.Length);
-        pSuffix += pDevExt->VideoGuid.Length/2;
+        memcpy(pSuffix, pVGuid->Buffer, pVGuid->Length);
+        pSuffix += pVGuid->Length/2;
         pSuffix[0] = L'\\';
         pSuffix += 1;
@@ -757 +762 @@
             sizeof(val));
 }
+
+UNICODE_STRING* vboxWddmVGuidGet(PDEVICE_EXTENSION pDevExt)
+{
+    if (pDevExt->VideoGuid.Buffer)
+        return &pDevExt->VideoGuid;
+
+    Assert(KeGetCurrentIrql() == PASSIVE_LEVEL);
+    WCHAR VideoGuidBuf[512];
+    ULONG cbVideoGuidBuf = sizeof (VideoGuidBuf);
+    NTSTATUS Status = vboxWddmRegQueryVideoGuidString(cbVideoGuidBuf, VideoGuidBuf, &cbVideoGuidBuf);
+    Assert(Status == STATUS_SUCCESS);
+    if (Status == STATUS_SUCCESS)
+    {
+        PWCHAR pBuf = (PWCHAR)vboxWddmMemAllocZero(cbVideoGuidBuf);
+        Assert(pBuf);
+        if (pBuf)
+        {
+            memcpy(pBuf, VideoGuidBuf, cbVideoGuidBuf);
+            RtlInitUnicodeString(&pDevExt->VideoGuid, pBuf);
+            return &pDevExt->VideoGuid;
+        }
+    }
+
+    return NULL;
+}
+
+VOID vboxWddmVGuidFree(PDEVICE_EXTENSION pDevExt)
+{
+    if (pDevExt->VideoGuid.Buffer)
+    {
+        vboxWddmMemFree(pDevExt->VideoGuid.Buffer);
+        pDevExt->VideoGuid.Buffer = NULL;
+    }
+}