Nikolay Sivov : user32/tests: Relax iCaptionWidth test to fix some failures.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 5ab2999fbb955b957cbcb614b8562d707b740781
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5ab2999fbb955b957cbcb614b8...

Author: Nikolay Sivov <nsivov(a)codeweavers.com>
Date:   Thu Nov 19 17:32:31 2015 +0300

user32/tests: Relax iCaptionWidth test to fix some failures.

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 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 1ee8920..6fc24a6 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,