September 2022 - Wine-Commits

Tag wine-7.18 : Alexandre Julliard : Release 7.18
by Alexandre Julliard Sept. 23, 2022

Sept. 23, 2022

Module: wine Branch: refs/tags/wine-7.18 Tag: 863d3fbd4ab310b891b9d1a3533f1ba2e8cf972e URL: https://gitlab.winehq.org/wine/wine/-/tags/863d3fbd4ab310b891b9d1a3533f1ba2… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 23 21:59:24 2022 +0200 Release 7.18

1 0

Jacek Caban : winevulkan: Use DECLSPEC_ALIGN instead of pshpack4.h.
by Alexandre Julliard Sept. 23, 2022

Sept. 23, 2022

Module: wine Branch: master Commit: f664af0bca4af1909bd30bc6da1e116d1cd90f9a URL: https://gitlab.winehq.org/wine/wine/-/commit/f664af0bca4af1909bd30bc6da1e11… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 6 22:35:36 2022 +0200 winevulkan: Use DECLSPEC_ALIGN instead of pshpack4.h. --- dlls/winevulkan/loader_thunks.h | 512 ++++++++++++++++++++-------------------- dlls/winevulkan/make_vulkan | 6 +- 2 files changed, 257 insertions(+), 261 deletions(-)

1 0

Rémi Bernon : win32u: Lock display devices mutex in find_adapter.
by Alexandre Julliard Sept. 23, 2022

Sept. 23, 2022

Module: wine Branch: master Commit: 59a76b3a868c67c27c777b7bd4be85214612e957 URL: https://gitlab.winehq.org/wine/wine/-/commit/59a76b3a868c67c27c777b7bd4be85… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 14 11:32:30 2022 +0200 win32u: Lock display devices mutex in find_adapter. --- dlls/win32u/sysparams.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 2927c94f2a7..867332624d1 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -2020,12 +2020,15 @@ static struct adapter *find_adapter( UNICODE_STRING *name ) struct display_device *device; struct adapter *adapter; + if (!lock_display_devices()) return NULL; + if (name && name->Length) device = find_adapter_device_by_name( name ); else device = find_adapter_device_by_id( 0 ); /* use primary adapter */ if (!device) adapter = NULL; else adapter = adapter_acquire( CONTAINING_RECORD( device, struct adapter, dev ) ); + unlock_display_devices(); return adapter; } @@ -2493,10 +2496,7 @@ LONG WINAPI NtUserChangeDisplaySettings( UNICODE_STRING *devname, DEVMODEW *devm if ((!devname || !devname->Length) && !devmode) return apply_display_settings( NULL, NULL, hwnd, flags, lparam ); - if (!lock_display_devices()) return DISP_CHANGE_FAILED; - adapter = find_adapter( devname ); - unlock_display_devices(); - if (!adapter) return DISP_CHANGE_BADPARAM; + if (!(adapter = find_adapter( devname ))) return DISP_CHANGE_BADPARAM; if (!adapter_get_full_mode( adapter, devmode, &full_mode )) ret = DISP_CHANGE_BADMODE; else if ((flags & CDS_UPDATEREGISTRY) && !adapter_set_registry_settings( adapter, &full_mode )) ret = DISP_CHANGE_NOTUPDATED; @@ -2552,10 +2552,7 @@ BOOL WINAPI NtUserEnumDisplaySettings( UNICODE_STRING *device, DWORD index, DEVM TRACE( "device %s, index %#x, devmode %p, flags %#x\n", debugstr_us(device), index, devmode, flags ); - if (!lock_display_devices()) return FALSE; - adapter = find_adapter( device ); - unlock_display_devices(); - if (!adapter) return FALSE; + if (!(adapter = find_adapter( device ))) return FALSE; lstrcpynW( devmode->dmDeviceName, wine_display_driverW, ARRAY_SIZE(devmode->dmDeviceName) ); devmode->dmSpecVersion = DM_SPECVERSION;

1 0

Rémi Bernon : win32u: Broadcast WM_DISPLAYCHANGE message on display settings change.
by Alexandre Julliard Sept. 23, 2022

Sept. 23, 2022

Module: wine Branch: master Commit: 7384591c71788bc99a3e4be48bfc09d1139e5243 URL: https://gitlab.winehq.org/wine/wine/-/commit/7384591c71788bc99a3e4be48bfc09… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 6 10:39:39 2022 +0200 win32u: Broadcast WM_DISPLAYCHANGE message on display settings change. --- dlls/user32/tests/sysparams.c | 1 - dlls/win32u/sysparams.c | 14 ++++++++++++++ dlls/winemac.drv/display.c | 35 ++--------------------------------- dlls/winemac.drv/window.c | 3 +-- dlls/winex11.drv/desktop.c | 10 ++-------- dlls/winex11.drv/display.c | 6 +++--- dlls/winex11.drv/window.c | 2 +- dlls/winex11.drv/x11drv.h | 4 ++-- dlls/winex11.drv/xrandr.c | 6 +----- 9 files changed, 26 insertions(+), 55 deletions(-)

1 0

Jacek Caban : winevulkan: Introduce VkVariable.
by Alexandre Julliard Sept. 23, 2022

Sept. 23, 2022

Module: wine Branch: master Commit: df8fc0b33bbd83d330e4722172af5c809bc275aa URL: https://gitlab.winehq.org/wine/wine/-/commit/df8fc0b33bbd83d330e4722172af5c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 6 21:55:24 2022 +0200 winevulkan: Introduce VkVariable. --- dlls/winevulkan/make_vulkan | 166 ++++++++++++++++++++------------------------ 1 file changed, 74 insertions(+), 92 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 381fe281b4d..99bad6b4c57 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1139,20 +1139,83 @@ class VkHandle(object): def needs_unwrapping(self): return self.is_wrapped() -class VkMember(object): - def __init__(self, const=False, struct_fwd_decl=False,_type=None, pointer=None, name=None, array_len=None, - dyn_array_len=None, optional=False, values=None, object_type=None, bit_width=None): +class VkVariable(object): + def __init__(self, const=False, type_info=None, type=None, name=None, pointer=None, array_len=None, + dyn_array_len=None, object_type=None): self.const = const - self.struct_fwd_decl = struct_fwd_decl + self.type_info = type_info + self.type = type self.name = name self.pointer = pointer - self.type = _type - self.type_info = None self.array_len = array_len self.dyn_array_len = dyn_array_len + self.object_type = object_type + if type_info: + self.set_type_info(type_info) + + def set_type_info(self, type_info): + """ Helper function to set type information from the type registry. + This is needed, because not all type data is available at time of + parsing. + """ + self.type_info = type_info + self.handle = type_info["data"] if type_info["category"] == "handle" else None + self.struct = type_info["data"] if type_info["category"] == "struct" else None + + def is_const(self): + return self.const + + def is_pointer(self): + return self.pointer is not None + + def is_handle(self): + return self.handle is not None + + def is_struct(self): + return self.struct is not None + + def is_dynamic_array(self): + """ Returns if the member is an array element. + Vulkan uses this for dynamically sized arrays for which + there is a 'count' parameter. + """ + return self.dyn_array_len is not None + + def is_static_array(self): + """ Returns if the member is an array. + Vulkan uses this often for fixed size arrays in which the + length is part of the member. + """ + return self.array_len is not None + + def needs_alignment(self): + """ Check if this member needs alignment for 64-bit data. + Various structures need alignment on 64-bit variables due + to compiler differences on 32-bit between Win32 and Linux. + """ + + if self.is_pointer(): + return False + elif self.type == "size_t": + return False + elif self.type in ["uint64_t", "VkDeviceSize"]: + return True + elif self.is_struct(): + return self.struct.needs_alignment() + elif self.is_handle(): + # Dispatchable handles are pointers to objects, while + # non-dispatchable are uint64_t and hence need alignment. + return not self.handle.is_dispatchable() + return False + +class VkMember(VkVariable): + def __init__(self, const=False, struct_fwd_decl=False,_type=None, pointer=None, name=None, array_len=None, + dyn_array_len=None, optional=False, values=None, object_type=None, bit_width=None): + VkVariable.__init__(self, const=const, type=_type, name=name, pointer=pointer, array_len=array_len, + dyn_array_len=dyn_array_len, object_type=object_type) + self.struct_fwd_decl = struct_fwd_decl self.optional = optional self.values = values - self.object_type = object_type self.bit_width = bit_width def __eq__(self, other): @@ -1379,32 +1442,6 @@ class VkMember(object): return conversions - def is_const(self): - return self.const - - def is_dynamic_array(self): - """ Returns if the member is an array element. - Vulkan uses this for dynamically sized arrays for which - there is a 'count' parameter. - """ - return self.dyn_array_len is not None - - def is_handle(self): - return self.type_info["category"] == "handle" - - def is_pointer(self): - return self.pointer is not None - - def is_static_array(self): - """ Returns if the member is an array. - Vulkan uses this often for fixed size arrays in which the - length is part of the member. - """ - return self.array_len is not None - - def is_struct(self): - return self.type_info["category"] == "struct" - def is_struct_forward_declaration(self): return self.struct_fwd_decl @@ -1421,28 +1458,6 @@ class VkMember(object): def is_bit_field(self): return self.bit_width is not None - def needs_alignment(self): - """ Check if this member needs alignment for 64-bit data. - Various structures need alignment on 64-bit variables due - to compiler differences on 32-bit between Win32 and Linux. - """ - - if self.is_pointer(): - return False - elif self.type == "size_t": - return False - elif self.type in ["uint64_t", "VkDeviceSize"]: - return True - elif self.is_struct(): - struct = self.type_info["data"] - return struct.needs_alignment() - elif self.is_handle(): - # Dispatchable handles are pointers to objects, while - # non-dispatchable are uint64_t and hence need alignment. - handle = self.type_info["data"] - return False if handle.is_dispatchable() else True - return False - def needs_conversion(self): """ Structures requiring alignment, need conversion between win32 and host. """ @@ -1486,28 +1501,13 @@ class VkMember(object): struct = self.type_info["data"] return struct.needs_struct_extensions_conversion() - def set_type_info(self, type_info): - """ Helper function to set type information from the type registry. - This is needed, because not all type data is available at time of - parsing. - """ - self.type_info = type_info - - -class VkParam(object): +class VkParam(VkVariable): """ Helper class which describes a parameter to a function call. """ def __init__(self, type_info, const=None, pointer=None, name=None, array_len=None, dyn_array_len=None, object_type=None): - self.const = const - self.name = name - self.array_len = array_len - self.dyn_array_len = dyn_array_len - self.pointer = pointer - self.object_type = object_type - self.type_info = type_info - self.type = type_info["name"] # For convenience - self.handle = type_info["data"] if type_info["category"] == "handle" else None - self.struct = type_info["data"] if type_info["category"] == "struct" else None + VkVariable.__init__(self, const=const, type_info=type_info, type=type_info["name"], name=name, + pointer=pointer, array_len=array_len, dyn_array_len=dyn_array_len, + object_type=object_type) self._set_direction() self._set_format_string() @@ -1767,30 +1767,12 @@ class VkParam(object): return conversions - def is_const(self): - return self.const is not None - - def is_dynamic_array(self): - return self.dyn_array_len is not None - def is_dispatchable(self): if not self.is_handle(): return False return self.handle.is_dispatchable() - def is_handle(self): - return self.handle is not None - - def is_pointer(self): - return self.pointer is not None - - def is_static_array(self): - return self.array_len is not None - - def is_struct(self): - return self.struct is not None - def needs_conversion(self): """ Returns if parameter needs conversion between win32 and host. """

1 0

Rémi Bernon : win32u: Use find_adapter_device_by_(name|id) helpers in find_adapter.
by Alexandre Julliard Sept. 23, 2022

Sept. 23, 2022

Module: wine Branch: master Commit: fa32c2efc796cc47aaf6c656e9355d4be1496a44 URL: https://gitlab.winehq.org/wine/wine/-/commit/fa32c2efc796cc47aaf6c656e9355d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 14 11:27:31 2022 +0200 win32u: Use find_adapter_device_by_(name|id) helpers in find_adapter. --- dlls/win32u/sysparams.c | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index eaeb3d72cc7..2927c94f2a7 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -2017,16 +2017,16 @@ static struct display_device *find_adapter_device_by_name( UNICODE_STRING *name */ static struct adapter *find_adapter( UNICODE_STRING *name ) { + struct display_device *device; struct adapter *adapter; - LIST_FOR_EACH_ENTRY(adapter, &adapters, struct adapter, entry) - { - if (!name || !name->Length) return adapter_acquire( adapter ); /* use primary adapter */ - if (!wcsnicmp( name->Buffer, adapter->dev.device_name, name->Length / sizeof(WCHAR) ) && - !adapter->dev.device_name[name->Length / sizeof(WCHAR)]) - return adapter_acquire( adapter ); - } - return NULL; + if (name && name->Length) device = find_adapter_device_by_name( name ); + else device = find_adapter_device_by_id( 0 ); /* use primary adapter */ + + if (!device) adapter = NULL; + else adapter = adapter_acquire( CONTAINING_RECORD( device, struct adapter, dev ) ); + + return adapter; } /*********************************************************************** @@ -2496,11 +2496,7 @@ LONG WINAPI NtUserChangeDisplaySettings( UNICODE_STRING *devname, DEVMODEW *devm if (!lock_display_devices()) return DISP_CHANGE_FAILED; adapter = find_adapter( devname ); unlock_display_devices(); - if (!adapter) - { - WARN( "Invalid device name %s.\n", debugstr_us(devname) ); - return DISP_CHANGE_BADPARAM; - } + if (!adapter) return DISP_CHANGE_BADPARAM; if (!adapter_get_full_mode( adapter, devmode, &full_mode )) ret = DISP_CHANGE_BADMODE; else if ((flags & CDS_UPDATEREGISTRY) && !adapter_set_registry_settings( adapter, &full_mode )) ret = DISP_CHANGE_NOTUPDATED; @@ -2559,11 +2555,7 @@ BOOL WINAPI NtUserEnumDisplaySettings( UNICODE_STRING *device, DWORD index, DEVM if (!lock_display_devices()) return FALSE; adapter = find_adapter( device ); unlock_display_devices(); - if (!adapter) - { - WARN( "Invalid device name %s.\n", debugstr_us(device) ); - return FALSE; - } + if (!adapter) return FALSE; lstrcpynW( devmode->dmDeviceName, wine_display_driverW, ARRAY_SIZE(devmode->dmDeviceName) ); devmode->dmSpecVersion = DM_SPECVERSION;

1 0

Rémi Bernon : win32u: Factor out display_device lookup in separate helpers.
by Alexandre Julliard Sept. 23, 2022

Sept. 23, 2022

Module: wine Branch: master Commit: aa1e59390f4aea7d881aa3618bbc00321fdf01df URL: https://gitlab.winehq.org/wine/wine/-/commit/aa1e59390f4aea7d881aa3618bbc00… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 14 11:27:31 2022 +0200 win32u: Factor out display_device lookup in separate helpers. --- dlls/win32u/sysparams.c | 68 +++++++++++++++++++++++++++++-------------------- 1 file changed, 41 insertions(+), 27 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 3c47205cc32..eaeb3d72cc7 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1973,6 +1973,45 @@ LONG WINAPI NtUserGetDisplayConfigBufferSizes( UINT32 flags, UINT32 *num_path_in return ERROR_SUCCESS; } +/* display_lock mutex must be held */ +static struct display_device *find_monitor_device( struct display_device *adapter, DWORD index ) +{ + struct monitor *monitor; + + LIST_FOR_EACH_ENTRY(monitor, &monitors, struct monitor, entry) + if (&monitor->adapter->dev == adapter && index == monitor->id) + return &monitor->dev; + + WARN( "Failed to find adapter %s monitor with id %u.\n", debugstr_w(adapter->device_name), index ); + return NULL; +} + +/* display_lock mutex must be held */ +static struct display_device *find_adapter_device_by_id( DWORD index ) +{ + struct adapter *adapter; + + LIST_FOR_EACH_ENTRY(adapter, &adapters, struct adapter, entry) + if (index == adapter->id) return &adapter->dev; + + WARN( "Failed to find adapter with id %u.\n", index ); + return NULL; +} + +/* display_lock mutex must be held */ +static struct display_device *find_adapter_device_by_name( UNICODE_STRING *name ) +{ + SIZE_T len = name->Length / sizeof(WCHAR); + struct adapter *adapter; + + LIST_FOR_EACH_ENTRY(adapter, &adapters, struct adapter, entry) + if (!wcsnicmp( name->Buffer, adapter->dev.device_name, len ) && !adapter->dev.device_name[len]) + return &adapter->dev; + + WARN( "Failed to find adapter with name %s.\n", debugstr_us(name) ); + return NULL; +} + /* Find and acquire the adapter matching name, or primary adapter if name is NULL. * If not NULL, the returned adapter needs to be released with adapter_release. */ @@ -1997,8 +2036,6 @@ NTSTATUS WINAPI NtUserEnumDisplayDevices( UNICODE_STRING *device, DWORD index, DISPLAY_DEVICEW *info, DWORD flags ) { struct display_device *found = NULL; - struct adapter *adapter; - struct monitor *monitor; TRACE( "%s %u %p %#x\n", debugstr_us( device ), index, info, flags ); @@ -2006,31 +2043,8 @@ NTSTATUS WINAPI NtUserEnumDisplayDevices( UNICODE_STRING *device, DWORD index, if (!lock_display_devices()) return STATUS_UNSUCCESSFUL; - if (!device || !device->Length) - { - /* Enumerate adapters */ - LIST_FOR_EACH_ENTRY(adapter, &adapters, struct adapter, entry) - { - if (index == adapter->id) - { - found = &adapter->dev; - break; - } - } - } - else if ((adapter = find_adapter( device ))) - { - /* Enumerate monitors */ - LIST_FOR_EACH_ENTRY(monitor, &monitors, struct monitor, entry) - { - if (monitor->adapter == adapter && index == monitor->id) - { - found = &monitor->dev; - break; - } - } - adapter_release( adapter ); - } + if (!device || !device->Length) found = find_adapter_device_by_id( index ); + else if ((found = find_adapter_device_by_name( device ))) found = find_monitor_device( found, index ); if (found) {

1 0

Rémi Bernon : winemac.drv: Stop using the cached_modes_mutex for get_default_bpp.
by Alexandre Julliard Sept. 23, 2022

Sept. 23, 2022

Module: wine Branch: master Commit: 3e3beee0b4d3c619e62a1d64b757d0a80c1cc967 URL: https://gitlab.winehq.org/wine/wine/-/commit/3e3beee0b4d3c619e62a1d64b757d0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 9 08:32:43 2022 +0200 winemac.drv: Stop using the cached_modes_mutex for get_default_bpp. --- dlls/winemac.drv/display.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index b981aa12e35..f3d9ef06712 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -51,9 +51,6 @@ static const WCHAR initial_mode_keyW[] = {'I','n','i','t','i','a','l',' ','D','i ' ','M','o','d','e'}; static const WCHAR pixelencodingW[] = {'P','i','x','e','l','E','n','c','o','d','i','n','g',0}; -static int cached_default_mode_bpp; -static pthread_mutex_t cached_modes_mutex = PTHREAD_MUTEX_INITIALIZER; - static BOOL inited_original_display_mode; @@ -400,22 +397,23 @@ static BOOL display_mode_matches_descriptor(CGDisplayModeRef mode, const struct static int get_default_bpp(void) { + static int cached; int ret; - if (!cached_default_mode_bpp) + if (!cached) { CGDisplayModeRef mode = CGDisplayCopyDisplayMode(kCGDirectMainDisplay); if (mode) { - cached_default_mode_bpp = display_mode_bits_per_pixel(mode); + cached = display_mode_bits_per_pixel(mode); CFRelease(mode); } - if (!cached_default_mode_bpp) - cached_default_mode_bpp = 32; + if (!cached) + cached = 32; } - ret = cached_default_mode_bpp; + ret = cached; TRACE(" -> %d\n", ret); return ret; @@ -800,9 +798,7 @@ LONG macdrv_ChangeDisplaySettings(LPDEVMODEW displays, HWND hwnd, DWORD flags, L return DISP_CHANGE_FAILED; } - pthread_mutex_lock(&cached_modes_mutex); bpp = get_default_bpp(); - pthread_mutex_unlock(&cached_modes_mutex); desc = create_original_display_mode_descriptor(macdrv_displays[0].displayID);

1 0

Rémi Bernon : win32u: Move enumeration of available modes out of graphics drivers.
by Alexandre Julliard Sept. 23, 2022

Sept. 23, 2022

Module: wine Branch: master Commit: 981d59264f7002ddc445414c42bea2c705f1dbb0 URL: https://gitlab.winehq.org/wine/wine/-/commit/981d59264f7002ddc445414c42bea2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 9 11:48:52 2022 +0200 win32u: Move enumeration of available modes out of graphics drivers. --- dlls/win32u/driver.c | 12 ---- dlls/win32u/sysparams.c | 41 +++++++++-- dlls/wineandroid.drv/init.c | 31 --------- dlls/winemac.drv/display.c | 162 -------------------------------------------- dlls/winemac.drv/gdi.c | 1 - dlls/winemac.drv/macdrv.h | 2 - dlls/winex11.drv/display.c | 99 --------------------------- dlls/winex11.drv/init.c | 1 - dlls/winex11.drv/x11drv.h | 2 - include/wine/gdi_driver.h | 1 - 10 files changed, 36 insertions(+), 316 deletions(-)

1 0

Rémi Bernon : user32/tests: Cleanup sysparams WM_DISPLAYCHANGE tests.
by Alexandre Julliard Sept. 23, 2022

Sept. 23, 2022

Module: wine Branch: master Commit: 6d5041744d175e9f3ea9e8eab680e6e4d778b9d6 URL: https://gitlab.winehq.org/wine/wine/-/commit/6d5041744d175e9f3ea9e8eab680e6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 16 20:43:26 2022 +0200 user32/tests: Cleanup sysparams WM_DISPLAYCHANGE tests. --- dlls/user32/tests/sysparams.c | 126 ++++++++++++++++++++++-------------------- 1 file changed, 67 insertions(+), 59 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 4f2709094e9..6d630ab1ead 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -30,7 +30,6 @@ #include "winuser.h" #include "winnls.h" -static LONG (WINAPI *pChangeDisplaySettingsExA)(LPCSTR, LPDEVMODEA, HWND, DWORD, LPVOID); static BOOL (WINAPI *pIsProcessDPIAware)(void); static BOOL (WINAPI *pSetProcessDPIAware)(void); static BOOL (WINAPI *pSetProcessDpiAwarenessContext)(DPI_AWARENESS_CONTEXT); @@ -2447,78 +2446,88 @@ static void test_SPI_SETWALLPAPER( void ) /* 115 */ static void test_WM_DISPLAYCHANGE(void) { - DEVMODEA mode, startmode; - int start_bpp, last_set_bpp = 0; - int test_bpps[] = {8, 16, 24, 32}, i; - LONG change_ret; - DWORD wait_ret; - - if (!pChangeDisplaySettingsExA) - { - win_skip("ChangeDisplaySettingsExA is not available\n"); - return; - } + UINT test_bpps[] = {8, 16, 24}, default_bpp, i; + DEVMODEW settings; + DWORD res; + BOOL ret; displaychange_test_active = TRUE; + displaychange_sem = CreateSemaphoreW( NULL, 0, 1, NULL ); - memset(&startmode, 0, sizeof(startmode)); - startmode.dmSize = sizeof(startmode); - EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &startmode); - start_bpp = startmode.dmBitsPerPel; + memset( &settings, 0, sizeof(DEVMODEW) ); + settings.dmSize = sizeof(DEVMODEW); + ret = EnumDisplaySettingsW( NULL, ENUM_CURRENT_SETTINGS, &settings ); + ok( ret, "EnumDisplaySettingsW failed, error %#lx\n", GetLastError() ); - displaychange_sem = CreateSemaphoreW(NULL, 0, 1, NULL); + ok( settings.dmFields & DM_BITSPERPEL, "got dmFields %#lx\n", settings.dmFields ); + ok( settings.dmBitsPerPel == 32, "got dmBitsPerPel %lu\n", settings.dmBitsPerPel ); + default_bpp = settings.dmBitsPerPel; - for(i = 0; i < ARRAY_SIZE(test_bpps); i++) { - last_bpp = -1; + /* setting the default mode here sends a WM_DISPLAYCHANGE */ + + last_bpp = -1; + change_counter = 0; + displaychange_ok = TRUE; + res = ChangeDisplaySettingsExW( NULL, &settings, NULL, 0, NULL ); + ok( !res, "ChangeDisplaySettingsExW returned %ld\n", res ); + res = WaitForSingleObject( displaychange_sem, 10000 ); + ok( !res, "WaitForSingleObject returned %#lx\n", res ); + ok( last_bpp == default_bpp, "got WM_DISPLAYCHANGE bpp %u\n", last_bpp ); + displaychange_ok = FALSE; + + for (i = 0; i < ARRAY_SIZE(test_bpps); i++) + { + UINT bpp = test_bpps[i]; - memset(&mode, 0, sizeof(mode)); - mode.dmSize = sizeof(mode); - mode.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT; - mode.dmBitsPerPel = test_bpps[i]; - mode.dmPelsWidth = GetSystemMetrics(SM_CXSCREEN); - mode.dmPelsHeight = GetSystemMetrics(SM_CYSCREEN); + winetest_push_context( "bpp %u", bpp ); - change_counter = 0; /* This sends a SETTINGSCHANGE message as well in which we aren't interested */ + settings.dmBitsPerPel = bpp; + settings.dmFields |= DM_BITSPERPEL; + + last_bpp = -1; + change_counter = 0; displaychange_ok = TRUE; - change_ret = pChangeDisplaySettingsExA(NULL, &mode, NULL, 0, NULL); - /* Wait quite long for the message, screen setting changes can take some time */ - if(change_ret == DISP_CHANGE_SUCCESSFUL) { - wait_ret = WaitForSingleObject(displaychange_sem, 10000); - /* we may not get a notification if nothing changed */ - if (wait_ret == WAIT_TIMEOUT && !last_set_bpp && start_bpp == test_bpps[i]) - continue; - ok(wait_ret == WAIT_OBJECT_0, "Waiting for the WM_DISPLAYCHANGE message timed out\n"); + res = ChangeDisplaySettingsExW( NULL, &settings, NULL, 0, NULL ); + if (!res) + { + /* Wait quite long for the message, screen setting changes can take some time */ + res = WaitForSingleObject( displaychange_sem, 10000 ); + ok( !res, "WaitForSingleObject returned %#lx\n", res ); + todo_wine + ok( last_bpp == bpp, "got WM_DISPLAYCHANGE bpp %u\n", last_bpp ); } - displaychange_ok = FALSE; - - if(change_ret != DISP_CHANGE_SUCCESSFUL) { - skip("Setting depth %d failed(ret = %ld)\n", test_bpps[i], change_ret); - ok(last_bpp == -1, "WM_DISPLAYCHANGE was sent with wParam %d despite mode change failure\n", last_bpp); - continue; + else + { + todo_wine + win_skip( "ChangeDisplaySettingsExW returned %ld\n", res ); + ok( res == DISP_CHANGE_BADMODE || broken( DISP_CHANGE_FAILED && bpp == 8 ), + "ChangeDisplaySettingsExW returned %ld\n", res ); + ok( last_bpp == -1, "got WM_DISPLAYCHANGE bpp %u\n", last_bpp ); } + displaychange_ok = FALSE; - todo_wine_if(start_bpp != test_bpps[i]) { - ok(last_bpp == test_bpps[i], "Set bpp %d, but WM_DISPLAYCHANGE reported bpp %d\n", test_bpps[i], last_bpp); - } - last_set_bpp = test_bpps[i]; + winetest_pop_context(); } - if(start_bpp != last_set_bpp && last_set_bpp != 0) { - memset(&mode, 0, sizeof(mode)); - mode.dmSize = sizeof(mode); - mode.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT; - mode.dmBitsPerPel = start_bpp; - mode.dmPelsWidth = GetSystemMetrics(SM_CXSCREEN); - mode.dmPelsHeight = GetSystemMetrics(SM_CYSCREEN); + /* restoring default mode most of the time doesn't send WM_DISPLAYCHANGE */ - displaychange_ok = TRUE; - change_ret = pChangeDisplaySettingsExA(NULL, &mode, NULL, 0, NULL); - WaitForSingleObject(displaychange_sem, 10000); - displaychange_ok = FALSE; - CloseHandle(displaychange_sem); - displaychange_sem = 0; - } + settings.dmBitsPerPel = default_bpp; + settings.dmFields |= DM_BITSPERPEL; + + last_bpp = -1; + change_counter = 0; + displaychange_ok = TRUE; + res = ChangeDisplaySettingsExW( NULL, &settings, NULL, 0, NULL ); + ok( !res, "ChangeDisplaySettingsExW returned %ld\n", res ); + res = WaitForSingleObject( displaychange_sem, 1000 ); + todo_wine + ok( res == WAIT_TIMEOUT || broken( !res ), "WaitForSingleObject returned %#lx\n", res ); + todo_wine + ok( last_bpp == -1 || broken( last_bpp == default_bpp ), "got WM_DISPLAYCHANGE bpp %u\n", last_bpp ); + displaychange_ok = FALSE; + CloseHandle( displaychange_sem ); + displaychange_sem = 0; displaychange_test_active = FALSE; } @@ -4136,7 +4145,6 @@ START_TEST(sysparams) HANDLE hInstance, hdll; hdll = GetModuleHandleA("user32.dll"); - pChangeDisplaySettingsExA = (void*)GetProcAddress(hdll, "ChangeDisplaySettingsExA"); pIsProcessDPIAware = (void*)GetProcAddress(hdll, "IsProcessDPIAware"); pSetProcessDPIAware = (void*)GetProcAddress(hdll, "SetProcessDPIAware"); pGetDpiForSystem = (void*)GetProcAddress(hdll, "GetDpiForSystem");

1 0