Changeset 23255 in vbox

Timestamp:

Sep 23, 2009 12:38:37 PM (15 years ago)

Author:

vboxsync

Message:

Windows guest video driver: NT fixes.

Location:

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

Files:

• VBoxHGSMI.h (modified) (3 diffs, 2 props)
• VBoxVideo.cpp (modified) (3 diffs)
• VBoxVideoHGSMI.cpp (modified) (3 diffs)

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

@@ -90 +90 @@
 typedef void (*PFNFREEPOOL) (void*  HwDeviceExtension, void*  Ptr);
 
+typedef unsigned char (*PFNQUEUEDPC) (void* HwDeviceExtension, void (*CallbackRoutine)(void* HwDeviceExtension, void *Context), void *Context);
+
 /* pfn*SpinLock* functions are available */
 #define VBOXVIDEOPORTPROCS_SPINLOCK 0x00000001
@@ -96 +98 @@
 /* pfn*Pool functions are available */
 #define VBOXVIDEOPORTPROCS_POOL     0x00000004
+/* pfnQueueDpc function is available */
+#define VBOXVIDEOPORTPROCS_DPC      0x00000008
 
 typedef struct VBOXVIDEOPORTPROCS
@@ -118 +122 @@
     PFNALLOCATEPOOL pfnAllocatePool;
     PFNFREEPOOL pfnFreePool;
+
+    PFNQUEUEDPC pfnQueueDpc;
 } VBOXVIDEOPORTPROCS;
 

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

@@ -86 +86 @@
     {
         case WINNT4:
+            dprintf(("VBoxVideo::DriverEntry: WINNT4\n"));
             InitData.HwInitDataSize = SIZE_OF_NT4_VIDEO_HW_INITIALIZATION_DATA;
             break;
         case WIN2K:
+            dprintf(("VBoxVideo::DriverEntry: WIN2K\n"));
             InitData.HwInitDataSize = SIZE_OF_W2K_VIDEO_HW_INITIALIZATION_DATA;
             break;
@@ -1211 +1213 @@
 
           VIDEO_ACCESS_RANGE tmpRanges[4];
-          ULONG slot;
+          ULONG slot = 0;
 
           VideoPortZeroMemory(tmpRanges, sizeof(tmpRanges));
 
           /* need to call VideoPortGetAccessRanges to ensure interrupt info in ConfigInfo gets set up */
-          VP_STATUS status = VideoPortGetAccessRanges(HwDeviceExtension,
-                                            0,
-                                            NULL,
-                                            sizeof (tmpRanges)/sizeof (tmpRanges[0]),
-                                            tmpRanges,
-                                            NULL,
-                                            NULL,
-                                            (PULONG) &slot);
+          VP_STATUS status; 
+          if (vboxQueryWinVersion() == WINNT4)
+          {
+              /* NT crashes if either of 'vendorId, 'deviceId' or 'slot' parameters is NULL,
+               * and needs PCI ids for a successful VideoPortGetAccessRanges call.
+               */
+              ULONG vendorId = 0x80EE;
+              ULONG deviceId = 0xBEEF;
+              status = VideoPortGetAccessRanges(HwDeviceExtension,
+                                                0,
+                                                NULL,
+                                                sizeof (tmpRanges)/sizeof (tmpRanges[0]),
+                                                tmpRanges,
+                                                &vendorId,
+                                                &deviceId,
+                                                &slot);
+          }
+          else
+          {
+              status = VideoPortGetAccessRanges(HwDeviceExtension,
+                                                0,
+                                                NULL,
+                                                sizeof (tmpRanges)/sizeof (tmpRanges[0]),
+                                                tmpRanges,
+                                                NULL,
+                                                NULL,
+                                                &slot);
+          }
+          dprintf(("VBoxVideo::VBoxVideoFindAdapter: VideoPortGetAccessRanges status 0x%x\n", status));
           if (status == NO_ERROR)
           {
@@ -1358 +1381 @@
         {
             /* schedule a DPC*/
-            BOOLEAN bResult = VideoPortQueueDpc(PrimaryExtension, VBoxVideoHGSMIDpc, (PVOID)1);
+            BOOLEAN bResult = PrimaryExtension->u.primary.VideoPortProcs.pfnQueueDpc(PrimaryExtension, VBoxVideoHGSMIDpc, (PVOID)1);
             Assert(bResult);
         }

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

@@ -470 +470 @@
 }
 
+BOOLEAN vboxQueueDpcVoid(IN PVOID  HwDeviceExtension, IN PMINIPORT_DPC_ROUTINE  CallbackRoutine, IN PVOID  Context)
+{
+    return FALSE;
+}
+
 void VBoxSetupVideoPortFunctions(PDEVICE_EXTENSION PrimaryExtension, VBOXVIDEOPORTPROCS *pCallbacks, PVIDEO_PORT_CONFIG_INFO pConfigInfo)
 {
@@ -477 +482 @@
     {
         /* VideoPortGetProcAddress is available for >= win2k */
+        pCallbacks->pfnWaitForSingleObject = vboxWaitForSingleObjectVoid;
+        pCallbacks->pfnSetEvent = vboxSetEventVoid;
+        pCallbacks->pfnClearEvent = vboxClearEventVoid;
+        pCallbacks->pfnCreateEvent = vboxCreateEventVoid;
+        pCallbacks->pfnDeleteEvent = vboxDeleteEventVoid;
+        pCallbacks->pfnCreateSpinLock = vboxCreateSpinLockVoid;
+        pCallbacks->pfnDeleteSpinLock = vboxDeleteSpinLockVoid;
+        pCallbacks->pfnAcquireSpinLock = vboxAcquireSpinLockVoid;
+        pCallbacks->pfnReleaseSpinLock = vboxReleaseSpinLockVoid;
+        pCallbacks->pfnAcquireSpinLockAtDpcLevel = vboxAcquireSpinLockAtDpcLevelVoid;
+        pCallbacks->pfnReleaseSpinLockFromDpcLevel = vboxReleaseSpinLockFromDpcLevelVoid;
+        pCallbacks->pfnAllocatePool = vboxAllocatePoolVoid;
+        pCallbacks->pfnFreePool = vboxFreePoolVoid;
+        pCallbacks->pfnQueueDpc = vboxQueueDpcVoid;
         return;
     }
@@ -590 +609 @@
         pCallbacks->pfnAllocatePool = vboxAllocatePoolVoid;
         pCallbacks->pfnFreePool = vboxFreePoolVoid;
+    }
+
+    pCallbacks->pfnQueueDpc = (PFNQUEUEDPC)(pConfigInfo->VideoPortGetProcAddress)
+            (PrimaryExtension,
+             (PUCHAR)"VideoPortQueueDpc");
+    Assert(pCallbacks->pfnQueueDpc);
+
+    if(pCallbacks->pfnQueueDpc)
+    {
+        pCallbacks->fSupportedTypes |= VBOXVIDEOPORTPROCS_DPC;
+    }
+    else
+    {
+        pCallbacks->pfnQueueDpc = vboxQueueDpcVoid;
     }