Changeset 32876 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Miniport/VBoxVideo.cpp

Timestamp:

Oct 1, 2010 8:38:01 PM (14 years ago)

Author:

vboxsync

Message:

Additions/WINNT/VBoxVideo: start refactoring the HGSMI code

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Miniport/VBoxVideo.cpp (modified) (9 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/VBoxVideo.cpp

@@ -1969 +1969 @@
 
 #ifdef VBOX_WITH_HGSMI
-      ((PDEVICE_EXTENSION)HwDeviceExtension)->u.primary.IOPortHost = (RTIOPORT)VGA_PORT_HGSMI_HOST;
-      ((PDEVICE_EXTENSION)HwDeviceExtension)->u.primary.IOPortGuest = (RTIOPORT)VGA_PORT_HGSMI_GUEST;
+      /* pPrimary is not yet set */
+      ((PDEVICE_EXTENSION)HwDeviceExtension)->u.primary.hgsmiInfo.IOPortHost = (RTIOPORT)VGA_PORT_HGSMI_HOST;
+      ((PDEVICE_EXTENSION)HwDeviceExtension)->u.primary.hgsmiInfo.IOPortGuest = (RTIOPORT)VGA_PORT_HGSMI_GUEST;
 #endif /* VBOX_WITH_HGSMI */
 
@@ -2024 +2025 @@
       VBoxSetupDisplaysHGSMI((PDEVICE_EXTENSION)HwDeviceExtension, ConfigInfo, AdapterMemorySize);
 
-      if (((PDEVICE_EXTENSION)HwDeviceExtension)->u.primary.bHGSMI)
+      if (hgsmiFromDeviceExt((PDEVICE_EXTENSION)HwDeviceExtension)->bHGSMI)
       {
           LogRel(("VBoxVideo: using HGSMI\n"));
@@ -2675 +2676 @@
             }
 
-            if (!pDevExt->pPrimary->u.primary.bHGSMI)
+            if (!hgsmiFromDeviceExt(pDevExt)->bHGSMI)
             {
                 RequestPacket->StatusBlock->Status = ERROR_INVALID_FUNCTION;
@@ -2692 +2693 @@
             pInfo->u32MinVBVABufferSize = VBVA_MIN_BUFFER_SIZE;
 
-            pInfo->IOPortGuestCommand = pDevExt->pPrimary->u.primary.IOPortGuest;
+            pInfo->IOPortGuestCommand = hgsmiFromDeviceExt(pDevExt)->IOPortGuest;
 
             RequestPacket->StatusBlock->Information = sizeof(QUERYHGSMIRESULT);
@@ -2711 +2712 @@
             }
 
-            if (!pDevExt->pPrimary->u.primary.bHGSMI)
+            if (!hgsmiFromDeviceExt(pDevExt)->bHGSMI)
             {
                 RequestPacket->StatusBlock->Status = ERROR_INVALID_FUNCTION;
@@ -2739 +2740 @@
             }
 
-            if (!pDevExt->pPrimary->u.primary.bHGSMI)
+            if (!hgsmiFromDeviceExt(pDevExt)->bHGSMI)
             {
                 RequestPacket->StatusBlock->Status = ERROR_INVALID_FUNCTION;
@@ -2765 +2766 @@
             }
 
-            if (!pDevExt->pPrimary->u.primary.bHGSMI)
+            if (!hgsmiFromDeviceExt(pDevExt)->bHGSMI)
             {
                 RequestPacket->StatusBlock->Status = ERROR_INVALID_FUNCTION;
@@ -2786 +2787 @@
         {
             /* TODO: implement */
-            if (!pDevExt->pPrimary->u.primary.bHGSMI)
+            if (!hgsmiFromDeviceExt(pDevExt)->bHGSMI)
             {
                 RequestPacket->StatusBlock->Status = ERROR_INVALID_FUNCTION;
@@ -2804 +2805 @@
             }
 
-            if (!pDevExt->pPrimary->u.primary.bHGSMI)
+            if (!hgsmiFromDeviceExt(pDevExt)->bHGSMI)
             {
                 RequestPacket->StatusBlock->Status = ERROR_INVALID_FUNCTION;