Module: wine Branch: master Commit: 15968690eb541f3eb0c145e538f7dc7bab85f60a URL: https://gitlab.winehq.org/wine/wine/-/commit/15968690eb541f3eb0c145e538f7dc7...
Author: Tim Clem tclem@codeweavers.com Date: Tue May 7 14:35:21 2024 -0700
winemac.drv: Do not consider the "valid" and "safe" flags as making a display mode unique.
In the case that unsafe/invalid modes aren't excluded entirely by the include_unsupported flag to copy_display_modes, we actually want to compare them to their counterparts with the same resolution, so that we can prefer the safe and valid alternatives.
---
dlls/winemac.drv/display.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index ed27390ac30..fe9e6dcb5bd 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -420,8 +420,7 @@ static CFDictionaryRef create_mode_dict(CGDisplayModeRef display_mode, BOOL is_o height *= 2; }
- io_flags &= kDisplayModeValidFlag | kDisplayModeSafeFlag | kDisplayModeInterlacedFlag | - kDisplayModeStretchedFlag | kDisplayModeTelevisionFlag; + io_flags &= kDisplayModeInterlacedFlag | kDisplayModeStretchedFlag | kDisplayModeTelevisionFlag; cf_io_flags = CFNumberCreate(NULL, kCFNumberSInt32Type, &io_flags); cf_width = CFNumberCreate(NULL, kCFNumberSInt64Type, &width); cf_height = CFNumberCreate(NULL, kCFNumberSInt64Type, &height);