Rebase against 218286bb87f8a38a48b4717247e578e02f6a051f.

patches/msi-Dummy_Thread/0001-msi-Create-dummy-thread-to-initialize-COM-for-custom.patch

@@ -1,4 +1,4 @@
-From 898e62a33f525084b08d5a3be634e7fcb4661f68 Mon Sep 17 00:00:00 2001
+From 246ebe70f4b1ffb5a41098045c0a29be6055d7dd Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Mon, 26 Jun 2017 16:18:09 +0200
 Subject: msi: Create dummy thread to initialize COM for custom actions.
@@ -8,12 +8,12 @@ Subject: msi: Create dummy thread to initialize COM for custom actions.
  1 file changed, 48 insertions(+)
 
 diff --git a/dlls/msi/action.c b/dlls/msi/action.c
-index 64e01c48f57..d804323ff58 100644
+index 24ada643035..178e3949ee2 100644
 --- a/dlls/msi/action.c
 +++ b/dlls/msi/action.c
-@@ -158,6 +158,13 @@ static const WCHAR szValidateProductID[] =
- static const WCHAR szWriteEnvironmentStrings[] =
-     {'W','r','i','t','e','E','n','v','i','r','o','n','m','e','n','t','S','t','r','i','n','g','s',0};
+@@ -160,6 +160,13 @@ static const WCHAR szWriteEnvironmentStrings[] =
+ static const WCHAR szINSTALL[] =
+     {'I','N','S','T','A','L','L',0};
 
 +struct dummy_thread
 +{
@@ -25,7 +25,7 @@ index 64e01c48f57..d804323ff58 100644
  static INT ui_actionstart(MSIPACKAGE *package, LPCWSTR action, LPCWSTR description, LPCWSTR template)
  {
      WCHAR query[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ',
-@@ -7860,6 +7867,42 @@ static UINT ACTION_PerformActionSequence(MSIPACKAGE *package, UINT seq)
+@@ -7946,6 +7953,42 @@ static UINT ACTION_PerformActionSequence(MSIPACKAGE *package, UINT seq)
      return rc;
  }
 
@@ -68,15 +68,15 @@ index 64e01c48f57..d804323ff58 100644
  /****************************************************
   * TOP level entry points
   *****************************************************/
-@@ -7871,6 +7914,7 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath,
+@@ -7956,6 +7999,7 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath,
+     static const WCHAR szDisableRollback[] = {'D','I','S','A','B','L','E','R','O','L','L','B','A','C','K',0};
      static const WCHAR szAction[] = {'A','C','T','I','O','N',0};
-     static const WCHAR szInstall[] = {'I','N','S','T','A','L','L',0};
-     WCHAR *reinstall, *remove, *patch, *productcode;
+     WCHAR *reinstall, *remove, *patch, *productcode, *action;
 +    struct dummy_thread thread_info = {NULL, NULL, NULL};
-     BOOL ui_exists;
      UINT rc;
+     DWORD len = 0;
 
-@@ -7936,6 +7980,8 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath,
+@@ -8023,6 +8067,8 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath,
      msi_adjust_privilege_properties( package );
      msi_set_context( package );
 
@@ -85,7 +85,7 @@ index 64e01c48f57..d804323ff58 100644
      productcode = msi_dup_property( package->db, szProductCode );
      if (strcmpiW( productcode, package->ProductCode ))
      {
-@@ -7984,6 +8030,8 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath,
+@@ -8059,6 +8105,8 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath,
      /* finish up running custom actions */
      ACTION_FinishCustomActions(package);
 
@@ -95,5 +95,5 @@ index 64e01c48f57..d804323ff58 100644
      {
          WARN("installation failed, running rollback script\n");
 -- 
-2.13.1
+2.14.1
 

patches/patchinstall.sh

@@ -52,7 +52,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "c16ef729db50209a626b743f5847a24dff5688a4"
+	echo "218286bb87f8a38a48b4717247e578e02f6a051f"
 }
 
 # Show version information
@@ -9046,11 +9046,6 @@ fi
 # |
 if test "$enable_windowscodecs_Palette_Images" -eq 1; then
 	patch_apply windowscodecs-Palette_Images/0005-windowscodecs-Add-support-for-palette-image-formats-.patch
-	patch_apply windowscodecs-Palette_Images/0006-windowscodecs-Fix-IWICBitmapEncoder-SetPalette-for-a.patch
-	patch_apply windowscodecs-Palette_Images/0007-windowscodecs-Implement-IWICBitmapFrameEncode-SetPal.patch
-	patch_apply windowscodecs-Palette_Images/0008-windowscodecs-Implement-IWICBitmapDecoder-CopyPalett.patch
-	patch_apply windowscodecs-Palette_Images/0009-windowscodecs-Implement-IWICBitmapFrameEncode-SetPal.patch
-	patch_apply windowscodecs-Palette_Images/0010-windowscodecs-Fix-IWICBitmapEncoder-SetPalette-for-a.patch
 	patch_apply windowscodecs-Palette_Images/0011-windowscodecs-tests-Add-some-tests-for-encoding-1bpp.patch
 	patch_apply windowscodecs-Palette_Images/0012-windowscodecs-tests-Add-tests-for-encoding-2bpp-4bpp.patch
 	patch_apply windowscodecs-Palette_Images/0013-windowscodecs-Use-V_UI1-instead-of-V_UNION-to-assign.patch
@@ -9062,11 +9057,6 @@ if test "$enable_windowscodecs_Palette_Images" -eq 1; then
 	patch_apply windowscodecs-Palette_Images/0021-windowscodecs-PNG-decoder-should-return-WINCODEC_ERR.patch
 	(
 		printf '%s\n' '+    { "Dmitry Timoshkov", "windowscodecs: Add support for palette image formats to PNG encoder.", 1 },';
-		printf '%s\n' '+    { "Dmitry Timoshkov", "windowscodecs: Fix IWICBitmapEncoder::SetPalette for a not initialized case in BMP encoder.", 1 },';
-		printf '%s\n' '+    { "Dmitry Timoshkov", "windowscodecs: Implement IWICBitmapFrameEncode::SetPalette in BMP encoder.", 1 },';
-		printf '%s\n' '+    { "Dmitry Timoshkov", "windowscodecs: Implement IWICBitmapDecoder::CopyPalette in TIFF decoder.", 1 },';
-		printf '%s\n' '+    { "Dmitry Timoshkov", "windowscodecs: Implement IWICBitmapFrameEncode::SetPalette in the TIFF encoder.", 1 },';
-		printf '%s\n' '+    { "Dmitry Timoshkov", "windowscodecs: Fix IWICBitmapEncoder::SetPalette for a not initialized case in TIFF encoder.", 1 },';
 		printf '%s\n' '+    { "Dmitry Timoshkov", "windowscodecs/tests: Add some tests for encoding 1bpp/8bpp images with a palette.", 1 },';
 		printf '%s\n' '+    { "Dmitry Timoshkov", "windowscodecs/tests: Add tests for encoding 2bpp/4bpp images with a palette.", 1 },';
 		printf '%s\n' '+    { "Dmitry Timoshkov", "windowscodecs: Use V_UI1() instead of V_UNION() to assign a VT_UI1 variant member.", 1 },';