Changeset 22412 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Aug 24, 2009 1:02:40 PM (15 years ago)

Author:

vboxsync

Message:

HGSMI/VBVA updates

Location:

trunk/src/VBox/Additions/WINNT/Graphics

Files:

• Display/enable.c (modified) (3 diffs)
• Display/pointer.c (modified) (1 diff)
• Display/screen.c (modified) (1 diff)
• Display/vbox.c (modified) (3 diffs)
• Miniport/VBoxVideo.cpp (modified) (4 diffs)

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

@@ -558 +558 @@
     vDisablePalette((PPDEV) dhpdev);
 
-    /* Free the driver's VBVA resources. */
-    vboxVbvaDisable ((PPDEV) dhpdev);
-
     EngFreeMem(dhpdev);
 }
@@ -867 +864 @@
     vboxVHWADisable(ppdev);
 #endif
+
+#ifdef VBOX_WITH_HGSMI
+    /* Free the driver's VBVA resources. */
+    vboxVbvaDisable ((PPDEV) dhpdev);
+#endif
     vDisableSURF(ppdev);
 }
@@ -959 +961 @@
         vboxVHWADisable(ppdev);
 #endif
+
+#ifdef VBOX_WITH_HGSMI
+        /* Free the driver's VBVA resources. */
+        vboxVbvaDisable ((PPDEV) dhpdev);
+#endif
+
         //
         // We must give up the display.

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

@@ -164 +164 @@
     DWORD   returnedDataLength;
 
-    DISPDBG((0, "DISP bSetHardwarePointerShape SPS_ALPHA = %d\n", fl & SPS_ALPHA));
+    DISPDBG((0, "DISP[%d] bSetHardwarePointerShape SPS_ALPHA = %d\n", ppdev->iDevice, fl & SPS_ALPHA));
 
     // We don't use the exclusion rectangle because we only support

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

@@ -245 +245 @@
                                  (uint8_t *)ppdev->pjScreen + ppdev->layout.offDisplayInformation + sizeof (HGSMIHOSTFLAGS),
                                  ppdev->layout.cbDisplayInformation - sizeof (HGSMIHOSTFLAGS),
-                                 ppdev->layout.offDisplayInformation + sizeof (HGSMIHOSTFLAGS));
+                                 info.areaDisplay.offBase + ppdev->layout.offDisplayInformation + sizeof (HGSMIHOSTFLAGS));
+
+        DISPDBG((0, "VBoxDISP::vboxInitVBoxVideo: offBase 0x%x\n",
+                 info.areaDisplay.offBase));
 
         if (RT_FAILURE (rc))

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

@@ -345 +345 @@
     HGSMIOFFSET offBuffer = HGSMIHeapBufferOffset (&ppdev->hgsmiDisplayHeap, p);
 
+    DISPDBG((0, "VBoxDISP::vboxHGSMIBufferSubmit: offset 0x%x\n", offBuffer));
+
     ppdev->pfnHGSMIGHCommandPost(ppdev->hMpHGSMI, offBuffer);
 //    ASMOutU16 (VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_VBVA_GUEST);
@@ -389 +391 @@
     BOOL bRc = FALSE;
 
-    DISPDBG((1, "VBoxDisp::vboxVbvaEnable called\n"));
+    DISPDBG((1, "VBoxDisp::vboxVbvaEnable called ppdev %p, hgsmi %d, vbva %p\n", ppdev, ppdev->bHGSMISupported, ppdev->pVBVA));
 
     if (ppdev->bHGSMISupported)
     {
         VBVABUFFER *pVBVA = (VBVABUFFER *)((uint8_t *)ppdev->pjScreen + ppdev->layout.offVBVABuffer);
+
+        DISPDBG((1, "VBoxDisp::vboxVbvaEnable screen %p vbva off 0x%x\n", ppdev->pjScreen, ppdev->layout.offVBVABuffer));
 
         pVBVA->u32HostEvents      = 0;
@@ -677 +681 @@
             pScreen->i32OriginX      = ppdev->ptlDevOrg.x;
             pScreen->i32OriginY      = ppdev->ptlDevOrg.y;
+            pScreen->u32StartOffset  = 0;
             pScreen->u32LineSize     = ppdev->lDeltaScreen > 0?ppdev->lDeltaScreen: -ppdev->lDeltaScreen;
             pScreen->u32Width        = ppdev->cxScreen;

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/VBoxVideo.cpp

@@ -1565 +1565 @@
                 Result = vboxUpdatePointerShape(&PointerAttributes, sizeof (PointerAttributes));
 #else
-                Result = vboxUpdatePointerShape((PDEVICE_EXTENSION)HwDeviceExtension, &PointerAttributes, sizeof (PointerAttributes));
-#endif/* VBOX_WITH_HGSMI */
+                Result = vboxUpdatePointerShape(((PDEVICE_EXTENSION)HwDeviceExtension)->pPrimary, &PointerAttributes, sizeof (PointerAttributes));
+#endif /* VBOX_WITH_HGSMI */
 
                 if (!Result)
@@ -1597 +1597 @@
                 Result = vboxUpdatePointerShape(&PointerAttributes, sizeof (PointerAttributes));
 #else
-                Result = vboxUpdatePointerShape((PDEVICE_EXTENSION)HwDeviceExtension, &PointerAttributes, sizeof (PointerAttributes));
-#endif/* VBOX_WITH_HGSMI */
+                Result = vboxUpdatePointerShape(((PDEVICE_EXTENSION)HwDeviceExtension)->pPrimary, &PointerAttributes, sizeof (PointerAttributes));
+#endif /* VBOX_WITH_HGSMI */
 
                 if (!Result)
@@ -1644 +1644 @@
                 Result = vboxUpdatePointerShape(pPointerAttributes, RequestPacket->InputBufferLength);
 #else
-                Result = vboxUpdatePointerShape((PDEVICE_EXTENSION)HwDeviceExtension, pPointerAttributes, RequestPacket->InputBufferLength);
-#endif/* VBOX_WITH_HGSMI */
+                Result = vboxUpdatePointerShape(((PDEVICE_EXTENSION)HwDeviceExtension)->pPrimary, pPointerAttributes, RequestPacket->InputBufferLength);
+#endif /* VBOX_WITH_HGSMI */
                 if (!Result)
                     dprintf(("VBoxVideo::VBoxVideoStartIO: Could not set hardware pointer -> fallback\n"));
@@ -2225 +2225 @@
     VP_STATUS Status;
 
-    dprintf(("VBoxVideo::VBoxVideoMapVideoMemory\n"));
+    dprintf(("VBoxVideo::VBoxVideoMapVideoMemory: fb offset 0x%x\n", DeviceExtension->ulFrameBufferOffset));
 
     FrameBuffer.QuadPart = VBE_DISPI_LFB_PHYSICAL_ADDRESS + DeviceExtension->ulFrameBufferOffset;