Changeset 19430 in vbox for trunk/src/VBox/Additions

Timestamp:

May 6, 2009 1:16:44 PM (16 years ago)

Author:

vboxsync

Message:

HGSMI: windows graphics drivers.

Location:

trunk/src/VBox/Additions/WINNT/Graphics

Files:

• Display/vbox.c (modified) (4 diffs)
• Miniport/Helper.cpp (modified) (2 diffs)
• Miniport/Helper.h (modified) (1 diff)
• Miniport/VBoxVideo.cpp (modified) (4 diffs)
• Miniport/VBoxVideo.h (modified) (1 diff)

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

@@ -435 +435 @@
     BOOL bRc = FALSE;
 
-    DISPDBG((1, "VBoxDisp::vboxHwBufferBeginUpdate called flags = 0x%08X\n",
-             ppdev->pVBVA? ppdev->pVBVA->u32HostEvents: -1));
+    // DISPDBG((1, "VBoxDisp::vboxHwBufferBeginUpdate called flags = 0x%08X\n",
+    //          ppdev->pVBVA? ppdev->pVBVA->u32HostEvents: -1));
 
     if (   ppdev->pVBVA
@@ -469 +469 @@
             ppdev->pVBVA->indexRecordFree = indexRecordNext;
 
-            DISPDBG((1, "VBoxDisp::vboxHwBufferBeginUpdate indexRecordNext = %d\n", indexRecordNext));
+            // DISPDBG((1, "VBoxDisp::vboxHwBufferBeginUpdate indexRecordNext = %d\n", indexRecordNext));
 
             /* Remember which record we are using. */
@@ -485 +485 @@
     VBVARECORD *pRecord;
 
-    DISPDBG((1, "VBoxDisp::vboxHwBufferEndUpdate called\n"));
+    // DISPDBG((1, "VBoxDisp::vboxHwBufferEndUpdate called\n"));
 
     VBVA_ASSERT(ppdev->pVBVA);
@@ -586 +586 @@
         uint32_t cbChunk = cb;
 
-        DISPDBG((1, "VBoxDisp::vboxHwBufferWrite pVBVA->off32Free %d, pRecord->cbRecord 0x%08X, cbHwBufferAvail %d, cb %d, cbWritten %d\n",
-                    pVBVA->off32Free, pRecord->cbRecord, cbHwBufferAvail, cb, cbWritten));
+        // DISPDBG((1, "VBoxDisp::vboxHwBufferWrite pVBVA->off32Free %d, pRecord->cbRecord 0x%08X, cbHwBufferAvail %d, cb %d, cbWritten %d\n",
+        //             pVBVA->off32Free, pRecord->cbRecord, cbHwBufferAvail, cb, cbWritten));
 
         if (cbChunk >= cbHwBufferAvail)

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

@@ -285 +285 @@
 }
 
+#ifndef VBOX_WITH_HGSMI
 /**
  * Sends the pointer shape to the VMMDev
@@ -359 +360 @@
     return bRC;
 }
+#endif /* VBOX_WITH_HGSMI */

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/Helper.h

@@ -39 +39 @@
 BOOLEAN vboxQueryHostWantsAbsolute();
 winVersion_t vboxQueryWinVersion();
+#ifndef VBOX_WITH_HGSMI
 BOOLEAN vboxUpdatePointerShape(PVIDEO_POINTER_ATTRIBUTES pointerAttr, uint32_t cbLength);
+#endif /* !VBOX_WITH_HGSMI */
 
 #include "vboxioctl.h"

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

@@ -1207 +1207 @@
       VBoxSetupDisplays((PDEVICE_EXTENSION)HwDeviceExtension, ConfigInfo, AdapterMemorySize);
 #else
+      /* Initialize VBoxGuest library, which is used for requests which go through VMMDev. */
+      rc = VbglInit ();
+
       /* Guest supports only HGSMI, the old VBVA via VMMDev is not supported. Old 
        * code will be ifdef'ed and later removed.
@@ -1498 +1501 @@
                 PointerAttributes.Enable = VBOX_MOUSE_POINTER_VISIBLE;
 
+#ifndef VBOX_WITH_HGSMI
                 Result = vboxUpdatePointerShape(&PointerAttributes, sizeof (PointerAttributes));
+#else
+                Result = vboxUpdatePointerShape((PDEVICE_EXTENSION)HwDeviceExtension, &PointerAttributes, sizeof (PointerAttributes));
+#endif/* VBOX_WITH_HGSMI */
 
                 if (!Result)
@@ -1526 +1533 @@
                 PointerAttributes.Enable = 0;
 
+#ifndef VBOX_WITH_HGSMI
                 Result = vboxUpdatePointerShape(&PointerAttributes, sizeof (PointerAttributes));
+#else
+                Result = vboxUpdatePointerShape((PDEVICE_EXTENSION)HwDeviceExtension, &PointerAttributes, sizeof (PointerAttributes));
+#endif/* VBOX_WITH_HGSMI */
 
                 if (!Result)
@@ -1569 +1580 @@
                 dprintf(("\tBytes attached: %d\n", RequestPacket->InputBufferLength - sizeof(VIDEO_POINTER_ATTRIBUTES)));
 #endif
+#ifndef VBOX_WITH_HGSMI
                 Result = vboxUpdatePointerShape(pPointerAttributes, RequestPacket->InputBufferLength);
+#else
+                Result = vboxUpdatePointerShape((PDEVICE_EXTENSION)HwDeviceExtension, pPointerAttributes, RequestPacket->InputBufferLength);
+#endif/* VBOX_WITH_HGSMI */
                 if (!Result)
                     dprintf(("VBoxVideo::VBoxVideoStartIO: Could not set hardware pointer -> fallback\n"));

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

@@ -242 +242 @@
                              PVIDEO_PORT_CONFIG_INFO pConfigInfo,
                              ULONG AdapterMemorySize);
+BOOLEAN vboxUpdatePointerShape (PDEVICE_EXTENSION PrimaryExtension,
+                                PVIDEO_POINTER_ATTRIBUTES pointerAttr,
+                                uint32_t cbLength);
 #endif /* VBOX_WITH_HGSMI */
 } /* extern "C" */