Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-03 16:05:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

sync msiexec to wine 1.1.23

Browse source 
svn path=/trunk/; revision=41332
This commit is contained in:
Christoph von Wittich 2009-06-07 11:34:39 +00:00
parent b5b8395b7d
commit 8d470e46d8
4 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
reactos/base/system/msiexec/msiexec.c
View file

@ -1,7 +1,7 @@
/*
* msiexec.exe implementation
*
* Copyright 2004 Vincent Béron
* Copyright 2004 Vincent Béron
* Copyright 2005 Mike McCormack
*
* This library is free software; you can redistribute it and/or
@ -69,7 +69,7 @@ static const char UsageStr[] =
" msiexec {/h|/?}\n"
"NOTE: Product code on commandline unimplemented as of yet\n"
"\n"
"Copyright 2004 Vincent Béron\n";
"Copyright 2004 Vincent Béron\n";
static const WCHAR ActionAdmin[] = {
'A','C','T','I','O','N','=','A','D','M','I','N',0 };
@ -388,9 +388,9 @@ enum chomp_state
static int chomp( WCHAR *str )
{
enum chomp_state state = cs_whitespace;
enum chomp_state state = cs_token;
WCHAR *p, *out;
int count = 0, ignore;
int count = 1, ignore;
for( p = str, out = str; *p; p++ )
{
@ -493,7 +493,7 @@ static BOOL process_args_from_reg( LPWSTR ident, int *pargc, WCHAR ***pargv )
return ret;
}
int main(int argc, char **argv)
int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)
{
int i;
BOOL FunctionInstall = FALSE;
@ -529,9 +529,10 @@ int main(int argc, char **argv)
LPWSTR DllName = NULL;
DWORD ReturnCode;
int argc;
LPWSTR *argvW = NULL;
/* overwrite the command line */
/* parse the command line */
process_args( GetCommandLineW(), &argc, &argvW );
/*

BIN
reactos/base/system/msiexec/msiexec.ico
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 766 B

After

Width:  |  Height:  |  Size: 15 KiB

2
reactos/base/system/msiexec/service.c
View file

@ -32,7 +32,7 @@ static SERVICE_STATUS_HANDLE hstatus;
static HANDLE thread;
static HANDLE kill_event;
void KillService(void)
static void KillService(void)
{
WINE_TRACE("Killing service\n");
SetEvent(kill_event);

2
reactos/media/doc/README.WINE
View file

@ -186,7 +186,7 @@ reactos/base/applications/winhlp32 # Autosync
reactos/base/applications/wordpad # Autosync
reactos/base/services/rpcss # Synced to Wine-20081105
reactos/base/system/expand # Out of sync
reactos/base/system/msiexec # Synced to Wine-1_1_5
reactos/base/system/msiexec # Synced to Wine-1_1_23
reactos/modules/rosapps/winfile # Autosync
In addition the following libs, dlls and source files are mostly based on code ported