Detlef Riekenberg : msi/tests: Replace lstrcatW with memcpy to fix failures on win95.

Alexandre Julliard julliard at winehq.org
Mon Apr 20 11:33:11 CDT 2009


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

Author: Detlef Riekenberg <wine.dev at web.de>
Date:   Fri Apr 17 15:18:44 2009 +0200

msi/tests: Replace lstrcatW with memcpy to fix failures on win95.

---

 dlls/msi/tests/automation.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c
index 7229748..88ce287 100644
--- a/dlls/msi/tests/automation.c
+++ b/dlls/msi/tests/automation.c
@@ -2331,7 +2331,6 @@ static void test_Installer_InstallProduct(void)
 
 static void test_Installer(void)
 {
-    static WCHAR szBackslash[] = { '\\',0 };
     static WCHAR szCreateRecordException[] = { 'C','r','e','a','t','e','R','e','c','o','r','d',',','C','o','u','n','t',0 };
     static WCHAR szIntegerDataException[] = { 'I','n','t','e','g','e','r','D','a','t','a',',','F','i','e','l','d',0 };
     WCHAR szPath[MAX_PATH];
@@ -2395,8 +2394,9 @@ static void test_Installer(void)
     ok(len, "MultiByteToWideChar returned error %d\n", GetLastError());
     if (!len) return;
 
-    lstrcatW(szPath, szBackslash);
-    lstrcatW(szPath, szMsifile);
+    /* lstrcatW does not work on win95 */
+    szPath[len - 1] = '\\';
+    memcpy(&szPath[len], szMsifile, sizeof(szMsifile));
 
     /* Installer::OpenPackage */
     hr = Installer_OpenPackage(szPath, 0, &pSession);




More information about the wine-cvs mailing list