Changeset 69180 in vbox for trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDisplay.cpp

Timestamp:

Oct 23, 2017 6:08:32 PM (7 years ago)

Author:

vboxsync

Message:

Additions/win/vboxtray: Code cleanup in VBoxDisplay service, step 1.

File:

• trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDisplay.cpp (modified) (5 diffs)

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDisplay.cpp

@@ -546 +546 @@
                        && dwNewPosX == 0 && dwNewPosY == 0 && !fChangeOrigin);
     DWORD dmFields = 0;
+    VBOXDISPLAY_DRIVER_TYPE enmDriverType = getVBoxDisplayDriverType(pCtx);
 
     LogFlowFunc(("[%d] %dx%d at %d,%d fChangeOrigin %d fEnabled %d fExtDisSup %d\n",
@@ -676 +677 @@
     hlpResizeRect(paRects, NumDevices, DevPrimaryNum, Id,
             fEnabled ? Width : 0, fEnabled ? Height : 0, dwNewPosX, dwNewPosY);
-#ifdef Log
+
     for (i = 0; i < NumDevices; i++)
     {
@@ -684 +685 @@
                 paRects[i].bottom - paRects[i].top));
     }
-#endif /* Log */
-
-#ifdef VBOX_WITH_WDDM
-    VBOXDISPLAY_DRIVER_TYPE enmDriverType = getVBoxDisplayDriverType (pCtx);
-    if (enmDriverType == VBOXDISPLAY_DRIVER_TYPE_WDDM)
-    {
-        /* Assign the new rectangles to displays. */
-        for (i = 0; i < NumDevices; i++)
-        {
-            paDeviceModes[i].dmPosition.x = paRects[i].left;
-            paDeviceModes[i].dmPosition.y = paRects[i].top;
-            paDeviceModes[i].dmPelsWidth  = paRects[i].right - paRects[i].left;
-            paDeviceModes[i].dmPelsHeight = paRects[i].bottom - paRects[i].top;
-
-            if (i == Id)
-                paDeviceModes[i].dmBitsPerPel = BitsPerPixel;
-
+
+    /* Assign the new rectangles to displays. */
+    for (i = 0; i < NumDevices; i++)
+    {
+        paDeviceModes[i].dmPosition.x = paRects[i].left;
+        paDeviceModes[i].dmPosition.y = paRects[i].top;
+        paDeviceModes[i].dmPelsWidth  = paRects[i].right - paRects[i].left;
+        paDeviceModes[i].dmPelsHeight = paRects[i].bottom - paRects[i].top;
+
+        if (i == Id)
+            paDeviceModes[i].dmBitsPerPel = BitsPerPixel;
+
+        if (enmDriverType >= VBOXDISPLAY_DRIVER_TYPE_WDDM)
+        {
             paDeviceModes[i].dmFields |= dmFields;
 
             /* On Vista one must specify DM_BITSPERPEL.
-             * Note that the current mode dmBitsPerPel is already in the DEVMODE structure.
-             */
+            * Note that the current mode dmBitsPerPel is already in the DEVMODE structure.
+            */
             if (!(paDeviceModes[i].dmFields & DM_BITSPERPEL))
             {
@@ -712 +710 @@
                 paDeviceModes[i].dmBitsPerPel = 32;
             }
-
-            LogFlowFunc(("ResizeDisplayDevice: pfnChangeDisplaySettingsEx %x: %dx%dx%d at %d,%d fields 0x%X\n",
-                  pCtx->pfnChangeDisplaySettingsEx,
-                  paDeviceModes[i].dmPelsWidth,
-                  paDeviceModes[i].dmPelsHeight,
-                  paDeviceModes[i].dmBitsPerPel,
-                  paDeviceModes[i].dmPosition.x,
-                  paDeviceModes[i].dmPosition.y,
-                  paDeviceModes[i].dmFields));
-        }
-
+        }
+        else
+        {
+            paDeviceModes[i].dmFields = DM_POSITION | DM_PELSHEIGHT | DM_PELSWIDTH | DM_BITSPERPEL;
+        }
+
+        LogFlowFunc(("ResizeDisplayDevice: Going to resize display %d to %dx%dx%d at %d,%d fields 0x%X\n",
+            i,
+            paDeviceModes[i].dmPelsWidth,
+            paDeviceModes[i].dmPelsHeight,
+            paDeviceModes[i].dmBitsPerPel,
+            paDeviceModes[i].dmPosition.x,
+            paDeviceModes[i].dmPosition.y,
+            paDeviceModes[i].dmFields));
+    }
+
+#ifdef VBOX_WITH_WDDM
+    if (enmDriverType == VBOXDISPLAY_DRIVER_TYPE_WDDM)
+    {
         LogFlowFunc(("Request to resize the displa\n"));
         DWORD err = VBoxDispIfResizeModes(&pCtx->pEnv->dispIf, Id, fEnabled, fExtDispSup, paDisplayDevices, paDeviceModes, DevNum);
@@ -753 +759 @@
     for (i = 0; i < NumDevices; i++)
     {
-        paDeviceModes[i].dmPosition.x = paRects[i].left;
-        paDeviceModes[i].dmPosition.y = paRects[i].top;
-        paDeviceModes[i].dmPelsWidth  = paRects[i].right - paRects[i].left;
-        paDeviceModes[i].dmPelsHeight = paRects[i].bottom - paRects[i].top;
-
-        /* On Vista one must specify DM_BITSPERPEL.
-         * Note that the current mode dmBitsPerPel is already in the DEVMODE structure.
-         */
-        paDeviceModes[i].dmFields = DM_POSITION | DM_PELSHEIGHT | DM_PELSWIDTH | DM_BITSPERPEL;
-
-        if (   i == Id
-            && BitsPerPixel != 0)
-        {
-            /* Change dmBitsPerPel if requested. */
-            paDeviceModes[i].dmBitsPerPel = BitsPerPixel;
-        }
-
-        LogFlowFunc(("ResizeDisplayDevice: pfnChangeDisplaySettingsEx Current MonitorId=%d: %dx%dx%d at %d,%d\n",
-              i,
-              paDeviceModes[i].dmPelsWidth,
-              paDeviceModes[i].dmPelsHeight,
-              paDeviceModes[i].dmBitsPerPel,
-              paDeviceModes[i].dmPosition.x,
-              paDeviceModes[i].dmPosition.y));
-
         LONG status = pCtx->pfnChangeDisplaySettingsEx((LPSTR)paDisplayDevices[i].DeviceName,
                                                        &paDeviceModes[i], NULL, CDS_NORESET | CDS_UPDATEREGISTRY, NULL);