[5/5] comctl32/dpa: Fix DPA_Merge() test failures on old 4.7x comctl32

Nikolay Sivov bunglehead at gmail.com
Sun Sep 13 13:37:35 CDT 2009


Changelog:
    - Fix DPA_Merge() test failures on old 4.7x comctl32

>From 844b963c95e1a670af61c3fff1c2492d2dc9c689 Mon Sep 17 00:00:00 2001
From: Nikolay Sivov <bunglehead at gmail.com>
Date: Sun, 13 Sep 2009 21:56:48 +0400
Subject: Fix DPA_Merge() test failures on old 4.7x comctl32

---
 dlls/comctl32/tests/dpa.c |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/dlls/comctl32/tests/dpa.c b/dlls/comctl32/tests/dpa.c
index b8499d9..ad66922 100644
--- a/dlls/comctl32/tests/dpa.c
+++ b/dlls/comctl32/tests/dpa.c
@@ -433,11 +433,15 @@ static void test_DPA_Merge(void)
     pDPA_Merge(dpa2, dpa, DPAM_UNION,
                CB_CmpLT, CB_MergeInsertSrc, 0xdeadbeef);
     rc = CheckDPA(dpa2, 0x123456, &dw);
-    ok(rc, "dw=0x%x\n", dw);
+    ok(rc ||
+       broken(!rc && dw == 0x23456), /* 4.7x */
+       "dw=0x%x\n", dw);
 
     expect(0, nMessages[DPAMM_MERGE]);
     expect(0, nMessages[DPAMM_DELETE]);
-    expect(3, nMessages[DPAMM_INSERT]);
+    ok(nMessages[DPAMM_INSERT] == 3 ||
+       broken(nMessages[DPAMM_INSERT] == 2), /* 4.7x */
+       "Expected 3, got %d\n", nMessages[DPAMM_INSERT]);
 
     /* Merge dpa3 into dpa2 and dpa */
     memset(nMessages, 0, sizeof(nMessages));
@@ -458,7 +462,9 @@ static void test_DPA_Merge(void)
                CB_CmpLT, CB_MergeInsertSrc, 0xdeadbeef);
     expect(3, nMessages[DPAMM_MERGE]);
     expect(0, nMessages[DPAMM_DELETE]);
-    expect(3, nMessages[DPAMM_INSERT]);
+    ok(nMessages[DPAMM_INSERT] == 3 ||
+       broken(nMessages[DPAMM_INSERT] == 2), /* 4.7x */
+       "Expected 3, got %d\n", nMessages[DPAMM_INSERT]);
 
     rc = CheckDPA(dpa,  0x123456, &dw);
     ok(rc, "dw=0x%x\n",  dw);
-- 
1.5.6.5





More information about the wine-patches mailing list