Module: wine Branch: master Commit: ed275327888b2223f1e63b211556e13f8bdcd612 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed275327888b2223f1e63b211... Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 7 15:28:15 2021 +0100 win32u: Fix return types on lock_display_devices failures. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/sysparams.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 56523210bdf..5c65dce716d 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1528,14 +1528,16 @@ LONG WINAPI NtUserGetDisplayConfigBufferSizes( UINT32 flags, UINT32 *num_path_in if (flags != QDC_ONLY_ACTIVE_PATHS) FIXME( "only returning active paths\n" ); - if (!lock_display_devices()) return FALSE; - LIST_FOR_EACH_ENTRY( monitor, &monitors, struct monitor, entry ) + if (lock_display_devices()) { - if (!(monitor->dev.state_flags & DISPLAY_DEVICE_ACTIVE)) - continue; - count++; + LIST_FOR_EACH_ENTRY( monitor, &monitors, struct monitor, entry ) + { + if (!(monitor->dev.state_flags & DISPLAY_DEVICE_ACTIVE)) + continue; + count++; + } + unlock_display_devices(); } - unlock_display_devices(); *num_path_info = count; *num_mode_info = count * 2; @@ -1715,7 +1717,7 @@ LONG WINAPI NtUserChangeDisplaySettings( UNICODE_STRING *devname, DEVMODEW *devm return ret; } - if (!lock_display_devices()) return FALSE; + if (!lock_display_devices()) return DISP_CHANGE_FAILED; if ((adapter = find_adapter( devname ))) lstrcpyW( device_name, adapter->dev.device_name ); unlock_display_devices(); if (!adapter)