Changeset 41058 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.cpp

Timestamp:

Apr 25, 2012 9:42:29 PM (13 years ago)

Author:

vboxsync

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

77623

Message:

crHgsmi cleanup & adjustments

File:

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

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

@@ -1962 +1962 @@
         {
             if (pAllocation->pSynchEvent)
-            {
                 ObDereferenceObject(pAllocation->pSynchEvent);
-            }
             break;
         }
@@ -2151 +2149 @@
                 {
                     pAllocationInfo->Size = pAllocInfo->cbBuffer;
-                    pAllocation->enmSynchType = pAllocInfo->enmSynchType;
+                    pAllocation->fUhgsmiType = pAllocInfo->fUhgsmiType;
                     pAllocation->SurfDesc.cbSize = pAllocInfo->cbBuffer;
                     pAllocationInfo->Flags.CpuVisible = 1;
 //                    pAllocationInfo->Flags.SynchronousPaging = 1;
                     pAllocationInfo->AllocationPriority = D3DDDI_ALLOCATIONPRIORITY_MAXIMUM;
-                    switch (pAllocInfo->enmSynchType)
+                    if (pAllocInfo->hSynch)
                     {
-                        case VBOXUHGSMI_SYNCHOBJECT_TYPE_EVENT:
-                            Status = ObReferenceObjectByHandle((HANDLE)pAllocInfo->hSynch, EVENT_MODIFY_STATE, *ExEventObjectType, UserMode,
-                                    (PVOID*)&pAllocation->pSynchEvent,
-                                    NULL);
-                            Assert(Status == STATUS_SUCCESS);
-                            break;
-                        case VBOXUHGSMI_SYNCHOBJECT_TYPE_SEMAPHORE:
-                            Status = ObReferenceObjectByHandle((HANDLE)pAllocInfo->hSynch, EVENT_MODIFY_STATE, *ExSemaphoreObjectType, UserMode,
-                                    (PVOID*)&pAllocation->pSynchSemaphore,
-                                    NULL);
-                            Assert(Status == STATUS_SUCCESS);
-                            break;
-                        case VBOXUHGSMI_SYNCHOBJECT_TYPE_NONE:
-                            pAllocation->pSynchEvent = NULL;
-                            Status = STATUS_SUCCESS;
-                            break;
-                        default:
-                            LOGREL(("ERROR: invalid synch info type(%d)", pAllocInfo->enmSynchType));
-                            AssertBreakpoint();
-                            Status = STATUS_INVALID_PARAMETER;
-                            break;
+                        Status = ObReferenceObjectByHandle((HANDLE)pAllocInfo->hSynch, EVENT_MODIFY_STATE, *ExEventObjectType, UserMode,
+                                (PVOID*)&pAllocation->pSynchEvent,
+                                NULL);
+                        Assert(Status == STATUS_SUCCESS);
                     }
                     break;
@@ -2763 +2744 @@
     {
         VBOXVDMACMD_CHROMIUM_BUFFER *pBufCmd = &pBody->aBuffers[i];
-        if (!pBufCmd->u32GuesData)
+        if (!pBufCmd->u32GuestData)
         {
             /* signal completion */
-            PVBOXWDDM_ALLOCATION pAlloc = (PVBOXWDDM_ALLOCATION)pBufCmd->u64GuesData;
-            switch (pAlloc->enmSynchType)
-            {
-                case VBOXUHGSMI_SYNCHOBJECT_TYPE_EVENT:
-                    KeSetEvent(pAlloc->pSynchEvent, 3, FALSE);
-                    break;
-                case VBOXUHGSMI_SYNCHOBJECT_TYPE_SEMAPHORE:
-                    KeReleaseSemaphore(pAlloc->pSynchSemaphore,
-                        3,
-                        1,
-                        FALSE);
-                    break;
-                case VBOXUHGSMI_SYNCHOBJECT_TYPE_NONE:
-                    break;
-                default:
-                    Assert(0);
-            }
+            PVBOXWDDM_ALLOCATION pAlloc = (PVBOXWDDM_ALLOCATION)pBufCmd->u64GuestData;
+            if (pAlloc->pSynchEvent)
+                KeSetEvent(pAlloc->pSynchEvent, 3, FALSE);
         }
     }
@@ -3035 +3002 @@
                 pBufCmd->offBuffer = pBufInfo->Alloc.offAlloc;
                 pBufCmd->cbBuffer = pBufInfo->cbData;
-                pBufCmd->u32GuesData = pBufInfo->bDoNotSignalCompletion;
-                pBufCmd->u64GuesData = (uint64_t)pBufInfo->Alloc.pAlloc;
+                pBufCmd->u32GuestData = pBufInfo->bDoNotSignalCompletion;
+                pBufCmd->u64GuestData = (uint64_t)pBufInfo->Alloc.pAlloc;
             }
 
@@ -5136 +5103 @@
 
                 pSubmInfo->cbData = pSubmUmInfo->cbData;
-                pSubmInfo->bDoNotSignalCompletion = pSubmUmInfo->fSubFlags.bDoNotSignalCompletion;
+                pSubmInfo->bDoNotSignalCompletion = pSubmUmInfo->bDoNotSignalCompletion;
 
                 pPLL->AllocationIndex = i;