March 2021 - Wine-commits - list.winehq.org

Alexandre Julliard : ntdll: Allow using the .fake files from the build tree as PE mapping placeholders.
by Alexandre Julliard 30 Mar '21

30 Mar '21

Module: wine Branch: master Commit: 4a10f3a188e585bcf71bd191ab3d790f1a89b397 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a10f3a188e585bcf71bd191… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 30 10:06:44 2021 +0200 ntdll: Allow using the .fake files from the build tree as PE mapping placeholders. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 49 +++++++++++++++++------------------------- dlls/ntdll/unix/unix_private.h | 2 +- 2 files changed, 21 insertions(+), 30 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 9aab5102b8a..7c4572e6b0e 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1395,7 +1395,7 @@ static NTSTATUS CDECL load_builtin_dll( UNICODE_STRING *nt_name, void **module, * Load the builtin dll if specified by load order configuration. * Return STATUS_IMAGE_ALREADY_LOADED if we should keep the native one that we have found. */ -NTSTATUS load_builtin( const pe_image_info_t *image_info, const WCHAR *filename, +NTSTATUS load_builtin( const pe_image_info_t *image_info, WCHAR *filename, void **module, SIZE_T *size ) { WORD machine = image_info->machine; /* request same machine as the native one */ @@ -1404,38 +1404,32 @@ NTSTATUS load_builtin( const pe_image_info_t *image_info, const WCHAR *filename, SECTION_IMAGE_INFORMATION info; enum loadorder loadorder; + /* remove .fake extension if present */ + if (image_info->image_flags & IMAGE_FLAGS_WineFakeDll) + { + static const WCHAR fakeW[] = {'.','f','a','k','e',0}; + WCHAR *ext = wcsrchr( filename, '.' ); + + TRACE( "%s is a fake Wine dll\n", debugstr_w(filename) ); + if (ext && !wcsicmp( ext, fakeW )) *ext = 0; + } + init_unicode_string( &nt_name, filename ); loadorder = get_load_order( &nt_name ); + if (loadorder == LO_DISABLED) return STATUS_DLL_NOT_FOUND; + if (image_info->image_flags & IMAGE_FLAGS_WineBuiltin) { - switch (loadorder) - { - case LO_NATIVE_BUILTIN: - case LO_BUILTIN: - case LO_BUILTIN_NATIVE: - case LO_DEFAULT: - status = find_builtin_dll( &nt_name, module, size, &info, machine, FALSE ); - if (status == STATUS_DLL_NOT_FOUND) return STATUS_IMAGE_ALREADY_LOADED; - return status; - default: - return STATUS_DLL_NOT_FOUND; - } + if (loadorder == LO_NATIVE) return STATUS_DLL_NOT_FOUND; + loadorder = LO_BUILTIN_NATIVE; /* load builtin, then fallback to the file we found */ } - if (image_info->image_flags & IMAGE_FLAGS_WineFakeDll) + else if (image_info->image_flags & IMAGE_FLAGS_WineFakeDll) { - TRACE( "%s is a fake Wine dll\n", debugstr_us(&nt_name) ); - switch (loadorder) - { - case LO_NATIVE_BUILTIN: - case LO_BUILTIN: - case LO_BUILTIN_NATIVE: - case LO_DEFAULT: - return find_builtin_dll( &nt_name, module, size, &info, machine, FALSE ); - default: - return STATUS_DLL_NOT_FOUND; - } + if (loadorder == LO_NATIVE) return STATUS_DLL_NOT_FOUND; + loadorder = LO_BUILTIN; /* builtin with no fallback since mapping a fake dll is not useful */ } + switch (loadorder) { case LO_NATIVE: @@ -1443,13 +1437,10 @@ NTSTATUS load_builtin( const pe_image_info_t *image_info, const WCHAR *filename, return STATUS_IMAGE_ALREADY_LOADED; case LO_BUILTIN: return find_builtin_dll( &nt_name, module, size, &info, machine, FALSE ); - case LO_BUILTIN_NATIVE: - case LO_DEFAULT: + default: status = find_builtin_dll( &nt_name, module, size, &info, machine, (loadorder == LO_DEFAULT) ); if (status == STATUS_DLL_NOT_FOUND) return STATUS_IMAGE_ALREADY_LOADED; return status; - default: - return STATUS_DLL_NOT_FOUND; } } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 1557aa2371a..05ba8202ee7 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -143,7 +143,7 @@ extern DWORD ntdll_umbstowcs( const char *src, DWORD srclen, WCHAR *dst, DWORD d extern int ntdll_wcstoumbs( const WCHAR *src, DWORD srclen, char *dst, DWORD dstlen, BOOL strict ) DECLSPEC_HIDDEN; extern char **build_envp( const WCHAR *envW ) DECLSPEC_HIDDEN; extern NTSTATUS exec_wineloader( char **argv, int socketfd, const pe_image_info_t *pe_info ) DECLSPEC_HIDDEN; -extern NTSTATUS load_builtin( const pe_image_info_t *image_info, const WCHAR *filename, +extern NTSTATUS load_builtin( const pe_image_info_t *image_info, WCHAR *filename, void **addr_ptr, SIZE_T *size_ptr ) DECLSPEC_HIDDEN; extern BOOL is_builtin_path( const UNICODE_STRING *path, WORD *machine ) DECLSPEC_HIDDEN; extern NTSTATUS load_main_exe( const WCHAR *name, const char *unix_name, const WCHAR *curdir, WCHAR **image,

1 0

Alexandre Julliard : ntdll: Map the builtin or fake dll from the Wine dirs if it's missing from the prefix.
by Alexandre Julliard 30 Mar '21

30 Mar '21

Module: wine Branch: master Commit: bb065801a693e1cd305d2a507c206f1b21a142d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb065801a693e1cd305d2a50… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 30 10:12:07 2021 +0200 ntdll: Map the builtin or fake dll from the Wine dirs if it's missing from the prefix. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/module.c | 4 +- dlls/mscoree/tests/mscoree.c | 4 +- dlls/ntdll/loader.c | 141 ++++++++++++++++++++++++++----------------- 3 files changed, 88 insertions(+), 61 deletions(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 6eb2fc804d1..46f5c43b54e 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -422,10 +422,8 @@ static void testLoadLibraryEx(void) /* load kernel32.dll with an absolute path that does not exist */ SetLastError(0xdeadbeef); hmodule = LoadLibraryExA(path, NULL, LOAD_LIBRARY_AS_DATAFILE); + ok(hmodule == 0, "Expected 0, got %p\n", hmodule); todo_wine - { - ok(hmodule == 0, "Expected 0, got %p\n", hmodule); - } ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index 9974eff6335..92126339ef0 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -368,7 +368,7 @@ static void test_loadlibraryshim(void) } hr = pLoadLibraryShim(fusion, vbogus, NULL, &hdll); - todo_wine ok(hr == E_HANDLE, "LoadLibraryShim failed, hr=%x\n", hr); + ok(hr == E_HANDLE, "LoadLibraryShim failed, hr=%x\n", hr); if (SUCCEEDED(hr)) FreeLibrary(hdll); @@ -406,7 +406,7 @@ static void test_loadlibraryshim(void) FreeLibrary(hdll); hr = pLoadLibraryShim(gdidll, latest, NULL, &hdll); - todo_wine ok(hr == E_HANDLE, "LoadLibraryShim failed, hr=%x\n", hr); + ok(hr == E_HANDLE, "LoadLibraryShim failed, hr=%x\n", hr); if (SUCCEEDED(hr)) FreeLibrary(hdll); } diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 7dada146044..e8b53778284 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2378,38 +2378,6 @@ static NTSTATUS load_so_dll( LPCWSTR load_path, const UNICODE_STRING *nt_name, } -/*********************************************************************** - * load_builtin_dll - */ -static NTSTATUS load_builtin_dll( LPCWSTR load_path, UNICODE_STRING *nt_name, - DWORD flags, WINE_MODREF** pwm, BOOL prefer_native ) -{ - NTSTATUS status; - void *module; - SECTION_IMAGE_INFORMATION image_info; - - TRACE("Trying built-in %s\n", debugstr_us(nt_name)); - - status = unix_funcs->load_builtin_dll( nt_name, &module, &image_info, prefer_native ); - if (status) return status; - - if ((*pwm = find_existing_module( module ))) /* already loaded */ - { - if ((*pwm)->ldr.LoadCount != -1) (*pwm)->ldr.LoadCount++; - TRACE( "Found %s for %s at %p, count=%d\n", - debugstr_us(&(*pwm)->ldr.FullDllName), debugstr_us(nt_name), - (*pwm)->ldr.DllBase, (*pwm)->ldr.LoadCount); - if (module != (*pwm)->ldr.DllBase) NtUnmapViewOfSection( NtCurrentProcess(), module ); - return STATUS_SUCCESS; - } - - TRACE( "loading %s\n", debugstr_us(nt_name) ); - status = build_module( load_path, nt_name, &module, &image_info, NULL, flags, pwm ); - if (status && module) NtUnmapViewOfSection( NtCurrentProcess(), module ); - return status; -} - - /************************************************************************* * build_main_module * @@ -2553,6 +2521,86 @@ done: } +/*********************************************************************** + * get_env_var + */ +static NTSTATUS get_env_var( const WCHAR *name, SIZE_T extra, UNICODE_STRING *ret ) +{ + NTSTATUS status; + SIZE_T len, size = 1024 + extra; + + for (;;) + { + ret->Buffer = RtlAllocateHeap( GetProcessHeap(), 0, size ); + status = RtlQueryEnvironmentVariable( NULL, name, wcslen(name), + ret->Buffer, size - extra - 1, &len ); + if (!status) + { + ret->Buffer[len] = 0; + ret->Length = len * sizeof(WCHAR); + ret->MaximumLength = size * sizeof(WCHAR); + return status; + } + RtlFreeHeap( GetProcessHeap(), 0, ret->Buffer ); + if (status != STATUS_BUFFER_TOO_SMALL) return status; + size = len + 1 + extra; + } +} + + +/*********************************************************************** + * find_builtin_without_file + * + * Find a builtin dll when the corresponding file cannot be found in the prefix. + * This is used during prefix bootstrap. + */ +static NTSTATUS find_builtin_without_file( const WCHAR *name, UNICODE_STRING *new_name, + WINE_MODREF **pwm, HANDLE *mapping, + SECTION_IMAGE_INFORMATION *image_info, struct file_id *id ) +{ + const WCHAR *ext; + WCHAR dllpath[32]; + DWORD i, len; + NTSTATUS status = STATUS_DLL_NOT_FOUND; + BOOL found_image = FALSE; + + if (!get_env_var( L"WINEBUILDDIR", 20 + 2 * wcslen(name), new_name )) + { + RtlAppendUnicodeToString( new_name, L"\\dlls\\" ); + RtlAppendUnicodeToString( new_name, name ); + if ((ext = wcsrchr( name, '.' )) && !wcscmp( ext, L".dll" )) new_name->Length -= 4 * sizeof(WCHAR); + RtlAppendUnicodeToString( new_name, L"\\" ); + RtlAppendUnicodeToString( new_name, name ); + status = open_dll_file( new_name, pwm, mapping, image_info, id ); + if (status != STATUS_DLL_NOT_FOUND) return status; + RtlAppendUnicodeToString( new_name, L".fake" ); + status = open_dll_file( new_name, pwm, mapping, image_info, id ); + if (status != STATUS_DLL_NOT_FOUND) return status; + RtlFreeUnicodeString( new_name ); + } + for (i = 0; ; i++) + { + swprintf( dllpath, ARRAY_SIZE(dllpath), L"WINEDLLDIR%u", i ); + if (get_env_var( dllpath, 20 + wcslen(name), new_name )) break; + len = new_name->Length; + RtlAppendUnicodeToString( new_name, L"\\" ); + RtlAppendUnicodeToString( new_name, name ); + status = open_dll_file( new_name, pwm, mapping, image_info, id ); + if (status == STATUS_IMAGE_MACHINE_TYPE_MISMATCH) found_image = TRUE; + else if (status != STATUS_DLL_NOT_FOUND) return status; + new_name->Length = len; + RtlAppendUnicodeToString( new_name, L"\\fakedlls\\" ); + RtlAppendUnicodeToString( new_name, name ); + status = open_dll_file( new_name, pwm, mapping, image_info, id ); + if (status == STATUS_IMAGE_MACHINE_TYPE_MISMATCH) found_image = TRUE; + else if (status != STATUS_DLL_NOT_FOUND) return status; + RtlFreeUnicodeString( new_name ); + } + if (found_image) status = STATUS_IMAGE_MACHINE_TYPE_MISMATCH; + return status; +} + + /*********************************************************************** * search_dll_file * @@ -2597,14 +2645,10 @@ static NTSTATUS search_dll_file( LPCWSTR paths, LPCWSTR search, UNICODE_STRING * paths = ptr; } - if (!found_image) - { - /* not found, return file in the system dir to be loaded as builtin */ - wcscpy( name, system_dir ); - wcscat( name, search ); - if (!RtlDosPathNameToNtPathName_U( name, nt_name, NULL, NULL )) status = STATUS_NO_MEMORY; - } - else status = STATUS_IMAGE_MACHINE_TYPE_MISMATCH; + if (found_image) + status = STATUS_IMAGE_MACHINE_TYPE_MISMATCH; + else if (!wcspbrk( search, L":/\\" )) + status = find_builtin_without_file( search, nt_name, pwm, mapping, image_info, id ); done: RtlFreeHeap( GetProcessHeap(), 0, name ); @@ -2713,7 +2757,7 @@ static NTSTATUS load_dll( const WCHAR *load_path, const WCHAR *libname, const WC return STATUS_SUCCESS; } - if (nts && nts != STATUS_DLL_NOT_FOUND && nts != STATUS_INVALID_IMAGE_NOT_MZ) goto done; + if (nts && nts != STATUS_INVALID_IMAGE_NOT_MZ) goto done; prev = NtCurrentTeb()->Tib.ArbitraryUserPointer; NtCurrentTeb()->Tib.ArbitraryUserPointer = nt_name.Buffer + 4; @@ -2727,21 +2771,6 @@ static NTSTATUS load_dll( const WCHAR *load_path, const WCHAR *libname, const WC case STATUS_SUCCESS: /* valid PE file */ nts = load_native_dll( load_path, &nt_name, mapping, &image_info, &id, flags, pwm ); break; - - case STATUS_DLL_NOT_FOUND: /* no file found, try builtin */ - switch (unix_funcs->get_load_order( &nt_name )) - { - case LO_NATIVE_BUILTIN: - case LO_BUILTIN: - case LO_BUILTIN_NATIVE: - case LO_DEFAULT: - nts = load_builtin_dll( load_path, &nt_name, flags, pwm, FALSE ); - break; - default: - nts = STATUS_DLL_NOT_FOUND; - break; - } - break; } NtCurrentTeb()->Tib.ArbitraryUserPointer = prev;

1 0

Alexandre Julliard : ntdll: Remove load_builtin_dll() and get_load_order() from the Unix interface.
by Alexandre Julliard 30 Mar '21

30 Mar '21

Module: wine Branch: master Commit: f55f0b8448b6810f583784235d809bdbb10b2d6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f55f0b8448b6810f58378423… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 30 10:20:54 2021 +0200 ntdll: Remove load_builtin_dll() and get_load_order() from the Unix interface. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 17 ----------------- dlls/ntdll/unix/loadorder.c | 2 +- dlls/ntdll/unix/unix_private.h | 13 ++++++++++++- dlls/ntdll/unixlib.h | 16 +--------------- 4 files changed, 14 insertions(+), 34 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 7c4572e6b0e..4c76865019b 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1374,21 +1374,6 @@ done: } -/*********************************************************************** - * load_builtin_dll - */ -static NTSTATUS CDECL load_builtin_dll( UNICODE_STRING *nt_name, void **module, - SECTION_IMAGE_INFORMATION *image_info, BOOL prefer_native ) -{ - SIZE_T size; - NTSTATUS status; - - status = find_builtin_dll( nt_name, module, &size, image_info, current_machine, prefer_native ); - if (status == STATUS_IMAGE_NOT_AT_BASE) status = STATUS_SUCCESS; - return status; -} - - /*********************************************************************** * load_builtin * @@ -1794,11 +1779,9 @@ static struct unix_funcs unix_funcs = ntdll_tan, virtual_release_address_space, load_so_dll, - load_builtin_dll, init_builtin_dll, init_unix_lib, unwind_builtin_dll, - get_load_order, __wine_dbg_get_channel_flags, __wine_dbg_strdup, __wine_dbg_output, diff --git a/dlls/ntdll/unix/loadorder.c b/dlls/ntdll/unix/loadorder.c index 67a7473dc7f..49af8eb6adb 100644 --- a/dlls/ntdll/unix/loadorder.c +++ b/dlls/ntdll/unix/loadorder.c @@ -378,7 +378,7 @@ static enum loadorder get_load_order_value( HANDLE std_key, HANDLE app_key, WCHA * Return the loadorder of a module. * The system directory and '.dll' extension is stripped from the path. */ -enum loadorder CDECL get_load_order( const UNICODE_STRING *nt_name ) +enum loadorder get_load_order( const UNICODE_STRING *nt_name ) { static const WCHAR prefixW[] = {'\\','?','?','\\'}; enum loadorder ret = LO_INVALID; diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 05ba8202ee7..3987cc6c4d0 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -400,7 +400,18 @@ static inline void context_init_xstate( CONTEXT *context, void *xstate_buffer ) } #endif -extern enum loadorder CDECL get_load_order( const UNICODE_STRING *nt_name ) DECLSPEC_HIDDEN; +enum loadorder +{ + LO_INVALID, + LO_DISABLED, + LO_NATIVE, + LO_BUILTIN, + LO_NATIVE_BUILTIN, /* native then builtin */ + LO_BUILTIN_NATIVE, /* builtin then native */ + LO_DEFAULT /* nothing specified, use default strategy */ +}; + +extern enum loadorder get_load_order( const UNICODE_STRING *nt_name ) DECLSPEC_HIDDEN; static inline size_t ntdll_wcslen( const WCHAR *str ) { diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index 80e4eaefc75..04ae8230b1a 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -25,19 +25,8 @@ struct _DISPATCHER_CONTEXT; -enum loadorder -{ - LO_INVALID, - LO_DISABLED, - LO_NATIVE, - LO_BUILTIN, - LO_NATIVE_BUILTIN, /* native then builtin */ - LO_BUILTIN_NATIVE, /* builtin then native */ - LO_DEFAULT /* nothing specified, use default strategy */ -}; - /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 119 +#define NTDLL_UNIXLIB_VERSION 120 struct unix_funcs { @@ -85,13 +74,10 @@ struct unix_funcs /* loader functions */ NTSTATUS (CDECL *load_so_dll)( UNICODE_STRING *nt_name, void **module ); - NTSTATUS (CDECL *load_builtin_dll)( UNICODE_STRING *name, void **module, - SECTION_IMAGE_INFORMATION *image_info, BOOL prefer_native ); void (CDECL *init_builtin_dll)( void *module ); NTSTATUS (CDECL *init_unix_lib)( void *module, DWORD reason, const void *ptr_in, void *ptr_out ); NTSTATUS (CDECL *unwind_builtin_dll)( ULONG type, struct _DISPATCHER_CONTEXT *dispatch, CONTEXT *context ); - enum loadorder (CDECL *get_load_order)( const UNICODE_STRING *nt_name ); /* debugging functions */ unsigned char (CDECL *dbg_get_channel_flags)( struct __wine_debug_channel *channel );

1 0

Zebediah Figura : vkd3d-shader: Create a separate variable for uniforms.
by Alexandre Julliard 30 Mar '21

30 Mar '21

Module: vkd3d Branch: master Commit: 21fea55c2db6168b544853b588bd642fb8bbe445 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=21fea55c2db6168b544853b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Mar 28 21:46:55 2021 +0200 vkd3d-shader: Create a separate variable for uniforms. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_codegen.c | 59 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 58 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 21bd9ab..e9f3699 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -19,6 +19,49 @@ */ #include "hlsl.h" +#include <stdio.h> + +/* Split uniforms into two variables representing the constant and temp + * registers, and copy the former to the latter, so that writes to uniforms + * work. */ +static void prepend_uniform_copy(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_var *var) +{ + struct vkd3d_string_buffer *name; + struct hlsl_ir_assignment *store; + struct hlsl_ir_var *const_var; + struct hlsl_ir_load *load; + + if (!(name = vkd3d_string_buffer_get(&ctx->string_buffers))) + { + ctx->failed = true; + return; + } + vkd3d_string_buffer_printf(name, "<uniform-%s>", var->name); + if (!(const_var = hlsl_new_var(vkd3d_strdup(name->buffer), var->data_type, var->loc, NULL, var->reg_reservation))) + { + vkd3d_string_buffer_release(&ctx->string_buffers, name); + ctx->failed = true; + return; + } + vkd3d_string_buffer_release(&ctx->string_buffers, name); + list_add_head(&ctx->globals->vars, &const_var->scope_entry); + var->is_uniform = 0; + const_var->is_uniform = 1; + + if (!(load = hlsl_new_var_load(const_var, var->loc))) + { + ctx->failed = true; + return; + } + list_add_head(instrs, &load->node.entry); + + if (!(store = hlsl_new_simple_assignment(var, &load->node))) + { + ctx->failed = true; + return; + } + list_add_after(&load->node.entry, &store->node.entry); +} static bool transform_ir(struct hlsl_ctx *ctx, bool (*func)(struct hlsl_ctx *ctx, struct hlsl_ir_node *, void *), struct list *instrs, void *context) @@ -404,7 +447,7 @@ static void compute_liveness(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl LIST_FOR_EACH_ENTRY(var, entry_func->parameters, struct hlsl_ir_var, param_entry) { - if (var->is_input_varying || var->is_uniform) + if (var->is_input_varying) var->first_write = 1; if (var->is_output_varying) var->last_read = UINT_MAX; @@ -418,8 +461,22 @@ static void compute_liveness(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func) { + struct hlsl_ir_var *var; + list_move_head(entry_func->body, &ctx->static_initializers); + LIST_FOR_EACH_ENTRY(var, &ctx->globals->vars, struct hlsl_ir_var, scope_entry) + { + if (var->is_uniform) + prepend_uniform_copy(ctx, entry_func->body, var); + } + + LIST_FOR_EACH_ENTRY(var, entry_func->parameters, struct hlsl_ir_var, param_entry) + { + if (var->is_uniform) + prepend_uniform_copy(ctx, entry_func->body, var); + } + while (transform_ir(ctx, fold_redundant_casts, entry_func->body, NULL)); while (transform_ir(ctx, split_struct_copies, entry_func->body, NULL)); while (transform_ir(ctx, fold_constants, entry_func->body, NULL));

1 0

Zebediah Figura : vkd3d-shader: Check for missing semantics on entry function parameters.
by Alexandre Julliard 30 Mar '21

30 Mar '21

Module: vkd3d Branch: master Commit: 9a70d5769020c20c4476603d30e2de5776007c9d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9a70d5769020c20c4476603… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Mar 28 21:46:56 2021 +0200 vkd3d-shader: Check for missing semantics on entry function parameters. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 9 +++++++++ tests/hlsl-invalid.shader_test | 13 +++++++++++++ 2 files changed, 22 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 794166d..daf354d 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1626,6 +1626,7 @@ int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d struct hlsl_ir_function_decl *entry_func; const struct hlsl_profile_info *profile; const char *entry_point; + struct hlsl_ir_var *var; struct hlsl_ctx ctx; int ret; @@ -1668,6 +1669,14 @@ int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d return VKD3D_ERROR_INVALID_SHADER; } + LIST_FOR_EACH_ENTRY(var, entry_func->parameters, struct hlsl_ir_var, param_entry) + { + if (var->data_type->type != HLSL_CLASS_STRUCT && !var->semantic + && (var->is_input_varying || var->is_output_varying)) + hlsl_error(&ctx, var->loc, VKD3D_SHADER_ERROR_HLSL_MISSING_SEMANTIC, + "Parameter \"%s\" is missing a semantic.", var->name); + } + if (!hlsl_type_is_void(entry_func->return_type) && entry_func->return_type->type != HLSL_CLASS_STRUCT && !entry_func->semantic) hlsl_error(&ctx, entry_func->loc, VKD3D_SHADER_ERROR_HLSL_MISSING_SEMANTIC, diff --git a/tests/hlsl-invalid.shader_test b/tests/hlsl-invalid.shader_test index 370d84d..b30ff3d 100644 --- a/tests/hlsl-invalid.shader_test +++ b/tests/hlsl-invalid.shader_test @@ -108,6 +108,19 @@ float4 main(out float4 o : sv_target) return 0; } +[pixel shader fail] +float4 main(out float4 o) : sv_target +{ + o = 1; + return 0; +} + +[pixel shader fail] +float4 main(in float4 i) : sv_target +{ + return 0; +} + [pixel shader fail] struct {float4 a;};

1 0

Zebediah Figura : vkd3d-shader: Create a separate variable for input varyings.
by Alexandre Julliard 30 Mar '21

30 Mar '21

Module: vkd3d Branch: master Commit: a6e47e155217741212955897f1b00bbfefce2d9d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a6e47e15521774121295589… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Mar 28 21:46:57 2021 +0200 vkd3d-shader: Create a separate variable for input varyings. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_codegen.c | 83 ++++++++++++++++++++++++++++++++++++++-- tests/hlsl-invalid.shader_test | 11 ++++++ 2 files changed, 91 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index e9f3699..ca38fe7 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -63,6 +63,83 @@ static void prepend_uniform_copy(struct hlsl_ctx *ctx, struct list *instrs, stru list_add_after(&load->node.entry, &store->node.entry); } +static void prepend_input_copy(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_var *var, + struct hlsl_type *type, unsigned int field_offset, const char *semantic) +{ + struct vkd3d_string_buffer *name; + struct hlsl_ir_assignment *store; + struct hlsl_ir_constant *offset; + struct hlsl_ir_var *varying; + struct hlsl_ir_load *load; + + if (!(name = vkd3d_string_buffer_get(&ctx->string_buffers))) + { + ctx->failed = true; + return; + } + vkd3d_string_buffer_printf(name, "<input-%s>", semantic); + if (!(varying = hlsl_new_var(vkd3d_strdup(name->buffer), type, var->loc, vkd3d_strdup(semantic), NULL))) + { + vkd3d_string_buffer_release(&ctx->string_buffers, name); + ctx->failed = true; + return; + } + vkd3d_string_buffer_release(&ctx->string_buffers, name); + varying->is_input_varying = 1; + list_add_head(&ctx->globals->vars, &varying->scope_entry); + + if (!(load = hlsl_new_var_load(varying, var->loc))) + { + ctx->failed = true; + return; + } + list_add_head(instrs, &load->node.entry); + + if (!(offset = hlsl_new_uint_constant(ctx, field_offset * 4, var->loc))) + { + ctx->failed = true; + return; + } + list_add_after(&load->node.entry, &offset->node.entry); + + if (!(store = hlsl_new_assignment(var, &offset->node, &load->node, 0, var->loc))) + { + ctx->failed = true; + return; + } + list_add_after(&offset->node.entry, &store->node.entry); +} + +static void prepend_input_struct_copy(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_var *var, + struct hlsl_type *type, unsigned int field_offset) +{ + struct hlsl_struct_field *field; + + LIST_FOR_EACH_ENTRY(field, type->e.elements, struct hlsl_struct_field, entry) + { + if (field->type->type == HLSL_CLASS_STRUCT) + prepend_input_struct_copy(ctx, instrs, var, field->type, field_offset + field->reg_offset); + else if (field->semantic) + prepend_input_copy(ctx, instrs, var, field->type, field_offset + field->reg_offset, field->semantic); + else + hlsl_error(ctx, field->loc, VKD3D_SHADER_ERROR_HLSL_MISSING_SEMANTIC, + "Field '%s' is missing a semantic.", field->name); + } +} + +/* Split input varyings into two variables representing the varying and temp + * registers, and copy the former to the latter, so that writes to input + * varyings work. */ +static void prepend_input_var_copy(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_var *var) +{ + if (var->data_type->type == HLSL_CLASS_STRUCT) + prepend_input_struct_copy(ctx, instrs, var, var->data_type, 0); + else if (var->semantic) + prepend_input_copy(ctx, instrs, var, var->data_type, 0, var->semantic); + + var->is_input_varying = 0; +} + static bool transform_ir(struct hlsl_ctx *ctx, bool (*func)(struct hlsl_ctx *ctx, struct hlsl_ir_node *, void *), struct list *instrs, void *context) { @@ -441,14 +518,12 @@ static void compute_liveness(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl LIST_FOR_EACH_ENTRY(var, &ctx->globals->vars, struct hlsl_ir_var, scope_entry) { - if (var->is_uniform) + if (var->is_uniform || var->is_input_varying) var->first_write = 1; } LIST_FOR_EACH_ENTRY(var, entry_func->parameters, struct hlsl_ir_var, param_entry) { - if (var->is_input_varying) - var->first_write = 1; if (var->is_output_varying) var->last_read = UINT_MAX; } @@ -475,6 +550,8 @@ int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun { if (var->is_uniform) prepend_uniform_copy(ctx, entry_func->body, var); + if (var->is_input_varying) + prepend_input_var_copy(ctx, entry_func->body, var); } while (transform_ir(ctx, fold_redundant_casts, entry_func->body, NULL)); diff --git a/tests/hlsl-invalid.shader_test b/tests/hlsl-invalid.shader_test index b30ff3d..59a0dbe 100644 --- a/tests/hlsl-invalid.shader_test +++ b/tests/hlsl-invalid.shader_test @@ -135,3 +135,14 @@ float4 main() : sv_target const float4 x; return x; } + +[pixel shader fail] +struct input +{ + float4 a; +}; + +float4 main(struct input i) : sv_target +{ + return i.a; +}

1 0

Zebediah Figura : vkd3d-shader: Store the function return semantic in the return variable.
by Alexandre Julliard 30 Mar '21

30 Mar '21

Module: vkd3d Branch: master Commit: 5ad94644ec9b151e5dc4898086cf3ab880c39fe4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5ad94644ec9b151e5dc4898… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Mar 28 21:46:58 2021 +0200 vkd3d-shader: Store the function return semantic in the return variable. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 9 +++------ libs/vkd3d-shader/hlsl.h | 1 - 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index daf354d..53b9db3 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -563,7 +563,6 @@ struct hlsl_ir_function_decl *hlsl_new_func_decl(struct hlsl_ctx *ctx, struct hl return NULL; decl->return_type = return_type; decl->parameters = parameters; - decl->semantic = semantic; decl->loc = loc; if (!hlsl_type_is_void(return_type)) @@ -572,11 +571,12 @@ struct hlsl_ir_function_decl *hlsl_new_func_decl(struct hlsl_ctx *ctx, struct hl char name[28]; sprintf(name, "<retval-%p>", decl); - if (!(return_var = hlsl_new_synthetic_var(ctx, name, return_type, loc))) + if (!(return_var = hlsl_new_var(vkd3d_strdup(name), return_type, loc, semantic, NULL))) { vkd3d_free(decl); return NULL; } + list_add_tail(&ctx->globals->vars, &return_var->scope_entry); decl->return_var = return_var; } @@ -1161,8 +1161,6 @@ void hlsl_dump_function(const struct hlsl_ir_function_decl *func) dump_ir_var(&buffer, param); vkd3d_string_buffer_printf(&buffer, "\n"); } - if (func->semantic) - vkd3d_string_buffer_printf(&buffer, "Function semantic: %s\n", func->semantic); if (func->body) dump_instr_list(&buffer, func->body); @@ -1302,7 +1300,6 @@ void hlsl_free_instr(struct hlsl_ir_node *node) static void free_function_decl(struct hlsl_ir_function_decl *decl) { - vkd3d_free((void *)decl->semantic); vkd3d_free(decl->parameters); hlsl_free_instr_list(decl->body); vkd3d_free(decl); @@ -1678,7 +1675,7 @@ int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d } if (!hlsl_type_is_void(entry_func->return_type) - && entry_func->return_type->type != HLSL_CLASS_STRUCT && !entry_func->semantic) + && entry_func->return_type->type != HLSL_CLASS_STRUCT && !entry_func->return_var->semantic) hlsl_error(&ctx, entry_func->loc, VKD3D_SHADER_ERROR_HLSL_MISSING_SEMANTIC, "Entry point \"%s\" is missing a return value semantic.", entry_point); diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index cc740ea..cf12f63 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -229,7 +229,6 @@ struct hlsl_ir_function_decl struct vkd3d_shader_location loc; struct rb_entry entry; struct hlsl_ir_function *func; - const char *semantic; struct list *parameters; struct list *body; };

1 0

Zebediah Figura : vkd3d-shader: Create a separate variable for output varyings.
by Alexandre Julliard 30 Mar '21

30 Mar '21

Module: vkd3d Branch: master Commit: 3d22df25fe17b47a4add8323a69f9f3ea1a12c6e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3d22df25fe17b47a4add832… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Mar 28 21:46:59 2021 +0200 vkd3d-shader: Create a separate variable for output varyings. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_codegen.c | 86 +++++++++++++++++++++++++++++++++++++++- tests/hlsl-invalid.shader_test | 13 ++++++ 2 files changed, 97 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index ca38fe7..dbd591a 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -140,6 +140,83 @@ static void prepend_input_var_copy(struct hlsl_ctx *ctx, struct list *instrs, st var->is_input_varying = 0; } +static void append_output_copy(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_var *var, + struct hlsl_type *type, unsigned int field_offset, const char *semantic) +{ + struct vkd3d_string_buffer *name; + struct hlsl_ir_assignment *store; + struct hlsl_ir_constant *offset; + struct hlsl_ir_var *varying; + struct hlsl_ir_load *load; + + if (!(name = vkd3d_string_buffer_get(&ctx->string_buffers))) + { + ctx->failed = true; + return; + } + vkd3d_string_buffer_printf(name, "<output-%s>", semantic); + if (!(varying = hlsl_new_var(vkd3d_strdup(name->buffer), type, var->loc, vkd3d_strdup(semantic), NULL))) + { + vkd3d_string_buffer_release(&ctx->string_buffers, name); + ctx->failed = true; + return; + } + vkd3d_string_buffer_release(&ctx->string_buffers, name); + varying->is_output_varying = 1; + list_add_head(&ctx->globals->vars, &varying->scope_entry); + + if (!(offset = hlsl_new_uint_constant(ctx, field_offset * 4, var->loc))) + { + ctx->failed = true; + return; + } + list_add_tail(instrs, &offset->node.entry); + + if (!(load = hlsl_new_load(var, &offset->node, type, var->loc))) + { + ctx->failed = true; + return; + } + list_add_after(&offset->node.entry, &load->node.entry); + + if (!(store = hlsl_new_assignment(varying, NULL, &load->node, 0, var->loc))) + { + ctx->failed = true; + return; + } + list_add_after(&load->node.entry, &store->node.entry); +} + +static void append_output_struct_copy(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_var *var, + struct hlsl_type *type, unsigned int field_offset) +{ + struct hlsl_struct_field *field; + + LIST_FOR_EACH_ENTRY(field, type->e.elements, struct hlsl_struct_field, entry) + { + if (field->type->type == HLSL_CLASS_STRUCT) + append_output_struct_copy(ctx, instrs, var, field->type, field_offset + field->reg_offset); + else if (field->semantic) + append_output_copy(ctx, instrs, var, field->type, field_offset + field->reg_offset, field->semantic); + else + hlsl_error(ctx, field->loc, VKD3D_SHADER_ERROR_HLSL_MISSING_SEMANTIC, + "Field '%s' is missing a semantic.", field->name); + } +} + +/* Split output varyings into two variables representing the temp and varying + * registers, and copy the former to the latter, so that reads from output + * varyings work. */ +static void append_output_var_copy(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_var *var) +{ + if (var->data_type->type == HLSL_CLASS_STRUCT) + append_output_struct_copy(ctx, instrs, var, var->data_type, 0); + else if (var->semantic) + append_output_copy(ctx, instrs, var, var->data_type, 0, var->semantic); + + var->is_output_varying = 0; +} + static bool transform_ir(struct hlsl_ctx *ctx, bool (*func)(struct hlsl_ctx *ctx, struct hlsl_ir_node *, void *), struct list *instrs, void *context) { @@ -520,12 +597,13 @@ static void compute_liveness(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl { if (var->is_uniform || var->is_input_varying) var->first_write = 1; + else if (var->is_output_varying) + var->last_read = UINT_MAX; } LIST_FOR_EACH_ENTRY(var, entry_func->parameters, struct hlsl_ir_var, param_entry) { - if (var->is_output_varying) - var->last_read = UINT_MAX; + var->first_write = 1; } if (entry_func->return_var) @@ -552,7 +630,11 @@ int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun prepend_uniform_copy(ctx, entry_func->body, var); if (var->is_input_varying) prepend_input_var_copy(ctx, entry_func->body, var); + if (var->is_output_varying) + append_output_var_copy(ctx, entry_func->body, var); } + if (entry_func->return_var) + append_output_var_copy(ctx, entry_func->body, entry_func->return_var); while (transform_ir(ctx, fold_redundant_casts, entry_func->body, NULL)); while (transform_ir(ctx, split_struct_copies, entry_func->body, NULL)); diff --git a/tests/hlsl-invalid.shader_test b/tests/hlsl-invalid.shader_test index 59a0dbe..0711d26 100644 --- a/tests/hlsl-invalid.shader_test +++ b/tests/hlsl-invalid.shader_test @@ -146,3 +146,16 @@ float4 main(struct input i) : sv_target { return i.a; } + +[pixel shader fail] +struct output +{ + float4 t : sv_target; + int a; +}; + +void main(out struct output o) +{ + o.t = float4(0, 0, 0, 0); + o.a = 0; +}

1 0

Francois Gouget : winetest: Detect and report the missing side-by-side version errors.
by Alexandre Julliard 29 Mar '21

29 Mar '21

Module: wine Branch: master Commit: 44222dc9f24edb095dfafb8759e201c3b5680934 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44222dc9f24edb095dfafb87… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 29 15:52:59 2021 +0200 winetest: Detect and report the missing side-by-side version errors. This replaces the 'load error 14001' error message with a clearer 'dll is missing' information message. Signed-off-by: Francois Gouget <fgouget(a)icodeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index eaf83a48f62..75996d88147 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -985,6 +985,7 @@ extract_test_proc (HMODULE hModule, LPCSTR lpszType, LPSTR lpszName, LONG_PTR lP break; case STATUS_DLL_NOT_FOUND: xprintf (" %s=dll is missing\n", dllname); + /* or it is a side-by-side dll but the test has no manifest */ break; case STATUS_ORDINAL_NOT_FOUND: xprintf (" %s=dll is missing an ordinal (%s)\n", dllname, get_file_version(filename)); @@ -992,6 +993,9 @@ extract_test_proc (HMODULE hModule, LPCSTR lpszType, LPSTR lpszName, LONG_PTR lP case STATUS_ENTRYPOINT_NOT_FOUND: xprintf (" %s=dll is missing an entrypoint (%s)\n", dllname, get_file_version(filename)); break; + case ERROR_SXS_CANT_GEN_ACTCTX: + xprintf (" %s=dll is missing the requested side-by-side version\n", dllname); + break; default: xprintf (" %s=load error %u\n", dllname, err); break;

1 0

Francois Gouget : winetest: Clarify the 'version not present' error.
by Alexandre Julliard 29 Mar '21

29 Mar '21

Module: wine Branch: master Commit: 55f648fac991bcfe1d9d2464b291d29a22a59721 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55f648fac991bcfe1d9d2464… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 29 15:53:26 2021 +0200 winetest: Clarify the 'version not present' error. Most of the time the library is actually missing (or only available in the wrong bitness). Show the error code to help diagnose the other cases. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 75996d88147..107151c927f 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -135,8 +135,10 @@ static char * get_file_version(char * file_name) heap_free(data); } else sprintf(version, "version error %u", ERROR_OUTOFMEMORY); - } else - sprintf(version, "version not present"); + } else if (GetLastError() == ERROR_FILE_NOT_FOUND) + sprintf(version, "dll is missing"); + else + sprintf(version, "version not present %u", GetLastError()); return version; }

1 0