January 2021 - Wine-Commits

Zebediah Figura : vkd3d-shader: Implement function-like macro expansion.
by Alexandre Julliard Jan. 14, 2021

Jan. 14, 2021

Module: vkd3d Branch: master Commit: e1a956f8f2f96f89baf8d723a3fa94a2071c2429 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e1a956f8f2f96f89baf8d72… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 12 16:14:19 2021 -0600 vkd3d-shader: Implement function-like macro expansion. 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 | 1 - libs/vkd3d-shader/preproc.h | 35 ++++ libs/vkd3d-shader/preproc.l | 329 ++++++++++++++++++++++++------- libs/vkd3d-shader/preproc.y | 46 ++++- libs/vkd3d-shader/vkd3d_shader_private.h | 2 + tests/hlsl_d3d12.c | 2 +- 6 files changed, 338 insertions(+), 77 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=e1a956f8f2f96f89baf…

1 0

Zebediah Figura : vkd3d-shader: Implement concatenation.
by Alexandre Julliard Jan. 14, 2021

Jan. 14, 2021

Module: vkd3d Branch: master Commit: 33df515f103205c78a2e669ab8a8723c4c86ea90 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=33df515f103205c78a2e669… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 12 16:14:20 2021 -0600 vkd3d-shader: Implement concatenation. 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/preproc.l | 22 ++++++++++++++++++++++ libs/vkd3d-shader/preproc.y | 6 ++++++ tests/hlsl_d3d12.c | 7 ++----- 3 files changed, 30 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 9043ade..18a59b7 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -83,6 +83,8 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* <INITIAL>0[0-7]*[ul]{0,2} {return T_INTEGER;} <INITIAL>[1-9][0-9]*[ul]{0,2} {return T_INTEGER;} +<INITIAL>## {return T_CONCAT;} + <INITIAL>"&&" {return T_TEXT;} <INITIAL>"||" {return T_TEXT;} <INITIAL>"++" {return T_TEXT;} @@ -189,6 +191,18 @@ static struct preproc_macro *preproc_get_top_macro(struct preproc_ctx *ctx) return ctx->expansion_stack[ctx->expansion_count - 1].macro; } +/* Concatenation is not done for object-like macros, but is done for both + * function-like macro bodies and their arguments. */ +static bool should_concat(struct preproc_ctx *ctx) +{ + struct preproc_macro *macro; + + if (!ctx->expansion_count) + return false; + macro = ctx->expansion_stack[ctx->expansion_count - 1].macro; + return !macro || macro->arg_count; +} + static void preproc_pop_buffer(struct preproc_ctx *ctx) { if (ctx->expansion_count) @@ -375,6 +389,14 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) switch (func_state->state) { case STATE_NONE: + if (token == T_CONCAT && should_concat(ctx)) + { + while (ctx->buffer.content_size + && strchr(" \t\r\n", ctx->buffer.buffer[ctx->buffer.content_size - 1])) + --ctx->buffer.content_size; + break; + } + if (token == T_IDENTIFIER || token == T_IDENTIFIER_PAREN) { const struct preproc_text *expansion; diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index 4173af0..45577f2 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -327,6 +327,8 @@ static void free_parse_arg_names(struct parse_arg_names *args) %token T_INCLUDE "#include" %token T_UNDEF "#undef" +%token T_CONCAT "##" + %type <integer> expr %type <string> body_token %type <const_string> body_token_const @@ -419,6 +421,10 @@ body_token_const { $$ = ","; } + | T_CONCAT + { + $$ = "##"; + } directive : T_DEFINE T_IDENTIFIER body_text T_NEWLINE diff --git a/tests/hlsl_d3d12.c b/tests/hlsl_d3d12.c index 6980b99..e726798 100644 --- a/tests/hlsl_d3d12.c +++ b/tests/hlsl_d3d12.c @@ -349,10 +349,8 @@ static void test_preprocess(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { - if (i == 10 || i == 11) - continue; vkd3d_test_set_context("Source \"%s\"", tests[i].source); - todo_if (i <= 4 || (i >= 9 && i <= 14)) + todo_if (i <= 4 || i == 9 || (i >= 12 && i <= 14)) check_preprocess(tests[i].source, NULL, NULL, tests[i].present, tests[i].absent); } vkd3d_test_set_context(NULL); @@ -407,8 +405,7 @@ static void test_preprocess(void) ok(include_count_file2 == 2, "file2 was included %u times.\n", include_count_file2); /* Macro invocation spread across multiple files. */ - if (0) - todo check_preprocess(test_include2_top, NULL, &test_include, "pass", NULL); + check_preprocess(test_include2_top, NULL, &test_include, "pass", NULL); blob = errors = (ID3D10Blob *)0xdeadbeef; hr = D3DPreprocess(test_include_top, strlen(test_include_top), NULL, NULL, &test_include_fail, &blob, &errors);

1 0

Jeremy Newman : set width on footer
by Jeremy Newman Jan. 14, 2021

Jan. 14, 2021

Module: appdb Branch: master Commit: fc98694d827117ef5574364ce55ae48ae05c5ac6 URL: https://source.winehq.org/git/appdb.git/?a=commit;h=fc98694d827117ef5574364… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Jan 14 10:30:54 2021 -0600 set width on footer --- css/styles.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/css/styles.css b/css/styles.css index 6ed28f4..f612718 100644 --- a/css/styles.css +++ b/css/styles.css @@ -145,7 +145,9 @@ a.btn, a.btn:visited { #footer a, #footer a:visited { color: #fff; } - +#footer img { + width: 150px; +} /* =====================================================================================================================

1 0

Jeremy Newman : set size on footer logo
by Jeremy Newman Jan. 14, 2021

Jan. 14, 2021

Module: bugzilla Branch: master Commit: 6ddc89989ba83e4b1a787271944f7a3e97d9e13c URL: https://source.winehq.org/git/bugzilla.git/?a=commit;h=6ddc89989ba83e4b1a78… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Jan 14 10:17:24 2021 -0600 set size on footer logo --- styles.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/styles.css b/styles.css index f191d5c..429b7a6 100644 --- a/styles.css +++ b/styles.css @@ -170,7 +170,7 @@ BODY { text-align: right; padding-right: 20px; } -#cwfooter IMG { vertical-align: middle; } +#cwfooter IMG { vertical-align: middle; width: 150px; } /* header text */ H1.title { color: #A50D0D; border-bottom: 1px solid #A50D0D; margin: 0px; }

1 0

Jeremy Newman : set size on footer logo
by Jeremy Newman Jan. 14, 2021

Jan. 14, 2021

Module: website Branch: master Commit: c121f30f1861d50e774f310c84d5b554da77beb8 URL: https://source.winehq.org/git/website.git/?a=commit;h=c121f30f1861d50e774f3… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Jan 14 10:17:42 2021 -0600 set size on footer logo --- css/styles.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/styles.css b/css/styles.css index 825604ab..6dbda392 100644 --- a/css/styles.css +++ b/css/styles.css @@ -373,7 +373,7 @@ hr color: #ffffff; margin: 1em 0 1em 120px; } -#whq-footer IMG { vertical-align: middle; } +#whq-footer IMG { vertical-align: middle; width: 150px; } #whq-footer .glyphicon { vertical-align: -18%; } #whq-footer A { color: #ffffff; text-decoration: none; } #whq-footer A:visited { color: #ffffff; }

1 0

Jeremy Newman : set size on footer logo
by Jeremy Newman Jan. 14, 2021

Jan. 14, 2021

Module: appdb Branch: master Commit: a7b8e785596aaea7f50d227b4c793d265d45faa6 URL: https://source.winehq.org/git/appdb.git/?a=commit;h=a7b8e785596aaea7f50d227… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Jan 14 10:16:33 2021 -0600 set size on footer logo --- css/styles.css | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/css/styles.css b/css/styles.css index f09174d..6ed28f4 100644 --- a/css/styles.css +++ b/css/styles.css @@ -68,7 +68,7 @@ a.btn, a.btn:visited { overflow: auto; } -.carousel-control.left, +.carousel-control.left, .carousel-control.right { background-image: none } @@ -194,7 +194,7 @@ a.btn, a.btn:visited { color: #ffffff; margin: 1em 0 1em 120px; } -#whq-footer IMG { vertical-align: middle; } +#whq-footer IMG { vertical-align: middle; width: 150px; } #whq-footer .glyphicon { vertical-align: -18%; } #whq-footer A { color: #ffffff; text-decoration: none; } #whq-footer A:visited { color: #ffffff; } @@ -241,7 +241,7 @@ a.btn, a.btn:visited { float: none; width: 160px; overflow: hidden; - font-size: 95%; + font-size: 95%; background: rgba(149,73,58,0.98); background: linear-gradient(to right, rgba(149,73,58,0.7) 0%, rgba(149,73,58,0.95) 10%, @@ -345,9 +345,9 @@ DIV.newsblock { margin: 0 5px 25px 10px; padding: 0; } .inline { display: inline-block; } .small { font-size: 8pt; } .cursor-pointer { cursor: pointer; } -.no-text-decoration { - text-decoration: none !important; - +.no-text-decoration { + text-decoration: none !important; + } /* IMG options */ @@ -672,10 +672,10 @@ table.whq-table tbody tr:nth-child(odd) td { } /* used for the test report form */ table.whq-table-striped tbody tr:nth-child(odd) td { - background-color: #E0E0E0; + background-color: #E0E0E0; } table.whq-table-striped tbody tr:nth-child(even) td { - background-color: #C0C0C0; + background-color: #C0C0C0; } /* box */ @@ -690,7 +690,7 @@ table.whq-table-striped tbody tr:nth-child(even) td { } TD.cline { - background-color: #EEEEEE; color: #000000; + background-color: #EEEEEE; color: #000000; text-align: center; font-weight: bold; font-size: 10pt; }

1 0

Alexandre Julliard : Wine release 6.0
by Alexandre Julliard Jan. 14, 2021

Jan. 14, 2021

Module: website Branch: master Commit: a6ed9dd97977f294f515ca3c90af76c84cb27402 URL: https://source.winehq.org/git/website.git/?a=commit;h=a6ed9dd97977f294f515c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 14 16:44:21 2021 +0100 Wine release 6.0 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2021011401.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/en/2021011401.xml b/news/en/2021011401.xml new file mode 100644 index 00000000..4fe5e44b --- /dev/null +++ b/news/en/2021011401.xml @@ -0,0 +1,18 @@ +<news> +<date>January 14, 2021</date> +<title>Wine 6.0 Released</title> +<body> + The Wine team is proud to announce that the stable release Wine 6.0 is now available. + This release represents a year of development effort and over 8,300 individual changes. It contains a large number of improvements that are listed in the <a href="{$root}/announce/6.0">release notes</a> below. The areas of major changes are: + +<ul> + <li>Core modules in PE format.</li> + <li>Vulkan backend for WineD3D.</li> + <li>DirectShow and Media Foundation support.</li> + <li>Text console redesign.</li> +</ul> + + This release is dedicated to the memory of Ken Thomases, who passed away just before Christmas at the age of 51. Ken was an incredibly brilliant developer, and the mastermind behind the macOS support in Wine. We all miss his skills, his patience, and his dark sense of humor. +The source is <a href="//dl.winehq.org/wine/source/6.0/wine-6.0.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-6.0 : Alexandre Julliard : Release 6.0
by Alexandre Julliard Jan. 14, 2021

Jan. 14, 2021

Module: wine Branch: refs/tags/wine-6.0 Tag: 1f352a9d3a621cc5c5c8058434290583bd9aa83c URL: https://source.winehq.org/git/wine.git/?a=tag;h=1f352a9d3a621cc5c5c80584342… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 14 16:42:26 2021 +0100 Release 6.0

1 0

Alexandre Julliard : Release 6.0.
by Alexandre Julliard Jan. 14, 2021

Jan. 14, 2021

Module: wine Branch: master Commit: 477fe4ba2fceaffe96ea3910595befeb22b717a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=477fe4ba2fceaffe96ea3910… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 14 16:42:26 2021 +0100 Release 6.0. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 510 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-------- VERSION | 2 +- configure | 18 +-- 3 files changed, 457 insertions(+), 73 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=477fe4ba2fceaffe96ea…

1 0

Zebediah Figura : vkd3d-shader: Implement #ifdef.
by Alexandre Julliard Jan. 12, 2021

Jan. 12, 2021

Module: vkd3d Branch: master Commit: b0dbb35ec7131db4f415a1d91f320c52f0935e8a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b0dbb35ec7131db4f415a1d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jan 7 11:48:07 2021 -0600 vkd3d-shader: Implement #ifdef. 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/preproc.l | 4 ++++ libs/vkd3d-shader/preproc.y | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 89c205f..12a2e9d 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -110,6 +110,8 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* return T_ENDIF; if (!strcmp(p, "if")) return T_IF; + if (!strcmp(p, "ifdef")) + return T_IFDEF; preproc_warning(ctx, yyget_lloc(yyscanner), VKD3D_SHADER_WARNING_PP_UNKNOWN_DIRECTIVE, "Ignoring unknown directive \"%s\".", yytext); @@ -199,6 +201,7 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) case T_ELSE: case T_ENDIF: case T_IF: + case T_IFDEF: ctx->current_directive = token; break; @@ -218,6 +221,7 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) case T_ELSE: case T_ENDIF: case T_IF: + case T_IFDEF: break; default: diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index 45cad44..c16f230 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -183,6 +183,7 @@ static uint32_t preproc_parse_integer(const char *s) %token T_ELSE "#else" %token T_ENDIF "#endif" %token T_IF "#if" +%token T_IFDEF "#ifdef" %type <integer> expr %type <string> body_token @@ -219,6 +220,11 @@ directive if (!preproc_push_if(ctx, !!$2)) YYABORT; } + | T_IFDEF T_IDENTIFIER T_NEWLINE + { + preproc_push_if(ctx, !!preproc_find_macro(ctx, $2)); + vkd3d_free($2); + } | T_ELIF expr T_NEWLINE { if (ctx->if_count)

1 0