Alexandre Julliard : kernel32/tests: Fix some profile test failures on NT4.
Alexandre Julliard
julliard at winehq.org
Mon Nov 10 07:43:57 CST 2008
Module: wine
Branch: master
Commit: 181e4f08b61b993ccea45e645425550bebedb87b
URL: http://source.winehq.org/git/wine.git/?a=commit;h=181e4f08b61b993ccea45e645425550bebedb87b
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon Nov 10 11:09:02 2008 +0100
kernel32/tests: Fix some profile test failures on NT4.
---
dlls/kernel32/tests/profile.c | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c
index 2a9f08a..3cd8af1 100644
--- a/dlls/kernel32/tests/profile.c
+++ b/dlls/kernel32/tests/profile.c
@@ -279,6 +279,7 @@ static void test_profile_existing(void)
DWORD dwShareMode;
DWORD write_error;
BOOL read_error;
+ DWORD broken_error;
} pe[] = {
{GENERIC_READ, FILE_SHARE_READ, ERROR_SHARING_VIOLATION, FALSE },
{GENERIC_READ, FILE_SHARE_WRITE, ERROR_SHARING_VIOLATION, TRUE },
@@ -286,10 +287,10 @@ static void test_profile_existing(void)
{GENERIC_WRITE, FILE_SHARE_WRITE, ERROR_SHARING_VIOLATION, TRUE },
{GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, ERROR_SHARING_VIOLATION, FALSE },
{GENERIC_READ|GENERIC_WRITE, FILE_SHARE_WRITE, ERROR_SHARING_VIOLATION, TRUE },
- {GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, 0, FALSE },
- {GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, 0, FALSE },
+ {GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, 0, FALSE, ERROR_SHARING_VIOLATION /* nt4 */},
+ {GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, 0, FALSE, ERROR_SHARING_VIOLATION /* nt4 */},
/*Thief demo (bug 5024) opens .ini file like this*/
- {GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, 0, FALSE }
+ {GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, 0, FALSE, ERROR_SHARING_VIOLATION /* nt4 */}
};
int i;
@@ -308,10 +309,15 @@ static void test_profile_existing(void)
ret = WritePrivateProfileString(SECTION, KEY, "12345", testfile1);
if (!pe[i].write_error)
{
- ok( ret, "%d: WritePrivateProfileString failed with error %u\n", i, GetLastError() );
+ if (!ret)
+ ok( broken(GetLastError() == pe[i].broken_error),
+ "%d: WritePrivateProfileString failed with error %u\n", i, GetLastError() );
CloseHandle(h);
size = GetPrivateProfileString(SECTION, KEY, 0, buffer, MAX_PATH, testfile1);
- ok( size == 5, "%d: test failed, number of characters copied: %d instead of 5\n", i, size );
+ if (ret)
+ ok( size == 5, "%d: test failed, number of characters copied: %d instead of 5\n", i, size );
+ else
+ ok( !size, "%d: test failed, number of characters copied: %d instead of 0\n", i, size );
}
else
{
More information about the wine-cvs
mailing list