Changeset 37384 in vbox for trunk/src/VBox/Additions

Timestamp:

Jun 8, 2011 3:09:14 PM (13 years ago)

Author:

vboxsync

Message:

1 million rectangles ought to be enough for anybody...

Location:

trunk/src/VBox/Additions

Files:

• WINNT/Graphics/Video/disp/xpdm/VBoxDispDriver.cpp (modified) (12 diffs)
• WINNT/Graphics/Video/mp/xpdm/VBoxMPDriver.cpp (modified) (8 diffs)
• common/VBoxGuestLib/VBoxGuestR3LibSeamless.cpp (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm/VBoxDispDriver.cpp

@@ -135 +135 @@
 {
     ULONG cnt=0;
-        
+
     while (*pwcs!=*L"")
     {
@@ -181 +181 @@
         memset(_font.lfFaceName, 0, sizeof(_font.lfFaceName));                       \
         memcpy(_font.lfFaceName, _name, sizeof(_name));                              \
-    } while (0)                                                                   
+    } while (0)
 
 static int VBoxDispInitDevice(PVBOXDISPDEV pDev, DEVMODEW *pdm, GDIINFO *pGdiInfo, DEVINFO *pDevInfo)
@@ -286 +286 @@
     pGdiInfo->ulNumPalReg = (pDev->mode.ulBitsPerPel==8) ? (1<<pDev->mode.ulBitsPerPel) : 0;
 
-    /* @todo: might want to implement IOCTL_VIDEO_QUERY_COLOR_CAPABILITIES in miniport driver 
+    /* @todo: might want to implement IOCTL_VIDEO_QUERY_COLOR_CAPABILITIES in miniport driver
      *        and query host for this info there
      */
@@ -343 +343 @@
     pDevInfo->flGraphicsCaps |= GCAPS_DIRECTDRAW;
 #endif
-    VBOXDISPMAKELOGFONTW(pDevInfo->lfDefaultFont, 
+    VBOXDISPMAKELOGFONTW(pDevInfo->lfDefaultFont,
                          16, 7, FW_BOLD, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, VARIABLE_PITCH, L"System");
 
@@ -383 +383 @@
 
     LOGF_LEAVE();
-    return rc;    
+    return rc;
 }
 
@@ -442 +442 @@
 }
 
-/* Returns video modes supported by our device/driver 
+/* Returns video modes supported by our device/driver
  * Note: If we fail here we'd be asked to enter 800x600@4bpp mode later in VBoxDispDrvEnablePDEV.
  */
@@ -492 +492 @@
  * Returns pointer to our driver private info structure which would be passed by GDI to our other callbacks.
  */
-DHPDEV APIENTRY 
+DHPDEV APIENTRY
 VBoxDispDrvEnablePDEV(DEVMODEW *pdm, LPWSTR pwszLogAddress, ULONG cPat, HSURF *phsurfPatterns,
                       ULONG cjCaps, ULONG *pdevcaps,
@@ -671 +671 @@
     size.cy = pDev->mode.ulHeight;
 
-    pDev->surface.hBitmap = EngCreateBitmap(size, pDev->mode.lScanlineStride, iFormat, 
+    pDev->surface.hBitmap = EngCreateBitmap(size, pDev->mode.lScanlineStride, iFormat,
                                             pDev->mode.lScanlineStride>0 ? BMF_TOPDOWN:0,
                                             pDev->memInfo.FrameBufferBase);
@@ -938 +938 @@
             LOGF(("VBOXESC_SETVISIBLEREGION"));
             LPRGNDATA lpRgnData = (LPRGNDATA)pvIn;
-
-            if (cjIn >= sizeof(RGNDATAHEADER)
+            DWORD cRects;
+
+            if (    cjIn >= sizeof(RGNDATAHEADER)
                 &&  pvIn
                 &&  lpRgnData->rdh.dwSize == sizeof(RGNDATAHEADER)
                 &&  lpRgnData->rdh.iType  == RDH_RECTANGLES
-                &&  cjIn == ((uint64_t)lpRgnData->rdh.nCount) * sizeof(RECT) + sizeof(RGNDATAHEADER))
-            {
+                &&  (cRects = lpRgnData->rdh.nCount) <= _1M
+                &&  cjIn == cRects * (uint64_t)sizeof(RECT) + sizeof(RGNDATAHEADER))
+            {
+                /** @todo this whole conversion thing could maybe be skipped
+                 *        since RTRECT matches the RECT layout. */
+#if 0
+                AssertCompile(sizeof(RTRECT) == sizeof(RECT));
+                AssertCompileMembersSameSizeAndOffset(RTRECT, xLeft,    RECT, left);
+                AssertCompileMembersSameSizeAndOffset(RTRECT, xBottom,  RECT, bottom);
+                AssertCompileMembersSameSizeAndOffset(RTRECT, xRight,   RECT, right);
+                AssertCompileMembersSameSizeAndOffset(RTRECT, xTop,     RECT, top);
+
+                rc = VBoxDispMPSetVisibleRegion(pDev->hDriver, (PRTRECT)&lpRgnData->Buffer[0], cRects);
+                VBOX_WARNRC(rc);
+#else
                 DWORD   i;
                 PRTRECT pRTRect;
@@ -950 +964 @@
                 RECT   *pRect = (RECT *)&lpRgnData->Buffer;
 
-                pRTRect = (PRTRECT) EngAllocMem(0, lpRgnData->rdh.nCount*sizeof(RTRECT), MEM_ALLOC_TAG);
+                pRTRect = (PRTRECT) EngAllocMem(0, cRects*sizeof(RTRECT), MEM_ALLOC_TAG);
                 if (!pRTRect)
                 {
-                    WARN(("failed to allocate %d bytes", lpRgnData->rdh.nCount*sizeof(RTRECT)));
+                    WARN(("failed to allocate %d bytes", cRects*sizeof(RTRECT)));
                     break;
                 }
 
-                for (i=0; i<lpRgnData->rdh.nCount; ++i)
+                for (i = 0; i < cRects; ++i)
                 {
                     LOG(("New visible rectangle (%d,%d) (%d,%d)",
@@ -967 +981 @@
                 }
 
-                rc = VBoxDispMPSetVisibleRegion(pDev->hDriver, pRTRect, lpRgnData->rdh.nCount);
+                rc = VBoxDispMPSetVisibleRegion(pDev->hDriver, pRTRect, cRects);
                 VBOX_WARNRC(rc);
 
                 EngFreeMem(pRTRect);
 
+#endif
                 if (RT_SUCCESS(rc))
                 {
@@ -983 +998 @@
                 {
                     WARN(("check failed rdh.dwSize=%x iType=%d size=%d expected size=%d",
-                          lpRgnData->rdh.dwSize, lpRgnData->rdh.iType, cjIn, 
+                          lpRgnData->rdh.dwSize, lpRgnData->rdh.iType, cjIn,
                           lpRgnData->rdh.nCount * sizeof(RECT) + sizeof(RGNDATAHEADER)));
                 }

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/xpdm/VBoxMPDriver.cpp

@@ -26 +26 @@
 
 /* Resource list */
-VIDEO_ACCESS_RANGE  VBoxLegacyVGAResourceList[] = 
+VIDEO_ACCESS_RANGE  VBoxLegacyVGAResourceList[] =
 {
     { 0x000003B0, 0x00000000, 0x0000000C, 1, 1, 1, 0 }, /* VGA regs (0x3B0-0x3BB) */
@@ -106 +106 @@
             ULONG vendorId = 0x80EE;
             ULONG deviceId = 0xBEEF;
-            rc = VideoPortGetAccessRanges(pExt, 0, NULL, RT_ELEMENTS(tmpRanges), tmpRanges, 
+            rc = VideoPortGetAccessRanges(pExt, 0, NULL, RT_ELEMENTS(tmpRanges), tmpRanges,
                                           &vendorId, &deviceId, &slot);
         }
@@ -142 +142 @@
     }
 
-    /* @todo: pretend success to make the driver work. */
+    /** @todo pretend success to make the driver work. */
     rc = NO_ERROR;
 
@@ -281 +281 @@
         }
 
-        /* Returns count of supported video modes and structure size in bytes, 
+        /* Returns count of supported video modes and structure size in bytes,
          * used to allocate buffer for the following IOCTL_VIDEO_QUERY_AVAIL_MODES call.
          */
@@ -350 +350 @@
             STARTIO_IN(VIDEO_POINTER_POSITION, pPos);
 
-            /*@todo: set pointer position*/
+            /** @todo set pointer position*/
             bResult = VBoxMPEnablePointer(pExt, TRUE, pStatus);
             break;
@@ -439 +439 @@
             uint32_t cRects = RequestPacket->InputBufferLength/sizeof(RTRECT);
             /*Sanity check*/
-            if (RequestPacket->InputBufferLength != cRects*sizeof(RTRECT))
+            if (   cRects > _1M
+                || RequestPacket->InputBufferLength != cRects * sizeof(RTRECT))
             {
                 pStatus->Status = ERROR_INSUFFICIENT_BUFFER;
@@ -487 +488 @@
         case IOCTL_VIDEO_HGSMI_HANDLER_DISABLE:
         {
-            /* @todo: not implemented */
+            /** @todo not implemented */
             break;
         }
@@ -519 +520 @@
 }
 
-/* Called to set out hardware into desired power state, not supported at the moment. 
+/* Called to set out hardware into desired power state, not supported at the moment.
  * Required to return NO_ERROR always.
  */

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSeamless.cpp

@@ -147 +147 @@
     int rc;
 
-    AssertReturn(pRects || (cRects == 0), VERR_INVALID_PARAMETER);
-    AssertReturn(sizeof(VMMDevVideoSetVisibleRegion)+(cRects-1)*sizeof(RTRECT)
-                 == sizeof(VMMDevVideoSetVisibleRegion)+(uint64_t)(cRects-1)*sizeof(RTRECT), VERR_INVALID_PARAMETER);
+    AssertReturn(pRects || cRects == 0, VERR_INVALID_PARAMETER);
+    AssertMsgReturn(cRects <= _1M, ("%u\n", cRects), VERR_OUT_OF_RANGE);
 
     rc = vbglR3GRAlloc((VMMDevRequestHeader **)&pReq,
                          sizeof(VMMDevVideoSetVisibleRegion)
-                       + cRects * sizeof(RTRECT) - sizeof(RTRECT),
+                       + cRects * sizeof(RTRECT)
+                       - sizeof(RTRECT),
                        VMMDevReq_VideoSetVisibleRegion);
     if (RT_SUCCESS(rc))