Changeset 36899 in vbox for trunk/src

Timestamp:

Apr 29, 2011 3:52:47 PM (14 years ago)

Author:

vboxsync

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

71478

Message:

Fix builds with undefined VBOX_WITH_WDDM

Location:

trunk/src/VBox

Files:

• Additions/WINNT/VBoxTray/Makefile.kmk (modified) (1 diff)
• Devices/Graphics/DevVGA.h (modified) (7 diffs)

trunk/src/VBox/Additions/WINNT/VBoxTray/Makefile.kmk

@@ -54 +54 @@
         $(VBOX_LIB_VBGL_R3)
 
+include $(KBUILD_PATH)/sdks/WINDDK.kmk
+VBoxTray_INCS   += $(PATH_SDK_WINDDK_INC_API) $(PATH_SDK_WINDDK_INC_DDK)
+
 ifdef VBOX_WITH_WDDM
  VBoxTray_DEFS   += VBOX_WITH_WDDM
  # VBoxTray_DEFS   += LOG_ENABLED
- # we need only includes for PFND3DKMT stuff as all we link dynamicaly to it
- include $(KBUILD_PATH)/sdks/WINDDK.kmk
- VBoxTray_INCS   += $(PATH_SDK_WINDDK_INC_API) $(PATH_SDK_WINDDK_INC_DDK)
 endif
+
 # VBoxTray.cpp uses VBOX_SVN_REV.
 VBoxTray.cpp_DEFS += VBOX_SVN_REV=$(VBOX_SVN_REV)

trunk/src/VBox/Devices/Graphics/DevVGA.h

@@ -280 +280 @@
 #endif
 
+#if HC_ARCH_BITS == 32
+# if defined(VBOX_WITH_HGSMI) != defined(VBOX_WITH_VDMA)
+    uint32_t                    Padding3;
+# endif
+#endif
+
+
     uint32_t                    cMonitors;
     /** Current refresh timer interval. */
@@ -309 +316 @@
 #else
 # if HC_ARCH_BITS == 32
-    uint32_t                    Padding3;
+    uint32_t                    Padding4;
 # endif
 #endif
@@ -345 +352 @@
     /** VBE Extra Data write address one byte buffer */
     uint8_t                     cbWriteVBEExtraAddress;
-    uint8_t                     Padding4;
+    uint8_t                     Padding5;
 # else
-    uint8_t                     Padding4[2];
+    uint8_t                     Padding5[2];
 # endif
 #endif
@@ -353 +360 @@
     /** Retrace emulation state */
     bool                        fRealRetrace;
-    bool                        Padding5[HC_ARCH_BITS == 64 ? 7 : 3];
+    bool                        Padding6[HC_ARCH_BITS == 64 ? 7 : 3];
     vga_retrace_s               retrace_state;
 
@@ -363 +370 @@
     /** The VBE BIOS current memory address. */
     uint16_t                    u16VBEExtraAddress;
-    uint16_t                    Padding6[2];
+    uint16_t                    Padding7[2];
 #endif
     /** Current logo data offset. */
@@ -393 +400 @@
     /** Clear screen flag. */
     uint8_t                     fLogoClearScreen;
-    uint8_t                     Padding7[7];
+    uint8_t                     Padding8[7];
     /** Palette data. */
     uint32_t                    au32LogoPalette[256];
@@ -407 +414 @@
     RTIOPORT                    IOPortBase;
 #ifdef VBOX_WITH_WDDM
-    uint8_t                     Padding8[2];
+    uint8_t                     Padding9[2];
     /* specifies guest driver caps, i.e. whether it can handle IRQs from the adapter,
      * the way it can handle async HGSMI command completion, etc. */
     uint32_t                    fGuestCaps;
 #else
-    uint8_t                     Padding8[6];
+    uint8_t                     Padding10[6];
 #endif
 #endif /* VBOX_WITH_HGSMI */