James Hawkins : lz32: Fix several failing tests in win95.

Alexandre Julliard julliard at winehq.org
Fri Aug 29 07:30:16 CDT 2008


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

Author: James Hawkins <jhawkins at codeweavers.com>
Date:   Thu Aug 28 21:16:02 2008 -0500

lz32: Fix several failing tests in win95.

---

 dlls/lz32/tests/lzexpand_main.c |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/dlls/lz32/tests/lzexpand_main.c b/dlls/lz32/tests/lzexpand_main.c
index a296b28..07cfe5f 100644
--- a/dlls/lz32/tests/lzexpand_main.c
+++ b/dlls/lz32/tests/lzexpand_main.c
@@ -230,7 +230,8 @@ static void test_LZOpenFileA_existing_compressed(void)
   /* d, using underscore-terminated file name. */
   file = LZOpenFileA(_terminated, &test, OF_EXIST);
   ok(file >= 0, "LZOpenFileA failed on switching to a compressed file name\n");
-  ok(test.cBytes == sizeof(OFSTRUCT), 
+  ok(test.cBytes == sizeof(OFSTRUCT) ||
+     broken(test.cBytes == 40), /* win95 */
      "LZOpenFileA set test.cBytes to %d\n", test.cBytes);
   ok(test.nErrCode == 0, "LZOpenFileA set test.nErrCode to %d\n", 
      test.nErrCode);
@@ -388,7 +389,8 @@ static void test_LZOpenFileA(void)
   /* a, for reading. */
   file = LZOpenFileA(filename_, &test, OF_READ);
   ok(file >= 0, "LZOpenFileA failed on read\n");
-  ok(test.cBytes == sizeof(OFSTRUCT),
+  ok(test.cBytes == sizeof(OFSTRUCT) ||
+     broken(test.cBytes == 40), /* win95 */
      "LZOpenFileA set test.cBytes to %d\n", test.cBytes);
   ok(test.nErrCode == ERROR_SUCCESS,
      "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode);
@@ -403,7 +405,8 @@ static void test_LZOpenFileA(void)
   /* b, for writing. */
   file = LZOpenFileA(filename_, &test, OF_WRITE);
   ok(file >= 0, "LZOpenFileA failed on write\n");
-  ok(test.cBytes == sizeof(OFSTRUCT),
+  ok(test.cBytes == sizeof(OFSTRUCT) ||
+     broken(test.cBytes == 40), /* win95 */
      "LZOpenFileA set test.cBytes to %d\n", test.cBytes);
   ok(test.nErrCode == ERROR_SUCCESS,
      "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode);
@@ -418,7 +421,8 @@ static void test_LZOpenFileA(void)
   /* c, for reading and writing. */
   file = LZOpenFileA(filename_, &test, OF_READWRITE);
   ok(file >= 0, "LZOpenFileA failed on read/write\n");
-  ok(test.cBytes == sizeof(OFSTRUCT),
+  ok(test.cBytes == sizeof(OFSTRUCT) ||
+     broken(test.cBytes == 40), /* win95 */
      "LZOpenFileA set test.cBytes to %d\n", test.cBytes);
   ok(test.nErrCode == ERROR_SUCCESS,
      "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode);
@@ -433,7 +437,8 @@ static void test_LZOpenFileA(void)
   /* d, for checking file existence. */
   file = LZOpenFileA(filename_, &test, OF_EXIST);
   ok(file >= 0, "LZOpenFileA failed on read/write\n");
-  ok(test.cBytes == sizeof(OFSTRUCT),
+  ok(test.cBytes == sizeof(OFSTRUCT) ||
+     broken(test.cBytes == 40), /* win95 */
      "LZOpenFileA set test.cBytes to %d\n", test.cBytes);
   ok(test.nErrCode == ERROR_SUCCESS,
      "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode);
@@ -448,7 +453,8 @@ static void test_LZOpenFileA(void)
   /* Delete the file then make sure it doesn't exist anymore. */
   file = LZOpenFileA(filename_, &test, OF_DELETE);
   ok(file >= 0, "LZOpenFileA failed on delete\n");
-  ok(test.cBytes == sizeof(OFSTRUCT),
+  ok(test.cBytes == sizeof(OFSTRUCT) ||
+     broken(test.cBytes == 40), /* win95 */
      "LZOpenFileA set test.cBytes to %d\n", test.cBytes);
   ok(test.nErrCode == ERROR_SUCCESS,
      "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode);




More information about the wine-cvs mailing list