Release v5.0-rc5

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48433

CONTRIBUTING.md

@@ -1,30 +0,0 @@
-Contributing to Wine Staging
-----------------------------
-
-First of all, thank you for taking the time to contribute to this project.
-
-### Reporting bugs
-
-Since WineConf 2015 Wine Staging is an official part of WineHQ, which means you
-can report problems directly at [bugs.winehq.org](https://bugs.winehq.org/).
-Most of the time bugs found in Wine Staging also turn out to be present in the
-development branch, so its recommended to open your bug in the "Wine" product,
-unless you are sure its really "Wine Staging" specific. For bugs related to our
-binary packages, please open a bug report in the "Packaging" product.
-
-### Submitting patches
-
-**IMPORTANT:** Please use [dev.wine-staging.com](https://dev.wine-staging.com/patches)
-for patch submissions, we currently do not accept Pull requests on GitHub.
-
-Wine Staging mainly concentrates on experimental features and patches which are
-difficult to get into the development branch. If you have a very simple bug fix
-including tests, there is usually no need to send it to Wine Staging. You can
-directly contribute it to the
-[development branch](http://wiki.winehq.org/SubmittingPatches). However, if you
-already tried that without success, or are working on such a complex area that
-you do not really think its ready for inclusion, you might want to submit it to
-our Staging tree. Please open a patch submission request on
-[dev.wine-staging.com](https://dev.wine-staging.com/patches) including the patch.
-More information is also available in our
-[Wiki](https://wiki.winehq.org/Wine-Staging_Patches).

LICENSE.md

@@ -8,7 +8,8 @@ are part of **Wine Staging** and are licensed under the terms of the
 
 ```
 Copyright (C) 2014-2017 the Wine Staging project authors.
-Copyright (C) 2018 Alistair Leslie-Hughes
+Copyright (C) 2018 Alistair Leslie-Hughes, Zebediah Figura
+Copyright (C) 2019-2020 Alistair Leslie-Hughes, Zebediah Figura, Paul Gofman
 
 Wine Staging is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public

README.md

@@ -6,15 +6,14 @@ features, which have not been integrated into the development branch yet. The
 idea of Wine Staging is to provide experimental features faster to end users and
 to give developers the possibility to discuss and improve their patches before
 they are integrated into the main branch. More information about Wine Staging
-can also be found on our website [wine-staging.com](http://wine-staging.com).
+can also be found [on the WineHQ wiki](https://wiki.winehq.org/Wine-Staging).
 
 Installation
 ------------
 
 Ready-to-use packages for Wine Staging are available for a variety of Linux
-distributions and for Mac OS X. Just follow the
-[installation instructions](https://wine-staging.com/installation.html)
-for your operating system.
+distributions and for Mac OS X. Just follow the [installation
+instructions](https://wiki.winehq.org/Download) for your operating system.
 
 On most distributions the `wine-staging` package is installed to
 `/opt/wine-staging`, such that multiple Wine versions can be installed in
@@ -78,5 +77,6 @@ in our [Wiki](https://wiki.winehq.org/Wine-Staging).
 Contributing
 ------------
 
-Please see CONTRIBUTING.md for more information about contributing to Wine
-Staging.
+For information on contributing to Wine-Staging, please see
+<https://wiki.winehq.org/Wine-Staging_Contributing>. Note that GitHub pull
+requests are strongly dispreferred, especially for patches.

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/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/activeds-ADsOpenObject/0001-include-Add-adserr.h.patch

@@ -0,0 +1,83 @@
+From e5500b9a3c7d36563725dc7975c2436a02165906 Mon Sep 17 00:00:00 2001
+From: Dmitry Timoshkov <dmitry@baikal.ru>
+Date: Fri, 15 Nov 2019 15:46:23 +0800
+Subject: [PATCH] include: Add adserr.h.
+
+Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru>
+---
+ include/Makefile.in |  1 +
+ include/adserr.h    | 50 +++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 51 insertions(+)
+ create mode 100644 include/adserr.h
+
+diff --git a/include/Makefile.in b/include/Makefile.in
+index cbad4d604f..2e0a10d650 100644
+--- a/include/Makefile.in
++++ b/include/Makefile.in
+@@ -7,6 +7,7 @@ SOURCES = \
+ 	activaut.idl \
+ 	activdbg.idl \
+ 	activscp.idl \
++	adserr.h \
+ 	adshlp.h \
+ 	advpub.h \
+ 	af_irda.h \
+diff --git a/include/adserr.h b/include/adserr.h
+new file mode 100644
+index 0000000000..83da568763
+--- /dev/null
++++ b/include/adserr.h
+@@ -0,0 +1,50 @@
++/*
++ * Copyright (C) 2019 Dmitry Timoshkov
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
++ */
++
++#ifndef __ADSERR_H
++#define __ADSERR_H
++
++#ifdef RC_INVOKED
++#define _HRESULT_TYPEDEF_(x) (x)
++#else
++#define _HRESULT_TYPEDEF_(x) ((HRESULT)x)
++#endif
++
++#define E_ADS_BAD_PATHNAME                                 _HRESULT_TYPEDEF_(0x80005000)
++#define E_ADS_INVALID_DOMAIN_OBJECT                        _HRESULT_TYPEDEF_(0x80005001)
++#define E_ADS_INVALID_USER_OBJECT                          _HRESULT_TYPEDEF_(0x80005002)
++#define E_ADS_INVALID_COMPUTER_OBJECT                      _HRESULT_TYPEDEF_(0x80005003)
++#define E_ADS_UNKNOWN_OBJECT                               _HRESULT_TYPEDEF_(0x80005004)
++#define E_ADS_PROPERTY_NOT_SET                             _HRESULT_TYPEDEF_(0x80005005)
++#define E_ADS_PROPERTY_NOT_SUPPORTED                       _HRESULT_TYPEDEF_(0x80005006)
++#define E_ADS_PROPERTY_INVALID                             _HRESULT_TYPEDEF_(0x80005007)
++#define E_ADS_BAD_PARAMETER                                _HRESULT_TYPEDEF_(0x80005008)
++#define E_ADS_OBJECT_UNBOUND                               _HRESULT_TYPEDEF_(0x80005009)
++#define E_ADS_PROPERTY_NOT_MODIFIED                        _HRESULT_TYPEDEF_(0x8000500A)
++#define E_ADS_PROPERTY_MODIFIED                            _HRESULT_TYPEDEF_(0x8000500B)
++#define E_ADS_CANT_CONVERT_DATATYPE                        _HRESULT_TYPEDEF_(0x8000500C)
++#define E_ADS_PROPERTY_NOT_FOUND                           _HRESULT_TYPEDEF_(0x8000500D)
++#define E_ADS_OBJECT_EXISTS                                _HRESULT_TYPEDEF_(0x8000500E)
++#define E_ADS_SCHEMA_VIOLATION                             _HRESULT_TYPEDEF_(0x8000500F)
++#define E_ADS_COLUMN_NOT_SET                               _HRESULT_TYPEDEF_(0x80005010)
++#define S_ADS_ERRORSOCCURRED                               _HRESULT_TYPEDEF_(0x00005011)
++#define S_ADS_NOMORE_ROWS                                  _HRESULT_TYPEDEF_(0x00005012)
++#define S_ADS_NOMORE_COLUMNS                               _HRESULT_TYPEDEF_(0x00005013)
++#define E_ADS_INVALID_FILTER                               _HRESULT_TYPEDEF_(0x80005014)
++
++#endif /* __ADSERR_H */
+-- 
+2.17.1
+

patches/activeds-ADsOpenObject/0002-activeds-Implement-ADsOpenObject.patch

@@ -0,0 +1,161 @@
+From c12e335b0df736fe2a2f2447d0d751de7cc21d37 Mon Sep 17 00:00:00 2001
+From: Dmitry Timoshkov <dmitry@baikal.ru>
+Date: Fri, 15 Nov 2019 17:37:11 +0800
+Subject: [PATCH 2/5] activeds: Implement ADsOpenObject.
+Content-Type: text/plain; charset=UTF-8
+To: wine-devel@winehq.org
+
+Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru>
+---
+ dlls/activeds/Makefile.in     |  1 +
+ dlls/activeds/activeds_main.c | 80 +++++++++++++++++++++++++++++++++--
+ include/iads.idl              | 14 ++++++
+ 3 files changed, 91 insertions(+), 4 deletions(-)
+
+diff --git a/dlls/activeds/Makefile.in b/dlls/activeds/Makefile.in
+index 20578a93bc..54f86d661e 100644
+--- a/dlls/activeds/Makefile.in
++++ b/dlls/activeds/Makefile.in
+@@ -1,5 +1,6 @@
+ MODULE    = activeds.dll
+ IMPORTLIB = activeds
++IMPORTS   = advapi32 ole32 oleaut32
+ 
+ EXTRADLLFLAGS = -mno-cygwin
+ 
+diff --git a/dlls/activeds/activeds_main.c b/dlls/activeds/activeds_main.c
+index 69c5c447dc..8ff587e332 100644
+--- a/dlls/activeds/activeds_main.c
++++ b/dlls/activeds/activeds_main.c
+@@ -2,6 +2,7 @@
+  * Implementation of the Active Directory Service Interface
+  *
+  * Copyright 2005 Detlef Riekenberg
++ * Copyright 2019 Dmitry Timoshkov
+  *
+  * This file contains only stubs to get the printui.dll up and running
+  * activeds.dll is much much more than this
+@@ -30,8 +31,10 @@
+ #include "winuser.h"
+ 
+ #include "objbase.h"
++#include "initguid.h"
+ #include "iads.h"
+ #include "adshlp.h"
++#include "adserr.h"
+ 
+ #include "wine/debug.h"
+ 
+@@ -112,11 +115,80 @@ HRESULT WINAPI ADsBuildVarArrayInt(LPDWORD lpdwObjectTypes, DWORD dwObjectTypes,
+ /*****************************************************
+  * ADsOpenObject     [ACTIVEDS.9]
+  */
+-HRESULT WINAPI ADsOpenObject(LPCWSTR lpszPathName, LPCWSTR lpszUserName, LPCWSTR lpszPassword, DWORD dwReserved, REFIID riid, VOID** ppObject)
++HRESULT WINAPI ADsOpenObject(LPCWSTR path, LPCWSTR user, LPCWSTR password, DWORD reserved, REFIID riid, void **obj)
+ {
+-    FIXME("(%s,%s,%u,%s,%p)!stub\n", debugstr_w(lpszPathName),
+-          debugstr_w(lpszUserName), dwReserved, debugstr_guid(riid), ppObject);
+-    return E_NOTIMPL;
++    HRESULT hr;
++    HKEY hkey, hprov;
++    WCHAR provider[MAX_PATH], progid[MAX_PATH];
++    DWORD idx = 0;
++
++    TRACE("(%s,%s,%u,%s,%p)\n", debugstr_w(path), debugstr_w(user), reserved, debugstr_guid(riid), obj);
++
++    if (!path || !riid || !obj)
++        return E_INVALIDARG;
++
++    if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\ADs\\Providers", 0, KEY_READ, &hkey))
++        return E_ADS_BAD_PATHNAME;
++
++    hr = E_ADS_BAD_PATHNAME;
++
++    for (;;)
++    {
++        if (RegEnumKeyW(hkey, idx++, provider, ARRAY_SIZE(provider)))
++            break;
++
++        TRACE("provider %s\n", debugstr_w(provider));
++
++        if (!wcsnicmp(path, provider, wcslen(provider)) && path[wcslen(provider)] == ':')
++        {
++            LONG size;
++
++            if (RegOpenKeyExW(hkey, provider, 0, KEY_READ, &hprov))
++                break;
++
++            size = ARRAY_SIZE(progid);
++            if (!RegQueryValueW(hprov, NULL, progid, &size))
++            {
++                CLSID clsid;
++
++                if (CLSIDFromProgID(progid, &clsid) == S_OK)
++                {
++                    IADsOpenDSObject *adsopen;
++                    IDispatch *disp;
++
++                    TRACE("ns %s => clsid %s\n", debugstr_w(progid), wine_dbgstr_guid(&clsid));
++                    if (CoCreateInstance(&clsid, 0, CLSCTX_INPROC_SERVER, &IID_IADsOpenDSObject, (void **)&adsopen) == S_OK)
++                    {
++                        BSTR bpath, buser, bpassword;
++
++                        bpath = SysAllocString(path);
++                        buser = SysAllocString(user);
++                        bpassword = SysAllocString(password);
++
++                        hr = IADsOpenDSObject_OpenDSObject(adsopen, bpath, buser, bpassword, reserved, &disp);
++                        if (hr == S_OK)
++                        {
++                            hr = IDispatch_QueryInterface(disp, riid, obj);
++                            IDispatch_Release(disp);
++                        }
++
++                        SysFreeString(bpath);
++                        SysFreeString(buser);
++                        SysFreeString(bpassword);
++
++                        IADsOpenDSObject_Release(adsopen);
++                    }
++                }
++            }
++
++            RegCloseKey(hprov);
++            break;
++        }
++    }
++
++    RegCloseKey(hkey);
++
++    return hr;
+ }
+ 
+ /*****************************************************
+diff --git a/include/iads.idl b/include/iads.idl
+index 6931b6f734..add52571c7 100644
+--- a/include/iads.idl
++++ b/include/iads.idl
+@@ -794,6 +794,20 @@ interface IDirectorySearch : IUnknown
+     HRESULT CloseSearchHandle([in] ADS_SEARCH_HANDLE hSearchResult);
+ }
+ 
++/*****************************************************************************
++ *    IID_IADsOpenDSObject interface
++ */
++[
++    odl,
++    uuid(ddf2891e-0f9c-11d0-8ad4-00c04fd8d503),
++    dual,
++    oleautomation
++]
++interface IADsOpenDSObject : IDispatch
++{
++    HRESULT OpenDSObject([in] BSTR path, [in] BSTR user, [in] BSTR password, [in] long reserved, [out,retval] IDispatch **obj);
++}
++
+ /*****************************************************************************
+  *    IADsADSystemInfo interface
+  */
+-- 
+2.20.1
+

patches/activeds-ADsOpenObject/0003-adsldp-Add-LDAPNamespace-stubs.patch

@@ -0,0 +1,483 @@
+From ba1eb1310db57db3820a3886e374afc507c2b507 Mon Sep 17 00:00:00 2001
+From: Dmitry Timoshkov <dmitry@baikal.ru>
+Date: Tue, 19 Nov 2019 11:34:13 +0800
+Subject: [PATCH 3/5] adsldp: Add LDAPNamespace stubs.
+Content-Type: text/plain; charset=UTF-8
+To: wine-devel@winehq.org
+
+Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru>
+---
+ dlls/adsldp/Makefile.in |   5 +-
+ dlls/adsldp/adsldp.c    | 295 ++++++++++++++++++++++++++++++++++++----
+ dlls/adsldp/adsldp.idl  |   9 ++
+ dlls/adsldp/adsldp.rgs  |  16 +++
+ dlls/adsldp/rsrc.rc     |  20 +++
+ 5 files changed, 319 insertions(+), 26 deletions(-)
+ create mode 100644 dlls/adsldp/adsldp.rgs
+ create mode 100644 dlls/adsldp/rsrc.rc
+
+diff --git a/dlls/adsldp/Makefile.in b/dlls/adsldp/Makefile.in
+index 4dce14fd0d..7bf07fce2c 100644
+--- a/dlls/adsldp/Makefile.in
++++ b/dlls/adsldp/Makefile.in
+@@ -1,10 +1,13 @@
+ MODULE    = adsldp.dll
+-IMPORTS   = oleaut32 secur32
++IMPORTS   = oleaut32 secur32 rpcrt4
+ 
+ EXTRADLLFLAGS = -mno-cygwin
++dlldata_EXTRADEFS = -DENTRY_PREFIX=ADSLDP_
+ 
+ C_SRCS = \
+ 	adsldp.c
+ 
+ IDL_SRCS = \
+ 	adsldp.idl
++
++RC_SRCS = rsrc.rc
+diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c
+index 4fc0de41eb..ef62aad279 100644
+--- a/dlls/adsldp/adsldp.c
++++ b/dlls/adsldp/adsldp.c
+@@ -31,10 +31,15 @@
+ #define SECURITY_WIN32
+ #include "security.h"
+ 
++#include "wine/heap.h"
+ #include "wine/debug.h"
+ 
+ WINE_DEFAULT_DEBUG_CHANNEL(adsldp);
+ 
++DEFINE_GUID(CLSID_LDAPNamespace,0x228d9a82,0xc302,0x11cf,0x9a,0xa4,0x00,0xaa,0x00,0x4a,0x56,0x91);
++
++extern HRESULT WINAPI ADSLDP_DllGetClassObject(REFCLSID,REFIID,void **) DECLSPEC_HIDDEN;
++
+ static HMODULE adsldp_hinst;
+ 
+ typedef struct
+@@ -235,31 +240,239 @@ static const IADsADSystemInfoVtbl IADsADSystemInfo_vtbl =
+     sysinfo_GetTrees
+ };
+ 
+-static HRESULT ADSystemInfo_create(void **obj)
++static HRESULT ADSystemInfo_create(REFIID riid, void **obj)
+ {
+     AD_sysinfo *sysinfo;
++    HRESULT hr;
+ 
+     sysinfo = HeapAlloc(GetProcessHeap(), 0, sizeof(*sysinfo));
+     if (!sysinfo) return E_OUTOFMEMORY;
+ 
+     sysinfo->IADsADSystemInfo_iface.lpVtbl = &IADsADSystemInfo_vtbl;
+     sysinfo->ref = 1;
+-    *obj = &sysinfo->IADsADSystemInfo_iface;
+ 
+-    TRACE("created %p\n", *obj);
++    hr = IADsADSystemInfo_QueryInterface(&sysinfo->IADsADSystemInfo_iface, riid, obj);
++    IADsADSystemInfo_Release(&sysinfo->IADsADSystemInfo_iface);
+ 
+-    return S_OK;
++    return hr;
+ }
+ 
++typedef struct
++{
++    IADs IADs_iface;
++    LONG ref;
++} LDAP_namespace;
++
++static inline LDAP_namespace *impl_from_IADs(IADs *iface)
++{
++    return CONTAINING_RECORD(iface, LDAP_namespace, IADs_iface);
++}
++
++static HRESULT WINAPI ldapns_QueryInterface(IADs *iface, REFIID riid, void **obj)
++{
++    TRACE("%p,%s,%p\n", iface, debugstr_guid(riid), obj);
++
++    if (!riid || !obj) return E_INVALIDARG;
++
++    if (IsEqualGUID(riid, &IID_IUnknown) ||
++        IsEqualGUID(riid, &IID_IDispatch) ||
++        IsEqualGUID(riid, &IID_IADs))
++    {
++        IADs_AddRef(iface);
++        *obj = iface;
++        return S_OK;
++    }
++
++    FIXME("interface %s is not implemented\n", debugstr_guid(riid));
++    return E_NOINTERFACE;
++}
++
++static ULONG WINAPI ldapns_AddRef(IADs *iface)
++{
++    LDAP_namespace *ldap = impl_from_IADs(iface);
++    return InterlockedIncrement(&ldap->ref);
++}
++
++static ULONG WINAPI ldapns_Release(IADs *iface)
++{
++    LDAP_namespace *ldap = impl_from_IADs(iface);
++    LONG ref = InterlockedDecrement(&ldap->ref);
++
++    if (!ref)
++    {
++        TRACE("destroying %p\n", iface);
++        HeapFree(GetProcessHeap(), 0, ldap);
++    }
++
++    return ref;
++}
++
++static HRESULT WINAPI ldapns_GetTypeInfoCount(IADs *iface, UINT *count)
++{
++    FIXME("%p,%p: stub\n", iface, count);
++    return E_NOTIMPL;
++}
++
++static HRESULT WINAPI ldapns_GetTypeInfo(IADs *iface, UINT index, LCID lcid, ITypeInfo **info)
++{
++    FIXME("%p,%u,%#x,%p: stub\n", iface, index, lcid, info);
++    return E_NOTIMPL;
++}
++
++static HRESULT WINAPI ldapns_GetIDsOfNames(IADs *iface, REFIID riid, LPOLESTR *names,
++                                           UINT count, LCID lcid, DISPID *dispid)
++{
++    FIXME("%p,%s,%p,%u,%u,%p: stub\n", iface, debugstr_guid(riid), names, count, lcid, dispid);
++    return E_NOTIMPL;
++}
++
++static HRESULT WINAPI ldapns_Invoke(IADs *iface, DISPID dispid, REFIID riid, LCID lcid, WORD flags,
++                                    DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *argerr)
++{
++    FIXME("%p,%d,%s,%04x,%04x,%p,%p,%p,%p: stub\n", iface, dispid, debugstr_guid(riid), lcid, flags,
++          params, result, excepinfo, argerr);
++    return E_NOTIMPL;
++}
++
++static HRESULT WINAPI ldapns_get_Name(IADs *iface, BSTR *retval)
++{
++    FIXME("%p,%p: stub\n", iface, retval);
++    return E_NOTIMPL;
++}
++
++static HRESULT WINAPI ldapns_get_Class(IADs *iface, BSTR *retval)
++{
++    FIXME("%p,%p: stub\n", iface, retval);
++    return E_NOTIMPL;
++}
++
++static HRESULT WINAPI ldapns_get_GUID(IADs *iface, BSTR *retval)
++{
++    FIXME("%p,%p: stub\n", iface, retval);
++    return E_NOTIMPL;
++}
++
++static HRESULT WINAPI ldapns_get_ADsPath(IADs *iface, BSTR *retval)
++{
++    FIXME("%p,%p: stub\n", iface, retval);
++    return E_NOTIMPL;
++}
++
++static HRESULT WINAPI ldapns_get_Parent(IADs *iface, BSTR *retval)
++{
++    FIXME("%p,%p: stub\n", iface, retval);
++    return E_NOTIMPL;
++}
++
++static HRESULT WINAPI ldapns_get_Schema(IADs *iface, BSTR *retval)
++{
++    FIXME("%p,%p: stub\n", iface, retval);
++    return E_NOTIMPL;
++}
++
++static HRESULT WINAPI ldapns_GetInfo(IADs *iface)
++{
++    FIXME("%p: stub\n", iface);
++    return E_NOTIMPL;
++}
++
++static HRESULT WINAPI ldapns_SetInfo(IADs *iface)
++{
++    FIXME("%p: stub\n", iface);
++    return E_NOTIMPL;
++}
++
++static HRESULT WINAPI ldapns_Get(IADs *iface, BSTR name, VARIANT *prop)
++{
++    FIXME("%p,%s,%p: stub\n", iface, debugstr_w(name), prop);
++    return E_NOTIMPL;
++}
++
++static HRESULT WINAPI ldapns_Put(IADs *iface, BSTR name, VARIANT prop)
++{
++    FIXME("%p,%s,%s: stub\n", iface, debugstr_w(name), wine_dbgstr_variant(&prop));
++    return E_NOTIMPL;
++}
++
++static HRESULT WINAPI ldapns_GetEx(IADs *iface, BSTR name, VARIANT *prop)
++{
++    FIXME("%p,%s,%p: stub\n", iface, debugstr_w(name), prop);
++    return E_NOTIMPL;
++}
++
++static HRESULT WINAPI ldapns_PutEx(IADs *iface, LONG code, BSTR name, VARIANT prop)
++{
++    FIXME("%p,%d,%s,%s: stub\n", iface, code, debugstr_w(name), wine_dbgstr_variant(&prop));
++    return E_NOTIMPL;
++}
++
++static HRESULT WINAPI ldapns_GetInfoEx(IADs *iface, VARIANT prop, LONG reserved)
++{
++    FIXME("%p,%s,%d: stub\n", iface, wine_dbgstr_variant(&prop), reserved);
++    return E_NOTIMPL;
++}
++
++static const IADsVtbl IADs_vtbl =
++{
++    ldapns_QueryInterface,
++    ldapns_AddRef,
++    ldapns_Release,
++    ldapns_GetTypeInfoCount,
++    ldapns_GetTypeInfo,
++    ldapns_GetIDsOfNames,
++    ldapns_Invoke,
++    ldapns_get_Name,
++    ldapns_get_Class,
++    ldapns_get_GUID,
++    ldapns_get_ADsPath,
++    ldapns_get_Parent,
++    ldapns_get_Schema,
++    ldapns_GetInfo,
++    ldapns_SetInfo,
++    ldapns_Get,
++    ldapns_Put,
++    ldapns_GetEx,
++    ldapns_PutEx,
++    ldapns_GetInfoEx
++};
++
++static HRESULT LDAPNamespace_create(REFIID riid, void **obj)
++{
++    LDAP_namespace *ldap;
++    HRESULT hr;
++
++    ldap = heap_alloc(sizeof(*ldap));
++    if (!ldap) return E_OUTOFMEMORY;
++
++    ldap->IADs_iface.lpVtbl = &IADs_vtbl;
++    ldap->ref = 1;
++
++    hr = IADs_QueryInterface(&ldap->IADs_iface, riid, obj);
++    IADs_Release(&ldap->IADs_iface);
++
++    return hr;
++}
++
++static const struct class_info
++{
++    const CLSID *clsid;
++    HRESULT (*constructor)(REFIID, void **);
++} class_info[] =
++{
++    { &CLSID_ADSystemInfo, ADSystemInfo_create },
++    { &CLSID_LDAPNamespace, LDAPNamespace_create },
++};
++
+ typedef struct
+ {
+     IClassFactory IClassFactory_iface;
+-    HRESULT (*constructor)(void **);
+-} ADSystemInfo_factory;
++    LONG ref;
++    const struct class_info *info;
++} class_factory;
+ 
+-static inline ADSystemInfo_factory *impl_from_IClassFactory(IClassFactory *iface)
++static inline class_factory *impl_from_IClassFactory(IClassFactory *iface)
+ {
+-    return CONTAINING_RECORD(iface, ADSystemInfo_factory, IClassFactory_iface);
++    return CONTAINING_RECORD(iface, class_factory, IClassFactory_iface);
+ }
+ 
+ static HRESULT WINAPI factory_QueryInterface(IClassFactory *iface, REFIID riid, LPVOID *obj)
+@@ -283,19 +496,30 @@ static HRESULT WINAPI factory_QueryInterface(IClassFactory *iface, REFIID riid,
+ 
+ static ULONG WINAPI factory_AddRef(IClassFactory *iface)
+ {
+-    return 2;
++    class_factory *factory = impl_from_IClassFactory(iface);
++    ULONG ref = InterlockedIncrement(&factory->ref);
++
++    TRACE("(%p) ref %u\n", iface, ref);
++
++    return ref;
+ }
+ 
+ static ULONG WINAPI factory_Release(IClassFactory *iface)
+ {
+-    return 1;
++    class_factory *factory = impl_from_IClassFactory(iface);
++    ULONG ref = InterlockedDecrement(&factory->ref);
++
++    TRACE("(%p) ref %u\n", iface, ref);
++
++    if (!ref)
++        heap_free(factory);
++
++    return ref;
+ }
+ 
+ static HRESULT WINAPI factory_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **obj)
+ {
+-    ADSystemInfo_factory *factory = impl_from_IClassFactory(iface);
+-    IUnknown *unknown;
+-    HRESULT hr;
++    class_factory *factory = impl_from_IClassFactory(iface);
+ 
+     TRACE("%p,%s,%p\n", outer, debugstr_guid(riid), obj);
+ 
+@@ -304,13 +528,7 @@ static HRESULT WINAPI factory_CreateInstance(IClassFactory *iface, IUnknown *out
+     *obj = NULL;
+     if (outer) return CLASS_E_NOAGGREGATION;
+ 
+-    hr = factory->constructor((void **)&unknown);
+-    if (hr == S_OK)
+-    {
+-        hr = IUnknown_QueryInterface(unknown, riid, obj);
+-        IUnknown_Release(unknown);
+-    }
+-    return hr;
++    return factory->info->constructor(riid, obj);
+ }
+ 
+ static HRESULT WINAPI factory_LockServer(IClassFactory *iface, BOOL lock)
+@@ -328,21 +546,48 @@ static const struct IClassFactoryVtbl factory_vtbl =
+     factory_LockServer
+ };
+ 
+-static ADSystemInfo_factory ADSystemInfo_cf = { { &factory_vtbl }, ADSystemInfo_create };
++static HRESULT factory_constructor(const struct class_info *info, REFIID riid, void **obj)
++{
++    class_factory *factory;
++    HRESULT hr;
++
++    factory = heap_alloc(sizeof(*factory));
++    if (!factory) return E_OUTOFMEMORY;
++
++    factory->IClassFactory_iface.lpVtbl = &factory_vtbl;
++    factory->ref = 1;
++    factory->info = info;
++
++    hr = IClassFactory_QueryInterface(&factory->IClassFactory_iface, riid, obj);
++    IClassFactory_Release(&factory->IClassFactory_iface);
++
++    return hr;
++}
+ 
+ HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, LPVOID *obj)
+ {
++    const struct class_info *info = NULL;
++    int i;
++
+     TRACE("%s,%s,%p\n", debugstr_guid(clsid), debugstr_guid(iid), obj);
+ 
+     if (!clsid || !iid || !obj) return E_INVALIDARG;
+ 
+     *obj = NULL;
+ 
+-    if (IsEqualGUID(clsid, &CLSID_ADSystemInfo))
+-        return IClassFactory_QueryInterface(&ADSystemInfo_cf.IClassFactory_iface, iid, obj);
++    for (i = 0; i < ARRAY_SIZE(class_info); i++)
++    {
++        if (IsEqualCLSID(class_info[i].clsid, clsid))
++        {
++            info = &class_info[i];
++            break;
++        }
++    }
++
++    if (info)
++        return factory_constructor(info, iid, obj);
+ 
+-    FIXME("class %s/%s is not implemented\n", debugstr_guid(clsid), debugstr_guid(iid));
+-    return CLASS_E_CLASSNOTAVAILABLE;
++    return ADSLDP_DllGetClassObject(clsid, iid, obj);
+ }
+ 
+ HRESULT WINAPI DllCanUnloadNow(void)
+diff --git a/dlls/adsldp/adsldp.idl b/dlls/adsldp/adsldp.idl
+index c2f7504d0c..634aa36327 100644
+--- a/dlls/adsldp/adsldp.idl
++++ b/dlls/adsldp/adsldp.idl
+@@ -18,8 +18,17 @@
+  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+  */
+ 
++#pragma makedep proxy
+ #pragma makedep register
+ 
++[
++    helpstring("LDAP Namespace Object"),
++    progid("LDAPNamespace"),
++    uuid(228d9a82-c302-11cf-9aa4-00aa004a5691),
++    threading(both)
++]
++coclass ADs { }
++
+ [
+     helpstring("AD System Info Object"),
+     uuid(50b6327f-afd1-11d2-9cb9-0000f87a369e),
+diff --git a/dlls/adsldp/adsldp.rgs b/dlls/adsldp/adsldp.rgs
+new file mode 100644
+index 0000000000..0da0946832
+--- /dev/null
++++ b/dlls/adsldp/adsldp.rgs
+@@ -0,0 +1,16 @@
++HKLM
++{
++    NoRemove Software
++    {
++        NoRemove Microsoft
++        {
++            NoRemove ADs
++            {
++                NoRemove Providers
++                {
++                    ForceRemove 'LDAP' = s 'LDAPNamespace'
++                }
++            }
++        }
++    }
++}
+diff --git a/dlls/adsldp/rsrc.rc b/dlls/adsldp/rsrc.rc
+new file mode 100644
+index 0000000000..914fe0b2f3
+--- /dev/null
++++ b/dlls/adsldp/rsrc.rc
+@@ -0,0 +1,20 @@
++/*
++ * Copyright 2019 Dmitry Timoshkov
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
++ */
++
++/* @makedep: adsldp.rgs */
++1 WINE_REGISTRY adsldp.rgs
+-- 
+2.20.1
+

patches/activeds-ADsOpenObject/0004-adsldp-Add-IADsOpenDSObject-stubs.patch

@@ -0,0 +1,156 @@
+From 73b97a7095f833e5323117c1acbb8a64c5e3afcb Mon Sep 17 00:00:00 2001
+From: Dmitry Timoshkov <dmitry@baikal.ru>
+Date: Tue, 19 Nov 2019 11:46:50 +0800
+Subject: [PATCH 4/5] adsldp: Add IADsOpenDSObject stubs.
+Content-Type: text/plain; charset=UTF-8
+To: wine-devel@winehq.org
+
+Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru>
+---
+ dlls/adsldp/adsldp.c | 102 +++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 102 insertions(+)
+
+diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c
+index ef62aad279..bdce30c143 100644
+--- a/dlls/adsldp/adsldp.c
++++ b/dlls/adsldp/adsldp.c
+@@ -260,6 +260,7 @@ static HRESULT ADSystemInfo_create(REFIID riid, void **obj)
+ typedef struct
+ {
+     IADs IADs_iface;
++    IADsOpenDSObject IADsOpenDSObject_iface;
+     LONG ref;
+ } LDAP_namespace;
+ 
+@@ -270,6 +271,8 @@ static inline LDAP_namespace *impl_from_IADs(IADs *iface)
+ 
+ static HRESULT WINAPI ldapns_QueryInterface(IADs *iface, REFIID riid, void **obj)
+ {
++    LDAP_namespace *ldap = impl_from_IADs(iface);
++
+     TRACE("%p,%s,%p\n", iface, debugstr_guid(riid), obj);
+ 
+     if (!riid || !obj) return E_INVALIDARG;
+@@ -283,6 +286,13 @@ static HRESULT WINAPI ldapns_QueryInterface(IADs *iface, REFIID riid, void **obj
+         return S_OK;
+     }
+ 
++    if (IsEqualGUID(riid, &IID_IADsOpenDSObject))
++    {
++        IADs_AddRef(iface);
++        *obj = &ldap->IADsOpenDSObject_iface;
++        return S_OK;
++    }
++
+     FIXME("interface %s is not implemented\n", debugstr_guid(riid));
+     return E_NOINTERFACE;
+ }
+@@ -436,6 +446,97 @@ static const IADsVtbl IADs_vtbl =
+     ldapns_GetInfoEx
+ };
+ 
++static inline LDAP_namespace *impl_from_IADsOpenDSObject(IADsOpenDSObject *iface)
++{
++    return CONTAINING_RECORD(iface, LDAP_namespace, IADsOpenDSObject_iface);
++}
++
++static HRESULT WINAPI openobj_QueryInterface(IADsOpenDSObject *iface, REFIID riid, void **obj)
++{
++    TRACE("%p,%s,%p\n", iface, debugstr_guid(riid), obj);
++
++    if (!riid || !obj) return E_INVALIDARG;
++
++    if (IsEqualGUID(riid, &IID_IADsOpenDSObject) ||
++        IsEqualGUID(riid, &IID_IDispatch) ||
++        IsEqualGUID(riid, &IID_IUnknown))
++    {
++        IADsOpenDSObject_AddRef(iface);
++        *obj = iface;
++        return S_OK;
++    }
++
++    FIXME("interface %s is not implemented\n", debugstr_guid(riid));
++    return E_NOINTERFACE;
++}
++
++static ULONG WINAPI openobj_AddRef(IADsOpenDSObject *iface)
++{
++    LDAP_namespace *ldap = impl_from_IADsOpenDSObject(iface);
++    return InterlockedIncrement(&ldap->ref);
++}
++
++static ULONG WINAPI openobj_Release(IADsOpenDSObject *iface)
++{
++    LDAP_namespace *ldap = impl_from_IADsOpenDSObject(iface);
++    LONG ref = InterlockedDecrement(&ldap->ref);
++
++    if (!ref)
++    {
++        TRACE("destroying %p\n", iface);
++        HeapFree(GetProcessHeap(), 0, ldap);
++    }
++
++    return ref;
++}
++
++static HRESULT WINAPI openobj_GetTypeInfoCount(IADsOpenDSObject *iface, UINT *count)
++{
++    FIXME("%p,%p: stub\n", iface, count);
++    return E_NOTIMPL;
++}
++
++static HRESULT WINAPI openobj_GetTypeInfo(IADsOpenDSObject *iface, UINT index, LCID lcid, ITypeInfo **info)
++{
++    FIXME("%p,%u,%#x,%p: stub\n", iface, index, lcid, info);
++    return E_NOTIMPL;
++}
++
++static HRESULT WINAPI openobj_GetIDsOfNames(IADsOpenDSObject *iface, REFIID riid, LPOLESTR *names,
++                                            UINT count, LCID lcid, DISPID *dispid)
++{
++    FIXME("%p,%s,%p,%u,%u,%p: stub\n", iface, debugstr_guid(riid), names, count, lcid, dispid);
++    return E_NOTIMPL;
++}
++
++static HRESULT WINAPI openobj_Invoke(IADsOpenDSObject *iface, DISPID dispid, REFIID riid, LCID lcid, WORD flags,
++                                     DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *argerr)
++{
++    FIXME("%p,%d,%s,%04x,%04x,%p,%p,%p,%p: stub\n", iface, dispid, debugstr_guid(riid), lcid, flags,
++          params, result, excepinfo, argerr);
++    return E_NOTIMPL;
++}
++
++static HRESULT WINAPI openobj_OpenDSObject(IADsOpenDSObject *iface, BSTR path, BSTR user, BSTR password,
++                                           LONG reserved, IDispatch **obj)
++{
++    FIXME("%p,%s,%s,%s,%d,%p: stub\n", iface, debugstr_w(path), debugstr_w(user), debugstr_w(password),
++          reserved, obj);
++    return E_NOTIMPL;
++}
++
++static const IADsOpenDSObjectVtbl IADsOpenDSObject_vtbl =
++{
++    openobj_QueryInterface,
++    openobj_AddRef,
++    openobj_Release,
++    openobj_GetTypeInfoCount,
++    openobj_GetTypeInfo,
++    openobj_GetIDsOfNames,
++    openobj_Invoke,
++    openobj_OpenDSObject
++};
++
+ static HRESULT LDAPNamespace_create(REFIID riid, void **obj)
+ {
+     LDAP_namespace *ldap;
+@@ -445,6 +546,7 @@ static HRESULT LDAPNamespace_create(REFIID riid, void **obj)
+     if (!ldap) return E_OUTOFMEMORY;
+ 
+     ldap->IADs_iface.lpVtbl = &IADs_vtbl;
++    ldap->IADsOpenDSObject_iface.lpVtbl = &IADsOpenDSObject_vtbl;
+     ldap->ref = 1;
+ 
+     hr = IADs_QueryInterface(&ldap->IADs_iface, riid, obj);
+-- 
+2.20.1
+

patches/activeds-ADsOpenObject/0005-adsldp-tests-Add-some-tests-for-LDAPNamespace.patch

@@ -0,0 +1,123 @@
+From 488afac28472b0563c67cfad8c02a82f489c2c04 Mon Sep 17 00:00:00 2001
+From: Dmitry Timoshkov <dmitry@baikal.ru>
+Date: Tue, 19 Nov 2019 12:12:27 +0800
+Subject: [PATCH 5/5] adsldp/tests: Add some tests for LDAPNamespace.
+Content-Type: text/plain; charset=UTF-8
+To: wine-devel@winehq.org
+
+Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru>
+---
+ dlls/adsldp/tests/Makefile.in |  1 +
+ dlls/adsldp/tests/ldap.c      | 78 +++++++++++++++++++++++++++++++++++
+ dlls/adsldp/tests/sysinfo.c   |  2 +
+ 3 files changed, 81 insertions(+)
+ create mode 100644 dlls/adsldp/tests/ldap.c
+
+diff --git a/dlls/adsldp/tests/Makefile.in b/dlls/adsldp/tests/Makefile.in
+index 777d2aa9de..52141139d5 100644
+--- a/dlls/adsldp/tests/Makefile.in
++++ b/dlls/adsldp/tests/Makefile.in
+@@ -2,4 +2,5 @@ TESTDLL   = adsldp.dll
+ IMPORTS   = ole32 oleaut32 secur32 advapi32 uuid
+ 
+ C_SRCS = \
++	ldap.c \
+ 	sysinfo.c
+diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c
+new file mode 100644
+index 0000000000..36b128da20
+--- /dev/null
++++ b/dlls/adsldp/tests/ldap.c
+@@ -0,0 +1,78 @@
++/*
++ * LDAPNamespace Tests
++ *
++ * Copyright 2019 Dmitry Timoshkov
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
++ */
++
++#include <stdarg.h>
++#include <stdio.h>
++
++#define COBJMACROS
++
++#include "windef.h"
++#include "winbase.h"
++#include "objbase.h"
++#include "iads.h"
++
++#include "wine/test.h"
++
++#include "initguid.h"
++DEFINE_GUID(CLSID_LDAPNamespace,0x228d9a82,0xc302,0x11cf,0x9a,0xa4,0x00,0xaa,0x00,0x4a,0x56,0x91);
++
++static void test_LDAP(void)
++{
++    HRESULT hr;
++    IUnknown *unk;
++    IADs *ads;
++    IADsOpenDSObject *ads_open;
++    IDispatch *disp;
++
++    hr = CoCreateInstance(&CLSID_LDAPNamespace, 0, CLSCTX_INPROC_SERVER, &IID_IADs, (void **)&ads);
++    ok(hr == S_OK, "got %#x\n", hr);
++    IADs_Release(ads);
++
++    hr = CoCreateInstance(&CLSID_LDAPNamespace, 0, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk);
++    ok(hr == S_OK, "got %#x\n", hr);
++
++    hr = IUnknown_QueryInterface(unk, &IID_IDispatch, (void **)&disp);
++    ok(hr == S_OK, "got %#x\n", hr);
++    IDispatch_Release(disp);
++
++    hr = IUnknown_QueryInterface(unk, &IID_IADsOpenDSObject, (void **)&ads_open);
++    ok(hr == S_OK, "got %#x\n", hr);
++    IADsOpenDSObject_Release(ads_open);
++
++    hr = IADsOpenDSObject_OpenDSObject(ads_open, (BSTR)L"LDAP:", NULL, NULL, ADS_SECURE_AUTHENTICATION, &disp);
++todo_wine
++    ok(hr == S_OK, "got %#x\n", hr);
++if (hr == S_OK)
++    IDispatch_Release(disp);
++
++    IUnknown_Release(unk);
++}
++
++START_TEST(ldap)
++{
++    HRESULT hr;
++
++    hr = CoInitialize(NULL);
++    ok(hr == S_OK, "got %#x\n", hr);
++
++    test_LDAP();
++
++    CoUninitialize();
++}
+diff --git a/dlls/adsldp/tests/sysinfo.c b/dlls/adsldp/tests/sysinfo.c
+index db982aa82f..cb250190f1 100644
+--- a/dlls/adsldp/tests/sysinfo.c
++++ b/dlls/adsldp/tests/sysinfo.c
+@@ -216,4 +216,6 @@ START_TEST(sysinfo)
+     test_ComputerName();
+     test_UserName();
+     test_sysinfo();
++
++    CoUninitialize();
+ }
+-- 
+2.20.1
+

patches/activeds-ADsOpenObject/definition

@@ -0,0 +1,2 @@
+Fixes: [40649] activeds: Implement ADsOpenObject.
+#Fixes: [42885] ADsOpenObject to bind to user's account/computer. (related)

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/0001-advapi32-tests-Extend-security-label-token-integrity.patch

@@ -1,15 +1,16 @@
-From ba50fc98ee4690e62899d48efc856c2bc910536c Mon Sep 17 00:00:00 2001
+From 8044f571b7e674ce9e562488864d48646a9c7b88 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Mon, 7 Aug 2017 01:25:02 +0200
-Subject: advapi32/tests: Extend security label / token integrity tests.
+Subject: [PATCH] advapi32/tests: Extend security label / token integrity
+ tests.
 
 ---
  dlls/advapi32/tests/Makefile.in |   2 +-
- dlls/advapi32/tests/security.c  | 389 +++++++++++++++++++++++++++++++++++++++-
+ dlls/advapi32/tests/security.c  | 389 +++++++++++++++++++++++++++++++-
  2 files changed, 387 insertions(+), 4 deletions(-)
 
 diff --git a/dlls/advapi32/tests/Makefile.in b/dlls/advapi32/tests/Makefile.in
-index 36ce031ef62..4437e6e5de7 100644
+index 12583e59f57..caee5fae308 100644
 --- a/dlls/advapi32/tests/Makefile.in
 +++ b/dlls/advapi32/tests/Makefile.in
 @@ -1,5 +1,5 @@
@@ -20,10 +21,10 @@ index 36ce031ef62..4437e6e5de7 100644
  C_SRCS = \
  	cred.c \
 diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
-index 0fd41fe82fa..4a03db27e69 100644
+index a736dbffd22..4529469d932 100644
 --- a/dlls/advapi32/tests/security.c
 +++ b/dlls/advapi32/tests/security.c
-@@ -7191,13 +7191,19 @@ static void test_token_security_descriptor(void)
+@@ -7034,13 +7034,19 @@ static void test_token_security_descriptor(void)
  {
      static SID low_level = {SID_REVISION, 1, {SECURITY_MANDATORY_LABEL_AUTHORITY},
                              {SECURITY_MANDATORY_LOW_RID}};
@@ -46,7 +47,7 @@ index 0fd41fe82fa..4a03db27e69 100644
      PROCESS_INFORMATION info;
      DWORD size, index, retd;
      ACCESS_ALLOWED_ACE *ace;
-@@ -7347,6 +7353,185 @@ static void test_token_security_descriptor(void)
+@@ -7190,6 +7196,185 @@ static void test_token_security_descriptor(void)
      /* The security label is also not inherited */
      if (pAddMandatoryAce)
      {
@@ -103,7 +104,7 @@ index 0fd41fe82fa..4a03db27e69 100644
 +
 +            if (sacl)
 +            {
-+                ret = pGetAce(sacl, 0, (void **)&ace);
++                ret = GetAce(sacl, 0, (void **)&ace);
 +                ok(ret, "GetAce failed with error %u\n", GetLastError());
 +                ok(ace->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE,
 +                   "Unexpected ACE type %#x\n", ace->Header.AceType);
@@ -165,7 +166,7 @@ index 0fd41fe82fa..4a03db27e69 100644
 +
 +            if (sacl)
 +            {
-+                ret = pGetAce(sacl, 0, (void **)&ace);
++                ret = GetAce(sacl, 0, (void **)&ace);
 +                ok(ret, "GetAce failed with error %u\n", GetLastError());
 +                ok(ace->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE,
 +                   "Unexpected ACE type %#x\n", ace->Header.AceType);
@@ -215,7 +216,7 @@ index 0fd41fe82fa..4a03db27e69 100644
 +
 +            if (sacl)
 +            {
-+                ret = pGetAce(sacl, 0, (void **)&ace);
++                ret = GetAce(sacl, 0, (void **)&ace);
 +                ok(ret, "GetAce failed with error %u\n", GetLastError());
 +                ok(ace->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE,
 +                   "Unexpected ACE type %#x\n", ace->Header.AceType);
@@ -232,7 +233,7 @@ index 0fd41fe82fa..4a03db27e69 100644
          ret = InitializeAcl(acl, 256, ACL_REVISION);
          ok(ret, "InitializeAcl failed with error %u\n", GetLastError());
  
-@@ -7362,6 +7547,90 @@ static void test_token_security_descriptor(void)
+@@ -7205,6 +7390,90 @@ static void test_token_security_descriptor(void)
  
          ret = SetKernelObjectSecurity(token, LABEL_SECURITY_INFORMATION, sd);
          ok(ret, "SetKernelObjectSecurity failed with error %u\n", GetLastError());
@@ -272,7 +273,7 @@ index 0fd41fe82fa..4a03db27e69 100644
 +
 +        if (sacl)
 +        {
-+            ret = pGetAce(sacl, 0, (void **)&ace);
++            ret = GetAce(sacl, 0, (void **)&ace);
 +            ok(ret, "GetAce failed with error %u\n", GetLastError());
 +            ok(ace->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE,
 +               "Unexpected ACE type %#x\n", ace->Header.AceType);
@@ -310,7 +311,7 @@ index 0fd41fe82fa..4a03db27e69 100644
 +
 +        if (sacl)
 +        {
-+            ret = pGetAce(sacl, 0, (void **)&ace);
++            ret = GetAce(sacl, 0, (void **)&ace);
 +            ok(ret, "GetAce failed with error %u\n", GetLastError());
 +            ok(ace->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE,
 +               "Unexpected ACE type %#x\n", ace->Header.AceType);
@@ -323,7 +324,7 @@ index 0fd41fe82fa..4a03db27e69 100644
      }
      else
          win_skip("SYSTEM_MANDATORY_LABEL not supported\n");
-@@ -7467,6 +7736,116 @@ static void test_child_token_sd(void)
+@@ -7312,6 +7581,116 @@ static void test_child_token_sd(void)
      HeapFree(GetProcessHeap(), 0, sd);
  }
  
@@ -366,7 +367,7 @@ index 0fd41fe82fa..4a03db27e69 100644
 +    ok(acl && acl != (void *)0xdeadbeef, "Got invalid SACL\n");
 +    ok(!defaulted, "SACL defaulted\n");
 +    ok(acl->AceCount == 1, "Expected exactly one ACE\n");
-+    ret = pGetAce(acl, 0, (void **)&ace_label);
++    ret = GetAce(acl, 0, (void **)&ace_label);
 +    ok(ret, "GetAce failed with error %u\n", GetLastError());
 +    ok(ace_label->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE,
 +       "Unexpected ACE type %#x\n", ace_label->Header.AceType);
@@ -421,7 +422,7 @@ index 0fd41fe82fa..4a03db27e69 100644
 +    ok(acl && acl != (void *)0xdeadbeef, "Got invalid SACL\n");
 +    ok(!defaulted, "SACL defaulted\n");
 +    ok(acl->AceCount == 1, "Expected exactly one ACE\n");
-+    ret = pGetAce(acl, 0, (void **)&ace_label);
++    ret = GetAce(acl, 0, (void **)&ace_label);
 +    ok(ret, "GetAce failed with error %u\n", GetLastError());
 +    ok(ace_label->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE,
 +       "Unexpected ACE type %#x\n", ace_label->Header.AceType);
@@ -440,7 +441,7 @@ index 0fd41fe82fa..4a03db27e69 100644
  static void test_GetExplicitEntriesFromAclW(void)
  {
      static const WCHAR wszCurrentUser[] = { 'C','U','R','R','E','N','T','_','U','S','E','R','\0'};
-@@ -7653,6 +8032,10 @@ START_TEST(security)
+@@ -7571,6 +7950,10 @@ START_TEST(security)
      {
          if (!strcmp(myARGV[2], "test_token_sd"))
              test_child_token_sd();
@@ -452,5 +453,5 @@ index 0fd41fe82fa..4a03db27e69 100644
              test_process_security_child();
          return;
 -- 
-2.13.1
+2.17.1
 

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