Changeset 4265 in vbox

Timestamp:

Aug 21, 2007 3:44:41 PM (17 years ago)

Author:

vboxsync

Message:

Implemented DrvDeriveSurface in the Windows guest diplay driver.

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Display

Files:

• dd.c (modified) (3 diffs)
• driver.h (modified) (1 diff)
• drv.c (modified) (1 diff)
• enable.c (modified) (12 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Display/dd.c

@@ -153 +153 @@
             pVm->dwFlags        = VIDMEM_ISLINEAR ;
             pVm->fpStart        = pDev->layout.offDDRAWHeap;
-            pVm->fpEnd          = pDev->layout.offDDRAWHeap + pDev->layout.cbDDRAWHeap;
+            pVm->fpEnd          = pDev->layout.offDDRAWHeap + pDev->layout.cbDDRAWHeap - 1; /* inclusive */
 
             pVm->ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN;
-            DISPDBG((0, "fpStart %ld fpEnd %ld\n", pVm->fpStart, pVm->fpEnd));
+            DISPDBG((0, "fpStart %x fpEnd %x\n", pVm->fpStart, pVm->fpEnd));
 
             pVm++;
@@ -508 +508 @@
     DISPDBG((0, "BPP %d lPitch=%d\n", lBpp, lPitch));
 
-    lpSurfaceGlobal->dwBlockSizeX   = lPitch * lpSurfaceGlobal->wHeight;
-    lpSurfaceGlobal->dwBlockSizeY   = 1;
+    lpSurfaceGlobal->dwBlockSizeX   = lPitch;
+    lpSurfaceGlobal->dwBlockSizeY   = lpSurfaceGlobal->wHeight;
     lpSurfaceGlobal->lPitch         = lPitch;
 
@@ -524 +524 @@
     {
         DISPDBG((0, "-> secondary surface\n"));
-        lpSurfaceGlobal->dwUserMemSize  = lPitch * (DWORD)(lpSurfaceGlobal->wHeight);
         lpSurfaceGlobal->fpVidMem       = DDHAL_PLEASEALLOC_BLOCKSIZE;
     }

trunk/src/VBox/Additions/WINNT/Graphics/Display/driver.h

@@ -208 +208 @@
         if (ppdev)
         {
-            if (ppdev->psoScreenBitmap && bIsScreenSurface(pso))
+            if (ppdev->psoScreenBitmap && pso->hsurf == ppdev->hsurfScreen)
             {
+                /* Convert the device PSO to the bitmap PSO which can be passed to Eng*. */
                 pso = ppdev->psoScreenBitmap;
             }

trunk/src/VBox/Additions/WINNT/Graphics/Display/drv.c

@@ -83 +83 @@
     {
         PPDEV ppdev = (PPDEV)pso->dhpdev;
-        return (ppdev && pso->hsurf == ppdev->hsurfScreen);
+        
+        /* The screen surface has the 'pso->dhpdev' field, 
+         * and is either the screen device surface with handle = hsurfScreen,
+         * or a surface derived from DDRAW with address equal to the framebuffer.
+         */
+        if (   ppdev
+            && (   pso->hsurf == ppdev->hsurfScreen
+                || pso->pvBits == ppdev->pjScreen
+               )
+           )
+        {
+            return TRUE;
+        }
     }
 

trunk/src/VBox/Additions/WINNT/Graphics/Display/enable.c

@@ -30 +30 @@
     {   INDEX_DrvOffset,                (PFN) DrvOffset             },  //  6
     {   INDEX_DrvDisableDriver,         (PFN) DrvDisableDriver      },  //  8
-    {   INDEX_DrvCreateDeviceBitmap,    (PFN) DrvCreateDeviceBitmap },  // 10
-    {   INDEX_DrvDeleteDeviceBitmap,    (PFN) DrvDeleteDeviceBitmap },  // 11
+//    {   INDEX_DrvCreateDeviceBitmap,    (PFN) DrvCreateDeviceBitmap },  // 10
+//    {   INDEX_DrvDeleteDeviceBitmap,    (PFN) DrvDeleteDeviceBitmap },  // 11
     {   INDEX_DrvRealizeBrush,          (PFN) DrvRealizeBrush       },  // 12
     {   INDEX_DrvDitherColor,           (PFN) DrvDitherColor        },  // 13
@@ -53 +53 @@
     {   INDEX_DrvEnableDirectDraw,      (PFN) DrvEnableDirectDraw   },  // 60 0x3c
     {   INDEX_DrvDisableDirectDraw,     (PFN) DrvDisableDirectDraw  },  // 61 0x3d
+    {   INDEX_DrvDeriveSurface,         (PFN) DrvDeriveSurface      },  // 85 0x55
 #endif
 };
@@ -248 +249 @@
     {   INDEX_DrvAssertMode,            (PFN) DrvAssertMode         },  //  5 0x5
     {   INDEX_DrvDisableDriver,         (PFN) DrvDisableDriver      },  //  8 0x8
-    {   INDEX_DrvCreateDeviceBitmap,    (PFN) DrvCreateDeviceBitmap },  // 10
-    {   INDEX_DrvDeleteDeviceBitmap,    (PFN) DrvDeleteDeviceBitmap },  // 11
+//    {   INDEX_DrvCreateDeviceBitmap,    (PFN) DrvCreateDeviceBitmap },  // 10
+//    {   INDEX_DrvDeleteDeviceBitmap,    (PFN) DrvDeleteDeviceBitmap },  // 11
     {   INDEX_DrvRealizeBrush,          (PFN) DrvRealizeBrush       },  // 12 0xc
     {   INDEX_DrvDitherColor,           (PFN) DrvDitherColor        },  // 13 0xd
@@ -271 +272 @@
     {   INDEX_DrvEnableDirectDraw,      (PFN) DrvEnableDirectDraw   },  // 60 0x3c
     {   INDEX_DrvDisableDirectDraw,     (PFN) DrvDisableDirectDraw  },  // 61 0x3d
-    /** @todo */
-////    {   INDEX_DrvDeriveSurface,         (PFN) DrvDeriveSurface      },  // 85
+    {   INDEX_DrvDeriveSurface,         (PFN) DrvDeriveSurface      },  // 85 0x55
 #endif
     {   INDEX_DrvNotify,                (PFN) DrvNotify             },  // 87 0x57
@@ -482 +482 @@
     memcpy(pGdiInfo, &GdiInfo, min(cjGdiInfo, sizeof(GDIINFO)));
 
-    DISPDBG((0, "VBoxDisp::DrvEnablePDEV completed\n"));
+    DISPDBG((0, "VBoxDisp::DrvEnablePDEV completed %x\n", ppdev));
     
     return((DHPDEV) ppdev);
@@ -501 +501 @@
 VOID DrvCompletePDEV(DHPDEV dhpdev, HDEV hdev)
 {
-    DISPDBG((0, "VBoxDisp::DrvCompletePDEV called\n"));
+    DISPDBG((0, "VBoxDisp::DrvCompletePDEV called %x\n", dhpdev));
     ((PPDEV) dhpdev)->hdevEng = hdev;
 }
@@ -515 +515 @@
 VOID DrvDisablePDEV(DHPDEV dhpdev)
 {
-    DISPDBG((0, "VBoxDisp::DrvDisablePDEV called\n"));
+    DISPDBG((0, "VBoxDisp::DrvDisablePDEV called %x\n", dhpdev));
 //    vStopNotificationThread ((PPDEV) dhpdev);
     vDisablePalette((PPDEV) dhpdev);
@@ -934 +934 @@
 }
 
+#if 0
 /******************************Public*Routine**********************************\
  * HBITMAP DrvCreateDeviceBitmap
@@ -971 +972 @@
     DISPDBG((0, "DISP DrvDeleteDeviceBitmap %x", dhsurf));
 }
+#endif /* 0 */
 
 /******************************Public*Routine******************************\
@@ -1175 +1177 @@
     if (pSurface->ddsCaps.dwCaps & DDSCAPS_NONLOCALVIDMEM)
     {
-        DISPDBG((0, "DrvDeriveSurface return NULL, surface in AGP memory"));
+        DISPDBG((0, "DrvDeriveSurface return NULL, surface in AGP memory\n"));
         return 0;
     }
@@ -1183 +1185 @@
     if (pSurface->lpSurfMore->ddsCapsEx.dwCaps2 & DDSCAPS2_TEXTUREMANAGE)
     {
-        DISPDBG((0, "DrvDeriveSurface return NULL, surface is managed"));
+        DISPDBG((0, "DrvDeriveSurface return NULL, surface is managed\n"));
         return 0;
     }
@@ -1229 +1231 @@
         }
 
+        /* Create a bitmap that represents the DDRAW bits.
+         * Important is to calculate the address of the bitmap.
+         */
         hbmDevice = EngCreateBitmap(sizel,
-                                    pDev->lDeltaScreen,
+                                    pSurfaceGlobal->lPitch,
                                     ulBitmapType,
                                     (pDev->lDeltaScreen > 0) ? BMF_TOPDOWN : 0,
-                                    (PVOID) (pDev->pjScreen));
+                                    (PVOID) (pDev->pjScreen + pSurfaceGlobal->fpVidMem));
         if (hbmDevice)
         {
-            VOID* pvScan0 = pDev->pjScreen + pSurfaceGlobal->fpVidMem;
-
-            //
-            // Note that HOOK_SYNCHRONIZE must always be hooked when we
-            // give GDI a pointer to the bitmap bits. We don't need to
-            // do it here since HOOK_SYNCHRONIZE is always set in our
-            // pdev->flHooks
-            //
-            ULONG   flags = MS_NOTSYSTEMMEMORY;
-
-            if ( EngModifySurface((HSURF)hbmDevice,
-                                  pDev->hdevEng,
-                                  pDev->flHooks,
-                                  flags,
-                                  (DHSURF)hbmDevice,
-                                  pvScan0,
-                                  pSurfaceGlobal->lPitch,
-                                  NULL) )
-            {
-                SURFOBJ*    surfobj = EngLockSurface((HSURF) hbmDevice);
-                AssertMsg(surfobj->iType == STYPE_BITMAP, ("expected STYPE_BITMAP"));
-                surfobj->iType = STYPE_DEVBITMAP;
-                EngUnlockSurface(surfobj);
-
-                DISPDBG((0, "DrvDeriveSurface return succeed\n"));
+            if (pSurfaceGlobal->fpVidMem == 0)
+            {
+                /* Screen surface, mark it so it will be recognized by the driver.
+                 * and so the driver will be called on any operations on the surface
+                 * (required for VBVA and VRDP).
+                 */
+                if (EngAssociateSurface((HSURF)hbmDevice, pDev->hdevEng, flHooks))
+                {
+                    SURFOBJ *surfobj = EngLockSurface ((HSURF)hbmDevice);
+                    DISPDBG((0, "DrvDeriveSurface surfobj %x, hsurf = %x\n", surfobj, surfobj->hsurf));
+                
+                    surfobj->dhpdev = (DHPDEV)pDev;
+                
+                    EngUnlockSurface(surfobj);
+
+                    DISPDBG((0, "DrvDeriveSurface return succeed %x at %x\n", hbmDevice, pSurfaceGlobal->fpVidMem));
+                    return(hbmDevice);
+                }
+            }
+            else
+            {
+                DISPDBG((0, "DrvDeriveSurface return succeed %x at %x\n", hbmDevice, pSurfaceGlobal->fpVidMem));
                 return(hbmDevice);
             }
 
-            DISPDBG((0, "DrvDeriveSurface: EngModifySurface failed\n"));
+            DISPDBG((0, "DrvDeriveSurface: EngAssociateSurface failed\n"));
             EngDeleteSurface((HSURF)hbmDevice);
         }