[jimtabor] 59201: [User32] - Release capture if the scroll is not tracking events. This fixes CORE-7075. - Minor sync porting to minimize differences.

Author: jimtabor
Date: Mon Jun 10 17:36:04 2013
New Revision: 59201

URL: http://svn.reactos.org/svn/reactos?rev=59201&view=rev
Log:
[User32]
- Release capture if the scroll is not tracking events. This fixes CORE-7075.
- Minor sync porting to minimize differences.

Modified:
    trunk/reactos/win32ss/user/user32/controls/scrollbar.c

Modified: trunk/reactos/win32ss/user/user32/controls/scrollbar.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/control...
==============================================================================
--- trunk/reactos/win32ss/user/user32/controls/scrollbar.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/controls/scrollbar.c	[iso-8859-1] Mon Jun 10 17:36:04 2013
@@ -63,10 +63,12 @@
 static INT  ScrollTrackingBar = 0;
 static INT  ScrollTrackingPos = 0;
 static INT  ScrollTrackingVal = 0;
-static BOOL ScrollMovingThumb = FALSE;
-
+ /* Hit test code of the last button-down event */
 static DWORD ScrollTrackHitTest = SCROLL_NOWHERE;
 static BOOL ScrollTrackVertical;
+
+ /* Is the moving thumb being displayed? */
+static BOOL ScrollMovingThumb = FALSE;

HBRUSH DefWndControlColor(HDC hDC, UINT ctlType);

@@ -766,6 +768,12 @@
   }
   if ((ScrollTrackHitTest == SCROLL_NOWHERE) && (Msg != WM_LBUTTONDOWN))
   {
+     //// ReactOS : Justin Case something goes wrong.
+     if (Wnd == GetCapture())
+     {
+        ReleaseCapture();
+     }
+     ////
      return;
   }

@@ -773,7 +781,7 @@
   NewInfo.reserved = ScrollBarInfo.reserved;
   memcpy(NewInfo.rgstate, ScrollBarInfo.rgstate, (CCHILDREN_SCROLLBAR + 1) * sizeof(DWORD));

-  if (SB_CTL == SBType  && 0 != (GetWindowLongPtrW(Wnd, GWL_STYLE) & (SBS_SIZEGRIP | SBS_SIZEBOX)))
+  if (SBType == SB_CTL && (GetWindowLongPtrW(Wnd, GWL_STYLE) & (SBS_SIZEGRIP | SBS_SIZEBOX)))
   {
       switch(Msg)
       {
@@ -826,7 +834,7 @@
         LastMousePos  = LastClickPos;
         TrackThumbPos = ScrollBarInfo.xyThumbTop;
         PrevPt = Pt;
-        if (SB_CTL == SBType && 0 != (GetWindowLongPtrW(Wnd, GWL_STYLE) & WS_TABSTOP)) SetFocus(Wnd);
+        if (SBType == SB_CTL && (GetWindowLongPtrW(Wnd, GWL_STYLE) & WS_TABSTOP)) SetFocus(Wnd);
         SetCapture(Wnd);
         ScrollBarInfo.rgstate[ScrollTrackHitTest] |= STATE_SYSTEM_PRESSED;
         NewInfo.rgstate[ScrollTrackHitTest] = ScrollBarInfo.rgstate[ScrollTrackHitTest];
@@ -1226,9 +1234,15 @@

case WM_LBUTTONDBLCLK:
       case WM_LBUTTONDOWN:
+        if (GetWindowLongW( Wnd, GWL_STYLE ) & SBS_SIZEGRIP)
+        {
+           SendMessageW( GetParent(Wnd), WM_SYSCOMMAND,
+                         SC_SIZE + ((GetWindowLongW( Wnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) ?
+                                   WMSZ_BOTTOMLEFT : WMSZ_BOTTOMRIGHT), lParam );
+        }
+        else
         {
           POINT Pt;
-
           Pt.x = (short)LOWORD(lParam);
           Pt.y = (short)HIWORD(lParam);
           ScrollTrackScrollBar(Wnd, SB_CTL, Pt);
@@ -1240,7 +1254,6 @@
       case WM_SYSTIMER:
         {
           POINT Pt;
-
           Pt.x = (short)LOWORD(lParam);
           Pt.y = (short)HIWORD(lParam);
           IntScrollHandleScrollEvent(Wnd, SB_CTL, Msg, Pt);
@@ -1540,7 +1553,7 @@
      }

SetLastError(ERROR_NO_SCROLLBARS);
-     ERR("GetScrollPos No Scroll Info\n");
+     TRACE("GetScrollPos No Scroll Info\n");
      return 0;
   }
   SetLastError(ERROR_INVALID_PARAMETER);