Changeset 496

Timestamp:

Aug 14, 1999, 6:13:16 PM (26 years ago)

Author:

cbratschi

Message:

wine-990731 update

Location:

trunk/src/comctl32

Files:

• animate.c (modified) (11 diffs)
• comboex.c (modified) (11 diffs)
• comctl32.def (modified) (3 diffs)
• comctl32.h (modified) (2 diffs)
• comctl32undoc.c (modified) (3 diffs)
• datetime.c (modified) (7 diffs)
• flatsb.c (modified) (16 diffs)
• header.c (modified) (2 diffs)
• hotkey.c (modified) (9 diffs)
• imagelist.c (modified) (10 diffs)
• ipaddress.c (modified) (2 diffs)
• listview.c (modified) (23 diffs)
• monthcal.c (modified) (7 diffs)
• nativefont.c (modified) (5 diffs)
• pager.c (modified) (8 diffs)
• progress.c (modified) (2 diffs)
• propsheet.c (modified) (6 diffs)
• rebar.c (modified) (2 diffs)
• status.c (modified) (2 diffs)
• tab.c (modified) (8 diffs)
• toolbar.c (modified) (10 diffs)
• tooltips.c (modified) (2 diffs)
• trackbar.c (modified) (3 diffs)
• treeview.c (modified) (30 diffs)
• updown.c (modified) (19 diffs)

trunk/src/comctl32/animate.c ¶

@@ -1 @@
-/* $Id: animate.c,v 1.3 1999-06-10 16:21:57 achimha Exp $ */
+/* $Id: animate.c,v 1.4 1999-08-14 16:13:09 cbratschi Exp $ */
 /*
  * Animation control
@@ -34 +34 @@
     hrsrc = FindResourceA (hInst, lpName, "AVI");
     if (!hrsrc)
-        return FALSE;
+        return FALSE;
 
     handle = LoadResource (hInst, hrsrc);
     if (!handle)
-        return FALSE;
+        return FALSE;
 
     infoPtr->lpAvi = LockResource (handle);
     if (!infoPtr->lpAvi)
-        return FALSE;
+        return FALSE;
 
     return TRUE;
@@ -54 +54 @@
 
     infoPtr->hFile =
-        CreateFileA (lpName, GENERIC_READ, 0, NULL, OPEN_EXISTING,
-                       FILE_ATTRIBUTE_NORMAL, 0);
+        CreateFileA (lpName, GENERIC_READ, 0, NULL, OPEN_EXISTING,
+                       FILE_ATTRIBUTE_NORMAL, 0);
     if (!infoPtr->hFile)
-        return FALSE;
+        return FALSE;
 
     handle =
-        CreateFileMappingA (infoPtr->hFile, NULL, PAGE_READONLY | SEC_COMMIT,
-                              0, 0, NULL);
+        CreateFileMappingA (infoPtr->hFile, NULL, PAGE_READONLY | SEC_COMMIT,
+                              0, 0, NULL);
     if (!handle) {
-        CloseHandle (infoPtr->hFile);
-        infoPtr->hFile = 0;
-        return FALSE;
+        CloseHandle (infoPtr->hFile);
+        infoPtr->hFile = 0;
+        return FALSE;
     }
 
     infoPtr->lpAvi = MapViewOfFile (handle, FILE_MAP_READ, 0, 0, 0);
     if (!infoPtr->lpAvi) {
-        CloseHandle (infoPtr->hFile);
-        infoPtr->hFile = 0;
-        return FALSE;
+        CloseHandle (infoPtr->hFile);
+        infoPtr->hFile = 0;
+        return FALSE;
     }
 
@@ -83 +83 @@
 {
     if (infoPtr->hFile) {
-        UnmapViewOfFile (infoPtr->lpAvi);
-        CloseHandle (infoPtr->hFile);
-        infoPtr->lpAvi = NULL;
+        UnmapViewOfFile (infoPtr->lpAvi);
+        CloseHandle (infoPtr->hFile);
+        infoPtr->lpAvi = NULL;
     }
     else {
-        GlobalFree ((HGLOBAL)infoPtr->lpAvi);
-        infoPtr->lpAvi = NULL;
+        GlobalFree ((HGLOBAL)infoPtr->lpAvi);
+        infoPtr->lpAvi = NULL;
     }
 }
@@ -111 +111 @@
 
     if (!lParam) {
-//      TRACE (animate, "closing avi!\n");
-        return TRUE;
-    }
-    
+//      TRACE (animate, "closing avi!\n");
+        return TRUE;
+    }
+
     if (HIWORD(lParam)) {
-//      FIXME (animate, "(\"%s\") empty stub!\n", (LPSTR)lParam);
-
-        if (ANIMATE_LoadResA (infoPtr, hInstance, (LPSTR)lParam)) {
-
-//          FIXME (animate, "AVI resource found!\n");
-
-        }
-        else {
-//          FIXME (animate, "No AVI resource found!\n");
-            if (ANIMATE_LoadFileA (infoPtr, (LPSTR)lParam)) {
-//              FIXME (animate, "AVI file found!\n");
-            }
-            else {
-//              FIXME (animate, "No AVI file found!\n");
-                return FALSE;
-            }
-        }
+//      FIXME (animate, "(\"%s\") empty stub!\n", (LPSTR)lParam);
+
+        if (ANIMATE_LoadResA (infoPtr, hInstance, (LPSTR)lParam)) {
+
+//          FIXME (animate, "AVI resource found!\n");
+
+        }
+        else {
+//          FIXME (animate, "No AVI resource found!\n");
+            if (ANIMATE_LoadFileA (infoPtr, (LPSTR)lParam)) {
+//              FIXME (animate, "AVI file found!\n");
+            }
+            else {
+//              FIXME (animate, "No AVI file found!\n");
+                return FALSE;
+            }
+        }
     }
     else {
-//      FIXME (animate, "(%u) empty stub!\n", (WORD)LOWORD(lParam));
-
-        if (ANIMATE_LoadResA (infoPtr, hInstance,
-                                MAKEINTRESOURCEA((INT)lParam))) {
-//          FIXME (animate, "AVI resource found!\n");
-        }
-        else {
-//          FIXME (animate, "No AVI resource found!\n");
-            return FALSE;
-        }
+//      FIXME (animate, "(%u) empty stub!\n", (WORD)LOWORD(lParam));
+
+        if (ANIMATE_LoadResA (infoPtr, hInstance,
+                                MAKEINTRESOURCEA((INT)lParam))) {
+//          FIXME (animate, "AVI resource found!\n");
+        }
+        else {
+//          FIXME (animate, "No AVI resource found!\n");
+            return FALSE;
+        }
     }
 
@@ -167 +167 @@
     /* nothing opened */
     if (...)
-        return FALSE;
+        return FALSE;
 #endif
-    
+
     if (nRepeat == -1) {
 
-//      FIXME (animate, "(loop from=%d to=%d) empty stub!\n",
-//             nFrom, nTo);
+//      FIXME (animate, "(loop from=%d to=%d) empty stub!\n",
+//             nFrom, nTo);
 
     }
     else {
 
-//      FIXME (animate, "(repeat=%d from=%d to=%d) empty stub!\n",
-//             nRepeat, nFrom, nTo);
+//      FIXME (animate, "(repeat=%d from=%d to=%d) empty stub!\n",
+//             nRepeat, nFrom, nTo);
 
     }
@@ -196 +196 @@
     /* nothing opened */
     if (...)
-        return FALSE;
+        return FALSE;
 #endif
-    
+
     return TRUE;
 }
@@ -212 +212 @@
     infoPtr = (ANIMATE_INFO *)COMCTL32_Alloc (sizeof(ANIMATE_INFO));
     if (!infoPtr) {
-//      ERR (animate, "could not allocate info memory!\n");
-        return 0;
+//      ERR (animate, "could not allocate info memory!\n");
+        return 0;
     }
 
@@ -262 +262 @@
 
 
-LRESULT WINAPI
+static LRESULT WINAPI
 ANIMATE_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     switch (uMsg)
     {
-        case ACM_OPENA:
-            return ANIMATE_OpenA (hwnd, wParam, lParam);
-
-/*      case ACM_OPEN32W: */
-/*          return ANIMATE_Open32W (hwnd, wParam, lParam); */
+        case ACM_OPENA:
+            return ANIMATE_OpenA (hwnd, wParam, lParam);
+
+/*      case ACM_OPEN32W: */
+/*          return ANIMATE_Open32W (hwnd, wParam, lParam); */
 
         case ACM_PLAY:
             return ANIMATE_Play (hwnd, wParam, lParam);
 
-        case ACM_STOP:
-            return ANIMATE_Stop (hwnd, wParam, lParam);
-
-
-        case WM_CREATE:
-            return ANIMATE_Create (hwnd, wParam, lParam);
-
-        case WM_DESTROY:
-            return ANIMATE_Destroy (hwnd, wParam, lParam);
-
-/*      case WM_ERASEBKGND: */
-/*          return ANIMATE_EraseBackground (hwnd, wParam, lParam); */
-
-/*      case WM_NCCREATE: */
-/*      case WM_NCHITTEST: */
-/*      case WM_PAINT: */
-/*      case WM_SIZE: */
-/*      case WM_STYLECHANGED: */
-/*      case WM_TIMER: */
-
-        default:
-//          if (uMsg >= WM_USER)
-//              ERR (animate, "unknown msg %04x wp=%08x lp=%08lx\n",
-//                   uMsg, wParam, lParam);
-            return DefWindowProcA (hwnd, uMsg, wParam, lParam);
+        case ACM_STOP:
+            return ANIMATE_Stop (hwnd, wParam, lParam);
+
+
+        case WM_CREATE:
+            return ANIMATE_Create (hwnd, wParam, lParam);
+
+        case WM_DESTROY:
+            return ANIMATE_Destroy (hwnd, wParam, lParam);
+
+/*      case WM_ERASEBKGND: */
+/*          return ANIMATE_EraseBackground (hwnd, wParam, lParam); */
+
+/*      case WM_NCCREATE: */
+/*      case WM_NCHITTEST: */
+/*      case WM_PAINT: */
+/*      case WM_SIZE: */
+/*      case WM_STYLECHANGED: */
+/*      case WM_TIMER: */
+
+        default:
+//          if (uMsg >= WM_USER)
+//              ERR (animate, "unknown msg %04x wp=%08x lp=%08lx\n",
+//                   uMsg, wParam, lParam);
+            return DefWindowProcA (hwnd, uMsg, wParam, lParam);
     }
     return 0;
@@ -321 +321 @@
     wndClass.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1);
     wndClass.lpszClassName = ANIMATE_CLASSA;
- 
+
     RegisterClassA (&wndClass);
 }
@@ -330 +330 @@
 {
     if (GlobalFindAtomA (ANIMATE_CLASSA))
-        UnregisterClassA (ANIMATE_CLASSA, (HINSTANCE)NULL);
-}
-
+        UnregisterClassA (ANIMATE_CLASSA, (HINSTANCE)NULL);
+}
+

trunk/src/comctl32/comboex.c ¶

@@ -1 @@
-/* $Id: comboex.c,v 1.3 1999-06-10 16:21:57 achimha Exp $ */
+/* $Id: comboex.c,v 1.4 1999-08-14 16:13:09 cbratschi Exp $ */
 /*
  * ComboBoxEx control
@@ -16 +16 @@
  *
  * FIXME:
- *   - should include "combo.h" 
+ *   - should include "combo.h"
  */
 
@@ -50 +50 @@
 
     if ((GetWindowLongA (hwnd, GWL_STYLE) & CBS_DROPDOWNLIST) != CBS_DROPDOWN)
-        return 0;
+        return 0;
 
 //    TRACE (comboex, "-- 0x%x\n", GetDlgItem (infoPtr->hwndCombo, ID_CB_EDIT));
@@ -103 +103 @@
 
     if ((DWORD)wParam) {
-        infoPtr->dwExtStyle = (infoPtr->dwExtStyle & ~(DWORD)wParam) | (DWORD)lParam;
+        infoPtr->dwExtStyle = (infoPtr->dwExtStyle & ~(DWORD)wParam) | (DWORD)lParam;
     }
     else
-        infoPtr->dwExtStyle = (DWORD)lParam;
+        infoPtr->dwExtStyle = (DWORD)lParam;
 
     /* FIXME: repaint?? */
@@ -150 +150 @@
 //    FIXME (comboex, "(0x%x 0x%x 0x%lx): stub\n", uMsg, wParam, lParam);
 
-    if (infoPtr->hwndCombo)    
-        return SendMessageA (infoPtr->hwndCombo, uMsg, wParam, lParam);
+    if (infoPtr->hwndCombo)
+        return SendMessageA (infoPtr->hwndCombo, uMsg, wParam, lParam);
 
     return 0;
@@ -166 +166 @@
     infoPtr = (COMBOEX_INFO *)COMCTL32_Alloc (sizeof(COMBOEX_INFO));
     if (infoPtr == NULL) {
-//      ERR (comboex, "could not allocate info memory!\n");
-        return 0;
+//      ERR (comboex, "could not allocate info memory!\n");
+        return 0;
     }
 
@@ -178 +178 @@
     /* create combo box */
     dwComboStyle = GetWindowLongA (hwnd, GWL_STYLE) &
-                        (CBS_SIMPLE|CBS_DROPDOWN|CBS_DROPDOWNLIST|WS_CHILD);
+                        (CBS_SIMPLE|CBS_DROPDOWN|CBS_DROPDOWNLIST|WS_CHILD);
 
     infoPtr->hwndCombo = CreateWindowA ("ComboBox", "",
-                         WS_CHILD | WS_VISIBLE | CBS_OWNERDRAWFIXED | dwComboStyle,
-                        0, 0, 0, 0, hwnd, (HMENU)1,
-                        GetWindowLongA (hwnd, GWL_HINSTANCE), NULL);
+                         WS_CHILD | WS_VISIBLE | CBS_OWNERDRAWFIXED | dwComboStyle,
+                        0, 0, 0, 0, hwnd, (HMENU)1,
+                        GetWindowLongA (hwnd, GWL_HINSTANCE), NULL);
 
     return 0;
@@ -196 +196 @@
 
     if (infoPtr->hwndCombo)
-        DestroyWindow (infoPtr->hwndCombo);
+        DestroyWindow (infoPtr->hwndCombo);
 
 
@@ -217 +217 @@
 
     MoveWindow (infoPtr->hwndCombo, 0, 0, rect.right -rect.left,
-                  rect.bottom - rect.top, TRUE);
-
-    return 0;
-}
-
-
-LRESULT WINAPI
+                  rect.bottom - rect.top, TRUE);
+
+    return 0;
+}
+
+
+static LRESULT WINAPI
 COMBOEX_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     switch (uMsg)
     {
-/*      case CBEM_DELETEITEM: */
-
-        case CBEM_GETCOMBOCONTROL:
-            return COMBOEX_GetComboControl (hwnd, wParam, lParam);
-
-        case CBEM_GETEDITCONTROL:
-            return COMBOEX_GetEditControl (hwnd, wParam, lParam);
-
-        case CBEM_GETEXTENDEDSTYLE:
-            return COMBOEX_GetExtendedStyle (hwnd, wParam, lParam);
-
-        case CBEM_GETIMAGELIST:
-            return COMBOEX_GetImageList (hwnd, wParam, lParam);
-
-/*      case CBEM_GETITEM32A:
-        case CBEM_GETITEM32W:
-        case CBEM_GETUNICODEFORMAT:
-        case CBEM_HASEDITCHANGED:
+/*      case CBEM_DELETEITEM: */
+
+        case CBEM_GETCOMBOCONTROL:
+            return COMBOEX_GetComboControl (hwnd, wParam, lParam);
+
+        case CBEM_GETEDITCONTROL:
+            return COMBOEX_GetEditControl (hwnd, wParam, lParam);
+
+        case CBEM_GETEXTENDEDSTYLE:
+            return COMBOEX_GetExtendedStyle (hwnd, wParam, lParam);
+
+        case CBEM_GETIMAGELIST:
+            return COMBOEX_GetImageList (hwnd, wParam, lParam);
+
+/*      case CBEM_GETITEM32A:
+        case CBEM_GETITEM32W:
+        case CBEM_GETUNICODEFORMAT:
+        case CBEM_HASEDITCHANGED:
 */
 
-        case CBEM_INSERTITEMA:
-            return COMBOEX_InsertItemA (hwnd, wParam, lParam);
-
-/*      case CBEM_INSERTITEM32W: */
-
-        case CBEM_SETEXTENDEDSTYLE:
-            return COMBOEX_SetExtendedStyle (hwnd, wParam, lParam);
-
-        case CBEM_SETIMAGELIST:
-            return COMBOEX_SetImageList (hwnd, wParam, lParam);
-
-        case CBEM_SETITEMA:
-            return COMBOEX_SetItemA (hwnd, wParam, lParam);
-
-/*      case CBEM_SETITEM32W:
-        case CBEM_SETUNICODEFORMAT:
+        case CBEM_INSERTITEMA:
+            return COMBOEX_InsertItemA (hwnd, wParam, lParam);
+
+/*      case CBEM_INSERTITEM32W: */
+
+        case CBEM_SETEXTENDEDSTYLE:
+            return COMBOEX_SetExtendedStyle (hwnd, wParam, lParam);
+
+        case CBEM_SETIMAGELIST:
+            return COMBOEX_SetImageList (hwnd, wParam, lParam);
+
+        case CBEM_SETITEMA:
+            return COMBOEX_SetItemA (hwnd, wParam, lParam);
+
+/*      case CBEM_SETITEM32W:
+        case CBEM_SETUNICODEFORMAT:
 */
 
-        case CB_DELETESTRING:
-        case CB_FINDSTRINGEXACT:
-        case CB_GETCOUNT:
-        case CB_GETCURSEL:
-        case CB_GETDROPPEDCONTROLRECT:
-        case CB_GETDROPPEDSTATE:
-        case CB_GETITEMDATA:
-        case CB_GETITEMHEIGHT:
-        case CB_GETLBTEXT:
-        case CB_GETLBTEXTLEN:
-        case CB_GETEXTENDEDUI:
-        case CB_LIMITTEXT:
-        case CB_RESETCONTENT:
-        case CB_SELECTSTRING:
-        case CB_SETCURSEL:
-        case CB_SETDROPPEDWIDTH:
-        case CB_SETEXTENDEDUI:
-        case CB_SETITEMDATA:
-        case CB_SETITEMHEIGHT:
-        case CB_SHOWDROPDOWN:
-            return COMBOEX_Forward (hwnd, uMsg, wParam, lParam);
-
-
-        case WM_CREATE:
-            return COMBOEX_Create (hwnd, wParam, lParam);
-
-        case WM_DESTROY:
-            return COMBOEX_Destroy (hwnd, wParam, lParam);
-
-        case WM_SIZE:
-            return COMBOEX_Size (hwnd, wParam, lParam);
-
-        default:
-//          if (uMsg >= WM_USER)
-//              ERR (comboex, "unknown msg %04x wp=%08x lp=%08lx\n",
-//                   uMsg, wParam, lParam);
-            return DefWindowProcA (hwnd, uMsg, wParam, lParam);
+        case CB_DELETESTRING:
+        case CB_FINDSTRINGEXACT:
+        case CB_GETCOUNT:
+        case CB_GETCURSEL:
+        case CB_GETDROPPEDCONTROLRECT:
+        case CB_GETDROPPEDSTATE:
+        case CB_GETITEMDATA:
+        case CB_GETITEMHEIGHT:
+        case CB_GETLBTEXT:
+        case CB_GETLBTEXTLEN:
+        case CB_GETEXTENDEDUI:
+        case CB_LIMITTEXT:
+        case CB_RESETCONTENT:
+        case CB_SELECTSTRING:
+        case CB_SETCURSEL:
+        case CB_SETDROPPEDWIDTH:
+        case CB_SETEXTENDEDUI:
+        case CB_SETITEMDATA:
+        case CB_SETITEMHEIGHT:
+        case CB_SHOWDROPDOWN:
+            return COMBOEX_Forward (hwnd, uMsg, wParam, lParam);
+
+
+        case WM_CREATE:
+            return COMBOEX_Create (hwnd, wParam, lParam);
+
+        case WM_DESTROY:
+            return COMBOEX_Destroy (hwnd, wParam, lParam);
+
+        case WM_SIZE:
+            return COMBOEX_Size (hwnd, wParam, lParam);
+
+        default:
+//          if (uMsg >= WM_USER)
+//              ERR (comboex, "unknown msg %04x wp=%08x lp=%08lx\n",
+//                   uMsg, wParam, lParam);
+            return DefWindowProcA (hwnd, uMsg, wParam, lParam);
     }
     return 0;
@@ -323 +323 @@
     wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
     wndClass.lpszClassName = WC_COMBOBOXEXA;
- 
+
     RegisterClassA (&wndClass);
 }
@@ -332 +332 @@
 {
     if (GlobalFindAtomA (WC_COMBOBOXEXA))
-        UnregisterClassA (WC_COMBOBOXEXA, (HINSTANCE)NULL);
-}
-
+        UnregisterClassA (WC_COMBOBOXEXA, (HINSTANCE)NULL);
+}
+

trunk/src/comctl32/comctl32.def ¶

@@ -1 @@
-; $Id: comctl32.def,v 1.10 1999-06-21 13:59:00 sandervl Exp $
+; $Id: comctl32.def,v 1.11 1999-08-14 16:13:09 cbratschi Exp $
 LIBRARY COMCTL32 INITINSTANCE
 DESCRIPTION 'COMCTL32 Common Controls Library'
@@ -99 +99 @@
   DSA_InsertItem      = _DSA_InsertItem@12         @325
   DSA_DeleteItem      = _DSA_DeleteItem@8          @326
-  DSA_DeleteAllItems  = _DSA_DeleteAllItems@4      @327 
+  DSA_DeleteAllItems  = _DSA_DeleteAllItems@4      @327
 
   DPA_Create          = _DPA_Create@4              @328
@@ -136 +136 @@
   StrStrW             = _COMCTL32_StrStrW@8        @362
   StrSpnW             = _COMCTL32_StrSpnW@8        @364
+
+  comctl32_410        = _comctl32_410@16           @410
+  InitMUILanguage     = _InitMUILanguage@4         @500 ;should be 70

trunk/src/comctl32/comctl32.h ¶

@@ -1 @@
-/* $Id: comctl32.h,v 1.6 1999-06-10 16:21:58 achimha Exp $ */
+/* $Id: comctl32.h,v 1.7 1999-08-14 16:13:10 cbratschi Exp $ */
 /*
  * Win32 common controls implementation
@@ -67 +67 @@
 #define IDC_MOVEDN_BTN      207
 
+/* Toolbar imagelist bitmaps */
+#define IDB_STD_SMALL       120
+#define IDB_STD_LARGE       121
+#define IDB_VIEW_SMALL      124
+#define IDB_VIEW_LARGE      125
+#define IDB_HIST_SMALL      130
+#define IDB_HIST_LARGE      131
+
+
+/* Month calendar month menu popup */
+#define IDD_MCMONTHMENU     300
+
+#define IDM_JAN                         301
+#define IDM_FEB                         302
+#define IDM_MAR                         303
+#define IDM_APR                         304
+#define IDM_MAY                         305
+#define IDM_JUN                         306
+#define IDM_JUL                         307
+#define IDM_AUG                         308
+#define IDM_SEP                         309
+#define IDM_OCT                         310
+#define IDM_NOV                         311
+#define IDM_DEC                         312
 
 #endif /* _H_COMCTL32 */

trunk/src/comctl32/comctl32undoc.c ¶

@@ -1 @@
-/* $Id: comctl32undoc.c,v 1.9 1999-08-03 15:49:58 cbratschi Exp $ */
+/* $Id: comctl32undoc.c,v 1.10 1999-08-14 16:13:10 cbratschi Exp $ */
 /*
  * Undocumented functions from COMCTL32.DLL
@@ -45 +45 @@
            PFNDPACOMPARE pfnCompare, PFNDPAMERGE pfnMerge, LPARAM lParam)
 {
+    INT nCount;
+
+#if 0    /* these go with the "incomplete implementation" below */
     LPVOID pWork1, pWork2;
     INT nResult;
-    INT nCount, nIndex;
+    INT nIndex;
     INT nNewItems;
+#endif
 
 //    TRACE (commctrl, "(%p %p %08lx %p %p %08lx): stub!\n",
@@ -1894 +1898 @@
 //  return (INT)(lpLoop-lpStr);
 }
+
+/**************************************************************************
+ * comctl32_410 [COMCTL32.410]
+ *
+ * FIXME: What's this supposed to do?
+ *        Parameter 1 is an HWND, you're on your own for the rest.
+ */
+
+BOOL WINAPI comctl32_410( HWND hw, DWORD b, DWORD c, DWORD d) {
+
+   //FIXME_(commctrl)("(%x, %lx, %lx, %lx): stub!\n", hw, b, c, d);
+
+   return TRUE;
+}
+
+/*************************************************************************
+ * InitMUILanguage [COMCTL32.70]
+ *
+ * FIXME: What's this supposed to do?  Apparently some i18n thing.
+ *
+ */
+
+BOOL WINAPI InitMUILanguage( DWORD a ) {
+
+   //FIXME_(commctrl)("(%lx): stub!\n", a);
+
+   return TRUE;
+}
+

trunk/src/comctl32/datetime.c ¶

@@ -1 @@
-/* $Id: datetime.c,v 1.3 1999-06-10 16:21:58 achimha Exp $ */
+/* $Id: datetime.c,v 1.4 1999-08-14 16:13:10 cbratschi Exp $ */
 /*
  * Date and time picker control
  *
  * Copyright 1998, 1999 Eric Kohl
+ * Copyright 1999 Alex Priem <alexp@sci.kun.nl>
  * Copyright 1999 Achim Hasenmueller
+ * Copyright 1999 Christoph Bratschi
  *
- * NOTES
- *   This is just a dummy control. An author is needed! Any volunteers?
- *   I will only improve this control once in a while.
- *     Eric <ekohl@abo.rhein-zeitung.de>
  *
  * TODO:
@@ -20 +18 @@
 #include "commctrl.h"
 #include "datetime.h"
-
+#include "monthcal.h"
+#include <string.h>
+#include <stdio.h>
 
 
 #define DATETIME_GetInfoPtr(hwnd) ((DATETIME_INFO *)GetWindowLongA (hwnd, 0))
+static BOOL
+
+DATETIME_SendSimpleNotify (HWND hwnd, UINT code);
+
+static char *days[] = {"Sunday", "Monday", "Tuesday", "Wednesday",
+                       "Thursday", "Friday", "Saturday", NULL};
+
+static char *monthtxt[] = {"January", "February", "March", "April", "May",
+                           "June", "July", "August", "September", "October",
+                           "November", "December"};
+
+static LRESULT
+DATETIME_GetSystemTime (HWND hwnd, WPARAM wParam, LPARAM lParam )
+{
+  DATETIME_INFO *infoPtr = DATETIME_GetInfoPtr (hwnd);
+  DWORD dwStyle = GetWindowLongA (hwnd, GWL_STYLE);
+  SYSTEMTIME *lprgSysTimeArray=(SYSTEMTIME *) lParam;
+
+  if (!lParam) return GDT_NONE;
+
+  if ((dwStyle & DTS_SHOWNONE) &&
+       (SendMessageA (infoPtr->hwndCheckbut, BM_GETCHECK, 0, 0)))
+        return GDT_NONE;
+
+  MONTHCAL_CopyTime (&infoPtr->date, lprgSysTimeArray);
+
+  return GDT_VALID;
+}
+
+
+static LRESULT
+DATETIME_SetSystemTime (HWND hwnd, WPARAM wParam, LPARAM lParam )
+{
+  DATETIME_INFO *infoPtr = DATETIME_GetInfoPtr (hwnd);
+  SYSTEMTIME *lprgSysTimeArray=(SYSTEMTIME *) lParam;
+
+  if (!lParam) return 0;
+
+  if (lParam==GDT_VALID)
+        MONTHCAL_CopyTime (lprgSysTimeArray, &infoPtr->date);
+  if (lParam==GDT_NONE) {
+        infoPtr->dateValid=FALSE;
+    SendMessageA (infoPtr->hwndCheckbut, BM_SETCHECK, 0, 0);
+        }
+  return 1;
+}
+
+
+static LRESULT
+DATETIME_GetMonthCalColor (HWND hwnd, WPARAM wParam)
+{
+  DATETIME_INFO *infoPtr = DATETIME_GetInfoPtr (hwnd);
+
+  return SendMessageA (infoPtr->hMonthCal, MCM_GETCOLOR, wParam, 0);
+}
+
+static LRESULT
+DATETIME_SetMonthCalColor (HWND hwnd, WPARAM wParam, LPARAM lParam)
+{
+  DATETIME_INFO *infoPtr = DATETIME_GetInfoPtr (hwnd);
+
+  return SendMessageA (infoPtr->hMonthCal, MCM_SETCOLOR, wParam, lParam);
+}
+
+
+/* FIXME: need to get way to force font into monthcal structure */
+
+static LRESULT
+DATETIME_GetMonthCal (HWND hwnd)
+{
+  DATETIME_INFO *infoPtr = DATETIME_GetInfoPtr (hwnd);
+
+  return infoPtr->hMonthCal;
+}
+
+
+
+/* FIXME: need to get way to force font into monthcal structure */
+
+static LRESULT
+DATETIME_GetMonthCalFont (HWND hwnd)
+{
+
+  return 0;
+}
+
+static LRESULT
+DATETIME_SetMonthCalFont (HWND hwnd, WPARAM wParam, LPARAM lParam)
+{
+
+  return 0;
+}
+
+
+static void DATETIME_Refresh (HWND hwnd, HDC hdc)
+
+{
+  DATETIME_INFO *infoPtr = DATETIME_GetInfoPtr (hwnd);
+  RECT *daytxt   = &infoPtr->daytxt;
+  RECT *daynumtxt= &infoPtr->daynumtxt;
+  RECT *rmonthtxt= &infoPtr->rmonthtxt;
+  RECT *yeartxt  = &infoPtr->yeartxt;
+  RECT *calbutton= &infoPtr->calbutton;
+  RECT *checkbox = &infoPtr->checkbox;
+  RECT *rect     = &infoPtr->rect;
+  DWORD dwStyle = GetWindowLongA (hwnd, GWL_STYLE);
+  SYSTEMTIME date = infoPtr->date;
+  SIZE size;
+  BOOL prssed=FALSE;
+  COLORREF oldBk;
+
+
+
+  if (infoPtr->dateValid) {
+    char txt[80];
+        HFONT oldFont;
+        oldFont = SelectObject (hdc, infoPtr->hFont);
+
+        GetClientRect (hwnd, rect);
+
+        sprintf (txt,"%s,",days[date.wDayOfWeek]);
+        GetTextExtentPoint32A (hdc, txt, strlen (txt), &size);
+        rect->bottom=size.cy+2;
+
+        checkbox->left  = 0;
+        checkbox->right = 0;
+        checkbox->top   = rect->top;
+        checkbox->bottom= rect->bottom;
+    if (dwStyle & DTS_SHOWNONE) {    /* FIXME: draw checkbox */
+                checkbox->right=18;
+                }
+
+
+        if (infoPtr->select==(DTHT_DAY|DTHT_GOTFOCUS))
+                oldBk=SetBkColor (hdc, COLOR_GRAYTEXT);
+       daytxt->left  = checkbox->right;
+       daytxt->right = checkbox->right+size.cx;
+       daytxt->top   = rect->top;
+       daytxt->bottom= rect->bottom;
+       DrawTextA ( hdc, txt, strlen(txt), daytxt,
+                         DT_LEFT | DT_VCENTER | DT_SINGLELINE );
+        if (infoPtr->select==(DTHT_DAY|DTHT_GOTFOCUS))
+                SetBkColor (hdc, oldBk);
+
+        if (infoPtr->select==(DTHT_MONTH|DTHT_GOTFOCUS))
+                oldBk=SetBkColor (hdc, COLOR_GRAYTEXT);
+        strcpy (txt, monthtxt[date.wMonth]);
+        GetTextExtentPoint32A (hdc, "September", 9, &size);
+       rmonthtxt->left  = daytxt->right;
+       rmonthtxt->right = daytxt->right+size.cx;
+        rmonthtxt->top   = rect->top;
+        rmonthtxt->bottom= rect->bottom;
+        DrawTextA ( hdc, txt, strlen(txt), rmonthtxt,
+                         DT_CENTER | DT_VCENTER | DT_SINGLELINE );
+        if (infoPtr->select==(DTHT_MONTH|DTHT_GOTFOCUS))
+                SetBkColor (hdc, oldBk);
+
+        if (infoPtr->select==(DTHT_DAYNUM|DTHT_GOTFOCUS))
+                oldBk=SetBkColor (hdc, COLOR_GRAYTEXT);
+        sprintf (txt,"%d,",date.wDay);
+        GetTextExtentPoint32A (hdc, "31,", 3, &size);
+       daynumtxt->left  = rmonthtxt->right;
+       daynumtxt->right = rmonthtxt->right+size.cx;
+        daynumtxt->top   = rect->top;
+        daynumtxt->bottom= rect->bottom;
+        DrawTextA ( hdc, txt, strlen(txt), daynumtxt,
+                         DT_RIGHT | DT_VCENTER | DT_SINGLELINE );
+        if (infoPtr->select==(DTHT_DAYNUM|DTHT_GOTFOCUS))
+                SetBkColor (hdc, oldBk);
+
+        if (infoPtr->select==(DTHT_YEAR|DTHT_GOTFOCUS))
+                oldBk=SetBkColor (hdc, COLOR_GRAYTEXT);
+        sprintf (txt,"%d",date.wYear);
+        GetTextExtentPoint32A (hdc, "2000", 5, &size);
+       yeartxt->left  = daynumtxt->right;
+       yeartxt->right = daynumtxt->right+size.cx;
+        yeartxt->top   = rect->top;
+        yeartxt->bottom= rect->bottom;
+        DrawTextA ( hdc, txt, strlen(txt), yeartxt,
+                         DT_RIGHT | DT_VCENTER | DT_SINGLELINE );
+        if (infoPtr->select==(DTHT_YEAR|DTHT_GOTFOCUS))
+                SetBkColor (hdc, oldBk);
+
+        SelectObject (hdc, oldFont);
+        }
+
+        if (!(dwStyle & DTS_UPDOWN)) {
+
+                calbutton->right = rect->right;
+                calbutton->left  = rect->right-15;
+                calbutton->top   = rect->top;
+                calbutton->bottom= rect->bottom;
+
+        DrawFrameControl(hdc, calbutton, DFC_SCROLL,
+                DFCS_SCROLLDOWN | (prssed ? DFCS_PUSHED : 0) |
+                (dwStyle & WS_DISABLED ? DFCS_INACTIVE : 0) );
+        }
+
+}
+
+static LRESULT
+DATETIME_HitTest (HWND hwnd, DATETIME_INFO *infoPtr, POINT pt)
+{
+  //TRACE ("%ld, %ld\n",pt.x,pt.y);
+
+  if (PtInRect (&infoPtr->calbutton, pt)) return DTHT_MCPOPUP;
+  if (PtInRect (&infoPtr->yeartxt, pt))   return DTHT_YEAR;
+  if (PtInRect (&infoPtr->daynumtxt, pt)) return DTHT_DAYNUM;
+  if (PtInRect (&infoPtr->rmonthtxt, pt)) return DTHT_MONTH;
+  if (PtInRect (&infoPtr->daytxt, pt))    return DTHT_DAY;
+  if (PtInRect (&infoPtr->checkbox, pt))  return DTHT_CHECKBOX;
+
+  return 0;
+}
+
+static LRESULT
+DATETIME_LButtonDown (HWND hwnd, WPARAM wParam, LPARAM lParam)
+{
+    DATETIME_INFO *infoPtr = DATETIME_GetInfoPtr (hwnd);
+        POINT pt;
+        int old;
+
+    //TRACE ("\n");
+
+        old=infoPtr->select;
+    pt.x=(INT)LOWORD(lParam);
+    pt.y=(INT)HIWORD(lParam);
+    infoPtr->select=DATETIME_HitTest (hwnd, infoPtr, pt);
+
+        if (infoPtr->select!=old) {
+                HDC hdc;
+
+                SetFocus (hwnd);
+                hdc=GetDC (hwnd);
+                DATETIME_Refresh (hwnd,hdc);
+        ReleaseDC (hwnd, hdc);
+    }
+        if (infoPtr->select==DTHT_MCPOPUP) {
+                        POINT pt;
+
+                        pt.x=8;
+                        pt.y=infoPtr->rect.bottom+5;
+                        ClientToScreen (hwnd, &pt);
+                        infoPtr->hMonthCal=CreateWindowExA (0,"SysMonthCal32", 0,
+                                WS_POPUP | WS_BORDER,
+                                pt.x,pt.y,145,150,
+                                GetParent (hwnd),
+                                0,0,0);
+
+                      //TRACE ("dt:%x mc:%x mc parent:%x, desktop:%x, mcpp:%x\n",
+                      //hwnd,infoPtr->hMonthCal,
+                      //GetParent (infoPtr->hMonthCal),
+                      //GetDesktopWindow (),
+                      //GetParent (GetParent (infoPtr->hMonthCal)));
+
+                        SetFocus (hwnd);
+                        DATETIME_SendSimpleNotify (hwnd, DTN_DROPDOWN);
+        }
+    return 0;
+}
+
+
+static LRESULT
+DATETIME_Paint (HWND hwnd, WPARAM wParam)
+{
+    HDC hdc;
+    PAINTSTRUCT ps;
+
+    hdc = wParam==0 ? BeginPaint (hwnd, &ps) : (HDC)wParam;
+    DATETIME_Refresh (hwnd, hdc);
+    if(!wParam)
+    EndPaint (hwnd, &ps);
+    return 0;
+}
+
+static LRESULT
+DATETIME_ParentNotify (HWND hwnd, WPARAM wParam, LPARAM lParam)
+{
+    DATETIME_INFO *infoPtr = DATETIME_GetInfoPtr (hwnd);
+        LPNMHDR lpnmh=(LPNMHDR) lParam;
+
+        //TRACE ("%x,%lx\n",wParam, lParam);
+        //TRACE ("Got notification %x from %x\n", lpnmh->code, lpnmh->hwndFrom);
+        //TRACE ("info: %x %x %x\n",hwnd,infoPtr->hMonthCal,infoPtr->hUpdown);
+        return 0;
+}
+
+static LRESULT
+DATETIME_Notify (HWND hwnd, WPARAM wParam, LPARAM lParam)
+
+{
+    DATETIME_INFO *infoPtr = DATETIME_GetInfoPtr (hwnd);
+        LPNMHDR lpnmh=(LPNMHDR) lParam;
+
+        //TRACE ("%x,%lx\n",wParam, lParam);
+        //TRACE ("Got notification %x from %x\n", lpnmh->code, lpnmh->hwndFrom);
+        //TRACE ("info: %x %x %x\n",hwnd,infoPtr->hMonthCal,infoPtr->hUpdown);
+        return 0;
+}
+
+static LRESULT
+DATETIME_KillFocus (HWND hwnd, WPARAM wParam, LPARAM lParam)
+{
+    DATETIME_INFO *infoPtr = DATETIME_GetInfoPtr (hwnd);
+    HDC hdc;
+
+    //TRACE ("\n");
+
+        if (infoPtr->select) {
+                        DATETIME_SendSimpleNotify (hwnd, NM_KILLFOCUS);
+                        infoPtr->select&= ~DTHT_GOTFOCUS;
+        }
+    hdc = GetDC (hwnd);
+    DATETIME_Refresh (hwnd, hdc);
+    ReleaseDC (hwnd, hdc);
+    InvalidateRect (hwnd, NULL, TRUE);
+
+    return 0;
+}
+
+
+static LRESULT
+DATETIME_SetFocus (HWND hwnd, WPARAM wParam, LPARAM lParam)
+{
+    HDC hdc;
+    DATETIME_INFO *infoPtr = DATETIME_GetInfoPtr (hwnd);
+
+    //TRACE ("\n");
+
+        if (infoPtr->select) {
+                        DATETIME_SendSimpleNotify (hwnd, NM_SETFOCUS);
+                        infoPtr->select|=DTHT_GOTFOCUS;
+        }
+    hdc = GetDC (hwnd);
+    DATETIME_Refresh (hwnd, hdc);
+    ReleaseDC (hwnd, hdc);
+
+    return 0;
+}
+
+
+static BOOL
+DATETIME_SendSimpleNotify (HWND hwnd, UINT code)
+{
+    NMHDR nmhdr;
+
+    //TRACE("%x\n",code);
+    nmhdr.hwndFrom = hwnd;
+    nmhdr.idFrom   = GetWindowLongA( hwnd, GWL_ID);
+    nmhdr.code     = code;
+
+    return (BOOL) SendMessageA (GetParent (hwnd), WM_NOTIFY,
+                                   (WPARAM)nmhdr.idFrom, (LPARAM)&nmhdr);
+}
 
 
@@ -33 +387 @@
 DATETIME_Create (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
-    DATETIME_INFO *infoPtr;
+  DATETIME_INFO *infoPtr;
+  DWORD dwStyle = GetWindowLongA (hwnd, GWL_STYLE);
 
     /* allocate memory for info structure */
     infoPtr = (DATETIME_INFO *)COMCTL32_Alloc (sizeof(DATETIME_INFO));
     if (infoPtr == NULL) {
-//      ERR (datetime, "could not allocate info memory!\n");
-        return 0;
+        //ERR("could not allocate info memory!\n");
+        return 0;
     }
 
     SetWindowLongA (hwnd, 0, (DWORD)infoPtr);
 
+        if (dwStyle & DTS_SHOWNONE) {
+                infoPtr->hwndCheckbut=CreateWindowExA (0,"button", 0,
+                                WS_CHILD | WS_VISIBLE | BS_AUTOCHECKBOX,
+                                2,2,13,13,
+                                hwnd,
+                0, GetWindowLongA  (hwnd, GWL_HINSTANCE), 0);
+                SendMessageA (infoPtr->hwndCheckbut, BM_SETCHECK, 1, 0);
+        }
+
+        if (dwStyle & DTS_UPDOWN) {
+
+                        infoPtr->hUpdown=CreateUpDownControl (
+                                WS_CHILD | WS_BORDER | WS_VISIBLE,
+                                120,1,20,20,
+                                hwnd,1,0,0,
+                                UD_MAXVAL, UD_MINVAL, 0);
+        }
 
     /* initialize info structure */
-
-
-
+        infoPtr->hMonthCal=0;
+        GetSystemTime (&infoPtr->date);
+        infoPtr->dateValid = TRUE;
+        infoPtr->hFont = GetStockObject(DEFAULT_GUI_FONT);
     return 0;
 }
@@ -58 +431 @@
     DATETIME_INFO *infoPtr = DATETIME_GetInfoPtr (hwnd);
 
-    /* free datetime info data */
     COMCTL32_Free (infoPtr);
-
-    return 0;
-}
-
-
-
-
-LRESULT WINAPI
+    return 0;
+}
+
+
+
+
+
+static LRESULT WINAPI
 DATETIME_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
+
     switch (uMsg)
     {
 
     case DTM_GETSYSTEMTIME:
-//        FIXME (datetime, "Unimplemented msg DTM_GETSYSTEMTIME\n");
-        return GDT_VALID;
+                DATETIME_GetSystemTime (hwnd, wParam, lParam);
 
     case DTM_SETSYSTEMTIME:
-//        FIXME (datetime, "Unimplemented msg DTM_SETSYSTEMTIME\n");
+                DATETIME_SetSystemTime (hwnd, wParam, lParam);
+
+    case DTM_GETRANGE:
+        //FIXME("Unimplemented msg DTM_GETRANGE\n");
+        return 0;
+
+    case DTM_SETRANGE:
+        //FIXME("Unimplemented msg DTM_SETRANGE\n");
         return 1;
 
-    case DTM_GETRANGE:
-//        FIXME (datetime, "Unimplemented msg DTM_GETRANGE\n");
-        return 0;
-
-    case DTM_SETRANGE:
-//        FIXME (datetime, "Unimplemented msg DTM_SETRANGE\n");
+    case DTM_SETFORMATA:
+        //FIXME("Unimplemented msg DTM_SETFORMAT32A\n");
         return 1;
 
-    case DTM_SETFORMATA:
-//        FIXME (datetime, "Unimplemented msg DTM_SETFORMAT32A\n");
+    case DTM_SETFORMATW:
+        //FIXME("Unimplemented msg DTM_SETFORMAT32W\n");
         return 1;
 
-    case DTM_SETFORMATW:
-//        FIXME (datetime, "Unimplemented msg DTM_SETFORMAT32W\n");
-        return 1;
-
     case DTM_SETMCCOLOR:
-//        FIXME (datetime, "Unimplemented msg DTM_SETMCCOLOR\n");
-        return 0;
+        return DATETIME_SetMonthCalColor (hwnd, wParam, lParam);
 
     case DTM_GETMCCOLOR:
-//        FIXME (datetime, "Unimplemented msg DTM_GETMCCOLOR\n");
-        return 0;
+        return DATETIME_GetMonthCalColor (hwnd, wParam);
 
     case DTM_GETMONTHCAL:
-//        FIXME (datetime, "Unimplemented msg DTM_GETMONTHCAL\n");
-        return 0;
+        return DATETIME_GetMonthCal (hwnd);
 
     case DTM_SETMCFONT:
-//        FIXME (datetime, "Unimplemented msg DTM_SETMCFONT\n");
-        return 0;
+        return DATETIME_SetMonthCalFont (hwnd, wParam, lParam);
 
     case DTM_GETMCFONT:
-//        FIXME (datetime, "Unimplemented msg DTM_GETMCFONT\n");
-        return 0;
-
-        case WM_CREATE:
-            return DATETIME_Create (hwnd, wParam, lParam);
-
-        case WM_DESTROY:
-            return DATETIME_Destroy (hwnd, wParam, lParam);
-
-        default:
-//          if (uMsg >= WM_USER)
-//              ERR (datetime, "unknown msg %04x wp=%08x lp=%08lx\n",
-//                   uMsg, wParam, lParam);
-            return DefWindowProcA (hwnd, uMsg, wParam, lParam);
+        return DATETIME_GetMonthCalFont (hwnd);
+
+        case WM_PARENTNOTIFY:
+                return DATETIME_ParentNotify (hwnd, wParam, lParam);
+
+        case WM_NOTIFY:
+                return DATETIME_Notify (hwnd, wParam, lParam);
+
+    case WM_PAINT:
+        return DATETIME_Paint (hwnd, wParam);
+
+    case WM_KILLFOCUS:
+        return DATETIME_KillFocus (hwnd, wParam, lParam);
+
+    case WM_SETFOCUS:
+        return DATETIME_SetFocus (hwnd, wParam, lParam);
+
+    case WM_LBUTTONDOWN:
+        return DATETIME_LButtonDown (hwnd, wParam, lParam);
+
+        case WM_CREATE:
+            return DATETIME_Create (hwnd, wParam, lParam);
+
+        case WM_DESTROY:
+            return DATETIME_Destroy (hwnd, wParam, lParam);
+
+        default:
+            //if (uMsg >= WM_USER)
+                //ERR("unknown msg %04x wp=%08x lp=%08lx\n",
+                //     uMsg, wParam, lParam);
+            return DefWindowProcA (hwnd, uMsg, wParam, lParam);
     }
     return 0;
@@ -134 +518 @@
 
 VOID
-DATETIME_Register (VOID)
+DATETIME_Register (void)
 {
     WNDCLASSA wndClass;
@@ -148 +532 @@
     wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
     wndClass.lpszClassName = DATETIMEPICK_CLASSA;
- 
+
     RegisterClassA (&wndClass);
 }
@@ -154 +538 @@
 
 VOID
-DATETIME_Unregister (VOID)
+DATETIME_Unregister (void)
 {
     if (GlobalFindAtomA (DATETIMEPICK_CLASSA))
-        UnregisterClassA (DATETIMEPICK_CLASSA, (HINSTANCE)NULL);
-}
-
+        UnregisterClassA (DATETIMEPICK_CLASSA, (HINSTANCE)NULL);
+}
+

trunk/src/comctl32/flatsb.c ¶

@@ -1 @@
-/* $Id: flatsb.c,v 1.3 1999-06-10 16:21:58 achimha Exp $ */
+/* $Id: flatsb.c,v 1.4 1999-08-14 16:13:10 cbratschi Exp $ */
 /*
  * Flat Scrollbar control
@@ -20 +20 @@
 #include "winbase.h"
 #include "commctrl.h"
-#include "flatsb.h" 
+#include "flatsb.h"
 
 
@@ -26 +26 @@
 
 
-BOOL WINAPI 
+BOOL WINAPI
 FlatSB_EnableScrollBar(HWND hwnd, INT dummy, UINT dummy2)
 {
@@ -33 +33 @@
 }
 
-BOOL WINAPI 
+BOOL WINAPI
 FlatSB_ShowScrollBar(HWND hwnd, INT code, BOOL flag)
 {
@@ -40 +40 @@
 }
 
-BOOL WINAPI 
+BOOL WINAPI
 FlatSB_GetScrollRange(HWND hwnd, INT code, LPINT min, LPINT max)
 {
@@ -47 +47 @@
 }
 
-BOOL WINAPI 
+BOOL WINAPI
 FlatSB_GetScrollInfo(HWND hwnd, INT code, LPSCROLLINFO info)
 {
@@ -54 +54 @@
 }
 
-INT WINAPI 
+INT WINAPI
 FlatSB_GetScrollPos(HWND hwnd, INT code)
 {
@@ -61 +61 @@
 }
 
-BOOL WINAPI 
+BOOL WINAPI
 FlatSB_GetScrollProp(HWND hwnd, INT propIndex, LPINT prop)
 {
@@ -69 +69 @@
 
 
-INT WINAPI 
+INT WINAPI
 FlatSB_SetScrollPos(HWND hwnd, INT code, INT pos, BOOL fRedraw)
 {
@@ -76 +76 @@
 }
 
-INT WINAPI 
+INT WINAPI
 FlatSB_SetScrollInfo(HWND hwnd, INT code, LPSCROLLINFO info, BOOL fRedraw)
 {
@@ -83 +83 @@
 }
 
-INT WINAPI 
+INT WINAPI
 FlatSB_SetScrollRange(HWND hwnd, INT code, INT min, INT max, BOOL fRedraw)
 {
@@ -90 +90 @@
 }
 
-BOOL WINAPI 
+BOOL WINAPI
 FlatSB_SetScrollProp(HWND hwnd, UINT index, INT newValue, BOOL flag)
 {
@@ -128 +128 @@
 
 
-LRESULT WINAPI
+static LRESULT WINAPI
 FlatSB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
@@ -134 +134 @@
     {
 
-        case WM_CREATE:
-            return FlatSB_Create (hwnd, wParam, lParam);
+        case WM_CREATE:
+            return FlatSB_Create (hwnd, wParam, lParam);
 
-        case WM_DESTROY:
-            return FlatSB_Destroy (hwnd, wParam, lParam);
+        case WM_DESTROY:
+            return FlatSB_Destroy (hwnd, wParam, lParam);
 
-        default:
-//          if (uMsg >= WM_USER)
-//              ERR_(datetime)("unknown msg %04x wp=%08x lp=%08lx\n",
-//                   uMsg, wParam, lParam);
-            return DefWindowProcA (hwnd, uMsg, wParam, lParam);
+        default:
+//          if (uMsg >= WM_USER)
+//              ERR_(datetime)("unknown msg %04x wp=%08x lp=%08lx\n",
+//                   uMsg, wParam, lParam);
+            return DefWindowProcA (hwnd, uMsg, wParam, lParam);
     }
     return 0;
@@ -165 +165 @@
     wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
     wndClass.lpszClassName = FLATSB_CLASSA;
- 
+
     RegisterClassA (&wndClass);
 }
@@ -174 +174 @@
 {
     if (GlobalFindAtomA (FLATSB_CLASSA))
-        UnregisterClassA (FLATSB_CLASSA, (HINSTANCE)NULL);
+        UnregisterClassA (FLATSB_CLASSA, (HINSTANCE)NULL);
 }
 

trunk/src/comctl32/header.c ¶

@@ -1 @@
-/* $Id: header.c,v 1.7 1999-06-30 15:52:16 cbratschi Exp $ */
+/* $Id: header.c,v 1.8 1999-08-14 16:13:10 cbratschi Exp $ */
 /*
  *  Header control
@@ -1444 +1444 @@
 
 
-LRESULT WINAPI
+static LRESULT WINAPI
 HEADER_WindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {

trunk/src/comctl32/hotkey.c ¶

@@ -1 @@
-/* $Id: hotkey.c,v 1.3 1999-06-10 16:21:59 achimha Exp $ */
+/* $Id: hotkey.c,v 1.4 1999-08-14 16:13:10 cbratschi Exp $ */
 /*
  * Hotkey control
@@ -79 +79 @@
 
     hBrush =
-        (HBRUSH)SendMessageA (GetParent (hwnd), WM_CTLCOLOREDIT,
-                                wParam, (LPARAM)hwnd);
+        (HBRUSH)SendMessageA (GetParent (hwnd), WM_CTLCOLOREDIT,
+                                wParam, (LPARAM)hwnd);
     if (hBrush)
-        hBrush = (HBRUSH)GetStockObject (WHITE_BRUSH);
+        hBrush = (HBRUSH)GetStockObject (WHITE_BRUSH);
     GetClientRect (hwnd, &rc);
 
@@ -106 +106 @@
 
     switch (wParam) {
-        case VK_RETURN:
-        case VK_TAB:
-        case VK_SPACE:
-        case VK_DELETE:
-        case VK_ESCAPE:
-        case VK_BACK:
-            return DefWindowProcA (hwnd, WM_KEYDOWN, wParam, lParam);
-
-        case VK_SHIFT:
-        case VK_CONTROL:
-        case VK_MENU:
-//          FIXME (hotkey, "modifier key pressed!\n");
-            break;
-
-        default:
-//          FIXME (hotkey, " %d\n", wParam);
-            break;
+        case VK_RETURN:
+        case VK_TAB:
+        case VK_SPACE:
+        case VK_DELETE:
+        case VK_ESCAPE:
+        case VK_BACK:
+            return DefWindowProcA (hwnd, WM_KEYDOWN, wParam, lParam);
+
+        case VK_SHIFT:
+        case VK_CONTROL:
+        case VK_MENU:
+//          FIXME (hotkey, "modifier key pressed!\n");
+            break;
+
+        default:
+//          FIXME (hotkey, " %d\n", wParam);
+            break;
     }
 
@@ -206 +206 @@
     hdc = GetDC (hwnd);
     if (infoPtr->hFont)
-        hOldFont = SelectObject (hdc, infoPtr->hFont);
+        hOldFont = SelectObject (hdc, infoPtr->hFont);
 
     GetTextMetricsA (hdc, &tm);
@@ -212 +212 @@
 
     if (infoPtr->hFont)
-        SelectObject (hdc, hOldFont);
+        SelectObject (hdc, hOldFont);
     ReleaseDC (hwnd, hdc);
 
     if (LOWORD(lParam)) {
 
-//      FIXME (hotkey, "force redraw!\n");
+//      FIXME (hotkey, "force redraw!\n");
 
     }
@@ -231 +231 @@
 
     switch (wParam) {
-        case VK_RETURN:
-        case VK_TAB:
-        case VK_SPACE:
-        case VK_DELETE:
-        case VK_ESCAPE:
-        case VK_BACK:
-            return DefWindowProcA (hwnd, WM_SYSKEYDOWN, wParam, lParam);
-
-        case VK_SHIFT:
-        case VK_CONTROL:
-        case VK_MENU:
-//          FIXME (hotkey, "modifier key pressed!\n");
-            break;
-
-        default:
-//          FIXME (hotkey, " %d\n", wParam);
-            break;
+        case VK_RETURN:
+        case VK_TAB:
+        case VK_SPACE:
+        case VK_DELETE:
+        case VK_ESCAPE:
+        case VK_BACK:
+            return DefWindowProcA (hwnd, WM_SYSKEYDOWN, wParam, lParam);
+
+        case VK_SHIFT:
+        case VK_CONTROL:
+        case VK_MENU:
+//          FIXME (hotkey, "modifier key pressed!\n");
+            break;
+
+        default:
+//          FIXME (hotkey, " %d\n", wParam);
+            break;
     }
 
@@ -266 +266 @@
 
 
-LRESULT WINAPI
+static LRESULT WINAPI
 HOTKEY_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     switch (uMsg)
     {
-/*      case HKM_GETHOTKEY: */
-/*      case HKM_SETHOTKEY: */
-/*      case HKM_SETRULES: */
-
-/*      case WM_CHAR: */
-
-        case WM_CREATE:
-            return HOTKEY_Create (hwnd, wParam, lParam);
-
-        case WM_DESTROY:
-            return HOTKEY_Destroy (hwnd, wParam, lParam);
-
-        case WM_ERASEBKGND:
-            return HOTKEY_EraseBackground (hwnd, wParam, lParam);
-
-        case WM_GETDLGCODE:
-            return DLGC_WANTCHARS | DLGC_WANTARROWS;
-
-        case WM_GETFONT:
-            return HOTKEY_GetFont (hwnd, wParam, lParam);
-
-        case WM_KEYDOWN:
-        case WM_SYSKEYDOWN:
-            return HOTKEY_KeyDown (hwnd, wParam, lParam);
-
-        case WM_KEYUP:
-        case WM_SYSKEYUP:
-            return HOTKEY_KeyUp (hwnd, wParam, lParam);
-
-        case WM_KILLFOCUS:
-            return HOTKEY_KillFocus (hwnd, wParam, lParam);
-
-        case WM_LBUTTONDOWN:
-            return HOTKEY_LButtonDown (hwnd, wParam, lParam);
-
-        case WM_NCCREATE:
-            return HOTKEY_NCCreate (hwnd, wParam, lParam);
-
-/*      case WM_PAINT: */
-
-        case WM_SETFOCUS:
-            return HOTKEY_SetFocus (hwnd, wParam, lParam);
-
-        case WM_SETFONT:
-            return HOTKEY_SetFont (hwnd, wParam, lParam);
-
-/*      case WM_SYSCHAR: */
-
-        default:
-//          if (uMsg >= WM_USER)
-//              ERR (hotkey, "unknown msg %04x wp=%08x lp=%08lx\n",
-//                   uMsg, wParam, lParam);
-            return DefWindowProcA (hwnd, uMsg, wParam, lParam);
+/*      case HKM_GETHOTKEY: */
+/*      case HKM_SETHOTKEY: */
+/*      case HKM_SETRULES: */
+
+/*      case WM_CHAR: */
+
+        case WM_CREATE:
+            return HOTKEY_Create (hwnd, wParam, lParam);
+
+        case WM_DESTROY:
+            return HOTKEY_Destroy (hwnd, wParam, lParam);
+
+        case WM_ERASEBKGND:
+            return HOTKEY_EraseBackground (hwnd, wParam, lParam);
+
+        case WM_GETDLGCODE:
+            return DLGC_WANTCHARS | DLGC_WANTARROWS;
+
+        case WM_GETFONT:
+            return HOTKEY_GetFont (hwnd, wParam, lParam);
+
+        case WM_KEYDOWN:
+        case WM_SYSKEYDOWN:
+            return HOTKEY_KeyDown (hwnd, wParam, lParam);
+
+        case WM_KEYUP:
+        case WM_SYSKEYUP:
+            return HOTKEY_KeyUp (hwnd, wParam, lParam);
+
+        case WM_KILLFOCUS:
+            return HOTKEY_KillFocus (hwnd, wParam, lParam);
+
+        case WM_LBUTTONDOWN:
+            return HOTKEY_LButtonDown (hwnd, wParam, lParam);
+
+        case WM_NCCREATE:
+            return HOTKEY_NCCreate (hwnd, wParam, lParam);
+
+/*      case WM_PAINT: */
+
+        case WM_SETFOCUS:
+            return HOTKEY_SetFocus (hwnd, wParam, lParam);
+
+        case WM_SETFONT:
+            return HOTKEY_SetFont (hwnd, wParam, lParam);
+
+/*      case WM_SYSCHAR: */
+
+        default:
+//          if (uMsg >= WM_USER)
+//              ERR (hotkey, "unknown msg %04x wp=%08x lp=%08lx\n",
+//                   uMsg, wParam, lParam);
+            return DefWindowProcA (hwnd, uMsg, wParam, lParam);
     }
     return 0;
@@ -344 +344 @@
     wndClass.hbrBackground = 0;
     wndClass.lpszClassName = HOTKEY_CLASSA;
- 
+
     RegisterClassA (&wndClass);
 }
@@ -353 +353 @@
 {
     if (GlobalFindAtomA (HOTKEY_CLASSA))
-        UnregisterClassA (HOTKEY_CLASSA, (HINSTANCE)NULL);
-}
-
+        UnregisterClassA (HOTKEY_CLASSA, (HINSTANCE)NULL);
+}
+

trunk/src/comctl32/imagelist.c ¶

@@ -1 @@
-/* $Id: imagelist.c,v 1.5 1999-07-12 15:58:47 cbratschi Exp $ */
+/* $Id: imagelist.c,v 1.6 1999-08-14 16:13:11 cbratschi Exp $ */
 /*
  *  ImageList implementation
@@ -76 +76 @@
  *     This function can NOT be used to reduce the number of images.
  */
-
 static VOID
 IMAGELIST_InternalExpandBitmaps (HIMAGELIST himl, INT nImageCount)
@@ -142 +141 @@
  */
 
+
+/*************************************************************************
+ * IMAGELIST_InternalDraw [Internal]
+ *
+ * Draws the image in the ImageList (without the mask)
+ *
+ * PARAMS
+ *     pimldp        [I] pointer to IMAGELISTDRAWPARAMS structure.
+ *     cx            [I] the width of the image to display
+ *     cy............[I] the height of the image to display
+ *
+ * RETURNS
+ *     nothing
+ *
+ * NOTES
+ *     This functions is used by ImageList_DrawIndirect, when it is
+ *     required to draw only the Image (without the mask) to the screen.
+ *
+ *     Blending and Overlays styles are accomplised by another function
+ */
+static VOID
+IMAGELIST_InternalDraw(IMAGELISTDRAWPARAMS *pimldp, INT cx, INT cy)
+{
+    HDC hImageDC;
+    HBITMAP hOldBitmap;
+    hImageDC = CreateCompatibleDC(0);
+    hOldBitmap = SelectObject(hImageDC, pimldp->himl->hbmImage);
+    BitBlt(pimldp->hdcDst,
+        pimldp->x, pimldp->y, cx, cy,
+        hImageDC,
+        pimldp->himl->cx * pimldp->i, 0,
+        SRCCOPY);
+
+    SelectObject(hImageDC, hOldBitmap);
+    DeleteDC(hImageDC);
+}
+
+
+/*************************************************************************
+ * IMAGELIST_InternalDrawMask [Internal]
+ *
+ * Draws the image in the ImageList witht the mask
+ *
+ * PARAMS
+ *     pimldp        [I] pointer to IMAGELISTDRAWPARAMS structure.
+ *     cx            [I] the width of the image to display
+ *     cy............[I] the height of the image to display
+ *
+ * RETURNS
+ *     nothing
+ *
+ * NOTES
+ *     This functions is used by ImageList_DrawIndirect, when it is
+ *     required to draw the Image with the mask to the screen.
+ *
+ *     Blending and Overlays styles are accomplised by another function.
+ */
+static VOID
+IMAGELIST_InternalDrawMask(IMAGELISTDRAWPARAMS *pimldp, INT cx, INT cy)
+{
+    HDC     hMaskDC, hImageDC;
+    BOOL bUseCustomBackground, bBlendFlag;
+    HBRUSH hBrush, hOldBrush;
+    HBITMAP hOldBitmapImage, hOldBitmapMask;
+    HIMAGELIST himlLocal = pimldp->himl;
+
+    bUseCustomBackground = (himlLocal->clrBk != CLR_NONE);
+    bBlendFlag = (pimldp->fStyle & ILD_BLEND50 )
+        || (pimldp->fStyle & ILD_BLEND25);
+
+    hImageDC = CreateCompatibleDC(0);
+    hMaskDC = CreateCompatibleDC(0);
+
+    hOldBitmapImage = SelectObject(hImageDC, himlLocal->hbmImage);
+    hOldBitmapMask = SelectObject(hMaskDC, himlLocal->hbmMask);
+    /* Draw the Background for the appropriate Styles
+    */
+    if( bUseCustomBackground && (pimldp->fStyle == ILD_NORMAL
+          || pimldp->fStyle & ILD_IMAGE
+          || bBlendFlag))
+    {
+        hBrush = CreateSolidBrush (himlLocal->clrBk);
+        hOldBrush = SelectObject (pimldp->hdcDst, hBrush);
+        PatBlt (pimldp->hdcDst,
+            pimldp->x, pimldp->y, cx, cy,
+            PATCOPY);
+
+        DeleteObject (SelectObject (pimldp->hdcDst, hOldBrush));
+    }
+
+    /* Draw Image Transparently over the current background
+    */
+    if(pimldp->fStyle == ILD_NORMAL
+        || pimldp->fStyle & ILD_TRANSPARENT
+        || ((pimldp->fStyle & ILD_IMAGE) && bUseCustomBackground)
+        || bBlendFlag)
+    {
+        BitBlt(pimldp->hdcDst,
+            pimldp->x, pimldp->y, cx, cy,
+            hMaskDC,
+            himlLocal->cx * pimldp->i, 0,
+            SRCAND);
+
+        BitBlt(pimldp->hdcDst,
+            pimldp->x, pimldp->y, cx, cy,
+            hImageDC,
+            himlLocal->cx * pimldp->i, 0,
+            SRCPAINT);
+    }
+    /* Draw the image when no Background is specified
+    */
+    else if(pimldp->fStyle & ILD_IMAGE && !bUseCustomBackground)
+    {
+        BitBlt(pimldp->hdcDst,
+            pimldp->x, pimldp->y, cx, cy,
+            hImageDC,
+            himlLocal->cx * pimldp->i, 0,
+            SRCCOPY);
+    }
+    /* Draw the mask with or without a background
+    */
+    else if(pimldp->fStyle & ILD_MASK)
+    {
+        BitBlt(pimldp->hdcDst,
+            pimldp->x, pimldp->y, cx, cy,
+            hMaskDC,
+            himlLocal->cx * pimldp->i, 0,
+            bUseCustomBackground ? SRCCOPY : SRCAND);
+    }
+    SelectObject(hImageDC, hOldBitmapImage);
+    SelectObject(hMaskDC, hOldBitmapMask);
+    DeleteDC(hImageDC);
+    DeleteDC(hMaskDC);
+}
+
+/*************************************************************************
+ * IMAGELIST_InternalDrawBlend [Internal]
+ *
+ * Draws the Blend over the current image
+ *
+ * PARAMS
+ *     pimldp        [I] pointer to IMAGELISTDRAWPARAMS structure.
+ *     cx            [I] the width of the image to display
+ *     cy............[I] the height of the image to display
+ *
+ * RETURNS
+ *     nothing
+ *
+ * NOTES
+ *     This functions is used by ImageList_DrawIndirect, when it is
+ *     required to add the blend to the current image.
+ *
+ */
+static VOID
+IMAGELIST_InternalDrawBlend(IMAGELISTDRAWPARAMS *pimldp, INT cx, INT cy)
+{
+
+    HDC         hBlendMaskDC,hMaskDC;
+    HBRUSH      hBlendColorBrush, hBlendBrush, hOldBrush;
+    HBITMAP     hBlendMaskBitmap, hOldBitmap;
+    COLORREF    clrBlend, OldTextColor, OldBkColor;
+    HIMAGELIST  himlLocal = pimldp->himl;
+
+    clrBlend = GetSysColor (COLOR_HIGHLIGHT);
+    if (!(pimldp->rgbFg == CLR_DEFAULT))
+    {
+        clrBlend = pimldp->rgbFg;
+    }
+    /* Create the blend Mask
+    */
+    hBlendMaskDC = CreateCompatibleDC(0);
+    hBlendBrush = pimldp->fStyle & ILD_BLEND50 ?
+        himlLocal->hbrBlend50 : himlLocal->hbrBlend25;
+
+    hBlendMaskBitmap = CreateBitmap(cx, cy, 1, 1, NULL);
+    hOldBitmap = SelectObject(hBlendMaskDC, hBlendMaskBitmap);
+
+    hOldBrush = (HBRUSH) SelectObject(hBlendMaskDC, hBlendBrush);
+    PatBlt(hBlendMaskDC, 0, 0, cx, cy, PATCOPY);
+    SelectObject(hBlendMaskDC, hOldBrush);
+
+    /* Modify the blend mask if an Image Mask exist
+    */
+    if(pimldp->himl->hbmMask != 0)
+    {
+        HBITMAP hOldMaskBitmap;
+        hMaskDC = CreateCompatibleDC(0);
+        hOldMaskBitmap = (HBITMAP) SelectObject(hMaskDC, himlLocal->hbmMask);
+
+        BitBlt(hBlendMaskDC,
+            0,0, cx, cy,
+            hMaskDC,
+            himlLocal->cx * pimldp->i,0,
+            0x220326); /* NOTSRCAND */
+
+        BitBlt(hBlendMaskDC,
+            0,0, cx, cy,
+            hBlendMaskDC,
+            0,0,
+            NOTSRCCOPY);
+
+        SelectObject(hMaskDC, hOldMaskBitmap);
+        DeleteDC(hMaskDC);
+
+    }
+    /* Apply blend to the current image given the BlendMask
+    */
+    OldTextColor = SetTextColor(pimldp->hdcDst, 0);
+    OldBkColor = SetBkColor(pimldp->hdcDst, RGB(255,255,255));
+    hBlendColorBrush = CreateSolidBrush(clrBlend);
+    hOldBrush = (HBRUSH) SelectObject (pimldp->hdcDst, hBlendColorBrush);
+
+    BitBlt (pimldp->hdcDst,
+        pimldp->x, pimldp->y, cx, cy,
+        hBlendMaskDC,
+        0, 0,
+        0xB8074A); /* PSDPxax */
+
+    SelectObject(pimldp->hdcDst, hOldBrush);
+    SetTextColor(pimldp->hdcDst, OldTextColor);
+    SetBkColor(pimldp->hdcDst, OldBkColor);
+    SelectObject(hBlendMaskDC, hOldBitmap);
+    DeleteDC(hBlendMaskDC);
+    DeleteObject(hBlendMaskBitmap);
+    DeleteObject(hBlendColorBrush);
+}
+
+/*************************************************************************
+ * IMAGELIST_InternalDrawOverlay [Internal]
+ *
+ * Draws the overlay image
+ *
+ * PARAMS
+ *     pimldp        [I] pointer to IMAGELISTDRAWPARAMS structure.
+ *     cx            [I] the width of the image to display
+ *     cy............[I] the height of the image to display
+ *
+ * RETURNS
+ *     nothing
+ *
+ * NOTES
+ *     This functions is used by ImageList_DrawIndirect, when it is
+ *     required to draw the overlay
+ *
+ *
+ */
+static VOID
+IMAGELIST_InternalDrawOverlay(IMAGELISTDRAWPARAMS *pimldp, INT cx, INT cy)
+{
+    INT     nOvlIdx;
+    HDC     hImageDC;
+    HBITMAP hOldBitmap;
+
+    nOvlIdx = (pimldp->fStyle & 0x0700) >> 8;
+    if ((nOvlIdx >= 1) && (nOvlIdx <= MAX_OVERLAYIMAGE))
+    {
+        nOvlIdx = pimldp->himl->nOvlIdx[nOvlIdx - 1];
+        if ((nOvlIdx >= 0) && (nOvlIdx <= pimldp->himl->cCurImage))
+        {
+            hImageDC = CreateCompatibleDC(0);
+            if (pimldp->himl->hbmMask)
+            {
+                hOldBitmap = (HBITMAP) SelectObject (hImageDC,
+                    pimldp->himl->hbmMask);
+
+                BitBlt (pimldp->hdcDst,
+                    pimldp->x, pimldp->y, cx, cy,
+                    hImageDC, pimldp->himl->cx * nOvlIdx, 0,
+                    SRCAND);
+
+                SelectObject(hImageDC, hOldBitmap);
+            }
+            hOldBitmap = (HBITMAP) SelectObject (hImageDC,
+                pimldp->himl->hbmImage);
+
+            BitBlt (pimldp->hdcDst,
+                pimldp->x, pimldp->y, cx, cy,
+                hImageDC,
+                pimldp->himl->cx * nOvlIdx, 0,
+                SRCPAINT);
+
+            SelectObject(hImageDC, hOldBitmap);
+            DeleteDC(hImageDC);
+        }
+    }
+}
+
+
+
+
+
 INT WINAPI
 ImageList_Add (HIMAGELIST himl, HBITMAP hbmImage, HBITMAP hbmMask)
 {
-    HDC    hdcSrc, hdcDst;
-    INT    nFirstIndex, nImageCount;
-    INT    nStartX;
-    BITMAP bmp;
+    HDC     hdcImage, hdcBitmap;
+    INT     nFirstIndex, nImageCount;
+    INT     nStartX;
+    BITMAP  bmp;
+    HBITMAP hOldBitmapImage, hOldBitmap;
 
     if (!himl || !hbmImage)
-        return -1;
+      return -1;
 
     GetObjectA (hbmImage, sizeof(BITMAP), (LPVOID)&bmp);
@@ -161 +452 @@
     nStartX = himl->cCurImage * himl->cx;
 
-    hdcSrc = CreateCompatibleDC (0);
-    hdcDst = CreateCompatibleDC (0);
-
-    /* copy image bitmap */
-    SelectObject (hdcDst, himl->hbmImage);
-    SelectObject (hdcSrc, hbmImage);
-    BitBlt (hdcDst, himl->cCurImage * himl->cx, 0,
-              bmp.bmWidth, himl->cy, hdcSrc, 0, 0, SRCCOPY);
-
-    if (himl->hbmMask) {
-        if (hbmMask) {
-            /* copy mask bitmap */
-            SelectObject (hdcDst, himl->hbmMask);
-            SelectObject (hdcSrc, hbmMask);
-            BitBlt (hdcDst, nStartX, 0, bmp.bmWidth, himl->cy,
-                      hdcSrc, 0, 0, SRCCOPY);
-        }
-        else {
-            /* copy monochrome image to the mask bitmap */
-            SelectObject (hdcDst, himl->hbmMask);
-            SelectObject (hdcSrc, hbmImage);
-            SetBkColor (hdcSrc, GetNearestColor (hdcSrc,
-                          GetPixel (hdcSrc, 0, 0)));
-            BitBlt (hdcDst, nStartX, 0, bmp.bmWidth, himl->cy,
-                      hdcSrc, nStartX, 0, SRCCOPY);
-        }
-    }
-
-    DeleteDC (hdcSrc);
-    DeleteDC (hdcDst);
+    hdcImage  = CreateCompatibleDC(0);
+    hdcBitmap = CreateCompatibleDC(0);
+
+    hOldBitmapImage = SelectObject(hdcImage, himl->hbmImage);
+    hOldBitmap = SelectObject(hdcBitmap, hbmImage);
+
+    /* Copy result to the imagelist
+    */
+    BitBlt (hdcImage, nStartX, 0, bmp.bmWidth, himl->cy,
+        hdcBitmap, 0, 0, SRCCOPY);
+
+    if(himl->hbmMask)
+    {
+        HDC hdcMask, hdcTemp, hOldBitmapMask, hOldBitmapTemp;
+
+        hdcMask   = CreateCompatibleDC (0);
+        hdcTemp   = CreateCompatibleDC(0);
+        hOldBitmapMask = (HBITMAP) SelectObject(hdcMask, himl->hbmMask);
+        hOldBitmapTemp = (HBITMAP) SelectObject(hdcTemp, hbmMask);
+
+        BitBlt (hdcMask,
+            nStartX, 0, bmp.bmWidth, himl->cy,
+            hdcTemp,
+            0, 0,
+            SRCCOPY);
+
+        SelectObject(hdcTemp, hOldBitmapTemp);
+        DeleteDC(hdcTemp);
+
+        /* Remove the background from the image
+        */
+        BitBlt (hdcImage,
+            nStartX, 0, bmp.bmWidth, himl->cy,
+            hdcMask,
+            nStartX, 0,
+            0x220326); /* NOTSRCAND */
+
+        SelectObject(hdcMask, hOldBitmapMask);
+        DeleteDC(hdcMask);
+    }
+
+    SelectObject(hdcImage, hOldBitmapImage);
+    SelectObject(hdcBitmap, hOldBitmap);
+    DeleteDC(hdcImage);
+    DeleteDC(hdcBitmap);
 
     nFirstIndex = himl->cCurImage;
@@ -240 +546 @@
 {
     HDC    hdcImage, hdcMask, hdcBitmap;
-    INT    nIndex, nImageCount;
+    INT    nIndex, nImageCount, nMaskXOffset=0;
     BITMAP bmp;
+    HBITMAP hOldBitmap, hOldBitmapMask, hOldBitmapImage;
+    HBITMAP hMaskBitmap=0;
+    COLORREF bkColor;
 
     if (himl == NULL)
@@ -252 +561 @@
 
     if (himl->cCurImage + nImageCount >= himl->cMaxImage)
+    {
         IMAGELIST_InternalExpandBitmaps (himl, nImageCount);
+    }
 
     nIndex = himl->cCurImage;
     himl->cCurImage += nImageCount;
 
-    hdcImage  = CreateCompatibleDC (0);
-    hdcBitmap = CreateCompatibleDC (0);
-
-    SelectObject (hdcBitmap, hBitmap);
-    SelectObject (hdcImage, himl->hbmImage);
-    BitBlt (hdcImage, nIndex * himl->cx, 0, bmp.bmWidth, himl->cy,
-              hdcBitmap, 0, 0, SRCCOPY);
-
-    if (himl->hbmMask) {
-        COLORREF bkColor = (clrMask != CLR_DEFAULT) ? clrMask :
-            GetNearestColor (hdcBitmap, GetPixel (hdcBitmap, 0, 0));
-
-        /* create mask from image */
-        hdcMask = CreateCompatibleDC (0);
-        SelectObject (hdcMask, himl->hbmMask);
-
-        /* create monochrome image to the mask bitmap */
-        SetBkColor (hdcBitmap, bkColor);
-        BitBlt (hdcMask, nIndex * himl->cx, 0, bmp.bmWidth, himl->cy,
-                  hdcBitmap, 0, 0, SRCCOPY);
-
-        DeleteDC (hdcMask);
-    }
-
-    DeleteDC (hdcImage);
-    DeleteDC (hdcBitmap);
+    hdcMask   = CreateCompatibleDC (0);
+    hdcImage  = CreateCompatibleDC(0);
+    hdcBitmap = CreateCompatibleDC(0);
+
+
+    hOldBitmapImage = SelectObject(hdcImage, himl->hbmImage);
+    hOldBitmap = SelectObject(hdcBitmap, hBitmap);
+    if(himl->hbmMask)
+    {
+        hOldBitmapMask = SelectObject(hdcMask, himl->hbmMask);
+        nMaskXOffset = nIndex * himl->cx;
+    }
+    else
+    {
+        /*
+            Create a temp Mask so we can remove the background of
+            the Image (Windows does this even if there is no mask)
+        */
+        hMaskBitmap = CreateBitmap(bmp.bmWidth, himl->cy, 1, 1, NULL);
+        hOldBitmapMask = SelectObject(hdcMask, hMaskBitmap);
+        nMaskXOffset = 0;
+    }
+    /* create monochrome image to the mask bitmap */
+    bkColor = (clrMask != CLR_DEFAULT) ? clrMask :
+        GetPixel (hdcBitmap, 0, 0);
+    SetBkColor (hdcBitmap, bkColor);
+    BitBlt (hdcMask,
+        nMaskXOffset, 0, bmp.bmWidth, himl->cy,
+        hdcBitmap, 0, 0,
+        SRCCOPY);
+
+    SetBkColor(hdcBitmap, RGB(255,255,255));
+    /*Remove the background from the image
+    */
+    /*
+        WINDOWS BUG ALERT!!!!!!
+        The statement below should not be done in common practice
+        but this is how ImageList_AddMasked works in Windows.
+        It overwrites the original bitmap passed, this was discovered
+        by using the same bitmap to itterated the different styles
+        on windows where it failed (BUT ImageList_Add is OK)
+        This is here in case some apps really on this bug
+    */
+    BitBlt(hdcBitmap,
+        0, 0, bmp.bmWidth, himl->cy,
+        hdcMask,
+        nMaskXOffset, 0,
+        0x220326); /* NOTSRCAND */
+    /* Copy result to the imagelist
+    */
+    BitBlt (hdcImage,
+        nIndex * himl->cx, 0, bmp.bmWidth, himl->cy,
+        hdcBitmap,
+        0, 0,
+        SRCCOPY);
+    /* Clean up
+    */
+    SelectObject(hdcMask,hOldBitmapMask);
+    SelectObject(hdcImage, hOldBitmapImage);
+    SelectObject(hdcBitmap, hOldBitmap);
+    DeleteDC(hdcMask);
+    DeleteDC(hdcImage);
+    DeleteDC(hdcBitmap);
+    if(!himl->hbmMask)
+    {
+        DeleteObject(hMaskBitmap);
+    }
 
     return nIndex;
@@ -878 +1230 @@
 ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp)
 {
-    HIMAGELIST himlLocal;
-    HDC      hdcImageList, hdcTempImage;
-    HBITMAP  hbmTempImage;
-    HBRUSH   hBrush, hOldBrush;
     INT      cx, cy;
-    INT      nOvlIdx;
-    COLORREF   clrBlend;
-    BOOL     bImage;       /* draw image ? */
-    BOOL     bImageTrans;  /* draw image transparent ? */
-    BOOL     bMask;        /* draw mask ? */
-    BOOL     bMaskTrans;   /* draw mask transparent ? */
-    BOOL     bBlend25;
-    BOOL     bBlend50;
-
+    /*
+        Do some Error Checking
+    */
     if (pimldp == NULL)
         return FALSE;
@@ -900 +1242 @@
     if ((pimldp->i < 0) || (pimldp->i > pimldp->himl->cCurImage))
         return FALSE;
-
-    himlLocal = pimldp->himl;
-
-    cx = (pimldp->cx == 0) ? himlLocal->cx : pimldp->cx;
-    cy = (pimldp->cy == 0) ? himlLocal->cy : pimldp->cy;
-
-    /* ILD_NORMAL state */
-    bImage      = TRUE;
-    bImageTrans = FALSE;
-    bMask       = FALSE;
-    bMaskTrans  = FALSE;
-    bBlend25    = FALSE;
-    bBlend50    = FALSE;
-    if ((himlLocal->clrBk == CLR_NONE) && (himlLocal->hbmMask))
+    /*
+        Get the Height and Width to display
+    */
+    cx = (pimldp->cx == 0) ? pimldp->himl->cx : pimldp->cx;
+    cy = (pimldp->cy == 0) ? pimldp->himl->cy : pimldp->cy;
+    /*
+        Draw the image
+    */
+    if(pimldp->himl->hbmMask != 0)
     {
-        bImageTrans = TRUE;
-        bMask = TRUE;
-        bMaskTrans = TRUE;
-    }
-
-    /* ILD_IMAGE state (changes) */
-    if (pimldp->fStyle & ILD_IMAGE)
+        IMAGELIST_InternalDrawMask(pimldp, cx, cy);
+    }
+    else
     {
-        bMask = FALSE;
-        bImage = TRUE;
-        bImageTrans = FALSE;
-    }
-
-    /* ILD_MASK state (changes) */
-    if ((pimldp->fStyle & ILD_MASK) && (himlLocal->hbmMask))
+        IMAGELIST_InternalDraw(pimldp, cx, cy);
+    }
+    /*
+        Apply the blend if needed to the Image
+    */
+    if((pimldp->fStyle & ILD_BLEND50)
+        || (pimldp->fStyle & ILD_BLEND25))
     {
-        bMask  = TRUE;
-        bMaskTrans = FALSE;
-        bImage = FALSE;
-    }
-    if ((pimldp->fStyle & ILD_TRANSPARENT) && (himlLocal->hbmMask))
+        IMAGELIST_InternalDrawBlend(pimldp, cx, cy);
+    }
+    /*
+        Apply the Overlay if needed
+    */
+    if (pimldp->fStyle & 0x0700)
     {
-        bMaskTrans = TRUE;
-        bImageTrans = TRUE;
-    }
-    if ((himlLocal->clrBk == CLR_NONE) && (himlLocal->hbmMask))
-        bMaskTrans = TRUE;
-
-    if (pimldp->fStyle & ILD_BLEND50)
-        bBlend50 = TRUE;
-    else if (pimldp->fStyle & ILD_BLEND25)
-        bBlend25 = TRUE;
-
-    hdcImageList = CreateCompatibleDC (0);
-
-    if (bMask)
-    {
-        /* draw the mask */
-        SelectObject (hdcImageList, himlLocal->hbmMask);
-        SetBkColor (hdcImageList, RGB(255, 255, 255));
-        SetTextColor (hdcImageList, RGB(0, 0, 0));
-        BitBlt (pimldp->hdcDst, pimldp->x, pimldp->y, cx, cy,
-                  hdcImageList, himlLocal->cx * pimldp->i, 0,
-                  bMaskTrans ? SRCAND : SRCCOPY);
-    }
-
-    if (bImage)
-    {
-        /* draw the image */
-        SelectObject (hdcImageList, himlLocal->hbmImage);
-
-        if (!bImageTrans)
-        {
-            hBrush = CreateSolidBrush (himlLocal->clrBk);
-            hOldBrush = SelectObject (pimldp->hdcDst, hBrush);
-            PatBlt (pimldp->hdcDst, pimldp->x, pimldp->y,
-                      cx, cy, PATCOPY);
-            DeleteObject (SelectObject (pimldp->hdcDst, hOldBrush));
-        }
-
-        BitBlt (pimldp->hdcDst, pimldp->x, pimldp->y, cx, cy,
-                  hdcImageList, himlLocal->cx * pimldp->i, 0, SRCPAINT);
-
-        if (bBlend25 || bBlend50)
-        {
-            if (pimldp->rgbFg == CLR_DEFAULT)
-                clrBlend = GetSysColor (COLOR_HIGHLIGHT);
-            else
-                clrBlend = pimldp->rgbFg;
-
-            hdcTempImage = CreateCompatibleDC (0);
-            hbmTempImage = CreateBitmap (himlLocal->cx, himlLocal->cy,
-                                           1, himlLocal->uBitsPixel, NULL);
-            SelectObject (hdcTempImage, hbmTempImage);
-
-
-            /* mask */
-            SelectObject (hdcTempImage,
-                            bBlend50 ? himlLocal->hbrBlend50 : himlLocal->hbrBlend25);
-            PatBlt (hdcTempImage, 0, 0, himlLocal->cx, himlLocal->cy, PATCOPY);
-
-            SelectObject (hdcImageList, himlLocal->hbmMask);
-            BitBlt (hdcTempImage, 0, 0, himlLocal->cx,
-                      himlLocal->cy, hdcImageList,
-                      pimldp->i * himlLocal->cx, 0, SRCPAINT);
-
-            BitBlt (pimldp->hdcDst, pimldp->x, pimldp->y, cx, cy,
-                      hdcTempImage, 0, 0, SRCAND);
-
-            /* fill */
-            hBrush = CreateSolidBrush (clrBlend);
-            SelectObject (hdcTempImage, hBrush);
-            PatBlt (hdcTempImage, 0, 0, himlLocal->cx, himlLocal->cy, PATCOPY);
-            DeleteObject (hBrush);
-
-            SelectObject (hdcTempImage,
-                            bBlend50 ? himlLocal->hbrBlend50 : himlLocal->hbrBlend25);
-            PatBlt (hdcTempImage, 0, 0, himlLocal->cx, himlLocal->cy, 0x0A0329);
-
-            SelectObject (hdcImageList, himlLocal->hbmMask);
-            BitBlt (hdcTempImage, 0, 0, himlLocal->cx,
-                      himlLocal->cy, hdcImageList,
-                      pimldp->i * himlLocal->cx, 0, SRCPAINT);
-
-            BitBlt (pimldp->hdcDst, pimldp->x, pimldp->y, cx, cy,
-                      hdcTempImage, 0, 0, SRCPAINT);
-
-            DeleteObject (hbmTempImage);
-            DeleteDC (hdcTempImage);
-        }
-    }
-
-    /* Draw overlay image */
-    if (pimldp->fStyle & 0x0700) {
-        nOvlIdx = (pimldp->fStyle & 0x0700) >> 8;
-        if ((nOvlIdx >= 1) && (nOvlIdx <= MAX_OVERLAYIMAGE)) {
-            nOvlIdx = pimldp->himl->nOvlIdx[nOvlIdx - 1];
-            if ((nOvlIdx >= 0) && (nOvlIdx <= pimldp->himl->cCurImage)) {
-                if (pimldp->himl->hbmMask) {
-                    SelectObject (hdcImageList, pimldp->himl->hbmMask);
-                    BitBlt (pimldp->hdcDst, pimldp->x, pimldp->y, cx, cy,
-                              hdcImageList, pimldp->himl->cx * nOvlIdx, 0,
-                              SRCAND);
-                }
-                SelectObject (hdcImageList, pimldp->himl->hbmImage);
-                BitBlt (pimldp->hdcDst, pimldp->x, pimldp->y,
-                          cx, cy, hdcImageList,
-                          pimldp->himl->cx * nOvlIdx, 0, SRCPAINT);
-            }
-        }
-    }
-
-    DeleteDC (hdcImageList);
+        IMAGELIST_InternalDrawOverlay(pimldp, cx, cy);
+    }
 
     return TRUE;
@@ -1211 +1436 @@
     ICONINFO ii;
     HICON  hIcon;
+    HBITMAP hOldSrcBitmap,hOldDstBitmap;
     HDC    hdcSrc, hdcDst;
 
     if ((himl == NULL) || (i < 0) || (i >= himl->cCurImage))
-        return 0;
+        return 0;
 
     hdcSrc = CreateCompatibleDC(0);
@@ -1221 +1447 @@
     ii.fIcon = TRUE;
     ii.hbmMask  = CreateCompatibleBitmap (hdcDst, himl->cx, himl->cy);
-    ii.hbmColor = CreateCompatibleBitmap (hdcDst, himl->cx, himl->cy);
-
 
     /* draw mask*/
-    SelectObject (hdcDst, ii.hbmMask);
+    hOldDstBitmap = (HBITMAP)SelectObject (hdcDst, ii.hbmMask);
     if (himl->hbmMask) {
-        SelectObject (hdcSrc, himl->hbmMask);
-        BitBlt (hdcDst, 0, 0, himl->cx, himl->cy,
-                  hdcSrc, i * himl->cx, 0, SRCCOPY);
+        SelectObject (hdcSrc, himl->hbmMask);
+        BitBlt (hdcDst, 0, 0, himl->cx, himl->cy,
+                  hdcSrc, i * himl->cx, 0, SRCCOPY);
     }
     else
-        PatBlt (hdcDst, 0, 0, himl->cx, himl->cy, BLACKNESS);
+        PatBlt (hdcDst, 0, 0, himl->cx, himl->cy, BLACKNESS);
 
     /* draw image*/
+    hOldSrcBitmap = (HBITMAP)SelectObject (hdcSrc, himl->hbmImage);
+    ii.hbmColor = CreateCompatibleBitmap (hdcSrc, himl->cx, himl->cy);
     SelectObject (hdcDst, ii.hbmColor);
-    SelectObject (hdcSrc, himl->hbmImage);
     BitBlt (hdcDst, 0, 0, himl->cx, himl->cy,
-              hdcSrc, i * himl->cx, 0, SRCCOPY);
+              hdcSrc, i * himl->cx, 0, SRCCOPY);
+
+    /*
+     * CreateIconIndirect requires us to deselect the bitmaps from
+     * the DCs before calling
+     */
+    SelectObject(hdcSrc, hOldSrcBitmap);
+    SelectObject(hdcDst, hOldDstBitmap);
 
     hIcon = CreateIconIndirect (&ii);

trunk/src/comctl32/ipaddress.c ¶

@@ -1 @@
-/* $Id: ipaddress.c,v 1.6 1999-07-12 15:58:47 cbratschi Exp $ */
+/* $Id: ipaddress.c,v 1.7 1999-08-14 16:13:11 cbratschi Exp $ */
 /*
  * IP Address control
@@ -597 +597 @@
 }
 
-LRESULT WINAPI
+static LRESULT WINAPI
 IPADDRESS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {

trunk/src/comctl32/listview.c ¶

@@ -2 +2 @@
  * Listview control
  *
- * Copyright 1998 Eric Kohl
+ * Copyright 1998, 1999 Eric Kohl
  * Copyright 1999 Luc Tourangeau
  * Copyright 1999 Achim Hasenmueller
@@ -13 +13 @@
  *   1. No horizontal scrolling when header is larger than the client area.
  *   2. Drawing optimizations.
+ *   3. Hot item handling.
  *
  * Notifications:
@@ -21 +22 @@
  *
  * Unicode:
- *   LISTVIEW_SetItem32W : no unicode support
- *   LISTVIEW_InsertItem32W : no unicode support
- *   LISTVIEW_InsertColumn32W : no unicode support
+ *   LISTVIEW_SetItemW : no unicode support
+ *   LISTVIEW_InsertItemW : no unicode support
+ *   LISTVIEW_InsertColumnW : no unicode support
  *   LISTVIEW_GetColumnW : no unicode support
+ *   LISTVIEW_SetColumnW : no unicode support
  *
  * Advanced functionality:
  *   LISTVIEW_GetNumberOfWorkAreas : not implemented
  *   LISTVIEW_GetHotCursor : not implemented
- *   LISTVIEW_GetHotItem : not implemented
  *   LISTVIEW_GetHoverTime : not implemented
  *   LISTVIEW_GetISearchString : not implemented
@@ -35 +36 @@
  *   LISTVIEW_EditLabel : REPORT (need to implement a timer)
  *   LISTVIEW_GetColumnOrderArray : not implemented
+ *   LISTVIEW_SetColumnOrderArray : not implemented
  *   LISTVIEW_Arrange : empty stub
  *   LISTVIEW_ApproximateViewRect : incomplete
@@ -3157 +3159 @@
 
 /* LISTVIEW_GetEditControl */
-/* LISTVIEW_GetExtendedListViewStyle */
+
+/***
+ * DESCRIPTION:
+ * Retrieves the extended listview style.
+ *
+ * PARAMETERS:
+ * [I] HWND  : window handle
+ *
+ * RETURN:
+ *   SUCCESS : previous style
+ *   FAILURE : 0
+ */
+static LRESULT LISTVIEW_GetExtendedListViewStyle(HWND hwnd)
+{
+    LISTVIEW_INFO *infoPtr;
+    /* make sure we can get the listview info */
+    if (!(infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0)))
+        return (0);
+    return (infoPtr->dwExStyle);
+}
 
 /***
@@ -3412 +3433 @@
 /* LISTVIEW_GetItemW */
 /* LISTVIEW_GetHotCursor */
-/* LISTVIEW_GetHotItem */
-/* LISTVIEW_GetHoverTime> */
+
+/***
+ * DESCRIPTION:
+ * Retrieves the index of the hot item.
+ *
+ * PARAMETERS:
+ * [I] HWND  : window handle
+ *
+ * RETURN:
+ *   SUCCESS : hot item index
+ *   FAILURE : -1 (no hot item)
+ */
+static LRESULT LISTVIEW_GetHotItem(HWND hwnd)
+{
+    LISTVIEW_INFO *infoPtr;
+    /* make sure we can get the listview info */
+    if (!(infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0)))
+        return (-1);
+    return (infoPtr->nHotItem);
+}
+
+/* LISTVIEW_GetHoverTime */
 
 /***
@@ -4628 +4669 @@
 }
 
+/* LISTVIEW_SetBkImage */
+
 /***
  * DESCRIPTION:
@@ -4758 +4801 @@
 }
 
+/* LISTVIEW_SetColumnW */
+/* LISTVIEW_SetColumnOrderArray */
+
 /***
  * DESCRIPTION:
@@ -4809 +4855 @@
 /***
  * DESCRIPTION:
+ * Sets the extended listview style.
+ *
+ * PARAMETERS:
+ * [I] HWND  : window handle
+ * [I] DWORD : mask
+ * [I] DWORD : style
+ *
+ * RETURN:
+ *   SUCCESS : previous style
+ *   FAILURE : 0
+ */
+static LRESULT LISTVIEW_SetExtendedListViewStyle(HWND hwnd, DWORD dwMask, DWORD dwStyle)
+{
+    LISTVIEW_INFO *infoPtr;
+    DWORD dwOldStyle;
+    /* make sure we can get the listview info */
+    if (!(infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0)))
+        return (0);
+    /* store previous style */
+    dwOldStyle = infoPtr->dwExStyle;
+    /* set new style */
+    infoPtr->dwExStyle = (dwOldStyle & ~dwMask) | (dwStyle & dwMask);
+    return (dwOldStyle);
+}
+
+/* LISTVIEW_SetHotCursor */
+
+/***
+ * DESCRIPTION:
+ * Sets the hot item index.
+ *
+ * PARAMETERS:
+ * [I] HWND  : window handle
+ * [I] INT   : index
+ *
+ * RETURN:
+ *   SUCCESS : previous hot item index
+ *   FAILURE : -1 (no hot item)
+ */
+static LRESULT LISTVIEW_SetHotItem(HWND hwnd, INT iIndex)
+{
+    LISTVIEW_INFO *infoPtr;
+    INT iOldIndex;
+    /* make sure we can get the listview info */
+    if (!(infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0)))
+        return (-1);
+    /* store previous index */
+    iOldIndex = infoPtr->nHotItem;
+    /* set new style */
+    infoPtr->nHotItem = iIndex;
+    return (iOldIndex);
+}
+
+/* LISTVIEW_SetIconSpacing */
+
+/***
+ * DESCRIPTION:
  * Sets image lists.
  *
@@ -4893 +4996 @@
  * [I] HWND : window handle
  * [I] INT : item count (prjected number of items)
- *
- * RETURN:
- * None
- */
-static VOID LISTVIEW_SetItemCount(HWND hwnd, INT nItemCount)
-{
-  FIXME("empty stub!\n");
+ * [I] DWORD : update flags
+ *
+ * RETURN:
+ *   SUCCESS : TRUE
+ *   FAILURE : FALSE
+ */
+static BOOL LISTVIEW_SetItemCount(HWND hwnd, INT nItems, DWORD dwFlags)
+{
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO*)GetWindowLongA(hwnd, 0);
+  FIXME("(%d %08lx)empty stub!\n", nItems, dwFlags);
+  if (nItems == 0)
+    return LISTVIEW_DeleteAllItems (hwnd);
+  if (nItems > GETITEMCOUNT(infoPtr))
+{
+    /* append items */
+    FIXME("append items\n");
+  }
+  else if (nItems < GETITEMCOUNT(infoPtr))
+  {
+    /* remove items */
+    FIXME("remove items\n");
+  }
+  return TRUE;
 }
 
@@ -4947 +5066 @@
   return bResult;
 }
+
+/* LISTVIEW_SetItemPosition32 */
 
 /***
@@ -5031 +5152 @@
 }
 
+/* LISTVIEW_SetItemTextW */
+
+/***
+ * DESCRIPTION:
+ * Set item index that marks the start of a multiple selection.
+ *
+ * PARAMETER(S):
+ * [I] HWND : window handle
+ * [I] INT  : index
+ *
+ * RETURN:
+ * Index number or -1 if there is no selection mark.
+ */
+static LRESULT LISTVIEW_SetSelectionMark(HWND hwnd, INT nIndex)
+{
+  LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
+  INT nOldIndex = infoPtr->nSelectionMark;
+  infoPtr->nSelectionMark = nIndex;
+  return nOldIndex;
+}
+
 /***
  * DESCRIPTION:
@@ -5075 +5217 @@
 }
 
+/* LISTVIEW_SetToolTips */
+/* LISTVIEW_SetUnicodeFormat */
+/* LISTVIEW_SetWorkAreas */
 
 /***
@@ -5163 +5308 @@
 }
 
+/* LISTVIEW_SubItemHitTest */
+
 /***
  * DESCRIPTION:
@@ -5241 +5388 @@
   infoPtr->nFocusedItem = -1;
   infoPtr->nSelectionMark = -1;
+  infoPtr->nHotItem = -1;
   infoPtr->iconSpacing.cx = GetSystemMetrics(SM_CXICONSPACING);
   infoPtr->iconSpacing.cy = GetSystemMetrics(SM_CYICONSPACING);
@@ -6433 +6581 @@
  *
  */
-LRESULT WINAPI LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam,
+static LRESULT WINAPI LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam,
                                    LPARAM lParam)
 {
@@ -6475 +6623 @@
 
 /*      case LVM_GETCOLUMNW: */
-/*      case LVM_GETCOLUMNORDERARRAY: */
+
+  case LVM_GETCOLUMNORDERARRAY:
+    //FIXME("Unimplemented msg LVM_GETCOLUMNORDERARRAY\n");
+    return 0;
+
 
   case LVM_GETCOLUMNWIDTH:
@@ -6484 +6636 @@
 
 /*      case LVM_GETEDITCONTROL: */
-/*      case LVM_GETEXTENDEDLISTVIEWSTYLE: */
+  case LVM_GETEXTENDEDLISTVIEWSTYLE:
+    return LISTVIEW_GetExtendedListViewStyle(hwnd);
 
   case LVM_GETHEADER:
@@ -6490 +6643 @@
 
 /*      case LVM_GETHOTCURSOR: */
-/*      case LVM_GETHOTITEM: */
+
+  case LVM_GETHOTITEM:
+    return LISTVIEW_GetHotItem(hwnd);
+
 /*      case LVM_GETHOVERTIME: */
 
@@ -6593 +6749 @@
     return LISTVIEW_SetColumnA(hwnd, (INT)wParam, (LPLVCOLUMNA)lParam);
 
-/*      case LVM_SETCOLUMNW: */
-/*      case LVM_SETCOLUMNORDERARRAY: */
+  case LVM_SETCOLUMNW:
+    //FIXME("Unimplemented msg LVM_SETCOLUMNW\n");
+    return 0;
+
+  case LVM_SETCOLUMNORDERARRAY:
+    //FIXME("Unimplemented msg LVM_SETCOLUMNORDERARRAY\n");
+    return 0;
 
   case LVM_SETCOLUMNWIDTH:
     return LISTVIEW_SetColumnWidth(hwnd, (INT)wParam, (INT)lParam);
 
-/*      case LVM_SETEXTENDEDLISTVIEWSTYLE: */
+  case LVM_SETEXTENDEDLISTVIEWSTYLE:
+    return LISTVIEW_SetExtendedListViewStyle(hwnd, (DWORD)wParam, (DWORD)lParam);
+
 /*      case LVM_SETHOTCURSOR: */
-/*      case LVM_SETHOTITEM: */
+
+  case LVM_SETHOTITEM:
+    return LISTVIEW_SetHotItem(hwnd, (INT)wParam);
+
 /*      case LVM_SETHOVERTIME: */
 /*      case LVM_SETICONSPACING: */
@@ -6614 +6780 @@
 
   case LVM_SETITEMCOUNT:
-    LISTVIEW_SetItemCount(hwnd, (INT)wParam);
-    break;
+    return LISTVIEW_SetItemCount(hwnd, (INT)wParam, (DWORD)lParam);
 
   case LVM_SETITEMPOSITION:
@@ -6621 +6786 @@
                                     (INT)HIWORD(lParam));
 
-/*      case LVM_SETITEMPOSITION: */
+/*      case LVM_SETITEMPOSITION32: */
 
   case LVM_SETITEMSTATE:
@@ -6629 +6794 @@
     return LISTVIEW_SetItemTextA(hwnd, (INT)wParam, (LPLVITEMA)lParam);
 
-/*      case LVM_SETSELECTIONMARK: */
+/*      case LVM_SETITEMTEXTW: */
+
+  case LVM_SETSELECTIONMARK:
+    return LISTVIEW_SetSelectionMark(hwnd, (INT)lParam);
 
   case LVM_SETTEXTBKCOLOR:

trunk/src/comctl32/monthcal.c ¶

@@ -1 @@
-/* $Id: monthcal.c,v 1.3 1999-06-10 16:22:01 achimha Exp $ */
-/*
- * Month calendar control
+
+/* Month calendar control
+
+
  *
- * Copyright 1998, 1999 Eric Kohl
- * Copyright 1999 Achim Hasenmueller
- *
- * NOTES
- *   This is just a dummy control. An author is needed! Any volunteers?
- *   I will only improve this control once in a while.
- *     Eric <ekohl@abo.rhein-zeitung.de>
+ * Copyright 1998, 1999 Eric Kohl (ekohl@abo.rhein-zeitung.de)
+ * Copyright 1999  Alex Priem (alexp@sci.kun.nl)
+ * Copyright 1999 Christoph Bratschi
  *
  * TODO:
- *   - All messages.
- *   - All notifications.
+ *   - Notifications.
  *
+ *
+ *  FIXME: refresh should ask for rect of required length. (?)
+ *  FIXME: we refresh to often; especially in LButtonDown/MouseMove.
+ *  FIXME: handle resources better (doesn't work now); also take care
+           of internationalization.
+ *  FIXME: keyboard handling.
  */
 
 #include "winbase.h"
+#include "win.h"
 #include "commctrl.h"
+#include "comctl32.h"
 #include "monthcal.h"
-
+#include "winnls.h"
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+//DEFAULT_DEBUG_CHANNEL(monthcal)
+
+/* take #days/month from ole/parsedt.c;
+ * we want full month-names, and abbreviated weekdays, so these are
+ * defined here */
 
 #define MONTHCAL_GetInfoPtr(hwnd) ((MONTHCAL_INFO *)GetWindowLongA (hwnd, 0))
 
-
-
-
+/* helper functions
+ * MONTHCAL_ValidateTime: is time a valid date/time combo?
+ */
+
+int mdays[] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31, 0};
+
+int DayOfWeekTable[] = {0, 3, 2, 5, 0, 3, 5, 1, 4, 6, 2, 4};
+
+static char *daytxt[] = {"Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun" };
+
+static char *monthtxt[] = {"January", "February", "March", "April", "May",
+                           "June", "July", "August", "September", "October",
+                           "November", "December"};
+
+/* CHECKME: all these validations OK? */
+
+static int MONTHCAL_ValidateTime (SYSTEMTIME time)
+
+{
+ if (time.wMonth > 12) return FALSE;
+ if (time.wDayOfWeek > 6) return FALSE;
+ if (time.wDay > mdays[time.wMonth]) return FALSE;
+ if (time.wMonth > 23) return FALSE;
+ if (time.wMinute > 60) return FALSE;
+ if (time.wSecond > 60) return FALSE;
+ if (time.wMilliseconds > 100) return FALSE;
+ return TRUE;
+}
+
+void MONTHCAL_CopyTime (const SYSTEMTIME *from, SYSTEMTIME *to)
+
+{
+ to->wYear=from->wYear;
+ to->wMonth=from->wMonth;
+ to->wDayOfWeek=from->wDayOfWeek;
+ to->wDay=from->wDay;
+ to->wHour=from->wHour;
+ to->wMinute=from->wMinute;
+ to->wSecond=from->wSecond;
+ to->wMilliseconds=from->wMilliseconds;
+}
+
+
+/* Note:Depending on DST, this may be offset by a day.
+   Need to find out if we're on a DST place & adjust the clock accordingly.
+   Above function assumes we have a valid data.
+   Valid for year>1752;  d <= 1 <= 31, 1 <= m <= 12.
+   0=Monday.
+*/
+
+
+int MONTHCAL_CalculateDayOfWeek (DWORD day, DWORD month, DWORD year)
+
+{
+ year -= month < 3;
+ return (year + year/4 - year/100 + year/400 +
+         DayOfWeekTable[month-1] + day - 1 ) % 7;
+}
+
+
+static int MONTHCAL_CalcDayFromPos (MONTHCAL_INFO *infoPtr, int x, int y)
+
+{
+    int daypos,weekpos,retval,firstDay;
+
+    daypos=(x - infoPtr->prevmonth.left) / infoPtr->textWidth ;
+    weekpos=(y - infoPtr->days.bottom - infoPtr->rcClient.top) /
+                     (infoPtr->textHeight*1.25);
+        firstDay=MONTHCAL_CalculateDayOfWeek (1,infoPtr->currentMonth,infoPtr->currentYear);
+    retval=daypos + 7*weekpos - firstDay;
+        //TRACE ("%d %d %d\n",daypos,weekpos,retval);
+        return retval;
+}
+
+
+static void MONTHCAL_CalcDayXY (MONTHCAL_INFO *infoPtr, int day, int month,
+                                 int *x, int *y)
+
+{
+  int firstDay,prevMonth;
+
+  firstDay=MONTHCAL_CalculateDayOfWeek (1,infoPtr->currentMonth,infoPtr->currentYear);
+
+  if (month==infoPtr->currentMonth) {
+        *x=(day+firstDay) & 7;
+        *y=(day+firstDay-*x) / 7;
+                return;
+        }
+  if (month < infoPtr->currentMonth) {
+                prevMonth=month - 1;
+                if (prevMonth==0) prevMonth=11;
+        *x=(mdays[prevMonth]-firstDay) & 7;
+                *y=0;
+        }
+
+  *y=mdays[month] / 7;
+  *x=(day+firstDay+mdays[month]) & 7;
+}
+
+
+static void MONTHCAL_CalcDayRect (MONTHCAL_INFO *infoPtr, RECT *r, int x, int y)
+{
+  r->left   = infoPtr->prevmonth.left + x * infoPtr->textWidth;
+  r->right  = r->left + infoPtr->textWidth;
+  r->top    = infoPtr->rcClient.top + y * 1.25 * infoPtr->textHeight
+                                   + infoPtr->days.bottom;
+  r->bottom = r->top + infoPtr->textHeight;
+
+}
+
+static void MONTHCAL_CalcPosFromDay (MONTHCAL_INFO *infoPtr,
+                                            int day, int month, RECT *r)
+
+{
+  int x,y;
+
+  MONTHCAL_CalcDayXY (infoPtr, day, month, &x, &y);
+  MONTHCAL_CalcDayRect (infoPtr, r, x, y);
+}
+
+
+
+
+static void MONTHCAL_CircleDay (HDC hdc, MONTHCAL_INFO *infoPtr, int i, int j)
+
+{
+        HPEN hRedPen = CreatePen(PS_SOLID, 2, RGB (255,0,0) );
+    HPEN hOldPen2 = SelectObject( hdc, hRedPen );
+        POINT points[7];
+        int x,y;
+
+ /* use prevmonth to calculate position because it contains the extra width
+  * from MCS_WEEKNUMBERS
+  */
+
+        x=infoPtr->prevmonth.left + (i+0.5)*infoPtr->textWidth;
+        y=infoPtr->rcClient.top + 1.25*(j+0.5)*infoPtr->textHeight + infoPtr->days.bottom;
+        points[0].x = x;
+        points[0].y = y-0.25*infoPtr->textHeight;
+        points[1].x = x-1.0*infoPtr->textWidth;
+        points[1].y = y;
+        points[2].x = x;
+        points[2].y = y+0.6*infoPtr->textHeight;
+        points[3].x = x+0.5*infoPtr->textWidth;
+        points[3].y = y;
+        points[4].x = x+0.3*infoPtr->textWidth;
+        points[4].y = y-0.5*infoPtr->textHeight;
+        points[5].x = x-0.25*infoPtr->textWidth;
+        points[5].y = y-0.5*infoPtr->textHeight;
+        points[6].x = x-0.5*infoPtr->textWidth;
+        points[6].y = y-0.45*infoPtr->textHeight;
+
+        PolyBezier (hdc,points,4);
+        PolyBezier (hdc,points+3,4);
+    DeleteObject (hRedPen);
+        SelectObject (hdc, hOldPen2);
+}
+
+
+
+
+
+static void MONTHCAL_DrawDay (HDC hdc, MONTHCAL_INFO *infoPtr,
+                                                        int day, int month, int x, int y, int bold)
+
+{
+  char buf[10];
+  RECT r;
+  static int haveBoldFont,haveSelectedDay=FALSE;
+  HBRUSH hbr;
+  COLORREF oldCol,oldBk;
+
+  sprintf (buf,"%d",day);
+
+
+
+/* No need to check styles: when selection is not valid, it is set to zero.
+ * 1<day<31, so evertyhing's OK.
+ */
+
+  MONTHCAL_CalcDayRect (infoPtr, &r, x, y);
+
+  if ((day>=infoPtr->minSel.wDay) && (day<=infoPtr->maxSel.wDay)
+      && (month==infoPtr->currentMonth)) {
+                HRGN hrgn;
+                RECT r2;
+
+                //TRACE ("%d %d %d\n",day,infoPtr->minSel.wDay,infoPtr->maxSel.wDay);
+                //TRACE ("%d %d %d %d\n", r.left, r.top, r.right, r.bottom);
+                oldCol=SetTextColor (hdc, infoPtr->monthbk);
+                oldBk=SetBkColor (hdc,infoPtr->trailingtxt);
+                hbr= GetSysColorBrush (COLOR_GRAYTEXT);
+                hrgn=CreateEllipticRgn (r.left,r.top, r.right,r.bottom);
+                FillRgn (hdc,hrgn,hbr);
+
+                r2.left   = r.left-0.25*infoPtr->textWidth;
+                r2.top    = r.top;
+                r2.right  = r.left+0.5*infoPtr->textWidth;
+                r2.bottom = r.bottom;
+                if (haveSelectedDay) FillRect (hdc,&r2,hbr);
+                haveSelectedDay=TRUE;
+        } else {
+                haveSelectedDay=FALSE;
+        }
+
+
+
+/* need to add some code for multiple selections */
+
+  if ((bold) && (!haveBoldFont)) {
+        SelectObject (hdc, infoPtr->hBoldFont);
+                haveBoldFont=TRUE;
+        }
+  if ((!bold) && (haveBoldFont)) {
+        SelectObject (hdc, infoPtr->hFont);
+                haveBoldFont=FALSE;
+        }
+
+
+
+  DrawTextA ( hdc, buf, lstrlenA(buf), &r,
+                         DT_CENTER | DT_VCENTER | DT_SINGLELINE );
+  if (haveSelectedDay) {
+                SetTextColor(hdc, oldCol);
+                SetBkColor (hdc, oldBk);
+        }
+
+  if ((day==infoPtr->curSelDay) && (month==infoPtr->currentMonth)) {
+                HPEN hNewPen, hOldPen;
+
+                hNewPen = CreatePen(PS_DOT, 0, GetSysColor(COLOR_WINDOWTEXT) );
+                hbr= GetSysColorBrush (COLOR_WINDOWTEXT);
+                hOldPen = SelectObject( hdc, hNewPen );
+                r.left+=2;
+                r.right-=2;
+                r.top-=1;
+                r.bottom+=1;
+                FrameRect (hdc, &r, hbr);
+                SelectObject( hdc, hOldPen );
+  }
+}
+
+
+/* CHECKME: For `todays date', do we need to check the locale?*/
+/* CHECKME: For `todays date', how do is Y2K handled?*/
+/* FIXME:  todays date circle */
+
+static void MONTHCAL_Refresh (HWND hwnd, HDC hdc)
+
+{
+    MONTHCAL_INFO *infoPtr=MONTHCAL_GetInfoPtr(hwnd);
+        RECT *rcClient=&infoPtr->rcClient;
+        RECT *title=&infoPtr->title;
+        RECT *prev=&infoPtr->titlebtnprev;
+        RECT *next=&infoPtr->titlebtnnext;
+        RECT *titlemonth=&infoPtr->titlemonth;
+        RECT *titleyear=&infoPtr->titleyear;
+        RECT *prevmonth=&infoPtr->prevmonth;
+        RECT *nextmonth=&infoPtr->nextmonth;
+        RECT *days=&infoPtr->days;
+        RECT *weeknums=&infoPtr->weeknums;
+        RECT *rtoday=&infoPtr->today;
+    int i,j,m,mask,day,firstDay, weeknum,prevMonth;
+    int textHeight,textWidth;
+        SIZE size;
+        HBRUSH hbr;
+    HFONT currentFont;
+        TEXTMETRICA tm;
+/*    LOGFONTA logFont; */
+        char buf[20],*thisMonthtxt;
+    COLORREF oldTextColor,oldBkColor;
+    DWORD dwStyle = GetWindowLongA (hwnd, GWL_STYLE);
+        BOOL prssed;
+
+
+    oldTextColor = SetTextColor(hdc, GetSysColor( COLOR_WINDOWTEXT));
+
+    currentFont = SelectObject (hdc, infoPtr->hFont);
+
+        /* FIXME: need a way to determine current font, without setting it */
+/*
+        if (infoPtr->hFont!=currentFont) {
+        SelectObject (hdc, currentFont);
+                infoPtr->hFont=currentFont;
+                GetObjectA (currentFont, sizeof (LOGFONTA), &logFont);
+        logFont.lfWeight=FW_BOLD;
+        infoPtr->hBoldFont = CreateFontIndirectA (&logFont);
+        }
+*/
+
+        GetTextMetricsA (hdc, &tm);
+        infoPtr->textHeight=textHeight=tm.tmHeight + tm.tmExternalLeading;
+    GetTextExtentPoint32A (hdc, "Sun",3, &size);
+        infoPtr->textWidth=textWidth=size.cx+2;
+
+    GetClientRect (hwnd, rcClient);
+    hbr =  CreateSolidBrush (RGB(255,255,255));
+    DrawEdge (hdc, rcClient, EDGE_SUNKEN, BF_RECT | BF_ADJUST);
+    FillRect (hdc, rcClient, hbr);
+    DeleteObject (hbr);
+
+/* calculate whole client area & title area */
+
+        infoPtr->rcClient.right=7*infoPtr->textWidth;
+        if (dwStyle & MCS_WEEKNUMBERS)
+          infoPtr->rcClient.right+=infoPtr->textWidth;
+
+        title->top    = rcClient->top + 1;
+        title->bottom = title->top + 2*textHeight + 4;
+        title->left   = rcClient->left + 1;
+        title->right  = rcClient->right - 1;
+        infoPtr->rcClient.bottom=title->bottom + 6*textHeight;
+
+
+/* draw header */
+
+    hbr =  CreateSolidBrush (infoPtr->titlebk);
+    FillRect (hdc, title, hbr);
+
+        prev->top                 = next->top        = title->top + 6;
+        prev->bottom      = next->bottom     = title->top + 2*textHeight - 3;
+        prev->right       = title->left  + 28;
+        prev->left        = title->left  + 4;
+        next->left        = title->right - 28;
+        next->right       = title->right - 4;
+        titlemonth->bottom= titleyear->bottom = prev->top + 2*textHeight - 3;
+        titlemonth->top   = titleyear->top    = title->top + 6;
+        titlemonth->left  = title->left;
+        titlemonth->right = title->right;
+        prssed=FALSE;
+
+        if (!(infoPtr->status & MC_PREVPRESSED))
+           DrawFrameControl(hdc, prev, DFC_SCROLL,
+                        DFCS_SCROLLLEFT | (dwStyle & WS_DISABLED ? DFCS_INACTIVE : 0) );
+
+        if (!(infoPtr->status & MC_NEXTPRESSED))
+        DrawFrameControl(hdc, next, DFC_SCROLL,
+                DFCS_SCROLLRIGHT | (dwStyle & WS_DISABLED ? DFCS_INACTIVE : 0) );
+
+    oldBkColor=SetBkColor (hdc,infoPtr->titlebk);
+    SetTextColor(hdc, infoPtr->titletxt);
+        SelectObject (hdc, infoPtr->hBoldFont);
+
+        thisMonthtxt=monthtxt[infoPtr->currentMonth - 1];
+        sprintf (buf,"%s %ld",thisMonthtxt,infoPtr->currentYear);
+    DrawTextA ( hdc, buf, strlen(buf), titlemonth,
+                        DT_CENTER | DT_VCENTER | DT_SINGLELINE );
+        SelectObject (hdc, infoPtr->hFont);
+
+ /* titlemonth left/right contained rect for whole titletxt ('June  1999')
+  * MCM_HitTestInfo wants month & year rects, so prepare these now.
+  * (no, we can't draw them separately; the whole text is centered)
+  */
+
+    GetTextExtentPoint32A (hdc, buf,lstrlenA (buf), &size);
+        titlemonth->left = title->right/2 - size.cx/2;
+        titleyear->right = title->right/2 + size.cx/2;
+    GetTextExtentPoint32A (hdc, thisMonthtxt,lstrlenA (thisMonthtxt), &size);
+    titlemonth->right= titlemonth->left+size.cx;
+    titleyear->right = titlemonth->right;
+
+/* draw line under day abbreviatons */
+
+         if (dwStyle & MCS_WEEKNUMBERS)
+                MoveToEx (hdc, rcClient->left+textWidth+3,
+                       title->bottom + textHeight + 2, NULL);
+         else
+                MoveToEx (hdc, rcClient->left+3, title->bottom + textHeight + 2, NULL);
+     LineTo   (hdc, rcClient->right-3, title->bottom + textHeight + 2);
+
+/* draw day abbreviations */
+
+    SetBkColor (hdc, infoPtr->monthbk);
+    SetTextColor(hdc, infoPtr->trailingtxt);
+
+        days->left   = rcClient->left;
+        if (dwStyle & MCS_WEEKNUMBERS) days->left+=textWidth;
+    days->right  = days->left + textWidth;
+    days->top    = title->bottom + 2;
+    days->bottom = title->bottom + textHeight + 2;
+        i=infoPtr->firstDay;
+
+        for (j=0; j<7; j++) {
+            DrawTextA ( hdc, daytxt[i], strlen(daytxt[i]), days,
+                         DT_CENTER | DT_VCENTER | DT_SINGLELINE );
+                        i++;
+                        if (i>7) i-=7;
+                        days->left+=textWidth;
+                        days->right+=textWidth;
+        }
+
+        days->left   = rcClient->left + j;
+        if (dwStyle & MCS_WEEKNUMBERS) days->left+=textWidth;
+    days->right  = rcClient->left + (j+1)*textWidth-2;
+
+/* draw day numbers; first, the previous month */
+
+        prevmonth->left=0;
+        if (dwStyle & MCS_WEEKNUMBERS) prevmonth->left=textWidth;
+
+        firstDay=MONTHCAL_CalculateDayOfWeek (1,infoPtr->currentMonth,infoPtr->currentYear);
+        prevMonth=infoPtr->currentMonth-1;
+        if (prevMonth==0) prevMonth=11;
+        day=mdays[prevMonth]-firstDay;
+        mask=1<<(day-1);
+
+        i=0;
+        m=0;
+        while (day<=mdays[prevMonth]) {
+                        MONTHCAL_DrawDay (hdc, infoPtr, day, prevMonth, i, 0,
+                                                infoPtr->monthdayState[m] & mask);
+                        mask<<=1;
+                        day++;
+                        i++;
+        }
+
+        prevmonth->right = prevmonth->left+i*textWidth;
+        prevmonth->top   = days->bottom;
+        prevmonth->bottom= prevmonth->top + textHeight;
+
+/* draw `current' month  */
+
+        day=1;
+        infoPtr->firstDayplace=i;
+    SetTextColor(hdc, infoPtr->txt);
+        m++;
+        mask=1;
+        while (i<7) {
+                        MONTHCAL_DrawDay (hdc, infoPtr, day, infoPtr->currentMonth, i, 0,
+                                                infoPtr->monthdayState[m] & mask);
+                        if ((infoPtr->currentMonth==infoPtr->todaysDate.wMonth) &&
+                (day==infoPtr->todaysDate.wDay))
+                                        MONTHCAL_CircleDay (hdc, infoPtr, i,j);
+                        mask<<=1;
+                        day++;
+                        i++;
+                }
+
+        j=1;
+        i=0;
+        while (day<=mdays[infoPtr->currentMonth]) {
+                        MONTHCAL_DrawDay (hdc, infoPtr, day, infoPtr->currentMonth, i, j,
+                                                infoPtr->monthdayState[m] & mask);
+                        if ((infoPtr->currentMonth==infoPtr->todaysDate.wMonth) &&
+                (day==infoPtr->todaysDate.wDay))
+                                        MONTHCAL_CircleDay (hdc, infoPtr, i,j);
+                        mask<<=1;
+                        day++;
+                        i++;
+                        if (i>6) {
+                                i=0;
+                                j++;
+                        }
+        }
+
+/*  draw `next' month */
+
+/* note: the nextmonth rect only hints for the `half-week' that needs to be
+ * drawn to complete the current week. An eventual next week that needs to
+ * be drawn to complete the month calendar is not taken into account in
+ * this rect -- HitTest knows about this.*/
+
+
+
+        nextmonth->left   = prevmonth->left+i*textWidth;
+        nextmonth->right  = rcClient->right;
+        nextmonth->top    = days->bottom+(j+1)*textHeight;
+        nextmonth->bottom = nextmonth->top + textHeight;
+
+        day=1;
+        m++;
+        mask=1;
+    SetTextColor(hdc, infoPtr->trailingtxt);
+        while ((i<7) && (j<6)) {
+                        MONTHCAL_DrawDay (hdc, infoPtr, day, infoPtr->currentMonth+1, i, j,
+                                                infoPtr->monthdayState[m] & mask);
+                        mask<<=1;
+                        day++;
+                        i++;
+                        if (i==7) {
+                                i=0;
+                                j++;
+                        }
+        }
+    SetTextColor(hdc, infoPtr->txt);
+
+
+
+/* draw `today' date if style allows it, and draw a circle before today's
+ * date if necessairy */
+
+        if (!( dwStyle & MCS_NOTODAY))  {
+        int offset=0;
+        if (!( dwStyle & MCS_NOTODAYCIRCLE))  {
+                        MONTHCAL_CircleDay (hdc, infoPtr, 0, 6);
+                        offset+=textWidth;
+                }
+
+                MONTHCAL_CalcDayRect (infoPtr, rtoday, offset==textWidth, 6);
+                sprintf (buf,"Today: %d/%d/%d",infoPtr->todaysDate.wMonth,
+                        infoPtr->todaysDate.wDay, infoPtr->todaysDate.wYear-1900);
+                rtoday->right  = rcClient->right;
+        SelectObject (hdc, infoPtr->hBoldFont);
+            DrawTextA ( hdc, buf, lstrlenA(buf), rtoday,
+                         DT_LEFT | DT_VCENTER | DT_SINGLELINE );
+        SelectObject (hdc, infoPtr->hFont);
+        }
+
+        if (dwStyle & MCS_WEEKNUMBERS)  {
+                        /* display weeknumbers*/
+
+                weeknums->left   = 0;
+                weeknums->right  = textWidth;
+                weeknums->top    = days->bottom + 2;
+                weeknums->bottom = days->bottom + 2 + textHeight;
+
+                weeknum=0;
+                for (i=0; i<infoPtr->currentMonth-1; i++)
+                        weeknum+=mdays[i];
+
+                weeknum/=7;
+                for (i=0; i<6; i++) {
+                        sprintf (buf,"%d",weeknum+i);
+                DrawTextA ( hdc, buf, lstrlenA(buf), weeknums,
+                         DT_CENTER | DT_BOTTOM | DT_SINGLELINE );
+                        weeknums->top+=textHeight*1.25;
+                        weeknums->bottom+=textHeight*1.25;
+                }
+
+            MoveToEx (hdc, weeknums->right, days->bottom+5 , NULL);
+        LineTo   (hdc, weeknums->right, weeknums->bottom-1.25*textHeight-5);
+
+        }
+
+                                 /* currentFont was font at entering Refresh */
+
+    SetBkColor (hdc, oldBkColor);
+    SelectObject (hdc, currentFont);
+    SetTextColor (hdc, oldTextColor);
+}
+
+
+static LRESULT
+MONTHCAL_GetMinReqRect (HWND hwnd, WPARAM wParam, LPARAM lParam)
+
+{
+    MONTHCAL_INFO *infoPtr=MONTHCAL_GetInfoPtr(hwnd);
+        LPRECT lpRect=(LPRECT) lParam;
+        //TRACE ("%x %lx\n",wParam,lParam);
+
+  /* validate parameters */
+
+    if ( (infoPtr==NULL) || (lpRect == NULL) ) return FALSE;
+
+        lpRect->left=infoPtr->rcClient.left;
+        lpRect->right=infoPtr->rcClient.right;
+        lpRect->top=infoPtr->rcClient.top;
+        lpRect->bottom=infoPtr->rcClient.bottom;
+        return TRUE;
+}
+
+static LRESULT
+MONTHCAL_GetColor (HWND hwnd, WPARAM wParam, LPARAM lParam)
+
+{
+    MONTHCAL_INFO *infoPtr=MONTHCAL_GetInfoPtr(hwnd);
+
+        //TRACE ("%x %lx\n",wParam,lParam);
+
+        switch ((int)wParam) {
+                case MCSC_BACKGROUND:
+                        return infoPtr->bk;
+                case MCSC_TEXT:
+                        return infoPtr->txt;
+                case MCSC_TITLEBK:
+                        return infoPtr->titlebk;
+                case MCSC_TITLETEXT:
+                        return infoPtr->titletxt;
+                case MCSC_MONTHBK:
+                        return infoPtr->monthbk;
+                case MCSC_TRAILINGTEXT:
+                        return infoPtr->trailingtxt;
+        }
+
+ return -1;
+}
+
+static LRESULT
+MONTHCAL_SetColor (HWND hwnd, WPARAM wParam, LPARAM lParam)
+
+{
+    MONTHCAL_INFO *infoPtr=MONTHCAL_GetInfoPtr(hwnd);
+        int prev=-1;
+
+        //TRACE ("%x %lx\n",wParam,lParam);
+
+        switch ((int)wParam) {
+                case MCSC_BACKGROUND:
+                        prev=infoPtr->bk;
+                        infoPtr->bk=(COLORREF) lParam;
+                        break;
+                case MCSC_TEXT:
+                        prev=infoPtr->txt;
+                        infoPtr->txt=(COLORREF) lParam;
+                        break;
+                case MCSC_TITLEBK:
+                        prev=infoPtr->titlebk;
+                        infoPtr->titlebk=(COLORREF) lParam;
+                        break;
+                case MCSC_TITLETEXT:
+                        prev=infoPtr->titletxt;
+                        infoPtr->titletxt=(COLORREF) lParam;
+                        break;
+                case MCSC_MONTHBK:
+                        prev=infoPtr->monthbk;
+                        infoPtr->monthbk=(COLORREF) lParam;
+                        break;
+                case MCSC_TRAILINGTEXT:
+                        prev=infoPtr->trailingtxt;
+                        infoPtr->trailingtxt=(COLORREF) lParam;
+                        break;
+        }
+
+ return prev;
+}
+
+static LRESULT
+MONTHCAL_GetMonthDelta (HWND hwnd, WPARAM wParam, LPARAM lParam)
+
+{
+    MONTHCAL_INFO *infoPtr=MONTHCAL_GetInfoPtr(hwnd);
+
+        //TRACE ("%x %lx\n",wParam,lParam);
+
+        if (infoPtr->delta) return infoPtr->delta;
+        else return infoPtr->visible;
+}
+
+static LRESULT
+MONTHCAL_SetMonthDelta (HWND hwnd, WPARAM wParam, LPARAM lParam)
+
+{
+    MONTHCAL_INFO *infoPtr=MONTHCAL_GetInfoPtr(hwnd);
+    int prev=infoPtr->delta;
+
+        //TRACE ("%x %lx\n",wParam,lParam);
+
+        infoPtr->delta=(int) wParam;
+        return prev;
+}
+
+
+
+static LRESULT
+MONTHCAL_GetFirstDayOfWeek (HWND hwnd, WPARAM wParam, LPARAM lParam)
+{
+    MONTHCAL_INFO *infoPtr=MONTHCAL_GetInfoPtr(hwnd);
+
+        return infoPtr->firstDay;
+}
+
+/* FIXME: we need more error checking here */
+
+static LRESULT
+MONTHCAL_SetFirstDayOfWeek (HWND hwnd, WPARAM wParam, LPARAM lParam)
+
+{
+    MONTHCAL_INFO *infoPtr=MONTHCAL_GetInfoPtr(hwnd);
+    int prev=infoPtr->firstDay;
+        char buf[40];
+        int day;
+
+        //TRACE ("%x %lx\n",wParam,lParam);
+
+        if ((lParam>=0) && (lParam<7)) {
+                        infoPtr->firstDay=(int) lParam;
+                        GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_IFIRSTDAYOFWEEK,
+                buf, sizeof(buf));
+                //TRACE ("%s %d\n",buf,strlen(buf));
+            if ((sscanf(buf,"%d",&day)==1) && (infoPtr->firstDay!=day))
+                                infoPtr->firstDay|=HIWORD(TRUE);
+
+        }
+    return prev;
+}
+
+
+
+/* FIXME: fill this in */
+
+static LRESULT
+MONTHCAL_GetMonthRange (HWND hwnd, WPARAM wParam, LPARAM lParam)
+{
+  MONTHCAL_INFO *infoPtr=MONTHCAL_GetInfoPtr(hwnd);
+
+  //TRACE ("%x %lx\n",wParam,lParam);
+
+  return infoPtr->monthRange;
+}
+
+static LRESULT
+MONTHCAL_GetMaxTodayWidth (HWND hwnd)
+
+{
+ MONTHCAL_INFO *infoPtr=MONTHCAL_GetInfoPtr(hwnd);
+
+ return (infoPtr->today.right-infoPtr->today.left);
+}
+
+/* FIXME: are validated times taken from current date/time or simply
+ * copied?
+ * FIXME:    check whether MCM_GETMONTHRANGE shows correct result after
+ *            adjusting range with MCM_SETRANGE
+ */
+
+static LRESULT
+MONTHCAL_SetRange (HWND hwnd, WPARAM wParam, LPARAM lParam)
+{
+  MONTHCAL_INFO *infoPtr=MONTHCAL_GetInfoPtr(hwnd);
+  SYSTEMTIME lprgSysTimeArray[1];
+  int prev;
+
+  //TRACE ("%x %lx\n",wParam,lParam);
+
+  if (wParam & GDTR_MAX) {
+                if (MONTHCAL_ValidateTime(lprgSysTimeArray[1])){
+                        MONTHCAL_CopyTime (&lprgSysTimeArray[1],&infoPtr->maxDate);
+                        infoPtr->rangeValid|=GDTR_MAX;
+                } else  {
+                        GetSystemTime (&infoPtr->todaysDate);
+                        MONTHCAL_CopyTime (&infoPtr->todaysDate,&infoPtr->maxDate);
+                        }
+                }
+  if (wParam & GDTR_MIN) {
+                if (MONTHCAL_ValidateTime(lprgSysTimeArray[0])) {
+                        MONTHCAL_CopyTime (&lprgSysTimeArray[0],&infoPtr->maxDate);
+                        infoPtr->rangeValid|=GDTR_MIN;
+                } else {
+                        GetSystemTime (&infoPtr->todaysDate);
+                        MONTHCAL_CopyTime (&infoPtr->todaysDate,&infoPtr->maxDate);
+                        }
+            }
+
+  prev=infoPtr->monthRange;
+  infoPtr->monthRange=infoPtr->maxDate.wMonth-infoPtr->minDate.wMonth;
+  if (infoPtr->monthRange!=prev)
+        COMCTL32_ReAlloc (infoPtr->monthdayState,
+                infoPtr->monthRange*sizeof(MONTHDAYSTATE));
+
+  return 1;
+}
+
+
+/* CHECKME: At the moment, we copy ranges anyway,regardless of
+ * infoPtr->rangeValid; a invalid range is simply filled with zeros in
+ * SetRange.  Is this the right behavior?
+*/
+
+static LRESULT
+MONTHCAL_GetRange (HWND hwnd, WPARAM wParam, LPARAM lParam)
+{
+  MONTHCAL_INFO *infoPtr=MONTHCAL_GetInfoPtr(hwnd);
+  SYSTEMTIME *lprgSysTimeArray=(SYSTEMTIME *) lParam;
+
+  /* validate parameters */
+
+  if ( (infoPtr==NULL) || (lprgSysTimeArray==NULL) ) return FALSE;
+
+  MONTHCAL_CopyTime (&infoPtr->maxDate,&lprgSysTimeArray[1]);
+  MONTHCAL_CopyTime (&infoPtr->minDate,&lprgSysTimeArray[0]);
+
+  return infoPtr->rangeValid;
+}
+
+static LRESULT
+MONTHCAL_SetDayState (HWND hwnd, WPARAM wParam, LPARAM lParam)
+
+{
+  MONTHCAL_INFO *infoPtr=MONTHCAL_GetInfoPtr(hwnd);
+  int i,iMonths=(int) wParam;
+  MONTHDAYSTATE *dayStates=(LPMONTHDAYSTATE) lParam;
+
+  //TRACE ("%x %lx\n",wParam,lParam);
+  if (iMonths!=infoPtr->monthRange) return 0;
+
+  for (i=0; i<iMonths; i++)
+                infoPtr->monthdayState[i]=dayStates[i];
+  return 1;
+}
+
+static LRESULT
+MONTHCAL_GetCurSel (HWND hwnd, WPARAM wParam, LPARAM lParam)
+{
+  MONTHCAL_INFO *infoPtr=MONTHCAL_GetInfoPtr(hwnd);
+  SYSTEMTIME *lpSel=(SYSTEMTIME *) lParam;
+
+  //TRACE ("%x %lx\n",wParam,lParam);
+  if ( (infoPtr==NULL) || (lpSel==NULL) ) return FALSE;
+  if ( GetWindowLongA( hwnd, GWL_STYLE) & MCS_MULTISELECT) return FALSE;
+
+  MONTHCAL_CopyTime (&infoPtr->minSel,lpSel);
+  return TRUE;
+}
+
+
+/* FIXME: if the specified date is not visible, make it visible */
+/* FIXME: redraw? */
+
+static LRESULT
+MONTHCAL_SetCurSel (HWND hwnd, WPARAM wParam, LPARAM lParam)
+{
+  MONTHCAL_INFO *infoPtr=MONTHCAL_GetInfoPtr(hwnd);
+  SYSTEMTIME *lpSel=(SYSTEMTIME *) lParam;
+
+  //TRACE ("%x %lx\n",wParam,lParam);
+  if ( (infoPtr==NULL) || (lpSel==NULL) ) return FALSE;
+  if ( GetWindowLongA( hwnd, GWL_STYLE) & MCS_MULTISELECT) return FALSE;
+
+  //TRACE ("%d %d\n",lpSel->wMonth,lpSel->wDay);
+
+  MONTHCAL_CopyTime (lpSel,&infoPtr->minSel);
+  MONTHCAL_CopyTime (lpSel,&infoPtr->maxSel);
+
+  return TRUE;
+}
+
+static LRESULT
+MONTHCAL_GetMaxSelCount (HWND hwnd, WPARAM wParam, LPARAM lParam)
+{
+  MONTHCAL_INFO *infoPtr=MONTHCAL_GetInfoPtr(hwnd);
+
+  //TRACE ("%x %lx\n",wParam,lParam);
+  return infoPtr->maxSelCount;
+}
+
+static LRESULT
+MONTHCAL_SetMaxSelCount (HWND hwnd, WPARAM wParam, LPARAM lParam)
+{
+  MONTHCAL_INFO *infoPtr=MONTHCAL_GetInfoPtr(hwnd);
+
+  //TRACE ("%x %lx\n",wParam,lParam);
+  if ( GetWindowLongA( hwnd, GWL_STYLE) & MCS_MULTISELECT)  {
+                infoPtr->maxSelCount=wParam;
+  }
+
+  return TRUE;
+}
+
+
+static LRESULT
+MONTHCAL_GetSelRange (HWND hwnd, WPARAM wParam, LPARAM lParam)
+{
+  MONTHCAL_INFO *infoPtr=MONTHCAL_GetInfoPtr(hwnd);
+  SYSTEMTIME *lprgSysTimeArray=(SYSTEMTIME *) lParam;
+
+  //TRACE ("%x %lx\n",wParam,lParam);
+
+  /* validate parameters */
+
+  if ( (infoPtr==NULL) || (lprgSysTimeArray==NULL) ) return FALSE;
+
+  if ( GetWindowLongA( hwnd, GWL_STYLE) & MCS_MULTISELECT)  {
+                MONTHCAL_CopyTime (&infoPtr->maxSel,&lprgSysTimeArray[1]);
+        MONTHCAL_CopyTime (&infoPtr->minSel,&lprgSysTimeArray[0]);
+                //TRACE ("[min,max]=[%d %d]\n",infoPtr->minSel.wDay,infoPtr->maxSel.wDay);
+        return TRUE;
+  }
+
+  return FALSE;
+}
+
+static LRESULT
+MONTHCAL_SetSelRange (HWND hwnd, WPARAM wParam, LPARAM lParam)
+{
+  MONTHCAL_INFO *infoPtr=MONTHCAL_GetInfoPtr(hwnd);
+  SYSTEMTIME *lprgSysTimeArray=(SYSTEMTIME *) lParam;
+
+  //TRACE ("%x %lx\n",wParam,lParam);
+
+  /* validate parameters */
+
+  if ( (infoPtr==NULL) || (lprgSysTimeArray==NULL) ) return FALSE;
+
+  if ( GetWindowLongA( hwnd, GWL_STYLE) & MCS_MULTISELECT)  {
+                MONTHCAL_CopyTime (&lprgSysTimeArray[1],&infoPtr->maxSel);
+        MONTHCAL_CopyTime (&lprgSysTimeArray[0],&infoPtr->minSel);
+                //TRACE ("[min,max]=[%d %d]\n",infoPtr->minSel.wDay,infoPtr->maxSel.wDay);
+        return TRUE;
+  }
+
+  return FALSE;
+}
+
+
+
+
+static LRESULT
+MONTHCAL_GetToday (HWND hwnd, WPARAM wParam, LPARAM lParam)
+{
+  MONTHCAL_INFO *infoPtr=MONTHCAL_GetInfoPtr(hwnd);
+  SYSTEMTIME *lpToday=(SYSTEMTIME *) lParam;
+
+  //TRACE ("%x %lx\n",wParam,lParam);
+
+  /* validate parameters */
+
+  if ( (infoPtr==NULL) || (lpToday==NULL) ) return FALSE;
+  MONTHCAL_CopyTime (&infoPtr->todaysDate,lpToday);
+  return TRUE;
+}
+
+
+static LRESULT
+MONTHCAL_SetToday (HWND hwnd, WPARAM wParam, LPARAM lParam)
+{
+  MONTHCAL_INFO *infoPtr=MONTHCAL_GetInfoPtr(hwnd);
+  SYSTEMTIME *lpToday=(SYSTEMTIME *) lParam;
+
+  //TRACE ("%x %lx\n",wParam,lParam);
+
+  /* validate parameters */
+
+  if ( (infoPtr==NULL) || (lpToday==NULL) ) return FALSE;
+  MONTHCAL_CopyTime (lpToday, &infoPtr->todaysDate);
+  return TRUE;
+}
+
+
+
+
+static LRESULT
+MONTHCAL_HitTest (HWND hwnd, LPARAM lParam)
+{
+ MONTHCAL_INFO *infoPtr=MONTHCAL_GetInfoPtr(hwnd);
+ PMCHITTESTINFO lpht=(PMCHITTESTINFO) lParam;
+ UINT x,y;
+ DWORD retval;
+
+ x=lpht->pt.x;
+ y=lpht->pt.y;
+ retval=MCHT_NOWHERE;
+
+
+        /* are we in the header? */
+
+ if (PtInRect (&infoPtr->title, lpht->pt)) {
+
+                if (PtInRect (&infoPtr->titlebtnprev, lpht->pt)) {
+                        retval=MCHT_TITLEBTNPREV;
+                        goto done;
+                }
+                if (PtInRect (&infoPtr->titlebtnnext, lpht->pt)) {
+                        retval=MCHT_TITLEBTNNEXT;
+                        goto done;
+                }
+                if (PtInRect (&infoPtr->titlemonth, lpht->pt)) {
+                        retval=MCHT_TITLEMONTH;
+                        goto done;
+                }
+                if (PtInRect (&infoPtr->titleyear, lpht->pt)) {
+                        retval=MCHT_TITLEYEAR;
+                        goto done;
+                }
+                retval=MCHT_TITLE;
+                goto done;
+        }
+
+ if (PtInRect (&infoPtr->days, lpht->pt)) {
+                retval=MCHT_CALENDARDAY;  /* FIXME: find out which day we're on */
+                goto done;
+        }
+ if (PtInRect (&infoPtr->weeknums, lpht->pt)) {
+                retval=MCHT_CALENDARWEEKNUM;/* FIXME: find out which day we're on */
+                goto done;
+        }
+ if (PtInRect (&infoPtr->prevmonth, lpht->pt)) {
+                retval=MCHT_CALENDARDATEPREV;
+                goto done;
+        }
+ if (PtInRect (&infoPtr->nextmonth, lpht->pt) ||
+    ((x>infoPtr->nextmonth.left) && (x<infoPtr->nextmonth.right) &&
+     (y>infoPtr->nextmonth.bottom) && (y<infoPtr->today.top ))) {
+                retval=MCHT_CALENDARDATENEXT;
+                goto done;
+        }
+
+
+ if (PtInRect (&infoPtr->today, lpht->pt)) {
+                retval=MCHT_TODAYLINK;
+                goto done;
+        }
+
+/* MCHT_CALENDARDATE determination: since the next & previous month have
+ * been handled already (MCHT_CALENDARDATEPREV/NEXT), we only have to check
+ * whether we're in the calendar area. infoPtr->prevMonth.left handles the
+ * MCS_WEEKNUMBERS style nicely.
+ */
+
+
+ //TRACE ("%d %d [%d %d %d %d] [%d %d %d %d]\n",x,y,
+ //       infoPtr->prevmonth.left, infoPtr->prevmonth.right,
+ //       infoPtr->prevmonth.top, infoPtr->prevmonth.bottom,
+ //       infoPtr->nextmonth.left, infoPtr->nextmonth.right,
+ //       infoPtr->nextmonth.top, infoPtr->nextmonth.bottom);
+
+ if ((x>infoPtr->prevmonth.left) && (x<infoPtr->nextmonth.right) &&
+         (y>infoPtr->prevmonth.top) && (y<infoPtr->nextmonth.bottom))  {
+                lpht->st.wYear=infoPtr->currentYear;
+                lpht->st.wMonth=infoPtr->currentMonth;
+
+                lpht->st.wDay=MONTHCAL_CalcDayFromPos (infoPtr,x,y);
+
+                //TRACE ("day hit: %d\n",lpht->st.wDay);
+                retval=MCHT_CALENDARDATE;
+                goto done;
+
+        }
+
+        /* Hit nothing special? What's left must be background :-) */
+
+  retval=MCHT_CALENDARBK;
+ done:
+  lpht->uHit=retval;
+  return retval;
+}
+
+
+
+static void MONTHCAL_GoToNextMonth (HWND hwnd,  MONTHCAL_INFO *infoPtr)
+{
+    DWORD dwStyle = GetWindowLongA (hwnd, GWL_STYLE);
+
+        //TRACE ("\n");
+
+        infoPtr->currentMonth++;
+        if (infoPtr->currentMonth>12) {
+                infoPtr->currentYear++;
+                infoPtr->currentMonth=1;
+        }
+
+        if (dwStyle & MCS_DAYSTATE) {
+                NMDAYSTATE nmds;
+                int i;
+
+        nmds.nmhdr.hwndFrom = hwnd;
+                nmds.nmhdr.idFrom   = GetWindowLongA( hwnd, GWL_ID);
+                nmds.nmhdr.code     = MCN_GETDAYSTATE;
+                nmds.cDayState          = infoPtr->monthRange;
+                nmds.prgDayState        = COMCTL32_Alloc
+                                 (infoPtr->monthRange*sizeof(MONTHDAYSTATE));
+
+                SendMessageA (GetParent (hwnd), WM_NOTIFY,
+                                  (WPARAM)nmds.nmhdr.idFrom, (LPARAM)&nmds);
+                for (i=0; i<infoPtr->monthRange; i++)
+                infoPtr->monthdayState[i]=nmds.prgDayState[i];
+        }
+
+}
+
+
+static void MONTHCAL_GoToPrevMonth (HWND hwnd,  MONTHCAL_INFO *infoPtr)
+{
+    DWORD dwStyle = GetWindowLongA (hwnd, GWL_STYLE);
+
+        //TRACE ("\n");
+
+        infoPtr->currentMonth--;
+        if (infoPtr->currentMonth<1) {
+                infoPtr->currentYear--;
+                infoPtr->currentMonth=12;
+        }
+
+        if (dwStyle & MCS_DAYSTATE) {
+                NMDAYSTATE nmds;
+                int i;
+
+        nmds.nmhdr.hwndFrom = hwnd;
+                nmds.nmhdr.idFrom   = GetWindowLongA( hwnd, GWL_ID);
+                nmds.nmhdr.code     = MCN_GETDAYSTATE;
+                nmds.cDayState          = infoPtr->monthRange;
+                nmds.prgDayState        = COMCTL32_Alloc
+                                 (infoPtr->monthRange*sizeof(MONTHDAYSTATE));
+
+                SendMessageA (GetParent (hwnd), WM_NOTIFY,
+                                 (WPARAM)nmds.nmhdr.idFrom, (LPARAM)&nmds);
+                for (i=0; i<infoPtr->monthRange; i++)
+                infoPtr->monthdayState[i]=nmds.prgDayState[i];
+        }
+}
+
+
+static LRESULT
+MONTHCAL_LButtonDown (HWND hwnd, WPARAM wParam, LPARAM lParam)
+
+{
+    MONTHCAL_INFO *infoPtr = MONTHCAL_GetInfoPtr (hwnd);
+        MCHITTESTINFO ht;
+        HDC hdc;
+        DWORD hit;
+        HMENU hMenu;
+        HWND retval;
+
+
+        //TRACE ("%x %lx\n",wParam,lParam);
+
+    ht.pt.x = (INT)LOWORD(lParam);
+    ht.pt.y = (INT)HIWORD(lParam);
+    hit=MONTHCAL_HitTest (hwnd, (LPARAM) &ht);
+
+    hdc=GetDC (hwnd);
+
+        if (hit & MCHT_NEXT){
+                MONTHCAL_GoToNextMonth (hwnd, infoPtr);
+                infoPtr->status=MC_NEXTPRESSED;
+                SetTimer (hwnd, MC_NEXTMONTHTIMER, MC_NEXTMONTHDELAY,0);
+        }
+        if (hit & MCHT_PREV) {
+                MONTHCAL_GoToPrevMonth (hwnd, infoPtr);
+                infoPtr->status=MC_PREVPRESSED;
+                SetTimer (hwnd, MC_PREVMONTHTIMER, MC_NEXTMONTHDELAY,0);
+        }
+
+        if (hit == MCHT_TITLEMONTH) {
+/*
+                HRSRC hrsrc = FindResourceA( COMCTL32_hModule, MAKEINTRESOURCEA(IDD_MCMONTHMENU), RT_MENUA );
+        if (!hrsrc) {
+                        TRACE ("returning zero\n");
+                        return 0;
+                }
+                TRACE ("resource is:%x\n",hrsrc);
+        hMenu=LoadMenuIndirectA( (LPCVOID)LoadResource( COMCTL32_hModule, hrsrc ));
+
+                TRACE ("menu is:%x\n",hMenu);
+*/
+
+                hMenu=CreateMenu ();
+        AppendMenuA (hMenu,MF_STRING,IDM_JAN,"January");
+        AppendMenuA (hMenu,MF_STRING,IDM_FEB,"February");
+        AppendMenuA (hMenu,MF_STRING,IDM_MAR,"March");
+
+                retval=CreateWindowA (POPUPMENU_CLASS_ATOM, NULL,
+                        WS_CHILD | WS_VISIBLE,
+                        0,0,100,220,
+                        hwnd, hMenu, GetWindowLongA (hwnd, GWL_HINSTANCE), NULL);
+                //TRACE ("hwnd returned:%x\n",retval);
+
+        }
+        if (hit == MCHT_TITLEYEAR) {
+                        //FIXME ("create updown for yearselection\n");
+        }
+        if (hit == MCHT_TODAYLINK) {
+                        //FIXME ("set currentday\n");
+        }
+        if (hit == MCHT_CALENDARDATE) {
+                        SYSTEMTIME selArray[2];
+                        NMSELCHANGE nmsc;
+
+                        //TRACE ("\n");
+                    nmsc.nmhdr.hwndFrom = hwnd;
+                nmsc.nmhdr.idFrom   = GetWindowLongA( hwnd, GWL_ID);
+                nmsc.nmhdr.code     = MCN_SELCHANGE;
+                        MONTHCAL_CopyTime (&nmsc.stSelStart, &infoPtr->minSel);
+                        MONTHCAL_CopyTime (&nmsc.stSelEnd, &infoPtr->maxSel);
+
+                SendMessageA (GetParent (hwnd), WM_NOTIFY,
+                                   (WPARAM)nmsc.nmhdr.idFrom, (LPARAM)&nmsc);
+
+                        MONTHCAL_CopyTime (&ht.st, &selArray[0]);
+                        MONTHCAL_CopyTime (&ht.st, &selArray[1]);
+                        MONTHCAL_SetSelRange (hwnd,0,(LPARAM) &selArray);
+
+                        infoPtr->firstSelDay=ht.st.wDay;
+                        infoPtr->curSelDay=ht.st.wDay;
+                        infoPtr->status=MC_SEL_LBUTDOWN;
+        }
+
+        MONTHCAL_Refresh (hwnd,hdc);
+        ReleaseDC (hwnd,hdc);
+        return 0;
+}
+
+static LRESULT
+MONTHCAL_LButtonUp (HWND hwnd, WPARAM wParam, LPARAM lParam)
+
+{
+    MONTHCAL_INFO *infoPtr = MONTHCAL_GetInfoPtr (hwnd);
+        NMSELCHANGE nmsc;
+    NMHDR nmhdr;
+        HDC hdc;
+
+        //TRACE ("\n");
+
+        if (infoPtr->status & MC_NEXTPRESSED)
+                        KillTimer (hwnd, MC_NEXTMONTHTIMER);
+        if (infoPtr->status & MC_PREVPRESSED)
+                        KillTimer (hwnd, MC_PREVMONTHTIMER);
+        infoPtr->status=MC_SEL_LBUTUP;
+        infoPtr->curSelDay=0;
+
+    nmhdr.hwndFrom = hwnd;
+    nmhdr.idFrom   = GetWindowLongA( hwnd, GWL_ID);
+    nmhdr.code     = NM_RELEASEDCAPTURE;
+        //TRACE ("Sent notification from %x to %x\n", hwnd, GetParent (hwnd));
+
+    SendMessageA (GetParent (hwnd), WM_NOTIFY,
+                                   (WPARAM)nmhdr.idFrom, (LPARAM)&nmhdr);
+
+    nmsc.nmhdr.hwndFrom = hwnd;
+    nmsc.nmhdr.idFrom   = GetWindowLongA( hwnd, GWL_ID);
+    nmsc.nmhdr.code     = MCN_SELECT;
+        MONTHCAL_CopyTime (&nmsc.stSelStart, &infoPtr->minSel);
+        MONTHCAL_CopyTime (&nmsc.stSelEnd, &infoPtr->maxSel);
+
+    SendMessageA (GetParent (hwnd), WM_NOTIFY,
+                                   (WPARAM)nmsc.nmhdr.idFrom, (LPARAM)&nmsc);
+
+    hdc=GetDC (hwnd);
+    MONTHCAL_Refresh (hwnd,hdc);
+    ReleaseDC (hwnd,hdc);
+
+        return 0;
+}
+
+static LRESULT
+MONTHCAL_Timer (HWND hwnd, WPARAM wParam, LPARAM lParam)
+
+{
+    MONTHCAL_INFO *infoPtr = MONTHCAL_GetInfoPtr (hwnd);
+    HDC hdc;
+
+    //TRACE(" %d\n",wParam);
+    if (!infoPtr) return FALSE;
+
+    hdc=GetDC (hwnd);
+    switch (wParam) {
+        case MC_NEXTMONTHTIMER:
+                MONTHCAL_GoToNextMonth (hwnd, infoPtr);
+                break;
+        case MC_PREVMONTHTIMER:
+                MONTHCAL_GoToPrevMonth (hwnd, infoPtr);
+                break;
+    //default:
+        //ERR("got unknown timer\n");
+        }
+
+    MONTHCAL_Refresh (hwnd,hdc);
+    ReleaseDC (hwnd,hdc);
+    return 0;
+}
+
+
+
+static LRESULT
+MONTHCAL_MouseMove (HWND hwnd, WPARAM wParam, LPARAM lParam)
+{
+    MONTHCAL_INFO *infoPtr = MONTHCAL_GetInfoPtr (hwnd);
+        MCHITTESTINFO ht;
+        HDC hdc;
+        int selday,hit;
+        RECT r;
+
+        if (!(infoPtr->status & MC_SEL_LBUTDOWN)) return 0;
+
+        ht.pt.x=LOWORD(lParam);
+        ht.pt.y=HIWORD(lParam);
+
+        hit=MONTHCAL_HitTest (hwnd, (LPARAM) &ht);
+
+        /* not on the calendar date numbers? bail out */
+        //TRACE ("hit:%x\n",hit);
+        if ((hit & MCHT_CALENDARDATE) !=MCHT_CALENDARDATE) return 0;
+
+        selday=ht.st.wDay;
+        infoPtr->curSelDay=selday;
+        MONTHCAL_CalcPosFromDay (infoPtr,selday,ht.st.wMonth,&r);
+
+        if ( GetWindowLongA( hwnd, GWL_STYLE) & MCS_MULTISELECT)  {
+                SYSTEMTIME selArray[2];
+                int i;
+
+        MONTHCAL_GetSelRange (hwnd,0,(LPARAM) &selArray);
+                i=0;
+                if (infoPtr->firstSelDay==selArray[0].wDay) i=1;
+                //TRACE ("oldRange:%d %d %d %d\n",infoPtr->firstSelDay,selArray[0].wDay,selArray[1].wDay,i);
+                if (infoPtr->firstSelDay==selArray[1].wDay) {
+                                /* 1st time we get here: selArray[0]=selArray[1])  */
+                                /* if we're still at the first selected date, return */
+                        if (infoPtr->firstSelDay==selday) goto done;
+
+                        if (selday<infoPtr->firstSelDay) i=0;
+                }
+
+                if (abs(infoPtr->firstSelDay - selday) >= infoPtr->maxSelCount) {
+                        if (selday>infoPtr->firstSelDay)
+                                selday=infoPtr->firstSelDay+infoPtr->maxSelCount;
+                        else
+                                selday=infoPtr->firstSelDay-infoPtr->maxSelCount;
+                }
+
+                if (selArray[i].wDay!=selday) {
+
+                //TRACE ("newRange:%d %d %d %d\n",infoPtr->firstSelDay,selArray[0].wDay,selArray[1].wDay,i);
+
+                        selArray[i].wDay=selday;
+
+
+                        if (selArray[0].wDay>selArray[1].wDay) {
+                                DWORD tempday;
+                                tempday=selArray[1].wDay;
+                                selArray[1].wDay=selArray[0].wDay;
+                                selArray[0].wDay=tempday;
+                        }
+
+                MONTHCAL_SetSelRange (hwnd,0,(LPARAM) &selArray);
+                }
+        }
+
+done:
+
+        hdc=GetDC (hwnd);
+        MONTHCAL_Refresh (hwnd, hdc);
+        ReleaseDC (hwnd, hdc);
+
+        return 0;
+}
+
+static LRESULT
+MONTHCAL_Paint (HWND hwnd, WPARAM wParam)
+{
+    HDC hdc;
+    PAINTSTRUCT ps;
+
+    hdc = wParam==0 ? BeginPaint (hwnd, &ps) : (HDC)wParam;
+    MONTHCAL_Refresh (hwnd, hdc);
+    if(!wParam)
+    EndPaint (hwnd, &ps);
+    return 0;
+}
+
+static LRESULT
+MONTHCAL_KillFocus (HWND hwnd, WPARAM wParam, LPARAM lParam)
+{
+    HDC hdc;
+
+    //TRACE ("\n");
+
+    hdc = GetDC (hwnd);
+    MONTHCAL_Refresh (hwnd, hdc);
+    ReleaseDC (hwnd, hdc);
+    InvalidateRect (hwnd, NULL, TRUE);
+
+    return 0;
+}
+
+
+static LRESULT
+MONTHCAL_SetFocus (HWND hwnd, WPARAM wParam, LPARAM lParam)
+{
+    HDC hdc;
+
+    //TRACE ("\n");
+
+    hdc = GetDC (hwnd);
+    MONTHCAL_Refresh (hwnd, hdc);
+    ReleaseDC (hwnd, hdc);
+
+    return 0;
+}
+
+
+/* FIXME: check whether dateMin/dateMax need to be adjusted. */
 
 
@@ -33 +1414 @@
 {
     MONTHCAL_INFO *infoPtr;
+        LOGFONTA        logFont;
 
     /* allocate memory for info structure */
@@ -38 +1420 @@
     SetWindowLongA (hwnd, 0, (DWORD)infoPtr);
 
+        if (infoPtr == NULL) {
+        //ERR ( "could not allocate info memory!\n");
+        return 0;
+    }
+    if ((MONTHCAL_INFO*) GetWindowLongA( hwnd, 0) != infoPtr) {
+        //ERR ( "pointer assignment error!\n");
+        return 0;
+    }
+
+
+    infoPtr->hFont=GetStockObject(DEFAULT_GUI_FONT);
+                GetObjectA (infoPtr->hFont, sizeof (LOGFONTA), &logFont);
+        logFont.lfWeight=FW_BOLD;
+        infoPtr->hBoldFont = CreateFontIndirectA (&logFont);
 
     /* initialize info structure */
-
-
+   /* FIXME: calculate systemtime ->> localtime (substract timezoneinfo) */
+
+        GetSystemTime (&infoPtr->todaysDate);
+        infoPtr->firstDay  = 0;
+        infoPtr->currentMonth = infoPtr->todaysDate.wMonth;
+        infoPtr->currentYear= infoPtr->todaysDate.wYear;
+        MONTHCAL_CopyTime (&infoPtr->todaysDate,&infoPtr->minDate);
+        MONTHCAL_CopyTime (&infoPtr->todaysDate,&infoPtr->maxDate);
+        infoPtr->maxSelCount=6;
+        infoPtr->monthRange=3;
+        infoPtr->monthdayState=COMCTL32_Alloc
+                           (infoPtr->monthRange*sizeof(MONTHDAYSTATE));
+        infoPtr->titlebk     = GetSysColor (COLOR_GRAYTEXT);
+        infoPtr->titletxt    = GetSysColor (COLOR_WINDOW);
+        infoPtr->monthbk     = GetSysColor (COLOR_WINDOW);
+        infoPtr->trailingtxt = GetSysColor (COLOR_GRAYTEXT);
+        infoPtr->bk                  = GetSysColor (COLOR_WINDOW);
+        infoPtr->txt         = GetSysColor (COLOR_WINDOWTEXT);
 
     return 0;
@@ -52 +1464 @@
     MONTHCAL_INFO *infoPtr = MONTHCAL_GetInfoPtr (hwnd);
 
-
-
-
-
-
-    /* free ipaddress info data */
+    /* free month calendar info data */
     COMCTL32_Free (infoPtr);
 
@@ -65 +1472 @@
 
 
-
-LRESULT WINAPI
+static LRESULT WINAPI
 MONTHCAL_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
+
     switch (uMsg)
     {
 
-
-        case WM_CREATE:
-            return MONTHCAL_Create (hwnd, wParam, lParam);
-
-        case WM_DESTROY:
-            return MONTHCAL_Destroy (hwnd, wParam, lParam);
-
-        default:
-//          if (uMsg >= WM_USER)
-//              ERR (monthcal, "unknown msg %04x wp=%08x lp=%08lx\n",
-//                   uMsg, wParam, lParam);
-            return DefWindowProcA (hwnd, uMsg, wParam, lParam);
+        case MCM_GETCURSEL:
+        return MONTHCAL_GetCurSel (hwnd, wParam, lParam);
+
+        case MCM_SETCURSEL:
+        return MONTHCAL_SetCurSel (hwnd, wParam, lParam);
+
+        case MCM_GETMAXSELCOUNT:
+        return MONTHCAL_GetMaxSelCount (hwnd, wParam, lParam);
+
+        case MCM_SETMAXSELCOUNT:
+        return MONTHCAL_SetMaxSelCount (hwnd, wParam, lParam);
+
+        case MCM_GETSELRANGE:
+        return MONTHCAL_GetSelRange (hwnd, wParam, lParam);
+
+        case MCM_SETSELRANGE:
+        return MONTHCAL_SetSelRange (hwnd, wParam, lParam);
+
+        case MCM_GETMONTHRANGE:
+        return MONTHCAL_GetMonthRange (hwnd, wParam, lParam);
+
+        case MCM_SETDAYSTATE:
+        return MONTHCAL_SetDayState (hwnd, wParam, lParam);
+
+        case MCM_GETMINREQRECT:
+        return MONTHCAL_GetMinReqRect (hwnd, wParam, lParam);
+
+        case MCM_GETCOLOR:
+             return MONTHCAL_GetColor (hwnd, wParam, lParam);
+
+        case MCM_SETCOLOR:
+             return MONTHCAL_SetColor (hwnd, wParam, lParam);
+
+        case MCM_GETTODAY:
+             return MONTHCAL_GetToday (hwnd, wParam, lParam);
+
+        case MCM_SETTODAY:
+             return MONTHCAL_SetToday (hwnd, wParam, lParam);
+
+        case MCM_HITTEST:
+            return MONTHCAL_HitTest (hwnd,lParam);
+
+        case MCM_GETFIRSTDAYOFWEEK:
+        return MONTHCAL_GetFirstDayOfWeek (hwnd, wParam, lParam);
+
+        case MCM_SETFIRSTDAYOFWEEK:
+        return MONTHCAL_SetFirstDayOfWeek (hwnd, wParam, lParam);
+
+        case MCM_GETRANGE:
+             return MONTHCAL_GetRange (hwnd, wParam, lParam);
+
+        case MCM_SETRANGE:
+             return MONTHCAL_SetRange (hwnd, wParam, lParam);
+
+        case MCM_GETMONTHDELTA:
+             return MONTHCAL_GetMonthDelta (hwnd, wParam, lParam);
+
+        case MCM_SETMONTHDELTA:
+             return MONTHCAL_SetMonthDelta (hwnd, wParam, lParam);
+
+        case MCM_GETMAXTODAYWIDTH:
+             return MONTHCAL_GetMaxTodayWidth (hwnd);
+
+        case WM_GETDLGCODE:
+        return DLGC_WANTARROWS | DLGC_WANTCHARS;
+
+    case WM_KILLFOCUS:
+        return MONTHCAL_KillFocus (hwnd, wParam, lParam);
+
+    case WM_LBUTTONDOWN:
+        return MONTHCAL_LButtonDown (hwnd, wParam, lParam);
+
+    case WM_MOUSEMOVE:
+        return MONTHCAL_MouseMove (hwnd, wParam, lParam);
+
+    case WM_LBUTTONUP:
+        return MONTHCAL_LButtonUp (hwnd, wParam, lParam);
+
+    case WM_PAINT:
+        return MONTHCAL_Paint (hwnd, wParam);
+
+    case WM_SETFOCUS:
+        return MONTHCAL_SetFocus (hwnd, wParam, lParam);
+
+        case WM_CREATE:
+            return MONTHCAL_Create (hwnd, wParam, lParam);
+
+        case WM_TIMER:
+            return MONTHCAL_Timer (hwnd, wParam, lParam);
+
+        case WM_DESTROY:
+            return MONTHCAL_Destroy (hwnd, wParam, lParam);
+
+        default:
+            //if (uMsg >= WM_USER)
+            //    ERR ( "unknown msg %04x wp=%08x lp=%08lx\n",
+            //         uMsg, wParam, lParam);
+            return DefWindowProcA (hwnd, uMsg, wParam, lParam);
     }
     return 0;
@@ -89 +1582 @@
 
 
-VOID
-MONTHCAL_Register (VOID)
+void
+MONTHCAL_Register (void)
 {
     WNDCLASSA wndClass;
@@ -104 +1597 @@
     wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
     wndClass.lpszClassName = MONTHCAL_CLASSA;
- 
+
     RegisterClassA (&wndClass);
 }
 
 
-VOID
-MONTHCAL_Unregister (VOID)
+void
+MONTHCAL_Unregister (void)
 {
     if (GlobalFindAtomA (MONTHCAL_CLASSA))
-        UnregisterClassA (MONTHCAL_CLASSA, (HINSTANCE)NULL);
-}
-
+        UnregisterClassA (MONTHCAL_CLASSA, (HINSTANCE)NULL);
+}
+

trunk/src/comctl32/nativefont.c ¶

@@ -1 @@
-/* $Id: nativefont.c,v 1.3 1999-06-10 16:22:01 achimha Exp $ */
+/* $Id: nativefont.c,v 1.4 1999-08-14 16:13:12 cbratschi Exp $ */
 /*
  * Native Font control
@@ -60 +60 @@
 
 
-LRESULT WINAPI
+static LRESULT WINAPI
 NATIVEFONT_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
@@ -66 +66 @@
     {
 
-        case WM_CREATE:
-            return NATIVEFONT_Create (hwnd, wParam, lParam);
+        case WM_CREATE:
+            return NATIVEFONT_Create (hwnd, wParam, lParam);
 
-        case WM_DESTROY:
-            return NATIVEFONT_Destroy (hwnd, wParam, lParam);
+        case WM_DESTROY:
+            return NATIVEFONT_Destroy (hwnd, wParam, lParam);
 
-        default:
-//          ERR (nativefont, "unknown msg %04x wp=%08x lp=%08lx\n",
-//                   uMsg, wParam, lParam);
-            return DefWindowProcA (hwnd, uMsg, wParam, lParam);
+        default:
+//          ERR (nativefont, "unknown msg %04x wp=%08x lp=%08lx\n",
+//                   uMsg, wParam, lParam);
+            return DefWindowProcA (hwnd, uMsg, wParam, lParam);
     }
     return 0;
@@ -96 +96 @@
     wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
     wndClass.lpszClassName = WC_NATIVEFONTCTLA;
- 
+
     RegisterClassA (&wndClass);
 }
@@ -105 +105 @@
 {
     if (GlobalFindAtomA (WC_NATIVEFONTCTLA))
-        UnregisterClassA (WC_NATIVEFONTCTLA, (HINSTANCE)NULL);
+        UnregisterClassA (WC_NATIVEFONTCTLA, (HINSTANCE)NULL);
 }
 

trunk/src/comctl32/pager.c ¶

@@ -1 @@
-/* $Id: pager.c,v 1.3 1999-06-10 16:22:01 achimha Exp $ */
+/* $Id: pager.c,v 1.4 1999-08-14 16:13:12 cbratschi Exp $ */
 /*
  * Pager control
@@ -93 +93 @@
 
     if (infoPtr->hwndChild) {
-        ZeroMemory (&nmpgcs, sizeof (NMPGCALCSIZE));
-        nmpgcs.hdr.hwndFrom = hwnd;
-        nmpgcs.hdr.idFrom   = GetWindowLongA (hwnd, GWL_ID);
-        nmpgcs.hdr.code = PGN_CALCSIZE;
-        nmpgcs.dwFlag = (dwStyle & PGS_HORZ) ? PGF_CALCWIDTH : PGF_CALCHEIGHT;
-        SendMessageA (GetParent (hwnd), WM_NOTIFY,
-                        (WPARAM)nmpgcs.hdr.idFrom, (LPARAM)&nmpgcs);
-
-        infoPtr->nChildSize = (dwStyle & PGS_HORZ) ? nmpgcs.iWidth : nmpgcs.iHeight;
+        ZeroMemory (&nmpgcs, sizeof (NMPGCALCSIZE));
+        nmpgcs.hdr.hwndFrom = hwnd;
+        nmpgcs.hdr.idFrom   = GetWindowLongA (hwnd, GWL_ID);
+        nmpgcs.hdr.code = PGN_CALCSIZE;
+        nmpgcs.dwFlag = (dwStyle & PGS_HORZ) ? PGF_CALCWIDTH : PGF_CALCHEIGHT;
+        SendMessageA (GetParent (hwnd), WM_NOTIFY,
+                        (WPARAM)nmpgcs.hdr.idFrom, (LPARAM)&nmpgcs);
+
+        infoPtr->nChildSize = (dwStyle & PGS_HORZ) ? nmpgcs.iWidth : nmpgcs.iHeight;
 
 
@@ -168 +168 @@
     /* FIXME: redraw */
     if (infoPtr->hwndChild) {
-        SetParent (infoPtr->hwndChild, hwnd);
-        SetWindowPos (infoPtr->hwndChild, HWND_TOP,
-                        0, 0, 0, 0, SWP_SHOWWINDOW | SWP_NOSIZE);
+        RECT rect;
+
+        GetClientRect(hwnd,&rect);
+        SetParent (infoPtr->hwndChild, hwnd);
+        SetWindowPos (infoPtr->hwndChild, HWND_TOP,
+                        0, 0, 0, 0, SWP_SHOWWINDOW | SWP_NOSIZE);
+
+        MoveWindow (infoPtr->hwndChild, 0, 0, rect.right, rect.bottom, TRUE);
     }
 
@@ -188 +193 @@
     /* FIXME: redraw */
     SetWindowPos (infoPtr->hwndChild, HWND_TOP,
-                    0, 0, 0, 0, SWP_SHOWWINDOW | SWP_NOSIZE);
+                    0, 0, 0, 0, SWP_SHOWWINDOW | SWP_NOSIZE);
 
     return 0;
@@ -268 +273 @@
     GetClientRect (hwnd, &rect);
     if (infoPtr->hwndChild) {
-        SetWindowPos (infoPtr->hwndChild, HWND_TOP, rect.left, rect.top,
-                        rect.right - rect.left, rect.bottom - rect.top,
-                        SWP_SHOWWINDOW);
-/*      MoveWindow32 (infoPtr->hwndChild, 1, 1, rect.right - 2, rect.bottom-2, TRUE); */
-/*      UpdateWindow32 (infoPtr->hwndChild); */
+        SetWindowPos (infoPtr->hwndChild, HWND_TOP, rect.left, rect.top,
+                        rect.right - rect.left, rect.bottom - rect.top,
+                        SWP_SHOWWINDOW);
+/*      MoveWindow (infoPtr->hwndChild, 1, 1, rect.right - 2, rect.bottom-2, TRUE); */
+/*      UpdateWindow (infoPtr->hwndChild); */
 
     }
-/*    FillRect32 ((HDC32)wParam, &rect, hBrush); */
-/*    DeleteObject32 (hBrush); */
+/*    FillRect ((HDC)wParam, &rect, hBrush); */
+/*    DeleteObject (hBrush); */
     return TRUE;
 }
@@ -282 +287 @@
 
 
-LRESULT WINAPI
+static LRESULT WINAPI
 PAGER_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     switch (uMsg)
     {
-        case PGM_FORWARDMOUSE:
-            return PAGER_ForwardMouse (hwnd, wParam);
-
-        case PGM_GETBKCOLOR:
-            return PAGER_GetBkColor (hwnd, wParam, lParam);
-
-        case PGM_GETBORDER:
-            return PAGER_GetBorder (hwnd, wParam, lParam);
-
-        case PGM_GETBUTTONSIZE:
-            return PAGER_GetButtonSize (hwnd, wParam, lParam);
-
-        case PGM_GETBUTTONSTATE:
-            return PAGER_GetButtonState (hwnd, wParam, lParam);
-
-/*      case PGM_GETDROPTARGET: */
-
-        case PGM_GETPOS:
-            return PAGER_SetPos (hwnd, wParam, lParam);
-
-        case PGM_RECALCSIZE:
-            return PAGER_RecalcSize (hwnd, wParam, lParam);
-
-        case PGM_SETBKCOLOR:
-            return PAGER_SetBkColor (hwnd, wParam, lParam);
-
-        case PGM_SETBORDER:
-            return PAGER_SetBorder (hwnd, wParam, lParam);
-
-        case PGM_SETBUTTONSIZE:
-            return PAGER_SetButtonSize (hwnd, wParam, lParam);
-
-        case PGM_SETCHILD:
-            return PAGER_SetChild (hwnd, wParam, lParam);
-
-        case PGM_SETPOS:
-            return PAGER_SetPos (hwnd, wParam, lParam);
-
-        case WM_CREATE:
-            return PAGER_Create (hwnd, wParam, lParam);
-
-        case WM_DESTROY:
-            return PAGER_Destroy (hwnd, wParam, lParam);
-
-        case WM_ERASEBKGND:
-            return PAGER_EraseBackground (hwnd, wParam, lParam);
-
-        case WM_MOUSEMOVE:
-            return PAGER_MouseMove (hwnd, wParam, lParam);
-
-        case WM_NOTIFY:
-        case WM_COMMAND:
-            return SendMessageA (GetParent (hwnd), uMsg, wParam, lParam);
-
-/*      case WM_PAINT: */
-/*          return PAGER_Paint (hwnd, wParam); */
-
-        case WM_SIZE:
-            return PAGER_Size (hwnd, wParam, lParam);
-
-        default:
-//          if (uMsg >= WM_USER)
-//              ERR (pager, "unknown msg %04x wp=%08x lp=%08lx\n",
-//                   uMsg, wParam, lParam);
-            return DefWindowProcA (hwnd, uMsg, wParam, lParam);
+        case PGM_FORWARDMOUSE:
+            return PAGER_ForwardMouse (hwnd, wParam);
+
+        case PGM_GETBKCOLOR:
+            return PAGER_GetBkColor (hwnd, wParam, lParam);
+
+        case PGM_GETBORDER:
+            return PAGER_GetBorder (hwnd, wParam, lParam);
+
+        case PGM_GETBUTTONSIZE:
+            return PAGER_GetButtonSize (hwnd, wParam, lParam);
+
+        case PGM_GETBUTTONSTATE:
+            return PAGER_GetButtonState (hwnd, wParam, lParam);
+
+/*      case PGM_GETDROPTARGET: */
+
+        case PGM_GETPOS:
+            return PAGER_SetPos (hwnd, wParam, lParam);
+
+        case PGM_RECALCSIZE:
+            return PAGER_RecalcSize (hwnd, wParam, lParam);
+
+        case PGM_SETBKCOLOR:
+            return PAGER_SetBkColor (hwnd, wParam, lParam);
+
+        case PGM_SETBORDER:
+            return PAGER_SetBorder (hwnd, wParam, lParam);
+
+        case PGM_SETBUTTONSIZE:
+            return PAGER_SetButtonSize (hwnd, wParam, lParam);
+
+        case PGM_SETCHILD:
+            return PAGER_SetChild (hwnd, wParam, lParam);
+
+        case PGM_SETPOS:
+            return PAGER_SetPos (hwnd, wParam, lParam);
+
+        case WM_CREATE:
+            return PAGER_Create (hwnd, wParam, lParam);
+
+        case WM_DESTROY:
+            return PAGER_Destroy (hwnd, wParam, lParam);
+
+        case WM_ERASEBKGND:
+            return PAGER_EraseBackground (hwnd, wParam, lParam);
+
+        case WM_MOUSEMOVE:
+            return PAGER_MouseMove (hwnd, wParam, lParam);
+
+        case WM_NOTIFY:
+        case WM_COMMAND:
+            return SendMessageA (GetParent (hwnd), uMsg, wParam, lParam);
+
+/*      case WM_PAINT: */
+/*          return PAGER_Paint (hwnd, wParam); */
+
+        case WM_SIZE:
+            return PAGER_Size (hwnd, wParam, lParam);
+
+        default:
+//          if (uMsg >= WM_USER)
+//              ERR (pager, "unknown msg %04x wp=%08x lp=%08lx\n",
+//                   uMsg, wParam, lParam);
+            return DefWindowProcA (hwnd, uMsg, wParam, lParam);
     }
     return 0;
@@ -372 +377 @@
     wndClass.hbrBackground = 0;
     wndClass.lpszClassName = WC_PAGESCROLLERA;
- 
+
     RegisterClassA (&wndClass);
 }
@@ -381 +386 @@
 {
     if (GlobalFindAtomA (WC_PAGESCROLLERA))
-        UnregisterClassA (WC_PAGESCROLLERA, (HINSTANCE)NULL);
-}
-
+        UnregisterClassA (WC_PAGESCROLLERA, (HINSTANCE)NULL);
+}
+

trunk/src/comctl32/progress.c ¶

@@ -1 @@
-/* $Id: progress.c,v 1.7 1999-06-28 15:46:25 cbratschi Exp $ */
+/* $Id: progress.c,v 1.8 1999-08-14 16:13:12 cbratschi Exp $ */
 /*
  * Progress control
@@ -493 +493 @@
  *           ProgressWindowProc
  */
-LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message,
+static LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message,
                                   WPARAM wParam, LPARAM lParam)
 {

trunk/src/comctl32/propsheet.c ¶

@@ -1 @@
-/* $Id: propsheet.c,v 1.6 1999-07-12 15:58:48 cbratschi Exp $ */
+/* $Id: propsheet.c,v 1.7 1999-08-14 16:13:12 cbratschi Exp $ */
 /*
  * Property Sheets
@@ -627 +627 @@
     ((MyDLGTEMPLATEEX*)pTemplate)->style &= ~WS_SYSMENU;
     ((MyDLGTEMPLATEEX*)pTemplate)->style &= ~WS_POPUP;
+    ((MyDLGTEMPLATEEX*)pTemplate)->style &= ~WS_DISABLED;
   }
   else
@@ -635 +636 @@
     pTemplate->style &= ~WS_SYSMENU;
     pTemplate->style &= ~WS_POPUP;
+    pTemplate->style &= ~WS_DISABLED;
+
   }
 
@@ -668 +671 @@
 
   if (showPage)
+  {
+    NMHDR hdr;
+
+    hdr.hwndFrom = hwndParent;
+    hdr.code = PSN_SETACTIVE;
+
+    /*
+     * Send the notification before showing the page.
+     */
+    SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &hdr);
+
     ShowWindow(hwndPage, SW_SHOW);
+  }
   else
     ShowWindow(hwndPage, SW_HIDE);
@@ -899 +914 @@
     return FALSE;
 
-//  if (hpage != NULL)
-//    FIXME(propsheet, "Implement HPROPSHEETPAGE!\n");
-//  else
-    hwndPage = psInfo->proppage[index].hwndPage;
-
-  /*
-   * Notify the new page.
-   */
-  hdr.code = PSN_SETACTIVE;
-
-  SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &hdr);
+  /*
+   * hpage takes precedence over index.
+   */
+  if (hpage != NULL)
+  {
+    index = PROPSHEET_GetPageIndex(hpage, psInfo);
+
+    if (index == -1)
+    {
+      //TRACE("Could not find page to remove!\n");
+      return FALSE;
+    }
+  }
+
+  hwndPage = psInfo->proppage[index].hwndPage;
+
+  /*
+   * Notify the new page if it's already created.
+   * If not it will get created and notified in PROPSHEET_ShowPage.
+   */
+  if (hwndPage)
+  {
+    int result;
+    hdr.code = PSN_SETACTIVE;
+
+    result = SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &hdr);
+    /*
+     * TODO: check return value.
+     */
+  }
 
   /*
@@ -1340 +1374 @@
       if (pnmh->code == TCN_SELCHANGE)
       {
-        PropSheetInfo* psInfo = (PropSheetInfo*) GetPropA(hwnd,
-                                                          PropSheetInfoStr);
         int index = SendMessageA(pnmh->hwndFrom, TCM_GETCURSEL, 0, 0);
-        HWND hwndHelp  = GetDlgItem(hwnd, IDHELP);
-
-        PROPSHEET_ShowPage(hwnd, index, psInfo);
-
-        if (psInfo->proppage[index].hasHelp)
-          EnableWindow(hwndHelp, TRUE);
-        else
-          EnableWindow(hwndHelp, FALSE);
+        PROPSHEET_SetCurSel(hwnd, index, 0);
       }
 

trunk/src/comctl32/rebar.c ¶

@@ -1 @@
-/* $Id: rebar.c,v 1.7 1999-07-12 15:58:48 cbratschi Exp $ */
+/* $Id: rebar.c,v 1.8 1999-08-14 16:13:12 cbratschi Exp $ */
 /*
  * Rebar control
@@ -1861 +1861 @@
 
 
-LRESULT WINAPI
+static LRESULT WINAPI
 REBAR_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {

trunk/src/comctl32/status.c ¶

@@ -1 @@
-/* $Id: status.c,v 1.9 1999-07-12 15:58:48 cbratschi Exp $ */
+/* $Id: status.c,v 1.10 1999-08-14 16:13:12 cbratschi Exp $ */
 /*
  * Interface code to StatusWindow widget/control
@@ -1154 +1154 @@
 
 
-LRESULT WINAPI
+static LRESULT WINAPI
 StatusWindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {

trunk/src/comctl32/tab.c ¶

@@ -1 @@
-/* $Id: tab.c,v 1.9 1999-07-12 15:58:48 cbratschi Exp $ */
+/* $Id: tab.c,v 1.10 1999-08-14 16:13:13 cbratschi Exp $ */
 /*
  * Tab control
@@ -800 +800 @@
          */
         if (!(lStyle & TCS_OWNERDRAWFIXED))
+        {
+          DeleteObject(hbr);
           hbr = CreateSolidBrush(GetSysColor(COLOR_3DHILIGHT));
+        }
 
         /*
@@ -849 +852 @@
        * Background color.
        */
+      DeleteObject(hbr);
       hbr = CreateSolidBrush(GetSysColor(COLOR_BTNFACE));
 
@@ -963 +967 @@
     SetBkMode(hdc, oldBkMode);
     SelectObject(hdc, holdPen);
+    DeleteObject(hfocusPen);
+    DeleteObject(hbr);
   }
 }
@@ -1098 +1104 @@
   if (givenDC==0)
     ReleaseDC(hwnd, hdc);
+
+  DeleteObject(brush);
 
   return 0;
@@ -1420 +1428 @@
    if (len>wineItem->cchTextMax)
      wineItem->pszText = COMCTL32_ReAlloc (wineItem->pszText, (len+1)*sizeof(WCHAR));
-   lstrcpynAtoW (wineItem->pszText, tabItem->pszText, len+1);
+   lstrcpyAtoW (wineItem->pszText, tabItem->pszText);
   }
 
@@ -1456 +1464 @@
    if (len>wineItem->cchTextMax)
      wineItem->pszText = COMCTL32_ReAlloc (wineItem->pszText, (len+1)*sizeof(WCHAR));
-   lstrcpynW (wineItem->pszText, tabItem->pszText, len+1);
+   lstrcpyW (wineItem->pszText, tabItem->pszText);
   }
 
@@ -1784 +1792 @@
 }
 
-LRESULT WINAPI
+static LRESULT WINAPI
 TAB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {

trunk/src/comctl32/toolbar.c ¶

@@ -1 @@
-/* $Id: toolbar.c,v 1.11 1999-07-12 15:58:49 cbratschi Exp $ */
+/* $Id: toolbar.c,v 1.12 1999-08-14 16:13:13 cbratschi Exp $ */
 /*
  * Toolbar control
@@ -14 +14 @@
  *   - Fix TB_SETROWS.
  *   - Tooltip support (almost complete).
- *   - Internal COMMCTL32 bitmaps.
  *   - Fix TOOLBAR_SetButtonInfo32A.
  *   - Drag & drop of buttons
@@ -45 +44 @@
 #define BOTTOM_BORDER      2
 
-#define TOOLBAR_GetInfoPtr(wndPtr) ((TOOLBAR_INFO *)GetWindowLongA(hwnd,0))
+#define TOOLBAR_GetInfoPtr(hwnd) ((TOOLBAR_INFO *)GetWindowLongA(hwnd,0))
 
 
@@ -130 +129 @@
               internals directly */
 
-    HDC hdcImageList = CreateCompatibleDC (0);
-    HDC hdcMask = CreateCompatibleDC (0);
     HIMAGELIST himl = infoPtr->himlDef;
     HBITMAP hbmMask;
+    HDC hdcImageList;
+    HDC hdcMask;
+
+    if (!himl)
+        return;
+
+    /* create new dc's */
+    hdcImageList = CreateCompatibleDC (0);
+    hdcMask = CreateCompatibleDC (0);
 
     /* create new bitmap */
@@ -179 +185 @@
 
     rc = btnPtr->rect;
+
+    /* separator */
     if (btnPtr->fsStyle & TBSTYLE_SEP)
     {
-      if ((dwStyle & TBSTYLE_FLAT) && (btnPtr->idCommand == 0))
+      if ((dwStyle & TBSTYLE_FLAT) && (btnPtr->iBitmap == 0))
           TOOLBAR_DrawFlatSeparator (&rc, hdc);
       return;
@@ -1544 +1552 @@
  * This function implements the toolbar customization dialog.
  */
-BOOL WINAPI
+static BOOL WINAPI
 TOOLBAR_CustomizeDialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
@@ -1585 +1593 @@
     LPTBADDBITMAP lpAddBmp = (LPTBADDBITMAP)lParam;
     INT nIndex = 0,nButtons;
+    HBITMAP hbmLoad;
 
     if (!lpAddBmp)
@@ -1602 +1611 @@
 //        TRACE ("adding %d internal bitmaps!\n", nButtons);
 
-        /* Windows resize all the buttons to the size of a newly added STandard Image*/
+        /* Windows resize all the buttons to the size of a newly added standard Image*/
         if (lpAddBmp->nID & 1)
         {
@@ -1650 +1659 @@
     else if (lpAddBmp->hInst == HINST_COMMCTRL)
     {
-        /* add internal bitmaps */
-//        FIXME ("internal bitmaps not supported!\n");
-
-        /* Hack to "add" some reserved images within the image list
-           to get the right image indices */
-        nIndex = ImageList_GetImageCount (infoPtr->himlDef);
-        ImageList_SetImageCount (infoPtr->himlDef, nIndex + nButtons);
+        /* Add system bitmaps */
+        switch (lpAddBmp->nID)
+      {
+            case IDB_STD_SMALL_COLOR:
+                hbmLoad = LoadBitmapA (COMCTL32_hModule,
+                                       MAKEINTRESOURCEA(IDB_STD_SMALL));
+                nIndex = ImageList_AddMasked (infoPtr->himlDef,
+                                              hbmLoad, CLR_DEFAULT);
+                DeleteObject (hbmLoad);
+                break;
+
+            case IDB_STD_LARGE_COLOR:
+                hbmLoad = LoadBitmapA (COMCTL32_hModule,
+                                       MAKEINTRESOURCEA(IDB_STD_LARGE));
+                nIndex = ImageList_AddMasked (infoPtr->himlDef,
+                                              hbmLoad, CLR_DEFAULT);
+                DeleteObject (hbmLoad);
+                break;
+
+            case IDB_VIEW_SMALL_COLOR:
+                hbmLoad = LoadBitmapA (COMCTL32_hModule,
+                                       MAKEINTRESOURCEA(IDB_VIEW_SMALL));
+                nIndex = ImageList_AddMasked (infoPtr->himlDef,
+                                              hbmLoad, CLR_DEFAULT);
+                DeleteObject (hbmLoad);
+                break;
+
+            case IDB_VIEW_LARGE_COLOR:
+                hbmLoad = LoadBitmapA (COMCTL32_hModule,
+                                       MAKEINTRESOURCEA(IDB_VIEW_LARGE));
+                nIndex = ImageList_AddMasked (infoPtr->himlDef,
+                                              hbmLoad, CLR_DEFAULT);
+                DeleteObject (hbmLoad);
+                break;
+
+            case IDB_HIST_SMALL_COLOR:
+                hbmLoad = LoadBitmapA (COMCTL32_hModule,
+                                       MAKEINTRESOURCEA(IDB_HIST_SMALL));
+                nIndex = ImageList_AddMasked (infoPtr->himlDef,
+                                              hbmLoad, CLR_DEFAULT);
+                DeleteObject (hbmLoad);
+                break;
+
+            case IDB_HIST_LARGE_COLOR:
+                hbmLoad = LoadBitmapA (COMCTL32_hModule,
+                                       MAKEINTRESOURCEA(IDB_HIST_LARGE));
+                nIndex = ImageList_AddMasked (infoPtr->himlDef,
+                                              hbmLoad, CLR_DEFAULT);
+                DeleteObject (hbmLoad);
+                break;
+
+            default:
+        nIndex = ImageList_GetImageCount (infoPtr->himlDef);
+                //ERR ("invalid imagelist!\n");
+                break;
+        }
     }
     else
     {
-        HBITMAP hBmp =
-            LoadBitmapA (lpAddBmp->hInst, (LPSTR)lpAddBmp->nID);
-        nIndex = ImageList_AddMasked (infoPtr->himlDef, hBmp, CLR_DEFAULT);
-
-        DeleteObject (hBmp);
+        hbmLoad = LoadBitmapA (lpAddBmp->hInst, (LPSTR)lpAddBmp->nID);
+        nIndex = ImageList_AddMasked (infoPtr->himlDef, hbmLoad, CLR_DEFAULT);
+        DeleteObject (hbmLoad);
     }
 
@@ -3825 +3881 @@
 
 
-LRESULT WINAPI
+static LRESULT WINAPI
 ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {

trunk/src/comctl32/tooltips.c ¶

@@ -1 @@
-/* $Id: tooltips.c,v 1.12 1999-07-12 15:58:49 cbratschi Exp $ */
+/* $Id: tooltips.c,v 1.13 1999-08-14 16:13:15 cbratschi Exp $ */
 /*
  * Tool tip control
@@ -2175 +2175 @@
 
 
-LRESULT CALLBACK
+static LRESULT CALLBACK
 TOOLTIPS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {

trunk/src/comctl32/trackbar.c ¶

@@ -1 @@
-/* $Id: trackbar.c,v 1.11 1999-07-04 21:06:00 cbratschi Exp $ */
+/* $Id: trackbar.c,v 1.12 1999-08-14 16:13:15 cbratschi Exp $ */
 /*
  * Trackbar control
@@ -74 +74 @@
 static BOOL TRACKBAR_SendNotify (HWND hwnd, UINT code);
 
-void TRACKBAR_RecalculateTics (HWND hwnd,TRACKBAR_INFO *infoPtr,BOOL restoreOld)
+static void TRACKBAR_RecalculateTics (HWND hwnd,TRACKBAR_INFO *infoPtr,BOOL restoreOld)
 {
     INT i,tic,nrTics;
@@ -2032 +2032 @@
 
 
-LRESULT WINAPI
+static LRESULT WINAPI
 TRACKBAR_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {

trunk/src/comctl32/treeview.c ¶

@@ -1 @@
-/* $Id: treeview.c,v 1.9 1999-07-23 15:54:34 cbratschi Exp $ */
+/* $Id: treeview.c,v 1.10 1999-08-14 16:13:16 cbratschi Exp $ */
 /* Treeview control
  *
@@ -46 +46 @@
 #include "wingdi.h"
 #include "commctrl.h"
+#include "comctl32.h"
 #include "treeview.h"
 
@@ -460 +461 @@
 
 static LRESULT
+TREEVIEW_GetLineColor (HWND hwnd, WPARAM wParam, LPARAM lParam)
+{
+  TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
+
+  //TRACE("\n");
+  return (LRESULT) infoPtr->clrLine;
+}
+
+static LRESULT
+TREEVIEW_SetLineColor (HWND hwnd, WPARAM wParam, LPARAM lParam)
+{
+  TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
+  COLORREF prevColor=infoPtr->clrLine;
+
+  //TRACE("\n");
+  infoPtr->clrLine=(COLORREF) lParam;
+  return (LRESULT) prevColor;
+}
+
+static LRESULT
 TREEVIEW_SetTextColor (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -510 +531 @@
 {
   TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
-
+  DWORD dwStyle = GetWindowLongA(hwnd,GWL_STYLE);
   INT   center,xpos,cx,cy, cditem, drawmode;
   HFONT hOldFont;
@@ -523 +544 @@
 
   cditem=0;
+  //TRACE ("cdmode:%x\n",infoPtr->cdmode);
   if (infoPtr->cdmode & CDRF_NOTIFYITEMDRAW) {
                 drawmode=CDDS_ITEMPREPAINT;
 
                 if (infoPtr->cdmode & CDRF_NOTIFYSUBITEMDRAW)
-      drawmode|=CDDS_SUBITEM;
+                  drawmode|=CDDS_SUBITEM;
 
                 cditem=TREEVIEW_SendCustomDrawItemNotify (hwnd, hdc, wineItem, drawmode);
@@ -547 +569 @@
    * Display the tree hierarchy
    */
-  if ( GetWindowLongA( hwnd, GWL_STYLE) & TVS_HASLINES)
+  if ( dwStyle & TVS_HASLINES)
   {
     /*
@@ -557 +579 @@
      * points[2] is attached to the parent or the up sibling
      */
-    if ( GetWindowLongA( hwnd, GWL_STYLE) & TVS_LINESATROOT)
+    if ( dwStyle & TVS_LINESATROOT)
     {
       TREEVIEW_ITEM *upNode    = NULL;
@@ -598 +620 @@
 
       /*
-       * Get a doted pen
+       * Get a dotted pen
        */
-      hnewPen = CreatePen(PS_DOT, 0, GetSysColor(COLOR_WINDOWTEXT) );
+      hnewPen = CreatePen(PS_DOT, 0, infoPtr->clrLine);
       hOldPen = SelectObject( hdc, hnewPen );
 
@@ -619 +641 @@
     xpos+=(5*wineItem->iLevel);
 
-  if (( GetWindowLongA( hwnd, GWL_STYLE) & TVS_HASBUTTONS) &&
-      ( GetWindowLongA( hwnd, GWL_STYLE) & TVS_HASLINES))
+  if (( dwStyle & TVS_HASBUTTONS) && ( dwStyle & TVS_HASLINES))
   {
           if ( (wineItem->cChildren) ||
@@ -876 +897 @@
   if (tvItem->mask & TVIF_INTEGRAL) {
         wineItem->iIntegral=tvItem->iIntegral;
-//        FIXME (treeview," TVIF_INTEGRAL not supported yet\n");
   }
 
@@ -909 +929 @@
 }
 
-
-
-
+static LRESULT
+TREEVIEW_GetItemState (HWND hwnd, WPARAM wParam, LPARAM lParam)
+
+{
+    TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
+        TREEVIEW_ITEM *wineItem;
+
+        wineItem = TREEVIEW_ValidItem (infoPtr, (HTREEITEM)wParam);
+        if (!wineItem) return 0;
+
+        return (wineItem->state & lParam);
+}
 
 static void
@@ -1144 +1173 @@
    if (tvItem->mask & TVIF_INTEGRAL) {
         tvItem->iIntegral=wineItem->iIntegral;
-//              FIXME (treeview," TVIF_INTEGRAL not supported yet\n");
    }
 
@@ -1382 +1410 @@
 
 /***************************************************************************
+ * Treeview native sort routine: sort on item text.
+ */
+static INT WINAPI TREEVIEW_SortOnName (
+  LPVOID first,
+  LPVOID second,
+  LPARAM tvInfoPtr)
+{
+  HWND hwnd=(HWND) tvInfoPtr;
+  char *txt1, *txt2;
+  TREEVIEW_ITEM *item;
+
+
+  item=(TREEVIEW_ITEM *) first;
+  if (item->pszText==LPSTR_TEXTCALLBACKA)  {
+         TREEVIEW_SendDispInfoNotify (hwnd, item, TVN_GETDISPINFO, TVIF_TEXT);
+        }
+  txt1=item->pszText;
+
+  item=(TREEVIEW_ITEM *) second;
+  if (item->pszText==LPSTR_TEXTCALLBACKA)  {
+         TREEVIEW_SendDispInfoNotify (hwnd, item, TVN_GETDISPINFO, TVIF_TEXT);
+        }
+  txt2=item->pszText;
+
+  return -strcmp (txt1,txt2);
+}
+
+/***************************************************************************
  * Setup the treeview structure with regards of the sort method
  * and sort the children of the TV item specified in lParam
+ * fRecurse: currently unused. Should be zero.
+ * parent: if pSort!=NULL, should equal pSort->hParent.
+ *         otherwise, item which child items are to be sorted.
+ * pSort:  sort method info. if NULL, sort on item text.
+ *         if non-NULL, sort on item's lParam content, and let the
+ *         application decide what that means. See also TVM_SORTCHILDRENCB.
  */
-LRESULT WINAPI TREEVIEW_SortChildrenCB(
+
+static LRESULT WINAPI TREEVIEW_Sort (
   HWND   hwnd,
-  WPARAM wParam,
-  LPARAM lParam)
+  BOOL   fRecurse,
+  HTREEITEM parent,
+  LPTVSORTCB pSort
+  )
 {
   TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
@@ -1394 +1459 @@
 
   /* Obtain the TVSORTBC struct */
-  infoPtr->pCallBackSort = (LPTVSORTCB)lParam;
+  infoPtr->pCallBackSort = pSort;
+
+        /* undocumented feature: TVI_ROOT means `sort the whole tree' */
+
+  if (parent==TVI_ROOT)
+    parent=infoPtr->TopRootItem;
 
   /* Check for a valid handle to the parent item */
-  if (!TREEVIEW_ValidItem(infoPtr, infoPtr->pCallBackSort->hParent))
+  if (!TREEVIEW_ValidItem(infoPtr, parent))
   {
-//    ERR ("invalid item hParent=%d\n", (INT)infoPtr->pCallBackSort->hParent);
+    ERR ("invalid item hParent=%x\n", (INT)parent);
     return FALSE;
   }
 
   /* Obtain the parent node to sort */
-  sortMe = &infoPtr->items[ (INT)infoPtr->pCallBackSort->hParent ];
+  sortMe = &infoPtr->items[ (INT)parent ];
 
   /* Make sure there is something to sort */
@@ -1434 +1504 @@
 
     /* let DPA perform the sort activity */
-    DPA_Sort(
-      sortList,                  /* what  */
-      TREEVIEW_CallBackCompare,  /* how   */
-      hwnd);                     /* owner */
+        if (pSort)
+        DPA_Sort(
+                sortList,                  /* what  */
+                TREEVIEW_CallBackCompare,  /* how   */
+                hwnd);                     /* owner */
+        else
+                DPA_Sort (
+                        sortList,                  /* what  */
+                TREEVIEW_SortOnName,       /* how   */
+                        hwnd);                     /* owner */
 
     /*
@@ -1476 +1552 @@
   return FALSE;
 }
+
+/***************************************************************************
+ * Setup the treeview structure with regards of the sort method
+ * and sort the children of the TV item specified in lParam
+ */
+static LRESULT WINAPI TREEVIEW_SortChildrenCB(
+  HWND   hwnd,
+  WPARAM wParam,
+  LPARAM lParam
+  )
+{
+ LPTVSORTCB pSort=(LPTVSORTCB) lParam;
+
+ return TREEVIEW_Sort (hwnd, wParam, pSort->hParent, pSort);
+}
+
+
+/***************************************************************************
+ * Sort the children of the TV item specified in lParam.
+ */
+static LRESULT WINAPI TREEVIEW_SortChildren (
+  HWND   hwnd,
+  WPARAM wParam,
+  LPARAM lParam)
+{
+ return TREEVIEW_Sort (hwnd, (BOOL) wParam, (HTREEITEM) lParam, NULL);
+}
+
 
 int ffs(int mask)
@@ -1779 +1883 @@
 
 
-
+static LRESULT
+TREEVIEW_InsertItemW(HWND hwnd, WPARAM wParam, LPARAM lParam)
+{
+    TVINSERTSTRUCTW *tvisW;
+    TVINSERTSTRUCTA tvisA;
+    LRESULT lRes;
+
+    tvisW = (LPTVINSERTSTRUCTW)lParam;
+
+    tvisA.hParent = tvisW->hParent;
+    tvisA.hInsertAfter = tvisW->hInsertAfter;
+
+    tvisA.DUMMYUNIONNAME.item.mask           = tvisW->DUMMYUNIONNAME.item.mask;
+    tvisA.DUMMYUNIONNAME.item.hItem          = tvisW->DUMMYUNIONNAME.item.hItem;
+    tvisA.DUMMYUNIONNAME.item.state          = tvisW->DUMMYUNIONNAME.item.state;
+    tvisA.DUMMYUNIONNAME.item.stateMask      = tvisW->DUMMYUNIONNAME.item.stateMask;
+    tvisA.DUMMYUNIONNAME.item.cchTextMax     = tvisW->DUMMYUNIONNAME.item.cchTextMax;
+
+    if(tvisW->DUMMYUNIONNAME.item.pszText)
+    {
+        if (tvisW->DUMMYUNIONNAME.item.pszText!=LPSTR_TEXTCALLBACKW)
+        {
+            int len = lstrlenW (tvisW->DUMMYUNIONNAME.item.pszText)+1;
+            tvisA.DUMMYUNIONNAME.item.pszText = COMCTL32_Alloc (len);
+            lstrcpyWtoA (tvisA.DUMMYUNIONNAME.item.pszText,
+                         tvisW->DUMMYUNIONNAME.item.pszText );
+        }
+        else
+        {
+            tvisA.DUMMYUNIONNAME.item.pszText = LPSTR_TEXTCALLBACKA;
+            tvisA.DUMMYUNIONNAME.item.cchTextMax = 0;
+        }
+    }
+
+    tvisA.DUMMYUNIONNAME.item.iImage         = tvisW->DUMMYUNIONNAME.item.iImage;
+    tvisA.DUMMYUNIONNAME.item.iSelectedImage = tvisW->DUMMYUNIONNAME.item.iSelectedImage;
+    tvisA.DUMMYUNIONNAME.item.cChildren      = tvisW->DUMMYUNIONNAME.item.cChildren;
+    tvisA.DUMMYUNIONNAME.item.lParam         = tvisW->DUMMYUNIONNAME.item.lParam;
+
+    lRes = TREEVIEW_InsertItemA(hwnd,wParam,(LPARAM)&tvisA);
+
+    if (tvisA.DUMMYUNIONNAME.item.pszText!=LPSTR_TEXTCALLBACKA)
+    {
+        COMCTL32_Free(tvisA.DUMMYUNIONNAME.item.pszText);
+    }
+
+    return lRes;
+
+}
 
 
@@ -1858 +2010 @@
 
 
-LRESULT CALLBACK
+static LRESULT CALLBACK
 TREEVIEW_GetEditControl (HWND hwnd)
 
@@ -1979 +2131 @@
 TREEVIEW_StyleChanged (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
-  LPSTYLESTRUCT lpss=(LPSTYLESTRUCT) lParam;
-
 //  TRACE (treeview,"(%x %lx)\n",wParam,lParam);
 
-  if (wParam & (GWL_STYLE))
-         SetWindowLongA( hwnd, GWL_STYLE, lpss->styleNew);
-  if (wParam & (GWL_EXSTYLE))
-         SetWindowLongA( hwnd, GWL_STYLE, lpss->styleNew);
+  TREEVIEW_Refresh(hwnd);
 
   return 0;
@@ -2022 +2169 @@
     infoPtr->clrBk = GetSysColor (COLOR_WINDOW);
     infoPtr->clrText = GetSysColor (COLOR_BTNTEXT);
+    infoPtr->clrLine = GetSysColor (COLOR_WINDOWTEXT);
     infoPtr->cy = 0;
     infoPtr->cx = 0;
@@ -2039 +2187 @@
     infoPtr->dropItem=0;
     infoPtr->pCallBackSort=NULL;
+    infoPtr->uScrollTime = 300; /* milliseconds */
 
 /*
@@ -2696 +2845 @@
 
 
-LRESULT
+static LRESULT
 TREEVIEW_LButtonDoubleClick (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -3358 +3507 @@
 }
 
-
-LRESULT WINAPI
+static LRESULT
+TREEVIEW_GetScrollTime (HWND hwnd)
+{
+  TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
+  return infoPtr->uScrollTime;
+}
+
+static LRESULT
+TREEVIEW_SetScrollTime (HWND hwnd, UINT uScrollTime)
+{
+  TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
+  UINT uOldScrollTime = infoPtr->uScrollTime;
+  infoPtr->uScrollTime = min (uScrollTime, 100);
+  return uOldScrollTime;
+}
+
+static LRESULT WINAPI
 TREEVIEW_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
@@ -3367 +3531 @@
 
         case TVM_INSERTITEMW:
-//                      FIXME (treeview, "Unimplemented msg TVM_INSERTITEM32W\n");
-                return 0;
+          return TREEVIEW_InsertItemW(hwnd,wParam,lParam);
 
         case TVM_DELETEITEM:
@@ -3404 +3567 @@
 
         case TVM_GETITEMW:
-//                      FIXME (treeview, "Unimplemented msg TVM_GETITEM32W\n");
+//                      FIXME (treeview, "Unimplemented msg TVM_GETITEMW\n");
                 return 0;
 
@@ -3415 +3578 @@
 
         case TVM_EDITLABELA:
-//                      FIXME (treeview, "Unimplemented msg TVM_EDITLABEL32A \n");
+//                      FIXME (treeview, "Unimplemented msg TVM_EDITLABELA \n");
                 return 0;
 
         case TVM_EDITLABELW:
-//                      FIXME (treeview, "Unimplemented msg TVM_EDITLABEL32W \n");
+//                      FIXME (treeview, "Unimplemented msg TVM_EDITLABELW \n");
                 return 0;
 
@@ -3435 +3598 @@
 
         case TVM_SORTCHILDREN:
-//                      FIXME (treeview, "Unimplemented msg TVM_SORTCHILDREN\n");
-                return 0;
+                return TREEVIEW_SortChildrenCB(hwnd, wParam, lParam);
 
         case TVM_ENSUREVISIBLE:
@@ -3449 +3611 @@
 
         case TVM_GETISEARCHSTRINGA:
-//                      FIXME (treeview, "Unimplemented msg TVM_GETISEARCHSTRING32A\n");
+//                      FIXME (treeview, "Unimplemented msg TVM_GETISEARCHSTRINGA\n");
                 return 0;
 
         case TVM_GETISEARCHSTRINGW:
-//                      FIXME (treeview, "Unimplemented msg TVM_GETISEARCHSTRING32W\n");
+//                      FIXME (treeview, "Unimplemented msg TVM_GETISEARCHSTRINGW\n");
                 return 0;
 
@@ -3485 +3647 @@
 
         case TVM_SETSCROLLTIME:
-//                      FIXME (treeview, "Unimplemented msg TVM_SETSCROLLTIME\n");
-                return 0;
+                return TREEVIEW_SetScrollTime (hwnd, (UINT)wParam);
 
         case TVM_GETSCROLLTIME:
-//                      FIXME (treeview, "Unimplemented msg TVM_GETSCROLLTIME\n");
-                return 0;
+                return TREEVIEW_GetScrollTime (hwnd);
+
+        case TVM_GETITEMSTATE:
+                return TREEVIEW_GetItemState (hwnd,wParam, lParam);
+
+        case TVM_GETLINECOLOR:
+                return TREEVIEW_GetLineColor (hwnd,wParam, lParam);
+
+        case TVM_SETLINECOLOR:
+                return TREEVIEW_SetLineColor (hwnd,wParam, lParam);
 
         case TVM_SETINSERTMARKCOLOR:
@@ -3504 +3673 @@
                 return 0;
 
-                case WM_COMMAND:
-                         return TREEVIEW_Command (hwnd, wParam, lParam);
-
-                case WM_CREATE:
-                        return TREEVIEW_Create (hwnd, wParam, lParam);
-
-                case WM_DESTROY:
-                        return TREEVIEW_Destroy (hwnd);
-
-/*              case WM_ENABLE: */
-
-                case WM_ERASEBKGND:
-                        return TREEVIEW_EraseBackground (hwnd, wParam, lParam);
-
-                case WM_GETDLGCODE:
+        case WM_COMMAND:
+                return TREEVIEW_Command (hwnd, wParam, lParam);
+
+        case WM_CREATE:
+                return TREEVIEW_Create (hwnd, wParam, lParam);
+
+        case WM_DESTROY:
+                return TREEVIEW_Destroy (hwnd);
+
+/*      case WM_ENABLE: */
+
+        case WM_ERASEBKGND:
+                return TREEVIEW_EraseBackground (hwnd, wParam, lParam);
+
+        case WM_GETDLGCODE:
                 return DLGC_WANTARROWS | DLGC_WANTCHARS;
 
-                case WM_PAINT:
+        case WM_PAINT:
                 return TREEVIEW_Paint (hwnd, wParam, lParam);
 
-                case WM_GETFONT:
+        case WM_GETFONT:
                 return TREEVIEW_GetFont (hwnd, wParam, lParam);
 
-                case WM_SETFONT:
+        case WM_SETFONT:
                 return TREEVIEW_SetFont (hwnd, wParam, lParam);
 
-                case WM_KEYDOWN:
-                        return TREEVIEW_KeyDown (hwnd, wParam, lParam);
-
-
-                case WM_SETFOCUS:
-                        return TREEVIEW_SetFocus (hwnd, wParam, lParam);
-
-                case WM_KILLFOCUS:
-                        return TREEVIEW_KillFocus (hwnd, wParam, lParam);
-
-
-                case WM_LBUTTONDOWN:
-                        return TREEVIEW_LButtonDown (hwnd, wParam, lParam);
-
-                case WM_LBUTTONUP:
-                        return TREEVIEW_LButtonUp (hwnd, wParam, lParam);
-
-                case WM_LBUTTONDBLCLK:
-                        return TREEVIEW_LButtonDoubleClick (hwnd, wParam, lParam);
-
-                case WM_RBUTTONDOWN:
-                        return TREEVIEW_RButtonDown (hwnd, wParam, lParam);
-
-                case WM_RBUTTONUP:
-                        return TREEVIEW_RButtonUp (hwnd, wParam, lParam);
-
-                case WM_MOUSEMOVE:
-                        return TREEVIEW_MouseMove (hwnd, wParam, lParam);
-
-
-/*              case WM_SYSCOLORCHANGE: */
-                case WM_STYLECHANGED:
-                        return TREEVIEW_StyleChanged (hwnd, wParam, lParam);
-
-/*              case WM_SETREDRAW: */
-
-                case WM_TIMER:
-                        return TREEVIEW_HandleTimer (hwnd, wParam, lParam);
-
-                case WM_SIZE:
-                        return TREEVIEW_Size (hwnd, wParam,lParam);
-
-                case WM_HSCROLL:
-                        return TREEVIEW_HScroll (hwnd, wParam, lParam);
-                case WM_VSCROLL:
-                        return TREEVIEW_VScroll (hwnd, wParam, lParam);
-
-                case WM_DRAWITEM:
-//                      printf ("drawItem\n");
-                        return DefWindowProcA (hwnd, uMsg, wParam, lParam);
-
-                default:
-//                if (uMsg >= WM_USER)
-//              FIXME (treeview, "Unknown msg %04x wp=%08x lp=%08lx\n",
+        case WM_KEYDOWN:
+                return TREEVIEW_KeyDown (hwnd, wParam, lParam);
+
+        case WM_SETFOCUS:
+                return TREEVIEW_SetFocus (hwnd, wParam, lParam);
+
+        case WM_KILLFOCUS:
+                return TREEVIEW_KillFocus (hwnd, wParam, lParam);
+
+        case WM_LBUTTONDOWN:
+                return TREEVIEW_LButtonDown (hwnd, wParam, lParam);
+
+        case WM_LBUTTONUP:
+                return TREEVIEW_LButtonUp (hwnd, wParam, lParam);
+
+        case WM_LBUTTONDBLCLK:
+                return TREEVIEW_LButtonDoubleClick (hwnd, wParam, lParam);
+
+        case WM_RBUTTONDOWN:
+                return TREEVIEW_RButtonDown (hwnd, wParam, lParam);
+
+        case WM_RBUTTONUP:
+                return TREEVIEW_RButtonUp (hwnd, wParam, lParam);
+
+        case WM_MOUSEMOVE:
+                return TREEVIEW_MouseMove (hwnd, wParam, lParam);
+
+        case WM_STYLECHANGED:
+                return TREEVIEW_StyleChanged (hwnd, wParam, lParam);
+
+/*      case WM_SYSCOLORCHANGE: */
+/*      case WM_SETREDRAW: */
+
+        case WM_TIMER:
+                return TREEVIEW_HandleTimer (hwnd, wParam, lParam);
+
+        case WM_SIZE:
+                return TREEVIEW_Size (hwnd, wParam,lParam);
+
+        case WM_HSCROLL:
+                return TREEVIEW_HScroll (hwnd, wParam, lParam);
+
+        case WM_VSCROLL:
+                return TREEVIEW_VScroll (hwnd, wParam, lParam);
+
+        case WM_DRAWITEM:
+//              printf ("drawItem\n");
+                return DefWindowProcA (hwnd, uMsg, wParam, lParam);
+
+        default:
+//              if (uMsg >= WM_USER)
+//                FIXME (treeview, "Unknown msg %04x wp=%08x lp=%08lx\n",
 //                   uMsg, wParam, lParam);
             return DefWindowProcA (hwnd, uMsg, wParam, lParam);

trunk/src/comctl32/updown.c ¶

@@ -1 @@
-/* $Id: updown.c,v 1.6 1999-07-12 15:58:51 cbratschi Exp $ */
+/* $Id: updown.c,v 1.7 1999-08-14 16:13:16 cbratschi Exp $ */
 /*
  * Updown control
@@ -8 +8 @@
  *
  * TODO:
- *   - subclass the buddy window (in UPDOWN_SetBuddyHandle) to process the
- *     arrow keys
  *   - I am not sure about the default values for the Min, Max, Pos
  *     (in the UPDOWN_INFO the fields: MinVal, MaxVal, CurVal)
@@ -56 +54 @@
 #define DEFAULT_ADDTOP    0  /* amount to extend above the buddy window */
 #define DEFAULT_ADDBOT    0  /* amount to extend below the buddy window */
+#define DEFAULT_BUDDYBORDER  2  /* Width/height of the buddy border */
 
 
@@ -67 +66 @@
 #define TIMERID1         1
 #define TIMERID2         2
+#define BUDDY_UPDOWN_HWND        "buddyUpDownHWND"
+#define BUDDY_SUPERCLASS_WNDPROC "buddySupperClassWndProc"
 
 static int accelIndex = -1;
@@ -77 +78 @@
 #define UPDOWN_GetInfoPtr(hwnd) ((UPDOWN_INFO *)GetWindowLongA(hwnd,0))
 
+static LRESULT CALLBACK
+UPDOWN_Buddy_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
 
 /***********************************************************************
@@ -119 +122 @@
 
 /***********************************************************************
+ * UPDOWN_HasBuddyBorder [Internal]
+ *
+ * When we have a buddy set and that we are aligned on our buddy, we
+ * want to draw a sunken edge to make like we are part of that control.
+ */
+static BOOL UPDOWN_HasBuddyBorder(HWND hwnd)
+{
+  UPDOWN_INFO* infoPtr = UPDOWN_GetInfoPtr (hwnd);
+  DWORD        dwStyle = GetWindowLongA (hwnd, GWL_STYLE);
+
+  return  ( ((dwStyle & (UDS_ALIGNLEFT | UDS_ALIGNRIGHT)) != 0) &&
+            (SendMessageA(hwnd, UDM_GETBUDDY, 0, 0) != 0) &&
+            (lstrcmpiA(infoPtr->szBuddyClass, "EDIT") == 0 ) );
+}
+
+/***********************************************************************
  *           UPDOWN_GetArrowRect
  * wndPtr   - pointer to the up-down wnd
@@ -128 +147 @@
 static void UPDOWN_GetArrowRect (HWND hwnd, RECT *rect, BOOL incr)
 {
-  int len; /* will hold the width or height */
+  DWORD dwStyle = GetWindowLongA (hwnd, GWL_STYLE);
+  int   len; /* will hold the width or height */
 
   GetClientRect (hwnd, rect);
 
-  if (GetWindowLongA(hwnd, GWL_STYLE) & UDS_HORZ)
+  /*
+   * Make sure we calculate the rectangle to fit even if we draw the
+   * border.
+   */
+  if (UPDOWN_HasBuddyBorder(hwnd))
   {
-    len = rect->right-rect->left; /* compute the width */
-    if (incr) rect->left = len/2+1;
-    else rect->right = len/2;
-  } else
-  {
-    len = rect->bottom-rect->top; /* compute the height */
-    if (incr) rect->bottom = len/2;
-    else rect->top = len/2+1;
+    if (dwStyle & UDS_ALIGNLEFT)
+      rect->left+=DEFAULT_BUDDYBORDER;
+    else
+      rect->right-=DEFAULT_BUDDYBORDER;
+
+    InflateRect(rect, 0, -DEFAULT_BUDDYBORDER);
+  }
+
+  /*
+   * We're calculating the midpoint to figure-out where the
+   * separation between the buttons will lay. We make sure that we
+   * round the uneven numbers by adding 1.
+   */
+  if (dwStyle & UDS_HORZ) {
+    len = rect->right - rect->left + 1; /* compute the width */
+    if (incr)
+      rect->left = rect->left + len/2;
+    else
+      rect->right =  rect->left + len/2;
+  }
+  else {
+    len = rect->bottom - rect->top + 1; /* compute the height */
+    if (incr)
+      rect->bottom =  rect->top + len/2;
+    else
+      rect->top =  rect->top + len/2;
   }
 }
@@ -277 +319 @@
 
 /***********************************************************************
+ * UPDOWN_DrawBuddyBorder [Internal]
+ *
+ * When we have a buddy set and that we are aligned on our buddy, we
+ * want to draw a sunken edge to make like we are part of that control.
+ */
+static void UPDOWN_DrawBuddyBorder (HWND hwnd, HDC hdc)
+{
+  DWORD dwStyle = GetWindowLongA (hwnd, GWL_STYLE);
+  RECT  clientRect;
+
+  GetClientRect(hwnd, &clientRect);
+
+  if (dwStyle & UDS_ALIGNLEFT)
+    DrawEdge(hdc, &clientRect, EDGE_SUNKEN, BF_BOTTOM | BF_LEFT | BF_TOP);
+  else
+    DrawEdge(hdc, &clientRect, EDGE_SUNKEN, BF_BOTTOM | BF_RIGHT | BF_TOP);
+}
+
+/***********************************************************************
  * UPDOWN_Draw [Internal]
  *
@@ -287 +348 @@
   BOOL prssed;
   RECT rect;
+
+  /*
+   * Draw the common border between ourselves and our buddy.
+   */
+  if (UPDOWN_HasBuddyBorder(hwnd))
+    UPDOWN_DrawBuddyBorder(hwnd, hdc);
 
   /* Draw the incr button */
@@ -332 +399 @@
  * Calls UPDOWN_Draw.
  */
-static void UPDOWN_Paint (HWND hwnd)
+static void UPDOWN_Paint (HWND hwnd, HDC passedDC)
 {
     PAINTSTRUCT ps;
-    HDC hdc;
-
-    hdc = BeginPaint (hwnd, &ps);
+    HDC         hdc = passedDC;
+
+    if (passedDC == 0)
+      hdc = BeginPaint (hwnd, &ps);
+
     UPDOWN_Draw (hwnd, hdc);
-    EndPaint (hwnd, &ps);
+
+    if (passedDC == 0)
+      EndPaint (hwnd, &ps);
 }
 
 /***********************************************************************
  *           UPDOWN_SetBuddyHandle
+ * CB: UPDOWN_SetBuddy == message handler
  * Tests if 'hwndBud' is a valid window handle. If not, returns FALSE.
  * Else, sets it as a new Buddy.
@@ -354 +426 @@
 static BOOL UPDOWN_SetBuddyHandle (HWND hwnd, HWND hwndBud)
 {
-  UPDOWN_INFO *infoPtr = UPDOWN_GetInfoPtr (hwnd);
-  DWORD dwStyle = GetWindowLongA (hwnd, GWL_STYLE);
-  RECT budRect; /* new coord for the buddy */
-  int x;          /* new x position and width for the up-down */
-
-  *infoPtr->szBuddyClass = '\0';
-
-  /* Is is a valid bud? */
+  UPDOWN_INFO* infoPtr = UPDOWN_GetInfoPtr (hwnd);
+  DWORD        dwStyle = GetWindowLongA (hwnd, GWL_STYLE);
+  RECT         budRect;  /* new coord for the buddy */
+  int          x,width;  /* new x position and width for the up-down */
+        
+  /* Is it a valid bud? */
   if(!IsWindow(hwndBud))
     return FALSE;
 
-  /* Store buddy wundow handle */
+  /* there is already a body assigned */
+  if ( infoPtr->Buddy )
+    RemovePropA(infoPtr->Buddy, BUDDY_UPDOWN_HWND);
+
+  /* Store buddy window handle */
   infoPtr->Buddy = hwndBud;
 
+  /* keep upDown ctrl hwnd in a buddy property */
+  SetPropA( hwndBud, BUDDY_UPDOWN_HWND, hwnd);
+
   /* Store buddy window clas name */
-  GetClassNameA (hwndBud, infoPtr->szBuddyClass, 40);
+  memset(infoPtr->szBuddyClass, 0, UPDOWN_BUDDYCLASSNAMELEN);
+  GetClassNameA (hwndBud, infoPtr->szBuddyClass, UPDOWN_BUDDYCLASSNAMELEN-1);
 
   if(dwStyle & UDS_ARROWKEYS){
-//    FIXME(updown, "we need to subclass the buddy to process the arrow keys.\n");
+    /* Note that I don't clear the BUDDY_SUPERCLASS_WNDPROC property
+       when we reset the upDown ctrl buddy to another buddy because it is not
+       good to break the window proc chain. */
+
+    /* keep buddy supperclass wndproc in prop instead of in ptr struct
+       to prevent accessing freed memory */
+    SetPropA(
+      hwndBud,
+      BUDDY_SUPERCLASS_WNDPROC,
+      (LONG)GetWindowLongA(hwndBud, GWL_WNDPROC) );
+
+    /* Assign the buddy wndproc to local wndproc in order to override
+       keyboard's up and down arrow */
+    SetWindowLongA(
+      hwndBud,
+      GWL_WNDPROC,
+      (LONG)UPDOWN_Buddy_SubclassProc);
   }
 
@@ -379 +473 @@
     return TRUE;
 
-  infoPtr->Buddy = hwndBud;
-
   /* Get the rect of the buddy relative to its parent */
   GetWindowRect(infoPtr->Buddy, &budRect);
   MapWindowPoints(HWND_DESKTOP, GetParent(infoPtr->Buddy),
-                  (POINT *)(&budRect.left), 2);
+                  (POINT *)(&budRect.left), 2);
 
   /* now do the positioning */
@@ -398 +490 @@
   /* first adjust the buddy to accomodate the up/down */
   SetWindowPos(infoPtr->Buddy, 0, budRect.left, budRect.top,
-               budRect.right  - budRect.left, budRect.bottom - budRect.top,
-               SWP_NOACTIVATE|SWP_NOZORDER);
+               budRect.right  - budRect.left, budRect.bottom - budRect.top,
+               SWP_NOACTIVATE|SWP_NOZORDER);
 
   /* now position the up/down */
   /* Since the UDS_ALIGN* flags were used, */
   /* we will pick the position and size of the window. */
-
-  SetWindowPos (hwnd, 0, x, budRect.top-DEFAULT_ADDTOP,DEFAULT_WIDTH,
-                 (budRect.bottom-budRect.top)+DEFAULT_ADDTOP+DEFAULT_ADDBOT,
-                 SWP_NOACTIVATE|SWP_NOZORDER);
+  width = DEFAULT_WIDTH;
+
+  /*
+   * If the updown has a buddy border, it has to overlap with the buddy
+   * to look as if it is integrated with the buddy control.
+   * We nudge the control or change it size to overlap.
+   */
+  if (UPDOWN_HasBuddyBorder(hwnd))
+  {
+    if(dwStyle & UDS_ALIGNRIGHT)
+      x-=DEFAULT_BUDDYBORDER;
+    else
+      width+=DEFAULT_BUDDYBORDER;
+  }
+
+  SetWindowPos (hwnd, infoPtr->Buddy,
+                x, budRect.top-DEFAULT_ADDTOP,
+                width, (budRect.bottom-budRect.top)+DEFAULT_ADDTOP+DEFAULT_ADDBOT,
+                SWP_NOACTIVATE);
 
   return TRUE;
-}
+}       
 
 /***********************************************************************
@@ -640 +747 @@
   if(infoPtr->AccelVect) COMCTL32_Free(infoPtr->AccelVect);
 
+  if ( IsWindow(infoPtr->Buddy) ) /* Cleanup */
+        RemovePropA(infoPtr->Buddy, BUDDY_UPDOWN_HWND);
+
   COMCTL32_Free (infoPtr);
 
@@ -652 +762 @@
 
   if (dwStyle & WS_DISABLED) UPDOWN_CancelMode(hwnd);
-  UPDOWN_Paint(hwnd);
+
+  UPDOWN_Refresh(hwnd);
 
   return 0;
@@ -811 +922 @@
   if (lParam) UNKNOWN_PARAM(UDM_SETBUDDY,wParam,lParam);
   temp = infoPtr->Buddy;
-  infoPtr->Buddy = wParam;
   UPDOWN_SetBuddyHandle(hwnd,wParam);
 //      TRACE(updown, "UpDown Ctrl new buddy(%04x), hwnd=%04x\n",
@@ -901 +1011 @@
  *           UpDownWndProc
  */
-LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam,
+static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam,
                                 LPARAM lParam)
 {
@@ -942 +1052 @@
 
     case WM_PAINT:
-      UPDOWN_Paint(hwnd);
+      UPDOWN_Paint(hwnd,(HDC)wParam);
       break;
 
@@ -991 +1101 @@
 }
 
+/***********************************************************************
+ * UPDOWN_Buddy_SubclassProc used to handle messages sent to the buddy
+ *                           control.
+ */
+LRESULT CALLBACK
+UPDOWN_Buddy_SubclassProc (
+  HWND   hwnd,
+  UINT   uMsg,
+  WPARAM wParam,
+  LPARAM lParam)
+{
+  LONG superClassWndProc = GetPropA(hwnd, BUDDY_SUPERCLASS_WNDPROC);
+  //TRACE("hwnd=%04x, wndProc=%d, uMsg=%04x, wParam=%d, lParam=%d\n",
+  // hwnd, (INT)superClassWndProc, uMsg, wParam, (UINT)lParam);
+
+  switch (uMsg)
+  {
+    case WM_KEYDOWN:
+    {
+      if ( ((int)wParam == VK_UP ) || ((int)wParam == VK_DOWN ) )
+      {
+        HWND upDownHwnd      = GetPropA(hwnd, BUDDY_UPDOWN_HWND);
+        UPDOWN_INFO *infoPtr = UPDOWN_GetInfoPtr(upDownHwnd);
+
+        if (!lstrcmpA (infoPtr->szBuddyClass, "ListBox"))
+        {
+          /* if the buddy is a list window, we must update curr index */
+          INT oldVal = SendMessageA(hwnd, LB_GETCURSEL, 0, 0);
+          SendMessageA(hwnd, LB_SETCURSEL, oldVal+1, 0);
+        }
+        else
+        {
+          UPDOWN_GetBuddyInt(upDownHwnd);
+          UPDOWN_DoAction(upDownHwnd, 1, wParam==VK_UP);
+        }
+
+        break;
+      }
+      /* else Fall Through */
+    }
+
+    default:
+      return CallWindowProcA( (WNDPROC)superClassWndProc, hwnd, uMsg, wParam, lParam);
+  }
+
+  return 0;
+}
 
 /***********************************************************************