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

Timestamp:

Jan 16, 2013 12:01:19 PM (12 years ago)

Author:

vboxsync

Message:

VboxTray/VideoMode: Dynamic configuration of secondary monitor for windows guest. (Enabling/disabling/Change of resolution/position).

Fix for the error reported on #6118 comment 46, "setvideomodehint 1024*768 32 1 yes" not working.
If the previous resolution of the disabled secondary screen is 1024*768*32 and command is issued"setvideomodehint 1024*768 32 1 yes", then there is a conditional block in the code returns TRUE assuming that it is already at desired resolution and no further action is required.

To fix the issue, now I am checking that if the monitor, for which the request is being made, is disabled then conditional block will return FALSE and code will proceed further to enable the monitor.

File:

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

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

@@ -360 +360 @@
                                 VBOXDISPLAYCONTEXT *pCtx, BOOL fExtDispSup)
 {
+    BOOL fDispAlreadyEnabled = false; /* check whether the monitor with ID is already enabled. */
     BOOL fModeReset = (Width == 0 && Height == 0 && BitsPerPixel == 0 &&
                        dwNewPosX == 0 && dwNewPosY == 0);
@@ -448 +449 @@
 
             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).
@@ -546 +553 @@
      * is always 1.
      */
-    if (   !fModeReset && fEnabled
+    /* Handled the case where previouseresolution of secondary monitor
+     * was for eg. 1024*768*32 and monitor was in disabled state.
+     * User gives the command
+     * setvideomode 1024 768 32 1 yes.
+     * Now in this case the resolution request is same as previous one but
+     * monitor is going from disabled to enabled state so the below condition
+     * shour return false
+     * The below condition will only return true , if no mode reset has
+     * been requested AND fEnabled is 1 and fDispAlreadyEnabled is also 1 AND
+     * all rect conditions are true. Thus in this case nothing has to be done.
+     */
+    if ( !fModeReset && fEnabled && fDispAlreadyEnabled
         && paRects[Id].right - paRects[Id].left == Width
         && paRects[Id].bottom - paRects[Id].top == Height