gdi32/tests: Fix crash and failures on Win95.

This commit is contained in:
Paul Vriens 2010-10-31 19:27:49 +01:00 committed by Alexandre Julliard
parent 3237f5871d
commit 6b73bee057
1 changed files with 11 additions and 5 deletions

View File

@ -189,11 +189,16 @@ static void test_EnumICMProfilesA( HDC dc )
ret = EnumICMProfilesA( NULL, NULL, 0 );
ok(ret == -1 || broken(ret == 0) /* nt4 */, "expected -1, got %d\n", ret);
ret = EnumICMProfilesA( dc, NULL, 0 );
ok(ret == -1 || broken(ret == 0) /* nt4 */, "expected -1, got %d\n", ret);
ret = EnumICMProfilesA( dc, enum_profiles_callbackA, 0 );
ok(ret == -1 || broken(ret == 0) /* nt4 */, "expected -1, got %d\n", ret);
ok(ret == -1 || broken(ret == 0) /* nt4 */ || broken(ret == 1) /* win95 */,
"expected -1, got %d\n", ret);
if (ret != 1)
{
/* 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 )
@ -251,7 +256,8 @@ static void test_SetICMProfileA( HDC dc )
ret = SetICMProfileA( dc, NULL );
error = GetLastError();
ok(!ret, "SetICMProfileA succeeded\n");
ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error);
ok(error == ERROR_INVALID_PARAMETER || broken(error == 0xdeadbeef) /* win95 */,
"expected ERROR_INVALID_PARAMETER, got %u\n", error);
ret = SetICMProfileA( dc, profile );
ok(ret, "SetICMProfileA failed %u\n", GetLastError());