Changeset 44557 in vbox for trunk

Timestamp:

Feb 6, 2013 6:36:38 AM (12 years ago)

Author:

vboxsync

Message:

Additions/WINNT/VBoxTray: Support for dynamic operations on virtual secondary monitors
1) Enabling/ Disabling
2) Repositioning
3) Resizing.

Location:

trunk/src/VBox/Additions/WINNT

Files:

• VBoxTray/VBoxDispIf.cpp (modified) (6 diffs)
• VBoxTray/VBoxDispIf.h (modified) (1 diff)
• VBoxTray/VBoxDisplay.cpp (modified) (16 diffs)
• include/VBoxDisplay.h (modified) (1 diff)

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

@@ -16 +16 @@
 
 #include "VBoxTray.h"
-
+#define _WIN32_WINNT 0x0601
 #include <iprt/log.h>
 #include <iprt/err.h>
@@ -26 +26 @@
 #include <iprt/asm.h>
 #endif
+
+/* APIs specific to win7 and above WDDM architecture. Not available for Vista WDDM.
+ * This is the reason they have not been put in the VBOXDISPIF struct in VBoxDispIf.h
+ */
+typedef struct _VBOXDISPLAYWDDMAPICONTEXT
+{
+    LONG (WINAPI * pfnSetDisplayConfig)(UINT numPathArrayElements,DISPLAYCONFIG_PATH_INFO *pathArray,UINT numModeInfoArrayElements,
+                                    DISPLAYCONFIG_MODE_INFO *modeInfoArray, UINT Flags);
+    LONG (WINAPI * pfnQueryDisplayConfig)(UINT Flags,UINT *pNumPathArrayElements, DISPLAYCONFIG_PATH_INFO *pPathInfoArray,
+                                      UINT *pNumModeInfoArrayElements, DISPLAYCONFIG_MODE_INFO *pModeInfoArray,
+                                      DISPLAYCONFIG_TOPOLOGY_ID *pCurrentTopologyId);
+    LONG (WINAPI * pfnGetDisplayConfigBufferSizes)(UINT Flags, UINT *pNumPathArrayElements, UINT *pNumModeInfoArrayElements);
+} _VBOXDISPLAYWDDMAPICONTEXT;
+
+static _VBOXDISPLAYWDDMAPICONTEXT gCtx = {0};
 
 /* display driver interface abstraction for XPDM & WDDM
@@ -95 +110 @@
             Log((__FUNCTION__": VBoxDisplayInit: pfnEnumDisplayDevices = %p\n", pIf->modeData.wddm.pfnEnumDisplayDevices));
             bSupported &= !!(pIf->modeData.wddm.pfnEnumDisplayDevices);
+            /* for win 7 and above */
+             if (OSinfo.dwMinorVersion >= 1)
+            {
+                *(uintptr_t *)&gCtx.pfnSetDisplayConfig = (uintptr_t)GetProcAddress(hUser, "SetDisplayConfig");
+                Log((__FUNCTION__": VBoxDisplayInit: pfnSetDisplayConfig = %p\n", gCtx.pfnSetDisplayConfig));
+                bSupported &= !!(gCtx.pfnSetDisplayConfig);
+
+                *(uintptr_t *)&gCtx.pfnQueryDisplayConfig = (uintptr_t)GetProcAddress(hUser, "QueryDisplayConfig");
+                Log((__FUNCTION__": VBoxDisplayInit: pfnQueryDisplayConfig = %p\n", gCtx.pfnQueryDisplayConfig));
+                bSupported &= !!(gCtx.pfnQueryDisplayConfig);
+
+                *(uintptr_t *)&gCtx.pfnGetDisplayConfigBufferSizes = (uintptr_t)GetProcAddress(hUser, "GetDisplayConfigBufferSizes");
+                Log((__FUNCTION__": VBoxDisplayInit: pfnGetDisplayConfigBufferSizes = %p\n", gCtx.pfnGetDisplayConfigBufferSizes));
+                bSupported &= !!(gCtx.pfnGetDisplayConfigBufferSizes);
+            }
 
             /* this is vista and up */
@@ -1153 +1183 @@
     Data.aScreenInfos[0].Mode.Height = pDeviceMode->dmPelsHeight;
     Data.aScreenInfos[0].Mode.BitsPerPixel = pDeviceMode->dmBitsPerPel;
+    if (pDeviceMode->dmPosition.x != 0 || pDeviceMode->dmPosition.y != 0) {
+        Data.aScreenInfos[0].Mode.PosX = pDeviceMode->dmPosition.x;
+        Data.aScreenInfos[0].Mode.PosY = pDeviceMode->dmPosition.y;
+    }
     DWORD err = vboxDispIfEscapeWDDM(pIf, &Data.EscapeHdr, sizeof (Data) - sizeof (Data.EscapeHdr), TRUE);
     if (err != NO_ERROR)
@@ -1198 +1232 @@
         pInfo->Height = paDeviceModes[i].dmPelsHeight;
         pInfo->BitsPerPixel = paDeviceModes[i].dmBitsPerPel;
+
+        if (i == iChangedMode && (paDeviceModes[i].dmPosition.x != 0 || paDeviceModes[i].dmPosition.y != 0) )
+        {
+                /* change position values only if not equal to 0*/
+                LogRel(("VBoxTray: (WDDM) Change Position x=%d*y=%d Display Device ID=%d\n", paDeviceModes[i].dmPosition.x, paDeviceModes[i].dmPosition.y, i));
+                pInfo->PosX = paDeviceModes[i].dmPosition.x;
+                pInfo->PosY =  paDeviceModes[i].dmPosition.y;
+        }
 
         if (!hAdapter)
@@ -1282 +1324 @@
     return winEr;
 }
+
+DWORD vboxDispIfWddmEnableDisplay(PCVBOXDISPIF const pIf, UINT Id, bool fEnabled)
+{
+    DISPLAYCONFIG_PATH_INFO PathInfoArray[10];
+    DISPLAYCONFIG_MODE_INFO ModeInfoArray[10];
+    UINT NumPathArrayElements = 0;
+    UINT NumModeInfoArrayElements = 0;
+    ULONG dwStatus;
+    UINT uFlag;
+
+    dwStatus = gCtx.pfnGetDisplayConfigBufferSizes(fEnabled ? QDC_ALL_PATHS : QDC_ONLY_ACTIVE_PATHS,&NumPathArrayElements,&NumModeInfoArrayElements);
+    if (dwStatus != ERROR_SUCCESS)
+    {
+        LogFlow(("VBoxTray: (WDDM) Failed GetDisplayConfigBufferSizes \n"));
+        return dwStatus;
+    }
+    dwStatus = gCtx.pfnQueryDisplayConfig(fEnabled ? QDC_ALL_PATHS : QDC_ONLY_ACTIVE_PATHS,&NumPathArrayElements, &PathInfoArray[0],&NumModeInfoArrayElements, &ModeInfoArray[0],NULL);
+    if (dwStatus != ERROR_SUCCESS)
+    {
+        LogFlow(("VBoxTray: (WDDM) Failed QueryDisplayConfig \n"));
+        return dwStatus;
+    }
+    for (unsigned int i=0; i < NumPathArrayElements; ++i)
+    {
+        if (PathInfoArray[i].sourceInfo.id == Id)
+        {
+            if (fEnabled)
+            {
+                LogRel(("VBoxTray: (WDDM) Enable the Display Device i =%d \n", i));
+                PathInfoArray[i].flags=DISPLAYCONFIG_PATH_ACTIVE;
+                break;
+            }
+            else
+            {
+                LogRel(("VBoxTray: (WDDM) Disable the Display Device  ID=%d and Sourceid=%d\n", i, PathInfoArray[i].sourceInfo.id));
+                PathInfoArray[i].flags=0;
+                break;
+            }
+        }
+    }
+    dwStatus = gCtx.pfnSetDisplayConfig(NumPathArrayElements, &PathInfoArray[0],NumModeInfoArrayElements, &ModeInfoArray[0],(SDC_APPLY | SDC_SAVE_TO_DATABASE| SDC_ALLOW_CHANGES | SDC_USE_SUPPLIED_DISPLAY_CONFIG));
+    if (dwStatus != ERROR_SUCCESS) {
+        LogRel(("VBoxTray:(WDDM) Failed to disable the monitor."));
+        return dwStatus;
+    }
+    return ERROR_SUCCESS;
+}
+
 #endif /* VBOX_WITH_WDDM */
 

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

@@ -87 +87 @@
 DWORD VBoxDispIfResizeModes(PCVBOXDISPIF const pIf, UINT iChangedMode, DISPLAY_DEVICE *paDisplayDevices, DEVMODE *paDeviceModes, UINT cDevModes);
 DWORD VBoxDispIfCancelPendingResize(PCVBOXDISPIF const pIf);
+DWORD vboxDispIfWddmEnableDisplay(PCVBOXDISPIF const pIf, UINT Id, bool fEnabled);
 //DWORD VBoxDispIfReninitModes(PCVBOXDISPIF const pIf, uint8_t *pScreenIdMask, BOOL fReconnectDisplaysOnChange);

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

@@ -218 +218 @@
                                     VBOXDISPLAYCONTEXT *pCtx)
 {
-    DISPLAY_DEVICE DisplayDeviceTmp;
-    DISPLAY_DEVICE DisplayDevice;
-    DEVMODE DeviceMode;
+    DISPLAY_DEVICE displayDeviceTmp;
+    DISPLAY_DEVICE displayDevice;
+    DEVMODE devModePrimary;
+    DEVMODE deviceMode;
     DWORD DispNum = 0;
-
-    ZeroMemory(&DisplayDeviceTmp, sizeof(DisplayDeviceTmp));
-    DisplayDeviceTmp.cb = sizeof(DisplayDevice);
+    DWORD dwStatus = DISP_CHANGE_SUCCESSFUL;
+
+    ZeroMemory(&displayDeviceTmp, sizeof(DISPLAY_DEVICE));
+    displayDeviceTmp.cb = sizeof(DISPLAY_DEVICE);
 
     Log(("EnableDisplayDevice Id=%d, width=%d height=%d \
@@ -230 +232 @@
          Id, aWidth, aHeight, aPosX, aPosY, fEnabled, fExtDispSup));
 
-    /* Disable all the devices apart from the device with ID = Id and
+    /* Disable all the devices leaving the device with ID == Id and
      * primary device.
      */
-    while (EnumDisplayDevices (NULL, DispNum, &DisplayDeviceTmp, 0))
+    while (EnumDisplayDevices(NULL, DispNum, &displayDeviceTmp, 0))
     {
         /* Displays which are configured but not enabled, update their
@@ -244 +246 @@
         if (DispNum != 0 && DispNum != Id)
         {
-            DEVMODE DeviceModeTmp;
-            ZeroMemory(&DeviceModeTmp, sizeof(DEVMODE));
-            DeviceModeTmp.dmSize = sizeof(DEVMODE);
-            DeviceModeTmp.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL | DM_POSITION
+            DEVMODE deviceModeTmp;
+            ZeroMemory(&deviceModeTmp, sizeof(DEVMODE));
+            deviceModeTmp.dmSize = sizeof(DEVMODE);
+            deviceModeTmp.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL | DM_POSITION
                                      | DM_DISPLAYFREQUENCY | DM_DISPLAYFLAGS ;
-            gCtx.pfnChangeDisplaySettingsEx(DisplayDeviceTmp.DeviceName, &DeviceModeTmp, NULL,
-                                    (CDS_UPDATEREGISTRY | CDS_NORESET), NULL);
+            gCtx.pfnChangeDisplaySettingsEx(displayDeviceTmp.DeviceName, &deviceModeTmp, NULL,
+                                           (CDS_UPDATEREGISTRY | CDS_NORESET), NULL);
         }
         DispNum++;
     }
 
-    ZeroMemory(&DisplayDevice, sizeof(DisplayDevice));
-    DisplayDevice.cb = sizeof(DisplayDevice);
-
-    ZeroMemory(&DeviceMode, sizeof(DEVMODE));
-    DeviceMode.dmSize = sizeof(DEVMODE);
-
-    EnumDisplayDevices (NULL, Id, &DisplayDevice, 0);
-
-    if (!EnumDisplaySettings((LPSTR)DisplayDevice.DeviceName,
-         ENUM_REGISTRY_SETTINGS, &DeviceMode))
-    {
-        Log(("VBoxTray: ResizeDisplayDevice: EnumDisplaySettings error %d\n", GetLastError ()));
-        /* @todo: perhaps more intelligent error reporting is needed here
-         * return DISP_CHANGE_BADMODE to avoid retries & thus infinite looping */
-        return DISP_CHANGE_BADMODE;
-    }
-
-    if (DeviceMode.dmPelsWidth == 0
-        || DeviceMode.dmPelsHeight == 0)
-    {
-        /* No ENUM_REGISTRY_SETTINGS yet. Seen on Vista after installation.
-         * Get the current video mode then.
-         */
-        ZeroMemory(&DeviceMode, sizeof(DEVMODE));
-        DeviceMode.dmSize = sizeof(DEVMODE);
-        if (!EnumDisplaySettings((LPSTR)DisplayDevice.DeviceName,
-             ENUM_CURRENT_SETTINGS, &DeviceMode))
-        {
-            /* ENUM_CURRENT_SETTINGS returns FALSE when the display is not active:
-             * for example a disabled secondary display.
-             * Do not return here, ignore the error and set the display info to 0x0x0.
-             */
-            Log(("VBoxTray: ResizeDisplayDevice: EnumDisplaySettings(ENUM_CURRENT_SETTINGS) error %d\n", GetLastError ()));
-            ZeroMemory(&DeviceMode, sizeof(DEVMODE));
-        }
-    }
-
-    DeviceMode.dmFields =  DM_DISPLAYFREQUENCY | DM_DISPLAYFLAGS ;
-    if (fExtDispSup) /* Extended Display Support possible*/
-    {
-        Log(("VBoxTray: Extended Display Support. Change Position and Resolution \n"));
-        if (fEnabled)
-        {
-            if (aWidth !=0 && aHeight != 0)
-            {
-                Log(("VBoxTray: Mon ID = %d, Width = %d, Height = %d\n",
-                    Id, aWidth, aHeight));
-                DeviceMode.dmFields |=  DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL ;
-                DeviceMode.dmPelsWidth = aWidth;
-                DeviceMode.dmPelsHeight = aHeight;
-                DeviceMode.dmBitsPerPel = aBitsPerPixel;
-            }
-            if (aPosX != 0 || aPosY != 0)
-            {
-                Log(("VBoxTray: Mon ID = %d PosX = %d, PosY = %d\n",
-                    Id, aPosX, aPosY));
-                DeviceMode.dmFields |=  DM_POSITION;
-                DeviceMode.dmPosition.x = aPosX;
-                DeviceMode.dmPosition.y = aPosY;
-            }
-        }
-        else
-        {
-            /* Request is there to disable the monitor with ID = Id*/
-            Log(("VBoxTray: Disable the Monitor ID = %d\n", Id));
-            ZeroMemory(&DeviceMode, sizeof(DEVMODE));
-            DeviceMode.dmSize = sizeof(DEVMODE);
-            DeviceMode.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL | DM_POSITION
-                                     | DM_DISPLAYFREQUENCY | DM_DISPLAYFLAGS ;
-        }
-    }
-    else /* Extended display support not possible. Just change the res.*/
-    {
-        if (aWidth !=0 && aHeight != 0)
-        {
-            Log(("VBoxTray: No Extended Display Support. Just Change Resolution. \
-                 Mon ID = %d, Width = %d, Height = %d\n",
-                 Id, aWidth, aHeight));
-            DeviceMode.dmFields |=  DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL ;
-            DeviceMode.dmPelsWidth = aWidth;
-            DeviceMode.dmPelsHeight = aHeight;
-            DeviceMode.dmBitsPerPel = aBitsPerPixel;
-        }
-    }
-    Log(("VBoxTray: Changing Reslution of Monitor with ID = %d. Params \
-         PosX = %d, PosY = %d, Width = %d, Height = %d\n",
-         Id, DeviceMode.dmPosition.x, DeviceMode.dmPosition.y,
-         DeviceMode.dmPelsWidth, DeviceMode.dmPelsHeight));
-    gCtx.pfnChangeDisplaySettingsEx(DisplayDevice.DeviceName, &DeviceMode,
-                                    NULL, (CDS_UPDATEREGISTRY | CDS_NORESET), NULL);
-    Log(("VBoxTray: ChangeDisplay return erroNo = %d\n", GetLastError()));
-    DWORD dwStatus = gCtx.pfnChangeDisplaySettingsEx(NULL, NULL, NULL, 0, NULL);
-    Log(("VBoxTray: ChangeDisplay return errorNo = %d\n", GetLastError()));
-    /* @todo: if the pfnChangeDisplaySettingsEx returned status is
-     * NOT DISP_CHANGE_SUCCESSFUL AND NOT DISP_CHANGE_BADMODE,
-     * we will always end up in re-trying, see ResizeDisplayDevice
-     * is this what we want actually?  */
+    ZeroMemory(&displayDevice, sizeof(DISPLAY_DEVICE));
+    displayDevice.cb = sizeof(DISPLAY_DEVICE);
+    DispNum = 0;
+    while (EnumDisplayDevices(NULL, DispNum, &displayDevice, 0))
+    {
+        ZeroMemory(&deviceMode, sizeof(DEVMODE));
+        deviceMode.dmSize = sizeof(DEVMODE);
+        if (!EnumDisplaySettings((LPSTR)displayDevice.DeviceName,
+             ENUM_REGISTRY_SETTINGS, &deviceMode))
+        {
+            LogRel(("VBoxTray: ENUM_REGISTRY_SETTINGS Failed \n"));
+            return FALSE; // Store default failed
+        }
+        /* Save info about primary display */
+        if(DispNum == 0)
+            devModePrimary = deviceMode;
+
+        if (DispNum == Id)
+        {
+            if (fExtDispSup) /* Extended Display Support possible*/
+            {
+                if (fEnabled)
+                {
+                    /* Special case for enabling the secondary monitor. */
+                    if(!(displayDevice.StateFlags & DISPLAY_DEVICE_ACTIVE))
+                    {
+                        LogRel(("VBoxTray: Secondary Monitor with ID=%d Not Enabled. Enabling it.\n", DispNum));
+                        deviceMode.dmPosition.x = devModePrimary.dmPelsWidth;
+                        deviceMode.dmPosition.y = 0;
+                        /* dont any more flags here as, only DM_POISITON is used to enable the secondary display */
+                        deviceMode.dmFields = DM_POSITION;
+                        gCtx.pfnChangeDisplaySettingsEx((LPSTR)displayDevice.DeviceName,
+                                                                  &deviceMode, NULL, CDS_NORESET | CDS_UPDATEREGISTRY, NULL);
+                        /* A second call to ChangeDisplaySettings updates the monitor.*/
+                        gCtx.pfnChangeDisplaySettingsEx(NULL, NULL, NULL,0, NULL);
+                        /* shouln't retry in case of enabling or disabling the display device. */
+                        dwStatus = DISP_CHANGE_SUCCESSFUL;
+                    }
+                    else /* secondary monitor already enabled. Request to change the resolution or position. */
+                    {
+                        if (aWidth !=0 && aHeight != 0)
+                        {
+                            LogRel(("VBoxTray: Display ID: %d , Change Height: %d & Width: %d\n", Id, aWidth, aHeight));
+                            deviceMode.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL
+                                                  | DM_DISPLAYFREQUENCY | DM_DISPLAYFLAGS;
+                            deviceMode.dmPelsWidth = aWidth;
+                            deviceMode.dmPelsHeight = aHeight;
+                            deviceMode.dmBitsPerPel = aBitsPerPixel;
+                        }
+                        if (aPosX != 0 || aPosY != 0)
+                        {
+                            LogRel(("VBoxTray: Display ID: %d PosX: %d, PosY: %d\n",
+                                    Id, aPosX, aPosY));
+                            deviceMode.dmFields |=  DM_POSITION;
+                            deviceMode.dmPosition.x = aPosX;
+                            deviceMode.dmPosition.y = aPosY;
+                        }
+                        dwStatus = gCtx.pfnChangeDisplaySettingsEx((LPSTR)displayDevice.DeviceName,
+                                                                   &deviceMode, NULL, CDS_NORESET|CDS_UPDATEREGISTRY, NULL);
+                         /* A second call to ChangeDisplaySettings updates the monitor. */
+                        gCtx.pfnChangeDisplaySettingsEx(NULL, NULL, NULL,0, NULL);
+                    }
+                }
+                else /* Request is there to disable the monitor with ID = Id*/
+                {
+                    LogRel(("VBoxTray: Disable the Display ID: %d\n", Id));
+                    ZeroMemory(&deviceMode, sizeof(DEVMODE));
+                    deviceMode.dmSize = sizeof(DEVMODE);
+                    deviceMode.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL | DM_POSITION
+                                          | DM_DISPLAYFREQUENCY | DM_DISPLAYFLAGS;
+                    dwStatus = gCtx.pfnChangeDisplaySettingsEx((LPSTR)displayDevice.DeviceName,
+                                                               &deviceMode, NULL, CDS_NORESET|CDS_UPDATEREGISTRY, NULL);
+                    /* A second call to ChangeDisplaySettings updates the monitor. */
+                    gCtx.pfnChangeDisplaySettingsEx(NULL, NULL, NULL,0, NULL);
+                }
+                break;
+            }
+            else/* Extended display support not possible. Just change the res.*/
+            {
+                if (aWidth !=0 && aHeight != 0)
+                {
+                    LogRel(("VBoxTray: No Extended Display Support. Just Change Resolution. \
+                            Display ID = %d, Width = %d, Height = %d\n",Id, aWidth, aHeight));
+                    deviceMode.dmFields |=  DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL ;
+                    deviceMode.dmPelsWidth = aWidth;
+                    deviceMode.dmPelsHeight = aHeight;
+                    deviceMode.dmBitsPerPel = aBitsPerPixel;
+                    dwStatus = gCtx.pfnChangeDisplaySettingsEx((LPSTR)displayDevice.DeviceName,
+                                                                &deviceMode, NULL, CDS_NORESET|CDS_UPDATEREGISTRY, NULL);
+                    /* A second call to ChangeDisplaySettings updates the monitor. */
+                    gCtx.pfnChangeDisplaySettingsEx(NULL, NULL, NULL,0, NULL);
+                }
+            }
+            break;
+        }
+        ZeroMemory(&displayDevice, sizeof(displayDevice));
+        displayDevice.cb = sizeof(displayDevice);
+        DispNum++;
+    }
+    /* we don't want to retry, as it may get stuck in an inifinite loop. */
     return dwStatus;
-}
+ }
 
 /* Returns TRUE to try again. */
@@ -363 +368 @@
     BOOL fModeReset = (Width == 0 && Height == 0 && BitsPerPixel == 0 &&
                        dwNewPosX == 0 && dwNewPosY == 0);
+    BOOL fChangePosRequest = false; /* change in position requested */
 
     Log(("VBoxTray: ResizeDisplayDevice Width= %d, Height=%d , PosX=%d and PosY=%d \
@@ -374 +380 @@
     DWORD dwStatus;
 
-    ZeroMemory(&DisplayDevice, sizeof(DisplayDevice));
-    DisplayDevice.cb = sizeof(DisplayDevice);
+    ZeroMemory(&DisplayDevice, sizeof(DISPLAY_DEVICE));
+    DisplayDevice.cb = sizeof(DISPLAY_DEVICE);
 
     VBoxDispIfCancelPendingResize(&pCtx->pEnv->dispIf);
@@ -451 +457 @@
 
             paDisplayDevices[DevNum] = DisplayDevice;
-            /* Keep a record if the display with ID is already active or not. */
-            if (paDisplayDevices[Id].StateFlags & DISPLAY_DEVICE_ACTIVE)
-            {
-                LogFlow(("VBoxTray: Display with ID=%d already enabled\n", Id));
-                fDispAlreadyEnabled = TRUE;
-            }
 
             /* First try to get the video mode stored in registry (ENUM_REGISTRY_SETTINGS).
@@ -468 +468 @@
             {
                 Log(("VBoxTray: ResizeDisplayDevice: EnumDisplaySettings error %d\n", GetLastError ()));
-                return FALSE;
             }
 
@@ -487 +486 @@
                      */
                     Log(("VBoxTray: ResizeDisplayDevice: EnumDisplaySettings(ENUM_CURRENT_SETTINGS) error %d\n", GetLastError ()));
-                    ZeroMemory(&paDeviceModes[DevNum], sizeof(DEVMODE));
                 }
             }
@@ -493 +491 @@
             if (fExtDispSup)
             {
-                Log(("VBoxTray: Extended Display Support.\n"));
-                Log(("VBoxTray: ResizeDisplayDevice1: %dx%dx%d at %d,%d\n",
+                LogRel(("VBoxTray: Extended Display Support.\n"));
+                Log(("VBoxTray: ResizeDisplayDevice1: %dx%dx%d at %d,%d . Id = %d and DevNum=%d, fEnabled=%d\n",
                       paDeviceModes[Id].dmPelsWidth,
                       paDeviceModes[Id].dmPelsHeight,
                       paDeviceModes[Id].dmBitsPerPel,
                       paDeviceModes[Id].dmPosition.x,
-                      paDeviceModes[Id].dmPosition.y));
+                      paDeviceModes[Id].dmPosition.y,
+                      Id, DevNum, fEnabled));
                 if ((DevNum == Id && fEnabled == 1))
                 {
@@ -505 +504 @@
                      * secondary monitor .
                      */
-                    paRects[DevNum].left = dwNewPosX;
-                    paRects[DevNum].bottom = dwNewPosY;
-                    paDeviceModes[DevNum].dmPosition.x = dwNewPosX;
-                    paDeviceModes[DevNum].dmPosition.x = dwNewPosY;
+                    /* Used when a secondary monitor just needs to be enabled, without any
+                     * change in its position
+                     */
+                     if (dwNewPosX != 0)
+                    {
+                        LogRel(("VBoxTray: Setting Rectangle position x=%d*y=%d\n", dwNewPosX, dwNewPosY));
+                        paDeviceModes[DevNum].dmPosition.x = dwNewPosX;
+                        paDeviceModes[DevNum].dmPosition.y = dwNewPosY;
+                        fChangePosRequest = true;
+                    }
+                    paRects[DevNum].left   = paDeviceModes[DevNum].dmPosition.x;
+                    paRects[DevNum].top    = paDeviceModes[DevNum].dmPosition.y;
                     paRects[DevNum].right  = paDeviceModes[DevNum].dmPosition.x + paDeviceModes[DevNum].dmPelsWidth;
                     paRects[DevNum].bottom = paDeviceModes[DevNum].dmPosition.y + paDeviceModes[DevNum].dmPelsHeight;
@@ -522 +529 @@
             else
             {
+                    LogRel(("VBoxTray: NO Ext Display Support \n"));
                     paRects[DevNum].left   = paDeviceModes[DevNum].dmPosition.x;
                     paRects[DevNum].top    = paDeviceModes[DevNum].dmPosition.y;
@@ -533 +541 @@
         DisplayDevice.cb = sizeof(DISPLAY_DEVICE);
         i++;
+    }
+    /* Keep a record if the display with ID is already active or not. */
+    if (paDisplayDevices[Id].StateFlags & DISPLAY_DEVICE_ACTIVE)
+    {
+        LogRel(("VBoxTray: Display with ID=%d already enabled\n", Id));
+        fDispAlreadyEnabled = TRUE;
     }
 
@@ -566 +580 @@
      * all rect conditions are true. Thus in this case nothing has to be done.
      */
-    if ( !fModeReset && fEnabled && fDispAlreadyEnabled
+    if ( !fModeReset && fEnabled && fDispAlreadyEnabled && !fChangePosRequest
         && paRects[Id].right - paRects[Id].left == Width
         && paRects[Id].bottom - paRects[Id].top == Height
         && paDeviceModes[Id].dmBitsPerPel == BitsPerPixel)
     {
-        Log(("VBoxTray: ResizeDisplayDevice: Already at desired resolution\n"));
+        LogRel(("VBoxTray: Already at desired resolution. No Change.\n"));
         return FALSE;
     }
@@ -601 +615 @@
              * 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)
-            {
+            paDeviceModes[i].dmFields = DM_PELSHEIGHT | DM_PELSWIDTH | DM_BITSPERPEL;
+
+            if (i == Id && BitsPerPixel != 0)
+            {
+                LogRel(("VBoxTray: (WDDM)Changing resolution and position. \n"));
                 /* Change dmBitsPerPel if requested. */
                 paDeviceModes[i].dmBitsPerPel = BitsPerPixel;
-            }
-
-            Log(("VBoxTray: ResizeDisplayDevice: pfnChangeDisplaySettingsEx %x: %dx%dx%d at %d,%d\n",
+                paDeviceModes[i].dmPelsWidth = Width;
+                paDeviceModes[i].dmPelsHeight = Height;
+                if (dwNewPosX != 0 || dwNewPosY != 0)
+                {
+                    paDeviceModes[Id].dmPosition.x = dwNewPosX;
+                    paDeviceModes[Id].dmPosition.y = dwNewPosY;
+                }
+                else
+                {
+                    paDeviceModes[i].dmFields |= DM_POSITION;
+                    paDeviceModes[Id].dmPosition.x = 0;
+                    paDeviceModes[Id].dmPosition.y = 0;
+                }
+            }
+
+            Log(("VBoxTray: (WDDM) ResizeDisplayDevice: pfnChangeDisplaySettingsEx %x: %dx%dx%d at %d,%d\n",
                   gCtx.pfnChangeDisplaySettingsEx,
                   paDeviceModes[i].dmPelsWidth,
@@ -619 +646 @@
 
         }
-
-        DWORD err = VBoxDispIfResizeModes(&pCtx->pEnv->dispIf, Id, paDisplayDevices, paDeviceModes, NumDevices);
-        if (err == NO_ERROR || err != ERROR_RETRY)
-        {
-            if (err == NO_ERROR)
-                Log(("VBoxTray: VBoxDisplayThread: (WDDM) VBoxDispIfResizeModes succeeded\n"));
-            else
-                Log(("VBoxTray: VBoxDisplayThread: (WDDM) Failure VBoxDispIfResizeModes (%d)\n", err));
-            return FALSE;
-        }
-
+        /* Reques to enable /disable the secondary Display Device. Won't take the resize request now.*/
+        if (!fDispAlreadyEnabled && fEnabled || fDispAlreadyEnabled && !fEnabled)
+        {
+              OSVERSIONINFO OSinfo;
+              OSinfo.dwOSVersionInfoSize = sizeof (OSinfo);
+              GetVersionEx (&OSinfo);
+
+              /* for win 7 and above */
+              if (OSinfo.dwMajorVersion >= 6 && OSinfo.dwMinorVersion >= 1)
+              {
+                  LogRel(("VBoxTray: (WDDM) Request to enable/disable %d display device\n", fEnabled));
+                  DWORD dwStatus = vboxDispIfWddmEnableDisplay(&pCtx->pEnv->dispIf, Id, fEnabled);
+                  if(dwStatus != ERROR_SUCCESS)
+                  {
+                      /* Not going to retry for enabling or disabling of the secondary display device.*/
+                      LogRel(("VBoxTray: (WDDM) Failed to enable the Display Device \n"));
+                  }
+              }
+              else /* case: vista in wddm mode. SetDisplayConfig APIs etc is not avilable in this mode. */
+              {
+                  /* use traditional approach of ChangeDisplaySettingEx to enable/disable secondary monitor for Vista WDDM mode.*/
+                  dwStatus = EnableAndResizeDispDev(Id, Width, Height, BitsPerPixel,
+                                      dwNewPosX, dwNewPosY,fEnabled,
+                                      fExtDispSup, pCtx);
+                  if (dwStatus != DISP_CHANGE_SUCCESSFUL )
+                  {
+                      /* Successfully set new video mode or our driver can not set
+                       * the requested mode. Stop trying.
+                       */
+                       LogRel(("VBoxTray: (WDDM) Failed to enable/disable the Display Device \n"));
+                  }
+              }
+              return FALSE; /* for enable disable not retrying */
+        }
+        else
+        {
+            /* Resize request. Secondary display device should be in an enabled state. */
+            LogRel(("VBoxTray: (WDDM) Request to resize the display \n"));
+            DWORD err = VBoxDispIfResizeModes(&pCtx->pEnv->dispIf, Id, paDisplayDevices, paDeviceModes, NumDevices);
+            if (err == NO_ERROR || err != ERROR_RETRY)
+            {
+                if (err == NO_ERROR)
+                    LogRel(("VBoxTray: VBoxDisplayThread: (WDDM) VBoxDispIfResizeModes succeeded\n"));
+                else
+                    LogRel(("VBoxTray: VBoxDisplayThread: (WDDM) Failure VBoxDispIfResizeModes (%d)\n", err));
+                return FALSE;
+            }
+        }
         Log(("VBoxTray: ResizeDisplayDevice: (WDDM) RETRY requested\n"));
         return TRUE;
@@ -666 +730 @@
         }
 
-        Log(("VBoxTray: ResizeDisplayDevice: pfnChangeDisplaySettingsEx %x: %dx%dx%d at %d,%d\n",
-              gCtx.pfnChangeDisplaySettingsEx,
+        Log(("VBoxTray: ResizeDisplayDevice: pfnChangeDisplaySettingsEx Current MonitorId=%d: %dx%dx%d at %d,%d\n",
+              i,
               paDeviceModes[i].dmPelsWidth,
               paDeviceModes[i].dmPelsHeight,

trunk/src/VBox/Additions/WINNT/include/VBoxDisplay.h

@@ -78 +78 @@
     DWORD Height;
     DWORD BitsPerPixel;
+    DWORD PosX;
+    DWORD PosY;
 } VBOXWDDM_RECOMMENDVIDPN_SCREEN_INFO, *PVBOXWDDM_RECOMMENDVIDPN_SCREEN_INFO;