January 2023 - Wine-Commits

Francisco Casas : vkd3d-shader/hlsl: Introduce elementwise_intrinsic_float_convert_args().
by Alexandre Julliard Jan. 11, 2023

Jan. 11, 2023

Module: vkd3d Branch: master Commit: 6770ecbdf42b602c1f593f66c880b093691564c8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6770ecbdf42b602c1f593f66c880b… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Dec 13 20:13:56 2022 -0300 vkd3d-shader/hlsl: Introduce elementwise_intrinsic_float_convert_args(). --- libs/vkd3d-shader/hlsl.y | 56 ++++++++++++++++++++---------------------------- 1 file changed, 23 insertions(+), 33 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index c0ec779f..cbc59bc5 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2303,6 +2303,19 @@ static bool elementwise_intrinsic_convert_args(struct hlsl_ctx *ctx, return convert_args(ctx, params, common_type, loc); } +static bool elementwise_intrinsic_float_convert_args(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + struct hlsl_type *type; + + if (!(type = elementwise_intrinsic_get_common_type(ctx, params, loc))) + return false; + + type = hlsl_get_numeric_type(ctx, type->type, HLSL_TYPE_FLOAT, type->dimx, type->dimy); + + return convert_args(ctx, params, type, loc); +} + static bool intrinsic_abs(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -2442,13 +2455,10 @@ static bool intrinsic_ldexp(struct hlsl_ctx *ctx, { struct hlsl_ir_node *arg; - if (!elementwise_intrinsic_convert_args(ctx, params, loc)) + if (!elementwise_intrinsic_float_convert_args(ctx, params, loc)) return false; - if (!(arg = intrinsic_float_convert_arg(ctx, params, params->args[1], loc))) - return false; - - if (!(arg = add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_EXP2, arg, loc))) + if (!(arg = add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_EXP2, params->args[1], loc))) return false; return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MUL, params->args[0], arg, loc); @@ -2482,15 +2492,12 @@ static bool intrinsic_length(struct hlsl_ctx *ctx, static bool intrinsic_lerp(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { - struct hlsl_ir_node *arg, *neg, *add, *mul; - - if (!elementwise_intrinsic_convert_args(ctx, params, loc)) - return false; + struct hlsl_ir_node *neg, *add, *mul; - if (!(arg = intrinsic_float_convert_arg(ctx, params, params->args[0], loc))) + if (!elementwise_intrinsic_float_convert_args(ctx, params, loc)) return false; - if (!(neg = add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_NEG, arg, loc))) + if (!(neg = add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_NEG, params->args[0], loc))) return false; if (!(add = add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_ADD, params->args[1], neg, loc))) @@ -2499,7 +2506,7 @@ static bool intrinsic_lerp(struct hlsl_ctx *ctx, if (!(mul = add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MUL, params->args[2], add, loc))) return false; - return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_ADD, arg, mul, loc); + return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_ADD, params->args[0], mul, loc); } static bool intrinsic_max(struct hlsl_ctx *ctx, @@ -2649,15 +2656,12 @@ static bool intrinsic_normalize(struct hlsl_ctx *ctx, static bool intrinsic_pow(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { - struct hlsl_ir_node *log, *exp, *arg, *mul; - - if (!elementwise_intrinsic_convert_args(ctx, params, loc)) - return false; + struct hlsl_ir_node *log, *exp, *mul; - if (!(arg = intrinsic_float_convert_arg(ctx, params, params->args[0], loc))) + if (!elementwise_intrinsic_float_convert_args(ctx, params, loc)) return false; - if (!(log = hlsl_new_unary_expr(ctx, HLSL_OP1_LOG2, arg, *loc))) + if (!(log = hlsl_new_unary_expr(ctx, HLSL_OP1_LOG2, params->args[0], *loc))) return false; list_add_tail(params->instrs, &log->entry); @@ -2698,28 +2702,14 @@ static bool intrinsic_smoothstep(struct hlsl_ctx *ctx, { struct hlsl_ir_node *min_arg, *max_arg, *x_arg, *p, *p_num, *p_denom, *res; struct hlsl_ir_constant *one, *minus_two, *three; - struct hlsl_type *common_type; - if (!elementwise_intrinsic_convert_args(ctx, params, loc)) + if (!elementwise_intrinsic_float_convert_args(ctx, params, loc)) return false; min_arg = params->args[0]; max_arg = params->args[1]; x_arg = params->args[2]; - common_type = x_arg->data_type; - common_type = hlsl_get_numeric_type(ctx, common_type->type, HLSL_TYPE_FLOAT, common_type->dimx, - common_type->dimy); - - if (!(min_arg = add_implicit_conversion(ctx, params->instrs, min_arg, common_type, loc))) - return false; - - if (!(max_arg = add_implicit_conversion(ctx, params->instrs, max_arg, common_type, loc))) - return false; - - if (!(x_arg = add_implicit_conversion(ctx, params->instrs, x_arg, common_type, loc))) - return false; - if (!(min_arg = add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_NEG, min_arg, loc))) return false;

1 0

Jacek Caban : include: Add stdarg.h header.
by Alexandre Julliard Jan. 10, 2023

Jan. 10, 2023

Module: wine Branch: master Commit: 4d8091cccc46053c605e68eccd27b94ec297f28e URL: https://gitlab.winehq.org/wine/wine/-/commit/4d8091cccc46053c605e68eccd27b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 8 17:52:23 2022 +0100 include: Add stdarg.h header. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54263 --- include/Makefile.in | 1 + include/msvcrt/stdarg.h | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index c24ba7eff07..54cbf4d955c 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -512,6 +512,7 @@ SOURCES = \ msvcrt/setjmp.h \ msvcrt/share.h \ msvcrt/signal.h \ + msvcrt/stdarg.h \ msvcrt/stdbool.h \ msvcrt/stddef.h \ msvcrt/stdint.h \ diff --git a/include/msvcrt/stdarg.h b/include/msvcrt/stdarg.h new file mode 100644 index 00000000000..6c6b6048351 --- /dev/null +++ b/include/msvcrt/stdarg.h @@ -0,0 +1,31 @@ +/* + * Variable argument definitions + * + * Copyright 2022 Jacek Caban + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _INC_STDARG +#define _INC_STDARG + +#include <vadefs.h> + +#define va_start(v,l) _crt_va_start(v,l) +#define va_arg(v,l) _crt_va_arg(v,l) +#define va_end(v) _crt_va_end(v) +#define va_copy(d,s) _crt_va_copy(d,s) + +#endif /* _INC_STDARG */

1 0

Alexandre Julliard : wow64: Initialize win32u syscall table when it is mapped.
by Alexandre Julliard Jan. 10, 2023

Jan. 10, 2023

Module: wine Branch: master Commit: f2a07805b9b027da9a1caaf6023abc90bc950459 URL: https://gitlab.winehq.org/wine/wine/-/commit/f2a07805b9b027da9a1caaf6023abc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 10 15:35:53 2023 +0100 wow64: Initialize win32u syscall table when it is mapped. --- dlls/wow64/syscall.c | 75 +++++++++++++--------------------------------------- 1 file changed, 18 insertions(+), 57 deletions(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 8be5a1c300c..5ba9cd14954 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -88,6 +88,7 @@ SYSTEM_DLL_INIT_BLOCK *pLdrSystemDllInitBlock = NULL; /* wow64win syscall table */ static const SYSTEM_SERVICE_TABLE *psdwhwin32; +static HMODULE win32u_module; /* cpu backend dll functions */ static void * (WINAPI *pBTCpuGetBopCode)(void); @@ -392,17 +393,6 @@ static DWORD get_syscall_num( const BYTE *syscall ) } -/********************************************************************** - * init_image_mapping - */ -void init_image_mapping( HMODULE module ) -{ - void **ptr = RtlFindExportedRoutineByName( module, "Wow64Transition" ); - - if (ptr) *ptr = pBTCpuGetBopCode(); -} - - /********************************************************************** * init_syscall_table */ @@ -467,6 +457,23 @@ static void init_syscall_table( HMODULE module, ULONG idx, const SYSTEM_SERVICE_ } +/********************************************************************** + * init_image_mapping + */ +void init_image_mapping( HMODULE module ) +{ + void **ptr = RtlFindExportedRoutineByName( module, "Wow64Transition" ); + + if (!ptr) return; + *ptr = pBTCpuGetBopCode(); + if (!win32u_module && RtlFindExportedRoutineByName( module, "NtUserInitializeClientPfnArrays" )) + { + win32u_module = module; + init_syscall_table( win32u_module, 1, psdwhwin32 ); + } +} + + /********************************************************************** * load_64bit_module */ @@ -489,48 +496,6 @@ static HMODULE load_64bit_module( const WCHAR *name ) } -/********************************************************************** - * load_32bit_module - */ -static HMODULE load_32bit_module( const WCHAR *name ) -{ - NTSTATUS status; - UNICODE_STRING str; - WCHAR path[MAX_PATH]; - HANDLE file, mapping; - LARGE_INTEGER size; - IO_STATUS_BLOCK io; - OBJECT_ATTRIBUTES attr; - SIZE_T len = 0; - void *module = NULL; - const WCHAR *dir = get_machine_wow64_dir( current_machine ); - - swprintf( path, MAX_PATH, L"%s\\%s", dir, name ); - RtlInitUnicodeString( &str, path ); - InitializeObjectAttributes( &attr, &str, OBJ_CASE_INSENSITIVE, 0, NULL ); - if ((status = NtOpenFile( &file, GENERIC_READ | SYNCHRONIZE, &attr, &io, - FILE_SHARE_READ | FILE_SHARE_DELETE, - FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE ))) goto failed; - - size.QuadPart = 0; - status = NtCreateSection( &mapping, STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | - SECTION_MAP_READ | SECTION_MAP_EXECUTE, - NULL, &size, PAGE_EXECUTE_READ, SEC_IMAGE, file ); - NtClose( file ); - if (status) goto failed; - - status = NtMapViewOfSection( mapping, GetCurrentProcess(), &module, 0, 0, NULL, &len, - ViewShare, 0, PAGE_EXECUTE_READ ); - NtClose( mapping ); - if (!status) return module; - -failed: - ERR( "failed to load dll %lx\n", status ); - NtTerminateProcess( GetCurrentProcess(), status ); - return NULL; -} - - /********************************************************************** * get_cpu_dll_name */ @@ -589,10 +554,6 @@ static DWORD WINAPI process_init( RTL_RUN_ONCE *once, void *param, void **contex *(void **)RtlFindExportedRoutineByName( module, "__wine_syscall_dispatcher" ) = pBTCpuGetBopCode(); *(void **)RtlFindExportedRoutineByName( module, "__wine_unix_call_dispatcher" ) = p__wine_get_unix_opcode(); - module = load_32bit_module( L"win32u.dll" ); - init_syscall_table( module, 1, psdwhwin32 ); - NtUnmapViewOfSection( GetCurrentProcess(), module ); - init_file_redirects(); return TRUE;

1 0

Jacek Caban : include: Add vadefs.h header.
by Alexandre Julliard Jan. 10, 2023

Jan. 10, 2023

Module: wine Branch: master Commit: 4c7e7ccac9f2b33d8685fd830e9468a1599f33fd URL: https://gitlab.winehq.org/wine/wine/-/commit/4c7e7ccac9f2b33d8685fd830e9468… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 8 17:49:24 2022 +0100 include: Add vadefs.h header. Based on mingw-w64. --- include/Makefile.in | 1 + include/msvcrt/vadefs.h | 52 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 23a4265a437..c24ba7eff07 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -527,6 +527,7 @@ SOURCES = \ msvcrt/time.h \ msvcrt/uchar.h \ msvcrt/unistd.h \ + msvcrt/vadefs.h \ msvcrt/wchar.h \ msvcrt/wctype.h \ mswsock.h \ diff --git a/include/msvcrt/vadefs.h b/include/msvcrt/vadefs.h new file mode 100644 index 00000000000..2a612fc055c --- /dev/null +++ b/include/msvcrt/vadefs.h @@ -0,0 +1,52 @@ +/* + * Variable argument definitions + * + * Copyright 2022 Jacek Caban + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _INC_VADEFS +#define _INC_VADEFS + +#ifdef __cplusplus +#define _ADDRESSOF(v) (&reinterpret_cast<const char &>(v)) +#else +#define _ADDRESSOF(v) (&(v)) +#endif + +#if defined(__GNUC__) || defined(__clang__) + +typedef __builtin_va_list va_list; +#define _crt_va_start(v,l) __builtin_va_start(v,l) +#define _crt_va_arg(v,l) __builtin_va_arg(v,l) +#define _crt_va_end(v) __builtin_va_end(v) +#define _crt_va_copy(d,s) __builtin_va_copy(d,s) + +#else + +typedef char *va_list; + +#if defined(__i386__) +#define _INTSIZEOF(n) ((sizeof(n) + sizeof(int) - 1) & ~(sizeof(int) - 1)) +#define _crt_va_start(v,l) ((v) = (va_list)_ADDRESSOF(l) + _INTSIZEOF(l)) +#define _crt_va_arg(v,l) (*(l *)(((v) += _INTSIZEOF(l)) - _INTSIZEOF(l))) +#define _crt_va_end(v) ((v) = (va_list)0) +#define _crt_va_copy(d,s) ((d) = (s)) +#endif + +#endif + +#endif /* _INC_VADEFS */

1 0

Paul Gofman : dwmapi: Fill qpcVBlank in DwmGetCompositionTimingInfo().
by Alexandre Julliard Jan. 10, 2023

Jan. 10, 2023

Module: wine Branch: master Commit: 62fa96df16a0285cce1694ce47eef946f75bfd42 URL: https://gitlab.winehq.org/wine/wine/-/commit/62fa96df16a0285cce1694ce47eef9… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jan 9 15:53:32 2023 -0600 dwmapi: Fill qpcVBlank in DwmGetCompositionTimingInfo(). --- dlls/dwmapi/dwmapi_main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 56730f79cac..9ec03185f36 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -235,7 +235,7 @@ static int get_display_frequency(void) */ HRESULT WINAPI DwmGetCompositionTimingInfo(HWND hwnd, DWM_TIMING_INFO *info) { - LARGE_INTEGER performance_frequency; + LARGE_INTEGER performance_frequency, qpc; static int i, display_frequency; if (!info) @@ -258,6 +258,9 @@ HRESULT WINAPI DwmGetCompositionTimingInfo(HWND hwnd, DWM_TIMING_INFO *info) QueryPerformanceFrequency(&performance_frequency); info->qpcRefreshPeriod = performance_frequency.QuadPart / display_frequency; + QueryPerformanceCounter(&qpc); + info->qpcVBlank = (qpc.QuadPart / info->qpcRefreshPeriod) * info->qpcRefreshPeriod; + return S_OK; }

1 0

Stefan Dösinger : wined3d: Clamp the bound buffer range to the buffer size.
by Alexandre Julliard Jan. 10, 2023

Jan. 10, 2023

Module: wine Branch: master Commit: 09cafcc3b6eff3b046d3c08f64d9c1fb9ce54c47 URL: https://gitlab.winehq.org/wine/wine/-/commit/09cafcc3b6eff3b046d3c08f64d9c1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 4 11:16:14 2023 +0300 wined3d: Clamp the bound buffer range to the buffer size. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53671 --- dlls/wined3d/state.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index eb25f01130e..a6d0b174e31 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4618,7 +4618,9 @@ static void state_cb(struct wined3d_context *context, const struct wined3d_state buffer = buffer_state->buffer; bo_gl = wined3d_bo_gl(buffer->buffer_object); GL_EXTCALL(glBindBufferRange(GL_UNIFORM_BUFFER, base + i, - bo_gl->id, bo_gl->b.buffer_offset + buffer_state->offset, buffer_state->size)); + bo_gl->id, bo_gl->b.buffer_offset + buffer_state->offset, + min(buffer_state->size, buffer->resource.size - buffer_state->offset))); + buffer->bo_user.valid = true; } checkGLcall("bind constant buffers");

1 0

Gabriel Ivăncescu : winex11.drv: Obtain icon info for icons passed to fetch_icon_data().
by Alexandre Julliard Jan. 9, 2023

Jan. 9, 2023

Module: wine Branch: master Commit: 95b96a4a84c9038e788a2fd888b0a669ebb4a3a1 URL: https://gitlab.winehq.org/wine/wine/-/commit/95b96a4a84c9038e788a2fd888b0a6… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Jan 9 17:22:16 2023 +0200 winex11.drv: Obtain icon info for icons passed to fetch_icon_data(). SetWindowIcon can pass an icon as a parameter, but in that case NtUserGetIconInfo is never called, so the icon info is never filled. Fixes a regression introduced by 3eb944c0a7a1b4857cb0b74d04a8450b636c98de. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/winex11.drv/window.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 603314ff3bb..98b0b23e103 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -625,6 +625,7 @@ static void fetch_icon_data( HWND hwnd, HICON icon_big, HICON icon_small ) unsigned long *bits; Pixmap icon_pixmap, mask_pixmap; + icon_big = get_icon_info( icon_big, &ii ); if (!icon_big) { icon_big = get_icon_info( (HICON)send_message( hwnd, WM_GETICON, ICON_BIG, 0 ), &ii ); @@ -637,6 +638,8 @@ static void fetch_icon_data( HWND hwnd, HICON icon_big, HICON icon_small ) icon_big = get_icon_info( icon_big, &ii ); } } + + icon_small = get_icon_info( icon_small, &ii_small ); if (!icon_small) { icon_small = get_icon_info( (HICON)send_message( hwnd, WM_GETICON, ICON_SMALL, 0 ), &ii_small );

1 0

Eric Pouech : comctl32/tests: Retry when opening the clipboard.
by Alexandre Julliard Jan. 9, 2023

Jan. 9, 2023

Module: wine Branch: master Commit: e9a32c6a8d472756595b6d07e97364ccc73a84a1 URL: https://gitlab.winehq.org/wine/wine/-/commit/e9a32c6a8d472756595b6d07e97364… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Jan 9 09:31:05 2023 +0100 comctl32/tests: Retry when opening the clipboard. As the clipboard is a shared resource, we cannot expect that no other app hasn't openeded it. So wrap clipboard access with a retry feature in case of failure. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/comctl32/tests/edit.c | 35 ++++++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index 23caf877aa5..fae3091533b 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -72,6 +72,35 @@ static void flush_events(void) } } +static BOOL open_clipboard(HWND hwnd) +{ + DWORD start = GetTickCount(); + while (1) + { + BOOL ret = OpenClipboard(hwnd); + if (ret || GetLastError() != ERROR_ACCESS_DENIED) + return ret; + if (GetTickCount() - start > 100) + { + char classname[256]; + DWORD le = GetLastError(); + HWND clipwnd = GetOpenClipboardWindow(); + /* Provide a hint as to the source of interference: + * - The class name would typically be CLIPBRDWNDCLASS if the + * clipboard was opened by a Windows application using the + * ole32 API. + * - And it would be __wine_clipboard_manager if it was opened in + * response to a native application. + */ + GetClassNameA(clipwnd, classname, ARRAY_SIZE(classname)); + trace("%p (%s) opened the clipboard\n", clipwnd, classname); + SetLastError(le); + return ret; + } + Sleep(15); + } +} + static INT_PTR CALLBACK multi_edit_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) { static int num_ok_commands = 0; @@ -2264,7 +2293,7 @@ static void test_espassword(void) ok(r == strlen(password), "Expected: %s, got len %ld\n", password, r); ok(strcmp(buffer, password) == 0, "expected %s, got %s\n", password, buffer); - r = OpenClipboard(hwEdit); + r = open_clipboard(hwEdit); ok(r == TRUE, "expected %d, got %ld\n", TRUE, r); r = EmptyClipboard(); ok(r == TRUE, "expected %d, got %ld\n", TRUE, r); @@ -3237,7 +3266,7 @@ static void test_paste(void) strcpy(buffer, str); GlobalUnlock(hmem); - r = OpenClipboard(hEdit); + r = open_clipboard(hEdit); ok(r == TRUE, "expected %d, got %d\n", TRUE, r); r = EmptyClipboard(); ok(r == TRUE, "expected %d, got %d\n", TRUE, r); @@ -3260,7 +3289,7 @@ static void test_paste(void) strcpy(buffer, str2); GlobalUnlock(hmem); - r = OpenClipboard(hEdit); + r = open_clipboard(hEdit); ok(r == TRUE, "expected %d, got %d\n", TRUE, r); r = EmptyClipboard(); ok(r == TRUE, "expected %d, got %d\n", TRUE, r);

1 0

Eric Pouech : user32/tests: Fix failing WM_PASTE tests for edit control on Win10+.
by Alexandre Julliard Jan. 9, 2023

Jan. 9, 2023

Module: wine Branch: master Commit: ce78e293fd10bdd4f2dcf5c1df3c4b4a6beed430 URL: https://gitlab.winehq.org/wine/wine/-/commit/ce78e293fd10bdd4f2dcf5c1df3c4b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Jan 9 09:31:04 2023 +0100 user32/tests: Fix failing WM_PASTE tests for edit control on Win10+. There are cases in Windows10+ where the WM_PASTE message doesn't paste the content of the clipboard. This appeared in testing: - almost always just after (for a couple of milliseconds) setting new content into the clipboard and closing it. - in some unrelated rare occasions (like once for 400 runs). It looks like another (installed) process had opened the clipboard and forbids the paste command. As WM_PASTE doesn't return success/error status, workaround it by wrapping the WM_PASTE command into a helper, and retry when the clipboard's content hasn't been pasted. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53276 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/user32/tests/edit.c | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 1918d1c10e9..b70cf2d6e06 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -3204,12 +3204,32 @@ static void test_EM_GETHANDLE(void) DestroyWindow(hEdit); } +/* In Windows 10+, the WM_PASTE message isn't always successful. + * So retry in case of failure. + */ +#define check_paste(a, b) _check_paste(__LINE__, (a), (b)) +static void _check_paste(unsigned int line, HWND hedit, const char *content) +{ + /* only retry on windows platform */ + int tries = strcmp(winetest_platform, "wine") ? 3 : 1; + int len = 0; + + SendMessageA(hedit, WM_SETTEXT, 0, (LPARAM)""); + do + { + SendMessageA(hedit, WM_PASTE, 0, 0); + if ((len = SendMessageA(hedit, WM_GETTEXTLENGTH, 0, 0))) break; + Sleep(1); + } while (--tries > 0); + ok_(__FILE__, line)(len == strlen(content), "Unexpected len %u in edit\n", len); +} + static void test_paste(void) { HWND hEdit, hMultilineEdit; HANDLE hmem, hmem_ret; char *buffer; - int r, len; + int r; static const char *str = "this is a simple text"; static const char *str2 = "first line\r\nsecond line"; @@ -3234,10 +3254,7 @@ static void test_paste(void) ok(r == TRUE, "expected %d, got %d\n", TRUE, r); /* Paste single line */ - SendMessageA(hEdit, WM_SETTEXT, 0, (LPARAM)""); - r = SendMessageA(hEdit, WM_PASTE, 0, 0); - len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); - ok(strlen(str) == len, "got %d\n", len); + check_paste(hEdit, str); /* Prepare clipboard data with multiline text */ hmem = GlobalAlloc(GMEM_MOVEABLE, 255); @@ -3257,16 +3274,10 @@ static void test_paste(void) ok(r == TRUE, "expected %d, got %d\n", TRUE, r); /* Paste multiline text in singleline edit - should be cut */ - SendMessageA(hEdit, WM_SETTEXT, 0, (LPARAM)""); - r = SendMessageA(hEdit, WM_PASTE, 0, 0); - len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); - ok(strlen("first line") == len, "got %d\n", len); + check_paste(hEdit, "first line"); /* Paste multiline text in multiline edit */ - SendMessageA(hMultilineEdit, WM_SETTEXT, 0, (LPARAM)""); - r = SendMessageA(hMultilineEdit, WM_PASTE, 0, 0); - len = SendMessageA(hMultilineEdit, WM_GETTEXTLENGTH, 0, 0); - ok(strlen(str2) == len, "got %d\n", len); + check_paste(hMultilineEdit, str2); /* Cleanup */ DestroyWindow(hEdit);

1 0

Eric Pouech : comctl32/tests: Fix failing WM_PASTE tests for edit control on Win10+.
by Alexandre Julliard Jan. 9, 2023

Jan. 9, 2023

Module: wine Branch: master Commit: ee5cdea92206050776753c6ac49cc156407be7ad URL: https://gitlab.winehq.org/wine/wine/-/commit/ee5cdea92206050776753c6ac49cc1… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Jan 9 09:31:07 2023 +0100 comctl32/tests: Fix failing WM_PASTE tests for edit control on Win10+. There are cases in Windows10+ where the WM_PASTE message doesn't paste the content of the clipboard. This appeared in testing: - almost always just after (for a couple of milliseconds) setting new content into the clipboard and closing it. - in some unrelated rare occasions (like once for 400 runs). It looks like another (installed) process had opened the clipboard and forbids the paste command. As WM_PASTE doesn't return success/error status, workaround it by wrapping the WM_PASTE command into a helper, and retry when the clipboard's content hasn't been pasted. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53276 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53277 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/comctl32/tests/edit.c | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index fae3091533b..f45b898dc12 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -3246,6 +3246,26 @@ static void test_EM_GETHANDLE(void) DestroyWindow(hEdit); } +/* In Windows 10+, the WM_PASTE message isn't always successful. + * So retry in case of failure. + */ +#define check_paste(a, b) _check_paste(__LINE__, (a), (b)) +static void _check_paste(unsigned int line, HWND hedit, const char *content) +{ + /* only retry on windows platform */ + int tries = strcmp(winetest_platform, "wine") ? 3 : 1; + int len = 0; + + SendMessageA(hedit, WM_SETTEXT, 0, (LPARAM)""); + do + { + SendMessageA(hedit, WM_PASTE, 0, 0); + if ((len = SendMessageA(hedit, WM_GETTEXTLENGTH, 0, 0))) break; + Sleep(1); + } while (--tries > 0); + ok_(__FILE__, line)(len == strlen(content), "Unexpected len %u in edit\n", len); +} + static void test_paste(void) { static const char *str = "this is a simple text"; @@ -3253,7 +3273,7 @@ static void test_paste(void) HWND hEdit, hMultilineEdit; HANDLE hmem, hmem_ret; char *buffer; - int r, len; + int r; hEdit = create_editcontrol(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); hMultilineEdit = create_editcontrol(ES_AUTOHSCROLL | ES_AUTOVSCROLL | ES_MULTILINE, 0); @@ -3276,10 +3296,7 @@ static void test_paste(void) ok(r == TRUE, "expected %d, got %d\n", TRUE, r); /* Paste single line */ - SendMessageA(hEdit, WM_SETTEXT, 0, (LPARAM)""); - r = SendMessageA(hEdit, WM_PASTE, 0, 0); - len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); - ok(strlen(str) == len, "got %d\n", len); + check_paste(hEdit, str); /* Prepare clipboard data with multiline text */ hmem = GlobalAlloc(GMEM_MOVEABLE, 255); @@ -3300,15 +3317,10 @@ static void test_paste(void) /* Paste multiline text in singleline edit - should be cut */ SendMessageA(hEdit, WM_SETTEXT, 0, (LPARAM)""); - r = SendMessageA(hEdit, WM_PASTE, 0, 0); - len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); - ok(strlen("first line") == len, "got %d\n", len); + check_paste(hEdit, "first line"); /* Paste multiline text in multiline edit */ - SendMessageA(hMultilineEdit, WM_SETTEXT, 0, (LPARAM)""); - r = SendMessageA(hMultilineEdit, WM_PASTE, 0, 0); - len = SendMessageA(hMultilineEdit, WM_GETTEXTLENGTH, 0, 0); - ok(strlen(str2) == len, "got %d\n", len); + check_paste(hMultilineEdit, str2); /* Cleanup */ DestroyWindow(hEdit);

1 0