Changeset 22448 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Miniport

Timestamp:

Aug 25, 2009 11:12:49 PM (15 years ago)

Author:

vboxsync

Message:

hgsmi/guest video driver: backwards compatibility with < WinXP: make newer videoport functions picked up at runtime

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Miniport

Files:

• VBoxVideo.cpp (modified) (2 diffs)
• VBoxVideo.h (modified) (6 diffs)
• vboxioctl.h (modified) (2 diffs)

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

@@ -1158 +1158 @@
 
 #ifdef VBOX_WITH_HGSMI
-   VideoPortCreateSpinLock(HwDeviceExtension, &((PDEVICE_EXTENSION)HwDeviceExtension)->u.primary.pGHRWLock);
+   VBoxSetupVideoPortFunctions((PDEVICE_EXTENSION)HwDeviceExtension, &((PDEVICE_EXTENSION)HwDeviceExtension)->u.primary.VideoPortProcs, ConfigInfo);
+   ((PDEVICE_EXTENSION)HwDeviceExtension)->u.primary.VideoPortProcs.pfnCreateSpinLock(HwDeviceExtension, &((PDEVICE_EXTENSION)HwDeviceExtension)->u.primary.pGHRWLock);
 #endif
 
@@ -1998 +1999 @@
             break;
         }
+        case IOCTL_VIDEO_HGSMI_QUERY_PORTPROCS:
+        {
+            dprintf(("VBoxVideo::VBoxVideoStartIO: IOCTL_VIDEO_HGSMI_QUERY_PORTPROCS\n"));
+
+            if (RequestPacket->OutputBufferLength < sizeof(HGSMIQUERYCPORTPROCS))
+            {
+                dprintf(("VBoxVideo::VBoxVideoStartIO: Output buffer too small: %d needed: %d!!!\n",
+                         RequestPacket->OutputBufferLength, sizeof(HGSMIQUERYCPORTPROCS)));
+                RequestPacket->StatusBlock->Status = ERROR_INSUFFICIENT_BUFFER;
+                return FALSE;
+            }
+
+            if (!pDevExt->pPrimary->u.primary.bHGSMI)
+            {
+                RequestPacket->StatusBlock->Status = ERROR_INVALID_FUNCTION;
+                return FALSE;
+            }
+
+            HGSMIQUERYCPORTPROCS *pInfo = (HGSMIQUERYCPORTPROCS *)RequestPacket->OutputBuffer;
+            pInfo->pContext = pDevExt->pPrimary;
+            pInfo->VideoPortProcs = pDevExt->pPrimary->u.primary.VideoPortProcs;
+
+            RequestPacket->StatusBlock->Information = sizeof(HGSMIQUERYCPORTPROCS);
+            Result = TRUE;
+            break;
+        }
         case IOCTL_VIDEO_HGSMI_HANDLER_ENABLE:
         {

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

@@ -40 +40 @@
 RT_C_DECLS_END
 
-
 #define VBE_DISPI_IOPORT_INDEX          0x01CE
 #define VBE_DISPI_IOPORT_DATA           0x01CF
@@ -151 +150 @@
            /* The IO Port Number for guest commands. */
            RTIOPORT IOPortGuest;
+
+           /* Video Port API dynamically picked up at runtime for binary backwards compatibility with older NT versions */
+           VBOXVIDEOPORTPROCS VideoPortProcs;
 #endif /* VBOX_WITH_HGSMI */
        } primary;
@@ -296 +298 @@
 {
     UCHAR oldIrql;
-    VideoPortAcquireSpinLock(PrimaryExtension,
+    PrimaryExtension->u.primary.VideoPortProcs.pfnAcquireSpinLock(PrimaryExtension,
                 PrimaryExtension->u.primary.pGHRWLock,
             &oldIrql);
     VBoxVideoVBEWriteUlongLocked(dataType, data);
-    VideoPortReleaseSpinLock(PrimaryExtension,
+    PrimaryExtension->u.primary.VideoPortProcs.pfnReleaseSpinLock(PrimaryExtension,
                 PrimaryExtension->u.primary.pGHRWLock,
             oldIrql);
@@ -308 +310 @@
 {
     UCHAR oldIrql;
-    VideoPortAcquireSpinLock(PrimaryExtension,
+    PrimaryExtension->u.primary.VideoPortProcs.pfnAcquireSpinLock(PrimaryExtension,
                 PrimaryExtension->u.primary.pGHRWLock,
             &oldIrql);
     VBoxVideoVBEWriteUshortLocked(dataType, data);
-    VideoPortReleaseSpinLock(PrimaryExtension,
+    PrimaryExtension->u.primary.VideoPortProcs.pfnReleaseSpinLock(PrimaryExtension,
                 PrimaryExtension->u.primary.pGHRWLock,
             oldIrql);
@@ -321 +323 @@
     ULONG data;
     UCHAR oldIrql;
-    VideoPortAcquireSpinLock(PrimaryExtension,
+    PrimaryExtension->u.primary.VideoPortProcs.pfnAcquireSpinLock(PrimaryExtension,
                 PrimaryExtension->u.primary.pGHRWLock,
             &oldIrql);
     data = VBoxVideoVBEReadUlongLocked(dataType);
-    VideoPortReleaseSpinLock(PrimaryExtension,
+    PrimaryExtension->u.primary.VideoPortProcs.pfnReleaseSpinLock(PrimaryExtension,
                 PrimaryExtension->u.primary.pGHRWLock,
             oldIrql);
@@ -355 +357 @@
 
 BOOLEAN VBoxHGSMIIsSupported (PDEVICE_EXTENSION PrimaryExtension);
+
+void VBoxSetupVideoPortFunctions(PDEVICE_EXTENSION PrimaryExtension,
+                                VBOXVIDEOPORTPROCS *pCallbacks,
+                                PVIDEO_PORT_CONFIG_INFO pConfigInfo);
 
 VOID VBoxSetupDisplaysHGSMI (PDEVICE_EXTENSION PrimaryExtension,

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

@@ -60 +60 @@
 #define IOCTL_VIDEO_HGSMI_HANDLER_DISABLE \
     CTL_CODE(FILE_DEVICE_VIDEO, 0x433, METHOD_BUFFERED, FILE_ANY_ACCESS)
+
+#define IOCTL_VIDEO_HGSMI_QUERY_PORTPROCS \
+    CTL_CODE(FILE_DEVICE_VIDEO, 0x434, METHOD_BUFFERED, FILE_ANY_ACCESS)
 
 #endif /* VBOX_WITH_HGSMI */
@@ -136 +139 @@
 
 /**
+ * Data returned by IOCTL_VIDEO_HGSMI_QUERY_PORTPROCS
+ */
+typedef struct _HGSMIQUERYCPORTPROCS
+{
+    PVOID pContext;
+    VBOXVIDEOPORTPROCS VideoPortProcs;
+} HGSMIQUERYCPORTPROCS;
+
+/**
  * Data returned by IOCTL_VIDEO_HGSMI_HANDLER_ENABLE.
  *