Release v7.5

Warning fixes.

.github/workflows/macOS.yml

@@ -17,20 +17,18 @@ jobs:
           brew update
           brew install --cask xquartz
           brew install  bison \
-                        faudio \
                         gphoto2 \
                         gst-plugins-base \
-                        jxrlib \
-                        little-cms2 \
-                        mingw-w64 \
+                        gcenx/wine/mingw-w64@9 \
                         molten-vk \
-                        mpg123
+                        sdl2
 
       - name: Add bison & krb5 to $PATH
         run: |
           set -eu
           echo "$(brew --prefix bison)/bin" >> $GITHUB_PATH
           echo "$(brew --prefix krb5)/bin" >> $GITHUB_PATH
+          echo "$(brew --prefix mingw-w64@9)/bin" >> $GITHUB_PATH
 
       - name: Get upstream-commit
         run: |
@@ -64,6 +62,8 @@ jobs:
                         --x-lib=/opt/X11/lib
 
       - name: Build wine64
+        # mingw-w64 brew formula bumped binutils 2.38 causing a regression in parallel builds
+        # use gcenx/wine/mingw-w64@9 this uses binutils 2.37
         run: |
           cd $GITHUB_WORKSPACE/wine
           make -j$(sysctl -n hw.ncpu 2>/dev/null)
@@ -84,7 +84,7 @@ jobs:
                         gst-plugins-base \
                         jxrlib \
                         little-cms2 \
-                        mingw-w64 \
+                        gcenx/wine/mingw-w64@9 \
                         molten-vk \
                         mpg123
 
@@ -93,6 +93,7 @@ jobs:
           set -eu
           echo "$(brew --prefix bison)/bin" >> $GITHUB_PATH
           echo "$(brew --prefix krb5)/bin" >> $GITHUB_PATH
+          echo "$(brew --prefix mingw-w64@9)/bin" >> $GITHUB_PATH
 
       - name: Get upstream-commit
         run: |
@@ -124,6 +125,8 @@ jobs:
                         --x-lib=/opt/X11/lib
 
       - name: Build wine64
+        # mingw-w64 brew formula bumped binutils 2.38 causing a regression in parallel builds
+        # use gcenx/wine/mingw-w64@9 this uses binutils 2.37
         run: |
           cd $GITHUB_WORKSPACE/wine
           make -j$(sysctl -n hw.ncpu 2>/dev/null)

patches/Compiler_Warnings/0026-dwrite-Avoid-implicit-cast-of-interface-pointer.patch

@@ -1,18 +1,17 @@
-From b51fdc7e211f676d169c937209bf689e57252c5d Mon Sep 17 00:00:00 2001
+From 7e3c4d732bacaeaf37ab8f32a7548715825eff4d Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Tue, 22 Mar 2016 21:58:40 +0100
 Subject: [PATCH] dwrite: Avoid implicit cast of interface pointer.
 
 ---
- dlls/dwrite/font.c   | 4 ++--
- dlls/dwrite/layout.c | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
+ dlls/dwrite/font.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c
-index aa51c744297..7cad015480f 100644
+index 2296c74c1e3..2b5e18aab19 100644
 --- a/dlls/dwrite/font.c
 +++ b/dlls/dwrite/font.c
-@@ -2130,7 +2130,7 @@ static struct dwrite_font *unsafe_impl_from_IDWriteFont(IDWriteFont *iface)
+@@ -2514,7 +2514,7 @@ static struct dwrite_font *unsafe_impl_from_IDWriteFont(IDWriteFont *iface)
      if (!iface)
          return NULL;
      assert(iface->lpVtbl == (IDWriteFontVtbl*)&dwritefontvtbl);
@@ -21,7 +20,7 @@ index aa51c744297..7cad015480f 100644
  }
  
  struct dwrite_fontface *unsafe_impl_from_IDWriteFontFace(IDWriteFontFace *iface)
-@@ -2138,7 +2138,7 @@ struct dwrite_fontface *unsafe_impl_from_IDWriteFontFace(IDWriteFontFace *iface)
+@@ -2522,7 +2522,7 @@ struct dwrite_fontface *unsafe_impl_from_IDWriteFontFace(IDWriteFontFace *iface)
      if (!iface)
          return NULL;
      assert(iface->lpVtbl == (IDWriteFontFaceVtbl*)&dwritefontfacevtbl);
@@ -30,19 +29,6 @@ index aa51c744297..7cad015480f 100644
  }
  
  static struct dwrite_fontfacereference *unsafe_impl_from_IDWriteFontFaceReference(IDWriteFontFaceReference *iface)
-diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c
-index 1f6201a6a93..35791d5c22e 100644
---- a/dlls/dwrite/layout.c
-+++ b/dlls/dwrite/layout.c
-@@ -5886,7 +5886,7 @@ static const IDWriteTextFormat3Vtbl dwritetextformatvtbl =
- static struct dwrite_textformat *unsafe_impl_from_IDWriteTextFormat(IDWriteTextFormat *iface)
- {
-     return (iface->lpVtbl == (IDWriteTextFormatVtbl*)&dwritetextformatvtbl) ?
--        CONTAINING_RECORD(iface, struct dwrite_textformat, IDWriteTextFormat3_iface) : NULL;
-+        CONTAINING_RECORD((IDWriteTextFormat3 *)iface, struct dwrite_textformat, IDWriteTextFormat3_iface) : NULL;
- }
- 
- HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *collection, DWRITE_FONT_WEIGHT weight,
 -- 
-2.29.2
+2.34.1
 

patches/Compiler_Warnings/0031-include-Check-element-type-in-CONTAINING_RECORD-and-.patch

@@ -1,4 +1,4 @@
-From a349cc8bdcc3a083ea507dbbdeba9053e3a338e4 Mon Sep 17 00:00:00 2001
+From bd6e11aee0fbe2f880f87bec8b3d145b3de15dab Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Tue, 22 Mar 2016 23:08:30 +0100
 Subject: [PATCH] include: Check element type in CONTAINING_RECORD and similar
@@ -31,31 +31,31 @@ index b4d681fe0f3..287ad394fae 100644
  
  #endif  /* __WINE_SERVER_LIST_H */
 diff --git a/include/wine/rbtree.h b/include/wine/rbtree.h
-index 8aae29c8c10..330b3e8fbc9 100644
+index 4e86f3cfb84..694dc039cb1 100644
 --- a/include/wine/rbtree.h
 +++ b/include/wine/rbtree.h
 @@ -23,8 +23,14 @@
  #ifndef __WINE_WINE_RBTREE_H
  #define __WINE_WINE_RBTREE_H
  
--#define WINE_RB_ENTRY_VALUE(element, type, field) \
+-#define RB_ENTRY_VALUE(element, type, field) \
 -    ((type *)((char *)(element) - offsetof(type, field)))
 +#ifdef __GNUC__
-+# define WINE_RB_ENTRY_VALUE(element, type, field) ({       \
++# define RB_ENTRY_VALUE(element, type, field) ({       \
 +     const typeof(((type *)0)->field) *__ptr = (element);   \
 +     (type *)((char *)__ptr - offsetof(type, field)); })
 +#else
-+# define WINE_RB_ENTRY_VALUE(element, type, field) \
++# define RB_ENTRY_VALUE(element, type, field) \
 +     ((type *)((char *)(element) - offsetof(type, field)))
 +#endif
  
- struct wine_rb_entry
+ struct rb_entry
  {
 diff --git a/include/winnt.h b/include/winnt.h
-index 46e17c546a7..d5c65d2017b 100644
+index 9296a3dc555..c7406b8db39 100644
 --- a/include/winnt.h
 +++ b/include/winnt.h
-@@ -793,8 +793,14 @@ typedef struct _MEMORY_BASIC_INFORMATION
+@@ -840,8 +840,14 @@ typedef struct _WIN32_MEMORY_RANGE_ENTRY
  #define RTL_FIELD_SIZE(type, field) (sizeof(((type *)0)->field))
  #define RTL_SIZEOF_THROUGH_FIELD(type, field) (FIELD_OFFSET(type, field) + RTL_FIELD_SIZE(type, field))
  
@@ -73,5 +73,5 @@ index 46e17c546a7..d5c65d2017b 100644
  #define ARRAYSIZE(x) (sizeof(x) / sizeof((x)[0]))
  #ifdef __WINESRC__
 -- 
-2.26.2
+2.34.1
 

patches/Compiler_Warnings/0039-rpcrt4-Avoid-implicit-cast-of-interface-pointer.patch

@@ -1,4 +1,4 @@
-From f34ee38467781b2f7bae7e7f8a04a4210bf7d046 Mon Sep 17 00:00:00 2001
+From 6d3e24776dac1c5bf4625617c61367f506c42f92 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Tue, 8 Jun 2021 11:22:48 +1000
 Subject: [PATCH] rpcrt4: Avoid implicit cast of interface pointer.
@@ -9,7 +9,7 @@ Subject: [PATCH] rpcrt4: Avoid implicit cast of interface pointer.
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c
-index 764b304a047..58ea128e8a4 100644
+index d0d2e19342c..991ec052283 100644
 --- a/dlls/rpcrt4/ndr_marshall.c
 +++ b/dlls/rpcrt4/ndr_marshall.c
 @@ -6999,7 +6999,7 @@ static unsigned char *WINAPI NdrContextHandleMarshall(
@@ -22,7 +22,7 @@ index 764b304a047..58ea128e8a4 100644
          NdrServerContextNewMarshall(pStubMsg, ctxt, rundown, pFormat);
      }
 diff --git a/dlls/rpcrt4/ndr_typelib.c b/dlls/rpcrt4/ndr_typelib.c
-index f1f25885b75..126e8ec8766 100644
+index ff1d1025838..a8425a1e519 100644
 --- a/dlls/rpcrt4/ndr_typelib.c
 +++ b/dlls/rpcrt4/ndr_typelib.c
 @@ -1452,7 +1452,7 @@ struct typelib_stub
@@ -33,7 +33,7 @@ index f1f25885b75..126e8ec8766 100644
 +    struct typelib_stub *stub = CONTAINING_RECORD((CStdStubBuffer *)iface, struct typelib_stub, stub.stub_buffer);
      ULONG refcount = InterlockedDecrement(&stub->stub.stub_buffer.RefCount);
  
-     TRACE("(%p) decreasing refs to %d\n", stub, refcount);
+     TRACE("(%p) decreasing refs to %ld\n", stub, refcount);
 -- 
-2.30.2
+2.34.1
 

patches/Pipelight/0002-user32-Decrease-minimum-SetTimer-interval-to-5-ms.patch

@@ -1,31 +1,18 @@
-From 40630c14377561e90a4be405d2124338002a88f7 Mon Sep 17 00:00:00 2001
+From 81a36b530261731d6020e09770237ae5bf58166d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Fri, 2 May 2014 20:46:19 +0200
 Subject: [PATCH] user32: Decrease minimum SetTimer interval to 5 ms. (try 2)
 
 ---
- dlls/user32/message.c   | 2 +-
  dlls/user32/tests/msg.c | 2 ++
+ dlls/win32u/message.c   | 2 +-
  2 files changed, 3 insertions(+), 1 deletion(-)
 
-diff --git a/dlls/user32/message.c b/dlls/user32/message.c
-index 1336865112a..cbe9920384f 100644
---- a/dlls/user32/message.c
-+++ b/dlls/user32/message.c
-@@ -4496,7 +4496,7 @@ UINT_PTR WINAPI SetCoalescableTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMER
- 
-     if (proc) winproc = WINPROC_AllocProc( (WNDPROC)proc, FALSE );
- 
--    timeout = min( max( USER_TIMER_MINIMUM, timeout ), USER_TIMER_MAXIMUM );
-+    timeout = min( max( 5, timeout ), USER_TIMER_MAXIMUM );
- 
-     SERVER_START_REQ( set_win_timer )
-     {
 diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
-index c0ba5834cf9..a6bc158e8a7 100644
+index 4519da6962d..304a3b87f46 100644
 --- a/dlls/user32/tests/msg.c
 +++ b/dlls/user32/tests/msg.c
-@@ -10282,6 +10282,7 @@ static void test_timers(void)
+@@ -10709,6 +10709,7 @@ static void test_timers(void)
      start = GetTickCount();
      while (GetTickCount()-start < 1001 && GetMessageA(&msg, info.hWnd, 0, 0))
          DispatchMessageA(&msg);
@@ -33,7 +20,7 @@ index c0ba5834cf9..a6bc158e8a7 100644
      ok(abs(count-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE /* xp */
         || broken(abs(count-64) <= TIMER_COUNT_TOLERANCE) /* most common */
         || broken(abs(count-43) <= TIMER_COUNT_TOLERANCE) /* w2k3, win8 */,
-@@ -10352,6 +10353,7 @@ static void test_timers_no_wnd(void)
+@@ -10779,6 +10780,7 @@ static void test_timers_no_wnd(void)
      start = GetTickCount();
      while (GetTickCount()-start < 1001 && GetMessageA(&msg, NULL, 0, 0))
          DispatchMessageA(&msg);
@@ -41,6 +28,19 @@ index c0ba5834cf9..a6bc158e8a7 100644
      ok(abs(count-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE /* xp */
         || broken(abs(count-64) <= TIMER_COUNT_TOLERANCE) /* most common */
         || broken(abs(count-43) <= TIMER_COUNT_TOLERANCE) /* w1064v1809 */,
+diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c
+index d00178e6aa4..513150a3d61 100644
+--- a/dlls/win32u/message.c
++++ b/dlls/win32u/message.c
+@@ -170,7 +170,7 @@ UINT_PTR WINAPI NtUserSetSystemTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIME
+ 
+     if (proc) winproc = alloc_winproc( (WNDPROC)proc, TRUE );
+ 
+-    timeout = min( max( USER_TIMER_MINIMUM, timeout ), USER_TIMER_MAXIMUM );
++    timeout = min( max( 5, timeout ), USER_TIMER_MAXIMUM );
+ 
+     SERVER_START_REQ( set_win_timer )
+     {
 -- 
-2.17.1
+2.35.1
 

patches/advapi32-LsaLookupPrivilegeName/0001-advapi32-Fix-error-code-when-calling-LsaOpenPolicy-f.patch

@@ -1,8 +1,8 @@
-From 971cfbe9ab8a7cb62c5b3e62fe4fe0bfc4518889 Mon Sep 17 00:00:00 2001
+From a59b5e6351edfc13baca665b4f69a5d0786e7edc Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sun, 5 Mar 2017 23:04:36 +0100
-Subject: advapi32: Fix error code when calling LsaOpenPolicy for non existing
- remote machine.
+Subject: [PATCH] advapi32: Fix error code when calling LsaOpenPolicy for non
+ existing remote machine.
 
 ---
  dlls/advapi32/lsa.c       |  2 +-
@@ -10,10 +10,10 @@ Subject: advapi32: Fix error code when calling LsaOpenPolicy for non existing
  2 files changed, 11 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c
-index bfd879bbc73..2e021a1ec2d 100644
+index b63519c0299..d8a084ff408 100644
 --- a/dlls/advapi32/lsa.c
 +++ b/dlls/advapi32/lsa.c
-@@ -659,7 +659,7 @@ NTSTATUS WINAPI LsaOpenPolicy(
+@@ -739,7 +739,7 @@ NTSTATUS WINAPI LsaOpenPolicy(
            ObjectAttributes, DesiredAccess, PolicyHandle);
  
      ADVAPI_ForceLocalComputer(SystemName ? SystemName->Buffer : NULL,
@@ -23,10 +23,10 @@ index bfd879bbc73..2e021a1ec2d 100644
  
      if(PolicyHandle) *PolicyHandle = (LSA_HANDLE)0xcafe;
 diff --git a/dlls/advapi32/tests/lsa.c b/dlls/advapi32/tests/lsa.c
-index 861fea0525e..bb291e65a71 100644
+index 5c00298d41e..d04f5645345 100644
 --- a/dlls/advapi32/tests/lsa.c
 +++ b/dlls/advapi32/tests/lsa.c
-@@ -39,6 +39,8 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
+@@ -43,6 +43,8 @@ static NTSTATUS (WINAPI *pLsaGetUserName)(PUNICODE_STRING *user, PUNICODE_STRING
  
  static void test_lsa(void)
  {
@@ -35,7 +35,7 @@ index 861fea0525e..bb291e65a71 100644
      NTSTATUS status;
      LSA_HANDLE handle;
      LSA_OBJECT_ATTRIBUTES object_attributes;
-@@ -46,6 +48,14 @@ static void test_lsa(void)
+@@ -50,6 +52,14 @@ static void test_lsa(void)
      ZeroMemory(&object_attributes, sizeof(object_attributes));
      object_attributes.Length = sizeof(object_attributes);
  
@@ -49,7 +49,7 @@ index 861fea0525e..bb291e65a71 100644
 +
      status = LsaOpenPolicy( NULL, &object_attributes, POLICY_ALL_ACCESS, &handle);
      ok(status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED,
-        "LsaOpenPolicy(POLICY_ALL_ACCESS) returned 0x%08x\n", status);
+        "LsaOpenPolicy(POLICY_ALL_ACCESS) returned 0x%08lx\n", status);
 -- 
-2.14.2
+2.34.1
 

patches/api-ms-win-Stub_DLLs/0009-ext-ms-win-xaml-pal-l1-1-0-Add-dll-and-add-stub-for-.patch

@@ -1,34 +1,34 @@
-From 19efcf925a49a5d7e0b82eb6e4797b0ac725f2dc Mon Sep 17 00:00:00 2001
+From 49de5f50cf6eb5a3c4ab07be05ca25f96991ab8a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sun, 17 Jan 2016 17:07:35 +0100
 Subject: [PATCH] ext-ms-win-xaml-pal-l1-1-0: Add dll and add stub for
  XamlBehaviorEnabled.
 
 ---
- configure.ac                                       |  1 +
- dlls/ext-ms-win-xaml-pal-l1-1-0/Makefile.in        |  4 +++
- .../ext-ms-win-xaml-pal-l1-1-0.spec                |  6 ++++
- dlls/ext-ms-win-xaml-pal-l1-1-0/main.c             | 35 ++++++++++++++++++++++
+ configure.ac                                  |  1 +
+ dlls/ext-ms-win-xaml-pal-l1-1-0/Makefile.in   |  4 +++
+ .../ext-ms-win-xaml-pal-l1-1-0.spec           |  6 ++++
+ dlls/ext-ms-win-xaml-pal-l1-1-0/main.c        | 35 +++++++++++++++++++
  4 files changed, 46 insertions(+)
  create mode 100644 dlls/ext-ms-win-xaml-pal-l1-1-0/Makefile.in
  create mode 100644 dlls/ext-ms-win-xaml-pal-l1-1-0/ext-ms-win-xaml-pal-l1-1-0.spec
  create mode 100644 dlls/ext-ms-win-xaml-pal-l1-1-0/main.c
 
 diff --git a/configure.ac b/configure.ac
-index 8484c83..a9b51d2 100644
+index 7fb2da63a0b..e9ea24f2680 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3255,6 +3255,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-shell-comctl32-init-l1-1-0)
- WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-shell-comdlg32-l1-1-0)
- WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-shell-shell32-l1-2-0)
- WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-uxtheme-themes-l1-1-0)
+@@ -2572,6 +2572,7 @@ WINE_CONFIG_MAKEFILE(dlls/evr)
+ WINE_CONFIG_MAKEFILE(dlls/evr/tests)
+ WINE_CONFIG_MAKEFILE(dlls/explorerframe)
+ WINE_CONFIG_MAKEFILE(dlls/explorerframe/tests)
 +WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-xaml-pal-l1-1-0)
  WINE_CONFIG_MAKEFILE(dlls/faultrep)
  WINE_CONFIG_MAKEFILE(dlls/faultrep/tests)
  WINE_CONFIG_MAKEFILE(dlls/feclient)
 diff --git a/dlls/ext-ms-win-xaml-pal-l1-1-0/Makefile.in b/dlls/ext-ms-win-xaml-pal-l1-1-0/Makefile.in
 new file mode 100644
-index 0000000..6382d85
+index 00000000000..6382d85272b
 --- /dev/null
 +++ b/dlls/ext-ms-win-xaml-pal-l1-1-0/Makefile.in
 @@ -0,0 +1,4 @@
@@ -38,7 +38,7 @@ index 0000000..6382d85
 +	main.c
 diff --git a/dlls/ext-ms-win-xaml-pal-l1-1-0/ext-ms-win-xaml-pal-l1-1-0.spec b/dlls/ext-ms-win-xaml-pal-l1-1-0/ext-ms-win-xaml-pal-l1-1-0.spec
 new file mode 100644
-index 0000000..c167f5e
+index 00000000000..c167f5e753e
 --- /dev/null
 +++ b/dlls/ext-ms-win-xaml-pal-l1-1-0/ext-ms-win-xaml-pal-l1-1-0.spec
 @@ -0,0 +1,6 @@
@@ -50,7 +50,7 @@ index 0000000..c167f5e
 +@ stub XamlPalUninitialize
 diff --git a/dlls/ext-ms-win-xaml-pal-l1-1-0/main.c b/dlls/ext-ms-win-xaml-pal-l1-1-0/main.c
 new file mode 100644
-index 0000000..3e28275
+index 00000000000..3e282758f41
 --- /dev/null
 +++ b/dlls/ext-ms-win-xaml-pal-l1-1-0/main.c
 @@ -0,0 +1,35 @@
@@ -90,5 +90,5 @@ index 0000000..3e28275
 +    return TRUE;
 +}
 -- 
-1.9.1
+2.34.1
 

patches/api-ms-win-Stub_DLLs/0010-ext-ms-win-appmodel-usercontext-l1-1-0-Add-dll-and-a.patch

@@ -1,34 +1,34 @@
-From 65dda249fcbd5c1685fc89ede60e946b910508e3 Mon Sep 17 00:00:00 2001
+From adf1cce491f1580f73599ba2ec951a4004b4e091 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sun, 17 Jan 2016 17:12:45 +0100
 Subject: [PATCH] ext-ms-win-appmodel-usercontext-l1-1-0: Add dll and add stub
  for UserContextExtInitialize.
 
 ---
- configure.ac                                       |  1 +
- .../Makefile.in                                    |  4 +++
- .../ext-ms-win-appmodel-usercontext-l1-1-0.spec    |  3 ++
- dlls/ext-ms-win-appmodel-usercontext-l1-1-0/main.c | 35 ++++++++++++++++++++++
+ configure.ac                                  |  1 +
+ .../Makefile.in                               |  4 +++
+ ...xt-ms-win-appmodel-usercontext-l1-1-0.spec |  3 ++
+ .../main.c                                    | 35 +++++++++++++++++++
  4 files changed, 43 insertions(+)
  create mode 100644 dlls/ext-ms-win-appmodel-usercontext-l1-1-0/Makefile.in
  create mode 100644 dlls/ext-ms-win-appmodel-usercontext-l1-1-0/ext-ms-win-appmodel-usercontext-l1-1-0.spec
  create mode 100644 dlls/ext-ms-win-appmodel-usercontext-l1-1-0/main.c
 
 diff --git a/configure.ac b/configure.ac
-index 53ddeea..4061187 100644
+index e9ea24f2680..54c8fcb183b 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3238,6 +3238,7 @@ WINE_CONFIG_MAKEFILE(dlls/evr)
+@@ -2572,6 +2572,7 @@ WINE_CONFIG_MAKEFILE(dlls/evr)
  WINE_CONFIG_MAKEFILE(dlls/evr/tests)
  WINE_CONFIG_MAKEFILE(dlls/explorerframe)
  WINE_CONFIG_MAKEFILE(dlls/explorerframe/tests)
 +WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-appmodel-usercontext-l1-1-0)
- WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-authz-context-l1-1-0)
- WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-domainjoin-netjoin-l1-1-0)
- WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-dwmapi-ext-l1-1-0)
+ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-xaml-pal-l1-1-0)
+ WINE_CONFIG_MAKEFILE(dlls/faultrep)
+ WINE_CONFIG_MAKEFILE(dlls/faultrep/tests)
 diff --git a/dlls/ext-ms-win-appmodel-usercontext-l1-1-0/Makefile.in b/dlls/ext-ms-win-appmodel-usercontext-l1-1-0/Makefile.in
 new file mode 100644
-index 0000000..16eee75
+index 00000000000..16eee7588ff
 --- /dev/null
 +++ b/dlls/ext-ms-win-appmodel-usercontext-l1-1-0/Makefile.in
 @@ -0,0 +1,4 @@
@@ -38,7 +38,7 @@ index 0000000..16eee75
 +	main.c
 diff --git a/dlls/ext-ms-win-appmodel-usercontext-l1-1-0/ext-ms-win-appmodel-usercontext-l1-1-0.spec b/dlls/ext-ms-win-appmodel-usercontext-l1-1-0/ext-ms-win-appmodel-usercontext-l1-1-0.spec
 new file mode 100644
-index 0000000..7642d15
+index 00000000000..7642d156c94
 --- /dev/null
 +++ b/dlls/ext-ms-win-appmodel-usercontext-l1-1-0/ext-ms-win-appmodel-usercontext-l1-1-0.spec
 @@ -0,0 +1,3 @@
@@ -47,7 +47,7 @@ index 0000000..7642d15
 +@ stub UserContextExtSetToken
 diff --git a/dlls/ext-ms-win-appmodel-usercontext-l1-1-0/main.c b/dlls/ext-ms-win-appmodel-usercontext-l1-1-0/main.c
 new file mode 100644
-index 0000000..7a9e75f
+index 00000000000..7a9e75f7109
 --- /dev/null
 +++ b/dlls/ext-ms-win-appmodel-usercontext-l1-1-0/main.c
 @@ -0,0 +1,35 @@
@@ -87,5 +87,5 @@ index 0000000..7a9e75f
 +    return S_OK;
 +}
 -- 
-2.7.4
+2.34.1
 

patches/cmd-launch-association/0001-cmd-Support-for-launching-programs-based-on-file-ass.patch

@@ -121,7 +121,7 @@ index cacb7ea7751..19a807c1624 100644
 +            WINE_TRACE("Process still running, but returning anyway\n");
 +            errorlevel = 0;
 +          } else {
-+            WINE_TRACE("Process ended, errorlevel %d\n", errorlevel);
++            WINE_TRACE("Process ended, errorlevel %ld\n", errorlevel);
 +          }
 +
 +          CloseHandle(pe.hProcess);
@@ -160,7 +160,7 @@ index cacb7ea7751..19a807c1624 100644
 -        GetExitCodeProcess (pe.hProcess, &errorlevel);
 -        if (errorlevel == STILL_ACTIVE) errorlevel = 0;
 +      if (!status) {
-+        WINE_TRACE("Failed to launch via CreateProcess, rc %d (%d)\n",
++        WINE_TRACE("Failed to launch via CreateProcess, rc %d (%ld)\n",
 +                   status, GetLastError());
 +        break;
 +      }
@@ -180,7 +180,7 @@ index cacb7ea7751..19a807c1624 100644
 +        WINE_TRACE("Process still running, but returning anyway\n");
 +        errorlevel = 0;
 +      } else {
-+        WINE_TRACE("Process ended, errorlevel %d\n", errorlevel);
++        WINE_TRACE("Process ended, errorlevel %ld\n", errorlevel);
 +      }
 +
 +      CloseHandle(pe.hProcess);

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

@@ -1,4 +1,4 @@
-From a5045503cf3310058cc64814ff9626f4877a13bb Mon Sep 17 00:00:00 2001
+From 12a9a9cb506aede4748611c8fa3339afcee7c070 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 db592f0868d..ba13abacc46 100755
+index 20bcb96a2a6..b8fd60dbb53 100755
 --- a/configure
 +++ b/configure
-@@ -20291,6 +20291,7 @@ wine_fn_config_makefile dlls/crypt32/tests enable_tests
+@@ -20910,6 +20910,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 db592f0868d..ba13abacc46 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 d449b88fb19..af75e0e80ab 100644
+index 6cbd947bf31..c68c5975e63 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3029,6 +3029,7 @@ WINE_CONFIG_MAKEFILE(dlls/crypt32/tests)
+@@ -2361,6 +2361,7 @@ WINE_CONFIG_MAKEFILE(dlls/crypt32/tests)
  WINE_CONFIG_MAKEFILE(dlls/cryptdlg)
  WINE_CONFIG_MAKEFILE(dlls/cryptdll)
  WINE_CONFIG_MAKEFILE(dlls/cryptext)
@@ -113,7 +113,7 @@ index 537ba66cd3b..f9e34d1f8c5 100644
 +    PCCERT_CONTEXT ctx;
 +    CRYPTUI_VIEWCERTIFICATE_STRUCTW info;
 +
-+    TRACE("(%p, %p, %s, %u)\n", hwnd, hinst, debugstr_w(filename), showcmd);
++    TRACE("(%p, %p, %s, %lu)\n", hwnd, hinst, debugstr_w(filename), showcmd);
 +
 +    if (!CryptQueryObject(CERT_QUERY_OBJECT_FILE, filename, CERT_QUERY_CONTENT_FLAG_CERT,
 +                          CERT_QUERY_FORMAT_FLAG_ALL, 0, NULL, NULL, NULL, NULL, NULL,
@@ -142,7 +142,7 @@ index 537ba66cd3b..f9e34d1f8c5 100644
 +    HRESULT hr;
 +    LPWSTR filenameW;
 +
-+    TRACE("(%p, %p, %s, %u)\n", hwnd, hinst, debugstr_a(filename), showcmd);
++    TRACE("(%p, %p, %s, %lu)\n", hwnd, hinst, debugstr_a(filename), showcmd);
 +
 +    filenameW = heap_strdupAtoW(filename);
 +    hr = CryptExtOpenCERW(hwnd, hinst, filenameW, showcmd);
@@ -212,10 +212,10 @@ index 00000000000..cc62a772b59
 +
 +    SetLastError(0xdeadbeef);
 +    hr = pCryptExtOpenCER(0, 0, "dead.beef", SW_HIDE);
-+    ok(hr == S_OK, "got %#x\n", hr);
++    ok(hr == S_OK, "got %#lx\n", hr);
 +
 +    hr = pCryptExtOpenCER(0, 0, "VeriSign Class 3 Public Primary Certification Authority - G4.txt", SW_SHOW);
-+    ok(hr == S_OK, "got %#x\n", hr);
++    ok(hr == S_OK, "got %#lx\n", hr);
 +}
 +
 +START_TEST(cryptext)
@@ -227,5 +227,5 @@ index 00000000000..cc62a772b59
 +    test_CryptExtOpenCER();
 +}
 -- 
-2.33.0
+2.34.1
 

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

@@ -1,4 +1,4 @@
-From e3a6b75cbce69e18742135fdd8e105132d8ca9dd Mon Sep 17 00:00:00 2001
+From ea3579b5b3d701647f5c7f16de658f1cd7fe876d 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
@@ -38,7 +38,7 @@ index ccd4319ace2..6854c73ebcb 100644
  EXTRADLLFLAGS = -Wb,--prefer-native
  
 diff --git a/dlls/d3dx11_43/main.c b/dlls/d3dx11_43/main.c
-index 950f6d76f5c..00c1db35e42 100644
+index 5dad027864f..00c1db35e42 100644
 --- a/dlls/d3dx11_43/main.c
 +++ b/dlls/d3dx11_43/main.c
 @@ -66,12 +66,3 @@ HRESULT WINAPI D3DX11GetImageInfoFromFileW(const WCHAR *filename, ID3DX11ThreadP
@@ -49,13 +49,13 @@ index 950f6d76f5c..00c1db35e42 100644
 -HRESULT WINAPI D3DX11GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX11ThreadPump *pump,
 -        D3DX11_IMAGE_INFO *img_info, HRESULT *hresult)
 -{
--    FIXME("src_data %p, src_data_size %lu, pump %p, img_info %p, hresult %p stub!\n",
+-    FIXME("src_data %p, src_data_size %Iu, pump %p, img_info %p, hresult %p stub!\n",
 -            src_data, src_data_size, pump, img_info, hresult);
 -
 -    return E_NOTIMPL;
 -}
 diff --git a/dlls/d3dx11_43/texture.c b/dlls/d3dx11_43/texture.c
-index ee6808d76d6..8addf4f84d3 100644
+index 81ac8ee6db7..6881eec107d 100644
 --- a/dlls/d3dx11_43/texture.c
 +++ b/dlls/d3dx11_43/texture.c
 @@ -15,14 +15,190 @@
@@ -155,7 +155,7 @@ index ee6808d76d6..8addf4f84d3 100644
 +    GUID container_format;
 +    HRESULT hr;
 +
-+    TRACE("src_data %p, src_data_size %lu, pump %p, img_info %p, hresult %p.\n",
++    TRACE("src_data %p, src_data_size %Iu, pump %p, img_info %p, hresult %p.\n",
 +            src_data, src_data_size, pump, img_info, hresult);
 +
 +    if (!src_data || !src_data_size || !img_info)
@@ -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.33.0
+2.34.1
 

patches/d3dx11_43-D3DX11CreateTextureFromMemory/0002-d3dx11_42-Implement-D3DX11CreateTextureFromMemory.patch

@@ -1,4 +1,4 @@
-From 2f65959901f62bfc6a48c683e6eaa5d6ed5f7416 Mon Sep 17 00:00:00 2001
+From 5be34c9e347d4379179eeba742b25986152d4e4f Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Tue, 3 Aug 2021 11:13:18 +1000
 Subject: [PATCH] d3dx11_42: Implement D3DX11CreateTextureFromMemory
@@ -9,7 +9,7 @@ Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
  1 file changed, 342 insertions(+), 5 deletions(-)
 
 diff --git a/dlls/d3dx11_43/texture.c b/dlls/d3dx11_43/texture.c
-index 8addf4f84d3..f47b8583c6c 100644
+index 6881eec107d..b91bd8d881a 100644
 --- a/dlls/d3dx11_43/texture.c
 +++ b/dlls/d3dx11_43/texture.c
 @@ -22,6 +22,7 @@
@@ -239,7 +239,7 @@ index 8addf4f84d3..f47b8583c6c 100644
 +        SIZE_T src_data_size, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump,
          ID3D11Resource **texture, HRESULT *hresult)
  {
--    FIXME("device %p, data %p, data_size %lu, load_info %p, pump %p, texture %p, hresult %p stub.\n",
+-    FIXME("device %p, data %p, data_size %Iu, load_info %p, pump %p, texture %p, hresult %p stub.\n",
 -            device, data, data_size, load_info, pump, texture, hresult);
 +    unsigned int frame_count, width, height, stride, frame_size;
 +    IWICFormatConverter *converter = NULL;
@@ -259,7 +259,7 @@ index 8addf4f84d3..f47b8583c6c 100644
 +    HRESULT hr;
  
 -    return E_NOTIMPL;
-+    TRACE("device %p, src_data %p, src_data_size %lu, load_info %p, pump %p, texture %p, hresult %p.\n",
++    TRACE("device %p, data %p, data_size %Iu, load_info %p, pump %p, texture %p, hresult %p.\n",
 +            device, src_data, src_data_size, load_info, pump, texture, hresult);
 +
 +    if (!src_data || !src_data_size || !texture)
@@ -391,5 +391,5 @@ index 8addf4f84d3..f47b8583c6c 100644
  
  HRESULT WINAPI D3DX11SaveTextureToFileW(ID3D11DeviceContext *context, ID3D11Resource *texture,
 -- 
-2.30.2
+2.34.1
 

patches/d3dx9_36-CloneEffect/0001-d3dx9_36-Improve-stub-for-ID3DXEffectImpl_CloneEffec.patch

@@ -1,67 +0,0 @@
-From a31e5531eb8f3be5fddf9f81f48f191b1a10c2aa Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Mon, 16 Mar 2015 08:18:33 +0100
-Subject: [PATCH] d3dx9_36: Improve stub for ID3DXEffectImpl_CloneEffect.
-
----
- dlls/d3dx9_36/effect.c       |  4 +++-
- dlls/d3dx9_36/tests/effect.c | 16 +++++-----------
- 2 files changed, 8 insertions(+), 12 deletions(-)
-
-diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
-index 7d686a435d..f8d8ab9cd2 100644
---- a/dlls/d3dx9_36/effect.c
-+++ b/dlls/d3dx9_36/effect.c
-@@ -4100,7 +4100,9 @@ static HRESULT WINAPI d3dx_effect_CloneEffect(ID3DXEffect *iface, IDirect3DDevic
-     if (!device)
-         return D3DERR_INVALIDCALL;
- 
--    return E_NOTIMPL;
-+    iface->lpVtbl->AddRef(iface);
-+    *new_effect = iface;
-+    return S_OK;
- }
- 
- #if D3DX_SDK_VERSION >= 27
-diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c
-index 5c4a3c5e77..ff15426938 100644
---- a/dlls/d3dx9_36/tests/effect.c
-+++ b/dlls/d3dx9_36/tests/effect.c
-@@ -7419,29 +7419,23 @@ static void test_effect_clone(void)
-     ok(hr == D3DERR_INVALIDCALL, "Got result %#x.\n", hr);
- 
-     hr = effect->lpVtbl->CloneEffect(effect, device, &cloned);
--todo_wine
-     ok(hr == D3D_OK, "Got result %#x.\n", hr);
--if (hr == D3D_OK)
--{
--    ok(cloned != effect, "Expected new effect instance.\n");
-+
-+    todo_wine ok(cloned != effect, "Expected new effect instance.\n");
-     cloned->lpVtbl->Release(cloned);
--}
-     /* Try with different device. */
-     device2 = create_device(&window2);
-     hr = effect->lpVtbl->CloneEffect(effect, device2, &cloned);
--todo_wine
-     ok(hr == D3D_OK, "Got result %#x.\n", hr);
--if (hr == D3D_OK)
--{
--    ok(cloned != effect, "Expected new effect instance.\n");
-+    todo_wine ok(cloned != effect, "Expected new effect instance.\n");
- 
-     hr = cloned->lpVtbl->GetDevice(cloned, &device3);
-     ok(hr == S_OK, "Failed to get effect device.\n");
--    ok(device3 == device2, "Unexpected device instance.\n");
-+    todo_wine ok(device3 == device2, "Unexpected device instance, device3 %p, device2 %p.\n", device3, device2);
-     IDirect3DDevice9_Release(device3);
- 
-     cloned->lpVtbl->Release(cloned);
--}
-+
-     IDirect3DDevice9_Release(device2);
-     DestroyWindow(window2);
-     effect->lpVtbl->Release(effect);
--- 
-2.21.0
-

patches/d3dx9_36-CloneEffect/definition

@@ -1 +0,0 @@
-Fixes: [44635] Improve stub for ID3DXEffectImpl_CloneEffect

patches/d3dx9_36-D3DXSHProjectCubeMap/0001-d3dx9_-Add-D3DXSHProjectCubeMap-stub.patch

@@ -1,317 +0,0 @@
-From a8d19eb67828f3c4f157f0734d0d22c47cc11882 Mon Sep 17 00:00:00 2001
-From: Andrey Gusev <andrey.goosev@gmail.com>
-Date: Mon, 17 Dec 2018 12:23:40 +1100
-Subject: [PATCH] d3dx9_*: Add D3DXSHProjectCubeMap stub
-
-Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46284
----
- dlls/d3dx9_24/d3dx9_24.spec |  2 +-
- dlls/d3dx9_25/d3dx9_25.spec |  2 +-
- dlls/d3dx9_26/d3dx9_26.spec |  2 +-
- dlls/d3dx9_27/d3dx9_27.spec |  2 +-
- dlls/d3dx9_28/d3dx9_28.spec |  2 +-
- dlls/d3dx9_29/d3dx9_29.spec |  2 +-
- dlls/d3dx9_30/d3dx9_30.spec |  2 +-
- dlls/d3dx9_31/d3dx9_31.spec |  2 +-
- dlls/d3dx9_32/d3dx9_32.spec |  2 +-
- dlls/d3dx9_33/d3dx9_33.spec |  2 +-
- dlls/d3dx9_34/d3dx9_34.spec |  2 +-
- dlls/d3dx9_35/d3dx9_35.spec |  2 +-
- dlls/d3dx9_36/math.c        | 14 ++++++++++++++
- dlls/d3dx9_37/d3dx9_37.spec |  2 +-
- dlls/d3dx9_38/d3dx9_38.spec |  2 +-
- dlls/d3dx9_39/d3dx9_39.spec |  2 +-
- dlls/d3dx9_40/d3dx9_40.spec |  2 +-
- dlls/d3dx9_41/d3dx9_41.spec |  2 +-
- dlls/d3dx9_42/d3dx9_42.spec |  2 +-
- dlls/d3dx9_43/d3dx9_43.spec |  2 +-
- include/d3dx9math.h         |  1 +
- 21 files changed, 34 insertions(+), 19 deletions(-)
-
-diff --git a/dlls/d3dx9_24/d3dx9_24.spec b/dlls/d3dx9_24/d3dx9_24.spec
-index 7002e2b..06fb3ca 100644
---- a/dlls/d3dx9_24/d3dx9_24.spec
-+++ b/dlls/d3dx9_24/d3dx9_24.spec
-@@ -256,7 +256,7 @@
- @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr)
- @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
- @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
--@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
-+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
- @ stdcall D3DXSHRotate(ptr long ptr ptr)
- @ stdcall D3DXSHRotateZ(ptr long float ptr)
- @ stdcall D3DXSHScale(ptr long ptr float)
-diff --git a/dlls/d3dx9_25/d3dx9_25.spec b/dlls/d3dx9_25/d3dx9_25.spec
-index 3010005..e7b5f6b 100644
---- a/dlls/d3dx9_25/d3dx9_25.spec
-+++ b/dlls/d3dx9_25/d3dx9_25.spec
-@@ -256,7 +256,7 @@
- @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr)
- @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
- @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
--@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
-+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
- @ stdcall D3DXSHRotate(ptr long ptr ptr)
- @ stdcall D3DXSHRotateZ(ptr long float ptr)
- @ stdcall D3DXSHScale(ptr long ptr float)
-diff --git a/dlls/d3dx9_26/d3dx9_26.spec b/dlls/d3dx9_26/d3dx9_26.spec
-index fe641a7..c4a6c9f 100644
---- a/dlls/d3dx9_26/d3dx9_26.spec
-+++ b/dlls/d3dx9_26/d3dx9_26.spec
-@@ -260,7 +260,7 @@
- @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr)
- @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
- @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
--@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
-+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
- @ stdcall D3DXSHRotate(ptr long ptr ptr)
- @ stdcall D3DXSHRotateZ(ptr long float ptr)
- @ stdcall D3DXSHScale(ptr long ptr float)
-diff --git a/dlls/d3dx9_27/d3dx9_27.spec b/dlls/d3dx9_27/d3dx9_27.spec
-index fe641a7..c4a6c9f 100644
---- a/dlls/d3dx9_27/d3dx9_27.spec
-+++ b/dlls/d3dx9_27/d3dx9_27.spec
-@@ -260,7 +260,7 @@
- @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr)
- @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
- @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
--@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
-+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
- @ stdcall D3DXSHRotate(ptr long ptr ptr)
- @ stdcall D3DXSHRotateZ(ptr long float ptr)
- @ stdcall D3DXSHScale(ptr long ptr float)
-diff --git a/dlls/d3dx9_28/d3dx9_28.spec b/dlls/d3dx9_28/d3dx9_28.spec
-index acbcf26..480396b 100644
---- a/dlls/d3dx9_28/d3dx9_28.spec
-+++ b/dlls/d3dx9_28/d3dx9_28.spec
-@@ -265,7 +265,7 @@
- @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr)
- @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
- @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
--@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
-+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
- @ stdcall D3DXSHRotate(ptr long ptr ptr)
- @ stdcall D3DXSHRotateZ(ptr long float ptr)
- @ stdcall D3DXSHScale(ptr long ptr float)
-diff --git a/dlls/d3dx9_29/d3dx9_29.spec b/dlls/d3dx9_29/d3dx9_29.spec
-index acbcf26..480396b 100644
---- a/dlls/d3dx9_29/d3dx9_29.spec
-+++ b/dlls/d3dx9_29/d3dx9_29.spec
-@@ -265,7 +265,7 @@
- @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr)
- @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
- @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
--@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
-+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
- @ stdcall D3DXSHRotate(ptr long ptr ptr)
- @ stdcall D3DXSHRotateZ(ptr long float ptr)
- @ stdcall D3DXSHScale(ptr long ptr float)
-diff --git a/dlls/d3dx9_30/d3dx9_30.spec b/dlls/d3dx9_30/d3dx9_30.spec
-index fdf5ee4..09014db 100644
---- a/dlls/d3dx9_30/d3dx9_30.spec
-+++ b/dlls/d3dx9_30/d3dx9_30.spec
-@@ -265,7 +265,7 @@
- @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr)
- @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
- @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
--@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
-+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
- @ stdcall D3DXSHRotate(ptr long ptr ptr)
- @ stdcall D3DXSHRotateZ(ptr long float ptr)
- @ stdcall D3DXSHScale(ptr long ptr float)
-diff --git a/dlls/d3dx9_31/d3dx9_31.spec b/dlls/d3dx9_31/d3dx9_31.spec
-index ed842cd..3506942 100644
---- a/dlls/d3dx9_31/d3dx9_31.spec
-+++ b/dlls/d3dx9_31/d3dx9_31.spec
-@@ -262,7 +262,7 @@
- @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr)
- @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
- @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
--@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
-+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
- @ stdcall D3DXSHRotate(ptr long ptr ptr)
- @ stdcall D3DXSHRotateZ(ptr long float ptr)
- @ stdcall D3DXSHScale(ptr long ptr float)
-diff --git a/dlls/d3dx9_32/d3dx9_32.spec b/dlls/d3dx9_32/d3dx9_32.spec
-index af5624c..4d24919 100644
---- a/dlls/d3dx9_32/d3dx9_32.spec
-+++ b/dlls/d3dx9_32/d3dx9_32.spec
-@@ -267,7 +267,7 @@
- @ stub D3DXSHMultiply6(ptr ptr ptr)
- @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
- @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
--@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
-+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
- @ stdcall D3DXSHRotate(ptr long ptr ptr)
- @ stdcall D3DXSHRotateZ(ptr long float ptr)
- @ stdcall D3DXSHScale(ptr long ptr float)
-diff --git a/dlls/d3dx9_33/d3dx9_33.spec b/dlls/d3dx9_33/d3dx9_33.spec
-index af5624c..4d24919 100644
---- a/dlls/d3dx9_33/d3dx9_33.spec
-+++ b/dlls/d3dx9_33/d3dx9_33.spec
-@@ -267,7 +267,7 @@
- @ stub D3DXSHMultiply6(ptr ptr ptr)
- @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
- @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
--@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
-+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
- @ stdcall D3DXSHRotate(ptr long ptr ptr)
- @ stdcall D3DXSHRotateZ(ptr long float ptr)
- @ stdcall D3DXSHScale(ptr long ptr float)
-diff --git a/dlls/d3dx9_34/d3dx9_34.spec b/dlls/d3dx9_34/d3dx9_34.spec
-index af5624c..4d24919 100644
---- a/dlls/d3dx9_34/d3dx9_34.spec
-+++ b/dlls/d3dx9_34/d3dx9_34.spec
-@@ -267,7 +267,7 @@
- @ stub D3DXSHMultiply6(ptr ptr ptr)
- @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
- @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
--@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
-+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
- @ stdcall D3DXSHRotate(ptr long ptr ptr)
- @ stdcall D3DXSHRotateZ(ptr long float ptr)
- @ stdcall D3DXSHScale(ptr long ptr float)
-diff --git a/dlls/d3dx9_35/d3dx9_35.spec b/dlls/d3dx9_35/d3dx9_35.spec
-index af5624c..4d24919 100644
---- a/dlls/d3dx9_35/d3dx9_35.spec
-+++ b/dlls/d3dx9_35/d3dx9_35.spec
-@@ -267,7 +267,7 @@
- @ stub D3DXSHMultiply6(ptr ptr ptr)
- @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
- @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
--@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
-+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
- @ stdcall D3DXSHRotate(ptr long ptr ptr)
- @ stdcall D3DXSHRotateZ(ptr long float ptr)
- @ stdcall D3DXSHScale(ptr long ptr float)
-diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c
-index 8909c3c..bc1a7fc 100644
---- a/dlls/d3dx9_36/math.c
-+++ b/dlls/d3dx9_36/math.c
-@@ -3007,6 +3007,20 @@ static void rotate_X(FLOAT *out, UINT order, FLOAT a, FLOAT *in)
-     out[35] = 0.9057110548f * in[31] - 0.4192627370f * in[33] + 0.0624999329f * in[35];
- }
- 
-+HRESULT WINAPI D3DXSHProjectCubeMap(UINT order, IDirect3DCubeTexture9 *cubemap, FLOAT *rout, FLOAT *gout, FLOAT *bout)
-+{
-+    FIXME("order %u, cubemap %p, rout %p, gout %p, bout %p: stub!\n", order, cubemap, rout, gout, bout);
-+
-+    if(!cubemap || order < D3DXSH_MINORDER || order > D3DXSH_MAXORDER)
-+        return D3DERR_INVALIDCALL;
-+
-+    *rout = 0.0f;
-+    *gout = 0.0f;
-+    *bout = 0.0f;
-+
-+    return D3D_OK;
-+}
-+
- FLOAT* WINAPI D3DXSHRotate(FLOAT *out, UINT order, const D3DXMATRIX *matrix, const FLOAT *in)
- {
-     FLOAT alpha, beta, gamma, sinb, temp[36], temp1[36];
-diff --git a/dlls/d3dx9_37/d3dx9_37.spec b/dlls/d3dx9_37/d3dx9_37.spec
-index de8b12c..10395ff 100644
---- a/dlls/d3dx9_37/d3dx9_37.spec
-+++ b/dlls/d3dx9_37/d3dx9_37.spec
-@@ -269,7 +269,7 @@
- @ stub D3DXSHMultiply6(ptr ptr ptr)
- @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
- @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
--@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
-+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
- @ stdcall D3DXSHRotate(ptr long ptr ptr)
- @ stdcall D3DXSHRotateZ(ptr long float ptr)
- @ stdcall D3DXSHScale(ptr long ptr float)
-diff --git a/dlls/d3dx9_38/d3dx9_38.spec b/dlls/d3dx9_38/d3dx9_38.spec
-index de8b12c..10395ff 100644
---- a/dlls/d3dx9_38/d3dx9_38.spec
-+++ b/dlls/d3dx9_38/d3dx9_38.spec
-@@ -269,7 +269,7 @@
- @ stub D3DXSHMultiply6(ptr ptr ptr)
- @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
- @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
--@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
-+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
- @ stdcall D3DXSHRotate(ptr long ptr ptr)
- @ stdcall D3DXSHRotateZ(ptr long float ptr)
- @ stdcall D3DXSHScale(ptr long ptr float)
-diff --git a/dlls/d3dx9_39/d3dx9_39.spec b/dlls/d3dx9_39/d3dx9_39.spec
-index de8b12c..10395ff 100644
---- a/dlls/d3dx9_39/d3dx9_39.spec
-+++ b/dlls/d3dx9_39/d3dx9_39.spec
-@@ -269,7 +269,7 @@
- @ stub D3DXSHMultiply6(ptr ptr ptr)
- @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
- @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
--@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
-+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
- @ stdcall D3DXSHRotate(ptr long ptr ptr)
- @ stdcall D3DXSHRotateZ(ptr long float ptr)
- @ stdcall D3DXSHScale(ptr long ptr float)
-diff --git a/dlls/d3dx9_40/d3dx9_40.spec b/dlls/d3dx9_40/d3dx9_40.spec
-index de8b12c..10395ff 100644
---- a/dlls/d3dx9_40/d3dx9_40.spec
-+++ b/dlls/d3dx9_40/d3dx9_40.spec
-@@ -269,7 +269,7 @@
- @ stub D3DXSHMultiply6(ptr ptr ptr)
- @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
- @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
--@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
-+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
- @ stdcall D3DXSHRotate(ptr long ptr ptr)
- @ stdcall D3DXSHRotateZ(ptr long float ptr)
- @ stdcall D3DXSHScale(ptr long ptr float)
-diff --git a/dlls/d3dx9_41/d3dx9_41.spec b/dlls/d3dx9_41/d3dx9_41.spec
-index de8b12c..10395ff 100644
---- a/dlls/d3dx9_41/d3dx9_41.spec
-+++ b/dlls/d3dx9_41/d3dx9_41.spec
-@@ -269,7 +269,7 @@
- @ stub D3DXSHMultiply6(ptr ptr ptr)
- @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
- @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
--@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
-+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
- @ stdcall D3DXSHRotate(ptr long ptr ptr)
- @ stdcall D3DXSHRotateZ(ptr long float ptr)
- @ stdcall D3DXSHScale(ptr long ptr float)
-diff --git a/dlls/d3dx9_42/d3dx9_42.spec b/dlls/d3dx9_42/d3dx9_42.spec
-index c3bd9d5..5524bd0 100644
---- a/dlls/d3dx9_42/d3dx9_42.spec
-+++ b/dlls/d3dx9_42/d3dx9_42.spec
-@@ -262,7 +262,7 @@
- @ stub D3DXSHMultiply6(ptr ptr ptr)
- @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
- @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
--@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
-+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
- @ stdcall D3DXSHRotate(ptr long ptr ptr)
- @ stdcall D3DXSHRotateZ(ptr long float ptr)
- @ stdcall D3DXSHScale(ptr long ptr float)
-diff --git a/dlls/d3dx9_43/d3dx9_43.spec b/dlls/d3dx9_43/d3dx9_43.spec
-index c3bd9d5..5524bd0 100644
---- a/dlls/d3dx9_43/d3dx9_43.spec
-+++ b/dlls/d3dx9_43/d3dx9_43.spec
-@@ -262,7 +262,7 @@
- @ stub D3DXSHMultiply6(ptr ptr ptr)
- @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
- @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
--@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
-+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
- @ stdcall D3DXSHRotate(ptr long ptr ptr)
- @ stdcall D3DXSHRotateZ(ptr long float ptr)
- @ stdcall D3DXSHScale(ptr long ptr float)
-diff --git a/include/d3dx9math.h b/include/d3dx9math.h
-index bf03ca3..9296400d 100644
---- a/include/d3dx9math.h
-+++ b/include/d3dx9math.h
-@@ -396,6 +396,7 @@ HRESULT WINAPI D3DXSHEvalSphericalLight(UINT order, const D3DXVECTOR3 *dir, FLOA
- FLOAT* WINAPI D3DXSHMultiply2(FLOAT *out, const FLOAT *a, const FLOAT *b);
- FLOAT* WINAPI D3DXSHMultiply3(FLOAT *out, const FLOAT *a, const FLOAT *b);
- FLOAT* WINAPI D3DXSHMultiply4(FLOAT *out, const FLOAT *a, const FLOAT *b);
-+HRESULT WINAPI D3DXSHProjectCubeMap(UINT order, IDirect3DCubeTexture9 *cubemap, FLOAT *rout, FLOAT *gout, FLOAT *bout);
- FLOAT* WINAPI D3DXSHRotate(FLOAT *out, UINT order, const D3DXMATRIX *matrix, const FLOAT *in);
- FLOAT* WINAPI D3DXSHRotateZ(FLOAT *out, UINT order, FLOAT angle, const FLOAT *in);
- FLOAT* WINAPI D3DXSHScale(FLOAT *out, UINT order, const FLOAT *a, const FLOAT scale);
--- 
-1.9.1
-

patches/d3dx9_36-D3DXSHProjectCubeMap/definition

@@ -1 +0,0 @@
-Fixes: [46284] Add D3DXSHProjectCubeMap stub

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

@@ -1,4 +1,4 @@
-From b094a7cf3f804ea40e5bd05ad738c48b5464e0bb Mon Sep 17 00:00:00 2001
+From 8c78d1203c965927d0a0e6fcde31dd651cc704db 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 22be2612eeb..f3f31eb3671 100644
+index 22be2612eeb..2e11bb2b62d 100644
 --- a/dlls/dbghelp/Makefile.in
 +++ b/dlls/dbghelp/Makefile.in
 @@ -2,7 +2,7 @@ MODULE    = dbghelp.dll
@@ -22,10 +22,10 @@ index 22be2612eeb..f3f31eb3671 100644
  
  C_SRCS = \
 diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c
-index 553b212c526..3584a27953e 100644
+index 404c7c11dbb..e0779e4e3a7 100644
 --- a/dlls/dbghelp/elf_module.c
 +++ b/dlls/dbghelp/elf_module.c
-@@ -1451,6 +1451,7 @@ static BOOL elf_search_and_load_file(struct process* pcs, const WCHAR* filename,
+@@ -1445,6 +1445,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)
@@ -34,5 +34,5 @@ index 553b212c526..3584a27953e 100644
      }
  
 -- 
-2.33.0
+2.34.1
 

patches/dinput-joy-mappings/0001-dinput-Allow-empty-Joystick-mappings.patch

@@ -1,18 +1,18 @@
-From ef0da9342b0ced44da1ed8532941d53f48ead602 Mon Sep 17 00:00:00 2001
+From e7104770d4b57539d5b64a67212504910692e920 Mon Sep 17 00:00:00 2001
 From: Jetro Jormalainen <jje-wine@jv.jetro.fi>
 Date: Tue, 30 Apr 2019 09:20:54 +1000
 Subject: [PATCH] dinput: Allow empty Joystick mappings.
 
 ---
  dlls/dinput/device.c        | 77 ++++++++++++++++++++++++++++++-------
- dlls/dinput8/tests/device.c | 50 ++++++++++++++++++++++++
+ dlls/dinput/tests/device8.c | 50 ++++++++++++++++++++++++
  2 files changed, 113 insertions(+), 14 deletions(-)
 
 diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c
-index b423337c9ce..c9466655ce4 100644
+index 6cc190ee7fb..2fd9329aa68 100644
 --- a/dlls/dinput/device.c
 +++ b/dlls/dinput/device.c
-@@ -356,12 +356,26 @@ static DWORD semantic_to_obj_id( struct dinput_device *This, DWORD dwSemantic )
+@@ -364,12 +364,26 @@ static DWORD semantic_to_obj_id( struct dinput_device *This, DWORD dwSemantic )
      return type | (0x0000ff00 & (instance << 8));
  }
  
@@ -40,7 +40,7 @@ index b423337c9ce..c9466655ce4 100644
  {
      static const WCHAR *subkey = L"Software\\Wine\\DirectInput\\Mappings\\%s\\%s\\%s";
      HKEY hkey;
-@@ -372,8 +386,11 @@ static HKEY get_mapping_key(const WCHAR *device, const WCHAR *username, const WC
+@@ -380,8 +394,11 @@ static HKEY get_mapping_key(const WCHAR *device, const WCHAR *username, const WC
      swprintf( keyname, len, subkey, username, device, guid );
  
      /* The key used is HKCU\Software\Wine\DirectInput\Mappings\[username]\[device]\[mapping_guid] */
@@ -54,7 +54,7 @@ index b423337c9ce..c9466655ce4 100644
  
      free( keyname );
  
-@@ -393,7 +410,9 @@ static HRESULT save_mapping_settings(IDirectInputDevice8W *iface, LPDIACTIONFORM
+@@ -401,7 +418,9 @@ static HRESULT save_mapping_settings(IDirectInputDevice8W *iface, LPDIACTIONFORM
      if (StringFromCLSID(&lpdiaf->guidActionMap, &guid_str) != S_OK)
          return DI_SETTINGSNOTSAVED;
  
@@ -65,7 +65,7 @@ index b423337c9ce..c9466655ce4 100644
  
      if (!hkey)
      {
-@@ -428,7 +447,7 @@ static BOOL load_mapping_settings( struct dinput_device *This, LPDIACTIONFORMATW
+@@ -436,7 +455,7 @@ static BOOL load_mapping_settings( struct dinput_device *This, LPDIACTIONFORMATW
      HKEY hkey;
      WCHAR *guid_str;
      DIDEVICEINSTANCEW didev;
@@ -74,7 +74,7 @@ index b423337c9ce..c9466655ce4 100644
  
      didev.dwSize = sizeof(didev);
      IDirectInputDevice8_GetDeviceInfo(&This->IDirectInputDevice8W_iface, &didev);
-@@ -436,7 +455,7 @@ static BOOL load_mapping_settings( struct dinput_device *This, LPDIACTIONFORMATW
+@@ -444,7 +463,7 @@ static BOOL load_mapping_settings( struct dinput_device *This, LPDIACTIONFORMATW
      if (StringFromCLSID(&lpdiaf->guidActionMap, &guid_str) != S_OK)
          return FALSE;
  
@@ -83,7 +83,7 @@ index b423337c9ce..c9466655ce4 100644
  
      if (!hkey)
      {
-@@ -456,15 +475,20 @@ static BOOL load_mapping_settings( struct dinput_device *This, LPDIACTIONFORMATW
+@@ -464,15 +483,20 @@ static BOOL load_mapping_settings( struct dinput_device *This, LPDIACTIONFORMATW
          {
              lpdiaf->rgoAction[i].dwObjID = id;
              lpdiaf->rgoAction[i].guidInstance = didev.guidInstance;
@@ -107,7 +107,7 @@ index b423337c9ce..c9466655ce4 100644
  }
  
  static BOOL set_app_data( struct dinput_device *dev, int offset, UINT_PTR app_data )
-@@ -1607,13 +1631,18 @@ static HRESULT WINAPI dinput_device_BuildActionMap( IDirectInputDevice8W *iface,
+@@ -1935,13 +1959,18 @@ static HRESULT WINAPI dinput_device_BuildActionMap( IDirectInputDevice8W *iface,
          load_success = load_mapping_settings( impl, format, username_buf );
      }
  
@@ -130,7 +130,7 @@ index b423337c9ce..c9466655ce4 100644
          genre = format->rgoAction[i].dwSemantic & DIGENRE_ANY;
          if (devMask == genre || (devMask == DIGENRE_ANY && genre != DIMOUSE_MASK && genre != DIKEYBOARD_MASK))
          {
-@@ -1645,6 +1674,14 @@ static HRESULT WINAPI dinput_device_BuildActionMap( IDirectInputDevice8W *iface,
+@@ -1973,6 +2002,14 @@ static HRESULT WINAPI dinput_device_BuildActionMap( IDirectInputDevice8W *iface,
          }
      }
  
@@ -144,8 +144,8 @@ index b423337c9ce..c9466655ce4 100644
 +
      if (!has_actions) return DI_NOEFFECT;
      if (flags & (DIDBAM_DEFAULT|DIDBAM_PRESERVE|DIDBAM_INITIALIZE|DIDBAM_HWDEFAULTS))
-         FIXME("Unimplemented flags %#x\n", flags);
-@@ -1662,6 +1699,7 @@ static HRESULT WINAPI dinput_device_SetActionMap( IDirectInputDevice8W *iface, D
+         FIXME( "Unimplemented flags %#lx\n", flags );
+@@ -1990,6 +2027,7 @@ static HRESULT WINAPI dinput_device_SetActionMap( IDirectInputDevice8W *iface, D
      DIPROPSTRING dps;
      WCHAR username_buf[MAX_PATH];
      DWORD username_len = MAX_PATH;
@@ -153,7 +153,7 @@ index b423337c9ce..c9466655ce4 100644
      int i, action = 0, num_actions = 0;
      unsigned int offset = 0;
      const DIDATAFORMAT *df;
-@@ -1694,12 +1732,23 @@ static HRESULT WINAPI dinput_device_SetActionMap( IDirectInputDevice8W *iface, D
+@@ -2022,12 +2060,23 @@ static HRESULT WINAPI dinput_device_SetActionMap( IDirectInputDevice8W *iface, D
      data_format.dwFlags = DIDF_RELAXIS;
      data_format.dwDataSize = format->dwDataSize;
  
@@ -178,10 +178,10 @@ index b423337c9ce..c9466655ce4 100644
  
      /* Construct the dataformat and actionmap */
      obj_df = malloc( sizeof(DIOBJECTDATAFORMAT) * num_actions );
-diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c
-index 5ae9e225dc9..d3e86c68176 100644
---- a/dlls/dinput8/tests/device.c
-+++ b/dlls/dinput8/tests/device.c
+diff --git a/dlls/dinput/tests/device8.c b/dlls/dinput/tests/device8.c
+index 2586736cb1d..e2be36ad7d3 100644
+--- a/dlls/dinput/tests/device8.c
++++ b/dlls/dinput/tests/device8.c
 @@ -48,6 +48,8 @@ struct enum_data {
  /* Dummy GUID */
  static const GUID ACTION_MAPPING_GUID = { 0x1, 0x2, 0x3, { 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb } };
@@ -193,7 +193,7 @@ index 5ae9e225dc9..d3e86c68176 100644
      DITEST_BUTTON,
 @@ -472,6 +474,17 @@ static void test_action_mapping(void)
          hr = IDirectInputDevice8_SetActionMap(data.keyboard, data.lpdiaf, NULL, 0);
-         ok (hr == DI_NOEFFECT, "SetActionMap should have no effect with no actions to map hr=%08x\n", hr);
+         ok (hr == DI_NOEFFECT, "SetActionMap should have no effect with no actions to map hr=%#lx\n", hr);
  
 +        /* Test that after changing actionformat SetActionMap has effect and that second
 +         * SetActionMap call with same empty actionformat has no effect */
@@ -210,7 +210,7 @@ index 5ae9e225dc9..d3e86c68176 100644
          af.dwNumActions = ARRAY_SIZE(actionMapping);
  
 @@ -663,6 +676,43 @@ static void test_save_settings(void)
-         "Mapped incorrectly expected: 0x%08x got: 0x%08x\n", other_results[1], af.rgoAction[1].dwObjID);
+         "Mapped incorrectly expected: 0x%#lx got: 0x%#lx\n", other_results[1], af.rgoAction[1].dwObjID);
      ok (IsEqualGUID(&GUID_SysKeyboard, &af.rgoAction[1].guidInstance), "Action should be mapped to keyboard\n");
  
 +    /* Save and load empty mapping */
@@ -254,5 +254,5 @@ index 5ae9e225dc9..d3e86c68176 100644
      IDirectInput_Release(pDI);
  }
 -- 
-2.33.0
+2.34.1
 

patches/dinput-joy-mappings/0004-dinput-Allow-mapping-of-controls-based-of-Genre-type.patch

@@ -44,7 +44,7 @@ index e826cc89c1e..a4815f24958 100644
 +            else if (type == DIDFT_RELAXIS) type = DIDFT_AXIS;
 +
 +            obj = dataformat_to_odf_by_type(df, inst, type);
-+            TRACE("obj %p, inst 0x%08x, type 0x%08x\n", obj, inst, type);
++            TRACE("obj %p, inst 0x%08lx, type 0x%08lx\n", obj, inst, type);
 +            if(obj)
 +            {
 +                memcpy(&obj_df[action], obj, df->dwObjSize);

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

@@ -1,4 +1,4 @@
-From 2af1ec49d958424e2b78f52ae3e3daca1d562b35 Mon Sep 17 00:00:00 2001
+From da59fcb896bc204ea0ea1d866eeddef0c9b962c4 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Sat, 28 Mar 2015 08:18:10 +0100
 Subject: [PATCH] dsound: Apply filters before sound is multiplied to speakers.
@@ -11,7 +11,7 @@ Based on a patch by Mark Harmstone.
  3 files changed, 80 insertions(+), 35 deletions(-)
 
 diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c
-index 3085d86e5b5..91fa94b943e 100644
+index 346cc4ceca3..e869c4dd251 100644
 --- a/dlls/dsound/dsound.c
 +++ b/dlls/dsound/dsound.c
 @@ -234,6 +234,8 @@ static ULONG DirectSoundDevice_Release(DirectSoundDevice * device)
@@ -24,7 +24,7 @@ index 3085d86e5b5..91fa94b943e 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 2408f80ba82..2e23f222b03 100644
+index f89588de4d9..d4e74ed0e82 100644
 --- a/dlls/dsound/dsound_private.h
 +++ b/dlls/dsound/dsound_private.h
 @@ -89,8 +89,8 @@ struct DirectSoundDevice
@@ -39,7 +39,7 @@ index 2408f80ba82..2e23f222b03 100644
      DSVOLUMEPAN                 volpan;
  
 diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c
-index 1877d61cbf0..13bff1b9ae7 100644
+index 50816b1a582..ddab45893ac 100644
 --- a/dlls/dsound/mixer.c
 +++ b/dlls/dsound/mixer.c
 @@ -283,10 +283,9 @@ static inline float get_current_sample(const IDirectSoundBufferImpl *dsb,
@@ -54,7 +54,7 @@ index 1877d61cbf0..13bff1b9ae7 100644
      UINT committed_samples = 0;
      DWORD channel, i;
  
-@@ -302,17 +301,16 @@ static UINT cp_fields_noresample(IDirectSoundBufferImpl *dsb, UINT count)
+@@ -305,17 +304,16 @@ static UINT cp_fields_noresample(IDirectSoundBufferImpl *dsb, UINT count)
  
      for (; i < count; i++)
          for (channel = 0; channel < dsb->mix_channels; channel++)
@@ -75,7 +75,7 @@ index 1877d61cbf0..13bff1b9ae7 100644
      UINT channels = dsb->mix_channels;
  
      LONG64 freqAcc_start = *freqAccNum;
-@@ -340,7 +338,7 @@ static UINT cp_fields_resample_lq(IDirectSoundBufferImpl *dsb, UINT count, LONG6
+@@ -343,7 +341,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;
@@ -84,7 +84,7 @@ index 1877d61cbf0..13bff1b9ae7 100644
          }
      }
  
-@@ -348,11 +346,11 @@ static UINT cp_fields_resample_lq(IDirectSoundBufferImpl *dsb, UINT count, LONG6
+@@ -351,11 +349,11 @@ static UINT cp_fields_resample_lq(IDirectSoundBufferImpl *dsb, UINT count, LONG6
      return max_ipos;
  }
  
@@ -98,7 +98,7 @@ index 1877d61cbf0..13bff1b9ae7 100644
      UINT committed_samples = 0;
  
      LONG64 freqAcc_start = *freqAccNum;
-@@ -422,7 +420,7 @@ static UINT cp_fields_resample_hq(IDirectSoundBufferImpl *dsb, UINT count, LONG6
+@@ -430,23 +428,24 @@ 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];
@@ -107,7 +107,6 @@ index 1877d61cbf0..13bff1b9ae7 100644
          }
      }
  
-@@ -431,16 +429,17 @@ static UINT cp_fields_resample_hq(IDirectSoundBufferImpl *dsb, UINT count, LONG6
      return max_ipos;
  }
  
@@ -129,7 +128,7 @@ index 1877d61cbf0..13bff1b9ae7 100644
  
      ipos = dsb->sec_mixpos + adv * dsb->pwfx->nBlockAlign;
      if (ipos >= dsb->buflen) {
-@@ -476,6 +475,21 @@ static inline DWORD DSOUND_BufPtrDiff(DWORD buflen, DWORD ptr1, DWORD ptr2)
+@@ -482,6 +481,21 @@ static inline DWORD DSOUND_BufPtrDiff(DWORD buflen, DWORD ptr1, DWORD ptr2)
  		return buflen + ptr1 - ptr2;
  	}
  }
@@ -151,7 +150,7 @@ index 1877d61cbf0..13bff1b9ae7 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
-@@ -491,34 +505,63 @@ static inline DWORD DSOUND_BufPtrDiff(DWORD buflen, DWORD ptr1, DWORD ptr2)
+@@ -497,34 +511,63 @@ static inline DWORD DSOUND_BufPtrDiff(DWORD buflen, DWORD ptr1, DWORD ptr2)
   */
  static void DSOUND_MixToTemporary(IDirectSoundBufferImpl *dsb, DWORD frames)
  {
@@ -211,9 +210,9 @@ index 1877d61cbf0..13bff1b9ae7 100644
 +                    hr = IMediaObjectInPlace_Process(dsb->filters[i].inplace, frames * sizeof(float) * dsb->mix_channels,
 +                                                     (BYTE *)dsb->device->dsp_buffer, 0, DMO_INPLACE_NORMAL);
 +                    if (FAILED(hr))
-+                        WARN("IMediaObjectInPlace_Process failed for filter %u\n", i);
++                        WARN("IMediaObjectInPlace_Process failed for filter %lu\n", i);
 +                } else
-+                    WARN("filter %u has no inplace object - unsupported\n", i);
++                    WARN("filter %lu has no inplace object - unsupported\n", i);
 +            }
 +        }
  
@@ -235,5 +234,5 @@ index 1877d61cbf0..13bff1b9ae7 100644
  
  static void DSOUND_MixerVol(const IDirectSoundBufferImpl *dsb, INT frames)
 -- 
-2.33.0
+2.35.1