Huw Davies : lz32/tests: For win9x, cBytes depends on the length of the filename.

[Alexandre Julliard]

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

Author: Huw Davies <huw(a)codeweavers.com>
Date:   Mon Feb 23 12:01:18 2009 +0000

lz32/tests: For win9x, cBytes depends on the length of the filename.

---

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

diff --git a/dlls/lz32/tests/lzexpand_main.c b/dlls/lz32/tests/lzexpand_main.c
index 9c95d07..91fd687 100644
--- a/dlls/lz32/tests/lzexpand_main.c
+++ b/dlls/lz32/tests/lzexpand_main.c
@@ -231,7 +231,7 @@ static void test_LZOpenFileA_existing_compressed(void)
   file = LZOpenFileA(_terminated, &test, OF_EXIST);
   ok(file >= 0, "LZOpenFileA failed on switching to a compressed file name\n");
   ok(test.cBytes == sizeof(OFSTRUCT) ||
-     broken(test.cBytes == 40), /* win95 */
+     broken(test.cBytes == FIELD_OFFSET(OFSTRUCT, szPathName) + lstrlenA(test.szPathName)), /* win9x */
      "LZOpenFileA set test.cBytes to %d\n", test.cBytes);
   ok(test.nErrCode == 0, "LZOpenFileA set test.nErrCode to %d\n", 
      test.nErrCode);
@@ -390,7 +390,7 @@ static void test_LZOpenFileA(void)
   file = LZOpenFileA(filename_, &test, OF_READ);
   ok(file >= 0, "LZOpenFileA failed on read\n");
   ok(test.cBytes == sizeof(OFSTRUCT) ||
-     broken(test.cBytes == 40), /* win95 */
+     broken(test.cBytes == FIELD_OFFSET(OFSTRUCT, szPathName) + lstrlenA(test.szPathName)), /* win9x */
      "LZOpenFileA set test.cBytes to %d '%s'('%s')\n", test.cBytes, expected, short_expected);
   ok(test.nErrCode == ERROR_SUCCESS,
      "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode);
@@ -406,7 +406,7 @@ static void test_LZOpenFileA(void)
   file = LZOpenFileA(filename_, &test, OF_WRITE);
   ok(file >= 0, "LZOpenFileA failed on write\n");
   ok(test.cBytes == sizeof(OFSTRUCT) ||
-     broken(test.cBytes == 40), /* win95 */
+     broken(test.cBytes == FIELD_OFFSET(OFSTRUCT, szPathName) + lstrlenA(test.szPathName)), /* win9x */
      "LZOpenFileA set test.cBytes to %d\n", test.cBytes);
   ok(test.nErrCode == ERROR_SUCCESS,
      "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode);
@@ -422,7 +422,7 @@ static void test_LZOpenFileA(void)
   file = LZOpenFileA(filename_, &test, OF_READWRITE);
   ok(file >= 0, "LZOpenFileA failed on read/write\n");
   ok(test.cBytes == sizeof(OFSTRUCT) ||
-     broken(test.cBytes == 40), /* win95 */
+     broken(test.cBytes == FIELD_OFFSET(OFSTRUCT, szPathName) + lstrlenA(test.szPathName)), /* win9x */
      "LZOpenFileA set test.cBytes to %d\n", test.cBytes);
   ok(test.nErrCode == ERROR_SUCCESS,
      "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode);
@@ -438,7 +438,7 @@ static void test_LZOpenFileA(void)
   file = LZOpenFileA(filename_, &test, OF_EXIST);
   ok(file >= 0, "LZOpenFileA failed on read/write\n");
   ok(test.cBytes == sizeof(OFSTRUCT) ||
-     broken(test.cBytes == 40), /* win95 */
+     broken(test.cBytes == FIELD_OFFSET(OFSTRUCT, szPathName) + lstrlenA(test.szPathName)), /* win9x */
      "LZOpenFileA set test.cBytes to %d\n", test.cBytes);
   ok(test.nErrCode == ERROR_SUCCESS,
      "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode);
@@ -454,7 +454,7 @@ static void test_LZOpenFileA(void)
   file = LZOpenFileA(filename_, &test, OF_DELETE);
   ok(file >= 0, "LZOpenFileA failed on delete\n");
   ok(test.cBytes == sizeof(OFSTRUCT) ||
-     broken(test.cBytes == 40), /* win95 */
+     broken(test.cBytes == FIELD_OFFSET(OFSTRUCT, szPathName) + lstrlenA(test.szPathName)), /* win9x */
      "LZOpenFileA set test.cBytes to %d\n", test.cBytes);
   ok(test.nErrCode == ERROR_SUCCESS,
      "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode);