[ros-diffs] [cwittich] 38414: sync lz32 winetest to wine 1.1.11

Author: cwittich
Date: Sun Dec 28 05:24:41 2008
New Revision: 38414

URL: http://svn.reactos.org/svn/reactos?rev=38414&view=rev
Log:
sync lz32 winetest to wine 1.1.11

Modified:
    trunk/rostests/winetests/lz32/lzexpand_main.c

Modified: trunk/rostests/winetests/lz32/lzexpand_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/lz32/lzexpand_m…
==============================================================================
--- trunk/rostests/winetests/lz32/lzexpand_main.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/lz32/lzexpand_main.c [iso-8859-1] Sun Dec 28 05:24:41 2008
@@ -230,7 +230,8 @@
   /* 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);
@@ -370,7 +371,7 @@
   ok(test.cBytes == sizeof(OFSTRUCT),
      "LZOpenFileA set test.cBytes to %d\n", test.cBytes);
   ok(test.nErrCode == ERROR_SUCCESS ||
-     test.nErrCode == ERROR_FILE_NOT_FOUND, /* win9x */
+     broken(test.nErrCode != ERROR_SUCCESS), /* win9x */
      "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode);
   ok(lstrcmpA(test.szPathName, expected) == 0,
      "LZOpenFileA returned '%s', but was expected to return
'%s'\n",
@@ -388,7 +389,8 @@
   /* 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 @@
   /* 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 @@
   /* 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 @@
   /* 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 @@
   /* 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);
@@ -764,13 +770,13 @@
   SetLastError(0xfaceabee);
   /* Check for nonexistent file. */
   file = LZOpenFileW(badfilenameW, &test, OF_READ);
-  ok(GetLastError() == ERROR_FILE_NOT_FOUND || GetLastError() ==
ERROR_CALL_NOT_IMPLEMENTED,
-     "GetLastError() returns %d\n", GetLastError());
   if(GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
   {
-    trace("LZOpenFileW call not implemented, skipping rest of the test\n");
+    win_skip("LZOpenFileW call is not implemented\n");
     return;
   }
+  ok(GetLastError() == ERROR_FILE_NOT_FOUND,
+     "GetLastError() returns %d\n", GetLastError());
   ok(file == LZERROR_BADINHANDLE, "LZOpenFileW succeeded on nonexistent
file\n");
   LZClose(file);