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

Timestamp:

Mar 15, 2012 2:20:20 PM (13 years ago)

Author:

vboxsync

Message:

crOpenGL/wddm: don't use VBoxGuest device to comply woth Metro apps security

File:

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

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

@@ -3645 +3645 @@
                 break;
             }
+
             case VBOXESC_UHGSMI_DEALLOCATE:
             {
@@ -3661 +3662 @@
                 break;
             }
+
             case VBOXESC_GETVBOXVIDEOCMCMD:
             {
@@ -3677 +3679 @@
                 break;
             }
+
+            case VBOXESC_CRHGSMICTLCON_CALL:
+            {
+                PVBOXWDDM_CONTEXT pContext = (PVBOXWDDM_CONTEXT)pEscape->hContext;
+                PVBOXDISPIFESCAPE_CRHGSMICTLCON_CALL pCall = (PVBOXDISPIFESCAPE_CRHGSMICTLCON_CALL)pEscapeHdr;
+                if (pEscape->PrivateDriverDataSize >= sizeof (*pCall))
+                {
+                    /* this is true due to the above condition */
+                    Assert(pEscape->PrivateDriverDataSize > RT_OFFSETOF(VBOXDISPIFESCAPE_CRHGSMICTLCON_CALL, CallInfo));
+                    int rc = VBoxMpCrCtlConCallUserData(pDevExt, &pCall->CallInfo, pEscape->PrivateDriverDataSize - RT_OFFSETOF(VBOXDISPIFESCAPE_CRHGSMICTLCON_CALL, CallInfo));
+                    if (RT_SUCCESS(rc))
+                        Status = STATUS_SUCCESS;
+                    else
+                    {
+                        WARN(("VBoxMpCrUmCtlConCall failed, rc(%d)", rc));
+                        Status = STATUS_UNSUCCESSFUL;
+                    }
+                }
+                else
+                {
+                    WARN(("buffer too small!"));
+                    Status = STATUS_BUFFER_TOO_SMALL;
+                }
+
+                break;
+            }
+
+            case VBOXESC_CRHGSMICTLCON_GETCLIENTID:
+            {
+                PVBOXWDDM_CONTEXT pContext = (PVBOXWDDM_CONTEXT)pEscape->hContext;
+                if (pEscape->PrivateDriverDataSize == sizeof (*pEscapeHdr))
+                {
+                    pEscapeHdr->u32CmdSpecific = pContext->u32CrConClientID;
+                    Status = STATUS_SUCCESS;
+                }
+                else
+                {
+                    WARN(("unexpected buffer size!"));
+                    Status = STATUS_INVALID_PARAMETER;
+                }
+
+                break;
+            }
+
             case VBOXESC_SETVISIBLEREGION:
             {
@@ -5615 +5661 @@
                                 if (Status == STATUS_SUCCESS)
                                 {
-        //                            Assert(KeGetCurrentIrql() < DISPATCH_LEVEL);
-        //                            ExAcquireFastMutex(&pDevExt->ContextMutex);
-                                    ASMAtomicIncU32(&pDevExt->cContexts3D);
-        //                            ExReleaseFastMutex(&pDevExt->ContextMutex);
-                                    break;
+                                    int rc = VINF_SUCCESS;
+                                    if (pInfo->crVersionMajor || pInfo->crVersionMinor)
+                                    {
+                                        rc = VBoxMpCrCtlConConnect(pDevExt,
+                                            pInfo->crVersionMajor, pInfo->crVersionMinor,
+                                            &pContext->u32CrConClientID);
+                                        if (!RT_SUCCESS(rc))
+                                        {
+                                            WARN(("VBoxMpCrCtlConConnect failed rc (%d)", rc));
+                                            Status = STATUS_UNSUCCESSFUL;
+                                        }
+                                    }
+
+                                    if (RT_SUCCESS(rc))
+                                    {
+            //                            Assert(KeGetCurrentIrql() < DISPATCH_LEVEL);
+            //                            ExAcquireFastMutex(&pDevExt->ContextMutex);
+                                        ASMAtomicIncU32(&pDevExt->cContexts3D);
+            //                            ExReleaseFastMutex(&pDevExt->ContextMutex);
+                                        break;
+                                    }
                                 }
 
                                 vboxWddmSwapchainCtxTerm(pDevExt, pContext);
                             }
+                            vboxVideoAMgrCtxDestroy(&pContext->AllocContext);
                         }
                         break;
@@ -5630 +5693 @@
                     case VBOXWDDM_CONTEXT_TYPE_CUSTOM_UHGSMI_GL:
                     {
+                        pContext->enmType = pInfo->enmType;
                         Status = vboxVideoAMgrCtxCreate(&pDevExt->AllocMgr, &pContext->AllocContext);
                         Assert(Status == STATUS_SUCCESS);
-                        if (Status != STATUS_SUCCESS)
-                            break;
-                        /* do not break to go to the _2D branch and do the rest stuff */
+                        if (Status == STATUS_SUCCESS)
+                        {
+                            int rc = VINF_SUCCESS;
+                            if (pInfo->crVersionMajor || pInfo->crVersionMinor)
+                            {
+                                rc = VBoxMpCrCtlConConnect(pDevExt,
+                                    pInfo->crVersionMajor, pInfo->crVersionMinor,
+                                    &pContext->u32CrConClientID);
+                                if (!RT_SUCCESS(rc))
+                                {
+                                    WARN(("VBoxMpCrCtlConConnect failed rc (%d)", rc));
+                                    Status = STATUS_UNSUCCESSFUL;
+                                }
+                            }
+
+                            if (RT_SUCCESS(rc))
+                            {
+                                break;
+                            }
+                            vboxVideoAMgrCtxDestroy(&pContext->AllocContext);
+                        }
+                        break;
                     }
                     case VBOXWDDM_CONTEXT_TYPE_CUSTOM_2D:
@@ -5684 +5767 @@
     PVBOXWDDM_CONTEXT pContext = (PVBOXWDDM_CONTEXT)hContext;
     PVBOXMP_DEVEXT pDevExt = pContext->pDevice->pAdapter;
-    if (pContext->enmType == VBOXWDDM_CONTEXT_TYPE_CUSTOM_3D)
-    {
-        Assert(KeGetCurrentIrql() < DISPATCH_LEVEL);
-//        ExAcquireFastMutex(&pDevExt->ContextMutex);
-//        RemoveEntryList(&pContext->ListEntry);
-        uint32_t cContexts = ASMAtomicDecU32(&pDevExt->cContexts3D);
-//        ExReleaseFastMutex(&pDevExt->ContextMutex);
-        Assert(cContexts < UINT32_MAX/2);
+    switch(pContext->enmType)
+    {
+        case VBOXWDDM_CONTEXT_TYPE_CUSTOM_3D:
+        {
+            Assert(KeGetCurrentIrql() < DISPATCH_LEVEL);
+    //        ExAcquireFastMutex(&pDevExt->ContextMutex);
+    //        RemoveEntryList(&pContext->ListEntry);
+            uint32_t cContexts = ASMAtomicDecU32(&pDevExt->cContexts3D);
+    //        ExReleaseFastMutex(&pDevExt->ContextMutex);
+            Assert(cContexts < UINT32_MAX/2);
+            /* don't break! */
+        }
+        case VBOXWDDM_CONTEXT_TYPE_CUSTOM_UHGSMI_3D:
+        case VBOXWDDM_CONTEXT_TYPE_CUSTOM_UHGSMI_GL:
+            if (pContext->u32CrConClientID)
+            {
+                VBoxMpCrCtlConDisconnect(pDevExt, pContext->u32CrConClientID);
+            }
+            break;
+        default:
+            break;
     }