Dylan Smith : richedit: Fixed test failure that happend on older builds of riched20.dll.
Alexandre Julliard
julliard at winehq.org
Tue Sep 30 11:16:40 CDT 2008
Module: wine
Branch: master
Commit: c13fd6a44b71c263e76cf2a4bbf6026ed06a4ca0
URL: http://source.winehq.org/git/wine.git/?a=commit;h=c13fd6a44b71c263e76cf2a4bbf6026ed06a4ca0
Author: Dylan Smith <dylan.ah.smith at gmail.com>
Date: Mon Sep 29 13:33:52 2008 -0400
richedit: Fixed test failure that happend on older builds of riched20.dll.
---
dlls/riched20/tests/editor.c | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c
index 41dce86..15f0248 100644
--- a/dlls/riched20/tests/editor.c
+++ b/dlls/riched20/tests/editor.c
@@ -1101,6 +1101,7 @@ static void test_SETPARAFORMAT(void)
HWND hwndRichEdit = new_richedit(NULL);
PARAFORMAT2 fmt;
HRESULT ret;
+ LONG expectedMask = PFM_ALL2 & ~PFM_TABLEROWDELIMITER;
fmt.cbSize = sizeof(PARAFORMAT2);
fmt.dwMask = PFM_ALIGNMENT;
fmt.wAlignment = PFA_LEFT;
@@ -1111,8 +1112,14 @@ static void test_SETPARAFORMAT(void)
fmt.cbSize = sizeof(PARAFORMAT2);
fmt.dwMask = -1;
ret = SendMessage(hwndRichEdit, EM_GETPARAFORMAT, 0, (LPARAM) &fmt);
- ok(ret == PFM_ALL2, "expected %x got %x\n", PFM_ALL2, ret);
- ok(fmt.dwMask == PFM_ALL2, "expected %x got %x\n", PFM_ALL2, fmt.dwMask);
+ /* Ignore the PFM_TABLEROWDELIMITER bit because it changes
+ * between richedit different native builds of riched20.dll
+ * used on different Windows versions. */
+ ret &= ~PFM_TABLEROWDELIMITER;
+ fmt.dwMask &= ~PFM_TABLEROWDELIMITER;
+
+ ok(ret == expectedMask, "expected %x got %x\n", expectedMask, ret);
+ ok(fmt.dwMask == expectedMask, "expected %x got %x\n", expectedMask, fmt.dwMask);
DestroyWindow(hwndRichEdit);
}
More information about the wine-cvs
mailing list