From b7a8eefb2b44f1ac5127dd3d99a1bc71b8410007 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Tue, 11 Feb 2003 22:11:56 +0000 Subject: [PATCH] Authors: Francois Gouget , With help from Enio Schutt Jr Skip the overlapped I/O tests on files on Win9x. --- dlls/kernel/tests/file.c | 45 ++++++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 18 deletions(-) diff --git a/dlls/kernel/tests/file.c b/dlls/kernel/tests/file.c index a3b1af77e39..02177e90b95 100644 --- a/dlls/kernel/tests/file.c +++ b/dlls/kernel/tests/file.c @@ -609,6 +609,7 @@ void test_offset_in_overlapped_structure(void) HANDLE hFile; OVERLAPPED ov; DWORD done; + BOOL rc; BYTE buf[256], pattern[] = "TeSt"; UINT i; char temp_path[MAX_PATH], temp_fname[MAX_PATH]; @@ -628,19 +629,23 @@ void test_offset_in_overlapped_structure(void) memset(&ov, 0, sizeof(ov)); ov.Offset = PATTERN_OFFSET; ov.OffsetHigh = 0; - ok(WriteFile(hFile, pattern, sizeof(pattern), &done, &ov), "WriteFile error %ld", GetLastError()); - ok(done == sizeof(pattern), "expected number of bytes written %lu", done); - trace("Current offset = %04lx\n", SetFilePointer(hFile, 0, NULL, FILE_CURRENT)); - ok(SetFilePointer(hFile, 0, NULL, FILE_CURRENT) == (PATTERN_OFFSET + sizeof(pattern)), - "expected file offset %d", PATTERN_OFFSET + sizeof(pattern)); + rc=WriteFile(hFile, pattern, sizeof(pattern), &done, &ov); + /* Win 9x does not support the overlapped I/O on files */ + if (rc || GetLastError()!=ERROR_INVALID_PARAMETER) { + ok(rc, "WriteFile error %ld", GetLastError()); + ok(done == sizeof(pattern), "expected number of bytes written %lu", done); + trace("Current offset = %04lx\n", SetFilePointer(hFile, 0, NULL, FILE_CURRENT)); + ok(SetFilePointer(hFile, 0, NULL, FILE_CURRENT) == (PATTERN_OFFSET + sizeof(pattern)), + "expected file offset %d", PATTERN_OFFSET + sizeof(pattern)); - ov.Offset = sizeof(buf) * 2; - ov.OffsetHigh = 0; - ok(WriteFile(hFile, pattern, sizeof(pattern), &done, &ov), "WriteFile error %ld", GetLastError()); - ok(done == sizeof(pattern), "expected number of bytes written %lu", done); - /*trace("Current offset = %04lx\n", SetFilePointer(hFile, 0, NULL, FILE_CURRENT));*/ - ok(SetFilePointer(hFile, 0, NULL, FILE_CURRENT) == (sizeof(buf) * 2 + sizeof(pattern)), - "expected file offset %d", sizeof(buf) * 2 + sizeof(pattern)); + ov.Offset = sizeof(buf) * 2; + ov.OffsetHigh = 0; + ok(WriteFile(hFile, pattern, sizeof(pattern), &done, &ov), "WriteFile error %ld", GetLastError()); + ok(done == sizeof(pattern), "expected number of bytes written %lu", done); + /*trace("Current offset = %04lx\n", SetFilePointer(hFile, 0, NULL, FILE_CURRENT));*/ + ok(SetFilePointer(hFile, 0, NULL, FILE_CURRENT) == (sizeof(buf) * 2 + sizeof(pattern)), + "expected file offset %d", sizeof(buf) * 2 + sizeof(pattern)); + } CloseHandle(hFile); @@ -653,12 +658,16 @@ void test_offset_in_overlapped_structure(void) memset(&ov, 0, sizeof(ov)); ov.Offset = PATTERN_OFFSET; ov.OffsetHigh = 0; - ok(ReadFile(hFile, buf, sizeof(pattern), &done, &ov), "ReadFile error %ld", GetLastError()); - ok(done == sizeof(pattern), "expected number of bytes read %lu", done); - trace("Current offset = %04lx\n", SetFilePointer(hFile, 0, NULL, FILE_CURRENT)); - ok(SetFilePointer(hFile, 0, NULL, FILE_CURRENT) == (PATTERN_OFFSET + sizeof(pattern)), - "expected file offset %d", PATTERN_OFFSET + sizeof(pattern)); - ok(!memcmp(buf, pattern, sizeof(pattern)), "pattern match failed"); + rc=ReadFile(hFile, buf, sizeof(pattern), &done, &ov); + /* Win 9x does not support the overlapped I/O on files */ + if (rc || GetLastError()!=ERROR_INVALID_PARAMETER) { + ok(rc, "ReadFile error %ld", GetLastError()); + ok(done == sizeof(pattern), "expected number of bytes read %lu", done); + trace("Current offset = %04lx\n", SetFilePointer(hFile, 0, NULL, FILE_CURRENT)); + ok(SetFilePointer(hFile, 0, NULL, FILE_CURRENT) == (PATTERN_OFFSET + sizeof(pattern)), + "expected file offset %d", PATTERN_OFFSET + sizeof(pattern)); + ok(!memcmp(buf, pattern, sizeof(pattern)), "pattern match failed"); + } CloseHandle(hFile);