- Wine-Commits - list.winehq.org

Nikolay Sivov : vkd3d-shader/hlsl: Validate break/continue context.
by Alexandre Julliard Oct. 31, 2023

Oct. 31, 2023

Module: vkd3d Branch: master Commit: 72623031a2604249dbd9ae14b883bfd0484e33ef URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/72623031a2604249dbd9ae14b883b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 24 21:05:42 2023 +0200 vkd3d-shader/hlsl: Validate break/continue context. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.h | 2 ++ libs/vkd3d-shader/hlsl.y | 42 +++++++++++++++++++++++++++++------------- tests/hlsl/switch.shader_test | 4 ++-- 3 files changed, 33 insertions(+), 15 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 6200d6b9..bd09e869 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -727,6 +727,8 @@ struct hlsl_scope struct hlsl_scope *upper; /* The scope was created for the loop statement. */ bool loop; + /* The scope was created for the switch statement. */ + bool _switch; }; struct hlsl_profile_info diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 20802eb2..5fd140fb 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -4640,12 +4640,31 @@ static void validate_texture_format_type(struct hlsl_ctx *ctx, struct hlsl_type } } -static struct hlsl_scope *get_loop_scope(struct hlsl_scope *scope) +static bool check_continue(struct hlsl_ctx *ctx, const struct hlsl_scope *scope, const struct vkd3d_shader_location *loc) { + if (scope->_switch) + { + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, + "The 'continue' statement is not allowed in 'switch' statements."); + return false; + } + if (scope->loop) - return scope; + return true; - return scope->upper ? get_loop_scope(scope->upper) : NULL; + if (scope->upper) + return check_continue(ctx, scope->upper, loc); + + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, "The 'continue' statement is only allowed in loops."); + return false; +} + +static bool is_break_allowed(const struct hlsl_scope *scope) +{ + if (scope->loop || scope->_switch) + return true; + + return scope->upper ? is_break_allowed(scope->upper) : false; } static void check_duplicated_switch_cases(struct hlsl_ctx *ctx, const struct hlsl_ir_switch_case *check, struct list *cases) @@ -5407,6 +5426,8 @@ loop_scope_start: switch_scope_start: %empty { + hlsl_push_scope(ctx); + ctx->cur_scope->_switch = true; } var_identifier: @@ -6244,12 +6265,10 @@ jump_statement: { struct hlsl_ir_node *jump; - /* TODO: allow 'break' in the 'switch' statements. */ - - if (!get_loop_scope(ctx->cur_scope)) + if (!is_break_allowed(ctx->cur_scope)) { hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, - "The 'break' statement must be used inside of a loop."); + "The 'break' statement must be used inside of a loop or a switch."); } if (!($$ = make_empty_block(ctx))) @@ -6261,13 +6280,8 @@ jump_statement: | KW_CONTINUE ';' { struct hlsl_ir_node *jump; - struct hlsl_scope *scope; - if (!(scope = get_loop_scope(ctx->cur_scope))) - { - hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, - "The 'continue' statement must be used inside of a loop."); - } + check_continue(ctx, ctx->cur_scope, &@1); if (!($$ = make_empty_block(ctx))) YYABORT; @@ -6411,6 +6425,8 @@ switch_statement: $$ = $5; hlsl_block_add_instr($$, s); + + hlsl_pop_scope(ctx); } switch_case: diff --git a/tests/hlsl/switch.shader_test b/tests/hlsl/switch.shader_test index e41834d7..720672a7 100644 --- a/tests/hlsl/switch.shader_test +++ b/tests/hlsl/switch.shader_test @@ -211,7 +211,7 @@ float4 main() : sv_target } % unterminated cases -[pixel shader fail(sm<6)] +[pixel shader fail(sm<6) todo] uint4 v; float4 main() : sv_target @@ -455,7 +455,7 @@ todo draw quad probe all rgba (1.0, 2.0, 3.0, 4.0) % 'continue' is not supported in switches -[pixel shader fail(sm<6) todo] +[pixel shader fail(sm<6)] uint4 v; float4 main() : sv_target

1 0

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

Oct. 31, 2023

Module: wine Branch: master Commit: 663e93e61f9b2c39af97bb69a83ed201de98487e URL: https://gitlab.winehq.org/wine/wine/-/commit/663e93e61f9b2c39af97bb69a83ed2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 31 13:26:36 2023 +0100 server: Only create Wow64 system directories for 32-bit platforms. --- server/registry.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/server/registry.c b/server/registry.c index 629d67c832f..0128b8be9d8 100644 --- a/server/registry.c +++ b/server/registry.c @@ -1990,8 +1990,6 @@ void init_registry(void) { case IMAGE_FILE_MACHINE_I386: mkdir( "drive_c/windows/syswow64", 0777 ); break; case IMAGE_FILE_MACHINE_ARMNT: mkdir( "drive_c/windows/sysarm32", 0777 ); break; - case IMAGE_FILE_MACHINE_AMD64: mkdir( "drive_c/windows/sysx8664", 0777 ); break; - case IMAGE_FILE_MACHINE_ARM64: mkdir( "drive_c/windows/sysarm64", 0777 ); break; } } }

1 0

Alexandre Julliard : winegcc: Use a temp file for the implicitly created import library.
by Alexandre Julliard Oct. 31, 2023

Oct. 31, 2023

Module: wine Branch: master Commit: 4819a850a0ee4ad1989bbd5c7207c5d952166d14 URL: https://gitlab.winehq.org/wine/wine/-/commit/4819a850a0ee4ad1989bbd5c7207c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 31 16:34:40 2023 +0100 winegcc: Use a temp file for the implicitly created import library. Otherwise clang creates a .lib file along with every dll. --- tools/winegcc/winegcc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index b8eb5e4fc79..4924f608720 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -465,6 +465,8 @@ static struct strarray get_link_args( struct options *opts, const char *output_n if (opts->out_implib) strarray_add(&link_args, strmake("-Wl,-implib:%s", opts->out_implib)); + else + strarray_add(&link_args, strmake("-Wl,-implib:%s", make_temp_file( output_name, ".lib" ))); strarray_add( &link_args, strmake( "-Wl,-filealign:%s", opts->file_align ? opts->file_align : "0x1000" ));

1 0

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

Oct. 31, 2023

Module: wine Branch: master Commit: c9a011a9cbeeebff37d420967c717f10c7a70657 URL: https://gitlab.winehq.org/wine/wine/-/commit/c9a011a9cbeeebff37d420967c717f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 31 14:07:05 2023 +0100 wow64: Only support Wow64 system directories for 32-bit platforms. --- dlls/wow64/wow64_private.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/wow64/wow64_private.h b/dlls/wow64/wow64_private.h index c063704859a..470738ea2bd 100644 --- a/dlls/wow64/wow64_private.h +++ b/dlls/wow64/wow64_private.h @@ -64,8 +64,6 @@ static inline const WCHAR *get_machine_wow64_dir( USHORT machine ) case IMAGE_FILE_MACHINE_TARGET_HOST: return L"\\??\\C:\\windows\\system32"; 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: Only check Wow64 system directories for 32-bit platforms.
by Alexandre Julliard Oct. 31, 2023

Oct. 31, 2023

Module: wine Branch: master Commit: 3d66e96b7f1e9e95d89eddbd956fb3d1e8f7bc22 URL: https://gitlab.winehq.org/wine/wine/-/commit/3d66e96b7f1e9e95d89eddbd956fb3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 31 13:19:56 2023 +0100 ntdll: Only check Wow64 system directories for 32-bit platforms. --- dlls/ntdll/unix/loader.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index c442f7f6be2..bfa161e25c9 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1568,8 +1568,6 @@ static const WCHAR *get_machine_wow64_dir( WORD machine ) static const WCHAR system32[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\','s','y','s','t','e','m','3','2','\\',0}; static const WCHAR syswow64[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\','s','y','s','w','o','w','6','4','\\',0}; static const WCHAR sysarm32[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\','s','y','s','a','r','m','3','2','\\',0}; - static const WCHAR sysx8664[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\','s','y','s','x','8','6','6','4','\\',0}; - static const WCHAR sysarm64[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\','s','y','s','a','r','m','6','4','\\',0}; if (machine == native_machine) machine = IMAGE_FILE_MACHINE_TARGET_HOST; @@ -1578,8 +1576,6 @@ static const WCHAR *get_machine_wow64_dir( WORD machine ) case IMAGE_FILE_MACHINE_TARGET_HOST: return system32; case IMAGE_FILE_MACHINE_I386: return syswow64; case IMAGE_FILE_MACHINE_ARMNT: return sysarm32; - case IMAGE_FILE_MACHINE_AMD64: return sysx8664; - case IMAGE_FILE_MACHINE_ARM64: return sysarm64; default: return NULL; } } @@ -1602,6 +1598,7 @@ BOOL is_builtin_path( const UNICODE_STRING *path, WORD *machine ) for (i = 0; i < supported_machines_count; i++) { sysdir = get_machine_wow64_dir( supported_machines[i] ); + if (!sysdir) continue; dirlen = wcslen( sysdir ); if (len <= dirlen) continue; if (wcsnicmp( p, sysdir, dirlen )) continue; @@ -1941,9 +1938,14 @@ static void load_wow64_ntdll( USHORT machine ) void *module; unsigned int status; SIZE_T size; - WCHAR *path = malloc( sizeof("\\??\\C:\\windows\\system32\\ntdll.dll") * sizeof(WCHAR) ); + const WCHAR *wow64_dir; + WCHAR *path; - wcscpy( path, get_machine_wow64_dir( machine )); + if (machine == current_machine) return; + if (!(wow64_dir = get_machine_wow64_dir( machine ))) return; + + path = malloc( sizeof("\\??\\C:\\windows\\system32\\ntdll.dll") * sizeof(WCHAR) ); + wcscpy( path, wow64_dir ); wcscat( path, ntdllW ); init_unicode_string( &nt_name, path ); status = find_builtin_dll( &nt_name, &module, &size, &info, 0, 0, machine, 0, FALSE ); @@ -2004,7 +2006,7 @@ static void start_main_thread(void) init_thread_stack( teb, 0, 0, 0 ); NtCreateKeyedEvent( &keyed_event, GENERIC_READ | GENERIC_WRITE, NULL, 0 ); load_ntdll(); - if (main_image_info.Machine != current_machine) load_wow64_ntdll( main_image_info.Machine ); + load_wow64_ntdll( main_image_info.Machine ); load_apiset_dll(); ntdll_init_syscalls( &syscall_table, p__wine_syscall_dispatcher ); server_init_process_done();

1 0

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