From 9accb03ac780adeca210ac40e8b93ddb1e487318 Mon Sep 17 00:00:00 2001 From: James Tabor Date: Wed, 22 Feb 2017 00:01:13 +0000 Subject: [PATCH] [NtUser] - Fix : Allow controls to receive non-client messages. See CORE-12771. - See also https://bugs.winehq.org/show_bug.cgi?id=42503 . svn path=/trunk/; revision=73875 --- reactos/win32ss/user/ntuser/nonclient.c | 2 ++ reactos/win32ss/user/ntuser/window.h | 3 +++ 2 files changed, 5 insertions(+) diff --git a/reactos/win32ss/user/ntuser/nonclient.c b/reactos/win32ss/user/ntuser/nonclient.c index d28577a80ce..3ce9cff5a6e 100644 --- a/reactos/win32ss/user/ntuser/nonclient.c +++ b/reactos/win32ss/user/ntuser/nonclient.c @@ -1950,6 +1950,8 @@ GetNCHitEx(PWND pWnd, POINT pt) RECTL_vInflateRect(&rcWindow, -UserGetSystemMetrics(SM_CXDLGFRAME), -UserGetSystemMetrics(SM_CYDLGFRAME)); else if (HAS_THINFRAME( Style, ExStyle )) RECTL_vInflateRect(&rcWindow, -UserGetSystemMetrics(SM_CXBORDER), -UserGetSystemMetrics(SM_CYBORDER)); + else if (HAS_CLIENTFRAME( Style, ExStyle )) + RECTL_vInflateRect(&rcWindow, -UserGetSystemMetrics(SM_CXEDGE), -UserGetSystemMetrics(SM_CYEDGE)); if (!RECTL_bPointInRect( &rcWindow, pt.x, pt.y )) return HTBORDER; } diff --git a/reactos/win32ss/user/ntuser/window.h b/reactos/win32ss/user/ntuser/window.h index aa1b6f459e7..47f5533f14c 100644 --- a/reactos/win32ss/user/ntuser/window.h +++ b/reactos/win32ss/user/ntuser/window.h @@ -16,6 +16,9 @@ extern ATOM AtomFlashWndState; #define HAS_THINFRAME(Style, ExStyle) \ (((Style) & WS_BORDER) || (!((Style) & (WS_CHILD | WS_POPUP)))) +#define HAS_CLIENTFRAME(Style, ExStyle) \ + (((ExStyle) & WS_EX_CLIENTEDGE) || (!((Style) & (WS_CHILD | WS_POPUP)))) + #define HAS_MENU(pWnd,style) ((((style) & (WS_CHILD | WS_POPUP)) != WS_CHILD) && (pWnd->IDMenu) && IntIsMenu(UlongToHandle(pWnd->IDMenu))) #define IntIsDesktopWindow(WndObj) \ -- 2.17.1