Changeset 9374 for trunk/src

Timestamp:

Oct 29, 2002, 2:47:35 PM (23 years ago)

Author:

sandervl

Message:

reverted back to old code due to regressions in latest Wine

Location:

trunk/src/comctl32

Files:

• comctl32undoc.c (modified) (66 diffs)
• trackbar.c (deleted)
• trackbar.cpp (added)
• trackbar.h (added)
• treeview.c (deleted)
• treeview.cpp (added)
• treeview.h (added)

trunk/src/comctl32/comctl32undoc.c

@@ -74 +74 @@
 typedef HRESULT (CALLBACK *DPALOADPROC)(LPLOADDATA,IStream*,LPARAM);
 #endif
+
+INT __cdecl _wtoi(LPWSTR string);
 
 /**************************************************************************
@@ -281 +283 @@
         }
         nResult = (pfnCompare)(*pWork1, *pWork2, lParam);
-        TRACE("compare result=%d, dpa1.cnt=%d, dpa2.cnt=%d\n",
+        TRACE("compare result=%d, dpa1.cnt=%d, dpa2.cnt=%d\n", 
               nResult, nIndex, nCount);
 
@@ -530 +532 @@
 
     /* open the sub key */
-    if ((err = RegOpenKeyExW( mp->extview.hKey, mp->extview.lpszSubKey,
+    if ((err = RegOpenKeyExW( mp->extview.hKey, mp->extview.lpszSubKey, 
                               0, KEY_WRITE, &newkey))) {
         /* not present - what to do ??? */
@@ -550 +552 @@
     if (mp->wineFlags & WMRUF_CHANGED) {
         mp->wineFlags &= ~WMRUF_CHANGED;
-        err = RegSetValueExA(newkey, "MRUList", 0, REG_SZ,
+        err = RegSetValueExA(newkey, "MRUList", 0, REG_SZ, 
                              mp->realMRU, strlen(mp->realMRU) + 1);
         if (err) {
@@ -563 +565 @@
             witem->itemFlag &= ~WMRUIF_CHANGED;
             realname[0] = 'a' + i;
-            err = RegSetValueExW(newkey, realname, 0,
-                                 (mp->extview.dwFlags & MRUF_BINARY_LIST) ?
+            err = RegSetValueExW(newkey, realname, 0, 
+                                 (mp->extview.dwFlags & MRUF_BINARY_LIST) ? 
                                  REG_BINARY : REG_SZ,
                                  &witem->datastart, witem->size);
@@ -609 +611 @@
 /**************************************************************************
  *                  FindMRUData [COMCTL32.169]
- *
+ * 
  * Searches binary list for item that matches lpData of length cbData.
  * Returns position in list order 0 -> MRU and if lpRegNum != NULL then value
@@ -644 +646 @@
     for(i=0; i<mp->cursize; i++) {
         if (mp->extview.dwFlags & MRUF_BINARY_LIST) {
-            if (!mp->extview.lpfnCompare(lpData, &mp->array[i]->datastart,
+            if (!mp->extview.lpfnCompare(lpData, &mp->array[i]->datastart, 
                                          cbData))
                 break;
@@ -677 +679 @@
         *lpRegNum = 'a' + i;
 
-    TRACE("(%p, %p, %ld, %p) returning %d\n",
+    TRACE("(%08x, %p, %ld, %p) returning %d\n",
            hList, lpData, cbData, lpRegNum, ret);
 
@@ -686 +688 @@
 /**************************************************************************
  *              AddMRUData [COMCTL32.167]
- *
+ * 
  * Add item to MRU binary list.  If item already exists in list then it is
  * simply moved up to the top of the list and not added again.  If list is
@@ -726 +728 @@
 
     /* Allocate space for new item and move in the data */
-    mp->array[replace] = witem = (LPWINEMRUITEM)COMCTL32_Alloc(cbData +
+    mp->array[replace] = witem = (LPWINEMRUITEM)COMCTL32_Alloc(cbData + 
                                                                sizeof(WINEMRUITEM));
     witem->itemFlag |= WMRUIF_CHANGED;
@@ -738 +740 @@
     }
     mp->realMRU[0] = replace + 'a';
-    TRACE("(%p, %p, %ld) adding data, /%c/ now most current\n",
+    TRACE("(%08x, %p, %ld) adding data, /%c/ now most current\n", 
           hList, lpData, cbData, replace+'a');
     ret = replace;
@@ -752 +754 @@
 /**************************************************************************
  *              AddMRUStringW [COMCTL32.401]
- *
+ * 
  * Add item to MRU string list.  If item already exists in list them it is
  * simply moved up to the top of the list and not added again.  If list is
@@ -768 +770 @@
 AddMRUStringW(HANDLE hList, LPCWSTR lpszString)
 {
-    FIXME("(%p, %s) empty stub!\n", hList, debugstr_w(lpszString));
+    FIXME("(%08x, %s) empty stub!\n", hList, debugstr_w(lpszString));
 
     return 0;
@@ -779 +781 @@
 AddMRUStringA(HANDLE hList, LPCSTR lpszString)
 {
-    FIXME("(%p, %s) empty stub!\n", hList, debugstr_a(lpszString));
+    FIXME("(%08x, %s) empty stub!\n", hList, debugstr_a(lpszString));
 
     return 0;
@@ -799 +801 @@
 DelMRUString(HANDLE hList, INT nItemPos)
 {
-    FIXME("(%p, %d): stub\n", hList, nItemPos);
+    FIXME("(%08x, %d): stub\n", hList, nItemPos);
     return TRUE;
 }
@@ -815 +817 @@
 /**************************************************************************
  *                  FindMRUStringA [COMCTL32.155]
- *
+ * 
  * Searches string list for item that matches lpszString.
  * Returns position in list order 0 -> MRU and if lpRegNum != NULL then value
@@ -866 +868 @@
 
     /* open the sub key */
-    if ((err = RegCreateKeyExW( mp->extview.hKey, mp->extview.lpszSubKey,
+    if ((err = RegCreateKeyExW( mp->extview.hKey, mp->extview.lpszSubKey, 
                                 0,
                                 emptyW,
-                                REG_OPTION_NON_VOLATILE,
+                                REG_OPTION_NON_VOLATILE, 
                                 KEY_READ | KEY_WRITE,
                                 0,
@@ -885 +887 @@
     if (newkey) {
         datasize = mp->extview.nMaxItems + 1;
-        if((err=RegQueryValueExA( newkey, "MRUList", 0, &type, mp->realMRU,
+        if((err=RegQueryValueExA( newkey, "MRUList", 0, &type, mp->realMRU, 
                                   &datasize))) {
             /* not present - set size to 1 (will become 0 later) */
@@ -905 +907 @@
                 ERR("Key %s not found 1\n", debugstr_w(realname));
             }
-            mp->array[i] = witem = (LPWINEMRUITEM)COMCTL32_Alloc(datasize +
+            mp->array[i] = witem = (LPWINEMRUITEM)COMCTL32_Alloc(datasize + 
                                                                  sizeof(WINEMRUITEM));
             witem->size = datasize;
-            if(RegQueryValueExW( newkey, realname, 0, &type,
+            if(RegQueryValueExW( newkey, realname, 0, &type, 
                                  &witem->datastart, &datasize)) {
                 /* not present - what to do ??? */
@@ -947 +949 @@
     mp->isUnicode = TRUE;
 
-    return CreateMRUListLazy_common(mp);
+    return CreateMRUListLazy_common(mp);   
 }
 
@@ -1016 +1018 @@
  *    of list returns -1.
  *    If lpBuffer == NULL or nItemPos is -ve return value is no. of items in
- *    the list.
+ *    the list. 
  */
 INT WINAPI EnumMRUListW(HANDLE hList, INT nItemPos, LPVOID lpBuffer,
@@ -1031 +1033 @@
     TRACE("nItemPos=%d, desired=%d\n", nItemPos, desired);
     witem = mp->array[desired];
-    datasize = min( witem->size, nBufferSize );
+    datasize = min( witem->size, nBufferSize ); 
     memcpy( lpBuffer, &witem->datastart, datasize);
-    TRACE("(%p, %d, %p, %ld): returning len=%d\n",
+    TRACE("(%08x, %d, %p, %ld): returning len=%d\n", 
           hList, nItemPos, lpBuffer, nBufferSize, datasize);
     return datasize;
@@ -1040 +1042 @@
 /**************************************************************************
  *                EnumMRUListA [COMCTL32.154]
- *
+ * 
  */
 INT WINAPI EnumMRUListA(HANDLE hList, INT nItemPos, LPVOID lpBuffer,
@@ -1057 +1059 @@
     witem = mp->array[desired];
     if(mp->extview.dwFlags & MRUF_BINARY_LIST) {
-        datasize = min( witem->size, nBufferSize );
+        datasize = min( witem->size, nBufferSize ); 
         memcpy( lpBuffer, &witem->datastart, datasize);
     } else {
@@ -1066 +1068 @@
                             lpBuffer, datasize, NULL, NULL);
     }
-    TRACE("(%p, %d, %p, %ld): returning len=%d\n",
+    TRACE("(%08x, %d, %p, %ld): returning len=%d\n", 
           hList, nItemPos, lpBuffer, nBufferSize, datasize);
     return datasize;
 }
-
+  
 
 /**************************************************************************
@@ -1126 +1128 @@
 {
     TRACE("(%p %p)\n", lppDest, lpSrc);
-
+ 
     if (lpSrc) {
         LPSTR ptr = COMCTL32_ReAlloc (*lppDest, strlen (lpSrc) + 1);
@@ -1199 +1201 @@
 {
     TRACE("(%p %p)\n", lppDest, lpSrc);
-
+ 
     if (lpSrc) {
         INT len = strlenW (lpSrc) + 1;
@@ -1371 +1373 @@
 
 /**************************************************************************
- * DSA_GetItem [COMCTL32.322]
+ * DSA_GetItem [COMCTL32.322] 
  *
  * PARAMS
@@ -1389 +1391 @@
 
     TRACE("(%p %d %p)\n", hdsa, nIndex, pDest);
-
+    
     if (!hdsa)
         return FALSE;
@@ -1403 +1405 @@
 
 /**************************************************************************
- * DSA_GetItemPtr [COMCTL32.323]
+ * DSA_GetItemPtr [COMCTL32.323] 
  *
  * Retrieves a pointer to the specified item.
@@ -1429 +1431 @@
 
     pSrc = (char *) hdsa->pData + (hdsa->nItemSize * nIndex);
-
+    
     TRACE("-- ret=%p\n", pSrc);
 
@@ -1437 +1439 @@
 
 /**************************************************************************
- * DSA_SetItem [COMCTL32.325]
+ * DSA_SetItem [COMCTL32.325] 
  *
  * Sets the contents of an item in the array.
@@ -1456 +1458 @@
     INT  nSize, nNewItems;
     LPVOID pDest, lpTemp;
-
+    
     TRACE("(%p %d %p)\n", hdsa, nIndex, pSrc);
 
     if ((!hdsa) || nIndex < 0)
         return FALSE;
-
+      
     if (hdsa->nItemCount <= nIndex) {
         /* within the old array */
@@ -1481 +1483 @@
             hdsa->nItemCount = nIndex + 1;
             hdsa->pData = lpTemp;
-        }
+        }    
     }
 
@@ -1495 +1497 @@
 
 /**************************************************************************
- * DSA_InsertItem [COMCTL32.324]
+ * DSA_InsertItem [COMCTL32.324] 
  *
  * PARAMS
@@ -1512 +1514 @@
     INT   nNewItems, nSize;
     LPVOID  lpTemp, lpDest;
-
+    
     TRACE("(%p %d %p)\n", hdsa, nIndex, pSrc);
 
@@ -1532 +1534 @@
 
         hdsa->nMaxCount = nNewItems;
-        hdsa->pData = lpTemp;
+        hdsa->pData = lpTemp;         
     }
 
@@ -1557 +1559 @@
 
 /**************************************************************************
- * DSA_DeleteItem [COMCTL32.326]
+ * DSA_DeleteItem [COMCTL32.326] 
  *
  * PARAMS
@@ -1573 +1575 @@
     LPVOID lpDest,lpSrc;
     INT  nSize;
-
+    
     TRACE("(%p %d)\n", hdsa, nIndex);
 
@@ -1590 +1592 @@
         memmove (lpDest, lpSrc, nSize);
     }
-
+    
     hdsa->nItemCount--;
-
+    
     /* free memory ? */
     if ((hdsa->nMaxCount - hdsa->nItemCount) >= hdsa->nGrow) {
@@ -1627 +1629 @@
     TRACE("(%p)\n", hdsa);
 
-    if (!hdsa)
+    if (!hdsa) 
         return FALSE;
     if (hdsa->pData && (!COMCTL32_Free (hdsa->pData)))
@@ -1853 +1855 @@
     INT i;
 
-    if (!hdpa || !hdpa->ptrs)
+    if (!hdpa->ptrs)
         return -1;
 
@@ -1883 +1885 @@
 DPA_InsertPtr (const HDPA hdpa, INT i, LPVOID p)
 {
+    INT   nNewItems, nSize, nIndex = 0;
+    LPVOID  *lpTemp, *lpDest;
+
     TRACE("(%p %d %p)\n", hdpa, i, p);
 
-    if (!hdpa || i < 0) return -1;
-
-    if (i >= 0x7fff)
-        i = hdpa->nItemCount;
-
-    if (i >= hdpa->nItemCount)
-        return DPA_SetPtr(hdpa, i, p) ? i : -1;
-
-    /* create empty spot at the end */
-    if (!DPA_SetPtr(hdpa, hdpa->nItemCount, 0)) return -1;
-    memmove (hdpa->ptrs + i + 1, hdpa->ptrs + i, (hdpa->nItemCount - i - 1) * sizeof(LPVOID));
-    hdpa->ptrs[i] = p;
-    return i;
-}
+    if ((!hdpa) || (i < 0))
+        return -1;
+
+    if (!hdpa->ptrs) {
+        hdpa->ptrs =
+            (LPVOID*)HeapAlloc (hdpa->hHeap, HEAP_ZERO_MEMORY,
+                                2 * hdpa->nGrow * sizeof(LPVOID));
+        if (!hdpa->ptrs)
+            return -1;
+        hdpa->nMaxCount = hdpa->nGrow * 2;
+        nIndex = 0;
+    }
+    else {
+        if (hdpa->nItemCount >= hdpa->nMaxCount) {
+            TRACE("-- resizing\n");
+            nNewItems = hdpa->nMaxCount + hdpa->nGrow;
+            nSize = nNewItems * sizeof(LPVOID);
+
+            lpTemp = (LPVOID*)HeapReAlloc (hdpa->hHeap, HEAP_ZERO_MEMORY,
+                                           hdpa->ptrs, nSize);
+            if (!lpTemp)
+                return -1;
+            hdpa->nMaxCount = nNewItems;
+            hdpa->ptrs = lpTemp;
+        }
+
+        if (i >= hdpa->nItemCount) {
+            nIndex = hdpa->nItemCount;
+            TRACE("-- appending at %d\n", nIndex);
+        }
+        else {
+            TRACE("-- inserting at %d\n", i);
+            lpTemp = hdpa->ptrs + i;
+            lpDest = lpTemp + 1;
+            nSize  = (hdpa->nItemCount - i) * sizeof(LPVOID);
+            TRACE("-- move dest=%p src=%p size=%x\n",
+                   lpDest, lpTemp, nSize);
+            memmove (lpDest, lpTemp, nSize);
+            nIndex = i;
+        }
+    }
+
+    /* insert item */
+    hdpa->nItemCount++;
+    hdpa->ptrs[nIndex] = p;
+
+    return nIndex;
+}
+
 
 /**************************************************************************
@@ -1919 +1959 @@
 {
     LPVOID *lpTemp;
-
+    
     TRACE("(%p %d %p)\n", hdpa, i, p);
 
-    if (!hdpa || i < 0 || i > 0x7fff)
+    if ((!hdpa) || i < 0)
         return FALSE;
-
+      
     if (hdpa->nItemCount <= i) {
         /* within the old array */
-        if (hdpa->nMaxCount <= i) {
+        if (hdpa->nMaxCount > i) {
+            /* within the allocated space, set a new boundary */
+            hdpa->nItemCount = i+1;
+        }
+        else {
             /* resize the block of memory */
             INT nNewItems =
@@ -1933 +1977 @@
             INT nSize = nNewItems * sizeof(LPVOID);
 
-            if (hdpa->ptrs)
-                lpTemp = (LPVOID*)HeapReAlloc (hdpa->hHeap, HEAP_ZERO_MEMORY, hdpa->ptrs, nSize);
-            else
-                lpTemp = (LPVOID*)HeapAlloc (hdpa->hHeap, HEAP_ZERO_MEMORY, nSize);
-            
+            lpTemp = (LPVOID*)HeapReAlloc (hdpa->hHeap, HEAP_ZERO_MEMORY,
+                                           hdpa->ptrs, nSize);
             if (!lpTemp)
                 return FALSE;
 
-            hdpa->nMaxCount = nNewItems;
-            hdpa->ptrs = lpTemp;
-        }
-        hdpa->nItemCount = i+1;
+            hdpa->nItemCount = nNewItems;
+            hdpa->ptrs = lpTemp;        
+        }    
     }
 
@@ -1973 +2013 @@
     LPVOID *lpDest, *lpSrc, lpTemp = NULL;
     INT  nSize;
-
+    
     TRACE("(%p %d)\n", hdpa, i);
 
@@ -1990 +2030 @@
         memmove (lpDest, lpSrc, nSize);
     }
-
+    
     hdpa->nItemCount --;
-
+    
     /* free memory ?*/
     if ((hdpa->nMaxCount - hdpa->nItemCount) >= hdpa->nGrow) {
@@ -2003 +2043 @@
 
         hdpa->nMaxCount = nNewItems;
-        hdpa->ptrs = (LPVOID*)lpDest;
+        hdpa->ptrs = (LPVOID*)lpDest;         
     }
 
@@ -2028 +2068 @@
     TRACE("(%p)\n", hdpa);
 
-    if (!hdpa)
+    if (!hdpa) 
         return FALSE;
 
@@ -2067 +2107 @@
 
     TRACE("l=%i r=%i\n", l, r);
-
+ 
     if (l==r)    /* one element is always sorted */
         return;
@@ -2080 +2120 @@
 
     /* join the two sides */
-    while( (l<=m) && (m<r) )
+    while( (l<=m) && (m<r) ) 
     {
         if(pfnCompare(lpPtrs[l],lpPtrs[m+1],lParam)>0)
@@ -2198 +2238 @@
 
         TRACE("linear search\n");
-
+        
         nIndex = (nStart == -1)? 0 : nStart;
         lpPtr = hdpa->ptrs;
@@ -2233 +2273 @@
     HDPA hdpa;
 
-    TRACE("(%d %p)\n", nGrow, hHeap);
+    TRACE("(%d 0x%x)\n", nGrow, hHeap);
 
     if (hHeap)
@@ -2281 +2321 @@
     UINT idFrom = 0;
 
-    TRACE("(%p %p %d %p 0x%08lx)\n",
+    TRACE("(0x%04x 0x%04x %d %p 0x%08lx)\n",
            lpNotify->hwndFrom, lpNotify->hwndTo, uCode, lpHdr,
            lpNotify->dwParam5);
@@ -2288 +2328 @@
         return 0;
 
-    if (lpNotify->hwndFrom == (HWND)-1) {
+    if (lpNotify->hwndFrom == -1) {
         lpNmh = lpHdr;
         idFrom = lpHdr->idFrom;
@@ -2334 +2374 @@
     NOTIFYDATA notify;
 
-    TRACE("(%p %p %d %p)\n",
+    TRACE("(0x%04x 0x%04x %d %p)\n",
            hwndTo, hwndFrom, uCode, lpHdr);
 
@@ -2368 +2408 @@
     HWND hwndNotify;
 
-    TRACE("(%p %p %d %p 0x%08lx)\n",
+    TRACE("(0x%04x 0x%04x %d %p 0x%08lx)\n",
            hwndFrom, hwndTo, uCode, lpHdr, dwParam5);
 
@@ -2451 +2491 @@
 COMCTL32_StrToIntW (LPWSTR lpString)
 {
-    return atoiW(lpString);
+    return _wtoi(lpString);
 }
 
@@ -2463 +2503 @@
  *     hdpa     [I] handle to the dynamic pointer array
  *     enumProc [I]
- *     lParam   [I]
+ *     lParam   [I] 
  *
  * RETURNS
@@ -2644 +2684 @@
         if (dbcs && lpStart[1] != HIBYTE(wMatch)) continue;
         lpGotIt = lpStart;
-    }
+    }    
     return (LPSTR)lpGotIt;
 }
@@ -2698 +2738 @@
     if( strchrW(lpSet, *(WORD*)lpLoop))
       return (INT)(lpLoop-lpStr);
-
+  
   return (INT)(lpLoop-lpStr);
 }
@@ -2711 +2751 @@
 BOOL WINAPI COMCTL32_410( HWND hw, DWORD b, DWORD c, DWORD d) {
 
-   FIXME("(%p, %lx, %lx, %lx): stub!\n", hw, b, c, d);
+   FIXME("(%x, %lx, %lx, %lx): stub!\n", hw, b, c, d);
 
    return TRUE;
@@ -2725 +2765 @@
 BOOL WINAPI COMCTL32_411( HWND hw, DWORD b, DWORD c) {
 
-   FIXME("(%p, %lx, %lx): stub!\n", hw, b, c);
+   FIXME("(%x, %lx, %lx): stub!\n", hw, b, c);
 
    return TRUE;
@@ -2739 +2779 @@
 BOOL WINAPI COMCTL32_412( HWND hwnd, DWORD b, DWORD c)
 {
-    FIXME("(%p, %lx, %lx): stub!\n", hwnd, b, c);
+    FIXME("(%x, %lx, %lx): stub!\n", hwnd, b, c);
 
     if (IsWindow (hwnd) == FALSE)
@@ -2760 +2800 @@
 BOOL WINAPI COMCTL32_413( HWND hw, DWORD b, DWORD c, DWORD d) {
 
-   FIXME("(%p, %lx, %lx, %lx): stub!\n", hw, b, c, d);
+   FIXME("(%x, %lx, %lx, %lx): stub!\n", hw, b, c, d);
 
    return TRUE;
@@ -2776 +2816 @@
 {
 
-   FIXME("(%p, %lx, %lx, %lx, %lx): stub!\n", hwnd, b, c, d, e);
+   FIXME("(%x, %lx, %lx, %lx, %lx): stub!\n", hwnd, b, c, d, e);
 
    return TRUE;