From 5ab2999fbb955b957cbcb614b8562d707b740781 Mon Sep 17 00:00:00 2001 From: Nikolay Sivov Date: Thu, 19 Nov 2015 17:32:31 +0300 Subject: [PATCH] user32/tests: Relax iCaptionWidth test to fix some failures. Signed-off-by: Nikolay Sivov Signed-off-by: Alexandre Julliard --- dlls/user32/tests/sysparams.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 1ee89204e53..6fc24a64418 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -1552,10 +1552,10 @@ static void test_SPI_SETNONCLIENTMETRICS( void ) /* 44 */ ok( Ncmcur.iSmCaptionHeight == expect, "SmCaptionHeight: %d expected %d\n", Ncmcur.iSmCaptionHeight, expect); - ok( Ncmcur.iCaptionWidth == 8 || - Ncmcur.iCaptionWidth == 12 || /* Vista, W7b */ + /* iCaptionWidth depends on a version, could be 8, 12 (Vista, Win7), 13 */ + ok( (Ncmcur.iCaptionWidth >= 8 && Ncmcur.iCaptionWidth <= 13) || Ncmcur.iCaptionWidth == Ncmstart.iCaptionWidth, /* with windows XP theme, the value never changes */ - "CaptionWidth: %d expected 8, 12 or %d\n", Ncmcur.iCaptionWidth, Ncmstart.iCaptionWidth); + "CaptionWidth: %d expected from [8, 13] or %d\n", Ncmcur.iCaptionWidth, Ncmstart.iCaptionWidth); ok( Ncmcur.iScrollWidth == 8, "ScrollWidth: %d expected 8\n", Ncmcur.iScrollWidth); ok( Ncmcur.iScrollHeight == 8,