Release v5.11

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

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

@@ -1,18 +1,18 @@
-From 9e585de1f2f28e1ef18c1edca875779c491375cb Mon Sep 17 00:00:00 2001
+From aa9cb874b1fb89601d6a5a735b442b8a7aa7b3aa Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Thu, 2 Oct 2014 19:44:31 +0200
 Subject: [PATCH] kernel32: Add winediag message to show warning, that this
  isn't vanilla wine.
 
 ---
- dlls/kernel32/process.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
+ dlls/kernel32/process.c | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
 
 diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
-index 36ed82bff8c..b8a677c5485 100644
+index 8f506fcf1320..45bfe7fe7b5d 100644
 --- a/dlls/kernel32/process.c
 +++ b/dlls/kernel32/process.c
-@@ -65,6 +65,7 @@
+@@ -60,6 +60,7 @@
  
  WINE_DEFAULT_DEBUG_CHANNEL(process);
  WINE_DECLARE_DEBUG_CHANNEL(relay);
@@ -20,7 +20,15 @@ index 36ed82bff8c..b8a677c5485 100644
  
  typedef struct
  {
-@@ -997,6 +998,15 @@ void WINAPI start_process( LPTHREAD_START_ROUTINE entry, PEB *peb )
+@@ -125,6 +126,7 @@ static inline DWORD call_process_entry( PEB *peb, LPTHREAD_START_ROUTINE entry )
+ }
+ #endif
+ 
++extern const char * CDECL wine_get_version(void);
+ /***********************************************************************
+  *           __wine_start_process
+  *
+@@ -150,6 +152,15 @@ void CDECL __wine_start_process( LPTHREAD_START_ROUTINE entry, PEB *peb )
  
      __TRY
      {
@@ -37,5 +45,5 @@ index 36ed82bff8c..b8a677c5485 100644
              being_debugged = FALSE;
  
 -- 
-2.23.0
+2.26.2
 

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

@@ -1,4 +1,4 @@
-From 90474eb9f6583f2e8fe0314cfa0b0dc04797833b Mon Sep 17 00:00:00 2001
+From ed999d4430c1aca8f90f26670d3615cdaaab300d 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 1ebe07fc08c..7a19674b2f3 100644
+index 0d19e12768f..e313d5807b3 100644
 --- a/dlls/ntdll/ntdll.spec
 +++ b/dlls/ntdll/ntdll.spec
-@@ -1586,6 +1586,9 @@
+@@ -1594,6 +1594,9 @@
  # Virtual memory
  @ cdecl __wine_locked_recvmsg(long ptr long)
  
@@ -28,10 +28,10 @@ index 1ebe07fc08c..7a19674b2f3 100644
  @ cdecl wine_get_version() NTDLL_wine_get_version
  @ cdecl wine_get_build_id() NTDLL_wine_get_build_id
 diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
-index 27e7141bc65..4baf8a3967b 100644
+index 47800db41b1..12e7b721cb5 100644
 --- a/dlls/ntdll/ntdll_misc.h
 +++ b/dlls/ntdll/ntdll_misc.h
-@@ -107,6 +107,9 @@ extern int __wine_main_argc;
+@@ -86,6 +86,9 @@ extern int __wine_main_argc;
  extern char **__wine_main_argv;
  extern WCHAR **__wine_main_wargv;
  
@@ -42,10 +42,10 @@ index 27e7141bc65..4baf8a3967b 100644
  extern const char *build_dir DECLSPEC_HIDDEN;
  extern const char *data_dir DECLSPEC_HIDDEN;
 diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c
-index 6c5f722b2a6..df81e061e7b 100644
+index b1cc307d2ae..2e5fee216ef 100644
 --- a/dlls/ntdll/process.c
 +++ b/dlls/ntdll/process.c
-@@ -119,6 +119,24 @@ HANDLE CDECL __wine_make_process_system(void)
+@@ -85,6 +85,24 @@ HANDLE CDECL __wine_make_process_system(void)
      return ret;
  }
  
@@ -67,11 +67,11 @@ index 6c5f722b2a6..df81e061e7b 100644
 +    return ret;
 +}
 +
- static UINT process_error_mode;
- 
- #define UNIMPLEMENTED_INFO_CLASS(c) \
+ /******************************************************************************
+ *  NtQueryInformationProcess		[NTDLL.@]
+ *  ZwQueryInformationProcess		[NTDLL.@]
 diff --git a/server/protocol.def b/server/protocol.def
-index c53ceb50d50..947a3c971f5 100644
+index 6e0f309450a..7315f8ac4ea 100644
 --- a/server/protocol.def
 +++ b/server/protocol.def
 @@ -3755,6 +3755,14 @@ struct handle_info
@@ -215,5 +215,5 @@ index c4f1cd943c2..970ed1838da 100644
 +    }
 +}
 -- 
-2.26.2
+2.27.0
 

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

@@ -1,4 +1,4 @@
-From 2f03ded51b6f537ac6a4f3bfb51e1d0998a27c48 Mon Sep 17 00:00:00 2001
+From 1f2b1bafabfd457836f18741f178b3745e129c36 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sat, 5 Aug 2017 03:39:55 +0200
 Subject: [PATCH] ntdll: Implement process token elevation through manifests.
@@ -12,10 +12,10 @@ Subject: [PATCH] ntdll: Implement process token elevation through manifests.
  5 files changed, 67 insertions(+)
 
 diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
-index 38c893e3eb4..d32b57612d5 100644
+index 0c8f05285c4..92ae87c6e6d 100644
 --- a/dlls/ntdll/loader.c
 +++ b/dlls/ntdll/loader.c
-@@ -4045,6 +4045,32 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, void **entry, ULONG_PTR unknow
+@@ -3898,6 +3898,32 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, void **entry, ULONG_PTR unknow
  }
  
  
@@ -48,17 +48,17 @@ index 38c893e3eb4..d32b57612d5 100644
  /***********************************************************************
   *           load_global_options
   */
-@@ -4478,6 +4504,7 @@ void __wine_process_init(void)
-                                       's','y','s','t','e','m','3','2','\\',
+@@ -4359,6 +4385,7 @@ void __wine_process_init(void)
                                        'k','e','r','n','e','l','3','2','.','d','l','l',0};
+     void (WINAPI *kernel32_start_process)(LPTHREAD_START_ROUTINE,void*) = NULL;
      RTL_USER_PROCESS_PARAMETERS *params;
 +    ACTIVATION_CONTEXT_RUN_LEVEL_INFORMATION runlevel;
      WINE_MODREF *wm;
      NTSTATUS status;
      ANSI_STRING func_name;
-@@ -4575,6 +4602,16 @@ void __wine_process_init(void)
+@@ -4453,6 +4480,16 @@ void __wine_process_init(void)
  
-     virtual_set_large_address_space();
+     unix_funcs->virtual_set_large_address_space();
  
 +    /* elevate process if necessary */
 +    status = RtlQueryInformationActivationContext( 0, NULL, 0, RunlevelInformationInActivationContext,
@@ -74,10 +74,10 @@ index 38c893e3eb4..d32b57612d5 100644
      RemoveEntryList( &wm->ldr.InLoadOrderLinks );
      InsertHeadList( &peb->LdrData->InLoadOrderModuleList, &wm->ldr.InLoadOrderLinks );
 diff --git a/server/process.c b/server/process.c
-index 4c7da9223c1..d6f71a774f3 100644
+index ac85cace95d..52604ec4d61 100644
 --- a/server/process.c
 +++ b/server/process.c
-@@ -1107,6 +1107,14 @@ struct process_snapshot *process_snap( int *count )
+@@ -1115,6 +1115,14 @@ struct process_snapshot *process_snap( int *count )
      return snapshot;
  }
  
@@ -105,10 +105,10 @@ index 5b83e111a6f..dfe5c4e52d8 100644
  /* console functions */
  extern void inherit_console( struct thread *parent_thread, struct process *parent,
 diff --git a/server/protocol.def b/server/protocol.def
-index 68c66bc2fcb..55c821ac1e2 100644
+index 7315f8ac4ea..901c380b721 100644
 --- a/server/protocol.def
 +++ b/server/protocol.def
-@@ -3762,6 +3762,13 @@ struct handle_info
+@@ -3763,6 +3763,13 @@ struct handle_info
  @END
  
  
@@ -145,5 +145,5 @@ index 970ed1838da..1c1d49989b3 100644
 +    }
 +}
 -- 
-2.26.0
+2.26.2
 

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

@@ -1,4 +1,4 @@
-From 51830c6683b199e79cb9e782ee51555054a4da7c Mon Sep 17 00:00:00 2001
+From 9c61f6acfa2c43e43f07fae1a5cd447573b9529b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sun, 6 Aug 2017 02:08:05 +0200
 Subject: [PATCH] server: Implement support for creating processes using a
@@ -6,20 +6,20 @@ Subject: [PATCH] server: Implement support for creating processes using a
 
 ---
  dlls/kernelbase/process.c | 24 +++++++++++++-----------
- dlls/ntdll/process.c      |  3 ++-
+ dlls/ntdll/unix/process.c |  1 +
  server/process.c          | 39 +++++++++++++++++++++++++++++++++++----
  server/process.h          |  2 +-
  server/protocol.def       |  1 +
  server/request.c          |  2 +-
  server/security.h         |  2 ++
  server/token.c            | 11 +++++++++++
- 8 files changed, 66 insertions(+), 18 deletions(-)
+ 8 files changed, 65 insertions(+), 17 deletions(-)
 
 diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c
-index a07dddb1f..99985ab89 100644
+index a3b168543fc..b5c8b47239d 100644
 --- a/dlls/kernelbase/process.c
 +++ b/dlls/kernelbase/process.c
-@@ -242,7 +242,7 @@ static RTL_USER_PROCESS_PARAMETERS *create_process_params( const WCHAR *filename
+@@ -244,7 +244,7 @@ static RTL_USER_PROCESS_PARAMETERS *create_process_params( const WCHAR *filename
  /***********************************************************************
   *           create_nt_process
   */
@@ -28,7 +28,7 @@ index a07dddb1f..99985ab89 100644
                                     BOOL inherit, DWORD flags, RTL_USER_PROCESS_PARAMETERS *params,
                                     RTL_USER_PROCESS_INFORMATION *info, HANDLE parent )
  {
-@@ -257,7 +257,7 @@ static NTSTATUS create_nt_process( SECURITY_ATTRIBUTES *psa, SECURITY_ATTRIBUTES
+@@ -259,7 +259,7 @@ static NTSTATUS create_nt_process( SECURITY_ATTRIBUTES *psa, SECURITY_ATTRIBUTES
          status = RtlCreateUserProcess( &nameW, OBJ_CASE_INSENSITIVE, params,
                                         psa ? psa->lpSecurityDescriptor : NULL,
                                         tsa ? tsa->lpSecurityDescriptor : NULL,
@@ -37,7 +37,7 @@ index a07dddb1f..99985ab89 100644
          RtlFreeUnicodeString( &nameW );
      }
      return status;
-@@ -267,7 +267,7 @@ static NTSTATUS create_nt_process( SECURITY_ATTRIBUTES *psa, SECURITY_ATTRIBUTES
+@@ -269,7 +269,7 @@ static NTSTATUS create_nt_process( SECURITY_ATTRIBUTES *psa, SECURITY_ATTRIBUTES
  /***********************************************************************
   *           create_vdm_process
   */
@@ -46,7 +46,7 @@ index a07dddb1f..99985ab89 100644
                                      BOOL inherit, DWORD flags, RTL_USER_PROCESS_PARAMETERS *params,
                                      RTL_USER_PROCESS_INFORMATION *info )
  {
-@@ -288,7 +288,7 @@ static NTSTATUS create_vdm_process( SECURITY_ATTRIBUTES *psa, SECURITY_ATTRIBUTE
+@@ -290,7 +290,7 @@ static NTSTATUS create_vdm_process( SECURITY_ATTRIBUTES *psa, SECURITY_ATTRIBUTE
                winevdm, params->ImagePathName.Buffer, params->CommandLine.Buffer );
      RtlInitUnicodeString( &params->ImagePathName, winevdm );
      RtlInitUnicodeString( &params->CommandLine, newcmdline );
@@ -55,7 +55,7 @@ index a07dddb1f..99985ab89 100644
      HeapFree( GetProcessHeap(), 0, newcmdline );
      return status;
  }
-@@ -297,7 +297,7 @@ static NTSTATUS create_vdm_process( SECURITY_ATTRIBUTES *psa, SECURITY_ATTRIBUTE
+@@ -299,7 +299,7 @@ static NTSTATUS create_vdm_process( SECURITY_ATTRIBUTES *psa, SECURITY_ATTRIBUTE
  /***********************************************************************
   *           create_cmd_process
   */
@@ -64,7 +64,7 @@ index a07dddb1f..99985ab89 100644
                                      BOOL inherit, DWORD flags, RTL_USER_PROCESS_PARAMETERS *params,
                                      RTL_USER_PROCESS_INFORMATION *info )
  {
-@@ -316,7 +316,7 @@ static NTSTATUS create_cmd_process( SECURITY_ATTRIBUTES *psa, SECURITY_ATTRIBUTE
+@@ -318,7 +318,7 @@ static NTSTATUS create_cmd_process( SECURITY_ATTRIBUTES *psa, SECURITY_ATTRIBUTE
      swprintf( newcmdline, len, L"%s /s/c \"%s\"", comspec, params->CommandLine.Buffer );
      RtlInitUnicodeString( &params->ImagePathName, comspec );
      RtlInitUnicodeString( &params->CommandLine, newcmdline );
@@ -73,7 +73,7 @@ index a07dddb1f..99985ab89 100644
      RtlFreeHeap( GetProcessHeap(), 0, newcmdline );
      return status;
  }
-@@ -448,7 +448,9 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessInternalW( HANDLE token, const WCHAR
+@@ -450,7 +450,9 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessInternalW( HANDLE token, const WCHAR
  
      TRACE( "app %s cmdline %s\n", debugstr_w(app_name), debugstr_w(cmd_line) );
  
@@ -84,7 +84,7 @@ index a07dddb1f..99985ab89 100644
      if (new_token) FIXME( "No support for returning created process token\n" );
  
      if (app_name)
-@@ -521,7 +523,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessInternalW( HANDLE token, const WCHAR
+@@ -523,7 +525,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessInternalW( HANDLE token, const WCHAR
          }
      }
  
@@ -93,7 +93,7 @@ index a07dddb1f..99985ab89 100644
      switch (status)
      {
      case STATUS_SUCCESS:
-@@ -530,7 +532,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessInternalW( HANDLE token, const WCHAR
+@@ -532,7 +534,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessInternalW( HANDLE token, const WCHAR
      case STATUS_INVALID_IMAGE_NE_FORMAT:
      case STATUS_INVALID_IMAGE_PROTECT:
          TRACE( "starting %s as Win16/DOS binary\n", debugstr_w(app_name) );
@@ -102,7 +102,7 @@ index a07dddb1f..99985ab89 100644
          break;
      case STATUS_INVALID_IMAGE_NOT_MZ:
          /* check for .com or .bat extension */
-@@ -538,12 +540,12 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessInternalW( HANDLE token, const WCHAR
+@@ -540,12 +542,12 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessInternalW( HANDLE token, const WCHAR
          if (!wcsicmp( p, L".com" ) || !wcsicmp( p, L".pif" ))
          {
              TRACE( "starting %s as DOS binary\n", debugstr_w(app_name) );
@@ -117,21 +117,12 @@ index a07dddb1f..99985ab89 100644
          }
          break;
      }
-diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c
-index f3d9079f8..2fa553091 100644
---- a/dlls/ntdll/process.c
-+++ b/dlls/ntdll/process.c
-@@ -1667,7 +1667,7 @@ NTSTATUS WINAPI RtlCreateUserProcess( UNICODE_STRING *path, ULONG attributes,
-                                       RTL_USER_PROCESS_PARAMETERS *params,
-                                       SECURITY_DESCRIPTOR *process_descr,
-                                       SECURITY_DESCRIPTOR *thread_descr,
--                                      HANDLE parent, BOOLEAN inherit, HANDLE debug, HANDLE exception,
-+                                      HANDLE parent, BOOLEAN inherit, HANDLE debug, HANDLE token,
-                                       RTL_USER_PROCESS_INFORMATION *info )
- {
-     NTSTATUS status;
-@@ -1735,6 +1735,7 @@ NTSTATUS WINAPI RtlCreateUserProcess( UNICODE_STRING *path, ULONG attributes,
-         req->access         = PROCESS_ALL_ACCESS;
+diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c
+index cca6c2747bf..379a0036b63 100644
+--- a/dlls/ntdll/unix/process.c
++++ b/dlls/ntdll/unix/process.c
+@@ -827,6 +827,7 @@ NTSTATUS WINAPI NtCreateUserProcess( HANDLE *process_handle_ptr, HANDLE *thread_
+         req->access         = process_access;
          req->cpu            = pe_info.cpu;
          req->info_size      = startup_info_size;
 +        req->token          = wine_server_obj_handle( token );
@@ -139,10 +130,10 @@ index f3d9079f8..2fa553091 100644
          wine_server_add_data( req, startup_info, startup_info_size );
          wine_server_add_data( req, params->Environment, env_size );
 diff --git a/server/process.c b/server/process.c
-index d6f71a774..aa66814d8 100644
+index 52604ec4d61..047916ffd09 100644
 --- a/server/process.c
 +++ b/server/process.c
-@@ -491,7 +491,7 @@ static void start_sigkill_timer( struct process *process )
+@@ -499,7 +499,7 @@ static void start_sigkill_timer( struct process *process )
  /* create a new process */
  /* if the function fails the fd is closed */
  struct process *create_process( int fd, struct process *parent, int inherit_all,
@@ -151,7 +142,7 @@ index d6f71a774..aa66814d8 100644
  {
      struct process *process;
  
-@@ -568,7 +568,7 @@ struct process *create_process( int fd, struct process *parent, int inherit_all,
+@@ -576,7 +576,7 @@ struct process *create_process( int fd, struct process *parent, int inherit_all,
                                         : alloc_handle_table( process, 0 );
          /* Note: for security reasons, starting a new process does not attempt
           * to use the current impersonation token for the new process */
@@ -160,7 +151,7 @@ index d6f71a774..aa66814d8 100644
          process->affinity = parent->affinity;
      }
      if (!process->handles || !process->token) goto error;
-@@ -1124,6 +1124,7 @@ DECL_HANDLER(new_process)
+@@ -1132,6 +1132,7 @@ DECL_HANDLER(new_process)
      const struct security_descriptor *sd;
      const struct object_attributes *objattr = get_req_object_attributes( &sd, &name, NULL );
      struct process *process = NULL;
@@ -168,7 +159,7 @@ index d6f71a774..aa66814d8 100644
      struct process *parent;
      struct thread *parent_thread = current;
      int socket_fd = thread_get_inflight_fd( current, req->socket_fd );
-@@ -1177,10 +1178,39 @@ DECL_HANDLER(new_process)
+@@ -1185,10 +1186,39 @@ DECL_HANDLER(new_process)
          return;
      }
  
@@ -208,7 +199,7 @@ index d6f71a774..aa66814d8 100644
          release_object( parent );
          return;
      }
-@@ -1228,7 +1258,7 @@ DECL_HANDLER(new_process)
+@@ -1236,7 +1266,7 @@ DECL_HANDLER(new_process)
  #undef FIXUP_LEN
      }
  
@@ -217,7 +208,7 @@ index d6f71a774..aa66814d8 100644
  
      process->startup_info = (struct startup_info *)grab_object( info );
  
-@@ -1289,6 +1319,7 @@ DECL_HANDLER(new_process)
+@@ -1297,6 +1327,7 @@ DECL_HANDLER(new_process)
      reply->handle = alloc_handle_no_access_check( current->process, process, req->access, objattr->attributes );
  
   done:
@@ -225,7 +216,7 @@ index d6f71a774..aa66814d8 100644
      if (process) release_object( process );
      release_object( parent );
      release_object( info );
-@@ -1322,7 +1353,7 @@ DECL_HANDLER(exec_process)
+@@ -1330,7 +1361,7 @@ DECL_HANDLER(exec_process)
          close( socket_fd );
          return;
      }
@@ -235,7 +226,7 @@ index d6f71a774..aa66814d8 100644
      release_object( process );
  }
 diff --git a/server/process.h b/server/process.h
-index dfe5c4e52..61b83abf6 100644
+index dfe5c4e52d8..61b83abf693 100644
 --- a/server/process.h
 +++ b/server/process.h
 @@ -118,7 +118,7 @@ extern unsigned int alloc_ptid( void *ptr );
@@ -248,10 +239,10 @@ index dfe5c4e52..61b83abf6 100644
  extern struct thread *get_process_first_thread( struct process *process );
  extern struct process *get_process_from_id( process_id_t id );
 diff --git a/server/protocol.def b/server/protocol.def
-index 45ab670ea..c763da4ca 100644
+index 901c380b721..8c86967609f 100644
 --- a/server/protocol.def
 +++ b/server/protocol.def
-@@ -791,6 +791,7 @@ struct rawinput_device
+@@ -801,6 +801,7 @@ struct rawinput_device
      unsigned int access;         /* access rights for process object */
      client_cpu_t cpu;            /* CPU that the new process will use */
      data_size_t  info_size;      /* size of startup info */
@@ -260,7 +251,7 @@ index 45ab670ea..c763da4ca 100644
      VARARG(info,startup_info,info_size); /* startup information */
      VARARG(env,unicode_str);     /* environment for new process */
 diff --git a/server/request.c b/server/request.c
-index 200c2697d..f743b720a 100644
+index 4c1f30a5fe7..321bb6cfa81 100644
 --- a/server/request.c
 +++ b/server/request.c
 @@ -582,7 +582,7 @@ static void master_socket_poll_event( struct fd *fd, int event )
@@ -273,7 +264,7 @@ index 200c2697d..f743b720a 100644
              create_thread( -1, process, NULL );
              release_object( process );
 diff --git a/server/security.h b/server/security.h
-index 21e90ccf2..32dfe5f8d 100644
+index 21e90ccf23f..32dfe5f8db9 100644
 --- a/server/security.h
 +++ b/server/security.h
 @@ -67,6 +67,8 @@ extern const ACL *token_get_default_dacl( struct token *token );
@@ -286,10 +277,10 @@ index 21e90ccf2..32dfe5f8d 100644
  static inline const ACE_HEADER *ace_next( const ACE_HEADER *ace )
  {
 diff --git a/server/token.c b/server/token.c
-index 181219d21..858ec25d7 100644
+index 1c1d49989b3..2f466aa1b25 100644
 --- a/server/token.c
 +++ b/server/token.c
-@@ -845,6 +845,12 @@ int token_assign_label( struct token *token, PSID label )
+@@ -843,6 +843,12 @@ int token_assign_label( struct token *token, PSID label )
      return ret;
  }
  
@@ -302,7 +293,7 @@ index 181219d21..858ec25d7 100644
  struct token *token_create_admin( void )
  {
      struct token *token = NULL;
-@@ -1271,6 +1277,11 @@ const SID *token_get_primary_group( struct token *token )
+@@ -1269,6 +1275,11 @@ const SID *token_get_primary_group( struct token *token )
      return token->primary_group;
  }
  
@@ -315,5 +306,5 @@ index 181219d21..858ec25d7 100644
  {
      GENERIC_MAPPING mapping;
 -- 
-2.24.0
+2.27.0
 

patches/bcrypt-ECDHSecretAgreement/0001-bcrypt-Implement-BCryptSecretAgreement-with-libgcryp.patch

@@ -1,4 +1,4 @@
-From 830d2641a7e23474b3ef4ee52e42e6b4f2cd388b Mon Sep 17 00:00:00 2001
+From a5c9b96c7b517d212260cb8567162425554ff613 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 BCryptSecretAgreement with libgcrypt.
@@ -17,10 +17,10 @@ Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
  create mode 100644 dlls/bcrypt/gcrypt.c
 
 diff --git a/configure.ac b/configure.ac
-index 47d2b750c01..2dfa2ebcb51 100644
+index e3d63ed7501..beb86c23b45 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -46,6 +46,7 @@ AC_ARG_WITH(faudio,    AS_HELP_STRING([--without-faudio],[do not use FAudio (XAu
+@@ -47,6 +47,7 @@ AC_ARG_WITH(faudio,    AS_HELP_STRING([--without-faudio],[do not use FAudio (XAu
  AC_ARG_WITH(float-abi, AS_HELP_STRING([--with-float-abi=abi],[specify the ABI (soft|softfp|hard) for ARM platforms]))
  AC_ARG_WITH(fontconfig,AS_HELP_STRING([--without-fontconfig],[do not use fontconfig]))
  AC_ARG_WITH(freetype,  AS_HELP_STRING([--without-freetype],[do not use the FreeType library]))
@@ -28,7 +28,7 @@ index 47d2b750c01..2dfa2ebcb51 100644
  AC_ARG_WITH(gettext,   AS_HELP_STRING([--without-gettext],[do not use gettext]))
  AC_ARG_WITH(gettextpo, AS_HELP_STRING([--with-gettextpo],[use the GetTextPO library to rebuild po files]),
              [if test "x$withval" = "xno"; then ac_cv_header_gettext_po_h=no; fi])
-@@ -1989,6 +1990,19 @@ WINE_NOTICE_WITH(vkd3d,[test "x$ac_cv_lib_soname_vkd3d" = "x"],
+@@ -2033,6 +2034,19 @@ WINE_NOTICE_WITH(vkd3d,[test "x$ac_cv_lib_soname_vkd3d" = "x"],
                   [vkd3d ${notice_platform}development files not found (or too old), Direct3D 12 won't be supported.])
  test "x$ac_cv_lib_soname_vkd3d" != "x" || enable_d3d12=${enable_d3d12:-no}
  
@@ -61,7 +61,7 @@ index dd6d4a76640..ea3486a4002 100644
  	macos.c \
  	md2.c \
 diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h
-index 5cc2c249da8..b16dfbdcd2b 100644
+index 18343a6c749..27cd4950274 100644
 --- a/dlls/bcrypt/bcrypt_internal.h
 +++ b/dlls/bcrypt/bcrypt_internal.h
 @@ -25,6 +25,9 @@
@@ -74,7 +74,7 @@ index 5cc2c249da8..b16dfbdcd2b 100644
  #elif HAVE_COMMONCRYPTO_COMMONCRYPTOR_H
  #include <AvailabilityMacros.h>
  #include <CommonCrypto/CommonCryptor.h>
-@@ -157,6 +160,12 @@ struct algorithm
+@@ -161,6 +164,12 @@ struct algorithm
      ULONG         flags;
  };
  
@@ -87,15 +87,15 @@ index 5cc2c249da8..b16dfbdcd2b 100644
  #if defined(HAVE_GNUTLS_CIPHER_INIT)
  struct key_symmetric
  {
-@@ -251,6 +260,7 @@ NTSTATUS key_destroy( struct key * ) DECLSPEC_HIDDEN;
- BOOL key_is_symmetric( struct key * ) DECLSPEC_HIDDEN;
+@@ -258,6 +267,7 @@ NTSTATUS key_export_dsa_capi( struct key *, UCHAR *, ULONG, ULONG * ) DECLSPEC_H
  NTSTATUS key_export_ecc( struct key *, UCHAR *, ULONG, ULONG * ) DECLSPEC_HIDDEN;
+ NTSTATUS key_import_dsa_capi( struct key *, UCHAR *, ULONG ) DECLSPEC_HIDDEN;
  NTSTATUS key_import_ecc( struct key *, UCHAR *, ULONG ) DECLSPEC_HIDDEN;
 +NTSTATUS compute_secret_ecc (struct key *pubkey_in, struct key *privkey_in, struct secret *secret) DECLSPEC_HIDDEN;
  
  BOOL is_zero_vector( const UCHAR *, ULONG ) DECLSPEC_HIDDEN;
  BOOL is_equal_vector( const UCHAR *, ULONG, const UCHAR *, ULONG ) DECLSPEC_HIDDEN;
-@@ -258,4 +268,7 @@ BOOL is_equal_vector( const UCHAR *, ULONG, const UCHAR *, ULONG ) DECLSPEC_HIDD
+@@ -265,4 +275,7 @@ BOOL is_equal_vector( const UCHAR *, ULONG, const UCHAR *, ULONG ) DECLSPEC_HIDD
  BOOL gnutls_initialize(void) DECLSPEC_HIDDEN;
  void gnutls_uninitialize(void) DECLSPEC_HIDDEN;
  
@@ -104,10 +104,10 @@ index 5cc2c249da8..b16dfbdcd2b 100644
 +
  #endif /* __BCRYPT_INTERNAL_H */
 diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
-index c2939ea815a..15b934247d8 100644
+index fee40ebe8d7..f254571bbc2 100644
 --- a/dlls/bcrypt/bcrypt_main.c
 +++ b/dlls/bcrypt/bcrypt_main.c
-@@ -1349,6 +1349,12 @@ NTSTATUS key_import_ecc( struct key *key, UCHAR *input, ULONG len )
+@@ -1421,6 +1421,12 @@ NTSTATUS key_import_ecc( struct key *key, UCHAR *input, ULONG len )
      ERR( "support for keys not available at build time\n" );
      return STATUS_NOT_IMPLEMENTED;
  }
@@ -120,7 +120,7 @@ index c2939ea815a..15b934247d8 100644
  #endif
  
  NTSTATUS WINAPI BCryptGenerateSymmetricKey( BCRYPT_ALG_HANDLE algorithm, BCRYPT_KEY_HANDLE *handle,
-@@ -1714,27 +1720,81 @@ NTSTATUS WINAPI BCryptDeriveKeyPBKDF2( BCRYPT_ALG_HANDLE handle, UCHAR *pwd, ULO
+@@ -1833,27 +1839,81 @@ NTSTATUS WINAPI BCryptDeriveKeyPBKDF2( BCRYPT_ALG_HANDLE handle, UCHAR *pwd, ULO
      return STATUS_SUCCESS;
  }
  
@@ -212,7 +212,7 @@ index c2939ea815a..15b934247d8 100644
  }
  
  BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
-@@ -1746,6 +1806,9 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
+@@ -1865,6 +1925,9 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
          DisableThreadLibraryCalls( hinst );
  #ifdef HAVE_GNUTLS_CIPHER_INIT
          gnutls_initialize();
@@ -222,7 +222,7 @@ index c2939ea815a..15b934247d8 100644
  #endif
          break;
  
-@@ -1753,6 +1816,9 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
+@@ -1872,6 +1935,9 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
          if (reserved) break;
  #ifdef HAVE_GNUTLS_CIPHER_INIT
          gnutls_uninitialize();
@@ -234,7 +234,7 @@ index c2939ea815a..15b934247d8 100644
      }
 diff --git a/dlls/bcrypt/gcrypt.c b/dlls/bcrypt/gcrypt.c
 new file mode 100644
-index 00000000000..d7ed6eeddf3
+index 00000000000..f882d61def8
 --- /dev/null
 +++ b/dlls/bcrypt/gcrypt.c
 @@ -0,0 +1,264 @@
@@ -503,10 +503,10 @@ index 00000000000..d7ed6eeddf3
 +}
 +#endif
 diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c
-index 1d78b9f4d1f..59c98eed0cc 100644
+index d447e90a11e..7828fa5c792 100644
 --- a/dlls/bcrypt/gnutls.c
 +++ b/dlls/bcrypt/gnutls.c
-@@ -1297,4 +1297,13 @@ NTSTATUS key_destroy( struct key *key )
+@@ -1580,4 +1580,13 @@ NTSTATUS key_destroy( struct key *key )
      heap_free( key );
      return STATUS_SUCCESS;
  }
@@ -521,10 +521,10 @@ index 1d78b9f4d1f..59c98eed0cc 100644
 +
  #endif
 diff --git a/dlls/bcrypt/macos.c b/dlls/bcrypt/macos.c
-index 9ff9772c15a..4851603819c 100644
+index f635ba4bc8e..50cd5d83d1f 100644
 --- a/dlls/bcrypt/macos.c
 +++ b/dlls/bcrypt/macos.c
-@@ -268,4 +268,10 @@ NTSTATUS key_destroy( struct key *key )
+@@ -267,4 +267,10 @@ NTSTATUS key_destroy( struct key *key )
      heap_free( key );
      return STATUS_SUCCESS;
  }
@@ -536,10 +536,10 @@ index 9ff9772c15a..4851603819c 100644
 +}
  #endif
 diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c
-index f7404057fa8..d9509f2c49b 100644
+index e4a99d63048..6ca26b3d6ba 100644
 --- a/dlls/bcrypt/tests/bcrypt.c
 +++ b/dlls/bcrypt/tests/bcrypt.c
-@@ -2067,7 +2067,7 @@ static void test_ECDH(void)
+@@ -2068,7 +2068,7 @@ static void test_ECDH(void)
          goto raw_secret_end;
      }
  
@@ -549,5 +549,5 @@ index f7404057fa8..d9509f2c49b 100644
      if (status != STATUS_SUCCESS)
      {
 -- 
-2.17.1
+2.26.2
 

patches/d3d11-Deferred_Context/0045-d3d11-Implement-ID3D11Device2-GetImmediateContext1.patch

@@ -0,0 +1,44 @@
+From 2537d783b525e7ec2239b87b17916d15e0130add Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Mon, 1 Jun 2020 16:34:54 +1000
+Subject: [PATCH] d3d11: Implement ID3D11Device2 GetImmediateContext1
+
+Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=41636
+---
+ dlls/d3d11/device.c | 19 +++++++++++++++++--
+ 1 file changed, 17 insertions(+), 2 deletions(-)
+
+diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
+index a649be2f8ea..28100c2f9db 100644
+--- a/dlls/d3d11/device.c
++++ b/dlls/d3d11/device.c
+@@ -7174,9 +7174,24 @@ static void STDMETHODCALLTYPE d3d11_device_GetImmediateContext1(ID3D11Device2 *i
+ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeferredContext1(ID3D11Device2 *iface, UINT flags,
+         ID3D11DeviceContext1 **context)
+ {
+-    FIXME("iface %p, flags %#x, context %p stub!\n", iface, flags, context);
++    struct d3d11_deferred_context *object;
+ 
+-    return E_NOTIMPL;
++    TRACE("iface %p, flags %#x, context %p.\n", iface, flags, context);
++
++    if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object))))
++        return E_OUTOFMEMORY;
++
++    object->ID3D11DeviceContext1_iface.lpVtbl = &d3d11_deferred_context_vtbl;
++    object->device = (ID3D11Device *)iface;
++    object->refcount = 1;
++
++    list_init(&object->commands);
++
++    ID3D11Device2_AddRef(iface);
++    wined3d_private_store_init(&object->private_store);
++
++    return ID3D11DeviceContext1_QueryInterface(&object->ID3D11DeviceContext1_iface,
++            &IID_ID3D11DeviceContext, (void**)context);
+ }
+ 
+ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateBlendState1(ID3D11Device2 *iface,
+-- 
+2.26.2
+

patches/d3d11-Deferred_Context/definition

@@ -1,5 +1,6 @@
 Fixes: [42191] Add semi-stub for D3D11 deferred context implementation
 Fixes: [43743] No 3D graphics in Wolcen: Lords of Mayhem
 Fixes: [44089] Correcly align the mapinfo buffer.
+Fixes: [41636] d3d11: Implement ID3D11Device2 GetImmediateContext1
 #This is pretty dumb.
 Depends: nvapi-Stub_DLL

patches/directmanipulation-new-dll/0002-directmanipulation-New-dll.patch

@@ -1,198 +0,0 @@
-From 3c3fd497486e624cbc8ab3a98e2fd02cdf6dc2ba Mon Sep 17 00:00:00 2001
-From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Wed, 17 Jul 2019 09:26:16 +1000
-Subject: [PATCH 2/6] directmanipulation: New dll
-
-Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
----
- configure                                     |  2 +
- configure.ac                                  |  1 +
- dlls/directmanipulation/Makefile.in           |  8 +++
- dlls/directmanipulation/directmanip.idl       | 38 +++++++++++
- dlls/directmanipulation/directmanipulation.c  | 67 +++++++++++++++++++
- .../directmanipulation.spec                   |  6 ++
- 6 files changed, 122 insertions(+)
- create mode 100644 dlls/directmanipulation/Makefile.in
- create mode 100644 dlls/directmanipulation/directmanip.idl
- create mode 100644 dlls/directmanipulation/directmanipulation.c
- create mode 100644 dlls/directmanipulation/directmanipulation.spec
-
-diff --git a/configure b/configure
-index f1de2c4052..bc376a6686 100755
---- a/configure
-+++ b/configure
-@@ -1231,6 +1231,7 @@ enable_dhtmled_ocx
- enable_difxapi
- enable_dinput
- enable_dinput8
-+enable_directmanipulation
- enable_dispex
- enable_dmband
- enable_dmcompos
-@@ -20162,6 +20163,7 @@ wine_fn_config_makefile dlls/dinput enable_dinput
- wine_fn_config_makefile dlls/dinput/tests enable_tests
- wine_fn_config_makefile dlls/dinput8 enable_dinput8
- wine_fn_config_makefile dlls/dinput8/tests enable_tests
-+wine_fn_config_makefile dlls/directmanipulation enable_directmanipulation
- wine_fn_config_makefile dlls/dispdib.dll16 enable_win16
- wine_fn_config_makefile dlls/dispex enable_dispex
- wine_fn_config_makefile dlls/dispex/tests enable_tests
-diff --git a/configure.ac b/configure.ac
-index a7c45ace73..51519fdd9b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -3148,6 +3148,7 @@ WINE_CONFIG_MAKEFILE(dlls/dinput)
- WINE_CONFIG_MAKEFILE(dlls/dinput/tests)
- WINE_CONFIG_MAKEFILE(dlls/dinput8)
- WINE_CONFIG_MAKEFILE(dlls/dinput8/tests)
-+WINE_CONFIG_MAKEFILE(dlls/directmanipulation)
- WINE_CONFIG_MAKEFILE(dlls/dispdib.dll16,enable_win16)
- WINE_CONFIG_MAKEFILE(dlls/dispex)
- WINE_CONFIG_MAKEFILE(dlls/dispex/tests)
-diff --git a/dlls/directmanipulation/Makefile.in b/dlls/directmanipulation/Makefile.in
-new file mode 100644
-index 0000000000..331c2a8420
---- /dev/null
-+++ b/dlls/directmanipulation/Makefile.in
-@@ -0,0 +1,8 @@
-+MODULE    = directmanipulation.dll
-+
-+EXTRADLLFLAGS = -mno-cygwin
-+
-+IDL_SRCS = directmanip.idl
-+
-+C_SRCS = \
-+	directmanipulation.c
-diff --git a/dlls/directmanipulation/directmanip.idl b/dlls/directmanipulation/directmanip.idl
-new file mode 100644
-index 0000000000..ff00668ba5
---- /dev/null
-+++ b/dlls/directmanipulation/directmanip.idl
-@@ -0,0 +1,38 @@
-+/*
-+ * Copyright 2019 Alistair Leslie-Hughes
-+ *
-+ * 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
-+ */
-+#pragma makedep register
-+
-+[
-+    uuid(54e211b6-3650-4f75-8334-fa359598e1c5),
-+    threading(both)
-+]
-+coclass DirectManipulationManager
-+{
-+    interface IDirectManipulationManager2;
-+    [default] interface IDirectManipulationManager;
-+}
-+
-+[
-+    uuid(99793286-77cc-4b57-96db-3b354f6f9fb5),
-+    threading(both)
-+]
-+coclass DirectManipulationSharedManager
-+{
-+    interface IDirectManipulationManager2;
-+    [default] interface IDirectManipulationManager;
-+}
-diff --git a/dlls/directmanipulation/directmanipulation.c b/dlls/directmanipulation/directmanipulation.c
-new file mode 100644
-index 0000000000..136b2976a4
---- /dev/null
-+++ b/dlls/directmanipulation/directmanipulation.c
-@@ -0,0 +1,67 @@
-+/*
-+ * Copyright 2019 Alistair Leslie-Hughes
-+ *
-+ * 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 "windef.h"
-+#include "winbase.h"
-+#include "oleidl.h"
-+#include "rpcproxy.h"
-+#include "wine/debug.h"
-+
-+WINE_DEFAULT_DEBUG_CHANNEL(manipulation);
-+
-+static HINSTANCE dm_instance;
-+
-+BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)
-+{
-+    TRACE("(%p, %u, %p)\n", instance, reason, reserved);
-+
-+    switch (reason)
-+    {
-+        case DLL_WINE_PREATTACH:
-+            return FALSE;    /* prefer native version */
-+        case DLL_PROCESS_ATTACH:
-+            dm_instance = instance;
-+            DisableThreadLibraryCalls(instance);
-+            break;
-+    }
-+
-+    return TRUE;
-+}
-+
-+HRESULT WINAPI DllRegisterServer(void)
-+{
-+    return __wine_register_resources( dm_instance );
-+}
-+
-+HRESULT WINAPI DllUnregisterServer(void)
-+{
-+    return __wine_unregister_resources( dm_instance );
-+}
-+
-+HRESULT WINAPI DllCanUnloadNow(void)
-+{
-+    return S_FALSE;
-+}
-+
-+HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
-+{
-+    FIXME("(%s,%s,%p): no interface found.\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv);
-+    return CLASS_E_CLASSNOTAVAILABLE;
-+}
-\ No newline at end of file
-diff --git a/dlls/directmanipulation/directmanipulation.spec b/dlls/directmanipulation/directmanipulation.spec
-new file mode 100644
-index 0000000000..3f0004daeb
---- /dev/null
-+++ b/dlls/directmanipulation/directmanipulation.spec
-@@ -0,0 +1,6 @@
-+@ stub InitializeDManipHook
-+@ stdcall -private DllCanUnloadNow()
-+@ stub DllGetActivationFactory
-+@ stdcall -private DllGetClassObject(ptr ptr ptr)
-+@ stdcall -private DllRegisterServer()
-+@ stdcall -private DllUnregisterServer()
--- 
-2.17.1
-

patches/directmanipulation-new-dll/0003-uuid-Add-directmanipulation.h.patch

@@ -1,25 +0,0 @@
-From 528186d14bef47f9afdbee2e323445f14191c858 Mon Sep 17 00:00:00 2001
-From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Thu, 18 Jul 2019 09:46:30 +1000
-Subject: [PATCH 3/6] uuid: Add directmanipulation.h
-
-Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
----
- dlls/uuid/uuid.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c
-index aa3b30c3c7..eacb83301d 100644
---- a/dlls/uuid/uuid.c
-+++ b/dlls/uuid/uuid.c
-@@ -90,6 +90,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
- #include "netcfgx.h"
- #include "shimgdata.h"
- #include "comsvcs.h"
-+#include "directmanipulation.h"
- 
- /* FIXME: cguids declares GUIDs but does not define their values */
- 
--- 
-2.17.1
-

patches/directmanipulation-new-dll/0004-directmanipulation-Create-DirectManipulationManager-.patch

@@ -1,259 +0,0 @@
-From d7ab064f1040d0031a0f277f16d2ef7bfe5b1944 Mon Sep 17 00:00:00 2001
-From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Wed, 17 Jul 2019 16:33:21 +1000
-Subject: [PATCH 4/6] directmanipulation: Create
- DirectManipulationManager/DirectManipulationSharedManager objects
-
-Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44865
-Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
----
- dlls/directmanipulation/Makefile.in          |   1 +
- dlls/directmanipulation/directmanipulation.c | 205 ++++++++++++++++++-
- 2 files changed, 204 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/directmanipulation/Makefile.in b/dlls/directmanipulation/Makefile.in
-index 331c2a8420..d67a21eb77 100644
---- a/dlls/directmanipulation/Makefile.in
-+++ b/dlls/directmanipulation/Makefile.in
-@@ -1,4 +1,5 @@
- MODULE    = directmanipulation.dll
-+IMPORTS   = uuid
- 
- EXTRADLLFLAGS = -mno-cygwin
- 
-diff --git a/dlls/directmanipulation/directmanipulation.c b/dlls/directmanipulation/directmanipulation.c
-index 136b2976a4..81efa3688b 100644
---- a/dlls/directmanipulation/directmanipulation.c
-+++ b/dlls/directmanipulation/directmanipulation.c
-@@ -15,6 +15,7 @@
-  * License along with this library; if not, write to the Free Software
-  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-  */
-+#define COBJMACROS
- 
- #include <stdarg.h>
- 
-@@ -22,8 +23,11 @@
- #include "winbase.h"
- #include "oleidl.h"
- #include "rpcproxy.h"
-+#include "wine/heap.h"
- #include "wine/debug.h"
- 
-+#include "directmanipulation.h"
-+
- WINE_DEFAULT_DEBUG_CHANNEL(manipulation);
- 
- static HINSTANCE dm_instance;
-@@ -60,8 +64,205 @@ HRESULT WINAPI DllCanUnloadNow(void)
-     return S_FALSE;
- }
- 
-+
-+struct directmanipulation
-+{
-+    IDirectManipulationManager2 IDirectManipulationManager2_iface;
-+    LONG ref;
-+};
-+
-+static inline struct directmanipulation *impl_from_IDirectManipulationManager2(IDirectManipulationManager2 *iface)
-+{
-+    return CONTAINING_RECORD(iface, struct directmanipulation, IDirectManipulationManager2_iface);
-+}
-+
-+static HRESULT WINAPI direct_manip_QueryInterface(IDirectManipulationManager2 *iface, REFIID riid, void **ppv)
-+{
-+    if (IsEqualGUID(riid, &IID_IUnknown) ||
-+        IsEqualGUID(riid, &IID_IDirectManipulationManager) ||
-+        IsEqualGUID(riid, &IID_IDirectManipulationManager2)) {
-+        IUnknown_AddRef(iface);
-+        *ppv = iface;
-+        return S_OK;
-+    }
-+
-+    FIXME("(%p)->(%s,%p),not found\n", iface, debugstr_guid(riid), ppv);
-+    return E_NOINTERFACE;
-+}
-+
-+static ULONG WINAPI direct_manip_AddRef(IDirectManipulationManager2 *iface)
-+{
-+    struct directmanipulation *This = impl_from_IDirectManipulationManager2(iface);
-+    ULONG ref = InterlockedIncrement(&This->ref);
-+
-+    TRACE("(%p) ref=%u\n", This, ref);
-+
-+    return ref;
-+}
-+
-+static ULONG WINAPI direct_manip_Release(IDirectManipulationManager2 *iface)
-+{
-+    struct directmanipulation *This = impl_from_IDirectManipulationManager2(iface);
-+    ULONG ref = InterlockedDecrement(&This->ref);
-+
-+    TRACE("(%p) ref=%u\n", This, ref);
-+
-+    if (!ref)
-+    {
-+        heap_free(This);
-+    }
-+    return ref;
-+}
-+
-+static HRESULT WINAPI direct_manip_Activate(IDirectManipulationManager2 *iface, HWND window)
-+{
-+    struct directmanipulation *This = impl_from_IDirectManipulationManager2(iface);
-+    FIXME("%p, %p\n", This, window);
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI direct_manip_Deactivate(IDirectManipulationManager2 *iface, HWND window)
-+{
-+    struct directmanipulation *This = impl_from_IDirectManipulationManager2(iface);
-+    FIXME("%p, %p\n", This, window);
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI direct_manip_RegisterHitTestTarget(IDirectManipulationManager2 *iface, HWND window,
-+                HWND hittest, DIRECTMANIPULATION_HITTEST_TYPE type)
-+{
-+    struct directmanipulation *This = impl_from_IDirectManipulationManager2(iface);
-+    FIXME("%p, %p, %p, %d\n", This, window, hittest, type);
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI direct_manip_ProcessInput(IDirectManipulationManager2 *iface, const MSG *msg, BOOL *handled)
-+{
-+    struct directmanipulation *This = impl_from_IDirectManipulationManager2(iface);
-+    FIXME("%p, %p, %p\n", This, msg, handled);
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI direct_manip_GetUpdateManager(IDirectManipulationManager2 *iface, REFIID riid, void **obj)
-+{
-+    struct directmanipulation *This = impl_from_IDirectManipulationManager2(iface);
-+    FIXME("%p, %s, %p\n", This, debugstr_guid(riid), obj);
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI direct_manip_CreateViewport(IDirectManipulationManager2 *iface, IDirectManipulationFrameInfoProvider *frame,
-+                HWND window, REFIID riid, void **obj)
-+{
-+    struct directmanipulation *This = impl_from_IDirectManipulationManager2(iface);
-+    FIXME("%p, %p, %p, %s, %p\n", This, frame, window, debugstr_guid(riid), obj);
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI direct_manip_CreateContent(IDirectManipulationManager2 *iface, IDirectManipulationFrameInfoProvider *frame,
-+                REFCLSID clsid, REFIID riid, void **obj)
-+{
-+    struct directmanipulation *This = impl_from_IDirectManipulationManager2(iface);
-+    FIXME("%p, %p,  %s, %p\n", This, frame, debugstr_guid(riid), obj);
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI direct_manip_CreateBehavior(IDirectManipulationManager2 *iface, REFCLSID clsid, REFIID riid, void **obj)
-+{
-+    struct directmanipulation *This = impl_from_IDirectManipulationManager2(iface);
-+    FIXME("%p, %s,  %s, %p\n", This, debugstr_guid(clsid), debugstr_guid(riid), obj);
-+    return E_NOTIMPL;
-+}
-+
-+static const struct IDirectManipulationManager2Vtbl directmanipVtbl =
-+{
-+    direct_manip_QueryInterface,
-+    direct_manip_AddRef,
-+    direct_manip_Release,
-+    direct_manip_Activate,
-+    direct_manip_Deactivate,
-+    direct_manip_RegisterHitTestTarget,
-+    direct_manip_ProcessInput,
-+    direct_manip_GetUpdateManager,
-+    direct_manip_CreateViewport,
-+    direct_manip_CreateContent,
-+    direct_manip_CreateBehavior
-+};
-+
-+static HRESULT WINAPI DirectManipulation_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv)
-+{
-+    struct directmanipulation *object;
-+    HRESULT ret;
-+
-+    TRACE("(%p, %s, %p)\n", outer, debugstr_guid(riid), ppv);
-+
-+    *ppv = NULL;
-+
-+    object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object));
-+    if (!object)
-+        return E_OUTOFMEMORY;
-+
-+    object->IDirectManipulationManager2_iface.lpVtbl = &directmanipVtbl;
-+    object->ref = 1;
-+
-+    ret = direct_manip_QueryInterface(&object->IDirectManipulationManager2_iface, riid, ppv);
-+    direct_manip_Release(&object->IDirectManipulationManager2_iface);
-+
-+    return ret;
-+}
-+
-+static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv)
-+{
-+    *ppv = NULL;
-+
-+    if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IClassFactory, riid)) {
-+        *ppv = iface;
-+    }
-+
-+    if(*ppv) {
-+        IUnknown_AddRef((IUnknown*)*ppv);
-+        return S_OK;
-+    }
-+
-+    WARN("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv);
-+    return E_NOINTERFACE;
-+}
-+
-+static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface)
-+{
-+    TRACE("(%p)\n", iface);
-+    return 2;
-+}
-+
-+static ULONG WINAPI ClassFactory_Release(IClassFactory *iface)
-+{
-+    TRACE("(%p)\n", iface);
-+    return 1;
-+}
-+
-+static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock)
-+{
-+    TRACE("(%p)->(%x)\n", iface, fLock);
-+    return S_OK;
-+}
-+
-+static const IClassFactoryVtbl DirectFactoryVtbl = {
-+    ClassFactory_QueryInterface,
-+    ClassFactory_AddRef,
-+    ClassFactory_Release,
-+    DirectManipulation_CreateInstance,
-+    ClassFactory_LockServer
-+};
-+
-+static IClassFactory direct_factory = { &DirectFactoryVtbl };
-+
- HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
- {
--    FIXME("(%s,%s,%p): no interface found.\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv);
-+    if(IsEqualGUID(&CLSID_DirectManipulationManager, rclsid) ||
-+       IsEqualGUID(&CLSID_DirectManipulationSharedManager, rclsid) ) {
-+        TRACE("(CLSID_DirectManipulationManager %s %p)\n", debugstr_guid(riid), ppv);
-+        return IClassFactory_QueryInterface(&direct_factory, riid, ppv);
-+    }
-+
-+    FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv);
-     return CLASS_E_CLASSNOTAVAILABLE;
--}
-\ No newline at end of file
-+}
--- 
-2.17.1
-

patches/directmanipulation-new-dll/0007-directmanipulation-Supprot-IDirectManipulationFrameI.patch

@@ -1,4 +1,4 @@
-From c7190485c2cc3ccc4d6480d0621552aa488154bd Mon Sep 17 00:00:00 2001
+From 9a5ebfa598dedd23eeef0ea4d1a292f4e6281a1c Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Tue, 23 Jul 2019 08:37:12 +1000
 Subject: [PATCH] directmanipulation: Supprot
@@ -10,10 +10,10 @@ Subject: [PATCH] directmanipulation: Supprot
  1 file changed, 49 insertions(+)
 
 diff --git a/dlls/directmanipulation/directmanipulation.c b/dlls/directmanipulation/directmanipulation.c
-index 44d74b368d0..f5a8aee5de2 100644
+index 3b4c19a7994..e1cfec7a6a5 100644
 --- a/dlls/directmanipulation/directmanipulation.c
 +++ b/dlls/directmanipulation/directmanipulation.c
-@@ -213,6 +213,7 @@ static HRESULT WINAPI DirectManipulation_CreateInstance(IClassFactory *iface, IU
+@@ -340,6 +340,7 @@ static HRESULT WINAPI DirectManipulation_CreateInstance(IClassFactory *iface, IU
  struct directcompositor
  {
      IDirectManipulationCompositor IDirectManipulationCompositor_iface;
@@ -21,7 +21,7 @@ index 44d74b368d0..f5a8aee5de2 100644
      LONG ref;
  };
  
-@@ -221,8 +222,15 @@ static inline struct directcompositor *impl_from_IDirectManipulationCompositor(I
+@@ -348,8 +349,15 @@ static inline struct directcompositor *impl_from_IDirectManipulationCompositor(I
      return CONTAINING_RECORD(iface, struct directcompositor, IDirectManipulationCompositor_iface);
  }
  
@@ -37,7 +37,7 @@ index 44d74b368d0..f5a8aee5de2 100644
      if (IsEqualGUID(riid, &IID_IUnknown) ||
          IsEqualGUID(riid, &IID_IDirectManipulationCompositor))
      {
-@@ -230,6 +238,12 @@ static HRESULT WINAPI compositor_QueryInterface(IDirectManipulationCompositor *i
+@@ -357,6 +365,12 @@ static HRESULT WINAPI compositor_QueryInterface(IDirectManipulationCompositor *i
          *ppv = iface;
          return S_OK;
      }
@@ -50,7 +50,7 @@ index 44d74b368d0..f5a8aee5de2 100644
  
      FIXME("(%p)->(%s,%p),not found\n", iface, debugstr_guid(riid), ppv);
      return E_NOINTERFACE;
-@@ -299,6 +313,40 @@ static const struct IDirectManipulationCompositorVtbl  compositorVtbl =
+@@ -426,6 +440,40 @@ static const struct IDirectManipulationCompositorVtbl  compositorVtbl =
      compositor_Flush
  };
  
@@ -91,7 +91,7 @@ index 44d74b368d0..f5a8aee5de2 100644
  static HRESULT WINAPI DirectCompositor_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv)
  {
      struct directcompositor *object;
-@@ -313,6 +361,7 @@ static HRESULT WINAPI DirectCompositor_CreateInstance(IClassFactory *iface, IUnk
+@@ -440,6 +488,7 @@ static HRESULT WINAPI DirectCompositor_CreateInstance(IClassFactory *iface, IUnk
          return E_OUTOFMEMORY;
  
      object->IDirectManipulationCompositor_iface.lpVtbl = &compositorVtbl;
@@ -100,5 +100,5 @@ index 44d74b368d0..f5a8aee5de2 100644
  
      ret = compositor_QueryInterface(&object->IDirectManipulationCompositor_iface, riid, ppv);
 -- 
-2.17.1
+2.27.0
 

patches/directmanipulation-new-dll/0008-directmanipulation-Implement-IDirectManipulationMana.patch

@@ -1,176 +0,0 @@
-From 3b024e2861712c7fd833c77a2de71b025102309f Mon Sep 17 00:00:00 2001
-From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Mon, 22 Jul 2019 10:36:34 +1000
-Subject: [PATCH] directmanipulation: Implement IDirectManipulationManager2
- GetUpdateManager.
-
----
- dlls/directmanipulation/directmanipulation.c | 131 ++++++++++++++++++-
- 1 file changed, 129 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/directmanipulation/directmanipulation.c b/dlls/directmanipulation/directmanipulation.c
-index edfdda980e..c67d3ff956 100644
---- a/dlls/directmanipulation/directmanipulation.c
-+++ b/dlls/directmanipulation/directmanipulation.c
-@@ -68,6 +68,13 @@ HRESULT WINAPI DllCanUnloadNow(void)
- struct directmanipulation
- {
-     IDirectManipulationManager2 IDirectManipulationManager2_iface;
-+    IDirectManipulationUpdateManager *updatemanager;
-+    LONG ref;
-+};
-+
-+struct directupdatemanager
-+{
-+    IDirectManipulationUpdateManager IDirectManipulationUpdateManager_iface;
-     LONG ref;
- };
- 
-@@ -76,6 +83,100 @@ static inline struct directmanipulation *impl_from_IDirectManipulationManager2(I
-     return CONTAINING_RECORD(iface, struct directmanipulation, IDirectManipulationManager2_iface);
- }
- 
-+static inline struct directupdatemanager *impl_from_IDirectManipulationUpdateManager(IDirectManipulationUpdateManager *iface)
-+{
-+    return CONTAINING_RECORD(iface, struct directupdatemanager, IDirectManipulationUpdateManager_iface);
-+}
-+
-+static HRESULT WINAPI update_manager_QueryInterface(IDirectManipulationUpdateManager *iface, REFIID riid,void **ppv)
-+{
-+    struct directupdatemanager *This = impl_from_IDirectManipulationUpdateManager(iface);
-+
-+    TRACE("(%p)->(%s,%p)\n", This, debugstr_guid(riid), ppv);
-+
-+    if (IsEqualGUID(riid, &IID_IUnknown) ||
-+        IsEqualGUID(riid, &IID_IDirectManipulationUpdateManager)) {
-+        IUnknown_AddRef(iface);
-+        *ppv = iface;
-+        return S_OK;
-+    }
-+
-+    FIXME("(%p)->(%s,%p), not found\n", This, debugstr_guid(riid), ppv);
-+    return E_NOINTERFACE;
-+}
-+
-+ULONG WINAPI update_manager_AddRef(IDirectManipulationUpdateManager *iface)
-+{
-+    struct directupdatemanager *This = impl_from_IDirectManipulationUpdateManager(iface);
-+    ULONG ref = InterlockedIncrement(&This->ref);
-+
-+    TRACE("(%p) ref=%u\n", This, ref);
-+
-+    return ref;
-+}
-+
-+ULONG WINAPI update_manager_Release(IDirectManipulationUpdateManager *iface)
-+{
-+    struct directupdatemanager *This = impl_from_IDirectManipulationUpdateManager(iface);
-+    ULONG ref = InterlockedDecrement(&This->ref);
-+
-+    TRACE("(%p) ref=%u\n", This, ref);
-+
-+    if (!ref)
-+    {
-+        heap_free(This);
-+    }
-+    return ref;
-+}
-+
-+static HRESULT WINAPI update_manager_RegisterWaitHandleCallback(IDirectManipulationUpdateManager *iface, HANDLE handle,
-+            IDirectManipulationUpdateHandler *handler, DWORD *cookie)
-+{
-+    struct directupdatemanager *This = impl_from_IDirectManipulationUpdateManager(iface);
-+    FIXME("%p, %p, %p, %p\n", This, handle, handler, cookie);
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI update_manager_UnregisterWaitHandleCallback(IDirectManipulationUpdateManager *iface, DWORD cookie)
-+{
-+    struct directupdatemanager *This = impl_from_IDirectManipulationUpdateManager(iface);
-+    FIXME("%p, %x\n", This, cookie);
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI update_manager_Update(IDirectManipulationUpdateManager *iface, IDirectManipulationFrameInfoProvider *provider)
-+{
-+    struct directupdatemanager *This = impl_from_IDirectManipulationUpdateManager(iface);
-+    FIXME("%p, %p\n", This, provider);
-+    return E_NOTIMPL;
-+}
-+
-+struct IDirectManipulationUpdateManagerVtbl updatemanagerVtbl =
-+{
-+    update_manager_QueryInterface,
-+    update_manager_AddRef,
-+    update_manager_Release,
-+    update_manager_RegisterWaitHandleCallback,
-+    update_manager_UnregisterWaitHandleCallback,
-+    update_manager_Update
-+};
-+
-+static HRESULT create_update_manager(IDirectManipulationUpdateManager **obj)
-+{
-+    struct directupdatemanager *object;
-+
-+    object = heap_alloc(sizeof(*object));
-+    if(!object)
-+        return E_OUTOFMEMORY;
-+
-+    object->IDirectManipulationUpdateManager_iface.lpVtbl = &updatemanagerVtbl;
-+    object->ref = 1;
-+
-+    *obj = &object->IDirectManipulationUpdateManager_iface;
-+
-+    return S_OK;
-+}
-+
- static HRESULT WINAPI direct_manip_QueryInterface(IDirectManipulationManager2 *iface, REFIID riid, void **ppv)
- {
-     if (IsEqualGUID(riid, &IID_IUnknown) ||
-@@ -109,6 +210,8 @@ static ULONG WINAPI direct_manip_Release(IDirectManipulationManager2 *iface)
- 
-     if (!ref)
-     {
-+        if(This->updatemanager)
-+            IDirectManipulationUpdateManager_Release(This->updatemanager);
-         heap_free(This);
-     }
-     return ref;
-@@ -146,8 +249,32 @@ static HRESULT WINAPI direct_manip_ProcessInput(IDirectManipulationManager2 *ifa
- static HRESULT WINAPI direct_manip_GetUpdateManager(IDirectManipulationManager2 *iface, REFIID riid, void **obj)
- {
-     struct directmanipulation *This = impl_from_IDirectManipulationManager2(iface);
--    FIXME("%p, %s, %p\n", This, debugstr_guid(riid), obj);
--    return E_NOTIMPL;
-+    HRESULT hr = E_FAIL;
-+
-+    TRACE("%p, %s, %p\n", This, debugstr_guid(riid), obj);
-+
-+    *obj = NULL;
-+    if(IsEqualGUID(riid, &IID_IDirectManipulationUpdateManager))
-+    {
-+        if(!This->updatemanager)
-+        {
-+            hr = create_update_manager(&This->updatemanager);
-+        }
-+        else
-+        {
-+            hr = S_OK;
-+        }
-+
-+        if(hr == S_OK)
-+        {
-+            IDirectManipulationUpdateManager_AddRef(This->updatemanager);
-+            *obj = This->updatemanager;
-+        }
-+    }
-+    else
-+        FIXME("Interface %s currently not supported.\n", debugstr_guid(riid));
-+
-+    return hr;
- }
- 
- static HRESULT WINAPI direct_manip_CreateViewport(IDirectManipulationManager2 *iface, IDirectManipulationFrameInfoProvider *frame,
--- 
-2.17.1
-

patches/directmanipulation-new-dll/0012-directmanipulation-tests-Initial-tests.patch

@@ -1,118 +0,0 @@
-From efa0cbb8de357cf24f6eb4d15c638dd3c26819ba Mon Sep 17 00:00:00 2001
-From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Mon, 29 Jul 2019 09:09:41 +1000
-Subject: [PATCH] directmanipulation/tests: Initial tests
-
----
- configure                                    |  1 +
- configure.ac                                 |  1 +
- dlls/directmanipulation/tests/Makefile.in    |  5 ++
- dlls/directmanipulation/tests/manipulation.c | 60 ++++++++++++++++++++
- 4 files changed, 67 insertions(+)
- create mode 100644 dlls/directmanipulation/tests/Makefile.in
- create mode 100644 dlls/directmanipulation/tests/manipulation.c
-
-diff --git a/configure b/configure
-index 2ae3710ebb0..da201f4ffef 100755
---- a/configure
-+++ b/configure
-@@ -20370,6 +20370,7 @@ wine_fn_config_makefile dlls/dinput/tests enable_tests
- wine_fn_config_makefile dlls/dinput8 enable_dinput8
- wine_fn_config_makefile dlls/dinput8/tests enable_tests
- wine_fn_config_makefile dlls/directmanipulation enable_directmanipulation
-+wine_fn_config_makefile dlls/directmanipulation/tests enable_tests
- wine_fn_config_makefile dlls/dispdib.dll16 enable_win16
- wine_fn_config_makefile dlls/dispex enable_dispex
- wine_fn_config_makefile dlls/dispex/tests enable_tests
-diff --git a/configure.ac b/configure.ac
-index 7c0044c8872..b2a913132c2 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -3186,6 +3186,7 @@ WINE_CONFIG_MAKEFILE(dlls/dinput/tests)
- WINE_CONFIG_MAKEFILE(dlls/dinput8)
- WINE_CONFIG_MAKEFILE(dlls/dinput8/tests)
- WINE_CONFIG_MAKEFILE(dlls/directmanipulation)
-+WINE_CONFIG_MAKEFILE(dlls/directmanipulation/tests)
- WINE_CONFIG_MAKEFILE(dlls/dispdib.dll16,enable_win16)
- WINE_CONFIG_MAKEFILE(dlls/dispex)
- WINE_CONFIG_MAKEFILE(dlls/dispex/tests)
-diff --git a/dlls/directmanipulation/tests/Makefile.in b/dlls/directmanipulation/tests/Makefile.in
-new file mode 100644
-index 00000000000..29ec0db511a
---- /dev/null
-+++ b/dlls/directmanipulation/tests/Makefile.in
-@@ -0,0 +1,5 @@
-+TESTDLL   = directmanipulation.dll
-+IMPORTS   = uuid ole32
-+
-+C_SRCS = \
-+	manipulation.c
-diff --git a/dlls/directmanipulation/tests/manipulation.c b/dlls/directmanipulation/tests/manipulation.c
-new file mode 100644
-index 00000000000..93b692729b3
---- /dev/null
-+++ b/dlls/directmanipulation/tests/manipulation.c
-@@ -0,0 +1,60 @@
-+/*
-+ *
-+ * Copyright 2019 Alistair Leslie-Hughes
-+ *
-+ * 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
-+ *
-+ */
-+#define COBJMACROS
-+
-+#include <stdarg.h>
-+
-+#include "windows.h"
-+#include "directmanipulation.h"
-+
-+#include "wine/test.h"
-+
-+static void test_IDirectManipulationManager2(void)
-+{
-+    IDirectManipulationManager2 *manager2;
-+    IDirectManipulationUpdateManager *update;
-+    HRESULT hres;
-+
-+    hres = CoCreateInstance(&CLSID_DirectManipulationManager, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER,
-+            &IID_IDirectManipulationManager2, (void**)&manager2);
-+    if(FAILED(hres))
-+    {
-+        win_skip("Failed to create XMLView instance\n");
-+        return;
-+    }
-+    ok(hres == S_OK, "CoCreateInstance returned %x, expected S_OK\n", hres);
-+
-+    hres = IDirectManipulationManager2_GetUpdateManager(manager2, &IID_IDirectManipulationUpdateManager, (void**)&update);
-+    ok(hres == S_OK, "returned %x, expected S_OK\n", hres);
-+
-+    if(update)
-+        IDirectManipulationUpdateManager_Release(update);
-+
-+    IDirectManipulationManager2_Release(manager2);
-+}
-+
-+START_TEST(manipulation)
-+{
-+    CoInitialize(NULL);
-+
-+    test_IDirectManipulationManager2();
-+
-+    CoUninitialize();
-+}
--- 
-2.24.1
-

patches/eventfd_synchronization/definition

@@ -4,9 +4,10 @@ Fixes: [36692] Many multi-threaded applications have poor performance due to hea
 Depends: server-Shared_Memory
 Depends: ntdll-SystemRoot_Symlink
 Depends: ws2_32-WSACleanup
-Depends: ntdll-RtlCreateUserThread
 Depends: server-Realtime_Priority
 Depends: advapi32-Token_Integrity_Level
 Depends: ntdll-Junction_Points
 Depends: kernel32-K32GetPerformanceInfo
-Depends: user32-rawinput-mouse
+Depends: user32-rawinput-mouse
+Depends: server-Desktop_Refcount
+Disabled: true

patches/kernel32-Processor_Group/0001-kernel32-Implement-some-processor-group-functions.patch

@@ -1,4 +1,4 @@
-From 7889f94f7680ac2a42e279f7a6e8662e0748a4b9 Mon Sep 17 00:00:00 2001
+From da0da9472013ed502f5f0aabcca5b8359ffdc1c4 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sat, 4 Feb 2017 16:20:37 +0100
 Subject: [PATCH] kernel32: Implement some processor group functions.
@@ -6,14 +6,13 @@ Subject: [PATCH] kernel32: Implement some processor group functions.
 ---
  ...pi-ms-win-core-kernel32-legacy-l1-1-0.spec |  2 +-
  ...pi-ms-win-core-kernel32-legacy-l1-1-1.spec |  2 +-
- dlls/kernel32/cpu.c                           | 28 ++++++++++++++-----
  dlls/kernel32/kernel32.spec                   |  2 +-
- dlls/kernel32/tests/process.c                 | 23 +++++++++++++++
- include/winnt.h                               |  2 ++
- 6 files changed, 49 insertions(+), 10 deletions(-)
+ dlls/kernel32/process.c                       | 26 ++++++++++++++++---
+ dlls/kernel32/tests/process.c                 | 23 ++++++++++++++++
+ 5 files changed, 48 insertions(+), 7 deletions(-)
 
 diff --git a/dlls/api-ms-win-core-kernel32-legacy-l1-1-0/api-ms-win-core-kernel32-legacy-l1-1-0.spec b/dlls/api-ms-win-core-kernel32-legacy-l1-1-0/api-ms-win-core-kernel32-legacy-l1-1-0.spec
-index e653ac6d212..b6af37ab0aa 100644
+index e653ac6d2122..b6af37ab0aa2 100644
 --- a/dlls/api-ms-win-core-kernel32-legacy-l1-1-0/api-ms-win-core-kernel32-legacy-l1-1-0.spec
 +++ b/dlls/api-ms-win-core-kernel32-legacy-l1-1-0/api-ms-win-core-kernel32-legacy-l1-1-0.spec
 @@ -21,7 +21,7 @@
@@ -26,7 +25,7 @@ index e653ac6d212..b6af37ab0aa 100644
  @ stdcall GetNamedPipeServerProcessId(long ptr) kernel32.GetNamedPipeServerProcessId
  @ stdcall GetShortPathNameA(str ptr long) kernel32.GetShortPathNameA
 diff --git a/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec b/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec
-index 4998af04d9b..5ce8e24713b 100644
+index 4998af04d9bc..5ce8e24713b5 100644
 --- a/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec
 +++ b/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec
 @@ -26,7 +26,7 @@
@@ -38,56 +37,8 @@ index 4998af04d9b..5ce8e24713b 100644
  @ stdcall GetNamedPipeClientProcessId(long ptr) kernel32.GetNamedPipeClientProcessId
  @ stdcall GetNamedPipeServerProcessId(long ptr) kernel32.GetNamedPipeServerProcessId
  @ stdcall GetNumaAvailableMemoryNodeEx(long ptr) kernel32.GetNumaAvailableMemoryNodeEx
-diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c
-index 993bc8588f4..199a54b9deb 100644
---- a/dlls/kernel32/cpu.c
-+++ b/dlls/kernel32/cpu.c
-@@ -106,7 +106,9 @@ err:
-  */
- WORD WINAPI GetActiveProcessorGroupCount(void)
- {
--    FIXME("semi-stub, always returning 1\n");
-+    TRACE("()\n");
-+
-+    /* systems with less than 64 logical processors only have group 0 */
-     return 1;
- }
- 
-@@ -115,14 +117,26 @@ WORD WINAPI GetActiveProcessorGroupCount(void)
-  */
- DWORD WINAPI GetActiveProcessorCount(WORD group)
- {
--    SYSTEM_INFO si;
--    DWORD cpus;
-+    TRACE("(%u)\n", group);
- 
--    GetSystemInfo( &si );
--    cpus = si.dwNumberOfProcessors;
-+    if (group && group != ALL_PROCESSOR_GROUPS)
-+    {
-+        SetLastError(ERROR_INVALID_PARAMETER);
-+        return 0;
-+    }
- 
--    FIXME("semi-stub, returning %u\n", cpus);
--    return cpus;
-+    return system_info.NumberOfProcessors;
-+}
-+
-+/***********************************************************************
-+ *           GetMaximumProcessorGroupCount (KERNEL32.@)
-+ */
-+WORD WINAPI GetMaximumProcessorGroupCount(void)
-+{
-+    TRACE("()\n");
-+
-+    /* systems with less than 64 logical processors only have group 0 */
-+    return 1;
- }
- 
- /***********************************************************************
 diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
-index a14bed04bef..a2feb9dfa14 100644
+index 1a6fdbab0185..6a1381b7c322 100644
 --- a/dlls/kernel32/kernel32.spec
 +++ b/dlls/kernel32/kernel32.spec
 @@ -717,7 +717,7 @@
@@ -99,8 +50,60 @@ index a14bed04bef..a2feb9dfa14 100644
  @ stdcall -import GetModuleFileNameA(long ptr long)
  @ stdcall -import GetModuleFileNameW(long ptr long)
  @ stdcall -import GetModuleHandleA(str)
+diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
+index 8f506fcf1320..2f7ebb5edd25 100644
+--- a/dlls/kernel32/process.c
++++ b/dlls/kernel32/process.c
+@@ -706,7 +706,9 @@ HRESULT WINAPI RegisterApplicationRecoveryCallback(APPLICATION_RECOVERY_CALLBACK
+  */
+ WORD WINAPI GetActiveProcessorGroupCount(void)
+ {
+-    FIXME("semi-stub, always returning 1\n");
++    TRACE("()\n");
++
++    /* systems with less than 64 logical processors only have group 0 */
+     return 1;
+ }
+ 
+@@ -715,10 +717,14 @@ WORD WINAPI GetActiveProcessorGroupCount(void)
+  */
+ DWORD WINAPI GetActiveProcessorCount(WORD group)
+ {
+-    DWORD cpus = system_info.NumberOfProcessors;
++    TRACE("(%u)\n", group);
+ 
+-    FIXME("semi-stub, returning %u\n", cpus);
+-    return cpus;
++    if (group && group != ALL_PROCESSOR_GROUPS)
++    {
++        SetLastError(ERROR_INVALID_PARAMETER);
++        return 0;
++    }
++    return system_info.NumberOfProcessors;
+ }
+ 
+ /***********************************************************************
+@@ -732,6 +738,18 @@ DWORD WINAPI GetMaximumProcessorCount(WORD group)
+     return cpus;
+ }
+ 
++/***********************************************************************
++ *           GetMaximumProcessorGroupCount (KERNEL32.@)
++ */
++WORD WINAPI GetMaximumProcessorGroupCount(void)
++{
++    TRACE("()\n");
++
++    /* systems with less than 64 logical processors only have group 0 */
++    return 1;
++}
++
++
+ /***********************************************************************
+  *           GetEnabledXStateFeatures (KERNEL32.@)
+  */
 diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c
-index 5cdc9fa03be..4c998e2fe6e 100644
+index 32818042337b..da649eff62ed 100644
 --- a/dlls/kernel32/tests/process.c
 +++ b/dlls/kernel32/tests/process.c
 @@ -92,6 +92,7 @@ static SIZE_T (WINAPI *pGetLargePageMinimum)(void);
@@ -111,7 +114,7 @@ index 5cdc9fa03be..4c998e2fe6e 100644
  
  /* ############################### */
  static char     base[MAX_PATH];
-@@ -259,6 +260,7 @@ static BOOL init(void)
+@@ -274,6 +275,7 @@ static BOOL init(void)
      pInitializeProcThreadAttributeList = (void *)GetProcAddress(hkernel32, "InitializeProcThreadAttributeList");
      pUpdateProcThreadAttribute = (void *)GetProcAddress(hkernel32, "UpdateProcThreadAttribute");
      pDeleteProcThreadAttributeList = (void *)GetProcAddress(hkernel32, "DeleteProcThreadAttributeList");
@@ -119,7 +122,7 @@ index 5cdc9fa03be..4c998e2fe6e 100644
  
      return TRUE;
  }
-@@ -4101,6 +4103,26 @@ void test_parent_process_attribute(unsigned int level, HANDLE read_pipe)
+@@ -3955,6 +3957,26 @@ void test_parent_process_attribute(unsigned int level, HANDLE read_pipe)
      }
  }
  
@@ -146,7 +149,7 @@ index 5cdc9fa03be..4c998e2fe6e 100644
  START_TEST(process)
  {
      HANDLE job;
-@@ -4191,6 +4213,7 @@ START_TEST(process)
+@@ -4065,6 +4087,7 @@ START_TEST(process)
      test_GetNumaProcessorNode();
      test_session_info();
      test_GetLogicalProcessorInformationEx();
@@ -154,19 +157,6 @@ index 5cdc9fa03be..4c998e2fe6e 100644
      test_largepages();
      test_ProcThreadAttributeList();
      test_SuspendProcessState();
-diff --git a/include/winnt.h b/include/winnt.h
-index 40534338d05..068a5782465 100644
---- a/include/winnt.h
-+++ b/include/winnt.h
-@@ -6475,6 +6475,8 @@ typedef struct _GROUP_AFFINITY
-     WORD Reserved[3];
- } GROUP_AFFINITY, *PGROUP_AFFINITY;
- 
-+#define ALL_PROCESSOR_GROUPS 0xffff
-+
- typedef struct _PROCESSOR_NUMBER
- {
-     WORD Group;
 -- 
-2.24.1
+2.26.2
 

patches/kernel32-SetProcessDEPPolicy/0002-kernel32-Implement-GetSystemDEPPolicy.patch

@@ -1,4 +1,4 @@
-From c2299b57da38098badb711e54f9baf9d8e1c1241 Mon Sep 17 00:00:00 2001
+From e31513df269b2ba58f0dc11cc5494b9db1e05cd4 Mon Sep 17 00:00:00 2001
 From: "Olivier F. R. Dierick" <o.dierick@piezo-forte.be>
 Date: Tue, 19 Apr 2016 07:33:32 +0200
 Subject: [PATCH] kernel32: Implement GetSystemDEPPolicy().
@@ -8,18 +8,18 @@ Subject: [PATCH] kernel32: Implement GetSystemDEPPolicy().
  1 file changed, 68 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
-index 185278740e4..503a9797b59 100644
+index cf97affd6faf..78f80c5210f0 100644
 --- a/dlls/kernel32/process.c
 +++ b/dlls/kernel32/process.c
-@@ -58,6 +58,7 @@
+@@ -51,6 +51,7 @@
  #include "winbase.h"
  #include "wincon.h"
  #include "kernel_private.h"
 +#include "winreg.h"
  #include "psapi.h"
  #include "wine/exception.h"
- #include "wine/library.h"
-@@ -4399,8 +4400,73 @@ DWORD WINAPI WTSGetActiveConsoleSessionId(void)
+ #include "wine/server.h"
+@@ -671,8 +672,73 @@ DWORD WINAPI WTSGetActiveConsoleSessionId(void)
   */
  DEP_SYSTEM_POLICY_TYPE WINAPI GetSystemDEPPolicy(void)
  {
@@ -96,5 +96,5 @@ index 185278740e4..503a9797b59 100644
  
  /**********************************************************************
 -- 
-2.17.1
+2.26.2
 

patches/loader-KeyboardLayouts/0002-user32-Improve-GetKeyboardLayoutList.patch

@@ -1,4 +1,4 @@
-From 7bb09137aab184c1c2a36c1be27f6d8105ce2a11 Mon Sep 17 00:00:00 2001
+From 440f90abdcbe7e9a1d43e06900a4674e6fabd805 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Tue, 9 Jul 2019 14:13:28 +1000
 Subject: [PATCH] user32: Improve GetKeyboardLayoutList
@@ -11,10 +11,10 @@ not the complete list from the registry.
  2 files changed, 35 insertions(+), 27 deletions(-)
 
 diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c
-index 921ea2c962d..953eec47dea 100644
+index 6d916c7d65d..b9e0dc60e7c 100644
 --- a/dlls/user32/driver.c
 +++ b/dlls/user32/driver.c
-@@ -213,12 +213,9 @@ static SHORT CDECL nulldrv_GetAsyncKeyState( INT key )
+@@ -210,12 +210,9 @@ static void CDECL nulldrv_Beep(void)
  
  static UINT CDECL nulldrv_GetKeyboardLayoutList( INT size, HKL *layouts )
  {
@@ -27,7 +27,7 @@ index 921ea2c962d..953eec47dea 100644
  
      baselayout = GetUserDefaultLCID();
      langid = PRIMARYLANGID(LANGIDFROMLCID(baselayout));
-@@ -227,30 +224,6 @@ static UINT CDECL nulldrv_GetKeyboardLayoutList( INT size, HKL *layouts )
+@@ -224,30 +221,6 @@ static UINT CDECL nulldrv_GetKeyboardLayoutList( INT size, HKL *layouts )
      else
          baselayout |= baselayout << 16;
  
@@ -59,11 +59,11 @@ index 921ea2c962d..953eec47dea 100644
      if (baselayout != 0)
      {
 diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c
-index 1e6be311eeb..1653c07b20b 100644
+index 913fabfbd85..dd84ff5cbb2 100644
 --- a/dlls/user32/tests/input.c
 +++ b/dlls/user32/tests/input.c
-@@ -2990,6 +2990,40 @@ static void test_GetPointerType(void)
-     ok(type == PT_MOUSE, " type %d\n", type );
+@@ -3010,6 +3010,40 @@ static void test_UnregisterDeviceNotification(void)
+     ok(ret == FALSE, "Unregistering NULL Device Notification returned: %d\n", ret);
  }
  
 +static void test_GetKeyboardLayoutList(void)
@@ -103,7 +103,7 @@ index 1e6be311eeb..1653c07b20b 100644
  START_TEST(input)
  {
      POINT pos;
-@@ -3013,6 +3047,7 @@ START_TEST(input)
+@@ -3033,6 +3067,7 @@ START_TEST(input)
      test_GetKeyState();
      test_OemKeyScan();
      test_GetRawInputData();
@@ -112,5 +112,5 @@ index 1e6be311eeb..1653c07b20b 100644
  
      if(pGetMouseMovePointsEx)
 -- 
-2.24.0.rc1
+2.26.2
 

patches/ntdll-APC_Performance/0001-ntdll-Reuse-old-async-fileio-structures-if-possible.patch

@@ -1,4 +1,4 @@
-From b03e8c0e0097e3dfd2c30f1f53f13abaa731b858 Mon Sep 17 00:00:00 2001
+From 2fc74d8b5fd617e4b614e80c2eba9971a2dea00e Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Tue, 3 Mar 2015 03:39:12 +0100
 Subject: [PATCH] ntdll: Reuse old async fileio structures if possible.
@@ -7,14 +7,14 @@ This should speed up apps which heavily rely on async io stuff. Some
 tests (using the kernel and ntdll wine tests) show that it is very
 often possible to reuse old fileio structures.
 ---
- dlls/ntdll/file.c | 24 ++++++++++++++++++------
+ dlls/ntdll/unix/file.c | 24 ++++++++++++++++++------
  1 file changed, 18 insertions(+), 6 deletions(-)
 
-diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
-index 45660b47ec2e..083a413aac5f 100644
---- a/dlls/ntdll/file.c
-+++ b/dlls/ntdll/file.c
-@@ -387,6 +387,7 @@ struct async_fileio
+diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c
+index ca6899b50f5..4c3f3dac465 100644
+--- a/dlls/ntdll/unix/file.c
++++ b/dlls/ntdll/unix/file.c
+@@ -4433,6 +4433,7 @@ struct async_fileio
  {
      async_callback_t    *callback; /* must be the first field */
      struct async_fileio *next;
@@ -22,10 +22,10 @@ index 45660b47ec2e..083a413aac5f 100644
      HANDLE               handle;
  };
  
-@@ -430,18 +431,29 @@ static struct async_fileio *alloc_fileio( DWORD size, async_callback_t callback,
+@@ -4484,18 +4485,29 @@ static void release_fileio( struct async_fileio *io )
+ static struct async_fileio *alloc_fileio( DWORD size, async_callback_t callback, HANDLE handle )
  {
      /* first free remaining previous fileinfos */
- 
 -    struct async_fileio *io = InterlockedExchangePointer( (void **)&fileio_freelist, NULL );
 +    struct async_fileio *old_io = InterlockedExchangePointer( (void **)&fileio_freelist, NULL );
 +    struct async_fileio *io = NULL;
@@ -59,5 +59,5 @@ index 45660b47ec2e..083a413aac5f 100644
      }
      return io;
 -- 
-2.26.2
+2.27.0
 

patches/ntdll-ApiSetMap/0001-ntdll-Add-dummy-apiset-to-PEB.patch

@@ -1,4 +1,4 @@
-From 8c3c4edd9393b71f66501a9972ee6e6b4f60aeb5 Mon Sep 17 00:00:00 2001
+From 708e627172f61b5d0744135e31d4e9e3f7b32536 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Mon, 3 Apr 2017 01:06:26 +0200
 Subject: [PATCH] ntdll: Add dummy apiset to PEB.
@@ -12,19 +12,19 @@ Subject: [PATCH] ntdll: Add dummy apiset to PEB.
  create mode 100644 include/apiset.h
 
 diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
-index ca8b5e2bf8a..565dea14b39 100644
+index 21e8b0c08f8..24254d4b43c 100644
 --- a/dlls/ntdll/thread.c
 +++ b/dlls/ntdll/thread.c
-@@ -75,6 +75,7 @@ static PEB_LDR_DATA ldr;
+@@ -71,6 +71,7 @@ static PEB_LDR_DATA ldr;
  static RTL_BITMAP tls_bitmap;
  static RTL_BITMAP tls_expansion_bitmap;
  static RTL_BITMAP fls_bitmap;
 +static API_SET_NAMESPACE_ARRAY apiset_map;
  static int nb_threads = 1;
  
- static RTL_CRITICAL_SECTION peb_lock;
+ struct ldt_copy *__wine_ldt_copy = NULL;
 @@ -300,6 +301,7 @@ TEB *thread_init(void)
-     teb = virtual_alloc_first_teb();
+ 
      peb = teb->Peb;
      peb->FastPebLock        = &peb_lock;
 +    peb->ApiSetMap          = &apiset_map;
@@ -32,7 +32,7 @@ index ca8b5e2bf8a..565dea14b39 100644
      peb->TlsExpansionBitmap = &tls_expansion_bitmap;
      peb->FlsBitmap          = &fls_bitmap;
 diff --git a/include/Makefile.in b/include/Makefile.in
-index 74db5ee1516..f250ea74d4b 100644
+index 9796dd8e5d9..2bc410f4308 100644
 --- a/include/Makefile.in
 +++ b/include/Makefile.in
 @@ -15,6 +15,7 @@ SOURCES = \
@@ -87,7 +87,7 @@ index 00000000000..6801cd5f509
 +
 +#endif
 diff --git a/include/winternl.h b/include/winternl.h
-index 87d0bde2955..eab44d1a57a 100644
+index f362790dbca..b33e346885f 100644
 --- a/include/winternl.h
 +++ b/include/winternl.h
 @@ -23,6 +23,7 @@