October 2023 - Wine-Commits

Alexandre Julliard : kernelbase: Only support Wow64 system directories for 32-bit platforms.
by Alexandre Julliard Oct. 31, 2023

Oct. 31, 2023

Module: wine Branch: master Commit: 0d3fd1474782dd98cbc99d9dd6e259baf740d4bd URL: https://gitlab.winehq.org/wine/wine/-/commit/0d3fd1474782dd98cbc99d9dd6e259… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 31 14:06:34 2023 +0100 kernelbase: Only support Wow64 system directories for 32-bit platforms. --- dlls/kernelbase/file.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index aaa549bfd85..42c47707582 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -85,8 +85,6 @@ static const WCHAR *get_machine_wow64_dir( WORD machine ) case IMAGE_FILE_MACHINE_TARGET_HOST: return system_dir; case IMAGE_FILE_MACHINE_I386: return L"C:\\windows\\syswow64"; case IMAGE_FILE_MACHINE_ARMNT: return L"C:\\windows\\sysarm32"; - case IMAGE_FILE_MACHINE_AMD64: return L"C:\\windows\\sysx8664"; - case IMAGE_FILE_MACHINE_ARM64: return L"C:\\windows\\sysarm64"; default: return NULL; } }

1 0

Alexandre Julliard : ntdll: Also update code ranges for pure ARM64EC binaries.
by Alexandre Julliard Oct. 31, 2023

Oct. 31, 2023

Module: wine Branch: master Commit: 8f507ff9a77cc369fc7020a9c0ef0d48c0e0b547 URL: https://gitlab.winehq.org/wine/wine/-/commit/8f507ff9a77cc369fc7020a9c0ef0d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 31 13:07:07 2023 +0100 ntdll: Also update code ranges for pure ARM64EC binaries. --- dlls/ntdll/unix/virtual.c | 90 ++++++++++++++++++++++++----------------------- 1 file changed, 46 insertions(+), 44 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 2c2000751e5..464f343a575 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2461,6 +2461,34 @@ static void alloc_arm64ec_map(void) } +/*********************************************************************** + * update_arm64ec_ranges + */ +static void update_arm64ec_ranges( struct file_view *view, IMAGE_NT_HEADERS *nt, + const IMAGE_DATA_DIRECTORY *dir ) +{ + const IMAGE_ARM64EC_METADATA *metadata; + const IMAGE_CHPE_RANGE_ENTRY *map; + char *base = view->base; + const IMAGE_LOAD_CONFIG_DIRECTORY *cfg = (void *)(base + dir->VirtualAddress); + ULONG i, size = min( dir->Size, cfg->Size ); + + if (size <= offsetof( IMAGE_LOAD_CONFIG_DIRECTORY, CHPEMetadataPointer )) return; + if (!cfg->CHPEMetadataPointer) return; + if (!arm64ec_view) alloc_arm64ec_map(); + commit_arm64ec_map( view ); + metadata = (void *)(base + (cfg->CHPEMetadataPointer - nt->OptionalHeader.ImageBase)); + if (!metadata->CodeMap) return; + map = (void *)(base + metadata->CodeMap); + + for (i = 0; i < metadata->CodeMapCount; i++) + { + if ((map[i].StartOffset & 0x3) != 1 /* arm64ec */) continue; + set_arm64ec_range( base + (map[i].StartOffset & ~3), map[i].Length ); + } +} + + /*********************************************************************** * apply_arm64x_relocations */ @@ -2506,44 +2534,13 @@ static void apply_arm64x_relocations( char *base, const IMAGE_BASE_RELOCATION *r * update_arm64x_mapping */ static void update_arm64x_mapping( struct file_view *view, IMAGE_NT_HEADERS *nt, - IMAGE_SECTION_HEADER *sections ) + const IMAGE_DATA_DIRECTORY *dir, IMAGE_SECTION_HEADER *sections ) { - ULONG i, size, sec, offset; - const IMAGE_DATA_DIRECTORY *dir; - const IMAGE_LOAD_CONFIG_DIRECTORY *cfg; - const IMAGE_ARM64EC_METADATA *metadata; const IMAGE_DYNAMIC_RELOCATION_TABLE *table; const char *ptr, *end; char *base = view->base; - - /* retrieve config directory */ - - if (nt->FileHeader.Machine != IMAGE_FILE_MACHINE_ARM64) return; - if (nt->OptionalHeader.Magic != IMAGE_NT_OPTIONAL_HDR64_MAGIC) return; - dir = nt->OptionalHeader.DataDirectory + IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG; - if (!dir->VirtualAddress || !dir->Size) return; - cfg = (void *)(base + dir->VirtualAddress); - size = min( dir->Size, cfg->Size ); - - /* update code ranges */ - - if (size <= offsetof( IMAGE_LOAD_CONFIG_DIRECTORY, CHPEMetadataPointer )) return; - if (!cfg->CHPEMetadataPointer) return; - if (!arm64ec_view) alloc_arm64ec_map(); - commit_arm64ec_map( view ); - metadata = (void *)(base + (cfg->CHPEMetadataPointer - nt->OptionalHeader.ImageBase)); - if (metadata->CodeMap) - { - const IMAGE_CHPE_RANGE_ENTRY *map = (void *)(base + metadata->CodeMap); - - for (i = 0; i < metadata->CodeMapCount; i++) - { - if ((map[i].StartOffset & 0x3) != 1 /* arm64ec */) continue; - set_arm64ec_range( base + (map[i].StartOffset & ~3), map[i].Length ); - } - } - - /* apply dynamic relocations */ + const IMAGE_LOAD_CONFIG_DIRECTORY *cfg = (void *)(base + dir->VirtualAddress); + ULONG sec, offset, size = min( dir->Size, cfg->Size ); if (size <= offsetof( IMAGE_LOAD_CONFIG_DIRECTORY, DynamicValueRelocTableSection )) return; offset = cfg->DynamicValueRelocTableOffset; @@ -2687,7 +2684,7 @@ static NTSTATUS map_image_into_view( struct file_view *view, const WCHAR *filena IMAGE_NT_HEADERS *nt; IMAGE_SECTION_HEADER sections[96]; IMAGE_SECTION_HEADER *sec; - IMAGE_DATA_DIRECTORY *imports, *relocs; + IMAGE_DATA_DIRECTORY *imports, *dir; NTSTATUS status = STATUS_CONFLICTING_ADDRESSES; int i; off_t pos; @@ -2838,13 +2835,18 @@ static NTSTATUS map_image_into_view( struct file_view *view, const WCHAR *filena } #ifdef __aarch64__ - if (machine == IMAGE_FILE_MACHINE_AMD64 || - (!machine && main_image_info.Machine == IMAGE_FILE_MACHINE_AMD64)) + if ((dir = get_data_dir( nt, total_size, IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG ))) { - update_arm64x_mapping( view, nt, sections ); - /* reload changed data from NT header */ - image_info->machine = nt->FileHeader.Machine; - image_info->entry_point = nt->OptionalHeader.AddressOfEntryPoint; + if (image_info->machine == IMAGE_FILE_MACHINE_ARM64 && + (machine == IMAGE_FILE_MACHINE_AMD64 || + (!machine && main_image_info.Machine == IMAGE_FILE_MACHINE_AMD64))) + { + update_arm64x_mapping( view, nt, dir, sections ); + /* reload changed data from NT header */ + image_info->machine = nt->FileHeader.Machine; + image_info->entry_point = nt->OptionalHeader.AddressOfEntryPoint; + } + if (image_info->machine == IMAGE_FILE_MACHINE_AMD64) update_arm64ec_ranges( view, nt, dir ); } #endif if (machine && machine != nt->FileHeader.Machine) return STATUS_NOT_SUPPORTED; @@ -2861,10 +2863,10 @@ static NTSTATUS map_image_into_view( struct file_view *view, const WCHAR *filena else ((IMAGE_NT_HEADERS32 *)nt)->OptionalHeader.ImageBase = image_info->map_addr; - if ((relocs = get_data_dir( nt, total_size, IMAGE_DIRECTORY_ENTRY_BASERELOC ))) + if ((dir = get_data_dir( nt, total_size, IMAGE_DIRECTORY_ENTRY_BASERELOC ))) { - IMAGE_BASE_RELOCATION *rel = (IMAGE_BASE_RELOCATION *)(ptr + relocs->VirtualAddress); - IMAGE_BASE_RELOCATION *end = (IMAGE_BASE_RELOCATION *)((char *)rel + relocs->Size); + IMAGE_BASE_RELOCATION *rel = (IMAGE_BASE_RELOCATION *)(ptr + dir->VirtualAddress); + IMAGE_BASE_RELOCATION *end = (IMAGE_BASE_RELOCATION *)((char *)rel + dir->Size); while (rel && rel < end - 1 && rel->SizeOfBlock && rel->VirtualAddress < total_size) rel = process_relocation_block( ptr + rel->VirtualAddress, rel, delta );

1 0

Alexandre Julliard : ntdll: Remove an unused global variable.
by Alexandre Julliard Oct. 31, 2023

Oct. 31, 2023

Module: wine Branch: master Commit: 123b86fe4a551a767b6f6e743295ffb333b6b6e1 URL: https://gitlab.winehq.org/wine/wine/-/commit/123b86fe4a551a767b6f6e743295ff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 31 13:13:06 2023 +0100 ntdll: Remove an unused global variable. --- dlls/ntdll/unix/loader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 0b83d11d373..c442f7f6be2 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -389,7 +389,6 @@ const char **dll_paths = NULL; const char **system_dll_paths = NULL; const char *user_name = NULL; SECTION_IMAGE_INFORMATION main_image_info = { NULL }; -static const IMAGE_EXPORT_DIRECTORY *ntdll_exports; /* adjust an array of pointers to make them into RVAs */ static inline void fixup_rva_ptrs( void *array, BYTE *base, unsigned int count ) @@ -1759,12 +1758,13 @@ static void load_ntdll_functions( HMODULE module ) { void **p__wine_unix_call_dispatcher; unixlib_handle_t *p__wine_unixlib_handle; + const IMAGE_EXPORT_DIRECTORY *exports; - ntdll_exports = get_module_data_dir( module, IMAGE_FILE_EXPORT_DIRECTORY, NULL ); - assert( ntdll_exports ); + exports = get_module_data_dir( module, IMAGE_DIRECTORY_ENTRY_EXPORT, NULL ); + assert( exports ); #define GET_FUNC(name) \ - if (!(p##name = (void *)find_named_export( module, ntdll_exports, #name ))) \ + if (!(p##name = (void *)find_named_export( module, exports, #name ))) \ ERR( "%s not found\n", #name ) GET_FUNC( DbgUiRemoteBreakin );

1 0

Giovanni Mascellani : ci: Run cross tests on Windows.
by Alexandre Julliard Oct. 31, 2023

Oct. 31, 2023

Module: vkd3d Branch: master Commit: dbc5e7d07c45a0f0cde05f1088ddc003c3c99e7f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/dbc5e7d07c45a0f0cde05f1088ddc… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Sep 26 11:20:39 2023 +0200 ci: Run cross tests on Windows. A driver program is introduced to coordinate test running on Windows, similarly to what "make test" does on Linux and macOS. --- .gitignore | 1 + .gitlab-ci.yml | 2 + Makefile.am | 27 ++++++- gitlab/README | 10 ++- gitlab/build-crosstest | 5 +- gitlab/test.yml | 35 +++++++++ tests/driver.c | 204 +++++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 278 insertions(+), 6 deletions(-)

1 0

Giovanni Mascellani : ci: Run shader tests on Windows.
by Alexandre Julliard Oct. 31, 2023

Oct. 31, 2023

Module: vkd3d Branch: master Commit: f462d237c18616a6eaef63bfe7cf3a3f1a705410 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f462d237c18616a6eaef63bfe7cf3… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Oct 18 12:40:57 2023 +0200 ci: Run shader tests on Windows. --- Makefile.am | 7 +++++-- tests/driver.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 56 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 4e3a43bb..def1db6f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -580,8 +580,11 @@ endif tests/crosstests.txt: FORCE $(AM_V_GEN) for i in $(vkd3d_cross_tests) ; do echo $$i ; done > $@ -crosstest-lists: tests/crosstests.txt -CLEANFILES += tests/crosstests.txt +tests/shader_tests.txt: FORCE + $(AM_V_GEN) for i in $(vkd3d_shader_tests) ; do echo $$i ; done > $@ + +crosstest-lists: tests/crosstests.txt tests/shader_tests.txt +CLEANFILES += tests/crosstests.txt tests/shader_tests.txt FORCE: diff --git a/tests/driver.c b/tests/driver.c index f6da3405..553417ad 100644 --- a/tests/driver.c +++ b/tests/driver.c @@ -19,6 +19,7 @@ #include <stdio.h> #include <stdbool.h> #include <windows.h> +#include <shlobj.h> #define TIMEOUT_MS (10 * 1000) #define MAX_TIMEOUT_COUNT 3 @@ -32,16 +33,33 @@ enum program_result static enum program_result run_program(const char *cmdline, const char *log_filename) { + char cmdline2[1024], log_dirname[1024], *file_part; enum program_result ret = PROGRAM_RESULT_SUCCESS; HANDLE log = INVALID_HANDLE_VALUE; SECURITY_ATTRIBUTES attrs = {0}; PROCESS_INFORMATION info = {0}; DWORD exit_code, wait_result; STARTUPINFOA startup = {0}; - char cmdline2[1024]; + int res; strcpy(cmdline2, cmdline); + if (GetFullPathNameA(log_filename, sizeof(log_dirname), log_dirname, &file_part) == 0) + { + fprintf(stderr, "Cannot extract the directory name for path %s, last error %ld.\n", log_filename, GetLastError()); + ret = PROGRAM_RESULT_FAILURE; + goto out; + } + *file_part = '\0'; + + res = SHCreateDirectoryExA(NULL, log_dirname, NULL); + if (res != ERROR_SUCCESS && res != ERROR_ALREADY_EXISTS) + { + fprintf(stderr, "Cannot create log directory %s, error %d.\n", log_dirname, res); + ret = PROGRAM_RESULT_FAILURE; + goto out; + } + attrs.nLength = sizeof(attrs); attrs.bInheritHandle = TRUE; @@ -125,6 +143,38 @@ static bool run_tests_for_directory(const char *commit_dir) printf("Building %s\n", commit_dir); printf("---\n"); + sprintf(list_filename, "artifacts/%s/tests/shader_tests.txt", commit_dir); + list_file = fopen(list_filename, "r"); + + if (!list_file) + { + fprintf(stderr, "Cannot open list file %s, errno %d.\n", list_filename, errno); + ret = false; + } + else + { + while (fgets(line, sizeof(line), list_file) && timeout_count < MAX_TIMEOUT_COUNT) + { + size_t len = strlen(line); + + if (line[len - 1] == '\n') + line[--len] = '\0'; + + sprintf(cmdline, "artifacts/%s/tests/shader_runner.cross%s.exe %s", commit_dir, test_arch, line); + + /* Remove the .shader_test suffix. */ + line[len - 12] = '\0'; + sprintf(log_filename, "artifacts/%s/%s.log", commit_dir, line); + + ++test_count; + result = run_program(cmdline, log_filename); + success_count += result == PROGRAM_RESULT_SUCCESS; + timeout_count += result == PROGRAM_RESULT_TIMEOUT; + } + + fclose(list_file); + } + sprintf(list_filename, "artifacts/%s/tests/crosstests.txt", commit_dir); list_file = fopen(list_filename, "r");

1 0

Sven Baars : advapi32/tests: Fix a typo (Coverity).
by Alexandre Julliard Oct. 30, 2023

Oct. 30, 2023

Module: wine Branch: master Commit: 28210162472459d2afe57e638e2f50ee37f2b63f URL: https://gitlab.winehq.org/wine/wine/-/commit/28210162472459d2afe57e638e2f50… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Mon Oct 30 14:12:01 2023 +0100 advapi32/tests: Fix a typo (Coverity). --- dlls/advapi32/tests/registry.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 29b1aff6b74..30a79368c94 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1179,7 +1179,7 @@ static void test_reg_open_key(void) ret = RegCreateKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine", 0, NULL, 0, KEY_WOW64_64KEY | KEY_ALL_ACCESS, NULL, &hkRoot64, NULL); - ok(ret == ERROR_SUCCESS || ERROR_ACCESS_DENIED, + ok(ret == ERROR_SUCCESS || ret == ERROR_ACCESS_DENIED, "RegCreateKeyEx with KEY_WOW64_64KEY failed (err=%lu)\n", ret); if (ret == ERROR_ACCESS_DENIED) {

1 0

Esme Povirk : user32/tests: Improve timer measurement method.
by Alexandre Julliard Oct. 30, 2023

Oct. 30, 2023

Module: wine Branch: master Commit: 0f0867063d1c5693170fe8770692072b24c77e5c URL: https://gitlab.winehq.org/wine/wine/-/commit/0f0867063d1c5693170fe877069207… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Oct 27 15:28:28 2023 -0500 user32/tests: Improve timer measurement method. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55786 --- dlls/user32/tests/msg.c | 106 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 71 insertions(+), 35 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 90abf9b83a1..68398508fc6 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -11548,20 +11548,67 @@ static VOID CALLBACK tfunc(HWND hwnd, UINT uMsg, UINT_PTR id, DWORD dwTime) { } -#define TIMER_ID 0x19 -#define TIMER_COUNT_EXPECTED 100 -#define TIMER_COUNT_TOLERANCE 10 +#define TIMER_ID 0x19 +#define TIMER_COUNT 500 /* 499 samples */ +#define TIMER_DURATION_EXPECTED 10000 /* 10 ms */ +#define TIMER_DURATION_ALT 15600 /* 15.6 ms */ +#define TIMER_DURATION_TOLERANCE 1000 /* 1 ms */ static int count = 0; -static void CALLBACK callback_count(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime) +static ULONGLONG timer_ticks[TIMER_COUNT]; +static int timer_duration = 0; + +static int compare_ulonglong(const void *a, const void *b) { + ULONGLONG la, lb; + la = *(ULONGLONG*)a; + lb = *(ULONGLONG*)b; + return (la > lb) - (la < lb); +} + +static void timer_fired(void) +{ + if (count < TIMER_COUNT) + { + LARGE_INTEGER performance_counter; + BOOL ret; + + ret = QueryPerformanceCounter(&performance_counter); + ok(ret, "QueryPerformanceCounter failed\n"); + + timer_ticks[count] = performance_counter.QuadPart; + } + count++; + + if (count == TIMER_COUNT) + { + LARGE_INTEGER performance_frequency; + BOOL ret; + + /* calculate durations */ + for (int i=0; i < TIMER_COUNT-1; i++) + timer_ticks[i] = timer_ticks[i+1] - timer_ticks[i]; + + qsort(timer_ticks, TIMER_COUNT - 1, sizeof(timer_ticks[0]), compare_ulonglong); + + ret = QueryPerformanceFrequency(&performance_frequency); + ok(ret, "QueryPerformanceFrequency failed\n"); + + /* median duration, converted to microseconds */ + timer_duration = (int)(timer_ticks[(TIMER_COUNT - 1) / 2] * 1000000 / performance_frequency.QuadPart); + } +} + +static void CALLBACK callback_count(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime) +{ + timer_fired(); } static DWORD exception; static void CALLBACK callback_exception(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime) { - count++; + timer_fired(); RaiseException(exception, 0, 0, NULL); } @@ -11583,7 +11630,6 @@ static DWORD WINAPI timer_thread_proc(LPVOID x) static void test_timers(void) { struct timer_info info; - DWORD start; DWORD id; MSG msg; @@ -11609,44 +11655,37 @@ static void test_timers(void) /* Check the minimum allowed timeout for a timer. MSDN indicates that it should be 10.0 ms, * which occurs sometimes, but most testing on the VMs indicates a minimum timeout closer to - * 15.6 ms. Since there is some measurement error between test runs we are allowing for - * ±9 counts (~4 ms) around the expected value. + * 15.6 ms. */ count = 0; id = SetTimer(info.hWnd, TIMER_ID, 0, callback_count); ok(id != 0, "did not get id from SetTimer.\n"); ok(id==TIMER_ID, "SetTimer timer ID different\n"); - start = GetTickCount(); - while (GetTickCount()-start < 1001 && GetMessageA(&msg, info.hWnd, 0, 0)) + while (count < TIMER_COUNT && GetMessageA(&msg, info.hWnd, 0, 0)) DispatchMessageA(&msg); - ok(abs(count-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE /* xp */ - || broken(abs(count-64) <= TIMER_COUNT_TOLERANCE) /* most common */ - || broken(abs(count-43) <= TIMER_COUNT_TOLERANCE) /* w2k3, win8 */, - "did not get expected count for minimum timeout (%d != ~%d).\n", - count, TIMER_COUNT_EXPECTED); + ok(abs(timer_duration-TIMER_DURATION_EXPECTED) < TIMER_DURATION_TOLERANCE /* xp, win7 */ + || broken(abs(timer_duration - TIMER_DURATION_ALT) < TIMER_DURATION_TOLERANCE) /* most common */, + "did not get expected median timeout (%d != ~%d).\n", + timer_duration, TIMER_DURATION_EXPECTED); ok(KillTimer(info.hWnd, id), "KillTimer failed\n"); /* Perform the same check on SetSystemTimer (only available on w2k3 and older) */ if (pSetSystemTimer) { - int syscount = 0; - count = 0; id = pSetSystemTimer(info.hWnd, TIMER_ID, 0, callback_count); ok(id != 0, "did not get id from SetSystemTimer.\n"); ok(id==TIMER_ID, "SetTimer timer ID different\n"); - start = GetTickCount(); - while (GetTickCount()-start < 1001 && GetMessageA(&msg, info.hWnd, 0, 0)) + while (count < TIMER_COUNT && GetMessageA(&msg, info.hWnd, 0, 0)) { if (msg.message == WM_SYSTIMER) - syscount++; + timer_fired(); + ok(msg.message != WM_TIMER, "unexpected WM_TIMER\n"); DispatchMessageA(&msg); } - ok(abs(syscount-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE - || broken(abs(syscount-64) < TIMER_COUNT_TOLERANCE) /* most common */ - || broken(syscount > 4000 && syscount < 12000) /* win2k3sp0 */, - "did not get expected count for minimum timeout (%d != ~%d).\n", - syscount, TIMER_COUNT_EXPECTED); - ok(count == 0, "did not get expected count for callback timeout (%d != 0).\n", count); + ok(abs(timer_duration-TIMER_DURATION_EXPECTED) < TIMER_DURATION_TOLERANCE + || broken(abs(timer_duration - TIMER_DURATION_ALT) < TIMER_DURATION_TOLERANCE) /* most common */, + "did not get expected median timeout (%d != ~%d).\n", + timer_duration, TIMER_DURATION_EXPECTED); ok(pKillSystemTimer(info.hWnd, id), "KillSystemTimer failed\n"); } @@ -11679,20 +11718,17 @@ static void test_timers_no_wnd(void) /* Check the minimum allowed timeout for a timer. MSDN indicates that it should be 10.0 ms, * which occurs sometimes, but most testing on the VMs indicates a minimum timeout closer to - * 15.6 ms. Since there is some measurement error between test runs we are allowing for - * ±9 counts (~4 ms) around the expected value. + * 15.6 ms. */ count = 0; id = SetTimer(NULL, 0, 0, callback_count); ok(id != 0, "did not get id from SetTimer.\n"); - start = GetTickCount(); - while (GetTickCount()-start < 1001 && GetMessageA(&msg, NULL, 0, 0)) + while (count < TIMER_COUNT && GetMessageA(&msg, NULL, 0, 0)) DispatchMessageA(&msg); - ok(abs(count-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE /* xp */ - || broken(abs(count-64) <= TIMER_COUNT_TOLERANCE) /* most common */ - || broken(abs(count-43) <= TIMER_COUNT_TOLERANCE) /* w1064v1809 */, - "did not get expected count for minimum timeout (%d != ~%d).\n", - count, TIMER_COUNT_EXPECTED); + ok(abs(timer_duration-TIMER_DURATION_EXPECTED) < TIMER_DURATION_TOLERANCE /* xp */ + || broken(abs(timer_duration - TIMER_DURATION_ALT) < TIMER_DURATION_TOLERANCE) /* most common */, + "did not get expected median timeout (%d != ~%d).\n", + timer_duration, TIMER_DURATION_EXPECTED); KillTimer(NULL, id); /* Note: SetSystemTimer doesn't support a NULL window, see test_timers */

1 0

Connor McAdams : uiautomationcore: Return TRUE from UiaClientsAreListening().
by Alexandre Julliard Oct. 30, 2023

Oct. 30, 2023

Module: wine Branch: master Commit: d81256e7b6728177784d67f3b88d7b8fabb2512d URL: https://gitlab.winehq.org/wine/wine/-/commit/d81256e7b6728177784d67f3b88d7b… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Oct 30 08:44:31 2023 -0400 uiautomationcore: Return TRUE from UiaClientsAreListening(). This function always returns TRUE on Windows 7 and above, and now that we have stubs for all the event raising functions there should be no harm in doing the same. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 10 ++++++++++ dlls/uiautomationcore/uia_main.c | 4 ++-- include/uiautomationcoreapi.h | 1 + 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 6cb6e56d99b..67dcb04dadc 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -18607,6 +18607,15 @@ static void test_uia_event_ProxyProviderWinEventHandler(void) UiaRegisterProviderCallback(NULL); } +static void test_UiaClientsAreListening(void) +{ + BOOL ret; + + /* Always returns TRUE on Windows 7 and above. */ + ret = UiaClientsAreListening(); + ok(!!ret, "ret != TRUE\n"); +} + /* * Once a process returns a UI Automation provider with * UiaReturnRawElementProvider it ends up in an implicit MTA until exit. This @@ -18663,6 +18672,7 @@ START_TEST(uiautomation) return; } + test_UiaClientsAreListening(); test_UiaHostProviderFromHwnd(); test_uia_reserved_value_ifaces(); test_UiaLookupId(); diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index 9ca320b1ba0..8c7a72bb35e 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -264,8 +264,8 @@ static const IRawElementProviderSimpleVtbl hwnd_host_provider_vtbl = { */ BOOL WINAPI UiaClientsAreListening(void) { - FIXME("()\n"); - return FALSE; + TRACE("()\n"); + return TRUE; } /*********************************************************************** diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h index 0fd942f3f37..fbfbc46b09c 100644 --- a/include/uiautomationcoreapi.h +++ b/include/uiautomationcoreapi.h @@ -559,6 +559,7 @@ HRESULT WINAPI UiaRemoveEvent(HUIAEVENT huiaevent); HRESULT WINAPI UiaEventAddWindow(HUIAEVENT huiaevent, HWND hwnd); HRESULT WINAPI UiaEventRemoveWindow(HUIAEVENT huiaevent, HWND hwnd); BOOL WINAPI UiaHasServerSideProvider(HWND hwnd); +BOOL WINAPI UiaClientsAreListening(void); #ifdef __cplusplus }

1 0

Connor McAdams : uiautomationcore: Don't set HRESULT when attempting to advise currently focused HUIANODE.
by Alexandre Julliard Oct. 30, 2023

Oct. 30, 2023

Module: wine Branch: master Commit: 0cbca47dae968ecaa720ae0ba0b2ac491e62fa1a URL: https://gitlab.winehq.org/wine/wine/-/commit/0cbca47dae968ecaa720ae0ba0b2ac… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Oct 30 08:43:38 2023 -0400 uiautomationcore: Don't set HRESULT when attempting to advise currently focused HUIANODE. create_uia_node_from_hwnd() is expected to fail if the HWND doesn't have a native serverside provider. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/uia_com_client.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/uiautomationcore/uia_com_client.c b/dlls/uiautomationcore/uia_com_client.c index 5c0d0cd0b9e..43b16db74f8 100644 --- a/dlls/uiautomationcore/uia_com_client.c +++ b/dlls/uiautomationcore/uia_com_client.c @@ -1372,8 +1372,7 @@ static HRESULT uia_event_handlers_add_handler(IUnknown *handler_iface, SAFEARRAY { HUIANODE node = NULL; - hr = create_uia_node_from_hwnd(info.hwndFocus, &node, NODE_FLAG_IGNORE_CLIENTSIDE_HWND_PROVS); - if (SUCCEEDED(hr)) + if (SUCCEEDED(create_uia_node_from_hwnd(info.hwndFocus, &node, NODE_FLAG_IGNORE_CLIENTSIDE_HWND_PROVS))) uia_com_focus_handler_advise_node(event, node, info.hwndFocus); UiaNodeRelease(node); }

1 0

Connor McAdams : uiautomationcore: Don't return failure from ::GetEmbeddedFragmentRoots stub on the default BaseHwnd provider.
by Alexandre Julliard Oct. 30, 2023

Oct. 30, 2023

Module: wine Branch: master Commit: 4ed0a496189d2adab5a52d04b6b6443f9188fda6 URL: https://gitlab.winehq.org/wine/wine/-/commit/4ed0a496189d2adab5a52d04b6b644… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Oct 30 08:42:06 2023 -0400 uiautomationcore: Don't return failure from ::GetEmbeddedFragmentRoots stub on the default BaseHwnd provider. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/uia_provider.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/uiautomationcore/uia_provider.c b/dlls/uiautomationcore/uia_provider.c index 33bed429ec6..2e5f0e6c6ea 100644 --- a/dlls/uiautomationcore/uia_provider.c +++ b/dlls/uiautomationcore/uia_provider.c @@ -1883,7 +1883,7 @@ static HRESULT WINAPI base_hwnd_fragment_GetEmbeddedFragmentRoots(IRawElementPro { FIXME("%p, %p: stub!\n", iface, ret_val); *ret_val = NULL; - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI base_hwnd_fragment_SetFocus(IRawElementProviderFragment *iface)

1 0