Francois Gouget : user/tests: It is perfectly valid for some sysparams registry fields

[Alexandre Julliard]

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

Author: Francois Gouget 
Date:   Thu Oct  5 11:59:13 2006 +0200

user/tests: It is perfectly valid for some sysparams registry fields
to not be set if they have their default value. This is the case on
Windows for instance.

---

dlls/user/tests/sysparams.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/dlls/user/tests/sysparams.c b/dlls/user/tests/sysparams.c
index 4dd0ec9..d9f5875 100644
--- a/dlls/user/tests/sysparams.c
+++ b/dlls/user/tests/sysparams.c
@@ -1466,18 +1466,20 @@ static void test_SPI_SETMINIMIZEDMETRICS
     rc=SystemParametersInfoA( SPI_GETMINIMIZEDMETRICS, sizeof(MINIMIZEDMETRICS), &lpMm_orig, FALSE );
     if (!test_error_msg(rc,"SPI_{GET,SET}MINIMIZEDMETRICS"))
         return;
-    /* test registry */
+    /* Test registry. Note that it is perfectly valid for some fields to
+     * not be set.
+     */
     regval = metricfromreg( SPI_MINIMIZEDMETRICS_REGKEY, SPI_MINWIDTH_VALNAME, dpi);
-    ok( regval == lpMm_orig.iWidth, "wrong value in registry %d, expected %d\n",
+    ok( regval == -1 || regval == lpMm_orig.iWidth, "wrong value in registry %d, expected %d\n",
         regval, lpMm_orig.iWidth);
     regval = metricfromreg( SPI_MINIMIZEDMETRICS_REGKEY, SPI_MINHORZGAP_VALNAME, dpi);
-    ok( regval == lpMm_orig.iHorzGap, "wrong value in registry %d, expected %d\n",
+    ok( regval == -1 || regval == lpMm_orig.iHorzGap, "wrong value in registry %d, expected %d\n",
         regval, lpMm_orig.iHorzGap);
     regval = metricfromreg( SPI_MINIMIZEDMETRICS_REGKEY, SPI_MINVERTGAP_VALNAME, dpi);
-    ok( regval == lpMm_orig.iVertGap, "wrong value in registry %d, expected %d\n",
+    ok( regval == -1 || regval == lpMm_orig.iVertGap, "wrong value in registry %d, expected %d\n",
         regval, lpMm_orig.iVertGap);
     regval = metricfromreg( SPI_MINIMIZEDMETRICS_REGKEY, SPI_MINARRANGE_VALNAME, dpi);
-    ok( regval == lpMm_orig.iArrange, "wrong value in registry %d, expected %d\n",
+    ok( regval == -1 || regval == lpMm_orig.iArrange, "wrong value in registry %d, expected %d\n",
         regval, lpMm_orig.iArrange);
     /* set some new values */
     lpMm_cur.iWidth = 180;