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

Timestamp:

Oct 20, 2010 10:25:22 AM (14 years ago)

Author:

vboxsync

Message:

Additions/WINNT/Graphics: more refactoring and some re-ordering

Location:

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

Files:

• VBoxVideo.cpp (modified) (10 diffs)
• VBoxVideo.h (modified) (4 diffs)
• VBoxVideoHGSMI.cpp (modified) (18 diffs)
• wddm/VBoxVideoVhwa.cpp (modified) (6 diffs)
• wddm/VBoxVideoVidPn.cpp (modified) (3 diffs)
• wddm/VBoxVideoWddm.cpp (modified) (20 diffs)

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

@@ -895 +895 @@
      */
     int iCustomMode;
-    for (iCustomMode = 0; iCustomMode < DeviceExtension->pPrimary->u.primary.cDisplays; iCustomMode++)
+    for (iCustomMode = 0; iCustomMode < commonFromDeviceExt(DeviceExtension)->cDisplays; iCustomMode++)
     {
         if (fDisplayChangeRequest && iCustomMode == display)
@@ -952 +952 @@
         if (DeviceExtension->CurrentMode == 0)
 #else
-        if (!DeviceExtension->u.primary.cDisplays || !DeviceExtension->aSources[0].pPrimaryAllocation)
+        if (!commonFromDeviceExt(DeviceExtension)->cDisplays || !DeviceExtension->aSources[0].pPrimaryAllocation)
 #endif
         {
@@ -992 +992 @@
         }
 #else
-        if (DeviceExtension->u.primary.cDisplays && DeviceExtension->aSources[0].pPrimaryAllocation)
+        if (commonFromDeviceExt(DeviceExtension)->cDisplays && DeviceExtension->aSources[0].pPrimaryAllocation)
         {
             if (!xres)
@@ -1051 +1051 @@
                 if (DeviceExtension->CurrentMode != 0)
 #else
-                if (DeviceExtension->u.primary.cDisplays && DeviceExtension->aSources[0].pPrimaryAllocation)
+                if (commonFromDeviceExt(DeviceExtension)->cDisplays && DeviceExtension->aSources[0].pPrimaryAllocation)
 #endif
 #ifndef VBOX_WITH_MULTIMONITOR_FIX
@@ -1157 +1157 @@
                 if (DeviceExtension->CurrentMode == 0)
 #else
-                if (!DeviceExtension->u.primary.cDisplays || !DeviceExtension->aSources[0].pPrimaryAllocation)
+                if (!commonFromDeviceExt(DeviceExtension)->cDisplays || !DeviceExtension->aSources[0].pPrimaryAllocation)
 #endif
                 {
@@ -1347 +1347 @@
     /* Size of a framebuffer. */
 
-    ULONG ulSize = ulAvailable / PrimaryExtension->u.primary.cDisplays;
+    ULONG ulSize = ulAvailable / commonFromDeviceExt(PrimaryExtension)->cDisplays;
 
     /* Align down to 4096 bytes. */
@@ -1353 +1353 @@
 
     dprintf(("VBoxVideo::VBoxComputeFrameBufferSizes: cbVRAM = 0x%08X, cDisplays = %d, ulSize = 0x%08X, ulSize * cDisplays = 0x%08X, slack = 0x%08X\n",
-             commonFromDeviceExt(PrimaryExtension)->cbVRAM, PrimaryExtension->u.primary.cDisplays,
-             ulSize, ulSize * PrimaryExtension->u.primary.cDisplays,
-             ulAvailable - ulSize * PrimaryExtension->u.primary.cDisplays));
+             commonFromDeviceExt(PrimaryExtension)->cbVRAM, commonFromDeviceExt(PrimaryExtension)->cDisplays,
+             ulSize, ulSize * commonFromDeviceExt(PrimaryExtension)->cDisplays,
+             ulAvailable - ulSize * commonFromDeviceExt(PrimaryExtension)->cDisplays));
 
 
@@ -1523 +1523 @@
     for (iCustomMode = 0;
 #ifdef VBOX_WITH_WDDM
-            iCustomMode < pDevExt->u.primary.cDisplays;
+            iCustomMode < commonFromDeviceExt(pDevExt)->cDisplays;
 #else
-            iCustomMode < pDevExt->pPrimary->u.primary.cDisplays;
+            iCustomMode < commonFromDeviceExt(pDevExt)->cDisplays;
 #endif
             iCustomMode++)
@@ -1700 +1700 @@
       ((PDEVICE_EXTENSION)HwDeviceExtension)->ulFrameBufferSize       = 0;
       ((PDEVICE_EXTENSION)HwDeviceExtension)->u.primary.ulVbvaEnabled = 0;
-      ((PDEVICE_EXTENSION)HwDeviceExtension)->u.primary.cDisplays     = 1;
       VBoxVideoCmnMemZero(&((PDEVICE_EXTENSION)HwDeviceExtension)->areaDisplay, sizeof(HGSMIAREA));
       /* Guest supports only HGSMI, the old VBVA via VMMDev is not supported. Old
@@ -2857 +2856 @@
     if (ChildEnumInfo->ChildIndex > 0)
     {
-        if ((int)ChildEnumInfo->ChildIndex <= pDevExt->pPrimary->u.primary.cDisplays)
+        if ((int)ChildEnumInfo->ChildIndex <= commonFromDeviceExt(pDevExt)->cDisplays)
         {
             *VideoChildType = Monitor;

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

@@ -203 +203 @@
 typedef struct VBOXVIDEO_COMMON
 {
+    int cDisplays;                      /* Number of displays. */
+
     ULONG cbVRAM;                       /* The VRAM size. */
 
@@ -214 +216 @@
     volatile HGSMIHOSTFLAGS * pHostFlags; /* HGSMI host flags */
     volatile bool bHostCmdProcessing;
-    VBOXVCMNSPIN_LOCK pSynchLock;
 
     PVOID pvAdapterInformation;         /* The pointer to the last 4K of VRAM.
@@ -268 +269 @@
            ULONG ulVbvaEnabled;                /* Indicates that VBVA mode is enabled. */
 
-           int cDisplays;                      /* Number of displays. */
-
 #ifdef VBOX_WITH_WDDM
            VBOXVDMAINFO Vdma;
@@ -276 +275 @@
 # endif
 #endif
+
+           VBOXVCMNSPIN_LOCK pSynchLock;
 
            ULONG ulMaxFrameBufferSize;         /* The size of the VRAM allocated for the a single framebuffer. */

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

@@ -126 +126 @@
                 break;
             }
-            VBOX_HGSMI_LOCK(PrimaryExtension, &commonFromDeviceExt(PrimaryExtension)->pSynchLock, flags, &OldIrql);
+            VBOX_HGSMI_LOCK(PrimaryExtension, &PrimaryExtension->u.primary.pSynchLock, flags, &OldIrql);
             if(!(commonFromDeviceExt(PrimaryExtension)->pHostFlags->u32HostFlags & HGSMIHOSTFLAGS_COMMANDS_PENDING))
             {
                 Assert(commonFromDeviceExt(PrimaryExtension)->bHostCmdProcessing);
                 commonFromDeviceExt(PrimaryExtension)->bHostCmdProcessing = false;
-                VBOX_HGSMI_UNLOCK(PrimaryExtension, &commonFromDeviceExt(PrimaryExtension)->pSynchLock, flags, OldIrql);
+                VBOX_HGSMI_UNLOCK(PrimaryExtension, &PrimaryExtension->u.primary.pSynchLock, flags, OldIrql);
                 break;
             }
-            VBOX_HGSMI_UNLOCK(PrimaryExtension, &commonFromDeviceExt(PrimaryExtension)->pSynchLock, flags, OldIrql);
+            VBOX_HGSMI_UNLOCK(PrimaryExtension, &PrimaryExtension->u.primary.pSynchLock, flags, OldIrql);
         }
         else
@@ -140 +140 @@
             if(!bProcessing)
             {
-                VBOX_HGSMI_LOCK(PrimaryExtension, &commonFromDeviceExt(PrimaryExtension)->pSynchLock, flags, &OldIrql);
+                VBOX_HGSMI_LOCK(PrimaryExtension, &PrimaryExtension->u.primary.pSynchLock, flags, &OldIrql);
                 if(!(commonFromDeviceExt(PrimaryExtension)->pHostFlags->u32HostFlags & HGSMIHOSTFLAGS_COMMANDS_PENDING)
                         || commonFromDeviceExt(PrimaryExtension)->bHostCmdProcessing)
                 {
-                    VBOX_HGSMI_UNLOCK(PrimaryExtension, &commonFromDeviceExt(PrimaryExtension)->pSynchLock, flags, OldIrql);
+                    VBOX_HGSMI_UNLOCK(PrimaryExtension, &PrimaryExtension->u.primary.pSynchLock, flags, OldIrql);
                     break;
                 }
                 Assert(!commonFromDeviceExt(PrimaryExtension)->bHostCmdProcessing);
                 commonFromDeviceExt(PrimaryExtension)->bHostCmdProcessing = true;
-                VBOX_HGSMI_UNLOCK(PrimaryExtension, &commonFromDeviceExt(PrimaryExtension)->pSynchLock, flags, OldIrql);
+                VBOX_HGSMI_UNLOCK(PrimaryExtension, &PrimaryExtension->u.primary.pSynchLock, flags, OldIrql);
                 bProcessing = true;
             }
@@ -366 +366 @@
 
     for (i = 0, Extension = PrimaryExtension;
-         i < PrimaryExtension->u.primary.cDisplays && Extension;
+         i < commonFromDeviceExt(PrimaryExtension)->cDisplays && Extension;
          i++, Extension = Extension->pNext)
     {
@@ -381 +381 @@
     }
 
-    if (i == PrimaryExtension->u.primary.cDisplays && Extension == NULL)
+    if (i == commonFromDeviceExt(PrimaryExtension)->cDisplays && Extension == NULL)
     {
         return VINF_SUCCESS;
@@ -431 +431 @@
 
 
-static int vboxSetupAdapterInfoHGSMI (PDEVICE_EXTENSION PrimaryExtension)
+static int vboxSetupAdapterInfoHGSMI (PVBOXVIDEO_COMMON pCommon)
 {
     dprintf(("VBoxVideo::vboxSetupAdapterInfo\n"));
 
     /* setup the flags first to ensure they are initialized by the time the host heap is ready */
-    int rc = vboxCallChannel(commonFromDeviceExt(PrimaryExtension),
+    int rc = vboxCallChannel(pCommon,
             HGSMI_CH_HGSMI,
             HGSMI_CC_HOST_FLAGS_LOCATION,
@@ -444 +444 @@
                        NULL);
     AssertRC(rc);
-#ifndef VBOX_WITH_WDDM
-    if (RT_SUCCESS(rc))
-    {
-        rc = VBoxHGSMISendViewInfo (commonFromDeviceExt(PrimaryExtension),
-                               PrimaryExtension->u.primary.cDisplays,
-                               vbvaInitInfoDisplay,
-                               (void *) PrimaryExtension);
-        AssertRC(rc);
-    }
-    /* 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)
+    if (RT_SUCCESS(rc) && pCommon->fCaps)
     {
         /* Inform about caps */
-        rc = vboxCallVBVA (commonFromDeviceExt(PrimaryExtension),
+        rc = vboxCallVBVA (pCommon,
                                VBVA_INFO_CAPS,
                                sizeof (VBVACAPS),
@@ -472 +458 @@
     {
         /* Report the host heap location. */
-        rc = vboxCallVBVA (commonFromDeviceExt(PrimaryExtension),
+        rc = vboxCallVBVA (pCommon,
                            VBVA_INFO_HEAP,
                            sizeof (VBVAINFOHEAP),
@@ -730 +716 @@
     memset(commonFromDeviceExt(PrimaryExtension), 0,
            sizeof(*commonFromDeviceExt(PrimaryExtension)));
-    commonFromDeviceExt(PrimaryExtension)->cbVRAM = AdapterMemorySize;
-    commonFromDeviceExt(PrimaryExtension)->fCaps  = fCaps;
-    commonFromDeviceExt(PrimaryExtension)->bHGSMI = VBoxHGSMIIsSupported ();
+    commonFromDeviceExt(PrimaryExtension)->cbVRAM    = AdapterMemorySize;
+    commonFromDeviceExt(PrimaryExtension)->fCaps     = fCaps;
+    commonFromDeviceExt(PrimaryExtension)->cDisplays = 1;
+    commonFromDeviceExt(PrimaryExtension)->bHGSMI    = VBoxHGSMIIsSupported ();
     /* Why does this use VBoxVideoCmnMemZero?  The MSDN docs say that it should
      * only be used on mapped display adapter memory.  Done with memset above. */
@@ -851 +838 @@
     if (commonFromDeviceExt(PrimaryExtension)->bHGSMI)
     {
+        /* Query the configured number of displays. */
+        ULONG cDisplays = 0;
+        vboxQueryConfHGSMI (commonFromDeviceExt(PrimaryExtension), VBOX_VBVA_CONF32_MONITOR_COUNT, &cDisplays);
+
+        dprintf(("VBoxVideo::VBoxSetupDisplays: cDisplays = %d\n",
+                 cDisplays));
+
+        if (cDisplays == 0 || cDisplays > VBOX_VIDEO_MAX_SCREENS)
+        {
+            /* Host reported some bad value. Continue in the 1 screen mode. */
+            cDisplays = 1;
+        }
+        commonFromDeviceExt(PrimaryExtension)->cDisplays = cDisplays;
+    }
+
+    if (commonFromDeviceExt(PrimaryExtension)->bHGSMI)
+    {
+        /* Setup the information for the host. */
+        rc = vboxSetupAdapterInfoHGSMI (commonFromDeviceExt(PrimaryExtension));
+
+        if (RT_FAILURE (rc))
+        {
+            commonFromDeviceExt(PrimaryExtension)->bHGSMI = FALSE;
+        }
+    }
+
 #ifndef VBOX_WITH_WDDM
+    /* For WDDM, we simply store the number of monitors as we will deal with
+     * VidPN stuff later */
+    if (commonFromDeviceExt(PrimaryExtension)->bHGSMI)
+    {
         typedef VP_STATUS (*PFNCREATESECONDARYDISPLAY)(PVOID, PVOID *, ULONG);
         PFNCREATESECONDARYDISPLAY pfnCreateSecondaryDisplay = NULL;
@@ -864 +881 @@
         }
 
-        if (pfnCreateSecondaryDisplay != NULL)
-#endif
-        {
-            /* Query the configured number of displays. */
-            ULONG cDisplays = 0;
-            vboxQueryConfHGSMI (commonFromDeviceExt(PrimaryExtension), VBOX_VBVA_CONF32_MONITOR_COUNT, &cDisplays);
-
-            dprintf(("VBoxVideo::VBoxSetupDisplays: cDisplays = %d\n",
-                     cDisplays));
-
-            if (cDisplays == 0 || cDisplays > VBOX_VIDEO_MAX_SCREENS)
-            {
-                /* Host reported some bad value. Continue in the 1 screen mode. */
-                cDisplays = 1;
-            }
-
-#ifndef VBOX_WITH_WDDM
+        if (!pfnCreateSecondaryDisplay)
+            commonFromDeviceExt(PrimaryExtension)->cDisplays = 1;
+        else
+        {
             PDEVICE_EXTENSION pPrev = PrimaryExtension;
 
             ULONG iDisplay;
+            ULONG cDisplays = commonFromDeviceExt(PrimaryExtension)->cDisplays;
+            commonFromDeviceExt(PrimaryExtension)->cDisplays = 1;
             for (iDisplay = 1; iDisplay < cDisplays; iDisplay++)
             {
@@ -909 +915 @@
 
                /* Take the successfully created display into account. */
-               PrimaryExtension->u.primary.cDisplays++;
-            }
-#else
-            /* simply store the number of monitors, we will deal with VidPN stuff later */
-            PrimaryExtension->u.primary.cDisplays = cDisplays;
-#endif
+               commonFromDeviceExt(PrimaryExtension)->cDisplays++;
+            }
         }
 
@@ -921 +923 @@
     }
 
-#ifndef VBOX_WITH_WDDM
     /* Now when the number of monitors is known and extensions are created,
      * calculate the layout of framebuffers.
      */
     VBoxComputeFrameBufferSizes (PrimaryExtension);
-#endif
+    /* 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 */
 
     if (commonFromDeviceExt(PrimaryExtension)->bHGSMI)
     {
-        /* Setup the information for the host. */
-        rc = vboxSetupAdapterInfoHGSMI (PrimaryExtension);
+        if (RT_SUCCESS(rc))
+        {
+            rc = VBoxHGSMISendViewInfo (commonFromDeviceExt(PrimaryExtension),
+                                   commonFromDeviceExt(PrimaryExtension)->cDisplays,
+                                   vbvaInitInfoDisplay,
+                                   (void *) PrimaryExtension);
+            AssertRC(rc);
+        }
 
         if (RT_FAILURE (rc))
@@ -938 +948 @@
         }
     }
+#endif
 
 #ifdef VBOX_WITH_WDDM
@@ -982 +993 @@
             ulAvailable = offset;
             ulSize = ulAvailable / 2;
-            ulSize /= PrimaryExtension->u.primary.cDisplays;
+            ulSize /= commonFromDeviceExt(PrimaryExtension)->cDisplays;
             Assert(ulSize > VBVA_MIN_BUFFER_SIZE);
             if (ulSize > VBVA_MIN_BUFFER_SIZE)
@@ -1001 +1012 @@
             Assert(ulSize);
 
-            Assert(ulSize * PrimaryExtension->u.primary.cDisplays < ulAvailable);
-
-            for (int i = PrimaryExtension->u.primary.cDisplays-1; i >= 0; --i)
+            Assert(ulSize * commonFromDeviceExt(PrimaryExtension)->cDisplays < ulAvailable);
+
+            for (int i = commonFromDeviceExt(PrimaryExtension)->cDisplays-1; i >= 0; --i)
             {
                 offset -= ulSize;
@@ -1044 +1055 @@
     if (commonFromDeviceExt(PrimaryExtension)->bHGSMI)
     {
-        VBoxVideoCmnSpinLockCreate(PrimaryExtension, &commonFromDeviceExt(PrimaryExtension)->pSynchLock);
+        VBoxVideoCmnSpinLockCreate(PrimaryExtension, &PrimaryExtension->u.primary.pSynchLock);
     }
 
@@ -1059 +1070 @@
         VBoxUnmapAdapterMemory(PrimaryExtension, (void**)&PrimaryExtension->pvVisibleVram, vboxWddmVramCpuVisibleSize(PrimaryExtension));
 
-    for (int i = PrimaryExtension->u.primary.cDisplays-1; i >= 0; --i)
+    for (int i = commonFromDeviceExt(PrimaryExtension)->cDisplays-1; i >= 0; --i)
     {
         rc = vboxVbvaDisable(PrimaryExtension, &PrimaryExtension->aSources[i].Vbva);
@@ -1304 +1315 @@
 static int vboxVBVACreateChannelContexts(PDEVICE_EXTENSION PrimaryExtension, VBVA_CHANNELCONTEXTS ** ppContext)
 {
-#ifndef VBOX_WITH_WDDM
-    uint32_t cDisplays = (uint32_t)PrimaryExtension->u.primary.cDisplays;
-#else
-    uint32_t cDisplays = (uint32_t)PrimaryExtension->u.primary.cDisplays;
-#endif
+    uint32_t cDisplays = (uint32_t)commonFromDeviceExt(PrimaryExtension)->cDisplays;
     const size_t size = RT_OFFSETOF(VBVA_CHANNELCONTEXTS, aContexts[cDisplays]);
     VBVA_CHANNELCONTEXTS * pContext = (VBVA_CHANNELCONTEXTS*)VBoxVideoCmnMemAllocNonPaged(PrimaryExtension, size, MEM_TAG);

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

@@ -353 +353 @@
 static void vboxVhwaInitSrc(PDEVICE_EXTENSION pDevExt, D3DDDI_VIDEO_PRESENT_SOURCE_ID srcId)
 {
-    Assert(srcId < (D3DDDI_VIDEO_PRESENT_SOURCE_ID)pDevExt->u.primary.cDisplays);
+    Assert(srcId < (D3DDDI_VIDEO_PRESENT_SOURCE_ID)commonFromDeviceExt(pDevExt)->cDisplays);
     VBOXVHWA_INFO *pSettings = &pDevExt->aSources[srcId].Vhwa.Settings;
     memset (pSettings, 0, sizeof (VBOXVHWA_INFO));
@@ -418 +418 @@
 void vboxVhwaInit(PDEVICE_EXTENSION pDevExt)
 {
-    for (int i = 0; i < pDevExt->u.primary.cDisplays; ++i)
+    for (int i = 0; i < commonFromDeviceExt(pDevExt)->cDisplays; ++i)
     {
         vboxVhwaInitSrc(pDevExt, (D3DDDI_VIDEO_PRESENT_SOURCE_ID)i);
@@ -428 +428 @@
     /* we do not allocate/map anything, just issue a Disable command
      * to ensure all pending commands are flushed */
-    for (int i = 0; i < pDevExt->u.primary.cDisplays; ++i)
+    for (int i = 0; i < commonFromDeviceExt(pDevExt)->cDisplays; ++i)
     {
         vboxVhwaDisable(pDevExt, i);
@@ -680 +680 @@
 int vboxVhwaHlpGetSurfInfo(PDEVICE_EXTENSION pDevExt, PVBOXWDDM_ALLOCATION pSurf)
 {
-    for (int i = 0; i < pDevExt->u.primary.cDisplays; ++i)
+    for (int i = 0; i < commonFromDeviceExt(pDevExt)->cDisplays; ++i)
     {
         PVBOXWDDM_SOURCE pSource = &pDevExt->aSources[i];
@@ -720 +720 @@
 int vboxVhwaHlpCheckInit(PDEVICE_EXTENSION pDevExt, D3DDDI_VIDEO_PRESENT_SOURCE_ID VidPnSourceId)
 {
-    Assert(VidPnSourceId < (D3DDDI_VIDEO_PRESENT_SOURCE_ID)pDevExt->u.primary.cDisplays);
-    if (VidPnSourceId >= (D3DDDI_VIDEO_PRESENT_SOURCE_ID)pDevExt->u.primary.cDisplays)
+    Assert(VidPnSourceId < (D3DDDI_VIDEO_PRESENT_SOURCE_ID)commonFromDeviceExt(pDevExt)->cDisplays);
+    if (VidPnSourceId >= (D3DDDI_VIDEO_PRESENT_SOURCE_ID)commonFromDeviceExt(pDevExt)->cDisplays)
         return VERR_INVALID_PARAMETER;
 
@@ -766 +766 @@
 int vboxVhwaHlpCheckTerm(PDEVICE_EXTENSION pDevExt, D3DDDI_VIDEO_PRESENT_SOURCE_ID VidPnSourceId)
 {
-    Assert(VidPnSourceId < (D3DDDI_VIDEO_PRESENT_SOURCE_ID)pDevExt->u.primary.cDisplays);
-    if (VidPnSourceId >= (D3DDDI_VIDEO_PRESENT_SOURCE_ID)pDevExt->u.primary.cDisplays)
+    Assert(VidPnSourceId < (D3DDDI_VIDEO_PRESENT_SOURCE_ID)commonFromDeviceExt(pDevExt)->cDisplays);
+    if (VidPnSourceId >= (D3DDDI_VIDEO_PRESENT_SOURCE_ID)commonFromDeviceExt(pDevExt)->cDisplays)
         return VERR_INVALID_PARAMETER;
 

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

@@ -1558 +1558 @@
 NTSTATUS vboxVidPnCommitSourceMode(struct _DEVICE_EXTENSION* pDevExt, D3DDDI_VIDEO_PRESENT_SOURCE_ID srcId, CONST D3DKMDT_VIDPN_SOURCE_MODE* pVidPnSourceModeInfo, PVBOXWDDM_ALLOCATION pAllocation)
 {
-    Assert(srcId < (UINT)pDevExt->u.primary.cDisplays);
-    if (srcId < (UINT)pDevExt->u.primary.cDisplays)
+    Assert(srcId < (UINT)commonFromDeviceExt(pDevExt)->cDisplays);
+    if (srcId < (UINT)commonFromDeviceExt(pDevExt)->cDisplays)
     {
         PVBOXWDDM_SOURCE pSource = &pDevExt->aSources[srcId];
@@ -1565 +1565 @@
     }
 
-    drprintf((__FUNCTION__": invalid srcId (%d), cSources(%d)\n", srcId, pDevExt->u.primary.cDisplays));
+    drprintf((__FUNCTION__": invalid srcId (%d), cSources(%d)\n", srcId, commonFromDeviceExt(pDevExt)->cDisplays));
     return STATUS_INVALID_PARAMETER;
 }
@@ -1580 +1580 @@
 {
     VBOXVIDPNCOMMITTARGETMODE *pInfo = (VBOXVIDPNCOMMITTARGETMODE*)pContext;
-    Assert(cTgtPaths <= (SIZE_T)pDevExt->u.primary.cDisplays);
+    Assert(cTgtPaths <= (SIZE_T)commonFromDeviceExt(pDevExt)->cDisplays);
     D3DKMDT_HVIDPNTARGETMODESET hVidPnTargetModeSet;
     CONST DXGK_VIDPNTARGETMODESET_INTERFACE* pVidPnTargetModeSetInterface;

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

@@ -174 +174 @@
         pView->u32ViewIndex     = pAllocation->SurfDesc.VidPnSourceId;
         pView->u32ViewOffset    = (uint32_t)offVram; /* we pretend the view is located at the start of each framebuffer */
-        pView->u32ViewSize      = vboxWddmVramCpuVisibleSegmentSize(pDevExt)/pDevExt->u.primary.cDisplays;
+        pView->u32ViewSize      = vboxWddmVramCpuVisibleSegmentSize(pDevExt)/commonFromDeviceExt(pDevExt)->cDisplays;
 
         pView->u32MaxScreenSize = pView->u32ViewSize;
@@ -594 +594 @@
                 {
                     drprintf(("VBoxVideoWddm: using HGSMI\n"));
-                    *NumberOfVideoPresentSources = pContext->u.primary.cDisplays;
-                    *NumberOfChildren = pContext->u.primary.cDisplays;
+                    *NumberOfVideoPresentSources = commonFromDeviceExt(pContext)->cDisplays;
+                    *NumberOfChildren = commonFromDeviceExt(pContext)->cDisplays;
                     dprintf(("VBoxVideoWddm: sources(%d), children(%d)\n", *NumberOfVideoPresentSources, *NumberOfChildren));
 
@@ -1024 +1024 @@
 
     dfprintf(("==> "__FUNCTION__ ", context(0x%x)\n", MiniportDeviceContext));
-    Assert(ChildRelationsSize == (pDevExt->u.primary.cDisplays + 1)*sizeof(DXGK_CHILD_DESCRIPTOR));
-    for (int i = 0; i < pDevExt->u.primary.cDisplays; ++i)
+    Assert(ChildRelationsSize == (commonFromDeviceExt(pDevExt)->cDisplays + 1)*sizeof(DXGK_CHILD_DESCRIPTOR));
+    for (int i = 0; i < commonFromDeviceExt(pDevExt)->cDisplays; ++i)
     {
         ChildRelations[i].ChildDeviceType = TypeVideoOutput;
@@ -1217 +1217 @@
             pCaps->MaxOverlays = 0;
 #ifdef VBOX_WITH_VIDEOHWACCEL
-            for (int i = 0; i < pContext->u.primary.cDisplays; ++i)
+            for (int i = 0; i < commonFromDeviceExt(pContext)->cDisplays; ++i)
             {
                 if ( pContext->aSources[i].Vhwa.Settings.fFlags & VBOXVHWA_F_ENABLED)
@@ -1306 +1306 @@
                 memset (pQi, 0, sizeof (VBOXWDDM_QI));
                 pQi->u32Version = VBOXVIDEOIF_VERSION;
-                pQi->cInfos = pContext->u.primary.cDisplays;
+                pQi->cInfos = commonFromDeviceExt(pContext)->cDisplays;
 #ifdef VBOX_WITH_VIDEOHWACCEL
-                for (int i = 0; i < pContext->u.primary.cDisplays; ++i)
+                for (int i = 0; i < commonFromDeviceExt(pContext)->cDisplays; ++i)
                 {
                     pQi->aInfos[i] = pContext->aSources[i].Vhwa.Settings;
@@ -1668 +1668 @@
         {
             PVBOXWDDM_RCINFO pRcInfo = (PVBOXWDDM_RCINFO)pCreateAllocation->pPrivateDriverData;
-//            Assert(pRcInfo->RcDesc.VidPnSourceId < pDevExt->u.primary.cDisplays);
+//            Assert(pRcInfo->RcDesc.VidPnSourceId < commonFromDeviceExt(pDevExt)->cDisplays);
             Assert(pRcInfo->cAllocInfos == pCreateAllocation->NumAllocations);
             pResource = (PVBOXWDDM_RESOURCE)vboxWddmMemAllocZero(RT_OFFSETOF(VBOXWDDM_RESOURCE, aAllocations[pRcInfo->cAllocInfos]));
@@ -3294 +3294 @@
                 {
                     PVBOXDISPIFESCAPE_SCREENLAYOUT pLo = (PVBOXDISPIFESCAPE_SCREENLAYOUT)pEscapeHdr;
-                    Assert(pLo->ScreenLayout.cScreens <= (UINT)pDevExt->u.primary.cDisplays);
+                    Assert(pLo->ScreenLayout.cScreens <= (UINT)commonFromDeviceExt(pDevExt)->cDisplays);
                     for (UINT i = 0; i < pLo->ScreenLayout.cScreens; ++i)
                     {
                         PVBOXSCREENLAYOUT_ELEMENT pEl = &pLo->ScreenLayout.aScreens[i];
-                        Assert(pEl->VidPnSourceId < (UINT)pDevExt->u.primary.cDisplays);
-                        if (pEl->VidPnSourceId < (UINT)pDevExt->u.primary.cDisplays)
+                        Assert(pEl->VidPnSourceId < (UINT)commonFromDeviceExt(pDevExt)->cDisplays);
+                        if (pEl->VidPnSourceId < (UINT)commonFromDeviceExt(pDevExt)->cDisplays)
                         {
                             PVBOXWDDM_SOURCE pSource = &pDevExt->aSources[pEl->VidPnSourceId];
@@ -3424 +3424 @@
             if (Status == STATUS_SUCCESS && bSupported)
             {
-                for (int id = 0; id < pContext->u.primary.cDisplays; ++id)
+                for (int id = 0; id < commonFromDeviceExt(pContext)->cDisplays; ++id)
                 {
                     D3DKMDT_HVIDPNSOURCEMODESET hNewVidPnSourceModeSet;
@@ -3455 +3455 @@
                 if (Status == STATUS_SUCCESS && bSupported)
                 {
-                    for (int id = 0; id < pContext->u.primary.cDisplays; ++id)
+                    for (int id = 0; id < commonFromDeviceExt(pContext)->cDisplays; ++id)
                     {
                         D3DKMDT_HVIDPNTARGETMODESET hNewVidPnTargetModeSet;
@@ -3565 +3565 @@
     if (Status == STATUS_SUCCESS)
     {
-        for (int i = 0; i < pDevExt->u.primary.cDisplays; ++i)
+        for (int i = 0; i < commonFromDeviceExt(pDevExt)->cDisplays; ++i)
         {
             Status = vboxVidPnCheckAddMonitorModes(pDevExt, i, D3DKMDT_MCO_DRIVER, &Resolution, 1, 0);
@@ -3682 +3682 @@
     NTSTATUS Status = STATUS_SUCCESS;
     PDEVICE_EXTENSION pDevExt = (PDEVICE_EXTENSION)hAdapter;
-    Assert((UINT)pDevExt->u.primary.cDisplays > pSetVidPnSourceAddress->VidPnSourceId);
+    Assert((UINT)commonFromDeviceExt(pDevExt)->cDisplays > pSetVidPnSourceAddress->VidPnSourceId);
 
     PVBOXWDDM_SOURCE pSource = &pDevExt->aSources[pSetVidPnSourceAddress->VidPnSourceId];
@@ -3689 +3689 @@
     Status = STATUS_SUCCESS;
 
-    if ((UINT)pDevExt->u.primary.cDisplays > pSetVidPnSourceAddress->VidPnSourceId)
+    if ((UINT)commonFromDeviceExt(pDevExt)->cDisplays > pSetVidPnSourceAddress->VidPnSourceId)
     {
         PVBOXWDDM_ALLOCATION pAllocation;
@@ -3741 +3741 @@
     else
     {
-        drprintf((__FUNCTION__": invalid VidPnSourceId (%d), should be smaller than (%d)\n", pSetVidPnSourceAddress->VidPnSourceId, pDevExt->u.primary.cDisplays));
+        drprintf((__FUNCTION__": invalid VidPnSourceId (%d), should be smaller than (%d)\n", pSetVidPnSourceAddress->VidPnSourceId, commonFromDeviceExt(pDevExt)->cDisplays));
         Status = STATUS_INVALID_PARAMETER;
     }
@@ -3766 +3766 @@
     NTSTATUS Status = STATUS_SUCCESS;
     PDEVICE_EXTENSION pDevExt = (PDEVICE_EXTENSION)hAdapter;
-    Assert((UINT)pDevExt->u.primary.cDisplays > pSetVidPnSourceVisibility->VidPnSourceId);
+    Assert((UINT)commonFromDeviceExt(pDevExt)->cDisplays > pSetVidPnSourceVisibility->VidPnSourceId);
 
     PVBOXWDDM_SOURCE pSource = &pDevExt->aSources[pSetVidPnSourceVisibility->VidPnSourceId];
@@ -3773 +3773 @@
     Status = STATUS_SUCCESS;
 
-    if ((UINT)pDevExt->u.primary.cDisplays > pSetVidPnSourceVisibility->VidPnSourceId)
+    if ((UINT)commonFromDeviceExt(pDevExt)->cDisplays > pSetVidPnSourceVisibility->VidPnSourceId)
     {
         PVBOXWDDM_ALLOCATION pAllocation = pSource->pPrimaryAllocation;
@@ -3819 +3819 @@
     else
     {
-        drprintf((__FUNCTION__": invalid VidPnSourceId (%d), should be smaller than (%d)\n", pSetVidPnSourceVisibility->VidPnSourceId, pDevExt->u.primary.cDisplays));
+        drprintf((__FUNCTION__": invalid VidPnSourceId (%d), should be smaller than (%d)\n", pSetVidPnSourceVisibility->VidPnSourceId, commonFromDeviceExt(pDevExt)->cDisplays));
         Status = STATUS_INVALID_PARAMETER;
     }
@@ -3858 +3858 @@
         {
             /* clear all current primaries */
-            for (int i = 0; i < pDevExt->u.primary.cDisplays; ++i)
+            for (int i = 0; i < commonFromDeviceExt(pDevExt)->cDisplays; ++i)
             {
                 vboxWddmAssignPrimary(pDevExt, &pDevExt->aSources[i], NULL, i);
@@ -4005 +4005 @@
     PDEVICE_EXTENSION pDevExt = (PDEVICE_EXTENSION)hAdapter;
 
-    Assert((UINT)pDevExt->u.primary.cDisplays > pGetScanLine->VidPnTargetId);
+    Assert((UINT)commonFromDeviceExt(pDevExt)->cDisplays > pGetScanLine->VidPnTargetId);
     VBOXWDDM_TARGET *pTarget = &pDevExt->aTargets[pGetScanLine->VidPnTargetId];
     Assert(pTarget->HeightTotal);
@@ -4399 +4399 @@
 
     D3DDDI_VIDEO_PRESENT_SOURCE_ID id = pAllocation->SurfDesc.VidPnSourceId;
-    if (id >= (D3DDDI_VIDEO_PRESENT_SOURCE_ID)pDevExt->u.primary.cDisplays)
+    if (id >= (D3DDDI_VIDEO_PRESENT_SOURCE_ID)commonFromDeviceExt(pDevExt)->cDisplays)
         return false;
 
@@ -4968 +4968 @@
             Assert(pCreateContext->Flags.Value <= 2); /* 2 is a GDI context in Win7 */
             pContext->enmType = VBOXWDDM_CONTEXT_TYPE_SYSTEM;
-            for (int i = 0; i < pDevExt->u.primary.cDisplays; ++i)
+            for (int i = 0; i < commonFromDeviceExt(pDevExt)->cDisplays; ++i)
             {
                 pDevExt->aSources[i].offVram = VBOXVIDEOOFFSET_VOID;