[PATCH v3 2/3] comctl32/status: Hide size grip when the parent window is maximized.

[Waritnan Sookbuntherng]

Signed-off-by: Waritnan Sookbuntherng <lion328 at hotmail.co.th>
---
 dlls/comctl32/status.c       | 6 ++++--
 dlls/comctl32/tests/status.c | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c
index cb27ee868c..3bf72fa577 100644
--- a/dlls/comctl32/status.c
+++ b/dlls/comctl32/status.c
@@ -284,7 +284,8 @@ STATUSBAR_Refresh (STATUS_INFO *infoPtr, HDC hdc)
 
     SelectObject (hdc, hOldFont);
 
-    if (GetWindowLongW (infoPtr->Self, GWL_STYLE) & SBARS_SIZEGRIP)
+    if ((GetWindowLongW (infoPtr->Self, GWL_STYLE) & SBARS_SIZEGRIP)
+            && !(GetWindowLongW (infoPtr->Notify, GWL_STYLE) & WS_MAXIMIZE))
 	    STATUSBAR_DrawSizeGrip (theme, hdc, &rect);
 
     return 0;
@@ -997,7 +998,8 @@ STATUSBAR_WMGetText (const STATUS_INFO *infoPtr, INT size, LPWSTR buf)
 static BOOL
 STATUSBAR_WMNCHitTest (const STATUS_INFO *infoPtr, INT x, INT y)
 {
-    if (GetWindowLongW (infoPtr->Self, GWL_STYLE) & SBARS_SIZEGRIP) {
+    if ((GetWindowLongW (infoPtr->Self, GWL_STYLE) & SBARS_SIZEGRIP)
+            && !(GetWindowLongW (infoPtr->Notify, GWL_STYLE) & WS_MAXIMIZE)) {
 	RECT  rect;
 	POINT pt;
 
diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c
index 074e637801..2841a502ae 100644
--- a/dlls/comctl32/tests/status.c
+++ b/dlls/comctl32/tests/status.c
@@ -641,7 +641,7 @@ static void test_sizegrip(void)
     TEST_NCHITTEST(rcGripper.right, rcGripper.bottom, HTNOWHERE);
     TEST_NCHITTEST(rcGripper.right + 1, rcGripper.bottom, HTNOWHERE);
     TEST_NCHITTEST(rcGripper.right, rcGripper.bottom + 1, HTNOWHERE);
-    todo_wine TEST_NCHITTEST(rcGripper.right - 1, rcGripper.bottom - 1, HTCLIENT);
+    TEST_NCHITTEST(rcGripper.right - 1, rcGripper.bottom - 1, HTCLIENT);
 
     /* not maximized and right-to-left */
     SETWNDLONG(FALSE, TRUE);
@@ -661,7 +661,7 @@ static void test_sizegrip(void)
     TEST_NCHITTEST(rcGripper.right, rcGripper.bottom, HTNOWHERE);
     TEST_NCHITTEST(rcGripper.right + 1, rcGripper.bottom, HTNOWHERE);
     TEST_NCHITTEST(rcGripper.right, rcGripper.bottom + 1, HTNOWHERE);
-    todo_wine TEST_NCHITTEST(rcGripper.right - 1, rcGripper.bottom - 1, HTCLIENT);
+    TEST_NCHITTEST(rcGripper.right - 1, rcGripper.bottom - 1, HTCLIENT);
 
 #undef TEST_NCHITTEST
 #undef SETWNDLONG
-- 
2.19.1