Changeset 27055 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm

Timestamp:

Mar 4, 2010 7:06:28 PM (15 years ago)

Author:

vboxsync

Message:

wddm: bugfixes

Location:

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

Files:

• VBoxVideoWddm.cpp (modified) (13 diffs)
• VBoxVideoWddm.h (modified) (1 diff)

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

@@ -1084 +1084 @@
     PDEVICE_EXTENSION pContext = (PDEVICE_EXTENSION)hAdapter;
 
+    AssertBreakpoint();
+
     switch (pQueryAdapterInfo->Type)
     {
@@ -1186 +1188 @@
     PDEVICE_EXTENSION pContext = (PDEVICE_EXTENSION)hAdapter;
 
+    AssertBreakpoint();
+
     PVBOXWDDM_DEVICE pDevice = (PVBOXWDDM_DEVICE)vboxWddmMemAllocZero(sizeof (VBOXWDDM_DEVICE));
     pCreateDevice->hDevice = pDevice;
@@ -1197 +1201 @@
 
     pDevice->pAdapter = pContext;
+    pDevice->hDevice = pCreateDevice->hDevice;
 
     pCreateDevice->hDevice = pDevice;
@@ -1238 +1243 @@
                             pAllocation->enmType = VBOXWDDM_ALLOC_TYPE_STD_SHAREDPRIMARYSURFACE;
                             pAllocation->u.SurfInfo = pAllocInfo->u.SurfInfo;
-                            PVBOXWDDM_ALLOCATION_SHAREDPRIMARYSURFACE pAlloc = VBOXWDDM_ALLOCATION_BODY(pAllocInfo, VBOXWDDM_ALLOCATION_SHAREDPRIMARYSURFACE);
+                            PVBOXWDDM_ALLOCATION_SHAREDPRIMARYSURFACE pAlloc = VBOXWDDM_ALLOCATION_BODY(pAllocation, VBOXWDDM_ALLOCATION_SHAREDPRIMARYSURFACE);
                             PVBOXWDDM_ALLOCINFO_SHAREDPRIMARYSURFACE pAllocI = VBOXWDDM_ALLOCINFO_BODY(pAllocInfo, VBOXWDDM_ALLOCINFO_SHAREDPRIMARYSURFACE);
                             pAlloc->RefreshRate = pAllocI->RefreshRate;
@@ -1287 +1292 @@
                 if (pAllocationInfo->PrivateDriverDataSize >= VBOXWDDM_ALLOCINFO_HEADSIZE())
                 {
-                    PVBOXWDDM_ALLOCATION pAllocation = (PVBOXWDDM_ALLOCATION)vboxWddmMemAllocZero(VBOXWDDM_ALLOCINFO_HEADSIZE());
+                    PVBOXWDDM_ALLOCATION pAllocation = (PVBOXWDDM_ALLOCATION)vboxWddmMemAllocZero(VBOXWDDM_ALLOCATION_HEADSIZE());
                     Assert(pAllocation);
                     if (pAllocation)
@@ -1348 +1353 @@
     dfprintf(("==> "__FUNCTION__ ", context(0x%x)\n", hAdapter));
 
+    AssertBreakpoint();
+
     NTSTATUS Status = STATUS_SUCCESS;
 
@@ -1392 +1399 @@
 }
 
-
+/**
+ * DxgkDdiDescribeAllocation
+ */
 NTSTATUS
 APIENTRY
@@ -1402 +1411 @@
 
     AssertBreakpoint();
-    /* @todo: fixme: implement */
+    PVBOXWDDM_ALLOCATION pAllocation = (PVBOXWDDM_ALLOCATION)pDescribeAllocation->hAllocation;
+    pDescribeAllocation->Width = pAllocation->u.SurfInfo.width;
+    pDescribeAllocation->Height = pAllocation->u.SurfInfo.height;
+    pDescribeAllocation->Format = pAllocation->u.SurfInfo.format;
+    memset (&pDescribeAllocation->MultisampleMethod, 0, sizeof (pDescribeAllocation->MultisampleMethod));
+    pDescribeAllocation->RefreshRate.Numerator = 60000;
+    pDescribeAllocation->RefreshRate.Denominator = 1000;
+    pDescribeAllocation->PrivateDriverFormatAttribute = 0;
 
     dfprintf(("<== "__FUNCTION__ ", hAdapter(0x%x)\n", hAdapter));
@@ -1422 +1438 @@
 
     dfprintf(("==> "__FUNCTION__ ", context(0x%x)\n", hAdapter));
+
+    AssertBreakpoint();
 
     NTSTATUS Status = STATUS_SUCCESS;
@@ -1660 +1678 @@
     PAGED_CODE();
 
+    AssertBreakpoint();
+
     NTSTATUS Status = STATUS_SUCCESS;
 
@@ -1812 +1832 @@
 
     dfprintf(("==> "__FUNCTION__ ", context(0x%x)\n", hAdapter));
+
+    AssertBreakpoint();
 
     PDEVICE_EXTENSION pContext = (PDEVICE_EXTENSION)hAdapter;
@@ -2478 +2500 @@
     dfprintf(("==> "__FUNCTION__ ", hDevice(0x%x)\n", hDevice));
 
+    AssertBreakpoint();
+
     NTSTATUS Status = STATUS_SUCCESS;
 
@@ -2770 +2794 @@
     dfprintf(("==> "__FUNCTION__ ", hDevice(0x%x)\n", hDevice));
 
+    AssertBreakpoint();
+
     NTSTATUS Status = STATUS_SUCCESS;
     PVBOXWDDM_DEVICE pDevice = (PVBOXWDDM_DEVICE)hDevice;

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoWddm.h

@@ -102 +102 @@
 {
     struct _DEVICE_EXTENSION * pAdapter; /* Adapder info */
+    HANDLE hDevice; /* handle passed to CreateDevice */
     VBOXWDDM_DEVICE_TYPE enmType; /* device creation flags passed to DxgkDdiCreateDevice, not sure we need it */
 } VBOXWDDM_DEVICE, *PVBOXWDDM_DEVICE;