Changeset 44931 in vbox

Timestamp:

Mar 6, 2013 12:24:58 PM (12 years ago)

Author:

vboxsync

Message:

Additions/WINNT: Code improvement. Fix for WDDM multimonitor.

File:

• trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDispIf.cpp (modified) (6 diffs)

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

@@ -448 +448 @@
 
 #ifdef VBOX_WITH_WDDM
-/**/
+
 #define VBOXRR_TIMER_ID 1234
 
@@ -876 +876 @@
     pMon->hThread = 0;
 }
-/**/
+
 
 typedef struct VBOXDISPIF_WDDM_INTERNAL
@@ -1275 +1275 @@
     BOOL fAbleToInvalidateVidPn = FALSE;
 
-    if (winEr == NO_ERROR)
+    if (0 && winEr == NO_ERROR)
     {
         Assert(hAdapter);
@@ -1339 +1339 @@
         vboxDispIfReninitModesWDDM(pIf, ScreenMask, TRUE);
 
-        winEr = vboxDispIfWddmValidateFixResize(pIf, paDisplayDevices, paDeviceModes, cDevModes);
-
+        OSVERSIONINFO OSinfo;
+        OSinfo.dwOSVersionInfoSize = sizeof (OSinfo);
+        GetVersionEx (&OSinfo);
+        if (OSinfo.dwMajorVersion >= 6 && OSinfo.dwMinorVersion >= 1)
+            winEr = vboxDispIfWddmResizeDisplay(pIf, iChangedMode, paDisplayDevices, paDeviceModes, cDevModes);
+        else
+            winEr = vboxDispIfWddmValidateFixResize(pIf, paDisplayDevices, paDeviceModes, cDevModes);
         Assert(winEr == NO_ERROR);
     }
@@ -1427 +1432 @@
     UINT numModeInfoArrayElements = 0;
     ULONG dwStatus;
+    bool fFoundDisplay = false;
 
     dwStatus = gCtx.pfnGetDisplayConfigBufferSizes(QDC_ONLY_ACTIVE_PATHS, &numPathArrayElements, &numModeInfoArrayElements);
@@ -1453 +1459 @@
         free(pModeInfoArray);
         return dwStatus;
-     }
-    for (unsigned int i=0; i < numPathArrayElements; ++i)
-    {
-        LogRel(("Sourceid= %d and targetid = %d\n", pPathInfoArray[i].sourceInfo.id, pPathInfoArray[i].targetInfo.id));
-        if (pPathInfoArray[i].sourceInfo.id == Id)
-        {
-            LogRel(("VBoxTray: (Resize) Enable the Display Device i =%d \n", i));
-            int test = pPathInfoArray[i].sourceInfo.modeInfoIdx;
-            pModeInfoArray[test].sourceMode.width = paDeviceMode[Id].dmPelsWidth;
-            pModeInfoArray[test].sourceMode.height = paDeviceMode[Id].dmPelsHeight;
-            pModeInfoArray[test].sourceMode.position.x = paDeviceMode[Id].dmPosition.x;
-            pModeInfoArray[test].sourceMode.position.y = paDeviceMode[Id].dmPosition.y;
+    }
+    LogFlow(("VBoxTray: NumPath =%d and NumMod=%d\n", numPathArrayElements, numModeInfoArrayElements));
+    for (UINT iter = 0; iter < numPathArrayElements; ++iter)
+    {
+        LogFlow(("Sourceid= %d and targetid = %d iter =%d and id = %d\n", pPathInfoArray[iter].sourceInfo.id, pPathInfoArray[iter].targetInfo.id, iter, Id));
+        if (pPathInfoArray[iter].sourceInfo.id == Id)
+        {
+            UINT iModIdx = pPathInfoArray[iter].sourceInfo.modeInfoIdx;
+            LogFlow(("VBoxTray: Mode Index = %d\n", iModIdx));
+            pModeInfoArray[iModIdx].sourceMode.width = paDeviceMode[Id].dmPelsWidth;
+            pModeInfoArray[iModIdx].sourceMode.height = paDeviceMode[Id].dmPelsHeight;
+            if(paDeviceMode[Id].dmPosition.x != 0 || paDeviceMode[Id].dmPosition.y != 0)
+            {
+                pModeInfoArray[iModIdx].sourceMode.position.x = paDeviceMode[Id].dmPosition.x;
+                pModeInfoArray[iModIdx].sourceMode.position.y = paDeviceMode[Id].dmPosition.y;
+            }
+            fFoundDisplay = true;
             break;
         }
     }
-    dwStatus = gCtx.pfnSetDisplayConfig(numPathArrayElements, pPathInfoArray, numModeInfoArrayElements, pModeInfoArray,(SDC_APPLY | SDC_SAVE_TO_DATABASE| SDC_ALLOW_CHANGES | SDC_USE_SUPPLIED_DISPLAY_CONFIG));
-    if (dwStatus != ERROR_SUCCESS)
-    {
-        free(pPathInfoArray);
-        free(pModeInfoArray);
-        LogRel(("VBoxTray:(WDDM) Failed to Enable/ disable the monitor."));
-        return dwStatus;
+    if (fFoundDisplay)
+    {
+        /* Call SetDisplayConfig only if displaywith ID=Id has been found. */
+        LogFlow(("VBoxTray: Found Display with Id=%d\n", Id));
+        dwStatus = gCtx.pfnSetDisplayConfig(numPathArrayElements, pPathInfoArray, numModeInfoArrayElements, pModeInfoArray,(SDC_APPLY | SDC_SAVE_TO_DATABASE| SDC_ALLOW_CHANGES | SDC_USE_SUPPLIED_DISPLAY_CONFIG));
+        if (dwStatus != ERROR_SUCCESS)
+        {
+            LogRel(("VBoxTray:(WDDM) Failed to resize the monitor."));
+            free(pPathInfoArray);
+            free(pModeInfoArray);
+            return dwStatus;
+        }
     }
     free(pPathInfoArray);