[5/6] msi/tests: Set the MSIFASTINSTALL property.

Hans Leidekker hans at codeweavers.com
Mon Oct 11 05:10:08 CDT 2010


On recent versions of msi this prevents the creation of a system restore
point, which can take a very long time.
---
 dlls/msi/tests/automation.c |    9 +++++----
 dlls/msi/tests/install.c    |   24 ++++++++++++++++--------
 dlls/msi/tests/package.c    |    3 +++
 dlls/msi/tests/patch.c      |    3 ++-
 4 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c
index 0ad51ea..49cdca3 100644
--- a/dlls/msi/tests/automation.c
+++ b/dlls/msi/tests/automation.c
@@ -79,7 +79,7 @@ static const CHAR directory_dat[] = "Directory\tDirectory_Parent\tDefaultDir\n"
                                     "MSITESTDIR\tProgramFilesFolder\tmsitest\n"
                                     "NEWDIR\tCABOUTDIR\tnew\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"
                                   "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n"
@@ -125,7 +125,7 @@ static const CHAR install_exec_seq_dat[] = "Action\tCondition\tSequence\n"
                                            "InstallInitialize\t\t1500\n"
                                            "InstallValidate\t\t1400\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"
                                 "i2\ti4\tL64\tS255\tS32\tS72\n"
@@ -148,7 +148,8 @@ static const CHAR property_dat[] = "Property\tValue\n"
                                    "ProductVersion\t1.1.1\n"
                                    "PROMPTROLLBACKCOST\tP\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"
                                    "s72\ti2\tl255\tL255\tL0\ts72\n"
@@ -156,7 +157,7 @@ static const CHAR registry_dat[] = "Registry\tRoot\tKey\tName\tValue\tComponent_
                                    "Apples\t1\tSOFTWARE\\Wine\\msitest\tName\timaname\tOne\n"
                                    "Oranges\t1\tSOFTWARE\\Wine\\msitest\tnumber\t#314\tTwo\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
 {
diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c
index 07a2dcf..b015015 100644
--- a/dlls/msi/tests/install.c
+++ b/dlls/msi/tests/install.c
@@ -171,7 +171,8 @@ static const CHAR property_dat[] = "Property\tValue\n"
                                    "AdminProperties\tPOSTADMIN\n"
                                    "ROOTDRIVE\tC:\\\n"
                                    "SERVNAME\tTestService\n"
-                                   "SERVDISP\tTestServiceDisp\n";
+                                   "SERVDISP\tTestServiceDisp\n"
+                                   "MSIFASTINSTALL\t1\n";
 
 static const CHAR aup_property_dat[] = "Property\tValue\n"
                                        "s72\tl0\n"
@@ -194,7 +195,8 @@ static const CHAR aup_property_dat[] = "Property\tValue\n"
                                        "AdminProperties\tPOSTADMIN\n"
                                        "ROOTDRIVE\tC:\\\n"
                                        "SERVNAME\tTestService\n"
-                                       "SERVDISP\tTestServiceDisp\n";
+                                       "SERVDISP\tTestServiceDisp\n"
+                                       "MSIFASTINSTALL\t1\n";
 
 static const CHAR aup2_property_dat[] = "Property\tValue\n"
                                         "s72\tl0\n"
@@ -217,7 +219,8 @@ static const CHAR aup2_property_dat[] = "Property\tValue\n"
                                         "AdminProperties\tPOSTADMIN\n"
                                         "ROOTDRIVE\tC:\\\n"
                                         "SERVNAME\tTestService\n"
-                                        "SERVDISP\tTestServiceDisp\n";
+                                        "SERVDISP\tTestServiceDisp\n"
+                                        "MSIFASTINSTALL\t1\n";
 
 static const CHAR icon_property_dat[] = "Property\tValue\n"
                                         "s72\tl0\n"
@@ -239,7 +242,8 @@ static const CHAR icon_property_dat[] = "Property\tValue\n"
                                         "AdminProperties\tPOSTADMIN\n"
                                         "ROOTDRIVE\tC:\\\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"
                                    "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"
                                       "ROOTDRIVE\tC:\\\n"
                                       "SERVNAME\tTestService\n"
                                       "SERVDISP\tTestServiceDisp\n"
-                                      "RemovePreviousVersions\t1\n";
+                                      "RemovePreviousVersions\t1\n"
+                                      "MSIFASTINSTALL\t1\n";
 
 static const CHAR up2_property_dat[] = "Property\tValue\n"
                                        "s72\tl0\n"
@@ -337,7 +342,8 @@ static const CHAR up2_property_dat[] = "Property\tValue\n"
                                        "AdminProperties\tPOSTADMIN\n"
                                        "ROOTDRIVE\tC:\\\n"
                                        "SERVNAME\tTestService\n"
-                                       "SERVDISP\tTestServiceDisp\n";
+                                       "SERVDISP\tTestServiceDisp\n"
+                                       "MSIFASTINSTALL\t1\n";
 
 static const CHAR up3_property_dat[] = "Property\tValue\n"
                                        "s72\tl0\n"
@@ -360,7 +366,8 @@ static const CHAR up3_property_dat[] = "Property\tValue\n"
                                        "ROOTDRIVE\tC:\\\n"
                                        "SERVNAME\tTestService\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"
                                    "s72\ti2\tl255\tL255\tL0\ts72\n"
@@ -1294,7 +1301,8 @@ static const CHAR vp_property_dat[] = "Property\tValue\n"
                                       "ProductLanguage\t1033\n"
                                       "ProductName\tMSITEST\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"
                                            "s72\ti2\tS64\tS0\tS255\n"
diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c
index 7e688c8..47e0da3 100644
--- a/dlls/msi/tests/package.c
+++ b/dlls/msi/tests/package.c
@@ -2510,6 +2510,9 @@ static void test_states(void)
     r = add_property_entry( hdb, "'ProductVersion', '1.1.1'" );
     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 );
     ok( r == ERROR_SUCCESS, "cannot create InstallExecuteSequence table: %d\n", r );
 
diff --git a/dlls/msi/tests/patch.c b/dlls/msi/tests/patch.c
index 998dc4b..4cad4eb 100644
--- a/dlls/msi/tests/patch.c
+++ b/dlls/msi/tests/patch.c
@@ -57,7 +57,8 @@ static const char property_dat[] =
     "ProductLanguage\t1033\n"
     "ProductName\tmsitest\n"
     "ProductVersion\t1.1.1\n"
-    "PATCHNEWSUMMARYSUBJECT\tInstaller Database\n";
+    "PATCHNEWSUMMARYSUBJECT\tInstaller Database\n"
+    "MSIFASTINSTALL\t1\n";
 
 static const char media_dat[] =
     "DiskId\tLastSequence\tDiskPrompt\tCabinet\tVolumeLabel\tSource\n"
-- 
1.7.1







More information about the wine-patches mailing list