Changeset 4124 in vbox

Timestamp:

Aug 12, 2007 5:58:06 PM (18 years ago)

Author:

vboxsync

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

23597

Message:

new surface code (disabled by default)

Location:

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

Files:

• driver.h (modified) (3 diffs)
• enable.c (modified) (8 diffs)

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

@@ -71 +71 @@
     ULONG cbDisplayInformation;
 } VRAMLAYOUT;
+
+typedef struct
+{
+    PPDEV   ppdev;
+} VBOXSURF, *PVBOXSURF;
 
 struct  _PDEV
@@ -121 +126 @@
     VRAMLAYOUT layout;
 
+    PVBOXSURF   pdsurfScreen;
+
 #ifdef VBOX_WITH_DDRAW
     BOOL             bDdExclusiveMode;
@@ -201 +208 @@
         if (ppdev)
         {
-            if (bIsScreenSurface(pso))
+            if (ppdev->psoScreenBitmap && bIsScreenSurface(pso))
             {
                 pso = ppdev->psoScreenBitmap;

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

@@ -304 +304 @@
     gflHooks = HOOK_BITBLT | HOOK_TEXTOUT | HOOK_FILLPATH |
                HOOK_COPYBITS | HOOK_STROKEPATH | HOOK_LINETO |
+#ifdef VBOX_NEW_SURFACE_CODE
+               HOOK_PAINT | HOOK_STRETCHBLT | HOOK_SYNCHRONIZE;
+#else
                HOOK_PAINT | HOOK_STRETCHBLT | HOOK_SYNCHRONIZEACCESS;
-
+#endif
     // Set up g_bOnNT40 based on the value in iEngineVersion
     if(iEngineVersion >= DDI_DRIVER_VERSION_NT5)
@@ -553 +556 @@
 \**************************************************************************/
 
-HSURF DrvEnableSurface(
-DHPDEV dhpdev)
+HSURF DrvEnableSurface(DHPDEV dhpdev)
 {
     PPDEV ppdev;
@@ -561 +563 @@
     ULONG ulBitmapType;
     FLONG flHooks;
-
+#ifdef VBOX_NEW_SURFACE_CODE
+    PVBOXSURF psurf;
+#endif
     DISPDBG((0, "DISP DrvEnableSurface called\n"));
         
@@ -607 +611 @@
     }
 
+#ifdef VBOX_NEW_SURFACE_CODE
+    psurf = (PVBOXSURF)EngAllocMem(0, sizeof(VBOXSURF), ALLOC_TAG);
+    if (psurf == NULL)
+    {
+        DISPDBG((0, "DrvEnableSurface: failed pdsurf memory allocation\n"));
+        goto l_Failure;
+    }
+    ppdev->pdsurfScreen = psurf;
+    psurf->ppdev        = ppdev;
+
+    //
+    // On NT4.0 we create a GDI managed bitmap as the primay surface. But
+    // on NT5.0 we create a device managed primary.
+    //
+    // On NT4.0 we still use our driver's accleration capabilities by
+    // doing a trick with EngLockSurface on the GDI managed primary.
+    //
+
+    if(g_bOnNT40)
+    {
+        hsurf = (HSURF) EngCreateBitmap(sizl,
+                                        ppdev->lDeltaScreen,
+                                        ulBitmapType,
+                                        (ppdev->lDeltaScreen > 0) ? BMF_TOPDOWN : 0,
+                                        (PVOID)(ppdev->pjScreen));
+    }
+    else
+    {
+        hsurf = (HSURF)EngCreateDeviceSurface((DHSURF)psurf, sizl,
+                                              ulBitmapType);
+    }
+ 
+    if ( hsurf == 0 )
+    {
+        DISPDBG((0, "DrvEnableSurface: failed EngCreateDeviceBitmap\n"));
+        goto l_Failure;
+    }
+
+    //
+    // On NT5.0 we call EngModifSurface to expose our device surface to
+    // GDI. We cant do this on NT4.0 hence we call EngAssociateSurface.
+    //
+     
+    if(g_bOnNT40)
+    {
+        //
+        // We have to associate the surface we just created with our physical
+        // device so that GDI can get information related to the PDEV when
+        // it's drawing to the surface (such as, for example, the length of 
+        // styles on the device when simulating styled lines).
+        //
+
+        //
+        // On NT4.0 we dont want to be called to Synchronize Access
+        //
+        LONG myflHooks = flHooks;
+        myflHooks &= ~HOOK_SYNCHRONIZE;
+
+        if (!EngAssociateSurface(hsurf, ppdev->hdevEng, myflHooks))
+        {
+            DISPDBG((0, "DrvEnableSurface: failed EngAssociateSurface\n"));
+            goto l_Failure; 
+        }
+
+        //
+        // Jam in the value of dhsurf into screen SURFOBJ. We do this to
+        // make sure the driver acclerates Drv calls we hook and not
+        // punt them back to GDI as the SURFOBJ's dhsurf = 0. 
+        //
+        ppdev->psoScreenBitmap = EngLockSurface(hsurf);
+        if(ppdev->psoScreenBitmap == 0)
+        {
+            DISPDBG((0, "DrvEnableSurface: failed EngLockSurface\n"));
+            goto l_Failure; 
+        }
+
+        ppdev->psoScreenBitmap->dhsurf = (DHSURF)hsurf;
+
+    }
+    else
+    {
+        //
+        // Tell GDI about the screen surface.  This will enable GDI to render
+        // directly to the screen.
+        //
+
+        if ( !EngModifySurface(hsurf,
+                               ppdev->hdevEng,
+                               flHooks,
+                               MS_NOTSYSTEMMEMORY,
+                               (DHSURF)psurf,
+                               ppdev->pjScreen,
+                               ppdev->lDeltaScreen,
+                               NULL))
+        {
+            DISPDBG((0, "DrvEnableSurface: failed EngModifySurface"));
+            goto l_Failure;
+        }
+    }
+    ppdev->hsurfScreen  = hsurf;
+    ppdev->flHooks      = flHooks;
+    ppdev->ulBitmapType = ulBitmapType;
+#else
     hsurf = (HSURF) EngCreateBitmap(sizl,
                                     ppdev->lDeltaScreen,
@@ -661 +768 @@
         }
     }
-    
+#endif /* VBOX_NEW_SURFACE_CODE */    
     return ppdev->hsurfScreen;
      
@@ -695 +802 @@
         ppdev->hsurfScreen = (HSURF)0;
     }
-    
+#ifdef VBOX_NEW_SURFACE_CODE
+    if (ppdev->pdsurfScreen)
+    {
+        EngFreeMem(ppdev->pdsurfScreen);
+        ppdev->pdsurfScreen = NULL;
+    }
+#else
     if (ppdev->hsurfScreenBitmap)
     {
@@ -701 +814 @@
         ppdev->hsurfScreenBitmap = (HSURF)0;
     }
-    
+#endif    
     vDisableSURF(ppdev);
 }
@@ -732 +845 @@
         }
 
+#ifdef VBOX_NEW_SURFACE_CODE
+        todo
+#endif
         if (pjScreen != ppdev->pjScreen)
         {