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

Alexandre Julliard julliard at winehq.org
Fri Apr 25 08:10:55 CDT 2008


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

Author: James Hawkins <jhawkins at codeweavers.com>
Date:   Thu Apr 24 20:19:35 2008 -0500

advapi32: Fix a test that fails in win2k3 SP2.

---

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

diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c
index e027a97..fe3d3ff 100644
--- a/dlls/advapi32/tests/registry.c
+++ b/dlls/advapi32/tests/registry.c
@@ -806,8 +806,9 @@ static void test_get_value(void)
     size = 0;
     ret = pRegGetValueA(hkey_main, NULL, "TP2_EXP_SZ", RRF_RT_REG_SZ, NULL, NULL, &size);
     ok(ret == ERROR_SUCCESS, "ret=%d\n", ret);
-    /* At least v5.2.3790.1830 (2003 SP1) returns the unexpanded sTestpath2 length + 1 here. */
-    ok((size == strlen(expanded2)+1) || (size == strlen(sTestpath2)+1),
+    ok((size == strlen(expanded2)+1) || /* win2k3 SP1 */
+       (size == strlen(expanded2)+2) || /* win2k3 SP2 */
+       (size == strlen(sTestpath2)+1),
         "strlen(expanded2)=%d, strlen(sTestpath2)=%d, size=%d\n", lstrlenA(expanded2), lstrlenA(sTestpath2), size);
 
     /* Query REG_EXPAND_SZ using RRF_RT_REG_SZ (ok, expands) */




More information about the wine-cvs mailing list