Paul Vriens : kernel32/tests: Don't crash on win98.

Alexandre Julliard julliard at wine.codeweavers.com
Thu Jul 5 13:31:25 CDT 2007


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

Author: Paul Vriens <paul.vriens.wine at gmail.com>
Date:   Thu Jul  5 16:30:09 2007 +0200

kernel32/tests: Don't crash on win98.

---

 dlls/kernel32/tests/profile.c |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c
index 272ba9c..4824ce8 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 );




More information about the wine-cvs mailing list