Rebase against adda27cdb82fd40ef71e554b8ba17244cb871710.

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "9fea10cceb0fbc0cf3111f462c98f7b994d5c893"
+	echo "adda27cdb82fd40ef71e554b8ba17244cb871710"
 }
 
 # Show version information

patches/shell32-IconCache/0001-shell32-iconcache-Generate-icons-from-available-icons-.patch

@@ -1,4 +1,4 @@
-From 6b66550b43ca3a870b6d8a8eb2aaef7001d8abc0 Mon Sep 17 00:00:00 2001
+From e4e08d2ff648f1021d9833f7ea986c42dfc642ad Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Gabriel=20Iv=C4=83ncescu?= <gabrielopcode@gmail.com>
 Date: Fri, 30 Nov 2018 12:20:40 +0200
 Subject: [PATCH] shell32/iconcache: Generate icons from available icons if
@@ -19,11 +19,11 @@ smaller icons are only picked if no other available icon is larger).
 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45696
 Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
 ---
- dlls/shell32/iconcache.c | 68 +++++++++++++++++++++++++++++++++-------
- 1 file changed, 57 insertions(+), 11 deletions(-)
+ dlls/shell32/iconcache.c | 72 +++++++++++++++++++++++++++++++---------
+ 1 file changed, 57 insertions(+), 15 deletions(-)
 
 diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c
-index f1d95e851eb..9d5f8b1c04a 100644
+index 1c61374a732..a1c91f4785e 100644
 --- a/dlls/shell32/iconcache.c
 +++ b/dlls/shell32/iconcache.c
 @@ -21,6 +21,7 @@
@@ -34,21 +34,25 @@ index f1d95e851eb..9d5f8b1c04a 100644
  
  #define COBJMACROS
  
-@@ -339,13 +340,6 @@ static INT SIC_IconAppend (const WCHAR *sourcefile, INT src_index, HICON *hicons
+@@ -335,17 +336,6 @@ static INT SIC_IconAppend (const WCHAR *sourcefile, INT src_index, HICON *hicons
      return ret;
  }
  
 -static BOOL get_imagelist_icon_size(int list, SIZE *size)
 -{
+-    int cx, cy;
 -    if (list < 0 || list >= ARRAY_SIZE(shell_imagelists)) return FALSE;
 -
--    return ImageList_GetIconSize( shell_imagelists[list], &size->cx, &size->cy );
+-    if (!ImageList_GetIconSize( shell_imagelists[list], &cx, &cy )) return FALSE;
+-    size->cx = cx;
+-    size->cy = cy;
+-    return TRUE;
 -}
 -
  /****************************************************************************
   * SIC_LoadIcon				[internal]
   *
-@@ -356,15 +350,67 @@ static INT SIC_LoadIcon (const WCHAR *sourcefile, INT index, DWORD flags)
+@@ -356,15 +346,67 @@ static INT SIC_LoadIcon (const WCHAR *sourcefile, INT index, DWORD flags)
  {
      HICON hicons[ARRAY_SIZE(shell_imagelists)] = { 0 };
      HICON hshortcuts[ARRAY_SIZE(hicons)] = { 0 };
@@ -60,8 +64,8 @@ index f1d95e851eb..9d5f8b1c04a 100644
 +    /* Keep track of the sizes in case any icon fails to get extracted */
      for (i = 0; i < ARRAY_SIZE(hicons); i++)
      {
--        get_imagelist_icon_size( i, &size );
--        if (!PrivateExtractIconsW( sourcefile, index, size.cx, size.cy, &hicons[i], 0, 1, 0 ))
+-        if (!get_imagelist_icon_size( i, &size ) ||
+-            !PrivateExtractIconsW( sourcefile, index, size.cx, size.cy, &hicons[i], 0, 1, 0 ))
 -            WARN("Failed to load icon %d from %s.\n", index, debugstr_w(sourcefile));
 +        ImageList_GetIconSize(shell_imagelists[i], &size[i].cx, &size[i].cy);
 +        PrivateExtractIconsW(sourcefile, index, size[i].cx, size[i].cy, &hicons[i], 0, 1, 0);
@@ -121,5 +125,5 @@ index f1d95e851eb..9d5f8b1c04a 100644
      }
  
 -- 
-2.33.0
+2.34.1
 

patches/xactengine3_7-PrepareWave/0002-xactengine3_7-Implement-IXACT3Engine-PrepareStreamin.patch

@@ -1,18 +1,17 @@
-From ff3d57ac0bc2f08ab955c3ae734cb488566246c8 Mon Sep 17 00:00:00 2001
+From f4ade3b6ec20410e3ee49ea195c5e219669b2077 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Sat, 15 Aug 2020 17:36:23 +1000
-Subject: [PATCH 2/3] xactengine3_7: Implement IXACT3Engine
- PrepareStreamingWave
+Subject: [PATCH] xactengine3_7: Implement IXACT3Engine PrepareStreamingWave
 
 ---
  dlls/xactengine3_7/xact_dll.c | 55 +++++++++++++++++++++++++++++++++--
  1 file changed, 53 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c
-index 5bcd8a6202c..99e4bd19049 100644
+index 98c3cf8f076..ef70516361a 100644
 --- a/dlls/xactengine3_7/xact_dll.c
 +++ b/dlls/xactengine3_7/xact_dll.c
-@@ -976,8 +976,59 @@ static HRESULT WINAPI IXACT3EngineImpl_PrepareStreamingWave(IXACT3Engine *iface,
+@@ -1068,8 +1068,59 @@ static HRESULT WINAPI IXACT3EngineImpl_PrepareStreamingWave(IXACT3Engine *iface,
          IXACT3Wave **ppWave)
  {
      XACT3EngineImpl *This = impl_from_IXACT3Engine(iface);
@@ -25,7 +24,7 @@ index 5bcd8a6202c..99e4bd19049 100644
 +    FACTWaveBankEntry fact_wavebank;
 +    UINT ret;
 +
-+    TRACE("(%p)->(0x%08x, %p, %p, %d, %p, %d, %d, %p)\n", This, dwFlags, &entry, &streamingParams,
++    TRACE("(%p)->(0x%08lx, %p, %p, %ld, %p, %ld, %d, %p)\n", This, dwFlags, &entry, &streamingParams,
 +            dwAlignment, pdwSeekTable, dwPlayOffset, nLoopCount, ppWave);
 +
 +    fake = (wrap_readfile_struct*) CoTaskMemAlloc(
@@ -48,7 +47,7 @@ index 5bcd8a6202c..99e4bd19049 100644
 +     *   passing through NULL to ensure it's not used.
 +     */
 +    ret = FACTAudioEngine_PrepareStreamingWave(This->fact_engine, dwFlags, fact_wavebank, fakeParms,
-+            dwAlignment, pdwSeekTable, NULL, dwPlayOffset, nLoopCount, &fwave);
++            dwAlignment, (uint32_t *)pdwSeekTable, NULL, dwPlayOffset, nLoopCount, &fwave);
 +
 +    if(ret != 0 || !fwave)
 +    {
@@ -75,5 +74,5 @@ index 5bcd8a6202c..99e4bd19049 100644
  
  static HRESULT WINAPI IXACT3EngineImpl_PrepareWave(IXACT3Engine *iface,
 -- 
-2.28.0
+2.34.1
 

patches/xactengine3_7-PrepareWave/0003-xactengine3_7-Implement-IXACT3Engine-PrepareInMemory.patch

@@ -1,17 +1,17 @@
-From 8387b1a1a4a07b66246015e3791518cbe1a69244 Mon Sep 17 00:00:00 2001
+From 38a38afe8996c020f6cdab5f96c06beed0a5b1ae Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Mon, 15 Aug 2020 17:49:23 +1000
-Subject: [PATCH 3/3] xactengine3_7: Implement IXACT3Engine PrepareInMemoryWave
+Date: Sat, 15 Aug 2020 17:49:23 +1000
+Subject: [PATCH] xactengine3_7: Implement IXACT3Engine PrepareInMemoryWave
 
 ---
  dlls/xactengine3_7/xact_dll.c | 40 +++++++++++++++++++++++++++++++++--
  1 file changed, 38 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c
-index 99e4bd19049..e6c3863b9ee 100644
+index ef70516361a..e712f6e40fd 100644
 --- a/dlls/xactengine3_7/xact_dll.c
 +++ b/dlls/xactengine3_7/xact_dll.c
-@@ -965,8 +965,44 @@ static HRESULT WINAPI IXACT3EngineImpl_PrepareInMemoryWave(IXACT3Engine *iface,
+@@ -1057,8 +1057,44 @@ static HRESULT WINAPI IXACT3EngineImpl_PrepareInMemoryWave(IXACT3Engine *iface,
          IXACT3Wave **ppWave)
  {
      XACT3EngineImpl *This = impl_from_IXACT3Engine(iface);
@@ -22,7 +22,7 @@ index 99e4bd19049..e6c3863b9ee 100644
 +    FACTWaveBankEntry fact_wavebank;
 +    UINT ret;
 +
-+    TRACE("(%p)->(0x%08x, %p, %p, %p, %d, %d, %p)\n", This, dwFlags, &entry, pdwSeekTable,
++    TRACE("(%p)->(0x%08lx, %p, %p, %p, %ld, %d, %p)\n", This, dwFlags, &entry, pdwSeekTable,
 +          pbWaveData, dwPlayOffset, nLoopCount, ppWave);
 +
 +    fact_wavebank.dwFlagsAndDuration = entry.dwFlagsAndDuration;
@@ -33,7 +33,7 @@ index 99e4bd19049..e6c3863b9ee 100644
 +    fact_wavebank.LoopRegion.dwTotalSamples = entry.LoopRegion.dwTotalSamples;
 +
 +    ret = FACTAudioEngine_PrepareInMemoryWave(This->fact_engine, dwFlags, fact_wavebank,
-+            pdwSeekTable, pbWaveData, dwPlayOffset, nLoopCount, &fwave);
++            (uint32_t *)pdwSeekTable, pbWaveData, dwPlayOffset, nLoopCount, &fwave);
 +    if(ret != 0 || !fwave)
 +    {
 +        ERR("Failed to CreateWave: %d (%p)\n", ret, fwave);
@@ -59,5 +59,5 @@ index 99e4bd19049..e6c3863b9ee 100644
  
  static HRESULT WINAPI IXACT3EngineImpl_PrepareStreamingWave(IXACT3Engine *iface,
 -- 
-2.28.0
+2.34.1
 

staging/upstream-commit

@@ -1 +1 @@
-9fea10cceb0fbc0cf3111f462c98f7b994d5c893
+adda27cdb82fd40ef71e554b8ba17244cb871710