Detlef Riekenberg : oleaut32/tests: Replace lstrcpyW and lstrcatW with memcpy to fix failures on win95.

[Alexandre Julliard]

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

Author: Detlef Riekenberg 
Date:   Fri Apr 17 14:45:09 2009 +0200

oleaut32/tests: Replace lstrcpyW and lstrcatW with memcpy to fix failures on win95.

---

dlls/oleaut32/tests/vartest.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c
index 24ef171..f0a6deb 100644
--- a/dlls/oleaut32/tests/vartest.c
+++ b/dlls/oleaut32/tests/vartest.c
@@ -106,15 +106,16 @@ static void init(void)
     res = VarBstrFromBool(VARIANT_TRUE, LANG_USER_DEFAULT, VAR_LOCALBOOL, &bstr);
     ok(SUCCEEDED(res) && (lstrlenW(bstr) > 0),
         "Expected localized string for 'True'\n");
-    lstrcpyW(sz12_true, sz12);
-    if (bstr) lstrcatW(sz12_true, bstr);
+    /* lstrcpyW / lstrcatW do not work on win95 */
+    memcpy(sz12_true, sz12, sizeof(sz12));
+    if (bstr) memcpy(&sz12_true[2], bstr, SysStringByteLen(bstr) + sizeof(WCHAR));
     SysFreeString(bstr);

res = VarBstrFromBool(VARIANT_FALSE, LANG_USER_DEFAULT, VAR_LOCALBOOL, &bstr);
     ok(SUCCEEDED(res) && (lstrlenW(bstr) > 0),
         "Expected localized string for 'False'\n");
-    lstrcpyW(sz12_false, sz12);
-    if (bstr) lstrcatW(sz12_false, bstr);
+    memcpy(sz12_false, sz12, sizeof(sz12));
+    if (bstr) memcpy(&sz12_false[2], bstr, SysStringByteLen(bstr) + sizeof(WCHAR));
     SysFreeString(bstr);

hOleaut32 = GetModuleHandle("oleaut32.dll");