Rebase against 302153117e20b62c9170aed62aa33e83cacfaf59.

patches/msi-MsiGetDatabaseState/0002-msi-tests-Add-custom-action-test-framework-and-check.patch

@@ -1,4 +1,4 @@
-From b75ee56387ae6b9f65041dc7583d4a59bed5e152 Mon Sep 17 00:00:00 2001
+From e2219e6b393f458d41f3b1d98ac7fb86d56aa235 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Wed, 31 May 2017 03:55:24 +0200
 Subject: msi/tests: Add custom action test framework and check
@@ -17,10 +17,10 @@ Subject: msi/tests: Add custom action test framework and check
  create mode 100644 dlls/msi/tests/custom.dll/main.c
 
 diff --git a/configure.ac b/configure.ac
-index 5aaa20c22b6..f44d20c2e69 100644
+index f5a617c1c33..21de7fc3103 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3326,6 +3326,7 @@ WINE_CONFIG_DLL(mshtml,,[clean,implib])
+@@ -3276,6 +3276,7 @@ WINE_CONFIG_DLL(mshtml,,[clean,implib])
  WINE_CONFIG_TEST(dlls/mshtml/tests,[clean])
  WINE_CONFIG_DLL(msi,,[clean,implib])
  WINE_CONFIG_TEST(dlls/msi/tests)
@@ -164,7 +164,7 @@ index 00000000000..91ee2d77b5b
 +    return TRUE;
 +}
 diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c
-index 9d4fecc3eeb..23c1ce6d28c 100644
+index e4290397fe7..f1c1af9f2b6 100644
 --- a/dlls/msi/tests/install.c
 +++ b/dlls/msi/tests/install.c
 @@ -1031,6 +1031,26 @@ static const CHAR uc_install_exec_seq_dat[] = "Action\tCondition\tSequence\n"
@@ -194,8 +194,8 @@ index 9d4fecc3eeb..23c1ce6d28c 100644
  static const char mixed_feature_dat[] =
      "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n"
      "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n"
-@@ -1939,6 +1959,19 @@ static const msi_table ft_tables[] =
-     ADD_TABLE(property)
+@@ -1973,6 +1993,19 @@ static const msi_table da_tables[] =
+     ADD_TABLE(da_custom_action),
  };
  
 +static const msi_table ca_tables[] =
@@ -214,8 +214,8 @@ index 9d4fecc3eeb..23c1ce6d28c 100644
  /* cabinet definitions */
  
  /* make the max size large so there is only one cab file */
-@@ -6045,6 +6078,186 @@ static void test_feature_tree(void)
-     DeleteFileA( msifile );
+@@ -6100,6 +6133,186 @@ error:
+     DeleteFileA(msifile);
  }
  
 +/* extracts a file from a resource to the specified filename */
@@ -401,14 +401,14 @@ index 9d4fecc3eeb..23c1ce6d28c 100644
  START_TEST(install)
  {
      DWORD len;
-@@ -6133,6 +6346,7 @@ START_TEST(install)
-     test_shared_component();
+@@ -6189,6 +6402,7 @@ START_TEST(install)
      test_remove_upgrade_code();
      test_feature_tree();
+     test_deferred_action();
 +    test_custom_action();
  
      DeleteFileA(log_file);
  
 -- 
-2.13.1
+2.14.1