- Wine-Devel - list.winehq.org

[PATCH vkd3d 1/5] vkd3d-shader: Partially implement #define.
by Zebediah Figura Jan. 7, 2021

Jan. 7, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- Makefile.am | 1 + libs/vkd3d-shader/preproc.h | 9 ++++ libs/vkd3d-shader/preproc.l | 24 ++++++++-- libs/vkd3d-shader/preproc.y | 60 +++++++++++++++++++++++- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + tests/hlsl_d3d12.c | 2 +- 6 files changed, 92 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index 514f0506..bf1d7bfa 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 effcd995..1cb3d5d7 100644 --- a/libs/vkd3d-shader/preproc.h +++ b/libs/vkd3d-shader/preproc.h @@ -23,6 +23,12 @@ #include "vkd3d_shader_private.h" +struct preproc_macro +{ + struct list entry; + char *name; +}; + struct preproc_if_state { /* Are we currently in a "true" block? */ @@ -41,6 +47,8 @@ struct preproc_ctx struct vkd3d_string_buffer buffer; struct vkd3d_shader_location location; + struct list macros; + struct preproc_if_state *if_stack; size_t if_count, if_stack_size; @@ -52,6 +60,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 47ad1f13..2484e107 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); @@ -221,11 +235,13 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) int preproc_lexer_parse(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, struct vkd3d_shader_message_context *message_context) { + struct preproc_macro *macro, *next; struct preproc_ctx ctx = {0}; YY_BUFFER_STATE top_buffer; void *output_code; vkd3d_string_buffer_init(&ctx.buffer); + list_init(&ctx.macros); ctx.message_context = message_context; ctx.location.source_name = compile_info->source_name; ctx.location.line = 1; @@ -248,6 +264,8 @@ int preproc_lexer_parse(const struct vkd3d_shader_compile_info *compile_info, } vkd3d_free(ctx.if_stack); + LIST_FOR_EACH_ENTRY_SAFE(macro, next, &ctx.macros, struct preproc_macro, entry) + preproc_free_macro(macro); if (ctx.error) { diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index 647bb45d..e608c5d8 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -66,6 +66,44 @@ 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 preproc_macro *macro; + + LIST_FOR_EACH_ENTRY(macro, &ctx->macros, struct preproc_macro, entry) + { + if (!strcmp(macro->name, name)) + return macro; + } + return NULL; +} + +static bool preproc_add_macro(struct preproc_ctx *ctx, const struct vkd3d_shader_location *loc, char *name) +{ + struct preproc_macro *macro; + + if ((macro = preproc_find_macro(ctx, name))) + { + preproc_warning(ctx, loc, VKD3D_SHADER_WARNING_PP_ALREADY_DEFINED, "Redefinition of %s.", name); + preproc_free_macro(macro); + } + + TRACE("Defining new macro %s.\n", debugstr_a(name)); + + if (!(macro = vkd3d_malloc(sizeof(*macro)))) + return false; + macro->name = name; + list_add_tail(&ctx->macros, &macro->entry); + return true; +} + +void preproc_free_macro(struct preproc_macro *macro) +{ + list_remove(&macro->entry); + vkd3d_free(macro->name); + vkd3d_free(macro); +} + static bool preproc_was_writing(struct preproc_ctx *ctx) { if (ctx->if_count < 2) @@ -135,17 +173,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 +197,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 b89d20e2..1011be27 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 77a7ea1a..38c1ab2c 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)) -- 2.30.0

4 15

[PATCH 1/2] ntdll: Set the process detaching flag before calling FLS callbacks.
by Zebediah Figura Jan. 7, 2021

Jan. 7, 2021

So that we will not deadlock trying to acquire fls_section. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- This fixes a hang that can be triggered by running dotnet45, which prevents some processes from exiting (i.e. bug 49897). Unfortunately it's not enough to fix the bug alone. I was unable to debug the remaining hang. 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 45ad496fd64..5e9a76b8be1 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(); } -- 2.29.2

1 1

[PATCH] msvcrt: Improve memmove performance on i386 and x86_64 architectures.
by Piotr Caban Jan. 7, 2021

Jan. 7, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49663 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- This implementation is still a little slower than native for small buffers. We will probably need to use jump tables to get similar speed. It also affects bug https://bugs.winehq.org/show_bug.cgi?id=49633 but the application changed since it was reported. I'm not sure how long the code-freeze will be. It might be to late for this change. dlls/msvcrt/math.c | 2 +- dlls/msvcrt/msvcrt.h | 2 + dlls/msvcrt/string.c | 264 ++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 266 insertions(+), 2 deletions(-)

1 0

[PATCH] d3d9/tests: Don't test functions directly when reporting GetLastError() (try 2)
by André Hentschel Jan. 7, 2021

Jan. 7, 2021

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- 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)); -- 2.25.1

2 1

[PATCH] user32: Make text warp on display.
by 崔家金 Jan. 6, 2021

Jan. 6, 2021

1 0

[PATCH 1/3] user32/tests: Add some tests for WM_CANCELMODE.
by Zebediah Figura Jan. 6, 2021

Jan. 6, 2021

In particular, test sending WM_CANCELMODE to a parent of the capture window. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- 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); -- 2.29.2

3 4

[PATCH] winex11.drv: Make Update _NET_WM_STATE before replaces the size hints for the WM_NORMAL_HINTS property.
by Jiajin Cui Jan. 6, 2021

Jan. 6, 2021

3 2

[PATCH] user32: Previous Windows versions support WS_EX_LAYERED only for top-level windows.
by Jiajin Cui Jan. 6, 2021

Jan. 6, 2021

2 1

[tools 1/2] testbot/WineReconfig: Do not prepare wineprefixes in advance.
by Francois Gouget Jan. 6, 2021

Jan. 6, 2021

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> --- Note: WineTest already has code to create any missing wineprefix. So all this patch does is make sure none is created in advance. 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 f9f6792a5a..bd9ff5779f 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; -- 2.20.1

1 1

[PATCH 1/4] ddraw/tests: Don't test functions directly when reporting GetLastError()
by André Hentschel Jan. 6, 2021

Jan. 6, 2021

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/ddraw/tests/ddraw1.c | 28 +++++++++++++++++++--------- dlls/ddraw/tests/ddraw2.c | 28 +++++++++++++++++++--------- dlls/ddraw/tests/ddraw4.c | 28 +++++++++++++++++++--------- dlls/ddraw/tests/ddraw7.c | 28 +++++++++++++++++++--------- 4 files changed, 76 insertions(+), 36 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index e1a315f291f..df5c8ac8400 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -13964,6 +13964,7 @@ static void test_cursor_clipping(void) IDirectDraw *ddraw; HWND window; HRESULT hr; + BOOL ret; window = create_window(); ok(!!window, "Failed to create a window.\n"); @@ -13986,9 +13987,11 @@ static void test_cursor_clipping(void) goto done; } - ok(ClipCursor(NULL), "ClipCursor failed, error %#x.\n", GetLastError()); + ret = ClipCursor(NULL); + ok(ret, "ClipCursor failed, error %#x.\n", GetLastError()); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -13997,7 +14000,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -14010,7 +14014,8 @@ static void test_cursor_clipping(void) } flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -14018,7 +14023,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "RestoreDisplayMode failed, hr %#x.\n", hr); flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -14027,7 +14033,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); flush_events(); SetRect(&rect, 0, 0, param.old_width, param.old_height); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -14040,7 +14047,8 @@ static void test_cursor_clipping(void) } flush_events(); SetRect(&rect, 0, 0, param.new_width, param.new_height); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -14049,7 +14057,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "RestoreDisplayMode failed, hr %#x.\n", hr); flush_events(); SetRect(&rect, 0, 0, param.old_width, param.old_height); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -14058,7 +14067,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 849d510a349..bc915c97864 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -14925,6 +14925,7 @@ static void test_cursor_clipping(void) IDirectDraw2 *ddraw; HWND window; HRESULT hr; + BOOL ret; window = create_window(); ok(!!window, "Failed to create a window.\n"); @@ -14947,9 +14948,11 @@ static void test_cursor_clipping(void) goto done; } - ok(ClipCursor(NULL), "ClipCursor failed, error %#x.\n", GetLastError()); + ret = ClipCursor(NULL); + ok(ret, "ClipCursor failed, error %#x.\n", GetLastError()); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -14958,7 +14961,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -14971,7 +14975,8 @@ static void test_cursor_clipping(void) } flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -14979,7 +14984,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "RestoreDisplayMode failed, hr %#x.\n", hr); flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -14988,7 +14994,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); flush_events(); SetRect(&rect, 0, 0, param.old_width, param.old_height); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -15001,7 +15008,8 @@ static void test_cursor_clipping(void) } flush_events(); SetRect(&rect, 0, 0, param.new_width, param.new_height); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -15010,7 +15018,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "RestoreDisplayMode failed, hr %#x.\n", hr); flush_events(); SetRect(&rect, 0, 0, param.old_width, param.old_height); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -15019,7 +15028,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 56a4777add5..f009b4583f4 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -17985,6 +17985,7 @@ static void test_cursor_clipping(void) IDirectDraw4 *ddraw; HWND window; HRESULT hr; + BOOL ret; window = create_window(); ok(!!window, "Failed to create a window.\n"); @@ -18007,9 +18008,11 @@ static void test_cursor_clipping(void) goto done; } - ok(ClipCursor(NULL), "ClipCursor failed, error %#x.\n", GetLastError()); + ret = ClipCursor(NULL); + ok(ret, "ClipCursor failed, error %#x.\n", GetLastError()); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -18018,7 +18021,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -18031,7 +18035,8 @@ static void test_cursor_clipping(void) } flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -18039,7 +18044,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "RestoreDisplayMode failed, hr %#x.\n", hr); flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -18048,7 +18054,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); flush_events(); SetRect(&rect, 0, 0, param.old_width, param.old_height); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -18061,7 +18068,8 @@ static void test_cursor_clipping(void) } flush_events(); SetRect(&rect, 0, 0, param.new_width, param.new_height); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -18070,7 +18078,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "RestoreDisplayMode failed, hr %#x.\n", hr); flush_events(); SetRect(&rect, 0, 0, param.old_width, param.old_height); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -18079,7 +18088,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index c9ba50287be..613f8dae98b 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -18247,6 +18247,7 @@ static void test_cursor_clipping(void) IDirectDraw7 *ddraw; HWND window; HRESULT hr; + BOOL ret; window = create_window(); ok(!!window, "Failed to create a window.\n"); @@ -18269,9 +18270,11 @@ static void test_cursor_clipping(void) goto done; } - ok(ClipCursor(NULL), "ClipCursor failed, error %#x.\n", GetLastError()); + ret = ClipCursor(NULL); + ok(ret, "ClipCursor failed, error %#x.\n", GetLastError()); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -18280,7 +18283,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -18293,7 +18297,8 @@ static void test_cursor_clipping(void) } flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -18301,7 +18306,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "RestoreDisplayMode failed, hr %#x.\n", hr); flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -18310,7 +18316,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); flush_events(); SetRect(&rect, 0, 0, param.old_width, param.old_height); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -18323,7 +18330,8 @@ static void test_cursor_clipping(void) } flush_events(); SetRect(&rect, 0, 0, param.new_width, param.new_height); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -18332,7 +18340,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "RestoreDisplayMode failed, hr %#x.\n", hr); flush_events(); SetRect(&rect, 0, 0, param.old_width, param.old_height); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -18341,7 +18350,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); -- 2.25.1

4 12