October 2021 - Wine-Commits

Alexandre Julliard : winemenubuilder: Launch .lnk files directly through the Wine loader.
by Alexandre Julliard Oct. 1, 2021

Oct. 1, 2021

Module: wine Branch: master Commit: 542d67342db8b77af8244328ca175f91cb504e5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=542d67342db8b77af8244328… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 1 10:20:15 2021 +0200 winemenubuilder: Launch .lnk files directly through the Wine loader. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemenubuilder/winemenubuilder.c | 59 ++++-------------------------- 1 file changed, 8 insertions(+), 51 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 06d1e655195..c0701d0241f 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -2492,10 +2492,8 @@ static char *get_start_exe_path(void) static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) { - static const WCHAR startW[] = {'\\','c','o','m','m','a','n','d', - '\\','s','t','a','r','t','.','e','x','e',0}; char *link_name = NULL, *icon_name = NULL, *work_dir = NULL; - char *escaped_path = NULL, *escaped_args = NULL, *description = NULL; + char *description = NULL; char *wmclass = NULL; WCHAR szTmp[INFOTIPSIZE]; WCHAR szDescription[INFOTIPSIZE], szPath[MAX_PATH], szWorkDir[MAX_PATH]; @@ -2503,7 +2501,6 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) int iIconId = 0, r = -1; DWORD csidl = -1; HANDLE hsem = NULL; - char *start_path = NULL; if ( !link ) { @@ -2574,37 +2571,11 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) /* check the path */ if( szPath[0] ) { - static const WCHAR exeW[] = {'.','e','x','e',0}; - WCHAR *p; - - /* check for .exe extension */ - if (!(p = strrchrW( szPath, '.' )) || - strchrW( p, '\\' ) || strchrW( p, '/' ) || - lstrcmpiW( p, exeW )) - { - /* Not .exe - use 'start.exe' to launch this file */ - p = szArgs + lstrlenW(szPath) + 2; - if (szArgs[0]) - { - p[0] = ' '; - memmove( p+1, szArgs, min( (lstrlenW(szArgs) + 1) * sizeof(szArgs[0]), - sizeof(szArgs) - (p + 1 - szArgs) * sizeof(szArgs[0]) ) ); - } - else - p[0] = 0; + /* FIXME: Use AppUserModelID if present. */ + WCHAR *p = PathFindFileNameW(szPath); - szArgs[0] = '"'; - lstrcpyW(szArgs + 1, szPath); - szArgs[lstrlenW(szArgs)] = '"'; - - GetWindowsDirectoryW(szPath, MAX_PATH); - lstrcatW(szPath, startW); - } - else + if (p) { - /* FIXME: Use AppUserModelID if present. */ - WCHAR *p = PathFindFileNameW(szPath); - lstrcpyW(szWMClass, p); CharLowerW(szWMClass); } @@ -2613,20 +2584,9 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) if (szWorkDir[0]) work_dir = wine_get_unix_file_name( szWorkDir ); } - else - { - /* if there's no path... try run the link itself */ - lstrcpynW(szArgs, link, MAX_PATH); - GetWindowsDirectoryW(szPath, MAX_PATH); - lstrcatW(szPath, startW); - } - /* escape the path and parameters */ - escaped_path = escape(szPath); - escaped_args = escape(szArgs); description = wchars_to_utf8_chars(szDescription); wmclass = wchars_to_utf8_chars(szWMClass); - start_path = get_start_exe_path(); /* building multiple menus concurrently has race conditions */ hsem = CreateSemaphoreA( NULL, 1, 1, "winemenubuilder_semaphore"); @@ -2646,17 +2606,17 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) else ++lastEntry; location = heap_printf("%s/%s.desktop", xdg_desktop_dir, lastEntry); - if (csidl == CSIDL_COMMON_DESKTOPDIRECTORY) - r = !write_desktop_entry(link, location, lastEntry, start_path, escape(link), + if (csidl == CSIDL_COMMON_DESKTOPDIRECTORY || !szPath[0]) + r = !write_desktop_entry(link, location, lastEntry, escape(link), "", description, work_dir, icon_name, wmclass); else - r = !write_desktop_entry(NULL, location, lastEntry, escaped_path, escaped_args, description, work_dir, icon_name, wmclass); + r = !write_desktop_entry(NULL, location, lastEntry, escape(szPath), escape(szArgs), description, work_dir, icon_name, wmclass); if (r == 0) chmod(location, 0755); heap_free(location); } else - r = !write_menu_entry(link, link_name, start_path, escape(link), + r = !write_menu_entry(link, link_name, escape(link), "", description, work_dir, icon_name, wmclass); ReleaseSemaphore( hsem, 1, NULL ); @@ -2666,11 +2626,8 @@ cleanup: heap_free(icon_name ); heap_free(work_dir ); heap_free(link_name ); - heap_free(escaped_args ); - heap_free(escaped_path ); heap_free(description ); heap_free(wmclass ); - heap_free(start_path ); if (r && !bWait) WINE_ERR("failed to build the menu\n" );

1 0

Alexandre Julliard : winemenubuilder: Use Unicode strings to process association entries.
by Alexandre Julliard Oct. 1, 2021

Oct. 1, 2021

Module: wine Branch: master Commit: 41881ff6257cee6624372da71eee62435e30d7da URL: https://source.winehq.org/git/wine.git/?a=commit;h=41881ff6257cee6624372da7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 1 10:25:27 2021 +0200 winemenubuilder: Use Unicode strings to process association entries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemenubuilder/winemenubuilder.c | 324 ++++++++++++++--------------- 1 file changed, 156 insertions(+), 168 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=41881ff6257cee662437…

1 0

Alexandre Julliard : winemenubuilder: Build with msvcrt.
by Alexandre Julliard Oct. 1, 2021

Oct. 1, 2021

Module: wine Branch: master Commit: f1d4dd7cc83d971c6e69c3f2bdffe85dbcd81c0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1d4dd7cc83d971c6e69c3f2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 1 10:46:39 2021 +0200 winemenubuilder: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemenubuilder/Makefile.in | 2 +- programs/winemenubuilder/winemenubuilder.c | 222 ++++++++++++----------------- 2 files changed, 89 insertions(+), 135 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f1d4dd7cc83d971c6e69…

1 0

Alexandre Julliard : winemenubuilder: Use Unicode strings to write desktop entries.
by Alexandre Julliard Oct. 1, 2021

Oct. 1, 2021

Module: wine Branch: master Commit: d4a773a1d778b1e0ee3ec0d35487933477145853 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4a773a1d778b1e0ee3ec0d3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 1 10:25:57 2021 +0200 winemenubuilder: Use Unicode strings to write desktop entries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemenubuilder/winemenubuilder.c | 305 ++++++++++------------------- 1 file changed, 108 insertions(+), 197 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d4a773a1d778b1e0ee3e…

1 0

Alexandre Julliard : winemenubuilder: Use DOS path names to create desktop and menu files.
by Alexandre Julliard Oct. 1, 2021

Oct. 1, 2021

Module: wine Branch: master Commit: 1377be60ba0117d98fede3ce1d292a5aa77edbdf URL: https://source.winehq.org/git/wine.git/?a=commit;h=1377be60ba0117d98fede3ce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 1 10:29:44 2021 +0200 winemenubuilder: Use DOS path names to create desktop and menu files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemenubuilder/winemenubuilder.c | 317 +++++++++++++---------------- 1 file changed, 144 insertions(+), 173 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1377be60ba0117d98fed…

1 0

Zebediah Figura : vkd3d-shader/hlsl: Cache matrix types.
by Alexandre Julliard Oct. 1, 2021

Oct. 1, 2021

Module: vkd3d Branch: master Commit: ec8d8e6f73b9096e8f46433282ba266a21e57241 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ec8d8e6f73b9096e8f46433… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Sep 27 20:51:46 2021 -0500 vkd3d-shader/hlsl: Cache matrix types. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(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 | 3 ++- libs/vkd3d-shader/hlsl.h | 4 ++-- libs/vkd3d-shader/hlsl.y | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 14ad90c..fc6d1e4 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -200,7 +200,7 @@ static void hlsl_type_calculate_reg_size(struct hlsl_ctx *ctx, struct hlsl_type } } -struct hlsl_type *hlsl_new_type(struct hlsl_ctx *ctx, const char *name, enum hlsl_type_class type_class, +static struct hlsl_type *hlsl_new_type(struct hlsl_ctx *ctx, const char *name, enum hlsl_type_class type_class, enum hlsl_base_type base_type, unsigned dimx, unsigned dimy) { struct hlsl_type *type; @@ -1658,6 +1658,7 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) sprintf(name, "%s%ux%u", names[bt], y, x); type = hlsl_new_type(ctx, hlsl_strdup(ctx, name), HLSL_CLASS_MATRIX, bt, x, y); hlsl_scope_add_type(ctx->globals, type); + ctx->builtin_types.matrix[bt][x - 1][y - 1] = type; if (y == 1) { diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 7e62839..9686a49 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -459,6 +459,8 @@ struct hlsl_ctx { struct hlsl_type *scalar[HLSL_TYPE_LAST_SCALAR + 1]; struct hlsl_type *vector[HLSL_TYPE_LAST_SCALAR + 1][4]; + /* matrix[float][2][4] is a float4x2, i.e. dimx = 2, dimy = 4 */ + struct hlsl_type *matrix[HLSL_TYPE_LAST_SCALAR + 1][4][4]; struct hlsl_type *sampler[HLSL_SAMPLER_DIM_MAX + 1]; struct hlsl_type *Void; } builtin_types; @@ -653,8 +655,6 @@ struct hlsl_ir_swizzle *hlsl_new_swizzle(struct hlsl_ctx *ctx, DWORD s, unsigned struct hlsl_ir_node *val, struct vkd3d_shader_location *loc); struct hlsl_ir_var *hlsl_new_synthetic_var(struct hlsl_ctx *ctx, const char *name, struct hlsl_type *type, const struct vkd3d_shader_location loc); -struct hlsl_type *hlsl_new_type(struct hlsl_ctx *ctx, const char *name, enum hlsl_type_class type_class, - enum hlsl_base_type base_type, unsigned dimx, unsigned dimy); struct hlsl_ir_constant *hlsl_new_uint_constant(struct hlsl_ctx *ctx, unsigned int n, const struct vkd3d_shader_location loc); struct hlsl_ir_node *hlsl_new_unary_expr(struct hlsl_ctx *ctx, enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg, diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 5c10659..d1ef9eb 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1019,7 +1019,7 @@ static struct hlsl_type *expr_common_type(struct hlsl_ctx *ctx, struct hlsl_type return ctx->builtin_types.scalar[base]; if (type == HLSL_CLASS_VECTOR) return ctx->builtin_types.vector[base][dimx - 1]; - return hlsl_new_type(ctx, NULL, type, base, dimx, dimy); + return ctx->builtin_types.matrix[base][dimx - 1][dimy - 1]; } static struct hlsl_ir_expr *add_expr(struct hlsl_ctx *ctx, struct list *instrs, enum hlsl_ir_expr_op op, @@ -2425,7 +2425,7 @@ type: YYABORT; } - $$ = hlsl_new_type(ctx, NULL, HLSL_CLASS_MATRIX, $3->base_type, $7, $5); + $$ = ctx->builtin_types.matrix[$3->base_type][$7 - 1][$5 - 1]; } | KW_VOID {

1 0

Zebediah Figura : vkd3d-shader/hlsl: Use cached vector types in more places.
by Alexandre Julliard Oct. 1, 2021

Oct. 1, 2021

Module: vkd3d Branch: master Commit: b8502ed51cc6ab161e97214ba86c231a51eca6e2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b8502ed51cc6ab161e97214… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Sep 27 20:51:45 2021 -0500 vkd3d-shader/hlsl: Use cached vector types in more places. 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: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 2 +- libs/vkd3d-shader/hlsl.y | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 932593f..14ad90c 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -608,7 +608,7 @@ struct hlsl_ir_swizzle *hlsl_new_swizzle(struct hlsl_ctx *ctx, DWORD s, unsigned if (!(swizzle = hlsl_alloc(ctx, sizeof(*swizzle)))) return NULL; init_node(&swizzle->node, HLSL_IR_SWIZZLE, - hlsl_new_type(ctx, NULL, HLSL_CLASS_VECTOR, val->data_type->base_type, components, 1), *loc); + ctx->builtin_types.vector[val->data_type->base_type][components - 1], *loc); hlsl_src_from_node(&swizzle->val, val); swizzle->swizzle = s; return swizzle; diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 2a38470..5c10659 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2397,7 +2397,7 @@ type: YYABORT; } - $$ = hlsl_new_type(ctx, NULL, HLSL_CLASS_VECTOR, $3->base_type, $5, 1); + $$ = ctx->builtin_types.vector[$3->base_type][$5 - 1]; } | KW_MATRIX '<' type ',' C_INTEGER ',' C_INTEGER '>' {

1 0

Zebediah Figura : vkd3d-shader/hlsl: Avoid hardcoding the size of the operands array.
by Alexandre Julliard Oct. 1, 2021

Oct. 1, 2021

Module: vkd3d Branch: master Commit: 98cfd7b09fff8b433fb68225a1dc8bf60c304fcc URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=98cfd7b09fff8b433fb6822… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Sep 27 20:51:44 2021 -0500 vkd3d-shader/hlsl: Avoid hardcoding the size of the operands array. 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: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 2 +- libs/vkd3d-shader/hlsl.h | 4 +++- libs/vkd3d-shader/hlsl.y | 26 +++++++++++++------------- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 30098ea..932593f 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1108,7 +1108,7 @@ static void dump_ir_expr(struct vkd3d_string_buffer *buffer, const struct hlsl_i unsigned int i; vkd3d_string_buffer_printf(buffer, "%s (", debug_hlsl_expr_op(expr->op)); - for (i = 0; i < 3 && expr->operands[i].node; ++i) + for (i = 0; i < HLSL_MAX_OPERANDS && expr->operands[i].node; ++i) { dump_src(buffer, &expr->operands[i]); vkd3d_string_buffer_printf(buffer, " "); diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index abc870f..7e62839 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -323,11 +323,13 @@ enum hlsl_ir_expr_op HLSL_OP3_LERP, }; +#define HLSL_MAX_OPERANDS 3 + struct hlsl_ir_expr { struct hlsl_ir_node node; enum hlsl_ir_expr_op op; - struct hlsl_src operands[3]; + struct hlsl_src operands[HLSL_MAX_OPERANDS]; }; enum hlsl_ir_jump_type diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 5aa2d8f..2a38470 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1022,15 +1022,15 @@ static struct hlsl_type *expr_common_type(struct hlsl_ctx *ctx, struct hlsl_type return hlsl_new_type(ctx, NULL, type, base, dimx, dimy); } -static struct hlsl_ir_expr *add_expr(struct hlsl_ctx *ctx, struct list *instrs, - enum hlsl_ir_expr_op op, struct hlsl_ir_node *operands[3], struct vkd3d_shader_location *loc) +static struct hlsl_ir_expr *add_expr(struct hlsl_ctx *ctx, struct list *instrs, enum hlsl_ir_expr_op op, + struct hlsl_ir_node *operands[HLSL_MAX_OPERANDS], struct vkd3d_shader_location *loc) { struct hlsl_ir_expr *expr; struct hlsl_type *type; unsigned int i; type = operands[0]->data_type; - for (i = 1; i <= 2; ++i) + for (i = 1; i < HLSL_MAX_OPERANDS; ++i) { if (!operands[i]) break; @@ -1038,7 +1038,7 @@ static struct hlsl_ir_expr *add_expr(struct hlsl_ctx *ctx, struct list *instrs, if (!type) return NULL; } - for (i = 0; i <= 2; ++i) + for (i = 0; i < HLSL_MAX_OPERANDS; ++i) { struct hlsl_ir_expr *cast; @@ -1062,7 +1062,7 @@ static struct hlsl_ir_expr *add_expr(struct hlsl_ctx *ctx, struct list *instrs, return NULL; init_node(&expr->node, HLSL_IR_EXPR, type, *loc); expr->op = op; - for (i = 0; i <= 2; ++i) + for (i = 0; i < HLSL_MAX_OPERANDS; ++i) hlsl_src_from_node(&expr->operands[i], operands[i]); list_add_tail(instrs, &expr->node.entry); @@ -1083,7 +1083,7 @@ static struct list *add_unary_expr(struct hlsl_ctx *ctx, struct list *instrs, static struct list *add_binary_expr(struct hlsl_ctx *ctx, struct list *list1, struct list *list2, enum hlsl_ir_expr_op op, struct vkd3d_shader_location loc) { - struct hlsl_ir_node *args[3] = {node_from_list(list1), node_from_list(list2)}; + struct hlsl_ir_node *args[HLSL_MAX_OPERANDS] = {node_from_list(list1), node_from_list(list2)}; list_move_tail(list1, list2); vkd3d_free(list2); @@ -1157,7 +1157,7 @@ static struct hlsl_ir_node *add_assignment(struct hlsl_ctx *ctx, struct list *in if (assign_op == ASSIGN_OP_SUB) { - struct hlsl_ir_node *args[3] = {rhs}; + struct hlsl_ir_node *args[HLSL_MAX_OPERANDS] = {rhs}; struct hlsl_ir_expr *expr; if (!(expr = add_expr(ctx, instrs, HLSL_OP1_NEG, args, &rhs->loc))) @@ -1167,8 +1167,8 @@ static struct hlsl_ir_node *add_assignment(struct hlsl_ctx *ctx, struct list *in } if (assign_op != ASSIGN_OP_ASSIGN) { + struct hlsl_ir_node *args[HLSL_MAX_OPERANDS] = {lhs, rhs}; enum hlsl_ir_expr_op op = op_from_assignment(assign_op); - struct hlsl_ir_node *args[3] = {lhs, rhs}; struct hlsl_ir_expr *expr; assert(op); @@ -1556,7 +1556,7 @@ static const struct hlsl_ir_function_decl *find_function_call(struct hlsl_ctx *c static bool intrinsic_abs(struct hlsl_ctx *ctx, const struct parse_initializer *params, struct vkd3d_shader_location loc) { - struct hlsl_ir_node *args[3] = {params->args[0]}; + struct hlsl_ir_node *args[HLSL_MAX_OPERANDS] = {params->args[0]}; return !!add_expr(ctx, params->instrs, HLSL_OP1_ABS, args, &loc); } @@ -1564,7 +1564,7 @@ static bool intrinsic_abs(struct hlsl_ctx *ctx, static bool intrinsic_clamp(struct hlsl_ctx *ctx, const struct parse_initializer *params, struct vkd3d_shader_location loc) { - struct hlsl_ir_node *args[3] = {params->args[0], params->args[1]}; + struct hlsl_ir_node *args[HLSL_MAX_OPERANDS] = {params->args[0], params->args[1]}; struct hlsl_ir_expr *max; if (!(max = add_expr(ctx, params->instrs, HLSL_OP2_MAX, args, &loc))) @@ -1578,7 +1578,7 @@ static bool intrinsic_clamp(struct hlsl_ctx *ctx, static bool intrinsic_max(struct hlsl_ctx *ctx, const struct parse_initializer *params, struct vkd3d_shader_location loc) { - struct hlsl_ir_node *args[3] = {params->args[0], params->args[1]}; + struct hlsl_ir_node *args[HLSL_MAX_OPERANDS] = {params->args[0], params->args[1]}; return !!add_expr(ctx, params->instrs, HLSL_OP2_MAX, args, &loc); } @@ -1586,7 +1586,7 @@ static bool intrinsic_max(struct hlsl_ctx *ctx, static bool intrinsic_pow(struct hlsl_ctx *ctx, const struct parse_initializer *params, struct vkd3d_shader_location loc) { - struct hlsl_ir_node *args[3] = {0}; + struct hlsl_ir_node *args[HLSL_MAX_OPERANDS] = {0}; struct hlsl_ir_node *log, *exp; struct hlsl_ir_expr *mul; @@ -1608,7 +1608,7 @@ static bool intrinsic_pow(struct hlsl_ctx *ctx, static bool intrinsic_saturate(struct hlsl_ctx *ctx, const struct parse_initializer *params, struct vkd3d_shader_location loc) { - struct hlsl_ir_node *args[3] = {params->args[0]}; + struct hlsl_ir_node *args[HLSL_MAX_OPERANDS] = {params->args[0]}; return !!add_expr(ctx, params->instrs, HLSL_OP1_SAT, args, &loc); }

1 0

Zebediah Figura : vkd3d-shader/hlsl: Pass the original name string to hlsl_new_type().
by Alexandre Julliard Oct. 1, 2021

Oct. 1, 2021

Module: vkd3d Branch: master Commit: a1f938e8e41cca53148ad4fd9d2d198ec02f9092 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a1f938e8e41cca53148ad4f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Sep 27 20:51:47 2021 -0500 vkd3d-shader/hlsl: Pass the original name string to hlsl_new_type(). 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: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index fc6d1e4..66ca389 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -207,7 +207,11 @@ static struct hlsl_type *hlsl_new_type(struct hlsl_ctx *ctx, const char *name, e if (!(type = hlsl_alloc(ctx, sizeof(*type)))) return NULL; - type->name = name; + if (!(type->name = hlsl_strdup(ctx, name))) + { + vkd3d_free(type); + return NULL; + } type->type = type_class; type->base_type = base_type; type->dimx = dimx; @@ -1656,21 +1660,21 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) for (x = 1; x <= 4; ++x) { sprintf(name, "%s%ux%u", names[bt], y, x); - type = hlsl_new_type(ctx, hlsl_strdup(ctx, name), HLSL_CLASS_MATRIX, bt, x, y); + type = hlsl_new_type(ctx, name, HLSL_CLASS_MATRIX, bt, x, y); hlsl_scope_add_type(ctx->globals, type); ctx->builtin_types.matrix[bt][x - 1][y - 1] = type; if (y == 1) { sprintf(name, "%s%u", names[bt], x); - type = hlsl_new_type(ctx, hlsl_strdup(ctx, name), HLSL_CLASS_VECTOR, bt, x, y); + type = hlsl_new_type(ctx, name, HLSL_CLASS_VECTOR, bt, x, y); hlsl_scope_add_type(ctx->globals, type); ctx->builtin_types.vector[bt][x - 1] = type; if (x == 1) { sprintf(name, "%s", names[bt]); - type = hlsl_new_type(ctx, hlsl_strdup(ctx, name), HLSL_CLASS_SCALAR, bt, x, y); + type = hlsl_new_type(ctx, name, HLSL_CLASS_SCALAR, bt, x, y); hlsl_scope_add_type(ctx->globals, type); ctx->builtin_types.scalar[bt] = type; } @@ -1681,16 +1685,16 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) for (bt = 0; bt <= HLSL_SAMPLER_DIM_MAX; ++bt) { - type = hlsl_new_type(ctx, hlsl_strdup(ctx, sampler_names[bt]), HLSL_CLASS_OBJECT, HLSL_TYPE_SAMPLER, 1, 1); + type = hlsl_new_type(ctx, sampler_names[bt], HLSL_CLASS_OBJECT, HLSL_TYPE_SAMPLER, 1, 1); type->sampler_dim = bt; ctx->builtin_types.sampler[bt] = type; } - ctx->builtin_types.Void = hlsl_new_type(ctx, hlsl_strdup(ctx, "void"), HLSL_CLASS_OBJECT, HLSL_TYPE_VOID, 1, 1); + ctx->builtin_types.Void = hlsl_new_type(ctx, "void", HLSL_CLASS_OBJECT, HLSL_TYPE_VOID, 1, 1); for (i = 0; i < ARRAY_SIZE(effect_types); ++i) { - type = hlsl_new_type(ctx, hlsl_strdup(ctx, effect_types[i].name), effect_types[i].class, + type = hlsl_new_type(ctx, effect_types[i].name, effect_types[i].class, effect_types[i].base_type, effect_types[i].dimx, effect_types[i].dimy); hlsl_scope_add_type(ctx->globals, type); }

1 0

Matteo Bruni : vkd3d-shader: Don't resize the buffer when there is enough free space.
by Alexandre Julliard Oct. 1, 2021

Oct. 1, 2021

Module: vkd3d Branch: master Commit: c3f85314772d590312fc015135cd9d794b0e9ff2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c3f85314772d590312fc015… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Sep 30 21:36:16 2021 +0200 vkd3d-shader: Don't resize the buffer when there is enough free space. 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/vkd3d_shader_main.c | 10 ++-------- libs/vkd3d-shader/vkd3d_shader_private.h | 3 +-- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index e38261b..baf2561 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -41,20 +41,14 @@ static void vkd3d_string_buffer_clear(struct vkd3d_string_buffer *buffer) static bool vkd3d_string_buffer_resize(struct vkd3d_string_buffer *buffer, int rc) { - unsigned int new_buffer_size = buffer->buffer_size * 2; - char *new_buffer; + unsigned int new_buffer_size = rc >= 0 ? buffer->content_size + rc + 1 : max(buffer->buffer_size * 2, 32); - new_buffer_size = max(new_buffer_size, 32); - while (rc > 0 && (unsigned int)rc >= new_buffer_size - buffer->content_size) - new_buffer_size *= 2; - if (!(new_buffer = vkd3d_realloc(buffer->buffer, new_buffer_size))) + if (!vkd3d_array_reserve((void **)&buffer->buffer, &buffer->buffer_size, new_buffer_size, 1)) { ERR("Failed to grow buffer.\n"); buffer->buffer[buffer->content_size] = '\0'; return false; } - buffer->buffer = new_buffer; - buffer->buffer_size = new_buffer_size; return true; } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 8b3e762..fa56ba1 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -912,8 +912,7 @@ void shader_sm4_reset(struct vkd3d_shader_parser *parser); struct vkd3d_string_buffer { char *buffer; - unsigned int buffer_size; - unsigned int content_size; + size_t buffer_size, content_size; }; struct vkd3d_string_buffer_cache

1 0