[PATCH] msiexec: Recognize /uninstall as alias for /x [resend]

Detlef Riekenberg wine.dev at web.de
Wed Apr 21 03:44:10 CDT 2010


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

diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c
index fe19d98..5415291 100644
--- a/programs/msiexec/msiexec.c
+++ b/programs/msiexec/msiexec.c
@@ -660,11 +660,11 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 			WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i]));
 			PackageName = argvW[i];
 		}
-		else if(msi_option_prefix(argvW[i], "x"))
+		else if(msi_option_prefix(argvW[i], "x") || msi_option_equal(argvW[i], "uninstall"))
 		{
 			FunctionInstall = TRUE;
-			PackageName = argvW[i]+2;
-			if (!PackageName[0])
+			if(msi_option_prefix(argvW[i], "x")) PackageName = argvW[i]+2;
+			if(!PackageName || !PackageName[0])
 			{
 				i++;
 				if (i >= argc)
-- 
1.7.0.4




More information about the wine-patches mailing list