[ros-diffs] [cwittich] 45742: [MSIEXEC] sync msiexec to wine 1.1.39

[cwittich at svn.reactos.org]

Author: cwittich
Date: Mon Mar  1 14:42:52 2010
New Revision: 45742

URL: http://svn.reactos.org/svn/reactos?rev=45742&view=rev
Log:
[MSIEXEC]
sync msiexec to wine 1.1.39

Modified:
    trunk/reactos/base/system/msiexec/msiexec.c

Modified: trunk/reactos/base/system/msiexec/msiexec.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/msiexec/msiexec.c?rev=45742&r1=45741&r2=45742&view=diff
==============================================================================
--- trunk/reactos/base/system/msiexec/msiexec.c [iso-8859-1] (original)
+++ trunk/reactos/base/system/msiexec/msiexec.c [iso-8859-1] Mon Mar  1 14:42:52 2010
@@ -47,6 +47,7 @@
 "  Install a product:\n"
 "    msiexec {package|productcode} [property]\n"
 "    msiexec /i {package|productcode} [property]\n"
+"    msiexec /package {package|productcode} [property]\n"
 "    msiexec /a package [property]\n"
 "  Repair an installation:\n"
 "    msiexec /f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n"
@@ -562,12 +563,13 @@
 		{
 			FunctionUnregServer = TRUE;
 		}
-		else if(msi_option_prefix(argvW[i], "i"))
+		else if(msi_option_prefix(argvW[i], "i") || msi_option_prefix(argvW[i], "package"))
 		{
 			LPWSTR argvWi = argvW[i];
+			int argLen = (msi_option_prefix(argvW[i], "i") ? 2 : 8);
 			FunctionInstall = TRUE;
-			if(lstrlenW(argvWi) > 2)
-				argvWi += 2;
+			if(lstrlenW(argvW[i]) > argLen)
+				argvWi += argLen;
 			else
 			{
 				i++;