Changeset 32622 in vbox for trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDisplay.cpp

Timestamp:

Sep 17, 2010 8:18:39 PM (14 years ago)

Author:

vboxsync

Message:

wddm: VBOXWDDM->VBOX_WITH_WDDM

File:

• trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDisplay.cpp (modified) (9 diffs)

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDisplay.cpp

@@ -39 +39 @@
 static VBOXDISPLAYCONTEXT gCtx = {0};
 
-#ifdef VBOXWDDM
+#ifdef VBOX_WITH_WDDM
 static bool vboxWddmReinitVideoModes(VBOXDISPLAYCONTEXT *pCtx)
 {
@@ -88 +88 @@
         Log(("VBoxTray: VBoxDisplayInit: pfnEnumDisplayDevices = %p\n", gCtx.pfnEnumDisplayDevices));
 
-#ifdef VBOXWDDM
+#ifdef VBOX_WITH_WDDM
         if (OSinfo.dwMajorVersion >= 6)
         {
@@ -129 +129 @@
 }
 
-#ifdef VBOXWDDM
+#ifdef VBOX_WITH_WDDM
 static VBOXDISPLAY_DRIVER_TYPE getVBoxDisplayDriverType(VBOXDISPLAYCONTEXT *pCtx)
 #else
@@ -135 +135 @@
 #endif
 {
-#ifdef VBOXWDDM
+#ifdef VBOX_WITH_WDDM
     VBOXDISPLAY_DRIVER_TYPE enmType = VBOXDISPLAY_DRIVER_TYPE_UNKNOWN;
 #else
@@ -168 +168 @@
 
                 if (strcmp(&dispDevice.DeviceString[0], "VirtualBox Graphics Adapter") == 0)
-#ifndef VBOXWDDM
+#ifndef VBOX_WITH_WDDM
                     result = true;
 #else
@@ -196 +196 @@
         /* Check for the short name, because all long stuff would be truncated */
         if (strcmp((char*)&tempDevMode.dmDeviceName[0], "VBoxDisp") == 0)
-#ifndef VBOXWDDM
+#ifndef VBOX_WITH_WDDM
             result = true;
 #else
@@ -203 +203 @@
     }
 
-#ifndef VBOXWDDM
+#ifndef VBOX_WITH_WDDM
     return result;
 #else
@@ -532 +532 @@
                          * Only try to change video mode if the active display driver is VBox additions.
                          */
-#ifdef VBOXWDDM
+#ifdef VBOX_WITH_WDDM
                         VBOXDISPLAY_DRIVER_TYPE enmDriverType = getVBoxDisplayDriverType (pCtx);
 
@@ -549 +549 @@
                                 Log(("VBoxTray: VBoxDisplayThread: Detected W2K or later\n"));
 
-#ifdef  VBOXWDDM
+#ifdef  VBOX_WITH_WDDM
                                 if (enmDriverType == VBOXDISPLAY_DRIVER_TYPE_WDDM)
                                 {