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

Zebediah Figura : setupapi: Make the FDI handle a local variable.
by Alexandre Julliard March 5, 2021

March 5, 2021

Module: wine Branch: master Commit: b70b153c59e2aa9365beecc94ef63f6fefb19b9f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b70b153c59e2aa9365beecc9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 4 20:08:17 2021 -0600 setupapi: Make the FDI handle a local variable. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/setupcab.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/setupapi/setupcab.c b/dlls/setupapi/setupcab.c index 562db2f50c9..4824170d587 100644 --- a/dlls/setupapi/setupcab.c +++ b/dlls/setupapi/setupcab.c @@ -40,7 +40,6 @@ OSVERSIONINFOW OsVersionInfo; HINSTANCE SETUPAPI_hInstance = 0; typedef struct { - HFDI hfdi; PSP_FILE_CALLBACK_A msghandler; PVOID context; CHAR most_recent_cabinet_name[MAX_PATH]; @@ -255,6 +254,7 @@ BOOL WINAPI SetupIterateCabinetA(PCSTR CabinetFile, DWORD Reserved, ERF erf; CHAR pszCabinet[MAX_PATH], pszCabPath[MAX_PATH], *p = NULL; DWORD fpnsize; + HFDI hfdi; BOOL ret; TRACE("(CabinetFile == %s, Reserved == %u, MsgHandler == ^%p, Context == ^%p)\n", @@ -293,14 +293,14 @@ BOOL WINAPI SetupIterateCabinetA(PCSTR CabinetFile, DWORD Reserved, my_hsc.msghandler = MsgHandler; my_hsc.context = Context; - my_hsc.hfdi = FDICreate( sc_cb_alloc, sc_cb_free, sc_cb_open, sc_cb_read, - sc_cb_write, sc_cb_close, sc_cb_lseek, cpuUNKNOWN, &erf ); + hfdi = FDICreate(sc_cb_alloc, sc_cb_free, sc_cb_open, sc_cb_read, + sc_cb_write, sc_cb_close, sc_cb_lseek, cpuUNKNOWN, &erf); - if (!my_hsc.hfdi) return FALSE; + if (!hfdi) return FALSE; - ret = FDICopy(my_hsc.hfdi, pszCabinet, pszCabPath, 0, sc_FNNOTIFY_A, NULL, &my_hsc); + ret = FDICopy(hfdi, pszCabinet, pszCabPath, 0, sc_FNNOTIFY_A, NULL, &my_hsc); - FDIDestroy(my_hsc.hfdi); + FDIDestroy(hfdi); return ret; }

1 0

Giovanni Mascellani : dwrite/tests: Remove overzealous test.
by Alexandre Julliard March 5, 2021

March 5, 2021

Module: wine Branch: master Commit: 23d6ac27dbbaacf3fc6caa3860df83e90c003692 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23d6ac27dbbaacf3fc6caa38… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Mar 4 11:23:08 2021 +0100 dwrite/tests: Remove overzealous test. While this test happens to always be true on Windows, this is just a property of the fallback fonts installed on the system, not a property of the code. Since we cannot control the fonts installed on users' computers, it makes no sense to do this test. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/layout.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index cc4079faa14..43a00b7e22e 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -4699,12 +4699,6 @@ todo_wine { todo_wine ok(font != NULL, "got %p\n", font); if (font) { - /* font returned for Hiragana character, check if it supports Latin too */ - exists = FALSE; - hr = IDWriteFont_HasCharacter(font, 'b', &exists); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(exists, "got %d\n", exists); - IDWriteFont_Release(font); } /* Try with explicit collection, Tahoma will be forced. */

1 0

Zebediah Figura : wined3d: Move the "device" member of struct wined3d_cs to struct wined3d_device_context.
by Alexandre Julliard March 5, 2021

March 5, 2021

Module: wine Branch: master Commit: 55a0507ee88db101ebcae512d5c1309ebe9a3103 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55a0507ee88db101ebcae512… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 4 21:29:47 2021 -0600 wined3d: Move the "device" member of struct wined3d_cs to struct wined3d_device_context. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 149 ++++++++++++++++++++--------------------- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 75 insertions(+), 76 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=55a0507ee88db101ebca…

1 0

Zebediah Figura : d3dx9/tests: Remove the fallback NAN definition.
by Alexandre Julliard March 5, 2021

March 5, 2021

Module: wine Branch: master Commit: 0d075b904b28a03cec304480446fab7753c3094f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d075b904b28a03cec304480… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 4 20:14:27 2021 -0600 d3dx9/tests: Remove the fallback NAN definition. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/mesh.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 42deb32b934..e981f3623ce 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -29,16 +29,6 @@ #include "rmxftmpl.h" #include "rmxfguid.h" -#ifndef NAN -/* From wine/port.h */ -static inline float __port_nan(void) -{ - static const unsigned __nan_bytes = 0x7fc00000; - return *(const float *)&__nan_bytes; -} -#define NAN __port_nan() -#endif - /* Set the WINETEST_DEBUG environment variable to be greater than 1 for verbose * function call traces of ID3DXAllocateHierarchy callbacks. */ #define TRACECALLBACK if(winetest_debug > 1) trace

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard March 5, 2021

March 5, 2021

Module: wine Branch: master Commit: 784faaaea4bba9100da49f07bc895a665103a280 URL: https://source.winehq.org/git/wine.git/?a=commit;h=784faaaea4bba9100da49f07… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Fri Mar 5 09:06:34 2021 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/po/lt.po b/po/lt.po index 8f3cc4dc3b6..74b49da407e 100644 --- a/po/lt.po +++ b/po/lt.po @@ -1,18 +1,18 @@ # Lithuanian translations for Wine -# Aurimas Fišeras <aurimas(a)members.fsf.org>, 2011-2020. +# Aurimas Fišeras <aurimas(a)members.fsf.org>, 2011-2021. msgid "" msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2020-11-09 23:18+0200\n" +"PO-Revision-Date: 2021-03-05 09:05+0200\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.4.1\n" +"X-Generator: Poedit 2.4.2\n" "X-Project-Style: default\n" #: dlls/aclui/aclui.rc:29 dlls/inetcpl.cpl/inetcpl.rc:90 @@ -21,26 +21,20 @@ msgid "Security" msgstr "Saugumas" #: dlls/aclui/aclui.rc:32 -#, fuzzy -#| msgid "&User name:" msgid "&Group or user names:" -msgstr "&Naudotojo vardas:" +msgstr "&Grupių ar naudotojų vardai:" #: dlls/aclui/aclui.rc:38 -#, fuzzy -#| msgid "Yellow" msgid "Allow" -msgstr "Geltona" +msgstr "Leisti" #: dlls/aclui/aclui.rc:39 msgid "Deny" -msgstr "" +msgstr "Drausti" #: dlls/aclui/aclui.rc:47 -#, fuzzy -#| msgid "Permission denied" msgid "Permissions for %1" -msgstr "Prieiga nesuteikta" +msgstr "%1 teisės" #: dlls/appwiz.cpl/appwiz.rc:58 msgid "Install/Uninstall"

1 0

Zebediah Figura : vkd3d-shader: Move the remainder of hlsl_parser_compile() to hlsl_compile_shader().
by Alexandre Julliard March 5, 2021

March 5, 2021

Module: vkd3d Branch: master Commit: 8ce33da2abef3896c7d3da92191afb13db5c7571 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8ce33da2abef3896c7d3da9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 4 17:33:24 2021 -0600 vkd3d-shader: Move the remainder of hlsl_parser_compile() to hlsl_compile_shader(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- libs/vkd3d-shader/hlsl.h | 4 ++-- libs/vkd3d-shader/hlsl.l | 4 ++-- libs/vkd3d-shader/hlsl.y | 47 +---------------------------------------------- 4 files changed, 47 insertions(+), 52 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 0486c95..02fa484 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -188,6 +188,22 @@ bool hlsl_get_function(struct hlsl_ctx *ctx, const char *name) return rb_get(&ctx->functions, name) != NULL; } +struct hlsl_ir_function_decl *hlsl_get_func_decl(struct hlsl_ctx *ctx, const char *name) +{ + struct hlsl_ir_function_decl *decl; + struct hlsl_ir_function *func; + struct rb_entry *entry; + + if ((entry = rb_get(&ctx->functions, name))) + { + func = RB_ENTRY_VALUE(entry, struct hlsl_ir_function, entry); + RB_FOR_EACH_ENTRY(decl, &func->overloads, struct hlsl_ir_function_decl, entry) + return decl; + } + + return NULL; +} + unsigned int hlsl_type_component_count(struct hlsl_type *type) { struct hlsl_struct_field *field; @@ -1606,7 +1622,9 @@ int hlsl_compile_shader(const char *text, const struct vkd3d_shader_compile_info struct vkd3d_shader_code *dxbc, struct vkd3d_shader_message_context *message_context) { const struct vkd3d_shader_hlsl_source_info *hlsl_source_info; + struct hlsl_ir_function_decl *entry_func; const struct hlsl_profile_info *profile; + const char *entry_point; struct hlsl_ctx ctx; int ret; @@ -1615,6 +1633,7 @@ int hlsl_compile_shader(const char *text, const struct vkd3d_shader_compile_info ERR("No HLSL source info given.\n"); return VKD3D_ERROR_INVALID_ARGUMENT; } + entry_point = hlsl_source_info->entry_point ? hlsl_source_info->entry_point : "main"; if (!(profile = get_target_info(hlsl_source_info->profile))) { @@ -1627,9 +1646,30 @@ int hlsl_compile_shader(const char *text, const struct vkd3d_shader_compile_info if (!hlsl_ctx_init(&ctx, message_context)) return VKD3D_ERROR_OUT_OF_MEMORY; - ret = hlsl_lexer_compile(&ctx, text, hlsl_source_info->entry_point ? hlsl_source_info->entry_point : "main"); + hlsl_lexer_compile(&ctx, text); - hlsl_ctx_cleanup(&ctx); + if (ctx.failed) + { + hlsl_ctx_cleanup(&ctx); + return VKD3D_ERROR_INVALID_SHADER; + } + + if (!(entry_func = hlsl_get_func_decl(&ctx, entry_point))) + { + const struct vkd3d_shader_location loc = {.source_name = compile_info->source_name}; + hlsl_error(&ctx, loc, VKD3D_SHADER_ERROR_HLSL_NOT_DEFINED, + "Entry point \"%s\" is not defined.", entry_point); + return VKD3D_ERROR_INVALID_SHADER; + } + + 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, + "Entry point \"%s\" is missing a return value semantic.", entry_point); + + ret = hlsl_emit_dxbc(&ctx, entry_func); + + hlsl_ctx_cleanup(&ctx); return ret; } diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 73ba2be..4af021e 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -518,6 +518,7 @@ void hlsl_free_type(struct hlsl_type *type) DECLSPEC_HIDDEN; void hlsl_free_var(struct hlsl_ir_var *decl) DECLSPEC_HIDDEN; bool hlsl_get_function(struct hlsl_ctx *ctx, const char *name) DECLSPEC_HIDDEN; +struct hlsl_ir_function_decl *hlsl_get_func_decl(struct hlsl_ctx *ctx, const char *name) DECLSPEC_HIDDEN; struct hlsl_type *hlsl_get_type(struct hlsl_scope *scope, const char *name, bool recursive) DECLSPEC_HIDDEN; struct hlsl_ir_var *hlsl_get_var(struct hlsl_scope *scope, const char *name) DECLSPEC_HIDDEN; @@ -571,7 +572,6 @@ unsigned int hlsl_type_component_count(struct hlsl_type *type) DECLSPEC_HIDDEN; bool hlsl_type_is_row_major(const struct hlsl_type *type) DECLSPEC_HIDDEN; bool hlsl_type_is_void(const struct hlsl_type *type) DECLSPEC_HIDDEN; -int hlsl_lexer_compile(struct hlsl_ctx *ctx, const char *text, const char *entrypoint) DECLSPEC_HIDDEN; -int hlsl_parser_compile(struct hlsl_ctx *ctx, const char *entrypoint) DECLSPEC_HIDDEN; +int hlsl_lexer_compile(struct hlsl_ctx *ctx, const char *text) DECLSPEC_HIDDEN; #endif diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l index 4cc0a3e..da54d57 100644 --- a/libs/vkd3d-shader/hlsl.l +++ b/libs/vkd3d-shader/hlsl.l @@ -282,7 +282,7 @@ static void update_location(struct hlsl_ctx *ctx, YYLTYPE *lloc) ctx->location.column += yyget_leng(ctx->scanner); } -int hlsl_lexer_compile(struct hlsl_ctx *ctx, const char *text, const char *entrypoint) +int hlsl_lexer_compile(struct hlsl_ctx *ctx, const char *text) { YY_BUFFER_STATE buffer; int ret; @@ -291,7 +291,7 @@ int hlsl_lexer_compile(struct hlsl_ctx *ctx, const char *text, const char *entry buffer = yy_scan_string(text, ctx->scanner); yy_switch_to_buffer(buffer, ctx->scanner); - ret = hlsl_parser_compile(ctx, entrypoint); + ret = hlsl_yyparse(ctx->scanner, ctx); yy_delete_buffer(buffer, ctx->scanner); yylex_destroy(ctx->scanner); diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index ae15118..6674774 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -286,22 +286,6 @@ static struct hlsl_ir_node *add_implicit_conversion(struct hlsl_ctx *ctx, struct return &cast->node; } -static struct hlsl_ir_function_decl *get_func_entry(struct hlsl_ctx *ctx, const char *name) -{ - struct hlsl_ir_function_decl *decl; - struct hlsl_ir_function *func; - struct rb_entry *entry; - - if ((entry = rb_get(&ctx->functions, name))) - { - func = RB_ENTRY_VALUE(entry, struct hlsl_ir_function, entry); - RB_FOR_EACH_ENTRY(decl, &func->overloads, struct hlsl_ir_function_decl, entry) - return decl; - } - - return NULL; -} - static bool declare_variable(struct hlsl_ctx *ctx, struct hlsl_ir_var *decl, bool local) { struct hlsl_ir_function_decl *func; @@ -334,7 +318,7 @@ static bool declare_variable(struct hlsl_ctx *ctx, struct hlsl_ir_var *decl, boo } else { - if ((func = get_func_entry(ctx, decl->name))) + if ((func = hlsl_get_func_decl(ctx, decl->name))) { hlsl_error(ctx, decl->loc, VKD3D_SHADER_ERROR_HLSL_REDEFINED, "Variable '%s' is already defined as a function.", decl->name); @@ -3012,32 +2996,3 @@ expr: list_move_tail($$, $3); vkd3d_free($3); } - -%% - -int hlsl_parser_compile(struct hlsl_ctx *ctx, const char *entrypoint) -{ - struct hlsl_ir_function_decl *entry_func; - - yyparse(ctx->scanner, ctx); - - if (ctx->failed) - return VKD3D_ERROR_INVALID_SHADER; - - if (!(entry_func = get_func_entry(ctx, entrypoint))) - { - const struct vkd3d_shader_location loc = {.source_name = ctx->location.source_name}; - - hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_NOT_DEFINED, "Entry point \"%s\" is not defined.", entrypoint); - return VKD3D_ERROR_INVALID_SHADER; - } - - 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, - "Entry point \"%s\" is missing a return value semantic.", entry_func->func->name); - } - - return hlsl_emit_dxbc(ctx, entry_func); -}

1 0

Zebediah Figura : tests: Add some tests for nested arrays.
by Alexandre Julliard March 5, 2021

March 5, 2021

Module: vkd3d Branch: master Commit: 2b38799e66687fe3bbb3fa5ed72e710d20c28123 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2b38799e66687fe3bbb3fa5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 4 17:33:26 2021 -0600 tests: Add some tests for nested arrays. 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> --- Makefile.am | 2 ++ tests/hlsl-nested-arrays.shader_test | 25 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/Makefile.am b/Makefile.am index 3b09dc7..a412194 100644 --- a/Makefile.am +++ b/Makefile.am @@ -57,6 +57,7 @@ vkd3d_shader_tests = \ tests/hlsl-invalid.shader_test \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ + tests/hlsl-nested-arrays.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ tests/hlsl-static-initializer.shader_test \ @@ -249,6 +250,7 @@ XFAIL_TESTS = \ tests/hlsl-comma.shader_test \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ + tests/hlsl-nested-arrays.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ tests/hlsl-static-initializer.shader_test \ diff --git a/tests/hlsl-nested-arrays.shader_test b/tests/hlsl-nested-arrays.shader_test new file mode 100644 index 0000000..66ae93e --- /dev/null +++ b/tests/hlsl-nested-arrays.shader_test @@ -0,0 +1,25 @@ +[pixel shader fail] +uniform float4 color[2][3]; + +float4 main() : sv_target +{ + return color[2][1]; +} + +[pixel shader] +uniform float color[2][3]; + +float4 main() : sv_target +{ + return float4(color[1][0], color[0][0], color[1][2], color[0][2]); +} + +[test] +uniform 0 float4 0.1 0.0 0.0 0.0 +uniform 4 float4 0.2 0.0 0.0 0.0 +uniform 8 float4 0.3 0.0 0.0 0.0 +uniform 12 float4 0.4 0.0 0.0 0.0 +uniform 16 float4 0.5 0.0 0.0 0.0 +uniform 20 float4 0.6 0.0 0.0 0.0 +draw quad +probe all rgba (0.4, 0.1, 0.6, 0.3)

1 0

Zebediah Figura : vkd3d-shader: Parse nested arrays.
by Alexandre Julliard March 5, 2021

March 5, 2021

Module: vkd3d Branch: master Commit: 405f2db4d97b1a8c46e70e1797a3a5e8f779c96f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=405f2db4d97b1a8c46e70e1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 4 17:33:27 2021 -0600 vkd3d-shader: Parse nested arrays. 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.y | 109 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 76 insertions(+), 33 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 6674774..ce4bd62 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -50,13 +50,19 @@ struct parse_initializer struct list *instrs; }; +struct parse_array_sizes +{ + uint32_t *sizes; /* innermost first */ + unsigned int count; +}; + struct parse_variable_def { struct list entry; struct vkd3d_shader_location loc; char *name; - uint32_t array_size; + struct parse_array_sizes arrays; const char *semantic; struct hlsl_reg_reservation *reg_reservation; struct parse_initializer initializer; @@ -732,15 +738,17 @@ static struct list *gen_struct_fields(struct hlsl_ctx *ctx, struct hlsl_type *ty return NULL; LIST_FOR_EACH_ENTRY_SAFE(v, v_next, fields, struct parse_variable_def, entry) { + unsigned int i; + if (!(field = vkd3d_calloc(1, sizeof(*field)))) { vkd3d_free(v); return list; } - if (v->array_size) - field->type = hlsl_new_array_type(ctx, type, v->array_size); - else - field->type = type; + + field->type = type; + for (i = 0; i < v->arrays.count; ++i) + field->type = hlsl_new_array_type(ctx, field->type, v->arrays.sizes[i]); field->loc = v->loc; field->name = v->name; field->modifiers = modifiers; @@ -761,16 +769,27 @@ static bool add_typedef(struct hlsl_ctx *ctx, DWORD modifiers, struct hlsl_type { struct parse_variable_def *v, *v_next; struct hlsl_type *type; + unsigned int i; bool ret; LIST_FOR_EACH_ENTRY_SAFE(v, v_next, list, struct parse_variable_def, entry) { - if (v->array_size) - type = hlsl_new_array_type(ctx, orig_type, v->array_size); + if (!v->arrays.count) + { + if (!(type = hlsl_type_clone(ctx, orig_type, 0))) + return false; + } else - type = hlsl_type_clone(ctx, orig_type, 0); - if (!type) - return false; + { + type = orig_type; + } + + for (i = 0; i < v->arrays.count; ++i) + { + if (!(type = hlsl_new_array_type(ctx, type, v->arrays.sizes[i]))) + return false; + } + vkd3d_free((void *)type->name); type->name = v->name; type->modifiers |= modifiers; @@ -1369,6 +1388,7 @@ static void struct_var_initializer(struct hlsl_ctx *ctx, struct list *list, stru static void free_parse_variable_def(struct parse_variable_def *v) { free_parse_initializer(&v->initializer); + vkd3d_free(v->arrays.sizes); vkd3d_free(v->name); vkd3d_free((void *)v->semantic); vkd3d_free(v->reg_reservation); @@ -1400,10 +1420,11 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t LIST_FOR_EACH_ENTRY_SAFE(v, v_next, var_list, struct parse_variable_def, entry) { - if (v->array_size) - type = hlsl_new_array_type(ctx, basic_type, v->array_size); - else - type = basic_type; + unsigned int i; + + type = basic_type; + for (i = 0; i < v->arrays.count; ++i) + type = hlsl_new_array_type(ctx, type, v->arrays.sizes[i]); if (!(var = hlsl_new_var(v->name, type, v->loc, v->semantic, modifiers, v->reg_reservation))) { @@ -1475,7 +1496,7 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t vkd3d_free(v); continue; } - if (v->array_size > 0) + if (v->arrays.count) { FIXME("Initializing arrays is not supported yet.\n"); free_parse_initializer(&v->initializer); @@ -1531,6 +1552,7 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t struct parse_function function; struct parse_parameter parameter; struct parse_initializer initializer; + struct parse_array_sizes arrays; struct parse_variable_def *variable_def; struct parse_if_body if_body; enum parse_unary_op unary_op; @@ -1681,6 +1703,8 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t %token <name> STRING %token <name> TYPE_IDENTIFIER +%type <arrays> arrays + %type <assign_op> assign_op %type <boolval> boolean @@ -1695,8 +1719,6 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t %type <if_body> if_body -%type <intval> array - %type <modifiers> input_mod %type <modifiers> input_mods %type <modifiers> var_modifiers @@ -2217,12 +2239,12 @@ type_specs: } type_spec: - any_identifier array + any_identifier arrays { $$ = vkd3d_calloc(1, sizeof(*$$)); $$->loc = @1; $$->name = $1; - $$->array_size = $2; + $$->arrays = $2; } declaration: @@ -2257,41 +2279,46 @@ variables_def: } variable_def: - any_identifier array colon_attribute + any_identifier arrays colon_attribute { $$ = vkd3d_calloc(1, sizeof(*$$)); $$->loc = @1; $$->name = $1; - $$->array_size = $2; + $$->arrays = $2; $$->semantic = $3.semantic; $$->reg_reservation = $3.reg_reservation; } - | any_identifier array colon_attribute '=' complex_initializer + | any_identifier arrays colon_attribute '=' complex_initializer { $$ = vkd3d_calloc(1, sizeof(*$$)); $$->loc = @1; $$->name = $1; - $$->array_size = $2; + $$->arrays = $2; $$->semantic = $3.semantic; $$->reg_reservation = $3.reg_reservation; $$->initializer = $5; } -array: +arrays: %empty { - $$ = 0; + $$.sizes = NULL; + $$.count = 0; } - | '[' expr ']' + | '[' expr ']' arrays { unsigned int size = evaluate_array_dimension(node_from_list($2)); + uint32_t *new_array; hlsl_free_instr_list($2); + $$ = $4; + if (!size) { hlsl_error(ctx, @2, VKD3D_SHADER_ERROR_HLSL_INVALID_SIZE, "Array size is not a positive integer constant."); + vkd3d_free($$.sizes); YYABORT; } @@ -2299,9 +2326,17 @@ array: { hlsl_error(ctx, @2, VKD3D_SHADER_ERROR_HLSL_INVALID_SIZE, "Array size %u is not between 1 and 65536.", size); + vkd3d_free($$.sizes); YYABORT; } - $$ = size; + + if (!(new_array = vkd3d_realloc($$.sizes, ($$.count + 1) * sizeof(*new_array)))) + { + vkd3d_free($$.sizes); + YYABORT; + } + $$.sizes = new_array; + $$.sizes[$$.count++] = size; } var_modifiers: @@ -2632,6 +2667,7 @@ postfix_expr: | postfix_expr '[' expr ']' { struct hlsl_ir_node *array = node_from_list($1), *index = node_from_list($3); + struct hlsl_ir_expr *cast; list_move_tail($1, $3); vkd3d_free($3); @@ -2643,7 +2679,14 @@ postfix_expr: YYABORT; } - if (!add_array_load(ctx, $1, array, index, @2)) + if (!(cast = hlsl_new_cast(index, ctx->builtin_types.scalar[HLSL_TYPE_UINT], &index->loc))) + { + hlsl_free_instr_list($1); + YYABORT; + } + list_add_tail($1, &cast->node.entry); + + if (!add_array_load(ctx, $1, array, &cast->node, @2)) { hlsl_free_instr_list($1); YYABORT; @@ -2762,10 +2805,11 @@ unary_expr: } /* var_modifiers is necessary to avoid shift/reduce conflicts. */ - | '(' var_modifiers type array ')' unary_expr + | '(' var_modifiers type arrays ')' unary_expr { struct hlsl_type *src_type = node_from_list($6)->data_type; struct hlsl_type *dst_type; + unsigned int i; if ($2) { @@ -2774,10 +2818,9 @@ unary_expr: YYABORT; } - if ($4) - dst_type = hlsl_new_array_type(ctx, $3, $4); - else - dst_type = $3; + dst_type = $3; + for (i = 0; i < $4.count; ++i) + dst_type = hlsl_new_array_type(ctx, dst_type, $4.sizes[i]); if (!compatible_data_types(src_type, dst_type)) {

1 0

Francois Gouget : testbot/LogUtils: Fix handling of subtest lines.
by Alexandre Julliard March 5, 2021

March 5, 2021

Module: tools Branch: master Commit: 82887dfa34ed1d8ee3653955afef82ac5c39a863 URL: https://source.winehq.org/git/tools.git/?a=commit;h=82887dfa34ed1d8ee365395… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 5 12:20:20 2021 +0100 testbot/LogUtils: Fix handling of subtest lines. Add support for garbled subtest lines. Let _CheckUnit() issue an error if they are misplaced. This also ensure the error message contains all the necessary information, such as the module name. Take the subtest line into account even if it looks like it is misplaced: the _CheckUnit() error is sufficient to indicate something is wrong. Tweak the _CheckUnit() message since subtest lines are not really "messages". Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 19 +++++++------------ testbot/src/reporttest/report.testwtbs | 8 ++++---- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 4e9b733..ed5dd74 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -381,7 +381,7 @@ sub _CheckUnit($$$$) # Only report the first misplaced message to avoid duplicate errors. if (!$Cur->{Units}->{$Unit} and $Cur->{Unit} ne "" and !$Cur->{IsBroken}) { - _AddExtra($LogInfo, "contains a misplaced $Type message for $Unit", $Cur); + _AddExtra($LogInfo, "contains a misplaced $Type line for $Unit", $Cur); $Cur->{IsBroken} = 1; } } @@ -557,19 +557,14 @@ sub ParseWineTestReport($$$) $Cur->{GroupLineNo} = $LineNo; $Cur->{Group} = undef; } - elsif ($Line =~ /^([_.a-z0-9-]+)\.c:\d+: Subtest ([_.a-z0-9-]+)$/) + elsif (($Cur->{Unit} ne "" and + $Line =~ /($Cur->{UnitsRE})\.c:\d+: Subtest ([_a-z0-9]+)/) or + $Line =~ /^([_a-z0-9]+)\.c:\d+: Subtest ([_a-z0-9]+)/) { my ($Unit, $SubUnit) = ($1, $2); - if ($Cur->{Units}->{$Unit}) - { - $Cur->{Units}->{$SubUnit} = 1; - $Cur->{UnitsRE} = join("|", keys %{$Cur->{Units}}); - } - else - { - _AddExtra($LogInfo, "$Unit has a misplaced $SubUnit subtest line"); - } - $LogInfo->{IsWineTest} = 1; + _CheckUnit($LogInfo, $Cur, $Unit, "$SubUnit subtest"); + $Cur->{Units}->{$SubUnit} = 1; + $Cur->{UnitsRE} = join("|", keys %{$Cur->{Units}}); } elsif (($Cur->{Unit} ne "" and $Line =~ /($Cur->{UnitsRE})\.c:\d+: Test (?:failed|succeeded inside todo block): /) or diff --git a/testbot/src/reporttest/report.testwtbs b/testbot/src/reporttest/report.testwtbs index 27ca12f..eefbbc0 100644 --- a/testbot/src/reporttest/report.testwtbs +++ b/testbot/src/reporttest/report.testwtbs @@ -80,7 +80,7 @@ n 0 advapi32:registry has no test summary line (early exit of the main process?) n 0 advapi32:service returned success despite having failures n 0 amstream:amstream has unaccounted for failure messages n 0 amstream:amstream returned success despite having failures -n 0 atl:registrar contains a misplaced test summary message for alien +n 0 atl:registrar contains a misplaced test summary line for alien n 0 browseui:progressdlg has unaccounted for skip messages n 0 cabinet:extract is missing some skip messages n 0 cmd.exe:batch has unaccounted for todo messages @@ -90,13 +90,13 @@ n 0 comctl32:dpa returned a non-zero exit code despite reporting no failures n 0 comctl32:header returned success despite having failures n 0 comctl32:ipaddress has no done line (or it is garbled) n 0 comctl32:misc had no start line (or it is garbled) -n 0 comctl32:monthcal contains a misplaced todo message for security +n 0 comctl32:monthcal contains a misplaced todo line for security n 0 comctl32:propsheet has no test summary line (early exit of the main process?) n 0 comctl32:rebar returned success despite having failures n 0 comctl32:toolbar has no done line (or it is garbled) n 0 comctl32:treeview returned success despite having failures -n 0 comctl32:updown contains a misplaced failure message for vorlon -n 0 shadow has a misplaced black subtest line +n 0 comctl32:updown contains a misplaced failure line for vorlon +n 0 comdlg32:filedlg contains a misplaced black subtest line for shadow n 0 xmllite:writer has unaccounted for failure messages n 0 xmllite:writer returned success despite having failures ----- TestWTBS -----

1 0

Francois Gouget : winetest/dissect: Fix handling of subtest lines.
by Alexandre Julliard March 5, 2021

March 5, 2021

Module: tools Branch: master Commit: 02548952b9b8001ed7e8154204651f7e64162e10 URL: https://source.winehq.org/git/tools.git/?a=commit;h=02548952b9b8001ed7e8154… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 5 12:19:51 2021 +0100 winetest/dissect: Fix handling of subtest lines. Add support for garbled subtest lines. Link to the corresponding source line. Call add_test_line() so they show up in the HTML-ized report. Let check_unit() issue an error if they are misplaced. Tweak the check_unit() message since subtest lines are not really "messages". Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 7f4f327..797c204 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -480,7 +480,7 @@ sub check_unit($$) my ($l_unit, $l_type) = @_; if (!$units{$l_unit} and !$broken) { - add_test_line("end", "Misplaced $l_type message"); + add_test_line("end", "Misplaced $l_type line"); $extra_failures++; $broken = 1; } @@ -609,19 +609,17 @@ while ($line = <IN>) { $rc = 0; } } - elsif ($line =~ /^([_.a-z0-9-]+)\.c:\d+: Subtest ([_.a-z0-9-]+)$/) + elsif (($unit ne "" and + $line =~ /^(.*?)($units_re)\.c:(\d+): (Subtest ([_.a-z0-9-]+).*)$/) or + $line =~ /^()([_a-z0-9]+)\.c:(\d+): (Subtest ([_.a-z0-9-]+).*)$/) { - my ($l_unit, $l_subunit) = ($1, $2); - if ($units{$l_unit}) - { - $units{$l_subunit} = 1; - $units_re = join("|", keys %units); - } - else - { - add_test_line("end", "$l_unit has a misplaced $l_subunit subtest line\n"); - $extra_failures++; - } + my ($pollution, $l_unit, $l_num, $l_text, $l_subunit) = ($1, $2, $3, $4, $5); + add_test_line("trace", escapeHTML($pollution) . + get_source_link($l_unit, $l_num) .": ". + escapeHTML($l_text)); + check_unit($l_unit, "subtest"); + $units{$l_subunit} = 1; + $units_re = join("|", keys %units); } elsif (($unit ne "" and $line =~ /^(.*?)($units_re)\.c:(\d+): (Test (?:failed|succeeded inside todo block): .*)$/) or

1 0