James Hawkins : advapi32: Fix a test that fails in win2k3.

Alexandre Julliard julliard at winehq.org
Mon Apr 21 07:46:16 CDT 2008


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

Author: James Hawkins <jhawkins at codeweavers.com>
Date:   Sun Apr 20 03:00:42 2008 -0500

advapi32: Fix a test that fails in win2k3.

---

 dlls/advapi32/tests/registry.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c
index 5d86d9b..e027a97 100644
--- a/dlls/advapi32/tests/registry.c
+++ b/dlls/advapi32/tests/registry.c
@@ -786,9 +786,13 @@ static void test_get_value(void)
     ret = pRegGetValueA(hkey_main, NULL, "TP1_ZB_SZ", RRF_RT_REG_SZ, &type, buf, &size);
     ok(ret == ERROR_SUCCESS, "ret=%d\n", ret);
     /* v5.2.3790.1830 (2003 SP1) returns sTestpath1 length + 2 here. */
-    ok(size == 0, "size=%d\n", size);
+    ok(size == 0 ||
+       size == 1, /* win2k3 */
+       "size=%d\n", size);
     ok(type == REG_SZ, "type=%d\n", type);
-    ok(!strcmp(sTestpath1, buf), "sTestpath=\"%s\" buf=\"%s\"\n", sTestpath1, buf);
+    ok(!strcmp(sTestpath1, buf) ||
+       !strcmp(buf, ""),
+       "Expected \"%s\" or \"\", got \"%s\"\n", sTestpath1, buf);
 
     /* Query REG_SZ using RRF_RT_REG_SZ|RRF_NOEXPAND (ok) */
     buf[0] = 0; type = 0xdeadbeef; size = sizeof(buf);




More information about the wine-cvs mailing list