wine-commits March 2021

wine-commits@winehq.org

2 participants
1163 discussions

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: Load builtin exe without a corresponding file only before the prefix is fully initialized.
by Alexandre Julliard 30 Mar '21

30 Mar '21

Module: wine Branch: master Commit: a3d9c487de0388ed0358fbd1f275c733e8d5225a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3d9c487de0388ed0358fbd1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 30 09:59:01 2021 +0200 ntdll: Load builtin exe without a corresponding file only before the prefix is fully initialized. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 40172afe4f1..9aab5102b8a 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -118,6 +118,7 @@ static char *argv0; static const char *bin_dir; static const char *dll_dir; static SIZE_T dll_path_maxlen; +static BOOL is_prefix_bootstrap; const char *home_dir = NULL; const char *data_dir = NULL; @@ -310,6 +311,8 @@ static void set_config_dir(void) static void init_paths( char *argv[] ) { Dl_info info; + struct stat st; + char *ntdll; argv0 = strdup( argv[0] ); @@ -332,6 +335,10 @@ static void init_paths( char *argv[] ) set_dll_path(); set_home_dir(); set_config_dir(); + + ntdll = build_path( config_dir, "dosdevices/c:/windows/system32/ntdll.dll" ); + is_prefix_bootstrap = stat( ntdll, &st ) == -1; + free( ntdll ); } @@ -1456,6 +1463,8 @@ BOOL is_builtin_path( const UNICODE_STRING *path, WORD *machine ) 's','y','s','w','o','w','6','4'}; unsigned int len; + if (!is_prefix_bootstrap) return FALSE; + *machine = current_machine; if (path->Length > wcslen(system_dir) * sizeof(WCHAR) && !wcsnicmp( path->Buffer, system_dir, wcslen(system_dir) ))

1 0

Alexandre Julliard : ntdll: Make sure the argv array matches the Unicode version, even when launching start.exe.
by Alexandre Julliard 30 Mar '21

30 Mar '21

Module: wine Branch: master Commit: 726cf9c0ebcd9abc5b8c3e29f44d1b7451606c58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=726cf9c0ebcd9abc5b8c3e29… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 30 09:56:32 2021 +0200 ntdll: Make sure the argv array matches the Unicode version, even when launching start.exe. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 198 +++++++++++++++++++++++++++++------------------ dlls/ntdll/unix/loader.c | 25 ++++-- 2 files changed, 140 insertions(+), 83 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=726cf9c0ebcd9abc5b8c…

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

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 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: 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 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

Vijay Kiran Kamuju : dhtmled.ocx: Implement IOleObject::SetExtent and IOleObject::GetExtent functions.
by Alexandre Julliard 29 Mar '21

29 Mar '21

Module: wine Branch: master Commit: 6ca1a92684fcbaa1c569b60411a8036b6d11dc99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ca1a92684fcbaa1c569b604… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Mar 10 21:30:28 2021 +0100 dhtmled.ocx: Implement IOleObject::SetExtent and IOleObject::GetExtent functions. This time without tests as the ocx file is not available from windows 7 & IE 8 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50697 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dhtmled.ocx/Makefile.in | 2 +- dlls/dhtmled.ocx/edit.c | 30 ++++++++++++++++++++++++++---- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/dlls/dhtmled.ocx/Makefile.in b/dlls/dhtmled.ocx/Makefile.in index a6c053a2737..bbe397dc401 100644 --- a/dlls/dhtmled.ocx/Makefile.in +++ b/dlls/dhtmled.ocx/Makefile.in @@ -1,5 +1,5 @@ MODULE = dhtmled.ocx -IMPORTS = uuid ole32 +IMPORTS = uuid ole32 user32 gdi32 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/dhtmled.ocx/edit.c b/dlls/dhtmled.ocx/edit.c index dfa300b9590..53dcdfc9ac6 100644 --- a/dlls/dhtmled.ocx/edit.c +++ b/dlls/dhtmled.ocx/edit.c @@ -1,5 +1,6 @@ /* * Copyright 2017 Alex Henrie + * Copyright 2021 Vijay Kiran Kamuju * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -30,6 +31,7 @@ typedef struct IOleObject IOleObject_iface; IPersistStreamInit IPersistStreamInit_iface; IOleClientSite *client_site; + SIZEL extent; LONG ref; } DHTMLEditImpl; @@ -700,15 +702,25 @@ static HRESULT WINAPI OleObject_GetUserType(IOleObject *iface, DWORD type_type, static HRESULT WINAPI OleObject_SetExtent(IOleObject *iface, DWORD aspect, SIZEL *size_limit) { DHTMLEditImpl *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%u, %p) stub\n", This, aspect, size_limit); - return E_NOTIMPL; + TRACE("(%p)->(%u, %p)\n", This, aspect, size_limit); + + if(aspect != DVASPECT_CONTENT) + return DV_E_DVASPECT; + + This->extent = *size_limit; + return S_OK; } static HRESULT WINAPI OleObject_GetExtent(IOleObject *iface, DWORD aspect, SIZEL *size_limit) { DHTMLEditImpl *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%u, %p) stub\n", This, aspect, size_limit); - return E_NOTIMPL; + TRACE("(%p)->(%u, %p)\n", This, aspect, size_limit); + + if(aspect != DVASPECT_CONTENT) + return E_FAIL; + + *size_limit = This->extent; + return S_OK; } static HRESULT WINAPI OleObject_Advise(IOleObject *iface, IAdviseSink *sink, DWORD *conn) @@ -849,6 +861,8 @@ static const IPersistStreamInitVtbl PersistStreamInitVtbl = { HRESULT dhtml_edit_create(REFIID iid, void **out) { DHTMLEditImpl *This; + DWORD dpi_x, dpi_y; + HDC hdc; HRESULT ret; TRACE("(%s, %p)\n", debugstr_guid(iid), out); @@ -863,6 +877,14 @@ HRESULT dhtml_edit_create(REFIID iid, void **out) This->client_site = NULL; This->ref = 1; + hdc = GetDC(0); + dpi_x = GetDeviceCaps(hdc, LOGPIXELSX); + dpi_y = GetDeviceCaps(hdc, LOGPIXELSY); + ReleaseDC(0, hdc); + + This->extent.cx = MulDiv(192, 2540, dpi_x); + This->extent.cy = MulDiv(192, 2540, dpi_y); + ret = IDHTMLEdit_QueryInterface(&This->IDHTMLEdit_iface, iid, out); IDHTMLEdit_Release(&This->IDHTMLEdit_iface); return ret;

1 0

Zebediah Figura : ntdll: Report SegDs to be identical to SegSs in x86_64 exception handlers.
by Alexandre Julliard 29 Mar '21

29 Mar '21

Module: wine Branch: master Commit: 195c57eeb7e62263af229baf5f486f353bf6459e URL: https://source.winehq.org/git/wine.git/?a=commit;h=195c57eeb7e62263af229baf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 28 17:08:31 2021 -0500 ntdll: Report SegDs to be identical to SegSs in x86_64 exception handlers. Based on a patch by Dávid Török. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47970 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 4 ++++ dlls/ntdll/tests/exception.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index b5be4f35758..d88f7ae553a 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -567,6 +567,10 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) context->R12, context->R13, context->R14, context->R15 ); } + /* Legends of Runeterra depends on having SegDs == SegSs in an exception + * handler. */ + context->SegDs = context->SegSs; + if (call_vectored_handlers( rec, context ) == EXCEPTION_CONTINUE_EXECUTION) NtContinue( context, FALSE ); diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 7c75606dd32..cdf3cdf8201 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -3020,7 +3020,7 @@ static DWORD WINAPI handler( EXCEPTION_RECORD *rec, ULONG64 frame, "%u: Unexpected exception address %p/%p\n", entry, rec->ExceptionAddress, (char*)context->Rip ); - todo_wine ok( context->SegDs == context->SegSs, + ok( context->SegDs == context->SegSs, "%u: ds %#x does not match ss %#x\n", entry, context->SegDs, context->SegSs ); todo_wine ok( context->SegEs == context->SegSs, "%u: es %#x does not match ss %#x\n", entry, context->SegEs, context->SegSs );

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
117
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2021