From: Christoph von Wittich <christoph_vw@reactos.org>
Date: Mon, 1 Mar 2010 13:42:52 +0000 (+0000)
Subject: [MSIEXEC]
X-Git-Tag: ReactOS-0.3.11-CLT2010~8^2~51
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=7d4885984ef7b2caa7e705eee4e483a9dc60c953;hp=86a010102c75849ae8334ef71dd65d1617154ec9

[MSIEXEC]
sync msiexec to wine 1.1.39

svn path=/trunk/; revision=45742
---

diff --git a/reactos/base/system/msiexec/msiexec.c b/reactos/base/system/msiexec/msiexec.c
index 9221fa2a9ce..fe19d98e434 100644
--- a/reactos/base/system/msiexec/msiexec.c
+++ b/reactos/base/system/msiexec/msiexec.c
@@ -47,6 +47,7 @@ static const char UsageStr[] =
 "  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 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 		{
 			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++;