Changeset 25232 in vbox for trunk/src

Timestamp:

Dec 8, 2009 12:01:25 PM (15 years ago)

Author:

vboxsync

Message:

2d accel: fix the video playback black screen, some code cleaning. NetFlt/Adp/win: do not change security settings for ioctl device as it is not needed anymore

Location:

trunk/src/VBox

Files:

• Frontends/VirtualBox/src/VBoxFBOverlay.cpp (modified) (8 diffs)
• HostDrivers/VBoxNetFlt/win/VBoxNetFltMp-win.c (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp

@@ -2460 +2460 @@
     {
         pProgram = calcProgram(pPrimary);
+        if(pProgram)
+        {
+            const VBoxVHWAColorKey *pResSrcCKey = getActiveSrcOverlayCKey();
+            const VBoxVHWAColorKey *pResDstCKey = getActiveDstOverlayCKey(pPrimary);
+
+            pProgram->start();
+            if(pResSrcCKey)
+            {
+                VBoxVHWASurfaceBase::setCKey(pProgram, &colorFormat(), pResSrcCKey, false);
+            }
+            if(pResDstCKey)
+            {
+                VBoxVHWASurfaceBase::setCKey(pProgram, &pPrimary->colorFormat(), pResDstCKey, true);
+            }
+            pProgram->stop();
+        }
     }
 
@@ -3439 +3455 @@
 int VBoxGLWidget::vhwaSurfaceBlt(struct _VBOXVHWACMD_SURF_BLT *pCmd)
 {
-    /**/
     Q_UNUSED(pCmd);
     return VERR_NOT_IMPLEMENTED;
-//    VBoxVHWASurfaceBase *pDstSurf = (VBoxVHWASurfaceBase*)pCmd->u.in.hDstSurf;
-//    VBoxVHWASurfaceBase *pSrcSurf = (VBoxVHWASurfaceBase*)pCmd->u.in.hSrcSurf;
-//    VBOXQGLLOG_ENTER(("pDstSurf (0x%x), pSrcSurf (0x%x)\n",pDstSurf,pSrcSurf));
-//    QRect dstRect = VBOXVHWA_CONSTRUCT_QRECT_FROM_RECTL(&pCmd->u.in.dstRect);
-//    QRect srcRect = VBOXVHWA_CONSTRUCT_QRECT_FROM_RECTL(&pCmd->u.in.srcRect);
-//    vboxCheckUpdateAddress (pSrcSurf, pCmd->u.in.offSrcSurface);
-//    vboxCheckUpdateAddress (pDstSurf, pCmd->u.in.offDstSurface);
-////    pDstSurf->makeCurrent();
-////    const VBoxVHWAColorKey DstCKey, *pDstCKey = NULL;
-////    const VBoxVHWAColorKey SrcCKey, *pSrcCKey = NULL;
-////    if(pCmd->u.in.flags & VBOXVHWA_BLT_KEYSRCOVERRIDE)
-////    {
-////        pSrcCKey = &
-////    }
-////    if(pCmd->u.in.flags & VBOXVHWA_BLT_KEYDESTOVERRIDE)
-////    {
-////
-////    }
-//    if(pCmd->u.in.xUpdatedSrcMemValid)
-//    {
-//        QRect r = VBOXVHWA_CONSTRUCT_QRECT_FROM_RECTL(&pCmd->u.in.xUpdatedSrcMemRect);
-//        pSrcSurf->updatedMem(&r);
-//    }
-//
-//    return pDstSurf->blt(&dstRect, pSrcSurf, &srcRect,
-//            pCmd->u.in.flags & VBOXVHWA_BLT_KEYSRCOVERRIDE ? &VBoxVHWAColorKey(pCmd->u.in.desc.SrcCK.high, pCmd->u.in.desc.SrcCK.low) : NULL,
-//            pCmd->u.in.flags & VBOXVHWA_BLT_KEYDESTOVERRIDE ? &VBoxVHWAColorKey(pCmd->u.in.desc.DstCK.high, pCmd->u.in.desc.DstCK.low) : NULL);
 }
 
@@ -3479 +3467 @@
     vboxCheckUpdateAddress (pTargSurf, pCmd->u.in.offTargSurface);
 
-//    Assert(pTargSurf->isYInverted());
-//    Assert(!pCurrSurf->isYInverted());
+
     if(pCmd->u.in.xUpdatedTargMemValid)
     {
@@ -3493 +3480 @@
     pTargSurf->cFlipsTarg++;
 #endif
-//    mDisplay.flip(pTargSurf, pCurrSurf);
-//    Assert(!pTargSurf->isYInverted());
-//    Assert(pCurrSurf->isYInverted());
+
     return VINF_SUCCESS;
 }
@@ -3501 +3486 @@
 void VBoxGLWidget::vhwaDoSurfaceOverlayUpdate(VBoxVHWASurfaceBase *pDstSurf, VBoxVHWASurfaceBase *pSrcSurf, struct _VBOXVHWACMD_SURF_OVERLAY_UPDATE *pCmd)
 {
+    /* get old values first to check whether we need to re-init display and program values */
+    bool bHadSrcCKey = false, bHadDstCKey = false;
+
+    if(pDstSurf)
+    {
+        bHadSrcCKey = !!(pSrcSurf->getActiveSrcOverlayCKey());
+        bHadDstCKey = !!(pSrcSurf->getActiveDstOverlayCKey(pDstSurf));
+    }
+
     if(pCmd->u.in.flags & VBOXVHWA_OVER_KEYDEST)
     {
@@ -3576 +3570 @@
         const VBoxVHWAColorKey *pResDstCKey = pSrcSurf->getActiveDstOverlayCKey(pDstSurf);
 
-        /* @todo: may need to update glDisplayList here !! */
-        VBoxVHWAGlProgramVHWA *pProgram = pSrcSurf->getProgram(pDstSurf);
-        if(pProgram)
-        {
-            pProgram->start();
-            if(pResSrcCKey || pResDstCKey)
+        if(bHadSrcCKey != !!pResSrcCKey || bHadDstCKey != !!pResDstCKey)
+        {
+            pSrcSurf->setVisibilityReinitFlag();
+        }
+        else if(pResSrcCKey || pResDstCKey)
+        {
+            VBoxVHWAGlProgramVHWA *pProgram = pSrcSurf->getProgram(pDstSurf);
+            if(pProgram)
             {
+                pProgram->start();
                 if(pResSrcCKey)
                 {
@@ -3591 +3588 @@
                     VBoxVHWASurfaceBase::setCKey(pProgram, &pDstSurf->colorFormat(), pResDstCKey, true);
                 }
-
+                pProgram->stop();
             }
-
-            switch(pSrcSurf->fourcc())
-            {
-                case 0:
-                case FOURCC_AYUV:
-                case FOURCC_YV12:
-                    break;
-                case FOURCC_UYVY:
-                case FOURCC_YUY2:
-                    break;
-                default:
-                    Assert(0);
-                    break;
-            }
-
-            pProgram->stop();
         }
 
         pSrcSurf->setRects(dstRect, srcRect);
-        pSrcSurf->setVisibilityReinitFlag();
+
     }
 }
@@ -4192 +4173 @@
     VBOXQGL_SAVE_START(pSSM);
     int rc = SSMR3PutU32(pSSM, 0);         AssertRC(rc); /* 0 primaries */
-    rc = SSMR3PutU32(pSSM, 0);         AssertRC(rc); /* 0 overlays */
     VBOXQGL_SAVE_STOP(pSSM);
 }

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/VBoxNetFltMp-win.c

@@ -62 +62 @@
 static PUCHAR vboxNetFltWinMpDbgGetOidName(ULONG oid);
 
+#ifdef VBOXNETFLT_WITH_IOCTL_SECURITY
 NTSYSAPI
 NTSTATUS
@@ -136 +137 @@
     return Status;
 }
+#endif
 /**
  * Register an ioctl interface - a device object to be used for this
@@ -210 +212 @@
         if(Status == NDIS_STATUS_SUCCESS)
         {
+#ifdef VBOXNETFLT_WITH_IOCTL_SECURITY
             /* NdisMRegisterDevice does not offers us the ability to set security attributes */
             /* need to do this "manualy" for the device to be accessible by the non-privileged users */
@@ -220 +223 @@
                 Status = NDIS_STATUS_SUCCESS;
             }
+#endif
 
             Status = ObReferenceObjectByPointer(g_pControlDeviceObject, FILE_READ_DATA, *IoFileObjectType, KernelMode);