Paul Vriens : kernel32/tests: Fix two failures on win9x.

Alexandre Julliard julliard at winehq.org
Tue Aug 26 07:06:39 CDT 2008


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

Author: Paul Vriens <paul.vriens.wine at gmail.com>
Date:   Mon Aug 25 16:48:31 2008 +0200

kernel32/tests: Fix two failures on win9x.

---

 dlls/kernel32/tests/file.c |    8 ++++++--
 include/winnt.h            |    1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c
index 4730ec4..3502e83 100644
--- a/dlls/kernel32/tests/file.c
+++ b/dlls/kernel32/tests/file.c
@@ -1353,7 +1353,9 @@ static void test_FindFirstFileA(void)
     ok( 0 == lstrcmpiA(data.cFileName, "nul"), "wrong name %s\n", data.cFileName );
     ok( 0 == data.nFileSizeHigh, "wrong size %d\n", data.nFileSizeHigh );
     ok( 0 == data.nFileSizeLow, "wrong size %d\n", data.nFileSizeLow );
-    ok( FILE_ATTRIBUTE_ARCHIVE == data.dwFileAttributes, "wrong attributes %x\n", data.dwFileAttributes );
+    ok( FILE_ATTRIBUTE_ARCHIVE == data.dwFileAttributes ||
+        FILE_ATTRIBUTE_DEVICE == data.dwFileAttributes /* Win9x */,
+        "wrong attributes %x\n", data.dwFileAttributes );
     SetLastError( 0xdeadbeaf );
     ok( !FindNextFileA( handle, &data ), "FindNextFileA succeeded\n" );
     ok( GetLastError() == ERROR_NO_MORE_FILES, "bad error %d\n", GetLastError() );
@@ -1368,7 +1370,9 @@ static void test_FindFirstFileA(void)
     ok( 0 == lstrcmpiA(data.cFileName, "lpt1"), "wrong name %s\n", data.cFileName );
     ok( 0 == data.nFileSizeHigh, "wrong size %d\n", data.nFileSizeHigh );
     ok( 0 == data.nFileSizeLow, "wrong size %d\n", data.nFileSizeLow );
-    ok( FILE_ATTRIBUTE_ARCHIVE == data.dwFileAttributes, "wrong attributes %x\n", data.dwFileAttributes );
+    ok( FILE_ATTRIBUTE_ARCHIVE == data.dwFileAttributes ||
+        FILE_ATTRIBUTE_DEVICE == data.dwFileAttributes /* Win9x */,
+        "wrong attributes %x\n", data.dwFileAttributes );
     SetLastError( 0xdeadbeaf );
     ok( !FindNextFileA( handle, &data ), "FindNextFileA succeeded\n" );
     ok( GetLastError() == ERROR_NO_MORE_FILES, "bad error %d\n", GetLastError() );
diff --git a/include/winnt.h b/include/winnt.h
index e8a37f5..7ca80a7 100644
--- a/include/winnt.h
+++ b/include/winnt.h
@@ -4118,6 +4118,7 @@ typedef struct _QUOTA_LIMITS_EX {
 #define FILE_ATTRIBUTE_SYSTEM              0x00000004
 #define FILE_ATTRIBUTE_DIRECTORY           0x00000010
 #define FILE_ATTRIBUTE_ARCHIVE             0x00000020
+#define FILE_ATTRIBUTE_DEVICE              0x00000040
 #define FILE_ATTRIBUTE_NORMAL              0x00000080
 #define FILE_ATTRIBUTE_TEMPORARY           0x00000100
 #define FILE_ATTRIBUTE_SPARSE_FILE         0x00000200




More information about the wine-cvs mailing list