Release v4.2

This patch has caused a disproportionate amount of annoyance during
rebases, and this is only likely to increase. On top of this it is not
an especially good way to structure things; switching between
interfaces is something best done within one DLL.

patches/Compiler_Warnings/0026-dwrite-Avoid-implicit-cast-of-interface-pointer.patch

@@ -1,7 +1,7 @@
-From 744549e1ecc76c3764079d337c09445d01a3527e Mon Sep 17 00:00:00 2001
+From 5e4c31d0796f2e559889d4f84cdb571130217e7d Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Tue, 22 Mar 2016 21:58:40 +0100
-Subject: dwrite: Avoid implicit cast of interface pointer.
+Subject: [PATCH] dwrite: Avoid implicit cast of interface pointer.
 
 ---
  dlls/dwrite/font.c   | 4 ++--
@@ -9,10 +9,10 @@ Subject: dwrite: Avoid implicit cast of interface pointer.
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c
-index d9ddce0..0a90c20 100644
+index f50133d..1bc7b59 100644
 --- a/dlls/dwrite/font.c
 +++ b/dlls/dwrite/font.c
-@@ -1684,7 +1684,7 @@ static struct dwrite_font *unsafe_impl_from_IDWriteFont(IDWriteFont *iface)
+@@ -1815,7 +1815,7 @@ static struct dwrite_font *unsafe_impl_from_IDWriteFont(IDWriteFont *iface)
      if (!iface)
          return NULL;
      assert(iface->lpVtbl == (IDWriteFontVtbl*)&dwritefontvtbl);
@@ -20,8 +20,8 @@ index d9ddce0..0a90c20 100644
 +    return CONTAINING_RECORD((IDWriteFont3 *)iface, struct dwrite_font, IDWriteFont3_iface);
  }
  
- static struct dwrite_fontface *unsafe_impl_from_IDWriteFontFace(IDWriteFontFace *iface)
-@@ -1692,7 +1692,7 @@ static struct dwrite_fontface *unsafe_impl_from_IDWriteFontFace(IDWriteFontFace
+ struct dwrite_fontface *unsafe_impl_from_IDWriteFontFace(IDWriteFontFace *iface)
+@@ -1823,7 +1823,7 @@ struct dwrite_fontface *unsafe_impl_from_IDWriteFontFace(IDWriteFontFace *iface)
      if (!iface)
          return NULL;
      assert(iface->lpVtbl == (IDWriteFontFaceVtbl*)&dwritefontfacevtbl);
@@ -31,10 +31,10 @@ index d9ddce0..0a90c20 100644
  
  void get_logfont_from_font(IDWriteFont *iface, LOGFONTW *lf)
 diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c
-index 706ed4e..c76a909 100644
+index f27fe9f..ee1eb5a 100644
 --- a/dlls/dwrite/layout.c
 +++ b/dlls/dwrite/layout.c
-@@ -5196,7 +5196,7 @@ static const IDWriteTextFormat2Vtbl dwritetextformatvtbl = {
+@@ -5622,7 +5622,7 @@ static const IDWriteTextFormat2Vtbl dwritetextformatvtbl = {
  static struct dwrite_textformat *unsafe_impl_from_IDWriteTextFormat(IDWriteTextFormat *iface)
  {
      return (iface->lpVtbl == (IDWriteTextFormatVtbl*)&dwritetextformatvtbl) ?
@@ -44,5 +44,5 @@ index 706ed4e..c76a909 100644
  
  HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *collection, DWRITE_FONT_WEIGHT weight, DWRITE_FONT_STYLE style,
 -- 
-2.9.0
+1.9.1
 

patches/Compiler_Warnings/0031-include-Check-element-type-in-CONTAINING_RECORD-and-.patch

@@ -1,8 +1,8 @@
-From 42dbdf9479e2e09734fa183b854d5ddfe987f203 Mon Sep 17 00:00:00 2001
+From 494fc3abe1eddabcf7cede677ee907284e89eea8 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Tue, 22 Mar 2016 23:08:30 +0100
-Subject: [PATCH] include: Check element type in CONTAINING_RECORD and
- similar macros.
+Subject: [PATCH] include: Check element type in CONTAINING_RECORD and similar
+ macros.
 
 ---
  include/wine/list.h   | 10 ++++++++--
@@ -11,7 +11,7 @@ Subject: [PATCH] include: Check element type in CONTAINING_RECORD and
  3 files changed, 24 insertions(+), 6 deletions(-)
 
 diff --git a/include/wine/list.h b/include/wine/list.h
-index b4d681f..287ad39 100644
+index b4d681fe..287ad394 100644
 --- a/include/wine/list.h
 +++ b/include/wine/list.h
 @@ -228,7 +228,13 @@ static inline void list_move_head( struct list *dst, struct list *src )
@@ -31,7 +31,7 @@ index b4d681f..287ad39 100644
  
  #endif  /* __WINE_SERVER_LIST_H */
 diff --git a/include/wine/rbtree.h b/include/wine/rbtree.h
-index dc50b5e..8130deb 100644
+index dc50b5e7..8130deb5 100644
 --- a/include/wine/rbtree.h
 +++ b/include/wine/rbtree.h
 @@ -23,8 +23,14 @@
@@ -52,12 +52,12 @@ index dc50b5e..8130deb 100644
  struct wine_rb_entry
  {
 diff --git a/include/winnt.h b/include/winnt.h
-index 7f822c4..ccfe73b 100644
+index 2b489382..a156efc4 100644
 --- a/include/winnt.h
 +++ b/include/winnt.h
-@@ -756,8 +756,14 @@ typedef struct _MEMORY_BASIC_INFORMATION
- 
- #define FIELD_OFFSET(type, field) ((LONG)offsetof(type, field))
+@@ -760,8 +760,14 @@ typedef struct _MEMORY_BASIC_INFORMATION
+ #define RTL_FIELD_SIZE(type, field) (sizeof(((type *)0)->field))
+ #define RTL_SIZEOF_THROUGH_FIELD(type, field) (FIELD_OFFSET(type, field) + RTL_FIELD_SIZE(type, field))
  
 -#define CONTAINING_RECORD(address, type, field) \
 -  ((type *)((PCHAR)(address) - offsetof(type, field)))
@@ -73,5 +73,5 @@ index 7f822c4..ccfe73b 100644
  #ifdef __WINESRC__
  # define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 -- 
-1.9.1
+2.20.1
 

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

@@ -1,25 +1,25 @@
-From 2e1a505fedd43f0f03ba36e1a8413bf04f8afa83 Mon Sep 17 00:00:00 2001
+From 05ca39b029f8f710ca53aeafc36384fd39fd6b89 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Thu, 2 Oct 2014 19:53:46 +0200
-Subject: winelib: Append '(Staging)' at the end of the version string.
+Subject: [PATCH] winelib: Append '(Staging)' at the end of the version string.
 
 ---
  libs/wine/Makefile.in | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in
-index 1b7fea8..780be10 100644
+index 4833eb5..3cfa4f4 100644
 --- a/libs/wine/Makefile.in
 +++ b/libs/wine/Makefile.in
-@@ -112,7 +112,7 @@ libwine_LDFLAGS = $(LIBWINE_LDFLAGS)
+@@ -31,7 +31,7 @@ libwine_LDFLAGS = $(LIBWINE_LDFLAGS)
  libwine_DEPS = $(LIBWINE_DEPENDS)
  
  version.c: dummy
--	version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-$(PACKAGE_VERSION)") | sed -n -e '$$s/\(.*\)/const char wine_build[] = "\1";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || ($(RM) $@ && exit 1)
-+	version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-$(PACKAGE_VERSION)") | sed -n -e '$$s/\(.*\)/const char wine_build[] = "\1  (Staging)";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || ($(RM) $@ && exit 1)
+-	version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-$(PACKAGE_VERSION)") | sed -n -e '$$s/\(.*\)/const char wine_build[] = "\1";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || (rm -f $@ && exit 1)
++	version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-$(PACKAGE_VERSION)") | sed -n -e '$$s/\(.*\)/const char wine_build[] = "\1  (Staging)";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || (rm -f $@ && exit 1)
  
  dummy:
  .PHONY: dummy
 -- 
-2.6.2
+1.9.1
 

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

@@ -1,28 +1,23 @@
-From b4a2543264f9eb91fc259a81dea872eee3c14aba Mon Sep 17 00:00:00 2001
+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 | 27 ++++++++++++++++++++++++++-
- 1 file changed, 26 insertions(+), 1 deletion(-)
+ loader/main.c | 30 +++++++++++++++++++++++++++++-
+ 1 file changed, 29 insertions(+), 1 deletion(-)
 
 diff --git a/loader/main.c b/loader/main.c
-index 44804e1..4d9126e 100644
+index a2dc40c51c..1642fb0965 100644
 --- a/loader/main.c
 +++ b/loader/main.c
-@@ -48,6 +48,7 @@
- #include "main.h"
+@@ -50,6 +50,30 @@
+ /* the preloader will set this variable */
+ const struct wine_preload_info *wine_main_preload_info = NULL;
  
- #ifdef __APPLE__
++#ifdef __APPLE__
 +#include <mach-o/dyld.h>
- 
- #ifndef __clang__
- __asm__(".zerofill WINE_DOS, WINE_DOS, ___wine_dos, 0x40000000");
-@@ -73,6 +74,26 @@ static inline void reserve_area( void *addr, size_t size )
-     wine_mmap_add_reserved_area( addr, size );
- }
- 
++
 +static const char *get_macho_library_path( const char *libname )
 +{
 +    unsigned int path_len, libname_len = strlen( libname );
@@ -30,7 +25,7 @@ index 44804e1..4d9126e 100644
 +
 +    for (i = 0; i < count; i++)
 +    {
-+        const char *path = _dyld_get_image_name( i );
++       const char *path = _dyld_get_image_name( i );
 +        if (!path) continue;
 +
 +        path_len = strlen( path );
@@ -42,11 +37,12 @@ index 44804e1..4d9126e 100644
 +    }
 +    return NULL;
 +}
++#endif
 +
- #else  /* __APPLE__ */
- 
- /* the preloader will set this variable */
-@@ -181,7 +202,11 @@ static void check_command_line( int argc, char *argv[] )
+ /***********************************************************************
+  *           check_command_line
+  *
+@@ -146,7 +170,11 @@ static void check_command_line( int argc, char *argv[] )
                  else
              #endif
                  {
@@ -60,5 +56,5 @@ index 44804e1..4d9126e 100644
                  wine_dlclose( lib_handle, NULL, 0 );
              }
 -- 
-2.4.3
+2.14.1
 

patches/advapi32-RegLoadAppKey/0001-advapi32-Add-RegLoadAppKeyA-RegLoadAppKeyW-stubs.patch

@@ -0,0 +1,125 @@
+From 2b29014573fcb38388dd82e33fa16f67b1a43a8c Mon Sep 17 00:00:00 2001
+From: Austin English <austinenglish@gmail.com>
+Date: Sun, 23 Oct 2016 16:15:45 -0500
+Subject: [PATCH] advapi32: Add RegLoadAppKeyA/RegLoadAppKeyW stubs
+
+Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41591
+Signed-off-by: Austin English <austinenglish@gmail.com>
+---
+ dlls/advapi32/advapi32.spec                        |  4 ++--
+ dlls/advapi32/registry.c                           | 24 ++++++++++++++++++++++
+ .../api-ms-win-core-registry-l1-1-0.spec           |  4 ++--
+ .../api-ms-win-downlevel-advapi32-l1-1-0.spec      |  4 ++--
+ dlls/kernelbase/kernelbase.spec                    |  4 ++--
+ include/winreg.h                                   |  3 +++
+ 6 files changed, 35 insertions(+), 8 deletions(-)
+
+diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec
+index e870a5d..042a523 100644
+--- a/dlls/advapi32/advapi32.spec
++++ b/dlls/advapi32/advapi32.spec
+@@ -648,8 +648,8 @@
+ @ stdcall RegGetKeySecurity(long long ptr ptr)
+ @ stdcall RegGetValueA(long str str long ptr ptr ptr)
+ @ stdcall RegGetValueW(long wstr wstr long ptr ptr ptr)
+-# @ stub RegLoadAppKeyA
+-# @ stub RegLoadAppKeyW
++@ stdcall RegLoadAppKeyA(str ptr long long long)
++@ stdcall RegLoadAppKeyW(wstr ptr long long long)
+ @ stdcall RegLoadKeyA(long str str)
+ @ stdcall RegLoadKeyW(long wstr wstr)
+ @ stdcall RegLoadMUIStringA(long str str long ptr long str)
+diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c
+index 3018372..55df6de 100644
+--- a/dlls/advapi32/registry.c
++++ b/dlls/advapi32/registry.c
+@@ -3513,3 +3513,27 @@ LONG WINAPI RegDisableReflectionKey(HKEY base)
+     FIXME("%p: stub\n", base);
+     return ERROR_SUCCESS;
+ }
++
++/******************************************************************************
++ * RegLoadAppKeyA [ADVAPI32.@]
++ *
++ */
++LSTATUS WINAPI RegLoadAppKeyA(const char *file, HKEY *result, REGSAM sam, DWORD options, DWORD reserved)
++{
++    FIXME("%s %p %u %u %u: stub\n", wine_dbgstr_a(file), result, sam, options, reserved);
++
++    *result = (HKEY)0xbeefcafe;
++    return ERROR_SUCCESS;
++}
++
++/******************************************************************************
++ * RegLoadAppKeyW [ADVAPI32.@]
++ *
++ */
++LSTATUS WINAPI RegLoadAppKeyW(const WCHAR *file, HKEY *result, REGSAM sam, DWORD options, DWORD reserved)
++{
++    FIXME("%s %p %u %u %u: stub\n", wine_dbgstr_w(file), result, sam, options, reserved);
++
++    *result = (HKEY)0xbeefcafe;
++    return ERROR_SUCCESS;
++}
+diff --git a/dlls/api-ms-win-core-registry-l1-1-0/api-ms-win-core-registry-l1-1-0.spec b/dlls/api-ms-win-core-registry-l1-1-0/api-ms-win-core-registry-l1-1-0.spec
+index 7a48e3b..f81f027 100644
+--- a/dlls/api-ms-win-core-registry-l1-1-0/api-ms-win-core-registry-l1-1-0.spec
++++ b/dlls/api-ms-win-core-registry-l1-1-0/api-ms-win-core-registry-l1-1-0.spec
+@@ -17,8 +17,8 @@
+ @ stdcall RegGetKeySecurity(long long ptr ptr) advapi32.RegGetKeySecurity
+ @ stdcall RegGetValueA(long str str long ptr ptr ptr) advapi32.RegGetValueA
+ @ stdcall RegGetValueW(long wstr wstr long ptr ptr ptr) advapi32.RegGetValueW
+-@ stub RegLoadAppKeyA
+-@ stub RegLoadAppKeyW
++@ stdcall RegLoadAppKeyA(str ptr long long long) advapi32.RegLoadAppKeyA
++@ stdcall RegLoadAppKeyW(wstr ptr long long long) advapi32.RegLoadAppKeyW
+ @ stdcall RegLoadKeyA(long str str) advapi32.RegLoadKeyA
+ @ stdcall RegLoadKeyW(long wstr wstr) advapi32.RegLoadKeyW
+ @ stdcall RegLoadMUIStringA(long str str long ptr long str) advapi32.RegLoadMUIStringA
+diff --git a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec
+index 5bdad41..b2dcc17 100644
+--- a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec
++++ b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec
+@@ -102,8 +102,8 @@
+ @ stdcall RegGetKeySecurity(long long ptr ptr) advapi32.RegGetKeySecurity
+ @ stdcall RegGetValueA(long str str long ptr ptr ptr) advapi32.RegGetValueA
+ @ stdcall RegGetValueW(long wstr wstr long ptr ptr ptr) advapi32.RegGetValueW
+-@ stub RegLoadAppKeyA
+-@ stub RegLoadAppKeyW
++@ stdcall RegLoadAppKeyA(str ptr long long long) advapi32.RegLoadAppKeyA
++@ stdcall RegLoadAppKeyW(wstr ptr long long long) advapi32.RegLoadAppKeyW
+ @ stdcall RegLoadKeyA(long str str) advapi32.RegLoadKeyA
+ @ stdcall RegLoadKeyW(long wstr wstr) advapi32.RegLoadKeyW
+ @ stdcall RegLoadMUIStringA(long str str long ptr long str) advapi32.RegLoadMUIStringA
+diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec
+index 286dae0..c114622 100644
+--- a/dlls/kernelbase/kernelbase.spec
++++ b/dlls/kernelbase/kernelbase.spec
+@@ -1288,8 +1288,8 @@
+ # @ stub RegKrnResetAppKeyLoaded
+ # @ stub RegKrnSetDllHasThreadStateGlobal
+ # @ stub RegKrnSetTermsrvRegistryExtensionFlags
+-# @ stub RegLoadAppKeyA
+-# @ stub RegLoadAppKeyW
++@ stdcall RegLoadAppKeyA(str ptr long long long) advapi32.RegLoadAppKeyA
++@ stdcall RegLoadAppKeyW(wstr ptr long long long) advapi32.RegLoadAppKeyW
+ @ stdcall -private RegLoadKeyA(long str str) kernel32.RegLoadKeyA
+ @ stdcall -private RegLoadKeyW(long wstr wstr) kernel32.RegLoadKeyW
+ @ stdcall -private RegLoadMUIStringA(long str str long ptr long str) kernel32.RegLoadMUIStringA
+diff --git a/include/winreg.h b/include/winreg.h
+index 51e9f02..5656eec 100644
+--- a/include/winreg.h
++++ b/include/winreg.h
+@@ -133,6 +133,9 @@ WINADVAPI LSTATUS   WINAPI RegGetKeySecurity(HKEY,SECURITY_INFORMATION,PSECURITY
+ WINADVAPI LSTATUS   WINAPI RegGetValueA(HKEY,LPCSTR,LPCSTR,DWORD,LPDWORD,PVOID,LPDWORD);
+ WINADVAPI LSTATUS   WINAPI RegGetValueW(HKEY,LPCWSTR,LPCWSTR,DWORD,LPDWORD,PVOID,LPDWORD);
+ #define                    RegGetValue WINELIB_NAME_AW(RegGetValue)
++WINADVAPI LSTATUS   WINAPI RegLoadAppKeyA(const char*,HKEY*,REGSAM,DWORD,DWORD);
++WINADVAPI LSTATUS   WINAPI RegLoadAppKeyW(const WCHAR*,HKEY*,REGSAM,DWORD,DWORD);
++#define                    RegLoadAppKey WINELIB_NAME_AW(RegLoadAppKey)
+ WINADVAPI LSTATUS   WINAPI RegLoadKeyA(HKEY,LPCSTR,LPCSTR);
+ WINADVAPI LSTATUS   WINAPI RegLoadKeyW(HKEY,LPCWSTR,LPCWSTR);
+ #define                    RegLoadKey WINELIB_NAME_AW(RegLoadKey)
+-- 
+1.9.1
+

patches/advapi32-RegLoadAppKey/definition

@@ -0,0 +1 @@
+Fixes: [41591] advapi32: Add RegLoadAppKeyA/RegLoadAppKeyW stubs

patches/advapi32-Token_Integrity_Level/0004-server-Implement-token-integrity-level.patch

@@ -1,4 +1,4 @@
-From 7d07ac217db0b5226fed0b7233fdb21ef70b0cc9 Mon Sep 17 00:00:00 2001
+From ae503e8e7eb8f4fcb9bf3e642458c2a1bba6ccaa Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Mon, 7 Aug 2017 02:28:35 +0200
 Subject: [PATCH] server: Implement token integrity level.
@@ -10,19 +10,19 @@ Subject: [PATCH] server: Implement token integrity level.
  3 files changed, 48 insertions(+), 12 deletions(-)
 
 diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c
-index b1dd999cf5..249b715da3 100644
+index ca26ab15..8aab0a48 100644
 --- a/dlls/ntdll/nt.c
 +++ b/dlls/ntdll/nt.c
 @@ -400,7 +400,7 @@ NTSTATUS WINAPI NtQueryInformationToken(
          0,    /* TokenAccessInformation */
          0,    /* TokenVirtualizationAllowed */
-         0,    /* TokenVirtualizationEnabled */
+         sizeof(DWORD), /* TokenVirtualizationEnabled */
 -        sizeof(TOKEN_MANDATORY_LABEL) + sizeof(SID), /* TokenIntegrityLevel [sizeof(SID) includes one SubAuthority] */
 +        0,    /* TokenIntegrityLevel */
          0,    /* TokenUIAccess */
          0,    /* TokenMandatoryPolicy */
          0,    /* TokenLogonSid */
-@@ -653,18 +653,23 @@ NTSTATUS WINAPI NtQueryInformationToken(
+@@ -659,18 +659,23 @@ NTSTATUS WINAPI NtQueryInformationToken(
          }
          break;
      case TokenIntegrityLevel:
@@ -55,7 +55,7 @@ index b1dd999cf5..249b715da3 100644
      case TokenAppContainerSid:
          {
 diff --git a/server/protocol.def b/server/protocol.def
-index 93afaabca1..685f69f4e2 100644
+index 11221d7d..1bfe3234 100644
 --- a/server/protocol.def
 +++ b/server/protocol.def
 @@ -3405,6 +3405,13 @@ enum caret_state
@@ -73,7 +73,7 @@ index 93afaabca1..685f69f4e2 100644
      obj_handle_t    handle;       /* handle to the token */
  @REPLY
 diff --git a/server/token.c b/server/token.c
-index e97c460ae0..fb40c1b551 100644
+index ccde0c2d..2d81118a 100644
 --- a/server/token.c
 +++ b/server/token.c
 @@ -113,6 +113,7 @@ struct token
@@ -112,7 +112,7 @@ index e97c460ae0..fb40c1b551 100644
      if (!token) return token;
  
      /* copy groups */
-@@ -891,7 +895,7 @@ struct token *token_create_admin( void )
+@@ -890,7 +894,7 @@ struct token *token_create_admin( void )
          static const TOKEN_SOURCE admin_source = {"SeMgr", {0, 0}};
          token = create_token( TRUE, user_sid, admin_groups, ARRAY_SIZE( admin_groups ),
                                admin_privs, ARRAY_SIZE( admin_privs ), default_dacl,
@@ -121,7 +121,7 @@ index e97c460ae0..fb40c1b551 100644
          /* we really need a primary group */
          assert( token->primary_group );
      }
-@@ -1525,6 +1529,26 @@ DECL_HANDLER(get_token_sid)
+@@ -1524,6 +1528,26 @@ DECL_HANDLER(get_token_sid)
      }
  }
  

patches/advapi32-Token_Integrity_Level/0006-ntdll-Add-function-to-create-new-tokens-for-elevatio.patch

@@ -1,4 +1,4 @@
-From d67d7293a17592b580d284fa68881a613e61f591 Mon Sep 17 00:00:00 2001
+From f94296129eb249a04ccb012a10f50b79fb0a631a 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 dbead5e..586b504 100644
+index 969cee7..008abb7 100644
 --- a/dlls/ntdll/ntdll.spec
 +++ b/dlls/ntdll/ntdll.spec
-@@ -1482,6 +1482,9 @@
+@@ -1508,6 +1508,9 @@
  # Virtual memory
  @ cdecl __wine_locked_recvmsg(long ptr long)
  
@@ -28,12 +28,12 @@ index dbead5e..586b504 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 8a64338..137a22d 100644
+index 5a93ede..cb02bd1 100644
 --- a/dlls/ntdll/ntdll_misc.h
 +++ b/dlls/ntdll/ntdll_misc.h
-@@ -80,6 +80,9 @@ extern void virtual_init_threading(void) DECLSPEC_HIDDEN;
- extern void fill_cpu_info(void) DECLSPEC_HIDDEN;
- extern void heap_set_debug_flags( HANDLE handle ) DECLSPEC_HIDDEN;
+@@ -83,6 +83,9 @@ extern void heap_set_debug_flags( HANDLE handle ) DECLSPEC_HIDDEN;
+ extern void init_user_process_params( SIZE_T data_size ) DECLSPEC_HIDDEN;
+ extern void update_user_process_params( const UNICODE_STRING *image ) DECLSPEC_HIDDEN;
  
 +/* token */
 +extern HANDLE CDECL __wine_create_default_token(BOOL admin);
@@ -42,10 +42,10 @@ index 8a64338..137a22d 100644
  extern timeout_t server_start_time DECLSPEC_HIDDEN;
  extern unsigned int server_cpus DECLSPEC_HIDDEN;
 diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c
-index 40034b4..1ebbb79 100644
+index 2ff8610..bb4a171 100644
 --- a/dlls/ntdll/process.c
 +++ b/dlls/ntdll/process.c
-@@ -99,6 +99,24 @@ HANDLE CDECL __wine_make_process_system(void)
+@@ -118,6 +118,24 @@ HANDLE CDECL __wine_make_process_system(void)
      return ret;
  }
  
@@ -71,10 +71,10 @@ index 40034b4..1ebbb79 100644
  
  #define UNIMPLEMENTED_INFO_CLASS(c) \
 diff --git a/server/protocol.def b/server/protocol.def
-index 0bb04cd..f2deca6 100644
+index 493100b..071f740 100644
 --- a/server/protocol.def
 +++ b/server/protocol.def
-@@ -3641,6 +3641,14 @@ struct handle_info
+@@ -3666,6 +3666,14 @@ struct handle_info
  @END
  
  
@@ -102,7 +102,7 @@ index 6c33714..21e90cc 100644
  
  /* token functions */
 diff --git a/server/token.c b/server/token.c
-index 7776cbe..64ab565 100644
+index 4c37c67..e449e61 100644
 --- a/server/token.c
 +++ b/server/token.c
 @@ -79,6 +79,7 @@ static const SID anonymous_logon_sid = { SID_REVISION, 1, { SECURITY_NT_AUTHORIT
@@ -121,7 +121,7 @@ index 7776cbe..64ab565 100644
  
  static luid_t prev_luid_value = { 1000, 0 };
  
-@@ -901,6 +903,64 @@ struct token *token_create_admin( void )
+@@ -908,6 +910,64 @@ struct token *token_create_admin( void )
      return token;
  }
  
@@ -186,7 +186,7 @@ index 7776cbe..64ab565 100644
  static struct privilege *token_find_privilege( struct token *token, const LUID *luid, int enabled_only )
  {
      struct privilege *privilege;
-@@ -1718,3 +1778,27 @@ DECL_HANDLER(set_token_default_dacl)
+@@ -1713,3 +1773,27 @@ DECL_HANDLER(set_token_default_dacl)
          release_object( token );
      }
  }

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

@@ -1,25 +1,24 @@
-From 3ff546b9cbde1d0f5ea43c5cbb92ac8dc2028676 Mon Sep 17 00:00:00 2001
+From dd6544561d6432555f14a9004e107e6b87564949 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sat, 5 Aug 2017 03:39:55 +0200
 Subject: [PATCH] ntdll: Implement process token elevation through manifests.
 
 ---
- dlls/ntdll/loader.c | 37 +++++++++++++++++++++++++++++++++++++
+ dlls/ntdll/loader.c | 40 ++++++++++++++++++++++++++++++++++++++--
  server/process.c    |  8 ++++++++
  server/process.h    |  1 +
  server/protocol.def |  7 +++++++
  server/token.c      | 14 ++++++++++++++
- 5 files changed, 67 insertions(+)
+ 5 files changed, 68 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
-index 3fcbbf77a5..2399f1246e 100644
+index d7dbe57..7588d5a 100644
 --- a/dlls/ntdll/loader.c
 +++ b/dlls/ntdll/loader.c
-@@ -3054,6 +3054,32 @@ NTSTATUS attach_dlls( CONTEXT *context )
- }
+@@ -3321,6 +3321,32 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, void **entry, ULONG_PTR unknow
  
  
-+/***********************************************************************
+ /***********************************************************************
 + *           elevate_process
 + */
 +static void elevate_process( void )
@@ -45,19 +44,37 @@ index 3fcbbf77a5..2399f1246e 100644
 +}
 +
 +
- /***********************************************************************
++/***********************************************************************
   *           load_global_options
   */
-@@ -3115,6 +3141,7 @@ void WINAPI LdrInitializeThunk( void *kernel_start, ULONG_PTR unknown2,
-                                 ULONG_PTR unknown3, ULONG_PTR unknown4 )
+ static void load_global_options(void)
+@@ -3373,6 +3399,7 @@ static void load_global_options(void)
+ }
+ 
+ 
++
+ /***********************************************************************
+  *           RtlImageDirectoryEntryToData   (NTDLL.@)
+  */
+@@ -3408,7 +3435,6 @@ PVOID WINAPI RtlImageDirectoryEntryToData( HMODULE module, BOOL image, WORD dir,
+     return RtlImageRvaToVa( nt, module, addr, NULL );
+ }
+ 
+-
+ /***********************************************************************
+  *           RtlImageRvaToSection   (NTDLL.@)
+  */
+@@ -3505,7 +3531,7 @@ void __wine_process_init(void)
  {
+     static const WCHAR kernel32W[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0};
      static const WCHAR globalflagW[] = {'G','l','o','b','a','l','F','l','a','g',0};
+-
 +    ACTIVATION_CONTEXT_RUN_LEVEL_INFORMATION runlevel;
-     NTSTATUS status;
      WINE_MODREF *wm;
-     PEB *peb = NtCurrentTeb()->Peb;
-@@ -3142,6 +3169,16 @@ void WINAPI LdrInitializeThunk( void *kernel_start, ULONG_PTR unknown2,
-                                        REG_DWORD, &peb->NtGlobalFlag, sizeof(peb->NtGlobalFlag), NULL );
+     NTSTATUS status;
+     ANSI_STRING func_name;
+@@ -3556,6 +3582,16 @@ void __wine_process_init(void)
+                                        &NtCurrentTeb()->Peb->NtGlobalFlag, sizeof(DWORD), NULL );
      heap_set_debug_flags( GetProcessHeap() );
  
 +    /* elevate process if necessary */
@@ -72,12 +89,12 @@ index 3fcbbf77a5..2399f1246e 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 );
+     InsertHeadList( &NtCurrentTeb()->Peb->LdrData->InLoadOrderModuleList, &wm->ldr.InLoadOrderModuleList );
 diff --git a/server/process.c b/server/process.c
-index ee85249bd4..81cea2f1ba 100644
+index 0a25f44..3988b52 100644
 --- a/server/process.c
 +++ b/server/process.c
-@@ -1133,6 +1133,14 @@ struct process_snapshot *process_snap( int *count )
+@@ -1109,6 +1109,14 @@ struct process_snapshot *process_snap( int *count )
      return snapshot;
  }
  
@@ -93,10 +110,10 @@ index ee85249bd4..81cea2f1ba 100644
  DECL_HANDLER(new_process)
  {
 diff --git a/server/process.h b/server/process.h
-index f22c128f07..78e88ec350 100644
+index 4566a04..029b328 100644
 --- a/server/process.h
 +++ b/server/process.h
-@@ -136,6 +136,7 @@ extern void break_process( struct process *process );
+@@ -138,6 +138,7 @@ extern void break_process( struct process *process );
  extern void detach_debugged_processes( struct thread *debugger );
  extern struct process_snapshot *process_snap( int *count );
  extern void enum_processes( int (*cb)(struct process*, void*), void *user);
@@ -105,10 +122,10 @@ index f22c128f07..78e88ec350 100644
  /* console functions */
  extern void inherit_console(struct thread *parent_thread, struct process *process, obj_handle_t hconin);
 diff --git a/server/protocol.def b/server/protocol.def
-index 0abd1683f0..5fb6e38ea5 100644
+index 071f740..cc44503 100644
 --- a/server/protocol.def
 +++ b/server/protocol.def
-@@ -3654,6 +3654,13 @@ struct handle_info
+@@ -3674,6 +3674,13 @@ struct handle_info
  @END
  
  
@@ -123,10 +140,10 @@ index 0abd1683f0..5fb6e38ea5 100644
  @REQ(create_completion)
      unsigned int access;          /* desired access to a port */
 diff --git a/server/token.c b/server/token.c
-index 64ab565a95..52fa10d52e 100644
+index e449e61..961fbe7 100644
 --- a/server/token.c
 +++ b/server/token.c
-@@ -1802,3 +1802,17 @@ DECL_HANDLER(create_token)
+@@ -1797,3 +1797,17 @@ DECL_HANDLER(create_token)
          release_object( token );
      }
  }
@@ -145,5 +162,5 @@ index 64ab565a95..52fa10d52e 100644
 +    }
 +}
 -- 
-2.16.1
+1.9.1
 

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

@@ -1,26 +1,26 @@
-From a4d5c33bb2fc98fd0f84ea05575e0d3eeb5a1bcd Mon Sep 17 00:00:00 2001
+From 9a67b4c62e5a575a38081114d4434f274355020e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Tue, 12 Apr 2016 01:02:34 +0200
 Subject: [PATCH] uiautomationcore: Add dll and stub some functions.
 
 ---
- dlls/uiautomationcore/Makefile.in           |  1 +
- dlls/uiautomationcore/uia_main.c            | 53 +++++++++++++++++++++++++----
- dlls/uiautomationcore/uiautomationcore.spec |  6 ++++
- 3 files changed, 54 insertions(+), 6 deletions(-)
+ dlls/uiautomationcore/Makefile.in |  1 +
+ dlls/uiautomationcore/uia_main.c  | 53 ++++++++++++++++++++++++++++++++++-----
+ 2 files changed, 48 insertions(+), 6 deletions(-)
 
 diff --git a/dlls/uiautomationcore/Makefile.in b/dlls/uiautomationcore/Makefile.in
-index 78d6254..029fc2e 100644
+index 5221450..5173f23 100644
 --- a/dlls/uiautomationcore/Makefile.in
 +++ b/dlls/uiautomationcore/Makefile.in
-@@ -1,4 +1,5 @@
+@@ -1,5 +1,6 @@
  MODULE = uiautomationcore.dll
+ IMPORTLIB = uiautomationcore
 +IMPORTS   = uuid
  
  C_SRCS = \
  	uia_main.c
 diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c
-index 31b7d3e..cc4831e 100644
+index f0d8247..b9c24b4 100644
 --- a/dlls/uiautomationcore/uia_main.c
 +++ b/dlls/uiautomationcore/uia_main.c
 @@ -1,4 +1,5 @@
@@ -121,41 +121,6 @@ index 31b7d3e..cc4831e 100644
      return 0;
  }
  
-diff --git a/dlls/uiautomationcore/uiautomationcore.spec b/dlls/uiautomationcore/uiautomationcore.spec
-index 48a06b2..8e676ad 100644
---- a/dlls/uiautomationcore/uiautomationcore.spec
-+++ b/dlls/uiautomationcore/uiautomationcore.spec
-@@ -53,6 +53,8 @@
- @ stub TransformPattern_Rotate
- @ stub UiaAddEvent
- @ stdcall UiaClientsAreListening()
-+@ stub UiaDisconnectAllProviders
-+@ stub UiaDisconnectProvider
- @ stub UiaEventAddWindow
- @ stub UiaEventRemoveWindow
- @ stub UiaFind
-@@ -69,6 +71,7 @@
- @ stub UiaHUiaNodeFromVariant
- @ stub UiaHasServerSideProvider
- @ stub UiaHostProviderFromHwnd
-+@ stub UiaIAccessibleFromProvider
- @ stdcall UiaLookupId(long ptr)
- @ stub UiaNavigate
- @ stub UiaNodeFromFocus
-@@ -77,10 +80,13 @@
- @ stub UiaNodeFromProvider
- @ stub UiaNodeRelease
- @ stub UiaPatternRelease
-+@ stub UiaProviderForNonClient
-+@ stub UiaProviderFromIAccessible
- @ stub UiaRaiseAsyncContentLoadedEvent
- @ stdcall UiaRaiseAutomationEvent(ptr long)
- @ stub UiaRaiseAutomationPropertyChangedEvent
- @ stub UiaRaiseStructureChangedEvent
-+@ stub UiaRaiseTextEditTextChangedEvent
- @ stub UiaRegisterProviderCallback
- @ stub UiaRemoveEvent
- @ stdcall UiaReturnRawElementProvider(long long long ptr)
 -- 
 1.9.1
 

patches/atl-AtlAxDialogBox/0001-atl-Implement-AtlAxDialogBox-A-W.patch

@@ -0,0 +1,100 @@
+From 452c42b4855e2f6338fa9b8746377ff9fe9ee706 Mon Sep 17 00:00:00 2001
+From: Qian Hong <qhong@codeweavers.com>
+Date: Wed, 23 Apr 2014 04:16:53 +0800
+Subject: [PATCH] atl: Implement AtlAxDialogBox[A,W]
+
+Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=32749
+---
+ dlls/atl/atl_ax.c | 60 +++++++++++++++++++++++++++++++++++++++++++++----------
+ 1 file changed, 50 insertions(+), 10 deletions(-)
+
+diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c
+index 8121278..92fcb84 100644
+--- a/dlls/atl/atl_ax.c
++++ b/dlls/atl/atl_ax.c
+@@ -28,6 +28,7 @@
+ #include "winerror.h"
+ #include "winuser.h"
+ #include "wine/debug.h"
++#include "wine/heap.h"
+ #include "objbase.h"
+ #include "objidl.h"
+ #include "ole2.h"
+@@ -1407,25 +1408,64 @@ HRESULT WINAPI AtlAxGetControl(HWND hWnd, IUnknown **pUnk)
+ }
+ 
+ /***********************************************************************
+- *           AtlAxDialogBoxW              [atl100.35]
++ *           AtlAxDialogBoxA              [atl100.@]
+  *
+  */
+-INT_PTR WINAPI AtlAxDialogBoxW(HINSTANCE hInstance, LPCWSTR lpTemplateName, HWND hWndParent, DLGPROC lpDialogProc,
+-        LPARAM dwInitParam)
++INT_PTR WINAPI AtlAxDialogBoxA(HINSTANCE hInst, LPCSTR name, HWND owner, DLGPROC dlgProc, LPARAM param)
+ {
+-    FIXME("(%p %s %p %p %lx)\n", hInstance, debugstr_w(lpTemplateName), hWndParent, lpDialogProc, dwInitParam);
+-    return 0;
++    INT_PTR res = 0;
++    int length;
++    WCHAR *nameW;
++
++    if (IS_INTRESOURCE(name))
++        return AtlAxDialogBoxW( hInst, (LPCWSTR) name, owner, dlgProc, param );
++
++    length = MultiByteToWideChar( CP_ACP, 0, name, -1, NULL, 0 );
++    nameW = heap_alloc( length * sizeof(WCHAR) );
++    if (nameW)
++    {
++        MultiByteToWideChar( CP_ACP, 0, name, -1, nameW, length );
++        res = AtlAxDialogBoxW( hInst, nameW, owner, dlgProc, param );
++        heap_free( nameW );
++    }
++    return res;
+ }
+ 
+ /***********************************************************************
+- *           AtlAxDialogBoxA              [atl100.36]
++ *           AtlAxDialogBoxW              [atl100.@]
+  *
+  */
+-INT_PTR WINAPI AtlAxDialogBoxA(HINSTANCE hInstance, LPCSTR lpTemplateName, HWND hWndParent, DLGPROC lpDialogProc,
+-        LPARAM dwInitParam)
++INT_PTR WINAPI AtlAxDialogBoxW(HINSTANCE hInst, LPCWSTR name, HWND owner, DLGPROC dlgProc, LPARAM param)
+ {
+-    FIXME("(%p %s %p %p %lx)\n", hInstance, debugstr_a(lpTemplateName), hWndParent, lpDialogProc, dwInitParam);
+-    return 0;
++    HRSRC hrsrc;
++    HGLOBAL hgl;
++    LPCDLGTEMPLATEW ptr;
++    LPDLGTEMPLATEW newptr;
++    INT_PTR res;
++
++    TRACE("(%p %s %p %p %lx)\n", hInst, debugstr_w(name), owner, dlgProc, param);
++
++    hrsrc = FindResourceW( hInst, name, (LPWSTR)RT_DIALOG );
++    if ( !hrsrc )
++        return 0;
++    hgl = LoadResource (hInst, hrsrc);
++    if ( !hgl )
++        return 0;
++    ptr = LockResource ( hgl );
++    if (!ptr)
++    {
++        FreeResource( hgl );
++        return 0;
++    }
++    newptr = AX_ConvertDialogTemplate( ptr );
++    if ( newptr )
++    {
++        res = DialogBoxIndirectParamW( hInst, newptr, owner, dlgProc, param );
++        heap_free( newptr );
++    } else
++        res = 0;
++    FreeResource ( hrsrc );
++    return res;
+ }
+ 
+ /***********************************************************************
+-- 
+1.9.1
+

patches/atl-AtlAxDialogBox/definition

@@ -0,0 +1 @@
+Fixes: [32749] atl: Implemented AtlAxDialogBox[A,W]

patches/bcrypt-BCryptDeriveKeyPBKDF2/0001-bcrypt-Implement-BCryptDeriveKeyPBKDF2-and-add-test-.patch

@@ -1,337 +0,0 @@
-From a324685a2f4f48d5d9da8c3000164800152dc297 Mon Sep 17 00:00:00 2001
-From: Jack Grigg <me@jackgrigg.com>
-Date: Sat, 17 Mar 2018 21:14:05 +1100
-Subject: [PATCH] bcrypt: Implement BCryptDeriveKeyPBKDF2 and add test vectors.
-
-Fixes https://bugs.winehq.org/show_bug.cgi?id=42704
-
-Tested on Ubuntu 16.04.2 LTS.
-
-v2 - Removed C++ comment
-   - Removed all warnings.
-   - Use heap_* functions
-   - Formatting changes.
-
-Signed-off-by: Jack Grigg <me@jackgrigg.com>
----
- dlls/bcrypt/bcrypt.spec    |   1 +
- dlls/bcrypt/bcrypt_main.c  | 163 +++++++++++++++++++++++++++++++++++++++++++++
- dlls/bcrypt/tests/bcrypt.c |  83 +++++++++++++++++++++++
- include/bcrypt.h           |   1 +
- 4 files changed, 248 insertions(+)
-
-diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec
-index 78824d7..f4d9a57 100644
---- a/dlls/bcrypt/bcrypt.spec
-+++ b/dlls/bcrypt/bcrypt.spec
-@@ -8,6 +8,7 @@
- @ stdcall BCryptDecrypt(ptr ptr long ptr ptr long ptr long ptr long)
- @ stub BCryptDeleteContext
- @ stub BCryptDeriveKey
-+@ stdcall BCryptDeriveKeyPBKDF2(ptr ptr long ptr long int64 ptr long long)
- @ stdcall BCryptDestroyHash(ptr)
- @ stdcall BCryptDestroyKey(ptr)
- @ stub BCryptDestroySecret
-diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
-index 29a0a78..33c1da53 100644
---- a/dlls/bcrypt/bcrypt_main.c
-+++ b/dlls/bcrypt/bcrypt_main.c
-@@ -2315,6 +2315,169 @@ NTSTATUS WINAPI BCryptSetProperty( BCRYPT_HANDLE handle, const WCHAR *prop, UCHA
-     }
- }
- 
-+NTSTATUS PBKDF2_F( BCRYPT_ALG_HANDLE algorithm,
-+                   UCHAR *password, ULONG password_length,
-+                   UCHAR *salt, ULONG salt_length,
-+                   ULONGLONG iterations, int i,
-+                   UCHAR *res, int hash_length )
-+{
-+    BCRYPT_HASH_HANDLE handle;
-+    NTSTATUS status = STATUS_NOT_SUPPORTED;
-+    UCHAR bytes[4];
-+    UCHAR *tmp;
-+    int j;
-+    int k;
-+
-+    if (!(tmp = heap_alloc( hash_length )))
-+    {
-+        return STATUS_NO_MEMORY;
-+    }
-+
-+    for (j = 0; j < iterations; j++)
-+    {
-+        status = BCryptCreateHash( algorithm, &handle, NULL, 0,
-+                                   password, password_length, 0 );
-+        if (status != STATUS_SUCCESS)
-+            goto done;
-+
-+        if (j == 0)
-+        {
-+            /* Use salt || INT(i) */
-+            status = BCryptHashData( handle, salt, salt_length, 0 );
-+            if (status != STATUS_SUCCESS)
-+                goto done;
-+            bytes[0] = (i >> 24) & 0xFF;
-+            bytes[1] = (i >> 16) & 0xFF;
-+            bytes[2] = (i >> 8) & 0xFF;
-+            bytes[3] = i & 0xFF;
-+            status = BCryptHashData( handle, bytes, 4, 0 );
-+        }
-+        else
-+        {
-+            /* Use U_j */
-+            status = BCryptHashData( handle, tmp, hash_length, 0 );
-+        }
-+        if (status != STATUS_SUCCESS)
-+            goto done;
-+
-+        status = BCryptFinishHash( handle, tmp, hash_length, 0 );
-+        if (status != STATUS_SUCCESS)
-+            goto done;
-+
-+        status = BCryptDestroyHash( handle );
-+        if (status != STATUS_SUCCESS)
-+            goto done;
-+
-+        handle = NULL;
-+
-+        if (j == 0)
-+        {
-+            /* Copy into res */
-+            memcpy( res, tmp, hash_length );
-+        }
-+        else
-+        {
-+            /* XOR into res */
-+            for (k = 0; k < hash_length; k++)
-+                res[k] ^= tmp[k];
-+        }
-+    }
-+
-+done:
-+    TRACE("<- status 0x%08x\n", status);
-+    if(handle)
-+        BCryptDestroyHash( handle );
-+    heap_free( tmp );
-+    return status;
-+}
-+
-+/************************************************************
-+ *            BCryptDeriveKeyPBKDF2   (BCRYPT.@)
-+ *
-+ * Derive a key from a password using the PBKDF2 function
-+ * (RFC 2898).
-+ *
-+ * PARAMS
-+ *   handle          [I] Pointer to the PRF provider
-+ *   password        [I] Optional pointer to the beginning of the password
-+ *   password_length [I] Length of the password
-+ *   salt            [I] Optional pointer to the beginning of the salt
-+ *   salt_length     [I] Length of the salt
-+ *   iterations      [I] Iteration count
-+ *   dk              [O] Pointer to the beginning of the buffer to store the
-+ *                       derived key in, at least dklen in size
-+ *   dklen           [I] Intended length of the derived key, at most
-+ *                       (2^32 - 1) * (output length of PRF)
-+ *   flags           [I] Reserved, must be zero
-+ *
-+ * RETURNS
-+ *   Success: STATUS_SUCCESS.
-+ *   Failure: - STATUS_INVALID_HANDLE
-+ *            - STATUS_INVALID_PARAMETER
-+ *            - STATUS_NO_MEMORY
-+ */
-+NTSTATUS WINAPI BCryptDeriveKeyPBKDF2( BCRYPT_ALG_HANDLE handle,
-+                                       PUCHAR password, ULONG password_length,
-+                                       PUCHAR salt, ULONG salt_length,
-+                                       ULONGLONG iterations,
-+                                       PUCHAR dk, ULONG dklen,
-+                                       ULONG flags )
-+{
-+    struct algorithm *alg = handle;
-+    int hlen = alg_props[alg->id].hash_length;
-+    UCHAR *partial;
-+    NTSTATUS status;
-+    int l;
-+    int r;
-+    int i;
-+
-+    TRACE( "%p, %p, %u, %p, %u, %s, %p, %u, %08x - stub\n",
-+           handle, password, password_length, salt, salt_length,
-+           wine_dbgstr_longlong(iterations), dk, dklen, flags );
-+
-+    if (dklen <= 0 || dklen > ((((ULONGLONG) 1) << 32) - 1) * hlen)
-+    {
-+        return STATUS_INVALID_PARAMETER;
-+    }
-+
-+    l = 1 + ((dklen - 1) / hlen); /* ceil(dklen/hlen) */
-+    r = dklen - (l - 1) * hlen;
-+
-+    /* Full blocks */
-+    for (i = 1; i < l; i++)
-+    {
-+        status = PBKDF2_F( handle,
-+                           password, password_length,
-+                           salt, salt_length,
-+                           iterations, i,
-+                           dk + ((i - 1) * hlen), hlen );
-+        if (status != STATUS_SUCCESS)
-+        {
-+            return status;
-+        }
-+    }
-+
-+    /* Final partial block */
-+    if (!(partial = heap_alloc( hlen )))
-+    {
-+        return STATUS_NO_MEMORY;
-+    }
-+    status = PBKDF2_F( handle,
-+                       password, password_length,
-+                       salt, salt_length,
-+                       iterations, l,
-+                       partial, hlen );
-+    if (status != STATUS_SUCCESS)
-+    {
-+        heap_free( partial );
-+        return status;
-+    }
-+    memcpy( dk + ((l - 1) * hlen), partial, r );
-+    heap_free( partial );
-+
-+    return STATUS_SUCCESS;
-+}
-+
- BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
- {
-     switch (reason)
-diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c
-index 6865e87..5c4df6a 100644
---- a/dlls/bcrypt/tests/bcrypt.c
-+++ b/dlls/bcrypt/tests/bcrypt.c
-@@ -36,6 +36,8 @@ static NTSTATUS (WINAPI *pBCryptHashData)(BCRYPT_HASH_HANDLE, PUCHAR, ULONG, ULO
- static NTSTATUS (WINAPI *pBCryptDuplicateHash)(BCRYPT_HASH_HANDLE, BCRYPT_HASH_HANDLE *, UCHAR *, ULONG, ULONG);
- static NTSTATUS (WINAPI *pBCryptFinishHash)(BCRYPT_HASH_HANDLE, PUCHAR, ULONG, ULONG);
- static NTSTATUS (WINAPI *pBCryptDestroyHash)(BCRYPT_HASH_HANDLE);
-+static NTSTATUS (WINAPI *pBCryptDeriveKeyPBKDF2)(BCRYPT_ALG_HANDLE, PUCHAR, ULONG, PUCHAR, ULONG,
-+                                                 ULONGLONG, PUCHAR, ULONG, ULONG);
- static NTSTATUS (WINAPI *pBCryptGenRandom)(BCRYPT_ALG_HANDLE, PUCHAR, ULONG, ULONG);
- static NTSTATUS (WINAPI *pBCryptGetProperty)(BCRYPT_HANDLE, LPCWSTR, PUCHAR, ULONG, ULONG *, ULONG);
- static NTSTATUS (WINAPI *pBCryptSetProperty)(BCRYPT_HANDLE, LPCWSTR, PUCHAR, ULONG, ULONG);
-@@ -396,6 +398,81 @@ static void test_BcryptHash(void)
-     ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
- }
- 
-+/* Test vectors from RFC 6070 */
-+static UCHAR password[] = "password";
-+static UCHAR salt[] = "salt";
-+static UCHAR long_password[] =
-+    "passwordPASSWORDpassword";
-+static UCHAR long_salt[] =
-+    "saltSALTsaltSALTsaltSALTsaltSALTsalt";
-+static UCHAR password_NUL[] = "pass\0word";
-+static UCHAR salt_NUL[] = "sa\0lt";
-+
-+static UCHAR dk1[] =
-+    "0c60c80f961f0e71f3a9b524af6012062fe037a6";
-+static UCHAR dk2[] =
-+    "ea6c014dc72d6f8ccd1ed92ace1d41f0d8de8957";
-+static UCHAR dk3[] =
-+    "4b007901b765489abead49d926f721d065a429c1";
-+static UCHAR dk4[] =
-+    "eefe3d61cd4da4e4e9945b3d6ba2158c2634e984";
-+static UCHAR dk5[] =
-+    "3d2eec4fe41c849b80c8d83662c0e44a8b291a964cf2f07038";
-+static UCHAR dk6[] =
-+    "56fa6aa75548099dcc37d7f03425e0c3";
-+
-+static const struct {
-+    ULONG password_length;
-+    ULONG salt_length;
-+    ULONGLONG iterations;
-+    ULONG dklen;
-+    UCHAR *password;
-+    UCHAR *salt;
-+    const UCHAR *dk;
-+} rfc6070[] = {
-+    {  8,  4,        1, 20, password,      salt,      dk1 },
-+    {  8,  4,        2, 20, password,      salt,      dk2 },
-+    {  8,  4,     4096, 20, password,      salt,      dk3 },
-+    {  8,  4, 16777216, 20, password,      salt,      dk4 },
-+    { 24, 36,     4096, 25, long_password, long_salt, dk5 },
-+    {  9,  5,     4096, 16, password_NUL,  salt_NUL,  dk6 }
-+};
-+
-+static void test_BcryptDeriveKeyPBKDF2(void)
-+{
-+    BCRYPT_ALG_HANDLE alg;
-+    UCHAR dk[25];
-+    char str[51];
-+    NTSTATUS ret;
-+    int i;
-+
-+    alg = NULL;
-+    ret = pBCryptOpenAlgorithmProvider(&alg, BCRYPT_SHA1_ALGORITHM, MS_PRIMITIVE_PROVIDER,
-+                                       BCRYPT_ALG_HANDLE_HMAC_FLAG);
-+    ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
-+    ok(alg != NULL, "alg not set\n");
-+
-+    test_hash_length(alg, 20);
-+    test_alg_name(alg, "SHA1");
-+
-+    for (i = 0; i < ARRAY_SIZE(rfc6070); i++)
-+    {
-+        memset(dk, 0, sizeof(dk));
-+        ret = pBCryptDeriveKeyPBKDF2(alg,
-+                                     rfc6070[i].password, rfc6070[i].password_length,
-+                                     rfc6070[i].salt, rfc6070[i].salt_length,
-+                                     rfc6070[i].iterations,
-+                                     dk, rfc6070[i].dklen,
-+                                     0);
-+        ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
-+        format_hash( dk, rfc6070[i].dklen, str );
-+        ok(!memcmp(str, rfc6070[i].dk, rfc6070[i].dklen), "got %s\n", str);
-+    }
-+
-+    ret = pBCryptCloseAlgorithmProvider(alg, 0);
-+    ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
-+}
-+
- static void test_rng(void)
- {
-     BCRYPT_ALG_HANDLE alg;
-@@ -1630,6 +1707,7 @@ START_TEST(bcrypt)
-     pBCryptDuplicateHash = (void *)GetProcAddress(module, "BCryptDuplicateHash");
-     pBCryptFinishHash = (void *)GetProcAddress(module, "BCryptFinishHash");
-     pBCryptDestroyHash = (void *)GetProcAddress(module, "BCryptDestroyHash");
-+    pBCryptDeriveKeyPBKDF2 = (void *)GetProcAddress(module, "BCryptDeriveKeyPBKDF2");
-     pBCryptGenRandom = (void *)GetProcAddress(module, "BCryptGenRandom");
-     pBCryptGetProperty = (void *)GetProcAddress(module, "BCryptGetProperty");
-     pBCryptSetProperty = (void *)GetProcAddress(module, "BCryptSetProperty");
-@@ -1660,5 +1738,10 @@ START_TEST(bcrypt)
-     else
-         win_skip("BCryptHash is not available\n");
- 
-+    if (pBCryptDeriveKeyPBKDF2) /* >= Win 7 */
-+        test_BcryptDeriveKeyPBKDF2();
-+    else
-+        win_skip("BCryptDeriveKeyPBKDF2 is not available\n");
-+
-     FreeLibrary(module);
- }
-diff --git a/include/bcrypt.h b/include/bcrypt.h
-index df54f62..d3e4b99 100644
---- a/include/bcrypt.h
-+++ b/include/bcrypt.h
-@@ -217,6 +217,7 @@ typedef PVOID BCRYPT_HASH_HANDLE;
- NTSTATUS WINAPI BCryptCloseAlgorithmProvider(BCRYPT_ALG_HANDLE, ULONG);
- NTSTATUS WINAPI BCryptCreateHash(BCRYPT_ALG_HANDLE, BCRYPT_HASH_HANDLE *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG);
- NTSTATUS WINAPI BCryptDecrypt(BCRYPT_KEY_HANDLE, PUCHAR, ULONG, VOID *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG *, ULONG);
-+NTSTATUS WINAPI BCryptDeriveKeyPBKDF2(BCRYPT_ALG_HANDLE, PUCHAR, ULONG, PUCHAR, ULONG, ULONGLONG, PUCHAR, ULONG, ULONG);
- NTSTATUS WINAPI BCryptDestroyHash(BCRYPT_HASH_HANDLE);
- NTSTATUS WINAPI BCryptDestroyKey(BCRYPT_KEY_HANDLE);
- NTSTATUS WINAPI BCryptEncrypt(BCRYPT_KEY_HANDLE, PUCHAR, ULONG, VOID *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG *, ULONG);
--- 
-1.9.1
-

patches/bcrypt-BCryptDeriveKeyPBKDF2/definition

@@ -1 +0,0 @@
-Fixes: [42704] Implement BCryptDeriveKeyPBKDF2

patches/bcrypt-BCryptGenerateKeyPair/0001-bcrypt-Add-support-for-algorithm-ECDH-P256.patch

@@ -1,58 +0,0 @@
-From ee38b7a672771d088ee5c4e58300623259020fb6 Mon Sep 17 00:00:00 2001
-From: Maxime Lombard <berillions@gmail.com>
-Date: Sun, 10 Jun 2018 14:47:01 +0200
-Subject: [PATCH 1/3] bcrypt: Add support for algorithm ECDH P256.
-
----
- dlls/bcrypt/bcrypt_internal.h | 1 +
- dlls/bcrypt/bcrypt_main.c     | 2 ++
- include/bcrypt.h              | 1 +
- 3 files changed, 4 insertions(+)
-
-diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h
-index 11c8b30..fd8cc90 100644
---- a/dlls/bcrypt/bcrypt_internal.h
-+++ b/dlls/bcrypt/bcrypt_internal.h
-@@ -137,6 +137,7 @@ enum alg_id
-     ALG_ID_SHA256,
-     ALG_ID_SHA384,
-     ALG_ID_SHA512,
-+    ALG_ID_ECDH_P256,
-     ALG_ID_ECDSA_P256,
-     ALG_ID_ECDSA_P384,
- };
-diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
-index 24065c1..003e8f3 100644
---- a/dlls/bcrypt/bcrypt_main.c
-+++ b/dlls/bcrypt/bcrypt_main.c
-@@ -114,6 +114,7 @@ alg_props[] =
-     /* ALG_ID_SHA256 */ {  286,   32,  512, BCRYPT_SHA256_ALGORITHM, FALSE },
-     /* ALG_ID_SHA384 */ {  382,   48, 1024, BCRYPT_SHA384_ALGORITHM, FALSE },
-     /* ALG_ID_SHA512 */ {  382,   64, 1024, BCRYPT_SHA512_ALGORITHM, FALSE },
-+    /* ALG_ID_ECDH_P256 */  { 0,   0,     0, BCRYPT_ECDH_P256_ALGORITHM, FALSE },
-     /* ALG_ID_ECDSA_P256 */ { 0,   0,     0, BCRYPT_ECDSA_P256_ALGORITHM, FALSE  },
-     /* ALG_ID_ECDSA_P384 */ { 0,   0,     0, BCRYPT_ECDSA_P384_ALGORITHM, FALSE  },
- };
-@@ -184,6 +185,7 @@ NTSTATUS WINAPI BCryptOpenAlgorithmProvider( BCRYPT_ALG_HANDLE *handle, LPCWSTR
-     else if (!strcmpW( id, BCRYPT_SHA256_ALGORITHM )) alg_id = ALG_ID_SHA256;
-     else if (!strcmpW( id, BCRYPT_SHA384_ALGORITHM )) alg_id = ALG_ID_SHA384;
-     else if (!strcmpW( id, BCRYPT_SHA512_ALGORITHM )) alg_id = ALG_ID_SHA512;
-+    else if (!strcmpW( id, BCRYPT_ECDH_P256_ALGORITHM )) alg_id = ALG_ID_ECDH_P256;
-     else if (!strcmpW( id, BCRYPT_ECDSA_P256_ALGORITHM )) alg_id = ALG_ID_ECDSA_P256;
-     else if (!strcmpW( id, BCRYPT_ECDSA_P384_ALGORITHM )) alg_id = ALG_ID_ECDSA_P384;
-     else
-diff --git a/include/bcrypt.h b/include/bcrypt.h
-index d3e4b99..676db72 100644
---- a/include/bcrypt.h
-+++ b/include/bcrypt.h
-@@ -81,6 +81,7 @@ typedef LONG NTSTATUS;
- #define BCRYPT_SHA256_ALGORITHM     (const WCHAR []){'S','H','A','2','5','6',0}
- #define BCRYPT_SHA384_ALGORITHM     (const WCHAR []){'S','H','A','3','8','4',0}
- #define BCRYPT_SHA512_ALGORITHM     (const WCHAR []){'S','H','A','5','1','2',0}
-+#define BCRYPT_ECDH_P256_ALGORITHM  (const WCHAR []){'E','C','D','H','_','P','2','5','6',0}
- #define BCRYPT_ECDSA_P256_ALGORITHM (const WCHAR []){'E','C','D','S','A','_','P','2','5','6',0}
- #define BCRYPT_ECDSA_P384_ALGORITHM (const WCHAR []){'E','C','D','S','A','_','P','3','8','4',0}
- #define BCRYPT_ECDSA_P521_ALGORITHM (const WCHAR []){'E','C','D','S','A','_','P','5','2','1',0}
--- 
-1.9.1
-

patches/bcrypt-BCryptGenerateKeyPair/0002-bcrypt-Add-BCryptGenerateKeyPair-stub.patch

@@ -1,56 +0,0 @@
-From 8ebad635c033bf41392e23ee50494195fdce73b9 Mon Sep 17 00:00:00 2001
-From: Maxime Lombard <berillions@gmail.com>
-Date: Sun, 10 Jun 2018 14:50:31 +0200
-Subject: [PATCH 2/3] bcrypt: Add BCryptGenerateKeyPair stub.
-
----
- dlls/bcrypt/bcrypt.spec   | 2 +-
- dlls/bcrypt/bcrypt_main.c | 6 ++++++
- include/bcrypt.h          | 1 +
- 3 files changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec
-index f4d9a57..1e81ad1 100644
---- a/dlls/bcrypt/bcrypt.spec
-+++ b/dlls/bcrypt/bcrypt.spec
-@@ -26,7 +26,7 @@
- @ stdcall BCryptFinishHash(ptr ptr long long)
- @ stub BCryptFreeBuffer
- @ stdcall BCryptGenRandom(ptr ptr long long)
--@ stub BCryptGenerateKeyPair
-+@ stdcall BCryptGenerateKeyPair(ptr ptr long long)
- @ stdcall BCryptGenerateSymmetricKey(ptr ptr ptr long ptr long long)
- @ stdcall BCryptGetFipsAlgorithmMode(ptr)
- @ stdcall BCryptGetProperty(ptr wstr ptr long ptr long)
-diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
-index 003e8f3..0d94634 100644
---- a/dlls/bcrypt/bcrypt_main.c
-+++ b/dlls/bcrypt/bcrypt_main.c
-@@ -160,6 +160,12 @@ NTSTATUS WINAPI BCryptGenRandom(BCRYPT_ALG_HANDLE handle, UCHAR *buffer, ULONG c
-     return STATUS_NOT_IMPLEMENTED;
- }
- 
-+NTSTATUS WINAPI BCryptGenerateKeyPair(BCRYPT_ALG_HANDLE algorithm, BCRYPT_KEY_HANDLE *handle, ULONG input_len, ULONG flags)
-+{
-+    FIXME("%p, %p, %u, %08x - stub\n", algorithm, handle, input_len, flags);
-+    return STATUS_SUCCESS;
-+}
-+
- NTSTATUS WINAPI BCryptOpenAlgorithmProvider( BCRYPT_ALG_HANDLE *handle, LPCWSTR id, LPCWSTR implementation, DWORD flags )
- {
-     const DWORD supported_flags = BCRYPT_ALG_HANDLE_HMAC_FLAG;
-diff --git a/include/bcrypt.h b/include/bcrypt.h
-index 676db72..ce11685 100644
---- a/include/bcrypt.h
-+++ b/include/bcrypt.h
-@@ -224,6 +224,7 @@ NTSTATUS WINAPI BCryptDestroyKey(BCRYPT_KEY_HANDLE);
- NTSTATUS WINAPI BCryptEncrypt(BCRYPT_KEY_HANDLE, PUCHAR, ULONG, VOID *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG *, ULONG);
- NTSTATUS WINAPI BCryptEnumAlgorithms(ULONG, ULONG *, BCRYPT_ALGORITHM_IDENTIFIER **, ULONG);
- NTSTATUS WINAPI BCryptFinishHash(BCRYPT_HASH_HANDLE, PUCHAR, ULONG, ULONG);
-+NTSTATUS WINAPI BCryptGenerateKeyPair(BCRYPT_ALG_HANDLE, BCRYPT_KEY_HANDLE *, ULONG, ULONG);
- NTSTATUS WINAPI BCryptGenerateSymmetricKey(BCRYPT_ALG_HANDLE, BCRYPT_KEY_HANDLE *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG);
- NTSTATUS WINAPI BCryptGenRandom(BCRYPT_ALG_HANDLE, PUCHAR, ULONG, ULONG);
- NTSTATUS WINAPI BCryptGetFipsAlgorithmMode(BOOLEAN *);
--- 
-1.9.1
-

patches/bcrypt-BCryptGenerateKeyPair/0003-bcrypt-Add-BCryptFinalizeKeyPair-stub.patch

@@ -1,56 +0,0 @@
-From 046863d1eb6db25555743cbbc257260387b31c19 Mon Sep 17 00:00:00 2001
-From: Maxime Lombard <berillions@gmail.com>
-Date: Sun, 10 Jun 2018 14:52:31 +0200
-Subject: [PATCH 3/3] bcrypt: Add BCryptFinalizeKeyPair stub.
-
----
- dlls/bcrypt/bcrypt.spec   | 2 +-
- dlls/bcrypt/bcrypt_main.c | 6 ++++++
- include/bcrypt.h          | 1 +
- 3 files changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec
-index 1e81ad1..052a099 100644
---- a/dlls/bcrypt/bcrypt.spec
-+++ b/dlls/bcrypt/bcrypt.spec
-@@ -22,7 +22,7 @@
- @ stub BCryptEnumProviders
- @ stub BCryptEnumRegisteredProviders
- @ stdcall BCryptExportKey(ptr ptr wstr ptr long ptr long)
--@ stub BCryptFinalizeKeyPair
-+@ stdcall BCryptFinalizeKeyPair(ptr long)
- @ stdcall BCryptFinishHash(ptr ptr long long)
- @ stub BCryptFreeBuffer
- @ stdcall BCryptGenRandom(ptr ptr long long)
-diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
-index 0d94634..40a3405 100644
---- a/dlls/bcrypt/bcrypt_main.c
-+++ b/dlls/bcrypt/bcrypt_main.c
-@@ -166,6 +166,12 @@ NTSTATUS WINAPI BCryptGenerateKeyPair(BCRYPT_ALG_HANDLE algorithm, BCRYPT_KEY_HA
-     return STATUS_SUCCESS;
- }
- 
-+NTSTATUS WINAPI BCryptFinalizeKeyPair(BCRYPT_KEY_HANDLE key, ULONG dwflags)
-+{
-+    FIXME("%p, %08x - stub\n", key, dwflags);
-+    return STATUS_SUCCESS;
-+}
-+
- NTSTATUS WINAPI BCryptOpenAlgorithmProvider( BCRYPT_ALG_HANDLE *handle, LPCWSTR id, LPCWSTR implementation, DWORD flags )
- {
-     const DWORD supported_flags = BCRYPT_ALG_HANDLE_HMAC_FLAG;
-diff --git a/include/bcrypt.h b/include/bcrypt.h
-index ce11685..b8e93a6 100644
---- a/include/bcrypt.h
-+++ b/include/bcrypt.h
-@@ -223,6 +223,7 @@ NTSTATUS WINAPI BCryptDestroyHash(BCRYPT_HASH_HANDLE);
- NTSTATUS WINAPI BCryptDestroyKey(BCRYPT_KEY_HANDLE);
- NTSTATUS WINAPI BCryptEncrypt(BCRYPT_KEY_HANDLE, PUCHAR, ULONG, VOID *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG *, ULONG);
- NTSTATUS WINAPI BCryptEnumAlgorithms(ULONG, ULONG *, BCRYPT_ALGORITHM_IDENTIFIER **, ULONG);
-+NTSTATUS WINAPI BCryptFinalizeKeyPair(BCRYPT_KEY_HANDLE, ULONG);
- NTSTATUS WINAPI BCryptFinishHash(BCRYPT_HASH_HANDLE, PUCHAR, ULONG, ULONG);
- NTSTATUS WINAPI BCryptGenerateKeyPair(BCRYPT_ALG_HANDLE, BCRYPT_KEY_HANDLE *, ULONG, ULONG);
- NTSTATUS WINAPI BCryptGenerateSymmetricKey(BCRYPT_ALG_HANDLE, BCRYPT_KEY_HANDLE *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG);
--- 
-1.9.1
-

patches/bcrypt-BCryptGenerateKeyPair/definition

@@ -1 +0,0 @@
-Fixes: [45312] Fix issue for Assassin's Creed : Syndicate

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

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

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

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