Josselin Bardet : msiexec: Support of /package option.

Alexandre Julliard julliard at winehq.org
Mon Jan 4 10:54:19 CST 2010


Module: wine
Branch: master
Commit: 2b07ae5e6f0b4720096afb203b52d70c2d1da020
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2b07ae5e6f0b4720096afb203b52d70c2d1da020

Author: Josselin Bardet <namjos at gmail.com>
Date:   Sun Jan  3 11:06:36 2010 +0100

msiexec: Support of /package option.

---

 programs/msiexec/msiexec.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c
index 9221fa2..fe19d98 100644
--- a/programs/msiexec/msiexec.c
+++ b/programs/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++;




More information about the wine-cvs mailing list