From: Brendan Shanks bshanks@codeweavers.com
--- dlls/winemac.drv/cocoa_display.m | 2 +- dlls/winemac.drv/macdrv_cocoa.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m index 3f6246e7e1b..4e3e65dd69a 100644 --- a/dlls/winemac.drv/cocoa_display.m +++ b/dlls/winemac.drv/cocoa_display.m @@ -656,7 +656,7 @@ void macdrv_free_adapters(struct macdrv_adapter* adapters) * * Returns non-zero value on failure with parameters unchanged and zero on success. */ -int macdrv_get_monitors(uint32_t adapter_id, struct macdrv_monitor** new_monitors, int* count) +int macdrv_get_monitors(CGDirectDisplayID adapter_id, struct macdrv_monitor** new_monitors, int* count) { struct macdrv_monitor* monitors = NULL; struct macdrv_monitor* realloc_monitors; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 4b4bc72401b..bf98a4f05d7 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -245,8 +245,8 @@ static inline CGPoint cgpoint_win_from_mac(CGPoint point) /* Represent an adapter in EnumDisplayDevices context */ struct macdrv_adapter { - /* ID to uniquely identify an adapter. Currently it's a CGDirectDisplayID */ - uint32_t id; + /* ID to uniquely identify an adapter */ + CGDirectDisplayID id; /* as StateFlags in DISPLAY_DEVICE struct */ uint32_t state_flags; }; @@ -268,7 +268,7 @@ extern int macdrv_set_display_mode(const struct macdrv_display* display, extern void macdrv_free_gpus(struct macdrv_gpu* gpus); extern int macdrv_get_adapters(uint64_t gpu_id, struct macdrv_adapter** adapters, int* count); extern void macdrv_free_adapters(struct macdrv_adapter* adapters); -extern int macdrv_get_monitors(uint32_t adapter_id, struct macdrv_monitor** monitors, int* count); +extern int macdrv_get_monitors(CGDirectDisplayID adapter_id, struct macdrv_monitor** monitors, int* count); extern void macdrv_free_monitors(struct macdrv_monitor* monitors);