Changeset 51017 in vbox

Timestamp:

Apr 9, 2014 4:31:50 PM (11 years ago)

Author:

vboxsync

Message:

wddm: fixes

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.cpp (modified) (8 diffs)

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

@@ -3540 +3540 @@
             }
             /** @todo: add necessary bits */
-            WARN(("Impl!"));
+//            WARN(("Impl!"));
             cbBuffer = VBOXWDDM_DUMMY_DMABUFFER_SIZE;
             break;
@@ -3552 +3552 @@
                 return STATUS_INVALID_PARAMETER;
             }
-            WARN(("Do we need to do anything here?"));
+//            WARN(("Do we need to do anything here?"));
             break;
         }
@@ -5809 +5809 @@
         WARN(("Present->DmaBufferPrivateDataSize(%d) < sizeof VBOXWDDM_DMA_PRIVATEDATA_BASEHDR (%d)",
                 pRender->DmaBufferPrivateDataSize , sizeof (VBOXWDDM_DMA_PRIVATEDATA_BASEHDR)));
-        /* @todo: can this actually happen? what status to return? */
         return STATUS_INVALID_PARAMETER;
     }
-
+    if (pRender->PatchLocationListOutSize < pRender->AllocationListSize)
+    {
+        WARN(("pRender->PatchLocationListOutSize(%d) < pRender->AllocationListSize(%d)",
+                pRender->PatchLocationListOutSize, pRender->AllocationListSize));
+        return STATUS_INVALID_PARAMETER;
+    }
+
+    NTSTATUS Status = STATUS_SUCCESS;
+
+    __try
+    {
     PVBOXWDDM_DMA_PRIVATEDATA_BASEHDR pInputHdr = (PVBOXWDDM_DMA_PRIVATEDATA_BASEHDR)pRender->pCommand;
     NTSTATUS Status = STATUS_SUCCESS;
@@ -5883 +5892 @@
             for (UINT i = 0; i < pRender->AllocationListSize; ++i, ++pRender->pPatchLocationListOut, ++pAllocationList, ++pSubmInfo, ++pSubmUmInfo)
             {
+                VBOXWDDM_UHGSMI_BUFFER_UI_SUBMIT_INFO SubmUmInfo = *pSubmUmInfo;
                 D3DDDI_PATCHLOCATIONLIST* pPLL = pRender->pPatchLocationListOut;
                 PVBOXWDDM_ALLOCATION pAlloc = vboxWddmGetAllocationFromAllocList(pDevExt, pAllocationList);
-                if (pSubmUmInfo->offData >= pAlloc->AllocData.SurfDesc.cbSize
-                        || pSubmUmInfo->cbData > pAlloc->AllocData.SurfDesc.cbSize
-                        || pSubmUmInfo->offData + pSubmUmInfo->cbData > pAlloc->AllocData.SurfDesc.cbSize)
+                if (SubmUmInfo.offData >= pAlloc->AllocData.SurfDesc.cbSize
+                        || SubmUmInfo.cbData > pAlloc->AllocData.SurfDesc.cbSize
+                        || SubmUmInfo.offData + SubmUmInfo.cbData > pAlloc->AllocData.SurfDesc.cbSize)
                 {
                     WARN(("invalid data"));
@@ -5896 +5906 @@
 
                 if (pAllocationList->SegmentId)
-                    pSubmInfo->offBuffer = pAllocationList->PhysicalAddress.LowPart + pSubmUmInfo->offData;
-
-                pSubmInfo->cbBuffer = pSubmUmInfo->cbData;
+                    pSubmInfo->offBuffer = pAllocationList->PhysicalAddress.LowPart + SubmUmInfo.offData;
+
+                pSubmInfo->cbBuffer = SubmUmInfo.cbData;
 
                 pPLL->AllocationIndex = i;
                 pPLL->PatchOffset = RT_OFFSETOF(VBOXCMDVBVA_CRCMD, Cmd.aBuffers[i].offBuffer);
-                pPLL->AllocationOffset = pSubmUmInfo->offData;
+                pPLL->AllocationOffset = SubmUmInfo.offData;
             }
 
@@ -5939 +5949 @@
         }
         default:
-        {
-            WARN(("unsupported render command %d", pInputHdr->enmCmd));
-            return STATUS_INVALID_PARAMETER;
-        }
+         {
+             WARN(("unsupported render command %d", pInputHdr->enmCmd));
+             return STATUS_INVALID_PARAMETER;
+         }
     }
 
@@ -5951 +5961 @@
     /* sanity */
     pCmd->u32FenceID = 0;
-
+    }
+    __except (EXCEPTION_EXECUTE_HANDLER)
+    {
+        Status = STATUS_INVALID_PARAMETER;
+        WARN(("invalid parameter"));
+    }
 //    LOGF(("LEAVE, hContext(0x%x)", hContext));
 
-    return STATUS_SUCCESS;
+    return Status;
+
+//    LOGF(("LEAVE, hContext(0x%x)", hContext));
+
+    return Status;
 }
 #endif
@@ -5973 +5992 @@
 //    LOGF(("ENTER, hContext(0x%x)", hContext));
 
-    Assert(pRender->DmaBufferPrivateDataSize >= sizeof (VBOXWDDM_DMA_PRIVATEDATA_BASEHDR));
     if (pRender->DmaBufferPrivateDataSize < sizeof (VBOXWDDM_DMA_PRIVATEDATA_BASEHDR))
     {