Paul Vriens : user32/tests: Fix a test failure on Win95.
Alexandre Julliard
julliard at winehq.org
Thu Jun 4 07:59:32 CDT 2009
Module: wine
Branch: master
Commit: f9ecd7397eefdee6dd11f3ccd478d1d72607f2f4
URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9ecd7397eefdee6dd11f3ccd478d1d72607f2f4
Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date: Thu Jun 4 10:54:25 2009 +0200
user32/tests: 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);
More information about the wine-cvs
mailing list