Changeset 3154 for trunk/src/comctl32/comctl32undoc.cpp

Timestamp:

Mar 18, 2000, 5:17:35 PM (25 years ago)

Author:

cbratschi

Message:

Corel 20000317 merge, ccbase finished, bug fixes

File:

• trunk/src/comctl32/comctl32undoc.cpp (modified) (14 diffs)

trunk/src/comctl32/comctl32undoc.cpp

@@ -1 @@
-/* $Id: comctl32undoc.cpp,v 1.1 2000-02-23 17:09:40 cbratschi Exp $ */
+/* $Id: comctl32undoc.cpp,v 1.2 2000-03-18 16:17:22 cbratschi Exp $ */
 /*
  * Undocumented functions from COMCTL32.DLL
@@ -13 +13 @@
 
 /*
- - Corel 20000212 level
- - WINE 20000130 level
+ - Corel 20000317 level
+ - (WINE 20000130 level)
 */
 
@@ -764 +764 @@
     LPVOID pSrc;
 
-    dprintf(("COMCTL32: DSA_GetItem"));
+    dprintf2(("COMCTL32: DSA_GetItem"));
 
     if (!hdsa)
@@ -797 +797 @@
     LPVOID pSrc;
 
-    dprintf(("COMCTL32: DSA_GetItemPtr"));
+    dprintf2(("COMCTL32: DSA_GetItemPtr"));
 
     if (!hdsa)
@@ -833 +833 @@
     LPVOID pDest, lpTemp;
 
-    dprintf(("COMCTL32: DSA_SetItem"));
+    dprintf2(("COMCTL32: DSA_SetItem"));
 
     if ((!hdsa) || nIndex < 0)
@@ -890 +890 @@
     LPDWORD p;
 
-    dprintf(("COMCTL32: DSA_InsertItem"));
+    dprintf2(("COMCTL32: DSA_InsertItem"));
 
     if ((!hdsa) || nIndex < 0)
@@ -959 +959 @@
     INT  nSize;
 
-    dprintf(("COMCTL32: DSA_DeleteItem"));
+    dprintf2(("COMCTL32: DSA_DeleteItem"));
 
     if (!hdsa)
@@ -1200 +1200 @@
 DPA_GetPtr (const HDPA hdpa, INT i)
 {
-    dprintf(("COMCTL32: DPA_GetPtr"));
+    dprintf2(("COMCTL32: DPA_GetPtr"));
 
     if (!hdpa)
@@ -1234 +1234 @@
     INT i;
 
-    dprintf(("COMCTL32: DPA_GetPtrIndex"));
+    dprintf2(("COMCTL32: DPA_GetPtrIndex"));
 
     if (!hdpa->ptrs)
@@ -1269 +1269 @@
     LPVOID  *lpTemp, *lpDest;
 
-    dprintf(("COMCTL32: DPA_InsertPtr"));
+    dprintf2(("COMCTL32: DPA_InsertPtr"));
 
     if ((!hdpa) || (i < 0))
@@ -1341 +1341 @@
     LPVOID *lpTemp;
 
-    dprintf(("COMCTL32: DPA_SetPtr"));
+    dprintf2(("COMCTL32: DPA_SetPtr"));
 
     if ((!hdpa) || i < 0)
@@ -1395 +1395 @@
     INT  nSize;
 
-    dprintf(("COMCTL32: DPA_DeletePtr"));
+    dprintf2(("COMCTL32: DPA_DeletePtr"));
 
     if ((!hdpa) || i < 0 || i >= hdpa->nItemCount)
@@ -1479 +1479 @@
  * RETURNS
  *     NONE
+ *
+ * NOTES:
+ *          Reverted back to the orginal quick sort, because the existing sort did not sort.
+ *          Kudos to the orginal author of the quick sort.
  */
 
@@ -1492 +1496 @@
     i = l;
     j = r;
-
-    if ( i >= j )
-        return;
-    else if ( i == (j - 1) )
-    {
-        if ( (pfnCompare)( lpPtrs[i], lpPtrs[j], lParam ) > 0 )
+    v = lpPtrs[(int)(l+r)/2];
+    do {
+        while ((pfnCompare)(lpPtrs[i], v, lParam) < 0) i++;
+        while ((pfnCompare)(lpPtrs[j], v, lParam) > 0) j--;
+        if (i <= j)
         {
-            t = lpPtrs[i];
-            lpPtrs[i] = lpPtrs[j];
-            lpPtrs[j] = t;
-        }
-        return;
-    }
-
-    v = lpPtrs[(int)(l+r)/2];
-
-    while ( i < j)
-    {
-        while ( (pfnCompare)( lpPtrs[i], v, lParam ) <= 0 && i < j )
-            i++;
-
-        while ( (pfnCompare)( v, lpPtrs[j], lParam ) <= 0 && i < j )
-            j--;
-
-        if ( i < j )
-        {
-            /* Swap the values; increment i and decrement j to avoid
-               infinite conditions where i and j swap forever */
             t = lpPtrs[i];
             lpPtrs[i++] = lpPtrs[j];
             lpPtrs[j--] = t;
         }
-    }
-
-    if ( i - 1 > l )
-        DPA_QuickSort (lpPtrs, l, i - 1, pfnCompare, lParam);
-    if ( j + 1 < r )
-        DPA_QuickSort (lpPtrs, j + 1, r, pfnCompare, lParam);
+    } while (i <= j);
+    if (l < j) DPA_QuickSort (lpPtrs, l, j, pfnCompare, lParam);
+    if (i < r) DPA_QuickSort (lpPtrs, i, r, pfnCompare, lParam);
 }