[PATCH 2/2] appwiz.cpl: Use zero terminated wide-char strings.

[Michael Stefaniuc]

Signed-off-by: Michael Stefaniuc 
---
 dlls/appwiz.cpl/addons.c | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c
index dd53d9e282e..67d61ea0d22 100644
--- a/dlls/appwiz.cpl/addons.c
+++ b/dlls/appwiz.cpl/addons.c
@@ -598,21 +598,18 @@ static IInternetBindInfo InstallCallbackBindInfo = { &InstallCallbackBindInfoVtb

static void append_url_params( WCHAR *url )
 {
-    static const WCHAR arch_formatW[] = {'?','a','r','c','h','='};
-    static const WCHAR v_formatW[] = {'&','v','='};
-    static const WCHAR winevW[] = {'&','w','i','n','e','v','='};
     DWORD size = INTERNET_MAX_URL_LENGTH * sizeof(WCHAR);
     DWORD len = lstrlenW(url);

-    memcpy(url+len, arch_formatW, sizeof(arch_formatW));
-    len += ARRAY_SIZE(arch_formatW);
+    lstrcpyW(url+len, L"?arch=");
+    len += lstrlenW(L"?arch=");
     len += MultiByteToWideChar(CP_ACP, 0, GECKO_ARCH, sizeof(GECKO_ARCH),
                                url+len, size/sizeof(WCHAR)-len)-1;
-    memcpy(url+len, v_formatW, sizeof(v_formatW));
-    len += ARRAY_SIZE(v_formatW);
+    lstrcpyW(url+len, L"&v=");
+    len += lstrlenW(L"&v=");
     len += MultiByteToWideChar(CP_ACP, 0, addon->version, -1, url+len, size/sizeof(WCHAR)-len)-1;
-    memcpy(url+len, winevW, sizeof(winevW));
-    len += ARRAY_SIZE(winevW);
+    lstrcpyW(url+len, L"&winev=");
+    len += lstrlenW(L"&winev=");
     MultiByteToWideChar(CP_ACP, 0, wine_get_version(), -1, url+len, size/sizeof(WCHAR)-len);
 }