Changeset 32241 in vbox for trunk/include/VBox

Timestamp:

Sep 6, 2010 4:52:56 AM (14 years ago)

Author:

vboxsync

Message:

wddm: 1. guest installler integration (uninstall needs additional fixing), 2. dev/vga saved state fixes, 3. better split video dma and wddm 4. separate wddm wine libs, 5. etc.

Location:

trunk/include/VBox

Files:

• HGSMI/HGSMIChSetup.h (modified) (1 diff)
• VBoxVideo.h (modified) (3 diffs)

trunk/include/VBox/HGSMI/HGSMIChSetup.h

@@ -46 +46 @@
 #define HGSMIHOSTFLAGS_COMMANDS_PENDING 0x1
 #define HGSMIHOSTFLAGS_IRQ              0x2
-#ifdef VBOXVDMA
+#ifdef VBOXWDDM
 /* one or more guest commands is completed */
 # define HGSMIHOSTFLAGS_GCOMMAND_COMPLETED 0x4

trunk/include/VBox/VBoxVideo.h

@@ -1041 +1041 @@
 #endif /* VBOX_WITH_HGSMI */
 
-#ifdef VBOXVDMA
+#ifdef VBOXWDDM
 # pragma pack(1)
 
@@ -1093 +1093 @@
     return (PVBOXSHGSMIHEADER)((uint8_t *)pvData - sizeof (VBOXSHGSMIHEADER));
 }
+
+typedef uint64_t VBOXVIDEOOFFSET;
+
+#define VBOXVIDEOOFFSET_VOID ((VBOXVIDEOOFFSET)~0)
+
+typedef enum
+{
+    VBOXVDMACMD_TYPE_UNDEFINED         = 0,
+    VBOXVDMACMD_TYPE_DMA_PRESENT_BLT   = 1,
+    VBOXVDMACMD_TYPE_DMA_BPB_TRANSFER,
+    VBOXVDMACMD_TYPE_DMA_BPB_FILL,
+    VBOXVDMACMD_TYPE_DMA_PRESENT_SHADOW2PRIMARY,
+    VBOXVDMACMD_TYPE_DMA_PRESENT_CLRFILL,
+    VBOXVDMACMD_TYPE_DMA_PRESENT_FLIP,
+    VBOXVDMACMD_TYPE_DMA_NOP
+} VBOXVDMACMD_TYPE;
+
+# pragma pack()
+#endif
+
+#ifdef VBOXVDMA
+# pragma pack(1)
 
 /* VDMA - Video DMA */
@@ -1168 +1190 @@
 typedef uint64_t VBOXVDMASURFHANDLE;
 
-typedef uint64_t VBOXVIDEOOFFSET;
-
-#define VBOXVIDEOOFFSET_VOID ((VBOXVIDEOOFFSET)~0)
-
-typedef enum
-{
-    VBOXVDMACMD_TYPE_UNDEFINED         = 0,
-    VBOXVDMACMD_TYPE_DMA_PRESENT_BLT   = 1,
-    VBOXVDMACMD_TYPE_DMA_BPB_TRANSFER,
-    VBOXVDMACMD_TYPE_DMA_BPB_FILL,
-    VBOXVDMACMD_TYPE_DMA_PRESENT_SHADOW2PRIMARY,
-    VBOXVDMACMD_TYPE_DMA_PRESENT_CLRFILL,
-    VBOXVDMACMD_TYPE_DMA_PRESENT_FLIP,
-    VBOXVDMACMD_TYPE_DMA_NOP
-} VBOXVDMACMD_TYPE;
-
 /* region specified as a rectangle, otherwize it is a size of memory pointed to by phys address */
 #define VBOXVDMAOPERAND_FLAGS_RECTL       0x1