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

Timestamp:

Aug 27, 2009 9:58:37 PM (15 years ago)

Author:

vboxsync

Message:

VBoxVideo/win: proper handling OS version information for win > XP & make VideoPort be properly initialized for win > XP

Location:

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

Files:

• Helper.cpp (modified) (2 diffs)
• Helper.h (modified) (1 diff)
• VBoxVideo.cpp (modified) (3 diffs)

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

@@ -262 +262 @@
     dprintf(("VBoxVideo::vboxQueryWinVersion: running on Windows NT version %d.%d, build %d\n",
              majorVersion, minorVersion, buildNumber));
-
-    if (majorVersion >= 5)
+    if(majorVersion == 7)
+    {
+        winVersion = WIN7;
+    }
+    else if(majorVersion == 6)
+    {
+        winVersion = WINVISTA;
+    }
+    else if (majorVersion == 5)
     {
         if (minorVersion >= 1)
@@ -272 +279 @@
             winVersion = WIN2K;
         }
-    } else
-    if (majorVersion == 4)
+    }
+    else if (majorVersion == 4)
     {
         winVersion = WINNT4;
-    } else
+    }
+    else
     {
         dprintf(("VBoxVideo::vboxQueryWinVersion: NT4 required!\n"));

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

@@ -25 +25 @@
 {
     UNKNOWN_WINVERSION = 0,
-    WINNT4 = 1,
-    WIN2K  = 2,
-    WINXP  = 3
+    WINNT4    = 1,
+    WIN2K     = 2,
+    WINXP     = 3,
+    WINVISTA  = 4,
+    WIN7      = 5
 } winVersion_t;
 

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

@@ -30 +30 @@
 #include <VBoxDisplay.h>
 
-#ifdef VBOX_WITH_HGSMI
-#include <iprt/initterm.h>
-#endif
-
 #if _MSC_VER >= 1400 /* bird: MS fixed swprintf to be standard-conforming... */
 #define _INC_SWPRINTF_INL_
@@ -63 +59 @@
     VIDEO_HW_INITIALIZATION_DATA InitData;
     ULONG rc;
-
-#ifdef VBOX_WITH_HGSMI
-    RTR0Init(0);
-#endif
 
     dprintf(("VBoxVideo::DriverEntry. Built %s %s\n", __DATE__, __TIME__));
@@ -1216 +1208 @@
           ((PDEVICE_EXTENSION)HwDeviceExtension)->u.primary.IOPortGuest = 0;
 
-          VIDEO_ACCESS_RANGE tmpRanges[2];
+          VIDEO_ACCESS_RANGE tmpRanges[4];
           ULONG slot;
+
+          VideoPortZeroMemory(tmpRanges, sizeof(tmpRanges));
 
           /* need to call VideoPortGetAccessRanges to ensure interrupt info in ConfigInfo gets set up */