Release v5.0-rc1

Fix stack alignment in x64 syscall thunks.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48274

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 a0211ba2069af11a64588a49222dcdcce1d805be 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/geometry.c           | 8 ++++----
  dlls/d2d1/hwnd_render_target.c | 2 +-
  dlls/d2d1/state_block.c        | 2 +-
- 7 files changed, 12 insertions(+), 12 deletions(-)
+ 6 files changed, 12 insertions(+), 12 deletions(-)
 
 diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c
-index c0aef3c..8a4b517 100644
+index bc958e50a1..76ecc7f02a 100644
 --- a/dlls/d2d1/bitmap.c
 +++ b/dlls/d2d1/bitmap.c
-@@ -626,5 +626,5 @@ struct d2d_bitmap *unsafe_impl_from_ID2D1Bitmap(ID2D1Bitmap *iface)
+@@ -617,5 +617,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 80fc0f5331..a612e683b6 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 47aa99697d..0efa3ebeaf 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 79850f1c20..b9b6a32f76 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
+@@ -3502,7 +3502,7 @@ void d2d_path_geometry_init(struct d2d_geometry *geometry, ID2D1Factory2 *factor
  
  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:
+@@ -3841,7 +3841,7 @@ fail:
  
  static inline struct d2d_geometry *impl_from_ID2D1TransformedGeometry(ID2D1TransformedGeometry *iface)
  {
@@ -121,11 +107,20 @@ index 421ba2b..f8db51c 100644
  }
  
  static HRESULT STDMETHODCALLTYPE d2d_transformed_geometry_QueryInterface(ID2D1TransformedGeometry *iface,
+@@ -4122,7 +4122,7 @@ void d2d_transformed_geometry_init(struct d2d_geometry *geometry, ID2D1Factory2
+ 
+ static inline struct d2d_geometry *impl_from_ID2D1GeometryGroup(ID2D1GeometryGroup *iface)
+ {
+-    return CONTAINING_RECORD(iface, struct d2d_geometry, ID2D1Geometry_iface);
++    return CONTAINING_RECORD( (ID2D1Geometry*)iface, struct d2d_geometry, ID2D1Geometry_iface);
+ }
+ 
+ static HRESULT STDMETHODCALLTYPE d2d_geometry_group_QueryInterface(ID2D1GeometryGroup *iface,
 diff --git a/dlls/d2d1/hwnd_render_target.c b/dlls/d2d1/hwnd_render_target.c
-index d0b9695..429561e 100644
+index 625f101eaa..f3626c42ce 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 +130,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 e3175146a6..b66752983e 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 +141,5 @@ index b15384e..4e7e34b 100644
 +    return CONTAINING_RECORD((ID2D1DrawingStateBlock1*)iface, struct d2d_state_block, ID2D1DrawingStateBlock1_iface);
  }
 -- 
-1.9.1
+2.17.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 7529755fcc41fda650aac6b27f34438354435d34 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 9280b5d32..2f0974a4c 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)
+@@ -1887,7 +1887,7 @@ static struct dwrite_font *unsafe_impl_from_IDWriteFont(IDWriteFont *iface)
      if (!iface)
          return NULL;
      assert(iface->lpVtbl == (IDWriteFontVtbl*)&dwritefontvtbl);
@@ -21,28 +21,28 @@ 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)
+@@ -1895,7 +1895,7 @@ struct dwrite_fontface *unsafe_impl_from_IDWriteFontFace(IDWriteFontFace *iface)
      if (!iface)
          return NULL;
      assert(iface->lpVtbl == (IDWriteFontFaceVtbl*)&dwritefontfacevtbl);
--    return CONTAINING_RECORD(iface, struct dwrite_fontface, IDWriteFontFace4_iface);
-+    return CONTAINING_RECORD((IDWriteFontFace4 *)iface, struct dwrite_fontface, IDWriteFontFace4_iface);
+-    return CONTAINING_RECORD(iface, struct dwrite_fontface, IDWriteFontFace5_iface);
++    return CONTAINING_RECORD((IDWriteFontFace5 *)iface, struct dwrite_fontface, IDWriteFontFace5_iface);
  }
  
- void get_logfont_from_font(IDWriteFont *iface, LOGFONTW *lf)
+ static struct dwrite_fontfacereference *unsafe_impl_from_IDWriteFontFaceReference(IDWriteFontFaceReference *iface)
 diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c
-index f27fe9f..ee1eb5a 100644
+index b9321157a..76ea23ba6 100644
 --- a/dlls/dwrite/layout.c
 +++ b/dlls/dwrite/layout.c
-@@ -5622,7 +5622,7 @@ static const IDWriteTextFormat2Vtbl dwritetextformatvtbl = {
+@@ -5895,7 +5895,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.24.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 @@
+Fixes: Fixes compile warnings.

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

@@ -1,7 +1,7 @@
-From 08d8e1c398ed6f3e237ad9fd3d29e10d09dcff3d Mon Sep 17 00:00:00 2001
+From 40630c14377561e90a4be405d2124338002a88f7 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Fri, 2 May 2014 20:46:19 +0200
-Subject: user32: Decrease minimum SetTimer interval to 5 ms. (try 2)
+Subject: [PATCH] user32: Decrease minimum SetTimer interval to 5 ms. (try 2)
 
 ---
  dlls/user32/message.c   | 2 +-
@@ -9,10 +9,10 @@ Subject: user32: Decrease minimum SetTimer interval to 5 ms. (try 2)
  2 files changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/user32/message.c b/dlls/user32/message.c
-index d122980..aec0938 100644
+index 1336865112a..cbe9920384f 100644
 --- a/dlls/user32/message.c
 +++ b/dlls/user32/message.c
-@@ -4443,7 +4443,7 @@ UINT_PTR WINAPI SetTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMERPROC proc )
+@@ -4496,7 +4496,7 @@ UINT_PTR WINAPI SetCoalescableTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMER
  
      if (proc) winproc = WINPROC_AllocProc( (WNDPROC)proc, FALSE );
  
@@ -22,25 +22,25 @@ index d122980..aec0938 100644
      SERVER_START_REQ( set_win_timer )
      {
 diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
-index d92fbc7..dbaddb7 100644
+index c0ba5834cf9..a6bc158e8a7 100644
 --- a/dlls/user32/tests/msg.c
 +++ b/dlls/user32/tests/msg.c
-@@ -8521,6 +8521,7 @@ static void test_timers(void)
+@@ -10282,6 +10282,7 @@ static void test_timers(void)
      start = GetTickCount();
      while (GetTickCount()-start < 1001 && GetMessageA(&msg, info.hWnd, 0, 0))
          DispatchMessageA(&msg);
 +todo_wine
      ok(abs(count-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE /* xp */
-        || broken(abs(count-64) < TIMER_COUNT_TOLERANCE) /* most common */
-        || broken(abs(count-43) < TIMER_COUNT_TOLERANCE) /* w2k3, win8 */,
-@@ -8589,6 +8590,7 @@ static void test_timers_no_wnd(void)
+        || broken(abs(count-64) <= TIMER_COUNT_TOLERANCE) /* most common */
+        || broken(abs(count-43) <= TIMER_COUNT_TOLERANCE) /* w2k3, win8 */,
+@@ -10352,6 +10353,7 @@ static void test_timers_no_wnd(void)
      start = GetTickCount();
      while (GetTickCount()-start < 1001 && GetMessageA(&msg, NULL, 0, 0))
          DispatchMessageA(&msg);
 +todo_wine
      ok(abs(count-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE /* xp */
-        || broken(abs(count-64) < TIMER_COUNT_TOLERANCE) /* most common */,
-        "did not get expected count for minimum timeout (%d != ~%d).\n",
+        || broken(abs(count-64) <= TIMER_COUNT_TOLERANCE) /* most common */
+        || broken(abs(count-43) <= TIMER_COUNT_TOLERANCE) /* w1064v1809 */,
 -- 
-2.5.1
+2.17.1
 

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/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-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/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

@@ -0,0 +1,3 @@
+# 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-Token_Integrity_Level/0006-ntdll-Add-function-to-create-new-tokens-for-elevatio.patch

@@ -1,4 +1,4 @@
-From f94296129eb249a04ccb012a10f50b79fb0a631a Mon Sep 17 00:00:00 2001
+From 8959c13f2be7e2a31f27c8483ee2202692f00710 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sat, 5 Aug 2017 01:45:29 +0200
 Subject: [PATCH] ntdll: Add function to create new tokens for elevation
@@ -7,17 +7,17 @@ Subject: [PATCH] ntdll: Add function to create new tokens for elevation
 ---
  dlls/ntdll/ntdll.spec   |  3 ++
  dlls/ntdll/ntdll_misc.h |  3 ++
- dlls/ntdll/process.c    | 18 +++++++++++
- server/protocol.def     |  8 +++++
+ dlls/ntdll/process.c    | 18 +++++++++
+ server/protocol.def     |  8 ++++
  server/security.h       |  1 +
- server/token.c          | 84 +++++++++++++++++++++++++++++++++++++++++++++++++
+ server/token.c          | 84 +++++++++++++++++++++++++++++++++++++++++
  6 files changed, 117 insertions(+)
 
 diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
-index 969cee7..008abb7 100644
+index d626e0bf2..5057e2b07 100644
 --- a/dlls/ntdll/ntdll.spec
 +++ b/dlls/ntdll/ntdll.spec
-@@ -1508,6 +1508,9 @@
+@@ -1556,6 +1556,9 @@
  # Virtual memory
  @ cdecl __wine_locked_recvmsg(long ptr long)
  
@@ -28,12 +28,12 @@ index 969cee7..008abb7 100644
  @ cdecl wine_get_version() NTDLL_wine_get_version
  @ cdecl wine_get_patches() NTDLL_wine_get_patches
 diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
-index 5a93ede..cb02bd1 100644
+index ac1469412..6c2345c6c 100644
 --- a/dlls/ntdll/ntdll_misc.h
 +++ b/dlls/ntdll/ntdll_misc.h
-@@ -83,6 +83,9 @@ extern void heap_set_debug_flags( HANDLE handle ) DECLSPEC_HIDDEN;
- extern void init_user_process_params( SIZE_T data_size ) DECLSPEC_HIDDEN;
- extern void update_user_process_params( const UNICODE_STRING *image ) DECLSPEC_HIDDEN;
+@@ -89,6 +89,9 @@ extern void init_user_process_params( SIZE_T data_size ) DECLSPEC_HIDDEN;
+ extern char **build_envp( const WCHAR *envW ) DECLSPEC_HIDDEN;
+ extern NTSTATUS restart_process( RTL_USER_PROCESS_PARAMETERS *params, NTSTATUS status ) DECLSPEC_HIDDEN;
  
 +/* token */
 +extern HANDLE CDECL __wine_create_default_token(BOOL admin);
@@ -42,10 +42,10 @@ index 5a93ede..cb02bd1 100644
  extern timeout_t server_start_time DECLSPEC_HIDDEN;
  extern unsigned int server_cpus DECLSPEC_HIDDEN;
 diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c
-index 2ff8610..bb4a171 100644
+index 52d7ea429..e24691b8a 100644
 --- a/dlls/ntdll/process.c
 +++ b/dlls/ntdll/process.c
-@@ -118,6 +118,24 @@ HANDLE CDECL __wine_make_process_system(void)
+@@ -125,6 +125,24 @@ HANDLE CDECL __wine_make_process_system(void)
      return ret;
  }
  
@@ -71,10 +71,10 @@ index 2ff8610..bb4a171 100644
  
  #define UNIMPLEMENTED_INFO_CLASS(c) \
 diff --git a/server/protocol.def b/server/protocol.def
-index 493100b..071f740 100644
+index e908f2131..0177cb579 100644
 --- a/server/protocol.def
 +++ b/server/protocol.def
-@@ -3666,6 +3666,14 @@ struct handle_info
+@@ -3734,6 +3734,14 @@ struct handle_info
  @END
  
  
@@ -90,7 +90,7 @@ index 493100b..071f740 100644
  @REQ(create_completion)
      unsigned int access;          /* desired access to a port */
 diff --git a/server/security.h b/server/security.h
-index 6c33714..21e90cc 100644
+index 6c337143c..21e90ccf2 100644
 --- a/server/security.h
 +++ b/server/security.h
 @@ -49,6 +49,7 @@ extern const PSID security_builtin_users_sid;
@@ -102,7 +102,7 @@ index 6c33714..21e90cc 100644
  
  /* token functions */
 diff --git a/server/token.c b/server/token.c
-index 4c37c67..e449e61 100644
+index 381ae6871..fcab79955 100644
 --- a/server/token.c
 +++ b/server/token.c
 @@ -79,6 +79,7 @@ static const SID anonymous_logon_sid = { SID_REVISION, 1, { SECURITY_NT_AUTHORIT
@@ -121,7 +121,7 @@ index 4c37c67..e449e61 100644
  
  static luid_t prev_luid_value = { 1000, 0 };
  
-@@ -908,6 +910,64 @@ struct token *token_create_admin( void )
+@@ -917,6 +919,64 @@ struct token *token_create_admin( void )
      return token;
  }
  
@@ -186,7 +186,7 @@ index 4c37c67..e449e61 100644
  static struct privilege *token_find_privilege( struct token *token, const LUID *luid, int enabled_only )
  {
      struct privilege *privilege;
-@@ -1713,3 +1773,27 @@ DECL_HANDLER(set_token_default_dacl)
+@@ -1722,3 +1782,27 @@ DECL_HANDLER(set_token_default_dacl)
          release_object( token );
      }
  }
@@ -215,5 +215,5 @@ index 4c37c67..e449e61 100644
 +    }
 +}
 -- 
-1.9.1
+2.23.0
 

patches/advapi32-Token_Integrity_Level/0008-ntdll-Implement-process-token-elevation-through-mani.patch

@@ -1,24 +1,25 @@
-From 19cfff2a16953b65f9767fee571a4ce5d51b0536 Mon Sep 17 00:00:00 2001
+From 6a09d34647aa517e45bc0bb20a92d0d94a1da888 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sat, 5 Aug 2017 03:39:55 +0200
 Subject: [PATCH] ntdll: Implement process token elevation through manifests.
 
 ---
- dlls/ntdll/loader.c | 40 ++++++++++++++++++++++++++++++++++++++--
+ dlls/ntdll/loader.c | 37 +++++++++++++++++++++++++++++++++++++
  server/process.c    |  8 ++++++++
  server/process.h    |  1 +
  server/protocol.def |  7 +++++++
  server/token.c      | 14 ++++++++++++++
- 5 files changed, 68 insertions(+), 2 deletions(-)
+ 5 files changed, 67 insertions(+)
 
 diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
-index c0708c6..479608f 100644
+index 2f203447e..7c5dd308b 100644
 --- a/dlls/ntdll/loader.c
 +++ b/dlls/ntdll/loader.c
-@@ -3505,6 +3505,32 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, void **entry, ULONG_PTR unknow
+@@ -3804,6 +3804,32 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, void **entry, ULONG_PTR unknow
+ }
  
  
- /***********************************************************************
++/***********************************************************************
 + *           elevate_process
 + */
 +static void elevate_process( void )
@@ -44,38 +45,20 @@ index c0708c6..479608f 100644
 +}
 +
 +
-+/***********************************************************************
+ /***********************************************************************
   *           load_global_options
   */
- static void load_global_options(void)
-@@ -3557,6 +3583,7 @@ static void load_global_options(void)
- }
- 
- 
-+
- /***********************************************************************
-  *           RtlImageDirectoryEntryToData   (NTDLL.@)
-  */
-@@ -3592,7 +3619,6 @@ PVOID WINAPI RtlImageDirectoryEntryToData( HMODULE module, BOOL image, WORD dir,
-     return RtlImageRvaToVa( nt, module, addr, NULL );
- }
- 
--
- /***********************************************************************
-  *           RtlImageRvaToSection   (NTDLL.@)
-  */
-@@ -3691,7 +3717,7 @@ void __wine_process_init(void)
+@@ -4233,6 +4259,7 @@ void __wine_process_init(void)
                                        's','y','s','t','e','m','3','2','\\',
                                        'k','e','r','n','e','l','3','2','.','d','l','l',0};
-     static const WCHAR globalflagW[] = {'G','l','o','b','a','l','F','l','a','g',0};
--
+     RTL_USER_PROCESS_PARAMETERS *params;
 +    ACTIVATION_CONTEXT_RUN_LEVEL_INFORMATION runlevel;
      WINE_MODREF *wm;
      NTSTATUS status;
      ANSI_STRING func_name;
-@@ -3742,6 +3768,16 @@ void __wine_process_init(void)
-                                        &NtCurrentTeb()->Peb->NtGlobalFlag, sizeof(DWORD), NULL );
-     heap_set_debug_flags( GetProcessHeap() );
+@@ -4324,6 +4351,16 @@ void __wine_process_init(void)
+ 
+     virtual_set_large_address_space();
  
 +    /* elevate process if necessary */
 +    status = RtlQueryInformationActivationContext( 0, NULL, 0, RunlevelInformationInActivationContext,
@@ -89,12 +72,12 @@ index c0708c6..479608f 100644
 +
      /* the main exe needs to be the first in the load order list */
      RemoveEntryList( &wm->ldr.InLoadOrderModuleList );
-     InsertHeadList( &NtCurrentTeb()->Peb->LdrData->InLoadOrderModuleList, &wm->ldr.InLoadOrderModuleList );
+     InsertHeadList( &peb->LdrData->InLoadOrderModuleList, &wm->ldr.InLoadOrderModuleList );
 diff --git a/server/process.c b/server/process.c
-index d8fdfcc..2c9365a 100644
+index 4c7da9223..d6f71a774 100644
 --- a/server/process.c
 +++ b/server/process.c
-@@ -1129,6 +1129,14 @@ struct process_snapshot *process_snap( int *count )
+@@ -1107,6 +1107,14 @@ struct process_snapshot *process_snap( int *count )
      return snapshot;
  }
  
@@ -110,22 +93,22 @@ index d8fdfcc..2c9365a 100644
  DECL_HANDLER(new_process)
  {
 diff --git a/server/process.h b/server/process.h
-index d9d29f0..a494eab 100644
+index 5b83e111a..dfe5c4e52 100644
 --- a/server/process.h
 +++ b/server/process.h
-@@ -139,6 +139,7 @@ extern void break_process( struct process *process );
+@@ -139,6 +139,7 @@ extern void kill_debugged_processes( struct thread *debugger, int exit_code );
  extern void detach_debugged_processes( struct thread *debugger );
  extern struct process_snapshot *process_snap( int *count );
  extern void enum_processes( int (*cb)(struct process*, void*), void *user);
 +extern void replace_process_token( struct process *process, struct token *token );
  
  /* console functions */
- extern void inherit_console(struct thread *parent_thread, struct process *process, obj_handle_t hconin);
+ extern void inherit_console( struct thread *parent_thread, struct process *parent,
 diff --git a/server/protocol.def b/server/protocol.def
-index 2b8d51a..650c279 100644
+index 6022e1715..45ab670ea 100644
 --- a/server/protocol.def
 +++ b/server/protocol.def
-@@ -3721,6 +3721,13 @@ struct handle_info
+@@ -3755,6 +3755,13 @@ struct handle_info
  @END
  
  
@@ -140,7 +123,7 @@ index 2b8d51a..650c279 100644
  @REQ(create_completion)
      unsigned int access;          /* desired access to a port */
 diff --git a/server/token.c b/server/token.c
-index fcab799..181219d 100644
+index fcab79955..181219d21 100644
 --- a/server/token.c
 +++ b/server/token.c
 @@ -1806,3 +1806,17 @@ DECL_HANDLER(create_token)
@@ -162,5 +145,5 @@ index fcab799..181219d 100644
 +    }
 +}
 -- 
-1.9.1
+2.24.0
 

patches/advapi32-Token_Integrity_Level/0010-server-Implement-support-for-creating-processes-usin.patch

@@ -1,133 +1,148 @@
-From e571cdf9236e083f196c09d0fc96ed7c98fae440 Mon Sep 17 00:00:00 2001
+From 51830c6683b199e79cb9e782ee51555054a4da7c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sun, 6 Aug 2017 02:08:05 +0200
 Subject: [PATCH] server: Implement support for creating processes using a
  token.
 
 ---
- dlls/kernel32/process.c | 27 +++++++++++++++------------
- server/process.c        | 39 +++++++++++++++++++++++++++++++++++----
- server/process.h        |  2 +-
- server/protocol.def     |  1 +
- server/request.c        |  2 +-
- server/security.h       |  2 ++
- server/token.c          | 11 +++++++++++
- 7 files changed, 66 insertions(+), 18 deletions(-)
+ dlls/kernelbase/process.c | 24 +++++++++++++-----------
+ dlls/ntdll/process.c      |  3 ++-
+ server/process.c          | 39 +++++++++++++++++++++++++++++++++++----
+ server/process.h          |  2 +-
+ server/protocol.def       |  1 +
+ server/request.c          |  2 +-
+ server/security.h         |  2 ++
+ server/token.c            | 11 +++++++++++
+ 8 files changed, 66 insertions(+), 18 deletions(-)
 
-diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
-index bb6cc3e..7b202db 100644
---- a/dlls/kernel32/process.c
-+++ b/dlls/kernel32/process.c
-@@ -2289,7 +2289,7 @@ static BOOL replace_process( HANDLE handle, const RTL_USER_PROCESS_PARAMETERS *p
-  * Create a new process. If hFile is a valid handle we have an exe
-  * file, otherwise it is a Winelib app.
+diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c
+index a07dddb1f..99985ab89 100644
+--- a/dlls/kernelbase/process.c
++++ b/dlls/kernelbase/process.c
+@@ -242,7 +242,7 @@ static RTL_USER_PROCESS_PARAMETERS *create_process_params( const WCHAR *filename
+ /***********************************************************************
+  *           create_nt_process
   */
--static BOOL create_process( HANDLE hFile, LPSECURITY_ATTRIBUTES psa, LPSECURITY_ATTRIBUTES tsa,
-+static BOOL create_process( HANDLE token, HANDLE hFile, LPSECURITY_ATTRIBUTES psa, LPSECURITY_ATTRIBUTES tsa,
-                             BOOL inherit, DWORD flags, const RTL_USER_PROCESS_PARAMETERS *params,
-                             LPPROCESS_INFORMATION info, LPCSTR unixdir, const pe_image_info_t *pe_info )
+-static NTSTATUS create_nt_process( SECURITY_ATTRIBUTES *psa, SECURITY_ATTRIBUTES *tsa,
++static NTSTATUS create_nt_process( HANDLE token, SECURITY_ATTRIBUTES *psa, SECURITY_ATTRIBUTES *tsa,
+                                    BOOL inherit, DWORD flags, RTL_USER_PROCESS_PARAMETERS *params,
+                                    RTL_USER_PROCESS_INFORMATION *info, HANDLE parent )
  {
-@@ -2356,6 +2356,7 @@ static BOOL create_process( HANDLE hFile, LPSECURITY_ATTRIBUTES psa, LPSECURITY_
+@@ -257,7 +257,7 @@ static NTSTATUS create_nt_process( SECURITY_ATTRIBUTES *psa, SECURITY_ATTRIBUTES
+         status = RtlCreateUserProcess( &nameW, OBJ_CASE_INSENSITIVE, params,
+                                        psa ? psa->lpSecurityDescriptor : NULL,
+                                        tsa ? tsa->lpSecurityDescriptor : NULL,
+-                                       parent, inherit, 0, 0, info );
++                                       parent, inherit, 0, token, info );
+         RtlFreeUnicodeString( &nameW );
+     }
+     return status;
+@@ -267,7 +267,7 @@ static NTSTATUS create_nt_process( SECURITY_ATTRIBUTES *psa, SECURITY_ATTRIBUTES
+ /***********************************************************************
+  *           create_vdm_process
+  */
+-static NTSTATUS create_vdm_process( SECURITY_ATTRIBUTES *psa, SECURITY_ATTRIBUTES *tsa,
++static NTSTATUS create_vdm_process( HANDLE token, SECURITY_ATTRIBUTES *psa, SECURITY_ATTRIBUTES *tsa,
+                                     BOOL inherit, DWORD flags, RTL_USER_PROCESS_PARAMETERS *params,
+                                     RTL_USER_PROCESS_INFORMATION *info )
+ {
+@@ -288,7 +288,7 @@ static NTSTATUS create_vdm_process( SECURITY_ATTRIBUTES *psa, SECURITY_ATTRIBUTE
+               winevdm, params->ImagePathName.Buffer, params->CommandLine.Buffer );
+     RtlInitUnicodeString( &params->ImagePathName, winevdm );
+     RtlInitUnicodeString( &params->CommandLine, newcmdline );
+-    status = create_nt_process( psa, tsa, inherit, flags, params, info, NULL );
++    status = create_nt_process( token, psa, tsa, inherit, flags, params, info, NULL );
+     HeapFree( GetProcessHeap(), 0, newcmdline );
+     return status;
+ }
+@@ -297,7 +297,7 @@ static NTSTATUS create_vdm_process( SECURITY_ATTRIBUTES *psa, SECURITY_ATTRIBUTE
+ /***********************************************************************
+  *           create_cmd_process
+  */
+-static NTSTATUS create_cmd_process( SECURITY_ATTRIBUTES *psa, SECURITY_ATTRIBUTES *tsa,
++static NTSTATUS create_cmd_process( HANDLE token, SECURITY_ATTRIBUTES *psa, SECURITY_ATTRIBUTES *tsa,
+                                     BOOL inherit, DWORD flags, RTL_USER_PROCESS_PARAMETERS *params,
+                                     RTL_USER_PROCESS_INFORMATION *info )
+ {
+@@ -316,7 +316,7 @@ static NTSTATUS create_cmd_process( SECURITY_ATTRIBUTES *psa, SECURITY_ATTRIBUTE
+     swprintf( newcmdline, len, L"%s /s/c \"%s\"", comspec, params->CommandLine.Buffer );
+     RtlInitUnicodeString( &params->ImagePathName, comspec );
+     RtlInitUnicodeString( &params->CommandLine, newcmdline );
+-    status = create_nt_process( psa, tsa, inherit, flags, params, info, NULL );
++    status = create_nt_process( token, psa, tsa, inherit, flags, params, info, NULL );
+     RtlFreeHeap( GetProcessHeap(), 0, newcmdline );
+     return status;
+ }
+@@ -448,7 +448,9 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessInternalW( HANDLE token, const WCHAR
+ 
+     TRACE( "app %s cmdline %s\n", debugstr_w(app_name), debugstr_w(cmd_line) );
+ 
+-    if (token) FIXME( "Creating a process with a token is not yet implemented\n" );
++    /* FIXME: Starting a process which requires admin rights should fail
++     * with ERROR_ELEVATION_REQUIRED when no token is passed. */
++
+     if (new_token) FIXME( "No support for returning created process token\n" );
+ 
+     if (app_name)
+@@ -521,7 +523,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessInternalW( HANDLE token, const WCHAR
+         }
+     }
+ 
+-    status = create_nt_process( process_attr, thread_attr, inherit, flags, params, &rtl_info, parent );
++    status = create_nt_process( token, process_attr, thread_attr, inherit, flags, params, &rtl_info, parent );
+     switch (status)
+     {
+     case STATUS_SUCCESS:
+@@ -530,7 +532,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessInternalW( HANDLE token, const WCHAR
+     case STATUS_INVALID_IMAGE_NE_FORMAT:
+     case STATUS_INVALID_IMAGE_PROTECT:
+         TRACE( "starting %s as Win16/DOS binary\n", debugstr_w(app_name) );
+-        status = create_vdm_process( process_attr, thread_attr, inherit, flags, params, &rtl_info );
++        status = create_vdm_process( token, process_attr, thread_attr, inherit, flags, params, &rtl_info );
+         break;
+     case STATUS_INVALID_IMAGE_NOT_MZ:
+         /* check for .com or .bat extension */
+@@ -538,12 +540,12 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessInternalW( HANDLE token, const WCHAR
+         if (!wcsicmp( p, L".com" ) || !wcsicmp( p, L".pif" ))
+         {
+             TRACE( "starting %s as DOS binary\n", debugstr_w(app_name) );
+-            status = create_vdm_process( process_attr, thread_attr, inherit, flags, params, &rtl_info );
++            status = create_vdm_process( token, process_attr, thread_attr, inherit, flags, params, &rtl_info );
+         }
+         else if (!wcsicmp( p, L".bat" ) || !wcsicmp( p, L".cmd" ))
+         {
+             TRACE( "starting %s as batch binary\n", debugstr_w(app_name) );
+-            status = create_cmd_process( process_attr, thread_attr, inherit, flags, params, &rtl_info );
++            status = create_cmd_process( token, process_attr, thread_attr, inherit, flags, params, &rtl_info );
+         }
+         break;
+     }
+diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c
+index f3d9079f8..2fa553091 100644
+--- a/dlls/ntdll/process.c
++++ b/dlls/ntdll/process.c
+@@ -1667,7 +1667,7 @@ NTSTATUS WINAPI RtlCreateUserProcess( UNICODE_STRING *path, ULONG attributes,
+                                       RTL_USER_PROCESS_PARAMETERS *params,
+                                       SECURITY_DESCRIPTOR *process_descr,
+                                       SECURITY_DESCRIPTOR *thread_descr,
+-                                      HANDLE parent, BOOLEAN inherit, HANDLE debug, HANDLE exception,
++                                      HANDLE parent, BOOLEAN inherit, HANDLE debug, HANDLE token,
+                                       RTL_USER_PROCESS_INFORMATION *info )
+ {
+     NTSTATUS status;
+@@ -1735,6 +1735,7 @@ NTSTATUS WINAPI RtlCreateUserProcess( UNICODE_STRING *path, ULONG attributes,
          req->access         = PROCESS_ALL_ACCESS;
-         req->cpu            = pe_info->cpu;
+         req->cpu            = pe_info.cpu;
          req->info_size      = startup_info_size;
 +        req->token          = wine_server_obj_handle( token );
          wine_server_add_data( req, objattr, attr_len );
          wine_server_add_data( req, startup_info, startup_info_size );
-         wine_server_add_data( req, params->Environment, (env_end - params->Environment) * sizeof(WCHAR) );
-@@ -2526,7 +2527,7 @@ static RTL_USER_PROCESS_PARAMETERS *get_vdm_params( const RTL_USER_PROCESS_PARAM
-  *
-  * Create a new VDM process for a 16-bit or DOS application.
-  */
--static BOOL create_vdm_process( LPSECURITY_ATTRIBUTES psa, LPSECURITY_ATTRIBUTES tsa,
-+static BOOL create_vdm_process( HANDLE token, LPSECURITY_ATTRIBUTES psa, LPSECURITY_ATTRIBUTES tsa,
-                                 BOOL inherit, DWORD flags, const RTL_USER_PROCESS_PARAMETERS *params,
-                                 LPPROCESS_INFORMATION info, LPCSTR unixdir )
- {
-@@ -2536,7 +2537,7 @@ static BOOL create_vdm_process( LPSECURITY_ATTRIBUTES psa, LPSECURITY_ATTRIBUTES
- 
-     if (!(new_params = get_vdm_params( params, &pe_info ))) return FALSE;
- 
--    ret = create_process( 0, psa, tsa, inherit, flags, new_params, info, unixdir, &pe_info );
-+    ret = create_process( token, 0, psa, tsa, inherit, flags, new_params, info, unixdir, &pe_info );
-     RtlDestroyProcessParameters( new_params );
-     return ret;
- }
-@@ -2547,7 +2548,7 @@ static BOOL create_vdm_process( LPSECURITY_ATTRIBUTES psa, LPSECURITY_ATTRIBUTES
-  *
-  * Create a new cmd shell process for a .BAT file.
-  */
--static BOOL create_cmd_process( LPSECURITY_ATTRIBUTES psa, LPSECURITY_ATTRIBUTES tsa,
-+static BOOL create_cmd_process( HANDLE token, LPSECURITY_ATTRIBUTES psa, LPSECURITY_ATTRIBUTES tsa,
-                                 BOOL inherit, DWORD flags, LPSTARTUPINFOW startup,
-                                 const RTL_USER_PROCESS_PARAMETERS *params,
-                                 LPPROCESS_INFORMATION info )
-@@ -2577,9 +2578,9 @@ static BOOL create_cmd_process( LPSECURITY_ATTRIBUTES psa, LPSECURITY_ATTRIBUTES
-     strcatW( newcmdline, params->CommandLine.Buffer );
-     strcatW( newcmdline, quotW );
-     if (params->CurrentDirectory.DosPath.Length) cur_dir = params->CurrentDirectory.DosPath.Buffer;
--    ret = CreateProcessW( comspec, newcmdline, psa, tsa, inherit,
-+    ret = CreateProcessInternalW( token, comspec, newcmdline, psa, tsa, inherit,
-                           flags | CREATE_UNICODE_ENVIRONMENT, params->Environment, cur_dir,
--                          startup, info );
-+                          startup, info, NULL );
-     HeapFree( GetProcessHeap(), 0, newcmdline );
-     return ret;
- }
-@@ -2692,7 +2693,9 @@ BOOL WINAPI CreateProcessInternalW( HANDLE token, LPCWSTR app_name, LPWSTR cmd_l
- 
-     TRACE("app %s cmdline %s\n", debugstr_w(app_name), debugstr_w(cmd_line) );
- 
--    if (token) FIXME("Creating a process with a token is not yet implemented\n");
-+    /* FIXME: Starting a process which requires admin rights should fail
-+     * with ERROR_ELEVATION_REQUIRED when no token is passed. */
-+
-     if (new_token) FIXME("No support for returning created process token\n");
- 
-     if (!(tidy_cmdline = get_file_name( app_name, cmd_line, name, ARRAY_SIZE( name ), &hFile, &is_64bit )))
-@@ -2760,17 +2763,17 @@ BOOL WINAPI CreateProcessInternalW( HANDLE token, LPCWSTR app_name, LPWSTR cmd_l
-                debugstr_w(name), is_64bit_arch(pe_info.cpu) ? 64 : 32,
-                wine_dbgstr_longlong(pe_info.base), wine_dbgstr_longlong(pe_info.base + pe_info.map_size),
-                cpu_names[pe_info.cpu] );
--        retv = create_process( hFile, process_attr, thread_attr,
-+        retv = create_process( token, hFile, process_attr, thread_attr,
-                                inherit, flags, params, info, unixdir, &pe_info );
-         break;
-     case BINARY_WIN16:
-         TRACE( "starting %s as Win16/DOS binary\n", debugstr_w(name) );
--        retv = create_vdm_process( process_attr, thread_attr, inherit, flags, params, info, unixdir );
-+        retv = create_vdm_process( token, process_attr, thread_attr, inherit, flags, params, info, unixdir );
-         break;
-     case BINARY_UNIX_LIB:
-         TRACE( "starting %s as %d-bit Winelib app\n",
-                debugstr_w(name), is_64bit_arch(pe_info.cpu) ? 64 : 32 );
--        retv = create_process( hFile, process_attr, thread_attr,
-+        retv = create_process( token, hFile, process_attr, thread_attr,
-                                inherit, flags, params, info, unixdir, &pe_info );
-         break;
-     case BINARY_UNKNOWN:
-@@ -2780,14 +2783,14 @@ BOOL WINAPI CreateProcessInternalW( HANDLE token, LPCWSTR app_name, LPWSTR cmd_l
-             if (!strcmpiW( p, comW ) || !strcmpiW( p, pifW ))
-             {
-                 TRACE( "starting %s as DOS binary\n", debugstr_w(name) );
--                retv = create_vdm_process( process_attr, thread_attr,
-+                retv = create_vdm_process( token, process_attr, thread_attr,
-                                            inherit, flags, params, info, unixdir );
-                 break;
-             }
-             if (!strcmpiW( p, batW ) || !strcmpiW( p, cmdW ) )
-             {
-                 TRACE( "starting %s as batch binary\n", debugstr_w(name) );
--                retv = create_cmd_process( process_attr, thread_attr,
-+                retv = create_cmd_process( token, process_attr, thread_attr,
-                                            inherit, flags, startup_info, params, info );
-                 break;
-             }
+         wine_server_add_data( req, params->Environment, env_size );
 diff --git a/server/process.c b/server/process.c
-index af2ba3d..57bf0ec 100644
+index d6f71a774..aa66814d8 100644
 --- a/server/process.c
 +++ b/server/process.c
-@@ -486,7 +486,7 @@ static void start_sigkill_timer( struct process *process )
+@@ -491,7 +491,7 @@ static void start_sigkill_timer( struct process *process )
  /* create a new process */
  /* if the function fails the fd is closed */
  struct process *create_process( int fd, struct process *parent, int inherit_all,
@@ -136,7 +151,7 @@ index af2ba3d..57bf0ec 100644
  {
      struct process *process;
  
-@@ -561,7 +561,7 @@ struct process *create_process( int fd, struct process *parent, int inherit_all,
+@@ -568,7 +568,7 @@ struct process *create_process( int fd, struct process *parent, int inherit_all,
                                         : alloc_handle_table( process, 0 );
          /* Note: for security reasons, starting a new process does not attempt
           * to use the current impersonation token for the new process */
@@ -145,15 +160,15 @@ index af2ba3d..57bf0ec 100644
          process->affinity = parent->affinity;
      }
      if (!process->handles || !process->token) goto error;
-@@ -1127,6 +1127,7 @@ DECL_HANDLER(new_process)
+@@ -1124,6 +1124,7 @@ DECL_HANDLER(new_process)
      const struct security_descriptor *sd;
      const struct object_attributes *objattr = get_req_object_attributes( &sd, &name, NULL );
      struct process *process = NULL;
 +    struct token *token = NULL;
-     struct process *parent = current->process;
+     struct process *parent;
+     struct thread *parent_thread = current;
      int socket_fd = thread_get_inflight_fd( current, req->socket_fd );
- 
-@@ -1167,10 +1168,39 @@ DECL_HANDLER(new_process)
+@@ -1177,10 +1178,39 @@ DECL_HANDLER(new_process)
          return;
      }
  
@@ -190,10 +205,10 @@ index af2ba3d..57bf0ec 100644
      {
          close( socket_fd );
 +        if (token) release_object( token );
+         release_object( parent );
          return;
      }
-     info->process  = NULL;
-@@ -1217,7 +1247,7 @@ DECL_HANDLER(new_process)
+@@ -1228,7 +1258,7 @@ DECL_HANDLER(new_process)
  #undef FIXUP_LEN
      }
  
@@ -202,15 +217,15 @@ index af2ba3d..57bf0ec 100644
  
      process->startup_info = (struct startup_info *)grab_object( info );
  
-@@ -1279,6 +1309,7 @@ DECL_HANDLER(new_process)
-     reply->handle = alloc_handle_no_access_check( parent, process, req->access, objattr->attributes );
+@@ -1289,6 +1319,7 @@ DECL_HANDLER(new_process)
+     reply->handle = alloc_handle_no_access_check( current->process, process, req->access, objattr->attributes );
  
   done:
 +    if (token) release_object( token );
      if (process) release_object( process );
+     release_object( parent );
      release_object( info );
- }
-@@ -1311,7 +1342,7 @@ DECL_HANDLER(exec_process)
+@@ -1322,7 +1353,7 @@ DECL_HANDLER(exec_process)
          close( socket_fd );
          return;
      }
@@ -220,10 +235,10 @@ index af2ba3d..57bf0ec 100644
      release_object( process );
  }
 diff --git a/server/process.h b/server/process.h
-index 029b328..ea28091 100644
+index dfe5c4e52..61b83abf6 100644
 --- a/server/process.h
 +++ b/server/process.h
-@@ -116,7 +116,7 @@ extern unsigned int alloc_ptid( void *ptr );
+@@ -118,7 +118,7 @@ extern unsigned int alloc_ptid( void *ptr );
  extern void free_ptid( unsigned int id );
  extern void *get_ptid_entry( unsigned int id );
  extern struct process *create_process( int fd, struct process *parent, int inherit_all,
@@ -233,22 +248,22 @@ index 029b328..ea28091 100644
  extern struct thread *get_process_first_thread( struct process *process );
  extern struct process *get_process_from_id( process_id_t id );
 diff --git a/server/protocol.def b/server/protocol.def
-index 607644e..1b5e6de 100644
+index 45ab670ea..c763da4ca 100644
 --- a/server/protocol.def
 +++ b/server/protocol.def
-@@ -744,6 +744,7 @@ struct rawinput_device
+@@ -791,6 +791,7 @@ struct rawinput_device
      unsigned int access;         /* access rights for process object */
-     cpu_type_t   cpu;            /* CPU that the new process will use */
+     client_cpu_t cpu;            /* CPU that the new process will use */
      data_size_t  info_size;      /* size of startup info */
 +    obj_handle_t token;          /* token for the new process */
      VARARG(objattr,object_attributes);   /* object attributes */
      VARARG(info,startup_info,info_size); /* startup information */
      VARARG(env,unicode_str);     /* environment for new process */
 diff --git a/server/request.c b/server/request.c
-index c10c4e6..86f293f 100644
+index 200c2697d..f743b720a 100644
 --- a/server/request.c
 +++ b/server/request.c
-@@ -577,7 +577,7 @@ static void master_socket_poll_event( struct fd *fd, int event )
+@@ -582,7 +582,7 @@ static void master_socket_poll_event( struct fd *fd, int event )
          int client = accept( get_unix_fd( master_socket->fd ), (struct sockaddr *) &dummy, &len );
          if (client == -1) return;
          fcntl( client, F_SETFL, O_NONBLOCK );
@@ -258,7 +273,7 @@ index c10c4e6..86f293f 100644
              create_thread( -1, process, NULL );
              release_object( process );
 diff --git a/server/security.h b/server/security.h
-index 21e90cc..32dfe5f 100644
+index 21e90ccf2..32dfe5f8d 100644
 --- a/server/security.h
 +++ b/server/security.h
 @@ -67,6 +67,8 @@ extern const ACL *token_get_default_dacl( struct token *token );
@@ -271,10 +286,10 @@ index 21e90cc..32dfe5f 100644
  static inline const ACE_HEADER *ace_next( const ACE_HEADER *ace )
  {
 diff --git a/server/token.c b/server/token.c
-index 1184241..5db97b4 100644
+index 181219d21..858ec25d7 100644
 --- a/server/token.c
 +++ b/server/token.c
-@@ -836,6 +836,12 @@ int token_assign_label( struct token *token, PSID label )
+@@ -845,6 +845,12 @@ int token_assign_label( struct token *token, PSID label )
      return ret;
  }
  
@@ -287,7 +302,7 @@ index 1184241..5db97b4 100644
  struct token *token_create_admin( void )
  {
      struct token *token = NULL;
-@@ -1262,6 +1268,11 @@ const SID *token_get_primary_group( struct token *token )
+@@ -1271,6 +1277,11 @@ const SID *token_get_primary_group( struct token *token )
      return token->primary_group;
  }
  
@@ -300,5 +315,5 @@ index 1184241..5db97b4 100644
  {
      GENERIC_MAPPING mapping;
 -- 
-1.9.1
+2.24.0
 

patches/advapi32-Token_Integrity_Level/0014-programs-runas-Basic-implementation-for-starting-pro.patch

@@ -1,4 +1,4 @@
-From 0616176a3276be4ae49dc86c7d96b11240afca78 Mon Sep 17 00:00:00 2001
+From 5bf0baa79c46ec44dfd5e1340e96ff9289bc37f8 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sun, 6 Aug 2017 03:15:34 +0200
 Subject: [PATCH] programs/runas: Basic implementation for starting processes
@@ -7,9 +7,9 @@ Subject: [PATCH] programs/runas: Basic implementation for starting processes
 ---
  configure.ac               |   1 +
  programs/runas/Makefile.in |   8 ++
- programs/runas/runas.c     | 214 +++++++++++++++++++++++++++++++++++++++++++++
- programs/runas/runas.h     |  26 ++++++
- programs/runas/runas.rc    |  39 +++++++++
+ programs/runas/runas.c     | 214 +++++++++++++++++++++++++++++++++++++
+ programs/runas/runas.h     |  26 +++++
+ programs/runas/runas.rc    |  39 +++++++
  5 files changed, 288 insertions(+)
  create mode 100644 programs/runas/Makefile.in
  create mode 100644 programs/runas/runas.c
@@ -17,10 +17,10 @@ Subject: [PATCH] programs/runas: Basic implementation for starting processes
  create mode 100644 programs/runas/runas.rc
 
 diff --git a/configure.ac b/configure.ac
-index b9ef668..404ab7a 100644
+index 499c4f37ca..6f12614af1 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3879,6 +3879,7 @@ WINE_CONFIG_MAKEFILE(programs/regedit/tests)
+@@ -3891,6 +3891,7 @@ WINE_CONFIG_MAKEFILE(programs/regedit/tests)
  WINE_CONFIG_MAKEFILE(programs/regsvcs)
  WINE_CONFIG_MAKEFILE(programs/regsvr32)
  WINE_CONFIG_MAKEFILE(programs/rpcss)
@@ -30,12 +30,12 @@ index b9ef668..404ab7a 100644
  WINE_CONFIG_MAKEFILE(programs/sc)
 diff --git a/programs/runas/Makefile.in b/programs/runas/Makefile.in
 new file mode 100644
-index 0000000..be9434b
+index 0000000000..33aa00ab03
 --- /dev/null
 +++ b/programs/runas/Makefile.in
 @@ -0,0 +1,8 @@
 +MODULE    = runas.exe
-+APPMODE   = -mconsole -municode
++APPMODE   = -mconsole -municode -mno-cygwin
 +IMPORTS   = advapi32 user32
 +
 +C_SRCS = \
@@ -44,7 +44,7 @@ index 0000000..be9434b
 +RC_SRCS = runas.rc
 diff --git a/programs/runas/runas.c b/programs/runas/runas.c
 new file mode 100644
-index 0000000..8e96aff
+index 0000000000..412755afa0
 --- /dev/null
 +++ b/programs/runas/runas.c
 @@ -0,0 +1,214 @@
@@ -69,7 +69,7 @@ index 0000000..8e96aff
 + */
 +
 +#include <windows.h>
-+#include <wine/unicode.h>
++#include <wchar.h>
 +#include <wine/debug.h>
 +
 +#include "runas.h"
@@ -153,10 +153,10 @@ index 0000000..8e96aff
 +
 +static WCHAR *starts_with(WCHAR *str, const WCHAR *start)
 +{
-+    DWORD start_len = strlenW(start);
-+    if (strlenW(str) < start_len)
++    DWORD start_len = lstrlenW(start);
++    if (lstrlenW(str) < start_len)
 +        return NULL;
-+    if (strncmpW(str, start, start_len))
++    if (wcsncmp(str, start, start_len))
 +        return NULL;
 +    return str + start_len;
 +}
@@ -176,8 +176,8 @@ index 0000000..8e96aff
 +            WCHAR *arg;
 +
 +            if ((arg = starts_with(argv[i], trustlevelW)))
-+                cmd->trustlevel = strtoulW(arg, NULL, 0);
-+            else if (!strcmpW(argv[i], showtrustlevelsW))
++                cmd->trustlevel = wcstoul(arg, NULL, 0);
++            else if (!lstrcmpW(argv[i], showtrustlevelsW))
 +                show_trustlevels();
 +            else
 +                WINE_FIXME("Ignoring parameter %s\n", wine_dbgstr_w(argv[i]));
@@ -264,7 +264,7 @@ index 0000000..8e96aff
 +}
 diff --git a/programs/runas/runas.h b/programs/runas/runas.h
 new file mode 100644
-index 0000000..40599a3
+index 0000000000..40599a3b33
 --- /dev/null
 +++ b/programs/runas/runas.h
 @@ -0,0 +1,26 @@
@@ -296,7 +296,7 @@ index 0000000..40599a3
 +#define STRING_START_ERROR          104
 diff --git a/programs/runas/runas.rc b/programs/runas/runas.rc
 new file mode 100644
-index 0000000..f9297a4
+index 0000000000..f9297a4479
 --- /dev/null
 +++ b/programs/runas/runas.rc
 @@ -0,0 +1,39 @@
@@ -340,5 +340,5 @@ index 0000000..f9297a4
 +    %2!u!: %3\n"
 +}
 -- 
-2.7.4
+2.23.0.rc1
 

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

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

patches/api-ms-win-Stub_DLLs/0027-uiautomationcore-Add-dll-and-stub-some-functions.patch

@@ -1,15 +1,15 @@
-From 9a67b4c62e5a575a38081114d4434f274355020e Mon Sep 17 00:00:00 2001
+From 21b4b65eadc9e39008ccadc48307fcfea05a24fb Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Tue, 12 Apr 2016 01:02:34 +0200
 Subject: [PATCH] uiautomationcore: Add dll and stub some functions.
 
 ---
  dlls/uiautomationcore/Makefile.in |  1 +
- dlls/uiautomationcore/uia_main.c  | 53 ++++++++++++++++++++++++++++++++++-----
+ dlls/uiautomationcore/uia_main.c  | 53 +++++++++++++++++++++++++++----
  2 files changed, 48 insertions(+), 6 deletions(-)
 
 diff --git a/dlls/uiautomationcore/Makefile.in b/dlls/uiautomationcore/Makefile.in
-index 5221450..5173f23 100644
+index b6edec5f6a9..bf2204d5ab4 100644
 --- a/dlls/uiautomationcore/Makefile.in
 +++ b/dlls/uiautomationcore/Makefile.in
 @@ -1,5 +1,6 @@
@@ -17,10 +17,10 @@ index 5221450..5173f23 100644
  IMPORTLIB = uiautomationcore
 +IMPORTS   = uuid
  
- C_SRCS = \
- 	uia_main.c
+ EXTRADLLFLAGS = -mno-cygwin
+ 
 diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c
-index f0d8247..b9c24b4 100644
+index f0d8247724d..b9c24b4b963 100644
 --- a/dlls/uiautomationcore/uia_main.c
 +++ b/dlls/uiautomationcore/uia_main.c
 @@ -1,4 +1,5 @@
@@ -122,5 +122,5 @@ index f0d8247..b9c24b4 100644
  }
  
 -- 
-1.9.1
+2.17.1
 

patches/bcrypt-BCryptSecretAgreement/0001-bcrypt-Add-BCryptDestroySecret-BCryptSecretAgreement.patch

@@ -1,91 +0,0 @@
-From 72d00367b9863fd84d47623b6811552e155fca84 Mon Sep 17 00:00:00 2001
-From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Tue, 5 Feb 2019 10:00:26 +1100
-Subject: [PATCH] bcrypt: Add BCryptDestroySecret/BCryptSecretAgreement stubs
-
----
- dlls/bcrypt/bcrypt.spec   |  4 ++--
- dlls/bcrypt/bcrypt_main.c | 16 ++++++++++++++++
- include/bcrypt.h          |  3 +++
- 3 files changed, 21 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec
-index 052a099..dfe08e7 100644
---- a/dlls/bcrypt/bcrypt.spec
-+++ b/dlls/bcrypt/bcrypt.spec
-@@ -11,7 +11,7 @@
- @ stdcall BCryptDeriveKeyPBKDF2(ptr ptr long ptr long int64 ptr long long)
- @ stdcall BCryptDestroyHash(ptr)
- @ stdcall BCryptDestroyKey(ptr)
--@ stub BCryptDestroySecret
-+@ stdcall BCryptDestroySecret(ptr)
- @ stdcall BCryptDuplicateHash(ptr ptr ptr long long)
- @ stdcall BCryptDuplicateKey(ptr ptr ptr long long)
- @ stdcall BCryptEncrypt(ptr ptr long ptr ptr long ptr long ptr long)
-@@ -44,7 +44,7 @@
- @ stdcall BCryptRemoveContextFunction(long wstr long wstr)
- @ stdcall BCryptRemoveContextFunctionProvider(long wstr long wstr wstr)
- @ stub BCryptResolveProviders
--@ stub BCryptSecretAgreement
-+@ stdcall BCryptSecretAgreement(ptr ptr ptr long)
- @ stub BCryptSetAuditingInterface
- @ stub BCryptSetContextFunctionProperty
- @ stdcall BCryptSetProperty(ptr wstr ptr long long)
-diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
-index 80bd14b..36451c9 100644
---- a/dlls/bcrypt/bcrypt_main.c
-+++ b/dlls/bcrypt/bcrypt_main.c
-@@ -1556,6 +1556,22 @@ NTSTATUS WINAPI BCryptDeriveKeyPBKDF2( BCRYPT_ALG_HANDLE handle,
-     return STATUS_SUCCESS;
- }
- 
-+NTSTATUS WINAPI BCryptSecretAgreement(BCRYPT_KEY_HANDLE handle, BCRYPT_KEY_HANDLE key, BCRYPT_SECRET_HANDLE *secret, ULONG flags)
-+{
-+    FIXME( "%p, %p, %p, %08x\n", handle, key, secret, flags );
-+
-+    if(secret)
-+        *secret = (BCRYPT_SECRET_HANDLE *)0xDEADFEED;
-+
-+    return STATUS_SUCCESS;
-+}
-+
-+NTSTATUS WINAPI BCryptDestroySecret(BCRYPT_SECRET_HANDLE secret)
-+{
-+    FIXME( "%p\n", secret );
-+    return STATUS_SUCCESS;
-+}
-+
- BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
- {
-     switch (reason)
-diff --git a/include/bcrypt.h b/include/bcrypt.h
-index ba78c1d..866914c 100644
---- a/include/bcrypt.h
-+++ b/include/bcrypt.h
-@@ -211,6 +211,7 @@ typedef PVOID BCRYPT_ALG_HANDLE;
- typedef PVOID BCRYPT_KEY_HANDLE;
- typedef PVOID BCRYPT_HANDLE;
- typedef PVOID BCRYPT_HASH_HANDLE;
-+typedef PVOID BCRYPT_SECRET_HANDLE;
- 
- /* Flags for BCryptGenRandom */
- #define BCRYPT_RNG_USE_ENTROPY_IN_BUFFER 0x00000001
-@@ -228,6 +229,7 @@ NTSTATUS WINAPI BCryptDecrypt(BCRYPT_KEY_HANDLE, PUCHAR, ULONG, VOID *, PUCHAR,
- NTSTATUS WINAPI BCryptDeriveKeyPBKDF2(BCRYPT_ALG_HANDLE, PUCHAR, ULONG, PUCHAR, ULONG, ULONGLONG, PUCHAR, ULONG, ULONG);
- NTSTATUS WINAPI BCryptDestroyHash(BCRYPT_HASH_HANDLE);
- NTSTATUS WINAPI BCryptDestroyKey(BCRYPT_KEY_HANDLE);
-+NTSTATUS WINAPI BCryptDestroySecret(BCRYPT_SECRET_HANDLE);
- NTSTATUS WINAPI BCryptDuplicateHash(BCRYPT_HASH_HANDLE, BCRYPT_HASH_HANDLE *, UCHAR *, ULONG, ULONG);
- NTSTATUS WINAPI BCryptEncrypt(BCRYPT_KEY_HANDLE, PUCHAR, ULONG, VOID *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG *, ULONG);
- NTSTATUS WINAPI BCryptEnumAlgorithms(ULONG, ULONG *, BCRYPT_ALGORITHM_IDENTIFIER **, ULONG);
-@@ -242,6 +244,7 @@ NTSTATUS WINAPI BCryptHash(BCRYPT_ALG_HANDLE, PUCHAR, ULONG, PUCHAR, ULONG, PUCH
- NTSTATUS WINAPI BCryptHashData(BCRYPT_HASH_HANDLE, PUCHAR, ULONG, ULONG);
- NTSTATUS WINAPI BCryptImportKeyPair(BCRYPT_ALG_HANDLE, BCRYPT_KEY_HANDLE, LPCWSTR, BCRYPT_KEY_HANDLE *, UCHAR *, ULONG, ULONG);
- NTSTATUS WINAPI BCryptOpenAlgorithmProvider(BCRYPT_ALG_HANDLE *, LPCWSTR, LPCWSTR, ULONG);
-+NTSTATUS WINAPI BCryptSecretAgreement(BCRYPT_KEY_HANDLE, BCRYPT_KEY_HANDLE, BCRYPT_SECRET_HANDLE *, ULONG);
- NTSTATUS WINAPI BCryptSetProperty(BCRYPT_HANDLE, LPCWSTR, PUCHAR, ULONG, ULONG);
- NTSTATUS WINAPI BCryptVerifySignature(BCRYPT_KEY_HANDLE, void *, UCHAR *, ULONG, UCHAR *, ULONG, ULONG);
- 
--- 
-1.9.1
-

patches/bcrypt-BCryptSecretAgreement/0002-bcrypt-Add-BCryptDeriveKey-stub.patch

@@ -1,78 +0,0 @@
-From 315b52406fbddcaf9289b2a47e8498fba49f8278 Mon Sep 17 00:00:00 2001
-From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Tue, 5 Feb 2019 10:09:59 +1100
-Subject: [PATCH] bcrypt: Add BCryptDeriveKey stub
-
----
- dlls/bcrypt/bcrypt.spec   |  2 +-
- dlls/bcrypt/bcrypt_main.c |  7 +++++++
- include/bcrypt.h          | 15 +++++++++++++++
- 3 files changed, 23 insertions(+), 1 deletion(-)
-
-diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec
-index dfe08e7..4946ee5 100644
---- a/dlls/bcrypt/bcrypt.spec
-+++ b/dlls/bcrypt/bcrypt.spec
-@@ -7,7 +7,7 @@
- @ stdcall BCryptCreateHash(ptr ptr ptr long ptr long long)
- @ stdcall BCryptDecrypt(ptr ptr long ptr ptr long ptr long ptr long)
- @ stub BCryptDeleteContext
--@ stub BCryptDeriveKey
-+@ stdcall BCryptDeriveKey(ptr wstr ptr ptr long ptr long)
- @ stdcall BCryptDeriveKeyPBKDF2(ptr ptr long ptr long int64 ptr long long)
- @ stdcall BCryptDestroyHash(ptr)
- @ stdcall BCryptDestroyKey(ptr)
-diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
-index 36451c9..ca2f274 100644
---- a/dlls/bcrypt/bcrypt_main.c
-+++ b/dlls/bcrypt/bcrypt_main.c
-@@ -1572,6 +1572,13 @@ NTSTATUS WINAPI BCryptDestroySecret(BCRYPT_SECRET_HANDLE secret)
-     return STATUS_SUCCESS;
- }
- 
-+NTSTATUS WINAPI BCryptDeriveKey(BCRYPT_SECRET_HANDLE secret, LPCWSTR kdf, BCryptBufferDesc *parameter,
-+        PUCHAR derived, ULONG derived_size, ULONG *result, ULONG flags)
-+{
-+    FIXME( "%p, %s, %p, %p, %d, %p, %08x\n", secret, debugstr_w(kdf), parameter, derived, derived_size, result, flags );
-+    return STATUS_INTERNAL_ERROR;
-+}
-+
- BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
- {
-     switch (reason)
-diff --git a/include/bcrypt.h b/include/bcrypt.h
-index 866914c..a5abf23 100644
---- a/include/bcrypt.h
-+++ b/include/bcrypt.h
-@@ -204,6 +204,20 @@ typedef struct _BCRYPT_KEY_DATA_BLOB_HEADER
-     ULONG cbKeyData;
- } BCRYPT_KEY_DATA_BLOB_HEADER, *PBCRYPT_KEY_DATA_BLOB_HEADER;
- 
-+typedef struct _BCryptBuffer
-+{
-+    ULONG cbBuffer;
-+    ULONG BufferType;
-+    void  *pvBuffer;
-+} BCryptBuffer, *PBCryptBuffer;
-+
-+typedef struct _BCryptBufferDesc
-+{
-+    ULONG ulVersion;
-+    ULONG cBuffers;
-+    PBCryptBuffer pBuffers;
-+} BCryptBufferDesc, *PBCryptBufferDesc;
-+
- #define BCRYPT_KEY_DATA_BLOB_MAGIC    0x4d42444b
- #define BCRYPT_KEY_DATA_BLOB_VERSION1 1
- 
-@@ -226,6 +240,7 @@ typedef PVOID BCRYPT_SECRET_HANDLE;
- NTSTATUS WINAPI BCryptCloseAlgorithmProvider(BCRYPT_ALG_HANDLE, ULONG);
- NTSTATUS WINAPI BCryptCreateHash(BCRYPT_ALG_HANDLE, BCRYPT_HASH_HANDLE *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG);
- NTSTATUS WINAPI BCryptDecrypt(BCRYPT_KEY_HANDLE, PUCHAR, ULONG, VOID *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG *, ULONG);
-+NTSTATUS WINAPI BCryptDeriveKey(BCRYPT_SECRET_HANDLE, LPCWSTR, BCryptBufferDesc*, PUCHAR, ULONG, ULONG *, ULONG);
- NTSTATUS WINAPI BCryptDeriveKeyPBKDF2(BCRYPT_ALG_HANDLE, PUCHAR, ULONG, PUCHAR, ULONG, ULONGLONG, PUCHAR, ULONG, ULONG);
- NTSTATUS WINAPI BCryptDestroyHash(BCRYPT_HASH_HANDLE);
- NTSTATUS WINAPI BCryptDestroyKey(BCRYPT_KEY_HANDLE);
--- 
-1.9.1
-

patches/bcrypt-BCryptSecretAgreement/definition

@@ -1 +0,0 @@
-Fixes: [46564] Add BCryptDestroySecret/BCryptSecretAgreement stubs.