Release v5.12.1

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

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/0031-include-Check-element-type-in-CONTAINING_RECORD-and-.patch

@@ -1,4 +1,4 @@
-From 494fc3abe1eddabcf7cede677ee907284e89eea8 Mon Sep 17 00:00:00 2001
+From a349cc8bdcc3a083ea507dbbdeba9053e3a338e4 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Tue, 22 Mar 2016 23:08:30 +0100
 Subject: [PATCH] include: Check element type in CONTAINING_RECORD and similar
@@ -11,7 +11,7 @@ Subject: [PATCH] include: Check element type in CONTAINING_RECORD and similar
  3 files changed, 24 insertions(+), 6 deletions(-)
 
 diff --git a/include/wine/list.h b/include/wine/list.h
-index b4d681fe..287ad394 100644
+index b4d681fe0f3..287ad394fae 100644
 --- a/include/wine/list.h
 +++ b/include/wine/list.h
 @@ -228,7 +228,13 @@ static inline void list_move_head( struct list *dst, struct list *src )
@@ -31,7 +31,7 @@ index b4d681fe..287ad394 100644
  
  #endif  /* __WINE_SERVER_LIST_H */
 diff --git a/include/wine/rbtree.h b/include/wine/rbtree.h
-index dc50b5e7..8130deb5 100644
+index 8aae29c8c10..330b3e8fbc9 100644
 --- a/include/wine/rbtree.h
 +++ b/include/wine/rbtree.h
 @@ -23,8 +23,14 @@
@@ -52,10 +52,10 @@ index dc50b5e7..8130deb5 100644
  struct wine_rb_entry
  {
 diff --git a/include/winnt.h b/include/winnt.h
-index 2b489382..a156efc4 100644
+index 46e17c546a7..d5c65d2017b 100644
 --- a/include/winnt.h
 +++ b/include/winnt.h
-@@ -760,8 +760,14 @@ typedef struct _MEMORY_BASIC_INFORMATION
+@@ -793,8 +793,14 @@ typedef struct _MEMORY_BASIC_INFORMATION
  #define RTL_FIELD_SIZE(type, field) (sizeof(((type *)0)->field))
  #define RTL_SIZEOF_THROUGH_FIELD(type, field) (FIELD_OFFSET(type, field) + RTL_FIELD_SIZE(type, field))
  
@@ -70,8 +70,8 @@ index 2b489382..a156efc4 100644
 +   ((type *)((PCHAR)(address) - offsetof(type, field)))
 +#endif
  
+ #define ARRAYSIZE(x) (sizeof(x) / sizeof((x)[0]))
  #ifdef __WINESRC__
- # define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 -- 
-2.20.1
+2.26.2
 

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

@@ -1,18 +1,18 @@
-From 9e585de1f2f28e1ef18c1edca875779c491375cb Mon Sep 17 00:00:00 2001
+From aa9cb874b1fb89601d6a5a735b442b8a7aa7b3aa 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
  isn't vanilla wine.
 
 ---
- dlls/kernel32/process.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
+ dlls/kernel32/process.c | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
 
 diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
-index 36ed82bff8c..b8a677c5485 100644
+index 8f506fcf1320..45bfe7fe7b5d 100644
 --- a/dlls/kernel32/process.c
 +++ b/dlls/kernel32/process.c
-@@ -65,6 +65,7 @@
+@@ -60,6 +60,7 @@
  
  WINE_DEFAULT_DEBUG_CHANNEL(process);
  WINE_DECLARE_DEBUG_CHANNEL(relay);
@@ -20,7 +20,15 @@ index 36ed82bff8c..b8a677c5485 100644
  
  typedef struct
  {
-@@ -997,6 +998,15 @@ void WINAPI start_process( LPTHREAD_START_ROUTINE entry, PEB *peb )
+@@ -125,6 +126,7 @@ static inline DWORD call_process_entry( PEB *peb, LPTHREAD_START_ROUTINE entry )
+ }
+ #endif
+ 
++extern const char * CDECL wine_get_version(void);
+ /***********************************************************************
+  *           __wine_start_process
+  *
+@@ -150,6 +152,15 @@ void CDECL __wine_start_process( LPTHREAD_START_ROUTINE entry, PEB *peb )
  
      __TRY
      {
@@ -37,5 +45,5 @@ index 36ed82bff8c..b8a677c5485 100644
              being_debugged = FALSE;
  
 -- 
-2.23.0
+2.26.2
 

patches/Staging/0002-winelib-Append-Staging-at-the-end-of-the-version-s.patch

@@ -1,17 +1,31 @@
-From 05ca39b029f8f710ca53aeafc36384fd39fd6b89 Mon Sep 17 00:00:00 2001
+From c097870c69720ece3874ad4ff987408a8c24ffb2 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Thu, 2 Oct 2014 19:53:46 +0200
 Subject: [PATCH] winelib: Append '(Staging)' at the end of the version string.
 
 ---
- libs/wine/Makefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ dlls/ntdll/Makefile.in | 2 +-
+ libs/wine/Makefile.in  | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
 
+diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in
+index ebf607e9d43..de93445d4e3 100644
+--- a/dlls/ntdll/Makefile.in
++++ b/dlls/ntdll/Makefile.in
+@@ -69,7 +69,7 @@ server_EXTRADEFS = \
+ 	-DBIN_TO_DATADIR=\"`$(MAKEDEP) -R ${bindir} ${datadir}/wine`\"
+ 
+ unix/version.c: dummy
+-	version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-$(PACKAGE_VERSION)") | sed -n -e '$$s/\(.*\)/const char wine_build[] = "\1";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || (rm -f $@ && exit 1)
++	version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-$(PACKAGE_VERSION)") | sed -n -e '$$s/\(.*\)/const char wine_build[] = "\1 (Staging)";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || (rm -f $@ && exit 1)
+ 
+ dummy:
+ .PHONY: dummy
 diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in
-index 4833eb5..3cfa4f4 100644
+index fe2a2b45e58..1e55a6b1f46 100644
 --- a/libs/wine/Makefile.in
 +++ b/libs/wine/Makefile.in
-@@ -31,7 +31,7 @@ libwine_LDFLAGS = $(LIBWINE_LDFLAGS)
+@@ -100,7 +100,7 @@ libwine_LDFLAGS = $(LIBWINE_LDFLAGS)
  libwine_DEPS = $(LIBWINE_DEPENDS)
  
  version.c: dummy
@@ -21,5 +35,5 @@ index 4833eb5..3cfa4f4 100644
  dummy:
  .PHONY: dummy
 -- 
-1.9.1
+2.26.2
 

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

@@ -1,66 +1,33 @@
-From fa73044dd60bae90b9a5ec850205a07579d4db17 Mon Sep 17 00:00:00 2001
+From 599c50c9e339fe04e96fdb665b3d7ccb1a7708b7 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Thu, 29 May 2014 23:43:45 +0200
 Subject: [PATCH] loader: Add commandline option --patches to show the patch
  list.
 
 ---
- dlls/ntdll/misc.c      |  8 ++++++++
- dlls/ntdll/ntdll.spec  |  1 +
  include/wine/library.h |  1 +
  libs/wine/config.c     |  6 ++++++
  libs/wine/wine.map     |  1 +
  loader/main.c          | 42 +++++++++++++++++++++++++++++++++++++++++-
- 6 files changed, 58 insertions(+), 1 deletion(-)
+ 4 files changed, 49 insertions(+), 1 deletion(-)
 
-diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c
-index bb75d9c..21e2db6 100644
---- a/dlls/ntdll/misc.c
-+++ b/dlls/ntdll/misc.c
-@@ -61,6 +61,14 @@ const char * CDECL NTDLL_wine_get_version(void)
- }
- 
- /*********************************************************************
-+ *                  wine_get_patches   (NTDLL.@)
-+ */
-+const void * CDECL NTDLL_wine_get_patches(void)
-+{
-+    return wine_get_patches();
-+}
-+
-+/*********************************************************************
-  *                  wine_get_build_id   (NTDLL.@)
-  */
- const char * CDECL NTDLL_wine_get_build_id(void)
-diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
-index 292b0f6..fb45a94 100644
---- a/dlls/ntdll/ntdll.spec
-+++ b/dlls/ntdll/ntdll.spec
-@@ -1516,6 +1516,7 @@
- 
- # Version
- @ cdecl wine_get_version() NTDLL_wine_get_version
-+@ cdecl wine_get_patches() NTDLL_wine_get_patches
- @ cdecl wine_get_build_id() NTDLL_wine_get_build_id
- @ cdecl wine_get_host_version(ptr ptr) NTDLL_wine_get_host_version
- 
 diff --git a/include/wine/library.h b/include/wine/library.h
-index 242bb69..fae73fe 100644
+index 090b8349559..b8a4a2df576 100644
 --- a/include/wine/library.h
 +++ b/include/wine/library.h
-@@ -43,6 +43,7 @@ extern const char *wine_get_data_dir(void);
- extern const char *wine_get_server_dir(void);
- extern const char *wine_get_user_name(void);
+@@ -42,6 +42,7 @@ extern "C" {
+ /* configuration */
+ 
  extern const char *wine_get_version(void);
 +extern const void *wine_get_patches(void);
  extern const char *wine_get_build_id(void);
  extern void wine_init_argv0_path( const char *argv0 );
  extern void wine_exec_wine_binary( const char *name, char **argv, const char *env_var );
 diff --git a/libs/wine/config.c b/libs/wine/config.c
-index 3c9110b..5da6263 100644
+index f5b4c0de9af..e52739d55ad 100644
 --- a/libs/wine/config.c
 +++ b/libs/wine/config.c
-@@ -522,6 +522,12 @@ const char *wine_get_version(void)
+@@ -515,6 +515,12 @@ const char *wine_get_version(void)
      return PACKAGE_VERSION;
  }
  
@@ -74,22 +41,22 @@ index 3c9110b..5da6263 100644
  const char *wine_get_build_id(void)
  {
 diff --git a/libs/wine/wine.map b/libs/wine/wine.map
-index 2159fac..7cb2918 100644
+index 1143b129734..55f874d3e74 100644
 --- a/libs/wine/wine.map
 +++ b/libs/wine/wine.map
-@@ -90,6 +90,7 @@ WINE_1.0
-     wine_get_ss;
-     wine_get_user_name;
+@@ -13,6 +13,7 @@ WINE_1.0
+     wine_exec_wine_binary;
+     wine_get_build_id;
      wine_get_version;
 +    wine_get_patches;
      wine_init;
      wine_init_argv0_path;
-     wine_is_dbcs_leadbyte;
+     wine_mmap_add_reserved_area;
 diff --git a/loader/main.c b/loader/main.c
-index f197cf8..f662912 100644
+index 0e6b6f66b50..24bcfff8c4c 100644
 --- a/loader/main.c
 +++ b/loader/main.c
-@@ -54,7 +54,8 @@ static void check_command_line( int argc, char *argv[] )
+@@ -55,7 +55,8 @@ static void check_command_line( int argc, char *argv[] )
      static const char usage[] =
          "Usage: wine PROGRAM [ARGUMENTS...]   Run the specified program\n"
          "       wine --help                   Display this help and exit\n"
@@ -99,7 +66,7 @@ index f197cf8..f662912 100644
  
      if (argc <= 1)
      {
-@@ -71,6 +72,45 @@ static void check_command_line( int argc, char *argv[] )
+@@ -72,6 +73,45 @@ static void check_command_line( int argc, char *argv[] )
          printf( "%s\n", wine_get_build_id() );
          exit(0);
      }
@@ -146,5 +113,5 @@ index f197cf8..f662912 100644
  
  
 -- 
-1.9.1
+2.26.2
 

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

@@ -1,313 +0,0 @@
-From 9618572cf2eace39198fb83b747a70d1865015e3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Wed, 28 May 2014 19:50:51 +0200
-Subject: [PATCH] loader: Add commandline option --check-libs.
-
----
- include/wine/library.h |   2 +
- libs/wine/config.c     | 124 +++++++++++++++++++++++++++++++++++++++++++++++++
- libs/wine/loader.c     |  36 ++++++++++++++
- libs/wine/wine.map     |   2 +
- loader/main.c          |  50 +++++++++++++++++++-
- 5 files changed, 213 insertions(+), 1 deletion(-)
-
-diff --git a/include/wine/library.h b/include/wine/library.h
-index fae73fe..7395a11 100644
---- a/include/wine/library.h
-+++ b/include/wine/library.h
-@@ -40,6 +40,7 @@ extern "C" {
- extern const char *wine_get_build_dir(void);
- extern const char *wine_get_config_dir(void);
- extern const char *wine_get_data_dir(void);
-+extern const char **wine_get_libs(void);
- extern const char *wine_get_server_dir(void);
- extern const char *wine_get_user_name(void);
- extern const char *wine_get_version(void);
-@@ -52,6 +53,7 @@ extern void wine_exec_wine_binary( const char *name, char **argv, const char *en
- 
- typedef void (*load_dll_callback_t)( void *, const char * );
- 
-+extern int wine_dladdr( void *addr, void *info, char *error, size_t errorsize );
- extern void *wine_dlopen( const char *filename, int flag, char *error, size_t errorsize );
- extern void *wine_dlsym( void *handle, const char *symbol, char *error, size_t errorsize );
- extern int wine_dlclose( void *handle, char *error, size_t errorsize );
-diff --git a/libs/wine/config.c b/libs/wine/config.c
-index 5da6263..6cedfb7 100644
---- a/libs/wine/config.c
-+++ b/libs/wine/config.c
-@@ -488,6 +488,130 @@ const char *wine_get_build_dir(void)
-     return build_dir;
- }
- 
-+const char *wine_libs[] = {
-+#ifdef SONAME_LIBCAIRO
-+    SONAME_LIBCAIRO,
-+#endif
-+#ifdef SONAME_LIBCAPI20
-+    SONAME_LIBCAPI20,
-+#endif
-+#ifdef SONAME_LIBCUPS
-+    SONAME_LIBCUPS,
-+#endif
-+#ifdef SONAME_LIBCURSES
-+    SONAME_LIBCURSES,
-+#endif
-+#ifdef SONAME_LIBDBUS_1
-+    SONAME_LIBDBUS_1,
-+#endif
-+#ifdef SONAME_LIBFONTCONFIG
-+    SONAME_LIBFONTCONFIG,
-+#endif
-+#ifdef SONAME_LIBFREETYPE
-+    SONAME_LIBFREETYPE,
-+#endif
-+#ifdef SONAME_LIBGL
-+    SONAME_LIBGL,
-+#endif
-+#ifdef SONAME_LIBGNUTLS
-+    SONAME_LIBGNUTLS,
-+#endif
-+#ifdef SONAME_LIBGOBJECT_2_0
-+    SONAME_LIBGOBJECT_2_0,
-+#endif
-+#ifdef SONAME_LIBGSM
-+    SONAME_LIBGSM,
-+#endif
-+#ifdef SONAME_LIBGTK_3
-+    SONAME_LIBGTK_3,
-+#endif
-+#ifdef SONAME_LIBHAL
-+    SONAME_LIBHAL,
-+#endif
-+#ifdef SONAME_LIBJPEG
-+    SONAME_LIBJPEG,
-+#endif
-+#ifdef SONAME_LIBNCURSES
-+    SONAME_LIBNCURSES,
-+#endif
-+#ifdef SONAME_LIBNETAPI
-+    SONAME_LIBNETAPI,
-+#endif
-+#ifdef SONAME_LIBODBC
-+    SONAME_LIBODBC,
-+#endif
-+#ifdef SONAME_LIBOSMESA
-+    SONAME_LIBOSMESA,
-+#endif
-+#ifdef SONAME_LIBPCAP
-+    SONAME_LIBPCAP,
-+#endif
-+#ifdef SONAME_LIBPNG
-+    SONAME_LIBPNG,
-+#endif
-+#ifdef SONAME_LIBSANE
-+    SONAME_LIBSANE,
-+#endif
-+#ifdef SONAME_LIBTIFF
-+    SONAME_LIBTIFF,
-+#endif
-+#ifdef SONAME_LIBTXC_DXTN
-+    SONAME_LIBTXC_DXTN,
-+#endif
-+#ifdef SONAME_LIBV4L1
-+    SONAME_LIBV4L1,
-+#endif
-+#ifdef SONAME_LIBVA
-+    SONAME_LIBVA,
-+#endif
-+#ifdef SONAME_LIBVA_DRM
-+    SONAME_LIBVA_DRM,
-+#endif
-+#ifdef SONAME_LIBVA_X11
-+    SONAME_LIBVA_X11,
-+#endif
-+#ifdef SONAME_LIBX11
-+    SONAME_LIBX11,
-+#endif
-+#ifdef SONAME_LIBX11_XCB
-+    SONAME_LIBX11_XCB,
-+#endif
-+#ifdef SONAME_LIBXCOMPOSITE
-+    SONAME_LIBXCOMPOSITE,
-+#endif
-+#ifdef SONAME_LIBXCURSOR
-+    SONAME_LIBXCURSOR,
-+#endif
-+#ifdef SONAME_LIBXEXT
-+    SONAME_LIBXEXT,
-+#endif
-+#ifdef SONAME_LIBXI
-+    SONAME_LIBXI,
-+#endif
-+#ifdef SONAME_LIBXINERAMA
-+    SONAME_LIBXINERAMA,
-+#endif
-+#ifdef SONAME_LIBXRANDR
-+    SONAME_LIBXRANDR,
-+#endif
-+#ifdef SONAME_LIBXRENDER
-+    SONAME_LIBXRENDER,
-+#endif
-+#ifdef SONAME_LIBXSLT
-+    SONAME_LIBXSLT,
-+#endif
-+#ifdef SONAME_LIBXXF86VM
-+    SONAME_LIBXXF86VM,
-+#endif
-+    NULL
-+};
-+
-+/* return the list of shared libs used by wine */
-+const char **wine_get_libs(void)
-+{
-+    return &wine_libs[0];
-+}
-+
- /* return the full name of the server directory (the one containing the socket) */
- const char *wine_get_server_dir(void)
- {
-diff --git a/libs/wine/loader.c b/libs/wine/loader.c
-index 649aa22..367dde3 100644
---- a/libs/wine/loader.c
-+++ b/libs/wine/loader.c
-@@ -1064,6 +1064,42 @@ void *wine_dlopen( const char *filename, int flag, char *error, size_t errorsize
- }
- 
- /***********************************************************************
-+ *      wine_dladdr
-+ */
-+int wine_dladdr( void *addr, void *info, char *error, size_t errorsize )
-+{
-+#ifdef HAVE_DLADDR
-+    int ret;
-+    const char *s;
-+    dlerror(); dlerror();
-+    ret = dladdr( addr, (Dl_info *)info );
-+    s = dlerror();
-+    if (error && errorsize)
-+    {
-+        if (s)
-+        {
-+            size_t len = strlen(s);
-+            if (len >= errorsize) len = errorsize - 1;
-+            memcpy( error, s, len );
-+            error[len] = 0;
-+        }
-+        else error[0] = 0;
-+    }
-+    dlerror();
-+    return ret;
-+#else
-+    if (error)
-+    {
-+        static const char msg[] = "dladdr interface not detected by configure";
-+        size_t len = min( errorsize, sizeof(msg) );
-+        memcpy( error, msg, len );
-+        error[len - 1] = 0;
-+    }
-+    return 0;
-+#endif
-+}
-+
-+/***********************************************************************
-  *		wine_dlsym
-  */
- void *wine_dlsym( void *handle, const char *symbol, char *error, size_t errorsize )
-diff --git a/libs/wine/wine.map b/libs/wine/wine.map
-index 7cb2918..72ffed8 100644
---- a/libs/wine/wine.map
-+++ b/libs/wine/wine.map
-@@ -65,6 +65,7 @@ WINE_1.0
-     wine_dbg_sprintf;
-     wine_dbgstr_an;
-     wine_dbgstr_wn;
-+    wine_dladdr;
-     wine_dlclose;
-     wine_dll_enum_load_path;
-     wine_dll_get_owner;
-@@ -85,6 +86,7 @@ WINE_1.0
-     wine_get_es;
-     wine_get_fs;
-     wine_get_gs;
-+    wine_get_libs;
-     wine_get_server_dir;
-     wine_get_sortkey;
-     wine_get_ss;
-diff --git a/loader/main.c b/loader/main.c
-index f662912..a2dc40c 100644
---- a/loader/main.c
-+++ b/loader/main.c
-@@ -36,6 +36,12 @@
- #ifdef HAVE_UNISTD_H
- # include <unistd.h>
- #endif
-+#ifdef HAVE_DLADDR
-+# include <dlfcn.h>
-+#endif
-+#ifdef HAVE_LINK_H
-+# include <link.h>
-+#endif
- #include <pthread.h>
- 
- #include "wine/library.h"
-@@ -55,7 +61,8 @@ static void check_command_line( int argc, char *argv[] )
-         "Usage: wine PROGRAM [ARGUMENTS...]   Run the specified program\n"
-         "       wine --help                   Display this help and exit\n"
-         "       wine --version                Output version information and exit\n"
--        "       wine --patches                Output patch information and exit";
-+        "       wine --patches                Output patch information and exit\n"
-+        "       wine --check-libs             Checks if shared libs are installed";
- 
-     if (argc <= 1)
-     {
-@@ -111,6 +118,47 @@ static void check_command_line( int argc, char *argv[] )
- 
-         exit(0);
-     }
-+    if (!strcmp( argv[1], "--check-libs" ))
-+    {
-+        void* lib_handle;
-+        int ret = 0;
-+        const char **wine_libs = wine_get_libs();
-+
-+        for(; *wine_libs; wine_libs++)
-+        {
-+            lib_handle = wine_dlopen( *wine_libs, RTLD_NOW, NULL, 0 );
-+            if (lib_handle)
-+            {
-+            #ifdef HAVE_DLADDR
-+                Dl_info libinfo;
-+                void* symbol;
-+
-+            #ifdef HAVE_LINK_H
-+                struct link_map *lm = (struct link_map *)lib_handle;
-+                symbol = (void *)lm->l_addr;
-+            #else
-+                symbol = wine_dlsym( lib_handle, "_init", NULL, 0 );
-+            #endif
-+                if (symbol && wine_dladdr( symbol, &libinfo, NULL, 0 ))
-+                {
-+                    printf( "%s: %s\n", *wine_libs, libinfo.dli_fname );
-+                }
-+                else
-+            #endif
-+                {
-+                    printf( "%s: found\n", *wine_libs );
-+                }
-+                wine_dlclose( lib_handle, NULL, 0 );
-+            }
-+            else
-+            {
-+                printf( "%s: missing\n", *wine_libs );
-+                ret = 1;
-+            }
-+        }
-+
-+        exit(ret);
-+    }
- }
- 
- 
--- 
-1.9.1
-

patches/Staging/0005-loader-Print-library-paths-for-check-libs-on-Mac-OS-.patch

@@ -1,60 +0,0 @@
-From 07ca5e888c3265c57c88ef1758e6c47fbea4fb07 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Sat, 27 Jun 2015 19:28:51 +0200
-Subject: loader: Print library paths for --check-libs on Mac OS X.
-
----
- loader/main.c | 30 +++++++++++++++++++++++++++++-
- 1 file changed, 29 insertions(+), 1 deletion(-)
-
-diff --git a/loader/main.c b/loader/main.c
-index a2dc40c51c..1642fb0965 100644
---- a/loader/main.c
-+++ b/loader/main.c
-@@ -50,6 +50,30 @@
- /* the preloader will set this variable */
- const struct wine_preload_info *wine_main_preload_info = NULL;
- 
-+#ifdef __APPLE__
-+#include <mach-o/dyld.h>
-+
-+static const char *get_macho_library_path( const char *libname )
-+{
-+    unsigned int path_len, libname_len = strlen( libname );
-+    uint32_t i, count = _dyld_image_count();
-+
-+    for (i = 0; i < count; i++)
-+    {
-+       const char *path = _dyld_get_image_name( i );
-+        if (!path) continue;
-+
-+        path_len = strlen( path );
-+        if (path_len < libname_len + 1) continue;
-+        if (path[path_len - libname_len - 1] != '/') continue;
-+        if (strcmp( path + path_len - libname_len, libname )) continue;
-+
-+        return path;
-+    }
-+    return NULL;
-+}
-+#endif
-+
- /***********************************************************************
-  *           check_command_line
-  *
-@@ -146,7 +170,11 @@ static void check_command_line( int argc, char *argv[] )
-                 else
-             #endif
-                 {
--                    printf( "%s: found\n", *wine_libs );
-+                    const char *path = NULL;
-+                #ifdef __APPLE__
-+                    path = get_macho_library_path( *wine_libs );
-+                #endif
-+                    printf( "%s: %s\n", *wine_libs, path ? path : "found");
-                 }
-                 wine_dlclose( lib_handle, NULL, 0 );
-             }
--- 
-2.14.1
-

patches/advapi32-LsaLookupSids/0002-advapi32-Prepend-a-hidden-LSA_TRUST_INFORMATION-in-L.patch

@@ -1,47 +0,0 @@
-From 246cb6b72666dcb77fb2f553d318d7dabbe8811d Mon Sep 17 00:00:00 2001
-From: Qian Hong <qhong@codeweavers.com>
-Date: Tue, 7 Apr 2015 13:18:47 +0800
-Subject: advapi32: Prepend a hidden LSA_TRUST_INFORMATION in LsaLookupSids to
- avoid crash when Domains[-1] incorrectly accessed by application. (try 2)
-
----
- dlls/advapi32/lsa.c | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c
-index 69c29c5..dfe25b3 100644
---- a/dlls/advapi32/lsa.c
-+++ b/dlls/advapi32/lsa.c
-@@ -488,14 +488,17 @@ NTSTATUS WINAPI LsaLookupSids(
-     if (!(*Names = heap_alloc(name_fullsize))) return STATUS_NO_MEMORY;
-     /* maximum count of stored domain infos is Count, allocate it like that cause really needed
-        count could only be computed after sid data is retrieved */
--    domain_fullsize = sizeof(LSA_REFERENCED_DOMAIN_LIST) + sizeof(LSA_TRUST_INFORMATION)*Count;
-+    domain_fullsize = sizeof(LSA_REFERENCED_DOMAIN_LIST) + sizeof(LSA_TRUST_INFORMATION) * (Count + 1);
-     if (!(*ReferencedDomains = heap_alloc(domain_fullsize)))
-     {
-         heap_free(*Names);
-         return STATUS_NO_MEMORY;
-     }
-     (*ReferencedDomains)->Entries = 0;
--    (*ReferencedDomains)->Domains = (LSA_TRUST_INFORMATION*)((char*)*ReferencedDomains + sizeof(LSA_REFERENCED_DOMAIN_LIST));
-+    (*ReferencedDomains)->Domains = (LSA_TRUST_INFORMATION*)((char*)*ReferencedDomains +
-+                                    sizeof(LSA_REFERENCED_DOMAIN_LIST) + sizeof(LSA_TRUST_INFORMATION));
-+    (*ReferencedDomains)->Domains[-1].Sid = NULL;
-+    RtlInitUnicodeStringEx(&(*ReferencedDomains)->Domains[-1].Name, NULL);
- 
-     /* Get full names data length and full length needed to store domain name and SID */
-     for (i = 0; i < Count; i++)
-@@ -555,7 +558,8 @@ NTSTATUS WINAPI LsaLookupSids(
- 
-     *ReferencedDomains = heap_realloc(*ReferencedDomains, domain_fullsize);
-     /* fix pointer after reallocation */
--    (*ReferencedDomains)->Domains = (LSA_TRUST_INFORMATION*)((char*)*ReferencedDomains + sizeof(LSA_REFERENCED_DOMAIN_LIST));
-+    (*ReferencedDomains)->Domains = (LSA_TRUST_INFORMATION*)((char*)*ReferencedDomains +
-+                                    sizeof(LSA_REFERENCED_DOMAIN_LIST) + sizeof(LSA_TRUST_INFORMATION));
-     domain_data = (char*)(*ReferencedDomains)->Domains + sizeof(LSA_TRUST_INFORMATION)*Count;
- 
-     mapped = 0;
--- 
-2.3.5
-

patches/advapi32-LsaLookupSids/0003-advapi32-Prepend-a-hidden-LSA_TRUST_INFORMATION-in-L.patch

@@ -1,39 +0,0 @@
-From ce254ac3659e0c040136341d035629f99ec6d1ea Mon Sep 17 00:00:00 2001
-From: Qian Hong <qhong@codeweavers.com>
-Date: Tue, 7 Apr 2015 13:19:06 +0800
-Subject: advapi32: Prepend a hidden LSA_TRUST_INFORMATION in LsaLookupNames2
- to avoid crash when Domains[-1] incorrectly accessed by application. (try 2)
-
----
- dlls/advapi32/lsa.c | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c
-index dfe25b3..258b8ca 100644
---- a/dlls/advapi32/lsa.c
-+++ b/dlls/advapi32/lsa.c
-@@ -404,14 +404,18 @@ NTSTATUS WINAPI LsaLookupNames2( LSA_HANDLE policy, ULONG flags, ULONG count,
-     sid = (SID *)(*sids + count);
- 
-     /* use maximum domain count */
--    if (!(*domains = heap_alloc(sizeof(LSA_REFERENCED_DOMAIN_LIST) + sizeof(LSA_TRUST_INFORMATION)*count +
--                                sid_size_total + domainname_size_total*sizeof(WCHAR))))
-+    if (!(*domains = heap_alloc(sizeof(LSA_REFERENCED_DOMAIN_LIST) + sizeof(LSA_TRUST_INFORMATION) * (count + 1) +
-+                                sid_size_total + domainname_size_total * sizeof(WCHAR))))
-     {
-         heap_free(*sids);
-         return STATUS_NO_MEMORY;
-     }
-     (*domains)->Entries = 0;
--    (*domains)->Domains = (LSA_TRUST_INFORMATION*)((char*)*domains + sizeof(LSA_REFERENCED_DOMAIN_LIST));
-+    (*domains)->Domains = (LSA_TRUST_INFORMATION*)((char*)*domains +
-+                          sizeof(LSA_REFERENCED_DOMAIN_LIST) + sizeof(LSA_TRUST_INFORMATION));
-+    (*domains)->Domains[-1].Sid = NULL;
-+    RtlInitUnicodeStringEx(&(*domains)->Domains[-1].Name, NULL);
-+
-     domain_data = (char*)(*domains)->Domains + sizeof(LSA_TRUST_INFORMATION)*count;
- 
-     domain.Buffer = heap_alloc(domain_size_max*sizeof(WCHAR));
--- 
-2.3.5
-

patches/advapi32-LsaLookupSids/0004-advapi32-Fallback-to-Sid-string-when-LookupAccountSi.patch

@@ -1,68 +0,0 @@
-From 77d43d721793edda9b419f7426442a35f0cb5918 Mon Sep 17 00:00:00 2001
-From: Qian Hong <qhong@codeweavers.com>
-Date: Tue, 7 Apr 2015 11:23:34 +0800
-Subject: advapi32: Fallback to Sid string when LookupAccountSid fails.
-
----
- dlls/advapi32/lsa.c | 31 +++++++++++++++++++++++++++++++
- 1 file changed, 31 insertions(+)
-
-diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c
-index 1b270a80829..b8dedbd6d58 100644
---- a/dlls/advapi32/lsa.c
-+++ b/dlls/advapi32/lsa.c
-@@ -29,6 +29,7 @@
- #include "winbase.h"
- #include "winreg.h"
- #include "winternl.h"
-+#include "sddl.h"
- #include "advapi32_misc.h"
- 
- #include "wine/debug.h"
-@@ -562,6 +563,21 @@ NTSTATUS WINAPI LsaLookupSids(
-                 domain.MaximumLength = sizeof(WCHAR);
-             }
-         }
-+        else
-+        {
-+            WCHAR *strsid = NULL;
-+
-+            if (ConvertSidToStringSidW(Sids[i], &strsid))
-+            {
-+                name_size = strlenW(strsid) + 1;
-+
-+                (*Names)[i].Name.Length = (name_size - 1) * sizeof(WCHAR);
-+                (*Names)[i].Name.MaximumLength = name_size * sizeof(WCHAR);
-+                name_fullsize += (*Names)[i].Name.MaximumLength;
-+
-+                LocalFree(strsid);
-+            }
-+        }
-     }
- 
-     /* now we have full length needed for both */
-@@ -605,6 +621,21 @@ NTSTATUS WINAPI LsaLookupSids(
-             (*Names)[i].DomainIndex = lsa_reflist_add_domain(*ReferencedDomains, &domain, &domain_data);
-             heap_free(domain.Buffer);
-         }
-+        else
-+        {
-+            WCHAR *strsid = NULL;
-+
-+            if (ConvertSidToStringSidW(Sids[i], &strsid))
-+            {
-+                name_size = strlenW(strsid) + 1;
-+                mapped++;
-+
-+                (*Names)[i].Name.Buffer = name_buffer;
-+                memcpy((*Names)[i].Name.Buffer, strsid, name_size * sizeof(WCHAR));
-+
-+                LocalFree(strsid);
-+            }
-+        }
- 
-         name_buffer += name_size;
-     }
--- 
-2.11.0
-

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

@@ -1,56 +0,0 @@
-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: [PATCH] advapi32: Fix name and use of DOMAIN_GROUP_RID_USERS.
-
----
- dlls/advapi32/security.c       | 7 +++++--
- dlls/advapi32/tests/security.c | 4 ++--
- 2 files changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c
-index a7707f15d39..73c1f054d5c 100644
---- a/dlls/advapi32/security.c
-+++ b/dlls/advapi32/security.c
-@@ -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 };
--static const WCHAR Domain_Users[] = { 'D','o','m','a','i','n',' ','U','s','e','r','s',0 };
-+static const WCHAR None[] = { 'N','o','n','e',0 };
- 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 };
-@@ -1185,7 +1185,10 @@ LookupAccountSidW(
-                             ac = Domain_Admins;
-                             break;
-                         case DOMAIN_GROUP_RID_USERS:
--                            ac = Domain_Users;
-+                            /* MSDN says the name of DOMAIN_GROUP_RID_USERS is Domain Users,
-+                             * tests show that MSDN seems to be wrong. */
-+                            ac = None;
-+                            use = 2;
-                             break;
-                         case DOMAIN_GROUP_RID_GUESTS:
-                             ac = Domain_Guests;
-diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
-index 5f65ed385dd..a9d745cfe39 100644
---- a/dlls/advapi32/tests/security.c
-+++ b/dlls/advapi32/tests/security.c
-@@ -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);
-+    ok(use == SidTypeGroup, "expect SidTypeGroup, got %d\n", use);
-     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.17.1
-

patches/advapi32-LsaLookupSids/definition

@@ -1,3 +0,0 @@
-# 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 8959c13f2be7e2a31f27c8483ee2202692f00710 Mon Sep 17 00:00:00 2001
+From 2588eb4eb5fe56aca7d229ea42b0eaa3786ff600 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
@@ -14,10 +14,10 @@ Subject: [PATCH] ntdll: Add function to create new tokens for elevation
  6 files changed, 117 insertions(+)
 
 diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
-index d626e0bf2..5057e2b07 100644
+index e5db07f0a4e..d52f6b76aa4 100644
 --- a/dlls/ntdll/ntdll.spec
 +++ b/dlls/ntdll/ntdll.spec
-@@ -1556,6 +1556,9 @@
+@@ -1594,6 +1594,9 @@
  # Virtual memory
  @ cdecl __wine_locked_recvmsg(long ptr long)
  
@@ -25,27 +25,27 @@ index d626e0bf2..5057e2b07 100644
 +@ cdecl __wine_create_default_token(long)
 +
  # Version
- @ cdecl wine_get_version() NTDLL_wine_get_version
- @ cdecl wine_get_patches() NTDLL_wine_get_patches
+ @ cdecl wine_get_version()
+ @ cdecl wine_get_build_id()
 diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
-index ac1469412..6c2345c6c 100644
+index 92fcde95a8a..80be882e76d 100644
 --- a/dlls/ntdll/ntdll_misc.h
 +++ b/dlls/ntdll/ntdll_misc.h
-@@ -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;
+@@ -69,6 +69,9 @@ extern void init_locale( HMODULE module ) DECLSPEC_HIDDEN;
+ extern void init_user_process_params(void) 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);
 +
  /* server support */
- extern timeout_t server_start_time DECLSPEC_HIDDEN;
- extern unsigned int server_cpus DECLSPEC_HIDDEN;
+ extern BOOL is_wow64 DECLSPEC_HIDDEN;
+ extern NTSTATUS alloc_object_attributes( const OBJECT_ATTRIBUTES *attr, struct object_attributes **ret,
 diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c
-index 52d7ea429..e24691b8a 100644
+index 992721d133f..24cb8f53de2 100644
 --- a/dlls/ntdll/process.c
 +++ b/dlls/ntdll/process.c
-@@ -125,6 +125,24 @@ HANDLE CDECL __wine_make_process_system(void)
+@@ -82,6 +82,24 @@ HANDLE CDECL __wine_make_process_system(void)
      return ret;
  }
  
@@ -67,14 +67,14 @@ index 52d7ea429..e24691b8a 100644
 +    return ret;
 +}
 +
- static UINT process_error_mode;
- 
- #define UNIMPLEMENTED_INFO_CLASS(c) \
+ /******************************************************************************
+ *  NtQueryInformationProcess		[NTDLL.@]
+ *  ZwQueryInformationProcess		[NTDLL.@]
 diff --git a/server/protocol.def b/server/protocol.def
-index e908f2131..0177cb579 100644
+index 96bc9250ab0..14b811684d8 100644
 --- a/server/protocol.def
 +++ b/server/protocol.def
-@@ -3734,6 +3734,14 @@ struct handle_info
+@@ -3759,6 +3759,14 @@ struct handle_info
  @END
  
  
@@ -90,7 +90,7 @@ index e908f2131..0177cb579 100644
  @REQ(create_completion)
      unsigned int access;          /* desired access to a port */
 diff --git a/server/security.h b/server/security.h
-index 6c337143c..21e90ccf2 100644
+index 6c337143c3d..21e90ccf23f 100644
 --- a/server/security.h
 +++ b/server/security.h
 @@ -49,6 +49,7 @@ extern const PSID security_builtin_users_sid;
@@ -102,10 +102,10 @@ index 6c337143c..21e90ccf2 100644
  
  /* token functions */
 diff --git a/server/token.c b/server/token.c
-index 381ae6871..fcab79955 100644
+index c4f1cd943c2..970ed1838da 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
+@@ -77,6 +77,7 @@ static const SID anonymous_logon_sid = { SID_REVISION, 1, { SECURITY_NT_AUTHORIT
  static const SID authenticated_user_sid = { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_AUTHENTICATED_USER_RID } };
  static const SID local_system_sid = { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_LOCAL_SYSTEM_RID } };
  static const SID high_label_sid = { SID_REVISION, 1, { SECURITY_MANDATORY_LABEL_AUTHORITY }, { SECURITY_MANDATORY_HIGH_RID } };
@@ -113,7 +113,7 @@ index 381ae6871..fcab79955 100644
  static const SID_N(5) local_user_sid = { SID_REVISION, 5, { SECURITY_NT_AUTHORITY }, { SECURITY_NT_NON_UNIQUE, 0, 0, 0, 1000 } };
  static const SID_N(2) builtin_admins_sid = { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_ADMINS } };
  static const SID_N(2) builtin_users_sid = { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_USERS } };
-@@ -95,6 +96,7 @@ const PSID security_builtin_admins_sid = (PSID)&builtin_admins_sid;
+@@ -93,6 +94,7 @@ const PSID security_builtin_admins_sid = (PSID)&builtin_admins_sid;
  const PSID security_builtin_users_sid = (PSID)&builtin_users_sid;
  const PSID security_domain_users_sid = (PSID)&domain_users_sid;
  const PSID security_high_label_sid = (PSID)&high_label_sid;
@@ -121,7 +121,7 @@ index 381ae6871..fcab79955 100644
  
  static luid_t prev_luid_value = { 1000, 0 };
  
-@@ -917,6 +919,64 @@ struct token *token_create_admin( void )
+@@ -915,6 +917,64 @@ struct token *token_create_admin( void )
      return token;
  }
  
@@ -186,7 +186,7 @@ index 381ae6871..fcab79955 100644
  static struct privilege *token_find_privilege( struct token *token, const LUID *luid, int enabled_only )
  {
      struct privilege *privilege;
-@@ -1722,3 +1782,27 @@ DECL_HANDLER(set_token_default_dacl)
+@@ -1720,3 +1780,27 @@ DECL_HANDLER(set_token_default_dacl)
          release_object( token );
      }
  }
@@ -215,5 +215,5 @@ index 381ae6871..fcab79955 100644
 +    }
 +}
 -- 
-2.23.0
+2.27.0
 

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

@@ -1,4 +1,4 @@
-From 6a09d34647aa517e45bc0bb20a92d0d94a1da888 Mon Sep 17 00:00:00 2001
+From 1f2b1bafabfd457836f18741f178b3745e129c36 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.
@@ -12,10 +12,10 @@ Subject: [PATCH] ntdll: Implement process token elevation through manifests.
  5 files changed, 67 insertions(+)
 
 diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
-index 2f203447e..7c5dd308b 100644
+index 0c8f05285c4..92ae87c6e6d 100644
 --- a/dlls/ntdll/loader.c
 +++ b/dlls/ntdll/loader.c
-@@ -3804,6 +3804,32 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, void **entry, ULONG_PTR unknow
+@@ -3898,6 +3898,32 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, void **entry, ULONG_PTR unknow
  }
  
  
@@ -48,17 +48,17 @@ index 2f203447e..7c5dd308b 100644
  /***********************************************************************
   *           load_global_options
   */
-@@ -4233,6 +4259,7 @@ void __wine_process_init(void)
-                                       's','y','s','t','e','m','3','2','\\',
+@@ -4359,6 +4385,7 @@ void __wine_process_init(void)
                                        'k','e','r','n','e','l','3','2','.','d','l','l',0};
+     void (WINAPI *kernel32_start_process)(LPTHREAD_START_ROUTINE,void*) = NULL;
      RTL_USER_PROCESS_PARAMETERS *params;
 +    ACTIVATION_CONTEXT_RUN_LEVEL_INFORMATION runlevel;
      WINE_MODREF *wm;
      NTSTATUS status;
      ANSI_STRING func_name;
-@@ -4324,6 +4351,16 @@ void __wine_process_init(void)
+@@ -4453,6 +4480,16 @@ void __wine_process_init(void)
  
-     virtual_set_large_address_space();
+     unix_funcs->virtual_set_large_address_space();
  
 +    /* elevate process if necessary */
 +    status = RtlQueryInformationActivationContext( 0, NULL, 0, RunlevelInformationInActivationContext,
@@ -71,13 +71,13 @@ index 2f203447e..7c5dd308b 100644
 +    }
 +
      /* the main exe needs to be the first in the load order list */
-     RemoveEntryList( &wm->ldr.InLoadOrderModuleList );
-     InsertHeadList( &peb->LdrData->InLoadOrderModuleList, &wm->ldr.InLoadOrderModuleList );
+     RemoveEntryList( &wm->ldr.InLoadOrderLinks );
+     InsertHeadList( &peb->LdrData->InLoadOrderModuleList, &wm->ldr.InLoadOrderLinks );
 diff --git a/server/process.c b/server/process.c
-index 4c7da9223..d6f71a774 100644
+index ac85cace95d..52604ec4d61 100644
 --- a/server/process.c
 +++ b/server/process.c
-@@ -1107,6 +1107,14 @@ struct process_snapshot *process_snap( int *count )
+@@ -1115,6 +1115,14 @@ struct process_snapshot *process_snap( int *count )
      return snapshot;
  }
  
@@ -93,7 +93,7 @@ index 4c7da9223..d6f71a774 100644
  DECL_HANDLER(new_process)
  {
 diff --git a/server/process.h b/server/process.h
-index 5b83e111a..dfe5c4e52 100644
+index 5b83e111a6f..dfe5c4e52d8 100644
 --- a/server/process.h
 +++ b/server/process.h
 @@ -139,6 +139,7 @@ extern void kill_debugged_processes( struct thread *debugger, int exit_code );
@@ -105,10 +105,10 @@ index 5b83e111a..dfe5c4e52 100644
  /* console functions */
  extern void inherit_console( struct thread *parent_thread, struct process *parent,
 diff --git a/server/protocol.def b/server/protocol.def
-index 6022e1715..45ab670ea 100644
+index 7315f8ac4ea..901c380b721 100644
 --- a/server/protocol.def
 +++ b/server/protocol.def
-@@ -3755,6 +3755,13 @@ struct handle_info
+@@ -3763,6 +3763,13 @@ struct handle_info
  @END
  
  
@@ -123,10 +123,10 @@ index 6022e1715..45ab670ea 100644
  @REQ(create_completion)
      unsigned int access;          /* desired access to a port */
 diff --git a/server/token.c b/server/token.c
-index fcab79955..181219d21 100644
+index 970ed1838da..1c1d49989b3 100644
 --- a/server/token.c
 +++ b/server/token.c
-@@ -1806,3 +1806,17 @@ DECL_HANDLER(create_token)
+@@ -1804,3 +1804,17 @@ DECL_HANDLER(create_token)
          release_object( token );
      }
  }
@@ -145,5 +145,5 @@ index fcab79955..181219d21 100644
 +    }
 +}
 -- 
-2.24.0
+2.26.2
 

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

@@ -1,4 +1,4 @@
-From 51830c6683b199e79cb9e782ee51555054a4da7c Mon Sep 17 00:00:00 2001
+From 9c61f6acfa2c43e43f07fae1a5cd447573b9529b 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
@@ -6,20 +6,20 @@ Subject: [PATCH] server: Implement support for creating processes using a
 
 ---
  dlls/kernelbase/process.c | 24 +++++++++++++-----------
- dlls/ntdll/process.c      |  3 ++-
+ dlls/ntdll/unix/process.c |  1 +
  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(-)
+ 8 files changed, 65 insertions(+), 17 deletions(-)
 
 diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c
-index a07dddb1f..99985ab89 100644
+index a3b168543fc..b5c8b47239d 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
+@@ -244,7 +244,7 @@ static RTL_USER_PROCESS_PARAMETERS *create_process_params( const WCHAR *filename
  /***********************************************************************
   *           create_nt_process
   */
@@ -28,7 +28,7 @@ index a07dddb1f..99985ab89 100644
                                     BOOL inherit, DWORD flags, RTL_USER_PROCESS_PARAMETERS *params,
                                     RTL_USER_PROCESS_INFORMATION *info, HANDLE parent )
  {
-@@ -257,7 +257,7 @@ static NTSTATUS create_nt_process( SECURITY_ATTRIBUTES *psa, SECURITY_ATTRIBUTES
+@@ -259,7 +259,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,
@@ -37,7 +37,7 @@ index a07dddb1f..99985ab89 100644
          RtlFreeUnicodeString( &nameW );
      }
      return status;
-@@ -267,7 +267,7 @@ static NTSTATUS create_nt_process( SECURITY_ATTRIBUTES *psa, SECURITY_ATTRIBUTES
+@@ -269,7 +269,7 @@ static NTSTATUS create_nt_process( SECURITY_ATTRIBUTES *psa, SECURITY_ATTRIBUTES
  /***********************************************************************
   *           create_vdm_process
   */
@@ -46,7 +46,7 @@ index a07dddb1f..99985ab89 100644
                                      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
+@@ -290,7 +290,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 );
@@ -55,7 +55,7 @@ index a07dddb1f..99985ab89 100644
      HeapFree( GetProcessHeap(), 0, newcmdline );
      return status;
  }
-@@ -297,7 +297,7 @@ static NTSTATUS create_vdm_process( SECURITY_ATTRIBUTES *psa, SECURITY_ATTRIBUTE
+@@ -299,7 +299,7 @@ static NTSTATUS create_vdm_process( SECURITY_ATTRIBUTES *psa, SECURITY_ATTRIBUTE
  /***********************************************************************
   *           create_cmd_process
   */
@@ -64,7 +64,7 @@ index a07dddb1f..99985ab89 100644
                                      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
+@@ -318,7 +318,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 );
@@ -73,7 +73,7 @@ index a07dddb1f..99985ab89 100644
      RtlFreeHeap( GetProcessHeap(), 0, newcmdline );
      return status;
  }
-@@ -448,7 +448,9 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessInternalW( HANDLE token, const WCHAR
+@@ -450,7 +450,9 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessInternalW( HANDLE token, const WCHAR
  
      TRACE( "app %s cmdline %s\n", debugstr_w(app_name), debugstr_w(cmd_line) );
  
@@ -84,7 +84,7 @@ index a07dddb1f..99985ab89 100644
      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
+@@ -523,7 +525,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessInternalW( HANDLE token, const WCHAR
          }
      }
  
@@ -93,7 +93,7 @@ index a07dddb1f..99985ab89 100644
      switch (status)
      {
      case STATUS_SUCCESS:
-@@ -530,7 +532,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessInternalW( HANDLE token, const WCHAR
+@@ -532,7 +534,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) );
@@ -102,7 +102,7 @@ index a07dddb1f..99985ab89 100644
          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
+@@ -540,12 +542,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) );
@@ -117,21 +117,12 @@ index a07dddb1f..99985ab89 100644
          }
          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;
+diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c
+index cca6c2747bf..379a0036b63 100644
+--- a/dlls/ntdll/unix/process.c
++++ b/dlls/ntdll/unix/process.c
+@@ -827,6 +827,7 @@ NTSTATUS WINAPI NtCreateUserProcess( HANDLE *process_handle_ptr, HANDLE *thread_
+         req->access         = process_access;
          req->cpu            = pe_info.cpu;
          req->info_size      = startup_info_size;
 +        req->token          = wine_server_obj_handle( token );
@@ -139,10 +130,10 @@ index f3d9079f8..2fa553091 100644
          wine_server_add_data( req, startup_info, startup_info_size );
          wine_server_add_data( req, params->Environment, env_size );
 diff --git a/server/process.c b/server/process.c
-index d6f71a774..aa66814d8 100644
+index 52604ec4d61..047916ffd09 100644
 --- a/server/process.c
 +++ b/server/process.c
-@@ -491,7 +491,7 @@ static void start_sigkill_timer( struct process *process )
+@@ -499,7 +499,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,
@@ -151,7 +142,7 @@ index d6f71a774..aa66814d8 100644
  {
      struct process *process;
  
-@@ -568,7 +568,7 @@ struct process *create_process( int fd, struct process *parent, int inherit_all,
+@@ -576,7 +576,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 */
@@ -160,7 +151,7 @@ index d6f71a774..aa66814d8 100644
          process->affinity = parent->affinity;
      }
      if (!process->handles || !process->token) goto error;
-@@ -1124,6 +1124,7 @@ DECL_HANDLER(new_process)
+@@ -1132,6 +1132,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;
@@ -168,7 +159,7 @@ index d6f71a774..aa66814d8 100644
      struct process *parent;
      struct thread *parent_thread = current;
      int socket_fd = thread_get_inflight_fd( current, req->socket_fd );
-@@ -1177,10 +1178,39 @@ DECL_HANDLER(new_process)
+@@ -1185,10 +1186,39 @@ DECL_HANDLER(new_process)
          return;
      }
  
@@ -208,7 +199,7 @@ index d6f71a774..aa66814d8 100644
          release_object( parent );
          return;
      }
-@@ -1228,7 +1258,7 @@ DECL_HANDLER(new_process)
+@@ -1236,7 +1266,7 @@ DECL_HANDLER(new_process)
  #undef FIXUP_LEN
      }
  
@@ -217,7 +208,7 @@ index d6f71a774..aa66814d8 100644
  
      process->startup_info = (struct startup_info *)grab_object( info );
  
-@@ -1289,6 +1319,7 @@ DECL_HANDLER(new_process)
+@@ -1297,6 +1327,7 @@ DECL_HANDLER(new_process)
      reply->handle = alloc_handle_no_access_check( current->process, process, req->access, objattr->attributes );
  
   done:
@@ -225,7 +216,7 @@ index d6f71a774..aa66814d8 100644
      if (process) release_object( process );
      release_object( parent );
      release_object( info );
-@@ -1322,7 +1353,7 @@ DECL_HANDLER(exec_process)
+@@ -1330,7 +1361,7 @@ DECL_HANDLER(exec_process)
          close( socket_fd );
          return;
      }
@@ -235,7 +226,7 @@ index d6f71a774..aa66814d8 100644
      release_object( process );
  }
 diff --git a/server/process.h b/server/process.h
-index dfe5c4e52..61b83abf6 100644
+index dfe5c4e52d8..61b83abf693 100644
 --- a/server/process.h
 +++ b/server/process.h
 @@ -118,7 +118,7 @@ extern unsigned int alloc_ptid( void *ptr );
@@ -248,10 +239,10 @@ index dfe5c4e52..61b83abf6 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 45ab670ea..c763da4ca 100644
+index 901c380b721..8c86967609f 100644
 --- a/server/protocol.def
 +++ b/server/protocol.def
-@@ -791,6 +791,7 @@ struct rawinput_device
+@@ -801,6 +801,7 @@ struct rawinput_device
      unsigned int access;         /* access rights for process object */
      client_cpu_t cpu;            /* CPU that the new process will use */
      data_size_t  info_size;      /* size of startup info */
@@ -260,7 +251,7 @@ index 45ab670ea..c763da4ca 100644
      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 200c2697d..f743b720a 100644
+index 4c1f30a5fe7..321bb6cfa81 100644
 --- a/server/request.c
 +++ b/server/request.c
 @@ -582,7 +582,7 @@ static void master_socket_poll_event( struct fd *fd, int event )
@@ -273,7 +264,7 @@ index 200c2697d..f743b720a 100644
              create_thread( -1, process, NULL );
              release_object( process );
 diff --git a/server/security.h b/server/security.h
-index 21e90ccf2..32dfe5f8d 100644
+index 21e90ccf23f..32dfe5f8db9 100644
 --- a/server/security.h
 +++ b/server/security.h
 @@ -67,6 +67,8 @@ extern const ACL *token_get_default_dacl( struct token *token );
@@ -286,10 +277,10 @@ index 21e90ccf2..32dfe5f8d 100644
  static inline const ACE_HEADER *ace_next( const ACE_HEADER *ace )
  {
 diff --git a/server/token.c b/server/token.c
-index 181219d21..858ec25d7 100644
+index 1c1d49989b3..2f466aa1b25 100644
 --- a/server/token.c
 +++ b/server/token.c
-@@ -845,6 +845,12 @@ int token_assign_label( struct token *token, PSID label )
+@@ -843,6 +843,12 @@ int token_assign_label( struct token *token, PSID label )
      return ret;
  }
  
@@ -302,7 +293,7 @@ index 181219d21..858ec25d7 100644
  struct token *token_create_admin( void )
  {
      struct token *token = NULL;
-@@ -1271,6 +1277,11 @@ const SID *token_get_primary_group( struct token *token )
+@@ -1269,6 +1275,11 @@ const SID *token_get_primary_group( struct token *token )
      return token->primary_group;
  }
  
@@ -315,5 +306,5 @@ index 181219d21..858ec25d7 100644
  {
      GENERIC_MAPPING mapping;
 -- 
-2.24.0
+2.27.0
 

patches/bcrypt-ECDHSecretAgreement/0002-bcrypt-Implement-BCRYPT_KDF_HASH.patch

@@ -0,0 +1,149 @@
+From d0c4ac467f5e85e29ae407b29b6a93c85f375fd3 Mon Sep 17 00:00:00 2001
+From: Derek Lesho <dlesho@codeweavers.com>
+Date: Tue, 7 Jan 2020 14:22:49 -0600
+Subject: [PATCH] bcrypt: Implement BCRYPT_KDF_HASH.
+
+Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47699
+Signed-off-by: Derek Lesho <dlesho at codeweavers.com>
+---
+ dlls/bcrypt/bcrypt_main.c  | 110 +++++++++++++++++++++++++++++++++++++
+ dlls/bcrypt/tests/bcrypt.c |   2 +-
+ 2 files changed, 111 insertions(+), 1 deletion(-)
+
+diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
+index 15b934247d..57d552a4c0 100644
+--- a/dlls/bcrypt/bcrypt_main.c
++++ b/dlls/bcrypt/bcrypt_main.c
+@@ -1773,6 +1773,116 @@ NTSTATUS WINAPI BCryptDeriveKey(BCRYPT_SECRET_HANDLE hSecret, LPCWSTR deriv_func
+         return STATUS_INVALID_HANDLE;
+     }
+ 
++    if (flags)
++    {
++        FIXME("flags ignored: %08x\n", flags);
++    }
++
++    if (!(strcmpW(deriv_func, BCRYPT_KDF_HASH)))
++    {
++        unsigned int i;
++        BCryptBuffer *hash_algorithm = NULL;
++        BCryptBuffer *secret_prepend = NULL;
++        BCryptBuffer *secret_append = NULL;
++        enum alg_id hash_alg_id;
++        ULONG hash_length;
++        struct hash_impl hash;
++        NTSTATUS status;
++
++        if (parameter)
++        {
++            for (i = 0; i < parameter->cBuffers; i++)
++            {
++                BCryptBuffer *cur_buffer = &parameter->pBuffers[i];
++                switch(cur_buffer->BufferType)
++                {
++                case KDF_HASH_ALGORITHM:
++                    if (hash_algorithm)
++                        FIXME("Duplicate KDF_HASH_ALGORITHM, untested\n");
++                    hash_algorithm = cur_buffer;
++                    break;
++                case KDF_SECRET_PREPEND:
++                    if (secret_prepend)
++                        FIXME("Multiple prefixes unsupported\n");
++                    secret_prepend = cur_buffer;
++                    break;
++                case KDF_SECRET_APPEND:
++                    if (secret_append)
++                        FIXME("Multiple suffixes unsupported\n");
++                    secret_append = cur_buffer;
++                    break;
++                default:
++                    FIXME("Unsupported BCRYPT_KDF_HASH parameter type %x\n", cur_buffer->BufferType);
++                    break;
++                }
++            }
++        }
++
++        if (!(hash_algorithm))
++            hash_alg_id = ALG_ID_SHA1;
++        else
++        {
++            for (i = 0; i < ARRAY_SIZE( builtin_algorithms ); i++)
++            {
++                if (!strcmpW( hash_algorithm->pvBuffer, builtin_algorithms[i].name))
++                {
++                    hash_alg_id = i;
++                    break;
++                }
++            }
++            if (i == ARRAY_SIZE(builtin_algorithms))
++            {
++                WARN("Algorithm %s not found\n", debugstr_w(hash_algorithm->pvBuffer));
++                return STATUS_NOT_SUPPORTED;
++            }
++            if (builtin_algorithms[hash_alg_id].class != BCRYPT_HASH_INTERFACE)
++            {
++                return STATUS_NOT_SUPPORTED;
++            }
++        }
++
++        hash_length = builtin_algorithms[hash_alg_id].hash_length;
++
++        if (!derived)
++        {
++            *result = hash_length;
++            return STATUS_SUCCESS;
++        }
++
++        if ((status = hash_init(&hash, hash_alg_id)))
++        {
++            return status;
++        }
++
++        if (secret_prepend)
++        {
++            hash_update(&hash, hash_alg_id, secret_prepend->pvBuffer, secret_prepend->cbBuffer);
++        }
++
++        hash_update(&hash, hash_alg_id, secret->data, secret->len);
++
++        if (secret_append)
++        {
++            hash_update(&hash, hash_alg_id, secret_append->pvBuffer, secret_append->cbBuffer);
++        }
++
++        if (derived_size >= hash_length)
++        {
++            hash_finish(&hash, hash_alg_id, derived, derived_size);
++            *result = hash_length;
++        }
++        else
++        {
++            UCHAR *output = heap_alloc(hash_length);
++            hash_finish(&hash, hash_alg_id, output, hash_length);
++            memcpy(derived, output, derived_size);
++            heap_free(output);
++            *result = derived_size;
++        }
++
++        return STATUS_SUCCESS;
++    }
++    else
+     if (!(strcmpW(deriv_func, BCRYPT_KDF_RAW_SECRET)))
+     {
+         ULONG n;
+diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c
+index d9509f2c49..edc59a8a97 100644
+--- a/dlls/bcrypt/tests/bcrypt.c
++++ b/dlls/bcrypt/tests/bcrypt.c
+@@ -2084,7 +2084,7 @@ static void test_ECDH(void)
+     raw_secret_end:
+ 
+     status = pBCryptDeriveKey(secret, BCRYPT_KDF_HASH, &hash_params, NULL, 0, &size, 0);
+-    todo_wine ok (status == STATUS_SUCCESS, "got %08x\n", status);
++    ok (status == STATUS_SUCCESS, "got %08x\n", status);
+ 
+     if (status != STATUS_SUCCESS)
+     {
+-- 
+2.24.1
+