Changeset 7018 for trunk/src/user32/scroll.cpp

Timestamp:

Oct 11, 2001, 5:16:44 PM (24 years ago)

Author:

sandervl

Message:

scrollbar fixes

File:

• trunk/src/user32/scroll.cpp (modified) (8 diffs)

trunk/src/user32/scroll.cpp

@@ -1 @@
-/* $Id: scroll.cpp,v 1.42 2001-07-08 08:06:15 sandervl Exp $ */
+/* $Id: scroll.cpp,v 1.43 2001-10-11 15:16:44 sandervl Exp $ */
 /*
  * Scrollbar control
@@ -226 +226 @@
         }
     }
+    //testestest
+    dprintf(("SCROLL_GetScrollBarRect: thumbPos %d thumbSize %d", *thumbPos, *thumbSize));
     return vertical;
 }
@@ -725 +727 @@
   return 0;
 }
+
+#ifdef __WIN32OS2__
+static LRESULT SCROLL_Enable(HWND hwnd, WPARAM wParam)
+{
+  SCROLLBAR_INFO* infoPtr = (SCROLLBAR_INFO*)GetInfoPtr(hwnd);
+
+  if (!infoPtr) return 0;
+
+  EnableScrollBar(hwnd, SB_CTL, ESB_DISABLE_BOTH);
+
+  return 0;
+}
+#endif
 
 /***********************************************************************
@@ -1162 +1177 @@
       return SCROLL_KeyDown(hwnd,wParam,lParam);
 
+#ifdef __WIN32OS2__
+    case WM_ENABLE:
+      return SCROLL_Enable(hwnd, wParam);
+#endif
+
     case WM_ERASEBKGND:
       return 1;
@@ -1277 +1297 @@
             ((UINT)(info->nMax - info->nMin) >= 0x80000000))
         {
+            //NOTE: This does not fail in NT4 (unlike SetScrollRange)
             infoPtr->MinVal = 0;
             infoPtr->MaxVal = 0;
@@ -1290 +1311 @@
                 infoPtr->MaxVal = info->nMax;
                 bChangeParams = TRUE; 
-           }
+            }
         }
     }
 
     /* Make sure the page size is valid */
-
     if (infoPtr->Page < 0) infoPtr->Page = 0;
     else if (infoPtr->Page > infoPtr->MaxVal - infoPtr->MinVal + 1 )
@@ -1307 +1327 @@
         infoPtr->CurVal = infoPtr->MaxVal - MAX( infoPtr->Page-1, 0 );
 
-    //TRACE("    new values: page=%d pos=%d min=%d max=%d\n",
-    //             infoPtr->Page, infoPtr->CurVal,
-    //             infoPtr->MinVal, infoPtr->MaxVal );
+    //testestest
+    dprintf(("new values: page=%d pos=%d min=%d max=%d\n",
+                 infoPtr->Page, infoPtr->CurVal,
+                 infoPtr->MinVal, infoPtr->MaxVal ));
 
     /* don't change the scrollbar state if SetScrollInfo
@@ -1481 +1502 @@
 
     dprintf(("SetScrollRange %x %x %d %d %d", hwnd, nBar, MinVal, MaxVal, bRedraw));
+
+    //This is what NT4 does
+    if ((MinVal > MaxVal) ||
+        ((UINT)(MaxVal - MinVal) >= 0x80000000))
+    {
+        dprintf(("Invalid range"));
+        SetLastError(ERROR_INVALID_SCROLLBAR_RANGE);
+        return FALSE;
+    }
+
     info.cbSize = sizeof(info);
     info.nMin   = MinVal;