Paul Vriens : hlink/tests: Fix some failures on Win9x and WinMe.

Alexandre Julliard julliard at winehq.org
Fri Dec 5 07:43:00 CST 2008


Module: wine
Branch: master
Commit: d127bbd5db78cd513a30ae3d5c3735f7dbd5f73f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d127bbd5db78cd513a30ae3d5c3735f7dbd5f73f

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Fri Dec  5 10:10:29 2008 +0100

hlink/tests: Fix some failures on Win9x and WinMe.

---

 dlls/hlink/tests/hlink.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c
index 89b7c7a..5e07359 100644
--- a/dlls/hlink/tests/hlink.c
+++ b/dlls/hlink/tests/hlink.c
@@ -351,6 +351,7 @@ static void test_persist_save_data(const char *testname, IHlink *lnk,
     const unsigned char *data;
     DWORD i;
     BOOL same;
+    unsigned int expected_data_win9x_size = 0;
 
     hr = IHlink_QueryInterface(lnk, &IID_IPersistStream, (void **)&ps);
     ok(hr == S_OK, "IHlink_QueryInterface failed with error 0x%08x\n", hr);
@@ -368,8 +369,13 @@ static void test_persist_save_data(const char *testname, IHlink *lnk,
 
     data = GlobalLock(hglobal);
 
+    if (expected_data_size % 4)
+        expected_data_win9x_size =  4 * ((expected_data_size / 4) + 1);
+
     /* first check we have the right amount of data */
-    ok((data_size == expected_data_size) || (data_size == expected_data_alt_size),
+    ok((data_size == expected_data_size) ||
+       (data_size == expected_data_alt_size) ||
+       broken(data_size == expected_data_win9x_size), /* Win9x and WinMe */
        "%s: Size of saved data differs (expected %d or %d, actual %d)\n",
        testname, expected_data_size, expected_data_alt_size, data_size);
 




More information about the wine-cvs mailing list