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

Timestamp:

Oct 17, 1999, 2:17:46 PM (26 years ago)

Author:

cbratschi

Message:

added WINE scrollbars to frame, fixed pmframe, WM_ENTERIDLE

File:

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

trunk/src/user32/scroll.cpp

@@ -1 @@
-/* $Id: scroll.cpp,v 1.8 1999-10-15 09:26:23 sandervl Exp $ */
+/* $Id: scroll.cpp,v 1.9 1999-10-17 12:17:44 cbratschi Exp $ */
 /*
  * Scrollbar control
  *
- * Copyright 1999 Christoph Bratschi (ported from WINE)
+ * Copyright 1999 Christoph Bratschi
  *
  * Copyright 1993 Martin Ayotte
@@ -10 +10 @@
  * WINE version: 990923
  */
-
-/* CB:
-  - exported API removed, this functions are already implemented by Open32,
-    code perhaps useful for new user32
-  - only control, default scroll bars for windows need more work
-  - SystemTimer not implemented
-*/
 
 #include <stdlib.h>
@@ -24 +17 @@
 #include "win32wbase.h"
 #include "oslibwin.h"
+
+static BOOL bitmapsLoaded = FALSE;
 
 static HBITMAP hUpArrow = 0;
@@ -112 +107 @@
 {
     HINSTANCE hinst;
+
+    if (bitmapsLoaded) return;
 
     //CB: Open32 hack to load our own bitmap
@@ -128 +125 @@
     hRgArrowI = NativeLoadBitmap( hinst, MAKEINTRESOURCEA(OBM_RGARROWI) );
     FreeLibrary(hinst);
+
+    bitmapsLoaded = TRUE;
 }
 
 /***********************************************************************
- *           SCROLL_GetPtrScrollInfo
- */
-static SCROLLBAR_INFO *SCROLL_GetPtrScrollInfo( HWND hwnd, INT nBar )
-{
-    SCROLLBAR_INFO *infoPtr;
+ *           SCROLL_GetInfoPtr
+ */
+static SCROLLBAR_INFO *SCROLL_GetInfoPtr( HWND hwnd, INT nBar )
+{
+    Win32BaseWindow *win32wnd;
+    HWND hwndFrame;
 
     switch(nBar)
     {
-/* CB: implement this later!
         case SB_HORZ:
-          infoPtr = (SCROLLBAR_INFO *)wndPtr->pHScroll;
-          break;
         case SB_VERT:
-          infoPtr = (SCROLLBAR_INFO *)wndPtr->pVScroll;
-          break;
-*/
+          win32wnd = Win32BaseWindow::GetWindowFromHandle(hwnd);
+          if (!win32wnd) return NULL;
+          hwndFrame = OSLibWinQueryWindow(win32wnd->getOS2WindowHandle(),QWOS_PARENT);
+          win32wnd = Win32BaseWindow::GetWindowFromOS2FrameHandle(hwndFrame);
+          if (!win32wnd) return NULL;
+          return win32wnd->getScrollInfo(nBar);
+
         case SB_CTL:
-          infoPtr = (SCROLLBAR_INFO *)GetInfoPtr(hwnd);
-          break;
-        default:      return NULL;
-    }
-
-    if (!infoPtr)  /* Create the info structure if needed */
-    {
-        infoPtr = (SCROLLBAR_INFO*)malloc(sizeof(SCROLLBAR_INFO));
-        infoPtr->MinVal = infoPtr->CurVal = infoPtr->Page = 0;
-        infoPtr->MaxVal = 100;
-        infoPtr->flags  = ESB_ENABLE_BOTH;
-
-        //CB: store in window class if not control!
-        SetInfoPtr(hwnd,(DWORD)infoPtr);
-
-        if (!hUpArrow) SCROLL_LoadBitmaps();
-    }
-    return infoPtr;
-}
-
-
-/***********************************************************************
- *           SCROLL_GetScrollInfo
- */
-static SCROLLBAR_INFO *SCROLL_GetScrollInfo( HWND hwnd, INT nBar )
-{
- Win32BaseWindow *window;
-
-    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
-    if(!window && nBar != SB_CTL) {
-        dprintf(("SCROLL_GetScrollInfo window %x not found!", hwnd));
-        SetLastError(ERROR_INVALID_WINDOW_HANDLE);
-        return NULL;
-    }
-
-    if (window) {
-            return window->getScrollInfo(nBar);
-    }
-
-    return SCROLL_GetPtrScrollInfo( hwnd, nBar );
+          return (SCROLLBAR_INFO*)GetInfoPtr(hwnd);
+    }
+
+    return NULL;
 }
 
@@ -208 +173 @@
     INT pixels;
     BOOL vertical;
-    DWORD dwStyle = GetWindowLongA(hwnd,GWL_STYLE);
     RECT rectClient;
 
     switch(nBar)
     {
-/* CB: implement later!
       case SB_HORZ:
-        lprect->left   = wndPtr->rectClient.left - wndPtr->rectWindow.left;
-        lprect->top    = wndPtr->rectClient.bottom - wndPtr->rectWindow.top;
-        lprect->right  = wndPtr->rectClient.right - wndPtr->rectWindow.left;
-        lprect->bottom = lprect->top + GetSystemMetrics(SM_CYHSCROLL);
-        if(dwStyle & WS_BORDER) {
-          lprect->left--;
-          lprect->right++;
-        } else if(dwStyle & WS_VSCROLL)
-          lprect->right++;
-        vertical = FALSE;
+      case SB_VERT:
+        GetClientRect( hwnd, lprect );
+        vertical = (nBar == SB_VERT);
         break;
 
-      case SB_VERT:
-        lprect->left   = wndPtr->rectClient.right - wndPtr->rectWindow.left;
-        lprect->top    = wndPtr->rectClient.top - wndPtr->rectWindow.top;
-        lprect->right  = lprect->left + GetSystemMetrics(SM_CXVSCROLL);
-        lprect->bottom = wndPtr->rectClient.bottom - wndPtr->rectWindow.top;
-        if(wndPtr->dwStyle & WS_BORDER) {
-          lprect->top--;
-          lprect->bottom++;
-        } else if(wndPtr->dwStyle & WS_HSCROLL)
-          lprect->bottom++;
-        vertical = TRUE;
-        break;
-*/
       case SB_CTL:
-        GetClientRect( hwnd, lprect );
-        vertical = ((dwStyle & SBS_VERT) != 0);
-        break;
+        {
+          DWORD dwStyle = GetWindowLongA(hwnd,GWL_STYLE);
+
+          GetClientRect( hwnd, lprect );
+          vertical = ((dwStyle & SBS_VERT) != 0);
+          break;
+        }
 
     default:
@@ -262 +209 @@
     else
     {
-        SCROLLBAR_INFO *info = SCROLL_GetPtrScrollInfo( hwnd, nBar );
+        SCROLLBAR_INFO *info = SCROLL_GetInfoPtr( hwnd, nBar );
 
         *arrowSize = GetSystemMetrics(SM_CXVSCROLL);
@@ -454 +401 @@
  * Draw the moving thumb rectangle.
  */
-static void SCROLL_DrawMovingThumb_9x( HDC hdc, RECT *rect, BOOL vertical,
+static void SCROLL_DrawMovingThumb( HDC hdc, RECT *rect, BOOL vertical,
                        INT arrowSize, INT thumbSize )
 {
@@ -477 +424 @@
 
   SCROLL_MovingThumb = !SCROLL_MovingThumb;
-}
-//******************************************************************************
-//******************************************************************************
-static void SCROLL_DrawMovingThumb( HDC hdc, RECT *rect, BOOL vertical,
-                    INT arrowSize, INT thumbSize )
-{
-  SCROLL_DrawMovingThumb_9x( hdc, rect, vertical, arrowSize, thumbSize );
 }
 /***********************************************************************
@@ -511 +451 @@
     else
     {
-      //CB: implement!
-      //hBrush = DEFWND_ControlColor( hdc, CTLCOLOR_SCROLLBAR );
+      hBrush = (HBRUSH)SendMessageA( hwnd, WM_CTLCOLORSCROLLBAR,
+                     (WPARAM)hdc,(LPARAM)hwnd);
     }
 
@@ -591 +531 @@
     BOOL Save_SCROLL_MovingThumb = SCROLL_MovingThumb;
 
+//SCROLL_DrawInterior_9x(hwnd,hdc,nBar,rect,arrowSize,thumbSize,thumbPos,flags,vertical,top_selected,bottom_selected);
+//return; //CB: improve!
+
     if (Save_SCROLL_MovingThumb &&
         (SCROLL_TrackingWin == hwnd) &&
@@ -606 +549 @@
                                        (WPARAM)hdc,(LPARAM)hwnd);
     } else {
-        //CB: implement!
-        //hBrush = DEFWND_ControlColor( hdc, CTLCOLOR_SCROLLBAR );
+        hBrush = (HBRUSH)SendMessageA( hwnd, WM_CTLCOLORSCROLLBAR,
+                                       (WPARAM)hdc,(LPARAM)hwnd);
+
     }
 
@@ -706 +650 @@
     RECT rect;
     BOOL vertical;
-    SCROLLBAR_INFO *infoPtr = SCROLL_GetPtrScrollInfo( hwnd, nBar );
+    SCROLLBAR_INFO *infoPtr = SCROLL_GetInfoPtr( hwnd, nBar );
     BOOL Save_SCROLL_MovingThumb = SCROLL_MovingThumb;
-    DWORD dwStyle = GetWindowLongA(hwnd,GWL_STYLE);
-
-    if (!infoPtr ||
-        ((nBar == SB_VERT) && !(dwStyle & WS_VSCROLL)) ||
-        ((nBar == SB_HORZ) && !(dwStyle & WS_HSCROLL))) return;
-    //if (!WIN_IsWindowDrawable( hwnd, FALSE )) return; //CB: what's that???
 
     vertical = SCROLL_GetScrollBarRect( hwnd, nBar, &rect,
@@ -754 +692 @@
                                      BOOL arrows, BOOL interior )
 {
-    HDC hdc = GetDCEx( hwnd, 0,
-                           DCX_CACHE | ((nBar == SB_CTL) ? 0 : DCX_WINDOW) );
+    //HDC hdc = GetDCEx( hwnd, 0,
+    //                       DCX_CACHE | ((nBar == SB_CTL) ? 0 : DCX_WINDOW) );
+HDC hdc;
+
+return;
+//CB: bug: paints in client window!
+//    GetClientRect returns wrong window size after GetDC
+//    why?!?
+
     if (!hdc) return;
 
@@ -811 +756 @@
     HDC hdc;
 
-    SCROLLBAR_INFO *infoPtr = SCROLL_GetScrollInfo( hwnd, nBar );
+    SCROLLBAR_INFO *infoPtr = SCROLL_GetInfoPtr( hwnd, nBar );
     if (!infoPtr) return;
     if ((SCROLL_trackHitTest == SCROLL_NOWHERE) && (msg != WM_LBUTTONDOWN))
                   return;
 
-    hdc = GetDCEx( hwnd, 0, DCX_CACHE | ((nBar == SB_CTL) ? 0 : DCX_WINDOW));
     vertical = SCROLL_GetScrollBarRect( hwnd, nBar, &rect,
                                         &arrowSize, &thumbSize, &thumbPos );
-    hwndOwner = (nBar == SB_CTL) ? GetParent(hwnd) : hwnd;
+    if (nBar == SB_CTL) hwndOwner = GetParent(hwnd); else
+    {
+      Win32BaseWindow *win32wnd;
+      HWND hwndFrame;
+
+      win32wnd = Win32BaseWindow::GetWindowFromHandle(hwnd);
+      if (!win32wnd) return;
+      hwndFrame = OSLibWinQueryWindow(win32wnd->getOS2WindowHandle(),QWOS_PARENT);
+      win32wnd = Win32BaseWindow::GetWindowFromOS2FrameHandle(hwndFrame);
+      if (!win32wnd) return;
+      hwndOwner = win32wnd->getWindowHandle();
+    }
+
     hwndCtl   = (nBar == SB_CTL) ? hwnd : 0;
 
@@ -854 +810 @@
     }
 
+    hdc = GetDCEx( hwnd, 0, DCX_CACHE | ((nBar == SB_CTL) ? 0 : DCX_WINDOW));
+
     //TRACE("Event: hwnd=%04x bar=%d msg=%x pt=%ld,%ld hit=%d\n",
     //             hwnd, nBar, msg, pt.x, pt.y, hittest );
@@ -872 +830 @@
                                 SB_LINEUP, hwndCtl );
             }
-            //CB: SetSystemTimer( hwnd, SCROLL_TIMER, (msg == WM_LBUTTONDOWN) ?
-            //                  SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY,
-            //                  (TIMERPROC)0 );
-        }
-        //CB: else KillSystemTimer( hwnd, SCROLL_TIMER );
+            SetSystemTimer( hwnd, SCROLL_TIMER, (msg == WM_LBUTTONDOWN) ?
+                            SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY,
+                            (TIMERPROC)0 );
+        }
+        else KillSystemTimer( hwnd, SCROLL_TIMER );
         break;
 
@@ -889 +847 @@
                 SendMessageA( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL,
                                 SB_PAGEUP, hwndCtl );
-                //CB: SetSystemTimer( hwnd, SCROLL_TIMER, (msg == WM_LBUTTONDOWN) ?
-                //                  SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY,
-                //                  (TIMERPROC)0 );
+                SetSystemTimer( hwnd, SCROLL_TIMER, (msg == WM_LBUTTONDOWN) ?
+                                SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY,
+                                (TIMERPROC)0 );
             }
         }
-        //CB: else KillSystemTimer( hwnd, SCROLL_TIMER );
+        else KillSystemTimer( hwnd, SCROLL_TIMER );
         break;
 
@@ -955 +913 @@
                 SendMessageA( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL,
                                 SB_PAGEDOWN, hwndCtl );
-                //CB: SetSystemTimer( hwnd, SCROLL_TIMER, (msg == WM_LBUTTONDOWN) ?
-                //                  SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY,
-                //                  (TIMERPROC)0 );
+                SetSystemTimer( hwnd, SCROLL_TIMER, (msg == WM_LBUTTONDOWN) ?
+                                SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY,
+                                (TIMERPROC)0 );
             }
         }
-        //CB: else KillSystemTimer( hwnd, SCROLL_TIMER );
+        else KillSystemTimer( hwnd, SCROLL_TIMER );
         break;
 
@@ -973 +931 @@
                                 SB_LINEDOWN, hwndCtl );
             }
-            //CB: SetSystemTimer( hwnd, SCROLL_TIMER, (msg == WM_LBUTTONDOWN) ?
-            //                  SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY,
-            //                  (TIMERPROC)0 );
-        }
-        //CB: else KillSystemTimer( hwnd, SCROLL_TIMER );
+            SetSystemTimer( hwnd, SCROLL_TIMER, (msg == WM_LBUTTONDOWN) ?
+                            SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY,
+                            (TIMERPROC)0 );
+        }
+        else KillSystemTimer( hwnd, SCROLL_TIMER );
         break;
     }
@@ -1008 +966 @@
     switch(message)
     {
+    case WM_NCCREATE:
+      {
+        SCROLLBAR_INFO *infoPtr = (SCROLLBAR_INFO*)malloc(sizeof(SCROLLBAR_INFO));
+
+        infoPtr->MinVal = infoPtr->CurVal = infoPtr->Page = 0;
+        infoPtr->MaxVal = 100;
+        infoPtr->flags  = ESB_ENABLE_BOTH;
+
+        SetInfoPtr(hwnd,(DWORD)infoPtr);
+
+        if (!bitmapsLoaded) SCROLL_LoadBitmaps();
+
+        return TRUE;
+      }
     case WM_CREATE:
         {
@@ -1014 +986 @@
             {
                 //FIXME("Unimplemented style SBS_SIZEBOX.\n" );
-                return 0;
+                return 0; //CB: implement! (for frames/toolbar already done)
             }
 
@@ -1040 +1012 @@
             }
         }
-        if (!hUpArrow) SCROLL_LoadBitmaps();
+
         //TRACE("ScrollBar creation, hwnd=%04x\n", hwnd );
         return 0;
@@ -1081 +1053 @@
 
     case SBM_SETRANGE:
-        SetScrollRange( hwnd, SB_CTL, wParam, lParam, FALSE );
-        return 0;  /* FIXME: return previous position */
+        {
+          SCROLLBAR_INFO *infoPtr = SCROLL_GetInfoPtr(hwnd,SB_CTL);
+          INT oldPos = infoPtr->CurVal;
+
+          SetScrollRange(hwnd,SB_CTL,wParam,lParam,FALSE);
+          return (oldPos != infoPtr->CurVal) ? infoPtr->CurVal:0;
+        }
 
     case SBM_GETRANGE:
@@ -1092 +1069 @@
 
     case SBM_SETRANGEREDRAW:
-        SetScrollRange( hwnd, SB_CTL, wParam, lParam, TRUE );
-        return 0;  /* FIXME: return previous position */
+        {
+          SCROLLBAR_INFO *infoPtr = SCROLL_GetInfoPtr(hwnd,SB_CTL);
+          INT oldPos = infoPtr->CurVal;
+
+          SetScrollRange(hwnd,SB_CTL,wParam,lParam,TRUE);
+          return (oldPos != infoPtr->CurVal) ? infoPtr->CurVal:0;
+        }
 
     case SBM_SETSCROLLINFO:
@@ -1114 +1096 @@
 
     default:
-//SvL: BUGFIX: Send WM_NCCREATE to defwndproc, return value 0 cancels window creation!
-//        if (message >= WM_USER)
-            //WARN("unknown msg %04x wp=%04x lp=%08lx\n",
-            //             message, wParam, lParam );
-        return DefWindowProcA( hwnd, message, wParam, lParam );
+      return DefWindowProcA( hwnd, message, wParam, lParam );
     }
     return 0;
+}
+
+/* frame handlers */
+
+VOID SCROLL_SubclassScrollBars(HWND hwndHorz,HWND hwndVert)
+{
+  if (hwndHorz)
+  {
+    SetWindowLongA(hwndHorz,GWL_WNDPROC,(ULONG)HorzScrollBarWndProc);
+    //windowClass = Win32WndClass::FindClass(cs->hInstance, (LPSTR)classAtom);
+//    InvalidateRect(hwndHorz,NULL,FALSE);
+  }
+
+  if (hwndVert)
+  {
+    SetWindowLongA(hwndVert,GWL_WNDPROC,(ULONG)VertScrollBarWndProc);
+//    InvalidateRect(hwndVert,NULL,FALSE);
+  }
+
+  if (!bitmapsLoaded) SCROLL_LoadBitmaps();
+}
+
+LRESULT WINAPI HorzScrollBarWndProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam )
+{
+  switch (message)
+  {
+    case WM_LBUTTONDOWN:
+    case WM_LBUTTONUP:
+    case WM_MOUSEMOVE:
+    case WM_SYSTIMER:
+        {
+            POINT pt;
+            CONV_POINT16TO32( (POINT16 *)&lParam, &pt );
+            SCROLL_HandleScrollEvent( hwnd, SB_HORZ, message, pt );
+        }
+        break;
+
+    case WM_ERASEBKGND:
+         return 1;
+
+    case WM_GETDLGCODE:
+         return DLGC_WANTARROWS; /* Windows returns this value */
+
+    case WM_PAINT:
+      {
+        PAINTSTRUCT ps;
+
+        HDC hdc = BeginPaint( hwnd, &ps );
+        SCROLL_DrawScrollBar( hwnd, hdc, SB_HORZ, TRUE, TRUE );
+        EndPaint( hwnd, &ps );
+      }
+      break;
+
+    case SBM_SETPOS:
+      return SetScrollPos( hwnd, SB_HORZ, wParam, (BOOL)lParam );
+
+    case SBM_GETPOS:
+        return GetScrollPos( hwnd, SB_HORZ );
+
+    case SBM_SETRANGE:
+        {
+          SCROLLBAR_INFO *infoPtr = SCROLL_GetInfoPtr(hwnd,SB_HORZ);
+          INT oldPos = infoPtr->CurVal;
+
+          SetScrollRange(hwnd,SB_HORZ,wParam,lParam,FALSE);
+          return (oldPos != infoPtr->CurVal) ? infoPtr->CurVal:0;
+        }
+
+    case SBM_GETRANGE:
+        GetScrollRange( hwnd, SB_HORZ, (LPINT)wParam, (LPINT)lParam );
+        return 0;
+
+    case SBM_ENABLE_ARROWS:
+        return EnableScrollBar( hwnd, SB_HORZ, wParam );
+
+    case SBM_SETRANGEREDRAW:
+        {
+          SCROLLBAR_INFO *infoPtr = SCROLL_GetInfoPtr(hwnd,SB_HORZ);
+          INT oldPos = infoPtr->CurVal;
+
+          SetScrollRange(hwnd,SB_HORZ,wParam,lParam,TRUE);
+          return (oldPos != infoPtr->CurVal) ? infoPtr->CurVal:0;
+        }
+
+    case SBM_SETSCROLLINFO:
+        return SetScrollInfo( hwnd, SB_HORZ, (SCROLLINFO *)lParam, wParam );
+
+    case SBM_GETSCROLLINFO:
+        return GetScrollInfo( hwnd, SB_HORZ, (SCROLLINFO *)lParam );
+
+    default:
+      return DefWindowProcA(hwnd,message,wParam,lParam);
+  }
+
+  return 0;
+}
+
+LRESULT WINAPI VertScrollBarWndProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam )
+{
+  switch (message)
+  {
+    case WM_LBUTTONDOWN:
+    case WM_LBUTTONUP:
+    case WM_MOUSEMOVE:
+    case WM_SYSTIMER:
+        {
+            POINT pt;
+            CONV_POINT16TO32( (POINT16 *)&lParam, &pt );
+            SCROLL_HandleScrollEvent( hwnd, SB_VERT, message, pt );
+        }
+        break;
+
+    case WM_ERASEBKGND:
+         return 1;
+
+    case WM_GETDLGCODE:
+         return DLGC_WANTARROWS; /* Windows returns this value */
+
+    case WM_PAINT:
+      {
+        PAINTSTRUCT ps;
+
+        HDC hdc = BeginPaint( hwnd, &ps );
+        SCROLL_DrawScrollBar( hwnd, hdc, SB_VERT, TRUE, TRUE );
+        EndPaint( hwnd, &ps );
+      }
+      break;
+
+    case SBM_SETPOS:
+      return SetScrollPos( hwnd, SB_VERT, wParam, (BOOL)lParam );
+
+    case SBM_GETPOS:
+        return GetScrollPos( hwnd, SB_VERT );
+
+    case SBM_SETRANGE:
+        {
+          SCROLLBAR_INFO *infoPtr = SCROLL_GetInfoPtr(hwnd,SB_VERT);
+          INT oldPos = infoPtr->CurVal;
+
+          SetScrollRange(hwnd,SB_VERT,wParam,lParam,FALSE);
+          return (oldPos != infoPtr->CurVal) ? infoPtr->CurVal:0;
+        }
+
+    case SBM_GETRANGE:
+        GetScrollRange( hwnd, SB_VERT, (LPINT)wParam, (LPINT)lParam );
+        return 0;
+
+    case SBM_ENABLE_ARROWS:
+        return EnableScrollBar( hwnd, SB_VERT, wParam );
+
+    case SBM_SETRANGEREDRAW:
+        {
+          SCROLLBAR_INFO *infoPtr = SCROLL_GetInfoPtr(hwnd,SB_VERT);
+          INT oldPos = infoPtr->CurVal;
+
+          SetScrollRange(hwnd,SB_VERT,wParam,lParam,TRUE);
+          return (oldPos != infoPtr->CurVal) ? infoPtr->CurVal:0;
+        }
+
+    case SBM_SETSCROLLINFO:
+        return SetScrollInfo( hwnd, SB_VERT, (SCROLLINFO *)lParam, wParam );
+
+    case SBM_GETSCROLLINFO:
+        return GetScrollInfo( hwnd, SB_VERT, (SCROLLINFO *)lParam );
+
+    default:
+      return DefWindowProcA(hwnd,message,wParam,lParam);
+  }
+
+  return 0;
 }
 
@@ -1148 +1296 @@
   INT retVal;
 
+/* CB: handled here, todo: hide/show
     window = Win32BaseWindow::GetWindowFromHandle(hwnd);
     if(!window && nBar != SB_CTL) {
@@ -1157 +1306 @@
         return window->setScrollInfo(nBar, (SCROLLINFO *)info, bRedraw);
     }
+*/
 
     retVal = SCROLL_SetScrollInfo( hwnd, nBar, info, &action );
@@ -1187 +1337 @@
    *action = 0;
 
-    if (!(infoPtr = SCROLL_GetScrollInfo(hwnd, nBar))) return 0;
+    if (!(infoPtr = SCROLL_GetInfoPtr(hwnd, nBar))) return 0;
     if (info->fMask & ~(SIF_ALL | SIF_DISABLENOSCROLL)) return 0;
     if ((info->cbSize != sizeof(*info)) &&
@@ -1303 +1453 @@
   SCROLLBAR_INFO *infoPtr;
 
-    if (!(infoPtr = SCROLL_GetScrollInfo( hwnd, nBar ))) return FALSE;
+    if (!(infoPtr = SCROLL_GetInfoPtr( hwnd, nBar ))) return FALSE;
     if (info->fMask & ~(SIF_ALL | SIF_DISABLENOSCROLL)) return FALSE;
     if ((info->cbSize != sizeof(*info)) &&
@@ -1341 +1491 @@
 
     dprintf(("SetScrollPos %x %d %d %d", hwnd, nBar, nPos, bRedraw));
-    if (!(infoPtr = SCROLL_GetScrollInfo( hwnd, nBar ))) return 0;
+    if (!(infoPtr = SCROLL_GetInfoPtr( hwnd, nBar ))) return 0;
     oldPos      = infoPtr->CurVal;
     info.cbSize = sizeof(info);
@@ -1368 +1518 @@
     dprintf(("GetScrollPos %x %d", hwnd, nBar));
 
-    infoPtr = SCROLL_GetScrollInfo( hwnd, nBar );
+    infoPtr = SCROLL_GetInfoPtr( hwnd, nBar );
     if (!infoPtr) return 0;
 
@@ -1442 +1592 @@
   SCROLLBAR_INFO *infoPtr;
 
-    infoPtr = SCROLL_GetScrollInfo( hwnd, nBar );
+    infoPtr = SCROLL_GetInfoPtr( hwnd, nBar );
     if (!infoPtr)
     {
@@ -1617 +1767 @@
     if (nBar == SB_BOTH)
     {
-        if (!(infoPtr = SCROLL_GetScrollInfo( hwnd, SB_VERT ))) return FALSE;
+        if (!(infoPtr = SCROLL_GetInfoPtr( hwnd, SB_VERT ))) return FALSE;
         if (!(bFineWithMe = (infoPtr->flags == flags)) )
         {
@@ -1628 +1778 @@
         bFineWithMe = TRUE;
 
-    if (!(infoPtr = SCROLL_GetScrollInfo( hwnd, nBar ))) return FALSE;
+    if (!(infoPtr = SCROLL_GetInfoPtr( hwnd, nBar ))) return FALSE;
     if (bFineWithMe && infoPtr->flags == flags) return FALSE;
     infoPtr->flags = flags;