Changeset 4257 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Display

Timestamp:

Aug 21, 2007 12:06:02 PM (18 years ago)

Author:

vboxsync

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

23767

Message:

Completed DrvDeriveSurface

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Display/enable.c (modified) (8 diffs)

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_DrvRealizeBrush,          (PFN) DrvRealizeBrush       },  // 12
     {   INDEX_DrvDitherColor,           (PFN) DrvDitherColor        },  // 13
@@ -230 +232 @@
     {   INDEX_DrvAssertMode,            (PFN) DrvAssertMode         },  //  5 0x5
     {   INDEX_DrvDisableDriver,         (PFN) DrvDisableDriver      },  //  8 0x8
+    {   INDEX_DrvCreateDeviceBitmap,    (PFN) DrvCreateDeviceBitmap },  // 10
+    {   INDEX_DrvDeleteDeviceBitmap,    (PFN) DrvDeleteDeviceBitmap },  // 11
     {   INDEX_DrvRealizeBrush,          (PFN) DrvRealizeBrush       },  // 12 0xc
     {   INDEX_DrvDitherColor,           (PFN) DrvDitherColor        },  // 13 0xd
@@ -913 +917 @@
 }
 
+/******************************Public*Routine**********************************\
+ * HBITMAP DrvCreateDeviceBitmap
+ *
+ * Function called by GDI to create a device-format-bitmap (DFB).  We will
+ * always try to allocate the bitmap in off-screen; if we can't, we simply
+ * fail the call and GDI will create and manage the bitmap itself.
+ *
+ * Note: We do not have to zero the bitmap bits.  GDI will automatically
+ *       call us via DrvBitBlt to zero the bits (which is a security
+ *       consideration).
+ *
+\******************************************************************************/
+
+HBITMAP 
+DrvCreateDeviceBitmap(
+    DHPDEV      dhpdev,
+    SIZEL       sizl,
+    ULONG       iFormat)
+{
+    DISPDBG((0, "DISP DrvCreateDeviceBitmap %x (%d,%d) %x\n", dhpdev, sizl.cx, sizl.cy, iFormat));
+    /* Let GDI manage the bitmap */
+    return (HBITMAP)0;
+}
+
+/******************************Public*Routine**********************************\
+ * VOID DrvDeleteDeviceBitmap
+ *
+ * Deletes a DFB.
+ *
+\******************************************************************************/
+
+VOID 
+DrvDeleteDeviceBitmap(
+    DHSURF      dhsurf)
+{
+    DISPDBG((0, "DISP DrvDeleteDeviceBitmap %x", dhsurf));
+}
+
 /******************************Public*Routine******************************\
 * DrvGetModes
@@ -1098 +1140 @@
 {
     PPDEV               pDev = (PPDEV)pDirectDraw->dhpdev;
-//    HBITMAP             hbmDevice;
+    HBITMAP             hbmDevice;
     DD_SURFACE_GLOBAL*  pSurfaceGlobal;
-//    SIZEL               sizl;
 
     DISPDBG((0, "%s: %p\n", __FUNCTION__, pDev));
@@ -1112 +1153 @@
     AssertMsg(!(pSurfaceGlobal->ddpfSurface.dwFlags & DDPF_FOURCC), ("GDI called us with a non-RGB surface!"));
 
-#if 0
     // The GDI driver does not accelerate surfaces in AGP memory,
     // thus we fail the call
@@ -1148 +1188 @@
         DWORD ulBitmapType, flHooks;        
 
-        sizl.cx = pSurfaceGlobal->wWidth;
-        sizl.cy = pSurfaceGlobal->wHeight;
+        sizel.cx = pSurfaceGlobal->wWidth;
+        sizel.cy = pSurfaceGlobal->wHeight;
 
         if (pDev->ulBitCount == 8)
         {
-            if (!bInit256ColorPalette(pDev)) {
-                DISPDBG((0, "DISP DrvEnableSurface failed to init the 8bpp palette\n"));
-                return(FALSE);
-            }
             ulBitmapType = BMF_8BPP;
             flHooks = HOOKS_BMF8BPP;
@@ -1176 +1212 @@
         }
 
-        hbmDevice = EngCreateBitmap(sizl,
+        hbmDevice = EngCreateBitmap(sizel,
                                     pDev->lDeltaScreen,
                                     ulBitmapType,
@@ -1218 +1254 @@
     DISPDBG((0, "DrvDeriveSurface return NULL"));
     DISPDBG((0, "pSurfaceGlobal->ddpfSurface.dwRGBBitCount = %d, lPitch =%ld", pSurfaceGlobal->ddpfSurface.dwRGBBitCount,pSurfaceGlobal->lPitch));
-#endif
     
     return(0);