[MSIEXEC]

[reactos.git] / reactos / base / system / msiexec / msiexec.c

diff --git a/reactos/base/system/msiexec/msiexec.c b/reactos/base/system/msiexec/msiexec.c
index 9ae87ce..d283b2d 100644 (file)
--- a/reactos/base/system/msiexec/msiexec.c
+++ b/reactos/base/system/msiexec/msiexec.c
@@ -418,11 +418,12 @@ static int chomp( WCHAR *str )
 {
        enum chomp_state state = cs_token;
        WCHAR *p, *out;
-       int count = 1, ignore;
+        int count = 1;
+        BOOL ignore;
 
        for( p = str, out = str; *p; p++ )
        {
-               ignore = 1;
+                ignore = TRUE;
                switch( state )
                {
                case cs_whitespace:
@@ -436,7 +437,7 @@ static int chomp( WCHAR *str )
                                break;
                        default:
                                count++;
-                               ignore = 0;
+                                ignore = FALSE;
                                state = cs_token;
                        }
                        break;
@@ -452,7 +453,7 @@ static int chomp( WCHAR *str )
                                *out++ = 0;
                                break;
                        default:
-                               ignore = 0;
+                                ignore = FALSE;
                        }
                        break;
 
@@ -463,7 +464,7 @@ static int chomp( WCHAR *str )
                                state = cs_token;
                                break;
                        default:
-                               ignore = 0;
+                                ignore = FALSE;
                        }
                        break;
                }
@@ -626,6 +627,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
                        WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i]));
                        PackageName = argvW[i];
                        StringListAppend(&property_list, ActionAdmin);
+                       WINE_FIXME("Administrative installs are not currently supported\n");
                }
                else if(msi_option_prefix(argvW[i], "f"))
                {
@@ -906,13 +908,18 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
                        }
                        else if(msi_strequal(argvW[i]+2, "b+!"))
                        {
-                               InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_ENDDIALOG;
-                               WINE_FIXME("Unknown modifier: !\n");
+                               WINE_FIXME("Unhandled modifier: !\n");
+                               InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_ENDDIALOG|INSTALLUILEVEL_HIDECANCEL;
+                       }
+                       else if(msi_strequal(argvW[i]+2, "b-!"))
+                       {
+                               WINE_FIXME("Unhandled modifier: !\n");
+                               InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_PROGRESSONLY|INSTALLUILEVEL_HIDECANCEL;
                        }
                        else if(msi_strequal(argvW[i]+2, "b!"))
                        {
-                               InstallUILevel = INSTALLUILEVEL_BASIC;
-                               WINE_FIXME("Unknown modifier: !\n");
+                               WINE_FIXME("Unhandled modifier: !\n");
+                               InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_HIDECANCEL;
                        }
                        else
                        {