[PATCH 2/2] user32: DefWindowProc(WM_NCCALCSIZE) should return 0.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=37609 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/defwnd.c | 3 ++- dlls/user32/tests/win.c | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index 8cd9047f02b..1b28232b551 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -265,7 +265,8 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa } case WM_NCCALCSIZE: - return NC_HandleNCCalcSize( hwnd, wParam, (RECT *)lParam ); + NC_HandleNCCalcSize( hwnd, wParam, (RECT *)lParam ); + break; case WM_WINDOWPOSCHANGING: return WINPOS_HandleWindowPosChanging( hwnd, (WINDOWPOS *)lParam ); diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index b93839e40b5..f2a4e5028ea 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -12378,7 +12378,6 @@ todo_wine params.rgrc[0] = window_rect; ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, TRUE, (LPARAM)¶ms); -todo_wine ok(!ret, "got %08x\n", ret); ok(EqualRect(¶ms.rgrc[0], &client_rect), "got %s\n", wine_dbgstr_rect(¶ms.rgrc[0])); @@ -12390,7 +12389,6 @@ todo_wine GetWindowRect(hwnd, &window_rect); ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, FALSE, (LPARAM)&window_rect); -todo_wine ok(!ret, "got %08x\n", ret); ok(EqualRect(&window_rect, &client_rect), "got %s\n", wine_dbgstr_rect(&window_rect)); -- 2.34.1
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=104364 Your paranoid android. === w10pro64 (32 bit report) === user32: win.c:2271: Test failed: style 0x200000: expected !100 win.c:2271: Test failed: style 0x300000: expected !100 === w10pro64 (64 bit report) === user32: win.c:2271: Test failed: style 0x200000: expected !100 win.c:2271: Test failed: style 0x300000: expected !100 === w10pro64_zh_CN (64 bit report) === user32: win.c:10264: Test failed: pos = 00fa00fa win.c:10268: Test failed: pos = 00fa00fa win.c:10272: Test failed: pos = 00fa00fa === debian11 (32 bit report) === user32: win.c:12376: Test succeeded inside todo block: got 00000000 win.c:12387: Test succeeded inside todo block: got 00000000 === debian11 (32 bit Arabic:Morocco report) === user32: win.c:12376: Test succeeded inside todo block: got 00000000 win.c:12387: Test succeeded inside todo block: got 00000000 === debian11 (32 bit German report) === user32: win.c:12376: Test succeeded inside todo block: got 00000000 win.c:12387: Test succeeded inside todo block: got 00000000 === debian11 (32 bit French report) === user32: win.c:12376: Test succeeded inside todo block: got 00000000 win.c:12387: Test succeeded inside todo block: got 00000000 === debian11 (32 bit Hebrew:Israel report) === user32: win.c:12376: Test succeeded inside todo block: got 00000000 win.c:12387: Test succeeded inside todo block: got 00000000 === debian11 (32 bit Hindi:India report) === user32: win.c:12376: Test succeeded inside todo block: got 00000000 win.c:12387: Test succeeded inside todo block: got 00000000 === debian11 (32 bit Japanese:Japan report) === user32: win.c:12376: Test succeeded inside todo block: got 00000000 win.c:12387: Test succeeded inside todo block: got 00000000 === debian11 (32 bit Chinese:China report) === user32: win.c:12376: Test succeeded inside todo block: got 00000000 win.c:12387: Test succeeded inside todo block: got 00000000 === debian11 (32 bit WoW report) === user32: win.c:12376: Test succeeded inside todo block: got 00000000 win.c:12387: Test succeeded inside todo block: got 00000000 === debian11 (64 bit WoW report) === user32: win.c:12376: Test succeeded inside todo block: got 00000000 win.c:12387: Test succeeded inside todo block: got 00000000
participants (2)
-
Dmitry Timoshkov -
Marvin