Andrew Nguyen : shlwapi/tests: Skip a StrCpyNW test that crashes on older Win9x.

Alexandre Julliard julliard at winehq.org
Tue Jul 20 11:20:34 CDT 2010


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

Author: Andrew Nguyen <anguyen at codeweavers.com>
Date:   Mon Jul 19 23:14:38 2010 -0500

shlwapi/tests: Skip a StrCpyNW test that crashes on older Win9x.

---

 dlls/shlwapi/tests/string.c |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c
index ec695b5..8353794 100644
--- a/dlls/shlwapi/tests/string.c
+++ b/dlls/shlwapi/tests/string.c
@@ -909,10 +909,15 @@ if (0)
     expect_eq(wbuf[0], 0, WCHAR, "%x");
     expect_eq(wbuf[1], (WCHAR)0xbfbf, WCHAR, "%x");
 
-    memset(wbuf, 0xbf, sizeof(wbuf));
-    expect_eq(StrCpyNW(wbuf, 0, 10), wbuf, PWCHAR, "%p");
-    expect_eq(wbuf[0], 0, WCHAR, "%x");
-    expect_eq(wbuf[1], (WCHAR)0xbfbf, WCHAR, "%x");
+    if (pStrCpyNXA)
+    {
+        memset(wbuf, 0xbf, sizeof(wbuf));
+        expect_eq(StrCpyNW(wbuf, 0, 10), wbuf, PWCHAR, "%p");
+        expect_eq(wbuf[0], 0, WCHAR, "%x");
+        expect_eq(wbuf[1], (WCHAR)0xbfbf, WCHAR, "%x");
+    }
+    else
+        win_skip("StrCpyNW test crashes on older Win9x platforms\n");
 
     memset(wbuf, 0xbf, sizeof(wbuf));
     expect_eq(StrCpyNW(wbuf, 0, 0), wbuf, PWCHAR, "%p");




More information about the wine-cvs mailing list