Changeset 13400

Timestamp:

Feb 18, 2000, 6:13:39 PM (25 years ago)

Author:

cbratschi

Message:

* empty log message *

Location:

tags/trunk

Files:

• include/win/treeview.h (modified) (4 diffs)
• src/comctl32/comctl32.c (modified) (5 diffs)
• src/comctl32/comctl32.h (modified) (3 diffs)
• src/comctl32/comctl32undoc.c (modified) (65 diffs)
• src/comctl32/draglist.c (modified) (4 diffs)
• src/comctl32/imagelist.c (modified) (43 diffs)
• src/comctl32/propsheet.c (modified) (8 diffs)
• src/comctl32/resource.asm (modified) (20 diffs)
• src/comctl32/treeview.c (modified) (31 diffs)

tags/trunk/include/win/treeview.h ¶

@@ -1 @@
-/* $Id: treeview.h,v 1.10 2000-02-17 17:26:07 cbratschi Exp $ */
+/* $Id: treeview.h,v 1.11 2000-02-18 17:12:43 cbratschi Exp $ */
 /*
  * Treeview class extra info
@@ -15 +15 @@
 #define TV_DEFAULTITEMHEIGHT  16
 #define TVITEM_ALLOC          32      /* default nr of items to allocate at first try */
+#define TV_ISEARCH_DELAY     500
 
 
@@ -89 +90 @@
                                /* 1=valid, 0=free;   */
                                /* size of list= uNumPtrsAlloced/32 */
+  LPWSTR        pszISearch;
+  UINT          uISearchLen;
 } TREEVIEW_INFO, *LPTREEVIEW_INFO;
 
@@ -107 +110 @@
 #define TV_REFRESH_TIMER 1
 #define TV_EDIT_TIMER    2
+#define TV_ISEARCH_TIMER 3
+
 #define TV_REFRESH_TIMER_SET 1
-#define TV_EDIT_TIMER_SET 2
+#define TV_EDIT_TIMER_SET    2
+#define TV_ISEARCH_TIMER_SET 3
 
 

tags/trunk/src/comctl32/comctl32.c ¶

@@ -1 @@
-/* $Id: comctl32.c,v 1.14 2000-02-14 17:31:39 cbratschi Exp $ */
+/* $Id: comctl32.c,v 1.15 2000-02-18 17:13:37 cbratschi Exp $ */
 /*
  * Win32 common controls implementation
@@ -225 +225 @@
     LPINT lpMenuId;
 
-//    TRACE (commctrl, "%x, %x, %p\n", hwnd, uFlags, lpInfo);
-
     dprintf(("COMCTL32: ShowHideMenuCtl"));
 
@@ -287 +285 @@
     INT  *lpRun;
     HWND hwndCtrl;
-
-//    TRACE (commctrl, "(0x%08lx 0x%08lx 0x%08lx)\n",
-//         (DWORD)hwnd, (DWORD)lpRect, (DWORD)lpInfo);
 
     dprintf(("COMCTL32: GetEffectiveClientRect"));
@@ -823 +818 @@
 COMCTL32_DllGetVersion (DLLVERSIONINFO *pdvi)
 {
+    dprintf(("COMCTL32: COMCTL32_DllGetVersion"));
+
     if (pdvi->cbSize != sizeof(DLLVERSIONINFO)) {
 //        WARN (commctrl, "wrong DLLVERSIONINFO size from app");
@@ -888 +885 @@
 {
     DWORD flags = 0;
-        int i;
-        BOOL cancel = 0, hover = 0, leave = 0, query = 0;
-        if (ptme->cbSize != sizeof(TRACKMOUSEEVENT)) {
+    int i;
+    BOOL cancel = 0, hover = 0, leave = 0, query = 0;
+
+    dprintf(("COMCTL32: _TrackMouseEvent"));
+
+    if (ptme->cbSize != sizeof(TRACKMOUSEEVENT)) {
         //WARN("wrong TRACKMOUSEEVENT size from app");
         return E_INVALIDARG;
     }
 
-    //TRACE("%lx, %lx, %x, %lx\n", ptme->cbSize, ptme->dwFlags, ptme->hwndTrack, ptme->dwHoverTime);
-
-        flags = ptme->dwFlags;
+    flags = ptme->dwFlags;
     if ( flags & TME_CANCEL ) {
                 cancel = 1;

tags/trunk/src/comctl32/comctl32.h ¶

@@ -1 @@
-/* $Id: comctl32.h,v 1.11 1999-12-18 20:56:58 achimha Exp $ */
+/* $Id: comctl32.h,v 1.12 2000-02-18 17:13:37 cbratschi Exp $ */
 /*
  * Win32 common controls implementation
@@ -23 +23 @@
 #include "unicode.h"
 #include "wineuni.h"
-
-#define TRACE(x)
-#define FIXME(x)
-#define WARN(x)
 
 #define _OS2WIN_H
@@ -99 +95 @@
 #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
+#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
 
 /* treeview checkboxes */

tags/trunk/src/comctl32/comctl32undoc.c ¶

@@ -1 @@
-/* $Id: comctl32undoc.c,v 1.17 2000-02-04 17:02:06 cbratschi Exp $ */
+/* $Id: comctl32undoc.c,v 1.18 2000-02-18 17:13:37 cbratschi Exp $ */
 /*
  * Undocumented functions from COMCTL32.DLL
@@ -59 +59 @@
 #endif
 
-//    TRACE (commctrl, "(%p %p %08lx %p %p %08lx): stub!\n",
-//         hdpa1, hdpa2, dwFlags, pfnCompare, pfnParam5, lParam);
+
+    dprintf(("COMCTL32: DPA_Merge"));
 
     if (IsBadWritePtr (hdpa1, sizeof(DPA)))
@@ -175 +175 @@
     LPVOID lpPtr;
 
+    dprintf2(("COMCTL32: COMCTL32_Alloc"));
+
     lpPtr = HeapAlloc (COMCTL32_hHeap, HEAP_ZERO_MEMORY, dwSize);
 
@@ -203 +205 @@
 {
     LPVOID lpDest;
+
+    dprintf2(("COMCTL32: COMCTL32_ReAlloc"));
 
     if (lpSrc)
@@ -228 +232 @@
 BOOL WINAPI COMCTL32_Free (LPVOID lpMem)
 {
+    dprintf2(("COMCTL32: COMCTL32_Free"));
+
     return HeapFree (COMCTL32_hHeap, 0, lpMem);
 }
@@ -248 +254 @@
 DWORD WINAPI COMCTL32_GetSize (LPVOID lpMem)
 {
+    dprintf2(("COMCTL32: COMCTL32_GetSize"));
 
     return HeapSize (COMCTL32_hHeap, 0, lpMem);
@@ -313 +320 @@
 CreateMRUListA (LPCREATEMRULIST lpcml)
 {
+     dprintf(("COMCTL32: CreateMRUListA"));
+
      return CreateMRUListLazyA (lpcml, 0, 0, 0);
 }
@@ -326 +335 @@
 FreeMRUListA (HANDLE hMRUList)
 {
+    dprintf(("COMCTL32: FreeMRUListA"));
     //FIXME("(%08x) empty stub!\n", hMRUList);
 
@@ -363 +373 @@
 AddMRUData (HANDLE hList, LPCVOID lpData, DWORD cbData)
 {
-    //FIXME("(%08x, %p, %ld) empty stub!\n", hList, lpData, cbData);
+    dprintf(("COMCTL32: AddMRUData - empty stub!"));
 
     return 0;
@@ -386 +396 @@
 AddMRUStringA(HANDLE hList, LPCSTR lpszString)
 {
-    //FIXME("(%08x, %s) empty stub!\n", hList, debugstr_a(lpszString));
+    dprintf(("COMCTL32: AddMRUStringA - empty stub!"));
 
     return 0;
@@ -406 +416 @@
 DelMRUString(HANDLE hList, INT nItemPos)
 {
-    //FIXME("(%08x, %d): stub\n", hList, nItemPos);
+    dprintf(("COMCTL32: DelMRUString - empty stub!"));
+
     return TRUE;
 }
@@ -429 +440 @@
 FindMRUData (HANDLE hList, LPCVOID lpData, DWORD cbData, LPINT lpRegNum)
 {
-    //FIXME("(%08x, %p, %ld, %p) empty stub!\n",
-    //       hList, lpData, cbData, lpRegNum);
+    dprintf(("COMCTL32: FindMRUData - empty stub!"));
 
     return 0;
@@ -453 +463 @@
 FindMRUStringA (HANDLE hList, LPCSTR lpszString, LPINT lpRegNum)
 {
-    //FIXME("(%08x, %s, %p) empty stub!\n", hList, debugstr_a(lpszString),
-    //      lpRegNum);
+    dprintf(("COMCTL32: FindMRUStringA - empty stub!"));
 
     return 0;
@@ -474 +483 @@
     LPVOID ptr;
 
-    //FIXME("(%p) empty stub!\n", lpcml);
+    dprintf(("COMCTL32: CreateMRUListLazyA - empty stub!"));
 
     if (lpcml == NULL)
@@ -515 +524 @@
 DWORD nBufferSize)
 {
-    //FIXME("(%08x, %d, %p, %ld): stub\n", hList, nItemPos, lpBuffer,
-    //      nBufferSize);
+    dprintf(("COMCTL32: EnumMRUListA - empty stub!"));
+
     return 0;
 }
@@ -538 +547 @@
     INT len;
 
-//    TRACE (commctrl, "(%p %p %d)\n", lpSrc, lpDest, nMaxLen);
+    dprintf(("COMCTL32: Str_GetPtrA"));
 
     if (!lpDest && lpSrc)
@@ -575 +584 @@
 Str_SetPtrA (LPSTR *lppDest, LPCSTR lpSrc)
 {
-//    TRACE (commctrl, "(%p %p)\n", lppDest, lpSrc);
+    dprintf(("COMCTL32: Str_SetPtrA"));
 
     if (lpSrc) {
@@ -611 +620 @@
     INT len;
 
-//    TRACE (commctrl, "(%p %p %d)\n", lpSrc, lpDest, nMaxLen);
+    dprintf(("COMCTL32: Str_GetPtrW"));
 
     if (!lpDest && lpSrc)
@@ -648 +657 @@
 Str_SetPtrW (LPWSTR *lppDest, LPCWSTR lpSrc)
 {
-//    TRACE (commctrl, "(%p %p)\n", lppDest, lpSrc);
+    dprintf(("COMCTL32: Str_SetPtrW"));
 
     if (lpSrc) {
@@ -692 +701 @@
     HDSA hdsa;
 
-//    TRACE (commctrl, "(size=%d grow=%d)\n", nSize, nGrow);
+    dprintf(("COMCTL32: DSA_Create"));
 
     hdsa = (HDSA)COMCTL32_Alloc (sizeof(DSA));
@@ -722 +731 @@
 DSA_Destroy (const HDSA hdsa)
 {
-//    TRACE (commctrl, "(%p)\n", hdsa);
+    dprintf(("COMCTL32: DSA_Destroy"));
 
     if (!hdsa)
@@ -752 +761 @@
     LPVOID pSrc;
 
-//    TRACE (commctrl, "(%p %d %p)\n", hdsa, nIndex, pDest);
+    dprintf(("COMCTL32: DSA_GetItem"));
 
     if (!hdsa)
@@ -785 +794 @@
     LPVOID pSrc;
 
-//    TRACE (commctrl, "(%p %d)\n", hdsa, nIndex);
+    dprintf(("COMCTL32: DSA_GetItemPtr"));
 
     if (!hdsa)
@@ -821 +830 @@
     LPVOID pDest, lpTemp;
 
-//    TRACE("(%p %d %p)\n", hdsa, nIndex, pSrc);
+    dprintf(("COMCTL32: DSA_SetItem"));
 
     if ((!hdsa) || nIndex < 0)
@@ -878 +887 @@
     LPDWORD p;
 
-//    TRACE("(%p %d %p)\n", hdsa, nIndex, pSrc);
+    dprintf(("COMCTL32: DSA_InsertItem"));
 
     if ((!hdsa) || nIndex < 0)
@@ -947 +956 @@
     INT  nSize;
 
-//    TRACE (commctrl, "(%p %d)\n", hdsa, nIndex);
+    dprintf(("COMCTL32: DSA_DeleteItem"));
 
     if (!hdsa)
@@ -998 +1007 @@
 DSA_DeleteAllItems (const HDSA hdsa)
 {
-//    TRACE (commctrl, "(%p)\n", hdsa);
+    dprintf(("COMCTL32: DSA_DeleteAllItems"));
 
     if (!hdsa)
@@ -1034 +1043 @@
     HDPA hdpa;
 
-//    TRACE (commctrl, "(%d)\n", nGrow);
+    dprintf(("COMCTL32: DPA_Create"));
 
     hdpa = (HDPA)COMCTL32_Alloc (sizeof(DPA));
@@ -1065 +1074 @@
 DPA_Destroy (const HDPA hdpa)
 {
-//    TRACE (commctrl, "(%p)\n", hdpa);
+    dprintf(("COMCTL32: DPA_Destroy"));
 
     if (!hdpa)
@@ -1094 +1103 @@
 DPA_Grow (const HDPA hdpa, INT nGrow)
 {
-//    TRACE (commctrl, "(%p %d)\n", hdpa, nGrow);
+    dprintf(("COMCTL32: DPA_Grow"));
 
     if (!hdpa)
@@ -1131 +1140 @@
     HDPA hdpaTemp;
 
+    dprintf(("COMCTL32: DPA_Clone"));
+
     if (!hdpa)
         return NULL;
-
-//    TRACE (commctrl, "(%p %p)\n", hdpa, hdpaNew);
 
     if (!hdpaNew) {
@@ -1188 +1197 @@
 DPA_GetPtr (const HDPA hdpa, INT i)
 {
-//    TRACE (commctrl, "(%p %d)\n", hdpa, i);
+    dprintf(("COMCTL32: DPA_GetPtr"));
 
     if (!hdpa)
@@ -1222 +1231 @@
     INT i;
 
+    dprintf(("COMCTL32: DPA_GetPtrIndex"));
+
     if (!hdpa->ptrs)
         return -1;
@@ -1255 +1266 @@
     LPVOID  *lpTemp, *lpDest;
 
-//    TRACE (commctrl, "(%p %d %p)\n", hdpa, i, p);
+    dprintf(("COMCTL32: DPA_InsertPtr"));
 
     if ((!hdpa) || (i < 0))
@@ -1327 +1338 @@
     LPVOID *lpTemp;
 
-//    TRACE (commctrl, "(%p %d %p)\n", hdpa, i, p);
+    dprintf(("COMCTL32: DPA_SetPtr"));
 
     if ((!hdpa) || i < 0)
@@ -1381 +1392 @@
     INT  nSize;
 
-//    TRACE (commctrl, "(%p %d)\n", hdpa, i);
+    dprintf(("COMCTL32: DPA_DeletePtr"));
 
     if ((!hdpa) || i < 0 || i >= hdpa->nItemCount)
@@ -1434 +1445 @@
 DPA_DeleteAllPtrs (const HDPA hdpa)
 {
-//    TRACE (commctrl, "(%p)\n", hdpa);
+    dprintf(("COMCTL32: DPA_DeleteAllPtrs"));
 
     if (!hdpa)
@@ -1512 +1523 @@
 DPA_Sort (const HDPA hdpa, PFNDPACOMPARE pfnCompare, LPARAM lParam)
 {
+    dprintf(("COMCTL32: DPA_Sort"));
+
     if (!hdpa || !pfnCompare)
         return FALSE;
-
-//    TRACE (commctrl, "(%p %p 0x%lx)\n", hdpa, pfnCompare, lParam);
 
     if ((hdpa->nItemCount > 1) && (hdpa->ptrs))
@@ -1552 +1563 @@
             PFNDPACOMPARE pfnCompare, LPARAM lParam, UINT uOptions)
 {
+    dprintf(("COMCTL32: DPA_Search"));
+
     if (!hdpa || !pfnCompare || !pFind)
         return -1;
-
-//    TRACE (commctrl, "(%p %p %d %p 0x%08lx 0x%08x)\n",
-//         hdpa, pFind, nStart, pfnCompare, lParam, uOptions);
 
     if (uOptions & DPAS_SORTED) {
@@ -1632 +1642 @@
     HDPA hdpa;
 
-//    TRACE (commctrl, "(%d 0x%x)\n", nGrow, hHeap);
+    dprintf(("COMCTL32: DPA_CreateEx"));
 
     if (hHeap)
@@ -1731 +1741 @@
     NOTIFYDATA notify;
 
-//    TRACE (commctrl, "(0x%04x 0x%04x %d %p)\n",
-//         hwndFrom, hwndTo, uCode, lpHdr);
+    dprintf(("COMCTL32: SendNotify"));
 
     notify.hwndFrom = hwndFrom;
@@ -1765 +1774 @@
     HWND hwndNotify;
 
-//    TRACE (commctrl, "(0x%04x 0x%04x %d %p 0x%08lx)\n",
-//         hwndFrom, hwndTo, uCode, lpHdr, dwParam5);
+    dprintf(("COMCTL32: SendNotifyEx"));
 
     hwndNotify = hwndTo;
@@ -1794 +1802 @@
 COMCTL32_StrChrA (LPCSTR lpString, CHAR cChar)
 {
+    dprintf(("COMCTL32: StrChrA"));
+
     return strchr (lpString, cChar);
 }
@@ -1807 +1817 @@
     INT len1, len2, i;
     CHAR  first;
+
+    dprintf(("COMCTL32: StrStrIA"));
 
     if (*lpStr2 == 0)
@@ -1838 +1850 @@
 COMCTL32_StrToIntA (LPSTR lpString)
 {
+    dprintf(("COMCTL32: StrToIntA"));
+
     return atoi(lpString);
 }
@@ -1861 +1875 @@
     INT i;
 
-//    TRACE (commctrl, "(%p %p %08lx)\n", hdpa, enumProc, lParam);
+    dprintf(("COMCTL32: DPA_EnumCallback"));
 
     if (!hdpa)
@@ -1895 +1909 @@
 DPA_DestroyCallback (const HDPA hdpa, DPAENUMPROC enumProc, LPARAM lParam)
 {
-//    TRACE (commctrl, "(%p %p %08lx)\n", hdpa, enumProc, lParam);
+    dprintf(("COMCTL32: DPA_DestroyCallback"));
 
     DPA_EnumCallback (hdpa, enumProc, lParam);
@@ -1922 +1936 @@
     INT i;
 
-//    TRACE (commctrl, "(%p %p %08lx)\n", hdsa, enumProc, lParam);
+    dprintf(("COMCTL32: DSA_EnumCallback"));
 
     if (!hdsa)
@@ -1957 +1971 @@
 DSA_DestroyCallback (const HDSA hdsa, DSAENUMPROC enumProc, LPARAM lParam)
 {
-//    TRACE (commctrl, "(%p %p %08lx)\n", hdsa, enumProc, lParam);
+    dprintf(("COMCTL32: DSA_DestroyCallback"));
 
     DSA_EnumCallback (hdsa, enumProc, lParam);
@@ -1968 +1982 @@
  *
  */
-INT WINAPI COMCTL32_StrCSpnA( LPCSTR lpStr, LPCSTR lpSet) {
+INT WINAPI COMCTL32_StrCSpnA( LPCSTR lpStr, LPCSTR lpSet)
+{
+  dprintf(("COMCTL32: StrCSpnA"));
+
   return strcspn(lpStr, lpSet);
 }
@@ -1976 +1993 @@
  *
  */
-LPWSTR WINAPI COMCTL32_StrChrW( LPCWSTR lpStart, WORD wMatch) {
+LPWSTR WINAPI COMCTL32_StrChrW( LPCWSTR lpStart, WORD wMatch)
+{
+  dprintf(("COMCTL32: StrChrW"));
+
   return (unsigned short*)wcschr(lpStart, wMatch);
 }
@@ -1984 +2004 @@
  *
  */
-INT WINAPI COMCTL32_StrCmpNA( LPCSTR lpStr1, LPCSTR lpStr2, int nChar) {
+INT WINAPI COMCTL32_StrCmpNA( LPCSTR lpStr1, LPCSTR lpStr2, int nChar)
+{
+  dprintf(("COMCTL32: StrCmpNA"));
+
   return strncmp(lpStr1, lpStr2, nChar);
 }
@@ -1992 +2015 @@
  *
  */
-INT WINAPI COMCTL32_StrCmpNIA( LPCSTR lpStr1, LPCSTR lpStr2, int nChar) {
+INT WINAPI COMCTL32_StrCmpNIA( LPCSTR lpStr1, LPCSTR lpStr2, int nChar)
+{
   //AH: Inline helper function from WINE
     int res;
+
+    dprintf(("COMCTL32: StrCmpNIA"));
+
     if (!nChar) return 0;
     while ((--nChar > 0) && *lpStr1)
@@ -2005 +2032 @@
  *
  */
-INT WINAPI COMCTL32_StrCmpNW( LPCWSTR lpStr1, LPCWSTR lpStr2, int nChar) {
+INT WINAPI COMCTL32_StrCmpNW( LPCWSTR lpStr1, LPCWSTR lpStr2, int nChar)
+{
+  dprintf(("COMCTL32: StrCmpNW"));
+
   return wcsncmp(lpStr1, lpStr2, nChar);
 }
@@ -2013 +2043 @@
  *
  */
-INT WINAPI COMCTL32_StrCmpNIW( LPCWSTR lpStr1, LPCWSTR lpStr2, int nChar) {
-//  FIXME("(%s, %s, %i): stub\n", debugstr_w(lpStr1), debugstr_w(lpStr2), nChar);
+INT WINAPI COMCTL32_StrCmpNIW( LPCWSTR lpStr1, LPCWSTR lpStr2, int nChar)
+{
   dprintf(("COMCTL32: StrCmpNIW - unimplemented stub\n"));
+
   return 0;
 }
@@ -2037 +2068 @@
  *
  */
-LPSTR WINAPI COMCTL32_StrRChrA( LPCSTR lpStart, LPCSTR lpEnd, WORD wMatch) {
+LPSTR WINAPI COMCTL32_StrRChrA( LPCSTR lpStart, LPCSTR lpEnd, WORD wMatch)
+{
   LPCSTR lpGotIt = NULL;
+
+  dprintf(("COMCTL32: StrRChrA"));
 
   if (!lpEnd) lpEnd = lpStart + strlen(lpStart);
@@ -2068 +2102 @@
   LPCWSTR lpGotIt = NULL;
 
+  dprintf(("COMCTL32: StrRChrW"));
+
   if (!lpEnd) lpEnd = lpStart + lstrlenW(lpStart);
 
@@ -2082 +2118 @@
  *
  */
-LPSTR WINAPI COMCTL32_StrStrA( LPCSTR lpFirst, LPCSTR lpSrch) {
+LPSTR WINAPI COMCTL32_StrStrA( LPCSTR lpFirst, LPCSTR lpSrch)
+{
+  dprintf(("COMCTL32: StrStrA"));
+
   return strstr(lpFirst, lpSrch);
 }
@@ -2090 +2129 @@
  *
  */
-LPWSTR WINAPI COMCTL32_StrStrW( LPCWSTR lpFirst, LPCWSTR lpSrch) {
+LPWSTR WINAPI COMCTL32_StrStrW( LPCWSTR lpFirst, LPCWSTR lpSrch)
+{
+  dprintf(("COMCTL32: StrStrW"));
+
   return (unsigned short*)wcsstr(lpFirst, lpSrch);
 }
@@ -2098 +2140 @@
  *
  */
-INT WINAPI COMCTL32_StrSpnW( LPWSTR lpStr, LPWSTR lpSet) {
+INT WINAPI COMCTL32_StrSpnW( LPWSTR lpStr, LPWSTR lpSet)
+{
   LPWSTR lpLoop = lpStr;
+
+  dprintf(("COMCTL32: StrSpnW"));
 
   /* validate ptr */
@@ -2120 +2165 @@
  */
 
-BOOL WINAPI comctl32_410( HWND hw, DWORD b, DWORD c, DWORD d) {
-
-   //FIXME("(%x, %lx, %lx, %lx): stub!\n", hw, b, c, d);
+BOOL WINAPI comctl32_410( HWND hw, DWORD b, DWORD c, DWORD d)
+{
+   dprintf(("COMCTL32: comctl32_410 - empty stub!"));
 
    return TRUE;
@@ -2134 +2179 @@
  */
 
-BOOL WINAPI comctl32_411( HWND hw, DWORD b, DWORD c) {
-
-   //FIXME("(%x, %lx, %lx): stub!\n", hw, b, c);
+BOOL WINAPI comctl32_411( HWND hw, DWORD b, DWORD c)
+{
+   dprintf(("COMCTL32: comctl32_411 - empty stub!"));
 
    return TRUE;
@@ -2150 +2195 @@
 BOOL WINAPI comctl32_412( HWND hwnd, DWORD b, DWORD c)
 {
-    //FIXME("(%x, %lx, %lx): stub!\n", hwnd, b, c);
+    dprintf(("COMCTL32: comctl32_412 - empty stub!"));
 
     if (IsWindow (hwnd) == FALSE)
@@ -2169 +2214 @@
  */
 
-BOOL WINAPI comctl32_413( HWND hw, DWORD b, DWORD c, DWORD d) {
-
-   //FIXME("(%x, %lx, %lx, %lx): stub!\n", hw, b, c, d);
+BOOL WINAPI comctl32_413( HWND hw, DWORD b, DWORD c, DWORD d)
+{
+   dprintf(("COMCTL32: comctl32_413 - empty stub!"));
 
    return TRUE;
@@ -2183 +2228 @@
  */
 
-BOOL WINAPI InitMUILanguage( LANGID uiLang) {
-
-   //FIXME("(%04x): stub!\n", uiLang);
+BOOL WINAPI InitMUILanguage( LANGID uiLang)
+{
+   dprintf(("COMCTL32: InitMUILanguage - empty stub!"));
 
    return TRUE;

tags/trunk/src/comctl32/draglist.c ¶

@@ -16 +16 @@
 
 #include "commctrl.h"
+#include <misc.h>
 
 static DWORD dwLastScrollTime = 0;
@@ -22 +23 @@
 BOOL WINAPI MakeDragList (HWND hwndLB)
 {
-    //FIXME("(0x%x)\n", hwndLB);
-
+    dprintf(("COMCTL32: MakeDragList - empty stub!"));
 
     return FALSE;
@@ -31 +31 @@
 VOID WINAPI DrawInsert (HWND hwndParent, HWND hwndLB, INT nItem)
 {
-    //FIXME("(0x%x 0x%x %d)\n", hwndParent, hwndLB, nItem);
-
-
+    dprintf(("COMCTL32: DrawInsert - empty stub!"));
 }
 
@@ -43 +41 @@
     DWORD dwScrollTime;
 
-    //FIXME("(0x%x %ld x %ld %s)\n",
-    //       hwndLB, pt.x, pt.y, bAutoScroll ? "TRUE" : "FALSE");
+    dprintf(("COMCTL32: LBItemFromPt"));
 
     ScreenToClient (hwndLB, &pt);

tags/trunk/src/comctl32/imagelist.c ¶

@@ -1 @@
-/* $Id: imagelist.c,v 1.11 2000-02-04 17:02:07 cbratschi Exp $ */
+/* $Id: imagelist.c,v 1.12 2000-02-18 17:13:37 cbratschi Exp $ */
 /*
  *  ImageList implementation
@@ -458 +458 @@
     HBITMAP hOldBitmapImage, hOldBitmap;
 
+    dprintf(("COMCTL32: ImageList_Add"));
+
     if (!himl || !hbmImage)
       return -1;
@@ -539 +541 @@
 ImageList_AddIcon (HIMAGELIST himl, HICON hIcon)
 {
+    dprintf(("COMCTL32: ImageList_AddIcon"));
+
     return ImageList_ReplaceIcon (himl, -1, hIcon);
 }
@@ -568 +572 @@
     HBITMAP hMaskBitmap=0;
     COLORREF bkColor;
+
+    dprintf(("COMCTL32: ImageList_AddMasked"));
 
     if (himl == NULL)
@@ -680 +686 @@
     HDC hdcSrc, hdcDst;
 
-//    FIXME(imagelist, "partially implemented!\n");
+    dprintf(("COMCTL32: ImageList_BeginDrag - partial implemented"));
 
     if (himlTrack == NULL)
@@ -752 +758 @@
     HDC hdcSrc, hdcDst;
 
-//    TRACE(imagelist, "iDst=%d  iSrc=%d\n", iDst, iSrc);
+    dprintf(("COMCTL32: ImageList_Copy"));
 
     if ((himlSrc == NULL) || (himlDst == NULL))
@@ -880 +886 @@
         {0x55, 0xAA, 0x55, 0xAA, 0x55, 0xAA, 0x55, 0xAA};
 
-//    TRACE (imagelist, "(%d %d 0x%x %d %d)\n", cx, cy, flags, cInitial, cGrow);
+    dprintf(("COMCTL32: ImageList_Create"));
 
     himl = (HIMAGELIST)COMCTL32_Alloc (sizeof(struct _IMAGELIST));
@@ -960 +966 @@
 ImageList_Destroy (HIMAGELIST himl)
 {
+    dprintf(("COMCTL32: ImageList_Destroy"));
+
     if (!himl)
         return FALSE;
@@ -1003 +1011 @@
 ImageList_DragEnter (HWND hwndLock, INT x, INT y)
 {
+    dprintf(("COMCTL32: ImageList_DragEnter"));
+
     if (himlInternalDrag == NULL)
         return FALSE;
@@ -1040 +1050 @@
 ImageList_DragLeave (HWND hwndLock)
 {
+    dprintf(("COMCTL32: ImageList_DragLeave"));
+
     if (hwndLock)
         hwndInternalDrag = hwndLock;
@@ -1075 +1087 @@
 ImageList_DragMove (INT x, INT y)
 {
+    dprintf(("COMCTL32: ImageList_DragMove"));
+
     ImageList_DragShowNolock (FALSE);
 
@@ -1107 +1121 @@
     HDC hdcDrag;
 
-//    FIXME (imagelist, "semi-stub!\n");
-//    TRACE (imagelist, "bShow=0x%X!\n", bShow);
+    dprintf(("COMCTL32: ImageList_DragShowNolock - semi-stub!"));
 
     hdcDrag = GetDCEx (hwndInternalDrag, 0,
@@ -1161 +1174 @@
 {
     IMAGELISTDRAWPARAMS imldp;
+
+    dprintf(("COMCTL32: ImageList_Draw"));
 
     imldp.cbSize  = sizeof(IMAGELISTDRAWPARAMS);
@@ -1216 +1231 @@
     IMAGELISTDRAWPARAMS imldp;
 
+    dprintf(("COMCTL32: ImageList_DrawEx"));
+
     imldp.cbSize  = sizeof(IMAGELISTDRAWPARAMS);
     imldp.himl    = himl;
@@ -1252 +1269 @@
 {
     INT      cx, cy;
+
+    dprintf(("COMCTL32: ImageList_DrawIndirect"));
+
     /*
         Do some Error Checking
@@ -1316 +1336 @@
     HDC hdcSrc, hdcDst;
 
+    dprintf(("COMCTL32: ImageList_Duplicate"));
+
     if (himlSrc == NULL) {
 //        ERR (imagelist, "Invalid image list handle!\n");
@@ -1344 +1366 @@
         DeleteDC (hdcSrc);
 
-        himlDst->cCurImage = himlSrc->cCurImage;
-        himlDst->cMaxImage = himlSrc->cMaxImage;
+        himlDst->cCurImage = himlSrc->cCurImage;
+        himlDst->cMaxImage = himlSrc->cMaxImage;
     }
 
@@ -1371 +1393 @@
 ImageList_EndDrag (VOID)
 {
-//    FIXME (imagelist, "semi-stub!\n");
+    dprintf(("COMCTL32: ImageList_EndDrag - semi-stub"));
 
     if (himlInternalDrag)
@@ -1404 +1426 @@
 ImageList_GetBkColor (HIMAGELIST himl)
 {
+    dprintf(("COMCTL32: ImageList_GetBkColor"));
+
     if (himl == NULL)
         return CLR_NONE;
@@ -1431 +1455 @@
 ImageList_GetDragImage (POINT *ppt, POINT *pptHotspot)
 {
-//    FIXME (imagelist, "semi-stub!\n");
+    dprintf(("COMCTL32: ImageList_GetDragImage - semi-stub!"));
 
     if (himlInternalDrag)
@@ -1462 +1486 @@
     HBITMAP hOldSrcBitmap,hOldDstBitmap;
     HDC    hdcSrc, hdcDst;
+
+    dprintf(("COMCTL32: ImageList_GetIcon"));
 
     if ((himl == NULL) || (i < 0) || (i >= himl->cCurImage))
@@ -1528 +1554 @@
 ImageList_GetIconSize (HIMAGELIST himl, INT *cx, INT *cy)
 {
+    dprintf(("COMCTL32: ImageList_GetIconSize"));
+
     if (himl == NULL)
         return FALSE;
@@ -1558 +1586 @@
 ImageList_GetImageCount (HIMAGELIST himl)
 {
+    dprintf(("COMCTL32: ImageList_GetImageCount"));
+
     if (himl == NULL)
         return 0;
@@ -1583 +1613 @@
 ImageList_GetImageInfo (HIMAGELIST himl, INT i, IMAGEINFO *pImageInfo)
 {
+    dprintf(("COMCTL32: ImageList_GetImageInfo"));
+
     if ((himl == NULL) || (pImageInfo == NULL))
         return FALSE;
@@ -1621 +1653 @@
 ImageList_GetImageRect (HIMAGELIST himl, INT i, LPRECT lpRect)
 {
+    dprintf(("COMCTL32: ImageList_GetImageRect"));
+
     if ((himl == NULL) || (lpRect == NULL))
         return FALSE;
@@ -1664 +1698 @@
     HANDLE   handle;
     INT      nImageCount;
+
+    dprintf(("COMCTL32: ImageList_LoadImageA"));
 
     handle = LoadImageA (hi, lpbmp, uType, 0, 0, uFlags);
@@ -1742 +1778 @@
     INT      nImageCount;
 
+    dprintf(("COMCTL32: ImageList_LoadImageW"));
+
     handle = LoadImageW (hi, lpbmp, uType, 0, 0, uFlags);
     if (!handle) {
@@ -1805 +1843 @@
     INT      nX1, nX2;
 
+    dprintf(("COMCTL32: ImageList_Merge"));
+
     if ((himl1 == NULL) || (himl2 == NULL))
         return NULL;
@@ -1899 +1939 @@
     int bitspixel = GetDeviceCaps(hdc,BITSPIXEL)*GetDeviceCaps(hdc,PLANES);
     if (bitspixel>8)
-        return TRUE;
+        return TRUE;
     if (bitspixel<=4)
-        return FALSE;
+        return FALSE;
     return GetDeviceCaps(hdc,94) & 0x10;
 }
@@ -1907 +1947 @@
 /* helper for ImageList_Read, see comments below */
 static HBITMAP _read_bitmap(LPSTREAM pstm,int ilcFlag,int cx,int cy) {
-    HDC                 xdc = 0;
-    BITMAPFILEHEADER    bmfh;
-    BITMAPINFOHEADER    bmih;
-    int                 bitsperpixel,palspace,longsperline,width,height;
-    LPBITMAPINFOHEADER  bmihc = NULL;
-    int                 result = 0;
-    HBITMAP             hbitmap = 0;
-    LPBYTE              bits = NULL,nbits = NULL;
-    int                 nbytesperline,bytesperline;
-
-    if (!SUCCEEDED(IStream_Read ( pstm, &bmfh, sizeof(bmfh), NULL))     ||
-        (bmfh.bfType != (('M'<<8)|'B'))                                 ||
-        !SUCCEEDED(IStream_Read ( pstm, &bmih, sizeof(bmih), NULL))     ||
-        (bmih.biSize != sizeof(bmih))
+    HDC                 xdc = 0;
+    BITMAPFILEHEADER    bmfh;
+    BITMAPINFOHEADER    bmih;
+    int                 bitsperpixel,palspace,longsperline,width,height;
+    LPBITMAPINFOHEADER  bmihc = NULL;
+    int                 result = 0;
+    HBITMAP             hbitmap = 0;
+    LPBYTE              bits = NULL,nbits = NULL;
+    int                 nbytesperline,bytesperline;
+
+    if (!SUCCEEDED(IStream_Read ( pstm, &bmfh, sizeof(bmfh), NULL))     ||
+        (bmfh.bfType != (('M'<<8)|'B'))                                 ||
+        !SUCCEEDED(IStream_Read ( pstm, &bmih, sizeof(bmih), NULL))     ||
+        (bmih.biSize != sizeof(bmih))
     )
-        return 0;
+        return 0;
 
     bitsperpixel = bmih.biPlanes * bmih.biBitCount;
     if (bitsperpixel<=8)
-        palspace = (1<<bitsperpixel)*sizeof(RGBQUAD);
+        palspace = (1<<bitsperpixel)*sizeof(RGBQUAD);
     else
-        palspace = 0;
+        palspace = 0;
     width = bmih.biWidth;
     height = bmih.biHeight;
     bmihc = (LPBITMAPINFOHEADER)LocalAlloc(LMEM_ZEROINIT,sizeof(bmih)+palspace);
     memcpy(bmihc,&bmih,sizeof(bmih));
-    longsperline        = ((width*bitsperpixel+31)&~0x1f)>>5;
-    bmihc->biSizeImage  = (longsperline*height)<<2;
+    longsperline        = ((width*bitsperpixel+31)&~0x1f)>>5;
+    bmihc->biSizeImage  = (longsperline*height)<<2;
 
     /* read the palette right after the end of the bitmapinfoheader */
     if (palspace)
-        if (!SUCCEEDED(IStream_Read ( pstm, bmihc+1, palspace, NULL)))
-            goto ret1;
+        if (!SUCCEEDED(IStream_Read ( pstm, bmihc+1, palspace, NULL)))
+            goto ret1;
 
     xdc = GetDC(0);
 #if 0 /* Magic for NxM -> 1x(N*M) not implemented for DIB Sections */
     if ((bitsperpixel>1) &&
-        ((ilcFlag!=ILC_COLORDDB) && (!ilcFlag || may_use_dibsection(xdc)))
+        ((ilcFlag!=ILC_COLORDDB) && (!ilcFlag || may_use_dibsection(xdc)))
      ) {
-        hbitmap = CreateDIBSection(xdc,(BITMAPINFO*)bmihc,0,(LPVOID*)&bits,0,0);
-        if (!hbitmap)
-            goto ret1;
-        if (!SUCCEEDED(IStream_Read( pstm, bits, bmihc->biSizeImage, NULL)))
-            goto ret1;
-        result = 1;
+        hbitmap = CreateDIBSection(xdc,(BITMAPINFO*)bmihc,0,(LPVOID*)&bits,0,0);
+        if (!hbitmap)
+            goto ret1;
+        if (!SUCCEEDED(IStream_Read( pstm, bits, bmihc->biSizeImage, NULL)))
+            goto ret1;
+        result = 1;
     } else
 #endif
     {
-        int i,nwidth,nheight;
-
-        nwidth  = width*(height/cy);
-        nheight = cy;
-
-        if (bitsperpixel==1)
-            hbitmap = CreateBitmap(nwidth,nheight,1,1,NULL);
-        else
-            hbitmap = CreateCompatibleBitmap(xdc,nwidth,nheight);
-
-        /* Might be a bit excessive memory use here */
-        bits = (LPBYTE)LocalAlloc(LMEM_ZEROINIT,bmihc->biSizeImage);
-        nbits = (LPBYTE)LocalAlloc(LMEM_ZEROINIT,bmihc->biSizeImage);
-        if (!SUCCEEDED(IStream_Read ( pstm, bits, bmihc->biSizeImage, NULL)))
-                goto ret1;
-
-        /* Copy the NxM bitmap into a 1x(N*M) bitmap we need, linewise */
-        /* Do not forget that windows bitmaps are bottom->top */
-        bytesperline    = longsperline*4;
-        nbytesperline   = (height/cy)*bytesperline;
-        for (i=0;i<height;i++) {
-            memcpy(
-                nbits+((height-i)%cy)*nbytesperline+(i/cy)*bytesperline,
-                bits+bytesperline*(height-i),
-                bytesperline
-            );
-        }
-        bmihc->biWidth  = nwidth;
-        bmihc->biHeight = nheight;
-        if (!SetDIBits(xdc,hbitmap,0,nheight,nbits,(BITMAPINFO*)bmihc,0))
-                goto ret1;
-        LocalFree((HLOCAL)nbits);
-        LocalFree((HLOCAL)bits);
-        result = 1;
+        int i,nwidth,nheight;
+
+        nwidth  = width*(height/cy);
+        nheight = cy;
+
+        if (bitsperpixel==1)
+            hbitmap = CreateBitmap(nwidth,nheight,1,1,NULL);
+        else
+            hbitmap = CreateCompatibleBitmap(xdc,nwidth,nheight);
+
+        /* Might be a bit excessive memory use here */
+        bits = (LPBYTE)LocalAlloc(LMEM_ZEROINIT,bmihc->biSizeImage);
+        nbits = (LPBYTE)LocalAlloc(LMEM_ZEROINIT,bmihc->biSizeImage);
+        if (!SUCCEEDED(IStream_Read ( pstm, bits, bmihc->biSizeImage, NULL)))
+                goto ret1;
+
+        /* Copy the NxM bitmap into a 1x(N*M) bitmap we need, linewise */
+        /* Do not forget that windows bitmaps are bottom->top */
+        bytesperline    = longsperline*4;
+        nbytesperline   = (height/cy)*bytesperline;
+        for (i=0;i<height;i++) {
+            memcpy(
+                nbits+((height-i)%cy)*nbytesperline+(i/cy)*bytesperline,
+                bits+bytesperline*(height-i),
+                bytesperline
+            );
+        }
+        bmihc->biWidth  = nwidth;
+        bmihc->biHeight = nheight;
+        if (!SetDIBits(xdc,hbitmap,0,nheight,nbits,(BITMAPINFO*)bmihc,0))
+                goto ret1;
+        LocalFree((HLOCAL)nbits);
+        LocalFree((HLOCAL)bits);
+        result = 1;
     }
 ret1:
-    if (xdc)    ReleaseDC(0,xdc);
-    if (bmihc)  LocalFree((HLOCAL)bmihc);
+    if (xdc)    ReleaseDC(0,xdc);
+    if (bmihc)  LocalFree((HLOCAL)bmihc);
     if (!result) {
-        if (hbitmap) {
-            DeleteObject(hbitmap);
-            hbitmap = 0;
-        }
+        if (hbitmap) {
+            DeleteObject(hbitmap);
+            hbitmap = 0;
+        }
     }
     return hbitmap;
@@ -2015 +2055 @@
  *
  * The format is like this:
- *      ILHEAD                  ilheadstruct;
+ *      ILHEAD                  ilheadstruct;
  *
  * for the color image part:
- *      BITMAPFILEHEADER        bmfh;
- *      BITMAPINFOHEADER        bmih;
+ *      BITMAPFILEHEADER        bmfh;
+ *      BITMAPINFOHEADER        bmih;
  * only if it has a palette:
- *      RGBQUAD         rgbs[nr_of_paletted_colors];
- *
- *      BYTE                    colorbits[imagesize];
+ *      RGBQUAD         rgbs[nr_of_paletted_colors];
+ *
+ *      BYTE                    colorbits[imagesize];
  *
  * the following only if the ILC_MASK bit is set in ILHEAD.ilFlags:
- *      BITMAPFILEHEADER        bmfh_mask;
- *      BITMAPINFOHEADER        bmih_mask;
+ *      BITMAPFILEHEADER        bmfh_mask;
+ *      BITMAPINFOHEADER        bmih_mask;
  * only if it has a palette (it usually does not):
- *      RGBQUAD         rgbs[nr_of_paletted_colors];
- *
- *      BYTE                    maskbits[imagesize];
+ *      RGBQUAD         rgbs[nr_of_paletted_colors];
+ *
+ *      BYTE                    maskbits[imagesize];
  *
  * CAVEAT: Those images are within a NxM bitmap, not the 1xN we expect.
@@ -2038 +2078 @@
 HIMAGELIST WINAPI ImageList_Read (LPSTREAM pstm)
 {
-    ILHEAD      ilHead;
-    HIMAGELIST  himl;
-    HBITMAP     hbmColor=0,hbmMask=0;
-    int         i;
+    ILHEAD      ilHead;
+    HIMAGELIST  himl;
+    HBITMAP     hbmColor=0,hbmMask=0;
+    int         i;
+
+    dprintf(("COMCTL32: ImageList_Read"));
 
     if (!SUCCEEDED(IStream_Read (pstm, &ilHead, sizeof(ILHEAD), NULL)))
-        return NULL;
+        return NULL;
     if (ilHead.usMagic != (('L' << 8) | 'I'))
-        return NULL;
+        return NULL;
     if (ilHead.usVersion != 0x101) /* probably version? */
-        return NULL;
+        return NULL;
 
 #if 0
-    FIXME("     ilHead.cCurImage = %d\n",ilHead.cCurImage);
-    FIXME("     ilHead.cMaxImage = %d\n",ilHead.cMaxImage);
-    FIXME("     ilHead.cGrow = %d\n",ilHead.cGrow);
-    FIXME("     ilHead.cx = %d\n",ilHead.cx);
-    FIXME("     ilHead.cy = %d\n",ilHead.cy);
-    FIXME("     ilHead.flags = %x\n",ilHead.flags);
-    FIXME("     ilHead.ovls[0] = %d\n",ilHead.ovls[0]);
-    FIXME("     ilHead.ovls[1] = %d\n",ilHead.ovls[1]);
-    FIXME("     ilHead.ovls[2] = %d\n",ilHead.ovls[2]);
-    FIXME("     ilHead.ovls[3] = %d\n",ilHead.ovls[3]);
+    FIXME("     ilHead.cCurImage = %d\n",ilHead.cCurImage);
+    FIXME("     ilHead.cMaxImage = %d\n",ilHead.cMaxImage);
+    FIXME("     ilHead.cGrow = %d\n",ilHead.cGrow);
+    FIXME("     ilHead.cx = %d\n",ilHead.cx);
+    FIXME("     ilHead.cy = %d\n",ilHead.cy);
+    FIXME("     ilHead.flags = %x\n",ilHead.flags);
+    FIXME("     ilHead.ovls[0] = %d\n",ilHead.ovls[0]);
+    FIXME("     ilHead.ovls[1] = %d\n",ilHead.ovls[1]);
+    FIXME("     ilHead.ovls[2] = %d\n",ilHead.ovls[2]);
+    FIXME("     ilHead.ovls[3] = %d\n",ilHead.ovls[3]);
 #endif
 
     hbmColor = _read_bitmap(pstm,ilHead.flags & ~ILC_MASK,ilHead.cx,ilHead.cy);
     if (!hbmColor)
-        return NULL;
+        return NULL;
     if (ilHead.flags & ILC_MASK) {
-        hbmMask = _read_bitmap(pstm,0,ilHead.cx,ilHead.cy);
-        if (!hbmMask) {
-            DeleteObject(hbmColor);
-            return NULL;
-        }
+        hbmMask = _read_bitmap(pstm,0,ilHead.cx,ilHead.cy);
+        if (!hbmMask) {
+            DeleteObject(hbmColor);
+            return NULL;
+        }
     }
 
     himl = ImageList_Create (
-                    ilHead.cx,
-                    ilHead.cy,
-                    ilHead.flags,
-                    1,          /* initial */
-                    ilHead.cGrow
+                    ilHead.cx,
+                    ilHead.cy,
+                    ilHead.flags,
+                    1,          /* initial */
+                    ilHead.cGrow
     );
     if (!himl) {
-        DeleteObject(hbmColor);
-        DeleteObject(hbmMask);
-        return NULL;
+        DeleteObject(hbmColor);
+        DeleteObject(hbmMask);
+        return NULL;
     }
     himl->hbmImage = hbmColor;
@@ -2093 +2135 @@
     ImageList_SetBkColor(himl,ilHead.bkcolor);
     for (i=0;i<4;i++)
-        ImageList_SetOverlayImage(himl,ilHead.ovls[i],i+1);
+        ImageList_SetOverlayImage(himl,ilHead.ovls[i],i+1);
     return himl;
 }
@@ -2116 +2158 @@
     HDC     hdcSrc, hdcDst;
     INT     cxNew, nCount;
+
+    dprintf(("COMCTL32: ImageList_Remove"));
 
     if ((i < -1) || (i >= himl->cCurImage)) {
@@ -2247 +2291 @@
     BITMAP bmp;
 
+    dprintf(("COMCTL32: ImageList_Replace"));
+
     if (himl == NULL) {
 //        ERR (imagelist, "Invalid image list handle!\n");
@@ -2310 +2356 @@
     BITMAP  bmp;
 
-//    TRACE (imagelist, "(0x%lx 0x%x 0x%x)\n", (DWORD)himl, i, hIcon);
+    dprintf(("COMCTL32: ImageList_ReplaceIcon"));
 
     if (himl == NULL)
@@ -2400 +2446 @@
     COLORREF clrOldBk;
 
+    dprintf(("COMCTL32: ImageList_SetBkColor"));
+
     if (himl == NULL)
         return CLR_NONE;
@@ -2434 +2482 @@
     HIMAGELIST himlTemp;
 
-//    FIXME (imagelist, "semi-stub!\n");
+    dprintf(("COMCTL32: ImageList_SetDragCursorImage - semi-stub"));
 
     if (himlInternalDrag == NULL)
@@ -2477 +2525 @@
 ImageList_SetFilter (HIMAGELIST himl, INT i, DWORD dwFilter)
 {
-//    FIXME (imagelist, "(%p 0x%x 0x%lx):empty stub!\n",
-//         himl, i, dwFilter);
+    dprintf(("COMCTL32: ImageList_SetFilter - empty stub!"));
 
     return FALSE;
@@ -2503 +2550 @@
 {
     INT nCount;
+
+    dprintf(("COMCTL32: ImageList_SetIconSize"));
 
     if (!himl)
@@ -2553 +2602 @@
     HBITMAP hbmNewBitmap;
     INT     nNewCount, nCopyCount;
+
+    dprintf(("COMCTL32: ImageList_SetImageCount"));
 
     if (!himl)
@@ -2646 +2697 @@
 ImageList_SetOverlayImage (HIMAGELIST himl, INT iImage, INT iOverlay)
 {
+    dprintf(("COMCTL32: ImageList_SetOverlayImage"));
+
     if (!himl)
         return FALSE;
@@ -2682 +2735 @@
 ImageList_Write (HIMAGELIST himl, PVOID pstm)
 {
+    dprintf(("COMCTL32: ImageList_Write - empty stub!"));
+
     if (!himl)
       return FALSE;
 
-    dprintf(("ImageList_Write empty stub!\n"));
-
-
     return FALSE;
 }

tags/trunk/src/comctl32/propsheet.c ¶

@@ -1 @@
-/* $Id: propsheet.c,v 1.18 2000-02-14 17:31:39 cbratschi Exp $ */
+/* $Id: propsheet.c,v 1.19 2000-02-18 17:13:38 cbratschi Exp $ */
 /*
  * Property Sheets
@@ -1481 +1481 @@
       break;
     default:
-//      FIXME(propsheet, "Invalid button index %d\n", buttonID);
+        //FIXME(propsheet, "Invalid button index %d\n", buttonID);
         break;
   }
@@ -1934 +1934 @@
   BYTE* pByte;
 
+  dprintf(("COMCTL32: PropertySheetA"));
+
   PROPSHEET_CollectSheetInfo(lppsh, psInfo);
 
@@ -1964 +1966 @@
 INT WINAPI PropertySheetW(LPCPROPSHEETHEADERW propertySheetHeader)
 {
-//    FIXME(propsheet, "(%p): stub\n", propertySheetHeader);
+    dprintf(("COMCTL32: PropertySheetW - empty stub!"));
 
     return -1;
@@ -1976 +1978 @@
 {
   PROPSHEETPAGEA* ppsp = COMCTL32_Alloc(sizeof(PROPSHEETPAGEA));
+
+  dprintf(("COMCTL32: CreatePropertySheetPageA"));
 
   *ppsp = *lpPropSheetPage;
@@ -1999 +2003 @@
 HPROPSHEETPAGE WINAPI CreatePropertySheetPageW(LPCPROPSHEETPAGEW lpPropSheetPage)
 {
-//    FIXME(propsheet, "(%p): stub\n", lpPropSheetPage);
+    dprintf(("COMCTL32: CreatePropertySheetPageW - empty stub!"));
 
     return 0;
@@ -2010 +2014 @@
 {
   PROPSHEETPAGEA *psp = (PROPSHEETPAGEA *)hPropPage;
+
+  dprintf(("COMCTL32: DestroyPropertySheetPage"));
 
   if (!psp)
@@ -2410 +2416 @@
 
     case PSM_SETTITLEW:
-        FIXME("Unimplemented msg PSM_SETTITLE32W\n");
+        //FIXME("Unimplemented msg PSM_SETTITLE32W\n");
         return 0;
     case PSM_SETCURSELID:
-        FIXME("Unimplemented msg PSM_SETCURSELID\n");
+        //FIXME("Unimplemented msg PSM_SETCURSELID\n");
         return 0;
     case PSM_SETFINISHTEXTW:
-        FIXME("Unimplemented msg PSM_SETFINISHTEXT32W\n");
+        //FIXME("Unimplemented msg PSM_SETFINISHTEXT32W\n");
         return 0;
 

tags/trunk/src/comctl32/resource.asm ¶

@@ -2 +2 @@
 ;/* Source : rsrc.rc */
 ;/* Cmdline: wrc -s -I. -IE:\IBMCPP\include -I..\..\include -I..\..\include\win -o resource.asm rsrc.rc */
-;/* Date   : Fri Feb  4 19:27:28 2000 */
+;/* Date   : Fri Feb 18 16:26:00 2000 */
 
         .386p
@@ -12 +12 @@
         public  _Resource_PEResTab
         dd      0
-        dd      0389b1a10h
+        dd      038ad6488h
         dd      0
         dw      0, 5
@@ -27 +27 @@
 L2:
         dd      0
-        dd      0389b1a10h
+        dd      038ad6488h
         dd      0
         dw      0, 7
@@ -46 +46 @@
 L4:
         dd      0
-        dd      0389b1a10h
+        dd      038ad6488h
         dd      0
         dw      0, 1
@@ -53 +53 @@
 L5:
         dd      0
-        dd      0389b1a10h
+        dd      038ad6488h
         dd      0
         dw      0, 3
@@ -64 +64 @@
 L6:
         dd      0
-        dd      0389b1a10h
+        dd      038ad6488h
         dd      0
         dw      0, 1
@@ -71 +71 @@
 L16:
         dd      0
-        dd      0389b1a10h
+        dd      038ad6488h
         dd      0
         dw      0, 1
@@ -78 +78 @@
 L2_120:
         dd      0
-        dd      0389b1a10h
+        dd      038ad6488h
         dd      0
         dw      0, 1
@@ -85 +85 @@
 L2_121:
         dd      0
-        dd      0389b1a10h
+        dd      038ad6488h
         dd      0
         dw      0, 1
@@ -92 +92 @@
 L2_124:
         dd      0
-        dd      0389b1a10h
+        dd      038ad6488h
         dd      0
         dw      0, 1
@@ -99 +99 @@
 L2_125:
         dd      0
-        dd      0389b1a10h
+        dd      038ad6488h
         dd      0
         dw      0, 1
@@ -106 +106 @@
 L2_130:
         dd      0
-        dd      0389b1a10h
+        dd      038ad6488h
         dd      0
         dw      0, 1
@@ -113 +113 @@
 L2_131:
         dd      0
-        dd      0389b1a10h
+        dd      038ad6488h
         dd      0
         dw      0, 1
@@ -120 +120 @@
 L2_401:
         dd      0
-        dd      0389b1a10h
+        dd      038ad6488h
         dd      0
         dw      0, 1
@@ -127 +127 @@
 L4_300:
         dd      0
-        dd      0389b1a10h
+        dd      038ad6488h
         dd      0
         dw      0, 1
@@ -134 +134 @@
 L5_200:
         dd      0
-        dd      0389b1a10h
+        dd      038ad6488h
         dd      0
         dw      0, 1
@@ -141 +141 @@
 L5_1006:
         dd      0
-        dd      0389b1a10h
+        dd      038ad6488h
         dd      0
         dw      0, 1
@@ -148 +148 @@
 L5_1020:
         dd      0
-        dd      0389b1a10h
+        dd      038ad6488h
         dd      0
         dw      0, 1
@@ -155 +155 @@
 L6_261:
         dd      0
-        dd      0389b1a10h
+        dd      038ad6488h
         dd      0
         dw      0, 1
@@ -162 +162 @@
 L16_1:
         dd      0
-        dd      0389b1a10h
+        dd      038ad6488h
         dd      0
         dw      0, 1

tags/trunk/src/comctl32/treeview.c ¶

@@ -1 @@
-/* $Id: treeview.c,v 1.27 2000-02-17 17:26:51 cbratschi Exp $ */
+/* $Id: treeview.c,v 1.28 2000-02-18 17:13:39 cbratschi Exp $ */
 /* Treeview control
  *
@@ -34 +34 @@
 
  - bug in SetScrollInfo/ShowScrollBar: WM_SIZE and WM_NCPAINT problems (i.e. RegEdit)
- - WM_HSCROLL: some rects are wrong
  - TVS_FULLROWSELECT
  - TVS_SINGLEEXPAND
@@ -45 +44 @@
 #include "winbase.h"
 #include "wingdi.h"
+#include "winnls.h"
 #include "commctrl.h"
 #include "comctl32.h"
@@ -79 +79 @@
 static BOOL    TREEVIEW_CalcItems(HWND hwnd,HDC hdc,TREEVIEW_INFO *infoPtr);
 static LRESULT TREEVIEW_EnsureVisible(HWND hwnd,HTREEITEM hItem);
+static VOID    TREEVIEW_ISearch(HWND hwnd,CHAR ch);
 
 static LRESULT CALLBACK TREEVIEW_Edit_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
@@ -578 +579 @@
   TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
 
-  //TRACE("\n");
   return (LRESULT) infoPtr->clrText;
 }
@@ -735 +735 @@
        * Get a dotted pen
        */
-#ifdef OS2LINEHACK //CB: workaround for Open32 PS_DOT bug
+#ifdef OS2LINEHACK
       TREEVIEW_Polyline(hdc,points,2,infoPtr->clrLine);
 #else
@@ -1316 +1316 @@
   BOOL ownDC = FALSE,changedLeftTop = FALSE;
   DWORD dwStyle = GetWindowLongA(hwnd,GWL_STYLE);
+  INT maxCX,maxCY;
+  INT xDiff = 0,yDiff = 0;
 
   GetClientRect(hwnd,&rect);
@@ -1407 +1409 @@
   infoPtr->uTotalHeight = y;
 
-  if (item && item->visible)
-  {
-    INT xDiff = 0,yDiff = 0;
-
-    //check cx and cy
-#if 0  //CB: next step
-    if ((infoPtr->cy > 0) && (item->rect.bottom < infoPtr->uVisibleHeight))
-    {
-      INT oldCY = infoPtr->cy;
-
-      infoPtr->cy = infoPtr->uTotalHeight-infoPtr->uVisibleHeight;
-      if (infoPtr->cy < 0) infoPtr->cy = 0;
-      yDiff = infoPtr->cy-oldCY;
-    }
-
-    changedLeftTop = xDiff || yDiff;
-    if (changedLeftTop)
-    {
-      iItem = (INT)infoPtr->TopRootItem;
-      item = NULL;
-      indent = 0;
-MessageBeep(MB_OK);
-      while (iItem)
-      {
-        item = &infoPtr->items[iItem];
-        OffsetRect(&item->rect,xDiff,yDiff);
-        OffsetRect(&item->text,xDiff,yDiff);
-        OffsetRect(&item->expandBox,xDiff,yDiff);
-        OffsetRect(&item->bitmap,xDiff,yDiff);
-        OffsetRect(&item->statebitmap,xDiff,yDiff);
-
-
-        if ((item->firstChild) && (item->state & TVIS_EXPANDED))
+  //check cx and cy
+  maxCY = infoPtr->uTotalHeight-infoPtr->uVisibleHeight;
+  if (maxCY < 0) maxCY = 0;
+  if (infoPtr->cy > maxCY)
+  {
+    yDiff = maxCY-infoPtr->cy;
+    infoPtr->cy = maxCY;
+  }
+
+  maxCX = infoPtr->uTotalWidth-infoPtr->uVisibleWidth;
+  if (maxCX < 0) maxCX = 0;
+  if (infoPtr->cx > maxCX)
+  {
+    xDiff = maxCX-infoPtr->cx;
+    infoPtr->cx = maxCX;
+  }
+
+  changedLeftTop = xDiff || yDiff;
+  if (changedLeftTop)
+  {
+    iItem = (INT)infoPtr->TopRootItem;
+    item = NULL;
+    indent = 0;
+
+    while (iItem)
+    {
+      item = &infoPtr->items[iItem];
+      OffsetRect(&item->rect,xDiff,yDiff);
+      OffsetRect(&item->text,xDiff,yDiff);
+      OffsetRect(&item->expandBox,xDiff,yDiff);
+      OffsetRect(&item->bitmap,xDiff,yDiff);
+      OffsetRect(&item->statebitmap,xDiff,yDiff);
+
+      if ((item->firstChild) && (item->state & TVIS_EXPANDED))
+      {
+        iItem = (INT)item->firstChild;
+        indent++;
+      } else
+      {
+        iItem = (INT)item->sibling;
+        while ((!iItem) && (indent > 0))
         {
-          iItem = (INT)item->firstChild;
-          indent++;
-        } else
-        {
+          indent--;
+          item = &infoPtr->items[(INT)item->parent];
           iItem = (INT)item->sibling;
-          while ((!iItem) && (indent > 0))
-          {
-            indent--;
-            item = &infoPtr->items[(INT)item->parent];
-            iItem = (INT)item->sibling;
-          }
         }
-      } /* while */
-    }
-#endif
-  }
-
-  if (!(dwStyle & TVS_NOSCROLL))
+      }
+    } /* while */
+  }
+
+  if (!(dwStyle & TVS_NOSCROLL) && (infoPtr->uVisibleHeight > 0) && (infoPtr->uVisibleWidth > 0))
   {
     if (infoPtr->uTotalHeight > infoPtr->uVisibleHeight)
@@ -1598 +1599 @@
   TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
 
-//  TRACE (treeview, " %d\n",wParam);
-
-  switch (wParam) {
-        case TV_REFRESH_TIMER:
-                KillTimer (hwnd, TV_REFRESH_TIMER);
-                infoPtr->Timer &= ~TV_REFRESH_TIMER_SET;
-                TREEVIEW_CalcItems(hwnd,0,infoPtr);
-                TREEVIEW_Refresh(hwnd);
-                return 0;
-
-        case TV_EDIT_TIMER:
-                KillTimer (hwnd, TV_EDIT_TIMER);
-                infoPtr->Timer &= ~TV_EDIT_TIMER_SET;
-                if (infoPtr->editItem)
-                   TREEVIEW_EditLabel(hwnd,infoPtr->editItem,TRUE);
-                return 0;
-        default:
-//              ERR (treeview,"got unknown timer\n");
-                break;
+  switch (wParam)
+  {
+    case TV_REFRESH_TIMER:
+      KillTimer (hwnd, TV_REFRESH_TIMER);
+      infoPtr->Timer &= ~TV_REFRESH_TIMER_SET;
+      TREEVIEW_CalcItems(hwnd,0,infoPtr);
+      TREEVIEW_Refresh(hwnd);
+      return 0;
+
+    case TV_EDIT_TIMER:
+      KillTimer (hwnd, TV_EDIT_TIMER);
+      infoPtr->Timer &= ~TV_EDIT_TIMER_SET;
+      if (infoPtr->editItem)
+        TREEVIEW_EditLabel(hwnd,infoPtr->editItem,TRUE);
+      return 0;
+
+    case TV_ISEARCH_TIMER:
+      KillTimer(hwnd,TV_ISEARCH_TIMER);
+      infoPtr->Timer &= ~TV_ISEARCH_TIMER_SET;
+      return 0;
  }
 
@@ -2627 +2629 @@
 }
 
-static LRESULT
-TREEVIEW_Size (HWND hwnd, WPARAM wParam, LPARAM lParam)
+static LRESULT TREEVIEW_Size (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
   TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
@@ -2635 +2636 @@
   {
     if (TREEVIEW_CalcItems(hwnd,0,infoPtr))
+#if 1 //CB: synchron update conflicts with Odin32 implementation -> check and fix
+      TREEVIEW_QueueRefresh(hwnd);
+#else
       TREEVIEW_Refresh(hwnd); //because size redraw isn't set
+#endif
   }
 
@@ -2648 +2653 @@
   if (infoPtr->hwndEdit) SetFocus(hwnd);
 
-  //CB: todo: check styles
   infoPtr->uInternalStatus |= TV_CALCALL;
   TREEVIEW_QueueRefresh(hwnd);
@@ -2666 +2670 @@
 TREEVIEW_Create (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
+  LPCREATESTRUCTA lpcs = (LPCREATESTRUCTA)lParam;
   TREEVIEW_INFO *infoPtr;
   DWORD dwStyle = GetWindowLongA (hwnd, GWL_STYLE);
@@ -2686 +2691 @@
   infoPtr->uInternalStatus = 0;
   if (IsWindowUnicode(hwnd)) infoPtr->uInternalStatus |= TV_UNICODE;
-  infoPtr->uNumItems=0;
+  infoPtr->uNumItems = 0;
   infoPtr->clrBk   = GetSysColor (COLOR_WINDOW);
   infoPtr->clrLine = GetSysColor (COLOR_WINDOWTEXT);
@@ -2696 +2701 @@
   infoPtr->himlState = NULL;
   infoPtr->uItemHeight = -1;
+  infoPtr->uRealItemHeight = 0;
+  infoPtr->uVisibleHeight = lpcs->cy;
+  infoPtr->uTotalHeight = 0;
+  infoPtr->uVisibleWidth = lpcs->cx;
+  infoPtr->uTotalWidth = 0;
+
   GetTextMetricsA (hdc, &tm);
   infoPtr->hFont = GetStockObject (DEFAULT_GUI_FONT);
   GetObjectA (infoPtr->hFont, sizeof (LOGFONTA), &logFont);
-  logFont.lfWeight=FW_BOLD;
+  logFont.lfWeight = FW_BOLD;
   infoPtr->hBoldFont = CreateFontIndirectA (&logFont);
 
   infoPtr->items = NULL;
   infoPtr->selectedItem = 0;
-  infoPtr->clrText=-1;        /* use system color */
-  infoPtr->dropItem=0;
-  infoPtr->insertMarkItem=0;
-  infoPtr->insertBeforeorAfter=0;
-  infoPtr->pCallBackSort=NULL;
+  infoPtr->clrText = -1;        /* use system color */
+  infoPtr->dropItem = 0;
+  infoPtr->insertMarkItem = 0;
+  infoPtr->insertBeforeorAfter = 0;
+  infoPtr->pCallBackSort = NULL;
   infoPtr->uScrollTime = 300;  /* milliseconds */
   infoPtr->hwndEdit = 0;
-
-  infoPtr->hwndToolTip=0;
+  infoPtr->pszISearch = NULL;
+  infoPtr->uISearchLen = 0;
+
+  infoPtr->hwndToolTip = 0;
   if (!(dwStyle & TVS_NOTOOLTIPS))
   {
@@ -2755 +2768 @@
     infoPtr->himlState = ImageList_Create (16, 16,ILC_COLOR | ILC_MASK, 15, 1);
 
-    //CB: MSDN docu says: uses DrawFrameControl
+    //MSDN docu says: uses DrawFrameControl but never believe what they write
     hbmLoad = LoadBitmapA (COMCTL32_hModule, MAKEINTRESOURCEA(IDT_CHECK));
     nIndex = ImageList_AddMasked (infoPtr->himlState, hbmLoad, CLR_DEFAULT);
@@ -2769 +2782 @@
 {
    TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
-
-//   TRACE (treeview,"\n");
 
    TREEVIEW_RemoveTree (hwnd);
@@ -2783 +2794 @@
 
    DeleteObject(infoPtr->hBoldFont);
+   COMCTL32_Free(infoPtr->pszISearch);
    COMCTL32_Free (infoPtr);
 
@@ -3281 +3293 @@
   TREEVIEW_ITEM *wineItem;
   RECT rect;
-  UINT status,x,y;
+  UINT status;
+  INT x,y;
 
   if (!lpht) return 0;
@@ -3669 +3682 @@
      goto setfocus;
 
-//CB: todo: check ht.flags for WM_HSCROLL!
-
   /*
    * If the style allow editing and the node is already selected
@@ -3959 +3970 @@
 
   GetObjectA (infoPtr->hFont, sizeof (LOGFONTA), &logFont);
-  logFont.lfWeight=FW_BOLD;
+  logFont.lfWeight = FW_BOLD;
   DeleteObject(infoPtr->hBoldFont);
   infoPtr->hBoldFont = CreateFontIndirectA (&logFont);
 
-  hdc = GetDC (0);
+  hdc = GetDC(hwnd);
   hOldFont = SelectObject (hdc, hFont);
   GetTextMetricsA (hdc, &tm);
   height= tm.tmHeight + tm.tmExternalLeading;
-  if (height>infoPtr->uRealItemHeight)
-    infoPtr->uRealItemHeight=height;
+  if (height > infoPtr->uRealItemHeight)
+    infoPtr->uRealItemHeight = height;
   SelectObject (hdc, hOldFont);
-  ReleaseDC (0, hdc);
+  ReleaseDC(hwnd,hdc);
 
   if (lParam)
@@ -3978 +3989 @@
     TREEVIEW_CalcItems(hwnd,0,infoPtr);
     TREEVIEW_Refresh(hwnd);
-  }
+  } else infoPtr->uInternalStatus |= TV_CALCALL;
 
   return 0;
@@ -4165 +4176 @@
   if (control)
   {
-    DWORD scrollMsg = 0;
+    INT scrollMsg = -1;
     BOOL horz = FALSE;
 
@@ -4171 +4182 @@
     {
       case VK_UP:
-//CB: todo: VK_UP doesn't work
         scrollMsg = SB_LINELEFT;
         break;
@@ -4197 +4207 @@
         break;
     }
-    if (scrollMsg)
+    if (scrollMsg != -1)
     {
       SendMessageA(hwnd,horz ? WM_HSCROLL:WM_VSCROLL,MAKELONG(scrollMsg,0),0);
@@ -4315 +4325 @@
     default:
       break;
- }
+  }
 
   if (hNewSelection)
@@ -4330 +4340 @@
 
   return FALSE;
+}
+
+static LRESULT TREEVIEW_Char(HWND hwnd,WPARAM wParam,LPARAM lParam)
+{
+  CHAR ch = (CHAR)wParam;
+
+  TREEVIEW_ISearch(hwnd,ch);
+
+  return 0;
 }
 
@@ -4393 +4412 @@
 }
 
-static LRESULT TREEVIEW_GetISearchString(HWND hwnd,LPSTR lpsz,BOOL unicode)
-{
-  //CB: todo: MSDN documentation is useless
-
-  return 0;
+static BOOL TREEVIEW_Compare(HWND hwnd,TREEVIEW_ITEM *item,LPWSTR text,INT textlen)
+{
+  if (item->pszText == LPSTR_TEXTCALLBACKW)
+    TREEVIEW_SendDispInfoNotify(hwnd,item,TVN_GETDISPINFO,TVIF_TEXT);
+  if (item->pszText == LPSTR_TEXTCALLBACKW) return FALSE;
+
+  //simulate lstrcmpniW
+  return CompareStringW(LOCALE_SYSTEM_DEFAULT,NORM_IGNORECASE,item->pszText,MIN(lstrlenW(item->pszText),textlen),text,textlen) == 2;
+}
+
+static TREEVIEW_ITEM* TREEVIEW_SearchChildren(HWND hwnd,TREEVIEW_INFO *infoPtr,TREEVIEW_ITEM *item,TREEVIEW_ITEM *stop,LPWSTR text,INT textlen)
+{
+  TREEVIEW_ITEM *child,*child2;
+
+  if (!(item->firstChild && (item->state & TVIS_EXPANDED))) return NULL;
+
+  child = &infoPtr->items[(INT)item->firstChild];
+  while (child)
+  {
+    if (child == stop) return NULL;
+    if (TREEVIEW_Compare(hwnd,child,text,textlen)) return child;
+    child2 = TREEVIEW_SearchChildren(hwnd,infoPtr,child,stop,text,textlen);
+    if (child2) return child2;
+    if (child->sibling) child = &infoPtr->items[(INT)child->sibling];
+    else return NULL;
+  }
+
+  return NULL;
+}
+
+static TREEVIEW_ITEM* TREEVIEW_Search(HWND hwnd,TREEVIEW_INFO *infoPtr,INT iItem,LPWSTR text,INT textlen)
+{
+  TREEVIEW_ITEM *item,*start;
+  BOOL found = FALSE;
+
+  item = start = &infoPtr->items[iItem];
+
+  if (TREEVIEW_Compare(hwnd,item,text,textlen)) found = TRUE; else
+  {
+    //search start to end
+    while (item->sibling || item->parent)
+    {
+      TREEVIEW_ITEM *child = TREEVIEW_SearchChildren(hwnd,infoPtr,item,NULL,text,textlen);
+
+      if (child)
+      {
+        found = TRUE;
+        item = child;
+        break;
+      }
+
+      item = TREEVIEW_GetNextListItem(hwnd,infoPtr,item);
+      if (item && TREEVIEW_Compare(hwnd,item,text,textlen))
+      {
+        found = TRUE;
+        break;
+      }
+    }
+    if (!found)
+    {
+      iItem = (INT)infoPtr->TopRootItem;
+      item = &infoPtr->items[iItem];
+      //search first to start
+      while (item != start)
+      {
+        TREEVIEW_ITEM *child;
+
+        if (TREEVIEW_Compare(hwnd,item,text,textlen))
+        {
+          found = TRUE;
+          break;
+        }
+        child = TREEVIEW_SearchChildren(hwnd,infoPtr,item,start,text,textlen);
+
+        if (child)
+        {
+          found = TRUE;
+          item = child;
+          break;
+        }
+        if (item->sibling) item = &infoPtr->items[(INT)item->sibling];
+        else break;
+      }
+    }
+  }
+
+  return found ? item:NULL;
+}
+
+static VOID TREEVIEW_ISearch(HWND hwnd,CHAR ch)
+{
+  TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
+  LPWSTR newString;
+  INT len,iItem;
+  CHAR ch2[2];
+  TREEVIEW_ITEM *item;
+
+  //check timer
+  if (infoPtr->Timer & TV_ISEARCH_TIMER_SET)
+  {
+    KillTimer(hwnd,TV_ISEARCH_TIMER);
+    infoPtr->Timer &= ~TV_ISEARCH_TIMER_SET;
+  } else if (infoPtr->uISearchLen > 0)
+  {
+    COMCTL32_Free(infoPtr->pszISearch);
+    infoPtr->pszISearch = NULL;
+    infoPtr->uISearchLen = 0;
+  }
+
+  //prepare new search string
+  len = infoPtr->uISearchLen+1;
+  newString = COMCTL32_Alloc((len+1)*sizeof(WCHAR));
+
+  if (infoPtr->uISearchLen > 0) lstrcpyW(newString,infoPtr->pszISearch);
+
+  ch2[0] = ch;
+  ch2[1] = 0;
+  lstrcpyAtoW((LPWSTR)&newString[len-1],(LPSTR)&ch2);
+
+  //search
+
+  iItem = infoPtr->selectedItem ? (INT)infoPtr->selectedItem:(INT)infoPtr->TopRootItem;
+  item = TREEVIEW_Search(hwnd,infoPtr,iItem,newString,len);
+  if (!item && infoPtr->pszISearch)
+  {
+    TREEVIEW_ITEM *next;
+//CB: todo: must press key twice to go to the next item
+    item = &infoPtr->items[iItem];
+    next = TREEVIEW_GetNextListItem(hwnd,infoPtr,item);
+    if (!next) next = &infoPtr->items[(INT)infoPtr->TopRootItem];
+    if (next && (next != item))
+    {
+      next = TREEVIEW_Search(hwnd,infoPtr,(INT)next->hItem,infoPtr->pszISearch,infoPtr->uISearchLen);
+      if (next)
+        TREEVIEW_SelectItem(hwnd,(WPARAM)TVGN_CARET,(LPARAM)next->hItem);
+    }
+    COMCTL32_Free(newString);
+    return;
+  }
+
+  //done
+  if (item)
+  {
+    COMCTL32_Free(infoPtr->pszISearch);
+    infoPtr->pszISearch = newString;
+    infoPtr->uISearchLen = len;
+    TREEVIEW_SelectItem(hwnd,(WPARAM)TVGN_CARET,(LPARAM)item->hItem);
+    SetTimer(hwnd,TV_ISEARCH_TIMER,TV_ISEARCH_DELAY,0);
+    infoPtr->Timer |= TV_ISEARCH_TIMER_SET;
+  } else
+  {
+    COMCTL32_Free(newString);
+    MessageBeep(0xFFFFFFFF);
+  }
+}
+
+static LRESULT TREEVIEW_GetISearchString(HWND hwnd,LPWSTR lpsz,BOOL unicode)
+{
+  TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
+
+  if (infoPtr->uISearchLen == 0) return 0;
+
+  if (unicode)
+    lstrcpyW(lpsz,infoPtr->pszISearch);
+  else
+    lstrcpyWtoA((LPSTR)lpsz,infoPtr->pszISearch);
+
+  return infoPtr->uISearchLen;
 }
 
@@ -4430 +4612 @@
 TREEVIEW_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
-   if (uMsg==WM_CREATE)
-                return TREEVIEW_Create (hwnd, wParam, lParam);
+   if (uMsg == WM_CREATE)
+     return TREEVIEW_Create (hwnd, wParam, lParam);
 
    if (!TREEVIEW_GetInfoPtr(hwnd))
-       return DefWindowProcA (hwnd, uMsg, wParam, lParam);
-
-    switch (uMsg) {
+     return DefWindowProcA (hwnd, uMsg, wParam, lParam);
+
+    switch (uMsg)
+    {
         case TVM_INSERTITEMA:
           return TREEVIEW_InsertItem(hwnd,wParam,lParam,FALSE);
@@ -4517 +4700 @@
 
         case TVM_GETISEARCHSTRINGA:
-                return TREEVIEW_GetISearchString(hwnd,(LPSTR)lParam,FALSE);
+                return TREEVIEW_GetISearchString(hwnd,(LPWSTR)lParam,FALSE);
 
         case TVM_GETISEARCHSTRINGW:
-                return TREEVIEW_GetISearchString(hwnd,(LPSTR)lParam,TRUE);
+                return TREEVIEW_GetISearchString(hwnd,(LPWSTR)lParam,TRUE);
 
         case TVM_GETTOOLTIPS:
@@ -4602 +4785 @@
         case WM_KEYDOWN:
                 return TREEVIEW_KeyDown (hwnd, wParam, lParam);
+
+        case WM_CHAR:
+                return TREEVIEW_Char(hwnd,wParam,lParam);
 
         case WM_SETFOCUS: