[ros-diffs] [cwittich] 41332: sync msiexec to wine 1.1.23

[cwittich at svn.reactos.org]

Author: cwittich
Date: Sun Jun  7 15:34:39 2009
New Revision: 41332

URL: http://svn.reactos.org/svn/reactos?rev=41332&view=rev
Log:
sync msiexec to wine 1.1.23

Modified:
    trunk/reactos/base/system/msiexec/msiexec.c
    trunk/reactos/base/system/msiexec/msiexec.ico
    trunk/reactos/base/system/msiexec/service.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/base/system/msiexec/msiexec.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/msiexec/msiexec.c?rev=41332&r1=41331&r2=41332&view=diff
==============================================================================
--- trunk/reactos/base/system/msiexec/msiexec.c [iso-8859-1] (original)
+++ trunk/reactos/base/system/msiexec/msiexec.c [iso-8859-1] Sun Jun  7 15:34:39 2009
@@ -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 @@
 "    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 @@
 
 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 @@
 	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 @@
 
 	LPWSTR DllName = NULL;
 	DWORD ReturnCode;
+	int argc;
 	LPWSTR *argvW = NULL;
 
-	/* overwrite the command line */
+	/* parse the command line */
 	process_args( GetCommandLineW(), &argc, &argvW );
 
 	/*

Modified: trunk/reactos/base/system/msiexec/msiexec.ico
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/msiexec/msiexec.ico?rev=41332&r1=41331&r2=41332&view=diff
==============================================================================
Binary files - no diff available.

Modified: trunk/reactos/base/system/msiexec/service.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/msiexec/service.c?rev=41332&r1=41331&r2=41332&view=diff
==============================================================================
--- trunk/reactos/base/system/msiexec/service.c [iso-8859-1] (original)
+++ trunk/reactos/base/system/msiexec/service.c [iso-8859-1] Sun Jun  7 15:34:39 2009
@@ -32,7 +32,7 @@
 static HANDLE thread;
 static HANDLE kill_event;
 
-void KillService(void)
+static void KillService(void)
 {
     WINE_TRACE("Killing service\n");
     SetEvent(kill_event);

Modified: trunk/reactos/media/doc/README.WINE
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=41332&r1=41331&r2=41332&view=diff
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Jun  7 15:34:39 2009
@@ -186,7 +186,7 @@
 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