Changeset 35718 in vbox for trunk

Timestamp:

Jan 25, 2011 5:58:44 PM (14 years ago)

Author:

vboxsync

Message:

wined3d/wddm: 64 bit build fix for wddm

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/directx.c (modified) (3 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/directx.c

@@ -2908 +2908 @@
             if (DevModeW.dmFields&DM_DISPLAYFLAGS)
             {
-#ifndef RT_ARCH_AMD64
-                if (DevModeW.u2.dmDisplayFlags&DM_INTERLACED)
-#else
+#if defined(RT_ARCH_AMD64) && !defined(VBOX_WITH_WDDM)
 # ifndef DM_INTERLACED
 #  define DM_INTERLACED 0x00000002
 # endif
                 if (DevModeW.dmDisplayFlags&DM_INTERLACED)
+#else
+                if (DevModeW.u2.dmDisplayFlags&DM_INTERLACED)
 #endif
                 {
@@ -2927 +2927 @@
             if (DevModeW.dmFields&DM_DISPLAYORIENTATION)
             {
-#ifndef RT_ARCH_AMD64
+#if defined(RT_ARCH_AMD64) && !defined(VBOX_WITH_WDDM)
+                switch (DevModeW.dmDisplayOrientation)
+#else
                 switch (DevModeW.u.s2.dmDisplayOrientation)
-#else
-                switch (DevModeW.dmDisplayOrientation)
 #endif
                 {
@@ -2946 +2946 @@
                         break;
                     default:
-#ifndef RT_ARCH_AMD64
+#if defined(RT_ARCH_AMD64) && !defined(VBOX_WITH_WDDM)
+                        WARN("Unexpected display orientation %#x", DevModeW.dmDisplayOrientation);
+#else
                         WARN("Unexpected display orientation %#x", DevModeW.u.s2.dmDisplayOrientation);
-#else
-                        WARN("Unexpected display orientation %#x", DevModeW.dmDisplayOrientation);
 #endif
                         break;