Nikolay Sivov : comctl32/dpa: Fix DPA_Merge() test failures on old 4. 7x comctl32.
Alexandre Julliard
julliard at winehq.org
Tue Sep 15 17:47:30 CDT 2009
Module: wine
Branch: master
Commit: d82fb3d308b9b43a069eef8beac188a11fcee474
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d82fb3d308b9b43a069eef8beac188a11fcee474
Author: Nikolay Sivov <bunglehead at gmail.com>
Date: Sun Sep 13 21:56:48 2009 +0400
comctl32/dpa: 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 1ba4c67..6acb55b 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);
More information about the wine-cvs
mailing list