Release v7.4

Remove warnings.

.github/workflows/macOS.yml

@@ -19,7 +19,7 @@ jobs:
           brew install  bison \
                         gphoto2 \
                         gst-plugins-base \
-                        mingw-w64 \
+                        gcenx/wine/mingw-w64@9 \
                         molten-vk \
                         sdl2
 
@@ -28,6 +28,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: |
@@ -62,9 +63,10 @@ jobs:
 
       - 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
+          make -j$(sysctl -n hw.ncpu 2>/dev/null)
 
   wine-devel:
     runs-on:  macos-latest
@@ -82,7 +84,7 @@ jobs:
                         gst-plugins-base \
                         jxrlib \
                         little-cms2 \
-                        mingw-w64 \
+                        gcenx/wine/mingw-w64@9 \
                         molten-vk \
                         mpg123
 
@@ -91,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: |
@@ -123,6 +126,7 @@ jobs:
 
       - 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
+          make -j$(sysctl -n hw.ncpu 2>/dev/null)

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/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/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/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/0003-dsound-Report-that-we-support-EAX-v1.patch

@@ -1,19 +1,19 @@
-From 8d33bbc39a573848f00c95699ec8c0eee9fdb416 Mon Sep 17 00:00:00 2001
+From f9f2e1a4150c515fc416c96405f89d174d5761eb Mon Sep 17 00:00:00 2001
 From: Mark Harmstone <mark@harmstone.com>
 Date: Sun, 15 Mar 2015 18:04:38 +0000
-Subject: dsound: Report that we support EAX v1.
+Subject: [PATCH] dsound: Report that we support EAX v1.
 
 ---
  dlls/dsound/buffer.c | 12 ++++++++++++
  1 file changed, 12 insertions(+)
 
 diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c
-index d735dc3..9eff140 100644
+index eb87479b7df..8d5ca27c90c 100644
 --- a/dlls/dsound/buffer.c
 +++ b/dlls/dsound/buffer.c
-@@ -1319,6 +1319,18 @@ static HRESULT WINAPI IKsPropertySetImpl_QuerySupport(IKsPropertySet *iface, REF
+@@ -1367,6 +1367,18 @@ static HRESULT WINAPI IKsPropertySetImpl_QuerySupport(IKsPropertySet *iface, REF
  
-     TRACE("(%p,%s,%d,%p)\n",This,debugstr_guid(guidPropSet),dwPropID,pTypeSupport);
+     TRACE("(%p,%s,%ld,%p)\n",This,debugstr_guid(guidPropSet),dwPropID,pTypeSupport);
  
 +    if (IsEqualGUID(&DSPROPSETID_EAX_ReverbProperties, guidPropSet)) {
 +        if (dwPropID <= DSPROPERTY_EAX_DAMPING) {
@@ -31,5 +31,5 @@ index d735dc3..9eff140 100644
  }
  
 -- 
-2.3.3
+2.34.1
 

patches/dsound-EAX/0004-dsound-Add-EAX-propset-stubs.patch

@@ -1,18 +1,18 @@
-From 601e237d1321fcdea3a678c31fd9eac62b89cfb4 Mon Sep 17 00:00:00 2001
+From ee7fe13f2c520e1360e46f825790539b5bc2be3b Mon Sep 17 00:00:00 2001
 From: Mark Harmstone <mark@harmstone.com>
 Date: Sun, 22 Mar 2015 13:58:53 +0000
-Subject: dsound: Add EAX propset stubs.
+Subject: [PATCH] dsound: Add EAX propset stubs.
 
 ---
  dlls/dsound/Makefile.in      |  1 +
- dlls/dsound/buffer.c         |  6 +++++
- dlls/dsound/dsound_private.h |  8 +++++++
- dlls/dsound/eax.c            | 54 ++++++++++++++++++++++++++++++++++++++++++++
+ dlls/dsound/buffer.c         |  6 ++++
+ dlls/dsound/dsound_private.h |  8 ++++++
+ dlls/dsound/eax.c            | 54 ++++++++++++++++++++++++++++++++++++
  4 files changed, 69 insertions(+)
  create mode 100644 dlls/dsound/eax.c
 
 diff --git a/dlls/dsound/Makefile.in b/dlls/dsound/Makefile.in
-index 6cb653f..1c04bf3 100644
+index 6cb653fdfa0..1c04bf34162 100644
 --- a/dlls/dsound/Makefile.in
 +++ b/dlls/dsound/Makefile.in
 @@ -9,6 +9,7 @@ C_SRCS = \
@@ -24,11 +24,11 @@ index 6cb653f..1c04bf3 100644
  	primary.c \
  	propset.c \
 diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c
-index 9eff140..0596ce3 100644
+index 8d5ca27c90c..ed710fad43d 100644
 --- a/dlls/dsound/buffer.c
 +++ b/dlls/dsound/buffer.c
-@@ -1298,6 +1298,9 @@ static HRESULT WINAPI IKsPropertySetImpl_Get(IKsPropertySet *iface, REFGUID guid
-     TRACE("(iface=%p,guidPropSet=%s,dwPropID=%d,pInstanceData=%p,cbInstanceData=%d,pPropData=%p,cbPropData=%d,pcbReturned=%p)\n",
+@@ -1346,6 +1346,9 @@ static HRESULT WINAPI IKsPropertySetImpl_Get(IKsPropertySet *iface, REFGUID guid
+     TRACE("(iface=%p,guidPropSet=%s,dwPropID=%ld,pInstanceData=%p,cbInstanceData=%ld,pPropData=%p,cbPropData=%ld,pcbReturned=%p)\n",
      This,debugstr_guid(guidPropSet),dwPropID,pInstanceData,cbInstanceData,pPropData,cbPropData,pcbReturned);
  
 +    if (IsEqualGUID(&DSPROPSETID_EAX_ReverbProperties, guidPropSet) || IsEqualGUID(&DSPROPSETID_EAXBUFFER_ReverbProperties, guidPropSet))
@@ -37,9 +37,9 @@ index 9eff140..0596ce3 100644
      return E_PROP_ID_UNSUPPORTED;
  }
  
-@@ -1309,6 +1312,9 @@ static HRESULT WINAPI IKsPropertySetImpl_Set(IKsPropertySet *iface, REFGUID guid
+@@ -1357,6 +1360,9 @@ static HRESULT WINAPI IKsPropertySetImpl_Set(IKsPropertySet *iface, REFGUID guid
  
-     TRACE("(%p,%s,%d,%p,%d,%p,%d)\n",This,debugstr_guid(guidPropSet),dwPropID,pInstanceData,cbInstanceData,pPropData,cbPropData);
+     TRACE("(%p,%s,%ld,%p,%ld,%p,%ld)\n",This,debugstr_guid(guidPropSet),dwPropID,pInstanceData,cbInstanceData,pPropData,cbPropData);
  
 +    if (IsEqualGUID(&DSPROPSETID_EAX_ReverbProperties, guidPropSet) || IsEqualGUID(&DSPROPSETID_EAXBUFFER_ReverbProperties, guidPropSet))
 +        return EAX_Set(This, guidPropSet, dwPropID, pInstanceData, cbInstanceData, pPropData, cbPropData);
@@ -48,7 +48,7 @@ index 9eff140..0596ce3 100644
  }
  
 diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
-index 3c7dc7a..e4495b2 100644
+index 304708c26da..c0e254f7a6e 100644
 --- a/dlls/dsound/dsound_private.h
 +++ b/dlls/dsound/dsound_private.h
 @@ -229,6 +229,14 @@ LONG capped_refcount_dec(LONG *ref) DECLSPEC_HIDDEN;
@@ -68,7 +68,7 @@ index 3c7dc7a..e4495b2 100644
  void DSOUND_RecalcVolPan(PDSVOLUMEPAN volpan) DECLSPEC_HIDDEN;
 diff --git a/dlls/dsound/eax.c b/dlls/dsound/eax.c
 new file mode 100644
-index 0000000..c30c7e1
+index 00000000000..c30c7e1a51a
 --- /dev/null
 +++ b/dlls/dsound/eax.c
 @@ -0,0 +1,54 @@
@@ -127,5 +127,5 @@ index 0000000..c30c7e1
 +    return E_PROP_ID_UNSUPPORTED;
 +}
 -- 
-2.3.3
+2.34.1
 

patches/dsound-EAX/0019-dsound-Allow-disabling-of-EAX-support-in-the-registr.patch

@@ -1,4 +1,4 @@
-From 4ff4b0b2c1a5aeabeec286dc76868acbccc8779d Mon Sep 17 00:00:00 2001
+From af21be49d511224d7299ef3d21f08ebfee66f3a5 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Sun, 5 Apr 2015 19:13:18 +0200
 Subject: [PATCH] dsound: Allow disabling of EAX support in the registry.
@@ -12,7 +12,7 @@ Based on a patch by Mark Harmstone.
  4 files changed, 44 insertions(+), 10 deletions(-)
 
 diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c
-index 926dbab1289..6393656c9fa 100644
+index 9a603a70ed9..39ce9101266 100644
 --- a/dlls/dsound/buffer.c
 +++ b/dlls/dsound/buffer.c
 @@ -34,6 +34,7 @@
@@ -23,9 +23,9 @@ index 926dbab1289..6393656c9fa 100644
  
  /*******************************************************************************
   *		IDirectSoundNotify
-@@ -1311,16 +1312,11 @@ static HRESULT WINAPI IKsPropertySetImpl_QuerySupport(IKsPropertySet *iface, REF
+@@ -1381,16 +1382,11 @@ static HRESULT WINAPI IKsPropertySetImpl_QuerySupport(IKsPropertySet *iface, REF
  
-     TRACE("(%p,%s,%d,%p)\n",This,debugstr_guid(guidPropSet),dwPropID,pTypeSupport);
+     TRACE("(%p,%s,%ld,%p)\n",This,debugstr_guid(guidPropSet),dwPropID,pTypeSupport);
  
 -    if (IsEqualGUID(&DSPROPSETID_EAX_ReverbProperties, guidPropSet)) {
 -        if (dwPropID <= DSPROPERTY_EAX_DAMPING) {
@@ -46,7 +46,7 @@ index 926dbab1289..6393656c9fa 100644
  
      return E_PROP_ID_UNSUPPORTED;
 diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c
-index fecb9489678..8b396a1939e 100644
+index da5912e216e..808425161a6 100644
 --- a/dlls/dsound/dsound_main.c
 +++ b/dlls/dsound/dsound_main.c
 @@ -93,6 +93,10 @@ const WCHAR wine_vxd_drv[] = L"winemm.vxd";
@@ -77,7 +77,7 @@ index fecb9489678..8b396a1939e 100644
  
  static const char * get_device_id(LPCGUID pGuid)
 diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
-index bca2bf46601..47a42e62e7c 100644
+index 0bca36b2540..7d488ab1e45 100644
 --- a/dlls/dsound/dsound_private.h
 +++ b/dlls/dsound/dsound_private.h
 @@ -37,6 +37,7 @@
@@ -88,7 +88,7 @@ index bca2bf46601..47a42e62e7c 100644
  
  /*****************************************************************************
   * Predeclare the interface implementation structures
-@@ -228,6 +229,7 @@ LONG capped_refcount_dec(LONG *ref) DECLSPEC_HIDDEN;
+@@ -234,6 +235,7 @@ LONG capped_refcount_dec(LONG *ref) DECLSPEC_HIDDEN;
  HRESULT DSOUND_FullDuplexCreate(REFIID riid, void **ppv) DECLSPEC_HIDDEN;
  
  /* eax.c */
@@ -150,5 +150,5 @@ index ef802b95a7d..570207709f0 100644
          buf->device->eax.using_eax = TRUE;
  
 -- 
-2.30.2
+2.34.1
 

patches/dsound-EAX/0023-dsound-Fake-success-for-EAX-Set-Buffer-ListenerPrope.patch

@@ -1,4 +1,4 @@
-From f8f6f53f2bb3d138717ac7a82c78010bce874d4a Mon Sep 17 00:00:00 2001
+From b332a35d8382c6fc77ba663c5db98a6374518bfe Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Mon, 25 Jan 2021 19:14:32 +1100
 Subject: [PATCH] dsound: Fake success for EAX Set Buffer/ListenerProperties
@@ -10,12 +10,12 @@ Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50551
  2 files changed, 6 insertions(+), 5 deletions(-)
 
 diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c
-index 6393656c9fa..24ff1a6198c 100644
+index 39ce9101266..ba93989f372 100644
 --- a/dlls/dsound/buffer.c
 +++ b/dlls/dsound/buffer.c
-@@ -1299,7 +1299,8 @@ static HRESULT WINAPI IKsPropertySetImpl_Set(IKsPropertySet *iface, REFGUID guid
+@@ -1369,7 +1369,8 @@ static HRESULT WINAPI IKsPropertySetImpl_Set(IKsPropertySet *iface, REFGUID guid
  
-     TRACE("(%p,%s,%d,%p,%d,%p,%d)\n",This,debugstr_guid(guidPropSet),dwPropID,pInstanceData,cbInstanceData,pPropData,cbPropData);
+     TRACE("(%p,%s,%ld,%p,%ld,%p,%ld)\n",This,debugstr_guid(guidPropSet),dwPropID,pInstanceData,cbInstanceData,pPropData,cbPropData);
  
 -    if (IsEqualGUID(&DSPROPSETID_EAX_ReverbProperties, guidPropSet) || IsEqualGUID(&DSPROPSETID_EAXBUFFER_ReverbProperties, guidPropSet))
 +    if (IsEqualGUID(&DSPROPSETID_EAX_ReverbProperties, guidPropSet) || IsEqualGUID(&DSPROPSETID_EAXBUFFER_ReverbProperties, guidPropSet) ||
@@ -44,5 +44,5 @@ index 6a6d22bc031..b3f48cdb5bd 100644
  
      FIXME("(%p,%s,%d,%p,%d,%p,%d)\n",
 -- 
-2.29.2
+2.34.1
 

patches/dwrite-FontFallback/0004-dwrite-Use-font-fallback-when-mapping-characters.patch

@@ -1,4 +1,4 @@
-From 8c7187f5501fff70df81612dfbdd084e67605189 Mon Sep 17 00:00:00 2001
+From bf4cc6cfca946ff719763bb7be25fe268577f0d3 Mon Sep 17 00:00:00 2001
 From: Lucian Poston <lucianposton@pm.me>
 Date: Mon, 21 May 2018 18:13:00 -0700
 Subject: [PATCH] dwrite: Use font fallback when mapping characters
@@ -7,11 +7,11 @@ Signed-off-by: Lucian Poston <lucianposton@pm.me>
 ---
  dlls/dwrite/analyzer.c     | 77 +++++++++++++++++++++++++++++---------
  dlls/dwrite/layout.c       |  6 +++
- dlls/dwrite/tests/layout.c | 54 +++++---------------------
- 3 files changed, 74 insertions(+), 63 deletions(-)
+ dlls/dwrite/tests/layout.c | 54 ++++----------------------
+ 3 files changed, 73 insertions(+), 64 deletions(-)
 
 diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c
-index 13ccf8e4434..c535b0cf49d 100644
+index 7ffcfa8070c..aab309c2a8c 100644
 --- a/dlls/dwrite/analyzer.c
 +++ b/dlls/dwrite/analyzer.c
 @@ -2094,6 +2094,7 @@ static HRESULT fallback_get_fallback_font(struct dwrite_fontfallback *fallback,
@@ -124,7 +124,7 @@ index 13ccf8e4434..c535b0cf49d 100644
      free(buff);
      return hr;
 diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c
-index d4aa49c6a6c..cda50c20777 100644
+index ba80c3f70e8..c7845f9b675 100644
 --- a/dlls/dwrite/layout.c
 +++ b/dlls/dwrite/layout.c
 @@ -725,6 +725,12 @@ static HRESULT layout_resolve_fonts(struct dwrite_textlayout *layout)
@@ -141,10 +141,10 @@ index d4aa49c6a6c..cda50c20777 100644
              IDWriteFont_Release(font);
              if (FAILED(hr)) {
 diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c
-index 096fc554253..b622aeb4239 100644
+index 3efedd3df95..07687c76c60 100644
 --- a/dlls/dwrite/tests/layout.c
 +++ b/dlls/dwrite/tests/layout.c
-@@ -3368,35 +3368,23 @@ static void test_GetMetrics(void)
+@@ -3366,35 +3366,23 @@ static void test_GetMetrics(void)
  
      count = 0;
      hr = IDWriteTextLayout_GetClusterMetrics(layout, clusters, 4, &count);
@@ -180,45 +180,48 @@ index 096fc554253..b622aeb4239 100644
      ok(metrics.lineCount == 1, "got %u\n", metrics.lineCount);
  
      IDWriteTextLayout_Release(layout);
-@@ -4690,12 +4678,9 @@ static void test_MapCharacters(void)
+@@ -4688,16 +4676,12 @@ static void test_MapCharacters(void)
      font = NULL;
      hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 1, NULL, NULL, DWRITE_FONT_WEIGHT_NORMAL,
          DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &mappedlength, &font, &scale);
 -todo_wine {
-     ok(hr == S_OK, "got 0x%08x\n", hr);
+     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
      ok(mappedlength == 1, "got %u\n", mappedlength);
 -}
      ok(scale == 1.0f, "got %f\n", scale);
 -    todo_wine
      ok(font != NULL, "got %p\n", font);
- if (font) {
+-if (font) {
      IDWriteFont_Release(font);
-@@ -4707,16 +4692,13 @@ if (font) {
+-}
++
+     /* same Latin text, full length */
+     g_source = L"abc";
+     mappedlength = 0;
+@@ -4705,16 +4689,12 @@ if (font) {
      font = NULL;
      hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 3, NULL, NULL, DWRITE_FONT_WEIGHT_NORMAL,
          DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &mappedlength, &font, &scale);
 -todo_wine {
-     ok(hr == S_OK, "got 0x%08x\n", hr);
+     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
      ok(mappedlength == 3, "got %u\n", mappedlength);
 -}
      ok(scale == 1.0f, "got %f\n", scale);
 -    todo_wine
      ok(font != NULL, "got %p\n", font);
 -if (font) {
--    IDWriteFont_Release(font);
+     IDWriteFont_Release(font);
 -}
-+    if (font) {
-+        IDWriteFont_Release(font);
-+    }
++
      /* string 'a\x3058b' */
      g_source = str2W;
      mappedlength = 0;
-@@ -4724,32 +4706,24 @@ if (font) {
+@@ -4722,32 +4702,24 @@ if (font) {
      font = NULL;
      hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 3, NULL, NULL, DWRITE_FONT_WEIGHT_NORMAL,
          DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &mappedlength, &font, &scale);
 -todo_wine {
-     ok(hr == S_OK, "got 0x%08x\n", hr);
+     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
      ok(mappedlength == 1, "got %u\n", mappedlength);
 -}
      ok(scale == 1.0f, "got %f\n", scale);
@@ -235,7 +238,7 @@ index 096fc554253..b622aeb4239 100644
      hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 1, 2, NULL, NULL, DWRITE_FONT_WEIGHT_NORMAL,
          DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &mappedlength, &font, &scale);
 -todo_wine {
-     ok(hr == S_OK, "got 0x%08x\n", hr);
+     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
      ok(mappedlength == 1, "got %u\n", mappedlength);
 -}
      ok(scale == 1.0f, "got %f\n", scale);
@@ -248,7 +251,7 @@ index 096fc554253..b622aeb4239 100644
      /* Try with explicit collection, Tahoma will be forced. */
      /* 1. Latin part */
      g_source = str2W;
-@@ -4772,7 +4746,10 @@ if (font) {
+@@ -4770,7 +4742,10 @@ if (font) {
      IDWriteLocalizedStrings_Release(strings);
      IDWriteFont_Release(font);
  
@@ -260,15 +263,15 @@ index 096fc554253..b622aeb4239 100644
      g_source = str2W;
      mappedlength = 0;
      scale = 0.0f;
-@@ -4782,7 +4759,6 @@ if (font) {
-     ok(hr == S_OK, "got 0x%08x\n", hr);
+@@ -4780,7 +4755,6 @@ if (font) {
+     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
      ok(mappedlength == 1, "got %u\n", mappedlength);
      ok(scale == 1.0f, "got %f\n", scale);
 -    ok(font != NULL, "got %p\n", font);
  
      exists = FALSE;
      hr = IDWriteFont_GetInformationalStrings(font, DWRITE_INFORMATIONAL_STRING_WIN32_FAMILY_NAMES, &strings, &exists);
-@@ -6669,34 +6645,22 @@ static void test_GetMetrics_with_custom_fontcollection(void)
+@@ -6667,34 +6641,22 @@ static void test_GetMetrics_with_custom_fontcollection(void)
      ok(hr == S_OK, "got 0x%08x\n", hr);
      count = 9999;
      hr = IDWriteTextLayout_GetClusterMetrics(layout, clusters, 4, &count);
@@ -304,5 +307,5 @@ index 096fc554253..b622aeb4239 100644
      IDWriteTextLayout_Release(layout);
  
 -- 
-2.34.1
+2.35.1
 

patches/eventfd_synchronization/0019-rpcrt4-Avoid-closing-the-server-thread-handle-while-.patch

@@ -1,4 +1,4 @@
-From 2cb70cc63fe4352ba6b6d813b1b386a210754d02 Mon Sep 17 00:00:00 2001
+From b3b91529f2e57720b52553dd0477c6077ab1a04b Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <z.figura12@gmail.com>
 Date: Fri, 8 Jun 2018 23:30:17 -0500
 Subject: [PATCH] rpcrt4: Avoid closing the server thread handle while it is
@@ -10,7 +10,7 @@ This, or something like this, should go upstream. This is invalid behaviour.
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c
-index 12260b7298b..a7cad5e273f 100644
+index cb62c59e368..2fd1e1bc4b4 100644
 --- a/dlls/rpcrt4/rpc_server.c
 +++ b/dlls/rpcrt4/rpc_server.c
 @@ -699,10 +699,6 @@ static DWORD CALLBACK RPCRT4_server_thread(LPVOID the_arg)
@@ -36,7 +36,7 @@ index 12260b7298b..a7cad5e273f 100644
        LeaveCriticalSection(&server_cs);
        if (!wait_thread)
 @@ -1579,6 +1578,7 @@ RPC_STATUS WINAPI RpcMgmtWaitServerListen( void )
-       TRACE("waiting for thread %u\n", GetThreadId(wait_thread));
+       TRACE("waiting for thread %lu\n", GetThreadId(wait_thread));
        LeaveCriticalSection(&listen_cs);
        WaitForSingleObject(wait_thread, INFINITE);
 +      CloseHandle(wait_thread);
@@ -44,5 +44,5 @@ index 12260b7298b..a7cad5e273f 100644
    }
    if (listen_done_event == event)
 -- 
-2.28.0
+2.34.1
 

patches/eventfd_synchronization/0037-kernel32-tests-Mark-some-existing-tests-as-failing-u.patch

@@ -1,4 +1,4 @@
-From 4417ee6abe20066cb1bbc784c0705885a07b3966 Mon Sep 17 00:00:00 2001
+From fb71b7bedd8d2863a588473dc09a04dcd8b43b44 Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <z.figura12@gmail.com>
 Date: Wed, 13 Jun 2018 22:25:40 -0500
 Subject: [PATCH] kernel32/tests: Mark some existing tests as failing under
@@ -9,27 +9,27 @@ Subject: [PATCH] kernel32/tests: Mark some existing tests as failing under
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c
-index 2a47abf342c..ef900dcfc04 100644
+index 93cae1c84d5..b158ac905fd 100644
 --- a/dlls/kernel32/tests/sync.c
 +++ b/dlls/kernel32/tests/sync.c
-@@ -218,7 +218,8 @@ todo_wine
+@@ -223,7 +223,8 @@ static void test_mutex(void)
      SetLastError(0xdeadbeef);
      hOpened = OpenMutexA(GENERIC_READ | GENERIC_WRITE, FALSE, "WineTestMutex");
-     ok(hOpened != NULL, "OpenMutex failed with error %d\n", GetLastError());
+     ok(hOpened != NULL, "OpenMutex failed with error %ld\n", GetLastError());
 -    wait_ret = WaitForSingleObject(hOpened, INFINITE);
 +    wait_ret = WaitForSingleObject(hOpened, 0);
 +todo_wine_if(getenv("WINEESYNC"))   /* XFAIL: validation is not implemented */
      ok(wait_ret == WAIT_FAILED, "WaitForSingleObject succeeded\n");
      CloseHandle(hOpened);
  
-@@ -249,6 +250,7 @@ todo_wine
+@@ -254,6 +255,7 @@ static void test_mutex(void)
  
      SetLastError(0xdeadbeef);
      ret = ReleaseMutex(hCreated);
 +todo_wine_if(getenv("WINEESYNC"))   /* XFAIL: due to the above */
      ok(!ret && (GetLastError() == ERROR_NOT_OWNER),
-         "ReleaseMutex should have failed with ERROR_NOT_OWNER instead of %d\n", GetLastError());
+         "ReleaseMutex should have failed with ERROR_NOT_OWNER instead of %ld\n", GetLastError());
  
 -- 
-2.28.0
+2.35.1
 

patches/eventfd_synchronization/0038-kernel32-tests-Add-some-semaphore-tests.patch

@@ -1,4 +1,4 @@
-From 775bf85e0e0614cbfe4494d7b8c47159cae5f47a Mon Sep 17 00:00:00 2001
+From 8592fcfbee64b776ce90c5edc5e9b67350665213 Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <z.figura12@gmail.com>
 Date: Wed, 13 Jun 2018 22:40:47 -0500
 Subject: [PATCH] kernel32/tests: Add some semaphore tests.
@@ -8,10 +8,10 @@ Subject: [PATCH] kernel32/tests: Add some semaphore tests.
  1 file changed, 97 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c
-index ef900dcfc04..26ccfdd4a54 100644
+index b158ac905fd..ad6ab1adc96 100644
 --- a/dlls/kernel32/tests/sync.c
 +++ b/dlls/kernel32/tests/sync.c
-@@ -577,7 +577,10 @@ static void test_event(void)
+@@ -582,7 +582,10 @@ static void test_event(void)
  
  static void test_semaphore(void)
  {
@@ -23,8 +23,8 @@ index ef900dcfc04..26ccfdd4a54 100644
  
      /* test case sensitivity */
  
-@@ -619,6 +622,99 @@ static void test_semaphore(void)
-     ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError());
+@@ -624,6 +627,99 @@ static void test_semaphore(void)
+     ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %lu\n", GetLastError());
  
      CloseHandle( handle );
 +
@@ -124,5 +124,5 @@ index ef900dcfc04..26ccfdd4a54 100644
  
  static void test_waitable_timer(void)
 -- 
-2.28.0
+2.35.1
 

patches/eventfd_synchronization/0039-kernel32-tests-Add-some-event-tests.patch

@@ -1,4 +1,4 @@
-From 30a65d88cd062f09f88513c377d2c7780e92e05d Mon Sep 17 00:00:00 2001
+From 8790bcd9d5ff4b2e38ca00a4ba7d1d884924b25e Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <z.figura12@gmail.com>
 Date: Wed, 13 Jun 2018 22:59:37 -0500
 Subject: [PATCH] kernel32/tests: Add some event tests.
@@ -8,10 +8,10 @@ Subject: [PATCH] kernel32/tests: Add some event tests.
  1 file changed, 118 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c
-index 26ccfdd4a54..ea54cb069df 100644
+index ad6ab1adc96..95f51f54b83 100644
 --- a/dlls/kernel32/tests/sync.c
 +++ b/dlls/kernel32/tests/sync.c
-@@ -464,12 +464,13 @@ static void test_slist(void)
+@@ -469,12 +469,13 @@ static void test_slist(void)
  
  static void test_event(void)
  {
@@ -26,8 +26,8 @@ index 26ccfdd4a54..ea54cb069df 100644
  
      /* no sd */
      handle = CreateEventA(NULL, FALSE, FALSE, __FILE__ ": Test Event");
-@@ -573,6 +574,122 @@ static void test_event(void)
-     ok( ret, "QueryMemoryResourceNotification failed err %u\n", GetLastError() );
+@@ -578,6 +579,122 @@ static void test_event(void)
+     ok( ret, "QueryMemoryResourceNotification failed err %lu\n", GetLastError() );
      ok( val == FALSE || val == TRUE, "wrong value %u\n", val );
      CloseHandle( handle );
 +
@@ -150,5 +150,5 @@ index 26ccfdd4a54..ea54cb069df 100644
  
  static void test_semaphore(void)
 -- 
-2.28.0
+2.35.1
 

patches/eventfd_synchronization/0041-kernel32-tests-Add-some-tests-for-wait-timeouts.patch

@@ -1,4 +1,4 @@
-From 0596227ece99953785e8165d9c983114da77721c Mon Sep 17 00:00:00 2001
+From 9d683eab1efae1c8dcd5b571e8a31ac0f13fc563 Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <z.figura12@gmail.com>
 Date: Wed, 13 Jun 2018 23:58:01 -0500
 Subject: [PATCH] kernel32/tests: Add some tests for wait timeouts.
@@ -8,10 +8,10 @@ Subject: [PATCH] kernel32/tests: Add some tests for wait timeouts.
  1 file changed, 68 insertions(+)
 
 diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c
-index 790b7bfe797..6e4916f6bc3 100644
+index 4685b7bec06..117edf12fb6 100644
 --- a/dlls/kernel32/tests/sync.c
 +++ b/dlls/kernel32/tests/sync.c
-@@ -54,6 +54,7 @@ static BOOLEAN (WINAPI *pTryAcquireSRWLockShared)(PSRWLOCK);
+@@ -57,6 +57,7 @@ static BOOLEAN (WINAPI *pTryAcquireSRWLockShared)(PSRWLOCK);
  
  static NTSTATUS (WINAPI *pNtAllocateVirtualMemory)(HANDLE, PVOID *, ULONG_PTR, SIZE_T *, ULONG, ULONG);
  static NTSTATUS (WINAPI *pNtFreeVirtualMemory)(HANDLE, PVOID *, SIZE_T *, ULONG);
@@ -19,7 +19,7 @@ index 790b7bfe797..6e4916f6bc3 100644
  static NTSTATUS (WINAPI *pNtWaitForSingleObject)(HANDLE, BOOLEAN, const LARGE_INTEGER *);
  static NTSTATUS (WINAPI *pNtWaitForMultipleObjects)(ULONG,const HANDLE*,BOOLEAN,BOOLEAN,const LARGE_INTEGER*);
  static PSLIST_ENTRY (__fastcall *pRtlInterlockedPushListSList)(PSLIST_HEADER list, PSLIST_ENTRY first,
-@@ -1480,11 +1481,15 @@ static HANDLE modify_handle(HANDLE handle, DWORD modify)
+@@ -1485,11 +1486,15 @@ static HANDLE modify_handle(HANDLE handle, DWORD modify)
      return ULongToHandle(tmp);
  }
  
@@ -35,9 +35,9 @@ index 790b7bfe797..6e4916f6bc3 100644
      DWORD ret;
  
      signaled = CreateEventW(NULL, TRUE, TRUE, NULL);
-@@ -1569,6 +1574,68 @@ static void test_WaitForSingleObject(void)
+@@ -1574,6 +1579,68 @@ static void test_WaitForSingleObject(void)
      status = pNtWaitForSingleObject(GetCurrentThread(), FALSE, &timeout);
-     ok(status == STATUS_TIMEOUT, "expected STATUS_TIMEOUT, got %08x\n", status);
+     ok(status == STATUS_TIMEOUT, "expected STATUS_TIMEOUT, got %08lx\n", status);
  
 +    ret = WaitForSingleObject( signaled, 0 );
 +    ok(ret == 0, "got %u\n", ret);
@@ -104,7 +104,7 @@ index 790b7bfe797..6e4916f6bc3 100644
      CloseHandle(signaled);
      CloseHandle(nonsignaled);
  }
-@@ -3037,6 +3104,7 @@ START_TEST(sync)
+@@ -3113,6 +3180,7 @@ START_TEST(sync)
      pTryAcquireSRWLockShared = (void *)GetProcAddress(hdll, "TryAcquireSRWLockShared");
      pNtAllocateVirtualMemory = (void *)GetProcAddress(hntdll, "NtAllocateVirtualMemory");
      pNtFreeVirtualMemory = (void *)GetProcAddress(hntdll, "NtFreeVirtualMemory");
@@ -113,5 +113,5 @@ index 790b7bfe797..6e4916f6bc3 100644
      pNtWaitForMultipleObjects = (void *)GetProcAddress(hntdll, "NtWaitForMultipleObjects");
      pRtlInterlockedPushListSList = (void *)GetProcAddress(hntdll, "RtlInterlockedPushListSList");
 -- 
-2.28.0
+2.35.1