- Wine-Commits - list.winehq.org

Henri Verbeet : vkd3d-shader/glsl: Update the current source location in vkd3d_glsl_generator_generate().
by Alexandre Julliard March 13, 2023

March 13, 2023

Module: vkd3d Branch: master Commit: 0a73c75db80ab1b4e27b3526bd02cd4118f890c5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0a73c75db80ab1b4e27b3526bd02c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Feb 26 04:04:58 2023 +0100 vkd3d-shader/glsl: Update the current source location in vkd3d_glsl_generator_generate(). Since the introduction of instruction arrays, the parser location no longer matches the location of the current instruction. Ultimately we'll likely want to add some kind of explicit location information to struct vkd3d_shader_instruction_array, because we might do transformations that change the order of the original instructions. --- libs/vkd3d-shader/glsl.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/glsl.c b/libs/vkd3d-shader/glsl.c index 1fe3f258..f8d68b5a 100644 --- a/libs/vkd3d-shader/glsl.c +++ b/libs/vkd3d-shader/glsl.c @@ -22,7 +22,7 @@ struct vkd3d_glsl_generator { struct vkd3d_shader_version version; struct vkd3d_string_buffer buffer; - const struct vkd3d_shader_location *location; + struct vkd3d_shader_location location; struct vkd3d_shader_message_context *message_context; bool failed; }; @@ -38,7 +38,7 @@ struct vkd3d_glsl_generator *vkd3d_glsl_generator_create(const struct vkd3d_shad memset(generator, 0, sizeof(*generator)); generator->version = *version; vkd3d_string_buffer_init(&generator->buffer); - generator->location = location; + generator->location = *location; generator->message_context = message_context; return generator; } @@ -50,7 +50,7 @@ static void VKD3D_PRINTF_FUNC(3, 4) vkd3d_glsl_compiler_error( va_list args; va_start(args, fmt); - vkd3d_shader_verror(generator->message_context, generator->location, error, fmt, args); + vkd3d_shader_verror(generator->message_context, &generator->location, error, fmt, args); va_end(args); generator->failed = true; } @@ -99,8 +99,10 @@ int vkd3d_glsl_generator_generate(struct vkd3d_glsl_generator *generator, vkd3d_string_buffer_printf(&generator->buffer, "#version 440\n\n"); vkd3d_string_buffer_printf(&generator->buffer, "void main()\n{\n"); + generator->location.column = 0; for (i = 0; i < parser->instructions.count; ++i) { + generator->location.line = i + 1; vkd3d_glsl_handle_instruction(generator, &parser->instructions.elements[i]); }

1 0

Henri Verbeet : vkd3d-shader/spirv: Update the current source location in spirv_compiler_generate_spirv().
by Alexandre Julliard March 13, 2023

March 13, 2023

Module: vkd3d Branch: master Commit: 8509ec1e72cbd987a5809cf86bcc1baa64023d81 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8509ec1e72cbd987a5809cf86bcc1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 13 16:32:16 2023 +0100 vkd3d-shader/spirv: Update the current source location in spirv_compiler_generate_spirv(). --- libs/vkd3d-shader/spirv.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index beee1548..982aabf9 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2223,7 +2223,7 @@ struct spirv_compiler struct vkd3d_spirv_builder spirv_builder; struct vkd3d_shader_message_context *message_context; - const struct vkd3d_shader_location *location; + struct vkd3d_shader_location location; bool failed; bool strip_debug; @@ -2323,7 +2323,7 @@ struct spirv_compiler *spirv_compiler_create(const struct vkd3d_shader_version * memset(compiler, 0, sizeof(*compiler)); compiler->message_context = message_context; - compiler->location = location; + compiler->location = *location; if ((target_info = vkd3d_find_struct(compile_info->next, SPIRV_TARGET_INFO))) { @@ -2566,7 +2566,7 @@ static void VKD3D_PRINTF_FUNC(3, 4) spirv_compiler_error(struct spirv_compiler * va_list args; va_start(args, format); - vkd3d_shader_verror(compiler->message_context, compiler->location, error, format, args); + vkd3d_shader_verror(compiler->message_context, &compiler->location, error, format, args); va_end(args); compiler->failed = true; } @@ -9959,8 +9959,10 @@ int spirv_compiler_generate_spirv(struct spirv_compiler *compiler, enum vkd3d_result result = VKD3D_OK; unsigned int i; + compiler->location.column = 0; for (i = 0; i < instructions->count; ++i) { + compiler->location.line = i + 1; if ((result = spirv_compiler_handle_instruction(compiler, &instructions->elements[i])) < 0) return result; }

1 0

Rémi Bernon : imm32: Rename input context immKbd to ime.
by Alexandre Julliard March 13, 2023

March 13, 2023

Module: wine Branch: master Commit: 4e7aa4fb6a9b890751c419d5f2416f6031bdf8b5 URL: https://gitlab.winehq.org/wine/wine/-/commit/4e7aa4fb6a9b890751c419d5f2416f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 21 17:07:29 2023 +0100 imm32: Rename input context immKbd to ime. --- dlls/imm32/imm.c | 83 ++++++++++++++++++++++++++------------------------------ 1 file changed, 39 insertions(+), 44 deletions(-)

1 0

Rémi Bernon : imm32: Move IMM_FreeThreadData helper around.
by Alexandre Julliard March 13, 2023

March 13, 2023

Module: wine Branch: master Commit: 0b34236dfdc41f71b52398a15dc7e457bbf451ff URL: https://gitlab.winehq.org/wine/wine/-/commit/0b34236dfdc41f71b52398a15dc7e4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 21 17:03:45 2023 +0100 imm32: Move IMM_FreeThreadData helper around. --- dlls/imm32/imm.c | 63 +++++++++++++++++++++++++++----------------------------- 1 file changed, 30 insertions(+), 33 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index c09e51e9d6a..3b793b8e69d 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -421,39 +421,6 @@ static InputContextData *query_imc_data(HIMC handle) return ret && ret->handle == handle ? ret : NULL; } -static BOOL free_input_context_data(HIMC hIMC) -{ - InputContextData *data = query_imc_data(hIMC); - - if (!data) - return FALSE; - - TRACE("Destroying %p\n", hIMC); - - data->immKbd->uSelected--; - data->immKbd->pImeSelect(hIMC, FALSE); - SendMessageW(data->IMC.hWnd, WM_IME_SELECT, FALSE, (LPARAM)data->immKbd); - - ImmDestroyIMCC(data->IMC.hCompStr); - ImmDestroyIMCC(data->IMC.hCandInfo); - ImmDestroyIMCC(data->IMC.hGuideLine); - ImmDestroyIMCC(data->IMC.hPrivate); - ImmDestroyIMCC(data->IMC.hMsgBuf); - - HeapFree(GetProcessHeap(), 0, data); - - return TRUE; -} - -static void IMM_FreeThreadData(void) -{ - struct coinit_spy *spy; - - free_input_context_data(UlongToHandle(NtUserGetThreadInfo()->default_imc)); - if ((spy = get_thread_coinit_spy())) - IInitializeSpy_Release(&spy->IInitializeSpy_iface); -} - static HMODULE load_graphics_driver(void) { static const WCHAR key_pathW[] = L"System\\CurrentControlSet\\Control\\Video\\{"; @@ -556,6 +523,36 @@ failed: return NULL; } +static BOOL free_input_context_data( HIMC hIMC ) +{ + InputContextData *data = query_imc_data( hIMC ); + + if (!data) return FALSE; + + TRACE( "Destroying %p\n", hIMC ); + + data->immKbd->uSelected--; + data->immKbd->pImeSelect( hIMC, FALSE ); + SendMessageW( data->IMC.hWnd, WM_IME_SELECT, FALSE, (LPARAM)data->immKbd ); + + ImmDestroyIMCC( data->IMC.hCompStr ); + ImmDestroyIMCC( data->IMC.hCandInfo ); + ImmDestroyIMCC( data->IMC.hGuideLine ); + ImmDestroyIMCC( data->IMC.hPrivate ); + ImmDestroyIMCC( data->IMC.hMsgBuf ); + + HeapFree( GetProcessHeap(), 0, data ); + + return TRUE; +} + +static void IMM_FreeThreadData(void) +{ + struct coinit_spy *spy; + + free_input_context_data( UlongToHandle( NtUserGetThreadInfo()->default_imc ) ); + if ((spy = get_thread_coinit_spy())) IInitializeSpy_Release( &spy->IInitializeSpy_iface ); +} static void IMM_FreeAllImmHkl(void) {

1 0

Rémi Bernon : imm32: Fail to load IME on any missing entry.
by Alexandre Julliard March 13, 2023

March 13, 2023

Module: wine Branch: master Commit: 84cec42e62c24a87298b209b53dcf1ff8a6ad626 URL: https://gitlab.winehq.org/wine/wine/-/commit/84cec42e62c24a87298b209b53dcf1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 21 14:10:59 2023 +0100 imm32: Fail to load IME on any missing entry. Testing shows that this is what native does. --- dlls/imm32/imm.c | 124 +++++++++++++++++++++++++++---------------------------- 1 file changed, 60 insertions(+), 64 deletions(-)

1 0

Rémi Bernon : imm32: Return early if IMM_GetImmHkl fails.
by Alexandre Julliard March 13, 2023

March 13, 2023

Module: wine Branch: master Commit: 245465ba1ddb9b5ad1bd36df047547a332fb7c50 URL: https://gitlab.winehq.org/wine/wine/-/commit/245465ba1ddb9b5ad1bd36df047547… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 21 14:39:39 2023 +0100 imm32: Return early if IMM_GetImmHkl fails. --- dlls/imm32/imm.c | 132 +++++++++++++++++++++++++------------------------------ 1 file changed, 60 insertions(+), 72 deletions(-)

1 0

Alex Henrie : wldap32: Add ldap_set_dbg_flags stub.
by Alexandre Julliard March 13, 2023

March 13, 2023

Module: wine Branch: master Commit: 6ed4a2e40e6d40d0569bbd9c57e17dca5ed12007 URL: https://gitlab.winehq.org/wine/wine/-/commit/6ed4a2e40e6d40d0569bbd9c57e17d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Mar 11 15:17:18 2023 -0700 wldap32: Add ldap_set_dbg_flags stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54663 --- dlls/wldap32/misc.c | 9 +++++++++ dlls/wldap32/wldap32.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/wldap32/misc.c b/dlls/wldap32/misc.c index f515698d095..8c61d618bc9 100644 --- a/dlls/wldap32/misc.c +++ b/dlls/wldap32/misc.c @@ -446,6 +446,15 @@ ULONG CDECL WLDAP32_ldap_result( LDAP *ld, ULONG msgid, ULONG all, struct l_time return ret; } +/*********************************************************************** + * ldap_set_dbg_flags (WLDAP32.@) + */ +ULONG CDECL ldap_set_dbg_flags( ULONG flags ) +{ + FIXME( "(0x%lx) stub\n", flags ); + return 0; +} + /*********************************************************************** * LdapUnicodeToUTF8 (WLDAP32.@) */ diff --git a/dlls/wldap32/wldap32.spec b/dlls/wldap32/wldap32.spec index 33e630dea87..7a23a1b0f22 100644 --- a/dlls/wldap32/wldap32.spec +++ b/dlls/wldap32/wldap32.spec @@ -185,7 +185,7 @@ 195 cdecl ldap_search_ext_s(ptr str long str ptr long ptr ptr ptr long ptr) ldap_search_ext_sA 196 cdecl ldap_search_ext_sA(ptr str long str ptr long ptr ptr ptr long ptr) 197 cdecl ldap_escape_filter_element(str long ptr long) ldap_escape_filter_elementA -198 stub ldap_set_dbg_flags +198 cdecl ldap_set_dbg_flags(long) 199 stub ldap_set_dbg_routine 200 cdecl ldap_memfree(ptr) ldap_memfreeA 201 cdecl ldap_startup(ptr ptr)

1 0

Evan Tang : kernel32/tests: Fix tls callback tests on Windows 7.
by Alexandre Julliard March 13, 2023

March 13, 2023

Module: wine Branch: master Commit: a7b49b0e86502125214c3672f56ecda7845dcb0d URL: https://gitlab.winehq.org/wine/wine/-/commit/a7b49b0e86502125214c3672f56ecd… Author: Evan Tang <etang(a)codeweavers.com> Date: Fri Mar 10 20:39:38 2023 -0600 kernel32/tests: Fix tls callback tests on Windows 7. Also add a few more so the full set of callbacks is tested. Fixes: 2203a8564c5faba383a3512f8244dba12d79da16 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54657 --- dlls/kernel32/tests/loader.c | 72 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 56 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 90e6d09740a..19f112efcd8 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -2144,6 +2144,19 @@ static void check_tls_index(HANDLE dll, BOOL tls_initialized) ok(found_dll, "Couldn't find dll %p in module list\n", dll); } +static int tls_init_fn_output; + +static DWORD WINAPI tls_thread_fn(void* tlsidx_v) +{ + int tls_index = (int)(DWORD_PTR)(tlsidx_v); + const char* str = ((char **)NtCurrentTeb()->ThreadLocalStoragePointer)[tls_index]; + ok( !strcmp( str, "hello world" ), "wrong tls data '%s' at %p\n", str, str ); + ok( tls_init_fn_output == DLL_THREAD_ATTACH, + "tls init function didn't run or got wrong reason: %d instead of %d\n", tls_init_fn_output, DLL_THREAD_ATTACH ); + tls_init_fn_output = 9999; + return 0; +} + static void test_import_resolution(void) { char temp_path[MAX_PATH]; @@ -2165,31 +2178,41 @@ static void test_import_resolution(void) char tls_data[16]; SHORT tls_index; SHORT tls_index_hi; - UCHAR tls_init_fn[64]; /* Note: Uses rip-relative address of tls_index, don't separate */ + int* tls_init_fn_output; + UCHAR tls_init_fn[64]; /* Note: Uses rip-relative address of tls_init_fn_output, don't separate */ + UCHAR entry_point_fn[16]; } data, *ptr; IMAGE_NT_HEADERS nt; IMAGE_SECTION_HEADER section; - int test; + int test, tls_index_save; #if defined(__i386__) static const UCHAR tls_init_code[] = { - 0xE8, 0x00, 0x00, 0x00, 0x00, /* call 1f */ - 0x59, /* 1: pop ecx */ - 0x8B, 0x49, 0xF7, /* mov ecx, [ecx - 9] ; mov ecx, [tls_index] */ - 0x64, 0x8B, 0x15, 0x2C, 0x00, 0x00, 0x00, /* mov edx, fs:0x2c */ - 0x8B, 0x14, 0x8A, /* mov edx, [edx + edx * 4] */ - 0xC6, 0x42, 0x05, 0x21, /* mov byte [edx + 5], 0x21 */ - 0xC2, 0x0C, 0x00, /* ret 12 */ + 0xE8, 0x00, 0x00, 0x00, 0x00, /* call 1f */ + 0x59, /* 1: pop ecx */ + 0x8B, 0x49, 0xF7, /* mov ecx, [ecx - 9] ; mov ecx, [tls_init_fn_output] */ + 0x8B, 0x54, 0x24, 0x08, /* mov edx, [esp + 8] */ + 0x89, 0x11, /* mov [ecx], edx */ + 0xB8, 0x01, 0x00, 0x00, 0x00, /* mov eax, 1 */ + 0xC2, 0x0C, 0x00, /* ret 12 */ + }; + static const UCHAR entry_point_code[] = { + 0xB8, 0x01, 0x00, 0x00, 0x00, /* mov eax, 1 */ + 0xC2, 0x0C, 0x00, /* ret 12 */ }; #elif defined(__x86_64__) static const UCHAR tls_init_code[] = { - 0x8B, 0x0D, 0xF6, 0xFF, 0xFF, 0xFF, /* mov ecx, [rip + tls_index] */ - 0x65, 0x48, 0x8B, 0x14, 0x25, 0x58, 0x00, 0x00, 0x00, /* mov rdx, gs:0x58 */ - 0x48, 0x8B, 0x14, 0xCA, /* mov rdx, [rdx + rcx * 8] */ - 0xC6, 0x42, 0x05, 0x21, /* mov byte [rdx + 5], 0x21 */ - 0xC3, /* ret */ + 0x48, 0x8B, 0x0D, 0xF1, 0xFF, 0xFF, 0xFF, /* mov rcx, [rip + tls_init_fn_output] */ + 0x89, 0x11, /* mov [rcx], edx */ + 0xB8, 0x01, 0x00, 0x00, 0x00, /* mov eax, 1 */ + 0xC3, /* ret */ + }; + static const UCHAR entry_point_code[] = { + 0xB8, 0x01, 0x00, 0x00, 0x00, /* mov eax, 1 */ + 0xC3, /* ret */ }; #else static const UCHAR tls_init_code[] = { 0x00 }; + static const UCHAR entry_point_code[] = { 0x00 }; #endif for (test = 0; test < 4; test++) @@ -2230,10 +2253,16 @@ static void test_import_resolution(void) if (test == 3 && sizeof(tls_init_code) > 1) { + /* Windows doesn't consistently call tls init functions on dlls without entry points */ assert(sizeof(tls_init_code) <= sizeof(data.tls_init_fn)); + assert(sizeof(entry_point_code) <= sizeof(data.entry_point_fn)); memcpy(data.tls_init_fn, tls_init_code, sizeof(tls_init_code)); + memcpy(data.entry_point_fn, entry_point_code, sizeof(entry_point_code)); + tls_init_fn_output = 9999; + data.tls_init_fn_output = &tls_init_fn_output; data.tls_init_fn_list[0] = nt.OptionalHeader.ImageBase + DATA_RVA(&data.tls_init_fn); data.tls.AddressOfCallBacks = nt.OptionalHeader.ImageBase + DATA_RVA(&data.tls_init_fn_list); + nt.OptionalHeader.AddressOfEntryPoint = DATA_RVA(&data.entry_point_fn); } GetTempPathA(MAX_PATH, temp_path); @@ -2315,16 +2344,27 @@ static void test_import_resolution(void) ok( mod != NULL, "failed to load err %lu\n", GetLastError() ); if (!mod) break; ptr = (struct imports *)((char *)mod + page_size); + tls_index_save = ptr->tls_index; ok( ptr->tls_index < 32 || broken(ptr->tls_index == 9999), /* before vista */ "wrong tls index %d\n", ptr->tls_index ); if (ptr->tls_index != 9999 && sizeof(tls_init_code) > 1) { - /* tls init function will write an '!' over the space in "hello world" */ str = ((char **)NtCurrentTeb()->ThreadLocalStoragePointer)[ptr->tls_index]; - ok( !strcmp( str, "hello!world" ), "wrong tls data '%s' at %p\n", str, str ); + ok( !strcmp( str, "hello world" ), "wrong tls data '%s' at %p\n", str, str ); + /* tls init function will write the reason to *tls_init_fn_output */ + ok( tls_init_fn_output == DLL_PROCESS_ATTACH, + "tls init function didn't run or got wrong reason: %d instead of %d\n", tls_init_fn_output, DLL_PROCESS_ATTACH ); + tls_init_fn_output = 9999; + WaitForSingleObject(CreateThread(NULL, 0, tls_thread_fn, (void*)(DWORD_PTR)ptr->tls_index, 0, NULL), INFINITE); + ok( tls_init_fn_output == DLL_THREAD_DETACH, + "tls init function didn't run or got wrong reason: %d instead of %d\n", tls_init_fn_output, DLL_THREAD_DETACH ); } check_tls_index(mod, ptr->tls_index != 9999); + tls_init_fn_output = 9999; FreeLibrary( mod ); + if (tls_index_save != 9999 && sizeof(tls_init_code) > 1) + ok( tls_init_fn_output == DLL_PROCESS_DETACH, + "tls init function didn't run or got wrong reason: %d instead of %d\n", tls_init_fn_output, DLL_PROCESS_DETACH ); } DeleteFileA( dll_name ); #undef DATA_RVA

1 0

Rémi Bernon : imm32: Avoid casts when calling into A/W IME.
by Alexandre Julliard March 13, 2023

March 13, 2023

Module: wine Branch: master Commit: 1ac7125813ca37e88da618695bd78d0bf88d7bb4 URL: https://gitlab.winehq.org/wine/wine/-/commit/1ac7125813ca37e88da618695bd78d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 21 17:25:39 2023 +0100 imm32: Avoid casts when calling into A/W IME. --- dlls/imm32/imm.c | 50 +++++++++++++++++++++++--------------------------- 1 file changed, 23 insertions(+), 27 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 634c4ff472c..a31e89d00c2 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -63,7 +63,7 @@ struct ime HWND UIWnd; /* Function Pointers */ - BOOL (WINAPI *pImeInquire)(IMEINFO *, WCHAR *, DWORD); + BOOL (WINAPI *pImeInquire)(IMEINFO *, void *, DWORD); BOOL (WINAPI *pImeConfigure)(HKL, HWND, DWORD, void *); BOOL (WINAPI *pImeDestroy)(UINT); LRESULT (WINAPI *pImeEscape)(HIMC, UINT, void *); @@ -71,14 +71,14 @@ struct ime BOOL (WINAPI *pImeSetActiveContext)(HIMC, BOOL); UINT (WINAPI *pImeToAsciiEx)(UINT, UINT, const BYTE *, TRANSMSGLIST *, UINT, HIMC); BOOL (WINAPI *pNotifyIME)(HIMC, DWORD, DWORD, DWORD); - BOOL (WINAPI *pImeRegisterWord)(const WCHAR *, DWORD, const WCHAR *); - BOOL (WINAPI *pImeUnregisterWord)(const WCHAR *, DWORD, const WCHAR *); - UINT (WINAPI *pImeEnumRegisterWord)(REGISTERWORDENUMPROCW, const WCHAR *, DWORD, const WCHAR *, void *); - BOOL (WINAPI *pImeSetCompositionString)(HIMC, DWORD, const void *, DWORD, const void *, DWORD); - DWORD (WINAPI *pImeConversionList)(HIMC, const WCHAR *, CANDIDATELIST *, DWORD, UINT); - BOOL (WINAPI *pImeProcessKey)(HIMC, UINT, LPARAM, const BYTE *); - UINT (WINAPI *pImeGetRegisterWordStyle)(UINT, STYLEBUFW *); - DWORD (WINAPI *pImeGetImeMenuItems)(HIMC, DWORD, DWORD, IMEMENUITEMINFOW *, IMEMENUITEMINFOW *, DWORD); + BOOL (WINAPI *pImeRegisterWord)(const void/*TCHAR*/*, DWORD, const void/*TCHAR*/*); + BOOL (WINAPI *pImeUnregisterWord)(const void/*TCHAR*/*, DWORD, const void/*TCHAR*/*); + UINT (WINAPI *pImeEnumRegisterWord)(void */*REGISTERWORDENUMPROCW*/, const void/*TCHAR*/*, DWORD, const void/*TCHAR*/*, void *); + BOOL (WINAPI *pImeSetCompositionString)(HIMC, DWORD, const void/*TCHAR*/*, DWORD, const void/*TCHAR*/*, DWORD); + DWORD (WINAPI *pImeConversionList)(HIMC, const void/*TCHAR*/*, CANDIDATELIST*, DWORD, UINT); + UINT (WINAPI *pImeGetRegisterWordStyle)(UINT, void/*STYLEBUFW*/*); + BOOL (WINAPI *pImeProcessKey)(HIMC, UINT, LPARAM, const BYTE*); + DWORD (WINAPI *pImeGetImeMenuItems)(HIMC, DWORD, DWORD, void/*IMEMENUITEMINFOW*/*, void/*IMEMENUITEMINFOW*/*, DWORD); }; static HRESULT (WINAPI *pCoRevokeInitializeSpy)(ULARGE_INTEGER cookie); @@ -934,12 +934,11 @@ UINT WINAPI ImmEnumRegisterWordA( HKL hkl, REGISTERWORDENUMPROCA procA, const ch if (!ime->hIME || !ime->pImeEnumRegisterWord) return 0; if (!is_kbd_ime_unicode( ime )) - ret = ime->pImeEnumRegisterWord( (REGISTERWORDENUMPROCW)procA, (const WCHAR *)readingA, - style, (const WCHAR *)stringA, user ); + ret = ime->pImeEnumRegisterWord( procA, readingA, style, stringA, user ); else { WCHAR *readingW = strdupAtoW( readingA ), *stringW = strdupAtoW( stringA ); - ret = ime->pImeEnumRegisterWord( (REGISTERWORDENUMPROCW)procA, readingW, style, stringW, user ); + ret = ime->pImeEnumRegisterWord( procA, readingW, style, stringW, user ); HeapFree( GetProcessHeap(), 0, readingW ); HeapFree( GetProcessHeap(), 0, stringW ); } @@ -966,8 +965,7 @@ UINT WINAPI ImmEnumRegisterWordW( HKL hkl, REGISTERWORDENUMPROCW procW, const WC else { char *readingA = strdupWtoA( readingW ), *stringA = strdupWtoA( stringW ); - ret = ime->pImeEnumRegisterWord( procW, (const WCHAR *)readingA, style, - (const WCHAR *)stringA, user ); + ret = ime->pImeEnumRegisterWord( procW, readingA, style, stringA, user ); HeapFree( GetProcessHeap(), 0, readingA ); HeapFree( GetProcessHeap(), 0, stringA ); } @@ -1597,7 +1595,7 @@ DWORD WINAPI ImmGetConversionListA( HKL hkl, HIMC himc, const char *srcA, CANDID if (!ime->hIME || !ime->pImeConversionList) return 0; if (!is_kbd_ime_unicode( ime )) - ret = ime->pImeConversionList( himc, (const WCHAR *)srcA, listA, lengthA, flags ); + ret = ime->pImeConversionList( himc, srcA, listA, lengthA, flags ); else { CANDIDATELIST *listW; @@ -1637,12 +1635,12 @@ DWORD WINAPI ImmGetConversionListW( HKL hkl, HIMC himc, const WCHAR *srcW, CANDI { CANDIDATELIST *listA; char *srcA = strdupWtoA( srcW ); - DWORD lengthA = ime->pImeConversionList( himc, (const WCHAR *)srcA, NULL, 0, flags ); + DWORD lengthA = ime->pImeConversionList( himc, srcA, NULL, 0, flags ); if (!(listA = HeapAlloc( GetProcessHeap(), 0, lengthA ))) ret = 0; else { - ime->pImeConversionList( himc, (const WCHAR *)srcA, listA, lengthA, flags ); + ime->pImeConversionList( himc, srcA, listA, lengthA, flags ); ret = convert_candidatelist_AtoW( listA, listW, lengthW ); HeapFree( GetProcessHeap(), 0, listA ); } @@ -1894,7 +1892,7 @@ UINT WINAPI ImmGetRegisterWordStyleA( HKL hkl, UINT count, STYLEBUFA *styleA ) if (!ime->hIME || !ime->pImeGetRegisterWordStyle) return 0; if (!is_kbd_ime_unicode( ime )) - ret = ime->pImeGetRegisterWordStyle( count, (STYLEBUFW *)styleA ); + ret = ime->pImeGetRegisterWordStyle( count, styleA ); else { STYLEBUFW styleW; @@ -1923,7 +1921,7 @@ UINT WINAPI ImmGetRegisterWordStyleW( HKL hkl, UINT count, STYLEBUFW *styleW ) else { STYLEBUFA styleA; - ret = ime->pImeGetRegisterWordStyle( count, (STYLEBUFW *)&styleA ); + ret = ime->pImeGetRegisterWordStyle( count, &styleA ); MultiByteToWideChar( CP_ACP, 0, styleA.szDescription, -1, styleW->szDescription, 32 ); styleW->dwStyle = styleA.dwStyle; } @@ -2148,7 +2146,7 @@ BOOL WINAPI ImmRegisterWordA( HKL hkl, const char *readingA, DWORD style, const if (!ime->hIME || !ime->pImeRegisterWord) return FALSE; if (!is_kbd_ime_unicode( ime )) - ret = ime->pImeRegisterWord( (const WCHAR *)readingA, style, (const WCHAR *)stringA ); + ret = ime->pImeRegisterWord( readingA, style, stringA ); else { WCHAR *readingW = strdupAtoW( readingA ), *stringW = strdupAtoW( stringA ); @@ -2177,7 +2175,7 @@ BOOL WINAPI ImmRegisterWordW( HKL hkl, const WCHAR *readingW, DWORD style, const else { char *readingA = strdupWtoA( readingW ), *stringA = strdupWtoA( stringW ); - ret = ime->pImeRegisterWord( (const WCHAR *)readingA, style, (const WCHAR *)stringA ); + ret = ime->pImeRegisterWord( readingA, style, stringA ); HeapFree( GetProcessHeap(), 0, readingA ); HeapFree( GetProcessHeap(), 0, stringA ); } @@ -2628,7 +2626,7 @@ BOOL WINAPI ImmUnregisterWordA( HKL hkl, const char *readingA, DWORD style, cons if (!ime->hIME || !ime->pImeUnregisterWord) return FALSE; if (!is_kbd_ime_unicode( ime )) - ret = ime->pImeUnregisterWord( (const WCHAR *)readingA, style, (const WCHAR *)stringA ); + ret = ime->pImeUnregisterWord( readingA, style, stringA ); else { WCHAR *readingW = strdupAtoW( readingA ), *stringW = strdupAtoW( stringA ); @@ -2657,7 +2655,7 @@ BOOL WINAPI ImmUnregisterWordW( HKL hkl, const WCHAR *readingW, DWORD style, con else { char *readingA = strdupWtoA( readingW ), *stringA = strdupWtoA( stringW ); - ret = ime->pImeUnregisterWord( (const WCHAR *)readingA, style, (const WCHAR *)stringA ); + ret = ime->pImeUnregisterWord( readingA, style, stringA ); HeapFree( GetProcessHeap(), 0, readingA ); HeapFree( GetProcessHeap(), 0, stringA ); } @@ -2686,8 +2684,7 @@ DWORD WINAPI ImmGetImeMenuItemsA( HIMC himc, DWORD flags, DWORD type, IMEMENUITE if (!data->immKbd->hIME || !data->immKbd->pImeGetImeMenuItems) return 0; if (!is_himc_ime_unicode( data ) || (!parentA && !menuA)) - ret = data->immKbd->pImeGetImeMenuItems( himc, flags, type, (IMEMENUITEMINFOW *)parentA, - (IMEMENUITEMINFOW *)menuA, size ); + ret = data->immKbd->pImeGetImeMenuItems( himc, flags, type, parentA, menuA, size ); else { IMEMENUITEMINFOW tmpW, *menuW, *parentW = parentA ? &tmpW : NULL; @@ -2760,8 +2757,7 @@ DWORD WINAPI ImmGetImeMenuItemsW( HIMC himc, DWORD flags, DWORD type, IMEMENUITE menuA = HeapAlloc( GetProcessHeap(), 0, size ); } - ret = data->immKbd->pImeGetImeMenuItems( himc, flags, type, (IMEMENUITEMINFOW *)parentA, - (IMEMENUITEMINFOW *)menuA, size ); + ret = data->immKbd->pImeGetImeMenuItems( himc, flags, type, parentA, menuA, size ); if (parentW) {

1 0

Connor McAdams : uiautomationcore/tests: Add tests for IUIAutomationElement caching methods.
by Alexandre Julliard March 13, 2023

March 13, 2023

Module: wine Branch: master Commit: 062584af05b5a7baa0231c98078eaed6cf3262e6 URL: https://gitlab.winehq.org/wine/wine/-/commit/062584af05b5a7baa0231c98078eae… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue Mar 7 11:41:18 2023 -0500 uiautomationcore/tests: Add tests for IUIAutomationElement caching methods. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 163 +++++++++++++++++++++++++++++ 1 file changed, 163 insertions(+) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index e9a9723ab20..18d7278bba0 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -10725,6 +10725,168 @@ static void test_CUIAutomation_cache_request_iface(IUIAutomation *uia_iface) IUIAutomationCacheRequest_Release(cache_req); } +static const struct prov_method_sequence get_elem_cache_seq[] = { + { &Provider, PROV_GET_PROPERTY_VALUE }, + NODE_CREATE_SEQ(&Provider_child), + { 0 }, +}; + +static const struct prov_method_sequence get_cached_prop_val_seq[] = { + { &Provider_child, FRAG_GET_RUNTIME_ID, METHOD_TODO }, + { 0 }, +}; + +static const struct prov_method_sequence get_cached_prop_val_seq2[] = { + { &Provider_child, FRAG_GET_RUNTIME_ID, METHOD_TODO }, + { &Provider_child, PROV_GET_PROPERTY_VALUE, METHOD_TODO }, /* UIA_IsControlElementPropertyId */ + { 0 }, +}; + +static void test_Element_cache_methods(IUIAutomation *uia_iface) +{ + HWND hwnd = create_test_hwnd("test_Element_cache_methods class"); + IUIAutomationElement *element, *element2; + IUIAutomationCacheRequest *cache_req; + IUnknown *unk_ns; + HRESULT hr; + VARIANT v; + + element = create_test_element_from_hwnd(uia_iface, hwnd, TRUE); + Provider.frag_root = &Provider.IRawElementProviderFragmentRoot_iface; + initialize_provider(&Provider_child, ProviderOptions_ServerSideProvider, NULL, TRUE); + provider_add_child(&Provider, &Provider_child); + + hr = UiaGetReservedNotSupportedValue(&unk_ns); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + cache_req = NULL; + hr = IUIAutomation_CreateCacheRequest(uia_iface, &cache_req); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!!cache_req, "cache_req == NULL\n"); + + /* + * Run these tests on Provider_child, it doesn't have an HWND so it will + * get UIA_RuntimeIdPropertyId from GetRuntimeId. + */ + hr = IUIAutomationElement_GetCurrentPropertyValueEx(element, UIA_LabeledByPropertyId, TRUE, &v); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(V_VT(&v) == VT_UNKNOWN, "Unexpected vt %d\n", V_VT(&v)); + ok(Provider_child.ref == 2, "Unexpected refcnt %ld\n", Provider_child.ref); + ok_method_sequence(get_elem_cache_seq, "get_elem_cache_seq"); + + IUIAutomationElement_Release(element); + ok(Provider.ref == 1, "Unexpected refcnt %ld\n", Provider.ref); + + hr = IUnknown_QueryInterface(V_UNKNOWN(&v), &IID_IUIAutomationElement, (void **)&element); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!!element, "element == NULL\n"); + VariantClear(&v); + + /* + * Passing in an invalid COM interface for IUIAutomationCacheRequest will + * cause an access violation on Windows. + */ + if (0) + { + IUIAutomationElement_BuildUpdatedCache(element, (IUIAutomationCacheRequest *)&Object, &element2); + } + + hr = IUIAutomationElement_BuildUpdatedCache(element, cache_req, NULL); + todo_wine ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); + + element2 = (void *)0xdeadbeef; + hr = IUIAutomationElement_BuildUpdatedCache(element, NULL, &element2); + todo_wine ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); + todo_wine ok(!element2, "element2 != NULL\n"); + + /* + * Test cached property values. The default IUIAutomationCacheRequest + * always caches UIA_RuntimeIdPropertyId. + */ + element2 = NULL; + hr = IUIAutomationElement_BuildUpdatedCache(element, cache_req, &element2); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine ok(!!element2, "element2 == NULL\n"); + ok_method_sequence(get_cached_prop_val_seq, "get_cached_prop_val_seq"); + + if (element2) + { + /* RuntimeId is currently unset, so we'll get the NotSupported value. */ + hr = IUIAutomationElement_GetCachedPropertyValueEx(element2, UIA_RuntimeIdPropertyId, TRUE, &v); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine ok(V_VT(&v) == VT_UNKNOWN, "Unexpected vt %d\n", V_VT(&v)); + if (SUCCEEDED(hr)) + ok(V_UNKNOWN(&v) == unk_ns, "unexpected IUnknown %p\n", V_UNKNOWN(&v)); + VariantClear(&v); + + /* Attempting to get a cached value for a non-cached property. */ + hr = IUIAutomationElement_GetCachedPropertyValueEx(element2, UIA_IsControlElementPropertyId, TRUE, &v); + todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + ok(V_VT(&v) == VT_EMPTY, "Unexpected vt %d\n", V_VT(&v)); + VariantClear(&v); + + IUIAutomationElement_Release(element2); + } + + /* RuntimeId is now set. */ + Provider_child.runtime_id[0] = Provider_child.runtime_id[1] = 0xdeadbeef; + element2 = NULL; + hr = IUIAutomationElement_BuildUpdatedCache(element, cache_req, &element2); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine ok(!!element2, "element2 == NULL\n"); + ok_method_sequence(get_cached_prop_val_seq, "get_cached_prop_val_seq"); + + if (element2) + { + hr = IUIAutomationElement_GetCachedPropertyValueEx(element2, UIA_RuntimeIdPropertyId, TRUE, &v); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine ok(V_VT(&v) == (VT_I4 | VT_ARRAY), "Unexpected vt %d\n", V_VT(&v)); + if (SUCCEEDED(hr)) + check_runtime_id(Provider_child.runtime_id, ARRAY_SIZE(Provider_child.runtime_id), V_ARRAY(&v)); + VariantClear(&v); + IUIAutomationElement_Release(element2); + } + + /* + * Add UIA_IsControlElementPropertyId to the list of cached property + * values. + */ + hr = IUIAutomationCacheRequest_AddProperty(cache_req, UIA_IsControlElementPropertyId); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + Provider_child.runtime_id[0] = Provider_child.runtime_id[1] = 0xdeadb33f; + element2 = NULL; + hr = IUIAutomationElement_BuildUpdatedCache(element, cache_req, &element2); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine ok(!!element2, "element2 == NULL\n"); + ok_method_sequence(get_cached_prop_val_seq2, "get_cached_prop_val_seq2"); + + if (element2) + { + hr = IUIAutomationElement_GetCachedPropertyValueEx(element2, UIA_RuntimeIdPropertyId, TRUE, &v); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine ok(V_VT(&v) == (VT_I4 | VT_ARRAY), "Unexpected vt %d\n", V_VT(&v)); + if (SUCCEEDED(hr)) + check_runtime_id(Provider_child.runtime_id, ARRAY_SIZE(Provider_child.runtime_id), V_ARRAY(&v)); + VariantClear(&v); + + hr = IUIAutomationElement_GetCachedPropertyValueEx(element2, UIA_IsControlElementPropertyId, TRUE, &v); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine ok(check_variant_bool(&v, TRUE), "V_BOOL(&v) = %#x\n", V_BOOL(&v)); + VariantClear(&v); + + IUIAutomationElement_Release(element2); + } + + IUIAutomationElement_Release(element); + ok(Provider_child.ref == 1, "Unexpected refcnt %ld\n", Provider_child.ref); + IUIAutomationCacheRequest_Release(cache_req); + IUnknown_Release(unk_ns); + + DestroyWindow(hwnd); + UnregisterClassA("test_Element_cache_methods class", NULL); +} + struct uia_com_classes { const GUID *clsid; const GUID *iid; @@ -10828,6 +10990,7 @@ static void test_CUIAutomation(void) test_CUIAutomation_cache_request_iface(uia_iface); test_ElementFromHandle(uia_iface, has_cui8); test_Element_GetPropertyValue(uia_iface); + test_Element_cache_methods(uia_iface); IUIAutomation_Release(uia_iface); CoUninitialize();

1 0