ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

comctl32/dpa: Fix DPA_Merge() test failures on old 4.7x comctl32.

This commit is contained in:
Nikolay Sivov 2009-09-13 21:56:48 +04:00 committed by Alexandre Julliard
parent 28998999d0
commit d82fb3d308
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/comctl32/tests/dpa.c
View File

@ -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);