ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-08-27 03:43:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

[NTUSER] Fix IntDefWindowProc()'s WM_MOUSEACTIVATE case (#7038)

Browse Source 
CORE-17545

Clang 13.0.1 was warning about broken 'Ret' handling.
Also remove an unrelated redundant 'else ...'.

Addendum to commit 6dfa71c487 (r68904).
This commit is contained in:
Serge Gautherie
2024-07-18 20:35:04 +02:00
committed by Hermès Bélusca-Maïto
parent 5385f32794
commit c6298321a3
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
win32ss/user/ntuser/defwnd.c
+6 -4
View File
@@ -566,7 +566,6 @@ IntDefWindowProc(
lResult = (LRESULT) (Wnd->strName.Length / sizeof(WCHAR));
}
}
else lResult = 0L;
break;
}
@@ -1038,12 +1037,15 @@ IntDefWindowProc(
case WM_MOUSEACTIVATE:
if (Wnd->style & WS_CHILD)
{
LONG Ret;
HWND hwndParent;
PWND pwndParent = IntGetParent(Wnd);
hwndParent = pwndParent ? UserHMGetHandle(pwndParent) : NULL;
if (hwndParent) Ret = co_IntSendMessage(hwndParent, WM_MOUSEACTIVATE, wParam, lParam);
if (Ret) return (Ret);
if (hwndParent)
{
lResult = co_IntSendMessage(hwndParent, WM_MOUSEACTIVATE, wParam, lParam);
if (lResult)
break;
}
}
return ( (HIWORD(lParam) == WM_LBUTTONDOWN && LOWORD(lParam) == HTCAPTION) ? MA_NOACTIVATE : MA_ACTIVATE );