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

Timestamp:

Sep 26, 1999, 5:25:55 PM (26 years ago)

Author:

sandervl

Message:

ScrollWindow fix

File:

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

trunk/src/user32/scroll.cpp

@@ -1 @@
-/* $Id: scroll.cpp,v 1.2 1999-09-26 10:10:00 sandervl Exp $ */
+/* $Id: scroll.cpp,v 1.3 1999-09-26 15:25:55 sandervl Exp $ */
 /*
  * Scrollbar control
@@ -1123 +1123 @@
                 BOOL bRedraw /* [I] Should scrollbar be redrawn afterwards ? */)
 {
-    INT action;
-    INT retVal = SCROLL_SetScrollInfo( hwnd, nBar, info, &action );
+  Win32BaseWindow *window;
+  INT action;
+  INT retVal = SCROLL_SetScrollInfo( hwnd, nBar, info, &action );
+
+    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
+    if(!window) {
+        dprintf(("SetScrollInfo window not found!"));
+        SetLastError(ERROR_INVALID_WINDOW_HANDLE);
+        return FALSE;
+    }
 
     if( action & SA_SSI_HIDE )
@@ -1280 +1288 @@
                 LPSCROLLINFO info /* [IO] (info.fMask [I] specifies which values are to retrieve) */)
 {
-    SCROLLBAR_INFO *infoPtr;
-
+  Win32BaseWindow *window;
+  SCROLLBAR_INFO *infoPtr;
+
+    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
+    if(!window) {
+        dprintf(("GetScrollInfo window not found!"));
+        SetLastError(ERROR_INVALID_WINDOW_HANDLE);
+        return FALSE;
+    }
     if (!(infoPtr = SCROLL_GetScrollInfo( hwnd, nBar ))) return FALSE;
     if (info->fMask & ~(SIF_ALL | SIF_DISABLENOSCROLL)) return FALSE;
@@ -1315 +1330 @@
                 BOOL bRedraw /* [I] Should scrollbar be redrawn afterwards ? */ )
 {
-    SCROLLINFO info;
-    SCROLLBAR_INFO *infoPtr;
-    INT oldPos;
+  Win32BaseWindow *window;
+  SCROLLINFO info;
+  SCROLLBAR_INFO *infoPtr;
+  INT oldPos;
+
+    dprintf(("SetScrollPos %x %d %d %d", hwnd, nBar, nPos, bRedraw));
+    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
+    if(!window) {
+        dprintf(("SetScrollPos window not found!"));
+        SetLastError(ERROR_INVALID_WINDOW_HANDLE);
+        return FALSE;
+    }
 
     if (!(infoPtr = SCROLL_GetScrollInfo( hwnd, nBar ))) return 0;
@@ -1342 +1366 @@
                 INT nBar /* [I] One of SB_HORZ, SB_VERT, or SB_CTL */)
 {
-    SCROLLBAR_INFO *infoPtr;
+  Win32BaseWindow *window;
+  SCROLLBAR_INFO *infoPtr;
+
+    dprintf(("GetScrollPos %x %d", hwnd, nBar));
+
+    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
+    if(!window) {
+        dprintf(("GetScrollPos window not found!"));
+        SetLastError(ERROR_INVALID_WINDOW_HANDLE);
+        return 0;
+    }
 
     if (!(infoPtr = SCROLL_GetScrollInfo( hwnd, nBar ))) return 0;
@@ -1359 +1393 @@
                 BOOL bRedraw /* [I] Should scrollbar be redrawn afterwards ? */)
 {
-    SCROLLINFO info;
+  Win32BaseWindow *window;
+  SCROLLINFO info;
+
+    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
+    if(!window) {
+        dprintf(("SetScrollRange window not found!"));
+        SetLastError(ERROR_INVALID_WINDOW_HANDLE);
+        return FALSE;
+    }
 
     info.cbSize = sizeof(info);
@@ -1413 +1455 @@
                 LPINT lpMax  /* [O] Where to store maximum value */)
 {
-    SCROLLBAR_INFO *infoPtr;
+  Win32BaseWindow *window;
+  SCROLLBAR_INFO *infoPtr;
+
+    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
+    if(!window) {
+        dprintf(("GetScrollRange window not found!"));
+        SetLastError(ERROR_INVALID_WINDOW_HANDLE);
+        return FALSE;
+    }
 
     if (!(infoPtr = SCROLL_GetScrollInfo( hwnd, nBar )))
@@ -1518 +1568 @@
     if(!window) {
         dprintf(("ShowScrollBar window not found!"));
-        SetLastError(ERROR_INVALID_HANDLE);
+        SetLastError(ERROR_INVALID_WINDOW_HANDLE);
         return 0;
     }
@@ -1552 +1602 @@
     if(!window) {
         dprintf(("EnableScrollBar window not found!"));
-        SetLastError(ERROR_INVALID_HANDLE);
+        SetLastError(ERROR_INVALID_WINDOW_HANDLE);
         return 0;
     }