From 95e5877027c56498b99ad629883066ab896a31b6 Mon Sep 17 00:00:00 2001 From: Serge Gautherie <32623169+SergeGautherie@users.noreply.github.com> Date: Mon, 1 Jun 2020 11:14:38 +0200 Subject: [PATCH] [USER32] MDIClientWndProc_common(): Properly sync to old Wine (#2843) No impact. Missed part of https://source.winehq.org/git/wine.git/commit/fb6304119a967ea13688ff9e34ed9d819bd50785 Detected by Cppcheck: identicalInnerCondition. Addendum to 303ece24219da7ec0cac1016767092287abd7877 (r72520). --- win32ss/user/user32/windows/mdi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/win32ss/user/user32/windows/mdi.c b/win32ss/user/user32/windows/mdi.c index 5d9d8bd6ff3..c93e541b463 100644 --- a/win32ss/user/user32/windows/mdi.c +++ b/win32ss/user/user32/windows/mdi.c @@ -1106,18 +1106,18 @@ LRESULT WINAPI MDIClientWndProc_common( HWND hwnd, UINT message, WPARAM wParam, if (!(ci = get_client_info( hwnd ))) { +#ifdef __REACTOS__ if (message == WM_NCCREATE) { -#ifdef __REACTOS__ if (!(ci = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ci)))) return FALSE; SetWindowLongPtrW( hwnd, GWLP_MDIWND, (LONG_PTR)ci ); ci->hBmpClose = 0; NtUserSetWindowFNID( hwnd, FNID_MDICLIENT); // wine uses WIN_ISMDICLIENT -#else - if (message == WM_NCCREATE) win_set_flags( hwnd, WIN_ISMDICLIENT, 0 ); -#endif } +#else + if (message == WM_NCCREATE) win_set_flags( hwnd, WIN_ISMDICLIENT, 0 ); +#endif return unicode ? DefWindowProcW( hwnd, message, wParam, lParam ) : DefWindowProcA( hwnd, message, wParam, lParam ); }