January 2021 - wine-commits

Zebediah Figura : vkd3d-shader: Parse function-like macro definitions.
by Alexandre Julliard 14 Jan '21

14 Jan '21

Module: vkd3d Branch: master Commit: 0f80ac09759936a8074ca691ecd8e5034bfaccf1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0f80ac09759936a8074ca69… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 12 16:14:18 2021 -0600 vkd3d-shader: Parse function-like macro definitions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/preproc.l | 5 +++- libs/vkd3d-shader/preproc.y | 72 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 86ca473..77f4f0dc 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -70,6 +70,7 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* <C_COMMENT,CXX_COMMENT><<EOF>> {yy_pop_state(yyscanner);} <C_COMMENT,CXX_COMMENT>. {} +<INITIAL>{IDENTIFIER}/\( {return T_IDENTIFIER_PAREN;} <INITIAL>{IDENTIFIER} {return T_IDENTIFIER;} /* We have no use for floats, but shouldn't parse them as integers. */ @@ -141,6 +142,7 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* } <INITIAL>{WS}+ {} +<INITIAL>[(),] {return yytext[0];} <INITIAL>. {return T_TEXT;} %% @@ -221,6 +223,7 @@ static int return_token(int token, YYSTYPE *lval, const char *text) switch (token) { case T_IDENTIFIER: + case T_IDENTIFIER_PAREN: case T_INTEGER: case T_STRING: case T_TEXT: @@ -321,7 +324,7 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) continue; } - if (token == T_IDENTIFIER) + if (token == T_IDENTIFIER || token == T_IDENTIFIER_PAREN) { struct preproc_macro *macro; diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index 17bc649..3cb7de6 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -28,6 +28,12 @@ #define PREPROC_YYLTYPE struct vkd3d_shader_location +struct parse_arg_names +{ + char **args; + size_t count; +}; + } %code provides @@ -254,6 +260,15 @@ static const void *get_parent_data(struct preproc_ctx *ctx) return preproc_get_top_file(ctx)->code.code; } +static void free_parse_arg_names(struct parse_arg_names *args) +{ + unsigned int i; + + for (i = 0; i < args->count; ++i) + vkd3d_free(args->args[i]); + vkd3d_free(args->args); +} + } %define api.prefix {preproc_yy} @@ -268,11 +283,14 @@ static const void *get_parent_data(struct preproc_ctx *ctx) %union { char *string; + const char *const_string; uint32_t integer; struct vkd3d_string_buffer string_buffer; + struct parse_arg_names arg_names; } %token <string> T_IDENTIFIER +%token <string> T_IDENTIFIER_PAREN %token <string> T_INTEGER %token <string> T_STRING %token <string> T_TEXT @@ -291,7 +309,9 @@ static const void *get_parent_data(struct preproc_ctx *ctx) %type <integer> expr %type <string> body_token +%type <const_string> body_token_const %type <string_buffer> body_text +%type <arg_names> identifier_list %% @@ -302,6 +322,28 @@ shader_text vkd3d_string_buffer_printf(&ctx->buffer, "\n"); } +identifier_list + : T_IDENTIFIER + { + if (!($$.args = vkd3d_malloc(sizeof(*$$.args)))) + YYABORT; + $$.args[0] = $1; + $$.count = 1; + } + | identifier_list ',' T_IDENTIFIER + { + char **new_array; + + if (!(new_array = vkd3d_realloc($1.args, ($1.count + 1) * sizeof(*$$.args)))) + { + free_parse_arg_names(&$1); + YYABORT; + } + $$.args = new_array; + $$.count = $1.count + 1; + $$.args[$1.count] = $3; + } + body_text : %empty { @@ -316,12 +358,32 @@ body_text } vkd3d_free($2); } + | body_text body_token_const + { + if (vkd3d_string_buffer_printf(&$$, "%s ", $2) < 0) + YYABORT; + } body_token : T_IDENTIFIER + | T_IDENTIFIER_PAREN | T_INTEGER | T_TEXT +body_token_const + : '(' + { + $$ = "("; + } + | ')' + { + $$ = ")"; + } + | ',' + { + $$ = ","; + } + directive : T_DEFINE T_IDENTIFIER body_text T_NEWLINE { @@ -332,6 +394,16 @@ directive YYABORT; } } + | T_DEFINE T_IDENTIFIER_PAREN '(' identifier_list ')' body_text T_NEWLINE + { + free_parse_arg_names(&$4); + if (!preproc_add_macro(ctx, &@6, $2, &@6, &$6)) + { + vkd3d_free($2); + vkd3d_string_buffer_cleanup(&$6); + YYABORT; + } + } | T_UNDEF T_IDENTIFIER T_NEWLINE { struct preproc_macro *macro;

1 0

Zebediah Figura : vkd3d-shader: Implement macro body expansion.
by Alexandre Julliard 14 Jan '21

14 Jan '21

Module: vkd3d Branch: master Commit: 668820f069f3b757ba51499c83f8fadd9eb627ac URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=668820f069f3b757ba51499… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 12 16:14:17 2021 -0600 vkd3d-shader: Implement macro body expansion. 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> --- Makefile.am | 1 - libs/vkd3d-shader/preproc.h | 18 ++++++++++ libs/vkd3d-shader/preproc.l | 83 ++++++++++++++++++++++++++++++++++++++------- libs/vkd3d-shader/preproc.y | 24 +++++++++++-- tests/hlsl_d3d12.c | 9 +++-- 5 files changed, 113 insertions(+), 22 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=668820f069f3b757ba5…

1 0

Jeremy Newman : set width on footer
by Jeremy Newman 14 Jan '21

14 Jan '21

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 14 Jan '21

14 Jan '21

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 14 Jan '21

14 Jan '21

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 14 Jan '21

14 Jan '21

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 14 Jan '21

14 Jan '21

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 14 Jan '21

14 Jan '21

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 14 Jan '21

14 Jan '21

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

Henri Verbeet : vkd3d-shader: Decorate "precise" arithmetic instructions with SpvDecorationNoContraction.
by Alexandre Julliard 12 Jan '21

12 Jan '21

Module: vkd3d Branch: master Commit: 73a937edd035e82155825abf406734c224cc666d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=73a937edd035e82155825ab… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 12 13:12:52 2021 +0100 vkd3d-shader: Decorate "precise" arithmetic instructions with SpvDecorationNoContraction. 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/spirv.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 61d0d47..27bf40b 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -6368,6 +6368,8 @@ static void vkd3d_dxbc_compiler_emit_alu_instruction(struct vkd3d_dxbc_compiler val_id = vkd3d_spirv_build_op_trv(builder, &builder->function_stream, op, type_id, src_ids, instruction->src_count); + if (instruction->flags & VKD3DSI_PRECISE_XYZW) + vkd3d_spirv_build_op_decorate(builder, val_id, SpvDecorationNoContraction, NULL, 0); vkd3d_dxbc_compiler_emit_store_dst(compiler, dst, val_id); } @@ -6600,6 +6602,8 @@ static void vkd3d_dxbc_compiler_emit_dot(struct vkd3d_dxbc_compiler *compiler, val_id = vkd3d_dxbc_compiler_emit_construct_vector(compiler, component_type, component_count, val_id, 0, 1); } + if (instruction->flags & VKD3DSI_PRECISE_XYZW) + vkd3d_spirv_build_op_decorate(builder, val_id, SpvDecorationNoContraction, NULL, 0); vkd3d_dxbc_compiler_emit_store_dst(compiler, dst, val_id); }

1 0

Zebediah Figura : vkd3d-shader: Implement #undef.
by Alexandre Julliard 12 Jan '21

12 Jan '21

Module: vkd3d Branch: master Commit: 1fc8b85879cbc3189be8198711047ed131d4ae6f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1fc8b85879cbc3189be8198… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jan 7 11:48:10 2021 -0600 vkd3d-shader: Implement #undef. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/preproc.l | 3 +++ libs/vkd3d-shader/preproc.y | 13 +++++++++++++ 2 files changed, 16 insertions(+) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index ad006fa..476c1e5 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -126,6 +126,8 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* return T_IFDEF; if (!strcmp(p, "ifndef")) return T_IFNDEF; + if (!strcmp(p, "undef")) + return T_UNDEF; preproc_warning(ctx, yyget_lloc(yyscanner), VKD3D_SHADER_WARNING_PP_UNKNOWN_DIRECTIVE, "Ignoring unknown directive \"%s\".", yytext); @@ -257,6 +259,7 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) case T_IFDEF: case T_IFNDEF: case T_INCLUDE: + case T_UNDEF: ctx->current_directive = token; break; diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index fd5d011..53ce3e5 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -282,6 +282,7 @@ static const void *get_parent_data(struct preproc_ctx *ctx) %token T_IFDEF "#ifdef" %token T_IFNDEF "#ifndef" %token T_INCLUDE "#include" +%token T_UNDEF "#undef" %type <integer> expr %type <string> body_token @@ -313,6 +314,18 @@ directive if (!preproc_add_macro(ctx, &@$, $2)) YYABORT; } + | T_UNDEF T_IDENTIFIER T_NEWLINE + { + struct preproc_macro *macro; + + if ((macro = preproc_find_macro(ctx, $2))) + { + TRACE("Removing macro definition %s.\n", debugstr_a($2)); + rb_remove(&ctx->macros, &macro->entry); + preproc_free_macro(macro); + } + vkd3d_free($2); + } | T_IF expr T_NEWLINE { if (!preproc_push_if(ctx, !!$2))

1 0

Zebediah Figura : vkd3d-shader: Implement #include.
by Alexandre Julliard 12 Jan '21

12 Jan '21

Module: vkd3d Branch: master Commit: 8c927c491c87510cad43b7106c9fba1cdde50cfd URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8c927c491c87510cad43b71… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jan 7 11:48:09 2021 -0600 vkd3d-shader: Implement #include. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/preproc.h | 30 +++++- libs/vkd3d-shader/preproc.l | 125 ++++++++++++++++++++----- libs/vkd3d-shader/preproc.y | 155 +++++++++++++++++++++++++++++-- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + tests/hlsl_d3d12.c | 16 ++-- 5 files changed, 281 insertions(+), 46 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=8c927c491c87510cad4…

1 0

Zebediah Figura : vkd3d-shader: Implement #ifndef.
by Alexandre Julliard 12 Jan '21

12 Jan '21

Module: vkd3d Branch: master Commit: 568983596e20b79aa3604404f36f3a0bc8a98edf URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=568983596e20b79aa360440… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jan 7 11:48:08 2021 -0600 vkd3d-shader: Implement #ifndef. 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 ++++++ tests/hlsl_d3d12.c | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 12a2e9d..8f54608 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -112,6 +112,8 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* return T_IF; if (!strcmp(p, "ifdef")) return T_IFDEF; + if (!strcmp(p, "ifndef")) + return T_IFNDEF; preproc_warning(ctx, yyget_lloc(yyscanner), VKD3D_SHADER_WARNING_PP_UNKNOWN_DIRECTIVE, "Ignoring unknown directive \"%s\".", yytext); @@ -202,6 +204,7 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) case T_ENDIF: case T_IF: case T_IFDEF: + case T_IFNDEF: ctx->current_directive = token; break; @@ -222,6 +225,7 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) case T_ENDIF: case T_IF: case T_IFDEF: + case T_IFNDEF: break; default: diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index c16f230..e1193fb 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -184,6 +184,7 @@ static uint32_t preproc_parse_integer(const char *s) %token T_ENDIF "#endif" %token T_IF "#if" %token T_IFDEF "#ifdef" +%token T_IFNDEF "#ifndef" %type <integer> expr %type <string> body_token @@ -225,6 +226,11 @@ directive preproc_push_if(ctx, !!preproc_find_macro(ctx, $2)); vkd3d_free($2); } + | T_IFNDEF 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) diff --git a/tests/hlsl_d3d12.c b/tests/hlsl_d3d12.c index 38c1ab2..8b8c302 100644 --- a/tests/hlsl_d3d12.c +++ b/tests/hlsl_d3d12.c @@ -349,7 +349,7 @@ static void test_preprocess(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { - if (i == 6) + if (i == 6 || i == 10 || i == 11) continue; vkd3d_test_set_context("Source \"%s\"", tests[i].source); todo_if (i <= 4 || (i >= 9 && i <= 14))

1 0

Zebediah Figura : vkd3d-shader: Implement #ifdef.
by Alexandre Julliard 12 Jan '21

12 Jan '21

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

Zebediah Figura : vkd3d-shader: Partially implement #define.
by Alexandre Julliard 12 Jan '21

12 Jan '21

Module: vkd3d Branch: master Commit: 9a1317ff0f274dda4d56af20e42f17d2af5a08c4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9a1317ff0f274dda4d56af2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jan 7 11:48:06 2021 -0600 vkd3d-shader: Partially implement #define. 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> --- Makefile.am | 1 + libs/vkd3d-shader/preproc.h | 10 ++++++ libs/vkd3d-shader/preproc.l | 35 +++++++++++++++++-- libs/vkd3d-shader/preproc.y | 59 +++++++++++++++++++++++++++++++- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + tests/hlsl_d3d12.c | 2 +- 6 files changed, 103 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index 514f050..bf1d7bf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -243,6 +243,7 @@ XFAIL_TESTS = \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ + tests/preproc-if.shader_test \ tests/preproc-ifdef.shader_test \ tests/preproc-if-expr.shader_test \ tests/preproc-invalid.shader_test \ diff --git a/libs/vkd3d-shader/preproc.h b/libs/vkd3d-shader/preproc.h index effcd99..7f77d27 100644 --- a/libs/vkd3d-shader/preproc.h +++ b/libs/vkd3d-shader/preproc.h @@ -22,6 +22,7 @@ #define __VKD3D_SHADER_PREPROC_H #include "vkd3d_shader_private.h" +#include "rbtree.h" struct preproc_if_state { @@ -33,6 +34,12 @@ struct preproc_if_state bool seen_else; }; +struct preproc_macro +{ + struct rb_entry entry; + char *name; +}; + struct preproc_ctx { void *scanner; @@ -44,6 +51,8 @@ struct preproc_ctx struct preproc_if_state *if_stack; size_t if_count, if_stack_size; + struct rb_tree macros; + int current_directive; bool last_was_newline; @@ -52,6 +61,7 @@ struct preproc_ctx bool error; }; +void preproc_free_macro(struct preproc_macro *macro) DECLSPEC_HIDDEN; void preproc_warning(struct preproc_ctx *ctx, const struct vkd3d_shader_location *loc, enum vkd3d_shader_error error, const char *format, ...) VKD3D_PRINTF_FUNC(4, 5) DECLSPEC_HIDDEN; diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 47ad1f1..89c205f 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -67,7 +67,7 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* <C_COMMENT,CXX_COMMENT><<EOF>> {yy_pop_state(yyscanner);} <C_COMMENT,CXX_COMMENT>. {} -<INITIAL>{IDENTIFIER} {return T_TEXT;} +<INITIAL>{IDENTIFIER} {return T_IDENTIFIER;} /* We have no use for floats, but shouldn't parse them as integers. */ @@ -100,6 +100,8 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* for (p = yytext + 1; strchr(" \t", *p); ++p) ; + if (!strcmp(p, "define")) + return T_DEFINE; if (!strcmp(p, "elif")) return T_ELIF; if (!strcmp(p, "else")) @@ -154,6 +156,7 @@ static int return_token(int token, YYSTYPE *lval, const char *text) { switch (token) { + case T_IDENTIFIER: case T_INTEGER: case T_TEXT: if (!(lval->string = vkd3d_strdup(text))) @@ -191,6 +194,7 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) { switch (token) { + case T_DEFINE: case T_ELIF: case T_ELSE: case T_ENDIF: @@ -208,8 +212,18 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) TRACE("Parsing token %d, line %d, in directive %d, string %s.\n", token, lloc->line, ctx->current_directive, debugstr_a(text)); - if (!ctx->current_directive && !preproc_is_writing(ctx)) - continue; + switch (ctx->current_directive) + { + case T_ELIF: + case T_ELSE: + case T_ENDIF: + case T_IF: + break; + + default: + if (!preproc_is_writing(ctx)) + continue; + } if (ctx->current_directive) return return_token(token, lval, text); @@ -218,6 +232,19 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) } } +static int preproc_macro_compare(const void *key, const struct rb_entry *entry) +{ + const struct preproc_macro *macro = RB_ENTRY_VALUE(entry, struct preproc_macro, entry); + const char *name = key; + + return strcmp(name, macro->name); +} + +static void preproc_macro_rb_free(struct rb_entry *entry, void *ctx) +{ + preproc_free_macro(RB_ENTRY_VALUE(entry, struct preproc_macro, entry)); +} + int preproc_lexer_parse(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, struct vkd3d_shader_message_context *message_context) { @@ -226,6 +253,7 @@ int preproc_lexer_parse(const struct vkd3d_shader_compile_info *compile_info, void *output_code; vkd3d_string_buffer_init(&ctx.buffer); + rb_init(&ctx.macros, preproc_macro_compare); ctx.message_context = message_context; ctx.location.source_name = compile_info->source_name; ctx.location.line = 1; @@ -248,6 +276,7 @@ int preproc_lexer_parse(const struct vkd3d_shader_compile_info *compile_info, } vkd3d_free(ctx.if_stack); + rb_destroy(&ctx.macros, preproc_macro_rb_free, NULL); if (ctx.error) { diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index 647bb45..45cad44 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -66,6 +66,43 @@ static void yyerror(const YYLTYPE *loc, void *scanner, struct preproc_ctx *ctx, preproc_error(ctx, loc, VKD3D_SHADER_ERROR_PP_INVALID_SYNTAX, "%s", string); } +static struct preproc_macro *preproc_find_macro(struct preproc_ctx *ctx, const char *name) +{ + struct rb_entry *entry; + + if ((entry = rb_get(&ctx->macros, name))) + return RB_ENTRY_VALUE(entry, struct preproc_macro, entry); + return NULL; +} + +static bool preproc_add_macro(struct preproc_ctx *ctx, const struct vkd3d_shader_location *loc, char *name) +{ + struct preproc_macro *macro; + int ret; + + if ((macro = preproc_find_macro(ctx, name))) + { + preproc_warning(ctx, loc, VKD3D_SHADER_WARNING_PP_ALREADY_DEFINED, "Redefinition of %s.", name); + rb_remove(&ctx->macros, &macro->entry); + preproc_free_macro(macro); + } + + TRACE("Defining new macro %s.\n", debugstr_a(name)); + + if (!(macro = vkd3d_malloc(sizeof(*macro)))) + return false; + macro->name = name; + ret = rb_put(&ctx->macros, name, &macro->entry); + assert(!ret); + return true; +} + +void preproc_free_macro(struct preproc_macro *macro) +{ + vkd3d_free(macro->name); + vkd3d_free(macro); +} + static bool preproc_was_writing(struct preproc_ctx *ctx) { if (ctx->if_count < 2) @@ -135,17 +172,20 @@ static uint32_t preproc_parse_integer(const char *s) uint32_t integer; } +%token <string> T_IDENTIFIER %token <string> T_INTEGER %token <string> T_TEXT %token T_NEWLINE +%token T_DEFINE "#define" %token T_ELIF "#elif" %token T_ELSE "#else" %token T_ENDIF "#endif" %token T_IF "#if" %type <integer> expr +%type <string> body_token %% @@ -156,8 +196,25 @@ shader_text vkd3d_string_buffer_printf(&ctx->buffer, "\n"); } +body_text + : %empty + | body_text body_token + { + vkd3d_free($2); + } + +body_token + : T_IDENTIFIER + | T_INTEGER + | T_TEXT + directive - : T_IF expr T_NEWLINE + : T_DEFINE T_IDENTIFIER body_text T_NEWLINE + { + if (!preproc_add_macro(ctx, &@$, $2)) + YYABORT; + } + | T_IF expr T_NEWLINE { if (!preproc_push_if(ctx, !!$2)) YYABORT; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index b89d20e..1011be2 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -82,6 +82,7 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_PP_INVALID_SYNTAX = 4000, + VKD3D_SHADER_WARNING_PP_ALREADY_DEFINED = 4300, VKD3D_SHADER_WARNING_PP_INVALID_DIRECTIVE = 4301, VKD3D_SHADER_WARNING_PP_UNKNOWN_DIRECTIVE = 4303, VKD3D_SHADER_WARNING_PP_UNTERMINATED_IF = 4305, diff --git a/tests/hlsl_d3d12.c b/tests/hlsl_d3d12.c index 77a7ea1..38c1ab2 100644 --- a/tests/hlsl_d3d12.c +++ b/tests/hlsl_d3d12.c @@ -349,7 +349,7 @@ static void test_preprocess(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { - if (i == 43) + if (i == 6) continue; vkd3d_test_set_context("Source \"%s\"", tests[i].source); todo_if (i <= 4 || (i >= 9 && i <= 14))

1 0

Julian Rüger : German translation for release 6.0-rc6.
by Alexandre Julliard 11 Jan '21

11 Jan '21

Module: website Branch: master Commit: 15ae33e3a70a43dedaa119e277152504ec4c495d URL: https://source.winehq.org/git/website.git/?a=commit;h=15ae33e3a70a43dedaa11… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Jan 11 11:46:42 2021 +0100 German translation for release 6.0-rc6. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2021010801.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/de/2021010801.xml b/news/de/2021010801.xml new file mode 100644 index 00000000..8ae46de0 --- /dev/null +++ b/news/de/2021010801.xml @@ -0,0 +1,13 @@ +<news> +<date>8. Januar 2021</date> +<title>Wine 6.0-rc6 freigegeben</title> +<body> + Die Entwicklungsversion 6.0-rc6 von Wine ist jetzt verfügbar. + Sofern keine Probleme in letzter Minute auftreten, ist dies voraussichtlich der letzte Release Candidate vor dem finalen 6.0. + <a href="{$root}/announce/6.0-rc6">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Nur Fehlerkorrekturen, da wir uns im Code-Freeze befinden.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/6.0/wine-6.0-rc6.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 6.0-rc5.
by Alexandre Julliard 11 Jan '21

11 Jan '21

Module: website Branch: master Commit: cda8856afc33d1ba68ad33572cb8d679efe924f0 URL: https://source.winehq.org/git/website.git/?a=commit;h=cda8856afc33d1ba68ad3… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Jan 11 11:45:13 2021 +0100 German translation for release 6.0-rc5. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2021010201.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/de/2021010201.xml b/news/de/2021010201.xml new file mode 100644 index 00000000..c8e1fb95 --- /dev/null +++ b/news/de/2021010201.xml @@ -0,0 +1,12 @@ +<news> +<date>2. Januar 2021</date> +<title>Wine 6.0-rc5 freigegeben</title> +<body> + Die Entwicklungsversion 6.0-rc5 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/6.0-rc5">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Nur Fehlerkorrekturen, da wir uns im Code-Freeze befinden.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/6.0/wine-6.0-rc5.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 6.0-rc4.
by Alexandre Julliard 11 Jan '21

11 Jan '21

Module: website Branch: master Commit: cc8a462b3daa2c1affa99a745e674abdd6b2ffbb URL: https://source.winehq.org/git/website.git/?a=commit;h=cc8a462b3daa2c1affa99… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Jan 11 11:44:38 2021 +0100 German translation for release 6.0-rc4. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2020122601.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/de/2020122601.xml b/news/de/2020122601.xml new file mode 100644 index 00000000..7d21fc07 --- /dev/null +++ b/news/de/2020122601.xml @@ -0,0 +1,12 @@ +<news> +<date>26. Dezember 2020</date> +<title>Wine 6.0-rc4 freigegeben</title> +<body> + Die Entwicklungsversion 6.0-rc4 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/6.0-rc4">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Nur Fehlerkorrekturen, da wir uns im Code-Freeze befinden.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/6.0/wine-6.0-rc4.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 6.0-rc3.
by Alexandre Julliard 11 Jan '21

11 Jan '21

Module: website Branch: master Commit: f7ac82444358ad4a5c46ee3a1bcbc1e34fc7d923 URL: https://source.winehq.org/git/website.git/?a=commit;h=f7ac82444358ad4a5c46e… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Jan 11 11:44:09 2021 +0100 German translation for release 6.0-rc3. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2020121801.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/de/2020121801.xml b/news/de/2020121801.xml new file mode 100644 index 00000000..ed3bc124 --- /dev/null +++ b/news/de/2020121801.xml @@ -0,0 +1,12 @@ +<news> +<date>18. Dezember 2020</date> +<title>Wine 6.0-rc3 freigegeben</title> +<body> + Die Entwicklungsversion 6.0-rc3 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/6.0-rc3">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Nur Fehlerkorrekturen, da wir uns im Code-Freeze befinden.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/6.0/wine-6.0-rc3.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : Wine release 6.0-rc6
by Alexandre Julliard 08 Jan '21

08 Jan '21

Module: website Branch: master Commit: 839db55067bd2f2c999b148190fa460d9268143d URL: https://source.winehq.org/git/website.git/?a=commit;h=839db55067bd2f2c999b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 8 22:05:18 2021 +0100 Wine release 6.0-rc6 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2021010801.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/en/2021010801.xml b/news/en/2021010801.xml new file mode 100644 index 00000000..8b292427 --- /dev/null +++ b/news/en/2021010801.xml @@ -0,0 +1,13 @@ +<news> +<date>January 8, 2021</date> +<title>Wine 6.0-rc6 Released</title> +<body> + The Wine development release 6.0-rc6 is now available. + Barring any last minute issue, this is expected to be the last release candidate before the final 6.0. + <a href="{$root}/announce/6.0-rc6">What's new</a> in this release: +<ul> + <li>Bug fixes only, we are in code freeze.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/6.0/wine-6.0-rc6.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-rc6 : Alexandre Julliard : Release 6.0-rc6
by Alexandre Julliard 08 Jan '21

08 Jan '21

Module: wine Branch: refs/tags/wine-6.0-rc6 Tag: 936e28af2970470cb461d0cb87a22d895df1ba1e URL: https://source.winehq.org/git/wine.git/?a=tag;h=936e28af2970470cb461d0cb87a… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 8 22:03:21 2021 +0100 Release 6.0-rc6

1 0

Alexandre Julliard : Release 6.0-rc6.
by Alexandre Julliard 08 Jan '21

08 Jan '21

Module: wine Branch: master Commit: 7d3186e029fb4cf417fab59483a37d8aece95b5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d3186e029fb4cf417fab594… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 8 22:03:21 2021 +0100 Release 6.0-rc6. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 127 ++++++++++++++++++++++++++++---------------------------------- VERSION | 2 +- configure | 18 ++++----- 3 files changed, 67 insertions(+), 80 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7d3186e029fb4cf417fa…

1 0

Gabriel Ivăncescu : ntdll: Do not override existing context's RAX when dispatching user APC on x86_64.
by Alexandre Julliard 08 Jan '21

08 Jan '21

Module: wine Branch: master Commit: 22dba3f0fb60c5e477d7b876ce744b878c98f89b URL: https://source.winehq.org/git/wine.git/?a=commit;h=22dba3f0fb60c5e477d7b876… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Jan 8 20:26:16 2021 +0200 ntdll: Do not override existing context's RAX when dispatching user APC on x86_64. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 1fd26d5bd76..cccbfc2a3be 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2049,6 +2049,7 @@ struct apc_stack_layout * WINAPI setup_user_apc_dispatcher_stack( CONTEXT *conte { c.ContextFlags = CONTEXT_FULL; NtGetContextThread( GetCurrentThread(), &c ); + c.Rax = STATUS_USER_APC; context = &c; } memmove( &stack->context, context, sizeof(stack->context) ); @@ -2076,7 +2077,6 @@ __ASM_GLOBAL_FUNC( call_user_apc_dispatcher, "call " __ASM_NAME("setup_user_apc_dispatcher_stack") "\n\t" "movq %rax,%rsp\n\t" "leaq 0x30(%rsp),%rcx\n\t" /* context */ - "movq $0xc0,0x78(%rcx)\n\t" /* context.Rax = STATUS_USER_APC */ "movq %r12,%rdx\n\t" /* ctx */ "movq %r13,%r8\n\t" /* arg1 */ "movq %r14,%r9\n" /* arg2 */

1 0

Gabriel Ivăncescu : ntdll: Do not override existing context's EAX when dispatching user APC.
by Alexandre Julliard 08 Jan '21

08 Jan '21

Module: wine Branch: master Commit: 775dac0238845f6696d9ab5053a9238402b0b8a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=775dac0238845f6696d9ab50… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Jan 8 19:29:42 2021 +0200 ntdll: Do not override existing context's EAX when dispatching user APC. Fixes a regression introduced by 175a3649ba04daaad3f2b5b62d6bfe091d6a9e46, which caused Winamp's in_wave module to crash when playing a wav file (the previous behavior only changed EAX when there was no context). Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_i386.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index ff9d8a12c14..f2d58dc654d 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1696,6 +1696,7 @@ struct apc_stack_layout * WINAPI setup_user_apc_dispatcher_stack( CONTEXT *conte { c.ContextFlags = CONTEXT_FULL; NtGetContextThread( GetCurrentThread(), &c ); + c.Eax = STATUS_USER_APC; context = &c; } memmove( &stack->context, context, sizeof(stack->context) ); @@ -1704,7 +1705,6 @@ struct apc_stack_layout * WINAPI setup_user_apc_dispatcher_stack( CONTEXT *conte stack->arg1 = arg1; stack->arg2 = arg2; stack->func = func; - stack->context.Eax = STATUS_USER_APC; return stack; }

1 0

Nikolay Sivov : mfplat/tests: Get source events in async mode.
by Alexandre Julliard 08 Jan '21

08 Jan '21

Module: wine Branch: master Commit: f72f1ff9529e3c340f639fc9509011a7933fece8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f72f1ff9529e3c340f639fc9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 8 17:42:34 2021 +0300 mfplat/tests: Get source events in async mode. Fixes test crashes on Windows 7, that happen on synchronous GetEvent(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 95 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 67 insertions(+), 28 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index b361d4da162..77ac299c918 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -191,6 +191,7 @@ struct test_callback IMFAsyncCallback IMFAsyncCallback_iface; HANDLE event; DWORD param; + IMFMediaEvent *media_event; }; static struct test_callback *impl_from_IMFAsyncCallback(IMFAsyncCallback *iface) @@ -420,38 +421,77 @@ static const IMFAsyncCallbackVtbl test_create_from_file_handler_callback_vtbl = test_create_from_file_handler_callback_Invoke, }; +static HRESULT WINAPI source_events_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) +{ + struct test_callback *callback = impl_from_IMFAsyncCallback(iface); + IMFMediaEventGenerator *generator; + HRESULT hr; + + ok(!!result, "Unexpected result object.\n"); + + generator = (IMFMediaEventGenerator *)IMFAsyncResult_GetStateNoAddRef(result); + + hr = IMFMediaEventGenerator_EndGetEvent(generator, result, &callback->media_event); + ok(hr == S_OK, "Failed to create an object, hr %#x.\n", hr); + + SetEvent(callback->event); + + return S_OK; +} + +static const IMFAsyncCallbackVtbl events_callback_vtbl = +{ + testcallback_QueryInterface, + testcallback_AddRef, + testcallback_Release, + testcallback_GetParameters, + source_events_callback_Invoke, +}; + static BOOL get_event(IMFMediaEventGenerator *generator, MediaEventType expected_event_type, PROPVARIANT *value) { + struct test_callback callback = { 0 }; MediaEventType event_type; - HRESULT hr, event_status; - IMFMediaEvent *event; + BOOL ret = FALSE; + HRESULT hr; - hr = IMFMediaEventGenerator_GetEvent(generator, 0, &event); - ok(hr == S_OK, "Failed to get event, hr %#x.\n", hr); + callback.IMFAsyncCallback_iface.lpVtbl = &events_callback_vtbl; + callback.event = CreateEventA(NULL, FALSE, FALSE, NULL); - hr = IMFMediaEvent_GetStatus(event, &event_status); - ok(hr == S_OK, "Failed to get status code, hr %#x.\n", hr); - ok(event_status == S_OK, "Unexpected event status code %#x.\n", event_status); + for (;;) + { + hr = IMFMediaEventGenerator_BeginGetEvent(generator, &callback.IMFAsyncCallback_iface, + (IUnknown *)generator); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - hr = IMFMediaEvent_GetType(event, &event_type); - ok(hr == S_OK, "Failed to event type, hr %#x.\n", hr); - ok(event_type == expected_event_type, "Unexpected event type %u, expected %u.\n", event_type, expected_event_type); + if (WaitForSingleObject(callback.event, 1000) == WAIT_TIMEOUT) + { + ok(0, "timeout\n"); + break; + } - if (event_type != expected_event_type) - { - IMFMediaEvent_Release(event); - return FALSE; - } + Sleep(10); - if (value) - { - hr = IMFMediaEvent_GetValue(event, value); - ok(hr == S_OK, "Failed to get value of event, hr %#x.\n", hr); + hr = IMFMediaEvent_GetType(callback.media_event, &event_type); + ok(hr == S_OK, "Failed to event type, hr %#x.\n", hr); + + if ((ret = (event_type == expected_event_type))) + { + if (value) + { + hr = IMFMediaEvent_GetValue(callback.media_event, value); + ok(hr == S_OK, "Failed to get value of event, hr %#x.\n", hr); + } + + break; + } } - IMFMediaEvent_Release(event); + CloseHandle(callback.event); + if (callback.media_event) + IMFMediaEvent_Release(callback.media_event); - return TRUE; + return ret; } static void test_source_resolver(void) @@ -612,14 +652,13 @@ todo_wine hr = IMFMediaSource_Start(mediasource, descriptor, &GUID_NULL, &var); ok(hr == S_OK, "Failed to start media source, hr %#x.\n", hr); - get_event((IMFMediaEventGenerator *)mediasource, MENewStream, &var); - ok(var.vt == VT_UNKNOWN, "Unexpected value type %u from MENewStream event.\n", var.vt); - video_stream = (IMFMediaStream *)var.punkVal; - - get_event((IMFMediaEventGenerator *)mediasource, MESourceStarted, NULL); + video_stream = NULL; + if (get_event((IMFMediaEventGenerator *)mediasource, MENewStream, &var)) + { + ok(var.vt == VT_UNKNOWN, "Unexpected value type.\n"); + video_stream = (IMFMediaStream *)var.punkVal; + } - /* Request samples, our file is 10 frames at 25fps */ - get_event((IMFMediaEventGenerator *)video_stream, MEStreamStarted, NULL); sample_count = 10; for (i = 0; i < sample_count; ++i)

1 0

Jacek Caban : configure: Check for linker delayload support on mingw hosts.
by Alexandre Julliard 08 Jan '21

08 Jan '21

Module: wine Branch: master Commit: 4b362d016c57c14570efeb9c38dfcc5cf2c0910d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b362d016c57c14570efeb9c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 8 14:56:45 2021 +0100 configure: Check for linker delayload support on mingw hosts. Fixes PE-only builds with llvm-mingw. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 27 ++++++++++++++++++++++++++- configure.ac | 3 ++- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/configure b/configure index e6ee28a616d..75fef4144fc 100755 --- a/configure +++ b/configure @@ -17456,7 +17456,32 @@ fi ;; MSVCRTFLAGS="" case $host_os in - mingw32*) ;; + mingw32*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-delayload,autoconftest.dll" >&5 +$as_echo_n "checking whether the compiler supports -Wl,-delayload,autoconftest.dll... " >&6; } +if ${ac_cv_cflags__Wl__delayload_autoconftest_dll+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -Wl,-delayload,autoconftest.dll" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__Wl__delayload_autoconftest_dll=yes +else + ac_cv_cflags__Wl__delayload_autoconftest_dll=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl__delayload_autoconftest_dll" >&5 +$as_echo "$ac_cv_cflags__Wl__delayload_autoconftest_dll" >&6; } +if test "x$ac_cv_cflags__Wl__delayload_autoconftest_dll" = xyes; then : + DELAYLOADFLAG="-Wl,-delayload," + +fi ;; *) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fno-builtin" >&5 $as_echo_n "checking whether the compiler supports -fno-builtin... " >&6; } if ${ac_cv_cflags__fno_builtin+:} false; then : diff --git a/configure.ac b/configure.ac index beabfeb761c..2c4bd667e8f 100644 --- a/configure.ac +++ b/configure.ac @@ -2060,7 +2060,8 @@ char*f(const char *h,char n) {return strchr(h,n);}]])],[ac_cv_c_logicalop_noisy= dnl Disable gcc builtins except for Mingw AC_SUBST(MSVCRTFLAGS,"") case $host_os in - mingw32*) ;; + mingw32*) dnl Check for delayload linker support + WINE_TRY_CFLAGS([-Wl,-delayload,autoconftest.dll],[AC_SUBST(DELAYLOADFLAG,["-Wl,-delayload,"])]) ;; *) WINE_TRY_CFLAGS([-fno-builtin],[MSVCRTFLAGS="$MSVCRTFLAGS -fno-builtin"]) WINE_TRY_CFLAGS([-fshort-wchar],[MSVCRTFLAGS="$MSVCRTFLAGS -fshort-wchar"]) ;; esac

1 0

Francois Gouget : testbot/PatchUtils: Add support for .com program tests.
by Alexandre Julliard 08 Jan '21

08 Jan '21

Module: tools Branch: master Commit: deed0b3912a23a72cbd6379870c2f02a6153f39b URL: https://source.winehq.org/git/tools.git/?a=commit;h=deed0b3912a23a72cbd6379… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 8 02:57:04 2021 +0100 testbot/PatchUtils: Add support for .com program tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48090 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/PatchUtils.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index df31a09..dbd14f2 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -177,7 +177,8 @@ sub _CreateTestInfo($$$) { my ($Impacts, $Root, $Dir) = @_; - my $Module = ($Root eq "programs") ? "$Dir.exe" : $Dir; + # Don't add an extension to programs that have one already + my $Module = ($Root eq "programs" and $Dir !~ /\./) ? "$Dir.exe" : $Dir; $Impacts->{BuildModules}->{$Module} = 1; $Impacts->{IsWinePatch} = 1;

1 0

Zebediah Figura : kernel32/tests: Add a regression test for a deadlock calling FLS callbacks on process exit.
by Alexandre Julliard 07 Jan '21

07 Jan '21

Module: wine Branch: master Commit: 9bc3a9f78bf5e6a09d4e9811f645def4a477f3d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9bc3a9f78bf5e6a09d4e9811… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 7 09:51:03 2021 -0600 kernel32/tests: Add a regression test for a deadlock calling FLS callbacks on process exit. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/fiber.c | 69 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/dlls/kernel32/tests/fiber.c b/dlls/kernel32/tests/fiber.c index 1b5d0d1393a..3c54351fa7b 100644 --- a/dlls/kernel32/tests/fiber.c +++ b/dlls/kernel32/tests/fiber.c @@ -776,8 +776,76 @@ static void test_FiberLocalStorageWithFibers(PFLS_CALLBACK_FUNCTION cbfunc) test_ConvertFiberToThread(); } +static void WINAPI fls_exit_deadlock_callback(void *arg) +{ + if (arg == (void *)1) + Sleep(INFINITE); + if (arg == (void *)2) + /* Unfortunately this test won't affect the exit code if it fails, but + * at least it will print a failure message. */ + ok(RtlDllShutdownInProgress(), "expected DLL shutdown\n"); +} + +static DWORD CALLBACK fls_exit_deadlock_thread(void *arg) +{ + FlsSetValue((DWORD_PTR)arg, (void *)1); + return 0; +} + +static void fls_exit_deadlock_child(void) +{ + DWORD index = FlsAlloc(fls_exit_deadlock_callback); + FlsSetValue(index, (void *)2); + CreateThread(NULL, 0, fls_exit_deadlock_thread, (void *)(DWORD_PTR)index, 0, NULL); + Sleep(100); + ExitProcess(0); +} + +static void test_fls_exit_deadlock(void) +{ + char **argv, cmdline[MAX_PATH]; + PROCESS_INFORMATION pi; + STARTUPINFOA si = {0}; + BOOL ret; + + /* Regression test for the following deadlock: + * + * Thread A Thread B + * ----------------------------- + * ExitThread + * acquire FLS lock + * call FLS callback + * ExitProcess + * terminate thread A + * acquire FLS lock + * + * Thread B deadlocks on acquiring the FLS lock (in order to itself call its + * FLS callbacks.) + */ + + winetest_get_mainargs(&argv); + sprintf(cmdline, "%s %s fls_exit_deadlock", argv[0], argv[1]); + ret = CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "failed to create child, error %u\n", GetLastError()); + ret = WaitForSingleObject(pi.hProcess, 1000); + ok(!ret, "wait failed\n"); + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); +} + START_TEST(fiber) { + char **argv; + int argc; + + argc = winetest_get_mainargs(&argv); + + if (argc == 3 && !strcmp(argv[2], "fls_exit_deadlock")) + { + fls_exit_deadlock_child(); + return; + } + init_funcs(); if (!pCreateFiber) @@ -790,4 +858,5 @@ START_TEST(fiber) test_FiberLocalStorage(); test_FiberLocalStorageCallback(FiberLocalStorageProc); test_FiberLocalStorageWithFibers(FiberLocalStorageProc); + test_fls_exit_deadlock(); }

1 0

Zebediah Figura : ntdll: Set the process detaching flag before calling FLS callbacks.
by Alexandre Julliard 07 Jan '21

07 Jan '21

Module: wine Branch: master Commit: 16592ca918999dd28764e071384361ea44bdf11d URL: https://source.winehq.org/git/wine.git/?a=commit;h=16592ca918999dd28764e071… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 7 09:51:02 2021 -0600 ntdll: Set the process detaching flag before calling FLS callbacks. So that we will not deadlock trying to acquire fls_section. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 9b7e30b2c2b..3f43062f9f8 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3182,12 +3182,14 @@ fail: */ void WINAPI LdrShutdownProcess(void) { + BOOL detaching = process_detaching; + TRACE("()\n"); - if (!process_detaching) + process_detaching = TRUE; + if (!detaching) RtlProcessFlsData( NtCurrentTeb()->FlsSlots, 1 ); - process_detaching = TRUE; process_detach(); }

1 0

Zebediah Figura : user32: Send WM_CANCELMODE to the current capture window after initializing a modal dialog.
by Alexandre Julliard 07 Jan '21

07 Jan '21

Module: wine Branch: master Commit: 32f5dfde0db785b862af1c8a81152f268c08fa47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32f5dfde0db785b862af1c8a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 6 22:49:48 2021 -0600 user32: Send WM_CANCELMODE to the current capture window after initializing a modal dialog. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48860 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/dialog.c | 5 +++++ dlls/user32/tests/dialog.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 9bf3470921d..c48f404eceb 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -667,6 +667,8 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, if (DIALOG_CreateControls32( hwnd, dlgTemplate, &template, hInst, unicode )) { + HWND capture; + /* Send initialisation messages and set focus */ if (dlgProc) @@ -695,6 +697,9 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, } } + if (modal_owner && (capture = GetCapture())) + SendMessageW( capture, WM_CANCELMODE, 0, 0 ); + if (template.style & WS_VISIBLE && !(GetWindowLongW( hwnd, GWL_STYLE ) & WS_VISIBLE)) { ShowWindow( hwnd, SW_SHOWNORMAL ); /* SW_SHOW doesn't always work */ diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 33469377bcc..fcfaf5c12d6 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -2192,7 +2192,7 @@ static INT_PTR CALLBACK capture_release_proc(HWND dialog, UINT message, WPARAM w HWND child = (HWND)lparam; DWORD style; - todo_wine ok(!GetCapture(), "got capture %p\n", GetCapture()); + ok(!GetCapture(), "got capture %p\n", GetCapture()); style = GetWindowLongA(child, GWL_STYLE); ok(!(style & WS_DISABLED), "child should not be disabled\n"); @@ -2233,12 +2233,12 @@ static void test_capture_release(void) SetCapture(child); ret = DialogBoxParamA(GetModuleHandleA(NULL), "TEST_EMPTY_DIALOG", NULL, capture_release_proc, (LPARAM)child); ok(ret == 1, "got %#Ix\n", ret); - todo_wine ok(!GetCapture(), "got capture %p\n", GetCapture()); + ok(!GetCapture(), "got capture %p\n", GetCapture()); SetCapture(child); ret = DialogBoxParamA(GetModuleHandleA(NULL), "TEST_EMPTY_DIALOG", window, capture_release_proc, (LPARAM)child); ok(ret == 1, "got %#Ix\n", ret); - todo_wine ok(!GetCapture(), "got capture %p\n", GetCapture()); + ok(!GetCapture(), "got capture %p\n", GetCapture()); SetCapture(child); dialog = CreateDialogParamA(GetModuleHandleA(NULL), "TEST_EMPTY_DIALOG",

1 0

Zebediah Figura : user32/tests: Add some tests for release of capture via modal dialogs.
by Alexandre Julliard 07 Jan '21

07 Jan '21

Module: wine Branch: master Commit: c75e06528830fb882f2664d42c1d1802707bc766 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c75e06528830fb882f2664d4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 6 22:49:47 2021 -0600 user32/tests: Add some tests for release of capture via modal dialogs. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/dialog.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 3f6fe6cfca1..33469377bcc 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -2174,6 +2174,89 @@ static void test_dialog_custom_data(void) DialogBoxA(g_hinst, "CUSTOM_TEST_DIALOG", NULL, custom_test_dialog_proc); } +static INT_PTR CALLBACK capture_release_proc(HWND dialog, UINT message, WPARAM wparam, LPARAM lparam) +{ + if (message == WM_INITDIALOG) + { + HWND child = (HWND)lparam; + DWORD style; + + ok(GetCapture() == child, "got capture %p\n", GetCapture()); + style = GetWindowLongA(child, GWL_STYLE); + ok(!(style & WS_DISABLED), "child should not be disabled\n"); + + PostMessageA(dialog, WM_USER, 0, (LPARAM)child); + } + else if (message == WM_USER) + { + HWND child = (HWND)lparam; + DWORD style; + + todo_wine ok(!GetCapture(), "got capture %p\n", GetCapture()); + style = GetWindowLongA(child, GWL_STYLE); + ok(!(style & WS_DISABLED), "child should not be disabled\n"); + + EndDialog(dialog, 1); + } + return FALSE; +} + +static INT_PTR CALLBACK capture_release_modeless_proc(HWND dialog, UINT message, WPARAM wparam, LPARAM lparam) +{ + if (message == WM_INITDIALOG) + { + HWND child = (HWND)lparam; + DWORD style; + + ok(GetCapture() == child, "got capture %p\n", GetCapture()); + style = GetWindowLongA(child, GWL_STYLE); + ok(!(style & WS_DISABLED), "child should not be disabled\n"); + + PostMessageA(dialog, WM_QUIT, 0, 0); + } + return FALSE; +} + +static void test_capture_release(void) +{ + HWND window, child, dialog; + INT_PTR ret; + MSG msg; + + /* Set the capture to a child window. The main window will receive + * WM_CANCELMODE when being disabled, but the child window will retain + * capture. */ + + window = CreateWindowA("static", "parent", 0, 100, 200, 300, 400, NULL, NULL, NULL, NULL); + child = CreateWindowA("static", "child", WS_CHILD, 10, 20, 100, 100, window, NULL, NULL, NULL); + + SetCapture(child); + ret = DialogBoxParamA(GetModuleHandleA(NULL), "TEST_EMPTY_DIALOG", NULL, capture_release_proc, (LPARAM)child); + ok(ret == 1, "got %#Ix\n", ret); + todo_wine ok(!GetCapture(), "got capture %p\n", GetCapture()); + + SetCapture(child); + ret = DialogBoxParamA(GetModuleHandleA(NULL), "TEST_EMPTY_DIALOG", window, capture_release_proc, (LPARAM)child); + ok(ret == 1, "got %#Ix\n", ret); + todo_wine ok(!GetCapture(), "got capture %p\n", GetCapture()); + + SetCapture(child); + dialog = CreateDialogParamA(GetModuleHandleA(NULL), "TEST_EMPTY_DIALOG", + window, capture_release_modeless_proc, (LPARAM)child); + ok(!!dialog, "failed to create dialog\n"); + ok(GetCapture() == child, "got capture %p\n", GetCapture()); + ShowWindow(dialog, SW_SHOWNORMAL); + ok(GetCapture() == child, "got capture %p\n", GetCapture()); + while (GetMessageA(&msg, NULL, 0, 0)) + DispatchMessageA(&msg); + ok(GetCapture() == child, "got capture %p\n", GetCapture()); + + DestroyWindow(dialog); + + DestroyWindow(child); + DestroyWindow(window); +} + START_TEST(dialog) { g_hinst = GetModuleHandleA (0); @@ -2193,4 +2276,5 @@ START_TEST(dialog) test_SaveRestoreFocus(); test_timer_message(); test_MessageBox(); + test_capture_release(); }

1 0

Zebediah Figura : user32/tests: Add some tests for WM_CANCELMODE.
by Alexandre Julliard 07 Jan '21

07 Jan '21

Module: wine Branch: master Commit: 522b230142e22673ac0eabf5fd246abd22098571 URL: https://source.winehq.org/git/wine.git/?a=commit;h=522b230142e22673ac0eabf5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 6 22:49:46 2021 -0600 user32/tests: Add some tests for WM_CANCELMODE. In particular, test sending WM_CANCELMODE to a parent of the capture window. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index c9d2819e1a9..47864340e39 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -11850,6 +11850,50 @@ static void test_other_process_window(const char *argv0) DestroyWindow(hwnd); } +static void test_cancel_mode(void) +{ + HWND hwnd1, hwnd2, child; + LRESULT ret; + + hwnd1 = CreateWindowA("MainWindowClass", "window 1", WS_OVERLAPPEDWINDOW, + 100, 200, 500, 300, NULL, NULL, NULL, NULL); + hwnd2 = CreateWindowA("MainWindowClass", "window 2", WS_OVERLAPPEDWINDOW, + 100, 200, 500, 300, NULL, NULL, NULL, NULL); + flush_events(TRUE); + SetCapture(hwnd1); + ok(GetCapture() == hwnd1, "got capture %p\n", GetCapture()); + + ret = SendMessageA(hwnd2, WM_CANCELMODE, 0, 0); + ok(!ret, "got %ld\n", ret); + ok(GetCapture() == hwnd1, "got capture %p\n", GetCapture()); + + ret = SendMessageA(hwnd1, WM_CANCELMODE, 0, 0); + ok(!ret, "got %ld\n", ret); + ok(!GetCapture(), "got capture %p\n", GetCapture()); + + child = CreateWindowA("MainWindowClass", "child", WS_CHILD, + 0, 0, 100, 100, hwnd1, NULL, NULL, NULL); + + SetCapture(child); + ok(GetCapture() == child, "got capture %p\n", GetCapture()); + + ret = SendMessageA(hwnd2, WM_CANCELMODE, 0, 0); + ok(!ret, "got %ld\n", ret); + ok(GetCapture() == child, "got capture %p\n", GetCapture()); + + ret = SendMessageA(hwnd1, WM_CANCELMODE, 0, 0); + ok(!ret, "got %ld\n", ret); + ok(GetCapture() == child, "got capture %p\n", GetCapture()); + + ret = SendMessageA(child, WM_CANCELMODE, 0, 0); + ok(!ret, "got %ld\n", ret); + ok(!GetCapture(), "got capture %p\n", GetCapture()); + + DestroyWindow(child); + DestroyWindow(hwnd1); + DestroyWindow(hwnd2); +} + START_TEST(win) { char **argv; @@ -12016,6 +12060,7 @@ START_TEST(win) test_arrange_iconic_windows(); test_other_process_window(argv[0]); test_SC_SIZE(); + test_cancel_mode(); /* add the tests above this line */ if (hhook) UnhookWindowsHookEx(hhook);

1 0

André Hentschel : d3d9/tests: Don't test functions directly when reporting GetLastError().
by Alexandre Julliard 07 Jan '21

07 Jan '21

Module: wine Branch: master Commit: f6bb6e987a933bdb8c942649020cc539e7abf5ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6bb6e987a933bdb8c942649… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 6 21:18:26 2021 +0100 d3d9/tests: Don't test functions directly when reporting GetLastError(). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 0343fade792..fac9de172bd 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -14159,8 +14159,8 @@ static void test_multi_adapter(void) ok(!!monitor, "Adapter %u: Failed to get monitor.\n", i); monitor_info.cbSize = sizeof(monitor_info); - ok(GetMonitorInfoA(monitor, (MONITORINFO *)&monitor_info), - "Adapter %u: Failed to get monitor info, error %#x.\n", i, GetLastError()); + ret = GetMonitorInfoA(monitor, (MONITORINFO *)&monitor_info); + ok(ret, "Adapter %u: Failed to get monitor info, error %#x.\n", i, GetLastError()); if (!i) ok(monitor_info.dwFlags == MONITORINFOF_PRIMARY, @@ -14351,6 +14351,7 @@ static void test_cursor_clipping(void) IDirect3D9 *d3d; HWND window; HRESULT hr; + BOOL ret; window = create_window(); ok(!!window, "Failed to create a window.\n"); @@ -14377,10 +14378,12 @@ static void test_cursor_clipping(void) "Adapter %u: Failed to find a different mode than %ux%u.\n", adapter_idx, current_mode.Width, current_mode.Height); - ok(ClipCursor(NULL), "Adapter %u: ClipCursor failed, error %#x.\n", adapter_idx, + ret = ClipCursor(NULL); + ok(ret, "Adapter %u: ClipCursor failed, error %#x.\n", adapter_idx, GetLastError()); get_virtual_rect(&virtual_rect); - ok(GetClipCursor(&clip_rect), "Adapter %u: GetClipCursor failed, error %#x.\n", adapter_idx, + ret = GetClipCursor(&clip_rect); + ok(ret, "Adapter %u: GetClipCursor failed, error %#x.\n", adapter_idx, GetLastError()); ok(EqualRect(&clip_rect, &virtual_rect), "Adapter %u: Expect clip rect %s, got %s.\n", adapter_idx, wine_dbgstr_rect(&virtual_rect), wine_dbgstr_rect(&clip_rect)); @@ -14395,7 +14398,8 @@ static void test_cursor_clipping(void) } flush_events(); get_virtual_rect(&virtual_rect); - ok(GetClipCursor(&clip_rect), "Adapter %u: GetClipCursor failed, error %#x.\n", adapter_idx, + ret = GetClipCursor(&clip_rect); + ok(ret, "Adapter %u: GetClipCursor failed, error %#x.\n", adapter_idx, GetLastError()); ok(EqualRect(&clip_rect, &virtual_rect), "Adapter %u: Expect clip rect %s, got %s.\n", adapter_idx, wine_dbgstr_rect(&virtual_rect), wine_dbgstr_rect(&clip_rect)); @@ -14403,7 +14407,8 @@ static void test_cursor_clipping(void) IDirect3DDevice9_Release(device); flush_events(); get_virtual_rect(&virtual_rect); - ok(GetClipCursor(&clip_rect), "Adapter %u: GetClipCursor failed, error %#x.\n", adapter_idx, + ret = GetClipCursor(&clip_rect); + ok(ret, "Adapter %u: GetClipCursor failed, error %#x.\n", adapter_idx, GetLastError()); ok(EqualRect(&clip_rect, &virtual_rect), "Adapter %u: Expect clip rect %s, got %s.\n", adapter_idx, wine_dbgstr_rect(&virtual_rect), wine_dbgstr_rect(&clip_rect));

1 0

Francois Gouget : testbot/build: Remove unneeded Reconfig vs. WineReconfig differences.
by Alexandre Julliard 07 Jan '21

07 Jan '21

Module: tools Branch: master Commit: c0619f7f7abd6cb3a509d5584e58f9b2dffcb678 URL: https://source.winehq.org/git/tools.git/?a=commit;h=c0619f7f7abd6cb3a509d55… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 6 23:29:54 2021 +0100 testbot/build: Remove unneeded Reconfig vs. WineReconfig differences. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Reconfig.pl | 1 + testbot/bin/build/WineReconfig.pl | 17 ++++++++--------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index 458b5da..9e1043a 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -152,6 +152,7 @@ if (defined $Usage) print "Where:\n"; print " --update Update Wine's source code.\n"; print " --build Update the Wine builds.\n"; + print "If none of the above actions is specified they are all performed.\n"; print " MISSIONS Is a colon-separated list of missions. By default the following\n"; print " missions are run.\n"; print " - exe32: Build the 32 bit Windows test executables.\n"; diff --git a/testbot/bin/build/WineReconfig.pl b/testbot/bin/build/WineReconfig.pl index bd9ff57..75a21b3 100755 --- a/testbot/bin/build/WineReconfig.pl +++ b/testbot/bin/build/WineReconfig.pl @@ -168,15 +168,15 @@ if (defined $Usage) } print "Usage: $Name0 [--update] [--build [--no-rm]] [--addons] [--help] [MISSIONS]\n"; print "\n"; - print "Performs all the tasks needed for the host to be ready to test new patches: update the Wine source and addons, and rebuild the Wine binaries.\n"; + print "Performs all the tasks needed for the host to be ready to run Wine tests: update the Wine source and addons, and rebuild the Wine binaries.\n"; print "\n"; print "Where:\n"; print " --update Update Wine's source code.\n"; print " --build Update the Wine builds.\n"; print " --addons Update the Gecko and Mono Wine addons.\n"; print "If none of the above actions is specified they are all performed.\n"; - print " MISSIONS Is a colon-separated list of missions. By default the\n"; - print " following missions are run.\n"; + print " MISSIONS Is a colon-separated list of missions. By default the following\n"; + print " missions are run.\n"; print " - win32: Build the regular 32 bit Wine.\n"; print " - wow32: Build the 32 bit WoW Wine.\n"; print " - wow64: Build the 64 bit WoW Wine.\n"; @@ -185,21 +185,20 @@ if (defined $Usage) exit 0; } -if (! -d "$DataDir/staging" and ! mkdir "$DataDir/staging") +if ($DataDir =~ /'/) { - LogMsg "Unable to create '$DataDir/staging': $!\n"; + LogMsg "The install path contains invalid characters\n"; exit(1); } - -if ($DataDir =~ /'/) +if (! -d "$DataDir/staging" and ! mkdir "$DataDir/staging") { - LogMsg "The install path contains invalid characters\n"; + LogMsg "Unable to create '$DataDir/staging': $!\n"; exit(1); } # -# Run the builds and/or tests +# Run the builds # exit(1) if ($OptBuild and !BuildNativeTestAgentd());

1 0

Francois Gouget : testbot/WineReconfig: Do not prepare wineprefixes in advance.
by Alexandre Julliard 07 Jan '21

07 Jan '21

Module: tools Branch: master Commit: e2888e5b253fee41bb4d77bdac3c61335050870b URL: https://source.winehq.org/git/tools.git/?a=commit;h=e2888e5b253fee41bb4d77b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 6 23:29:46 2021 +0100 testbot/WineReconfig: Do not prepare wineprefixes in advance. This avoids test failures when the patch changes the initial Wine registry. Call CleanupWinePrefixes() after successful builds to ensure a clean transition and remove any stray wineprefix. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48671 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/WineReconfig.pl | 47 ++++++++------------------------------- 1 file changed, 9 insertions(+), 38 deletions(-) diff --git a/testbot/bin/build/WineReconfig.pl b/testbot/bin/build/WineReconfig.pl index f9f6792..bd9ff57 100755 --- a/testbot/bin/build/WineReconfig.pl +++ b/testbot/bin/build/WineReconfig.pl @@ -3,7 +3,7 @@ # # Updates the Wine source from Git and rebuilds it. # -# Copyright 2018 Francois Gouget +# Copyright 2018-2021 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -65,12 +65,10 @@ sub UpdateWineBuilds($$) # WinePrefix helpers # -sub UpdateWinePrefixes($) +sub CleanupWinePrefixes() { - my ($TaskMissions) = @_; - - # Make sure no obsolete wineprefix is left behind in case WineReconfig - # is called with a different set of targets + # The TestBot used to prepare WinePrefixes in advance. + # Make sure no such obsolete wineprefix is left behind. foreach my $Dir (glob("'$DataDir/wineprefix-*'")) { if (basename($Dir) =~ /^(wineprefix-[a-zA-Z0-9\(a)_.-]+)$/) # untaint @@ -78,27 +76,6 @@ sub UpdateWinePrefixes($) rmtree("$DataDir/$1"); } } - - # Set up brand new WinePrefixes ready for use for testing. - # This way we do it once instead of doing it for every test, thus saving - # time. Note that this requires using a different wineprefix for each - # mission. - foreach my $Mission (@{$TaskMissions->{Missions}}) - { - next if ($Mission->{test} eq "build"); - - my $BaseName = SetupWineEnvironment($Mission); - InfoMsg "\nRecreating the $BaseName wineprefix\n"; - - # Wait for the wineprefix creation to complete so it is really done - # before the snapshot gets updated. - my $ErrMessage = CreateWinePrefix($Mission, "wait"); - if (defined $ErrMessage) - { - LogMsg "$ErrMessage\n"; - return 0; - } - } return 1; } @@ -107,7 +84,7 @@ sub UpdateWinePrefixes($) # Setup and command line processing # -my ($Usage, $OptUpdate, $OptBuild, $OptAddOns, $OptWinePrefix, $MissionStatement); +my ($Usage, $OptUpdate, $OptBuild, $OptAddOns, $MissionStatement); my $OptBuildFlags = $Build::Utils::FROM_SCRATCH; while (@ARGV) { @@ -128,10 +105,6 @@ while (@ARGV) { $OptAddOns = 1; } - elsif ($Arg eq "--wineprefix") - { - $OptWinePrefix = 1; - } elsif ($Arg =~ /^(?:-\?|-h|--help)$/) { $Usage = 0; @@ -159,9 +132,9 @@ while (@ARGV) my $TaskMissions; if (!defined $Usage) { - if (!$OptUpdate and !$OptBuild and !$OptAddOns and !$OptWinePrefix) + if (!$OptUpdate and !$OptBuild and !$OptAddOns) { - $OptUpdate = $OptBuild = $OptAddOns = $OptWinePrefix = 1; + $OptUpdate = $OptBuild = $OptAddOns = 1; } $MissionStatement ||= "win32:wow32:wow64"; my ($ErrMessage, $Missions) = ParseMissionStatement($MissionStatement); @@ -193,8 +166,7 @@ if (defined $Usage) Error "try '$Name0 --help' for more information\n"; exit $Usage; } - print "Usage: $Name0 [--update] [--build [--no-rm]] [--addons] [--wineprefix]\n"; - print " [--help] [MISSIONS]\n"; + print "Usage: $Name0 [--update] [--build [--no-rm]] [--addons] [--help] [MISSIONS]\n"; print "\n"; print "Performs all the tasks needed for the host to be ready to test new patches: update the Wine source and addons, and rebuild the Wine binaries.\n"; print "\n"; @@ -202,7 +174,6 @@ if (defined $Usage) print " --update Update Wine's source code.\n"; print " --build Update the Wine builds.\n"; print " --addons Update the Gecko and Mono Wine addons.\n"; - print " --wineprefix Update the wineprefixes.\n"; print "If none of the above actions is specified they are all performed.\n"; print " MISSIONS Is a colon-separated list of missions. By default the\n"; print " following missions are run.\n"; @@ -236,7 +207,7 @@ exit(1) if ($OptBuild and !BuildTestLauncher()); exit(1) if ($OptUpdate and !GitPull("wine")); exit(1) if ($OptAddOns and !UpdateAddOns()); exit(1) if ($OptBuild and !UpdateWineBuilds($TaskMissions, $OptBuildFlags)); -exit(1) if ($OptWinePrefix and !UpdateWinePrefixes($TaskMissions)); +exit(1) if ($OptBuild and !CleanupWinePrefixes()); LogMsg "ok\n"; exit;

1 0

Gabriel Ivăncescu : comctl32: Remove the masked background when 32bpp bitmaps have no alpha values.
by Alexandre Julliard 06 Jan '21

06 Jan '21

Module: wine Branch: master Commit: 4ac05afd39aff3030e3379ee06e32d6544ef5d62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ac05afd39aff3030e3379ee… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Jan 5 19:53:18 2021 +0200 comctl32: Remove the masked background when 32bpp bitmaps have no alpha values. Fixes a regression introduced by 61b9209221d28d5d02379791ac1316c1fc2ca3b7. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50454 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/imagelist.c | 7 +++++++ dlls/comctl32/tests/imagelist.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index a6d9c73c49b..307ccc0336c 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -234,6 +234,13 @@ static void add_dib_bits( HIMAGELIST himl, int pos, int count, int width, int he mask_bits[i * mask_stride + j / 8] |= 0x80 >> (j % 8); } } + else if (mask_info) /* mask out the background */ + { + for (i = 0; i < height; i++) + for (j = n * width; j < (n + 1) * width; j++) + if ((mask_bits[i * mask_stride + j / 8] << (j % 8)) & 0x80) + bits[i * stride + j] = 0; + } StretchDIBits( himl->hdcImage, pt.x, pt.y, himl->cx, himl->cy, n * width, 0, width, height, bits, info, DIB_RGB_COLORS, SRCCOPY ); if (mask_info) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index c74acb2a215..ed9b1cc97f2 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -2436,7 +2436,7 @@ static void test_alpha(void) /* If all alpha values are zero, the image is considered to have no alpha and gets masked */ if (!GetAValue(bits[0]) && !GetAValue(bits[1])) - todo_wine ok(!bits[0] && bits[1] == test_bitmaps[i + 1], + ok(!bits[0] && bits[1] == test_bitmaps[i + 1], "Bitmap [%08X, %08X] returned [%08X, %08X], expected [%08X, %08X]\n", test_bitmaps[i], test_bitmaps[i + 1], bits[0], bits[1], 0, test_bitmaps[i + 1]); else

1 0

Gabriel Ivăncescu : comctl32/tests: Add more tests for 32bpp bitmaps with and without alpha, and masks.
by Alexandre Julliard 06 Jan '21

06 Jan '21

Module: wine Branch: master Commit: a692a12541b72f3b9a5f75a6ad8b382613a37a6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a692a12541b72f3b9a5f75a6… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Jan 5 19:53:17 2021 +0200 comctl32/tests: Add more tests for 32bpp bitmaps with and without alpha, and masks. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/imagelist.c | 67 +++++++++++++++++++++++++++++++++-------- 1 file changed, 55 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index a5809060542..c74acb2a215 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -2346,9 +2346,8 @@ static void test_loadimage(void) #define GetAValue(argb) ((BYTE) ((argb) >> 24)) -static void get_image_alpha(HIMAGELIST himl, int index, int width, int height, UINT32 *alpha) +static void get_image_bits(HIMAGELIST himl, int index, int width, int height, UINT32 *bits) { - int i; HBITMAP hbm_dst; void *bitmap_bits; BITMAPINFO bitmap_info = {{sizeof(BITMAPINFOHEADER), width, height, 1, 32, BI_RGB, 0, 0, 0, 0, 0}}; @@ -2358,9 +2357,7 @@ static void get_image_alpha(HIMAGELIST himl, int index, int width, int height, U SelectObject(hdc_dst, hbm_dst); pImageList_Draw(himl, index, hdc_dst, 0, 0, ILD_TRANSPARENT); - memcpy(alpha, bitmap_bits, (size_t)(width * height * 32 / 8)); - for (i = 0; i < width * height; i++) - alpha[i] = GetAValue(alpha[i]); + memcpy(bits, bitmap_bits, (size_t)(width * height * 32 / 8)); DeleteObject(hbm_dst); DeleteDC(hdc_dst); @@ -2372,6 +2369,11 @@ static void test_alpha(void) const static UINT32 test_bitmaps[] = { 0x00654321, 0x00ABCDEF, + 0x00654321, 0x00654321, + 0x00ABCDEF, 0x00654321, + 0x00ABCDEF, 0x00ABCDEF, + 0x00654321, 0x01ABCDEF, + 0x01654321, 0x00ABCDEF, 0x00654321, 0xFFABCDEF, 0x00654321, 0x89ABCDEF, 0xFF654321, 0x00ABCDEF, @@ -2381,31 +2383,72 @@ static void test_alpha(void) 0x87654321, 0xFFABCDEF, 0x87654321, 0x89ABCDEF }; + const static BYTE mask_bits = 0xAA; int i, ret; HDC hdc; - HBITMAP hbm_test; + HBITMAP hbm_test, hbm_mask; HIMAGELIST himl; - UINT32 alpha[2]; + UINT32 bits[2]; hdc = CreateCompatibleDC(0); - himl = pImageList_Create(2, 1, ILC_COLOR32 | ILC_MASK, 0, 10); + himl = pImageList_Create(2, 1, ILC_COLOR32 | ILC_MASK, 0, 15); for (i = 0; i < ARRAY_SIZE(test_bitmaps); i += 2) { hbm_test = create_test_bitmap(hdc, 2, 1, 32, test_bitmaps + i); - ret = pImageList_AddMasked(himl, hbm_test, CLR_NONE); + ret = pImageList_AddMasked(himl, hbm_test, RGB(0x65,0x43,0x21)); ok(ret == i / 2, "ImageList_AddMasked returned %d, expected %d\n", ret, i / 2); DeleteObject(hbm_test); - get_image_alpha(himl, i / 2, 2, 1, alpha); - ok(alpha[0] == GetAValue(test_bitmaps[i]) && alpha[1] == GetAValue(test_bitmaps[i + 1]), + get_image_bits(himl, i / 2, 2, 1, bits); + ok(GetAValue(bits[0]) == GetAValue(test_bitmaps[i]) && GetAValue(bits[1]) == GetAValue(test_bitmaps[i + 1]), + "Bitmap [%08X, %08X] returned alpha value [%02X, %02X], expected [%02X, %02X]\n", + test_bitmaps[i], test_bitmaps[i + 1], GetAValue(bits[0]), GetAValue(bits[1]), + GetAValue(test_bitmaps[i]), GetAValue(test_bitmaps[i + 1])); + + /* If all alpha values are zero, the image is considered to have no alpha and gets masked */ + if (!GetAValue(bits[0]) && !GetAValue(bits[1])) + ok(bits[0] == (test_bitmaps[i] == 0x654321 ? 0 : test_bitmaps[i]) && + bits[1] == (test_bitmaps[i + 1] == 0x654321 ? 0 : test_bitmaps[i + 1]), + "Bitmap [%08X, %08X] returned [%08X, %08X], expected [%08X, %08X]\n", + test_bitmaps[i], test_bitmaps[i + 1], bits[0], bits[1], + test_bitmaps[i] == 0x654321 ? 0 : test_bitmaps[i], + test_bitmaps[i + 1] == 0x654321 ? 0 : test_bitmaps[i + 1]); + } + + pImageList_Destroy(himl); + hbm_mask = CreateBitmap(2, 1, 1, 1, &mask_bits); + himl = pImageList_Create(2, 1, ILC_COLOR32 | ILC_MASK, 0, 15); + + for (i = 0; i < ARRAY_SIZE(test_bitmaps); i += 2) + { + hbm_test = create_test_bitmap(hdc, 2, 1, 32, test_bitmaps + i); + ret = pImageList_Add(himl, hbm_test, hbm_mask); + ok(ret == i / 2, "ImageList_Add returned %d, expected %d\n", ret, i / 2); + DeleteObject(hbm_test); + + get_image_bits(himl, i / 2, 2, 1, bits); + ok(GetAValue(bits[0]) == GetAValue(test_bitmaps[i]) && GetAValue(bits[1]) == GetAValue(test_bitmaps[i + 1]), "Bitmap [%08X, %08X] returned alpha value [%02X, %02X], expected [%02X, %02X]\n", - test_bitmaps[i], test_bitmaps[i + 1], alpha[0], alpha[1], + test_bitmaps[i], test_bitmaps[i + 1], GetAValue(bits[0]), GetAValue(bits[1]), GetAValue(test_bitmaps[i]), GetAValue(test_bitmaps[i + 1])); + + /* If all alpha values are zero, the image is considered to have no alpha and gets masked */ + if (!GetAValue(bits[0]) && !GetAValue(bits[1])) + todo_wine ok(!bits[0] && bits[1] == test_bitmaps[i + 1], + "Bitmap [%08X, %08X] returned [%08X, %08X], expected [%08X, %08X]\n", + test_bitmaps[i], test_bitmaps[i + 1], bits[0], bits[1], 0, test_bitmaps[i + 1]); + else + { + if (GetAValue(bits[0]) >= 0x80) + ok(bits[0] & 0x00FFFFFF, "Bitmap [%08X, %08X] has alpha and masked first pixel [%08X]\n", + test_bitmaps[i], test_bitmaps[i + 1], bits[0]); + } } pImageList_Destroy(himl); + DeleteObject(hbm_mask); DeleteDC(hdc); }

1 0

Rémi Bernon : server: Accept DBG_EXCEPTION_HANDLED parameter in continue_debug_event.
by Alexandre Julliard 06 Jan '21

06 Jan '21

Module: wine Branch: master Commit: c414f232e6cb09a5ec6a4b015c4cdcf427e0531d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c414f232e6cb09a5ec6a4b01… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 6 15:33:10 2021 +0100 server: Accept DBG_EXCEPTION_HANDLED parameter in continue_debug_event. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50453 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 27 ++++++++++++++------------- server/debugger.c | 1 + 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index ca338775351..202a939b76f 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1053,7 +1053,7 @@ static void test_exceptions(void) ok( res == STATUS_SUCCESS, "NtSetContextThread failed with %x\n", res ); } -static void test_debugger(void) +static void test_debugger(DWORD cont_status) { char cmdline[MAX_PATH]; PROCESS_INFORMATION pi; @@ -1081,7 +1081,7 @@ static void test_debugger(void) do { - continuestatus = DBG_CONTINUE; + continuestatus = cont_status; ok(WaitForDebugEvent(&de, INFINITE), "reading debug event\n"); ret = ContinueDebugEvent(de.dwProcessId, de.dwThreadId, 0xdeadbeef); @@ -1091,7 +1091,7 @@ static void test_debugger(void) if (de.dwThreadId != pi.dwThreadId) { trace("event %d not coming from main thread, ignoring\n", de.dwDebugEventCode); - ContinueDebugEvent(de.dwProcessId, de.dwThreadId, DBG_CONTINUE); + ContinueDebugEvent(de.dwProcessId, de.dwThreadId, cont_status); continue; } @@ -3288,7 +3288,7 @@ static void test_rtlraiseexception(void) run_rtlraiseexception_test(EXCEPTION_INVALID_HANDLE); } -static void test_debugger(void) +static void test_debugger(DWORD cont_status) { char cmdline[MAX_PATH]; PROCESS_INFORMATION pi; @@ -3316,7 +3316,7 @@ static void test_debugger(void) do { - continuestatus = DBG_CONTINUE; + continuestatus = cont_status; ok(WaitForDebugEvent(&de, INFINITE), "reading debug event\n"); ret = ContinueDebugEvent(de.dwProcessId, de.dwThreadId, 0xdeadbeef); @@ -3326,7 +3326,7 @@ static void test_debugger(void) if (de.dwThreadId != pi.dwThreadId) { trace("event %d not coming from main thread, ignoring\n", de.dwDebugEventCode); - ContinueDebugEvent(de.dwProcessId, de.dwThreadId, DBG_CONTINUE); + ContinueDebugEvent(de.dwProcessId, de.dwThreadId, cont_status); continue; } @@ -4252,7 +4252,7 @@ static void test_thread_context(void) #undef COMPARE } -static void test_debugger(void) +static void test_debugger(DWORD cont_status) { char cmdline[MAX_PATH]; PROCESS_INFORMATION pi; @@ -4280,7 +4280,7 @@ static void test_debugger(void) do { - continuestatus = DBG_CONTINUE; + continuestatus = cont_status; ok(WaitForDebugEvent(&de, INFINITE), "reading debug event\n"); ret = ContinueDebugEvent(de.dwProcessId, de.dwThreadId, 0xdeadbeef); @@ -4290,7 +4290,7 @@ static void test_debugger(void) if (de.dwThreadId != pi.dwThreadId) { trace("event %d not coming from main thread, ignoring\n", de.dwDebugEventCode); - ContinueDebugEvent(de.dwProcessId, de.dwThreadId, DBG_CONTINUE); + ContinueDebugEvent(de.dwProcessId, de.dwThreadId, cont_status); continue; } @@ -5500,7 +5500,7 @@ static void test_thread_context(void) #undef COMPARE } -static void test_debugger(void) +static void test_debugger(DWORD cont_status) { char cmdline[MAX_PATH]; PROCESS_INFORMATION pi; @@ -5528,7 +5528,7 @@ static void test_debugger(void) do { - continuestatus = DBG_CONTINUE; + continuestatus = cont_status; ok(WaitForDebugEvent(&de, INFINITE), "reading debug event\n"); ret = ContinueDebugEvent(de.dwProcessId, de.dwThreadId, 0xdeadbeef); @@ -5538,7 +5538,7 @@ static void test_debugger(void) if (de.dwThreadId != pi.dwThreadId) { trace("event %d not coming from main thread, ignoring\n", de.dwDebugEventCode); - ContinueDebugEvent(de.dwProcessId, de.dwThreadId, DBG_CONTINUE); + ContinueDebugEvent(de.dwProcessId, de.dwThreadId, cont_status); continue; } @@ -8346,7 +8346,8 @@ START_TEST(exception) #endif - test_debugger(); + test_debugger(DBG_EXCEPTION_HANDLED); + test_debugger(DBG_CONTINUE); test_thread_context(); test_outputdebugstring(1, FALSE); test_ripevent(1); diff --git a/server/debugger.c b/server/debugger.c index e4a6c1e43a8..ee95d4ee326 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -677,6 +677,7 @@ DECL_HANDLER(continue_debug_event) struct process *process; if (req->status != DBG_EXCEPTION_NOT_HANDLED && + req->status != DBG_EXCEPTION_HANDLED && req->status != DBG_CONTINUE && req->status != DBG_REPLY_LATER) {

1 0

Rémi Bernon : windowscodecs: Copy container_count GUIDs, not bytes, in GetContainerFormats.
by Alexandre Julliard 06 Jan '21

06 Jan '21

Module: wine Branch: master Commit: 901366e3d4aecb84044a3f990bb2220a1e4a2b05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=901366e3d4aecb84044a3f99… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 5 18:40:00 2021 +0100 windowscodecs: Copy container_count GUIDs, not bytes, in GetContainerFormats. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index db6d25b46b3..cbe8aae572d 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -1658,7 +1658,7 @@ static HRESULT WINAPI MetadataReaderInfo_GetContainerFormats(IWICMetadataReaderI { if (This->container_count && length < This->container_count) return WINCODEC_ERR_INSUFFICIENTBUFFER; - memcpy(formats, This->container_formats, This->container_count); + memcpy(formats, This->container_formats, This->container_count * sizeof(*formats)); } return S_OK; }

1 0

Francois Gouget : testbot: Fix the spelling of comments, documentation and web pages.
by Alexandre Julliard 06 Jan '21

06 Jan '21

Module: tools Branch: master Commit: b264e96049a41a7814faeba2c20dc8538505fb05 URL: https://source.winehq.org/git/tools.git/?a=commit;h=b264e96049a41a7814faeba… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 6 14:00:17 2021 +0100 testbot: Fix the spelling of comments, documentation and web pages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Activity.pm | 2 +- testbot/lib/WineTestBot/Engine/Scheduler.pm | 2 +- testbot/lib/WineTestBot/PatchUtils.pm | 2 +- testbot/lib/WineTestBot/Steps.pm | 2 +- testbot/lib/WineTestBot/Tasks.pm | 2 +- testbot/web/Activity.pl | 2 +- testbot/web/Munin.pl | 2 +- testbot/web/Stats.pl | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index eba45a0..2a1e21f 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -68,7 +68,7 @@ for the specified timestamp. Entries have the following structure: vm => <VMObject>, status => <VMStatus>, value => <RecordValue>, - task => <TaskObjectIfAppopriate>, + task => <TaskObjectIfAppropriate>, start => <StartTimestamp>, end => <EndTimestamp>, rows => <NbRows>, diff --git a/testbot/lib/WineTestBot/Engine/Scheduler.pm b/testbot/lib/WineTestBot/Engine/Scheduler.pm index c28e143..800d136 100644 --- a/testbot/lib/WineTestBot/Engine/Scheduler.pm +++ b/testbot/lib/WineTestBot/Engine/Scheduler.pm @@ -884,7 +884,7 @@ sub _RevertVMs($$) # Note that during regular operation we get dirty VMs before they are # assigned a process to shut them down. This makes it possible to pick # the best future VM while we still know which VM is hot. - # In constrast on startup the dirty VMs all have processes checking their + # In contrast on startup the dirty VMs all have processes checking their # status, hence the dirtychild check to ensure we are not prevented from # preparing the best VM (e.g. build): it delays preparing the future VMs # until either there are no dirty VM or a VM got prepared for a task diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 44b3f97..df31a09 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -373,7 +373,7 @@ sub GetPatchImpacts($) } elsif ($Line eq LastPartSeparator()) { - # All the diffs so far belongs to previous parts of this patchset. + # All the diffs so far belong to previous parts of this patchset. # But: # - Only the last part must be taken into account to determine if a # rebuild and testing is needed. diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index c9ce343..0943375 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -30,7 +30,7 @@ A Job is composed of one or more Steps that each perform one operation. A Step is in turn composed of one WineTestBot::Task object for each VM that the Step should be run on. -A Step's lifecyle is as follows: +A Step's lifecycle is as follows: =over =item * diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 5a79ff9..141fee0 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -31,7 +31,7 @@ performing that Step in a WineTestBot::VM virtual machine. For instance a Step responsible for running a given test would have one Task object for each virtual machine that the test must be performed in. -A Task's lifecyle is as follows: +A Task's lifecycle is as follows: =over =item * diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index d616a7c..9444779 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -290,7 +290,7 @@ sub GenerateFooter($) print "running a task (in which case it links to it), \n"; print "dirty while the server is powering off the VM after a task or while it assesses its state on startup.\n"; - print "If no time is indicated then the VM remained in that state for less than 2 seconds. The tasks column indicates the number of runnable / queued tasks before that scheduling round. If any task needs to run on a maintenance, retired or deleted VM is is shown as +N. A long horizontal bar indicates the TestBot server was restarted. \n"; + print "If no time is indicated then the VM remained in that state for less than 2 seconds. The tasks column indicates the number of runnable / queued tasks before that scheduling round. If any task needs to run on a maintenance, retired or deleted VM it is shown as +N. A long horizontal bar indicates the TestBot server was restarted. \n"; print "This border indicates that the task timed out, \n"; print "this border denotes a transient (network?) error so the task will be re-run, \n"; print "and this border indicates a TestBot error. \n"; diff --git a/testbot/web/Munin.pl b/testbot/web/Munin.pl index 35160a1..c2464d0 100644 --- a/testbot/web/Munin.pl +++ b/testbot/web/Munin.pl @@ -82,7 +82,7 @@ happened in the past 5 minutes. However we have to report on infrequent events: - New jobs arrive infrequently: around one per hour currently, and it is not rare for two of them to arrive at the same time. If we were to naively extrapolate 1 new job in the past 5 minutes as a rate of 12 jobs per hour - we'd get a graph with exagerated swings. But note that things would converge + we'd get a graph with exaggerated swings. But note that things would converge on a meaningful value as Munin averages things out for the monthly or yearly graphs. - We could instead record when the last job arrived and derive a rate by diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index f453891..4a70cb0 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -426,7 +426,7 @@ sub GenerateFooter($) print "The Job rate and Task rate show the average hourly rate at which jobs / tasks are submitted to the TestBot. The Revert rate shows how many reverts have been done per hour to run those tasks. Note that the job and task rates provide a first approximation upper limit on the average time a job or task can take to complete.\n"; print "The Busy time indicates how long the TestBot had at least one pending task and the Busy % shows how much of the wall clock time this represents. Note that the busy percentage and average Job completion times can be optimized by balancing the load on the different VM hosts.\n"; print "The average and maximum time statistics show how long the VMs spend in each state of their lifecycle. A VM starts in the powered off or dirty state. It is then reverted to a clean state with the right configuration for the tests. Then it goes into the sleep state during which it gets ready to run the tests. Depending on the VM configuration this may be immediate or may require booting the VM first. Then it goes into the run state while the tests are being uploaded, run, and the results retrieved. This means the test itself takes less time to run than indicated in this statistic. Also note that the WineTest and Wine update tasks are tallied separately because they take much longer than regular tasks. Once the tests complete the VM is marked dirty while it waits for the TestBot to decide whether to power it off, or immediately revert it for the next task.\n"; - print "The errors section shows how many Timeouts occurred, that is how many tasks failed to complete within the alloted time; how many failed due to a TestBot error; and how many had to be rerun due to a Transient error such as a network connection issue.\n"; + print "The errors section shows how many Timeouts occurred, that is how many tasks failed to complete within the allotted time; how many failed due to a TestBot error; and how many had to be rerun due to a Transient error such as a network connection issue.\n"; print "</td></tr></tbody>\n"; print "</tbody></table></div>\n";

1 0

Julian Rüger : readme: Update German translation.
by Alexandre Julliard 05 Jan '21

05 Jan '21

Module: wine Branch: master Commit: c0ca6913ca9a7063deadd53fc4954da860880897 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0ca6913ca9a7063deadd53f… Author: Julian Rüger <jr98(a)gmx.net> Date: Tue Jan 5 16:36:45 2021 +0100 readme: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- documentation/README.de | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/documentation/README.de b/documentation/README.de index fbf63eca22e..b30575a356d 100644 --- a/documentation/README.de +++ b/documentation/README.de @@ -44,7 +44,7 @@ folgenden Betriebssysteme: FreeBSD 8.0 oder neuer Solaris x86 9 oder neuer NetBSD-current - Mac OS X 10.5 oder neuer + Mac OS X 10.8 oder neuer Da Wine Thread-Unterstützung auf Kernelebene benötigt, werden nur die oben aufgeführten Betriebssysteme unterstützt. @@ -67,9 +67,10 @@ NetBSD-Info: SYSVMSG in Ihrem Kernel aktiviert haben. Mac OS X Info: - Sie benötigen mindestens Xcode 2.4 um richtig unter x86 kompilieren zu - können. Der Mac-Treiber benötigt mindestens OS X 10.6, unter 10.5 wird - dieser nicht mit kompiliert. + Sie benötigen Xcode/Xcode-Kommandozeilentools oder Apple cctools. Die + Mindestanforderungen um Wine zu kompilieren sind clang 3.8 mit dem + MacOSX10.10.sdk und mingw-w64 v8. Das MacOSX10.14.sdk oder neuer kann + nur wine64 erzeugen. Unterstützte Dateisysteme: Wine sollte auf den meisten Dateisystemen laufen. Kompatibilitätsprobleme

1 0

Anton Baskanov : winegstreamer: Split audio data to fit in the sample buffer.
by Alexandre Julliard 05 Jan '21

05 Jan '21

Module: wine Branch: master Commit: 2752029e920608d416aa22a9c602211527eec951 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2752029e920608d416aa22a9… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu Dec 31 19:52:49 2020 +0700 winegstreamer: Split audio data to fit in the sample buffer. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50355 Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 80 +++++++++++++++++++++++++++++++++---------- 1 file changed, 62 insertions(+), 18 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 3ab4ea9c0d6..1e91c9f8e7e 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -793,12 +793,13 @@ static DWORD CALLBACK push_data(LPVOID iface) return 0; } -static HRESULT send_sample(struct gstdemux_source *pin, IMediaSample *sample, GstBuffer *buf, GstMapInfo *info) +static HRESULT send_sample(struct gstdemux_source *pin, IMediaSample *sample, + GstBuffer *buf, GstMapInfo *info, gsize offset, gsize size, DWORD bytes_per_second) { HRESULT hr; BYTE *ptr = NULL; - hr = IMediaSample_SetActualDataLength(sample, info->size); + hr = IMediaSample_SetActualDataLength(sample, size); if(FAILED(hr)){ WARN("SetActualDataLength failed: %08x\n", hr); return hr; @@ -806,18 +807,27 @@ static HRESULT send_sample(struct gstdemux_source *pin, IMediaSample *sample, Gs IMediaSample_GetPointer(sample, &ptr); - memcpy(ptr, info->data, info->size); + memcpy(ptr, &info->data[offset], size); if (GST_BUFFER_PTS_IS_VALID(buf)) { - REFERENCE_TIME rtStart = gst_segment_to_running_time(pin->segment, GST_FORMAT_TIME, buf->pts); + REFERENCE_TIME rtStart; + GstClockTime ptsStart = buf->pts; + if (offset > 0) + ptsStart = buf->pts + gst_util_uint64_scale(offset, GST_SECOND, bytes_per_second); + rtStart = gst_segment_to_running_time(pin->segment, GST_FORMAT_TIME, ptsStart); if (rtStart >= 0) rtStart /= 100; if (GST_BUFFER_DURATION_IS_VALID(buf)) { - REFERENCE_TIME tStart = buf->pts / 100; - REFERENCE_TIME tStop = (buf->pts + buf->duration) / 100; REFERENCE_TIME rtStop; - rtStop = gst_segment_to_running_time(pin->segment, GST_FORMAT_TIME, buf->pts + buf->duration); + REFERENCE_TIME tStart; + REFERENCE_TIME tStop; + GstClockTime ptsStop = buf->pts + buf->duration; + if (offset + size < info->size) + ptsStop = buf->pts + gst_util_uint64_scale(offset + size, GST_SECOND, bytes_per_second); + tStart = ptsStart / 100; + tStop = ptsStop / 100; + rtStop = gst_segment_to_running_time(pin->segment, GST_FORMAT_TIME, ptsStop); if (rtStop >= 0) rtStop /= 100; TRACE("Current time on %p: %i to %i ms\n", pin, (int)(rtStart / 10000), (int)(rtStop / 10000)); @@ -832,7 +842,7 @@ static HRESULT send_sample(struct gstdemux_source *pin, IMediaSample *sample, Gs IMediaSample_SetMediaTime(sample, NULL, NULL); } - IMediaSample_SetDiscontinuity(sample, GST_BUFFER_FLAG_IS_SET(buf, GST_BUFFER_FLAG_DISCONT)); + IMediaSample_SetDiscontinuity(sample, !offset && GST_BUFFER_FLAG_IS_SET(buf, GST_BUFFER_FLAG_DISCONT)); IMediaSample_SetPreroll(sample, GST_BUFFER_FLAG_IS_SET(buf, GST_BUFFER_FLAG_LIVE)); IMediaSample_SetSyncPoint(sample, !GST_BUFFER_FLAG_IS_SET(buf, GST_BUFFER_FLAG_DELTA_UNIT)); @@ -850,7 +860,7 @@ static GstFlowReturn got_data_sink(GstPad *pad, GstObject *parent, GstBuffer *bu { struct gstdemux_source *pin = gst_pad_get_element_private(pad); struct gstdemux *This = impl_from_strmbase_filter(pin->pin.pin.filter); - HRESULT hr; + HRESULT hr = S_OK; IMediaSample *sample; GstMapInfo info; @@ -861,24 +871,58 @@ static GstFlowReturn got_data_sink(GstPad *pad, GstObject *parent, GstBuffer *bu return GST_FLOW_OK; } - hr = BaseOutputPinImpl_GetDeliveryBuffer(&pin->pin, &sample, NULL, NULL, 0); + gst_buffer_map(buf, &info, GST_MAP_READ); - if (FAILED(hr)) + if (IsEqualGUID(&pin->pin.pin.mt.formattype, &FORMAT_WaveFormatEx) + && (IsEqualGUID(&pin->pin.pin.mt.subtype, &MEDIASUBTYPE_PCM) + || IsEqualGUID(&pin->pin.pin.mt.subtype, &MEDIASUBTYPE_IEEE_FLOAT))) { - if (hr != VFW_E_NOT_CONNECTED) - ERR("Could not get a delivery buffer (%x), returning GST_FLOW_FLUSHING\n", hr); + WAVEFORMATEX *format = (WAVEFORMATEX *)pin->pin.pin.mt.pbFormat; + gsize offset = 0; + while (offset < info.size) + { + gsize advance; + + hr = BaseOutputPinImpl_GetDeliveryBuffer(&pin->pin, &sample, NULL, NULL, 0); + + if (FAILED(hr)) + { + if (hr != VFW_E_NOT_CONNECTED) + ERR("Could not get a delivery buffer (%x), returning GST_FLOW_FLUSHING\n", hr); + break; + } + + advance = min(IMediaSample_GetSize(sample), info.size - offset); + + hr = send_sample(pin, sample, buf, &info, offset, advance, format->nAvgBytesPerSec); + + IMediaSample_Release(sample); + + if (FAILED(hr)) + break; + + offset += advance; + } } else { - gst_buffer_map(buf, &info, GST_MAP_READ); - - hr = send_sample(pin, sample, buf, &info); + hr = BaseOutputPinImpl_GetDeliveryBuffer(&pin->pin, &sample, NULL, NULL, 0); - gst_buffer_unmap(buf, &info); + if (FAILED(hr)) + { + if (hr != VFW_E_NOT_CONNECTED) + ERR("Could not get a delivery buffer (%x), returning GST_FLOW_FLUSHING\n", hr); + } + else + { + hr = send_sample(pin, sample, buf, &info, 0, info.size, 0); - IMediaSample_Release(sample); + IMediaSample_Release(sample); + } } + gst_buffer_unmap(buf, &info); + gst_buffer_unref(buf); if (hr == VFW_E_NOT_CONNECTED)

1 0

Anton Baskanov : winegstreamer: Move sample sending to a helper function.
by Alexandre Julliard 05 Jan '21

05 Jan '21

Module: wine Branch: master Commit: 291d5a9c10948f4372553a322bcf932e9501af99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=291d5a9c10948f4372553a32… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu Dec 31 19:52:48 2020 +0700 winegstreamer: Move sample sending to a helper function. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 76 +++++++++++++++++++++++-------------------- 1 file changed, 40 insertions(+), 36 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 805a7b8c089..3ab4ea9c0d6 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -793,51 +793,20 @@ static DWORD CALLBACK push_data(LPVOID iface) return 0; } -static GstFlowReturn got_data_sink(GstPad *pad, GstObject *parent, GstBuffer *buf) +static HRESULT send_sample(struct gstdemux_source *pin, IMediaSample *sample, GstBuffer *buf, GstMapInfo *info) { - struct gstdemux_source *pin = gst_pad_get_element_private(pad); - struct gstdemux *This = impl_from_strmbase_filter(pin->pin.pin.filter); HRESULT hr; BYTE *ptr = NULL; - IMediaSample *sample; - GstMapInfo info; - - TRACE("%p %p\n", pad, buf); - - if (This->initial) { - gst_buffer_unref(buf); - return GST_FLOW_OK; - } - hr = BaseOutputPinImpl_GetDeliveryBuffer(&pin->pin, &sample, NULL, NULL, 0); - - if (hr == VFW_E_NOT_CONNECTED) { - gst_buffer_unref(buf); - return GST_FLOW_NOT_LINKED; - } - - if (FAILED(hr)) { - gst_buffer_unref(buf); - ERR("Could not get a delivery buffer (%x), returning GST_FLOW_FLUSHING\n", hr); - return GST_FLOW_FLUSHING; - } - - gst_buffer_map(buf, &info, GST_MAP_READ); - - hr = IMediaSample_SetActualDataLength(sample, info.size); + hr = IMediaSample_SetActualDataLength(sample, info->size); if(FAILED(hr)){ - IMediaSample_Release(sample); - gst_buffer_unmap(buf, &info); - gst_buffer_unref(buf); WARN("SetActualDataLength failed: %08x\n", hr); - return GST_FLOW_FLUSHING; + return hr; } IMediaSample_GetPointer(sample, &ptr); - memcpy(ptr, info.data, info.size); - - gst_buffer_unmap(buf, &info); + memcpy(ptr, info->data, info->size); if (GST_BUFFER_PTS_IS_VALID(buf)) { REFERENCE_TIME rtStart = gst_segment_to_running_time(pin->segment, GST_FORMAT_TIME, buf->pts); @@ -874,8 +843,43 @@ static GstFlowReturn got_data_sink(GstPad *pad, GstObject *parent, GstBuffer *bu TRACE("sending sample returned: %08x\n", hr); + return hr; +} + +static GstFlowReturn got_data_sink(GstPad *pad, GstObject *parent, GstBuffer *buf) +{ + struct gstdemux_source *pin = gst_pad_get_element_private(pad); + struct gstdemux *This = impl_from_strmbase_filter(pin->pin.pin.filter); + HRESULT hr; + IMediaSample *sample; + GstMapInfo info; + + TRACE("%p %p\n", pad, buf); + + if (This->initial) { + gst_buffer_unref(buf); + return GST_FLOW_OK; + } + + hr = BaseOutputPinImpl_GetDeliveryBuffer(&pin->pin, &sample, NULL, NULL, 0); + + if (FAILED(hr)) + { + if (hr != VFW_E_NOT_CONNECTED) + ERR("Could not get a delivery buffer (%x), returning GST_FLOW_FLUSHING\n", hr); + } + else + { + gst_buffer_map(buf, &info, GST_MAP_READ); + + hr = send_sample(pin, sample, buf, &info); + + gst_buffer_unmap(buf, &info); + + IMediaSample_Release(sample); + } + gst_buffer_unref(buf); - IMediaSample_Release(sample); if (hr == VFW_E_NOT_CONNECTED) return GST_FLOW_NOT_LINKED;

1 0

Francois Gouget : testbot: Update the $MaxVMErrors description.
by Alexandre Julliard 05 Jan '21

05 Jan '21

Module: tools Branch: master Commit: 30dee3956f0397eb428708d7bf6beb6d8cb05346 URL: https://source.winehq.org/git/tools.git/?a=commit;h=30dee3956f0397eb428708d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jan 5 11:29:53 2021 +0100 testbot: Update the $MaxVMErrors description. We no longer put the VM in maintenance mode because that means only the administrator can put it back online. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Config.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index ea08aa0..ca3e983 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -102,7 +102,8 @@ $SleepAfterRevert = 0; # for reverts this should take into account the time it may need to boot. $VMToolTimeout = 6 * 60; -# After three consecutive failures to revert a VM, put it in maintenance mode. +# Notify the administrator that a VM probably needs manual fixing after +# $MaxVMErrors consecutive revert errors. $MaxVMErrors = 3; # How many times to run a test that fails before giving up.

1 0

Francois Gouget : transl: Fix the spelling of a comment.
by Alexandre Julliard 05 Jan '21

05 Jan '21

Module: tools Branch: master Commit: 1ded4f6ec67a9879e20b34eb87eac6cd443f9a97 URL: https://source.winehq.org/git/tools.git/?a=commit;h=1ded4f6ec67a9879e20b34e… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 5 11:28:58 2021 +0100 transl: Fix the spelling of a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- transl/lib_res.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/transl/lib_res.php b/transl/lib_res.php index fe64354..52889fc 100644 --- a/transl/lib_res.php +++ b/transl/lib_res.php @@ -70,7 +70,7 @@ function get_stringorid_asascii($data, &$pos) return $ret; } -/* same as get_stringorid, but uses 0xff00 as the marker of an oridinal */ +/* same as get_stringorid, but uses 0xff00 as the marker of an ordinal */ function get_stringorid($data, &$pos, $magic = 0xffff) { $len = strlen($data);

1 0

Francois Gouget : winetest: Fix the spelling of a comment.
by Alexandre Julliard 05 Jan '21

05 Jan '21

Module: tools Branch: master Commit: 2267d2dfc52f25c7b108f05783f9370063f35209 URL: https://source.winehq.org/git/tools.git/?a=commit;h=2267d2dfc52f25c7b108f05… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 5 11:28:36 2021 +0100 winetest: Fix the spelling of a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/tests/winehq_snapshot/index_files/utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winetest/tests/winehq_snapshot/index_files/utils.js b/winetest/tests/winehq_snapshot/index_files/utils.js index 1d20f17..6cc4237 100644 --- a/winetest/tests/winehq_snapshot/index_files/utils.js +++ b/winetest/tests/winehq_snapshot/index_files/utils.js @@ -1,5 +1,5 @@ /* - Misc JavaScipt for WineHQ + Misc JavaScript for WineHQ */ /*

1 0

Jacek Caban : jscript/tests: Silence noisy debug trace.
by Alexandre Julliard 04 Jan '21

04 Jan '21

Module: wine Branch: master Commit: 221fdb09b4c20da45e9834aa0cae27dcc75ea27b URL: https://source.winehq.org/git/wine.git/?a=commit;h=221fdb09b4c20da45e9834aa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 4 21:35:33 2021 +0100 jscript/tests: Silence noisy debug trace. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/tests/api.js | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 9c9d3fa56f9..da0ad1e1ebc 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -2521,7 +2521,6 @@ function testException(func, id) { } catch(e) { ret = e.name; num = e.number; - trace(e.message); } ok(ret === ex.type, "Exception test, ret = " + ret + ", expected " + ex.type +". Executed function: " + func.toString());

1 0

Jacek Caban : conhost: Fix wrapping search in edit_line_find_in_history.
by Alexandre Julliard 04 Jan '21

04 Jan '21

Module: wine Branch: master Commit: 105db4c5381c1ab6e5a2542b6aa7d7a2f1bdaf81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=105db4c5381c1ab6e5a2542b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 4 21:13:50 2021 +0100 conhost: Fix wrapping search in edit_line_find_in_history. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50000 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 3e41577a44b..0ac1c5f507b 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -691,6 +691,7 @@ static void edit_line_find_in_history( struct console *console ) unsigned int len, oldoffset; WCHAR *line; + if (!console->history_index) return; if (ctx->history_index && ctx->history_index == console->history_index) { start_pos--; @@ -699,28 +700,28 @@ static void edit_line_find_in_history( struct console *console ) do { - line = edit_line_history(console, ctx->history_index); - - if (ctx->history_index) ctx->history_index--; - else ctx->history_index = console->history_index; - - len = lstrlenW(line) + 1; - if (len >= ctx->cursor && !memcmp( ctx->buf, line, ctx->cursor * sizeof(WCHAR) )) - { - /* need to clean also the screen if new string is shorter than old one */ - edit_line_delete(console, 0, ctx->len); - - if (edit_line_grow(console, len)) - { - oldoffset = ctx->cursor; - ctx->cursor = 0; - edit_line_insert( console, line, len - 1 ); - ctx->cursor = oldoffset; - free(line); - return; - } - } - free(line); + line = edit_line_history(console, ctx->history_index); + + if (ctx->history_index) ctx->history_index--; + else ctx->history_index = console->history_index - 1; + + len = lstrlenW(line) + 1; + if (len >= ctx->cursor && !memcmp( ctx->buf, line, ctx->cursor * sizeof(WCHAR) )) + { + /* need to clean also the screen if new string is shorter than old one */ + edit_line_delete(console, 0, ctx->len); + + if (edit_line_grow(console, len)) + { + oldoffset = ctx->cursor; + ctx->cursor = 0; + edit_line_insert( console, line, len - 1 ); + ctx->cursor = oldoffset; + free(line); + return; + } + } + free(line); } while (ctx->history_index != start_pos); }

1 0

Kevin Puetz : include: Check whether the ms_abi attribute is supported on aarch64.
by Alexandre Julliard 04 Jan '21

04 Jan '21

Module: wine Branch: master Commit: 849e521dbaf04ffc55b4df17d56b6e09dfa23252 URL: https://source.winehq.org/git/wine.git/?a=commit;h=849e521dbaf04ffc55b4df17… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Mon Jan 4 11:19:39 2021 -0600 include: Check whether the ms_abi attribute is supported on aarch64. Updated to maintain sync with dac1e16dd4edc8404c59dc63ae708cd8bb50a38a. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/debug.h | 2 +- include/wine/test.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wine/debug.h b/include/wine/debug.h index e064aaefb8e..2255f62e502 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -157,7 +157,7 @@ extern int __cdecl __wine_dbg_header( enum __wine_debug_class cls, struct __wine quotes. The string will be valid for some time, but not indefinitely as strings are re-used. */ -#if (defined(__x86_64__) || defined(__aarch64__)) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT) +#if (defined(__x86_64__) || (defined(__aarch64__) && __has_attribute(ms_abi))) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT) # define __wine_dbg_cdecl __cdecl # define __wine_dbg_va_list __builtin_ms_va_list # define __wine_dbg_va_start(list,arg) __builtin_ms_va_start(list,arg) diff --git a/include/wine/test.h b/include/wine/test.h index 38c8922458e..787fea0ba24 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -78,7 +78,7 @@ extern void winetest_wait_child_process( HANDLE process ); #define START_TEST(name) void func_##name(void) #endif -#if (defined(__x86_64__) || defined(__aarch64__)) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT) +#if (defined(__x86_64__) || (defined(__aarch64__) && __has_attribute(ms_abi))) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT) #define __winetest_cdecl __cdecl #define __winetest_va_list __builtin_ms_va_list #else

1 0

Zebediah Figura : wined3d: Use debug_d3dusage() for both usage and usage query flags.
by Alexandre Julliard 04 Jan '21

04 Jan '21

Module: wine Branch: master Commit: 9cbe2735586965c2bf08e4a11e9c2e32daccfe48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9cbe2735586965c2bf08e4a1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Dec 25 10:41:19 2020 -0600 wined3d: Use debug_d3dusage() for both usage and usage query flags. Avoid spurious FIXME messages in wined3d_check_device_format(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 4 ++-- dlls/wined3d/utils.c | 29 ++++++++--------------------- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 10 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d35108710c2..2764b113065 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1692,10 +1692,10 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, DWORD format_flags = 0; DWORD allowed_usage; - TRACE("wined3d %p, adapter %p, device_type %s, adapter_format %s, usage %s, %s, " + TRACE("wined3d %p, adapter %p, device_type %s, adapter_format %s, usage %s, " "bind_flags %s, resource_type %s, check_format %s.\n", wined3d, adapter, debug_d3ddevicetype(device_type), debug_d3dformat(adapter_format_id), - debug_d3dusage(usage), debug_d3dusagequery(usage), wined3d_debug_bind_flags(bind_flags), + debug_d3dusage(usage), wined3d_debug_bind_flags(bind_flags), debug_d3dresourcetype(resource_type), debug_d3dformat(check_format_id)); adapter_format = wined3d_get_format(adapter, adapter_format_id, WINED3D_BIND_RENDER_TARGET); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 88175d4bf26..4ec6e4db42d 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4710,6 +4710,14 @@ const char *debug_d3dusage(DWORD usage) WINED3DUSAGE_TO_STR(WINED3DUSAGE_OWNDC); WINED3DUSAGE_TO_STR(WINED3DUSAGE_STATICDECL); WINED3DUSAGE_TO_STR(WINED3DUSAGE_OVERLAY); + WINED3DUSAGE_TO_STR(WINED3DUSAGE_QUERY_FILTER); + WINED3DUSAGE_TO_STR(WINED3DUSAGE_QUERY_GENMIPMAP); + WINED3DUSAGE_TO_STR(WINED3DUSAGE_QUERY_LEGACYBUMPMAP); + WINED3DUSAGE_TO_STR(WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING); + WINED3DUSAGE_TO_STR(WINED3DUSAGE_QUERY_SRGBREAD); + WINED3DUSAGE_TO_STR(WINED3DUSAGE_QUERY_SRGBWRITE); + WINED3DUSAGE_TO_STR(WINED3DUSAGE_QUERY_VERTEXTEXTURE); + WINED3DUSAGE_TO_STR(WINED3DUSAGE_QUERY_WRAPANDMIP); #undef WINED3DUSAGE_TO_STR if (usage) FIXME("Unrecognized usage flag(s) %#x.\n", usage); @@ -4717,27 +4725,6 @@ const char *debug_d3dusage(DWORD usage) return wine_dbg_sprintf("%s", buffer.str); } -const char *debug_d3dusagequery(DWORD usage) -{ - struct debug_buffer buffer; - - init_debug_buffer(&buffer, "0"); -#define WINED3DUSAGEQUERY_TO_STR(x) if (usage & x) { debug_append(&buffer, #x, " | "); usage &= ~x; } - WINED3DUSAGEQUERY_TO_STR(WINED3DUSAGE_QUERY_FILTER); - WINED3DUSAGEQUERY_TO_STR(WINED3DUSAGE_QUERY_GENMIPMAP); - WINED3DUSAGEQUERY_TO_STR(WINED3DUSAGE_QUERY_LEGACYBUMPMAP); - WINED3DUSAGEQUERY_TO_STR(WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING); - WINED3DUSAGEQUERY_TO_STR(WINED3DUSAGE_QUERY_SRGBREAD); - WINED3DUSAGEQUERY_TO_STR(WINED3DUSAGE_QUERY_SRGBWRITE); - WINED3DUSAGEQUERY_TO_STR(WINED3DUSAGE_QUERY_VERTEXTEXTURE); - WINED3DUSAGEQUERY_TO_STR(WINED3DUSAGE_QUERY_WRAPANDMIP); -#undef WINED3DUSAGEQUERY_TO_STR - if (usage) - FIXME("Unrecognized usage query flag(s) %#x.\n", usage); - - return wine_dbg_sprintf("%s", buffer.str); -} - const char *debug_d3ddeclmethod(enum wined3d_decl_method method) { switch (method) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0749f95f998..bd848f61e32 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5273,7 +5273,6 @@ const char *debug_d3dformat(enum wined3d_format_id format_id) DECLSPEC_HIDDEN; const char *debug_d3ddevicetype(enum wined3d_device_type device_type) DECLSPEC_HIDDEN; const char *debug_d3dresourcetype(enum wined3d_resource_type resource_type) DECLSPEC_HIDDEN; const char *debug_d3dusage(DWORD usage) DECLSPEC_HIDDEN; -const char *debug_d3dusagequery(DWORD usagequery) DECLSPEC_HIDDEN; const char *debug_d3ddeclmethod(enum wined3d_decl_method method) DECLSPEC_HIDDEN; const char *debug_d3ddeclusage(enum wined3d_decl_usage usage) DECLSPEC_HIDDEN; const char *debug_d3dinput_classification(enum wined3d_input_classification classification) DECLSPEC_HIDDEN;

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2021