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

Timestamp:

May 14, 2009 3:58:41 PM (16 years ago)

Author:

vboxsync

Message:

VBoxTray: Display debug stuff. Added check for setting display mode.

File:

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

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

@@ -169 +169 @@
         if (DisplayDevice.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE)
         {
-            Log(("Found primary device. err %d\n", GetLastError ()));
+            Log(("ResizeDisplayDevice: Found primary device. err %d\n", GetLastError ()));
             NumDevices++;
         }
@@ -175 +175 @@
         {
             
-            Log(("Found secondary device. err %d\n", GetLastError ()));
+            Log(("ResizeDisplayDevice: Found secondary device. err %d\n", GetLastError ()));
             NumDevices++;
         }
@@ -184 +184 @@
     }
     
-    Log(("Found total %d devices. err %d\n", NumDevices, GetLastError ()));
+    Log(("ResizeDisplayDevice: Found total %d devices. err %d\n", NumDevices, GetLastError ()));
     
     if (NumDevices == 0 || Id >= NumDevices)
     {
-        Log(("Requested identifier %d is invalid. err %d\n", Id, GetLastError ()));
+        Log(("ResizeDisplayDevice: Requested identifier %d is invalid. err %d\n", Id, GetLastError ()));
         return FALSE;
     }
@@ -206 +206 @@
     while (EnumDisplayDevices (NULL, i, &DisplayDevice, 0))
     { 
-        Log(("[%d(%d)] %s\n", i, DevNum, DisplayDevice.DeviceName));
+        Log(("ResizeDisplayDevice: [%d(%d)] %s\n", i, DevNum, DisplayDevice.DeviceName));
         
         BOOL bFetchDevice = FALSE;
@@ -212 +212 @@
         if (DisplayDevice.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE)
         {
-            Log(("Found primary device. err %d\n", GetLastError ()));
+            Log(("ResizeDisplayDevice: Found primary device. err %d\n", GetLastError ()));
             DevPrimaryNum = DevNum;
             bFetchDevice = TRUE;
@@ -219 +219 @@
         {
             
-            Log(("Found secondary device. err %d\n", GetLastError ()));
+            Log(("ResizeDisplayDevice: Found secondary device. err %d\n", GetLastError ()));
             bFetchDevice = TRUE;
         }
@@ -227 +227 @@
             if (DevNum >= NumDevices)
             {
-                Log(("%d >= %d\n", NumDevices, DevNum));
+                Log(("ResizeDisplayDevice: %d >= %d\n", NumDevices, DevNum));
                 return FALSE;
             }
@@ -238 +238 @@
                  ENUM_REGISTRY_SETTINGS, &paDeviceModes[DevNum]))
             {
-                Log(("EnumDisplaySettings err %d\n", GetLastError ()));
+                Log(("ResizeDisplayDevice: EnumDisplaySettings err %d\n", GetLastError ()));
                 return FALSE;
             }
             
-            Log(("%dx%d at %d,%d\n",
+            Log(("ResizeDisplayDevice: %dx%d at %d,%d\n",
                     paDeviceModes[DevNum].dmPelsWidth,
                     paDeviceModes[DevNum].dmPelsHeight,
@@ -281 +281 @@
         && paDeviceModes[Id].dmBitsPerPel == BitsPerPixel)
     {
-        Log(("VBoxDisplayThread : already at desired resolution.\n"));
+        Log(("ResizeDisplayDevice: Already at desired resolution.\n"));
         return FALSE;
     }
@@ -289 +289 @@
     for (i = 0; i < NumDevices; i++)
     {
-        Log(("[%d]: %d,%d %dx%d\n",
+        Log(("ResizeDisplayDevice: [%d]: %d,%d %dx%d\n",
                 i, paRects[i].left, paRects[i].top,
                 paRects[i].right - paRects[i].left,
@@ -303 +303 @@
     tempDevMode.dmSize = sizeof(DEVMODE);
     EnumDisplaySettings(NULL, 0xffffff, &tempDevMode);
+    BOOL bUpdateMonitor = FALSE;
+    LONG status = 0;
 
     /* Assign the new rectangles to displays. */
@@ -321 +323 @@
         }
 
-        Log(("calling pfnChangeDisplaySettingsEx %x\n", gCtx.pfnChangeDisplaySettingsEx));     
-
-        gCtx.pfnChangeDisplaySettingsEx((LPSTR)paDisplayDevices[i].DeviceName, 
-                                        &paDeviceModes[i], NULL, CDS_NORESET | CDS_UPDATEREGISTRY, NULL); 
-
-        Log(("ChangeDisplaySettings position err %d\n", GetLastError ()));
+        /* Test if the mode can be set. */
+        Log(("ResizeDisplayDevice: Testing if the mode can be set ...\n"));
+        SetLastError(0);
+        status = gCtx.pfnChangeDisplaySettingsEx((LPSTR)paDisplayDevices[i].DeviceName, 
+                                                 &paDeviceModes[i], NULL, CDS_TEST, NULL);
+        if (status == DISP_CHANGE_SUCCESSFUL)
+        {
+            Log(("ResizeDisplayDevice: Mode can be set! Calling pfnChangeDisplaySettingsEx %x\n", gCtx.pfnChangeDisplaySettingsEx));         
+            gCtx.pfnChangeDisplaySettingsEx((LPSTR)paDisplayDevices[i].DeviceName, 
+                                            &paDeviceModes[i], NULL, CDS_NORESET | CDS_UPDATEREGISTRY, NULL);    
+            Log(("ResizeDisplayDevice: ChangeDisplaySettingsEx position err %d\n", GetLastError ()));
+            bUpdateMonitor = TRUE;
+        }
+        else
+        {
+            if (status == DISP_CHANGE_BADMODE)
+            {
+                Log(("ResizeDisplayDevice: Bad mode detected. No changes made.\n"));
+            }
+            else Log(("ResizeDisplayDevice: Mode can NOT be set! Error: %d\n", status));
+        }
     }
     
     /* A second call to ChangeDisplaySettings updates the monitor. */
-    LONG status = ChangeDisplaySettings(NULL, 0); 
-    Log(("ChangeDisplaySettings update status %d\n", status));
-    if (status == DISP_CHANGE_SUCCESSFUL || status == DISP_CHANGE_BADMODE)
-    {
-        /* Successfully set new video mode or our driver can not set the requested mode. Stop trying. */
-        return FALSE;
-    }
-
-    /* Retry the request. */
-    return TRUE;
+    if (bUpdateMonitor)
+    {
+        status = ChangeDisplaySettings(NULL, 0); 
+        Log(("ResizeDisplayDevice: ChangeDisplaySettings update status %d\n", status));
+        if (status == DISP_CHANGE_SUCCESSFUL || status == DISP_CHANGE_BADMODE)
+        {
+            /* Successfully set new video mode or our driver can not set the requested mode. Stop trying. */
+            return FALSE;
+        }
+
+        /* Retry the request. */
+        return TRUE;
+    }
+
+    return FALSE; /* Don't retry; maybe something went wrong. */
 }