Nikolay Sivov : comctl32/trackbar: Fix reseting to default page size.

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: f4fdf94697788217ba77a5e2510a452092d0f414
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=f4fdf94697788217ba77a5e25...

Author: Nikolay Sivov 
Date:   Tue May  8 01:30:52 2018 +0300

comctl32/trackbar: Fix reseting to default page size.

Signed-off-by: Nikolay Sivov 
Signed-off-by: Alexandre Julliard 
(cherry picked from commit 38e715387da75458874a22efb34419cc469f9624)
Signed-off-by: Michael Stefaniuc

---

dlls/comctl32/tests/trackbar.c | 11 +++++++++++
 dlls/comctl32/trackbar.c       | 31 +++++++++++++++++--------------
 2 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c
index d4a9eb7..56f0a67 100644
--- a/dlls/comctl32/tests/trackbar.c
+++ b/dlls/comctl32/tests/trackbar.c
@@ -612,6 +612,17 @@ static void test_page_size(void)
     r = SendMessageA(hWndTrackbar, TBM_GETPAGESIZE, 0, 0);
     ok(r == 10, "Unexpected page size %d.\n", r);

+    r = SendMessageA(hWndTrackbar, TBM_SETPAGESIZE, 0, -1);
+    ok(r == 10, "Unexpected page size %d.\n", r);
+
+    r = SendMessageA(hWndTrackbar, TBM_GETPAGESIZE, 0, 0);
+    ok(r == 7, "Unexpected page size %d.\n", r);
+
+    SendMessageA(hWndTrackbar, TBM_SETRANGEMAX, 0, 100);
+
+    r = SendMessageA(hWndTrackbar, TBM_GETPAGESIZE, 0, 0);
+    ok(r == 19, "Unexpected page size %d.\n", r);
+
     DestroyWindow(hWndTrackbar);

hWndTrackbar = create_trackbar(defaultstyle, hWndParent);
diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c
index 074304c..bf489fe 100644
--- a/dlls/comctl32/trackbar.c
+++ b/dlls/comctl32/trackbar.c
@@ -1206,18 +1206,30 @@ TRACKBAR_SetLineSize (TRACKBAR_INFO *infoPtr, LONG lLineSize)
     return lTemp;
 }

+static void TRACKBAR_UpdatePageSize(TRACKBAR_INFO *infoPtr)
+{
+    if (infoPtr->flags & TB_USER_PAGE)
+        return;
+
+    infoPtr->lPageSize = (infoPtr->lRangeMax - infoPtr->lRangeMin) / 5;
+    if (infoPtr->lPageSize == 0) infoPtr->lPageSize = 1;
+}

static inline LONG
 TRACKBAR_SetPageSize (TRACKBAR_INFO *infoPtr, LONG lPageSize)
 {
     LONG lTemp = infoPtr->lPageSize;

-    if (lPageSize != -1)
-        infoPtr->lPageSize = lPageSize;
+    if (lPageSize == -1)
+    {
+        infoPtr->flags &= ~TB_USER_PAGE;
+        TRACKBAR_UpdatePageSize(infoPtr);
+    }
     else
-        infoPtr->lPageSize = TB_DEFAULTPAGESIZE;
-
-    infoPtr->flags |= TB_USER_PAGE;
+    {
+        infoPtr->flags |= TB_USER_PAGE;
+        infoPtr->lPageSize = lPageSize;
+    }

return lTemp;
 }
@@ -1244,15 +1256,6 @@ TRACKBAR_SetPos (TRACKBAR_INFO *infoPtr, BOOL fPosition, LONG lPosition)
     return 0;
 }

-static void TRACKBAR_UpdatePageSize(TRACKBAR_INFO *infoPtr)
-{
-    if (infoPtr->flags & TB_USER_PAGE)
-        return;
-
-    infoPtr->lPageSize = (infoPtr->lRangeMax - infoPtr->lRangeMin) / 5;
-    if (infoPtr->lPageSize == 0) infoPtr->lPageSize = 1;
-}
-
 static inline LRESULT
 TRACKBAR_SetRange (TRACKBAR_INFO *infoPtr, BOOL redraw, LONG range)
 {