Changeset 17610 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Display/enable.c

Timestamp:

Mar 10, 2009 10:14:15 AM (16 years ago)

Author:

vboxsync

Message:

HGSMI for the graphics device: the windows guest display driver prototype code.

File:

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

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

@@ -130 +130 @@
         ULONG ret = 0;
 
+#ifndef VBOX_WITH_HGSMI
         if (ppdev && ppdev->pInfo && vboxHwBufferBeginUpdate (ppdev))
         {
@@ -142 +143 @@
         else
             DISPDBG((0, "VBOXESC_ISVRDPACTIVE -> 0\n"));
+#else
+        if (ppdev && ppdev->pVBVA)
+        {
+            if (ppdev->pVBVA->u32HostEvents & VBVA_F_MODE_VRDP)
+            {
+                ret = 1;
+            }
+            DISPDBG((0, "VBOXESC_ISVRDPACTIVE -> %d (%x)\n", ret, ppdev->pVBVA->u32HostEvents));
+        }
+        else
+            DISPDBG((0, "VBOXESC_ISVRDPACTIVE -> 0\n"));
+#endif  /* VBOX_WITH_HGSMI */
         return ret;
     }
@@ -274 +287 @@
     {   INDEX_DrvStrokePath,            (PFN) DrvStrokePath         },  // 14 0xe
     {   INDEX_DrvFillPath,              (PFN) DrvFillPath           },  // 15 0xf
+//    {   INDEX_DrvStrokeAndFillPath,     (PFN) DrvStrokeAndFillPath  },        // 16 0x10
     {   INDEX_DrvPaint,                 (PFN) DrvPaint              },  // 17 0x11
     {   INDEX_DrvBitBlt,                (PFN) DrvBitBlt             },  // 18 0x12
@@ -316 +330 @@
 #define HOOKS_BMF32BPP gflHooks
 
+#ifndef VBOX_WITH_HGSMI
 HSEMAPHORE ghsemHwBuffer = 0;
+#endif /* !VBOX_WITH_HGSMI */
 
 /******************************Public*Routine******************************\
@@ -336 +352 @@
     // Set up hook flags to intercept all functions which can generate VRDP orders
     gflHooks = HOOK_BITBLT | HOOK_TEXTOUT | HOOK_FILLPATH |
-               HOOK_COPYBITS | HOOK_STROKEPATH | HOOK_LINETO |
+               HOOK_COPYBITS | HOOK_STROKEPATH | HOOK_LINETO | /* HOOK_STROKEANDFILLPATH | */
 #ifdef VBOX_NEW_SURFACE_CODE
                HOOK_PAINT | HOOK_STRETCHBLT | HOOK_SYNCHRONIZE;
@@ -367 +383 @@
             DDI_DRIVER_VERSION_NT4;
 
+#ifndef VBOX_WITH_HGSMI
     if (!ghsemHwBuffer)
     {
         ghsemHwBuffer = EngCreateSemaphore ();
     }
+#endif /* !VBOX_WITH_HGSMI */
 
     return(TRUE);
@@ -387 +405 @@
     DISPDBG((0, "VBoxDisp::DrvDisableDriver called.\n"));
 
+#ifndef VBOX_WITH_HGSMI
     if (ghsemHwBuffer)
     {
@@ -392 +411 @@
         ghsemHwBuffer = NULL;
     }
+#endif /* !VBOX_WITH_HGSMI */
 
     return;
@@ -1128 +1148 @@
         case DN_DEVICE_ORIGIN:
             ppdev->ptlDevOrg = *(PPOINTL)pvData;
+#ifndef VBOX_WITH_HGSMI
             DISPDBG((3, "DN_DEVICE_ORIGIN: %d, %d (PSO = %p, pInfo = %p)\n", ppdev->ptlDevOrg.x, 
                      ppdev->ptlDevOrg.y, pso, ppdev->pInfo));
@@ -1136 +1157 @@
                 VBoxProcessDisplayInfo(ppdev);
             }
+#else
+            DISPDBG((3, "DN_DEVICE_ORIGIN: %d, %d (PSO = %p)\n", ppdev->ptlDevOrg.x, 
+                     ppdev->ptlDevOrg.y, pso));
+            if (ppdev->bHGSMISupported)
+            {
+                VBoxProcessDisplayInfo(ppdev);
+            }
+#endif /* VBOX_WITH_HGSMI */
             break;
         case DN_DRAWING_BEGIN: