Piotr Caban : msvcr120: Relax gettnames structure layout tests.

Alexandre Julliard julliard at winehq.org
Wed Feb 10 15:34:02 CST 2021


Module: wine
Branch: master
Commit: 20b1dd9b1565ba2f23f4f266b47259ed83df4a84
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=20b1dd9b1565ba2f23f4f266b47259ed83df4a84

Author: Piotr Caban <piotr at codeweavers.com>
Date:   Wed Feb 10 14:36:43 2021 +0100

msvcr120: Relax gettnames structure layout tests.

Fixes test failure on newtb-wvistaadm testbot machine.

Signed-off-by: Piotr Caban <piotr at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/msvcr120/tests/msvcr120.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c
index b3e3828156b..e8ef2be3520 100644
--- a/dlls/msvcr120/tests/msvcr120.c
+++ b/dlls/msvcr120/tests/msvcr120.c
@@ -575,7 +575,8 @@ static void test_gettnames(void* (CDECL *p_gettnames)(void))
                 i, wine_dbgstr_w(ret->wstr[i]), wine_dbgstr_w(buf));
     }
 
-    ok(ret->str[42] + strlen(ret->str[42])+1 == (char*)ret->wstr[0],
+    ok(ret->str[42] + strlen(ret->str[42]) + 1 == (char*)ret->wstr[0] ||
+            ret->str[42] + strlen(ret->str[42]) + 2 == (char*)ret->wstr[0],
             "ret->str[42] = %p len = %d, ret->wstr[0] = %p\n",
             ret->str[42], strlen(ret->str[42]), ret->wstr[0]);
     p_free(ret);




More information about the wine-cvs mailing list