From 4f86b5cd072f96fb907399f78a4ab84963857383 Mon Sep 17 00:00:00 2001 From: Paul Vriens Date: Thu, 5 Jul 2007 16:30:09 +0200 Subject: [PATCH] kernel32/tests: Don't crash on win98. --- dlls/kernel32/tests/profile.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 272ba9ca1e2..4824ce856f8 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -137,6 +137,7 @@ static void test_profile_sections(void) char *p; static const char content[]="[section1]\r\nname1=val1\r\nname2=\r\nname3\r\nname4=val4\r\n[section2]\r\n"; static const char testfile4[]=".\\testwine4.ini"; + BOOL on_win98 = FALSE; DeleteFileA( testfile4 ); h = CreateFileA( testfile4, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); @@ -149,17 +150,25 @@ static void test_profile_sections(void) SetLastError(0xdeadbeef); ret = GetPrivateProfileSectionA( NULL, NULL, 0, NULL ); ok( ret == 0, "expected return size 0, got %d\n", ret ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + ok( GetLastError() == ERROR_INVALID_PARAMETER || + GetLastError() == 0xdeadbeef /* Win98 */, + "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + if (GetLastError() == 0xdeadbeef) on_win98 = TRUE; SetLastError(0xdeadbeef); ret = GetPrivateProfileSectionA( NULL, NULL, 0, testfile4 ); ok( ret == 0, "expected return size 0, got %d\n", ret ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + ok( GetLastError() == ERROR_INVALID_PARAMETER || + GetLastError() == 0xdeadbeef /* Win98 */, + "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - SetLastError(0xdeadbeef); - ret = GetPrivateProfileSectionA( "section1", NULL, 0, testfile4 ); - ok( ret == 0, "expected return size 0, got %d\n", ret ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + if (!on_win98) + { + SetLastError(0xdeadbeef); + ret = GetPrivateProfileSectionA( "section1", NULL, 0, testfile4 ); + ok( ret == 0, "expected return size 0, got %d\n", ret ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + } SetLastError(0xdeadbeef); ret = GetPrivateProfileSectionA( NULL, buf, sizeof(buf), testfile4 );