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

Timestamp:

Aug 12, 2007 4:01:54 PM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

23595

Message:

changed nt4 detection

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Display

Files:

• driver.h (modified) (1 diff)
• enable.c (modified) (5 diffs)
• screen.c (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Display/driver.h

@@ -141 +141 @@
 extern HSEMAPHORE ghsemHwBuffer;
 
-/* Global DDI version of guest */
-extern ULONG giEngineVersion;
+extern BOOL  g_bOnNT40;
 
 DWORD getAvailableModes(HANDLE, PVIDEO_MODE_INFORMATION *, DWORD *);

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

@@ -273 +273 @@
 // Required hook bits will be set up according to DDI version
 static ULONG gflHooks = 0;
-       ULONG giEngineVersion = DDI_DRIVER_VERSION_NT4;
+       BOOL  g_bOnNT40 = TRUE;      /* assume NT4 guest by default */
 
 #define HOOKS_BMF8BPP  gflHooks
@@ -299 +299 @@
 // working with.  For the first version the driver does nothing with it.
 
-    iEngineVersion;
-
     DISPDBG((0, "VBoxDisp::DrvEnableDriver called. iEngine version = %08X\n", iEngineVersion));
 
@@ -308 +306 @@
                HOOK_PAINT | HOOK_STRETCHBLT | HOOK_SYNCHRONIZEACCESS;
 
-    giEngineVersion = iEngineVersion;
+    // Set up g_bOnNT40 based on the value in iEngineVersion
+    if(iEngineVersion >= DDI_DRIVER_VERSION_NT5)
+        g_bOnNT40 = FALSE;
 
 // Fill in as much as we can.
@@ -622 +622 @@
         ppdev->hsurfScreenBitmap = hsurf;
          
-        if (!EngAssociateSurface(hsurf, ppdev->hdevEng, 0))
+        if (!EngAssociateSurface(hsurf, ppdev->hdevEng, flHooks))
         {
             DISPDBG((0, "DISP DrvEnableSurface failed EngAssociateSurface for ScreenBitmap.\n"));
@@ -645 +645 @@
             {
                 ppdev->hsurfScreen = hsurf;
-                
+                /* Must set dhsurf to make sure GDI doesn't ignore our hooks */
+                ppdev->psoScreenBitmap->dhsurf = (DHSURF)hsurf;
+
                 if (!EngAssociateSurface(hsurf, ppdev->hdevEng, flHooks))
                 {

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

@@ -488 +488 @@
 
 
-    if (    giEngineVersion == DDI_DRIVER_VERSION_NT4
-        ||  giEngineVersion == DDI_DRIVER_VERSION_SP3)
+    if (g_bOnNT40)
     {
         DISPDBG((0,"DISP bInitPDEV pGdiInfo->ulVersion = %x\n", GDI_DRIVER_VERSION));