Release v5.5

This causes wine-protocol-* to be created, and thus any
http/https/ftp will routed via wine.

LICENSE.md

@@ -9,7 +9,7 @@ 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, Zebediah Figura
-Copyright (C) 2019 Alistair Leslie-Hughes, Zebediah Figura, Paul Gofman
+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

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 d216f85a593a09e7983d9178fb3e1f20bfcf08cc 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 c29a1c26c..8906e1942 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 7aa953ca6..cf7d5b6f9 100644
 --- a/dlls/ntdll/ntdll.spec
 +++ b/dlls/ntdll/ntdll.spec
-@@ -1516,6 +1516,7 @@
+@@ -1566,6 +1566,7 @@
  
  # Version
  @ cdecl wine_get_version() NTDLL_wine_get_version
@@ -45,10 +45,10 @@ 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 a6fe28059..511bf4722 100644
 --- a/include/wine/library.h
 +++ b/include/wine/library.h
-@@ -43,6 +43,7 @@ extern const char *wine_get_data_dir(void);
+@@ -47,6 +47,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);
  extern const char *wine_get_version(void);
@@ -57,10 +57,10 @@ index 242bb69..fae73fe 100644
  extern void wine_init_argv0_path( const char *argv0 );
  extern void wine_exec_wine_binary( const char *name, char **argv, const char *env_var );
 diff --git a/libs/wine/config.c b/libs/wine/config.c
-index 3c9110b..5da6263 100644
+index 2a3314cbf..5b66c063d 100644
 --- a/libs/wine/config.c
 +++ b/libs/wine/config.c
-@@ -522,6 +522,12 @@ const char *wine_get_version(void)
+@@ -504,6 +504,12 @@ const char *wine_get_version(void)
      return PACKAGE_VERSION;
  }
  
@@ -74,19 +74,19 @@ 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 3f2c430fa..ca46979f5 100644
 --- a/libs/wine/wine.map
 +++ b/libs/wine/wine.map
-@@ -90,6 +90,7 @@ WINE_1.0
+@@ -28,6 +28,7 @@ WINE_1.0
      wine_get_ss;
      wine_get_user_name;
      wine_get_version;
 +    wine_get_patches;
      wine_init;
      wine_init_argv0_path;
-     wine_is_dbcs_leadbyte;
+     wine_ldt_alloc_entries;
 diff --git a/loader/main.c b/loader/main.c
-index f197cf8..f662912 100644
+index f197cf802..f6629128d 100644
 --- a/loader/main.c
 +++ b/loader/main.c
 @@ -54,7 +54,8 @@ static void check_command_line( int argc, char *argv[] )
@@ -146,5 +146,5 @@ index f197cf8..f662912 100644
  
  
 -- 
-1.9.1
+2.25.0
 

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

@@ -1,21 +1,21 @@
-From 9618572cf2eace39198fb83b747a70d1865015e3 Mon Sep 17 00:00:00 2001
+From df12fdb8d4cdf11d9f72a068923a5b0097e36bdb 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/config.c     | 124 +++++++++++++++++++++++++++++++++++++++++
+ libs/wine/loader.c     |  36 ++++++++++++
  libs/wine/wine.map     |   2 +
- loader/main.c          |  50 +++++++++++++++++++-
+ 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
+index 511bf4722a0..557cec20cf8 100644
 --- a/include/wine/library.h
 +++ b/include/wine/library.h
-@@ -40,6 +40,7 @@ extern "C" {
+@@ -44,6 +44,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);
@@ -23,7 +23,7 @@ index fae73fe..7395a11 100644
  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
+@@ -56,6 +57,7 @@ extern void wine_exec_wine_binary( const char *name, char **argv, const char *en
  
  typedef void (*load_dll_callback_t)( void *, const char * );
  
@@ -32,10 +32,10 @@ index fae73fe..7395a11 100644
  extern void *wine_dlsym( void *handle, const char *symbol, char *error, size_t errorsize );
  extern int wine_dlclose( void *handle, char *error, size_t errorsize );
 diff --git a/libs/wine/config.c b/libs/wine/config.c
-index 5da6263..6cedfb7 100644
+index 5b66c063db6..e0988513e14 100644
 --- a/libs/wine/config.c
 +++ b/libs/wine/config.c
-@@ -488,6 +488,130 @@ const char *wine_get_build_dir(void)
+@@ -470,6 +470,130 @@ const char *wine_get_build_dir(void)
      return build_dir;
  }
  
@@ -167,13 +167,14 @@ index 5da6263..6cedfb7 100644
  const char *wine_get_server_dir(void)
  {
 diff --git a/libs/wine/loader.c b/libs/wine/loader.c
-index 649aa22..367dde3 100644
+index 2a569f5b739..5f10c3f9d3e 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
+@@ -1072,6 +1072,42 @@ void *wine_dlopen( const char *filename, int flag, char *error, size_t errorsize
+     return ret;
  }
  
- /***********************************************************************
++/***********************************************************************
 + *      wine_dladdr
 + */
 +int wine_dladdr( void *addr, void *info, char *error, size_t errorsize )
@@ -209,32 +210,31 @@ index 649aa22..367dde3 100644
 +#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
+index ca46979f5b9..22a4e73b05b 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;
+@@ -9,6 +9,7 @@ WINE_1.0
+     wine_anon_mmap;
+     wine_casemap_lower;
+     wine_casemap_upper;
 +    wine_dladdr;
      wine_dlclose;
      wine_dll_enum_load_path;
-     wine_dll_get_owner;
-@@ -85,6 +86,7 @@ WINE_1.0
+     wine_dll_set_callback;
+@@ -24,6 +25,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;
+     wine_get_user_name;
 diff --git a/loader/main.c b/loader/main.c
-index f662912..a2dc40c 100644
+index d97d6b28bf8..49dc996e354 100644
 --- a/loader/main.c
 +++ b/loader/main.c
 @@ -36,6 +36,12 @@
@@ -247,10 +247,10 @@ index f662912..a2dc40c 100644
 +#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[] )
+ #include "main.h"
+@@ -54,7 +60,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"
@@ -260,7 +260,7 @@ index f662912..a2dc40c 100644
  
      if (argc <= 1)
      {
-@@ -111,6 +118,47 @@ static void check_command_line( int argc, char *argv[] )
+@@ -110,6 +117,47 @@ static void check_command_line( int argc, char *argv[] )
  
          exit(0);
      }
@@ -309,5 +309,5 @@ index f662912..a2dc40c 100644
  
  
 -- 
-1.9.1
+2.25.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/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
+

patches/bcrypt-ECDHSecretAgreement/definition

@@ -0,0 +1,2 @@
+Fixes: [47699] Multiple games fail to connect to online services (missing BCryptSecretAgreement / BCryptDeriveKey implementation)
+

patches/cmd-launch-association/definition

@@ -1,2 +1 @@
 Fixes: [18154] cmd: Support for launching programs based on file association
-# Fixes: [36646]

patches/combase-GetRestrictedErrorInfo/0002-combase-Add-GetRestrictedErrorInfo-and-RoOriginateLa.patch

@@ -1,105 +0,0 @@
-From 61b96f3dab24d3aec26237c8760d75f964474bc5 Mon Sep 17 00:00:00 2001
-From: Louis Lenders <xerox.xerox2000x@gmail.com>
-Date: Mon, 8 Apr 2019 17:06:58 +0200
-Subject: [PATCH 2/2] combase: Add GetRestrictedErrorInfo and
- RoOriginateLanguageException stubs.
-
-Signed-off-by: Louis Lenders <xerox.xerox2000x@gmail.com>
----
- .../api-ms-win-core-winrt-error-l1-1-0.spec           |  2 +-
- .../api-ms-win-core-winrt-error-l1-1-1.spec           |  4 ++--
- dlls/combase/combase.spec                             |  4 ++--
- dlls/combase/roapi.c                                  | 19 +++++++++++++++++++
- 4 files changed, 24 insertions(+), 5 deletions(-)
-
-diff --git a/dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec b/dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec
-index de0a6d8..99f1ca3 100644
---- a/dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec
-+++ b/dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec
-@@ -1,4 +1,4 @@
--@ stub GetRestrictedErrorInfo
-+@ stdcall GetRestrictedErrorInfo(ptr) combase.GetRestrictedErrorInfo
- @ stub RoCaptureErrorContext
- @ stub RoFailFastWithErrorContext
- @ stub RoGetErrorReportingFlags
-diff --git a/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec b/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec
-index b1ad813..0b390f1 100644
---- a/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec
-+++ b/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec
-@@ -1,4 +1,4 @@
--@ stub GetRestrictedErrorInfo
-+@ stdcall GetRestrictedErrorInfo(ptr) combase.GetRestrictedErrorInfo
- @ stub IsErrorPropagationEnabled
- @ stub RoCaptureErrorContext
- @ stub RoClearError
-@@ -9,7 +9,7 @@
- @ stub RoInspectThreadErrorInfo
- @ stub RoOriginateError
- @ stub RoOriginateErrorW
--@ stub RoOriginateLanguageException
-+@ stdcall RoOriginateLanguageException(long ptr ptr) combase.RoOriginateLanguageException
- @ stub RoReportFailedDelegate
- @ stub RoReportUnhandledError
- @ stub RoResolveRestrictedErrorInfoReference
-diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec
-index 93575d5..f67527a 100644
---- a/dlls/combase/combase.spec
-+++ b/dlls/combase/combase.spec
-@@ -180,7 +180,7 @@
- @ stub GetFuncDescs
- @ stdcall GetHGlobalFromStream(ptr ptr) ole32.GetHGlobalFromStream
- @ stub GetHookInterface
--@ stub GetRestrictedErrorInfo
-+@ stdcall GetRestrictedErrorInfo(ptr)
- @ stub HSTRING_UserFree
- @ stub HSTRING_UserFree64
- @ stub HSTRING_UserMarshal
-@@ -260,7 +260,7 @@
- @ stub RoInspectThreadErrorInfo
- @ stub RoOriginateError
- @ stub RoOriginateErrorW
--@ stub RoOriginateLanguageException
-+@ stdcall RoOriginateLanguageException(long ptr ptr)
- @ stub RoParameterizedTypeExtraGetTypeSignature
- @ stdcall RoRegisterActivationFactories(ptr ptr long ptr)
- @ stdcall RoRegisterForApartmentShutdown(ptr ptr ptr)
-diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c
-index c9fe80f..2a6dcdf 100644
---- a/dlls/combase/roapi.c
-+++ b/dlls/combase/roapi.c
-@@ -21,6 +21,7 @@
- #include "initguid.h"
- #include "roapi.h"
- #include "roparameterizediid.h"
-+#include "restrictederrorinfo.h"
- #include "winstring.h"
- 
- #include "wine/debug.h"
-@@ -276,6 +277,24 @@ HRESULT WINAPI RoRegisterActivationFactories(HSTRING *classes, PFNGETACTIVATIONF
- }
- 
- /***********************************************************************
-+ *      GetRestrictedErrorInfo (combase.@)
-+ */
-+HRESULT WINAPI GetRestrictedErrorInfo( IRestrictedErrorInfo **info )
-+{
-+    FIXME( "(%p)\n", info );
-+    return E_NOTIMPL;
-+}
-+
-+/***********************************************************************
-+ *      RoOriginateLanguageException (combase.@)
-+ */
-+BOOL WINAPI RoOriginateLanguageException( HRESULT error, HSTRING message, IUnknown *language_exception )
-+{
-+    FIXME("(%x %s %p) stub\n", error, debugstr_hstring(message), language_exception);
-+    return FALSE;
-+}
-+
-+/***********************************************************************
-  *      CleanupTlsOleState (combase.@)
-  */
- void WINAPI CleanupTlsOleState(void *unknown)
--- 
-1.9.1
-