Release v7.16

Add a reference to proton report which this patch would help.

.github/workflows/macOS.yml

@@ -19,7 +19,7 @@ jobs:
           brew install  bison \
                         gphoto2 \
                         gst-plugins-base \
-                        gcenx/wine/mingw-w64@9 \
+                        mingw-w64 \
                         molten-vk \
                         sdl2
 
@@ -28,7 +28,6 @@ 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,8 +61,6 @@ 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)
@@ -79,12 +76,9 @@ jobs:
           brew update
           brew install --cask xquartz
           brew install  bison \
-                        faudio \
                         gphoto2 \
                         gst-plugins-base \
-                        jxrlib \
-                        little-cms2 \
-                        gcenx/wine/mingw-w64@9 \
+                        mingw-w64 \
                         molten-vk \
                         mpg123
 
@@ -93,7 +87,6 @@ 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: |
@@ -125,8 +118,6 @@ 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/ddraw-Device_Caps/0001-ddraw-Don-t-set-HWTRANSFORMANDLIGHT-flag-on-d3d7-RGB.patch

@@ -1,116 +0,0 @@
-From 861cd6c6409efce4eb03aad3bc01f5df772e77fb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Sat, 6 Feb 2016 01:15:07 +0100
-Subject: [PATCH] ddraw: Don't set HWTRANSFORMANDLIGHT flag on d3d7 RGB device.
-
----
- dlls/ddraw/ddraw.c        |  9 +++++++++
- dlls/ddraw/tests/ddraw7.c | 18 ++++++++++++++++++
- 2 files changed, 27 insertions(+)
-
-diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
-index 705d0335d95..1d916f93c4f 100644
---- a/dlls/ddraw/ddraw.c
-+++ b/dlls/ddraw/ddraw.c
-@@ -49,6 +49,7 @@ static struct enum_device_entry
-     char interface_name[100];
-     char device_name[100];
-     const GUID *device_guid;
-+    DWORD remove_caps;
- } device_list7[] =
- {
-     /* T&L HAL device */
-@@ -56,6 +57,7 @@ static struct enum_device_entry
-         "WINE Direct3D7 Hardware Transform and Lighting acceleration using WineD3D",
-         "Wine D3D7 T&L HAL",
-         &IID_IDirect3DTnLHalDevice,
-+        0,
-     },
- 
-     /* HAL device */
-@@ -63,6 +65,7 @@ static struct enum_device_entry
-         "WINE Direct3D7 Hardware acceleration using WineD3D",
-         "Direct3D HAL",
-         &IID_IDirect3DHALDevice,
-+        0,
-     },
- 
-     /* RGB device */
-@@ -70,6 +73,7 @@ static struct enum_device_entry
-         "WINE Direct3D7 RGB Software Emulation using WineD3D",
-         "Wine D3D7 RGB",
-         &IID_IDirect3DRGBDevice,
-+        D3DDEVCAPS_HWTRANSFORMANDLIGHT,
-     },
- };
- 
-@@ -3749,6 +3753,7 @@ static HRESULT WINAPI d3d7_EnumDevices(IDirect3D7 *iface, LPD3DENUMDEVICESCALLBA
- {
-     struct ddraw *ddraw = impl_from_IDirect3D7(iface);
-     D3DDEVICEDESC7 device_desc7;
-+    DWORD dev_caps;
-     HRESULT hr;
-     size_t i;
- 
-@@ -3765,11 +3770,15 @@ static HRESULT WINAPI d3d7_EnumDevices(IDirect3D7 *iface, LPD3DENUMDEVICESCALLBA
-         return hr;
-     }
- 
-+    dev_caps = device_desc7.dwDevCaps;
-+
-     for (i = 0; i < ARRAY_SIZE(device_list7); i++)
-     {
-         HRESULT ret;
- 
-         device_desc7.deviceGUID = *device_list7[i].device_guid;
-+        device_desc7.dwDevCaps  = dev_caps & ~device_list7[i].remove_caps;
-+
-         ret = callback(device_list7[i].interface_name, device_list7[i].device_name, &device_desc7, context);
-         if (ret != DDENUMRET_OK)
-         {
-diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
-index d641595baa2..54cc18b74f2 100644
---- a/dlls/ddraw/tests/ddraw7.c
-+++ b/dlls/ddraw/tests/ddraw7.c
-@@ -577,6 +577,19 @@ static IDirect3DDevice7 *create_device_ex(HWND window, DWORD coop_level, const G
-     return device;
- }
- 
-+static HRESULT WINAPI enum_devtype_software_cb(char *desc_str, char *name, D3DDEVICEDESC7 *desc, void *ctx)
-+{
-+    BOOL *software_ok = ctx;
-+    if (IsEqualGUID(&desc->deviceGUID, &IID_IDirect3DRGBDevice))
-+    {
-+        ok(!(desc->dwDevCaps & D3DDEVCAPS_HWTRANSFORMANDLIGHT),
-+           "RGB emulation device shouldn't have HWTRANSFORMANDLIGHT flag\n");
-+        *software_ok = TRUE;
-+        return DDENUMRET_CANCEL;
-+    }
-+    return DDENUMRET_OK;
-+}
-+
- static IDirect3DDevice7 *create_device(HWND window, DWORD coop_level)
- {
-     const GUID *device_guid = &IID_IDirect3DHALDevice;
-@@ -6719,6 +6732,7 @@ static void test_surface_lock(void)
-     ULONG refcount;
-     DDPIXELFORMAT z_fmt;
-     BOOL hal_ok = FALSE;
-+    BOOL software_ok = FALSE;
-     const GUID *devtype = &IID_IDirect3DHALDevice;
-     D3DDEVICEDESC7 device_desc;
-     BOOL cubemap_supported;
-@@ -6844,6 +6858,10 @@ static void test_surface_lock(void)
-     if (hal_ok)
-         devtype = &IID_IDirect3DTnLHalDevice;
- 
-+    hr = IDirect3D7_EnumDevices(d3d, enum_devtype_software_cb, &software_ok);
-+    ok(SUCCEEDED(hr), "Failed to enumerate devices, hr %#x.\n", hr);
-+    if (!software_ok) win_skip("RGB device not found, unable to check flags\n");
-+
-     memset(&z_fmt, 0, sizeof(z_fmt));
-     hr = IDirect3D7_EnumZBufferFormats(d3d, devtype, enum_z_fmt, &z_fmt);
-     if (FAILED(hr) || !z_fmt.dwSize)
--- 
-2.20.1
-

patches/ddraw-IDirect3DTexture2_Load/0002-ddraw-tests-Add-more-tests-for-IDirect3DTexture2-Loa.patch

@@ -1,18 +1,18 @@
-From 4498bb259a9ab5e5bf6f8a55dc96b6ac24c82e09 Mon Sep 17 00:00:00 2001
+From 9028351204472aafe5d7731c8737a6cfdb09e659 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sat, 30 May 2015 02:56:19 +0200
-Subject: ddraw/tests: Add more tests for IDirect3DTexture2::Load.
+Subject: [PATCH] ddraw/tests: Add more tests for IDirect3DTexture2::Load.
 
 ---
- dlls/ddraw/tests/d3d.c    | 373 ++++++++++++++++++++++++++++++++++++++++++++++
- dlls/ddraw/tests/ddraw2.c |  28 +++-
+ dlls/ddraw/tests/d3d.c    | 373 ++++++++++++++++++++++++++++++++++++++
+ dlls/ddraw/tests/ddraw2.c |  28 ++-
  2 files changed, 400 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c
-index ec4197a..d35d0e0 100644
+index 87d0648b699..e88bbf59767 100644
 --- a/dlls/ddraw/tests/d3d.c
 +++ b/dlls/ddraw/tests/d3d.c
-@@ -1515,6 +1515,288 @@ static BOOL colortables_check_equality(PALETTEENTRY table1[256], PALETTEENTRY ta
+@@ -1221,6 +1221,288 @@ static BOOL colortables_check_equality(PALETTEENTRY table1[256], PALETTEENTRY ta
      return TRUE;
  }
  
@@ -301,9 +301,9 @@ index ec4197a..d35d0e0 100644
  /* test palette handling in IDirect3DTexture_Load */
  static void TextureLoadTest(void)
  {
-@@ -1578,6 +1860,97 @@ static void TextureLoadTest(void)
+@@ -1284,6 +1566,97 @@ static void TextureLoadTest(void)
      hr = IDirect3DTexture_Load(Texture2, Texture);
-     ok(hr == DD_OK, "IDirect3DTexture_Load returned %08x\n", hr);
+     ok(hr == DD_OK, "Got hr %#lx.\n", hr);
  
 +    for (i = 0; i < sizeof(load_tests) / sizeof(load_tests[0]); i++)
 +    {
@@ -400,10 +400,10 @@ index ec4197a..d35d0e0 100644
          table1[i].peRed = i;
          table1[i].peGreen = i;
 diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
-index 0cb1ca4..a2489e4 100644
+index 2d08718d131..0a2d575e8cc 100644
 --- a/dlls/ddraw/tests/ddraw2.c
 +++ b/dlls/ddraw/tests/ddraw2.c
-@@ -1121,8 +1121,10 @@ static void test_texture_load_ckey(void)
+@@ -1495,8 +1495,10 @@ static void test_texture_load_ckey(void)
      IDirectDraw2 *ddraw = NULL;
      IDirectDrawSurface *src = NULL;
      IDirectDrawSurface *dst = NULL;
@@ -414,7 +414,7 @@ index 0cb1ca4..a2489e4 100644
      DDSURFACEDESC ddsd;
      HRESULT hr;
      DDCOLORKEY ckey;
-@@ -1134,16 +1136,31 @@ static void test_texture_load_ckey(void)
+@@ -1508,16 +1510,31 @@ static void test_texture_load_ckey(void)
  
      memset(&ddsd, 0, sizeof(ddsd));
      ddsd.dwSize = sizeof(ddsd);
@@ -431,10 +431,10 @@ index 0cb1ca4..a2489e4 100644
 +    U4(ddsd.ddpfPixelFormat).dwBBitMask = 0x000000FF;
 +
      hr = IDirectDraw2_CreateSurface(ddraw, &ddsd, &src, NULL);
-     ok(SUCCEEDED(hr), "Failed to create source texture, hr %#x.\n", hr);
+     ok(SUCCEEDED(hr), "Failed to create source texture, hr %#lx.\n", hr);
      ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE;
      hr = IDirectDraw2_CreateSurface(ddraw, &ddsd, &dst, NULL);
-     ok(SUCCEEDED(hr), "Failed to create destination texture, hr %#x.\n", hr);
+     ok(SUCCEEDED(hr), "Failed to create destination texture, hr %#lx.\n", hr);
  
 +    U1(ddsd.ddpfPixelFormat).dwRGBBitCount = 16;
 +    U2(ddsd.ddpfPixelFormat).dwRBitMask = 0xf800;
@@ -445,20 +445,20 @@ index 0cb1ca4..a2489e4 100644
 +    ok(SUCCEEDED(hr), "Failed to create destination texture, hr %#x.\n", hr);
 +
      hr = IDirectDrawSurface_QueryInterface(src, &IID_IDirect3DTexture, (void **)&src_tex);
-     ok(SUCCEEDED(hr) || hr == E_NOINTERFACE, "Failed to get Direct3DTexture interface, hr %#x.\n", hr);
+     ok(SUCCEEDED(hr) || hr == E_NOINTERFACE, "Failed to get Direct3DTexture interface, hr %#lx.\n", hr);
      if (FAILED(hr))
-@@ -1154,6 +1171,8 @@ static void test_texture_load_ckey(void)
+@@ -1528,6 +1545,8 @@ static void test_texture_load_ckey(void)
      }
      hr = IDirectDrawSurface_QueryInterface(dst, &IID_IDirect3DTexture, (void **)&dst_tex);
-     ok(SUCCEEDED(hr), "Failed to get Direct3DTexture interface, hr %#x.\n", hr);
+     ok(SUCCEEDED(hr), "Failed to get Direct3DTexture interface, hr %#lx.\n", hr);
 +    hr = IDirectDrawSurface_QueryInterface(dst2, &IID_IDirect3DTexture, (void **)&dst2_tex);
-+    ok(SUCCEEDED(hr), "Failed to get Direct3DTexture interface, hr %#x.\n", hr);
++    ok(SUCCEEDED(hr), "Failed to get Direct3DTexture interface, hr %#lx.\n", hr);
  
      /* No surface has a color key */
      hr = IDirect3DTexture_Load(dst_tex, src_tex);
-@@ -1182,6 +1201,11 @@ static void test_texture_load_ckey(void)
-     ok(ckey.dwColorSpaceLowValue == 0x0000ff00, "dwColorSpaceLowValue is %#x.\n", ckey.dwColorSpaceLowValue);
-     ok(ckey.dwColorSpaceHighValue == 0x0000ff00, "dwColorSpaceHighValue is %#x.\n", ckey.dwColorSpaceHighValue);
+@@ -1556,6 +1575,11 @@ static void test_texture_load_ckey(void)
+     ok(ckey.dwColorSpaceLowValue == 0x0000ff00, "Got unexpected value 0x%08lx.\n", ckey.dwColorSpaceLowValue);
+     ok(ckey.dwColorSpaceHighValue == 0x0000ff00, "Got unexpected value 0x%08lx.\n", ckey.dwColorSpaceHighValue);
  
 +    /* Source surface has a color key but destination differs in format */
 +    ckey.dwColorSpaceLowValue = ckey.dwColorSpaceHighValue = 0x0;
@@ -468,8 +468,8 @@ index 0cb1ca4..a2489e4 100644
      /* Both surfaces have a color key: Dest ckey is overwritten */
      ckey.dwColorSpaceLowValue = ckey.dwColorSpaceHighValue = 0x000000ff;
      hr = IDirectDrawSurface_SetColorKey(dst, DDCKEY_SRCBLT, &ckey);
-@@ -1206,8 +1230,10 @@ static void test_texture_load_ckey(void)
-     ok(ckey.dwColorSpaceHighValue == 0x0000ff00, "dwColorSpaceHighValue is %#x.\n", ckey.dwColorSpaceHighValue);
+@@ -1580,8 +1604,10 @@ static void test_texture_load_ckey(void)
+     ok(ckey.dwColorSpaceHighValue == 0x0000ff00, "Got unexpected value 0x%08lx.\n", ckey.dwColorSpaceHighValue);
  
  done:
 +    if (dst2_tex) IDirect3DTexture_Release(dst2_tex);
@@ -480,5 +480,5 @@ index 0cb1ca4..a2489e4 100644
      if (src) IDirectDrawSurface_Release(src);
      if (ddraw) IDirectDraw2_Release(ddraw);
 -- 
-2.4.2
+2.35.1
 

patches/ddraw-version-check/definition

@@ -8,3 +8,4 @@
 #   The Sims Online
 Fixes: [19153] Resident Evil 1 fails to start (needs IDirect3D3::EnumDevices() to return a device named "RGB Emulation")
 Depends: ddraw-Device_Caps
+Disabled: True

patches/dsound-EAX/0008-dsound-Add-EAX-init-and-free-stubs.patch

@@ -1,4 +1,4 @@
-From 415ededb3cceae15cb05a1860cef1d4e5e055b27 Mon Sep 17 00:00:00 2001
+From 5d29a2de174042ce7bdd52d92337591933e0f761 Mon Sep 17 00:00:00 2001
 From: Mark Harmstone <mark@harmstone.com>
 Date: Fri, 27 Mar 2015 20:58:37 +0000
 Subject: [PATCH] dsound: Add EAX init and free stubs.
@@ -10,10 +10,10 @@ Subject: [PATCH] dsound: Add EAX init and free stubs.
  3 files changed, 33 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c
-index 6bbf468d136..e27fdfdecc4 100644
+index e8b3fb4a832..28f2e95994e 100644
 --- a/dlls/dsound/buffer.c
 +++ b/dlls/dsound/buffer.c
-@@ -1110,6 +1110,8 @@ HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *ds
+@@ -1153,6 +1153,8 @@ HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *ds
  		DSOUND_RecalcVolPan(&(dsb->volpan));
  
          InitializeSRWLock(&dsb->lock);
@@ -22,20 +22,20 @@ index 6bbf468d136..e27fdfdecc4 100644
  
          /* register buffer */
          err = DirectSoundDevice_AddBuffer(device, dsb);
-@@ -1150,6 +1152,8 @@ void secondarybuffer_destroy(IDirectSoundBufferImpl *This)
+@@ -1194,6 +1196,8 @@ void secondarybuffer_destroy(IDirectSoundBufferImpl *This)
          HeapFree(GetProcessHeap(), 0, This->filters);
      }
  
 +    free_eax_buffer(This);
 +
-     HeapFree(GetProcessHeap(), 0, This);
- 
      TRACE("(%p) released\n", This);
+ 
+     HeapFree(GetProcessHeap(), 0, This);
 diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
-index 3b4c4f290a4..8dbb9edb594 100644
+index 267b2c044bc..c906eb2adb1 100644
 --- a/dlls/dsound/dsound_private.h
 +++ b/dlls/dsound/dsound_private.h
-@@ -234,6 +234,8 @@ HRESULT WINAPI EAX_Get(IDirectSoundBufferImpl *buf, REFGUID guidPropSet,
+@@ -240,6 +240,8 @@ HRESULT WINAPI EAX_Get(IDirectSoundBufferImpl *buf, REFGUID guidPropSet,
  HRESULT WINAPI EAX_Set(IDirectSoundBufferImpl *buf, REFGUID guidPropSet,
          ULONG dwPropID, void *pInstanceData, ULONG cbInstanceData, void *pPropData,
          ULONG cbPropData) DECLSPEC_HIDDEN;
@@ -45,7 +45,7 @@ index 3b4c4f290a4..8dbb9edb594 100644
  /* mixer.c */
  void DSOUND_CheckEvent(const IDirectSoundBufferImpl *dsb, DWORD playpos, int len) DECLSPEC_HIDDEN;
 diff --git a/dlls/dsound/eax.c b/dlls/dsound/eax.c
-index 3931681d295..c0afb0f1acf 100644
+index 03b6e0a9813..91438efc335 100644
 --- a/dlls/dsound/eax.c
 +++ b/dlls/dsound/eax.c
 @@ -92,20 +92,46 @@ static const EFXEAXREVERBPROPERTIES efx_presets[] = {
@@ -97,5 +97,5 @@ index 3931681d295..c0afb0f1acf 100644
  
  HRESULT WINAPI EAX_Get(IDirectSoundBufferImpl *buf, REFGUID guidPropSet,
 -- 
-2.27.0
+2.35.1
 

patches/dwmapi-DwmGetCompositionTimingInfo/0001-dwmapi-Fill-rateRefresh-rateCompose-and-qpcRefreshPe.patch

@@ -1,134 +0,0 @@
-From bdd925e61fa6ba20272960bfea8e0638d20060f1 Mon Sep 17 00:00:00 2001
-From: Jactry Zeng <jzeng@codeweavers.com>
-Date: Fri, 3 Jun 2022 02:50:29 -0500
-Subject: [PATCH 1/2] dwmapi: Fill rateRefresh/rateCompose and qpcRefreshPeriod
- of DWM_TIMING_INFO from DwmGetCompositionTimingInfo().
-
-Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53035
-Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53038
-Signed-off-by: Jactry Zeng <jzeng@codeweavers.com>
----
- dlls/dwmapi/Makefile.in       |  1 +
- dlls/dwmapi/dwmapi_main.c     | 27 ++++++++++++++++++++++++++-
- dlls/dwmapi/tests/Makefile.in |  2 +-
- dlls/dwmapi/tests/dwmapi.c    | 22 ++++++++++++++++++++++
- 4 files changed, 50 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/dwmapi/Makefile.in b/dlls/dwmapi/Makefile.in
-index e63dbc2ea00..37411a57608 100644
---- a/dlls/dwmapi/Makefile.in
-+++ b/dlls/dwmapi/Makefile.in
-@@ -1,4 +1,5 @@
- MODULE    = dwmapi.dll
-+IMPORTS   = user32
- IMPORTLIB = dwmapi
- 
- EXTRADLLFLAGS = -Wb,--prefer-native
-diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c
-index 6bb086a87d1..1fb522e389a 100644
---- a/dlls/dwmapi/dwmapi_main.c
-+++ b/dlls/dwmapi/dwmapi_main.c
-@@ -211,12 +211,28 @@ HRESULT WINAPI DwmRegisterThumbnail(HWND dest, HWND src, PHTHUMBNAIL thumbnail_i
-     return E_NOTIMPL;
- }
- 
-+static int get_display_frequency(void)
-+{
-+    DEVMODEA mode;
-+
-+    memset(&mode, 0, sizeof(mode));
-+    mode.dmSize = sizeof(mode);
-+    if (EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &mode))
-+        return mode.dmDisplayFrequency;
-+    else
-+    {
-+        WARN("Failed to query display frequency, returning a fallback value.\n");
-+        return 60;
-+    }
-+}
-+
- /**********************************************************************
-  *           DwmGetCompositionTimingInfo         (DWMAPI.@)
-  */
- HRESULT WINAPI DwmGetCompositionTimingInfo(HWND hwnd, DWM_TIMING_INFO *info)
- {
--    static int i;
-+    LARGE_INTEGER performance_frequency;
-+    static int i, display_frequency;
- 
-     if (!info)
-         return E_INVALIDARG;
-@@ -229,6 +245,15 @@ HRESULT WINAPI DwmGetCompositionTimingInfo(HWND hwnd, DWM_TIMING_INFO *info)
-     memset(info, 0, info->cbSize);
-     info->cbSize = sizeof(DWM_TIMING_INFO);
- 
-+    display_frequency = get_display_frequency();
-+    info->rateRefresh.uiNumerator = display_frequency;
-+    info->rateRefresh.uiDenominator = 1;
-+    info->rateCompose.uiNumerator = display_frequency;
-+    info->rateCompose.uiDenominator = 1;
-+
-+    QueryPerformanceFrequency(&performance_frequency);
-+    info->qpcRefreshPeriod = performance_frequency.QuadPart / display_frequency;
-+
-     return S_OK;
- }
- 
-diff --git a/dlls/dwmapi/tests/Makefile.in b/dlls/dwmapi/tests/Makefile.in
-index 6c6130401d6..e819e3ca09a 100644
---- a/dlls/dwmapi/tests/Makefile.in
-+++ b/dlls/dwmapi/tests/Makefile.in
-@@ -1,5 +1,5 @@
- TESTDLL = dwmapi.dll
--IMPORTS = dwmapi
-+IMPORTS = dwmapi user32
- 
- C_SRCS = \
- 	dwmapi.c
-diff --git a/dlls/dwmapi/tests/dwmapi.c b/dlls/dwmapi/tests/dwmapi.c
-index 696aa9c9d86..29dbcbe74bd 100644
---- a/dlls/dwmapi/tests/dwmapi.c
-+++ b/dlls/dwmapi/tests/dwmapi.c
-@@ -35,7 +35,11 @@ static void test_DwmIsCompositionEnabled(void)
- 
- static void test_DwmGetCompositionTimingInfo(void)
- {
-+    LARGE_INTEGER performance_frequency;
-+    int result, display_frequency;
-     DWM_TIMING_INFO timing_info;
-+    QPC_TIME refresh_period;
-+    DEVMODEA mode;
-     BOOL enabled;
-     HRESULT hr;
- 
-@@ -56,9 +60,27 @@ static void test_DwmGetCompositionTimingInfo(void)
-     hr = DwmGetCompositionTimingInfo(NULL, &timing_info);
-     ok(hr == MILERR_MISMATCHED_SIZE, "Got hr %#lx.\n", hr);
- 
-+    memset(&mode, 0, sizeof(mode));
-+    mode.dmSize = sizeof(mode);
-+    result = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &mode);
-+    ok(!!result, "Failed to get display mode %#lx.\n", GetLastError());
-+    display_frequency = mode.dmDisplayFrequency;
-+    ok(!!QueryPerformanceFrequency(&performance_frequency), "Failed to get performance counter frequency.\n");
-+    refresh_period = performance_frequency.QuadPart / display_frequency;
-+
-     timing_info.cbSize = sizeof(timing_info);
-     hr = DwmGetCompositionTimingInfo(NULL, &timing_info);
-     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-+    ok(timing_info.cbSize == sizeof(timing_info), "Got wrong struct size %d.\n", timing_info.cbSize);
-+    ok(timing_info.rateRefresh.uiDenominator == 1 && timing_info.rateRefresh.uiNumerator == display_frequency,
-+            "Got wrong monitor refresh rate %d/%d.\n", timing_info.rateRefresh.uiDenominator,
-+            timing_info.rateRefresh.uiNumerator);
-+    ok(timing_info.rateCompose.uiDenominator == 1 && timing_info.rateCompose.uiNumerator == display_frequency,
-+            "Got wrong composition rate %d/%d.\n", timing_info.rateCompose.uiDenominator,
-+            timing_info.rateCompose.uiNumerator);
-+    ok(timing_info.qpcRefreshPeriod == refresh_period
-+            || broken(timing_info.qpcRefreshPeriod == display_frequency), /* win10 v1507 */
-+            "Got wrong monitor refresh period %s.\n", wine_dbgstr_longlong(timing_info.qpcRefreshPeriod));
- }
- 
- START_TEST(dwmapi)
--- 
-2.35.1
-

patches/dwmapi-DwmGetCompositionTimingInfo/0002-dwmapi-Return-S_OK-from-DwmFlush.patch

@@ -1,27 +0,0 @@
-From e1cdd6b53b73325cdb12815135162e43270df2ea Mon Sep 17 00:00:00 2001
-From: Jactry Zeng <jzeng@codeweavers.com>
-Date: Fri, 3 Jun 2022 02:50:30 -0500
-Subject: [PATCH 2/2] dwmapi: Return S_OK from DwmFlush().
-
-Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53035
-Signed-off-by: Jactry Zeng <jzeng@codeweavers.com>
----
- dlls/dwmapi/dwmapi_main.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c
-index 1fb522e389a..1a65410c7eb 100644
---- a/dlls/dwmapi/dwmapi_main.c
-+++ b/dlls/dwmapi/dwmapi_main.c
-@@ -92,7 +92,7 @@ HRESULT WINAPI DwmFlush(void)
- 
-     if (!once++) FIXME("() stub\n");
- 
--    return E_NOTIMPL;
-+    return S_OK;
- }
- 
- /**********************************************************************
--- 
-2.35.1
-

patches/dwmapi-DwmGetCompositionTimingInfo/definition

@@ -1,2 +0,0 @@
-Fixes: [53038] - dwmapi: Supply some defaults values for DwmGetCompositionTimingInfo.
-Fixes: [53035] - dwmapi: DwmFlush return S_OK.

patches/dwrite-FontFallback/definition

@@ -1 +1,2 @@
 Fixes: [44052] - Support for font fallback.
+Disabled: True

patches/eventfd_synchronization/0013-server-Create-eventfd-file-descriptors-for-process-o.patch

@@ -1,4 +1,4 @@
-From 3e714e2eb10fe17f12b747731c0ce7e18fd4b7a0 Mon Sep 17 00:00:00 2001
+From 61fb7e02aa6779469e94c79f1132c4991cb27244 Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <zfigura@codeweavers.com>
 Date: Mon, 6 Jul 2020 15:11:12 -0500
 Subject: [PATCH] server: Create eventfd file descriptors for process objects.
@@ -40,16 +40,16 @@ index c7b0323f204..27049ffbdb0 100644
  {
      struct esync *esync;
 diff --git a/server/esync.h b/server/esync.h
-index 7ca4ca89394..6a0a367124d 100644
+index 00f9e638d83..8522d8a69ae 100644
 --- a/server/esync.h
 +++ b/server/esync.h
-@@ -20,3 +20,4 @@
+@@ -22,3 +22,4 @@
  
  extern int do_esync(void);
  void esync_init(void);
 +int esync_create_fd( int initval, int flags );
 diff --git a/server/process.c b/server/process.c
-index da972a41955..91b26d00ec0 100644
+index da11b90c613..22ac16fb540 100644
 --- a/server/process.c
 +++ b/server/process.c
 @@ -63,6 +63,7 @@
@@ -77,7 +77,7 @@ index da972a41955..91b26d00ec0 100644
      no_satisfied,                /* satisfied */
      no_signal,                   /* signal */
      no_get_fd,                   /* get_fd */
-@@ -684,6 +686,7 @@ struct process *create_process( int fd, struct process *parent, unsigned int fla
+@@ -686,6 +688,7 @@ struct process *create_process( int fd, struct process *parent, unsigned int fla
      process->rawinput_mouse  = NULL;
      process->rawinput_kbd    = NULL;
      memset( &process->image_info, 0, sizeof(process->image_info) );
@@ -85,7 +85,7 @@ index da972a41955..91b26d00ec0 100644
      list_init( &process->kernel_object );
      list_init( &process->thread_list );
      list_init( &process->locks );
-@@ -741,6 +744,9 @@ struct process *create_process( int fd, struct process *parent, unsigned int fla
+@@ -742,6 +745,9 @@ struct process *create_process( int fd, struct process *parent, unsigned int fla
      if (!token_assign_label( process->token, &high_label_sid ))
          goto error;
  
@@ -95,15 +95,15 @@ index da972a41955..91b26d00ec0 100644
      set_fd_events( process->msg_fd, POLLIN );  /* start listening to events */
      return process;
  
-@@ -787,6 +793,7 @@ static void process_destroy( struct object *obj )
-     if (process->token) release_object( process->token );
+@@ -789,6 +795,7 @@ static void process_destroy( struct object *obj )
+     free( process->rawinput_devices );
      free( process->dir_cache );
      free( process->image );
 +    if (do_esync()) close( process->esync_fd );
  }
  
  /* dump a process on stdout for debugging purposes */
-@@ -804,6 +811,13 @@ static int process_signaled( struct object *obj, struct wait_queue_entry *entry
+@@ -806,6 +813,13 @@ static int process_signaled( struct object *obj, struct wait_queue_entry *entry
      return !process->running_threads;
  }
  
@@ -118,10 +118,10 @@ index da972a41955..91b26d00ec0 100644
  {
      access = default_map_access( obj, access );
 diff --git a/server/process.h b/server/process.h
-index 632faf9c4bf..1ba69b3406e 100644
+index 97e0d455ece..a0a071d8f88 100644
 --- a/server/process.h
 +++ b/server/process.h
-@@ -90,6 +90,7 @@ struct process
+@@ -85,6 +85,7 @@ struct process
      const struct rawinput_device *rawinput_kbd;   /* rawinput keyboard device, if any */
      struct list          kernel_object;   /* list of kernel object pointers */
      pe_image_info_t      image_info;      /* main exe image info */
@@ -130,5 +130,5 @@ index 632faf9c4bf..1ba69b3406e 100644
  
  /* process functions */
 -- 
-2.34.1
+2.35.1
 

patches/eventfd_synchronization/0021-server-ntdll-Implement-message-waits.patch

@@ -1,4 +1,4 @@
-From e0a89702e35941e75ce06f795966c92b3f195ed8 Mon Sep 17 00:00:00 2001
+From ca6a89f3bfb6aa5d7ac05bb0c469b527ae1a9d9d Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <zfigura@codeweavers.com>
 Date: Mon, 6 Jul 2020 16:11:23 -0500
 Subject: [PATCH] server, ntdll: Implement message waits.
@@ -10,10 +10,10 @@ Subject: [PATCH] server, ntdll: Implement message waits.
  3 files changed, 75 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/ntdll/unix/esync.c b/dlls/ntdll/unix/esync.c
-index fcbe563bb5a..88490e08ef9 100644
+index 2ae334d8417..608c318c1c7 100644
 --- a/dlls/ntdll/unix/esync.c
 +++ b/dlls/ntdll/unix/esync.c
-@@ -482,12 +482,13 @@ static void update_grabbed_object( struct esync *obj )
+@@ -475,12 +475,13 @@ static void update_grabbed_object( struct esync *obj )
  
  /* A value of STATUS_NOT_IMPLEMENTED returned from this function means that we
   * need to delegate to server_select(). */
@@ -28,7 +28,7 @@ index fcbe563bb5a..88490e08ef9 100644
      LONGLONG timeleft;
      LARGE_INTEGER now;
      ULONGLONG end;
-@@ -515,6 +516,9 @@ NTSTATUS esync_wait_objects( DWORD count, const HANDLE *handles, BOOLEAN wait_an
+@@ -508,6 +509,9 @@ NTSTATUS esync_wait_objects( DWORD count, const HANDLE *handles, BOOLEAN wait_an
              return ret;
      }
  
@@ -38,7 +38,7 @@ index fcbe563bb5a..88490e08ef9 100644
      if (has_esync && has_server)
          FIXME("Can't wait on esync and server objects at the same time!\n");
      else if (has_server)
-@@ -526,6 +530,9 @@ NTSTATUS esync_wait_objects( DWORD count, const HANDLE *handles, BOOLEAN wait_an
+@@ -519,6 +523,9 @@ NTSTATUS esync_wait_objects( DWORD count, const HANDLE *handles, BOOLEAN wait_an
          for (i = 0; i < count; i++)
              TRACE(" %p", handles[i]);
  
@@ -48,7 +48,7 @@ index fcbe563bb5a..88490e08ef9 100644
          if (!timeout)
              TRACE(", timeout = INFINITE.\n");
          else
-@@ -565,7 +572,9 @@ NTSTATUS esync_wait_objects( DWORD count, const HANDLE *handles, BOOLEAN wait_an
+@@ -558,7 +565,9 @@ NTSTATUS esync_wait_objects( DWORD count, const HANDLE *handles, BOOLEAN wait_an
                          int64_t value;
                          ssize_t size;
  
@@ -59,7 +59,7 @@ index fcbe563bb5a..88490e08ef9 100644
                          {
                              /* Don't grab the object, just check if it's signaled. */
                              if (fds[i].revents & POLLIN)
-@@ -610,6 +619,44 @@ NTSTATUS esync_wait_objects( DWORD count, const HANDLE *handles, BOOLEAN wait_an
+@@ -603,6 +612,44 @@ NTSTATUS esync_wait_objects( DWORD count, const HANDLE *handles, BOOLEAN wait_an
      }
  }
  
@@ -105,10 +105,10 @@ index fcbe563bb5a..88490e08ef9 100644
  {
      struct stat st;
 diff --git a/server/protocol.def b/server/protocol.def
-index cf00ab99c63..ecbb78cc9bb 100644
+index 5cf63cbac21..f837944574e 100644
 --- a/server/protocol.def
 +++ b/server/protocol.def
-@@ -3734,3 +3734,8 @@ enum esync_type
+@@ -3797,3 +3797,8 @@ enum esync_type
      int          type;
      unsigned int shm_idx;
  @END
@@ -118,10 +118,10 @@ index cf00ab99c63..ecbb78cc9bb 100644
 +    int          in_msgwait;    /* are we in a message wait? */
 +@END
 diff --git a/server/queue.c b/server/queue.c
-index d34bc284d08..f4edb299dc3 100644
+index 1702acb8480..9593ae532d4 100644
 --- a/server/queue.c
 +++ b/server/queue.c
-@@ -146,6 +146,7 @@ struct msg_queue
+@@ -144,6 +144,7 @@ struct msg_queue
      int                    keystate_lock;   /* owns an input keystate lock */
      unsigned int           ignore_post_msg; /* ignore post messages newer than this unique id */
      int                    esync_fd;        /* esync file descriptor (signalled on message) */
@@ -129,7 +129,7 @@ index d34bc284d08..f4edb299dc3 100644
  };
  
  struct hotkey
-@@ -319,6 +320,7 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_
+@@ -317,6 +318,7 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_
          queue->keystate_lock   = 0;
          queue->ignore_post_msg = 0;
          queue->esync_fd        = -1;
@@ -137,7 +137,7 @@ index d34bc284d08..f4edb299dc3 100644
          list_init( &queue->send_result );
          list_init( &queue->callback_result );
          list_init( &queue->pending_timers );
-@@ -1002,6 +1004,10 @@ static int is_queue_hung( struct msg_queue *queue )
+@@ -1001,6 +1003,10 @@ static int is_queue_hung( struct msg_queue *queue )
          if (get_wait_queue_thread(entry)->queue == queue)
              return 0;  /* thread is waiting on queue -> not hung */
      }
@@ -148,9 +148,9 @@ index d34bc284d08..f4edb299dc3 100644
      return 1;
  }
  
-@@ -3416,3 +3422,18 @@ DECL_HANDLER(get_rawinput_devices)
-             devices[i++] = e->device;
-     }
+@@ -3456,3 +3462,18 @@ DECL_HANDLER(update_rawinput_devices)
+     process->rawinput_mouse = find_rawinput_device( process, 1, 2 );
+     process->rawinput_kbd = find_rawinput_device( process, 1, 6 );
  }
 +
 +DECL_HANDLER(esync_msgwait)
@@ -168,5 +168,5 @@ index d34bc284d08..f4edb299dc3 100644
 +        set_fd_events( queue->fd, req->in_msgwait ? POLLIN : 0 );
 +}
 -- 
-2.30.2
+2.35.1
 

patches/eventfd_synchronization/0040-kernel32-tests-Add-some-mutex-tests.patch

@@ -1,4 +1,4 @@
-From 505384ad65984c3fc18c1c1a7b1fd39ecd0186f1 Mon Sep 17 00:00:00 2001
+From 07694655cf43e87ffc6185a5e7fe8d1bdd8658a4 Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <z.figura12@gmail.com>
 Date: Wed, 13 Jun 2018 23:32:04 -0500
 Subject: [PATCH] kernel32/tests: Add some mutex tests.
@@ -8,11 +8,11 @@ Subject: [PATCH] kernel32/tests: Add some mutex tests.
  1 file changed, 94 insertions(+)
 
 diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c
-index ea54cb069df..790b7bfe797 100644
+index bc85126d9aa..491052d5593 100644
 --- a/dlls/kernel32/tests/sync.c
 +++ b/dlls/kernel32/tests/sync.c
-@@ -177,8 +177,23 @@ static void test_signalandwait(void)
-     CloseHandle(file);
+@@ -227,8 +227,23 @@ static void test_temporary_objects(void)
+     ok(GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %lu\n", GetLastError());
  }
  
 +static HANDLE mutex, mutex2, mutices[2];
@@ -35,7 +35,7 @@ index ea54cb069df..790b7bfe797 100644
      DWORD wait_ret;
      BOOL ret;
      HANDLE hCreated;
-@@ -289,6 +304,85 @@ todo_wine_if(getenv("WINEESYNC"))   /* XFAIL: due to the above */
+@@ -339,6 +354,85 @@ todo_wine_if(getenv("WINEESYNC"))   /* XFAIL: due to the above */
      CloseHandle(hOpened);
  
      CloseHandle(hCreated);
@@ -122,5 +122,5 @@ index ea54cb069df..790b7bfe797 100644
  
  static void test_slist(void)
 -- 
-2.28.0
+2.35.1
 

patches/ntdll-CriticalSection/0003-ntdll-Use-fast-CS-functions-for-heap-locking.patch

@@ -1,4 +1,4 @@
-From 0dc447fc1d384c9412e9c8f55bfef9adfaeec994 Mon Sep 17 00:00:00 2001
+From 6fbc3bae354dec9fdd4a9a4e3e3a76340b66fd3f Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Sat, 5 Aug 2017 03:39:23 +0200
 Subject: [PATCH] ntdll: Use fast CS functions for heap locking.
@@ -8,64 +8,64 @@ Subject: [PATCH] ntdll: Use fast CS functions for heap locking.
  1 file changed, 8 insertions(+), 8 deletions(-)
 
 diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c
-index 1b6337d4ce8..ea2d4153b96 100644
+index 40c317417ce..60185aac2c6 100644
 --- a/dlls/ntdll/heap.c
 +++ b/dlls/ntdll/heap.c
-@@ -457,13 +457,13 @@ static inline ULONG heap_get_flags( const HEAP *heap, ULONG flags )
- static void heap_lock( HEAP *heap, ULONG flags )
+@@ -469,13 +469,13 @@ static inline ULONG heap_get_flags( const struct heap *heap, ULONG flags )
+ static void heap_lock( struct heap *heap, ULONG flags )
  {
      if (heap_get_flags( heap, flags ) & HEAP_NO_SERIALIZE) return;
 -    RtlEnterCriticalSection( &heap->cs );
 +    enter_critical_section( &heap->cs );
  }
  
- static void heap_unlock( HEAP *heap, ULONG flags )
+ static void heap_unlock( struct heap *heap, ULONG flags )
  {
      if (heap_get_flags( heap, flags ) & HEAP_NO_SERIALIZE) return;
 -    RtlLeaveCriticalSection( &heap->cs );
 +    leave_critical_section( &heap->cs );
  }
  
- static void heap_set_status( const HEAP *heap, ULONG flags, NTSTATUS status )
-@@ -1401,9 +1401,9 @@ HANDLE WINAPI RtlCreateHeap( ULONG flags, PVOID addr, SIZE_T totalSize, SIZE_T c
+ static void heap_set_status( const struct heap *heap, ULONG flags, NTSTATUS status )
+@@ -1383,9 +1383,9 @@ HANDLE WINAPI RtlCreateHeap( ULONG flags, PVOID addr, SIZE_T totalSize, SIZE_T c
      /* link it into the per-process heap list */
-     if (processHeap)
+     if (process_heap)
      {
--        RtlEnterCriticalSection( &processHeap->cs );
-+        enter_critical_section( &processHeap->cs );
-         list_add_head( &processHeap->entry, &heap->entry );
--        RtlLeaveCriticalSection( &processHeap->cs );
-+        leave_critical_section( &processHeap->cs );
+-        RtlEnterCriticalSection( &process_heap->cs );
++        enter_critical_section( &process_heap->cs );
+         list_add_head( &process_heap->entry, &heap->entry );
+-        RtlLeaveCriticalSection( &process_heap->cs );
++        leave_critical_section( &process_heap->cs );
      }
      else if (!addr)
      {
-@@ -1447,9 +1447,9 @@ HANDLE WINAPI RtlDestroyHeap( HANDLE heap )
-     if (heap == processHeap) return heap; /* cannot delete the main process heap */
+@@ -1441,9 +1441,9 @@ HANDLE WINAPI RtlDestroyHeap( HANDLE handle )
+     if (heap == process_heap) return handle; /* cannot delete the main process heap */
  
      /* remove it from the per-process list */
--    RtlEnterCriticalSection( &processHeap->cs );
-+    enter_critical_section( &processHeap->cs );
-     list_remove( &heapPtr->entry );
--    RtlLeaveCriticalSection( &processHeap->cs );
-+    leave_critical_section( &processHeap->cs );
+-    RtlEnterCriticalSection( &process_heap->cs );
++    enter_critical_section( &process_heap->cs );
+     list_remove( &heap->entry );
+-    RtlLeaveCriticalSection( &process_heap->cs );
++    leave_critical_section( &process_heap->cs );
  
-     heapPtr->cs.DebugInfo->Spare[0] = 0;
-     RtlDeleteCriticalSection( &heapPtr->cs );
-@@ -1930,7 +1930,7 @@ ULONG WINAPI RtlGetProcessHeaps( ULONG count, HANDLE *heaps )
+     heap->cs.DebugInfo->Spare[0] = 0;
+     RtlDeleteCriticalSection( &heap->cs );
+@@ -1938,7 +1938,7 @@ ULONG WINAPI RtlGetProcessHeaps( ULONG count, HANDLE *heaps )
      ULONG total = 1;  /* main heap */
      struct list *ptr;
  
--    RtlEnterCriticalSection( &processHeap->cs );
-+    enter_critical_section( &processHeap->cs );
-     LIST_FOR_EACH( ptr, &processHeap->entry ) total++;
+-    RtlEnterCriticalSection( &process_heap->cs );
++    enter_critical_section( &process_heap->cs );
+     LIST_FOR_EACH( ptr, &process_heap->entry ) total++;
      if (total <= count)
      {
-@@ -1938,7 +1938,7 @@ ULONG WINAPI RtlGetProcessHeaps( ULONG count, HANDLE *heaps )
-         LIST_FOR_EACH( ptr, &processHeap->entry )
-             *heaps++ = LIST_ENTRY( ptr, HEAP, entry );
+@@ -1946,7 +1946,7 @@ ULONG WINAPI RtlGetProcessHeaps( ULONG count, HANDLE *heaps )
+         LIST_FOR_EACH( ptr, &process_heap->entry )
+             *heaps++ = LIST_ENTRY( ptr, struct heap, entry );
      }
--    RtlLeaveCriticalSection( &processHeap->cs );
-+    leave_critical_section( &processHeap->cs );
+-    RtlLeaveCriticalSection( &process_heap->cs );
++    leave_critical_section( &process_heap->cs );
      return total;
  }
  

patches/ntdll-Junction_Points/0013-ntdll-Allow-creation-of-dangling-reparse-points-to-n.patch

@@ -1,8 +1,8 @@
-From 35bc7e69e9100202e0f0d91ee66449a13ef4d075 Mon Sep 17 00:00:00 2001
+From a25c97e1a004f773d8d1ad4d233aa140ca8d9c63 Mon Sep 17 00:00:00 2001
 From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
 Date: Tue, 30 Apr 2019 16:24:54 -0600
-Subject: ntdll: Allow creation of dangling reparse points to non-existent
- paths.
+Subject: [PATCH] ntdll: Allow creation of dangling reparse points to
+ non-existent paths.
 
 Signed-off-by: Erich E. Hoover <erich.e.hoover@gmail.com>
 ---
@@ -10,22 +10,22 @@ Signed-off-by: Erich E. Hoover <erich.e.hoover@gmail.com>
  1 file changed, 17 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c
-index e082ff5d322..e749e192f6f 100644
+index 82abd3e451b..fb4b3b65756 100644
 --- a/dlls/ntdll/unix/file.c
 +++ b/dlls/ntdll/unix/file.c
-@@ -3402,7 +3402,8 @@ static NTSTATUS lookup_unix_name( const WCHAR *name, int name_len, char **buffer
+@@ -3394,7 +3394,8 @@ static NTSTATUS lookup_unix_name( const WCHAR *name, int name_len, char **buffer
          /* if this is the last element, not finding it is not necessarily fatal */
          if (!name_len)
          {
--            if (status == STATUS_OBJECT_PATH_NOT_FOUND)
-+            if (status == STATUS_OBJECT_PATH_NOT_FOUND
+-            if (status == STATUS_OBJECT_NAME_NOT_FOUND)
++            if (status == STATUS_OBJECT_NAME_NOT_FOUND
 +                || (disposition == FILE_WINE_PATH && status == STATUS_OBJECT_NAME_NOT_FOUND))
              {
-                 status = STATUS_OBJECT_NAME_NOT_FOUND;
                  if (disposition != FILE_OPEN && disposition != FILE_OVERWRITE)
-@@ -3422,6 +3423,20 @@ static NTSTATUS lookup_unix_name( const WCHAR *name, int name_len, char **buffer
-                 status = STATUS_OBJECT_NAME_COLLISION;
+                 {
+@@ -3416,6 +3417,20 @@ static NTSTATUS lookup_unix_name( const WCHAR *name, int name_len, char **buffer
              }
+             if (end < next) strcat( unix_name, "/" );
          }
 +        else if (disposition == FILE_WINE_PATH && (status == STATUS_OBJECT_PATH_NOT_FOUND
 +                 || status == STATUS_OBJECT_NAME_NOT_FOUND))
@@ -41,10 +41,10 @@ index e082ff5d322..e749e192f6f 100644
 +                continue;
 +            }
 +        }
+         else if (status == STATUS_OBJECT_NAME_NOT_FOUND) status = STATUS_OBJECT_PATH_NOT_FOUND;
  
          if (status != STATUS_SUCCESS) break;
- 
-@@ -6080,7 +6095,7 @@ NTSTATUS create_reparse_point(HANDLE handle, REPARSE_DATA_BUFFER *buffer)
+@@ -6076,7 +6091,7 @@ NTSTATUS create_reparse_point(HANDLE handle, REPARSE_DATA_BUFFER *buffer)
              status = STATUS_NO_MEMORY;
              goto cleanup;
          }
@@ -54,5 +54,5 @@ index e082ff5d322..e749e192f6f 100644
          free( unix_dest );
      }
 -- 
-2.17.1
+2.35.1
 

patches/ntdll-Junction_Points/0024-ntdll-Succeed-with-no-data-for-NtReadFile-on-reparse.patch

@@ -1,7 +1,7 @@
-From 88fc8873bb68ef3d9b816a5cae76c5d7e12a82f1 Mon Sep 17 00:00:00 2001
+From 92381fe379f4e971168e1e3d9c67394eb8d0f697 Mon Sep 17 00:00:00 2001
 From: "Erich E. Hoover" <erich.e.hoover@wine-staging.com>
 Date: Mon, 23 Nov 2020 13:08:02 -0700
-Subject: ntdll: Succeed with no data for NtReadFile on reparse points.
+Subject: [PATCH] ntdll: Succeed with no data for NtReadFile on reparse points.
 
 Signed-off-by: Erich E. Hoover <erich.e.hoover@gmail.com>
 ---
@@ -12,10 +12,10 @@ Signed-off-by: Erich E. Hoover <erich.e.hoover@gmail.com>
  4 files changed, 8 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
-index ebed2600920..cb9a9506aba 100644
+index 92cff9d9b2e..1e867146cd9 100644
 --- a/dlls/ntdll/tests/file.c
 +++ b/dlls/ntdll/tests/file.c
-@@ -5581,7 +5581,7 @@ static void test_reparse_points(void)
+@@ -5591,7 +5591,7 @@ static void test_reparse_points(void)
      ok(handle != INVALID_HANDLE_VALUE, "Failed to open symlink file.\n");
      todo_wine ok(GetFileSize(handle, NULL) == 0, "symlink size is not zero\n");
      bret = ReadFile(handle, &buf, sizeof(buf), &dwLen, NULL);
@@ -25,12 +25,12 @@ index ebed2600920..cb9a9506aba 100644
      CloseHandle(handle);
  
 diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c
-index 49412c99d3c..f7ff9f4b5ed 100644
+index 0d6f08072a7..d7e0be3f65c 100644
 --- a/dlls/ntdll/unix/file.c
 +++ b/dlls/ntdll/unix/file.c
-@@ -5414,6 +5414,11 @@ NTSTATUS WINAPI NtReadFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, vo
-             goto done;
-         }
+@@ -5415,6 +5415,11 @@ NTSTATUS WINAPI NtReadFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, vo
+         if (needs_close) close( unix_handle );
+         return status;
      }
 +    else if (type == FD_TYPE_SYMLINK)
 +    {
@@ -41,7 +41,7 @@ index 49412c99d3c..f7ff9f4b5ed 100644
      if (type == FD_TYPE_SERIAL && async_read && length)
      {
 diff --git a/server/file.c b/server/file.c
-index 062322f685d..3079afdbdfd 100644
+index eb2dc5696ed..b9d0eb2d5f4 100644
 --- a/server/file.c
 +++ b/server/file.c
 @@ -294,6 +294,7 @@ static enum server_fd_type file_get_fd_type( struct fd *fd )
@@ -53,10 +53,10 @@ index 062322f685d..3079afdbdfd 100644
      if (S_ISDIR(file->mode)) return FD_TYPE_DIR;
      return FD_TYPE_CHAR;
 diff --git a/server/protocol.def b/server/protocol.def
-index 385420eedda..0c259ed063f 100644
+index 93c17e091cb..238e23b0a85 100644
 --- a/server/protocol.def
 +++ b/server/protocol.def
-@@ -1366,6 +1366,7 @@ enum server_fd_type
+@@ -1382,6 +1382,7 @@ enum server_fd_type
  {
      FD_TYPE_INVALID,  /* invalid file (no associated fd) */
      FD_TYPE_FILE,     /* regular file */
@@ -65,5 +65,5 @@ index 385420eedda..0c259ed063f 100644
      FD_TYPE_SOCKET,   /* socket */
      FD_TYPE_SERIAL,   /* serial port */
 -- 
-2.17.1
+2.35.1
 

patches/ntdll-NtQuerySection/0002-kernel32-tests-Add-tests-for-NtQuerySection.patch

@@ -1,4 +1,4 @@
-From 75ee9968e8532dcadd39163ff93db9a5c81fb799 Mon Sep 17 00:00:00 2001
+From c4c562ca31cfd3ce391abae2cc4e94a6bf4da049 Mon Sep 17 00:00:00 2001
 From: Dmitry Timoshkov <dmitry@baikal.ru>
 Date: Thu, 16 Oct 2014 23:26:35 +0200
 Subject: [PATCH] kernel32/tests: Add tests for NtQuerySection. (try 2)
@@ -8,10 +8,10 @@ Subject: [PATCH] kernel32/tests: Add tests for NtQuerySection. (try 2)
  1 file changed, 245 insertions(+)
 
 diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c
-index 365194b9065..167df789abf 100644
+index f492b2cf9b1..f6ac324c3a7 100644
 --- a/dlls/kernel32/tests/virtual.c
 +++ b/dlls/kernel32/tests/virtual.c
-@@ -54,6 +54,23 @@ static PVOID (WINAPI *pVirtualAllocFromApp)(PVOID, SIZE_T, DWORD, DWORD);
+@@ -55,6 +55,23 @@ static BOOL  (WINAPI *pPrefetchVirtualMemory)(HANDLE, ULONG_PTR, PWIN32_MEMORY_R
  
  /* ############################### */
  
@@ -35,8 +35,8 @@ index 365194b9065..167df789abf 100644
  static HANDLE create_target_process(const char *arg)
  {
      char **argv;
-@@ -4240,6 +4257,233 @@ static void test_shared_memory_ro(BOOL is_child, DWORD child_access)
-     CloseHandle(mapping);
+@@ -4246,6 +4263,233 @@ static void test_PrefetchVirtualMemory(void)
+         "PrefetchVirtualMemory unexpected status on 2 page-aligned entries: %ld\n", GetLastError() );
  }
  
 +static void test_NtQuerySection(void)
@@ -269,7 +269,7 @@ index 365194b9065..167df789abf 100644
  START_TEST(virtual)
  {
      int argc;
-@@ -4304,6 +4548,7 @@ START_TEST(virtual)
+@@ -4312,6 +4556,7 @@ START_TEST(virtual)
      test_shared_memory_ro(FALSE, FILE_MAP_COPY);
      test_shared_memory_ro(FALSE, FILE_MAP_COPY|FILE_MAP_WRITE);
      test_mappings();

patches/ntdll-RtlFirstFreeAce/0001-ntdll-Check-return-parameter-before-use.patch

@@ -1,25 +0,0 @@
-From 240b46c41f284b6ff96b990b9b719a18919fb6dd Mon Sep 17 00:00:00 2001
-From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Wed, 3 Mar 2021 08:56:39 +1100
-Subject: [PATCH 1/2] ntdll: Check return parameter before use
-
----
- dlls/ntdll/sec.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c
-index eccfc82ce8c..5c1c9b1fbb0 100644
---- a/dlls/ntdll/sec.c
-+++ b/dlls/ntdll/sec.c
-@@ -1172,6 +1172,8 @@ NTSTATUS WINAPI RtlAddAce(
- 		return STATUS_INVALID_PARAMETER;
- 	if (!RtlFirstFreeAce(acl,&targetace))
- 		return STATUS_INVALID_PARAMETER;
-+	if (!targetace)
-+		return STATUS_ALLOTTED_SPACE_EXCEEDED;
- 	nrofaces=0;ace=acestart;
- 	while (((BYTE *)ace - (BYTE *)acestart) < acelen) {
- 		nrofaces++;
--- 
-2.30.1
-

patches/ntdll-RtlFirstFreeAce/0002-ntdll-RtlFirstFreeAce-only-return-FALSE-on-error.patch

@@ -1,28 +0,0 @@
-From 0d2d659fbfb73fe046626d256ca5ee2878d9288b Mon Sep 17 00:00:00 2001
-From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Mon, 8 Feb 2021 13:16:52 +1100
-Subject: [PATCH 2/2] ntdll: RtlFirstFreeAce only return FALSE on error
-
----
- dlls/ntdll/sec.c | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c
-index 5c1c9b1fbb0..9cebcb4f58e 100644
---- a/dlls/ntdll/sec.c
-+++ b/dlls/ntdll/sec.c
-@@ -1149,9 +1149,8 @@ BOOLEAN WINAPI RtlFirstFreeAce(
- 			return FALSE;
- 		ace = (PACE_HEADER)(((BYTE*)ace)+ace->AceSize);
- 	}
--	if ((BYTE *)ace >= (BYTE *)acl + acl->AclSize)
--		return FALSE;
--	*x = ace;
-+	if ((BYTE *)ace <= (BYTE *)acl + acl->AclSize)
-+		*x = ace;
- 	return TRUE;
- }
- 
--- 
-2.30.1
-

patches/ntdll-RtlFirstFreeAce/definition

@@ -1 +0,0 @@
-Fixes: [50624] Waves Central 12.0.5 fails to start.

patches/ntdll-RtlQueryPackageIdentity/0003-ntdll-tests-Add-basic-tests-for-RtlQueryPackageIdent.patch

@@ -1,4 +1,4 @@
-From 109ef0c4769a50904accb044a5d569af8261e305 Mon Sep 17 00:00:00 2001
+From 0e455713af03b7f91fea4332c893390a8de8ca44 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sun, 17 Jan 2016 00:50:50 +0100
 Subject: [PATCH] ntdll/tests: Add basic tests for RtlQueryPackageIdentity.
@@ -20,7 +20,7 @@ index 90deb5865f8..428ebde23b3 100644
  C_SRCS = \
  	atom.c \
 diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c
-index aeae4e8adf3..52b06d33b54 100644
+index 2e0bfb650e4..cdb159479f2 100644
 --- a/dlls/ntdll/tests/rtl.c
 +++ b/dlls/ntdll/tests/rtl.c
 @@ -27,6 +27,9 @@
@@ -53,8 +53,8 @@ index aeae4e8adf3..52b06d33b54 100644
          pLdrRegisterDllNotification = (void *)GetProcAddress(hntdll, "LdrRegisterDllNotification");
          pLdrUnregisterDllNotification = (void *)GetProcAddress(hntdll, "LdrUnregisterDllNotification");
      }
-@@ -3682,6 +3691,76 @@ static void test_RtlDestroyHeap(void)
-     RtlRemoveVectoredExceptionHandler( handler );
+@@ -3730,6 +3739,76 @@ static void test_RtlFirstFreeAce(void)
+     HeapFree(GetProcessHeap(), 0, acl);
  }
  
 +static void test_RtlQueryPackageIdentity(void)
@@ -130,7 +130,7 @@ index aeae4e8adf3..52b06d33b54 100644
  START_TEST(rtl)
  {
      InitFunctionPtrs();
-@@ -3721,6 +3800,7 @@ START_TEST(rtl)
+@@ -3769,6 +3848,7 @@ START_TEST(rtl)
      test_RtlInitializeCriticalSectionEx();
      test_RtlLeaveCriticalSection();
      test_LdrEnumerateLoadedModules();