From: Brendan Shanks bshanks@codeweavers.com
--- dlls/winemac.drv/cocoa_app.m | 5 ++--- dlls/winemac.drv/display.c | 2 +- dlls/winemac.drv/macdrv_cocoa.h | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 9c7e5d770bf..2a9dab26989 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -2432,13 +2432,12 @@ void macdrv_beep(void) /*********************************************************************** * macdrv_set_display_mode */ -int macdrv_set_display_mode(const struct macdrv_display* display, - CGDisplayModeRef display_mode) +int macdrv_set_display_mode(CGDirectDisplayID displayID, CGDisplayModeRef display_mode) { __block int ret;
OnMainThread(^{ - ret = [[WineApplicationController sharedController] setMode:display_mode forDisplay:display->displayID]; + ret = [[WineApplicationController sharedController] setMode:display_mode forDisplay:displayID]; });
return ret; diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index db183962826..950aa2f2ef2 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -799,7 +799,7 @@ LONG macdrv_ChangeDisplaySettings(LPDEVMODEW displays, LPCWSTR primary_name, HWN bpp, mode->dmDisplayFrequency); ret = DISP_CHANGE_BADMODE; } - else if (!macdrv_set_display_mode(&macdrv_displays[0], best_display_mode)) + else if (!macdrv_set_display_mode(macdrv_displays[0].displayID, best_display_mode)) { WARN("Failed to set display mode\n"); ret = DISP_CHANGE_FAILED; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index bf98a4f05d7..771fb81b54c 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -262,8 +262,7 @@ static inline CGPoint cgpoint_win_from_mac(CGPoint point)
extern int macdrv_get_displays(struct macdrv_display** displays, int* count); extern void macdrv_free_displays(struct macdrv_display* displays); -extern int macdrv_set_display_mode(const struct macdrv_display* display, - CGDisplayModeRef display_mode); +extern int macdrv_set_display_mode(CGDirectDisplayID id, CGDisplayModeRef display_mode); extern int macdrv_get_gpus(struct macdrv_gpu** gpus, int* count); extern void macdrv_free_gpus(struct macdrv_gpu* gpus); extern int macdrv_get_adapters(uint64_t gpu_id, struct macdrv_adapter** adapters, int* count);