Rebase against 08df007e802dfa2845a5b4f33bbf8a04202258bb.

patches/dsound-EAX/0001-dsound-Apply-filters-before-sound-is-multiplied-to-s.patch

@@ -1,32 +1,33 @@
-From f6d6015507f7706db9db58b851b3032c56f4b3ed Mon Sep 17 00:00:00 2001
+From a259cb0c3a69913d6656ef3043a263ec5ad3ea05 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Sat, 28 Mar 2015 08:18:10 +0100
 Subject: dsound: Apply filters before sound is multiplied to speakers.
 
 Based on a patch by Mark Harmstone.
 ---
- dlls/dsound/dsound.c         |   1 +
+ dlls/dsound/dsound.c         |   2 +
  dlls/dsound/dsound_private.h |   4 +-
  dlls/dsound/mixer.c          | 110 ++++++++++++++++++++++++++++++-------------
- 3 files changed, 80 insertions(+), 35 deletions(-)
+ 3 files changed, 81 insertions(+), 35 deletions(-)
 
 diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c
-index 4d515adcaf3..65a00787098 100644
+index 68902d723af..449830ae83f 100644
 --- a/dlls/dsound/dsound.c
 +++ b/dlls/dsound/dsound.c
-@@ -233,6 +233,7 @@ static ULONG DirectSoundDevice_Release(DirectSoundDevice * device)
-         if(device->volume)
+@@ -234,6 +234,8 @@ static ULONG DirectSoundDevice_Release(DirectSoundDevice * device)
              IAudioStreamVolume_Release(device->volume);
-
+         if(device->mmdevice)
+             IMMDevice_Release(device->mmdevice);
++
 +        HeapFree(GetProcessHeap(), 0, device->dsp_buffer);
          HeapFree(GetProcessHeap(), 0, device->tmp_buffer);
          HeapFree(GetProcessHeap(), 0, device->cp_buffer);
          HeapFree(GetProcessHeap(), 0, device->buffer);
 diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
-index 8e1e2dafc7c..f22849fb0a2 100644
+index 985a7a2526b..45232cbd729 100644
 --- a/dlls/dsound/dsound_private.h
 +++ b/dlls/dsound/dsound_private.h
-@@ -89,8 +89,8 @@ struct DirectSoundDevice
+@@ -90,8 +90,8 @@ struct DirectSoundDevice
      int                         speaker_num[DS_MAX_CHANNELS];
      int                         num_speakers;
      int                         lfe_channel;
@@ -38,7 +39,7 @@ index 8e1e2dafc7c..f22849fb0a2 100644
      DSVOLUMEPAN                 volpan;
 
 diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c
-index 8413588edfb..a11d6c9e798 100644
+index 23e5bbcf7c7..e5211deaeeb 100644
 --- a/dlls/dsound/mixer.c
 +++ b/dlls/dsound/mixer.c
 @@ -278,23 +278,22 @@ static inline float get_current_sample(const IDirectSoundBufferImpl *dsb,
@@ -230,5 +231,5 @@ index 8413588edfb..a11d6c9e798 100644
 
  static void DSOUND_MixerVol(const IDirectSoundBufferImpl *dsb, INT frames)
 -- 
-2.11.0
+2.13.1
 

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

@@ -1,4 +1,4 @@
-From 0763c73423ae069023b54e669b0c9bd648e1f27e Mon Sep 17 00:00:00 2001
+From 3bd544b02b3d3c64bd2db3db2317b8ede9000636 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,10 +8,10 @@ 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 16652000ee5..62f01044bf1 100644
+index e016b43a8c1..e661275c719 100644
 --- a/dlls/msi/action.c
 +++ b/dlls/msi/action.c
-@@ -156,6 +156,13 @@ static const WCHAR szValidateProductID[] =
+@@ -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};
 
@@ -22,10 +22,10 @@ index 16652000ee5..62f01044bf1 100644
 +    HANDLE thread;
 +};
 +
- static void ui_actionstart(MSIPACKAGE *package, LPCWSTR action)
+ static void ui_actionstart(MSIPACKAGE *package, LPCWSTR action, LPCWSTR description, LPCWSTR template)
  {
-     static const WCHAR Query_t[] = 
-@@ -7912,6 +7919,42 @@ static UINT ACTION_PerformActionSequence(MSIPACKAGE *package, UINT seq)
+     MSIRECORD *row = MSI_CreateRecord(3);
+@@ -7916,6 +7923,42 @@ static UINT ACTION_PerformActionSequence(MSIPACKAGE *package, UINT seq)
      return rc;
  }
 
@@ -68,15 +68,15 @@ index 16652000ee5..62f01044bf1 100644
  /****************************************************
   * TOP level entry points
   *****************************************************/
-@@ -7923,6 +7966,7 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath,
+@@ -7927,6 +7970,7 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath,
      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;
 +    struct dummy_thread thread_info = {NULL, NULL, NULL};
      BOOL ui_exists;
      UINT rc;
 
-@@ -7988,6 +8032,8 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath,
+@@ -7992,6 +8036,8 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath,
      msi_adjust_privilege_properties( package );
      msi_set_context( package );
 
@@ -85,7 +85,7 @@ index 16652000ee5..62f01044bf1 100644
      productcode = msi_dup_property( package->db, szProductCode );
      if (strcmpiW( productcode, package->ProductCode ))
      {
-@@ -8036,6 +8082,8 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath,
+@@ -8040,6 +8086,8 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath,
      /* finish up running custom actions */
      ACTION_FinishCustomActions(package);
 

patches/patchinstall.sh

@@ -52,7 +52,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "73af2479c7107f6157cabdd24dc1e0fe47fbbb1e"
+	echo "08df007e802dfa2845a5b4f33bbf8a04202258bb"
 }
 
 # Show version information
@@ -8585,9 +8585,9 @@ fi
 # | Modified files:
 # |   *	dlls/gdiplus/image.c, dlls/gdiplus/tests/image.c, dlls/windowscodecs/bmpencode.c, dlls/windowscodecs/clsfactory.c,
 # | 	dlls/windowscodecs/converter.c, dlls/windowscodecs/gifformat.c, dlls/windowscodecs/info.c,
-# | 	dlls/windowscodecs/jpegformat.c, dlls/windowscodecs/metadataquery.c, dlls/windowscodecs/pngformat.c,
-# | 	dlls/windowscodecs/regsvr.c, dlls/windowscodecs/tests/converter.c, dlls/windowscodecs/tiffformat.c,
-# | 	dlls/windowscodecs/wincodecs_private.h, dlls/windowscodecs/windowscodecs_wincodec.idl
+# | 	dlls/windowscodecs/jpegformat.c, dlls/windowscodecs/pngformat.c, dlls/windowscodecs/regsvr.c,
+# | 	dlls/windowscodecs/tests/converter.c, dlls/windowscodecs/tiffformat.c, dlls/windowscodecs/wincodecs_private.h,
+# | 	dlls/windowscodecs/windowscodecs_wincodec.idl
 # |
 if test "$enable_windowscodecs_GIF_Encoder" -eq 1; then
 	patch_apply windowscodecs-GIF_Encoder/0001-windowscodecs-Implement-IWICBitmapEncoder-GetEncoder.patch
@@ -8602,7 +8602,6 @@ if test "$enable_windowscodecs_GIF_Encoder" -eq 1; then
 	patch_apply windowscodecs-GIF_Encoder/0010-windowscodecs-Initialize-empty-property-bag-in-GIF-e.patch
 	patch_apply windowscodecs-GIF_Encoder/0011-windowscodecs-Add-registration-for-GUID_WICPixelForm.patch
 	patch_apply windowscodecs-GIF_Encoder/0012-windowscodecs-Implement-IWICBitmapDecoder-GetMetadat.patch
-	patch_apply windowscodecs-GIF_Encoder/0013-windowscodecs-Improve-stub-for-IWICMetadataQueryRead.patch
 	patch_apply windowscodecs-GIF_Encoder/0014-windowscodecs-Fix-the-buffer-size-check-in-the-TIFF-.patch
 	patch_apply windowscodecs-GIF_Encoder/0015-windowscodecs-Add-support-for-converting-to-8bppInde.patch
 	patch_apply windowscodecs-GIF_Encoder/0016-windowscodecs-WICConvertBitmapSource-should-ask-IWIC.patch
@@ -8631,7 +8630,6 @@ if test "$enable_windowscodecs_GIF_Encoder" -eq 1; then
 		printf '%s\n' '+    { "Dmitry Timoshkov", "windowscodecs: Initialize empty property bag in GIF encoder'\''s CreateNewFrame implementation.", 1 },';
 		printf '%s\n' '+    { "Dmitry Timoshkov", "windowscodecs: Add registration for GUID_WICPixelFormat32bppGrayFloat pixel format.", 1 },';
 		printf '%s\n' '+    { "Dmitry Timoshkov", "windowscodecs: Implement IWICBitmapDecoder::GetMetadataQueryReader in the TIFF decoder.", 1 },';
-		printf '%s\n' '+    { "Dmitry Timoshkov", "windowscodecs: Improve stub for IWICMetadataQueryReader::GetMetadataByName.", 1 },';
 		printf '%s\n' '+    { "Dmitry Timoshkov", "windowscodecs: Fix the buffer size check in the TIFF decoder'\''s IWICBitmapFrameDecode::CopyPixels implementation.", 1 },';
 		printf '%s\n' '+    { "Dmitry Timoshkov", "windowscodecs: Add support for converting to 8bppIndexed format to IWICFormatConverter.", 1 },';
 		printf '%s\n' '+    { "Dmitry Timoshkov", "windowscodecs: WICConvertBitmapSource should ask IWICFormatConverter::Initialize to use an optimized palette.", 1 },';