July 2023 - Wine-commits - list.winehq.org

Zebediah Figura : vkd3d-shader/hlsl: Return a hlsl_block from the "selection_statement" rule.
by Alexandre Julliard 05 Jul '23

05 Jul '23

Module: vkd3d Branch: master Commit: e4bf5933b97207f16ad377c0c7a04ef3b0b100f5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e4bf5933b97207f16ad377c0c7a04… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 14 19:12:54 2022 -0600 vkd3d-shader/hlsl: Return a hlsl_block from the "selection_statement" rule. --- libs/vkd3d-shader/hlsl.y | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index a2f2f373..bf72117a 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -4576,7 +4576,6 @@ static void validate_texture_format_type(struct hlsl_ctx *ctx, struct hlsl_type %type <list> postfix_expr %type <list> primary_expr %type <list> relational_expr -%type <list> selection_statement %type <list> shift_expr %type <list> struct_declaration_without_vars %type <list> type_specs @@ -4600,6 +4599,7 @@ static void validate_texture_format_type(struct hlsl_ctx *ctx, struct hlsl_type %type <block> compound_statement %type <block> loop_statement +%type <block> selection_statement %type <block> statement %type <block> statement_list @@ -5929,9 +5929,6 @@ statement: $$ = list_to_block($1); } | selection_statement - { - $$ = list_to_block($1); - } | loop_statement jump_statement: @@ -5987,8 +5984,8 @@ selection_statement: "if condition type %s is not scalar.", string->buffer); hlsl_release_string_buffer(ctx, string); } - $$ = $3; - list_add_tail($$, &instr->entry); + $$ = list_to_block($3); + hlsl_block_add_instr($$, instr); } if_body:

1 0

Zebediah Figura : vkd3d-shader/hlsl: Return a hlsl_block from the "jump_statement" rule.
by Alexandre Julliard 05 Jul '23

05 Jul '23

Module: vkd3d Branch: master Commit: 07ce71158300497eb6db5d27cb938cfbd0cb6597 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/07ce71158300497eb6db5d27cb938… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 14 19:16:14 2022 -0600 vkd3d-shader/hlsl: Return a hlsl_block from the "jump_statement" rule. --- libs/vkd3d-shader/hlsl.y | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index bf72117a..00179664 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -138,6 +138,11 @@ static struct hlsl_ir_node *node_from_list(struct list *list) return LIST_ENTRY(list_tail(list), struct hlsl_ir_node, entry); } +static struct hlsl_ir_node *node_from_block(struct hlsl_block *block) +{ + return LIST_ENTRY(list_tail(&block->instrs), struct hlsl_ir_node, entry); +} + static struct list *block_to_list(struct hlsl_block *block) { /* This is a temporary hack to ease the transition from lists to blocks. @@ -652,7 +657,7 @@ static struct hlsl_ir_node *get_swizzle(struct hlsl_ctx *ctx, struct hlsl_ir_nod return NULL; } -static bool add_return(struct hlsl_ctx *ctx, struct list *instrs, +static bool add_return(struct hlsl_ctx *ctx, struct hlsl_block *block, struct hlsl_ir_node *return_value, const struct vkd3d_shader_location *loc) { struct hlsl_type *return_type = ctx->cur_function->return_type; @@ -664,7 +669,7 @@ static bool add_return(struct hlsl_ctx *ctx, struct list *instrs, { struct hlsl_ir_node *store; - if (!(return_value = add_implicit_conversion(ctx, instrs, return_value, return_type, loc))) + if (!(return_value = add_implicit_conversion(ctx, block_to_list(block), return_value, return_type, loc))) return false; if (!(store = hlsl_new_simple_store(ctx, ctx->cur_function->return_var, return_value))) @@ -685,7 +690,7 @@ static bool add_return(struct hlsl_ctx *ctx, struct list *instrs, if (!(jump = hlsl_new_jump(ctx, HLSL_IR_JUMP_RETURN, NULL, loc))) return false; - list_add_tail(instrs, &jump->entry); + hlsl_block_add_instr(block, jump); return true; } @@ -4569,7 +4574,6 @@ static void validate_texture_format_type(struct hlsl_ctx *ctx, struct hlsl_type %type <list> expr_optional %type <list> expr_statement %type <list> initializer_expr -%type <list> jump_statement %type <list> logicand_expr %type <list> logicor_expr %type <list> mul_expr @@ -4598,6 +4602,7 @@ static void validate_texture_format_type(struct hlsl_ctx *ctx, struct hlsl_type %type <attr_list> attribute_list_optional %type <block> compound_statement +%type <block> jump_statement %type <block> loop_statement %type <block> selection_statement %type <block> statement @@ -5925,22 +5930,19 @@ statement: } | compound_statement | jump_statement - { - $$ = list_to_block($1); - } | selection_statement | loop_statement jump_statement: KW_RETURN expr ';' { - if (!add_return(ctx, $2, node_from_list($2), &@1)) + $$ = list_to_block($2); + if (!add_return(ctx, $$, node_from_block($$), &@1)) YYABORT; - $$ = $2; } | KW_RETURN ';' { - if (!($$ = make_empty_list(ctx))) + if (!($$ = make_empty_block(ctx))) YYABORT; if (!add_return(ctx, $$, NULL, &@1)) YYABORT; @@ -5949,16 +5951,16 @@ jump_statement: { struct hlsl_ir_node *discard, *c; - if (!($$ = make_empty_list(ctx))) + if (!($$ = make_empty_block(ctx))) YYABORT; if (!(c = hlsl_new_uint_constant(ctx, ~0u, &@1))) return false; - list_add_tail($$, &c->entry); + hlsl_block_add_instr($$, c); if (!(discard = hlsl_new_jump(ctx, HLSL_IR_JUMP_DISCARD_NZ, c, &@1))) return false; - list_add_tail($$, &discard->entry); + hlsl_block_add_instr($$, discard); } selection_statement:

1 0

Zebediah Figura : vkd3d-shader/hlsl: Return a hlsl_block from the "expr_statement" and "expr" rules.
by Alexandre Julliard 05 Jul '23

05 Jul '23

Module: vkd3d Branch: master Commit: b0ac77b44d4f49c7ebfafa0b346eeb0deb6e0156 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b0ac77b44d4f49c7ebfafa0b346ee… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 14 19:51:02 2022 -0600 vkd3d-shader/hlsl: Return a hlsl_block from the "expr_statement" and "expr" rules. --- libs/vkd3d-shader/hlsl.y | 83 +++++++++++++++++++++++------------------------- 1 file changed, 39 insertions(+), 44 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 00179664..a888ec76 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -442,19 +442,19 @@ static DWORD add_modifiers(struct hlsl_ctx *ctx, DWORD modifiers, DWORD mod, return modifiers | mod; } -static bool append_conditional_break(struct hlsl_ctx *ctx, struct list *cond_list) +static bool append_conditional_break(struct hlsl_ctx *ctx, struct hlsl_block *cond_block) { struct hlsl_ir_node *condition, *not, *iff, *jump; struct hlsl_block then_block; /* E.g. "for (i = 0; ; ++i)". */ - if (list_empty(cond_list)) + if (list_empty(&cond_block->instrs)) return true; - condition = node_from_list(cond_list); + condition = node_from_block(cond_block); if (!(not = hlsl_new_unary_expr(ctx, HLSL_OP1_LOGIC_NOT, condition, &condition->loc))) return false; - list_add_tail(cond_list, &not->entry); + hlsl_block_add_instr(cond_block, not); hlsl_block_init(&then_block); @@ -464,7 +464,7 @@ static bool append_conditional_break(struct hlsl_ctx *ctx, struct list *cond_lis if (!(iff = hlsl_new_if(ctx, not, &then_block, NULL, &condition->loc))) return false; - list_add_tail(cond_list, &iff->entry); + hlsl_block_add_instr(cond_block, iff); return true; } @@ -492,8 +492,8 @@ static bool attribute_list_has_duplicates(const struct parse_attribute_list *att } static struct hlsl_block *create_loop(struct hlsl_ctx *ctx, enum loop_type type, - const struct parse_attribute_list *attributes, struct list *init, struct list *cond, - struct list *iter, struct hlsl_block *body, const struct vkd3d_shader_location *loc) + const struct parse_attribute_list *attributes, struct hlsl_block *init, struct hlsl_block *cond, + struct hlsl_block *iter, struct hlsl_block *body, const struct vkd3d_shader_location *loc) { struct hlsl_ir_node *loop; unsigned int i; @@ -528,32 +528,32 @@ static struct hlsl_block *create_loop(struct hlsl_ctx *ctx, enum loop_type type, } } - if (!init && !(init = make_empty_list(ctx))) + if (!init && !(init = make_empty_block(ctx))) goto oom; if (!append_conditional_break(ctx, cond)) goto oom; if (iter) - list_move_tail(&body->instrs, iter); + hlsl_block_add_block(body, iter); if (type == LOOP_DO_WHILE) - list_move_tail(&body->instrs, cond); + list_move_tail(&body->instrs, &cond->instrs); else - list_move_head(&body->instrs, cond); + list_move_head(&body->instrs, &cond->instrs); if (!(loop = hlsl_new_loop(ctx, body, loc))) goto oom; - list_add_tail(init, &loop->entry); + hlsl_block_add_instr(init, loop); - vkd3d_free(cond); + destroy_block(cond); destroy_block(body); - return list_to_block(init); + return init; oom: - destroy_instr_list(init); - destroy_instr_list(cond); - destroy_instr_list(iter); + destroy_block(init); + destroy_block(cond); + destroy_block(iter); destroy_block(body); return NULL; } @@ -4570,9 +4570,6 @@ static void validate_texture_format_type(struct hlsl_ctx *ctx, struct hlsl_type %type <list> declaration %type <list> declaration_statement %type <list> equality_expr -%type <list> expr -%type <list> expr_optional -%type <list> expr_statement %type <list> initializer_expr %type <list> logicand_expr %type <list> logicor_expr @@ -4602,6 +4599,9 @@ static void validate_texture_format_type(struct hlsl_ctx *ctx, struct hlsl_type %type <attr_list> attribute_list_optional %type <block> compound_statement +%type <block> expr +%type <block> expr_optional +%type <block> expr_statement %type <block> jump_statement %type <block> loop_statement %type <block> selection_statement @@ -5639,7 +5639,7 @@ state: any_identifier '=' expr ';' { vkd3d_free($1); - hlsl_free_instr_list($3); + destroy_block($3); } state_block_start: @@ -5705,17 +5705,12 @@ arrays: } | '[' expr ']' arrays { - struct hlsl_block block; uint32_t *new_array; unsigned int size; - hlsl_block_init(&block); - list_move_tail(&block.instrs, $2); - - size = evaluate_static_expression_as_uint(ctx, &block, &@2); + size = evaluate_static_expression_as_uint(ctx, $2, &@2); - hlsl_block_cleanup(&block); - vkd3d_free($2); + destroy_block($2); $$ = $4; @@ -5925,9 +5920,6 @@ statement: $$ = list_to_block($1); } | expr_statement - { - $$ = list_to_block($1); - } | compound_statement | jump_statement | selection_statement @@ -5936,7 +5928,7 @@ statement: jump_statement: KW_RETURN expr ';' { - $$ = list_to_block($2); + $$ = $2; if (!add_return(ctx, $$, node_from_block($$), &@1)) YYABORT; } @@ -5966,7 +5958,7 @@ jump_statement: selection_statement: KW_IF '(' expr ')' if_body { - struct hlsl_ir_node *condition = node_from_list($3); + struct hlsl_ir_node *condition = node_from_block($3); struct hlsl_ir_node *instr; if (!(instr = hlsl_new_if(ctx, condition, $5.then_block, $5.else_block, &@1))) @@ -5986,7 +5978,7 @@ selection_statement: "if condition type %s is not scalar.", string->buffer); hlsl_release_string_buffer(ctx, string); } - $$ = list_to_block($3); + $$ = $3; hlsl_block_add_instr($$, instr); } @@ -6018,14 +6010,14 @@ loop_statement: } | attribute_list_optional KW_FOR '(' scope_start declaration expr_statement expr_optional ')' statement { - $$ = create_loop(ctx, LOOP_FOR, &$1, $5, $6, $7, $9, &@2); + $$ = create_loop(ctx, LOOP_FOR, &$1, list_to_block($5), $6, $7, $9, &@2); hlsl_pop_scope(ctx); } expr_optional: %empty { - if (!($$ = make_empty_list(ctx))) + if (!($$ = make_empty_block(ctx))) YYABORT; } | expr @@ -6095,7 +6087,7 @@ primary_expr: } | '(' expr ')' { - $$ = $2; + $$ = block_to_list($2); } | var_identifier '(' func_arguments ')' { @@ -6189,10 +6181,10 @@ postfix_expr: } | postfix_expr '[' expr ']' { - struct hlsl_ir_node *array = node_from_list($1), *index = node_from_list($3); + struct hlsl_ir_node *array = node_from_list($1), *index = node_from_block($3); - list_move_head($1, $3); - vkd3d_free($3); + list_move_head($1, &$3->instrs); + destroy_block($3); if (!add_array_access(ctx, $1, array, index, &@2)) { @@ -6451,12 +6443,12 @@ conditional_expr: logicor_expr | logicor_expr '?' expr ':' assignment_expr { - struct hlsl_ir_node *cond = node_from_list($1), *first = node_from_list($3), *second = node_from_list($5); + struct hlsl_ir_node *cond = node_from_list($1), *first = node_from_block($3), *second = node_from_list($5); struct hlsl_type *common_type; - list_move_tail($1, $3); + list_move_tail($1, &$3->instrs); list_move_tail($1, $5); - vkd3d_free($3); + destroy_block($3); vkd3d_free($5); if (!(common_type = get_common_numeric_type(ctx, first, second, &@3))) @@ -6540,9 +6532,12 @@ assign_op: expr: assignment_expr + { + $$ = list_to_block($1); + } | expr ',' assignment_expr { $$ = $1; - list_move_tail($$, $3); + list_move_tail(&$$->instrs, $3); vkd3d_free($3); }

1 0

Zebediah Figura : vkd3d-shader/hlsl: Free the "iter" block pointer on success in create_loop().
by Alexandre Julliard 05 Jul '23

05 Jul '23

Module: vkd3d Branch: master Commit: 6e303af5192e61c8ca100dd81828a812487e759b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6e303af5192e61c8ca100dd81828a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jun 29 18:49:54 2023 -0500 vkd3d-shader/hlsl: Free the "iter" block pointer on success in create_loop(). Spotted by Giovanni Mascellani. --- libs/vkd3d-shader/hlsl.y | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index a888ec76..42fa2129 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -548,6 +548,7 @@ static struct hlsl_block *create_loop(struct hlsl_ctx *ctx, enum loop_type type, destroy_block(cond); destroy_block(body); + destroy_block(iter); return init; oom:

1 0

Jiajin Cui : shell32: Make sure wcmd has enough space to hold the string.
by Alexandre Julliard 04 Jul '23

04 Jul '23

Module: wine Branch: master Commit: eee640c93874317ab3ff62ca6afda962ac96d999 URL: https://gitlab.winehq.org/wine/wine/-/commit/eee640c93874317ab3ff62ca6afda9… Author: Jiajin Cui <cuijiajin(a)uniontech.com> Date: Wed Jun 21 17:53:52 2023 +0800 shell32: Make sure wcmd has enough space to hold the string. If the length of wszApplicationName exceeds 1024, it will cause an error when writing to the subsequent stack space after exceeding the wcmd space, Wcmd needs to be modified to dynamic allocation. Signed-off-by: Jiajin Cui <cuijiajin(a)uniontech.com> --- dlls/shell32/shlexec.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index da2b5fdc2b0..43e965ca7d5 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1764,6 +1764,14 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) TRACE("execute:%s,%s,%s\n", debugstr_w(wszApplicationName), debugstr_w(wszParameters), debugstr_w(wszDir)); lpFile = sei_tmp.lpFile; wcmd = wcmdBuffer; + len = lstrlenW(wszApplicationName) + 3; + if (sei_tmp.lpParameters[0]) + len += 1 + lstrlenW(wszParameters); + if (len > wcmdLen) + { + wcmd = heap_alloc(len * sizeof(WCHAR)); + wcmdLen = len; + } lstrcpyW(wcmd, wszApplicationName); if (sei_tmp.lpDirectory) {

1 0

Kevin Schmidt : taskmgr: Use macro for the color black too.
by Alexandre Julliard 04 Jul '23

04 Jul '23

Module: wine Branch: master Commit: 29b29eddcccaefffd7c7a714d2a2c16a92fe948a URL: https://gitlab.winehq.org/wine/wine/-/commit/29b29eddcccaefffd7c7a714d2a2c1… Author: Kevin Schmidt <kevin(a)imkx.dev> Date: Sun Jun 18 19:58:25 2023 +0200 taskmgr: Use macro for the color black too. --- programs/taskmgr/graph.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/programs/taskmgr/graph.c b/programs/taskmgr/graph.c index 4d04017e331..44522ddf307 100644 --- a/programs/taskmgr/graph.c +++ b/programs/taskmgr/graph.c @@ -32,9 +32,10 @@ #include "taskmgr.h" #include "perfdata.h" -#define BRIGHT_GREEN RGB(0, 255, 0) -#define DARK_GREEN RGB(0, 130, 0) -#define RED RGB(255, 0, 0) +#define BRIGHT_GREEN RGB(0, 255, 0) +#define DARK_GREEN RGB(0, 130, 0) +#define RED RGB(255, 0, 0) +#define BLACK RGB(0, 0, 0) WNDPROC OldGraphWndProc; @@ -69,7 +70,7 @@ static void Graph_DrawCpuUsageGraph(HDC hDC, HWND hWnd) /* * Fill it with blackness */ - FillSolidRect(hDC, &rcClient, RGB(0, 0, 0)); + FillSolidRect(hDC, &rcClient, BLACK); /* * Get the CPU usage @@ -248,7 +249,7 @@ static void Graph_DrawMemUsageGraph(HDC hDC, HWND hWnd) /* * Fill it with blackness */ - FillSolidRect(hDC, &rcClient, RGB(0, 0, 0)); + FillSolidRect(hDC, &rcClient, BLACK); /* * Get the memory usage @@ -344,7 +345,7 @@ static void Graph_DrawMemUsageHistoryGraph(HDC hDC, HWND hWnd) /* * Fill it with blackness */ - FillSolidRect(hDC, &rcClient, RGB(0, 0, 0)); + FillSolidRect(hDC, &rcClient, BLACK); /* * Draw the graph background

1 0

Alex Henrie : include: Use correct header guard name in winstring.h.
by Alexandre Julliard 04 Jul '23

04 Jul '23

Module: wine Branch: master Commit: 7e366d46b204582ece39bbd48d78be5503f4874d URL: https://gitlab.winehq.org/wine/wine/-/commit/7e366d46b204582ece39bbd48d78be… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jul 4 12:33:55 2023 -0600 include: Use correct header guard name in winstring.h. --- include/winstring.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/winstring.h b/include/winstring.h index 27c299b9470..79b284a842e 100644 --- a/include/winstring.h +++ b/include/winstring.h @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef __WINE_WINSTRING_H -#define __WINE_WINSTRING_H +#ifndef __WINSTRING_H_ +#define __WINSTRING_H_ #include <hstring.h> @@ -51,4 +51,4 @@ HRESULT WINAPI WindowsTrimStringStart(HSTRING str, HSTRING charstr, HSTRING *out } #endif -#endif /* __WINE_WINSTRING_H */ +#endif /* __WINSTRING_H_ */

1 0

Alex Henrie : include: Introduce wine_dbgstr_hstring and debugstr_hstring.
by Alexandre Julliard 04 Jul '23

04 Jul '23

Module: wine Branch: master Commit: f4a8ad89d43646a8d109da5747dfb1a92a6d8cd1 URL: https://gitlab.winehq.org/wine/wine/-/commit/f4a8ad89d43646a8d109da5747dfb1… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jul 4 12:33:55 2023 -0600 include: Introduce wine_dbgstr_hstring and debugstr_hstring. --- dlls/combase/roapi.c | 9 --------- dlls/cryptowinrt/main.c | 9 --------- dlls/cryptowinrt/private.h | 2 -- dlls/graphicscapture/main.c | 9 --------- dlls/threadpoolwinrt/main.c | 9 --------- dlls/windows.devices.bluetooth/main.c | 9 --------- dlls/windows.devices.bluetooth/private.h | 2 -- dlls/windows.devices.bluetooth/tests/bluetooth.c | 9 --------- dlls/windows.devices.enumeration/main.c | 9 --------- dlls/windows.devices.enumeration/private.h | 2 -- dlls/windows.globalization/main.c | 9 --------- dlls/windows.media.devices/main.c | 9 --------- dlls/windows.media.speech/tests/speech.c | 9 --------- dlls/windows.media/captions.c | 9 --------- dlls/windows.media/private.h | 2 -- dlls/windows.networking/main.c | 9 --------- dlls/windows.perception.stub/main.c | 9 --------- dlls/windows.system.profile.systemmanufacturers/main.c | 9 --------- dlls/windows.ui/main.c | 9 --------- dlls/wintypes/main.c | 10 ---------- include/wine/debug.h | 13 +++++++++++++ 21 files changed, 13 insertions(+), 153 deletions(-)

1 0

Matteo Bruni : d3dx9/tests: Use test message contexts in test_ID3DXFont().
by Alexandre Julliard 04 Jul '23

04 Jul '23

Module: wine Branch: master Commit: 06eede965a5980334cf175e0eda2a3a19359dd4c URL: https://gitlab.winehq.org/wine/wine/-/commit/06eede965a5980334cf175e0eda2a3… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Dec 6 03:41:14 2022 +0100 d3dx9/tests: Use test message contexts in test_ID3DXFont(). --- dlls/d3dx9_36/tests/core.c | 108 ++++++++++++++++++++++++--------------------- 1 file changed, 57 insertions(+), 51 deletions(-)

1 0

Matteo Bruni : d3dx9/tests: Get rid of unnecessary checks in test_D3DXCreateRenderToEnvMap().
by Alexandre Julliard 04 Jul '23

04 Jul '23

Module: wine Branch: master Commit: f504db74a926236edd721aae1561dc65832a5bed URL: https://gitlab.winehq.org/wine/wine/-/commit/f504db74a926236edd721aae1561dc… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Dec 6 03:42:39 2022 +0100 d3dx9/tests: Get rid of unnecessary checks in test_D3DXCreateRenderToEnvMap(). --- dlls/d3dx9_36/tests/core.c | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index 680e9e9544a..a16a94e8e09 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -1649,25 +1649,20 @@ static void test_D3DXCreateRenderToEnvMap(IDirect3DDevice9 *device) { const D3DXRTE_DESC *parameters = &tests[i].parameters; const D3DXRTE_DESC *expected = &tests[i].expected_values; + hr = D3DXCreateRenderToEnvMap(device, parameters->Size, parameters->MipLevels, parameters->Format, parameters->DepthStencil, parameters->DepthStencilFormat, &render); - ok(hr == D3D_OK, "%d: D3DXCreateRenderToEnvMap returned %#lx, expected %#lx\n", i, hr, D3D_OK); - if (SUCCEEDED(hr)) - { - hr = ID3DXRenderToEnvMap_GetDesc(render, &desc); - ok(hr == D3D_OK, "%d: GetDesc failed %#lx\n", i, hr); - if (SUCCEEDED(hr)) - { - ok(desc.Size == expected->Size, "%d: Got size %u, expected %u\n", i, desc.Size, expected->Size); - ok(desc.MipLevels == expected->MipLevels, "%d: Got miplevels %u, expected %u\n", i, desc.MipLevels, expected->MipLevels); - ok(desc.Format == expected->Format, "%d: Got format %#x, expected %#x\n", i, desc.Format, expected->Format); - ok(desc.DepthStencil == expected->DepthStencil, "%d: Got depth stencil %d, expected %d\n", - i, expected->DepthStencil, expected->DepthStencil); - ok(desc.DepthStencilFormat == expected->DepthStencilFormat, "%d: Got depth stencil format %#x, expected %#x\n", - i, expected->DepthStencilFormat, expected->DepthStencilFormat); - } - check_release((IUnknown *)render, 0); - } + ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); + hr = ID3DXRenderToEnvMap_GetDesc(render, &desc); + ok(hr == D3D_OK, "%d: GetDesc failed %#lx\n", i, hr); + ok(desc.Size == expected->Size, "%d: Got size %u, expected %u\n", i, desc.Size, expected->Size); + ok(desc.MipLevels == expected->MipLevels, "%d: Got miplevels %u, expected %u\n", i, desc.MipLevels, expected->MipLevels); + ok(desc.Format == expected->Format, "%d: Got format %#x, expected %#x\n", i, desc.Format, expected->Format); + ok(desc.DepthStencil == expected->DepthStencil, "%d: Got depth stencil %d, expected %d\n", + i, expected->DepthStencil, expected->DepthStencil); + ok(desc.DepthStencilFormat == expected->DepthStencilFormat, "%d: Got depth stencil format %#x, expected %#x\n", + i, expected->DepthStencilFormat, expected->DepthStencilFormat); + check_release((IUnknown *)render, 0); } /* check device ref count */

1 0