Release v4.19

Silence a noisy FIXME, by github user Guy1524

patches/Compiler_Warnings/0020-amstream-Avoid-implicit-cast-of-interface-pointer.patch

@@ -1,25 +0,0 @@
-From bd48f0d6b1476a77520f0bf5f82ac08e9dbf9acd Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Tue, 22 Mar 2016 21:54:01 +0100
-Subject: amstream: Avoid implicit cast of interface pointer.
-
----
- dlls/amstream/mediastreamfilter.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dlls/amstream/mediastreamfilter.c b/dlls/amstream/mediastreamfilter.c
-index 5abcb2f..a7ff6e8 100644
---- a/dlls/amstream/mediastreamfilter.c
-+++ b/dlls/amstream/mediastreamfilter.c
-@@ -42,7 +42,7 @@ typedef struct {
- 
- static inline IMediaStreamFilterImpl *impl_from_IMediaStreamFilter(IMediaStreamFilter *iface)
- {
--    return CONTAINING_RECORD(iface, IMediaStreamFilterImpl, filter);
-+    return CONTAINING_RECORD((IBaseFilter *)iface, IMediaStreamFilterImpl, filter.IBaseFilter_iface);
- }
- 
- /*** IUnknown methods ***/
--- 
-2.7.4
-

patches/Compiler_Warnings/0021-d2d1-Avoid-implicit-cast-of-interface-pointer.patch

@@ -1,4 +1,4 @@
-From 2aeb3a9e57142c3f4ff86cb81b206bdbc146552d Mon Sep 17 00:00:00 2001
+From c8f9b712a946fac79af1290d14c1d31d0a8f0c10 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Tue, 22 Mar 2016 21:54:26 +0100
 Subject: [PATCH] d2d1: Avoid implicit cast of interface pointer.
@@ -7,17 +7,16 @@ Subject: [PATCH] d2d1: Avoid implicit cast of interface pointer.
  dlls/d2d1/bitmap.c             | 2 +-
  dlls/d2d1/brush.c              | 8 ++++----
  dlls/d2d1/dc_render_target.c   | 2 +-
- dlls/d2d1/device.c             | 2 +-
  dlls/d2d1/geometry.c           | 6 +++---
  dlls/d2d1/hwnd_render_target.c | 2 +-
  dlls/d2d1/state_block.c        | 2 +-
- 7 files changed, 12 insertions(+), 12 deletions(-)
+ 6 files changed, 11 insertions(+), 11 deletions(-)
 
 diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c
-index c0aef3c..8a4b517 100644
+index 39e81192f77..52810211701 100644
 --- a/dlls/d2d1/bitmap.c
 +++ b/dlls/d2d1/bitmap.c
-@@ -626,5 +626,5 @@ struct d2d_bitmap *unsafe_impl_from_ID2D1Bitmap(ID2D1Bitmap *iface)
+@@ -623,5 +623,5 @@ struct d2d_bitmap *unsafe_impl_from_ID2D1Bitmap(ID2D1Bitmap *iface)
      if (!iface)
          return NULL;
      assert(iface->lpVtbl == (ID2D1BitmapVtbl *)&d2d_bitmap_vtbl);
@@ -25,10 +24,10 @@ index c0aef3c..8a4b517 100644
 +    return CONTAINING_RECORD((ID2D1Bitmap1*)iface, struct d2d_bitmap, ID2D1Bitmap1_iface);
  }
 diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c
-index 9c73ae1..a748669 100644
+index 21abf1456ab..1030884c2b7 100644
 --- a/dlls/d2d1/brush.c
 +++ b/dlls/d2d1/brush.c
-@@ -256,7 +256,7 @@ static void d2d_brush_init(struct d2d_brush *brush, ID2D1Factory *factory,
+@@ -253,7 +253,7 @@ static void d2d_brush_init(struct d2d_brush *brush, ID2D1Factory *factory,
  
  static inline struct d2d_brush *impl_from_ID2D1SolidColorBrush(ID2D1SolidColorBrush *iface)
  {
@@ -37,7 +36,7 @@ index 9c73ae1..a748669 100644
  }
  
  static HRESULT STDMETHODCALLTYPE d2d_solid_color_brush_QueryInterface(ID2D1SolidColorBrush *iface,
-@@ -399,7 +399,7 @@ HRESULT d2d_solid_color_brush_create(ID2D1Factory *factory, const D2D1_COLOR_F *
+@@ -396,7 +396,7 @@ HRESULT d2d_solid_color_brush_create(ID2D1Factory *factory, const D2D1_COLOR_F *
  
  static inline struct d2d_brush *impl_from_ID2D1LinearGradientBrush(ID2D1LinearGradientBrush *iface)
  {
@@ -46,7 +45,7 @@ index 9c73ae1..a748669 100644
  }
  
  static HRESULT STDMETHODCALLTYPE d2d_linear_gradient_brush_QueryInterface(ID2D1LinearGradientBrush *iface,
-@@ -586,7 +586,7 @@ HRESULT d2d_linear_gradient_brush_create(ID2D1Factory *factory,
+@@ -583,7 +583,7 @@ HRESULT d2d_linear_gradient_brush_create(ID2D1Factory *factory,
  
  static inline struct d2d_brush *impl_from_ID2D1RadialGradientBrush(ID2D1RadialGradientBrush *iface)
  {
@@ -55,7 +54,7 @@ index 9c73ae1..a748669 100644
  }
  
  static HRESULT STDMETHODCALLTYPE d2d_radial_gradient_brush_QueryInterface(ID2D1RadialGradientBrush *iface,
-@@ -818,7 +818,7 @@ HRESULT d2d_radial_gradient_brush_create(ID2D1Factory *factory,
+@@ -815,7 +815,7 @@ HRESULT d2d_radial_gradient_brush_create(ID2D1Factory *factory,
  
  static inline struct d2d_brush *impl_from_ID2D1BitmapBrush1(ID2D1BitmapBrush1 *iface)
  {
@@ -65,10 +64,10 @@ index 9c73ae1..a748669 100644
  
  static HRESULT STDMETHODCALLTYPE d2d_bitmap_brush_QueryInterface(ID2D1BitmapBrush1 *iface,
 diff --git a/dlls/d2d1/dc_render_target.c b/dlls/d2d1/dc_render_target.c
-index b095008..6030826 100644
+index 310c5412967..9d9168dc8ee 100644
 --- a/dlls/d2d1/dc_render_target.c
 +++ b/dlls/d2d1/dc_render_target.c
-@@ -26,7 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d);
+@@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d);
  
  static inline struct d2d_dc_render_target *impl_from_IUnknown(IUnknown *iface)
  {
@@ -77,24 +76,11 @@ index b095008..6030826 100644
  }
  
  static HRESULT d2d_dc_render_target_present(IUnknown *outer_unknown)
-diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c
-index 45b2258..bf32c23 100644
---- a/dlls/d2d1/device.c
-+++ b/dlls/d2d1/device.c
-@@ -207,7 +207,7 @@ static inline struct d2d_device_context *impl_from_ID2D1DeviceContext(ID2D1Devic
- 
- static inline struct d2d_device_context *impl_from_ID2D1RenderTarget(ID2D1RenderTarget *iface)
- {
--    return CONTAINING_RECORD(iface, struct d2d_device_context, ID2D1DeviceContext_iface);
-+    return CONTAINING_RECORD((ID2D1DeviceContext*)iface, struct d2d_device_context, ID2D1DeviceContext_iface);
- }
- 
- static HRESULT STDMETHODCALLTYPE d2d_device_context_inner_QueryInterface(IUnknown *iface, REFIID iid, void **out)
 diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c
-index 421ba2b..f8db51c 100644
+index 91ce32c28e7..da4a1f2d3ee 100644
 --- a/dlls/d2d1/geometry.c
 +++ b/dlls/d2d1/geometry.c
-@@ -2987,7 +2987,7 @@ static const struct ID2D1GeometrySinkVtbl d2d_geometry_sink_vtbl =
+@@ -2982,7 +2982,7 @@ static const struct ID2D1GeometrySinkVtbl d2d_geometry_sink_vtbl =
  
  static inline struct d2d_geometry *impl_from_ID2D1PathGeometry(ID2D1PathGeometry *iface)
  {
@@ -103,7 +89,7 @@ index 421ba2b..f8db51c 100644
  }
  
  static HRESULT STDMETHODCALLTYPE d2d_path_geometry_QueryInterface(ID2D1PathGeometry *iface, REFIID iid, void **out)
-@@ -3503,7 +3503,7 @@ void d2d_path_geometry_init(struct d2d_geometry *geometry, ID2D1Factory *factory
+@@ -3498,7 +3498,7 @@ void d2d_path_geometry_init(struct d2d_geometry *geometry, ID2D1Factory *factory
  
  static inline struct d2d_geometry *impl_from_ID2D1RectangleGeometry(ID2D1RectangleGeometry *iface)
  {
@@ -112,7 +98,7 @@ index 421ba2b..f8db51c 100644
  }
  
  static HRESULT STDMETHODCALLTYPE d2d_rectangle_geometry_QueryInterface(ID2D1RectangleGeometry *iface,
-@@ -3838,7 +3838,7 @@ fail:
+@@ -3833,7 +3833,7 @@ fail:
  
  static inline struct d2d_geometry *impl_from_ID2D1TransformedGeometry(ID2D1TransformedGeometry *iface)
  {
@@ -122,10 +108,10 @@ index 421ba2b..f8db51c 100644
  
  static HRESULT STDMETHODCALLTYPE d2d_transformed_geometry_QueryInterface(ID2D1TransformedGeometry *iface,
 diff --git a/dlls/d2d1/hwnd_render_target.c b/dlls/d2d1/hwnd_render_target.c
-index d0b9695..429561e 100644
+index 625f101eaa7..f3626c42cee 100644
 --- a/dlls/d2d1/hwnd_render_target.c
 +++ b/dlls/d2d1/hwnd_render_target.c
-@@ -26,7 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d);
+@@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d);
  
  static inline struct d2d_hwnd_render_target *impl_from_IUnknown(IUnknown *iface)
  {
@@ -135,10 +121,10 @@ index d0b9695..429561e 100644
  
  static HRESULT d2d_hwnd_render_target_present(IUnknown *outer_unknown)
 diff --git a/dlls/d2d1/state_block.c b/dlls/d2d1/state_block.c
-index b15384e..4e7e34b 100644
+index e3175146a64..b66752983e6 100644
 --- a/dlls/d2d1/state_block.c
 +++ b/dlls/d2d1/state_block.c
-@@ -190,5 +190,5 @@ struct d2d_state_block *unsafe_impl_from_ID2D1DrawingStateBlock(ID2D1DrawingStat
+@@ -187,5 +187,5 @@ struct d2d_state_block *unsafe_impl_from_ID2D1DrawingStateBlock(ID2D1DrawingStat
      if (!iface)
          return NULL;
      assert(iface->lpVtbl == (ID2D1DrawingStateBlockVtbl *)&d2d_state_block_vtbl);
@@ -146,5 +132,5 @@ index b15384e..4e7e34b 100644
 +    return CONTAINING_RECORD((ID2D1DrawingStateBlock1*)iface, struct d2d_state_block, ID2D1DrawingStateBlock1_iface);
  }
 -- 
-1.9.1
+2.20.1
 

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

@@ -1,4 +1,4 @@
-From 5e4c31d0796f2e559889d4f84cdb571130217e7d Mon Sep 17 00:00:00 2001
+From 14f3c7debf91be0e5b36299f330541f3146d00ca Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Tue, 22 Mar 2016 21:58:40 +0100
 Subject: [PATCH] dwrite: Avoid implicit cast of interface pointer.
@@ -9,10 +9,10 @@ Subject: [PATCH] dwrite: Avoid implicit cast of interface pointer.
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c
-index f50133d..1bc7b59 100644
+index be9ff88fe44..44c4426c9ff 100644
 --- a/dlls/dwrite/font.c
 +++ b/dlls/dwrite/font.c
-@@ -1815,7 +1815,7 @@ static struct dwrite_font *unsafe_impl_from_IDWriteFont(IDWriteFont *iface)
+@@ -1781,7 +1781,7 @@ static struct dwrite_font *unsafe_impl_from_IDWriteFont(IDWriteFont *iface)
      if (!iface)
          return NULL;
      assert(iface->lpVtbl == (IDWriteFontVtbl*)&dwritefontvtbl);
@@ -21,7 +21,7 @@ index f50133d..1bc7b59 100644
  }
  
  struct dwrite_fontface *unsafe_impl_from_IDWriteFontFace(IDWriteFontFace *iface)
-@@ -1823,7 +1823,7 @@ struct dwrite_fontface *unsafe_impl_from_IDWriteFontFace(IDWriteFontFace *iface)
+@@ -1789,7 +1789,7 @@ struct dwrite_fontface *unsafe_impl_from_IDWriteFontFace(IDWriteFontFace *iface)
      if (!iface)
          return NULL;
      assert(iface->lpVtbl == (IDWriteFontFaceVtbl*)&dwritefontfacevtbl);
@@ -31,18 +31,18 @@ index f50133d..1bc7b59 100644
  
  void get_logfont_from_font(IDWriteFont *iface, LOGFONTW *lf)
 diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c
-index f27fe9f..ee1eb5a 100644
+index b9c712cd7fb..358d13963a7 100644
 --- a/dlls/dwrite/layout.c
 +++ b/dlls/dwrite/layout.c
-@@ -5622,7 +5622,7 @@ static const IDWriteTextFormat2Vtbl dwritetextformatvtbl = {
+@@ -5715,7 +5715,7 @@ static const IDWriteTextFormat3Vtbl dwritetextformatvtbl =
  static struct dwrite_textformat *unsafe_impl_from_IDWriteTextFormat(IDWriteTextFormat *iface)
  {
      return (iface->lpVtbl == (IDWriteTextFormatVtbl*)&dwritetextformatvtbl) ?
--        CONTAINING_RECORD(iface, struct dwrite_textformat, IDWriteTextFormat2_iface) : NULL;
-+        CONTAINING_RECORD((IDWriteTextFormat2 *)iface, struct dwrite_textformat, IDWriteTextFormat2_iface) : NULL;
+-        CONTAINING_RECORD(iface, struct dwrite_textformat, IDWriteTextFormat3_iface) : NULL;
++        CONTAINING_RECORD((IDWriteTextFormat3 *)iface, struct dwrite_textformat, IDWriteTextFormat3_iface) : NULL;
  }
  
  HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *collection, DWRITE_FONT_WEIGHT weight, DWRITE_FONT_STYLE style,
 -- 
-1.9.1
+2.23.0
 

patches/Compiler_Warnings/0033-evr-Avoid-implicit-cast-of-interface-pointer.patch

@@ -1,25 +0,0 @@
-From b4586e37df817f205c8bebe319b4765dea5c62d5 Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Sun, 24 Sep 2017 19:21:06 +0200
-Subject: evr: Avoid implicit cast of interface pointer.
-
----
- dlls/evr/evr.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dlls/evr/evr.c b/dlls/evr/evr.c
-index c2d2933211e..5533f38a649 100644
---- a/dlls/evr/evr.c
-+++ b/dlls/evr/evr.c
-@@ -136,7 +136,7 @@ static const IUnknownVtbl evr_inner_vtbl =
- 
- static inline evr_filter *impl_from_IBaseFilter(IBaseFilter *iface)
- {
--    return CONTAINING_RECORD(iface, evr_filter, filter);
-+    return CONTAINING_RECORD(iface, evr_filter, filter.IBaseFilter_iface);
- }
- 
- static HRESULT WINAPI filter_QueryInterface(IBaseFilter *iface, REFIID riid, void **ppv)
--- 
-2.14.1
-

patches/Compiler_Warnings/definition

@@ -0,0 +1,2 @@
+Fixes: Fixes compile warnings.
+#Depends: mailing-list-patches

patches/Staging/0001-kernel32-Add-winediag-message-to-show-warning-that-t.patch

@@ -1,4 +1,4 @@
-From ee1533db82fa2a955765b6a00f5300900350d2fe Mon Sep 17 00:00:00 2001
+From 9e585de1f2f28e1ef18c1edca875779c491375cb Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Thu, 2 Oct 2014 19:44:31 +0200
 Subject: [PATCH] kernel32: Add winediag message to show warning, that this
@@ -9,7 +9,7 @@ Subject: [PATCH] kernel32: Add winediag message to show warning, that this
  1 file changed, 10 insertions(+)
 
 diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
-index 0a3fd70..206224f 100644
+index 36ed82bff8c..b8a677c5485 100644
 --- a/dlls/kernel32/process.c
 +++ b/dlls/kernel32/process.c
 @@ -65,6 +65,7 @@
@@ -18,9 +18,9 @@ index 0a3fd70..206224f 100644
  WINE_DECLARE_DEBUG_CHANNEL(relay);
 +WINE_DECLARE_DEBUG_CHANNEL(winediag);
  
- #ifdef __APPLE__
- extern char **__wine_get_main_environment(void);
-@@ -1090,6 +1091,15 @@ void WINAPI start_process( LPTHREAD_START_ROUTINE entry, PEB *peb )
+ typedef struct
+ {
+@@ -997,6 +998,15 @@ void WINAPI start_process( LPTHREAD_START_ROUTINE entry, PEB *peb )
  
      __TRY
      {
@@ -37,5 +37,5 @@ index 0a3fd70..206224f 100644
              being_debugged = FALSE;
  
 -- 
-1.9.1
+2.23.0
 

patches/Staging/0003-loader-Add-commandline-option-patches-to-show-the-pa.patch

@@ -1,23 +1,23 @@
-From f23512417cb3d149a8be4f757282d17cc1f99f9a Mon Sep 17 00:00:00 2001
+From fa73044dd60bae90b9a5ec850205a07579d4db17 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Thu, 29 May 2014 23:43:45 +0200
-Subject: loader: Add commandline option --patches to show the patch list.
+Subject: [PATCH] loader: Add commandline option --patches to show the patch
+ list.
 
 ---
  dlls/ntdll/misc.c      |  8 ++++++++
  dlls/ntdll/ntdll.spec  |  1 +
  include/wine/library.h |  1 +
  libs/wine/config.c     |  6 ++++++
- libs/wine/wine.def     |  1 +
  libs/wine/wine.map     |  1 +
  loader/main.c          | 42 +++++++++++++++++++++++++++++++++++++++++-
- 7 files changed, 59 insertions(+), 1 deletion(-)
+ 6 files changed, 58 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c
-index ad1b43b..1f985e7 100644
+index bb75d9c..21e2db6 100644
 --- a/dlls/ntdll/misc.c
 +++ b/dlls/ntdll/misc.c
-@@ -55,6 +55,14 @@ const char * CDECL NTDLL_wine_get_version(void)
+@@ -61,6 +61,14 @@ const char * CDECL NTDLL_wine_get_version(void)
  }
  
  /*********************************************************************
@@ -33,10 +33,10 @@ index ad1b43b..1f985e7 100644
   */
  const char * CDECL NTDLL_wine_get_build_id(void)
 diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
-index 51de6e7..ee4ed49 100644
+index 292b0f6..fb45a94 100644
 --- a/dlls/ntdll/ntdll.spec
 +++ b/dlls/ntdll/ntdll.spec
-@@ -1421,6 +1421,7 @@
+@@ -1516,6 +1516,7 @@
  
  # Version
  @ cdecl wine_get_version() NTDLL_wine_get_version
@@ -57,10 +57,10 @@ index 242bb69..fae73fe 100644
  extern void wine_init_argv0_path( const char *argv0 );
  extern void wine_exec_wine_binary( const char *name, char **argv, const char *env_var );
 diff --git a/libs/wine/config.c b/libs/wine/config.c
-index a273502..5262c76 100644
+index 3c9110b..5da6263 100644
 --- a/libs/wine/config.c
 +++ b/libs/wine/config.c
-@@ -478,6 +478,12 @@ const char *wine_get_version(void)
+@@ -522,6 +522,12 @@ const char *wine_get_version(void)
      return PACKAGE_VERSION;
  }
  
@@ -73,18 +73,6 @@ index a273502..5262c76 100644
  /* return the build id string */
  const char *wine_get_build_id(void)
  {
-diff --git a/libs/wine/wine.def b/libs/wine/wine.def
-index ed315bd..5b42029 100644
---- a/libs/wine/wine.def
-+++ b/libs/wine/wine.def
-@@ -83,6 +83,7 @@ EXPORTS
-     wine_get_sortkey
-     wine_get_user_name
-     wine_get_version
-+    wine_get_patches
-     wine_init
-     wine_init_argv0_path
-     wine_is_dbcs_leadbyte
 diff --git a/libs/wine/wine.map b/libs/wine/wine.map
 index 2159fac..7cb2918 100644
 --- a/libs/wine/wine.map
@@ -98,10 +86,10 @@ index 2159fac..7cb2918 100644
      wine_init_argv0_path;
      wine_is_dbcs_leadbyte;
 diff --git a/loader/main.c b/loader/main.c
-index ce21173..4794e51 100644
+index f197cf8..f662912 100644
 --- a/loader/main.c
 +++ b/loader/main.c
-@@ -89,7 +89,8 @@ static void check_command_line( int argc, char *argv[] )
+@@ -54,7 +54,8 @@ static void check_command_line( int argc, char *argv[] )
      static const char usage[] =
          "Usage: wine PROGRAM [ARGUMENTS...]   Run the specified program\n"
          "       wine --help                   Display this help and exit\n"
@@ -111,7 +99,7 @@ index ce21173..4794e51 100644
  
      if (argc <= 1)
      {
-@@ -106,6 +107,45 @@ static void check_command_line( int argc, char *argv[] )
+@@ -71,6 +72,45 @@ static void check_command_line( int argc, char *argv[] )
          printf( "%s\n", wine_get_build_id() );
          exit(0);
      }
@@ -158,5 +146,5 @@ index ce21173..4794e51 100644
  
  
 -- 
-2.2.1
+1.9.1
 

patches/Staging/0004-loader-Add-commandline-option-check-libs.patch

@@ -1,16 +1,15 @@
-From 41863fd8fdf3a885efa93359a538e4e74258fb30 Mon Sep 17 00:00:00 2001
+From 9618572cf2eace39198fb83b747a70d1865015e3 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Wed, 28 May 2014 19:50:51 +0200
-Subject: loader: Add commandline option --check-libs.
+Subject: [PATCH] loader: Add commandline option --check-libs.
 
 ---
  include/wine/library.h |   2 +
  libs/wine/config.c     | 124 +++++++++++++++++++++++++++++++++++++++++++++++++
  libs/wine/loader.c     |  36 ++++++++++++++
- libs/wine/wine.def     |   2 +
  libs/wine/wine.map     |   2 +
  loader/main.c          |  50 +++++++++++++++++++-
- 6 files changed, 215 insertions(+), 1 deletion(-)
+ 5 files changed, 213 insertions(+), 1 deletion(-)
 
 diff --git a/include/wine/library.h b/include/wine/library.h
 index fae73fe..7395a11 100644
@@ -33,10 +32,10 @@ index fae73fe..7395a11 100644
  extern void *wine_dlsym( void *handle, const char *symbol, char *error, size_t errorsize );
  extern int wine_dlclose( void *handle, char *error, size_t errorsize );
 diff --git a/libs/wine/config.c b/libs/wine/config.c
-index 12f4a67..be9f401 100644
+index 5da6263..6cedfb7 100644
 --- a/libs/wine/config.c
 +++ b/libs/wine/config.c
-@@ -443,6 +443,130 @@ const char *wine_get_build_dir(void)
+@@ -488,6 +488,130 @@ const char *wine_get_build_dir(void)
      return build_dir;
  }
  
@@ -168,10 +167,10 @@ index 12f4a67..be9f401 100644
  const char *wine_get_server_dir(void)
  {
 diff --git a/libs/wine/loader.c b/libs/wine/loader.c
-index b5b32cc..1453a82 100644
+index 649aa22..367dde3 100644
 --- a/libs/wine/loader.c
 +++ b/libs/wine/loader.c
-@@ -1041,6 +1041,42 @@ void *wine_dlopen( const char *filename, int flag, char *error, size_t errorsize
+@@ -1064,6 +1064,42 @@ void *wine_dlopen( const char *filename, int flag, char *error, size_t errorsize
  }
  
  /***********************************************************************
@@ -214,26 +213,6 @@ index b5b32cc..1453a82 100644
   *		wine_dlsym
   */
  void *wine_dlsym( void *handle, const char *symbol, char *error, size_t errorsize )
-diff --git a/libs/wine/wine.def b/libs/wine/wine.def
-index 5b42029..6acf329 100644
---- a/libs/wine/wine.def
-+++ b/libs/wine/wine.def
-@@ -64,6 +64,7 @@ EXPORTS
-     wine_dbg_sprintf
-     wine_dbgstr_an
-     wine_dbgstr_wn
-+    wine_dladdr
-     wine_dlclose
-     wine_dll_enum_load_path
-     wine_dll_get_owner
-@@ -79,6 +80,7 @@ EXPORTS
-     wine_get_build_id
-     wine_get_config_dir
-     wine_get_data_dir
-+    wine_get_libs
-     wine_get_server_dir
-     wine_get_sortkey
-     wine_get_user_name
 diff --git a/libs/wine/wine.map b/libs/wine/wine.map
 index 7cb2918..72ffed8 100644
 --- a/libs/wine/wine.map
@@ -255,7 +234,7 @@ index 7cb2918..72ffed8 100644
      wine_get_sortkey;
      wine_get_ss;
 diff --git a/loader/main.c b/loader/main.c
-index 343ea26..44804e1 100644
+index f662912..a2dc40c 100644
 --- a/loader/main.c
 +++ b/loader/main.c
 @@ -36,6 +36,12 @@
@@ -271,7 +250,7 @@ index 343ea26..44804e1 100644
  #include <pthread.h>
  
  #include "wine/library.h"
-@@ -90,7 +96,8 @@ static void check_command_line( int argc, char *argv[] )
+@@ -55,7 +61,8 @@ static void check_command_line( int argc, char *argv[] )
          "Usage: wine PROGRAM [ARGUMENTS...]   Run the specified program\n"
          "       wine --help                   Display this help and exit\n"
          "       wine --version                Output version information and exit\n"
@@ -281,7 +260,7 @@ index 343ea26..44804e1 100644
  
      if (argc <= 1)
      {
-@@ -146,6 +153,47 @@ static void check_command_line( int argc, char *argv[] )
+@@ -111,6 +118,47 @@ static void check_command_line( int argc, char *argv[] )
  
          exit(0);
      }
@@ -330,5 +309,5 @@ index 343ea26..44804e1 100644
  
  
 -- 
-2.7.1
+1.9.1
 

patches/advapi32-CreateRestrictedToken/0002-advapi32-Implement-CreateRestrictedToken.patch

@@ -1,19 +1,18 @@
-From 2a1064c5f90beac2bd709ab5d1c454c90a16189b Mon Sep 17 00:00:00 2001
+From 3c1f5962482e7acf531f57f49d923d9c4e5278b1 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Fri, 4 Aug 2017 02:51:57 +0200
-Subject: advapi32: Implement CreateRestrictedToken.
+Subject: [PATCH] advapi32: Implement CreateRestrictedToken.
 
 ---
- dlls/advapi32/security.c       | 88 +++++++++++++++++++++++++++++++++++-------
- dlls/advapi32/tests/security.c | 88 +++++++++++++++++++++++++++++++++++++++---
- 2 files changed, 157 insertions(+), 19 deletions(-)
+ dlls/kernelbase/security.c | 103 ++++++++++++++++++++++++++++++-------
+ 1 file changed, 84 insertions(+), 19 deletions(-)
 
-diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c
-index 82bb6689d43..c531e45c9a0 100644
---- a/dlls/advapi32/security.c
-+++ b/dlls/advapi32/security.c
-@@ -840,6 +840,60 @@ BOOL WINAPI SetThreadToken(PHANDLE thread, HANDLE token)
-                                                  ThreadImpersonationToken, &token, sizeof token ));
+diff --git a/dlls/kernelbase/security.c b/dlls/kernelbase/security.c
+index 2e75e81ed77..97f6ee6a2fd 100644
+--- a/dlls/kernelbase/security.c
++++ b/dlls/kernelbase/security.c
+@@ -592,31 +592,96 @@ exit:
+     return ret;
  }
  
 +static BOOL allocate_groups(TOKEN_GROUPS **groups_ret, SID_AND_ATTRIBUTES *sids, DWORD count)
@@ -71,11 +70,16 @@ index 82bb6689d43..c531e45c9a0 100644
 +}
 +
  /*************************************************************************
-  * CreateRestrictedToken [ADVAPI32.@]
-  *
-@@ -871,25 +925,33 @@ BOOL WINAPI CreateRestrictedToken(
-     PSID_AND_ATTRIBUTES restrictSids,
-     PHANDLE newToken)
+  * CreateRestrictedToken    (kernelbase.@)
+  */
+-BOOL WINAPI CreateRestrictedToken( HANDLE token, DWORD flags,
+-                                   DWORD disable_count, PSID_AND_ATTRIBUTES disable_sids,
+-                                   DWORD delete_count, PLUID_AND_ATTRIBUTES delete_privs,
+-                                   DWORD restrict_count, PSID_AND_ATTRIBUTES restrict_sids, PHANDLE ret )
++BOOL WINAPI CreateRestrictedToken( HANDLE baseToken, DWORD flags,
++                                   DWORD nDisableSids, PSID_AND_ATTRIBUTES disableSids,
++                                   DWORD nDeletePrivs, PLUID_AND_ATTRIBUTES deletePrivs,
++                                   DWORD nRestrictSids, PSID_AND_ATTRIBUTES restrictSids, PHANDLE newToken )
  {
 -    TOKEN_TYPE type;
 -    SECURITY_IMPERSONATION_LEVEL level = SecurityAnonymous;
@@ -86,21 +90,14 @@ index 82bb6689d43..c531e45c9a0 100644
 +    BOOL ret = FALSE;
  
 -    FIXME("(%p, 0x%x, %u, %p, %u, %p, %u, %p, %p): stub\n",
+-          token, flags, disable_count, disable_sids, delete_count, delete_privs,
+-          restrict_count, restrict_sids, ret );
 +    TRACE("(%p, 0x%x, %u, %p, %u, %p, %u, %p, %p)\n",
-           baseToken, flags, nDisableSids, disableSids,
-           nDeletePrivs, deletePrivs,
-           nRestrictSids, restrictSids,
-           newToken);
- 
--    size = sizeof(type);
--    if (!GetTokenInformation( baseToken, TokenType, &type, size, &size )) return FALSE;
--    if (type == TokenImpersonation)
--    {
--        size = sizeof(level);
--        if (!GetTokenInformation( baseToken, TokenImpersonationLevel, &level, size, &size ))
--            return FALSE;
--    }
--    return DuplicateTokenEx( baseToken, MAXIMUM_ALLOWED, NULL, level, type, newToken );
++          baseToken, flags, nDisableSids, disableSids,
++          nDeletePrivs, deletePrivs,
++          nRestrictSids, restrictSids,
++          newToken);
++
 +    if (!allocate_groups(&disable_groups, disableSids, nDisableSids))
 +        goto done;
 +
@@ -117,155 +114,19 @@ index 82bb6689d43..c531e45c9a0 100644
 +    heap_free(delete_privs);
 +    heap_free(restrict_sids);
 +    return ret;
+ 
+-    size = sizeof(type);
+-    if (!GetTokenInformation( token, TokenType, &type, size, &size )) return FALSE;
+-    if (type == TokenImpersonation)
+-    {
+-        size = sizeof(level);
+-        if (!GetTokenInformation( token, TokenImpersonationLevel, &level, size, &size ))
+-            return FALSE;
+-    }
+-    return DuplicateTokenEx( token, MAXIMUM_ALLOWED, NULL, level, type, ret );
  }
  
- /*	##############################
-diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
-index a1ecc409b73..0fd41fe82fa 100644
---- a/dlls/advapi32/tests/security.c
-+++ b/dlls/advapi32/tests/security.c
-@@ -5292,10 +5292,13 @@ static void test_GetUserNameW(void)
- 
- static void test_CreateRestrictedToken(void)
- {
-+    TOKEN_PRIMARY_GROUP *primary_group, *primary_group2;
-     HANDLE process_token, token, r_token;
-     PTOKEN_GROUPS token_groups, groups2;
-     SID_AND_ATTRIBUTES sattr;
-     SECURITY_IMPERSONATION_LEVEL level;
-+    TOKEN_PRIVILEGES *privs;
-+    PRIVILEGE_SET privset;
-     TOKEN_TYPE type;
-     BOOL is_member;
-     DWORD size;
-@@ -5311,7 +5314,7 @@ static void test_CreateRestrictedToken(void)
-     ret = OpenProcessToken(GetCurrentProcess(), TOKEN_DUPLICATE|TOKEN_QUERY, &process_token);
-     ok(ret, "got error %d\n", GetLastError());
- 
--    ret = DuplicateTokenEx(process_token, TOKEN_DUPLICATE|TOKEN_ADJUST_GROUPS|TOKEN_QUERY,
-+    ret = DuplicateTokenEx(process_token, TOKEN_DUPLICATE|TOKEN_ADJUST_GROUPS|TOKEN_ADJUST_PRIVILEGES|TOKEN_QUERY,
-         NULL, SecurityImpersonation, TokenImpersonation, &token);
-     ok(ret, "got error %d\n", GetLastError());
- 
-@@ -5342,11 +5345,21 @@ static void test_CreateRestrictedToken(void)
-     ok(ret, "got error %d\n", GetLastError());
-     ok(is_member, "not a member\n");
- 
--    /* disable a SID in new token */
-+    privset.PrivilegeCount = 1;
-+    privset.Control = PRIVILEGE_SET_ALL_NECESSARY;
-+    ret = LookupPrivilegeValueA(NULL, "SeChangeNotifyPrivilege", &privset.Privilege[0].Luid);
-+    ok(ret, "got error %d\n", GetLastError());
-+
-+    is_member = FALSE;
-+    ret = PrivilegeCheck(token, &privset, &is_member);
-+    ok(ret, "got error %d\n", GetLastError());
-+    ok(is_member, "Expected SeChangeNotifyPrivilege to be enabled\n");
-+
-+    /* disable a SID and a privilege in new token */
-     sattr.Sid = token_groups->Groups[i].Sid;
-     sattr.Attributes = 0;
-     r_token = NULL;
--    ret = pCreateRestrictedToken(token, 0, 1, &sattr, 0, NULL, 0, NULL, &r_token);
-+    ret = pCreateRestrictedToken(token, 0, 1, &sattr, 1, &privset.Privilege[0], 0, NULL, &r_token);
-     ok(ret, "got error %d\n", GetLastError());
- 
-     if (ret)
-@@ -5355,7 +5368,7 @@ static void test_CreateRestrictedToken(void)
-         is_member = TRUE;
-         ret = pCheckTokenMembership(r_token, token_groups->Groups[i].Sid, &is_member);
-         ok(ret, "got error %d\n", GetLastError());
--        todo_wine ok(!is_member, "not a member\n");
-+        ok(!is_member, "not a member\n");
- 
-         ret = GetTokenInformation(r_token, TokenGroups, NULL, 0, &size);
-         ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %d with error %d\n",
-@@ -5370,9 +5383,9 @@ static void test_CreateRestrictedToken(void)
-                 break;
-         }
- 
--        todo_wine ok(groups2->Groups[j].Attributes & SE_GROUP_USE_FOR_DENY_ONLY,
-+        ok(groups2->Groups[j].Attributes & SE_GROUP_USE_FOR_DENY_ONLY,
-             "got wrong attributes\n");
--        todo_wine ok((groups2->Groups[j].Attributes & SE_GROUP_ENABLED) == 0,
-+        ok((groups2->Groups[j].Attributes & SE_GROUP_ENABLED) == 0,
-             "got wrong attributes\n");
- 
-         HeapFree(GetProcessHeap(), 0, groups2);
-@@ -5386,10 +5399,73 @@ static void test_CreateRestrictedToken(void)
-         ret = GetTokenInformation(r_token, TokenImpersonationLevel, &level, size, &size);
-         ok(ret, "got error %d\n", GetLastError());
-         ok(level == SecurityImpersonation, "got level %u\n", type);
-+
-+        is_member = TRUE;
-+        ret = PrivilegeCheck(r_token, &privset, &is_member);
-+        ok(ret, "got error %d\n", GetLastError());
-+        ok(!is_member, "Expected SeChangeNotifyPrivilege not to be enabled\n");
-+
-+        ret = GetTokenInformation(r_token, TokenPrivileges, NULL, 0, &size);
-+        ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %d with error %d\n",
-+            ret, GetLastError());
-+        privs = HeapAlloc(GetProcessHeap(), 0, size);
-+        ret = GetTokenInformation(r_token, TokenPrivileges, privs, size, &size);
-+        ok(ret, "got error %d\n", GetLastError());
-+
-+        is_member = FALSE;
-+        for (j = 0; j < privs->PrivilegeCount; j++)
-+        {
-+            if (RtlEqualLuid(&privs->Privileges[j].Luid, &privset.Privilege[0].Luid))
-+            {
-+                is_member = TRUE;
-+                break;
-+            }
-+        }
-+
-+        ok(!is_member, "Expected not to find privilege\n");
-+        HeapFree(GetProcessHeap(), 0, privs);
-     }
- 
-     HeapFree(GetProcessHeap(), 0, token_groups);
-     CloseHandle(r_token);
-+
-+    ret = GetTokenInformation(token, TokenPrimaryGroup, NULL, 0, &size);
-+    ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %d with error %d\n",
-+        ret, GetLastError());
-+    primary_group = HeapAlloc(GetProcessHeap(), 0, size);
-+    ret = GetTokenInformation(token, TokenPrimaryGroup, primary_group, size, &size);
-+    ok(ret, "got error %d\n", GetLastError());
-+
-+    /* disable primary group */
-+    sattr.Sid = primary_group->PrimaryGroup;
-+    sattr.Attributes = 0;
-+    r_token = NULL;
-+    ret = pCreateRestrictedToken(token, 0, 1, &sattr, 0, NULL, 0, NULL, &r_token);
-+    ok(ret, "got error %d\n", GetLastError());
-+
-+    if (ret)
-+    {
-+        is_member = TRUE;
-+        ret = pCheckTokenMembership(r_token, primary_group->PrimaryGroup, &is_member);
-+        ok(ret, "got error %d\n", GetLastError());
-+        ok(!is_member, "not a member\n");
-+
-+        ret = GetTokenInformation(r_token, TokenPrimaryGroup, NULL, 0, &size);
-+        ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %d with error %d\n",
-+            ret, GetLastError());
-+        primary_group2 = HeapAlloc(GetProcessHeap(), 0, size);
-+        ret = GetTokenInformation(r_token, TokenPrimaryGroup, primary_group2, size, &size);
-+        ok(ret, "got error %d\n", GetLastError());
-+
-+        ok(EqualSid(primary_group2->PrimaryGroup, primary_group->PrimaryGroup),
-+           "Expected same primary group\n");
-+
-+        HeapFree(GetProcessHeap(), 0, primary_group2);
-+    }
-+
-+    HeapFree(GetProcessHeap(), 0, primary_group);
-+    CloseHandle(r_token);
-+
-     CloseHandle(token);
-     CloseHandle(process_token);
- }
+ /******************************************************************************
 -- 
-2.13.1
+2.20.1
 

patches/advapi32-CreateRestrictedToken/0003-server-Correctly-validate-SID-length-in-sd_is_valid.patch

@@ -1,36 +0,0 @@
-From 22a49dfa50cda9b1f5a5c64eabed2d17b0033896 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Fri, 4 Aug 2017 02:52:50 +0200
-Subject: server: Correctly validate SID length in sd_is_valid.
-
----
- server/token.c | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/server/token.c b/server/token.c
-index acd7a4dedb5..7ab0f634c05 100644
---- a/server/token.c
-+++ b/server/token.c
-@@ -332,8 +332,7 @@ int sd_is_valid( const struct security_descriptor *sd, data_size_t size )
-     owner = sd_get_owner( sd );
-     if (owner)
-     {
--        size_t needed_size = security_sid_len( owner );
--        if ((sd->owner_len < sizeof(SID)) || (needed_size > sd->owner_len))
-+        if ((sd->owner_len < sizeof(SID)) || (security_sid_len( owner ) > sd->owner_len))
-             return FALSE;
-     }
-     offset += sd->owner_len;
-@@ -344,8 +343,7 @@ int sd_is_valid( const struct security_descriptor *sd, data_size_t size )
-     group = sd_get_group( sd );
-     if (group)
-     {
--        size_t needed_size = security_sid_len( group );
--        if ((sd->group_len < sizeof(SID)) || (needed_size > sd->group_len))
-+        if ((sd->group_len < sizeof(SID)) || (security_sid_len( group ) > sd->group_len))
-             return FALSE;
-     }
-     offset += sd->group_len;
--- 
-2.13.1
-

patches/advapi32-LsaLookupSids/0001-advapi32-Initialize-buffer-length-to-zero-in-LsaLook.patch

@@ -1,31 +0,0 @@
-From be28c746d013c16fa6c2e50f5f9debc45d39d81b Mon Sep 17 00:00:00 2001
-From: Qian Hong <qhong@codeweavers.com>
-Date: Tue, 7 Apr 2015 13:18:31 +0800
-Subject: advapi32: Initialize buffer length to zero in LsaLookupSids to
- prevent crash. (try 2)
-
-Superseded 110588-110594
-
-Try 2:
-- Use RtlInitUnicodeStringEx to simplify code when possible. Same for
-other patches in this series. (Thanks Nikolay)
----
- dlls/advapi32/lsa.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c
-index 2a8b791..69c29c5 100644
---- a/dlls/advapi32/lsa.c
-+++ b/dlls/advapi32/lsa.c
-@@ -502,7 +502,7 @@ NTSTATUS WINAPI LsaLookupSids(
-     {
-         (*Names)[i].Use = SidTypeUnknown;
-         (*Names)[i].DomainIndex = -1;
--        (*Names)[i].Name.Buffer = NULL;
-+        RtlInitUnicodeStringEx(&(*Names)[i].Name, NULL);
- 
-         memset(&(*ReferencedDomains)->Domains[i], 0, sizeof(LSA_TRUST_INFORMATION));
- 
--- 
-2.3.5
-

patches/advapi32-LsaLookupSids/0005-advapi32-tests-Test-prefix-and-use-of-TokenPrimaryGr.patch

@@ -1,95 +0,0 @@
-From f0290aad953e988b1a15e214ecfc57f21dc136af Mon Sep 17 00:00:00 2001
-From: Qian Hong <qhong@codeweavers.com>
-Date: Tue, 28 Apr 2015 23:28:50 +0800
-Subject: advapi32/tests: Test prefix and use of TokenPrimaryGroup Sid.
-
----
- dlls/advapi32/tests/security.c | 35 ++++++++++++++++++++++++++++++-----
- 1 file changed, 30 insertions(+), 5 deletions(-)
-
-diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
-index f3fc682..6a716d6 100644
---- a/dlls/advapi32/tests/security.c
-+++ b/dlls/advapi32/tests/security.c
-@@ -2514,19 +2514,21 @@ static void test_granted_access(HANDLE handle, ACCESS_MASK access,
- static void test_process_security(void)
- {
-     BOOL res;
-+    PTOKEN_USER user;
-     PTOKEN_OWNER owner;
-     PTOKEN_PRIMARY_GROUP group;
--    PSID AdminSid = NULL, UsersSid = NULL;
-+    PSID AdminSid = NULL, UsersSid = NULL, UserSid = NULL;
-     PACL Acl = NULL, ThreadAcl = NULL;
-     SECURITY_DESCRIPTOR *SecurityDescriptor = NULL, *ThreadSecurityDescriptor = NULL;
--    char buffer[MAX_PATH];
-+    char buffer[MAX_PATH], account[MAX_PATH], domain[MAX_PATH];
-     PROCESS_INFORMATION info;
-     STARTUPINFOA startup;
-     SECURITY_ATTRIBUTES psa, tsa;
-     HANDLE token, event;
--    DWORD size;
-+    DWORD size, acc_size, dom_size, ret;
-     SID_IDENTIFIER_AUTHORITY SIDAuthWorld = { SECURITY_WORLD_SID_AUTHORITY };
-     PSID EveryoneSid = NULL;
-+    SID_NAME_USE use;
- 
-     Acl = HeapAlloc(GetProcessHeap(), 0, 256);
-     res = InitializeAcl(Acl, 256, ACL_REVISION);
-@@ -2558,7 +2560,8 @@ static void test_process_security(void)
-     owner = HeapAlloc(GetProcessHeap(), 0, size);
-     res = GetTokenInformation( token, TokenOwner, owner, size, &size );
-     ok(res, "GetTokenInformation failed with error %d\n", GetLastError());
--    AdminSid = ((TOKEN_OWNER*)owner)->Owner;
-+    AdminSid = owner->Owner;
-+    test_sid_str(AdminSid);
- 
-     res = GetTokenInformation( token, TokenPrimaryGroup, NULL, 0, &size );
-     ok(!res, "Expected failure, got %d\n", res);
-@@ -2568,13 +2571,34 @@ static void test_process_security(void)
-     group = HeapAlloc(GetProcessHeap(), 0, size);
-     res = GetTokenInformation( token, TokenPrimaryGroup, group, size, &size );
-     ok(res, "GetTokenInformation failed with error %d\n", GetLastError());
--    UsersSid = ((TOKEN_PRIMARY_GROUP*)group)->PrimaryGroup;
-+    UsersSid = group->PrimaryGroup;
-+    test_sid_str(UsersSid);
-+
-+    acc_size = sizeof(account);
-+    dom_size = sizeof(domain);
-+    ret = LookupAccountSidA( NULL, UsersSid, account, &acc_size, domain, &dom_size, &use );
-+    ok(ret, "LookupAccountSid failed with %d\n", ret);
-+    todo_wine ok(use == SidTypeGroup, "expect SidTypeGroup, got %d\n", use);
-+    todo_wine ok(!strcmp(account, "None"), "expect None, got %s\n", account);
-+
-+    res = GetTokenInformation( token, TokenUser, NULL, 0, &size );
-+    ok(!res, "Expected failure, got %d\n", res);
-+    ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER,
-+       "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError());
-+
-+    user = HeapAlloc(GetProcessHeap(), 0, size);
-+    res = GetTokenInformation( token, TokenUser, user, size, &size );
-+    ok(res, "GetTokenInformation failed with error %d\n", GetLastError());
-+    UserSid = user->User.Sid;
-+    test_sid_str(UserSid);
-+    todo_wine ok(EqualPrefixSid(UsersSid, UserSid), "TokenPrimaryGroup Sid and TokenUser Sid don't match.\n");
- 
-     CloseHandle( token );
-     if (!res)
-     {
-         HeapFree(GetProcessHeap(), 0, group);
-         HeapFree(GetProcessHeap(), 0, owner);
-+        HeapFree(GetProcessHeap(), 0, user);
-         HeapFree(GetProcessHeap(), 0, Acl);
-         return;
-     }
-@@ -2681,6 +2705,7 @@ static void test_process_security(void)
-     CloseHandle( event );
-     HeapFree(GetProcessHeap(), 0, group);
-     HeapFree(GetProcessHeap(), 0, owner);
-+    HeapFree(GetProcessHeap(), 0, user);
-     HeapFree(GetProcessHeap(), 0, Acl);
-     HeapFree(GetProcessHeap(), 0, SecurityDescriptor);
-     HeapFree(GetProcessHeap(), 0, ThreadAcl);
--- 
-2.3.5
-

patches/advapi32-LsaLookupSids/0006-server-Create-primary-group-using-DOMAIN_GROUP_RID_U.patch

@@ -1,38 +0,0 @@
-From 5487b4720e24aaa7a10719fc36bc23c851a48a9b Mon Sep 17 00:00:00 2001
-From: Qian Hong <qhong@codeweavers.com>
-Date: Tue, 28 Apr 2015 22:35:26 +0800
-Subject: server: Create primary group using DOMAIN_GROUP_RID_USERS.
-
----
- dlls/advapi32/tests/security.c | 2 +-
- server/token.c                 | 1 +
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
-index 25b34ba4..573119f 100644
---- a/dlls/advapi32/tests/security.c
-+++ b/dlls/advapi32/tests/security.c
-@@ -2591,7 +2591,7 @@ static void test_process_security(void)
-     ok(res, "GetTokenInformation failed with error %d\n", GetLastError());
-     UserSid = user->User.Sid;
-     test_sid_str(UserSid);
--    todo_wine ok(EqualPrefixSid(UsersSid, UserSid), "TokenPrimaryGroup Sid and TokenUser Sid don't match.\n");
-+    ok(EqualPrefixSid(UsersSid, UserSid), "TokenPrimaryGroup Sid and TokenUser Sid don't match.\n");
- 
-     CloseHandle( token );
-     if (!res)
-diff --git a/server/token.c b/server/token.c
-index e57cbc6..be8c53b 100644
---- a/server/token.c
-+++ b/server/token.c
-@@ -695,6 +695,7 @@ struct token *token_create_admin( void )
-             { security_local_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY },
-             { security_interactive_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY },
-             { security_authenticated_user_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY },
-+            { security_domain_users_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY|SE_GROUP_OWNER },
-             { alias_admins_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY|SE_GROUP_OWNER },
-             { alias_users_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY },
-             { logon_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY|SE_GROUP_LOGON_ID },
--- 
-2.3.5
-

patches/advapi32-LsaLookupSids/0007-advapi32-Fix-name-and-use-of-DOMAIN_GROUP_RID_USERS.patch

@@ -1,7 +1,7 @@
-From 83517396c266c2de290670128d678770f5d79cc9 Mon Sep 17 00:00:00 2001
+From 486ec8b5ea1b39195d92cfdbfe3a334280780a14 Mon Sep 17 00:00:00 2001
 From: Qian Hong <qhong@codeweavers.com>
 Date: Tue, 28 Apr 2015 23:00:08 +0800
-Subject: advapi32: Fix name and use of DOMAIN_GROUP_RID_USERS.
+Subject: [PATCH] advapi32: Fix name and use of DOMAIN_GROUP_RID_USERS.
 
 ---
  dlls/advapi32/security.c       | 7 +++++--
@@ -9,10 +9,10 @@ Subject: advapi32: Fix name and use of DOMAIN_GROUP_RID_USERS.
  2 files changed, 7 insertions(+), 4 deletions(-)
 
 diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c
-index d27b2e7..2362dd5 100644
+index a7707f15d39..73c1f054d5c 100644
 --- a/dlls/advapi32/security.c
 +++ b/dlls/advapi32/security.c
-@@ -191,7 +191,7 @@ static const WCHAR Domain_Admins[] = { 'D','o','m','a','i','n',' ','A','d','m','
+@@ -187,7 +187,7 @@ static const WCHAR Domain_Admins[] = { 'D','o','m','a','i','n',' ','A','d','m','
  static const WCHAR Domain_Computers[] = { 'D','o','m','a','i','n',' ','C','o','m','p','u','t','e','r','s',0 };
  static const WCHAR Domain_Controllers[] = { 'D','o','m','a','i','n',' ','C','o','n','t','r','o','l','l','e','r','s',0 };
  static const WCHAR Domain_Guests[] = { 'D','o','m','a','i','n',' ','G','u','e','s','t','s',0 };
@@ -21,7 +21,7 @@ index d27b2e7..2362dd5 100644
  static const WCHAR Enterprise_Admins[] = { 'E','n','t','e','r','p','r','i','s','e',' ','A','d','m','i','n','s',0 };
  static const WCHAR ENTERPRISE_DOMAIN_CONTROLLERS[] = { 'E','N','T','E','R','P','R','I','S','E',' ','D','O','M','A','I','N',' ','C','O','N','T','R','O','L','L','E','R','S',0 };
  static const WCHAR Everyone[] = { 'E','v','e','r','y','o','n','e',0 };
-@@ -2206,7 +2206,10 @@ LookupAccountSidW(
+@@ -1185,7 +1185,10 @@ LookupAccountSidW(
                              ac = Domain_Admins;
                              break;
                          case DOMAIN_GROUP_RID_USERS:
@@ -34,20 +34,23 @@ index d27b2e7..2362dd5 100644
                          case DOMAIN_GROUP_RID_GUESTS:
                              ac = Domain_Guests;
 diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
-index 573119f..490ce26 100644
+index 5f65ed385dd..a9d745cfe39 100644
 --- a/dlls/advapi32/tests/security.c
 +++ b/dlls/advapi32/tests/security.c
-@@ -2578,8 +2578,8 @@ static void test_process_security(void)
+@@ -3003,11 +3003,11 @@ static void test_process_security(void)
      dom_size = sizeof(domain);
      ret = LookupAccountSidA( NULL, UsersSid, account, &acc_size, domain, &dom_size, &use );
      ok(ret, "LookupAccountSid failed with %d\n", ret);
 -    todo_wine ok(use == SidTypeGroup, "expect SidTypeGroup, got %d\n", use);
--    todo_wine ok(!strcmp(account, "None"), "expect None, got %s\n", account);
 +    ok(use == SidTypeGroup, "expect SidTypeGroup, got %d\n", use);
-+    ok(!strcmp(account, "None"), "expect None, got %s\n", account);
+     if (PRIMARYLANGID(GetSystemDefaultLangID()) != LANG_ENGLISH)
+         skip("Non-English locale (test with hardcoded 'None')\n");
+     else
+-        todo_wine ok(!strcmp(account, "None"), "expect None, got %s\n", account);
++        ok(!strcmp(account, "None"), "expect None, got %s\n", account);
  
      res = GetTokenInformation( token, TokenUser, NULL, 0, &size );
      ok(!res, "Expected failure, got %d\n", res);
 -- 
-2.3.5
+2.17.1
 

patches/advapi32-LsaLookupSids/definition

@@ -1 +1,3 @@
-Depends: server-Misc_ACL
+# Originally sent 2015 April by Qian Hong, apparently dropped off the list:
+# <https://www.winehq.org/pipermail/wine-patches/2015-April/138515.html>
+# Some of the patches were labeled as for Cygwin.

patches/advapi32-RegLoadAppKey/0001-advapi32-Add-RegLoadAppKeyA-RegLoadAppKeyW-stubs.patch

@@ -1,125 +0,0 @@
-From 2b29014573fcb38388dd82e33fa16f67b1a43a8c Mon Sep 17 00:00:00 2001
-From: Austin English <austinenglish@gmail.com>
-Date: Sun, 23 Oct 2016 16:15:45 -0500
-Subject: [PATCH] advapi32: Add RegLoadAppKeyA/RegLoadAppKeyW stubs
-
-Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41591
-Signed-off-by: Austin English <austinenglish@gmail.com>
----
- dlls/advapi32/advapi32.spec                        |  4 ++--
- dlls/advapi32/registry.c                           | 24 ++++++++++++++++++++++
- .../api-ms-win-core-registry-l1-1-0.spec           |  4 ++--
- .../api-ms-win-downlevel-advapi32-l1-1-0.spec      |  4 ++--
- dlls/kernelbase/kernelbase.spec                    |  4 ++--
- include/winreg.h                                   |  3 +++
- 6 files changed, 35 insertions(+), 8 deletions(-)
-
-diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec
-index e870a5d..042a523 100644
---- a/dlls/advapi32/advapi32.spec
-+++ b/dlls/advapi32/advapi32.spec
-@@ -648,8 +648,8 @@
- @ stdcall RegGetKeySecurity(long long ptr ptr)
- @ stdcall RegGetValueA(long str str long ptr ptr ptr)
- @ stdcall RegGetValueW(long wstr wstr long ptr ptr ptr)
--# @ stub RegLoadAppKeyA
--# @ stub RegLoadAppKeyW
-+@ stdcall RegLoadAppKeyA(str ptr long long long)
-+@ stdcall RegLoadAppKeyW(wstr ptr long long long)
- @ stdcall RegLoadKeyA(long str str)
- @ stdcall RegLoadKeyW(long wstr wstr)
- @ stdcall RegLoadMUIStringA(long str str long ptr long str)
-diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c
-index 3018372..55df6de 100644
---- a/dlls/advapi32/registry.c
-+++ b/dlls/advapi32/registry.c
-@@ -3513,3 +3513,27 @@ LONG WINAPI RegDisableReflectionKey(HKEY base)
-     FIXME("%p: stub\n", base);
-     return ERROR_SUCCESS;
- }
-+
-+/******************************************************************************
-+ * RegLoadAppKeyA [ADVAPI32.@]
-+ *
-+ */
-+LSTATUS WINAPI RegLoadAppKeyA(const char *file, HKEY *result, REGSAM sam, DWORD options, DWORD reserved)
-+{
-+    FIXME("%s %p %u %u %u: stub\n", wine_dbgstr_a(file), result, sam, options, reserved);
-+
-+    *result = (HKEY)0xbeefcafe;
-+    return ERROR_SUCCESS;
-+}
-+
-+/******************************************************************************
-+ * RegLoadAppKeyW [ADVAPI32.@]
-+ *
-+ */
-+LSTATUS WINAPI RegLoadAppKeyW(const WCHAR *file, HKEY *result, REGSAM sam, DWORD options, DWORD reserved)
-+{
-+    FIXME("%s %p %u %u %u: stub\n", wine_dbgstr_w(file), result, sam, options, reserved);
-+
-+    *result = (HKEY)0xbeefcafe;
-+    return ERROR_SUCCESS;
-+}
-diff --git a/dlls/api-ms-win-core-registry-l1-1-0/api-ms-win-core-registry-l1-1-0.spec b/dlls/api-ms-win-core-registry-l1-1-0/api-ms-win-core-registry-l1-1-0.spec
-index 7a48e3b..f81f027 100644
---- a/dlls/api-ms-win-core-registry-l1-1-0/api-ms-win-core-registry-l1-1-0.spec
-+++ b/dlls/api-ms-win-core-registry-l1-1-0/api-ms-win-core-registry-l1-1-0.spec
-@@ -17,8 +17,8 @@
- @ stdcall RegGetKeySecurity(long long ptr ptr) advapi32.RegGetKeySecurity
- @ stdcall RegGetValueA(long str str long ptr ptr ptr) advapi32.RegGetValueA
- @ stdcall RegGetValueW(long wstr wstr long ptr ptr ptr) advapi32.RegGetValueW
--@ stub RegLoadAppKeyA
--@ stub RegLoadAppKeyW
-+@ stdcall RegLoadAppKeyA(str ptr long long long) advapi32.RegLoadAppKeyA
-+@ stdcall RegLoadAppKeyW(wstr ptr long long long) advapi32.RegLoadAppKeyW
- @ stdcall RegLoadKeyA(long str str) advapi32.RegLoadKeyA
- @ stdcall RegLoadKeyW(long wstr wstr) advapi32.RegLoadKeyW
- @ stdcall RegLoadMUIStringA(long str str long ptr long str) advapi32.RegLoadMUIStringA
-diff --git a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec
-index 5bdad41..b2dcc17 100644
---- a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec
-+++ b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec
-@@ -102,8 +102,8 @@
- @ stdcall RegGetKeySecurity(long long ptr ptr) advapi32.RegGetKeySecurity
- @ stdcall RegGetValueA(long str str long ptr ptr ptr) advapi32.RegGetValueA
- @ stdcall RegGetValueW(long wstr wstr long ptr ptr ptr) advapi32.RegGetValueW
--@ stub RegLoadAppKeyA
--@ stub RegLoadAppKeyW
-+@ stdcall RegLoadAppKeyA(str ptr long long long) advapi32.RegLoadAppKeyA
-+@ stdcall RegLoadAppKeyW(wstr ptr long long long) advapi32.RegLoadAppKeyW
- @ stdcall RegLoadKeyA(long str str) advapi32.RegLoadKeyA
- @ stdcall RegLoadKeyW(long wstr wstr) advapi32.RegLoadKeyW
- @ stdcall RegLoadMUIStringA(long str str long ptr long str) advapi32.RegLoadMUIStringA
-diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec
-index 286dae0..c114622 100644
---- a/dlls/kernelbase/kernelbase.spec
-+++ b/dlls/kernelbase/kernelbase.spec
-@@ -1288,8 +1288,8 @@
- # @ stub RegKrnResetAppKeyLoaded
- # @ stub RegKrnSetDllHasThreadStateGlobal
- # @ stub RegKrnSetTermsrvRegistryExtensionFlags
--# @ stub RegLoadAppKeyA
--# @ stub RegLoadAppKeyW
-+@ stdcall RegLoadAppKeyA(str ptr long long long) advapi32.RegLoadAppKeyA
-+@ stdcall RegLoadAppKeyW(wstr ptr long long long) advapi32.RegLoadAppKeyW
- @ stdcall -private RegLoadKeyA(long str str) kernel32.RegLoadKeyA
- @ stdcall -private RegLoadKeyW(long wstr wstr) kernel32.RegLoadKeyW
- @ stdcall -private RegLoadMUIStringA(long str str long ptr long str) kernel32.RegLoadMUIStringA
-diff --git a/include/winreg.h b/include/winreg.h
-index 51e9f02..5656eec 100644
---- a/include/winreg.h
-+++ b/include/winreg.h
-@@ -133,6 +133,9 @@ WINADVAPI LSTATUS   WINAPI RegGetKeySecurity(HKEY,SECURITY_INFORMATION,PSECURITY
- WINADVAPI LSTATUS   WINAPI RegGetValueA(HKEY,LPCSTR,LPCSTR,DWORD,LPDWORD,PVOID,LPDWORD);
- WINADVAPI LSTATUS   WINAPI RegGetValueW(HKEY,LPCWSTR,LPCWSTR,DWORD,LPDWORD,PVOID,LPDWORD);
- #define                    RegGetValue WINELIB_NAME_AW(RegGetValue)
-+WINADVAPI LSTATUS   WINAPI RegLoadAppKeyA(const char*,HKEY*,REGSAM,DWORD,DWORD);
-+WINADVAPI LSTATUS   WINAPI RegLoadAppKeyW(const WCHAR*,HKEY*,REGSAM,DWORD,DWORD);
-+#define                    RegLoadAppKey WINELIB_NAME_AW(RegLoadAppKey)
- WINADVAPI LSTATUS   WINAPI RegLoadKeyA(HKEY,LPCSTR,LPCSTR);
- WINADVAPI LSTATUS   WINAPI RegLoadKeyW(HKEY,LPCWSTR,LPCWSTR);
- #define                    RegLoadKey WINELIB_NAME_AW(RegLoadKey)
--- 
-1.9.1
-

patches/advapi32-RegLoadAppKey/definition

@@ -1 +0,0 @@
-Fixes: [41591] advapi32: Add RegLoadAppKeyA/RegLoadAppKeyW stubs

patches/advapi32-SetSecurityInfo/0001-advapi32-Move-the-DACL-combining-code-into-a-separat.patch

@@ -1,110 +0,0 @@
-From 646388b696afda85dccc76678af6a8955bf0b627 Mon Sep 17 00:00:00 2001
-From: "Erich E. Hoover" <erich.e.hoover@wine-staging.com>
-Date: Fri, 16 Oct 2015 16:03:00 -0600
-Subject: advapi32: Move the DACL combining code into a separate routine.
-
----
- dlls/advapi32/security.c | 79 +++++++++++++++++++++++++++---------------------
- 1 file changed, 45 insertions(+), 34 deletions(-)
-
-diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c
-index 00dafe8..dad8b22 100644
---- a/dlls/advapi32/security.c
-+++ b/dlls/advapi32/security.c
-@@ -5805,6 +5805,48 @@ BOOL WINAPI FileEncryptionStatusA(LPCSTR lpFileName, LPDWORD lpStatus)
-     return TRUE;
- }
- 
-+static NTSTATUS combine_dacls(ACL *parent, ACL *child, ACL **result)
-+{
-+    ACL *combined;
-+    int i;
-+
-+    /* initialize a combined DACL containing both inherited and new ACEs */
-+    combined = heap_alloc_zero(child->AclSize+parent->AclSize);
-+    if (!combined)
-+        return STATUS_NO_MEMORY;
-+
-+    memcpy(combined, child, child->AclSize);
-+    combined->AclSize = child->AclSize+parent->AclSize;
-+
-+    /* copy the inherited ACEs */
-+    for (i=0; i<parent->AceCount; i++)
-+    {
-+        ACE_HEADER *ace;
-+
-+        if (!GetAce(parent, i, (void*)&ace))
-+            continue;
-+        if (!(ace->AceFlags & (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE)))
-+            continue;
-+        if ((ace->AceFlags & (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE)) !=
-+                (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE))
-+        {
-+            FIXME("unsupported flags: %x\n", ace->AceFlags);
-+            continue;
-+        }
-+
-+        if (ace->AceFlags & NO_PROPAGATE_INHERIT_ACE)
-+            ace->AceFlags &= ~(OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE|NO_PROPAGATE_INHERIT_ACE);
-+        ace->AceFlags &= ~INHERIT_ONLY_ACE;
-+        ace->AceFlags |= INHERITED_ACE;
-+
-+        if (!AddAce(combined, ACL_REVISION, MAXDWORD, ace, ace->AceSize))
-+            WARN("error adding inherited ACE\n");
-+    }
-+
-+    *result = combined;
-+    return STATUS_SUCCESS;
-+}
-+
- /******************************************************************************
-  * SetSecurityInfo [ADVAPI32.@]
-  */
-@@ -5904,41 +5946,10 @@ DWORD WINAPI SetSecurityInfo(HANDLE handle, SE_OBJECT_TYPE ObjectType,
- 
-                     if (!err)
-                     {
--                        int i;
--
--                        dacl = heap_alloc_zero(pDacl->AclSize+parent_dacl->AclSize);
--                        if (!dacl)
--                        {
--                            LocalFree(parent_sd);
--                            return ERROR_NOT_ENOUGH_MEMORY;
--                        }
--                        memcpy(dacl, pDacl, pDacl->AclSize);
--                        dacl->AclSize = pDacl->AclSize+parent_dacl->AclSize;
--
--                        for (i=0; i<parent_dacl->AceCount; i++)
--                        {
--                            ACE_HEADER *ace;
--
--                            if (!GetAce(parent_dacl, i, (void*)&ace))
--                                continue;
--                            if (!(ace->AceFlags & (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE)))
--                                continue;
--                            if ((ace->AceFlags & (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE)) !=
--                                    (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE))
--                            {
--                                FIXME("unsupported flags: %x\n", ace->AceFlags);
--                                continue;
--                            }
--
--                            if (ace->AceFlags & NO_PROPAGATE_INHERIT_ACE)
--                                ace->AceFlags &= ~(OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE|NO_PROPAGATE_INHERIT_ACE);
--                            ace->AceFlags &= ~INHERIT_ONLY_ACE;
--                            ace->AceFlags |= INHERITED_ACE;
--
--                            if(!AddAce(dacl, ACL_REVISION, MAXDWORD, ace, ace->AceSize))
--                                WARN("error adding inherited ACE\n");
--                        }
-+                        status = combine_dacls(parent_dacl, pDacl, &dacl);
-                         LocalFree(parent_sd);
-+                        if (status != STATUS_SUCCESS)
-+                            return RtlNtStatusToDosError(status);
-                     }
-                 }
-                 else
--- 
-2.6.1
-

patches/advapi32-SetSecurityInfo/0002-advapi32-Fix-the-initialization-of-combined-DACLs-wh.patch

@@ -1,54 +0,0 @@
-From d1accafbe8e52b6b2c84e9fe5d08303fc05858af Mon Sep 17 00:00:00 2001
-From: "Erich E. Hoover" <erich.e.hoover@wine-staging.com>
-Date: Fri, 16 Oct 2015 13:58:38 -0600
-Subject: advapi32: Fix the initialization of combined DACLs when the new DACL
- is empty.
-
----
- dlls/advapi32/security.c | 23 +++++++++++++++++++++--
- 1 file changed, 21 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c
-index dad8b22..11ae487 100644
---- a/dlls/advapi32/security.c
-+++ b/dlls/advapi32/security.c
-@@ -5807,6 +5807,7 @@ BOOL WINAPI FileEncryptionStatusA(LPCSTR lpFileName, LPDWORD lpStatus)
- 
- static NTSTATUS combine_dacls(ACL *parent, ACL *child, ACL **result)
- {
-+    NTSTATUS status;
-     ACL *combined;
-     int i;
- 
-@@ -5815,8 +5816,26 @@ static NTSTATUS combine_dacls(ACL *parent, ACL *child, ACL **result)
-     if (!combined)
-         return STATUS_NO_MEMORY;
- 
--    memcpy(combined, child, child->AclSize);
--    combined->AclSize = child->AclSize+parent->AclSize;
-+    status = RtlCreateAcl(combined, parent->AclSize+child->AclSize, ACL_REVISION);
-+    if (status != STATUS_SUCCESS)
-+    {
-+        heap_free(combined);
-+        return status;
-+    }
-+
-+    /* copy the new ACEs */
-+    for (i=0; i<child->AceCount; i++)
-+    {
-+        ACE_HEADER *ace;
-+
-+        if (!GetAce(child, i, (void*)&ace))
-+        {
-+            WARN("error obtaining new ACE\n");
-+            continue;
-+        }
-+        if (!AddAce(combined, ACL_REVISION, MAXDWORD, ace, ace->AceSize))
-+            WARN("error adding new ACE\n");
-+    }
- 
-     /* copy the inherited ACEs */
-     for (i=0; i<parent->AceCount; i++)
--- 
-2.6.1
-

patches/advapi32-SetSecurityInfo/definition

@@ -1 +0,0 @@
-Fixes: [38423] Fix the initialization of combined DACLs when the new DACL is empty