Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-23 14:31:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

[WINESYNC] msiexec: Build with msvcrt.

Browse source 
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 8dff0e34452f4874873c91a7ec3b92a7cf1c3e16 by Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
winesync 2022-03-13 01:25:47 +01:00 committed by Mark Jansen
parent a32b4b85c6
commit 62230ae3d8
No known key found for this signature in database
GPG key ID: B39240EE84BEAE8B
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
base/system/msiexec/CMakeLists.txt
View file

@ -1,5 +1,6 @@
add_definitions(-D__WINESRC__)
remove_definitions(-D_CRT_NON_CONFORMING_SWPRINTFS)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/wine)
list(APPEND SOURCE

11
base/system/msiexec/msiexec.c
View file

@ -29,7 +29,6 @@
#include "wine/debug.h"
#include "wine/heap.h"
#include "wine/unicode.h"
#include "initguid.h"
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;
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);
}
HeapFree(GetProcessHeap(), 0, msi_res);
@ -153,7 +152,7 @@ static LPWSTR build_properties(struct string_list *property_list)
p = ret;
for(list = property_list; list; list = list->next)
{
value = strchrW(list->str,'=');
value = wcschr(list->str,'=');
if(!value)
continue;
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 */
value++;
needs_quote = strchrW(value,' ') ? 1 : 0;
needs_quote = wcschr(value,' ') ? 1 : 0;
if(needs_quote)
*p++ = '"';
len = lstrlenW(value);
@ -420,13 +419,13 @@ static int custom_action_server(const WCHAR *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));
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);
if (pipe == INVALID_HANDLE_VALUE)
{