wine-commits November 2022

wine-commits@winehq.org

1 participants
1171 discussions

Brendan Shanks : ntdll: Print correct thread rename trace if non-pseudo-handle to current thread is used.
by Alexandre Julliard 01 Nov '22

01 Nov '22

Module: wine Branch: master Commit: f726b6ba79e2b0b98c5afba747457f6685e80f59 URL: https://gitlab.winehq.org/wine/wine/-/commit/f726b6ba79e2b0b98c5afba747457f… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Oct 18 15:45:24 2022 -0700 ntdll: Print correct thread rename trace if non-pseudo-handle to current thread is used. --- dlls/ntdll/unix/thread.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 3a737044407..0cf0da4ad4c 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -2282,9 +2282,10 @@ NTSTATUS WINAPI NtSetInformationThread( HANDLE handle, THREADINFOCLASS class, if (!info) return STATUS_ACCESS_VIOLATION; if (info->ThreadName.Length && !info->ThreadName.Buffer) return STATUS_ACCESS_VIOLATION; - if (handle == GetCurrentThread()) + status = NtQueryInformationThread( handle, ThreadBasicInformation, &tbi, sizeof(tbi), NULL ); + if (handle == GetCurrentThread() || (!status && (HandleToULong(tbi.ClientId.UniqueThread) == GetCurrentThreadId()))) WARN_(threadname)( "Thread renamed to %s\n", debugstr_us(&info->ThreadName) ); - else if (!NtQueryInformationThread( handle, ThreadBasicInformation, &tbi, sizeof(tbi), NULL )) + else if (!status) WARN_(threadname)( "Thread ID %04x renamed to %s\n", HandleToULong( tbi.ClientId.UniqueThread ), debugstr_us(&info->ThreadName) ); else WARN_(threadname)( "Thread handle %p renamed to %s\n", handle, debugstr_us(&info->ThreadName) );

1 0

Jacek Caban : winevulkan: Assert Unix call result in private thunks.
by Alexandre Julliard 01 Nov '22

01 Nov '22

Module: wine Branch: master Commit: 0c38bb0b2bafca5eb232396e39c77a3e60de05fc URL: https://gitlab.winehq.org/wine/wine/-/commit/0c38bb0b2bafca5eb232396e39c77a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 1 15:36:09 2022 +0100 winevulkan: Assert Unix call result in private thunks. --- dlls/winevulkan/loader.c | 49 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 37 insertions(+), 12 deletions(-) diff --git a/dlls/winevulkan/loader.c b/dlls/winevulkan/loader.c index d6fe9fe078f..20bd9d38c27 100644 --- a/dlls/winevulkan/loader.c +++ b/dlls/winevulkan/loader.c @@ -257,6 +257,7 @@ VkResult WINAPI vkCreateInstance(const VkInstanceCreateInfo *create_info, struct vkCreateInstance_params params; struct VkInstance_T *instance; uint32_t phys_dev_count = 8, i; + NTSTATUS status; TRACE("create_info %p, allocator %p, instance %p\n", create_info, allocator, ret); @@ -275,7 +276,8 @@ VkResult WINAPI vkCreateInstance(const VkInstanceCreateInfo *create_info, params.pAllocator = allocator; params.pInstance = ret; params.client_ptr = instance; - vk_unix_call(unix_vkCreateInstance, &params); + status = vk_unix_call(unix_vkCreateInstance, &params); + assert(!status); if (instance->phys_dev_count <= phys_dev_count) break; phys_dev_count = instance->phys_dev_count; @@ -290,9 +292,12 @@ VkResult WINAPI vkCreateInstance(const VkInstanceCreateInfo *create_info, void WINAPI vkDestroyInstance(VkInstance instance, const VkAllocationCallbacks *pAllocator) { struct vkDestroyInstance_params params; + NTSTATUS status; + params.instance = instance; params.pAllocator = pAllocator; - vk_unix_call(unix_vkDestroyInstance, &params); + status = vk_unix_call(unix_vkDestroyInstance, &params); + assert(!status); free(instance); } @@ -300,6 +305,7 @@ VkResult WINAPI vkEnumerateInstanceExtensionProperties(const char *layer_name, uint32_t *count, VkExtensionProperties *properties) { struct vkEnumerateInstanceExtensionProperties_params params; + NTSTATUS status; TRACE("%p, %p, %p\n", layer_name, count, properties); @@ -318,13 +324,15 @@ VkResult WINAPI vkEnumerateInstanceExtensionProperties(const char *layer_name, params.pLayerName = layer_name; params.pPropertyCount = count; params.pProperties = properties; - vk_unix_call(unix_vkEnumerateInstanceExtensionProperties, &params); + status = vk_unix_call(unix_vkEnumerateInstanceExtensionProperties, &params); + assert(!status); return params.result; } VkResult WINAPI vkEnumerateInstanceVersion(uint32_t *version) { struct vkEnumerateInstanceVersion_params params; + NTSTATUS status; TRACE("%p\n", version); @@ -335,7 +343,8 @@ VkResult WINAPI vkEnumerateInstanceVersion(uint32_t *version) } params.pApiVersion = version; - vk_unix_call(unix_vkEnumerateInstanceVersion, &params); + status = vk_unix_call(unix_vkEnumerateInstanceVersion, &params); + assert(!status); return params.result; } @@ -434,12 +443,14 @@ void WINAPI vkGetPhysicalDeviceProperties2(VkPhysicalDevice phys_dev, VkPhysicalDeviceProperties2 *properties2) { struct vkGetPhysicalDeviceProperties2_params params; + NTSTATUS status; TRACE("%p, %p\n", phys_dev, properties2); params.physicalDevice = phys_dev; params.pProperties = properties2; - vk_unix_call(unix_vkGetPhysicalDeviceProperties2, &params); + status = vk_unix_call(unix_vkGetPhysicalDeviceProperties2, &params); + assert(!status); fill_luid_property(properties2); } @@ -447,12 +458,14 @@ void WINAPI vkGetPhysicalDeviceProperties2KHR(VkPhysicalDevice phys_dev, VkPhysicalDeviceProperties2 *properties2) { struct vkGetPhysicalDeviceProperties2KHR_params params; + NTSTATUS status; TRACE("%p, %p\n", phys_dev, properties2); params.physicalDevice = phys_dev; params.pProperties = properties2; - vk_unix_call(unix_vkGetPhysicalDeviceProperties2KHR, &params); + status = vk_unix_call(unix_vkGetPhysicalDeviceProperties2KHR, &params); + assert(!status); fill_luid_property(properties2); } @@ -462,6 +475,7 @@ VkResult WINAPI vkCreateDevice(VkPhysicalDevice phys_dev, const VkDeviceCreateIn struct vkCreateDevice_params params; uint32_t queue_count = 0, i; VkDevice device; + NTSTATUS status; for (i = 0; i < create_info->queueCreateInfoCount; i++) queue_count += create_info->pQueueCreateInfos[i].queueCount; @@ -475,7 +489,8 @@ VkResult WINAPI vkCreateDevice(VkPhysicalDevice phys_dev, const VkDeviceCreateIn params.pAllocator = allocator; params.pDevice = ret; params.client_ptr = device; - vk_unix_call(unix_vkCreateDevice, &params); + status = vk_unix_call(unix_vkCreateDevice, &params); + assert(!status); if (!device->base.unix_handle) free(device); return params.result; @@ -484,10 +499,12 @@ VkResult WINAPI vkCreateDevice(VkPhysicalDevice phys_dev, const VkDeviceCreateIn void WINAPI vkDestroyDevice(VkDevice device, const VkAllocationCallbacks *allocator) { struct vkDestroyDevice_params params; + NTSTATUS status; params.device = device; params.pAllocator = allocator; - vk_unix_call(unix_vkDestroyDevice, &params); + status = vk_unix_call(unix_vkDestroyDevice, &params); + assert(!status); free(device); } @@ -496,6 +513,7 @@ VkResult WINAPI vkCreateCommandPool(VkDevice device, const VkCommandPoolCreateIn { struct vkCreateCommandPool_params params; struct vk_command_pool *cmd_pool; + NTSTATUS status; if (!(cmd_pool = malloc(sizeof(*cmd_pool)))) return VK_ERROR_OUT_OF_HOST_MEMORY; @@ -507,7 +525,8 @@ VkResult WINAPI vkCreateCommandPool(VkDevice device, const VkCommandPoolCreateIn params.pAllocator = allocator; params.pCommandPool = ret; params.client_ptr = cmd_pool; - vk_unix_call(unix_vkCreateCommandPool, &params); + status = vk_unix_call(unix_vkCreateCommandPool, &params); + assert(!status); if (!cmd_pool->unix_handle) free(cmd_pool); return params.result; @@ -518,6 +537,7 @@ void WINAPI vkDestroyCommandPool(VkDevice device, VkCommandPool handle, const Vk struct vk_command_pool *cmd_pool = command_pool_from_handle(handle); struct vkDestroyCommandPool_params params; VkCommandBuffer buffer, cursor; + NTSTATUS status; if (!cmd_pool) return; @@ -534,7 +554,8 @@ void WINAPI vkDestroyCommandPool(VkDevice device, VkCommandPool handle, const Vk params.device = device; params.commandPool = handle; params.pAllocator = allocator; - vk_unix_call(unix_vkDestroyCommandPool, &params); + status = vk_unix_call(unix_vkDestroyCommandPool, &params); + assert(!status); free(cmd_pool); } @@ -543,6 +564,7 @@ VkResult WINAPI vkAllocateCommandBuffers(VkDevice device, const VkCommandBufferA { struct vk_command_pool *pool = command_pool_from_handle(allocate_info->commandPool); struct vkAllocateCommandBuffers_params params; + NTSTATUS status; uint32_t i; for (i = 0; i < allocate_info->commandBufferCount; i++) @@ -551,7 +573,8 @@ VkResult WINAPI vkAllocateCommandBuffers(VkDevice device, const VkCommandBufferA params.device = device; params.pAllocateInfo = allocate_info; params.pCommandBuffers = buffers; - vk_unix_call(unix_vkAllocateCommandBuffers, &params); + status = vk_unix_call(unix_vkAllocateCommandBuffers, &params); + assert(!status); if (params.result == VK_SUCCESS) { for (i = 0; i < allocate_info->commandBufferCount; i++) @@ -572,13 +595,15 @@ void WINAPI vkFreeCommandBuffers(VkDevice device, VkCommandPool cmd_pool, uint32 const VkCommandBuffer *buffers) { struct vkFreeCommandBuffers_params params; + NTSTATUS status; uint32_t i; params.device = device; params.commandPool = cmd_pool; params.commandBufferCount = count; params.pCommandBuffers = buffers; - vk_unix_call(unix_vkFreeCommandBuffers, &params); + status = vk_unix_call(unix_vkFreeCommandBuffers, &params); + assert(!status); for (i = 0; i < count; i++) { list_remove(&buffers[i]->pool_link);

1 0

Jacek Caban : winevulkan: Assert Unix call result in generated thunks.
by Alexandre Julliard 01 Nov '22

01 Nov '22

Module: wine Branch: master Commit: 572dd0b466c546adc77f7ad95a25e348bcef0088 URL: https://gitlab.winehq.org/wine/wine/-/commit/572dd0b466c546adc77f7ad95a25e3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 23 00:59:13 2022 +0200 winevulkan: Assert Unix call result in generated thunks. Instead of silently ignoring crashes. --- dlls/winevulkan/loader_thunks.c | 1996 +++++++++++++++++++++++++++++---------- dlls/winevulkan/make_vulkan | 6 +- dlls/winevulkan/vulkan_loader.h | 1 + 3 files changed, 1502 insertions(+), 501 deletions(-)

1 0

Jacek Caban : winevulkan: Support optional dispatch handles.
by Alexandre Julliard 01 Nov '22

01 Nov '22

Module: wine Branch: master Commit: 5b41a4816bb50c3d8c45896d375772ee2f224d74 URL: https://gitlab.winehq.org/wine/wine/-/commit/5b41a4816bb50c3d8c45896d375772… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 1 14:52:12 2022 +0100 winevulkan: Support optional dispatch handles. --- dlls/winevulkan/make_vulkan | 23 +- dlls/winevulkan/vulkan_thunks.c | 1034 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 1051 insertions(+), 6 deletions(-)

1 0

Eric Pouech : conhost/tests: Fix some conditions on tty test termination.
by Alexandre Julliard 01 Nov '22

01 Nov '22

Module: wine Branch: master Commit: 9317a331f1d4c39f5da391f976c2cb98f1d3e0fe URL: https://gitlab.winehq.org/wine/wine/-/commit/9317a331f1d4c39f5da391f976c2cb… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Oct 26 15:36:42 2022 +0200 conhost/tests: Fix some conditions on tty test termination. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/conhost/tests/tty.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/programs/conhost/tests/tty.c b/programs/conhost/tests/tty.c index 5befbd2ea82..9371d0ce6f5 100644 --- a/programs/conhost/tests/tty.c +++ b/programs/conhost/tests/tty.c @@ -1858,6 +1858,16 @@ static void test_pseudoconsole(void) if (i != 39) expect_output_sequence("\r\n"); } skip_sequence("\x1b[H\x1b[?25h"); + /* native sometimes redraws the screen afterwards */ + if (skip_sequence("\x1b[25l")) + { + unsigned int line_feed = 0; + /* not checking exact output, depends too heavily on previous tests */ + for (i = 0; i < console_output_count - 2; i++) + if (!memcmp(console_output + i, "\r\n", 2)) line_feed++; + ok(line_feed == 39, "Wrong number of line feeds %u\n", line_feed); + console_output_count = 0; + } } expect_empty_output();

1 0

Eric Pouech : user32: Fix rounding issue in edit tests for char pos messages.
by Alexandre Julliard 01 Nov '22

01 Nov '22

Module: wine Branch: master Commit: 614b7d7430e0ba60692a46e97f03b8b9600f0651 URL: https://gitlab.winehq.org/wine/wine/-/commit/614b7d7430e0ba60692a46e97f03b8… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Oct 29 13:06:46 2022 +0200 user32: Fix rounding issue in edit tests for char pos messages. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/user32/tests/edit.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 1e5ed8dbfa0..2afbbd5bea4 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1150,7 +1150,7 @@ static void test_char_from_pos(void) SendMessageA(hwEdit, WM_SETTEXT, 0, (LPARAM) "aa"); lo = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 0, 0)); hi = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 1, 0)); - mid = lo + (hi - lo) / 2; + mid = lo + (hi - lo + 1) / 2; for (i = lo; i < mid; i++) { ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); @@ -1168,7 +1168,7 @@ static void test_char_from_pos(void) SendMessageA(hwEdit, WM_SETTEXT, 0, (LPARAM) "aa"); lo = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 0, 0)); hi = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 1, 0)); - mid = lo + (hi - lo) / 2; + mid = lo + (hi - lo + 1) / 2; for (i = lo; i < mid; i++) { ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); @@ -1186,7 +1186,7 @@ static void test_char_from_pos(void) SendMessageA(hwEdit, WM_SETTEXT, 0, (LPARAM) "aa"); lo = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 0, 0)); hi = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 1, 0)); - mid = lo + (hi - lo) / 2; + mid = lo + (hi - lo + 1) / 2; for (i = lo; i < mid; i++) { ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); @@ -1204,7 +1204,7 @@ static void test_char_from_pos(void) SendMessageA(hwEdit, WM_SETTEXT, 0, (LPARAM) "aa"); lo = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 0, 0)); hi = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 1, 0)); - mid = lo + (hi - lo) / 2 +1; + mid = lo + (hi - lo + 1) / 2; for (i = lo; i < mid; i++) { ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); @@ -1223,7 +1223,7 @@ static void test_char_from_pos(void) SendMessageA(hwEdit, WM_SETTEXT, 0, (LPARAM) "aa"); lo = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 0, 0)); hi = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 1, 0)); - mid = lo + (hi - lo) / 2 +1; + mid = lo + (hi - lo + 1) / 2; for (i = lo; i < mid; i++) { ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); @@ -1242,7 +1242,7 @@ static void test_char_from_pos(void) SendMessageA(hwEdit, WM_SETTEXT, 0, (LPARAM) "aa"); lo = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 0, 0)); hi = LOWORD(SendMessageA(hwEdit, EM_POSFROMCHAR, 1, 0)); - mid = lo + (hi - lo) / 2 +1; + mid = lo + (hi - lo + 2) / 2; for (i = lo; i < mid; i++) { ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i));

1 0

Rémi Bernon : winex11.drv: Use the primary adapter info instead of calling back win32u.
by Alexandre Julliard 01 Nov '22

01 Nov '22

Module: wine Branch: master Commit: b112b4d4845e7121a8aa809a7e64598347a3e2fd URL: https://gitlab.winehq.org/wine/wine/-/commit/b112b4d4845e7121a8aa809a7e6459… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 21 13:42:46 2022 +0200 winex11.drv: Use the primary adapter info instead of calling back win32u. --- dlls/winex11.drv/desktop.c | 8 ++------ dlls/winex11.drv/display.c | 31 ++++--------------------------- dlls/winex11.drv/x11drv.h | 3 +-- dlls/winex11.drv/xrandr.c | 11 +++-------- dlls/winex11.drv/xvidmode.c | 9 ++------- 5 files changed, 12 insertions(+), 50 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index c6a08291f6a..7e8883e77ae 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -123,13 +123,9 @@ BOOL is_virtual_desktop(void) } /* Virtual desktop display settings handler */ -static BOOL X11DRV_desktop_get_id( const WCHAR *device_name, ULONG_PTR *id ) +static BOOL X11DRV_desktop_get_id( const WCHAR *device_name, BOOL is_primary, ULONG_PTR *id ) { - WCHAR primary_adapter[CCHDEVICENAME]; - - if (!get_primary_adapter( primary_adapter ) || wcsicmp( primary_adapter, device_name )) - return FALSE; - + if (!is_primary) return FALSE; *id = 0; return TRUE; } diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index a97682e3546..d53774f0e02 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -66,14 +66,9 @@ void X11DRV_Settings_SetHandler(const struct x11drv_settings_handler *new_handle * Default handlers if resolution switching is not enabled * */ -static BOOL nores_get_id(const WCHAR *device_name, ULONG_PTR *id) +static BOOL nores_get_id(const WCHAR *device_name, BOOL is_primary, ULONG_PTR *id) { - WCHAR primary_adapter[CCHDEVICENAME]; - - if (!get_primary_adapter( primary_adapter )) - return FALSE; - - *id = !wcsicmp( device_name, primary_adapter ) ? 1 : 0; + *id = is_primary ? 1 : 0; return TRUE; } @@ -196,24 +191,6 @@ void init_registry_display_settings(void) } } -BOOL get_primary_adapter(WCHAR *name) -{ - DISPLAY_DEVICEW dd; - DWORD i; - - dd.cb = sizeof(dd); - for (i = 0; !NtUserEnumDisplayDevices( NULL, i, &dd, 0 ); ++i) - { - if (dd.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) - { - lstrcpyW(name, dd.DeviceName); - return TRUE; - } - } - - return FALSE; -} - static void set_display_depth(ULONG_PTR display_id, DWORD depth) { struct x11drv_display_depth *display_depth; @@ -271,7 +248,7 @@ BOOL X11DRV_GetCurrentDisplaySettings( LPCWSTR name, BOOL is_primary, LPDEVMODEW DEVMODEW mode; ULONG_PTR id; - if (!settings_handler.get_id( name, &id ) || !settings_handler.get_current_mode( id, &mode )) + if (!settings_handler.get_id( name, is_primary, &id ) || !settings_handler.get_current_mode( id, &mode )) { ERR("Failed to get %s current display settings.\n", wine_dbgstr_w(name)); return FALSE; @@ -409,7 +386,7 @@ LONG X11DRV_ChangeDisplaySettings( LPDEVMODEW displays, LPCWSTR primary_name, HW if (!(ids = calloc( count, sizeof(*ids) ))) return DISP_CHANGE_FAILED; for (count = 0, mode = displays; mode->dmSize; mode = NEXT_DEVMODEW(mode), count++) { - if (!settings_handler.get_id( mode->dmDeviceName, ids + count )) goto done; + if (!settings_handler.get_id( mode->dmDeviceName, !wcsicmp( mode->dmDeviceName, primary_name ), ids + count )) goto done; mode->dmPosition.x -= left_most; mode->dmPosition.y -= top_most; } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 53c44bd88f1..5e1faf8a16e 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -710,7 +710,7 @@ struct x11drv_settings_handler * Following functions use this id to identify the device. * * Return FALSE if the device cannot be found and TRUE on success */ - BOOL (*get_id)(const WCHAR *device_name, ULONG_PTR *id); + BOOL (*get_id)(const WCHAR *device_name, BOOL is_primary, ULONG_PTR *id); /* get_modes() will be called to get a list of supported modes of the device of id in modes * with respect to flags, which could be 0, EDS_RAWMODE or EDS_ROTATEDMODE. If the implementation @@ -751,7 +751,6 @@ extern BOOL is_virtual_desktop(void) DECLSPEC_HIDDEN; extern BOOL is_desktop_fullscreen(void) DECLSPEC_HIDDEN; extern BOOL is_detached_mode(const DEVMODEW *) DECLSPEC_HIDDEN; extern BOOL create_desktop_win_data( Window win ) DECLSPEC_HIDDEN; -extern BOOL get_primary_adapter(WCHAR *) DECLSPEC_HIDDEN; void X11DRV_Settings_Init(void) DECLSPEC_HIDDEN; void X11DRV_XF86VM_Init(void) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index c7f922b1aae..2b75e3b28eb 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -144,17 +144,12 @@ static int XRandRErrorHandler(Display *dpy, XErrorEvent *event, void *arg) } /* XRandR 1.0 display settings handler */ -static BOOL xrandr10_get_id( const WCHAR *device_name, ULONG_PTR *id ) +static BOOL xrandr10_get_id( const WCHAR *device_name, BOOL is_primary, ULONG_PTR *id ) { - WCHAR primary_adapter[CCHDEVICENAME]; - - if (!get_primary_adapter( primary_adapter )) - return FALSE; - /* RandR 1.0 only supports changing the primary adapter settings. * For non-primary adapters, an id is still provided but getting * and changing non-primary adapters' settings will be ignored. */ - *id = !wcsicmp( device_name, primary_adapter ) ? 1 : 0; + *id = is_primary ? 1 : 0; return TRUE; } @@ -1224,7 +1219,7 @@ static void xrandr14_register_event_handlers(void) } /* XRandR 1.4 display settings handler */ -static BOOL xrandr14_get_id( const WCHAR *device_name, ULONG_PTR *id ) +static BOOL xrandr14_get_id( const WCHAR *device_name, BOOL is_primary, ULONG_PTR *id ) { struct current_mode *tmp_modes, *new_current_modes = NULL; INT gpu_count, adapter_count, new_current_mode_count = 0; diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c index 95342a84223..3a3932b611b 100644 --- a/dlls/winex11.drv/xvidmode.c +++ b/dlls/winex11.drv/xvidmode.c @@ -85,17 +85,12 @@ static int XVidModeErrorHandler(Display *dpy, XErrorEvent *event, void *arg) } /* XF86VidMode display settings handler */ -static BOOL xf86vm_get_id(const WCHAR *device_name, ULONG_PTR *id) +static BOOL xf86vm_get_id(const WCHAR *device_name, BOOL is_primary, ULONG_PTR *id) { - WCHAR primary_adapter[CCHDEVICENAME]; - - if (!get_primary_adapter( primary_adapter )) - return FALSE; - /* XVidMode only supports changing the primary adapter settings. * For non-primary adapters, an id is still provided but getting * and changing non-primary adapters' settings will be ignored. */ - *id = !wcsicmp( device_name, primary_adapter ) ? 1 : 0; + *id = is_primary ? 1 : 0; return TRUE; }

1 0

Rémi Bernon : win32u: Add is_primary parameter to GetCurrentDisplaySettings.
by Alexandre Julliard 01 Nov '22

01 Nov '22

Module: wine Branch: master Commit: 2fec6dd3e3d9b6d0ad4b6b2049a28f2b9e3a2e12 URL: https://gitlab.winehq.org/wine/wine/-/commit/2fec6dd3e3d9b6d0ad4b6b2049a28f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 21 13:38:33 2022 +0200 win32u: Add is_primary parameter to GetCurrentDisplaySettings. --- dlls/win32u/driver.c | 6 +++--- dlls/win32u/sysparams.c | 17 ++++++++++++----- dlls/wineandroid.drv/init.c | 2 +- dlls/winemac.drv/display.c | 4 ++-- dlls/winemac.drv/macdrv.h | 2 +- dlls/winex11.drv/display.c | 2 +- dlls/winex11.drv/x11drv.h | 2 +- include/wine/gdi_driver.h | 2 +- 8 files changed, 22 insertions(+), 15 deletions(-) diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 032adc35e81..f8aa15c46ce 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -759,7 +759,7 @@ static LONG nulldrv_ChangeDisplaySettings( LPDEVMODEW displays, LPCWSTR primary_ return DISP_CHANGE_FAILED; } -static BOOL nulldrv_GetCurrentDisplaySettings( LPCWSTR name, LPDEVMODEW mode ) +static BOOL nulldrv_GetCurrentDisplaySettings( LPCWSTR name, BOOL is_primary, LPDEVMODEW mode ) { return FALSE; } @@ -1072,9 +1072,9 @@ static LONG loaderdrv_ChangeDisplaySettings( LPDEVMODEW displays, LPCWSTR primar return load_driver()->pChangeDisplaySettings( displays, primary_name, hwnd, flags, lparam ); } -static BOOL loaderdrv_GetCurrentDisplaySettings( LPCWSTR name, LPDEVMODEW mode ) +static BOOL loaderdrv_GetCurrentDisplaySettings( LPCWSTR name, BOOL is_primary, LPDEVMODEW mode ) { - return load_driver()->pGetCurrentDisplaySettings( name, mode ); + return load_driver()->pGetCurrentDisplaySettings( name, is_primary, mode ); } static void loaderdrv_SetCursor( HCURSOR cursor ) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 96062bc6cfa..cd8e72b251f 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -503,6 +503,12 @@ static BOOL adapter_set_registry_settings( const struct adapter *adapter, const return ret; } +static BOOL adapter_get_current_settings( const struct adapter *adapter, DEVMODEW *mode ) +{ + BOOL is_primary = !!(adapter->dev.state_flags & DISPLAY_DEVICE_PRIMARY_DEVICE); + return user_driver->pGetCurrentDisplaySettings( adapter->dev.device_name, is_primary, mode ); +} + static int mode_compare(const void *p1, const void *p2) { BOOL a_interlaced, b_interlaced, a_stretched, b_stretched; @@ -2174,7 +2180,8 @@ static BOOL adapter_get_full_mode( const struct adapter *adapter, const DEVMODEW if (!is_detached_mode( full_mode ) && (!full_mode->dmPelsWidth || !full_mode->dmPelsHeight || !(full_mode->dmFields & DM_POSITION))) { DEVMODEW current_mode = {.dmSize = sizeof(DEVMODEW)}; - if (!user_driver->pGetCurrentDisplaySettings( adapter->dev.device_name, &current_mode )) return FALSE; + + if (!adapter_get_current_settings( adapter, &current_mode )) return FALSE; if (!full_mode->dmPelsWidth) full_mode->dmPelsWidth = current_mode.dmPelsWidth; if (!full_mode->dmPelsHeight) full_mode->dmPelsHeight = current_mode.dmPelsHeight; if (!(full_mode->dmFields & DM_POSITION)) @@ -2215,7 +2222,7 @@ static DEVMODEW *get_display_settings( const WCHAR *devname, const DEVMODEW *dev else { if (!devname) ret = adapter_get_registry_settings( adapter, mode ); - else ret = user_driver->pGetCurrentDisplaySettings( adapter->dev.device_name, mode ); + else ret = adapter_get_current_settings( adapter, mode ); if (!ret) goto done; } @@ -2457,7 +2464,7 @@ static LONG apply_display_settings( const WCHAR *devname, const DEVMODEW *devmod if ((adapter = find_adapter( NULL ))) { DEVMODEW current_mode = {.dmSize = sizeof(DEVMODEW)}; - user_driver->pGetCurrentDisplaySettings( adapter->dev.device_name, &current_mode ); + adapter_get_current_settings( adapter, &current_mode ); adapter_release( adapter ); send_notify_message( NtUserGetDesktopWindow(), WM_DISPLAYCHANGE, current_mode.dmBitsPerPel, @@ -2502,7 +2509,7 @@ static BOOL adapter_enum_display_settings( const struct adapter *adapter, DWORD DEVMODEW current_mode = {.dmSize = sizeof(DEVMODEW)}; const DEVMODEW *adapter_mode; - if (!(flags & EDS_ROTATEDMODE) && !user_driver->pGetCurrentDisplaySettings( adapter->dev.device_name, &current_mode )) + if (!(flags & EDS_ROTATEDMODE) && !adapter_get_current_settings( adapter, &current_mode )) { WARN( "Failed to query current display mode for EDS_ROTATEDMODE flag.\n" ); return FALSE; @@ -2550,7 +2557,7 @@ BOOL WINAPI NtUserEnumDisplaySettings( UNICODE_STRING *device, DWORD index, DEVM devmode->dmDriverExtra = 0; if (index == ENUM_REGISTRY_SETTINGS) ret = adapter_get_registry_settings( adapter, devmode ); - else if (index == ENUM_CURRENT_SETTINGS) ret = user_driver->pGetCurrentDisplaySettings( adapter->dev.device_name, devmode ); + else if (index == ENUM_CURRENT_SETTINGS) ret = adapter_get_current_settings( adapter, devmode ); else ret = adapter_enum_display_settings( adapter, index, devmode, flags ); adapter_release( adapter ); diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index c48d1fb1961..4308725dcee 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -306,7 +306,7 @@ BOOL ANDROID_UpdateDisplayDevices( const struct gdi_device_manager *device_manag /*********************************************************************** * ANDROID_GetCurrentDisplaySettings */ -BOOL ANDROID_GetCurrentDisplaySettings( LPCWSTR name, LPDEVMODEW devmode ) +BOOL ANDROID_GetCurrentDisplaySettings( LPCWSTR name, BOOL is_primary, LPDEVMODEW devmode ) { devmode->u2.dmDisplayFlags = 0; devmode->u1.s2.dmPosition.x = 0; diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 7abf47ee3dd..68069df7cc5 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -893,7 +893,7 @@ static DEVMODEW *display_get_modes(CGDirectDisplayID display_id, int *modes_coun * GetCurrentDisplaySettings (MACDRV.@) * */ -BOOL macdrv_GetCurrentDisplaySettings(LPCWSTR devname, LPDEVMODEW devmode) +BOOL macdrv_GetCurrentDisplaySettings(LPCWSTR devname, BOOL is_primary, LPDEVMODEW devmode) { struct macdrv_display *displays = NULL; int num_displays, display_idx; @@ -901,7 +901,7 @@ BOOL macdrv_GetCurrentDisplaySettings(LPCWSTR devname, LPDEVMODEW devmode) CGDirectDisplayID display_id; WCHAR *end; - TRACE("%s, %p + %hu\n", debugstr_w(devname), devmode, devmode->dmSize); + TRACE("%s, %u, %p + %hu\n", debugstr_w(devname), is_primary, devmode, devmode->dmSize); init_original_display_mode(); diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 4d99fde91f5..f6f9e5b6c67 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -123,7 +123,7 @@ static inline struct macdrv_thread_data *macdrv_thread_data(void) extern BOOL macdrv_ActivateKeyboardLayout(HKL hkl, UINT flags) DECLSPEC_HIDDEN; extern void macdrv_Beep(void) DECLSPEC_HIDDEN; extern LONG macdrv_ChangeDisplaySettings(LPDEVMODEW displays, LPCWSTR primary_name, HWND hwnd, DWORD flags, LPVOID lpvoid) DECLSPEC_HIDDEN; -extern BOOL macdrv_GetCurrentDisplaySettings(LPCWSTR name, LPDEVMODEW devmode) DECLSPEC_HIDDEN; +extern BOOL macdrv_GetCurrentDisplaySettings(LPCWSTR name, BOOL is_primary, LPDEVMODEW devmode) DECLSPEC_HIDDEN; extern LRESULT macdrv_ClipboardWindowProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) DECLSPEC_HIDDEN; extern BOOL macdrv_UpdateDisplayDevices( const struct gdi_device_manager *device_manager, BOOL force, void *param ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index f5a063a5e60..a97682e3546 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -266,7 +266,7 @@ static DWORD get_display_depth(ULONG_PTR display_id) * GetCurrentDisplaySettings (X11DRV.@) * */ -BOOL X11DRV_GetCurrentDisplaySettings( LPCWSTR name, LPDEVMODEW devmode ) +BOOL X11DRV_GetCurrentDisplaySettings( LPCWSTR name, BOOL is_primary, LPDEVMODEW devmode ) { DEVMODEW mode; ULONG_PTR id; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 0a8e2ac19d7..53c44bd88f1 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -214,7 +214,7 @@ extern BOOL X11DRV_SetCursorPos( INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL X11DRV_GetCursorPos( LPPOINT pos ) DECLSPEC_HIDDEN; extern BOOL X11DRV_ClipCursor( LPCRECT clip ) DECLSPEC_HIDDEN; extern LONG X11DRV_ChangeDisplaySettings( LPDEVMODEW displays, LPCWSTR primary_name, HWND hwnd, DWORD flags, LPVOID lpvoid ) DECLSPEC_HIDDEN; -extern BOOL X11DRV_GetCurrentDisplaySettings( LPCWSTR name, LPDEVMODEW devmode ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_GetCurrentDisplaySettings( LPCWSTR name, BOOL is_primary, LPDEVMODEW devmode ) DECLSPEC_HIDDEN; extern BOOL X11DRV_UpdateDisplayDevices( const struct gdi_device_manager *device_manager, BOOL force, void *param ) DECLSPEC_HIDDEN; extern BOOL X11DRV_CreateDesktopWindow( HWND hwnd ) DECLSPEC_HIDDEN; diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index e238340c76b..edde473b4d1 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -298,7 +298,7 @@ struct user_driver_funcs void (*pUpdateClipboard)(void); /* display modes */ LONG (*pChangeDisplaySettings)(LPDEVMODEW,LPCWSTR,HWND,DWORD,LPVOID); - BOOL (*pGetCurrentDisplaySettings)(LPCWSTR,LPDEVMODEW); + BOOL (*pGetCurrentDisplaySettings)(LPCWSTR,BOOL,LPDEVMODEW); BOOL (*pUpdateDisplayDevices)(const struct gdi_device_manager *,BOOL,void*); /* windowing functions */ BOOL (*pCreateDesktopWindow)(HWND);

1 0

Rémi Bernon : winemac.drv: Use the primary adapter name instead of calling back win32u.
by Alexandre Julliard 01 Nov '22

01 Nov '22

Module: wine Branch: master Commit: 81406eac96adb761f67bc6564ed57bc78982ace2 URL: https://gitlab.winehq.org/wine/wine/-/commit/81406eac96adb761f67bc6564ed57b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 21 14:00:21 2022 +0200 winemac.drv: Use the primary adapter name instead of calling back win32u. --- dlls/winemac.drv/display.c | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index d7180a68950..7abf47ee3dd 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -685,24 +685,6 @@ void check_retina_status(void) } } -static BOOL get_primary_adapter(WCHAR *name) -{ - DISPLAY_DEVICEW dd; - DWORD i; - - dd.cb = sizeof(dd); - for (i = 0; !NtUserEnumDisplayDevices(NULL, i, &dd, 0); ++i) - { - if (dd.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) - { - lstrcpyW(name, dd.DeviceName); - return TRUE; - } - } - - return FALSE; -} - static BOOL is_detached_mode(const DEVMODEW *mode) { return mode->dmFields & DM_POSITION && @@ -771,7 +753,6 @@ static CGDisplayModeRef find_best_display_mode(DEVMODEW *devmode, CFArrayRef dis */ LONG macdrv_ChangeDisplaySettings(LPDEVMODEW displays, LPCWSTR primary_name, HWND hwnd, DWORD flags, LPVOID lpvoid) { - WCHAR primary_adapter[CCHDEVICENAME]; LONG ret = DISP_CHANGE_SUCCESSFUL; DEVMODEW *mode; int bpp; @@ -785,9 +766,6 @@ LONG macdrv_ChangeDisplaySettings(LPDEVMODEW displays, LPCWSTR primary_name, HWN init_original_display_mode(); - if (!get_primary_adapter(primary_adapter)) - return DISP_CHANGE_FAILED; - if (macdrv_get_displays(&macdrv_displays, &num_displays)) return DISP_CHANGE_FAILED; @@ -804,7 +782,7 @@ LONG macdrv_ChangeDisplaySettings(LPDEVMODEW displays, LPCWSTR primary_name, HWN for (mode = displays; mode->dmSize && !ret; mode = NEXT_DEVMODEW(mode)) { - if (wcsicmp(primary_adapter, mode->dmDeviceName)) + if (wcsicmp(primary_name, mode->dmDeviceName)) { FIXME("Changing non-primary adapter settings is currently unsupported.\n"); continue;

1 0

Rémi Bernon : win32u: Add primary adapter name parameter to ChangeDisplaySettings.
by Alexandre Julliard 01 Nov '22

01 Nov '22

Module: wine Branch: master Commit: 6aeaeed9fb644403641719c7a58e9e022c40767e URL: https://gitlab.winehq.org/wine/wine/-/commit/6aeaeed9fb644403641719c7a58e9e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 21 13:59:54 2022 +0200 win32u: Add primary adapter name parameter to ChangeDisplaySettings. --- dlls/win32u/driver.c | 6 +++--- dlls/win32u/sysparams.c | 10 +++++++++- dlls/wineandroid.drv/init.c | 4 ++-- dlls/winemac.drv/display.c | 4 ++-- dlls/winemac.drv/macdrv.h | 2 +- dlls/winex11.drv/display.c | 2 +- dlls/winex11.drv/x11drv.h | 2 +- include/wine/gdi_driver.h | 2 +- 8 files changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index ee4a6534b50..032adc35e81 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -753,7 +753,7 @@ static void nulldrv_UpdateClipboard(void) { } -static LONG nulldrv_ChangeDisplaySettings( LPDEVMODEW displays, HWND hwnd, +static LONG nulldrv_ChangeDisplaySettings( LPDEVMODEW displays, LPCWSTR primary_name, HWND hwnd, DWORD flags, LPVOID lparam ) { return DISP_CHANGE_FAILED; @@ -1066,10 +1066,10 @@ static SHORT loaderdrv_VkKeyScanEx( WCHAR ch, HKL layout ) return load_driver()->pVkKeyScanEx( ch, layout ); } -static LONG loaderdrv_ChangeDisplaySettings( LPDEVMODEW displays, HWND hwnd, +static LONG loaderdrv_ChangeDisplaySettings( LPDEVMODEW displays, LPCWSTR primary_name, HWND hwnd, DWORD flags, LPVOID lparam ) { - return load_driver()->pChangeDisplaySettings( displays, hwnd, flags, lparam ); + return load_driver()->pChangeDisplaySettings( displays, primary_name, hwnd, flags, lparam ); } static BOOL loaderdrv_GetCurrentDisplaySettings( LPCWSTR name, LPDEVMODEW mode ) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 98ef5b276b7..96062bc6cfa 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -2422,6 +2422,7 @@ static BOOL all_detached_settings( const DEVMODEW *displays ) static LONG apply_display_settings( const WCHAR *devname, const DEVMODEW *devmode, HWND hwnd, DWORD flags, void *lparam ) { + WCHAR primary_name[CCHDEVICENAME]; struct adapter *adapter; DEVMODEW *displays; LONG ret; @@ -2438,7 +2439,14 @@ static LONG apply_display_settings( const WCHAR *devname, const DEVMODEW *devmod place_all_displays( displays ); - ret = user_driver->pChangeDisplaySettings( displays, hwnd, flags, lparam ); + if (!(adapter = find_adapter( NULL ))) primary_name[0] = 0; + else + { + wcscpy( primary_name, adapter->dev.device_name ); + adapter_release( adapter ); + } + + ret = user_driver->pChangeDisplaySettings( displays, primary_name, hwnd, flags, lparam ); free( displays ); if (ret) return ret; diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index 6011e20c8ce..c48d1fb1961 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -262,9 +262,9 @@ static BOOL CDECL ANDROID_DeleteDC( PHYSDEV dev ) /*********************************************************************** * ANDROID_ChangeDisplaySettings */ -LONG ANDROID_ChangeDisplaySettings( LPDEVMODEW displays, HWND hwnd, DWORD flags, LPVOID lpvoid ) +LONG ANDROID_ChangeDisplaySettings( LPDEVMODEW displays, LPCWSTR primary_name, HWND hwnd, DWORD flags, LPVOID lpvoid ) { - FIXME( "(%p,%p,0x%08x,%p)\n", displays, hwnd, flags, lpvoid ); + FIXME( "(%p,%s,%p,0x%08x,%p)\n", displays, debugstr_w(primary_name), hwnd, flags, lpvoid ); return DISP_CHANGE_SUCCESSFUL; } diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index e18e57281f7..d7180a68950 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -769,7 +769,7 @@ static CGDisplayModeRef find_best_display_mode(DEVMODEW *devmode, CFArrayRef dis * ChangeDisplaySettings (MACDRV.@) * */ -LONG macdrv_ChangeDisplaySettings(LPDEVMODEW displays, HWND hwnd, DWORD flags, LPVOID lpvoid) +LONG macdrv_ChangeDisplaySettings(LPDEVMODEW displays, LPCWSTR primary_name, HWND hwnd, DWORD flags, LPVOID lpvoid) { WCHAR primary_adapter[CCHDEVICENAME]; LONG ret = DISP_CHANGE_SUCCESSFUL; @@ -781,7 +781,7 @@ LONG macdrv_ChangeDisplaySettings(LPDEVMODEW displays, HWND hwnd, DWORD flags, L struct display_mode_descriptor *desc; CGDisplayModeRef best_display_mode; - TRACE("%p %p 0x%08x %p\n", displays, hwnd, flags, lpvoid); + TRACE("%p %s %p 0x%08x %p\n", displays, debugstr_w(primary_name), hwnd, flags, lpvoid); init_original_display_mode(); diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index ea51cf0f702..4d99fde91f5 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -122,7 +122,7 @@ static inline struct macdrv_thread_data *macdrv_thread_data(void) extern BOOL macdrv_ActivateKeyboardLayout(HKL hkl, UINT flags) DECLSPEC_HIDDEN; extern void macdrv_Beep(void) DECLSPEC_HIDDEN; -extern LONG macdrv_ChangeDisplaySettings(LPDEVMODEW displays, HWND hwnd, DWORD flags, LPVOID lpvoid) DECLSPEC_HIDDEN; +extern LONG macdrv_ChangeDisplaySettings(LPDEVMODEW displays, LPCWSTR primary_name, HWND hwnd, DWORD flags, LPVOID lpvoid) DECLSPEC_HIDDEN; extern BOOL macdrv_GetCurrentDisplaySettings(LPCWSTR name, LPDEVMODEW devmode) DECLSPEC_HIDDEN; extern LRESULT macdrv_ClipboardWindowProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) DECLSPEC_HIDDEN; extern BOOL macdrv_UpdateDisplayDevices( const struct gdi_device_manager *device_manager, diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 2a4a34e2c02..f5a063a5e60 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -390,7 +390,7 @@ static LONG apply_display_settings( DEVMODEW *displays, ULONG_PTR *ids, BOOL do_ * ChangeDisplaySettings (X11DRV.@) * */ -LONG X11DRV_ChangeDisplaySettings( LPDEVMODEW displays, HWND hwnd, DWORD flags, LPVOID lpvoid ) +LONG X11DRV_ChangeDisplaySettings( LPDEVMODEW displays, LPCWSTR primary_name, HWND hwnd, DWORD flags, LPVOID lpvoid ) { INT left_most = INT_MAX, top_most = INT_MAX; LONG count, ret = DISP_CHANGE_BADPARAM; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index f8f8fe3d4d1..0a8e2ac19d7 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -213,7 +213,7 @@ extern void X11DRV_SetCursor( HCURSOR handle ) DECLSPEC_HIDDEN; extern BOOL X11DRV_SetCursorPos( INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL X11DRV_GetCursorPos( LPPOINT pos ) DECLSPEC_HIDDEN; extern BOOL X11DRV_ClipCursor( LPCRECT clip ) DECLSPEC_HIDDEN; -extern LONG X11DRV_ChangeDisplaySettings( LPDEVMODEW displays, HWND hwnd, DWORD flags, LPVOID lpvoid ) DECLSPEC_HIDDEN; +extern LONG X11DRV_ChangeDisplaySettings( LPDEVMODEW displays, LPCWSTR primary_name, HWND hwnd, DWORD flags, LPVOID lpvoid ) DECLSPEC_HIDDEN; extern BOOL X11DRV_GetCurrentDisplaySettings( LPCWSTR name, LPDEVMODEW devmode ) DECLSPEC_HIDDEN; extern BOOL X11DRV_UpdateDisplayDevices( const struct gdi_device_manager *device_manager, BOOL force, void *param ) DECLSPEC_HIDDEN; diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 596d27156af..e238340c76b 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -297,7 +297,7 @@ struct user_driver_funcs LRESULT (*pClipboardWindowProc)(HWND,UINT,WPARAM,LPARAM); void (*pUpdateClipboard)(void); /* display modes */ - LONG (*pChangeDisplaySettings)(LPDEVMODEW,HWND,DWORD,LPVOID); + LONG (*pChangeDisplaySettings)(LPDEVMODEW,LPCWSTR,HWND,DWORD,LPVOID); BOOL (*pGetCurrentDisplaySettings)(LPCWSTR,LPDEVMODEW); BOOL (*pUpdateDisplayDevices)(const struct gdi_device_manager *,BOOL,void*); /* windowing functions */

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2022