Skip to content

W
wine-winehq
Commit 197f2f8c authored by Austin English's avatar Austin English Committed by Alexandre Julliard
Browse files
Options

gdi32/tests: Remove win9x hacks.

parent 0a284208
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 22 deletions
dlls/gdi32/tests/icm.c
View file @ 197f2f8c
...@@ -63,16 +63,10 @@ static void test_GetICMProfileA( HDC dc ) ...@@ -63,16 +63,10 @@ static void test_GetICMProfileA( HDC dc )
ok( !ret, "GetICMProfileA succeeded\n" ); ok( !ret, "GetICMProfileA succeeded\n" );
ok( size, "expected size > 0\n" ); ok( size, "expected size > 0\n" );
ok( filename[0] == 0, "Expected filename to be empty\n" ); ok( filename[0] == 0, "Expected filename to be empty\n" );
ok( error == ERROR_INSUFFICIENT_BUFFER || ok( error == ERROR_INSUFFICIENT_BUFFER, "got %d, expected ERROR_INSUFFICIENT_BUFFER\n", error );
error == ERROR_SUCCESS, /* Win95 */
"got %d, expected ERROR_INSUFFICIENT_BUFFER or ERROR_SUCCESS(Win95)\n", error );
/* Next test will crash on Win95 */ ret = GetICMProfileA( dc, NULL, filename );
if ( error == ERROR_INSUFFICIENT_BUFFER ) ok( !ret, "GetICMProfileA succeeded\n" );
{
ret = GetICMProfileA( dc, NULL, filename );
ok( !ret, "GetICMProfileA succeeded\n" );
}
size = MAX_PATH; size = MAX_PATH;
ret = GetICMProfileA( dc, &size, filename ); ret = GetICMProfileA( dc, &size, filename );
...@@ -190,15 +184,11 @@ static void test_EnumICMProfilesA( HDC dc ) ...@@ -190,15 +184,11 @@ static void test_EnumICMProfilesA( HDC dc )
ok(ret == -1 || broken(ret == 0) /* nt4 */, "expected -1, got %d\n", ret); ok(ret == -1 || broken(ret == 0) /* nt4 */, "expected -1, got %d\n", ret);
ret = EnumICMProfilesA( dc, enum_profiles_callbackA, 0 ); ret = EnumICMProfilesA( dc, enum_profiles_callbackA, 0 );
ok(ret == -1 || broken(ret == 0) /* nt4 */ || broken(ret == 1) /* win95 */, ok(ret == -1 || broken(ret == 0) /* nt4 */,
"expected -1, got %d\n", ret); "expected -1, got %d\n", ret);
if (ret != 1) ret = EnumICMProfilesA( dc, NULL, 0 );
{ ok(ret == -1 || broken(ret == 0) /* nt4 */, "expected -1, got %d\n", ret);
/* Crashes on Win95 */
ret = EnumICMProfilesA( dc, NULL, 0 );
ok(ret == -1 || broken(ret == 0) /* nt4 */, "expected -1, got %d\n", ret);
}
} }
static CALLBACK INT enum_profiles_callbackW( LPWSTR filename, LPARAM lparam ) static CALLBACK INT enum_profiles_callbackW( LPWSTR filename, LPARAM lparam )
...@@ -211,13 +201,13 @@ static void test_EnumICMProfilesW( HDC dc ) ...@@ -211,13 +201,13 @@ static void test_EnumICMProfilesW( HDC dc )
INT ret; INT ret;
ret = EnumICMProfilesW( NULL, NULL, 0 ); ret = EnumICMProfilesW( NULL, NULL, 0 );
ok(ret == -1 || broken(ret == 0) /* win9x, nt4 */, "expected -1, got %d\n", ret); ok(ret == -1 || broken(ret == 0) /* NT4 */, "expected -1, got %d\n", ret);
ret = EnumICMProfilesW( dc, NULL, 0 ); ret = EnumICMProfilesW( dc, NULL, 0 );
ok(ret == -1 || broken(ret == 0) /* win9x, nt4 */, "expected -1, got %d\n", ret); ok(ret == -1 || broken(ret == 0) /* NT4 */, "expected -1, got %d\n", ret);
ret = EnumICMProfilesW( dc, enum_profiles_callbackW, 0 ); ret = EnumICMProfilesW( dc, enum_profiles_callbackW, 0 );
ok(ret == -1 || ret == 1 || broken(ret == 0) /* win9x, nt4 */, "expected -1, got %d\n", ret); ok(ret == -1 || ret == 1 || broken(ret == 0) /* NT4 */, "expected -1, got %d\n", ret);
} }
static void test_SetICMProfileA( HDC dc ) static void test_SetICMProfileA( HDC dc )
...@@ -242,21 +232,21 @@ static void test_SetICMProfileA( HDC dc ) ...@@ -242,21 +232,21 @@ static void test_SetICMProfileA( HDC dc )
ret = SetICMProfileA( NULL, NULL ); ret = SetICMProfileA( NULL, NULL );
error = GetLastError(); error = GetLastError();
ok(!ret, "SetICMProfileA succeeded\n"); ok(!ret, "SetICMProfileA succeeded\n");
ok(error == ERROR_INVALID_PARAMETER || broken(error == 0xdeadbeef) /* win9x */, ok(error == ERROR_INVALID_PARAMETER,
"expected ERROR_INVALID_PARAMETER, got %u\n", error); "expected ERROR_INVALID_PARAMETER, got %u\n", error);
SetLastError( 0xdeadbeef ); SetLastError( 0xdeadbeef );
ret = SetICMProfileA( NULL, profile ); ret = SetICMProfileA( NULL, profile );
error = GetLastError(); error = GetLastError();
ok(!ret, "SetICMProfileA succeeded\n"); ok(!ret, "SetICMProfileA succeeded\n");
ok(error == ERROR_INVALID_HANDLE || broken(error == 0xdeadbeef) /* win9x */, ok(error == ERROR_INVALID_HANDLE,
"expected ERROR_INVALID_HANDLE, got %u\n", error); "expected ERROR_INVALID_HANDLE, got %u\n", error);
SetLastError( 0xdeadbeef ); SetLastError( 0xdeadbeef );
ret = SetICMProfileA( dc, NULL ); ret = SetICMProfileA( dc, NULL );
error = GetLastError(); error = GetLastError();
ok(!ret, "SetICMProfileA succeeded\n"); ok(!ret, "SetICMProfileA succeeded\n");
ok(error == ERROR_INVALID_PARAMETER || broken(error == 0xdeadbeef) /* win95 */, ok(error == ERROR_INVALID_PARAMETER,
"expected ERROR_INVALID_PARAMETER, got %u\n", error); "expected ERROR_INVALID_PARAMETER, got %u\n", error);
ret = SetICMProfileA( dc, profile ); ret = SetICMProfileA( dc, profile );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment