Skip to content

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

msi/tests: Set the MSIFASTINSTALL property.

On recent versions of msi this prevents the creation of a system restore point, which can take a very long time.
parent 5709fab0
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 13 deletions
dlls/msi/tests/automation.c
View file @ eafebe0f
...@@ -79,7 +79,7 @@ static const CHAR directory_dat[] = "Directory\tDirectory_Parent\tDefaultDir\n" ...@@ -79,7 +79,7 @@ static const CHAR directory_dat[] = "Directory\tDirectory_Parent\tDefaultDir\n"
"MSITESTDIR\tProgramFilesFolder\tmsitest\n" "MSITESTDIR\tProgramFilesFolder\tmsitest\n"
"NEWDIR\tCABOUTDIR\tnew\n" "NEWDIR\tCABOUTDIR\tnew\n"
"ProgramFilesFolder\tTARGETDIR\t.\n" "ProgramFilesFolder\tTARGETDIR\t.\n"
"TARGETDIR\t\tSourceDir"; "TARGETDIR\t\tSourceDir\n";
static const CHAR feature_dat[] = "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n" static const CHAR feature_dat[] = "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n"
"s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n" "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n"
...@@ -125,7 +125,7 @@ static const CHAR install_exec_seq_dat[] = "Action\tCondition\tSequence\n" ...@@ -125,7 +125,7 @@ static const CHAR install_exec_seq_dat[] = "Action\tCondition\tSequence\n"
"InstallInitialize\t\t1500\n" "InstallInitialize\t\t1500\n"
"InstallValidate\t\t1400\n" "InstallValidate\t\t1400\n"
"LaunchConditions\t\t100\n" "LaunchConditions\t\t100\n"
"WriteRegistryValues\tSourceDir And SOURCEDIR\t5000"; "WriteRegistryValues\tSourceDir And SOURCEDIR\t5000\n";
static const CHAR media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\tVolumeLabel\tSource\n" static const CHAR media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\tVolumeLabel\tSource\n"
"i2\ti4\tL64\tS255\tS32\tS72\n" "i2\ti4\tL64\tS255\tS32\tS72\n"
...@@ -148,7 +148,8 @@ static const CHAR property_dat[] = "Property\tValue\n" ...@@ -148,7 +148,8 @@ static const CHAR property_dat[] = "Property\tValue\n"
"ProductVersion\t1.1.1\n" "ProductVersion\t1.1.1\n"
"PROMPTROLLBACKCOST\tP\n" "PROMPTROLLBACKCOST\tP\n"
"Setup\tSetup\n" "Setup\tSetup\n"
"UpgradeCode\t{CE067E8D-2E1A-4367-B734-4EB2BDAD6565}"; "UpgradeCode\t{CE067E8D-2E1A-4367-B734-4EB2BDAD6565}\n"
"MSIFASTINSTALL\t1\n";
static const CHAR registry_dat[] = "Registry\tRoot\tKey\tName\tValue\tComponent_\n" static const CHAR registry_dat[] = "Registry\tRoot\tKey\tName\tValue\tComponent_\n"
"s72\ti2\tl255\tL255\tL0\ts72\n" "s72\ti2\tl255\tL255\tL0\ts72\n"
...@@ -156,7 +157,7 @@ static const CHAR registry_dat[] = "Registry\tRoot\tKey\tName\tValue\tComponent_ ...@@ -156,7 +157,7 @@ static const CHAR registry_dat[] = "Registry\tRoot\tKey\tName\tValue\tComponent_
"Apples\t1\tSOFTWARE\\Wine\\msitest\tName\timaname\tOne\n" "Apples\t1\tSOFTWARE\\Wine\\msitest\tName\timaname\tOne\n"
"Oranges\t1\tSOFTWARE\\Wine\\msitest\tnumber\t#314\tTwo\n" "Oranges\t1\tSOFTWARE\\Wine\\msitest\tnumber\t#314\tTwo\n"
"regdata\t1\tSOFTWARE\\Wine\\msitest\tblah\tbad\tdangler\n" "regdata\t1\tSOFTWARE\\Wine\\msitest\tblah\tbad\tdangler\n"
"OrderTest\t1\tSOFTWARE\\Wine\\msitest\tOrderTestName\tOrderTestValue\tcomponent"; "OrderTest\t1\tSOFTWARE\\Wine\\msitest\tOrderTestName\tOrderTestValue\tcomponent\n";
typedef struct _msi_table typedef struct _msi_table
{ {
......
dlls/msi/tests/install.c
View file @ eafebe0f
...@@ -171,7 +171,8 @@ static const CHAR property_dat[] = "Property\tValue\n" ...@@ -171,7 +171,8 @@ static const CHAR property_dat[] = "Property\tValue\n"
"AdminProperties\tPOSTADMIN\n" "AdminProperties\tPOSTADMIN\n"
"ROOTDRIVE\tC:\\\n" "ROOTDRIVE\tC:\\\n"
"SERVNAME\tTestService\n" "SERVNAME\tTestService\n"
"SERVDISP\tTestServiceDisp\n"; "SERVDISP\tTestServiceDisp\n"
"MSIFASTINSTALL\t1\n";
static const CHAR aup_property_dat[] = "Property\tValue\n" static const CHAR aup_property_dat[] = "Property\tValue\n"
"s72\tl0\n" "s72\tl0\n"
...@@ -194,7 +195,8 @@ static const CHAR aup_property_dat[] = "Property\tValue\n" ...@@ -194,7 +195,8 @@ static const CHAR aup_property_dat[] = "Property\tValue\n"
"AdminProperties\tPOSTADMIN\n" "AdminProperties\tPOSTADMIN\n"
"ROOTDRIVE\tC:\\\n" "ROOTDRIVE\tC:\\\n"
"SERVNAME\tTestService\n" "SERVNAME\tTestService\n"
"SERVDISP\tTestServiceDisp\n"; "SERVDISP\tTestServiceDisp\n"
"MSIFASTINSTALL\t1\n";
static const CHAR aup2_property_dat[] = "Property\tValue\n" static const CHAR aup2_property_dat[] = "Property\tValue\n"
"s72\tl0\n" "s72\tl0\n"
...@@ -217,7 +219,8 @@ static const CHAR aup2_property_dat[] = "Property\tValue\n" ...@@ -217,7 +219,8 @@ static const CHAR aup2_property_dat[] = "Property\tValue\n"
"AdminProperties\tPOSTADMIN\n" "AdminProperties\tPOSTADMIN\n"
"ROOTDRIVE\tC:\\\n" "ROOTDRIVE\tC:\\\n"
"SERVNAME\tTestService\n" "SERVNAME\tTestService\n"
"SERVDISP\tTestServiceDisp\n"; "SERVDISP\tTestServiceDisp\n"
"MSIFASTINSTALL\t1\n";
static const CHAR icon_property_dat[] = "Property\tValue\n" static const CHAR icon_property_dat[] = "Property\tValue\n"
"s72\tl0\n" "s72\tl0\n"
...@@ -239,7 +242,8 @@ static const CHAR icon_property_dat[] = "Property\tValue\n" ...@@ -239,7 +242,8 @@ static const CHAR icon_property_dat[] = "Property\tValue\n"
"AdminProperties\tPOSTADMIN\n" "AdminProperties\tPOSTADMIN\n"
"ROOTDRIVE\tC:\\\n" "ROOTDRIVE\tC:\\\n"
"SERVNAME\tTestService\n" "SERVNAME\tTestService\n"
"SERVDISP\tTestServiceDisp\n"; "SERVDISP\tTestServiceDisp\n"
"MSIFASTINSTALL\t1\n";
static const CHAR shortcut_dat[] = "Shortcut\tDirectory_\tName\tComponent_\tTarget\tArguments\tDescription\tHotkey\tIcon_\tIconIndex\tShowCmd\tWkDir\n" static const CHAR shortcut_dat[] = "Shortcut\tDirectory_\tName\tComponent_\tTarget\tArguments\tDescription\tHotkey\tIcon_\tIconIndex\tShowCmd\tWkDir\n"
"s72\ts72\tl128\ts72\ts72\tS255\tL255\tI2\tS72\tI2\tI2\tS72\n" "s72\ts72\tl128\ts72\ts72\tS255\tL255\tI2\tS72\tI2\tI2\tS72\n"
...@@ -315,7 +319,8 @@ static const CHAR up_property_dat[] = "Property\tValue\n" ...@@ -315,7 +319,8 @@ static const CHAR up_property_dat[] = "Property\tValue\n"
"ROOTDRIVE\tC:\\\n" "ROOTDRIVE\tC:\\\n"
"SERVNAME\tTestService\n" "SERVNAME\tTestService\n"
"SERVDISP\tTestServiceDisp\n" "SERVDISP\tTestServiceDisp\n"
"RemovePreviousVersions\t1\n"; "RemovePreviousVersions\t1\n"
"MSIFASTINSTALL\t1\n";
static const CHAR up2_property_dat[] = "Property\tValue\n" static const CHAR up2_property_dat[] = "Property\tValue\n"
"s72\tl0\n" "s72\tl0\n"
...@@ -337,7 +342,8 @@ static const CHAR up2_property_dat[] = "Property\tValue\n" ...@@ -337,7 +342,8 @@ static const CHAR up2_property_dat[] = "Property\tValue\n"
"AdminProperties\tPOSTADMIN\n" "AdminProperties\tPOSTADMIN\n"
"ROOTDRIVE\tC:\\\n" "ROOTDRIVE\tC:\\\n"
"SERVNAME\tTestService\n" "SERVNAME\tTestService\n"
"SERVDISP\tTestServiceDisp\n"; "SERVDISP\tTestServiceDisp\n"
"MSIFASTINSTALL\t1\n";
static const CHAR up3_property_dat[] = "Property\tValue\n" static const CHAR up3_property_dat[] = "Property\tValue\n"
"s72\tl0\n" "s72\tl0\n"
...@@ -360,7 +366,8 @@ static const CHAR up3_property_dat[] = "Property\tValue\n" ...@@ -360,7 +366,8 @@ static const CHAR up3_property_dat[] = "Property\tValue\n"
"ROOTDRIVE\tC:\\\n" "ROOTDRIVE\tC:\\\n"
"SERVNAME\tTestService\n" "SERVNAME\tTestService\n"
"SERVDISP\tTestServiceDisp\n" "SERVDISP\tTestServiceDisp\n"
"RemovePreviousVersions\t1\n"; "RemovePreviousVersions\t1\n"
"MSIFASTINSTALL\t1\n";
static const CHAR registry_dat[] = "Registry\tRoot\tKey\tName\tValue\tComponent_\n" static const CHAR registry_dat[] = "Registry\tRoot\tKey\tName\tValue\tComponent_\n"
"s72\ti2\tl255\tL255\tL0\ts72\n" "s72\ti2\tl255\tL255\tL0\ts72\n"
...@@ -1294,7 +1301,8 @@ static const CHAR vp_property_dat[] = "Property\tValue\n" ...@@ -1294,7 +1301,8 @@ static const CHAR vp_property_dat[] = "Property\tValue\n"
"ProductLanguage\t1033\n" "ProductLanguage\t1033\n"
"ProductName\tMSITEST\n" "ProductName\tMSITEST\n"
"ProductVersion\t1.1.1\n" "ProductVersion\t1.1.1\n"
"UpgradeCode\t{4C0EAA15-0264-4E5A-8758-609EF142B92D}\n"; "UpgradeCode\t{4C0EAA15-0264-4E5A-8758-609EF142B92D}\n"
"MSIFASTINSTALL\t1\n";
static const CHAR vp_custom_action_dat[] = "Action\tType\tSource\tTarget\tISComments\n" static const CHAR vp_custom_action_dat[] = "Action\tType\tSource\tTarget\tISComments\n"
"s72\ti2\tS64\tS0\tS255\n" "s72\ti2\tS64\tS0\tS255\n"
......
dlls/msi/tests/package.c
View file @ eafebe0f
...@@ -2510,6 +2510,9 @@ static void test_states(void) ...@@ -2510,6 +2510,9 @@ static void test_states(void)
r = add_property_entry( hdb, "'ProductVersion', '1.1.1'" ); r = add_property_entry( hdb, "'ProductVersion', '1.1.1'" );
ok( r == ERROR_SUCCESS, "cannot add property entry: %d\n", r ); ok( r == ERROR_SUCCESS, "cannot add property entry: %d\n", r );
r = add_property_entry( hdb, "'MSIFASTINSTALL', '1'" );
ok( r == ERROR_SUCCESS, "cannot add property entry: %d\n", r );
r = create_install_execute_sequence_table( hdb ); r = create_install_execute_sequence_table( hdb );
ok( r == ERROR_SUCCESS, "cannot create InstallExecuteSequence table: %d\n", r ); ok( r == ERROR_SUCCESS, "cannot create InstallExecuteSequence table: %d\n", r );
......
dlls/msi/tests/patch.c
View file @ eafebe0f
...@@ -57,7 +57,8 @@ static const char property_dat[] = ...@@ -57,7 +57,8 @@ static const char property_dat[] =
"ProductLanguage\t1033\n" "ProductLanguage\t1033\n"
"ProductName\tmsitest\n" "ProductName\tmsitest\n"
"ProductVersion\t1.1.1\n" "ProductVersion\t1.1.1\n"
"PATCHNEWSUMMARYSUBJECT\tInstaller Database\n"; "PATCHNEWSUMMARYSUBJECT\tInstaller Database\n"
"MSIFASTINSTALL\t1\n";
static const char media_dat[] = static const char media_dat[] =
"DiskId\tLastSequence\tDiskPrompt\tCabinet\tVolumeLabel\tSource\n" "DiskId\tLastSequence\tDiskPrompt\tCabinet\tVolumeLabel\tSource\n"
......
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