Changeset 33165 in vbox

Timestamp:

Oct 15, 2010 4:04:33 PM (14 years ago)

Author:

vboxsync

Message:

Additions/WINNT/Graphics: more refactoring

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Miniport

Files:

• VBoxVideo.cpp (modified) (1 diff)
• VBoxVideo.h (modified) (3 diffs)
• VBoxVideoHGSMI.cpp (modified) (15 diffs)
• wddm/VBoxVideoWddm.cpp (modified) (1 diff)

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

@@ -1700 +1700 @@
        * with old guest additions.
        */
-      VBoxSetupDisplaysHGSMI((PDEVICE_EXTENSION)HwDeviceExtension, ConfigInfo, AdapterMemorySize);
+      VBoxSetupDisplaysHGSMI((PDEVICE_EXTENSION)HwDeviceExtension, ConfigInfo, AdapterMemorySize, 0);
 
       if (commonFromDeviceExt((PDEVICE_EXTENSION)HwDeviceExtension)->bHGSMI)

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

@@ -220 +220 @@
                                          */
 
+    /** Host HGSMI capabilities the guest can handle */
+    uint32_t fCaps;
+
     BOOLEAN bHGSMI;                     /* Whether HGSMI is enabled. */
 
@@ -232 +235 @@
 
     /* The IO Port Number for guest commands. */
-    RTIOPORT IOPortGuest;
+    RTIOPORT IOPortGuest;    
 } VBOXVIDEO_COMMON, *PVBOXVIDEO_COMMON;
 
@@ -886 +889 @@
                              PVIDEO_PORT_CONFIG_INFO pConfigInfo,
 #endif
-                             ULONG AdapterMemorySize);
+                             ULONG AdapterMemorySize, uint32_t fCaps);
 BOOLEAN vboxUpdatePointerShape (PDEVICE_EXTENSION DeviceExtension,
                                 PVIDEO_POINTER_ATTRIBUTES pointerAttr,

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

@@ -316 +316 @@
 }
 
-static int vboxQueryConfHGSMI (PDEVICE_EXTENSION PrimaryExtension, uint32_t u32Index, ULONG *pulValue)
+static int vboxQueryConfHGSMI (PVBOXVIDEO_COMMON pCommon, uint32_t u32Index, ULONG *pulValue)
 {
     dprintf(("VBoxVideo::vboxQueryConf: u32Index = %d\n", u32Index));
@@ -325 +325 @@
     context.pulValue = pulValue;
 
-    int rc = vboxCallVBVA (commonFromDeviceExt(PrimaryExtension),
+    int rc = vboxCallVBVA (pCommon,
                            VBVA_QUERY_CONF32,
                            sizeof (VBVACONF32),
@@ -389 +389 @@
     return VERR_INTERNAL_ERROR;
 }
-#else
-int vbvaInitInfoCaps (PVBOXVIDEO_COMMON, void *pvContext, void *pvData)
+#endif
+int vbvaInitInfoCaps (PVBOXVIDEO_COMMON pCommon, void *pvContext, void *pvData)
 {
     VBVACAPS *pCaps = (VBVACAPS*)pvData;
     pCaps->rc = VERR_NOT_IMPLEMENTED;
-    pCaps->fCaps = VBVACAPS_COMPLETEGCMD_BY_IOREAD | VBVACAPS_IRQ;
+    pCaps->fCaps = pCommon->fCaps;
     return VINF_SUCCESS;
 }
@@ -405 +405 @@
     return pCaps->rc;
 }
-#endif
 
 static int vbvaInitInfoHeap (PVBOXVIDEO_COMMON pCommon, void *pvContext, void *pvData)
@@ -445 +444 @@
                        NULL);
     AssertRC(rc);
-    if(RT_SUCCESS (rc))
-    {
 #ifndef VBOX_WITH_WDDM
+    if (RT_SUCCESS(rc))
+    {
         rc = VBoxHGSMISendViewInfo (commonFromDeviceExt(PrimaryExtension),
                                PrimaryExtension->u.primary.cDisplays,
@@ -453 +452 @@
                                (void *) PrimaryExtension);
         AssertRC(rc);
-        if (RT_SUCCESS (rc))
-#else
-        /* in case of WDDM we do not control the framebuffer location,
-         * i.e. it is assigned by Video Memory Manager,
-         * The FB information should be passed to guest from our DxgkDdiSetVidPnSourceAddress callback */
-
+    }
+    /* in case of WDDM we do not control the framebuffer location,
+     * i.e. it is assigned by Video Memory Manager,
+     * The FB information should be passed to guest from our
+     * DxgkDdiSetVidPnSourceAddress callback */
+#endif
+    if (RT_SUCCESS(rc) && commonFromDeviceExt(PrimaryExtension)->fCaps)
+    {
         /* Inform about caps */
         rc = vboxCallVBVA (commonFromDeviceExt(PrimaryExtension),
@@ -467 +468 @@
                                NULL);
         AssertRC(rc);
-        if (RT_SUCCESS (rc))
-#endif
-        {
-            /* Report the host heap location. */
-            rc = vboxCallVBVA (commonFromDeviceExt(PrimaryExtension),
-                               VBVA_INFO_HEAP,
-                               sizeof (VBVAINFOHEAP),
-                               vbvaInitInfoHeap,
-                               NULL,
-                               NULL);
-            AssertRC(rc);
-        }
+    }
+    if (RT_SUCCESS (rc))
+    {
+        /* Report the host heap location. */
+        rc = vboxCallVBVA (commonFromDeviceExt(PrimaryExtension),
+                           VBVA_INFO_HEAP,
+                           sizeof (VBVAINFOHEAP),
+                           vbvaInitInfoHeap,
+                           NULL,
+                           NULL);
+        AssertRC(rc);
     }
 
@@ -721 +721 @@
         PVIDEO_PORT_CONFIG_INFO pConfigInfo,
 #endif
-        ULONG AdapterMemorySize)
+        ULONG AdapterMemorySize, uint32_t fCaps)
 {
     VP_STATUS rc = NO_ERROR;
@@ -750 +750 @@
     commonFromDeviceExt(PrimaryExtension)->pHostFlags               = NULL;
     PrimaryExtension->u.primary.ulMaxFrameBufferSize     = 0;
-    commonFromDeviceExt(PrimaryExtension)->bHGSMI         = VBoxHGSMIIsSupported ();
+    commonFromDeviceExt(PrimaryExtension)->fCaps         = fCaps;
+    commonFromDeviceExt(PrimaryExtension)->bHGSMI        = VBoxHGSMIIsSupported ();
     VBoxVideoCmnMemZero(&commonFromDeviceExt(PrimaryExtension)->areaHostHeap, sizeof(HGSMIAREA));
     VBoxVideoCmnMemZero(&PrimaryExtension->areaDisplay, sizeof(HGSMIAREA));
@@ -803 +804 @@
         /* The miniport heap is used for the host buffers. */
         ULONG cbMiniportHeap = 0;
-        vboxQueryConfHGSMI (PrimaryExtension, VBOX_VBVA_CONF32_HOST_HEAP_SIZE, &cbMiniportHeap);
+        vboxQueryConfHGSMI (commonFromDeviceExt(PrimaryExtension), VBOX_VBVA_CONF32_HOST_HEAP_SIZE, &cbMiniportHeap);
 
         if (cbMiniportHeap != 0)
@@ -887 +888 @@
             /* Query the configured number of displays. */
             ULONG cDisplays = 0;
-            vboxQueryConfHGSMI (PrimaryExtension, VBOX_VBVA_CONF32_MONITOR_COUNT, &cDisplays);
+            vboxQueryConfHGSMI (commonFromDeviceExt(PrimaryExtension), VBOX_VBVA_CONF32_MONITOR_COUNT, &cDisplays);
 
             dprintf(("VBoxVideo::VBoxSetupDisplays: cDisplays = %d\n",
@@ -1247 +1248 @@
 }
 
+#ifndef VBOX_WITH_WDDM
 typedef struct _VBVAMINIPORT_CHANNELCONTEXT
 {
@@ -1352 +1354 @@
 }
 
-#ifndef VBOX_WITH_WDDM
 DECLCALLBACK(void) hgsmiHostCmdComplete (HVBOXVIDEOHGSMI hHGSMI, struct _VBVAHOSTCMD * pCmd)
 {
@@ -1401 +1402 @@
     return VERR_INVALID_PARAMETER;
 }
-#endif
 
 static DECLCALLBACK(int) vboxVBVAChannelGenericHandler(void *pvHandler, uint16_t u16ChannelInfo, void *pvBuffer, HGSMISIZE cbBuffer)
@@ -1610 +1610 @@
     return VERR_GENERAL_FAILURE;
 }
+#endif /* !VBOX_WITH_WDDM */
 
 /** @todo Mouse pointer position to be read from VMMDev memory, address of the memory region

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoWddm.cpp

@@ -579 +579 @@
                  * with old guest additions.
                  */
-                VBoxSetupDisplaysHGSMI(pContext, AdapterMemorySize);
+                VBoxSetupDisplaysHGSMI(pContext, AdapterMemorySize,
+                                       VBVACAPS_COMPLETEGCMD_BY_IOREAD | VBVACAPS_IRQ);
                 if (commonFromDeviceExt(pContext)->bHGSMI)
                 {