winemac: Don't assume the current display mode is the original if we don't have…

winemac: Don't assume the current display mode is the original if we don't have the displays captured. Another process may have changed the display mode before we queried the current mode, so we may be seeing a non-original mode.

winemac: Don't assume the current display mode is the original if we don't have…
9c65d672 · Ken Thomases · Alexandre Julliard · fe1c0ab9 · 9c65d672
Commit 9c65d672 authored Jan 10, 2014 by Ken Thomases Committed by Alexandre Julliard Jan 10, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 18 additions and 10 deletions

cocoa_app.m dlls/winemac.drv/cocoa_app.m +18 -10

No files found.
--- a/dlls/winemac.drv/cocoa_app.m
+++ b/dlls/winemac.drv/cocoa_app.m
@@ -726,18 +726,16 @@ int macdrv_err_on;
            return TRUE;
        }

+        CGDisplayModeRelease(currentMode);
+        currentMode = NULL;
+
        mode = [self modeMatchingMode:mode forDisplay:displayID];
        if (!mode)
-        {
-            CGDisplayModeRelease(currentMode);
            return FALSE;
-        }

        originalMode = (CGDisplayModeRef)[originalDisplayModes objectForKey:displayIDKey];
-        if (!originalMode)
-            originalMode = currentMode;

-        if ([self mode:mode matchesMode:originalMode])
+        if (originalMode && [self mode:mode matchesMode:originalMode])
        {
            if ([originalDisplayModes count] == 1) // If this is the last changed display, do a blanket reset
            {
@@ -771,8 +769,17 @@ int macdrv_err_on;
            {
                if (active)
                {
-                    ret = (CGDisplaySetDisplayMode(displayID, mode, NULL) == CGDisplayNoErr);
-                    if (ret)
+                    // If we get here, we have the displays captured.  If we don't
+                    // know the original mode of the display, the current mode must
+                    // be the original.  We should re-query the current mode since
+                    // another process could have changed it between when we last
+                    // checked and when we captured the displays.
+                    if (!originalMode)
+                        originalMode = currentMode = CGDisplayCopyDisplayMode(displayID);
+
+                    if (originalMode)
+                        ret = (CGDisplaySetDisplayMode(displayID, mode, NULL) == CGDisplayNoErr);
+                    if (ret && !(currentMode && [self mode:mode matchesMode:currentMode]))
                        [originalDisplayModes setObject:(id)originalMode forKey:displayIDKey];
                    else if (![originalDisplayModes count])
                    {
@@ -781,6 +788,9 @@ int macdrv_err_on;
                        if (!displaysCapturedForFullscreen)
                            CGReleaseAllDisplays();
                    }
+
+                    if (currentMode)
+                        CGDisplayModeRelease(currentMode);
                }
                else
                {
@@ -790,8 +800,6 @@ int macdrv_err_on;
            }
        }

-        CGDisplayModeRelease(currentMode);
-
        if (ret)
            [self adjustWindowLevels];