>From 8d1d6a3eb66f706ef93ef6ff80b201f7bc88df2f Mon Sep 17 00:00:00 2001 From: Paul Vriens Date: Thu, 4 Jun 2009 10:54:25 +0200 Subject: [PATCH] Fix a test failure on Win95 --- dlls/user32/tests/sysparams.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index d055fa0..7b2edaf 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -2731,12 +2731,14 @@ static void test_EnumDisplaySettings(void) DWORD num; memset(&devmode, 0, sizeof(devmode)); - devmode.dmSize = sizeof(devmode); + /* Win95 doesn't handle ENUM_CURRENT_SETTINGS correctly */ EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &devmode); hdc = GetDC(0); val = GetDeviceCaps(hdc, BITSPIXEL); - ok(devmode.dmBitsPerPel == val, "GetDeviceCaps(BITSPIXEL) returned %d, EnumDisplaySettings returned %d\n", + ok(devmode.dmBitsPerPel == val || + broken(devmode.dmDeviceName[0] == 0), /* Win95 */ + "GetDeviceCaps(BITSPIXEL) returned %d, EnumDisplaySettings returned %d\n", val, devmode.dmBitsPerPel); val = GetDeviceCaps(hdc, NUMCOLORS); -- 1.6.0.6