From d456e9f49fdfca008cfa3655ff076a0f8eb4e6ba Mon Sep 17 00:00:00 2001 From: Andrey Turkin Date: Fri, 22 Sep 2006 06:16:52 +0400 Subject: [PATCH] msiexec: Should recognize /xpackage syntax. --- programs/msiexec/msiexec.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index 364d54a537f..ccb48b2b99c 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -546,14 +546,18 @@ int main(int argc, char **argv) WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); PackageName = argvW[i]; } - else if(msi_option_equal(argvW[i], "x")) + else if(msi_option_prefix(argvW[i], "x")) { FunctionInstall = TRUE; - i++; - if(i >= argc) - ShowUsage(1); - WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); - PackageName = argvW[i]; + PackageName = argvW[i]+2; + if (!PackageName[0]) + { + i++; + if (i >= argc) + ShowUsage(1); + PackageName = argvW[i]; + } + WINE_TRACE("PackageName = %s\n", wine_dbgstr_w(PackageName)); StringListAppend(&property_list, RemoveAll); } else if(msi_option_prefix(argvW[i], "j"))