Changeset 33085 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Miniport

Timestamp:

Oct 12, 2010 11:10:48 PM (14 years ago)

Author:

vboxsync

Message:

Additions/WINNT/Graphics: more refactoring

Location:

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

Files:

• VBoxVideo.h (modified) (3 diffs)
• VBoxVideoHGSMI.cpp (modified) (22 diffs)

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

@@ -24 +24 @@
 #include <VBox/HGSMI/HGSMI.h>
 #include <VBox/HGSMI/HGSMIChSetup.h>
+#include <VBox/VBoxVideo.h>
 #include "VBoxHGSMI.h"
 
@@ -34 +35 @@
 #include "video.h"
 #else
+#   ifdef PAGE_SIZE
+#    undef PAGE_SIZE
+#   endif
+#   ifdef PAGE_SHIFT
+#    undef PAGE_SHIFT
+#   endif
 #   define VBOX_WITH_WORKAROUND_MISSING_PACK
 #   if (_MSC_VER >= 1400) && !defined(VBOX_WITH_PATCHED_DDK)
@@ -870 +877 @@
 BOOLEAN VBoxHGSMIIsSupported (void);
 
+typedef int FNHGSMIFILLVIEWINFO (void *pvData, VBVAINFOVIEW *pInfo);
+typedef FNHGSMIFILLVIEWINFO *PFNHGSMIFILLVIEWINFO;
+
+int VBoxHGSMISendViewInfo(PVBOXVIDEO_COMMON pCommon, uint32_t u32Count, PFNHGSMIFILLVIEWINFO pfnFill, void *pvData);
+
 VOID VBoxSetupDisplaysHGSMI (PDEVICE_EXTENSION PrimaryExtension,
 #ifndef VBOX_WITH_WDDM

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

@@ -176 +176 @@
 }
 
-typedef int FNHGSMICALLINIT (PDEVICE_EXTENSION PrimaryExtension, void *pvContext, void *pvData);
+typedef int FNHGSMICALLINIT (PVBOXVIDEO_COMMON pCommon, void *pvContext, void *pvData);
 typedef FNHGSMICALLINIT *PFNHGSMICALLINIT;
 
-typedef int FNHGSMICALLFINALIZE (PDEVICE_EXTENSION PrimaryExtension, void *pvContext, void *pvData);
+typedef int FNHGSMICALLFINALIZE (PVBOXVIDEO_COMMON pCommon, void *pvContext, void *pvData);
 typedef FNHGSMICALLFINALIZE *PFNHGSMICALLFINALIZE;
 
@@ -217 +217 @@
 }
 
-static int vboxCallChannel (PDEVICE_EXTENSION PrimaryExtension,
+static int vboxCallChannel (PVBOXVIDEO_COMMON pCommon,
                          uint8_t u8Ch,
                          uint16_t u16Op,
@@ -228 +228 @@
 
     /* Allocate the IO buffer. */
-#ifndef VBOX_WITH_WDDM
-    if (PrimaryExtension->pPrimary != PrimaryExtension)
-    {
-        dprintf(("VBoxVideo::vboxCallChannel: not primary extension %p!!!\n", PrimaryExtension));
-        return VERR_INVALID_PARAMETER;
-    }
-#endif
-
-    void *p = HGSMIHeapAlloc (&commonFromDeviceExt(PrimaryExtension)->hgsmiAdapterHeap, cbData, u8Ch, u16Op);
+    void *p = HGSMIHeapAlloc (&pCommon->hgsmiAdapterHeap, cbData, u8Ch, u16Op);
 
     if (!p)
@@ -247 +239 @@
         if (pfnInit)
         {
-            rc = pfnInit (PrimaryExtension, pvContext, p);
+            rc = pfnInit (pCommon, pvContext, p);
         }
 
@@ -253 +245 @@
         {
             /* Initialize the buffer and get the offset for port IO. */
-            HGSMIOFFSET offBuffer = HGSMIHeapBufferOffset (&commonFromDeviceExt(PrimaryExtension)->hgsmiAdapterHeap,
+            HGSMIOFFSET offBuffer = HGSMIHeapBufferOffset (&pCommon->hgsmiAdapterHeap,
                                                            p);
 
             /* Submit the buffer to the host. */
-            VBoxHGSMIGuestWrite(commonFromDeviceExt(PrimaryExtension), offBuffer);
+            VBoxHGSMIGuestWrite(pCommon, offBuffer);
 
             if (pfnFinalize)
             {
-                rc = pfnFinalize (PrimaryExtension, pvContext, p);
+                rc = pfnFinalize (pCommon, pvContext, p);
             }
         }
@@ -271 +263 @@
 
         /* Free the IO buffer. */
-        HGSMIHeapFree (&commonFromDeviceExt(PrimaryExtension)->hgsmiAdapterHeap, p);
+        HGSMIHeapFree (&pCommon->hgsmiAdapterHeap, p);
     }
 
@@ -277 +269 @@
 }
 
-static int vboxCallVBVA (PDEVICE_EXTENSION PrimaryExtension,
+static int vboxCallVBVA (PVBOXVIDEO_COMMON pCommon,
                          uint16_t u16Op,
                          HGSMISIZE cbData,
@@ -284 +276 @@
                          void *pvContext)
 {
-    return vboxCallChannel (PrimaryExtension,
+    return vboxCallChannel (pCommon,
                             HGSMI_CH_VBVA,
                             u16Op,
@@ -299 +291 @@
 } QUERYCONFCTX;
 
-static int vbvaInitQueryConf (PDEVICE_EXTENSION PrimaryExtension, void *pvContext, void *pvData)
-{
-    NOREF (PrimaryExtension);
-
+static int vbvaInitQueryConf (PVBOXVIDEO_COMMON, void *pvContext, void *pvData)
+{
     QUERYCONFCTX *pCtx = (QUERYCONFCTX *)pvContext;
     VBVACONF32 *p = (VBVACONF32 *)pvData;
@@ -312 +302 @@
 }
 
-static int vbvaFinalizeQueryConf (PDEVICE_EXTENSION PrimaryExtension, void *pvContext, void *pvData)
-{
-    NOREF (PrimaryExtension);
-
+static int vbvaFinalizeQueryConf (PVBOXVIDEO_COMMON, void *pvContext, void *pvData)
+{
     QUERYCONFCTX *pCtx = (QUERYCONFCTX *)pvContext;
     VBVACONF32 *p = (VBVACONF32 *)pvData;
@@ -337 +325 @@
     context.pulValue = pulValue;
 
-    int rc = vboxCallVBVA (PrimaryExtension,
+    int rc = vboxCallVBVA (commonFromDeviceExt(PrimaryExtension),
                            VBVA_QUERY_CONF32,
                            sizeof (VBVACONF32),
@@ -348 +336 @@
     return rc;
 }
+
+int VBoxHGSMISendViewInfo(PVBOXVIDEO_COMMON pCommon, uint32_t u32Count, PFNHGSMIFILLVIEWINFO pfnFill, void *pvData)
+{
+    int rc;
+    /* Issue the screen info command. */
+    void *p = vboxHGSMIBufferAlloc (pCommon, sizeof(VBVAINFOVIEW) * u32Count,
+                                    HGSMI_CH_VBVA, VBVA_INFO_VIEW);
+    Assert(p);
+    if (p)
+    {
+        VBVAINFOVIEW *pInfo = (VBVAINFOVIEW *)p;
+        rc = pfnFill(pvData, pInfo);
+        if (RT_SUCCESS(rc))
+            vboxHGSMIBufferSubmit (pCommon, p);
+        vboxHGSMIBufferFree (pCommon, p);
+    }
+    else
+        rc = VERR_NO_MEMORY;
+    return rc;
+}
+
 #ifndef VBOX_WITH_WDDM
-static int vbvaInitInfoDisplay (PDEVICE_EXTENSION PrimaryExtension, void *pvContext, void *pvData)
-{
-    NOREF (pvContext);
-    VBVAINFOVIEW *p = (VBVAINFOVIEW *)pvData;
+static int vbvaInitInfoDisplay (void *pvData, VBVAINFOVIEW *p)
+{
+    PDEVICE_EXTENSION PrimaryExtension = (PDEVICE_EXTENSION) pvData;
 
     int i;
@@ -382 +390 @@
 }
 #else
-int vbvaInitInfoCaps (PDEVICE_EXTENSION PrimaryExtension, void *pvContext, void *pvData)
+int vbvaInitInfoCaps (PVBOXVIDEO_COMMON, void *pvContext, void *pvData)
 {
     VBVACAPS *pCaps = (VBVACAPS*)pvData;
@@ -391 +399 @@
 
 
-int vbvaFinalizeInfoCaps (PDEVICE_EXTENSION PrimaryExtension, void *pvContext, void *pvData)
+int vbvaFinalizeInfoCaps (PVBOXVIDEO_COMMON, void *pvContext, void *pvData)
 {
     VBVACAPS *pCaps = (VBVACAPS*)pvData;
@@ -399 +407 @@
 #endif
 
-static int vbvaInitInfoHeap (PDEVICE_EXTENSION PrimaryExtension, void *pvContext, void *pvData)
+static int vbvaInitInfoHeap (PVBOXVIDEO_COMMON pCommon, void *pvContext, void *pvData)
 {
     NOREF (pvContext);
     VBVAINFOHEAP *p = (VBVAINFOHEAP *)pvData;
 
-    p->u32HeapOffset = commonFromDeviceExt(PrimaryExtension)->cbVRAM
-                       - commonFromDeviceExt(PrimaryExtension)->cbMiniportHeap
+    p->u32HeapOffset = pCommon->cbVRAM
+                       - pCommon->cbMiniportHeap
                        - VBVA_ADAPTER_INFORMATION_SIZE;
-    p->u32HeapSize = commonFromDeviceExt(PrimaryExtension)->cbMiniportHeap;
+    p->u32HeapSize = pCommon->cbMiniportHeap;
 
     return VINF_SUCCESS;
 }
 
-static int hgsmiInitFlagsLocation (PDEVICE_EXTENSION PrimaryExtension, void *pvContext, void *pvData)
+static int hgsmiInitFlagsLocation (PVBOXVIDEO_COMMON pCommon, void *pvContext, void *pvData)
 {
     NOREF (pvContext);
     HGSMIBUFFERLOCATION *p = (HGSMIBUFFERLOCATION *)pvData;
 
-    p->offLocation = commonFromDeviceExt(PrimaryExtension)->cbVRAM - sizeof (HGSMIHOSTFLAGS);
+    p->offLocation = pCommon->cbVRAM - sizeof (HGSMIHOSTFLAGS);
     p->cbLocation = sizeof (HGSMIHOSTFLAGS);
 
@@ -429 +437 @@
 
     /* setup the flags first to ensure they are initialized by the time the host heap is ready */
-    int rc = vboxCallChannel(PrimaryExtension,
+    int rc = vboxCallChannel(commonFromDeviceExt(PrimaryExtension),
             HGSMI_CH_HGSMI,
             HGSMI_CC_HOST_FLAGS_LOCATION,
@@ -440 +448 @@
     {
 #ifndef VBOX_WITH_WDDM
-        rc = vboxCallVBVA (PrimaryExtension,
-                               VBVA_INFO_VIEW,
-                               sizeof (VBVAINFOVIEW) * PrimaryExtension->u.primary.cDisplays,
+        rc = VBoxHGSMISendViewInfo (commonFromDeviceExt(PrimaryExtension),
+                               PrimaryExtension->u.primary.cDisplays,
                                vbvaInitInfoDisplay,
-                               NULL,
-                               NULL);
+                               (void *) PrimaryExtension);
         AssertRC(rc);
         if (RT_SUCCESS (rc))
@@ -454 +460 @@
 
         /* Inform about caps */
-        rc = vboxCallVBVA (PrimaryExtension,
+        rc = vboxCallVBVA (commonFromDeviceExt(PrimaryExtension),
                                VBVA_INFO_CAPS,
                                sizeof (VBVACAPS),
@@ -465 +471 @@
         {
             /* Report the host heap location. */
-            rc = vboxCallVBVA (PrimaryExtension,
+            rc = vboxCallVBVA (commonFromDeviceExt(PrimaryExtension),
                                VBVA_INFO_HEAP,
                                sizeof (VBVAINFOHEAP),
@@ -1128 +1134 @@
 } MOUSEPOINTERSHAPECTX;
 
-static int vbvaInitMousePointerShape (PDEVICE_EXTENSION PrimaryExtension, void *pvContext, void *pvData)
-{
-    NOREF (PrimaryExtension);
-
+static int vbvaInitMousePointerShape (PVBOXVIDEO_COMMON, void *pvContext, void *pvData)
+{
     MOUSEPOINTERSHAPECTX *pCtx = (MOUSEPOINTERSHAPECTX *)pvContext;
     VBVAMOUSEPOINTERSHAPE *p = (VBVAMOUSEPOINTERSHAPE *)pvData;
@@ -1160 +1164 @@
 }
 
-static int vbvaFinalizeMousePointerShape (PDEVICE_EXTENSION PrimaryExtension, void *pvContext, void *pvData)
-{
-    NOREF (PrimaryExtension);
-
+static int vbvaFinalizeMousePointerShape (PVBOXVIDEO_COMMON, void *pvContext, void *pvData)
+{
     MOUSEPOINTERSHAPECTX *pCtx = (MOUSEPOINTERSHAPECTX *)pvContext;
     VBVAMOUSEPOINTERSHAPE *p = (VBVAMOUSEPOINTERSHAPE *)pvData;
@@ -1232 +1234 @@
     ctx.i32Result = VERR_NOT_SUPPORTED;
 
-    int rc = vboxCallVBVA (PrimaryExtension,
+    int rc = vboxCallVBVA (commonFromDeviceExt(PrimaryExtension),
                            VBVA_MOUSE_POINTER_SHAPE,
                            sizeof (VBVAMOUSEPOINTERSHAPE) + cbData,