Rebase against 975d0632a19efd41338cb73a97f1b0bdbe7bc0cc.

patches/api-ms-win-Stub_DLLs/0027-uiautomationcore-Add-dll-and-stub-some-functions.patch

@@ -1,4 +1,4 @@
-From 0e65ed108eb8bab24668f9a58c5757a3ad36104f Mon Sep 17 00:00:00 2001
+From ffea83bdf88a4b7d35c2f9a7e1a773d3110b5771 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Tue, 12 Apr 2016 01:02:34 +0200
 Subject: [PATCH] uiautomationcore: Add dll and stub some functions.
@@ -9,7 +9,7 @@ Subject: [PATCH] uiautomationcore: Add dll and stub some functions.
  2 files changed, 48 insertions(+), 6 deletions(-)
 
 diff --git a/dlls/uiautomationcore/Makefile.in b/dlls/uiautomationcore/Makefile.in
-index 5c4acb232a4..412f1dbbe19 100644
+index 71ea7b99c94..3e6c2d7688a 100644
 --- a/dlls/uiautomationcore/Makefile.in
 +++ b/dlls/uiautomationcore/Makefile.in
 @@ -1,5 +1,6 @@
@@ -17,10 +17,10 @@ index 5c4acb232a4..412f1dbbe19 100644
  IMPORTLIB = uiautomationcore
 +IMPORTS   = uuid
  
- EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
+ EXTRADLLFLAGS = -Wb,--prefer-native
  
 diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c
-index 42014af6035..61e165d83c0 100644
+index 2dada95af80..a32ef552f15 100644
 --- a/dlls/uiautomationcore/uia_main.c
 +++ b/dlls/uiautomationcore/uia_main.c
 @@ -1,4 +1,5 @@
@@ -121,5 +121,5 @@ index 42014af6035..61e165d83c0 100644
  }
  
 -- 
-2.20.1
+2.33.0
 

patches/cryptext-CryptExtOpenCER/0001-cryptext-Implement-CryptExtOpenCER.patch

@@ -1,4 +1,4 @@
-From 50bd67fb1fd718eaaf9f5600fba7ab86e4b71a76 Mon Sep 17 00:00:00 2001
+From a5045503cf3310058cc64814ff9626f4877a13bb Mon Sep 17 00:00:00 2001
 From: Dmitry Timoshkov <dmitry@baikal.ru>
 Date: Fri, 5 Jul 2019 13:20:23 +0800
 Subject: [PATCH] cryptext: Implement CryptExtOpenCER.
@@ -17,10 +17,10 @@ Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru>
  create mode 100644 dlls/cryptext/tests/cryptext.c
 
 diff --git a/configure b/configure
-index 2b20133cd65..f3ef3aef3a9 100755
+index db592f0868d..ba13abacc46 100755
 --- a/configure
 +++ b/configure
-@@ -20350,6 +20350,7 @@ wine_fn_config_makefile dlls/crypt32/tests enable_tests
+@@ -20291,6 +20291,7 @@ wine_fn_config_makefile dlls/crypt32/tests enable_tests
  wine_fn_config_makefile dlls/cryptdlg enable_cryptdlg
  wine_fn_config_makefile dlls/cryptdll enable_cryptdll
  wine_fn_config_makefile dlls/cryptext enable_cryptext
@@ -29,10 +29,10 @@ index 2b20133cd65..f3ef3aef3a9 100755
  wine_fn_config_makefile dlls/cryptnet/tests enable_tests
  wine_fn_config_makefile dlls/cryptsp enable_cryptsp
 diff --git a/configure.ac b/configure.ac
-index 24f5c8847d6..f71fb6f401d 100644
+index d449b88fb19..af75e0e80ab 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3083,6 +3083,7 @@ WINE_CONFIG_MAKEFILE(dlls/crypt32/tests)
+@@ -3029,6 +3029,7 @@ WINE_CONFIG_MAKEFILE(dlls/crypt32/tests)
  WINE_CONFIG_MAKEFILE(dlls/cryptdlg)
  WINE_CONFIG_MAKEFILE(dlls/cryptdll)
  WINE_CONFIG_MAKEFILE(dlls/cryptext)
@@ -41,7 +41,7 @@ index 24f5c8847d6..f71fb6f401d 100644
  WINE_CONFIG_MAKEFILE(dlls/cryptnet/tests)
  WINE_CONFIG_MAKEFILE(dlls/cryptsp)
 diff --git a/dlls/cryptext/Makefile.in b/dlls/cryptext/Makefile.in
-index 3acce60ae88..590074a806f 100644
+index 0ec2b8a2045..76accca43eb 100644
 --- a/dlls/cryptext/Makefile.in
 +++ b/dlls/cryptext/Makefile.in
 @@ -1,4 +1,5 @@
@@ -49,10 +49,10 @@ index 3acce60ae88..590074a806f 100644
 +MODULE  = cryptext.dll
 +IMPORTS = crypt32 cryptui user32
  
- EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
+ EXTRADLLFLAGS = -Wb,--prefer-native
  
 diff --git a/dlls/cryptext/cryptext.spec b/dlls/cryptext/cryptext.spec
-index 0dba38e3934..911ab2f4ba4 100644
+index ee3e155f457..24b4794c198 100644
 --- a/dlls/cryptext/cryptext.spec
 +++ b/dlls/cryptext/cryptext.spec
 @@ -12,8 +12,8 @@
@@ -227,5 +227,5 @@ index 00000000000..cc62a772b59
 +    test_CryptExtOpenCER();
 +}
 -- 
-2.20.1
+2.33.0
 

patches/d3dx11_43-D3DX11CreateTextureFromMemory/0001-d3dx11_43-Implement-D3DX11GetImageInfoFromMemory.patch

@@ -1,4 +1,4 @@
-From 95708c8fdfcb45cfe667cc9a68ea774c2be52169 Mon Sep 17 00:00:00 2001
+From e3a6b75cbce69e18742135fdd8e105132d8ca9dd Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Fri, 30 Jul 2021 15:57:29 +1000
 Subject: [PATCH] d3dx11_43: Implement D3DX11GetImageInfoFromMemory
@@ -14,7 +14,7 @@ Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
  4 files changed, 178 insertions(+), 9 deletions(-)
 
 diff --git a/dlls/d3dx11_42/Makefile.in b/dlls/d3dx11_42/Makefile.in
-index c34f53a930c..9e1379937a7 100644
+index 7fcce18a8e1..78ca5f707a7 100644
 --- a/dlls/d3dx11_42/Makefile.in
 +++ b/dlls/d3dx11_42/Makefile.in
 @@ -2,6 +2,7 @@ EXTRADEFS = -DD3DX11_SDK_VERSION=42
@@ -24,9 +24,9 @@ index c34f53a930c..9e1379937a7 100644
 +DELAYIMPORTS = windowscodecs
  PARENTSRC = ../d3dx11_43
  
- EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
+ EXTRADLLFLAGS = -Wb,--prefer-native
 diff --git a/dlls/d3dx11_43/Makefile.in b/dlls/d3dx11_43/Makefile.in
-index b69f3f1ce02..ed23958a671 100644
+index ccd4319ace2..6854c73ebcb 100644
 --- a/dlls/d3dx11_43/Makefile.in
 +++ b/dlls/d3dx11_43/Makefile.in
 @@ -2,6 +2,7 @@ EXTRADEFS = -DD3DX11_SDK_VERSION=43
@@ -35,7 +35,7 @@ index b69f3f1ce02..ed23958a671 100644
  IMPORTS   = d3dcompiler
 +DELAYIMPORTS = windowscodecs
  
- EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
+ EXTRADLLFLAGS = -Wb,--prefer-native
  
 diff --git a/dlls/d3dx11_43/main.c b/dlls/d3dx11_43/main.c
 index 950f6d76f5c..00c1db35e42 100644
@@ -250,5 +250,5 @@ index ee6808d76d6..8addf4f84d3 100644
          SIZE_T data_size, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump,
          ID3D11ShaderResourceView **view, HRESULT *hresult)
 -- 
-2.32.0
+2.33.0
 

patches/dbghelp-Debug_Symbols/0001-dbghelp-Always-check-for-debug-symbols-in-BINDIR.patch

@@ -1,4 +1,4 @@
-From 30c01cb08a47b706a4ae49ddbd28f39cb065b5c9 Mon Sep 17 00:00:00 2001
+From f73bf747238e157fc73f8b62941d3d8aa4b6bb33 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Mon, 6 Oct 2014 05:06:06 +0200
 Subject: [PATCH] dbghelp: Always check for debug symbols in BINDIR.
@@ -9,7 +9,7 @@ Subject: [PATCH] dbghelp: Always check for debug symbols in BINDIR.
  2 files changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/dbghelp/Makefile.in b/dlls/dbghelp/Makefile.in
-index 076c50323dda..ddb69c96dd42 100644
+index b2a5e2037e9..7140cc9f181 100644
 --- a/dlls/dbghelp/Makefile.in
 +++ b/dlls/dbghelp/Makefile.in
 @@ -1,6 +1,6 @@
@@ -19,12 +19,12 @@ index 076c50323dda..ddb69c96dd42 100644
 +EXTRADEFS = -D_IMAGEHLP_SOURCE_ -DBINDIR="L\"${bindir}\""
  DELAYIMPORTS = version
  
- EXTRADLLFLAGS = -mno-cygwin
+ C_SRCS = \
 diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c
-index e44629f016e1..923608f35e31 100644
+index 553b212c526..3584a27953e 100644
 --- a/dlls/dbghelp/elf_module.c
 +++ b/dlls/dbghelp/elf_module.c
-@@ -1436,6 +1436,7 @@ static BOOL elf_search_and_load_file(struct process* pcs, const WCHAR* filename,
+@@ -1451,6 +1451,7 @@ static BOOL elf_search_and_load_file(struct process* pcs, const WCHAR* filename,
          load_elf.elf_info    = elf_info;
  
          ret = search_unix_path(filename, process_getenv(pcs, L"LD_LIBRARY_PATH"), elf_load_file_cb, &load_elf)
@@ -33,5 +33,5 @@ index e44629f016e1..923608f35e31 100644
      }
  
 -- 
-2.26.2
+2.33.0
 

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

@@ -1,20 +1,20 @@
-From f02dd0110ae95771a6e44a608c724d964fab7f68 Mon Sep 17 00:00:00 2001
+From 2af1ec49d958424e2b78f52ae3e3daca1d562b35 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.
+Subject: [PATCH] dsound: Apply filters before sound is multiplied to speakers.
 
 Based on a patch by Mark Harmstone.
 ---
  dlls/dsound/dsound.c         |   2 +
  dlls/dsound/dsound_private.h |   4 +-
- dlls/dsound/mixer.c          | 110 ++++++++++++++++++++++++-----------
- 3 files changed, 81 insertions(+), 35 deletions(-)
+ dlls/dsound/mixer.c          | 109 ++++++++++++++++++++++++-----------
+ 3 files changed, 80 insertions(+), 35 deletions(-)
 
 diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c
-index 71ede7d8..cc8b4444 100644
+index 3085d86e5b5..91fa94b943e 100644
 --- a/dlls/dsound/dsound.c
 +++ b/dlls/dsound/dsound.c
-@@ -233,6 +233,8 @@ static ULONG DirectSoundDevice_Release(DirectSoundDevice * device)
+@@ -234,6 +234,8 @@ static ULONG DirectSoundDevice_Release(DirectSoundDevice * device)
          if(device->mmdevice)
              IMMDevice_Release(device->mmdevice);
          CloseHandle(device->sleepev);
@@ -24,10 +24,10 @@ index 71ede7d8..cc8b4444 100644
          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 c9ae7fd7..371cc5fb 100644
+index 2408f80ba82..2e23f222b03 100644
 --- a/dlls/dsound/dsound_private.h
 +++ b/dlls/dsound/dsound_private.h
-@@ -90,8 +90,8 @@ struct DirectSoundDevice
+@@ -89,8 +89,8 @@ struct DirectSoundDevice
      int                         speaker_num[DS_MAX_CHANNELS];
      int                         num_speakers;
      int                         lfe_channel;
@@ -39,11 +39,11 @@ index c9ae7fd7..371cc5fb 100644
      DSVOLUMEPAN                 volpan;
  
 diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c
-index 1643e7d4..d4dbdc15 100644
+index 1877d61cbf0..13bff1b9ae7 100644
 --- a/dlls/dsound/mixer.c
 +++ b/dlls/dsound/mixer.c
-@@ -278,23 +278,22 @@ static inline float get_current_sample(const IDirectSoundBufferImpl *dsb,
-     return dsb->get(dsb, mixpos % dsb->buflen, channel);
+@@ -283,10 +283,9 @@ static inline float get_current_sample(const IDirectSoundBufferImpl *dsb,
+     return dsb->get(dsb, buffer + (mixpos % buflen), channel);
  }
  
 -static UINT cp_fields_noresample(IDirectSoundBufferImpl *dsb, UINT count)
@@ -51,13 +51,17 @@ index 1643e7d4..d4dbdc15 100644
  {
      UINT istride = dsb->pwfx->nBlockAlign;
 -    UINT ostride = dsb->device->pwfx->nChannels * sizeof(float);
+     UINT committed_samples = 0;
      DWORD channel, i;
-     for (i = 0; i < count; i++)
+ 
+@@ -302,17 +301,16 @@ static UINT cp_fields_noresample(IDirectSoundBufferImpl *dsb, UINT count)
+ 
+     for (; i < count; i++)
          for (channel = 0; channel < dsb->mix_channels; channel++)
--            dsb->put(dsb, i * ostride, channel, get_current_sample(dsb,
--                    dsb->sec_mixpos + i * istride, channel));
-+            put(dsb, i * ostride, channel, get_current_sample(dsb,
-+                dsb->sec_mixpos + i * istride, channel));
+-            dsb->put(dsb, i * ostride, channel, get_current_sample(dsb, dsb->buffer->memory,
++            put(dsb, i * ostride, channel, get_current_sample(dsb, dsb->buffer->memory,
+                 dsb->buflen, dsb->sec_mixpos + i * istride, channel));
+-
      return count;
  }
  
@@ -71,16 +75,16 @@ index 1643e7d4..d4dbdc15 100644
      UINT channels = dsb->mix_channels;
  
      LONG64 freqAcc_start = *freqAccNum;
-@@ -322,7 +321,7 @@ static UINT cp_fields_resample_lq(IDirectSoundBufferImpl *dsb, UINT count, LONG6
-             float s1 = get_current_sample(dsb, idx, channel);
-             float s2 = get_current_sample(dsb, idx + istride, channel);
+@@ -340,7 +338,7 @@ static UINT cp_fields_resample_lq(IDirectSoundBufferImpl *dsb, UINT count, LONG6
+             float s1 = get_current_sample(dsb, dsb->buffer->memory, dsb->buflen, idx, channel);
+             float s2 = get_current_sample(dsb, dsb->buffer->memory, dsb->buflen, idx + istride, channel);
              float result = s1 * cur_freqAcc2 + s2 * cur_freqAcc;
 -            dsb->put(dsb, i * ostride, channel, result);
 +            put(dsb, i * ostride, channel, result);
          }
      }
  
-@@ -330,11 +329,11 @@ static UINT cp_fields_resample_lq(IDirectSoundBufferImpl *dsb, UINT count, LONG6
+@@ -348,11 +346,11 @@ static UINT cp_fields_resample_lq(IDirectSoundBufferImpl *dsb, UINT count, LONG6
      return max_ipos;
  }
  
@@ -91,10 +95,10 @@ index 1643e7d4..d4dbdc15 100644
      UINT i, channel;
      UINT istride = dsb->pwfx->nBlockAlign;
 -    UINT ostride = dsb->device->pwfx->nChannels * sizeof(float);
+     UINT committed_samples = 0;
  
      LONG64 freqAcc_start = *freqAccNum;
-     LONG64 freqAcc_end = freqAcc_start + count * dsb->freqAdjustNum;
-@@ -395,7 +394,7 @@ static UINT cp_fields_resample_hq(IDirectSoundBufferImpl *dsb, UINT count, LONG6
+@@ -422,7 +420,7 @@ static UINT cp_fields_resample_hq(IDirectSoundBufferImpl *dsb, UINT count, LONG6
              float* cache = &intermediate[channel * required_input + ipos];
              for (j = 0; j < fir_used; j++)
                  sum += fir_copy[j] * cache[j];
@@ -103,7 +107,7 @@ index 1643e7d4..d4dbdc15 100644
          }
      }
  
-@@ -404,16 +403,17 @@ static UINT cp_fields_resample_hq(IDirectSoundBufferImpl *dsb, UINT count, LONG6
+@@ -431,16 +429,17 @@ static UINT cp_fields_resample_hq(IDirectSoundBufferImpl *dsb, UINT count, LONG6
      return max_ipos;
  }
  
@@ -125,7 +129,7 @@ index 1643e7d4..d4dbdc15 100644
  
      ipos = dsb->sec_mixpos + adv * dsb->pwfx->nBlockAlign;
      if (ipos >= dsb->buflen) {
-@@ -443,6 +443,21 @@ static inline DWORD DSOUND_BufPtrDiff(DWORD buflen, DWORD ptr1, DWORD ptr2)
+@@ -476,6 +475,21 @@ static inline DWORD DSOUND_BufPtrDiff(DWORD buflen, DWORD ptr1, DWORD ptr2)
  		return buflen + ptr1 - ptr2;
  	}
  }
@@ -147,7 +151,7 @@ index 1643e7d4..d4dbdc15 100644
  /**
   * Mix at most the given amount of data into the allocated temporary buffer
   * of the given secondary buffer, starting from the dsb's first currently
-@@ -458,34 +473,63 @@ static inline DWORD DSOUND_BufPtrDiff(DWORD buflen, DWORD ptr1, DWORD ptr2)
+@@ -491,34 +505,63 @@ static inline DWORD DSOUND_BufPtrDiff(DWORD buflen, DWORD ptr1, DWORD ptr2)
   */
  static void DSOUND_MixToTemporary(IDirectSoundBufferImpl *dsb, DWORD frames)
  {
@@ -231,5 +235,5 @@ index 1643e7d4..d4dbdc15 100644
  
  static void DSOUND_MixerVol(const IDirectSoundBufferImpl *dsb, INT frames)
 -- 
-2.19.1
+2.33.0
 

patches/dsound-EAX/0007-dsound-Support-getting-and-setting-EAX-buffer-proper.patch

@@ -1,22 +1,22 @@
-From 43637cb46c48e84e7f1b127ba4427900c76f2470 Mon Sep 17 00:00:00 2001
+From f4e3bbf1a91a5a99d703d3fee9a81a5c5089ab79 Mon Sep 17 00:00:00 2001
 From: Mark Harmstone <mark@harmstone.com>
 Date: Fri, 27 Mar 2015 20:48:19 +0000
-Subject: dsound: Support getting and setting EAX buffer properties.
+Subject: [PATCH] dsound: Support getting and setting EAX buffer properties.
 
 ---
  dlls/dsound/buffer.c         |  2 ++
  dlls/dsound/dsound_eax.h     |  4 +++
  dlls/dsound/dsound_private.h |  2 ++
- dlls/dsound/eax.c            | 64 ++++++++++++++++++++++++++++++++++++++++++++
+ dlls/dsound/eax.c            | 64 ++++++++++++++++++++++++++++++++++++
  4 files changed, 72 insertions(+)
 
 diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c
-index 0596ce3..1c318f5 100644
+index b7a0fb26c4b..0aff7c96842 100644
 --- a/dlls/dsound/buffer.c
 +++ b/dlls/dsound/buffer.c
-@@ -1092,6 +1092,8 @@ HRESULT IDirectSoundBufferImpl_Create(
- 	/* calculate fragment size and write lead */
- 	DSOUND_RecalcFormat(dsb);
+@@ -1127,6 +1127,8 @@ HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *ds
+ 		return DSERR_OUTOFMEMORY;
+ 	}
  
 +	dsb->eax.reverb_mix = EAX_REVERBMIX_USEDISTANCE;
 +
@@ -24,7 +24,7 @@ index 0596ce3..1c318f5 100644
  		dsb->ds3db_ds3db.dwSize = sizeof(DS3DBUFFER);
  		dsb->ds3db_ds3db.vPosition.x = 0.0;
 diff --git a/dlls/dsound/dsound_eax.h b/dlls/dsound/dsound_eax.h
-index c90d82d..2ee83b9 100644
+index c90d82d9a3f..2ee83b94ff9 100644
 --- a/dlls/dsound/dsound_eax.h
 +++ b/dlls/dsound/dsound_eax.h
 @@ -119,6 +119,10 @@ typedef struct {
@@ -39,10 +39,10 @@ index c90d82d..2ee83b9 100644
  }
  #endif
 diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
-index c16f770..c732b52 100644
+index a11379f0f88..9b537ad80a5 100644
 --- a/dlls/dsound/dsound_private.h
 +++ b/dlls/dsound/dsound_private.h
-@@ -176,6 +176,8 @@ struct IDirectSoundBufferImpl
+@@ -177,6 +177,8 @@ struct IDirectSoundBufferImpl
      int                         num_filters;
      DSFilter*                   filters;
  
@@ -52,13 +52,14 @@ index c16f770..c732b52 100644
  };
  
 diff --git a/dlls/dsound/eax.c b/dlls/dsound/eax.c
-index cdd03be..3931681 100644
+index cdd03becbee..3931681d295 100644
 --- a/dlls/dsound/eax.c
 +++ b/dlls/dsound/eax.c
-@@ -179,6 +179,38 @@ HRESULT WINAPI EAX_Get(IDirectSoundBufferImpl *buf, REFGUID guidPropSet,
+@@ -178,6 +178,38 @@ HRESULT WINAPI EAX_Get(IDirectSoundBufferImpl *buf, REFGUID guidPropSet,
+                 return E_PROP_ID_UNSUPPORTED;
          }
  
-         return S_OK;
++        return S_OK;
 +    } else if (IsEqualGUID(&DSPROPSETID_EAXBUFFER_ReverbProperties, guidPropSet)) {
 +        EAXBUFFER_REVERBPROPERTIES *props;
 +
@@ -90,14 +91,14 @@ index cdd03be..3931681 100644
 +                return E_PROP_ID_UNSUPPORTED;
 +        }
 +
-+        return S_OK;
+         return S_OK;
      }
  
-     return E_PROP_ID_UNSUPPORTED;
-@@ -276,6 +308,38 @@ HRESULT WINAPI EAX_Set(IDirectSoundBufferImpl *buf, REFGUID guidPropSet,
+@@ -275,6 +307,38 @@ HRESULT WINAPI EAX_Set(IDirectSoundBufferImpl *buf, REFGUID guidPropSet,
+                 return E_PROP_ID_UNSUPPORTED;
          }
  
-         return S_OK;
++        return S_OK;
 +    } else if (IsEqualGUID(&DSPROPSETID_EAXBUFFER_ReverbProperties, guidPropSet)) {
 +        EAXBUFFER_REVERBPROPERTIES *props;
 +
@@ -129,10 +130,9 @@ index cdd03be..3931681 100644
 +                return E_PROP_ID_UNSUPPORTED;
 +        }
 +
-+        return S_OK;
+         return S_OK;
      }
  
-     return E_PROP_ID_UNSUPPORTED;
 -- 
-2.3.3
+2.33.0
 

patches/dsound-EAX/0018-dsound-Various-improvements-to-EAX-support.patch

@@ -1,4 +1,4 @@
-From 66c0779d339d5d27753e6f0ac6509741b908cca1 Mon Sep 17 00:00:00 2001
+From 3760db8daceee555842425400af01de2075b4568 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Sat, 4 Apr 2015 21:09:18 +0200
 Subject: [PATCH] dsound: Various improvements to EAX support.
@@ -16,28 +16,19 @@ update it later when necessary (-> much faster). Moreover, to avoid unnecessary
 locking, we initialize the EAX-specific properties always (for both the device and
 the buffers).
 ---
- dlls/dsound/buffer.c         |  6 ++--
+ dlls/dsound/buffer.c         |  4 ++-
  dlls/dsound/dsound.c         |  2 ++
  dlls/dsound/dsound_eax.h     |  1 +
  dlls/dsound/dsound_private.h |  1 +
  dlls/dsound/eax.c            | 68 ++++++++++++++++--------------------
- 5 files changed, 37 insertions(+), 41 deletions(-)
+ 5 files changed, 37 insertions(+), 39 deletions(-)
 
 diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c
-index 030f0849fed..252122d0374 100644
+index 6b7414d34ff..b1efa0d3012 100644
 --- a/dlls/dsound/buffer.c
 +++ b/dlls/dsound/buffer.c
-@@ -1084,8 +1084,6 @@ HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *ds
- 	/* calculate fragment size and write lead */
- 	DSOUND_RecalcFormat(dsb);
- 
--	dsb->eax.reverb_mix = EAX_REVERBMIX_USEDISTANCE;
--
- 	if (dsb->dsbd.dwFlags & DSBCAPS_CTRL3D) {
- 		dsb->ds3db_ds3db.dwSize = sizeof(DS3DBUFFER);
- 		dsb->ds3db_ds3db.vPosition.x = 0.0;
-@@ -1168,7 +1166,7 @@ HRESULT IDirectSoundBufferImpl_Duplicate(
-     HRESULT hres = DS_OK;
+@@ -1213,7 +1213,7 @@ HRESULT IDirectSoundBufferImpl_Duplicate(
+     VOID *committedbuff;
      TRACE("(%p,%p,%p)\n", device, ppdsb, pdsb);
  
 -    dsb = HeapAlloc(GetProcessHeap(),0,sizeof(*dsb));
@@ -45,7 +36,7 @@ index 030f0849fed..252122d0374 100644
      if (dsb == NULL) {
          WARN("out of memory\n");
          *ppdsb = NULL;
-@@ -1205,6 +1203,8 @@ HRESULT IDirectSoundBufferImpl_Duplicate(
+@@ -1261,6 +1261,8 @@ HRESULT IDirectSoundBufferImpl_Duplicate(
  
      InitializeSRWLock(&dsb->lock);
  
@@ -80,10 +71,10 @@ index a650108f570..a555a75e458 100644
  
      float *SampleBuffer;
 diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
-index 110dfe2c207..bca2bf46601 100644
+index 43e62626161..065fe820055 100644
 --- a/dlls/dsound/dsound_private.h
 +++ b/dlls/dsound/dsound_private.h
-@@ -234,6 +234,7 @@ HRESULT WINAPI EAX_Get(IDirectSoundBufferImpl *buf, REFGUID guidPropSet,
+@@ -239,6 +239,7 @@ HRESULT WINAPI EAX_Get(IDirectSoundBufferImpl *buf, REFGUID guidPropSet,
  HRESULT WINAPI EAX_Set(IDirectSoundBufferImpl *buf, REFGUID guidPropSet,
          ULONG dwPropID, void *pInstanceData, ULONG cbInstanceData, void *pPropData,
          ULONG cbPropData) DECLSPEC_HIDDEN;
@@ -92,7 +83,7 @@ index 110dfe2c207..bca2bf46601 100644
  void init_eax_buffer(IDirectSoundBufferImpl *dsb) DECLSPEC_HIDDEN;
  void process_eax_buffer(IDirectSoundBufferImpl *dsb, float *buf, DWORD count) DECLSPEC_HIDDEN;
 diff --git a/dlls/dsound/eax.c b/dlls/dsound/eax.c
-index a05b00e1c02..535ff92d44d 100644
+index a05b00e1c02..ef802b95a7d 100644
 --- a/dlls/dsound/eax.c
 +++ b/dlls/dsound/eax.c
 @@ -114,6 +114,8 @@ static const float LATE_LINE_MULTIPLIER = 4.0f;
@@ -253,5 +244,5 @@ index a05b00e1c02..535ff92d44d 100644
          switch (dwPropID) {
              case DSPROPERTY_EAXBUFFER_ALL:
 -- 
-2.27.0
+2.33.0
 

patches/dsound-Fast_Mixer/0001-dsound-Add-a-linear-resampler-for-use-with-a-large-n.patch

@@ -87,8 +87,8 @@ index a6402b09eff..28f32e9d092 100644
 +             * So far, this possibility of saving calls to
 +             * get_current_sample() is ignored.
 +             */
-+            float s1 = get_current_sample(dsb, idx, channel);
-+            float s2 = get_current_sample(dsb, idx + istride, channel);
++            float s1 = get_current_sample(dsb, dsb->buffer->memory, dsb->buflen, idx, channel);
++            float s2 = get_current_sample(dsb, dsb->buffer->memory, dsb->buflen, idx + istride, channel);
 +            float result = s1 * cur_freqAcc2 + s2 * cur_freqAcc;
 +            dsb->put(dsb, i * ostride, channel, result);
 +        }

patches/fltmgr.sys-FltBuildDefaultSecurityDescriptor/0001-fltmgr.sys-Implement-FltBuildDefaultSecurityDescript.patch

@@ -1,7 +1,7 @@
-From a1676237114c4c827e45e9adde3a190bc62b88d0 Mon Sep 17 00:00:00 2001
+From f9da0ca4c7012918b5c8660ebe8a9ea0c74f05b0 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Sun, 29 Aug 2021 13:26:53 +1000
-Subject: [PATCH 1/3] fltmgr.sys: Implement FltBuildDefaultSecurityDescriptor
+Subject: [PATCH] fltmgr.sys: Implement FltBuildDefaultSecurityDescriptor
 
 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 ---
@@ -12,12 +12,12 @@ Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
  4 files changed, 76 insertions(+), 3 deletions(-)
 
 diff --git a/dlls/fltmgr.sys/Makefile.in b/dlls/fltmgr.sys/Makefile.in
-index cbe124c2480..706f87b183b 100644
+index ba106a43831..bb1f34b4896 100644
 --- a/dlls/fltmgr.sys/Makefile.in
 +++ b/dlls/fltmgr.sys/Makefile.in
 @@ -1,5 +1,6 @@
  MODULE    = fltmgr.sys
- EXTRADLLFLAGS = -mno-cygwin -Wl,--subsystem,native
+ EXTRADLLFLAGS = -Wl,--subsystem,native
 +IMPORTS = ntoskrnl
  
  C_SRCS = \

patches/fltmgr.sys-FltBuildDefaultSecurityDescriptor/0002-fltmgr.sys-Create-import-library.patch

@@ -1,7 +1,7 @@
-From 4610af3e3e4e0715ad00de5e16b812f5bf9445be Mon Sep 17 00:00:00 2001
+From 36bb7032734a97c5b9d01ef96d595973ea16eb95 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Mon, 30 Aug 2021 15:15:35 +1000
-Subject: [PATCH 2/3] fltmgr.sys: Create import library
+Subject: [PATCH] fltmgr.sys: Create import library
 
 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 ---
@@ -9,13 +9,13 @@ Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/dlls/fltmgr.sys/Makefile.in b/dlls/fltmgr.sys/Makefile.in
-index 706f87b183b..764a1602678 100644
+index bb1f34b4896..5540df35d6a 100644
 --- a/dlls/fltmgr.sys/Makefile.in
 +++ b/dlls/fltmgr.sys/Makefile.in
 @@ -1,4 +1,5 @@
  MODULE    = fltmgr.sys
 +IMPORTLIB = fltmgr
- EXTRADLLFLAGS = -mno-cygwin -Wl,--subsystem,native
+ EXTRADLLFLAGS = -Wl,--subsystem,native
  IMPORTS = ntoskrnl
  
 -- 

patches/gdi32-rotation/0001-gdi32-fix-for-rotated-Arc-ArcTo-Chord-and-Pie-drawin.patch

@@ -1,4 +1,4 @@
-From 8204d928d034b627c2c4bc7930f62a352d609ad0 Mon Sep 17 00:00:00 2001
+From e26a5fd9e3b44cbee2919398233739d985274638 Mon Sep 17 00:00:00 2001
 From: Daniel Wendt <daniel.wendt@linux.com>
 Date: Fri, 15 Nov 2013 12:52:37 +0100
 Subject: [PATCH] gdi32: fix for rotated Arc, ArcTo, Chord and Pie drawing
@@ -11,7 +11,7 @@ Wine-Bug: http://bugs.winehq.org/show_bug.cgi?id=34579
  2 files changed, 83 insertions(+)
 
 diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c
-index 9bd6dc557a5..da9144f0862 100644
+index 9ebcaf7e4a3..c4456a76e77 100644
 --- a/dlls/gdi32/dibdrv/graphics.c
 +++ b/dlls/gdi32/dibdrv/graphics.c
 @@ -312,6 +312,60 @@ static int get_arc_points( int arc_dir, const RECT *rect, POINT start, POINT end
@@ -116,12 +116,12 @@ index 9bd6dc557a5..da9144f0862 100644
      {
          HeapFree( GetProcessHeap(), 0, points );
 diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h
-index 2dddf361d5b..e7d0090a52b 100644
+index 9f092913110..8dbf2772555 100644
 --- a/dlls/gdi32/gdi_private.h
 +++ b/dlls/gdi32/gdi_private.h
-@@ -289,4 +289,7 @@ static inline int get_dib_info_size( const BITMAPINFO *info, UINT coloruse )
-     return FIELD_OFFSET( BITMAPINFO, bmiColors[info->bmiHeader.biClrUsed] );
- }
+@@ -303,4 +303,7 @@ static inline int get_dib_info_size( const BITMAPINFO *info, UINT coloruse )
+ 
+ extern HMODULE gdi32_module DECLSPEC_HIDDEN;
  
 +BOOL xform_has_rotate_and_uniform_scale_and_shear( const XFORM *xform ) DECLSPEC_HIDDEN;
 +BOOL xform_decompose_rotation_and_translation( XFORM *xform, XFORM *rotation_and_translation ) DECLSPEC_HIDDEN;

patches/imm32-com-initialization/0001-imm32-Automatically-initialize-COM-on-window-activat.patch

@@ -1,4 +1,4 @@
-From 907420bdc128c5e0ac6ab91996baa1a70a7b50a0 Mon Sep 17 00:00:00 2001
+From d8c34665cf3869d553ef19d7556f5ce3ccf5c786 Mon Sep 17 00:00:00 2001
 From: Nikolay Sivov <nsivov@codeweavers.com>
 Date: Wed, 30 Jan 2019 12:25:41 +0300
 Subject: [PATCH] imm32: Automatically initialize COM on window activation.
@@ -15,7 +15,7 @@ Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
  7 files changed, 386 insertions(+), 3 deletions(-)
 
 diff --git a/dlls/imm32/Makefile.in b/dlls/imm32/Makefile.in
-index cebcf4ca30f..2ad39baf972 100644
+index b190888659b..ad10fc2fa45 100644
 --- a/dlls/imm32/Makefile.in
 +++ b/dlls/imm32/Makefile.in
 @@ -1,6 +1,6 @@
@@ -24,10 +24,10 @@ index cebcf4ca30f..2ad39baf972 100644
 -IMPORTS   = user32 gdi32 advapi32
 +IMPORTS   = user32 gdi32 advapi32 ole32
  
- EXTRADLLFLAGS = -mno-cygwin
- 
+ C_SRCS = \
+ 	imm.c
 diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c
-index 9d2a09f22be..2625549712e 100644
+index 20633041871..432dd224882 100644
 --- a/dlls/imm32/imm.c
 +++ b/dlls/imm32/imm.c
 @@ -19,6 +19,8 @@
@@ -556,10 +556,10 @@ index e12a1af5571..d37bc819447 100644
          FIXME("native imm32.dll not supported\n");
      return TRUE;
 diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h
-index c460b1571c8..e5af441e33b 100644
+index beece021a9f..5bc4a429b8d 100644
 --- a/dlls/user32/user_private.h
 +++ b/dlls/user32/user_private.h
-@@ -210,6 +210,7 @@ C_ASSERT( sizeof(struct user_thread_info) <= sizeof(((TEB *)0)->Win32ClientInfo)
+@@ -209,6 +209,7 @@ C_ASSERT( sizeof(struct user_thread_info) <= sizeof(((TEB *)0)->Win32ClientInfo)
  extern INT global_key_state_counter DECLSPEC_HIDDEN;
  extern BOOL (WINAPI *imm_register_window)(HWND) DECLSPEC_HIDDEN;
  extern void (WINAPI *imm_unregister_window)(HWND) DECLSPEC_HIDDEN;
@@ -568,5 +568,5 @@ index c460b1571c8..e5af441e33b 100644
  struct user_key_state_info
  {
 -- 
-2.29.2
+2.33.0
 

patches/inseng-Implementation/0001-inseng-Implement-CIF-reader-and-download-functions.patch

@@ -1,4 +1,4 @@
-From cc5f08165c512cecaafc19bb4157d2bea31f4770 Mon Sep 17 00:00:00 2001
+From eee60c1777c710cfcb4283922990a306361548ba Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Mon, 5 Sep 2016 15:31:29 +0200
 Subject: [PATCH] inseng: Implement CIF reader and download functions.
@@ -18,7 +18,7 @@ FIXME: Needs splitting.
  create mode 100644 dlls/inseng/inseng_private.h
 
 diff --git a/dlls/inseng/Makefile.in b/dlls/inseng/Makefile.in
-index d3f29328f67..b12c2156339 100644
+index 0217203791a..ba2388c97ed 100644
 --- a/dlls/inseng/Makefile.in
 +++ b/dlls/inseng/Makefile.in
 @@ -1,8 +1,11 @@
@@ -26,7 +26,7 @@ index d3f29328f67..b12c2156339 100644
 -IMPORTS   = uuid ole32 advapi32
 +IMPORTS   = uuid ole32 advapi32 urlmon shlwapi
  
- EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
+ EXTRADLLFLAGS = -Wb,--prefer-native
  
 -C_SRCS = inseng_main.c
 +C_SRCS = \
@@ -37,7 +37,7 @@ index d3f29328f67..b12c2156339 100644
  IDL_SRCS = inseng_classes.idl
 diff --git a/dlls/inseng/icif.c b/dlls/inseng/icif.c
 new file mode 100644
-index 00000000000..6fd35625006
+index 00000000000..11a91b86476
 --- /dev/null
 +++ b/dlls/inseng/icif.c
 @@ -0,0 +1,1745 @@
@@ -3862,5 +3862,5 @@ index 8a3f4c4d270..82927418a99 100644
 +cpp_quote("HRESULT WINAPI GetICifFileFromFile(ICifFile **, const char *);")
 +cpp_quote("HRESULT WINAPI GetICifRWFileFromFile(ICifRWFile **, const char *);")
 -- 
-2.30.2
+2.33.0
 

patches/nvcuda-CUDA_Support/0002-nvcuda-Add-stub-dll.patch

@@ -34,6 +34,7 @@ index 00000000000..4b33278c115
 +++ b/dlls/nvcuda/Makefile.in
 @@ -0,0 +1,6 @@
 +MODULE    = nvcuda.dll
++EXTRADLLFLAGS = -mcygwin
 +
 +C_SRCS = \
 +	nvcuda.c

patches/nvcuda-CUDA_Support/0003-nvcuda-First-implementation.patch

@@ -1,4 +1,4 @@
-From de6fa54bd3abdb58136d378b13a08e809e5b6a10 Mon Sep 17 00:00:00 2001
+From 420c654406ccb66b6876bed02851d7278318cd4e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sat, 3 Jan 2015 03:39:11 +0100
 Subject: [PATCH] nvcuda: First implementation. (rev 2)
@@ -23,10 +23,10 @@ Changes by Sebastian Lackner <sebastian@fds-team.de>:
  create mode 100644 dlls/nvcuda/tests/nvcuda.c
 
 diff --git a/configure.ac b/configure.ac
-index f6a8f8d2458..67f4376f9aa 100644
+index 341ed704730..6a3bdc6a89b 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3558,6 +3558,7 @@ WINE_CONFIG_MAKEFILE(dlls/ntoskrnl.exe/tests)
+@@ -3564,6 +3564,7 @@ WINE_CONFIG_MAKEFILE(dlls/ntoskrnl.exe/tests)
  WINE_CONFIG_MAKEFILE(dlls/ntprint)
  WINE_CONFIG_MAKEFILE(dlls/ntprint/tests)
  WINE_CONFIG_MAKEFILE(dlls/nvcuda)
@@ -35,17 +35,16 @@ index f6a8f8d2458..67f4376f9aa 100644
  WINE_CONFIG_MAKEFILE(dlls/odbc32)
  WINE_CONFIG_MAKEFILE(dlls/odbcbcp)
 diff --git a/dlls/nvcuda/Makefile.in b/dlls/nvcuda/Makefile.in
-index 4b33278c115..0921ce64cae 100644
+index f8bea7210cc..20a66c90afb 100644
 --- a/dlls/nvcuda/Makefile.in
 +++ b/dlls/nvcuda/Makefile.in
-@@ -1,6 +1,7 @@
- MODULE    = nvcuda.dll
+@@ -2,5 +2,6 @@ MODULE    = nvcuda.dll
+ EXTRADLLFLAGS = -mcygwin
  
  C_SRCS = \
 +	internal.c \
  	nvcuda.c
  
- RC_SRCS = nvcuda.rc
 diff --git a/dlls/nvcuda/internal.c b/dlls/nvcuda/internal.c
 new file mode 100644
 index 00000000000..664bdf84f51
@@ -3417,5 +3416,5 @@ index 00000000000..fc8f300a28b
 +    test_TlsNotifyInterface();
 +}
 -- 
-2.20.1
+2.33.0
 

patches/nvcuda-CUDA_Support/0007-nvcuda-Properly-wrap-stream-callbacks-by-forwarding-.patch

@@ -1,4 +1,4 @@
-From 3693c4416a4d6e938a36a63970d9ae16ac5c38a8 Mon Sep 17 00:00:00 2001
+From c9ebf40c3752098c4366446467a544bbd2260ee6 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Thu, 22 Jan 2015 01:02:53 +0100
 Subject: [PATCH] nvcuda: Properly wrap stream callbacks by forwarding them to
@@ -10,11 +10,12 @@ Subject: [PATCH] nvcuda: Properly wrap stream callbacks by forwarding them to
  2 files changed, 122 insertions(+), 15 deletions(-)
 
 diff --git a/dlls/nvcuda/Makefile.in b/dlls/nvcuda/Makefile.in
-index 0921ce64cae..ab8a5a29a7a 100644
+index 20a66c90afb..7691c6aede3 100644
 --- a/dlls/nvcuda/Makefile.in
 +++ b/dlls/nvcuda/Makefile.in
-@@ -1,4 +1,5 @@
+@@ -1,5 +1,6 @@
  MODULE    = nvcuda.dll
+ EXTRADLLFLAGS = -mcygwin
 +EXTRALIBS = $(PTHREAD_LIBS)
  
  C_SRCS = \
@@ -204,5 +205,5 @@ index 7b23abe6f90..117d78b6766 100644
  }
  
 -- 
-2.28.0
+2.33.0
 

patches/nvcuvid-CUDA_Video_Support/0001-nvcuvid-First-implementation.patch

@@ -1,4 +1,4 @@
-From 2b576a42fb563be7426ebc5919901d9ccb965bda Mon Sep 17 00:00:00 2001
+From b65a4bd03ba8ef03599ded3d2ac1180cc0ae1c5b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Tue, 6 Jan 2015 05:16:36 +0100
 Subject: [PATCH] nvcuvid: First implementation. (rev 2)
@@ -7,13 +7,13 @@ Changes by Sebastian Lackner <sebastian@fds-team.de>:
 * Convert structures properly where the Windows and Linux definition differs.
 ---
  configure.ac              |   1 +
- dlls/nvcuvid/Makefile.in  |   4 +
+ dlls/nvcuvid/Makefile.in  |   5 +
  dlls/nvcuvid/nvcuvid.c    | 512 ++++++++++++++++++++++++++++++++++++++
  dlls/nvcuvid/nvcuvid.spec |  24 ++
  include/Makefile.in       |   2 +
  include/cuviddec.h        |  99 ++++++++
  include/nvcuvid.h         |  79 ++++++
- 7 files changed, 721 insertions(+)
+ 7 files changed, 722 insertions(+)
  create mode 100644 dlls/nvcuvid/Makefile.in
  create mode 100644 dlls/nvcuvid/nvcuvid.c
  create mode 100644 dlls/nvcuvid/nvcuvid.spec
@@ -21,10 +21,10 @@ Changes by Sebastian Lackner <sebastian@fds-team.de>:
  create mode 100644 include/nvcuvid.h
 
 diff --git a/configure.ac b/configure.ac
-index 2be5ea9945a..620a9006aa7 100644
+index 73925b808fc..c81b347762f 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3653,6 +3653,7 @@ WINE_CONFIG_MAKEFILE(dlls/nvapi/tests)
+@@ -3574,6 +3574,7 @@ WINE_CONFIG_MAKEFILE(dlls/nvapi/tests)
  WINE_CONFIG_MAKEFILE(dlls/nvapi64,enable_win64)
  WINE_CONFIG_MAKEFILE(dlls/nvcuda)
  WINE_CONFIG_MAKEFILE(dlls/nvcuda/tests)
@@ -34,11 +34,12 @@ index 2be5ea9945a..620a9006aa7 100644
  WINE_CONFIG_MAKEFILE(dlls/odbcbcp)
 diff --git a/dlls/nvcuvid/Makefile.in b/dlls/nvcuvid/Makefile.in
 new file mode 100644
-index 00000000000..2c2dc8ccf67
+index 00000000000..23b2537c58d
 --- /dev/null
 +++ b/dlls/nvcuvid/Makefile.in
-@@ -0,0 +1,4 @@
+@@ -0,0 +1,5 @@
 +MODULE    = nvcuvid.dll
++EXTRADLLFLAGS = -mcygwin
 +
 +C_SRCS = \
 +	nvcuvid.c
@@ -591,10 +592,10 @@ index 00000000000..433e7db3b7e
 +@ stdcall cuvidSetVideoSourceState(ptr long) wine_cuvidSetVideoSourceState
 +@ stdcall cuvidUnmapVideoFrame(ptr long) wine_cuvidUnmapVideoFrame
 diff --git a/include/Makefile.in b/include/Makefile.in
-index 9fc3769b675..4f77d8eb016 100644
+index e409d8d788b..b4ae2bbcd96 100644
 --- a/include/Makefile.in
 +++ b/include/Makefile.in
-@@ -92,6 +92,7 @@ SOURCES = \
+@@ -97,6 +97,7 @@ SOURCES = \
  	ctxtcall.idl \
  	cuda.h \
  	custcntl.h \
@@ -602,7 +603,7 @@ index 9fc3769b675..4f77d8eb016 100644
  	cvconst.h \
  	cvttyp.idl \
  	d2d1.idl \
-@@ -538,6 +539,7 @@ SOURCES = \
+@@ -555,6 +556,7 @@ SOURCES = \
  	ntsecpkg.h \
  	ntstatus.h \
  	nvapi.h \
@@ -801,5 +802,5 @@ index 00000000000..a192ef64c2e
 +
 +#endif /* __WINE_NVCUVID_H */
 -- 
-2.28.0
+2.33.0
 

patches/nvencodeapi-Video_Encoder/0001-nvencodeapi-First-implementation.patch

@@ -38,8 +38,9 @@ new file mode 100644
 index 00000000000..a2e58acaf0d
 --- /dev/null
 +++ b/dlls/nvencodeapi/Makefile.in
-@@ -0,0 +1,4 @@
+@@ -0,0 +1,5 @@
 +MODULE    = nvencodeapi.dll
++EXTRADLLFLAGS = -mcygwin
 +
 +C_SRCS = \
 +	nvencodeapi.c
@@ -430,8 +431,9 @@ new file mode 100644
 index 00000000000..8297ec352b5
 --- /dev/null
 +++ b/dlls/nvencodeapi64/Makefile.in
-@@ -0,0 +1,5 @@
+@@ -0,0 +1,6 @@
 +MODULE    = nvencodeapi64.dll
++EXTRADLLFLAGS = -mcygwin
 +PARENTSRC = ../nvencodeapi
 +
 +C_SRCS = \

patches/packager-DllMain/0001-packager-Prefer-native-version.patch

@@ -1,25 +1,25 @@
-From 8e4c76596335097ca35af9d289c2096dc274b4d3 Mon Sep 17 00:00:00 2001
+From b8164026e54c8bb9e9401d4952ebe07d3811bc45 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Sun, 6 Aug 2017 02:50:23 +0200
 Subject: [PATCH] packager: Prefer native version.
 
 ---
- dlls/packager/Makefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ dlls/packager/Makefile.in | 2 ++
+ 1 file changed, 2 insertions(+)
 
 diff --git a/dlls/packager/Makefile.in b/dlls/packager/Makefile.in
-index a90014ce25d..747eed203ae 100644
+index a2b2daa0cea..55482167bc1 100644
 --- a/dlls/packager/Makefile.in
 +++ b/dlls/packager/Makefile.in
-@@ -1,7 +1,7 @@
+@@ -1,6 +1,8 @@
  MODULE = packager.dll
  IMPORTS = uuid shell32 shlwapi user32
  
--EXTRADLLFLAGS = -mno-cygwin
-+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
- 
++EXTRADLLFLAGS = -Wb,--prefer-native
++
  C_SRCS = \
  	packager_main.c
+ 
 -- 
-2.20.1
+2.33.0
 

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "16e73be10d940c9c04101a47687a6f8a385c2b0f"
+	echo "975d0632a19efd41338cb73a97f1b0bdbe7bc0cc"
 }
 
 # Show version information