marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msiexec: Build with msvcrt. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
stable
Alexandre Julliard 2019-04-29 12:10:09 +02:00
parent 40058d0486
commit 8dff0e3445
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
programs/msiexec/Makefile.in
View File

@ -1,7 +1,8 @@
MODULE = msiexec.exe MODULE = msiexec.exe
APPMODE = -mwindows
IMPORTS = msi ole32 advapi32 user32 IMPORTS = msi ole32 advapi32 user32
EXTRADLLFLAGS = -mwindows -mno-cygwin
C_SRCS = \ C_SRCS = \
msiexec.c \ msiexec.c \
service.c service.c

11
programs/msiexec/msiexec.c
View File

@ -29,7 +29,6 @@
#include "wine/debug.h" #include "wine/debug.h"
#include "wine/heap.h" #include "wine/heap.h"
#include "wine/unicode.h"
#include "initguid.h" #include "initguid.h"
DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
@ -92,7 +91,7 @@ static void ShowUsage(int ExitCode)
*msi_res = 0; *msi_res = 0;
LoadStringW(hmsi, 10, msi_res, len + 1); LoadStringW(hmsi, 10, msi_res, len + 1);
sprintfW(msiexec_help, msi_res, msiexec_version); swprintf(msiexec_help, len + 1 + ARRAY_SIZE(msiexec_version), msi_res, msiexec_version);
MsiMessageBoxW(0, msiexec_help, NULL, 0, GetUserDefaultLangID(), 0); MsiMessageBoxW(0, msiexec_help, NULL, 0, GetUserDefaultLangID(), 0);
} }
HeapFree(GetProcessHeap(), 0, msi_res); HeapFree(GetProcessHeap(), 0, msi_res);
@ -153,7 +152,7 @@ static LPWSTR build_properties(struct string_list *property_list)
p = ret; p = ret;
for(list = property_list; list; list = list->next) for(list = property_list; list; list = list->next)
{ {
value = strchrW(list->str,'='); value = wcschr(list->str,'=');
if(!value) if(!value)
continue; continue;
len = value - list->str; len = value - list->str;
@ -164,7 +163,7 @@ static LPWSTR build_properties(struct string_list *property_list)
/* check if the value contains spaces and maybe quote it */ /* check if the value contains spaces and maybe quote it */
value++; value++;
needs_quote = strchrW(value,' ') ? 1 : 0; needs_quote = wcschr(value,' ') ? 1 : 0;
if(needs_quote) if(needs_quote)
*p++ = '"'; *p++ = '"';
len = lstrlenW(value); len = lstrlenW(value);
@ -420,13 +419,13 @@ static int custom_action_server(const WCHAR *arg)
TRACE("%s\n", debugstr_w(arg)); TRACE("%s\n", debugstr_w(arg));
if (!(client_pid = atoiW(arg))) if (!(client_pid = wcstol(arg, NULL, 10)))
{ {
ERR("Invalid parameter %s\n", debugstr_w(arg)); ERR("Invalid parameter %s\n", debugstr_w(arg));
return 1; return 1;
} }
sprintfW(buffer, pipe_name, client_pid, sizeof(void *) * 8); swprintf(buffer, ARRAY_SIZE(buffer), pipe_name, client_pid, sizeof(void *) * 8);
pipe = CreateFileW(buffer, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); pipe = CreateFileW(buffer, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL);
if (pipe == INVALID_HANDLE_VALUE) if (pipe == INVALID_HANDLE_VALUE)
{ {