Release v5.8

Get the guard with STAGING_WRITECOPY env var back as the
patchset is currently causing some regressions.

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/Staging/0003-loader-Add-commandline-option-patches-to-show-the-pa.patch

@@ -1,4 +1,4 @@
-From fa73044dd60bae90b9a5ec850205a07579d4db17 Mon Sep 17 00:00:00 2001
+From 449d193d2cc9255387903c16fe803219fa63f29a 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
@@ -14,13 +14,14 @@ Subject: [PATCH] loader: Add commandline option --patches to show the patch
  6 files changed, 58 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c
-index bb75d9c..21e2db6 100644
+index c29a1c26c26..8906e194272 100644
 --- a/dlls/ntdll/misc.c
 +++ b/dlls/ntdll/misc.c
-@@ -61,6 +61,14 @@ const char * CDECL NTDLL_wine_get_version(void)
+@@ -60,6 +60,14 @@ const char * CDECL NTDLL_wine_get_version(void)
+     return wine_get_version();
  }
  
- /*********************************************************************
++/*********************************************************************
 + *                  wine_get_patches   (NTDLL.@)
 + */
 +const void * CDECL NTDLL_wine_get_patches(void)
@@ -28,15 +29,14 @@ index bb75d9c..21e2db6 100644
 +    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
+index 4f5fa8c21d4..f4784428e2e 100644
 --- a/dlls/ntdll/ntdll.spec
 +++ b/dlls/ntdll/ntdll.spec
-@@ -1516,6 +1516,7 @@
+@@ -1575,6 +1575,7 @@
  
  # Version
  @ cdecl wine_get_version() NTDLL_wine_get_version
@@ -45,22 +45,22 @@ index 292b0f6..fb45a94 100644
  @ 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 +74,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 407c897892d..d97d6b28bf8 100644
 --- a/loader/main.c
 +++ b/loader/main.c
-@@ -54,7 +54,8 @@ static void check_command_line( int argc, char *argv[] )
+@@ -53,7 +53,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 +99,7 @@ index f197cf8..f662912 100644
  
      if (argc <= 1)
      {
-@@ -71,6 +72,45 @@ static void check_command_line( int argc, char *argv[] )
+@@ -70,6 +71,45 @@ static void check_command_line( int argc, char *argv[] )
          printf( "%s\n", wine_get_build_id() );
          exit(0);
      }
@@ -146,5 +146,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/activeds-ADsOpenObject/0001-include-Add-adserr.h.patch

@@ -1,72 +0,0 @@
-From f517c6095f355529ccbd44585d22458fb52f9197 Mon Sep 17 00:00:00 2001
-From: Dmitry Timoshkov <dmitry@baikal.ru>
-Date: Fri, 15 Nov 2019 15:46:23 +0800
-Subject: [PATCH 1/5] include: Add adserr.h.
-Content-Type: text/plain; charset=UTF-8
-To: wine-devel@winehq.org
-
-Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru>
----
- include/adserr.h | 50 ++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 50 insertions(+)
- create mode 100644 include/adserr.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.20.1
-

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

@@ -1,161 +0,0 @@
-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

@@ -1,483 +0,0 @@
-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

@@ -1,156 +0,0 @@
-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

@@ -1,123 +0,0 @@
-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

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

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 bfd774b59dbfd3cc1f3b2d61d60797eb20654e96 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 fd60ec270ba..c50e83b5aa7 100644
 --- a/dlls/ntdll/ntdll.spec
 +++ b/dlls/ntdll/ntdll.spec
-@@ -1556,6 +1556,9 @@
+@@ -1573,6 +1573,9 @@
  # Virtual memory
  @ cdecl __wine_locked_recvmsg(long ptr long)
  
@@ -28,24 +28,24 @@ index d626e0bf2..5057e2b07 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 ac1469412..6c2345c6c 100644
+index 2e26d189a1e..6af681e5bde 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;
- extern NTSTATUS restart_process( RTL_USER_PROCESS_PARAMETERS *params, NTSTATUS status ) DECLSPEC_HIDDEN;
+@@ -104,6 +104,9 @@ extern int __wine_main_argc;
+ extern char **__wine_main_argv;
+ extern WCHAR **__wine_main_wargv;
  
 +/* 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 const char *build_dir DECLSPEC_HIDDEN;
+ extern const char *data_dir DECLSPEC_HIDDEN;
 diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c
-index 52d7ea429..e24691b8a 100644
+index d2a3421ac58..d360491e770 100644
 --- a/dlls/ntdll/process.c
 +++ b/dlls/ntdll/process.c
-@@ -125,6 +125,24 @@ HANDLE CDECL __wine_make_process_system(void)
+@@ -124,6 +124,24 @@ HANDLE CDECL __wine_make_process_system(void)
      return ret;
  }
  
@@ -71,10 +71,10 @@ index 52d7ea429..e24691b8a 100644
  
  #define UNIMPLEMENTED_INFO_CLASS(c) \
 diff --git a/server/protocol.def b/server/protocol.def
-index e908f2131..0177cb579 100644
+index f152afb97b6..68c66bc2fcb 100644
 --- a/server/protocol.def
 +++ b/server/protocol.def
-@@ -3734,6 +3734,14 @@ struct handle_info
+@@ -3754,6 +3754,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.26.2
 

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 2f03ded51b6f537ac6a4f3bfb51e1d0998a27c48 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 38c893e3eb4..d32b57612d5 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
+@@ -4045,6 +4045,32 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, void **entry, ULONG_PTR unknow
  }
  
  
@@ -48,7 +48,7 @@ index 2f203447e..7c5dd308b 100644
  /***********************************************************************
   *           load_global_options
   */
-@@ -4233,6 +4259,7 @@ void __wine_process_init(void)
+@@ -4478,6 +4504,7 @@ void __wine_process_init(void)
                                        's','y','s','t','e','m','3','2','\\',
                                        'k','e','r','n','e','l','3','2','.','d','l','l',0};
      RTL_USER_PROCESS_PARAMETERS *params;
@@ -56,7 +56,7 @@ index 2f203447e..7c5dd308b 100644
      WINE_MODREF *wm;
      NTSTATUS status;
      ANSI_STRING func_name;
-@@ -4324,6 +4351,16 @@ void __wine_process_init(void)
+@@ -4575,6 +4602,16 @@ void __wine_process_init(void)
  
      virtual_set_large_address_space();
  
@@ -71,10 +71,10 @@ 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 4c7da9223c1..d6f71a774f3 100644
 --- a/server/process.c
 +++ b/server/process.c
 @@ -1107,6 +1107,14 @@ struct process_snapshot *process_snap( int *count )
@@ -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 68c66bc2fcb..55c821ac1e2 100644
 --- a/server/protocol.def
 +++ b/server/protocol.def
-@@ -3755,6 +3755,13 @@ struct handle_info
+@@ -3762,6 +3762,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.0