Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-04 21:38:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MSIEXEC] Sync with Wine Staging 1.7.55. CORE-10536

Browse source 
svn path=/trunk/; revision=70125
This commit is contained in:
Amine Khaldi 2015-11-26 22:47:29 +00:00
parent bf8725c77d
commit bd175c8bd9
2 changed files with 27 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
reactos/base/system/msiexec/msiexec.c
View file

@ -882,10 +882,6 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
{
InstallUILevel = INSTALLUILEVEL_NONE;
}
else if(msi_strequal(argvW[i]+2, "b"))
{
InstallUILevel = INSTALLUILEVEL_BASIC;
}
else if(msi_strequal(argvW[i]+2, "r"))
{
InstallUILevel = INSTALLUILEVEL_REDUCED;
@ -898,28 +894,25 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
{
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;
}
else if(msi_strequal(argvW[i]+2, "b-"))
{
InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_PROGRESSONLY;
}
else if(msi_strequal(argvW[i]+2, "b+!"))
{
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!"))
{
WINE_FIXME("Unhandled modifier: !\n");
InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_HIDECANCEL;
const WCHAR *ptr = argvW[i] + 3;
InstallUILevel = INSTALLUILEVEL_BASIC;
while (*ptr)
{
if (msi_strprefix(ptr, "+"))
InstallUILevel |= INSTALLUILEVEL_ENDDIALOG;
if (msi_strprefix(ptr, "-"))
InstallUILevel |= INSTALLUILEVEL_PROGRESSONLY;
if (msi_strprefix(ptr, "!"))
{
WINE_FIXME("Unhandled modifier: !\n");
InstallUILevel |= INSTALLUILEVEL_HIDECANCEL;
}
ptr++;
}
}
else
{
@ -927,6 +920,14 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
wine_dbgstr_w(argvW[i]+2));
}
}
else if(msi_option_equal(argvW[i], "passive"))
{
static const WCHAR rebootpromptW[] =
{'R','E','B','O','O','T','P','R','O','M','P','T','=','"','S','"',0};
InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_PROGRESSONLY|INSTALLUILEVEL_HIDECANCEL;
StringListAppend(&property_list, rebootpromptW);
}
else if(msi_option_equal(argvW[i], "y"))
{
FunctionDllRegisterServer = TRUE;

2
reactos/media/doc/README.WINE
View file

@ -243,7 +243,7 @@ reactos/base/applications/winhlp32 # Synced to WineStaging-1.7.55
reactos/base/applications/wordpad # Synced to WineStaging-1.7.55
reactos/base/services/rpcss # Synced to WineStaging-1.7.55
reactos/base/system/expand # Synced to WineStaging-1.7.47
reactos/base/system/msiexec # Synced to WineStaging-1.7.47
reactos/base/system/msiexec # Synced to WineStaging-1.7.55
reactos/modules/rosapps/winfile # Autosync
In addition the following libs, dlls and source files are mostly based on code ported