Changeset 47039 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm

Timestamp:

Jul 8, 2013 1:19:00 PM (11 years ago)

Author:

vboxsync

Message:

wddm: fix multimon issue

Location:

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

Files:

• VBoxMPMisc.cpp (modified) (4 diffs)
• VBoxMPMisc.h (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPMisc.cpp

@@ -659 +659 @@
 #define VBOXWDDM_REG_DISPLAYSETTINGSVIDEOKEY_SUBKEY L"\\Video"
 
-NTSTATUS vboxWddmRegQueryVideoGuidString(ULONG cbBuf, PWCHAR pBuf, PULONG pcbResult)
-{
-    HANDLE hKey;
-    NTSTATUS Status = vboxWddmRegOpenKey(&hKey, VBOXWDDM_REG_DISPLAYSETTINGSVIDEOKEY, GENERIC_READ);
+NTSTATUS vboxWddmRegQueryVideoGuidString(PVBOXMP_DEVEXT pDevExt, ULONG cbBuf, PWCHAR pBuf, PULONG pcbResult)
+{
+    BOOLEAN fNewMethodSucceeded = FALSE;
+    HANDLE hKey = NULL;
+    NTSTATUS Status = IoOpenDeviceRegistryKey(pDevExt->pPDO, PLUGPLAY_REGKEY_DEVICE, GENERIC_READ, &hKey);
+    if (NT_SUCCESS(Status))
+    {
+        struct
+        {
+            KEY_VALUE_PARTIAL_INFORMATION Info;
+            UCHAR Buf[1024]; /* should be enough */
+        } KeyData;
+        ULONG cbResult;
+        UNICODE_STRING RtlStr;
+        RtlInitUnicodeString(&RtlStr, L"VideoID");
+        Status = ZwQueryValueKey(hKey,
+                    &RtlStr,
+                    KeyValuePartialInformation,
+                    &KeyData.Info,
+                    sizeof(KeyData),
+                    &cbResult);
+        if (NT_SUCCESS(Status))
+        {
+            if (KeyData.Info.Type == REG_SZ)
+            {
+                fNewMethodSucceeded = TRUE;
+                *pcbResult = KeyData.Info.DataLength + 2;
+                if (cbBuf >= KeyData.Info.DataLength)
+                {
+                    memcpy(pBuf, KeyData.Info.Data, KeyData.Info.DataLength + 2);
+                    Status = STATUS_SUCCESS;
+                }
+                else
+                    Status = STATUS_BUFFER_TOO_SMALL;
+            }
+        }
+        else
+        {
+            WARN(("ZwQueryValueKey failed, Status 0x%x", Status));
+        }
+
+        NTSTATUS tmpStatus = ZwClose(hKey);
+        Assert(tmpStatus == STATUS_SUCCESS);
+    }
+    else
+    {
+        WARN(("IoOpenDeviceRegistryKey failed Status 0x%x", Status));
+    }
+
+    if (fNewMethodSucceeded)
+        return Status;
+    else
+        WARN(("failed to acquire the VideoID, falling back to the old impl"));
+
+    Status = vboxWddmRegOpenKey(&hKey, VBOXWDDM_REG_DISPLAYSETTINGSVIDEOKEY, GENERIC_READ);
     Assert(Status == STATUS_SUCCESS);
     if (Status == STATUS_SUCCESS)
@@ -744 +795 @@
 }
 
-NTSTATUS vboxWddmRegOpenKey(OUT PHANDLE phKey, IN PWCHAR pName, IN ACCESS_MASK fAccess)
+NTSTATUS vboxWddmRegOpenKeyEx(OUT PHANDLE phKey, IN HANDLE hRootKey, IN PWCHAR pName, IN ACCESS_MASK fAccess)
 {
     OBJECT_ATTRIBUTES ObjAttr;
@@ -750 +801 @@
 
     RtlInitUnicodeString(&RtlStr, pName);
-    InitializeObjectAttributes(&ObjAttr, &RtlStr, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL);
+    InitializeObjectAttributes(&ObjAttr, &RtlStr, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, hRootKey, NULL);
 
     return ZwOpenKey(phKey, fAccess, &ObjAttr);
+}
+
+NTSTATUS vboxWddmRegOpenKey(OUT PHANDLE phKey, IN PWCHAR pName, IN ACCESS_MASK fAccess)
+{
+    return vboxWddmRegOpenKeyEx(phKey, NULL, pName, fAccess);
 }
 
@@ -878 +934 @@
     WCHAR VideoGuidBuf[512];
     ULONG cbVideoGuidBuf = sizeof (VideoGuidBuf);
-    NTSTATUS Status = vboxWddmRegQueryVideoGuidString(cbVideoGuidBuf, VideoGuidBuf, &cbVideoGuidBuf);
+    NTSTATUS Status = vboxWddmRegQueryVideoGuidString(pDevExt ,cbVideoGuidBuf, VideoGuidBuf, &cbVideoGuidBuf);
     Assert(Status == STATUS_SUCCESS);
     if (Status == STATUS_SUCCESS)

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPMisc.h

@@ -91 +91 @@
 NTSTATUS vboxWddmRegDisplaySettingsQueryRelY(HANDLE hKey, int * pResult);
 NTSTATUS vboxWddmDisplaySettingsQueryPos(IN PVBOXMP_DEVEXT pDeviceExtension, D3DDDI_VIDEO_PRESENT_SOURCE_ID VidPnSourceId, POINT * pPos);
-NTSTATUS vboxWddmRegQueryVideoGuidString(ULONG cbBuf, PWCHAR pBuf, PULONG pcbResult);
+NTSTATUS vboxWddmRegQueryVideoGuidString(PVBOXMP_DEVEXT pDevExt, ULONG cbBuf, PWCHAR pBuf, PULONG pcbResult);
 
 NTSTATUS vboxWddmRegQueryDrvKeyName(PVBOXMP_DEVEXT pDevExt, ULONG cbBuf, PWCHAR pBuf, PULONG pcbResult);
 
+NTSTATUS vboxWddmRegOpenKeyEx(OUT PHANDLE phKey, IN HANDLE hRootKey, IN PWCHAR pName, IN ACCESS_MASK fAccess);
 NTSTATUS vboxWddmRegOpenKey(OUT PHANDLE phKey, IN PWCHAR pName, IN ACCESS_MASK fAccess);
 NTSTATUS vboxWddmRegQueryValueDword(IN HANDLE hKey, IN PWCHAR pName, OUT PDWORD pDword);