- Wine-Commits - list.winehq.org

Francois Gouget : riched32/tests: EM_GETSELTEXT's wparam is not used and should be 0.
by Alexandre Julliard Feb. 28, 2023

Feb. 28, 2023

Module: wine Branch: master Commit: 002860d6b3620a75bc60b5b12c9ca2d0b47cdd22 URL: https://gitlab.winehq.org/wine/wine/-/commit/002860d6b3620a75bc60b5b12c9ca2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 23 17:29:29 2023 +0100 riched32/tests: EM_GETSELTEXT's wparam is not used and should be 0. --- dlls/riched32/tests/editor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index b8b00352f26..7782ed78338 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -1361,7 +1361,7 @@ static void test_EM_EXSETSEL(void) cr.cpMin = 4; cr.cpMax = 8; result = SendMessageA(hwndRichEdit, EM_EXSETSEL, 0, (LPARAM)&cr); todo_wine ok(result == 7, "EM_EXSETSEL return %Id expected 7\n", result); - result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, sizeof(bufA), (LPARAM)bufA); + result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, 0, (LPARAM)bufA); ok(!strcmp(bufA, "ef\x8e\xf0"), "EM_GETSELTEXT return incorrect string\n"); SendMessageA(hwndRichEdit, EM_EXGETSEL, 0, (LPARAM)&cr); ok(cr.cpMin == 4, "Selection start incorrectly: %ld expected 4\n", cr.cpMin); @@ -1420,7 +1420,7 @@ static void test_EM_SETSEL(void) /* 012345 6 7 8901 */ result = SendMessageA(hwndRichEdit, EM_SETSEL, 4, 8); todo_wine ok(result == 7, "EM_SETSEL return %Id expected 7\n", result); - result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, sizeof(buffA), (LPARAM)buffA); + result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, 0, (LPARAM)buffA); ok(!strcmp(buffA, "ef\x8e\xf0"), "EM_GETSELTEXT return incorrect string\n"); result = SendMessageA(hwndRichEdit, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); ok(sel_start == 4, "Selection start incorrectly: %d expected 4\n", sel_start);

1 0

Alex Henrie : shell32: Add support for Program Manager icons with arguments.
by Alexandre Julliard Feb. 28, 2023

Feb. 28, 2023

Module: wine Branch: master Commit: aa21d1acb28839177e8d7e74bab65bf1886d6596 URL: https://gitlab.winehq.org/wine/wine/-/commit/aa21d1acb28839177e8d7e74bab65b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Feb 24 19:55:12 2023 -0700 shell32: Add support for Program Manager icons with arguments. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52506 --- dlls/shell32/dde.c | 21 +++++++++++++++------ dlls/shell32/tests/progman_dde.c | 17 ++++++++++++++++- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/dde.c b/dlls/shell32/dde.c index 24294d69fe2..c390f8e3186 100644 --- a/dlls/shell32/dde.c +++ b/dlls/shell32/dde.c @@ -261,7 +261,7 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) } else if (!wcsicmp(command, L"AddItem")) { - WCHAR *path, *name; + WCHAR *target, *space = NULL, *path, *name; IShellLinkW *link; IPersistFile *file; HRESULT hres; @@ -272,15 +272,24 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) &IID_IShellLinkW, (void **)&link); if (FAILED(hres)) return DDE_FNOTPROCESSED; - len = SearchPathW(NULL, argv[0], L".exe", 0, NULL, NULL); - if (len == 0) + target = wcsdup(argv[0]); + while (!(len = SearchPathW(NULL, target, L".exe", 0, NULL, NULL))) { - IShellLinkW_Release(link); - return DDE_FNOTPROCESSED; + /* progressively remove words from the end of the command line until we get a valid file name */ + space = wcsrchr(target, ' '); + if (!space) + { + IShellLinkW_Release(link); + free(target); + return DDE_FNOTPROCESSED; + } + *space = 0; } path = malloc(len * sizeof(WCHAR)); - SearchPathW(NULL, argv[0], L".exe", len, path, NULL); + SearchPathW(NULL, target, L".exe", len, path, NULL); IShellLinkW_SetPath(link, path); + if (space) IShellLinkW_SetArguments(link, argv[0] + (space - target) + 1); + free(target); free(path); if (argc >= 2) IShellLinkW_SetDescription(link, argv[1]); diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index 5a7e8c912e5..b15295c5a21 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -231,10 +231,25 @@ static void test_parser(DWORD instance, HCONV hConv) ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); ok(check_exists("test/foobar.lnk"), "link not created\n"); - error = dde_execute(instance, hConv, "[AddItem(notepad,foo bar)]"); + error = dde_execute(instance, hConv, "[AddItem(notepad\tfoo.txt,foo)]"); + ok(error == DMLERR_NOTPROCESSED, "expected DMLERR_NOTPROCESSED, got %u\n", error); + + error = dde_execute(instance, hConv, "[AddItem(notepad foo.txt,foo)]"); + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); + ok(check_exists("test/foo.lnk"), "link not created\n"); + + error = dde_execute(instance, hConv, "[AddItem(notepad foo.txt bar.txt,foo bar)]"); ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); ok(check_exists("test/foo bar.lnk"), "link not created\n"); + error = dde_execute(instance, hConv, "[AddItem(C:\\Program Files\\Internet Explorer\\iexplore.exe,IE)]"); + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); + ok(check_exists("test/IE.lnk"), "link not created\n"); + + error = dde_execute(instance, hConv, "[AddItem(C:\\Program Files\\Internet Explorer\\iexplore.exe https://www.winehq.org/,WineHQ)"); + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); + ok(check_exists("test/WineHQ.lnk"), "link not created\n"); + error = dde_execute(instance, hConv, "[AddItem(notepad,a[b,c]d)]"); ok(error == DMLERR_NOTPROCESSED, "expected DMLERR_NOTPROCESSED, got %u\n", error);

1 0

Akihiro Sagawa : msado15: Free recordset filter on close.
by Alexandre Julliard Feb. 28, 2023

Feb. 28, 2023

Module: wine Branch: master Commit: e8bba58431f25da90b179f9acd5583f880adcc92 URL: https://gitlab.winehq.org/wine/wine/-/commit/e8bba58431f25da90b179f9acd5583… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Feb 25 20:57:45 2023 +0900 msado15: Free recordset filter on close. Introduced by commit 669107f6c5e54f520a846caec9649163675784a4. --- dlls/msado15/recordset.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index c9309336cb6..c22b2460147 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -1205,6 +1205,8 @@ static void close_recordset( struct recordset *recordset ) if ( recordset->row_set ) IRowset_Release( recordset->row_set ); recordset->row_set = NULL; + VariantClear( &recordset->filter ); + if (!recordset->fields) return; col_count = get_column_count( recordset );

1 0

Zebediah Figura : vkd3d-shader/hlsl: Do not set an initial latent matrix majority.
by Alexandre Julliard Feb. 28, 2023

Feb. 28, 2023

Module: vkd3d Branch: master Commit: 322963add80271e59e46ac61559d4408c153d4bc URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/322963add80271e59e46ac61559d4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 29 18:55:42 2022 -0500 vkd3d-shader/hlsl: Do not set an initial latent matrix majority. This change does nothing by itself. --- libs/vkd3d-shader/hlsl.c | 2 -- libs/vkd3d-shader/hlsl.y | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 3cf3e6d0..24822e97 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -2973,8 +2973,6 @@ static bool hlsl_ctx_init(struct hlsl_ctx *ctx, const char *source_name, ctx->location.line = ctx->location.column = 1; vkd3d_string_buffer_cache_init(&ctx->string_buffers); - ctx->matrix_majority = HLSL_MODIFIER_COLUMN_MAJOR; - list_init(&ctx->scopes); if (!(ctx->dummy_scope = hlsl_new_scope(ctx, NULL))) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index c072362c..6162423c 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -886,7 +886,8 @@ static struct hlsl_type *apply_type_modifiers(struct hlsl_ctx *ctx, struct hlsl_ && !(type->modifiers & HLSL_MODIFIERS_MAJORITY_MASK) && type->type == HLSL_CLASS_MATRIX) { - default_majority = ctx->matrix_majority; + if (!(default_majority = ctx->matrix_majority)) + default_majority = HLSL_MODIFIER_COLUMN_MAJOR; } else if (type->type != HLSL_CLASS_MATRIX) {

1 0

Zebediah Figura : vkd3d-shader/hlsl: Store the matrix majority as a type modifiers bitmask.
by Alexandre Julliard Feb. 28, 2023

Feb. 28, 2023

Module: vkd3d Branch: master Commit: 75ab9d31efcd06c8f50c4bce2c01331e630d3a49 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/75ab9d31efcd06c8f50c4bce2c013… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 29 18:49:10 2022 -0500 vkd3d-shader/hlsl: Store the matrix majority as a type modifiers bitmask. --- libs/vkd3d-shader/hlsl.c | 2 +- libs/vkd3d-shader/hlsl.h | 8 +------- libs/vkd3d-shader/hlsl.l | 4 ++-- libs/vkd3d-shader/hlsl.y | 5 +---- 4 files changed, 5 insertions(+), 14 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index d15abe50..3cf3e6d0 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -2973,7 +2973,7 @@ static bool hlsl_ctx_init(struct hlsl_ctx *ctx, const char *source_name, ctx->location.line = ctx->location.column = 1; vkd3d_string_buffer_cache_init(&ctx->string_buffers); - ctx->matrix_majority = HLSL_COLUMN_MAJOR; + ctx->matrix_majority = HLSL_MODIFIER_COLUMN_MAJOR; list_init(&ctx->scopes); diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 62049e8d..24d0f517 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -116,12 +116,6 @@ enum hlsl_sampler_dim HLSL_SAMPLER_DIM_MAX = HLSL_SAMPLER_DIM_CUBEARRAY, }; -enum hlsl_matrix_majority -{ - HLSL_COLUMN_MAJOR, - HLSL_ROW_MAJOR -}; - enum hlsl_regset { HLSL_REGSET_SAMPLERS, @@ -735,7 +729,7 @@ struct hlsl_ctx const struct hlsl_ir_function_decl *cur_function; /* Default matrix majority for matrix types. Can be set by a pragma within the HLSL source. */ - enum hlsl_matrix_majority matrix_majority; + unsigned int matrix_majority; /* Basic data types stored for convenience. */ struct diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l index 59f31fcd..adff1da0 100644 --- a/libs/vkd3d-shader/hlsl.l +++ b/libs/vkd3d-shader/hlsl.l @@ -233,14 +233,14 @@ row_major {return KW_ROW_MAJOR; } struct hlsl_ctx *ctx = yyget_extra(yyscanner); TRACE("#pragma setting row_major mode.\n"); - ctx->matrix_majority = HLSL_ROW_MAJOR; + ctx->matrix_majority = HLSL_MODIFIER_ROW_MAJOR; BEGIN(pp_ignore); } <pp_pragma>pack_matrix{WS}*${WS}*column_major{WS}*$ { struct hlsl_ctx *ctx = yyget_extra(yyscanner); TRACE("#pragma setting column_major mode.\n"); - ctx->matrix_majority = HLSL_COLUMN_MAJOR; + ctx->matrix_majority = HLSL_MODIFIER_COLUMN_MAJOR; BEGIN(pp_ignore); } <pp_pragma>{NEWLINE} { diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index c187cc47..c072362c 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -886,10 +886,7 @@ static struct hlsl_type *apply_type_modifiers(struct hlsl_ctx *ctx, struct hlsl_ && !(type->modifiers & HLSL_MODIFIERS_MAJORITY_MASK) && type->type == HLSL_CLASS_MATRIX) { - if (ctx->matrix_majority == HLSL_COLUMN_MAJOR) - default_majority = HLSL_MODIFIER_COLUMN_MAJOR; - else - default_majority = HLSL_MODIFIER_ROW_MAJOR; + default_majority = ctx->matrix_majority; } else if (type->type != HLSL_CLASS_MATRIX) {

1 0

Zebediah Figura : vkd3d-shader/hlsl: Get rid of the check_invalid_matrix_modifiers() helper.
by Alexandre Julliard Feb. 28, 2023

Feb. 28, 2023

Module: vkd3d Branch: master Commit: a28ecaa135259fcb7bbf1d60270f93e3a38f5c6c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a28ecaa135259fcb7bbf1d60270f9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 16 14:44:12 2023 -0600 vkd3d-shader/hlsl: Get rid of the check_invalid_matrix_modifiers() helper. --- libs/vkd3d-shader/hlsl.y | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 3e6077d9..e011ea24 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -149,13 +149,6 @@ static void destroy_instr_list(struct list *list) vkd3d_free(list); } -static void check_invalid_matrix_modifiers(struct hlsl_ctx *ctx, DWORD modifiers, struct vkd3d_shader_location loc) -{ - if (modifiers & HLSL_MODIFIERS_MAJORITY_MASK) - hlsl_error(ctx, &loc, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, - "'row_major' and 'column_major' modifiers are only allowed for matrices."); -} - static bool hlsl_types_are_componentwise_compatible(struct hlsl_ctx *ctx, struct hlsl_type *src, struct hlsl_type *dst) { @@ -889,9 +882,10 @@ static struct hlsl_type *apply_type_modifiers(struct hlsl_ctx *ctx, struct hlsl_ if (!(default_majority = ctx->matrix_majority) && force_majority) default_majority = HLSL_MODIFIER_COLUMN_MAJOR; } - else if (type->type != HLSL_CLASS_MATRIX) + else if (type->type != HLSL_CLASS_MATRIX && (*modifiers & HLSL_MODIFIERS_MAJORITY_MASK)) { - check_invalid_matrix_modifiers(ctx, *modifiers, *loc); + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, + "'row_major' and 'column_major' modifiers are only allowed for matrices."); } if (!default_majority && !(*modifiers & HLSL_TYPE_MODIFIERS_MASK))

1 0

Zebediah Figura : vkd3d-shader/hlsl: Apply latent type modifiers to matrix array typedefs.
by Alexandre Julliard Feb. 28, 2023

Feb. 28, 2023

Module: vkd3d Branch: master Commit: b3c620954b2d20411c31f806659bcd7aa842c517 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b3c620954b2d20411c31f806659bc… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 15 18:07:33 2023 -0600 vkd3d-shader/hlsl: Apply latent type modifiers to matrix array typedefs. --- libs/vkd3d-shader/hlsl.y | 25 ++++++++++--------- tests/hlsl-majority-pragma.shader_test | 45 ++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 4b26a179..c187cc47 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -882,12 +882,6 @@ static struct hlsl_type *apply_type_modifiers(struct hlsl_ctx *ctx, struct hlsl_ unsigned int default_majority = 0; struct hlsl_type *new_type; - /* This function is only used for declarations (i.e. variables and struct - * fields), which should inherit the matrix majority. We only explicitly set - * the default majority for declarations—typedefs depend on this—but we - * want to always set it, so that an hlsl_type object is never used to - * represent two different majorities (and thus can be used to store its - * register size, etc.) */ if (!(*modifiers & HLSL_MODIFIERS_MAJORITY_MASK) && !(type->modifiers & HLSL_MODIFIERS_MAJORITY_MASK) && type->type == HLSL_CLASS_MATRIX) @@ -1003,7 +997,8 @@ static bool gen_struct_fields(struct hlsl_ctx *ctx, struct parse_fields *fields, return true; } -static bool add_typedef(struct hlsl_ctx *ctx, DWORD modifiers, struct hlsl_type *orig_type, struct list *list) +static bool add_typedef(struct hlsl_ctx *ctx, const unsigned int modifiers, + struct hlsl_type *const orig_type, struct list *list) { struct parse_variable_def *v, *v_next; struct hlsl_type *type; @@ -1014,15 +1009,26 @@ static bool add_typedef(struct hlsl_ctx *ctx, DWORD modifiers, struct hlsl_type { if (!v->arrays.count) { + /* Do not use apply_type_modifiers() here. We should not apply the + * latent matrix majority to plain matrix types. */ if (!(type = hlsl_type_clone(ctx, orig_type, 0, modifiers))) { free_parse_variable_def(v); continue; } + + if (type->type != HLSL_CLASS_MATRIX) + check_invalid_matrix_modifiers(ctx, modifiers, v->loc); } else { - type = orig_type; + unsigned int var_modifiers = modifiers; + + if (!(type = apply_type_modifiers(ctx, orig_type, &var_modifiers, v->loc))) + { + free_parse_variable_def(v); + continue; + } } ret = true; @@ -1048,9 +1054,6 @@ static bool add_typedef(struct hlsl_ctx *ctx, DWORD modifiers, struct hlsl_type vkd3d_free((void *)type->name); type->name = v->name; - if (type->type != HLSL_CLASS_MATRIX) - check_invalid_matrix_modifiers(ctx, type->modifiers, v->loc); - if ((type->modifiers & HLSL_MODIFIER_COLUMN_MAJOR) && (type->modifiers & HLSL_MODIFIER_ROW_MAJOR)) hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, diff --git a/tests/hlsl-majority-pragma.shader_test b/tests/hlsl-majority-pragma.shader_test index da1b1ff3..48915aa7 100644 --- a/tests/hlsl-majority-pragma.shader_test +++ b/tests/hlsl-majority-pragma.shader_test @@ -128,6 +128,31 @@ float4 main() : sv_target } +% This applies to arrays as well. Note that struct fields already have latent +% majority applied (even if there have been no pragmas, as shown below), so the +% question of typedefs is moot there. + + +[pixel shader] +#pragma pack_matrix(row_major) +typedef float2x2 myarray_t[2]; +#pragma pack_matrix(column_major) +uniform myarray_t a; + +float4 main() : sv_target +{ + return float4(a[0][0], a[1][1]); +} + +[test] +uniform 0 float4 0.3 0.4 0.0 0.0 +uniform 4 float4 0.0 0.0 0.0 0.0 +uniform 8 float4 0.0 0.0 0.0 0.0 +uniform 12 float4 0.5 0.6 0.0 0.0 +draw quad +probe all rgba (0.3, 0.4, 0.5, 0.6) + + % However, if no pack_matrix directive has been used yet, a typedef has no % defined majority, and the majority can be overwritten, including by a % subsequent pragma. @@ -178,3 +203,23 @@ uniform 0 float4 0.2 0.4 0.0 0.0 uniform 4 float4 0.3 0.5 0.0 0.0 draw quad probe all rgba (0.2, 0.3, 0.4, 0.5) + + +[pixel shader] +typedef float2x2 myarray_t[2]; +#pragma pack_matrix(row_major) +typedef myarray_t myarray2_t; +uniform myarray2_t a; + +float4 main() : sv_target +{ + return float4(a[0][0], a[1][1]); +} + +[test] +uniform 0 float4 0.3 0.0 0.0 0.0 +uniform 4 float4 0.4 0.0 0.0 0.0 +uniform 8 float4 0.0 0.5 0.0 0.0 +uniform 12 float4 0.0 0.6 0.0 0.0 +draw quad +probe all rgba (0.3, 0.4, 0.5, 0.6)

1 0

Zebediah Figura : vkd3d-shader/hlsl: Apply latent majority modifiers to typedefs as well.
by Alexandre Julliard Feb. 28, 2023

Feb. 28, 2023

Module: vkd3d Branch: master Commit: 5838364886797eb70422501700feb910fb28c68c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5838364886797eb70422501700feb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 29 19:15:40 2022 -0500 vkd3d-shader/hlsl: Apply latent majority modifiers to typedefs as well. --- libs/vkd3d-shader/hlsl.y | 54 +++++++++++++++++----------------- tests/hlsl-majority-pragma.shader_test | 4 +-- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 6162423c..3e6077d9 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -877,7 +877,7 @@ static const struct hlsl_struct_field *get_struct_field(const struct hlsl_struct } static struct hlsl_type *apply_type_modifiers(struct hlsl_ctx *ctx, struct hlsl_type *type, - unsigned int *modifiers, struct vkd3d_shader_location loc) + unsigned int *modifiers, bool force_majority, const struct vkd3d_shader_location *loc) { unsigned int default_majority = 0; struct hlsl_type *new_type; @@ -886,12 +886,12 @@ static struct hlsl_type *apply_type_modifiers(struct hlsl_ctx *ctx, struct hlsl_ && !(type->modifiers & HLSL_MODIFIERS_MAJORITY_MASK) && type->type == HLSL_CLASS_MATRIX) { - if (!(default_majority = ctx->matrix_majority)) + if (!(default_majority = ctx->matrix_majority) && force_majority) default_majority = HLSL_MODIFIER_COLUMN_MAJOR; } else if (type->type != HLSL_CLASS_MATRIX) { - check_invalid_matrix_modifiers(ctx, *modifiers, loc); + check_invalid_matrix_modifiers(ctx, *modifiers, *loc); } if (!default_majority && !(*modifiers & HLSL_TYPE_MODIFIERS_MASK)) @@ -903,7 +903,7 @@ static struct hlsl_type *apply_type_modifiers(struct hlsl_ctx *ctx, struct hlsl_ *modifiers &= ~HLSL_TYPE_MODIFIERS_MASK; if ((new_type->modifiers & HLSL_MODIFIER_ROW_MAJOR) && (new_type->modifiers & HLSL_MODIFIER_COLUMN_MAJOR)) - hlsl_error(ctx, &loc, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, "'row_major' and 'column_major' modifiers are mutually exclusive."); return new_type; @@ -995,8 +995,7 @@ static bool gen_struct_fields(struct hlsl_ctx *ctx, struct parse_fields *fields, return true; } -static bool add_typedef(struct hlsl_ctx *ctx, const unsigned int modifiers, - struct hlsl_type *const orig_type, struct list *list) +static bool add_typedef(struct hlsl_ctx *ctx, struct hlsl_type *const orig_type, struct list *list) { struct parse_variable_def *v, *v_next; struct hlsl_type *type; @@ -1007,22 +1006,17 @@ static bool add_typedef(struct hlsl_ctx *ctx, const unsigned int modifiers, { if (!v->arrays.count) { - /* Do not use apply_type_modifiers() here. We should not apply the - * latent matrix majority to plain matrix types. */ - if (!(type = hlsl_type_clone(ctx, orig_type, 0, modifiers))) + if (!(type = hlsl_type_clone(ctx, orig_type, 0, 0))) { free_parse_variable_def(v); continue; } - - if (type->type != HLSL_CLASS_MATRIX) - check_invalid_matrix_modifiers(ctx, modifiers, v->loc); } else { - unsigned int var_modifiers = modifiers; + unsigned int var_modifiers = 0; - if (!(type = apply_type_modifiers(ctx, orig_type, &var_modifiers, v->loc))) + if (!(type = apply_type_modifiers(ctx, orig_type, &var_modifiers, true, &v->loc))) { free_parse_variable_def(v); continue; @@ -1052,11 +1046,6 @@ static bool add_typedef(struct hlsl_ctx *ctx, const unsigned int modifiers, vkd3d_free((void *)type->name); type->name = v->name; - if ((type->modifiers & HLSL_MODIFIER_COLUMN_MAJOR) - && (type->modifiers & HLSL_MODIFIER_ROW_MAJOR)) - hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, - "'row_major' and 'column_major' modifiers are mutually exclusive."); - ret = hlsl_scope_add_type(ctx->cur_scope, type); if (!ret) hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_REDEFINED, @@ -4065,7 +4054,7 @@ struct_declaration: "Modifiers are not allowed on struct type declarations."); } - if (!(type = apply_type_modifiers(ctx, $2, &modifiers, @1))) + if (!(type = apply_type_modifiers(ctx, $2, &modifiers, true, &@1))) YYABORT; $$ = declare_vars(ctx, type, modifiers, &@1, $3); } @@ -4150,7 +4139,7 @@ field: struct hlsl_type *type; unsigned int modifiers = $1; - if (!(type = apply_type_modifiers(ctx, $2, &modifiers, @1))) + if (!(type = apply_type_modifiers(ctx, $2, &modifiers, true, &@1))) YYABORT; if (modifiers & ~HLSL_STORAGE_NOINTERPOLATION) { @@ -4300,7 +4289,7 @@ func_prototype_no_attrs: if (modifiers & ~HLSL_MODIFIERS_MAJORITY_MASK) hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, "Only majority modifiers are allowed on functions."); - if (!(type = apply_type_modifiers(ctx, $2, &modifiers, @1))) + if (!(type = apply_type_modifiers(ctx, $2, &modifiers, true, &@1))) YYABORT; if ((var = hlsl_get_var(ctx->globals, $3))) { @@ -4526,7 +4515,7 @@ parameter: struct hlsl_type *type; unsigned int i; - if (!(type = apply_type_modifiers(ctx, $2, &modifiers, @1))) + if (!(type = apply_type_modifiers(ctx, $2, &modifiers, true, &@1))) YYABORT; $$.modifiers = modifiers; @@ -4758,9 +4747,20 @@ typedef_type: typedef: KW_TYPEDEF var_modifiers typedef_type type_specs ';' { - if ($2 & ~HLSL_TYPE_MODIFIERS_MASK) + struct parse_variable_def *v, *v_next; + unsigned int modifiers = $2; + struct hlsl_type *type; + + if (!(type = apply_type_modifiers(ctx, $3, &modifiers, false, &@2))) + { + LIST_FOR_EACH_ENTRY_SAFE(v, v_next, $4, struct parse_variable_def, entry) + free_parse_variable_def(v); + vkd3d_free($4); + YYABORT; + } + + if (modifiers) { - struct parse_variable_def *v, *v_next; hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, "Storage modifiers are not allowed on typedefs."); LIST_FOR_EACH_ENTRY_SAFE(v, v_next, $4, struct parse_variable_def, entry) @@ -4768,7 +4768,7 @@ typedef: vkd3d_free($4); YYABORT; } - if (!add_typedef(ctx, $2, $3, $4)) + if (!add_typedef(ctx, type, $4)) YYABORT; } @@ -4800,7 +4800,7 @@ declaration: struct hlsl_type *type; unsigned int modifiers = $1; - if (!(type = apply_type_modifiers(ctx, $2, &modifiers, @1))) + if (!(type = apply_type_modifiers(ctx, $2, &modifiers, true, &@1))) YYABORT; $$ = declare_vars(ctx, type, modifiers, &@1, $3); } diff --git a/tests/hlsl-majority-pragma.shader_test b/tests/hlsl-majority-pragma.shader_test index 48915aa7..10778fd0 100644 --- a/tests/hlsl-majority-pragma.shader_test +++ b/tests/hlsl-majority-pragma.shader_test @@ -112,12 +112,12 @@ float4 main() : sv_target uniform 0 float4 0.1 0.2 0.0 0.0 uniform 4 float4 0.3 0.4 0.0 0.0 draw quad -todo probe all rgba (0.1, 0.2, 0.3, 0.4) +probe all rgba (0.1, 0.2, 0.3, 0.4) % In fact, it's illegal to specify a contradictory majority. -[pixel shader fail todo] +[pixel shader fail] #pragma pack_matrix(row_major) typedef float2x2 mat_t; uniform column_major mat_t m;

1 0

Zebediah Figura : tests: Add more tests for pack_matrix pragmas.
by Alexandre Julliard Feb. 28, 2023

Feb. 28, 2023

Module: vkd3d Branch: master Commit: 2a412670eeaa24bb8ed1a7e3ba86bdd8b193de84 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/2a412670eeaa24bb8ed1a7e3ba86b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 29 17:39:34 2022 -0500 tests: Add more tests for pack_matrix pragmas. --- tests/hlsl-majority-pragma.shader_test | 131 +++++++++++++++++++++++++++++++++ 1 file changed, 131 insertions(+) diff --git a/tests/hlsl-majority-pragma.shader_test b/tests/hlsl-majority-pragma.shader_test index d269e859..da1b1ff3 100644 --- a/tests/hlsl-majority-pragma.shader_test +++ b/tests/hlsl-majority-pragma.shader_test @@ -20,6 +20,51 @@ uniform 12 float4 0.2 0.4 0.0 0.0 draw quad probe all rgba (0.17, 0.39, 0.17, 0.39) 1 + +%% Test with a struct. + +[pixel shader] +#pragma pack_matrix(row_major) +struct apple +{ + float2x2 m; +}; +#pragma pack_matrix(column_major) +uniform struct apple a; + +float4 main() : sv_target +{ + return float4(a.m[0], a.m[1]); +} + +[test] +uniform 0 float4 0.1 0.2 0.0 0.0 +uniform 4 float4 0.3 0.4 0.0 0.0 +draw quad +probe all rgba (0.1, 0.2, 0.3, 0.4) + + +%% Test with an array. + +[pixel shader] +#pragma pack_matrix(row_major) +uniform float2x2 m[2]; +#pragma pack_matrix(column_major) + +float4 main() : sv_target +{ + return float4(m[1][0], m[1][1]); +} + +[test] +uniform 0 float4 0.0 0.0 0.0 0.0 +uniform 4 float4 0.0 0.0 0.0 0.0 +uniform 8 float4 0.5 0.6 0.0 0.0 +uniform 12 float4 0.7 0.8 0.0 0.0 +draw quad +probe all rgba (0.5, 0.6, 0.7, 0.8) + + % The documentation claims these strings are subject to macro expansion. % They are not. @@ -47,3 +92,89 @@ uniform 0 float4 0.1 0.2 0.0 0.0 uniform 4 float4 0.3 0.4 0.0 0.0 draw quad probe all rgba (0.23, 0.34, 0.5, 0.5) 1 + + +% The majority that applies to a typedef is the latent majority at the time +% that typedef was declared. + +[pixel shader] +#pragma pack_matrix(row_major) +typedef float2x2 mat_t; +#pragma pack_matrix(column_major) +uniform mat_t m; + +float4 main() : sv_target +{ + return float4(m[0], m[1]); +} + +[test] +uniform 0 float4 0.1 0.2 0.0 0.0 +uniform 4 float4 0.3 0.4 0.0 0.0 +draw quad +todo probe all rgba (0.1, 0.2, 0.3, 0.4) + + +% In fact, it's illegal to specify a contradictory majority. + +[pixel shader fail todo] +#pragma pack_matrix(row_major) +typedef float2x2 mat_t; +uniform column_major mat_t m; + +float4 main() : sv_target +{ + return 0; +} + + +% However, if no pack_matrix directive has been used yet, a typedef has no +% defined majority, and the majority can be overwritten, including by a +% subsequent pragma. + +[pixel shader] +typedef float2x2 mat_t; +#pragma pack_matrix(row_major) +uniform mat_t m; + +uniform row_major mat_t r; +uniform column_major mat_t c; + +float4 main() : sv_target +{ + return float4(m[0], m[1]); +} + +[test] +uniform 0 float4 0.1 0.2 0.0 0.0 +uniform 4 float4 0.3 0.4 0.0 0.0 +draw quad +probe all rgba (0.1, 0.2, 0.3, 0.4) + + +% This does not apply recursively to struct or array members, however. Members +% defined while there is no latent majority are always column-major, even if +% the type is later used after a pack_matrix(row_major) directive. + +% Note that the majority of the struct or array type cannot itself be +% overwritten with modifiers; those are only valid on matrix types. + +[pixel shader] +struct apple +{ + float2x2 m; +}; +#pragma pack_matrix(row_major) +typedef struct apple apple_t; +uniform apple_t a; + +float4 main() : sv_target +{ + return float4(a.m[0], a.m[1]); +} + +[test] +uniform 0 float4 0.2 0.4 0.0 0.0 +uniform 4 float4 0.3 0.5 0.0 0.0 +draw quad +probe all rgba (0.2, 0.3, 0.4, 0.5)

1 0

Francisco Casas : vkd3d-shader/hlsl: Don't map src swizzles for SM1 dp3 and dp4 ops.
by Alexandre Julliard Feb. 27, 2023

Feb. 27, 2023

Module: vkd3d Branch: master Commit: af25d5bf9688c8f633456d8709f642c4f3049e64 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/af25d5bf9688c8f633456d8709f64… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Feb 23 10:52:29 2023 -0300 vkd3d-shader/hlsl: Don't map src swizzles for SM1 dp3 and dp4 ops. Without this patch, dp3 and dp4 map src swizzles to the dst writemask, which is not correct. Before b84f560bdf59c35e093e51bfdf9a166c196d3a9b, these ops worked despite this, because the dst register had, incorrectly, the full writemask. To solve this problem, write_sm1_binary_op_dot() is introduced, similarly to write_sm4_binary_op_dot(). --- libs/vkd3d-shader/hlsl_sm1.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm1.c b/libs/vkd3d-shader/hlsl_sm1.c index 07f9ceb7..4a62d804 100644 --- a/libs/vkd3d-shader/hlsl_sm1.c +++ b/libs/vkd3d-shader/hlsl_sm1.c @@ -525,6 +525,31 @@ static void write_sm1_binary_op(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buff write_sm1_instruction(ctx, buffer, &instr); } +static void write_sm1_binary_op_dot(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, + D3DSHADER_INSTRUCTION_OPCODE_TYPE opcode, const struct hlsl_reg *dst, + const struct hlsl_reg *src1, const struct hlsl_reg *src2) +{ + struct sm1_instruction instr = + { + .opcode = opcode, + + .dst.type = D3DSPR_TEMP, + .dst.writemask = dst->writemask, + .dst.reg = dst->id, + .has_dst = 1, + + .srcs[0].type = D3DSPR_TEMP, + .srcs[0].swizzle = hlsl_swizzle_from_writemask(src1->writemask), + .srcs[0].reg = src1->id, + .srcs[1].type = D3DSPR_TEMP, + .srcs[1].swizzle = hlsl_swizzle_from_writemask(src2->writemask), + .srcs[1].reg = src2->id, + .src_count = 2, + }; + + write_sm1_instruction(ctx, buffer, &instr); +} + static void write_sm1_unary_op(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, D3DSHADER_INSTRUCTION_OPCODE_TYPE opcode, const struct hlsl_reg *dst, const struct hlsl_reg *src, D3DSHADER_PARAM_SRCMOD_TYPE src_mod, D3DSHADER_PARAM_DSTMOD_TYPE dst_mod) @@ -738,11 +763,11 @@ static void write_sm1_expr(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b switch (arg1->data_type->dimx) { case 4: - write_sm1_binary_op(ctx, buffer, D3DSIO_DP4, &instr->reg, &arg1->reg, &arg2->reg); + write_sm1_binary_op_dot(ctx, buffer, D3DSIO_DP4, &instr->reg, &arg1->reg, &arg2->reg); break; case 3: - write_sm1_binary_op(ctx, buffer, D3DSIO_DP3, &instr->reg, &arg1->reg, &arg2->reg); + write_sm1_binary_op_dot(ctx, buffer, D3DSIO_DP3, &instr->reg, &arg1->reg, &arg2->reg); break; default:

1 0