Changeset 8382 for trunk/src/comctl32/comctl32undoc.c

Timestamp:

May 8, 2002, 1:26:30 PM (23 years ago)

Author:

sandervl

Message:

merge with latest Wine

File:

• trunk/src/comctl32/comctl32undoc.c (modified) (9 diffs)

trunk/src/comctl32/comctl32undoc.c

@@ -5 +5 @@
  *           1998 Juergen Schmied <j.schmied@metronet.de>
  *           2000 Eric Kohl for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * NOTES
@@ -34 +48 @@
 #include "comctl32.h"
 
-#include "debugtools.h"
-
-DEFAULT_DEBUG_CHANNEL(commctrl);
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(commctrl);
 
 
@@ -206 +220 @@
     INT nCount;
     LPVOID *pWork1, *pWork2;
-    INT nResult;
+    INT nResult, i;
     INT nIndex;
 
@@ -224 +238 @@
         return FALSE;
 
-    if (dwFlags & DPAM_SORT) {
+    if (!(dwFlags & DPAM_NOSORT)) {
         TRACE("sorting dpa's!\n");
         if (hdpa1->nItemCount > 0)
@@ -251 +265 @@
     do
     {
-        if (nIndex < 0) break;
+        if (nIndex < 0) {
+            if ((nCount >= 0) && (dwFlags & DPAM_INSERT)) {
+                /* Now insert the remaining new items into DPA 1 */
+                TRACE("%d items to be inserted at start of DPA 1\n",
+                      nCount+1);
+                for (i=nCount; i>=0; i--) {
+                    PVOID ptr;
+
+                    ptr = (pfnMerge)(3, *pWork2, NULL, lParam);
+                    if (!ptr)
+                        return FALSE;
+                    DPA_InsertPtr (hdpa1, 0, ptr);
+                    pWork2--;
+                }
+            }
+            break;
+        }
         nResult = (pfnCompare)(*pWork1, *pWork2, lParam);
         TRACE("compare result=%d, dpa1.cnt=%d, dpa2.cnt=%d\n", 
@@ -270 +300 @@
             pWork1--;
         }
-        else if (nResult < 0)
+        else if (nResult > 0)
         {
-            if (!(dwFlags & 8))
+            /* item in DPA 1 missing from DPA 2 */
+            if (dwFlags & DPAM_DELETE)
             {
+                /* Now delete the extra item in DPA1 */
                 PVOID ptr;
 
@@ -285 +317 @@
         else
         {
-            if (!(dwFlags & 4))
+            /* new item in DPA 2 */
+            if (dwFlags & DPAM_INSERT)
             {
+                /* Now insert the new item in DPA 1 */
                 PVOID ptr;
 
@@ -292 +326 @@
                 if (!ptr)
                     return FALSE;
-                DPA_InsertPtr (hdpa1, nIndex, ptr);
+                DPA_InsertPtr (hdpa1, nIndex+1, ptr);
             }
             nCount--;
@@ -2800 +2834 @@
    return TRUE;
 }
-