Skip to content

W
wine-winehq
Commit 171a4c41 authored by Hans Leidekker's avatar Hans Leidekker Committed by Alexandre Julliard
Browse files
Options

msiexec: Fix parsing of basic UI level modifiers.

Signed-off-by: 's avatarHans Leidekker <hans@codeweavers.com>
parent 9372af77
Show whitespace changes
Inline Side-by-side
Showing with 13 additions and 20 deletions
programs/msiexec/msiexec.c
View file @ 171a4c41
...@@ -886,10 +886,6 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine ...@@ -886,10 +886,6 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
{ {
InstallUILevel = INSTALLUILEVEL_NONE; InstallUILevel = INSTALLUILEVEL_NONE;
} }
else if(msi_strequal(argvW[i]+2, "b"))
{
InstallUILevel = INSTALLUILEVEL_BASIC;
}
else if(msi_strequal(argvW[i]+2, "r")) else if(msi_strequal(argvW[i]+2, "r"))
{ {
InstallUILevel = INSTALLUILEVEL_REDUCED; InstallUILevel = INSTALLUILEVEL_REDUCED;
...@@ -902,28 +898,25 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine ...@@ -902,28 +898,25 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
{ {
InstallUILevel = INSTALLUILEVEL_NONE|INSTALLUILEVEL_ENDDIALOG; InstallUILevel = INSTALLUILEVEL_NONE|INSTALLUILEVEL_ENDDIALOG;
} }
else if(msi_strequal(argvW[i]+2, "b+")) else if(msi_strprefix(argvW[i]+2, "b"))
{ {
InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_ENDDIALOG; const WCHAR *ptr = argvW[i] + 3;
}
else if(msi_strequal(argvW[i]+2, "b-")) InstallUILevel = INSTALLUILEVEL_BASIC;
while (*ptr)
{ {
InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_PROGRESSONLY; if (msi_strprefix(ptr, "+"))
} InstallUILevel |= INSTALLUILEVEL_ENDDIALOG;
else if(msi_strequal(argvW[i]+2, "b+!")) if (msi_strprefix(ptr, "-"))
InstallUILevel |= INSTALLUILEVEL_PROGRESSONLY;
if (msi_strprefix(ptr, "!"))
{ {
WINE_FIXME("Unhandled modifier: !\n"); WINE_FIXME("Unhandled modifier: !\n");
InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_ENDDIALOG|INSTALLUILEVEL_HIDECANCEL; InstallUILevel |= INSTALLUILEVEL_HIDECANCEL;
} }
else if(msi_strequal(argvW[i]+2, "b-!")) ptr++;
{
WINE_FIXME("Unhandled modifier: !\n");
InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_PROGRESSONLY|INSTALLUILEVEL_HIDECANCEL;
} }
else if(msi_strequal(argvW[i]+2, "b!"))
{
WINE_FIXME("Unhandled modifier: !\n");
InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_HIDECANCEL;
} }
else else
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment