From 6b73bee057cb3a3909db072417a260ef85e97b61 Mon Sep 17 00:00:00 2001 From: Paul Vriens Date: Sun, 31 Oct 2010 19:27:49 +0100 Subject: [PATCH] gdi32/tests: Fix crash and failures on Win95. --- dlls/gdi32/tests/icm.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/tests/icm.c b/dlls/gdi32/tests/icm.c index f201eabffaa..16bec76fdf4 100644 --- a/dlls/gdi32/tests/icm.c +++ b/dlls/gdi32/tests/icm.c @@ -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()); -- 2.11.4.GIT