Release v7.16

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

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/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-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();

patches/ntdll-wine-frames/0001-ntdll-Don-t-use-Wine-frames-during-exception-process.patch

@@ -0,0 +1,144 @@
+From b2c573c7d371f760d92b7490fd1aca002e2f18c6 Mon Sep 17 00:00:00 2001
+From: Paul Gofman <pgofman@codeweavers.com>
+Date: Tue, 26 Oct 2021 19:07:26 +0300
+Subject: [PATCH] ntdll: Don't use Wine frames during exception processing on
+ x64.
+
+CW-Bug-ID: #19570
+---
+ dlls/ntdll/signal_x86_64.c | 65 +++++++++++++++++++++++++++-----------
+ 1 file changed, 46 insertions(+), 19 deletions(-)
+
+diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c
+index b1ab4933b93..3d163fbc6ea 100644
+--- a/dlls/ntdll/signal_x86_64.c
++++ b/dlls/ntdll/signal_x86_64.c
+@@ -347,15 +347,32 @@ __ASM_GLOBAL_FUNC( RtlCaptureContext,
+                    "fxsave 0x100(%rcx)\n\t"         /* context->FltSave */
+                    "ret" );
+ 
+-static DWORD __cdecl nested_exception_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame,
++DWORD __cdecl nested_exception_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame,
+                                                CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher )
+ {
++    TRACE( "exception flags %#x.\n", rec->ExceptionFlags );
++
+     if (!(rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)))
+-        rec->ExceptionFlags |= EH_NESTED_CALL;
++        return ExceptionNestedException;
+ 
+     return ExceptionContinueSearch;
+ }
+ 
++/***********************************************************************
++ *		exception_handler_call_wrapper
++ */
++DWORD exception_handler_call_wrapper( EXCEPTION_RECORD *rec, void *frame,
++                                      CONTEXT *context, DISPATCHER_CONTEXT *dispatch );
++__ASM_GLOBAL_FUNC( exception_handler_call_wrapper,
++                   __ASM_SEH(".seh_endprologue\n\t")
++                   "subq $0x28, %rsp\n\t"
++                   __ASM_SEH(".seh_stackalloc 0x28\n\t")
++                   __ASM_SEH(".seh_handler nested_exception_handler, @except\n\t")
++                   "callq *0x30(%r9)\n\t"            /* dispatch->LanguageHandler */
++                   "nop\n\t"
++                   "addq $0x28, %rsp\n\t"
++                   "ret" );
++
+ /**********************************************************************
+  *           call_handler
+  *
+@@ -364,19 +381,19 @@ static DWORD __cdecl nested_exception_handler( EXCEPTION_RECORD *rec, EXCEPTION_
+  */
+ static DWORD call_handler( EXCEPTION_RECORD *rec, CONTEXT *context, DISPATCHER_CONTEXT *dispatch )
+ {
+-    EXCEPTION_REGISTRATION_RECORD frame;
+     DWORD res;
+ 
+-    frame.Handler = nested_exception_handler;
+-    __wine_push_frame( &frame );
+-
+     TRACE_(seh)( "calling handler %p (rec=%p, frame=%p context=%p, dispatch=%p)\n",
+                  dispatch->LanguageHandler, rec, (void *)dispatch->EstablisherFrame, dispatch->ContextRecord, dispatch );
+-    res = dispatch->LanguageHandler( rec, (void *)dispatch->EstablisherFrame, context, dispatch );
++    res = exception_handler_call_wrapper( rec, (void *)dispatch->EstablisherFrame, context, dispatch );
+     TRACE_(seh)( "handler at %p returned %u\n", dispatch->LanguageHandler, res );
+ 
+     rec->ExceptionFlags &= EH_NONCONTINUABLE;
+-    __wine_pop_frame( &frame );
++    if (res == ExceptionNestedException)
++    {
++        rec->ExceptionFlags |= EH_NESTED_CALL;
++        res = ExceptionContinueSearch;
++    }
+     return res;
+ }
+ 
+@@ -990,7 +1007,8 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG64 base, ULONG64 pc,
+ 
+ struct unwind_exception_frame
+ {
+-    EXCEPTION_REGISTRATION_RECORD frame;
++    BYTE dummy[0x28];
++    void *rip;
+     DISPATCHER_CONTEXT *dispatch;
+ };
+ 
+@@ -999,7 +1017,7 @@ struct unwind_exception_frame
+  *
+  * Handler for exceptions happening while calling an unwind handler.
+  */
+-static DWORD __cdecl unwind_exception_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame,
++DWORD __cdecl unwind_exception_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame,
+                                                CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher )
+ {
+     struct unwind_exception_frame *unwind_frame = (struct unwind_exception_frame *)frame;
+@@ -1019,27 +1037,36 @@ static DWORD __cdecl unwind_exception_handler( EXCEPTION_RECORD *rec, EXCEPTION_
+     return ExceptionCollidedUnwind;
+ }
+ 
++/***********************************************************************
++ *		exception_handler_call_wrapper
++ */
++DWORD unwind_handler_call_wrapper( EXCEPTION_RECORD *rec, void *frame,
++                                      CONTEXT *context, DISPATCHER_CONTEXT *dispatch );
++__ASM_GLOBAL_FUNC( unwind_handler_call_wrapper,
++                   __ASM_SEH(".seh_endprologue\n\t")
++                   "movq %r9, 0x8(%rsp)\n\t"
++                   "subq $0x28, %rsp\n\t"
++                   __ASM_SEH(".seh_stackalloc 0x28\n\t")
++                   __ASM_SEH(".seh_handler unwind_exception_handler, @except, @unwind\n\t")
++                   "callq *0x30(%r9)\n\t"            /* dispatch->LanguageHandler */
++                   "nop\n\t"
++                   "addq $0x28, %rsp\n\t"
++                   "ret" );
++
+ /**********************************************************************
+  *           call_unwind_handler
+  *
+  * Call a single unwind handler.
+  */
+-static DWORD call_unwind_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT *dispatch )
++DWORD call_unwind_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT *dispatch )
+ {
+-    struct unwind_exception_frame frame;
+     DWORD res;
+ 
+-    frame.frame.Handler = unwind_exception_handler;
+-    frame.dispatch = dispatch;
+-    __wine_push_frame( &frame.frame );
+-
+     TRACE( "calling handler %p (rec=%p, frame=%p context=%p, dispatch=%p)\n",
+            dispatch->LanguageHandler, rec, (void *)dispatch->EstablisherFrame, dispatch->ContextRecord, dispatch );
+-    res = dispatch->LanguageHandler( rec, (void *)dispatch->EstablisherFrame, dispatch->ContextRecord, dispatch );
++    res = unwind_handler_call_wrapper( rec, (void *)dispatch->EstablisherFrame, dispatch->ContextRecord, dispatch );
+     TRACE( "handler %p returned %x\n", dispatch->LanguageHandler, res );
+ 
+-    __wine_pop_frame( &frame.frame );
+-
+     switch (res)
+     {
+     case ExceptionContinueSearch:
+-- 
+2.35.1
+

patches/ntdll-wine-frames/definition

@@ -0,0 +1 @@
+Fixes: [52396] ntdll: Don't use Wine frames during exception processing on x64.

patches/patchinstall.sh

@@ -51,13 +51,13 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "b2bf7b6b899dc18d092deebb0356a909db656ba8"
+	echo "a4930f003f45ab82c4c05746cbd29cbd4af09735"
 }
 
 # Show version information
 version()
 {
-	echo "Wine Staging 7.12"
+	echo "Wine Staging 7.16"
 	echo "Copyright (C) 2014-2019 the Wine Staging project authors."
 	echo "Copyright (C) 2018-2020 Alistair Leslie-Hughes"
 	echo ""
@@ -104,11 +104,9 @@ patch_enable_all ()
 	enable_ddraw_Device_Caps="$1"
 	enable_ddraw_IDirect3DTexture2_Load="$1"
 	enable_ddraw_Silence_FIXMEs="$1"
-	enable_ddraw_version_check="$1"
 	enable_dinput_joy_mappings="$1"
 	enable_dsound_EAX="$1"
 	enable_dsound_Fast_Mixer="$1"
-	enable_dwrite_FontFallback="$1"
 	enable_eventfd_synchronization="$1"
 	enable_explorer_Video_Registry_Key="$1"
 	enable_fltmgr_sys_FltBuildDefaultSecurityDescriptor="$1"
@@ -146,12 +144,12 @@ patch_enable_all ()
 	enable_ntdll_NtQuerySection="$1"
 	enable_ntdll_NtSetLdtEntries="$1"
 	enable_ntdll_ProcessQuotaLimits="$1"
-	enable_ntdll_RtlFirstFreeAce="$1"
 	enable_ntdll_RtlQueryPackageIdentity="$1"
 	enable_ntdll_Serial_Port_Detection="$1"
 	enable_ntdll_Syscall_Emulation="$1"
 	enable_ntdll_WRITECOPY="$1"
 	enable_ntdll_ext4_case_folder="$1"
+	enable_ntdll_wine_frames="$1"
 	enable_nvapi_Stub_DLL="$1"
 	enable_nvcuda_CUDA_Support="$1"
 	enable_nvcuvid_CUDA_Video_Support="$1"
@@ -257,14 +255,13 @@ patch_enable_all ()
 	enable_winex11_drv_Query_server_position="$1"
 	enable_wininet_Cleanup="$1"
 	enable_winmm_mciSendCommandA="$1"
+	enable_winspool_drv_ClosePrinter="$1"
 	enable_wintab32_improvements="$1"
 	enable_wintrust_WTHelperGetProvCertFromChain="$1"
 	enable_ws2_32_SIO_IDEAL_SEND_BACKLOG_QUERY="$1"
 	enable_wscript_support_d_u_switches="$1"
 	enable_xactengine_initial="$1"
-	enable_xactengine3_7_Notification="$1"
 	enable_xactengine3_7_PrepareWave="$1"
-	enable_xactengine3_7_callbacks="$1"
 }
 
 # Enable or disable a specific patchset
@@ -337,9 +334,6 @@ patch_enable ()
 		ddraw-Silence_FIXMEs)
 			enable_ddraw_Silence_FIXMEs="$2"
 			;;
-		ddraw-version-check)
-			enable_ddraw_version_check="$2"
-			;;
 		dinput-joy-mappings)
 			enable_dinput_joy_mappings="$2"
 			;;
@@ -349,9 +343,6 @@ patch_enable ()
 		dsound-Fast_Mixer)
 			enable_dsound_Fast_Mixer="$2"
 			;;
-		dwrite-FontFallback)
-			enable_dwrite_FontFallback="$2"
-			;;
 		eventfd_synchronization)
 			enable_eventfd_synchronization="$2"
 			;;
@@ -463,9 +454,6 @@ patch_enable ()
 		ntdll-ProcessQuotaLimits)
 			enable_ntdll_ProcessQuotaLimits="$2"
 			;;
-		ntdll-RtlFirstFreeAce)
-			enable_ntdll_RtlFirstFreeAce="$2"
-			;;
 		ntdll-RtlQueryPackageIdentity)
 			enable_ntdll_RtlQueryPackageIdentity="$2"
 			;;
@@ -481,6 +469,9 @@ patch_enable ()
 		ntdll-ext4-case-folder)
 			enable_ntdll_ext4_case_folder="$2"
 			;;
+		ntdll-wine-frames)
+			enable_ntdll_wine_frames="$2"
+			;;
 		nvapi-Stub_DLL)
 			enable_nvapi_Stub_DLL="$2"
 			;;
@@ -796,6 +787,9 @@ patch_enable ()
 		winmm-mciSendCommandA)
 			enable_winmm_mciSendCommandA="$2"
 			;;
+		winspool.drv-ClosePrinter)
+			enable_winspool_drv_ClosePrinter="$2"
+			;;
 		wintab32-improvements)
 			enable_wintab32_improvements="$2"
 			;;
@@ -811,15 +805,9 @@ patch_enable ()
 		xactengine-initial)
 			enable_xactengine_initial="$2"
 			;;
-		xactengine3_7-Notification)
-			enable_xactengine3_7_Notification="$2"
-			;;
 		xactengine3_7-PrepareWave)
 			enable_xactengine3_7_PrepareWave="$2"
 			;;
-		xactengine3_7-callbacks)
-			enable_xactengine3_7_callbacks="$2"
-			;;
 		*)
 			return 1
 			;;
@@ -1167,13 +1155,6 @@ patch_apply()
 }
 
 
-if test "$enable_xactengine3_7_callbacks" -eq 1; then
-	if test "$enable_xactengine3_7_Notification" -gt 1; then
-		abort "Patchset xactengine3_7-Notification disabled, but xactengine3_7-callbacks depends on that."
-	fi
-	enable_xactengine3_7_Notification=1
-fi
-
 if test "$enable_winex11_WM_WINDOWPOSCHANGING" -eq 1; then
 	if test "$enable_winex11__NET_ACTIVE_WINDOW" -gt 1; then
 		abort "Patchset winex11-_NET_ACTIVE_WINDOW disabled, but winex11-WM_WINDOWPOSCHANGING depends on that."
@@ -1345,13 +1326,6 @@ if test "$enable_dsound_EAX" -eq 1; then
 	enable_dsound_Fast_Mixer=1
 fi
 
-if test "$enable_ddraw_version_check" -eq 1; then
-	if test "$enable_ddraw_Device_Caps" -gt 1; then
-		abort "Patchset ddraw-Device_Caps disabled, but ddraw-version-check depends on that."
-	fi
-	enable_ddraw_Device_Caps=1
-fi
-
 
 # Patchset Compiler_Warnings
 # |
@@ -1612,10 +1586,9 @@ fi
 # |   *	[#27002] Properly initialize caps->dwZBufferBitDepths in ddraw7_GetCaps
 # |
 # | Modified files:
-# |   *	dlls/ddraw/ddraw.c, dlls/ddraw/tests/ddraw7.c
+# |   *	dlls/ddraw/ddraw.c
 # |
 if test "$enable_ddraw_Device_Caps" -eq 1; then
-	patch_apply ddraw-Device_Caps/0001-ddraw-Don-t-set-HWTRANSFORMANDLIGHT-flag-on-d3d7-RGB.patch
 	patch_apply ddraw-Device_Caps/0002-ddraw-Set-dwZBufferBitDepth-in-ddraw7_GetCaps.patch
 fi
 
@@ -1641,21 +1614,6 @@ if test "$enable_ddraw_Silence_FIXMEs" -eq 1; then
 	patch_apply ddraw-Silence_FIXMEs/0001-ddraw-Silence-noisy-FIXME-about-unimplemented-D3DPRO.patch
 fi
 
-# Patchset ddraw-version-check
-# |
-# | This patchset has the following (direct or indirect) dependencies:
-# |   *	ddraw-Device_Caps
-# |
-# | This patchset fixes the following Wine bugs:
-# |   *	[#19153] Resident Evil 1 fails to start (needs IDirect3D3::EnumDevices() to return a device named "RGB Emulation")
-# |
-# | Modified files:
-# |   *	dlls/ddraw/ddraw.c
-# |
-if test "$enable_ddraw_version_check" -eq 1; then
-	patch_apply ddraw-version-check/0001-ddraw-Return-correct-devices-based-off-requested-Dir.patch
-fi
-
 # Patchset dinput-joy-mappings
 # |
 # | This patchset fixes the following Wine bugs:
@@ -1723,22 +1681,6 @@ if test "$enable_dsound_EAX" -eq 1; then
 	patch_apply dsound-EAX/0023-dsound-Fake-success-for-EAX-Set-Buffer-ListenerPrope.patch
 fi
 
-# Patchset dwrite-FontFallback
-# |
-# | This patchset fixes the following Wine bugs:
-# |   *	[#44052] - Support for font fallback.
-# |
-# | Modified files:
-# |   *	dlls/dwrite/analyzer.c, dlls/dwrite/layout.c, dlls/dwrite/tests/layout.c
-# |
-if test "$enable_dwrite_FontFallback" -eq 1; then
-	patch_apply dwrite-FontFallback/0001-dwrite-Test-IDWriteTextFormat-with-nonexistent-font.patch
-	patch_apply dwrite-FontFallback/0002-dwrite-Test-GetMetrics-with-custom-fontcollection.patch
-	patch_apply dwrite-FontFallback/0004-dwrite-Use-font-fallback-when-mapping-characters.patch
-	patch_apply dwrite-FontFallback/0005-dwrite-Use-MapCharacters-for-non-visual-characters.patch
-	patch_apply dwrite-FontFallback/0006-dwrite-Use-MapCharacters-for-dummy-line-metrics.patch
-fi
-
 # Patchset ntdll-DOS_Attributes
 # |
 # | This patchset fixes the following Wine bugs:
@@ -2374,19 +2316,6 @@ if test "$enable_ntdll_ProcessQuotaLimits" -eq 1; then
 	patch_apply ntdll-ProcessQuotaLimits/0001-ntdll-Add-fake-data-implementation-for-ProcessQuotaL.patch
 fi
 
-# Patchset ntdll-RtlFirstFreeAce
-# |
-# | This patchset fixes the following Wine bugs:
-# |   *	[#50624] Waves Central 12.0.5 fails to start.
-# |
-# | Modified files:
-# |   *	dlls/ntdll/sec.c
-# |
-if test "$enable_ntdll_RtlFirstFreeAce" -eq 1; then
-	patch_apply ntdll-RtlFirstFreeAce/0001-ntdll-Check-return-parameter-before-use.patch
-	patch_apply ntdll-RtlFirstFreeAce/0002-ntdll-RtlFirstFreeAce-only-return-FALSE-on-error.patch
-fi
-
 # Patchset ntdll-RtlQueryPackageIdentity
 # |
 # | Modified files:
@@ -2432,6 +2361,18 @@ if test "$enable_ntdll_ext4_case_folder" -eq 1; then
 	patch_apply ntdll-ext4-case-folder/0002-ntdll-server-Mark-drive_c-as-case-insensitive-when-c.patch
 fi
 
+# Patchset ntdll-wine-frames
+# |
+# | This patchset fixes the following Wine bugs:
+# |   *	[#52396] ntdll: Don't use Wine frames during exception processing on x64.
+# |
+# | Modified files:
+# |   *	dlls/ntdll/signal_x86_64.c
+# |
+if test "$enable_ntdll_wine_frames" -eq 1; then
+	patch_apply ntdll-wine-frames/0001-ntdll-Don-t-use-Wine-frames-during-exception-process.patch
+fi
+
 # Patchset nvcuda-CUDA_Support
 # |
 # | This patchset fixes the following Wine bugs:
@@ -2715,7 +2656,8 @@ fi
 # |   *	[#33576] Support for stored file ACLs
 # |
 # | Modified files:
-# |   *	dlls/advapi32/tests/security.c, server/change.c, server/file.c, server/file.h, server/object.c, server/object.h
+# |   *	dlls/advapi32/tests/security.c, dlls/xactengine3_7/xact_dll.c, server/change.c, server/file.c, server/file.h,
+# | 	server/object.c, server/object.h
 # |
 if test "$enable_server_Stored_ACLs" -eq 1; then
 	patch_apply server-Stored_ACLs/0001-server-Unify-the-storage-of-security-attributes-for-.patch
@@ -2948,7 +2890,7 @@ fi
 # Patchset stdole32.idl-Typelib
 # |
 # | Modified files:
-# |   *	dlls/stdole32.tlb/std_ole_v1.idl, include/stdole32.idl
+# |   *	dlls/stdole32.tlb/std_ole_v1.idl, include/Makefile.in, include/stdole32.idl
 # |
 if test "$enable_stdole32_idl_Typelib" -eq 1; then
 	patch_apply stdole32.idl-Typelib/0001-include-Make-stdole32.idl-a-public-component.patch
@@ -3821,6 +3763,18 @@ if test "$enable_winmm_mciSendCommandA" -eq 1; then
 	patch_apply winmm-mciSendCommandA/0001-winmm-Do-not-crash-in-Win-9X-mode-when-an-invalid-de.patch
 fi
 
+# Patchset winspool.drv-ClosePrinter
+# |
+# | This patchset fixes the following Wine bugs:
+# |   *	[#53425] - Add more tracing to ClosePrinter
+# |
+# | Modified files:
+# |   *	dlls/winspool.drv/info.c
+# |
+if test "$enable_winspool_drv_ClosePrinter" -eq 1; then
+	patch_apply winspool.drv-ClosePrinter/0001-winspool.drv-Add-more-tracing-to-ClosePrinter.patch
+fi
+
 # Patchset wintab32-improvements
 # |
 # | This patchset fixes the following Wine bugs:
@@ -3892,19 +3846,6 @@ if test "$enable_xactengine_initial" -eq 1; then
 	patch_apply xactengine-initial/0003-xactengine3_7-tests-Add-Global-settings-test.patch
 fi
 
-# Patchset xactengine3_7-Notification
-# |
-# | This patchset fixes the following Wine bugs:
-# |   *	[#50546] xactengine3_7: Send Notification after the Wavebank is created.
-# |
-# | Modified files:
-# |   *	dlls/xactengine3_7/xact_dll.c
-# |
-if test "$enable_xactengine3_7_Notification" -eq 1; then
-	patch_apply xactengine3_7-Notification/0001-xactengine3.7-Delay-Notication-for-WAVEBANKPREPARED.patch
-	patch_apply xactengine3_7-Notification/0002-xactengine3_7-Record-context-for-each-notications.patch
-fi
-
 # Patchset xactengine3_7-PrepareWave
 # |
 # | This patchset fixes the following Wine bugs:
@@ -3918,23 +3859,6 @@ if test "$enable_xactengine3_7_PrepareWave" -eq 1; then
 	patch_apply xactengine3_7-PrepareWave/0003-xactengine3_7-Implement-IXACT3Engine-PrepareInMemory.patch
 fi
 
-# Patchset xactengine3_7-callbacks
-# |
-# | This patchset has the following (direct or indirect) dependencies:
-# |   *	xactengine3_7-Notification
-# |
-# | This patchset fixes the following Wine bugs:
-# |   *	[#49678] - xactengine: Implement callback notifications.
-# |
-# | Modified files:
-# |   *	dlls/xactengine3_7/xact_dll.c, libs/faudio/include/FACT.h, libs/faudio/src/FACT.c, libs/faudio/src/FACT_internal.h
-# |
-if test "$enable_xactengine3_7_callbacks" -eq 1; then
-	patch_apply xactengine3_7-callbacks/0001-Add-support-for-private-contexts.patch
-	patch_apply xactengine3_7-callbacks/0002-xactengine3_7-notifications.patch
-	patch_apply xactengine3_7-callbacks/0004-xactengine3_7-Don-t-use-switch-with-constant-integer.patch
-fi
-
 if test "$enable_autoconf" -eq 1; then
 	if ! update_configure; then
 		abort "'autoreconf -f' failed."

patches/riched20-IText_Interface/0003-riched20-Stub-for-ITextPara-interface-and-implement-.patch

@@ -1,4 +1,4 @@
-From 534d035e5646d1a76657987894ce7124be0f7312 Mon Sep 17 00:00:00 2001
+From 0ed959d4122e705d8728a7064ff260d2a6955af5 Mon Sep 17 00:00:00 2001
 From: Jactry Zeng <wine@jactry.com>
 Date: Sun, 10 Aug 2014 22:17:57 +0800
 Subject: [PATCH] riched20: Stub for ITextPara interface and implement
@@ -10,10 +10,10 @@ Subject: [PATCH] riched20: Stub for ITextPara interface and implement
  2 files changed, 477 insertions(+)
 
 diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c
-index a23f4c82730..7204bb3a0fa 100644
+index afecd34dc2a..6b94ee89902 100644
 --- a/dlls/riched20/richole.c
 +++ b/dlls/riched20/richole.c
-@@ -3553,6 +3553,16 @@ static ULONG WINAPI TextPara_Release(ITextPara *iface)
+@@ -3563,6 +3563,16 @@ static ULONG WINAPI TextPara_Release(ITextPara *iface)
      return ref;
  }
  
@@ -30,7 +30,7 @@ index a23f4c82730..7204bb3a0fa 100644
  static HRESULT WINAPI TextPara_GetTypeInfoCount(ITextPara *iface, UINT *pctinfo)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
-@@ -3620,6 +3630,10 @@ static HRESULT WINAPI TextPara_GetDuplicate(ITextPara *iface, ITextPara **ret)
+@@ -3630,6 +3640,10 @@ static HRESULT WINAPI TextPara_GetDuplicate(ITextPara *iface, ITextPara **ret)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%p)\n", This, ret);
@@ -41,7 +41,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3627,6 +3641,10 @@ static HRESULT WINAPI TextPara_SetDuplicate(ITextPara *iface, ITextPara *para)
+@@ -3637,6 +3651,10 @@ static HRESULT WINAPI TextPara_SetDuplicate(ITextPara *iface, ITextPara *para)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%p)\n", This, para);
@@ -52,7 +52,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3634,6 +3652,10 @@ static HRESULT WINAPI TextPara_CanChange(ITextPara *iface, LONG *ret)
+@@ -3644,6 +3662,10 @@ static HRESULT WINAPI TextPara_CanChange(ITextPara *iface, LONG *ret)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%p)\n", This, ret);
@@ -63,7 +63,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3641,6 +3663,10 @@ static HRESULT WINAPI TextPara_IsEqual(ITextPara *iface, ITextPara *para, LONG *
+@@ -3651,6 +3673,10 @@ static HRESULT WINAPI TextPara_IsEqual(ITextPara *iface, ITextPara *para, LONG *
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%p %p)\n", This, para, ret);
@@ -74,7 +74,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3648,6 +3674,10 @@ static HRESULT WINAPI TextPara_Reset(ITextPara *iface, LONG value)
+@@ -3658,6 +3684,10 @@ static HRESULT WINAPI TextPara_Reset(ITextPara *iface, LONG value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%ld)\n", This, value);
@@ -85,7 +85,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3655,6 +3685,10 @@ static HRESULT WINAPI TextPara_GetStyle(ITextPara *iface, LONG *value)
+@@ -3665,6 +3695,10 @@ static HRESULT WINAPI TextPara_GetStyle(ITextPara *iface, LONG *value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%p)\n", This, value);
@@ -96,7 +96,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3662,6 +3696,10 @@ static HRESULT WINAPI TextPara_SetStyle(ITextPara *iface, LONG value)
+@@ -3672,6 +3706,10 @@ static HRESULT WINAPI TextPara_SetStyle(ITextPara *iface, LONG value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%ld)\n", This, value);
@@ -107,7 +107,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3669,6 +3707,10 @@ static HRESULT WINAPI TextPara_GetAlignment(ITextPara *iface, LONG *value)
+@@ -3679,6 +3717,10 @@ static HRESULT WINAPI TextPara_GetAlignment(ITextPara *iface, LONG *value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%p)\n", This, value);
@@ -118,7 +118,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3676,6 +3718,10 @@ static HRESULT WINAPI TextPara_SetAlignment(ITextPara *iface, LONG value)
+@@ -3686,6 +3728,10 @@ static HRESULT WINAPI TextPara_SetAlignment(ITextPara *iface, LONG value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%ld)\n", This, value);
@@ -129,7 +129,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3683,6 +3729,10 @@ static HRESULT WINAPI TextPara_GetHyphenation(ITextPara *iface, LONG *value)
+@@ -3693,6 +3739,10 @@ static HRESULT WINAPI TextPara_GetHyphenation(ITextPara *iface, LONG *value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%p)\n", This, value);
@@ -140,7 +140,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3690,6 +3740,10 @@ static HRESULT WINAPI TextPara_SetHyphenation(ITextPara *iface, LONG value)
+@@ -3700,6 +3750,10 @@ static HRESULT WINAPI TextPara_SetHyphenation(ITextPara *iface, LONG value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%ld)\n", This, value);
@@ -151,7 +151,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3697,6 +3751,10 @@ static HRESULT WINAPI TextPara_GetFirstLineIndent(ITextPara *iface, FLOAT *value
+@@ -3707,6 +3761,10 @@ static HRESULT WINAPI TextPara_GetFirstLineIndent(ITextPara *iface, FLOAT *value
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%p)\n", This, value);
@@ -162,7 +162,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3704,6 +3762,10 @@ static HRESULT WINAPI TextPara_GetKeepTogether(ITextPara *iface, LONG *value)
+@@ -3714,6 +3772,10 @@ static HRESULT WINAPI TextPara_GetKeepTogether(ITextPara *iface, LONG *value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%p)\n", This, value);
@@ -173,7 +173,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3711,6 +3773,10 @@ static HRESULT WINAPI TextPara_SetKeepTogether(ITextPara *iface, LONG value)
+@@ -3721,6 +3783,10 @@ static HRESULT WINAPI TextPara_SetKeepTogether(ITextPara *iface, LONG value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%ld)\n", This, value);
@@ -184,7 +184,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3718,6 +3784,10 @@ static HRESULT WINAPI TextPara_GetKeepWithNext(ITextPara *iface, LONG *value)
+@@ -3728,6 +3794,10 @@ static HRESULT WINAPI TextPara_GetKeepWithNext(ITextPara *iface, LONG *value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%p)\n", This, value);
@@ -195,7 +195,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3725,6 +3795,10 @@ static HRESULT WINAPI TextPara_SetKeepWithNext(ITextPara *iface, LONG value)
+@@ -3735,6 +3805,10 @@ static HRESULT WINAPI TextPara_SetKeepWithNext(ITextPara *iface, LONG value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%ld)\n", This, value);
@@ -206,7 +206,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3732,6 +3806,10 @@ static HRESULT WINAPI TextPara_GetLeftIndent(ITextPara *iface, FLOAT *value)
+@@ -3742,6 +3816,10 @@ static HRESULT WINAPI TextPara_GetLeftIndent(ITextPara *iface, FLOAT *value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%p)\n", This, value);
@@ -217,7 +217,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3739,6 +3817,10 @@ static HRESULT WINAPI TextPara_GetLineSpacing(ITextPara *iface, FLOAT *value)
+@@ -3749,6 +3827,10 @@ static HRESULT WINAPI TextPara_GetLineSpacing(ITextPara *iface, FLOAT *value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%p)\n", This, value);
@@ -228,7 +228,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3746,6 +3828,10 @@ static HRESULT WINAPI TextPara_GetLineSpacingRule(ITextPara *iface, LONG *value)
+@@ -3756,6 +3838,10 @@ static HRESULT WINAPI TextPara_GetLineSpacingRule(ITextPara *iface, LONG *value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%p)\n", This, value);
@@ -239,7 +239,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3753,6 +3839,10 @@ static HRESULT WINAPI TextPara_GetListAlignment(ITextPara *iface, LONG *value)
+@@ -3763,6 +3849,10 @@ static HRESULT WINAPI TextPara_GetListAlignment(ITextPara *iface, LONG *value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%p)\n", This, value);
@@ -250,7 +250,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3760,6 +3850,10 @@ static HRESULT WINAPI TextPara_SetListAlignment(ITextPara *iface, LONG value)
+@@ -3770,6 +3860,10 @@ static HRESULT WINAPI TextPara_SetListAlignment(ITextPara *iface, LONG value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%ld)\n", This, value);
@@ -261,7 +261,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3767,6 +3861,10 @@ static HRESULT WINAPI TextPara_GetListLevelIndex(ITextPara *iface, LONG *value)
+@@ -3777,6 +3871,10 @@ static HRESULT WINAPI TextPara_GetListLevelIndex(ITextPara *iface, LONG *value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%p)\n", This, value);
@@ -272,7 +272,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3774,6 +3872,10 @@ static HRESULT WINAPI TextPara_SetListLevelIndex(ITextPara *iface, LONG value)
+@@ -3784,6 +3882,10 @@ static HRESULT WINAPI TextPara_SetListLevelIndex(ITextPara *iface, LONG value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%ld)\n", This, value);
@@ -283,7 +283,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3781,6 +3883,10 @@ static HRESULT WINAPI TextPara_GetListStart(ITextPara *iface, LONG *value)
+@@ -3791,6 +3893,10 @@ static HRESULT WINAPI TextPara_GetListStart(ITextPara *iface, LONG *value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%p)\n", This, value);
@@ -294,7 +294,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3788,6 +3894,10 @@ static HRESULT WINAPI TextPara_SetListStart(ITextPara *iface, LONG value)
+@@ -3798,6 +3904,10 @@ static HRESULT WINAPI TextPara_SetListStart(ITextPara *iface, LONG value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%ld)\n", This, value);
@@ -305,7 +305,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3795,6 +3905,10 @@ static HRESULT WINAPI TextPara_GetListTab(ITextPara *iface, FLOAT *value)
+@@ -3805,6 +3915,10 @@ static HRESULT WINAPI TextPara_GetListTab(ITextPara *iface, FLOAT *value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%p)\n", This, value);
@@ -316,7 +316,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3802,6 +3916,10 @@ static HRESULT WINAPI TextPara_SetListTab(ITextPara *iface, FLOAT value)
+@@ -3812,6 +3926,10 @@ static HRESULT WINAPI TextPara_SetListTab(ITextPara *iface, FLOAT value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%.2f)\n", This, value);
@@ -327,7 +327,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3809,6 +3927,10 @@ static HRESULT WINAPI TextPara_GetListType(ITextPara *iface, LONG *value)
+@@ -3819,6 +3937,10 @@ static HRESULT WINAPI TextPara_GetListType(ITextPara *iface, LONG *value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%p)\n", This, value);
@@ -338,7 +338,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3816,6 +3938,10 @@ static HRESULT WINAPI TextPara_SetListType(ITextPara *iface, LONG value)
+@@ -3826,6 +3948,10 @@ static HRESULT WINAPI TextPara_SetListType(ITextPara *iface, LONG value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%ld)\n", This, value);
@@ -349,7 +349,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3823,6 +3949,10 @@ static HRESULT WINAPI TextPara_GetNoLineNumber(ITextPara *iface, LONG *value)
+@@ -3833,6 +3959,10 @@ static HRESULT WINAPI TextPara_GetNoLineNumber(ITextPara *iface, LONG *value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%p)\n", This, value);
@@ -360,7 +360,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3830,6 +3960,10 @@ static HRESULT WINAPI TextPara_SetNoLineNumber(ITextPara *iface, LONG value)
+@@ -3840,6 +3970,10 @@ static HRESULT WINAPI TextPara_SetNoLineNumber(ITextPara *iface, LONG value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%ld)\n", This, value);
@@ -371,7 +371,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3837,6 +3971,10 @@ static HRESULT WINAPI TextPara_GetPageBreakBefore(ITextPara *iface, LONG *value)
+@@ -3847,6 +3981,10 @@ static HRESULT WINAPI TextPara_GetPageBreakBefore(ITextPara *iface, LONG *value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%p)\n", This, value);
@@ -382,7 +382,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3844,6 +3982,10 @@ static HRESULT WINAPI TextPara_SetPageBreakBefore(ITextPara *iface, LONG value)
+@@ -3854,6 +3992,10 @@ static HRESULT WINAPI TextPara_SetPageBreakBefore(ITextPara *iface, LONG value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%ld)\n", This, value);
@@ -393,7 +393,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3851,6 +3993,10 @@ static HRESULT WINAPI TextPara_GetRightIndent(ITextPara *iface, FLOAT *value)
+@@ -3861,6 +4003,10 @@ static HRESULT WINAPI TextPara_GetRightIndent(ITextPara *iface, FLOAT *value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%p)\n", This, value);
@@ -404,7 +404,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3858,6 +4004,10 @@ static HRESULT WINAPI TextPara_SetRightIndent(ITextPara *iface, FLOAT value)
+@@ -3868,6 +4014,10 @@ static HRESULT WINAPI TextPara_SetRightIndent(ITextPara *iface, FLOAT value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%.2f)\n", This, value);
@@ -415,7 +415,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3865,6 +4015,10 @@ static HRESULT WINAPI TextPara_SetIndents(ITextPara *iface, FLOAT StartIndent, F
+@@ -3875,6 +4025,10 @@ static HRESULT WINAPI TextPara_SetIndents(ITextPara *iface, FLOAT StartIndent, F
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%.2f %.2f %.2f)\n", This, StartIndent, LeftIndent, RightIndent);
@@ -426,7 +426,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3872,6 +4026,10 @@ static HRESULT WINAPI TextPara_SetLineSpacing(ITextPara *iface, LONG LineSpacing
+@@ -3882,6 +4036,10 @@ static HRESULT WINAPI TextPara_SetLineSpacing(ITextPara *iface, LONG LineSpacing
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%ld %.2f)\n", This, LineSpacingRule, LineSpacing);
@@ -437,7 +437,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3879,6 +4037,10 @@ static HRESULT WINAPI TextPara_GetSpaceAfter(ITextPara *iface, FLOAT *value)
+@@ -3889,6 +4047,10 @@ static HRESULT WINAPI TextPara_GetSpaceAfter(ITextPara *iface, FLOAT *value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%p)\n", This, value);
@@ -448,7 +448,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3886,6 +4048,10 @@ static HRESULT WINAPI TextPara_SetSpaceAfter(ITextPara *iface, FLOAT value)
+@@ -3896,6 +4058,10 @@ static HRESULT WINAPI TextPara_SetSpaceAfter(ITextPara *iface, FLOAT value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%.2f)\n", This, value);
@@ -459,7 +459,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3893,6 +4059,10 @@ static HRESULT WINAPI TextPara_GetSpaceBefore(ITextPara *iface, FLOAT *value)
+@@ -3903,6 +4069,10 @@ static HRESULT WINAPI TextPara_GetSpaceBefore(ITextPara *iface, FLOAT *value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%p)\n", This, value);
@@ -470,7 +470,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3900,6 +4070,10 @@ static HRESULT WINAPI TextPara_SetSpaceBefore(ITextPara *iface, FLOAT value)
+@@ -3910,6 +4080,10 @@ static HRESULT WINAPI TextPara_SetSpaceBefore(ITextPara *iface, FLOAT value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%.2f)\n", This, value);
@@ -481,7 +481,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3907,6 +4081,10 @@ static HRESULT WINAPI TextPara_GetWidowControl(ITextPara *iface, LONG *value)
+@@ -3917,6 +4091,10 @@ static HRESULT WINAPI TextPara_GetWidowControl(ITextPara *iface, LONG *value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%p)\n", This, value);
@@ -492,7 +492,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3914,6 +4092,10 @@ static HRESULT WINAPI TextPara_SetWidowControl(ITextPara *iface, LONG value)
+@@ -3924,6 +4102,10 @@ static HRESULT WINAPI TextPara_SetWidowControl(ITextPara *iface, LONG value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%ld)\n", This, value);
@@ -503,7 +503,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3921,6 +4103,10 @@ static HRESULT WINAPI TextPara_GetTabCount(ITextPara *iface, LONG *value)
+@@ -3931,6 +4113,10 @@ static HRESULT WINAPI TextPara_GetTabCount(ITextPara *iface, LONG *value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%p)\n", This, value);
@@ -514,7 +514,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3928,6 +4114,10 @@ static HRESULT WINAPI TextPara_AddTab(ITextPara *iface, FLOAT tbPos, LONG tbAlig
+@@ -3938,6 +4124,10 @@ static HRESULT WINAPI TextPara_AddTab(ITextPara *iface, FLOAT tbPos, LONG tbAlig
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%.2f %ld %ld)\n", This, tbPos, tbAlign, tbLeader);
@@ -525,7 +525,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3935,6 +4125,10 @@ static HRESULT WINAPI TextPara_ClearAllTabs(ITextPara *iface)
+@@ -3945,6 +4135,10 @@ static HRESULT WINAPI TextPara_ClearAllTabs(ITextPara *iface)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)\n", This);
@@ -536,7 +536,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3942,6 +4136,10 @@ static HRESULT WINAPI TextPara_DeleteTab(ITextPara *iface, FLOAT pos)
+@@ -3952,6 +4146,10 @@ static HRESULT WINAPI TextPara_DeleteTab(ITextPara *iface, FLOAT pos)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%.2f)\n", This, pos);
@@ -547,7 +547,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3949,6 +4147,10 @@ static HRESULT WINAPI TextPara_GetTab(ITextPara *iface, LONG iTab, FLOAT *ptbPos
+@@ -3959,6 +4157,10 @@ static HRESULT WINAPI TextPara_GetTab(ITextPara *iface, LONG iTab, FLOAT *ptbPos
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%ld %p %p %p)\n", This, iTab, ptbPos, ptbAlign, ptbLeader);
@@ -559,11 +559,11 @@ index a23f4c82730..7204bb3a0fa 100644
  }
  
 diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c
-index 24284a24484..4ea3828033b 100644
+index a01f4e21db8..e44ffc767e7 100644
 --- a/dlls/riched20/tests/richole.c
 +++ b/dlls/riched20/tests/richole.c
-@@ -4249,6 +4249,274 @@ static void test_clipboard(void)
-   ITextRange_Release(range);
+@@ -5439,6 +5439,274 @@ static void test_undo_control(void)
+   release_interfaces(&inst.hwnd, &reole, &inst.doc, &selection);
  }
  
 +static void test_ITextRange_SetStart(void)
@@ -837,7 +837,7 @@ index 24284a24484..4ea3828033b 100644
  START_TEST(richole)
  {
    /* Must explicitly LoadLibrary(). The test has no references to functions in
-@@ -4269,6 +4537,13 @@ START_TEST(richole)
+@@ -5459,6 +5727,13 @@ START_TEST(richole)
    test_ITextRange_SetRange();
    test_ITextRange_GetDuplicate();
    test_ITextRange_Collapse();

patches/server-Stored_ACLs/0001-server-Unify-the-storage-of-security-attributes-for-.patch

@@ -1,17 +1,30 @@
-From 1a3f9029f375e5934ff2e87f83bd2cd5d546dd80 Mon Sep 17 00:00:00 2001
+From 07fdb3ce4ca75bb568dfcb62708fde112b0b7b3c Mon Sep 17 00:00:00 2001
 From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
 Date: Thu, 17 Apr 2014 16:07:46 -0600
 Subject: [PATCH] server: Unify the storage of security attributes for files
  and directories. (try 7)
 
 ---
- server/change.c | 45 ++++++---------------------------------------
- server/file.c   | 34 ++++++++++++++++++++++------------
- server/file.h   |  2 ++
- 3 files changed, 30 insertions(+), 51 deletions(-)
+ dlls/xactengine3_7/xact_dll.c |  1 +
+ server/change.c               | 45 +++++------------------------------
+ server/file.c                 | 34 ++++++++++++++++----------
+ server/file.h                 |  2 ++
+ 4 files changed, 31 insertions(+), 51 deletions(-)
 
+diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c
+index f2737e0a9bd..23a961cb88e 100644
+--- a/dlls/xactengine3_7/xact_dll.c
++++ b/dlls/xactengine3_7/xact_dll.c
+@@ -414,6 +414,7 @@ static HRESULT WINAPI IXACT3SoundBankImpl_Prepare(IXACT3SoundBank *iface,
+     XACT3SoundBankImpl *This = impl_from_IXACT3SoundBank(iface);
+     XACT3CueImpl *cue;
+     FACTCue *fcue;
++
+     UINT ret;
+     HRESULT hr;
+ 
 diff --git a/server/change.c b/server/change.c
-index dd9e0bfee31..fc030159101 100644
+index 5e9d94720a5..fc030159101 100644
 --- a/server/change.c
 +++ b/server/change.c
 @@ -365,48 +365,15 @@ static int dir_set_sd( struct object *obj, const struct security_descriptor *sd,
@@ -47,7 +60,7 @@ index dd9e0bfee31..fc030159101 100644
 -    else if (obj->sd)
 -        owner = sd_get_owner( obj->sd );
 -    else
--        owner = token_get_user( current->process->token );
+-        owner = token_get_owner( current->process->token );
 -
 -    if (set_info & DACL_SECURITY_INFORMATION)
 -    {
@@ -70,7 +83,7 @@ index dd9e0bfee31..fc030159101 100644
  
  static struct change_record *get_first_change_record( struct dir *dir )
 diff --git a/server/file.c b/server/file.c
-index 1fd0ac37df5..6032e228a9f 100644
+index 1b4efb04bc5..291dd78cb60 100644
 --- a/server/file.c
 +++ b/server/file.c
 @@ -499,18 +499,13 @@ mode_t sd_to_mode( const struct security_descriptor *sd, const struct sid *owner
@@ -133,7 +146,7 @@ index 1fd0ac37df5..6032e228a9f 100644
  {
      struct file *file = (struct file *)obj;
 diff --git a/server/file.h b/server/file.h
-index 358788096a0..38bcea802d6 100644
+index b5b1e2a1077..5eb6065b7ac 100644
 --- a/server/file.h
 +++ b/server/file.h
 @@ -168,6 +168,8 @@ extern void file_set_error(void);
@@ -146,5 +159,5 @@ index 358788096a0..38bcea802d6 100644
  /* file mapping functions */
  
 -- 
-2.34.1
+2.35.1
 

patches/server-Stored_ACLs/0004-server-Temporarily-store-the-full-security-descripto.patch

@@ -1,4 +1,4 @@
-From cd7fb7888c26a3ccbbc13404f671ed7525041e81 Mon Sep 17 00:00:00 2001
+From b4f93b03b07b3c29f7cc3548431a487885c0f8c2 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Mon, 30 Mar 2015 12:50:21 +0200
 Subject: [PATCH] server: Temporarily store the full security descriptor for
@@ -12,10 +12,10 @@ Subject: [PATCH] server: Temporarily store the full security descriptor for
  4 files changed, 80 insertions(+), 47 deletions(-)
 
 diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
-index 7f0c248cd7a..f1ec827d683 100644
+index 4b9e02af826..1e82353cfd0 100644
 --- a/dlls/advapi32/tests/security.c
 +++ b/dlls/advapi32/tests/security.c
-@@ -3702,7 +3702,6 @@ static void test_CreateDirectoryA(void)
+@@ -3774,7 +3774,6 @@ static void test_CreateDirectoryA(void)
      ok(error == ERROR_SUCCESS, "GetNamedSecurityInfo failed with error %ld\n", error);
      bret = GetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation);
      ok(bret, "GetAclInformation failed\n");
@@ -23,7 +23,7 @@ index 7f0c248cd7a..f1ec827d683 100644
      ok(acl_size.AceCount == 0, "GetAclInformation returned unexpected entry count (%ld != 0).\n",
                                 acl_size.AceCount);
      LocalFree(pSD);
-@@ -3713,7 +3712,6 @@ static void test_CreateDirectoryA(void)
+@@ -3785,7 +3784,6 @@ static void test_CreateDirectoryA(void)
      ok(error == ERROR_SUCCESS, "GetNamedSecurityInfo failed with error %ld\n", error);
      bret = GetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation);
      ok(bret, "GetAclInformation failed\n");
@@ -31,7 +31,7 @@ index 7f0c248cd7a..f1ec827d683 100644
      ok(acl_size.AceCount == 0, "GetAclInformation returned unexpected entry count (%ld != 0).\n",
                                 acl_size.AceCount);
      LocalFree(pSD);
-@@ -3836,7 +3834,6 @@ static void test_CreateDirectoryA(void)
+@@ -3908,7 +3906,6 @@ static void test_CreateDirectoryA(void)
      ok(error == ERROR_SUCCESS, "GetNamedSecurityInfo failed with error %d\n", error);
      bret = GetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation);
      ok(bret, "GetAclInformation failed\n");
@@ -39,7 +39,7 @@ index 7f0c248cd7a..f1ec827d683 100644
      ok(acl_size.AceCount == 0, "GetAclInformation returned unexpected entry count (%d != 0).\n",
                                 acl_size.AceCount);
      LocalFree(pSD);
-@@ -4935,23 +4932,22 @@ static void test_GetSecurityInfo(void)
+@@ -5024,23 +5021,22 @@ static void test_GetSecurityInfo(void)
          bret = GetAce(pDacl, 0, (VOID **)&ace);
          ok(bret, "Failed to get Current User ACE.\n");
          bret = EqualSid(&ace->SidStart, user_sid);
@@ -96,7 +96,7 @@ index 5beedef4714..1ebda152ef9 100644
  
      return &dir->obj;
 diff --git a/server/file.c b/server/file.c
-index d476f4b796e..e61de8283b8 100644
+index 6bc0708f9b2..743493b8d37 100644
 --- a/server/file.c
 +++ b/server/file.c
 @@ -187,7 +187,8 @@ struct file *create_file_for_fd_obj( struct fd *fd, unsigned int access, unsigne
@@ -167,7 +167,7 @@ index d476f4b796e..e61de8283b8 100644
 -    else if (obj->sd)
 -        owner = sd_get_owner( obj->sd );
 -    else
--        owner = token_get_user( current->process->token );
+-        owner = token_get_owner( current->process->token );
 +    /* calculate the new sd, save to a temporary variable before assigning */
 +    new_sd = set_sd_from_token_internal( sd, obj->sd, set_info, current->process->token );
 +    if (new_sd)
@@ -247,7 +247,7 @@ index d476f4b796e..e61de8283b8 100644
      }
      if (root_fd) release_object( root_fd );
 diff --git a/server/file.h b/server/file.h
-index abea05d33fd..81bcdc1c913 100644
+index 4490287291e..65c28b3ac62 100644
 --- a/server/file.h
 +++ b/server/file.h
 @@ -207,7 +207,8 @@ extern struct object *create_unix_device( struct object *root, const struct unic
@@ -261,5 +261,5 @@ index abea05d33fd..81bcdc1c913 100644
  
  /* completion */
 -- 
-2.34.1
+2.35.1
 

patches/shlwapi-AssocGetPerceivedType/0001-shlwapi-tests-Add-tests-for-AssocGetPerceivedType.patch

@@ -1,4 +1,4 @@
-From 96ac04f742980583ab06204facb5c9f838acb12c Mon Sep 17 00:00:00 2001
+From 367dc97c7091a8dcca2c34073e03a94e0c0255e5 Mon Sep 17 00:00:00 2001
 From: Mark Jansen <learn0more@gmail.com>
 Date: Sat, 2 May 2015 13:47:30 +0200
 Subject: [PATCH] shlwapi/tests: Add tests for AssocGetPerceivedType.
@@ -27,7 +27,7 @@ index b4f5b0cf8ce..0fb6e7fcbe8 100644
  
  /*************************************************************************
 diff --git a/dlls/shlwapi/tests/assoc.c b/dlls/shlwapi/tests/assoc.c
-index 84eda1317bb..ffbcea9f028 100644
+index 93e0d140518..a39cf49ea87 100644
 --- a/dlls/shlwapi/tests/assoc.c
 +++ b/dlls/shlwapi/tests/assoc.c
 @@ -23,12 +23,13 @@
@@ -44,9 +44,9 @@ index 84eda1317bb..ffbcea9f028 100644
  static HRESULT (WINAPI *pAssocCreate)(CLSID, REFIID, void **) = NULL;
 +static HRESULT (WINAPI *pAssocGetPerceivedType)(LPCWSTR, PERCEIVED *, INT *, LPWSTR *) = NULL;
  
- /* Every version of Windows with IE should have this association? */
- static const WCHAR dotHtml[] = { '.','h','t','m','l',0 };
-@@ -306,6 +307,282 @@ static void test_assoc_create(void)
+ /* Should every version of Windows with IE have .html association? */
+ 
+@@ -301,6 +302,282 @@ static void test_assoc_create(void)
      }
  }
  
@@ -329,7 +329,7 @@ index 84eda1317bb..ffbcea9f028 100644
  START_TEST(assoc)
  {
      HMODULE hshlwapi;
-@@ -313,9 +590,11 @@ START_TEST(assoc)
+@@ -308,9 +585,11 @@ START_TEST(assoc)
      pAssocQueryStringA = (void*)GetProcAddress(hshlwapi, "AssocQueryStringA");
      pAssocQueryStringW = (void*)GetProcAddress(hshlwapi, "AssocQueryStringW");
      pAssocCreate       = (void*)GetProcAddress(hshlwapi, "AssocCreate");