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

Nikolay Sivov : atl: Use CRT allocation functions.
by Alexandre Julliard March 31, 2022

March 31, 2022

Module: wine Branch: master Commit: 6341e6d9244e27c26f87715d4978fe9028115a35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6341e6d9244e27c26f87715d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 31 14:54:48 2022 +0300 atl: Use CRT allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/atl/atl.c | 11 +++++------ dlls/atl/atl30.c | 2 +- dlls/atl/atl_ax.c | 24 ++++++++++++------------ dlls/atl/registrar.c | 45 ++++++++++++++++++++++----------------------- 4 files changed, 40 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6341e6d9244e27c26f87…

1 0

Alexandre Julliard : kernel32: Move the language group resources to kernelbase.
by Alexandre Julliard March 31, 2022

March 31, 2022

Module: wine Branch: master Commit: 6d06171485c6043c53d7a8e5d43a5ba413fd7b91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d06171485c6043c53d7a8e5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 31 07:55:25 2022 +0200 kernel32: Move the language group resources to kernelbase. And enable translating them through the po files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale_rc.rc | 2 -- dlls/kernel32/nls/afk.nls | 18 ----------- dlls/kernel32/nls/ara.nls | 18 ----------- dlls/kernel32/nls/arb.nls | 18 ----------- dlls/kernel32/nls/are.nls | 18 ----------- dlls/kernel32/nls/arg.nls | 18 ----------- dlls/kernel32/nls/arh.nls | 18 ----------- dlls/kernel32/nls/ari.nls | 18 ----------- dlls/kernel32/nls/arj.nls | 18 ----------- dlls/kernel32/nls/ark.nls | 18 ----------- dlls/kernel32/nls/arl.nls | 18 ----------- dlls/kernel32/nls/arm.nls | 18 ----------- dlls/kernel32/nls/aro.nls | 18 ----------- dlls/kernel32/nls/arq.nls | 18 ----------- dlls/kernel32/nls/ars.nls | 18 ----------- dlls/kernel32/nls/art.nls | 18 ----------- dlls/kernel32/nls/aru.nls | 18 ----------- dlls/kernel32/nls/ary.nls | 18 ----------- dlls/kernel32/nls/ast.nls | 18 ----------- dlls/kernel32/nls/aze.nls | 18 ----------- dlls/kernel32/nls/azl.nls | 18 ----------- dlls/kernel32/nls/bel.nls | 18 ----------- dlls/kernel32/nls/ben.nls | 18 ----------- dlls/kernel32/nls/bgr.nls | 18 ----------- dlls/kernel32/nls/brf.nls | 18 ----------- dlls/kernel32/nls/cat.nls | 18 ----------- dlls/kernel32/nls/chs.nls | 18 ----------- dlls/kernel32/nls/cht.nls | 18 ----------- dlls/kernel32/nls/cor.nls | 18 ----------- dlls/kernel32/nls/csy.nls | 18 ----------- dlls/kernel32/nls/cym.nls | 18 ----------- dlls/kernel32/nls/dan.nls | 18 ----------- dlls/kernel32/nls/dea.nls | 18 ----------- dlls/kernel32/nls/dec.nls | 18 ----------- dlls/kernel32/nls/del.nls | 18 ----------- dlls/kernel32/nls/des.nls | 18 ----------- dlls/kernel32/nls/deu.nls | 18 ----------- dlls/kernel32/nls/div.nls | 18 ----------- dlls/kernel32/nls/ell.nls | 18 ----------- dlls/kernel32/nls/ena.nls | 18 ----------- dlls/kernel32/nls/enb.nls | 18 ----------- dlls/kernel32/nls/enc.nls | 18 ----------- dlls/kernel32/nls/eng.nls | 18 ----------- dlls/kernel32/nls/eni.nls | 18 ----------- dlls/kernel32/nls/enj.nls | 18 ----------- dlls/kernel32/nls/enl.nls | 18 ----------- dlls/kernel32/nls/enp.nls | 18 ----------- dlls/kernel32/nls/ens.nls | 18 ----------- dlls/kernel32/nls/ent.nls | 18 ----------- dlls/kernel32/nls/enu.nls | 18 ----------- dlls/kernel32/nls/enw.nls | 18 ----------- dlls/kernel32/nls/enz.nls | 18 ----------- dlls/kernel32/nls/eox.nls | 18 ----------- dlls/kernel32/nls/esa.nls | 18 ----------- dlls/kernel32/nls/esb.nls | 18 ----------- dlls/kernel32/nls/esc.nls | 18 ----------- dlls/kernel32/nls/esd.nls | 18 ----------- dlls/kernel32/nls/ese.nls | 18 ----------- dlls/kernel32/nls/esf.nls | 18 ----------- dlls/kernel32/nls/esg.nls | 18 ----------- dlls/kernel32/nls/esh.nls | 18 ----------- dlls/kernel32/nls/esi.nls | 18 ----------- dlls/kernel32/nls/esl.nls | 18 ----------- dlls/kernel32/nls/esm.nls | 18 ----------- dlls/kernel32/nls/esn.nls | 18 ----------- dlls/kernel32/nls/eso.nls | 18 ----------- dlls/kernel32/nls/esp.nls | 18 ----------- dlls/kernel32/nls/esr.nls | 18 ----------- dlls/kernel32/nls/ess.nls | 18 ----------- dlls/kernel32/nls/esu.nls | 18 ----------- dlls/kernel32/nls/esv.nls | 18 ----------- dlls/kernel32/nls/esy.nls | 18 ----------- dlls/kernel32/nls/esz.nls | 18 ----------- dlls/kernel32/nls/eti.nls | 18 ----------- dlls/kernel32/nls/euq.nls | 18 ----------- dlls/kernel32/nls/far.nls | 18 ----------- dlls/kernel32/nls/fin.nls | 18 ----------- dlls/kernel32/nls/fos.nls | 18 ----------- dlls/kernel32/nls/fra.nls | 18 ----------- dlls/kernel32/nls/frb.nls | 18 ----------- dlls/kernel32/nls/frc.nls | 18 ----------- dlls/kernel32/nls/frl.nls | 18 ----------- dlls/kernel32/nls/frm.nls | 18 ----------- dlls/kernel32/nls/frs.nls | 18 ----------- dlls/kernel32/nls/gae.nls | 18 ----------- dlls/kernel32/nls/gdh.nls | 18 ----------- dlls/kernel32/nls/gdv.nls | 18 ----------- dlls/kernel32/nls/glc.nls | 18 ----------- dlls/kernel32/nls/guj.nls | 18 ----------- dlls/kernel32/nls/heb.nls | 18 ----------- dlls/kernel32/nls/hin.nls | 18 ----------- dlls/kernel32/nls/hrv.nls | 18 ----------- dlls/kernel32/nls/hun.nls | 18 ----------- dlls/kernel32/nls/hye.nls | 18 ----------- dlls/kernel32/nls/ind.nls | 18 ----------- dlls/kernel32/nls/isl.nls | 18 ----------- dlls/kernel32/nls/ita.nls | 18 ----------- dlls/kernel32/nls/its.nls | 18 ----------- dlls/kernel32/nls/ivl.nls | 18 ----------- dlls/kernel32/nls/jpn.nls | 18 ----------- dlls/kernel32/nls/kan.nls | 18 ----------- dlls/kernel32/nls/kat.nls | 18 ----------- dlls/kernel32/nls/kkz.nls | 18 ----------- dlls/kernel32/nls/knk.nls | 18 ----------- dlls/kernel32/nls/kor.nls | 18 ----------- dlls/kernel32/nls/kyr.nls | 18 ----------- dlls/kernel32/nls/lth.nls | 18 ----------- dlls/kernel32/nls/lvi.nls | 18 ----------- dlls/kernel32/nls/mar.nls | 18 ----------- dlls/kernel32/nls/mki.nls | 18 ----------- dlls/kernel32/nls/mon.nls | 18 ----------- dlls/kernel32/nls/msb.nls | 18 ----------- dlls/kernel32/nls/msl.nls | 18 ----------- dlls/kernel32/nls/nep.nls | 18 ----------- dlls/kernel32/nls/nlb.nls | 18 ----------- dlls/kernel32/nls/nld.nls | 18 ----------- dlls/kernel32/nls/nls.nls | 18 ----------- dlls/kernel32/nls/non.nls | 18 ----------- dlls/kernel32/nls/nor.nls | 18 ----------- dlls/kernel32/nls/pan.nls | 18 ----------- dlls/kernel32/nls/plk.nls | 18 ----------- dlls/kernel32/nls/ptb.nls | 18 ----------- dlls/kernel32/nls/ptg.nls | 18 ----------- dlls/kernel32/nls/rmc.nls | 18 ----------- dlls/kernel32/nls/rom.nls | 18 ----------- dlls/kernel32/nls/rus.nls | 18 ----------- dlls/kernel32/nls/san.nls | 18 ----------- dlls/kernel32/nls/sin.nls | 18 ----------- dlls/kernel32/nls/sky.nls | 18 ----------- dlls/kernel32/nls/slv.nls | 18 ----------- dlls/kernel32/nls/sqi.nls | 18 ----------- dlls/kernel32/nls/srb.nls | 18 ----------- dlls/kernel32/nls/srl.nls | 18 ----------- dlls/kernel32/nls/srm.nls | 18 ----------- dlls/kernel32/nls/sve.nls | 18 ----------- dlls/kernel32/nls/svf.nls | 18 ----------- dlls/kernel32/nls/swk.nls | 18 ----------- dlls/kernel32/nls/syr.nls | 18 ----------- dlls/kernel32/nls/tam.nls | 18 ----------- dlls/kernel32/nls/tel.nls | 18 ----------- dlls/kernel32/nls/tha.nls | 18 ----------- dlls/kernel32/nls/trk.nls | 18 ----------- dlls/kernel32/nls/ttt.nls | 18 ----------- dlls/kernel32/nls/ukr.nls | 18 ----------- dlls/kernel32/nls/urd.nls | 18 ----------- dlls/kernel32/nls/uzb.nls | 18 ----------- dlls/kernel32/nls/uzl.nls | 18 ----------- dlls/kernel32/nls/vit.nls | 18 ----------- dlls/kernel32/nls/wal.nls | 18 ----------- dlls/kernel32/nls/zhh.nls | 18 ----------- dlls/kernel32/nls/zhi.nls | 18 ----------- dlls/kernel32/nls/zhm.nls | 18 ----------- dlls/kernelbase/kernelbase.h | 2 +- dlls/kernelbase/kernelbase.rc | 26 ++++++++++++++++ dlls/kernelbase/locale.c | 6 ++-- dlls/kernelbase/main.c | 2 +- po/ar.po | 58 +++++++++++++++++++++++++++++++----- po/ast.po | 55 +++++++++++++++++++++++++++++----- po/bg.po | 52 +++++++++++++++++++++++++++----- po/ca.po | 58 +++++++++++++++++++++++++++++++----- po/cs.po | 52 +++++++++++++++++++++++++++----- po/da.po | 58 +++++++++++++++++++++++++++++++----- po/de.po | 52 +++++++++++++++++++++++++++----- po/el.po | 53 ++++++++++++++++++++++++++++----- po/en.po | 52 +++++++++++++++++++++++++++----- po/en_US.po | 52 +++++++++++++++++++++++++++----- po/eo.po | 56 ++++++++++++++++++++++++++++++----- po/es.po | 58 +++++++++++++++++++++++++++++++----- po/fa.po | 53 ++++++++++++++++++++++++++++----- po/fi.po | 58 +++++++++++++++++++++++++++++++----- po/fr.po | 52 +++++++++++++++++++++++++++----- po/he.po | 69 ++++++++++++++++++++++++++++++++----------- po/hi.po | 52 +++++++++++++++++++++++++++----- po/hr.po | 58 +++++++++++++++++++++++++++++++----- po/hu.po | 58 +++++++++++++++++++++++++++++++----- po/it.po | 52 +++++++++++++++++++++++++++----- po/ja.po | 58 +++++++++++++++++++++++++++++++----- po/ko.po | 58 +++++++++++++++++++++++++++++++----- po/lt.po | 52 +++++++++++++++++++++++++++----- po/ml.po | 52 +++++++++++++++++++++++++++----- po/nb_NO.po | 52 +++++++++++++++++++++++++++----- po/nl.po | 52 +++++++++++++++++++++++++++----- po/or.po | 52 +++++++++++++++++++++++++++----- po/pa.po | 52 +++++++++++++++++++++++++++----- po/pl.po | 52 +++++++++++++++++++++++++++----- po/pt_BR.po | 52 +++++++++++++++++++++++++++----- po/pt_PT.po | 52 +++++++++++++++++++++++++++----- po/rm.po | 52 +++++++++++++++++++++++++++----- po/ro.po | 52 +++++++++++++++++++++++++++----- po/ru.po | 52 +++++++++++++++++++++++++++----- po/si.po | 56 ++++++++++++++++++++++++++++++----- po/sk.po | 62 ++++++++++++++++++++++++++++++-------- po/sl.po | 58 +++++++++++++++++++++++++++++++----- po/sr_RS(a)cyrillic.po | 54 ++++++++++++++++++++++++++++----- po/sr_RS(a)latin.po | 54 ++++++++++++++++++++++++++++----- po/sv.po | 58 +++++++++++++++++++++++++++++++----- po/ta.po | 52 +++++++++++++++++++++++++++----- po/te.po | 52 +++++++++++++++++++++++++++----- po/th.po | 53 ++++++++++++++++++++++++++++----- po/tr.po | 58 +++++++++++++++++++++++++++++++----- po/uk.po | 52 +++++++++++++++++++++++++++----- po/wa.po | 53 ++++++++++++++++++++++++++++----- po/wine.pot | 52 +++++++++++++++++++++++++++----- po/zh_CN.po | 58 +++++++++++++++++++++++++++++++----- po/zh_TW.po | 58 +++++++++++++++++++++++++++++++----- 205 files changed, 2304 insertions(+), 3130 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6d06171485c6043c53d7…

1 0

Alexandre Julliard : kernelbase: Reimplement the Geo ID functions using the locale.nls data.
by Alexandre Julliard March 31, 2022

March 31, 2022

Module: wine Branch: master Commit: 86baeafc760ea04eb11ac82c6ec2e6fe18df6a9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=86baeafc760ea04eb11ac82c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 31 07:46:13 2022 +0200 kernelbase: Reimplement the Geo ID functions using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 583 +++++++++++++---------------------------------- 1 file changed, 153 insertions(+), 430 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=86baeafc760ea04eb11a…

1 0

Alexandre Julliard : make_unicode: Generate the GeoID table in locale.nls.
by Alexandre Julliard March 31, 2022

March 31, 2022

Module: wine Branch: master Commit: ad02ef7bec5671d6b5c3c890b752384f31782609 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad02ef7bec5671d6b5c3c890… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 31 07:39:56 2022 +0200 make_unicode: Generate the GeoID table in locale.nls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- nls/locale.nls | Bin 625428 -> 660088 bytes tools/make_unicode | 444 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 434 insertions(+), 10 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ad02ef7bec5671d6b5c3…

1 0

Francisco Casas : vkd3d-shader/hlsl: Avoid leaks on memory allocation failures when parsing initializers.
by Alexandre Julliard March 31, 2022

March 31, 2022

Module: vkd3d Branch: master Commit: bed085cf9a1267834a61f375caf2f62a0f9d0da4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=bed085cf9a1267834a61f37… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Mar 30 23:38:26 2022 +0200 vkd3d-shader/hlsl: Avoid leaks on memory allocation failures when parsing initializers. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(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 | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 1ab56fba..0fc8fa29 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3208,7 +3208,10 @@ complex_initializer: { $$.args_count = 1; if (!($$.args = hlsl_alloc(ctx, sizeof(*$$.args)))) + { + destroy_instr_list($1); YYABORT; + } $$.args[0] = node_from_list($1); $$.instrs = $1; } @@ -3229,15 +3232,25 @@ initializer_expr_list: { $$.args_count = 1; if (!($$.args = hlsl_alloc(ctx, sizeof(*$$.args)))) + { + destroy_instr_list($1); YYABORT; + } $$.args[0] = node_from_list($1); $$.instrs = $1; } | initializer_expr_list ',' initializer_expr { + struct hlsl_ir_node **new_args; + $$ = $1; - if (!($$.args = hlsl_realloc(ctx, $$.args, ($$.args_count + 1) * sizeof(*$$.args)))) + if (!(new_args = hlsl_realloc(ctx, $$.args, ($$.args_count + 1) * sizeof(*$$.args)))) + { + free_parse_initializer(&$$); + destroy_instr_list($3); YYABORT; + } + $$.args = new_args; $$.args[$$.args_count++] = node_from_list($3); list_move_tail($$.instrs, $3); vkd3d_free($3);

1 0

Francisco Casas : vkd3d-shader/hlsl: Add 'braces' flag to parse initializers.
by Alexandre Julliard March 31, 2022

March 31, 2022

Module: vkd3d Branch: master Commit: 426c08eba4aefc0b3cae800c7e78c2a7b4306fb3 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=426c08eba4aefc0b3cae800… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Mar 30 23:38:28 2022 +0200 vkd3d-shader/hlsl: Add 'braces' flag to parse initializers. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(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 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 8f8b3c35..6fcacc67 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -48,6 +48,7 @@ struct parse_initializer struct hlsl_ir_node **args; unsigned int args_count; struct list *instrs; + bool braces; }; struct parse_array_sizes @@ -3215,14 +3216,17 @@ complex_initializer: } $$.args[0] = node_from_list($1); $$.instrs = $1; + $$.braces = false; } | '{' complex_initializer_list '}' { $$ = $2; + $$.braces = true; } | '{' complex_initializer_list ',' '}' { $$ = $2; + $$.braces = true; } complex_initializer_list: @@ -3260,6 +3264,7 @@ initializer_expr_list: } $$.args[0] = node_from_list($1); $$.instrs = $1; + $$.braces = false; } | initializer_expr_list ',' initializer_expr { @@ -3396,6 +3401,7 @@ func_arguments: $$.args_count = 0; if (!($$.instrs = make_empty_list(ctx))) YYABORT; + $$.braces = false; } | initializer_expr_list

1 0

Francisco Casas : vkd3d-shader/hlsl: Properly free parse_variable_def memory.
by Alexandre Julliard March 31, 2022

March 31, 2022

Module: vkd3d Branch: master Commit: 22f0b1df77c1d6e9c36a50f4799ed86b6620bfd9 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=22f0b1df77c1d6e9c36a50f… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Mar 30 23:38:29 2022 +0200 vkd3d-shader/hlsl: Properly free parse_variable_def memory. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(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 | 42 +++++++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 6fcacc67..a5a45640 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -668,6 +668,15 @@ static struct hlsl_type *apply_type_modifiers(struct hlsl_ctx *ctx, struct hlsl_ return new_type; } +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.name); + vkd3d_free(v); +} + static struct list *gen_struct_fields(struct hlsl_ctx *ctx, struct hlsl_type *type, struct list *fields) { struct parse_variable_def *v, *v_next; @@ -685,13 +694,14 @@ static struct list *gen_struct_fields(struct hlsl_ctx *ctx, struct hlsl_type *ty if (!(field = hlsl_alloc(ctx, sizeof(*field)))) { - vkd3d_free(v); - return list; + free_parse_variable_def(v); + continue; } field->type = type; for (i = 0; i < v->arrays.count; ++i) field->type = hlsl_new_array_type(ctx, field->type, v->arrays.sizes[i]); + vkd3d_free(v->arrays.sizes); field->loc = v->loc; field->name = v->name; field->semantic = v->semantic; @@ -719,18 +729,29 @@ static bool add_typedef(struct hlsl_ctx *ctx, DWORD modifiers, struct hlsl_type if (!v->arrays.count) { if (!(type = hlsl_type_clone(ctx, orig_type, 0, modifiers))) - return false; + { + free_parse_variable_def(v); + continue; + } } else { type = orig_type; } + ret = true; for (i = 0; i < v->arrays.count; ++i) { if (!(type = hlsl_new_array_type(ctx, type, v->arrays.sizes[i]))) - return false; + { + free_parse_variable_def(v); + ret = false; + break; + } } + if (!ret) + continue; + vkd3d_free(v->arrays.sizes); vkd3d_free((void *)type->name); type->name = v->name; @@ -747,6 +768,7 @@ static bool add_typedef(struct hlsl_ctx *ctx, DWORD modifiers, struct hlsl_type if (!ret) hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_REDEFINED, "Type '%s' is already defined.", v->name); + free_parse_initializer(&v->initializer); vkd3d_free(v); } vkd3d_free(list); @@ -1470,15 +1492,6 @@ static void struct_var_initializer(struct hlsl_ctx *ctx, struct list *list, stru vkd3d_free(initializer->args); } -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.name); - vkd3d_free(v); -} - static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_type, DWORD modifiers, struct list *var_list) { @@ -1510,6 +1523,7 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t type = basic_type; for (i = 0; i < v->arrays.count; ++i) type = hlsl_new_array_type(ctx, type, v->arrays.sizes[i]); + vkd3d_free(v->arrays.sizes); if (type->type != HLSL_CLASS_MATRIX) check_invalid_matrix_modifiers(ctx, modifiers, v->loc); @@ -1569,6 +1583,7 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_MISSING_INITIALIZER, "Const variable \"%s\" is missing an initializer.", var->name); hlsl_free_var(var); + free_parse_initializer(&v->initializer); vkd3d_free(v); continue; } @@ -1581,6 +1596,7 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t "Variable \"%s\" was already declared in this scope.", var->name); hlsl_note(ctx, &old->loc, VKD3D_SHADER_LOG_ERROR, "\"%s\" was previously declared here.", old->name); hlsl_free_var(var); + free_parse_initializer(&v->initializer); vkd3d_free(v); continue; }

1 0

Francisco Casas : vkd3d-shader/hlsl: Concatenate nested initializers.
by Alexandre Julliard March 31, 2022

March 31, 2022

Module: vkd3d Branch: master Commit: d9dc1a45549a2db601d2f9afd38c51edeaf8e0c7 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d9dc1a45549a2db601d2f9a… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Mar 30 23:38:27 2022 +0200 vkd3d-shader/hlsl: Concatenate nested initializers. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(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 | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 0fc8fa29..8f8b3c35 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2408,6 +2408,7 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl %type <function> func_prototype %type <initializer> complex_initializer +%type <initializer> complex_initializer_list %type <initializer> func_arguments %type <initializer> initializer_expr_list @@ -3215,15 +3216,36 @@ complex_initializer: $$.args[0] = node_from_list($1); $$.instrs = $1; } - | '{' initializer_expr_list '}' + | '{' complex_initializer_list '}' { $$ = $2; } - | '{' initializer_expr_list ',' '}' + | '{' complex_initializer_list ',' '}' { $$ = $2; } +complex_initializer_list: + complex_initializer + | complex_initializer_list ',' complex_initializer + { + struct hlsl_ir_node **new_args; + unsigned int i; + + $$ = $1; + if (!(new_args = hlsl_realloc(ctx, $$.args, ($$.args_count + $3.args_count) * sizeof(*$$.args)))) + { + free_parse_initializer(&$$); + free_parse_initializer(&$3); + YYABORT; + } + $$.args = new_args; + for (i = 0; i < $3.args_count; ++i) + $$.args[$$.args_count++] = $3.args[i]; + list_move_tail($$.instrs, $3.instrs); + free_parse_initializer(&$3); + } + initializer_expr: assignment_expr

1 0

Francisco Casas : vkd3d-shader/hlsl: Don't check exact number of components for braceless initialization of numeric types.
by Alexandre Julliard March 31, 2022

March 31, 2022

Module: vkd3d Branch: master Commit: 6284cf7d57902741b3948fe2de2a24e83d365736 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6284cf7d57902741b3948fe… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Mar 30 23:38:30 2022 +0200 vkd3d-shader/hlsl: Don't check exact number of components for braceless initialization of numeric types. The implicit conversion in add_assignment() takes responsability now. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(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 | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index a5a45640..7b7c26a3 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1606,19 +1606,17 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t unsigned int size = initializer_size(&v->initializer); struct hlsl_ir_load *load; - if (type->type <= HLSL_CLASS_LAST_NUMERIC - && type->dimx * type->dimy != size && size != 1) + if (type->type <= HLSL_CLASS_LAST_NUMERIC && v->initializer.braces + && type->dimx * type->dimy != size) { - if (size < type->dimx * type->dimy) - { - hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, - "Expected %u components in numeric initializer, but got %u.", - type->dimx * type->dimy, size); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; - } + hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, + "Expected %u components in numeric initializer, but got %u.", + type->dimx * type->dimy, v->initializer.args_count); + free_parse_initializer(&v->initializer); + vkd3d_free(v); + continue; } + if ((type->type == HLSL_CLASS_STRUCT || type->type == HLSL_CLASS_ARRAY) && hlsl_type_component_count(type) != size) {

1 0

Francisco Casas : vkd3d-shader/hlsl: Treat all braceless initializers as assignments.
by Alexandre Julliard March 31, 2022

March 31, 2022

Module: vkd3d Branch: master Commit: a75560af3d6047ec199f28e15bc367cbca99db2d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a75560af3d6047ec199f28e… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Mar 30 23:38:31 2022 +0200 vkd3d-shader/hlsl: Treat all braceless initializers as assignments. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(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 | 91 +++++++++++++++++++++++++----------------------- 1 file changed, 48 insertions(+), 43 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 7b7c26a3..2fbebf01 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1603,61 +1603,66 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t if (v->initializer.args_count) { - unsigned int size = initializer_size(&v->initializer); - struct hlsl_ir_load *load; - - if (type->type <= HLSL_CLASS_LAST_NUMERIC && v->initializer.braces - && type->dimx * type->dimy != size) + if (v->initializer.braces) { - hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, - "Expected %u components in numeric initializer, but got %u.", - type->dimx * type->dimy, v->initializer.args_count); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; - } + unsigned int size = initializer_size(&v->initializer); - if ((type->type == HLSL_CLASS_STRUCT || type->type == HLSL_CLASS_ARRAY) - && hlsl_type_component_count(type) != size) - { - hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, - "Expected %u components in initializer, but got %u.", hlsl_type_component_count(type), size); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; - } + if (type->type <= HLSL_CLASS_LAST_NUMERIC && type->dimx * type->dimy != size) + { + hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, + "Expected %u components in numeric initializer, but got %u.", + type->dimx * type->dimy, v->initializer.args_count); + free_parse_initializer(&v->initializer); + vkd3d_free(v); + continue; + } - if (type->type > HLSL_CLASS_LAST_NUMERIC && type->type != HLSL_CLASS_STRUCT) - { - FIXME("Initializers for non scalar/struct variables not supported yet.\n"); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; - } + if ((type->type == HLSL_CLASS_STRUCT || type->type == HLSL_CLASS_ARRAY) + && hlsl_type_component_count(type) != size) + { + hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, + "Expected %u components in initializer, but got %u.", hlsl_type_component_count(type), size); + free_parse_initializer(&v->initializer); + vkd3d_free(v); + continue; + } - if (type->type == HLSL_CLASS_STRUCT) - { - struct_var_initializer(ctx, statements_list, var, &v->initializer); - vkd3d_free(v); - continue; + if (type->type > HLSL_CLASS_LAST_NUMERIC && type->type != HLSL_CLASS_STRUCT) + { + FIXME("Initializers for non scalar/struct variables not supported yet.\n"); + free_parse_initializer(&v->initializer); + vkd3d_free(v); + continue; + } + + if (type->type == HLSL_CLASS_STRUCT) + { + struct_var_initializer(ctx, statements_list, var, &v->initializer); + vkd3d_free(v); + continue; + } + else + { + hlsl_fixme(ctx, &v->loc, "Complex initializer."); + free_parse_initializer(&v->initializer); + vkd3d_free(v); + continue; + } } - if (v->initializer.args_count > 1) + else { - hlsl_fixme(ctx, &v->loc, "Complex initializer."); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; - } + struct hlsl_ir_load *load = hlsl_new_var_load(ctx, var, var->loc); - load = hlsl_new_var_load(ctx, var, var->loc); - list_add_tail(v->initializer.instrs, &load->node.entry); - add_assignment(ctx, v->initializer.instrs, &load->node, ASSIGN_OP_ASSIGN, v->initializer.args[0]); - vkd3d_free(v->initializer.args); + assert(v->initializer.args_count == 1); + list_add_tail(v->initializer.instrs, &load->node.entry); + add_assignment(ctx, v->initializer.instrs, &load->node, ASSIGN_OP_ASSIGN, v->initializer.args[0]); + } if (modifiers & HLSL_STORAGE_STATIC) list_move_tail(&ctx->static_initializers, v->initializer.instrs); else list_move_tail(statements_list, v->initializer.instrs); + vkd3d_free(v->initializer.args); vkd3d_free(v->initializer.instrs); } vkd3d_free(v);

1 0