Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
8dff0e34
Commit
8dff0e34
authored
Apr 29, 2019
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msiexec: Build with msvcrt.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
40058d04
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
Makefile.in
programs/msiexec/Makefile.in
+2
-1
msiexec.c
programs/msiexec/msiexec.c
+5
-6
No files found.
programs/msiexec/Makefile.in
View file @
8dff0e34
MODULE
=
msiexec.exe
APPMODE
=
-mwindows
IMPORTS
=
msi ole32 advapi32 user32
EXTRADLLFLAGS
=
-mwindows
-mno-cygwin
C_SRCS
=
\
msiexec.c
\
service.c
...
...
programs/msiexec/msiexec.c
View file @
8dff0e34
...
...
@@ -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
);
s
printfW
(
msiexec_help
,
msi_res
,
msiexec_version
);
s
wprintf
(
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
;
}
s
printfW
(
buffer
,
pipe_name
,
client_pid
,
sizeof
(
void
*
)
*
8
);
s
wprintf
(
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
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment