Release v5.13

Added user32-QueryDisplayConfig
Added ntdll-freebsd-compile
2025-04-13 14:42:51 -07:00 · 2020-07-19 09:30:32 +10:00 · 2020-07-19 09:25:32 +10:00 · 2020-07-19 09:06:06 +10:00 · 2020-07-18 11:58:32 -05:00 · 2020-07-17 17:52:46 -05:00
261 changed files with 8357 additions and 15470 deletions
--- a/patches/Staging/0001-kernel32-Add-winediag-message-to-show-warning-that-t.patch
+++ b/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

--- a/patches/advapi32-CreateRestrictedToken/0001-ntdll-Implement-NtFilterToken.patch
+++ b/patches/advapi32-CreateRestrictedToken/0001-ntdll-Implement-NtFilterToken.patch
@@ -1,27 +1,29 @@
-From 1eb8acd819f9eee8fdf154d0ef43881008265916 Mon Sep 17 00:00:00 2001
+From 8d80506ade85cac639a732280111226f65e0aac3 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Fri, 4 Aug 2017 02:33:14 +0200
-Subject: ntdll: Implement NtFilterToken.
+Subject: [PATCH] ntdll: Implement NtFilterToken.

 ---
- dlls/ntdll/nt.c       | 59 ++++++++++++++++++++++++++++++++++++
+ dlls/ntdll/nt.c       | 59 ++++++++++++++++++++++++++++++
 dlls/ntdll/ntdll.spec |  2 +-
 include/winnt.h       |  5 +++
 include/winternl.h    |  1 +
+ server/named_pipe.c   |  2 +-
 server/process.c      |  2 +-
 server/protocol.def   | 10 ++++++
 server/security.h     |  4 ++-
- server/token.c        | 84 +++++++++++++++++++++++++++++++++++++++++++++++++--
- 8 files changed, 162 insertions(+), 5 deletions(-)
+ server/token.c        | 84 +++++++++++++++++++++++++++++++++++++++++--
+ 9 files changed, 163 insertions(+), 6 deletions(-)

 diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c
-index c3f5df3..59a08de 100644
+index cc13672b2b9..443d46c71c7 100644
 --- a/dlls/ntdll/nt.c
 +++ b/dlls/ntdll/nt.c
-@@ -119,6 +119,65 @@ NTSTATUS WINAPI NtDuplicateToken(
+@@ -90,6 +90,65 @@ NTSTATUS WINAPI NtDuplicateToken(
+     return status;
 }
 
- /******************************************************************************
+/******************************************************************************
 + *  NtFilterToken        [NTDLL.@]
 + *  ZwFilterToken        [NTDLL.@]
 + */
@@ -80,28 +82,27 @@ index c3f5df3..59a08de 100644
 +    return status;
 +}
 +
-+/******************************************************************************
+ /******************************************************************************
  *  NtOpenProcessToken		[NTDLL.@]
  *  ZwOpenProcessToken		[NTDLL.@]
-  */
 diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
-index c260b0d..3c5e69c 100644
+index 6293dc81ed4..36f7ddbda81 100644
 --- a/dlls/ntdll/ntdll.spec
 +++ b/dlls/ntdll/ntdll.spec
-@@ -176,7 +176,7 @@
+@@ -208,7 +208,7 @@
 # @ stub NtEnumerateSystemEnvironmentValuesEx
- @ stdcall NtEnumerateValueKey(long long long ptr long ptr)
+ @ stdcall -syscall NtEnumerateValueKey(long long long ptr long ptr)
 @ stub NtExtendSection
 -# @ stub NtFilterToken
 +@ stdcall NtFilterToken(long long ptr ptr ptr ptr)
- @ stdcall NtFindAtom(ptr long ptr)
- @ stdcall NtFlushBuffersFile(long ptr)
- @ stdcall NtFlushInstructionCache(long ptr long)
+ @ stdcall -syscall NtFindAtom(ptr long ptr)
+ @ stdcall -syscall NtFlushBuffersFile(long ptr)
+ @ stdcall -syscall NtFlushInstructionCache(long ptr long)
 diff --git a/include/winnt.h b/include/winnt.h
-index 16d96d8..4e238f9 100644
+index e1cf78420a6..da17fe3e330 100644
 --- a/include/winnt.h
 +++ b/include/winnt.h
-@@ -3904,6 +3904,11 @@ typedef enum _TOKEN_INFORMATION_CLASS {
+@@ -4221,6 +4221,11 @@ typedef enum _TOKEN_INFORMATION_CLASS {
 					TOKEN_ADJUST_SESSIONID | \
 					TOKEN_ADJUST_DEFAULT )
 
@@ -114,10 +115,10 @@ index 16d96d8..4e238f9 100644
 #define _SECURITY_DEFINED
 
 diff --git a/include/winternl.h b/include/winternl.h
-index c84e6d7..288f93e 100644
+index b3fbb90feff..4687a410ca4 100644
 --- a/include/winternl.h
 +++ b/include/winternl.h
-@@ -2303,6 +2303,7 @@ NTSYSAPI NTSTATUS  WINAPI NtDuplicateToken(HANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES
+@@ -2749,6 +2749,7 @@ NTSYSAPI NTSTATUS  WINAPI NtDuplicateToken(HANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES
 NTSYSAPI NTSTATUS  WINAPI NtEnumerateKey(HANDLE,ULONG,KEY_INFORMATION_CLASS,void *,DWORD,DWORD *);
 NTSYSAPI NTSTATUS  WINAPI NtEnumerateValueKey(HANDLE,ULONG,KEY_VALUE_INFORMATION_CLASS,PVOID,ULONG,PULONG);
 NTSYSAPI NTSTATUS  WINAPI NtExtendSection(HANDLE,PLARGE_INTEGER);
@@ -125,11 +126,24 @@ index c84e6d7..288f93e 100644
 NTSYSAPI NTSTATUS  WINAPI NtFindAtom(const WCHAR*,ULONG,RTL_ATOM*);
 NTSYSAPI NTSTATUS  WINAPI NtFlushBuffersFile(HANDLE,IO_STATUS_BLOCK*);
 NTSYSAPI NTSTATUS  WINAPI NtFlushInstructionCache(HANDLE,LPCVOID,SIZE_T);
+diff --git a/server/named_pipe.c b/server/named_pipe.c
+index b259abb8de4..4cd4d7dc4a8 100644
+--- a/server/named_pipe.c
+++ b/server/named_pipe.c
+@@ -1142,7 +1142,7 @@ static int pipe_server_ioctl( struct fd *fd, ioctl_code_t code, struct async *as
+         if (current->process->token) /* FIXME: use the client token */
+         {
+             struct token *token;
+-            if (!(token = token_duplicate( current->process->token, 0, SecurityImpersonation, NULL )))
+            if (!(token = token_duplicate( current->process->token, 0, SecurityImpersonation, NULL, NULL, 0, NULL, 0 )))
+                 return 0;
+             if (current->token) release_object( current->token );
+             current->token = token;
 diff --git a/server/process.c b/server/process.c
-index f8739d0..71d9d6d 100644
+index 5e587b28cbe..406167e825b 100644
 --- a/server/process.c
 +++ b/server/process.c
-@@ -566,7 +566,7 @@ struct thread *create_process( int fd, struct thread *parent_thread, int inherit
+@@ -577,7 +577,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 */
@@ -139,10 +153,10 @@ index f8739d0..71d9d6d 100644
     }
     if (!process->handles || !process->token) goto error;
 diff --git a/server/protocol.def b/server/protocol.def
-index 35824ae..6ee6d28 100644
+index a121c371c19..ee07b1eca14 100644
 --- a/server/protocol.def
 +++ b/server/protocol.def
-@@ -3356,6 +3356,16 @@ enum caret_state
+@@ -3263,6 +3263,16 @@ enum caret_state
     obj_handle_t  new_handle; /* duplicated handle */
 @END
 
@@ -160,10 +174,10 @@ index 35824ae..6ee6d28 100644
     obj_handle_t    handle; /* handle to the token */
     unsigned int    desired_access; /* desired access to the object */
 diff --git a/server/security.h b/server/security.h
-index 873bbc6..bc4a8f6 100644
+index 606dbb2ab2c..6c337143c3d 100644
 --- a/server/security.h
 +++ b/server/security.h
-@@ -55,7 +55,9 @@ extern const PSID security_high_label_sid;
+@@ -56,7 +56,9 @@ extern const PSID security_high_label_sid;
 extern struct token *token_create_admin(void);
 extern int token_assign_label( struct token *token, PSID label );
 extern struct token *token_duplicate( struct token *src_token, unsigned primary,
@@ -175,10 +189,10 @@ index 873bbc6..bc4a8f6 100644
                                    const LUID_AND_ATTRIBUTES *reqprivs,
                                    unsigned int count, LUID_AND_ATTRIBUTES *usedprivs);
 diff --git a/server/token.c b/server/token.c
-index 0810a61..2f6a467 100644
+index 2fa95e17aaf..38a4c203d54 100644
 --- a/server/token.c
 +++ b/server/token.c
-@@ -276,6 +276,19 @@ static int acl_is_valid( const ACL *acl, data_size_t size )
+@@ -285,6 +285,19 @@ static int acl_is_valid( const ACL *acl, data_size_t size )
     return TRUE;
 }
 
@@ -198,7 +212,7 @@ index 0810a61..2f6a467 100644
 /* checks whether all members of a security descriptor fit inside the size
  * of memory specified */
 int sd_is_valid( const struct security_descriptor *sd, data_size_t size )
-@@ -619,8 +632,36 @@ static struct token *create_token( unsigned primary, const SID *user,
+@@ -626,8 +639,36 @@ static struct token *create_token( unsigned primary, const SID *user,
     return token;
 }
 
@@ -236,7 +250,7 @@ index 0810a61..2f6a467 100644
 {
     const luid_t *modified_id =
         primary || (impersonation_level == src_token->impersonation_level) ?
-@@ -656,6 +697,12 @@ struct token *token_duplicate( struct token *src_token, unsigned primary,
+@@ -663,6 +704,12 @@ struct token *token_duplicate( struct token *src_token, unsigned primary,
             return NULL;
         }
         memcpy( newgroup, group, size );
@@ -249,7 +263,7 @@ index 0810a61..2f6a467 100644
         list_add_tail( &token->groups, &newgroup->entry );
         if (src_token->primary_group == &group->sid)
         {
-@@ -667,11 +714,14 @@ struct token *token_duplicate( struct token *src_token, unsigned primary,
+@@ -674,11 +721,14 @@ struct token *token_duplicate( struct token *src_token, unsigned primary,
 
     /* copy privileges */
     LIST_FOR_EACH_ENTRY( privilege, &src_token->privileges, struct privilege, entry )
@@ -264,7 +278,7 @@ index 0810a61..2f6a467 100644
 
     if (sd) default_set_sd( &token->obj, sd, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION |
                             DACL_SECURITY_INFORMATION | SACL_SECURITY_INFORMATION );
-@@ -1304,7 +1354,7 @@ DECL_HANDLER(duplicate_token)
+@@ -1311,7 +1361,7 @@ DECL_HANDLER(duplicate_token)
                                                      TOKEN_DUPLICATE,
                                                      &token_ops )))
     {
@@ -273,7 +287,7 @@ index 0810a61..2f6a467 100644
         if (token)
         {
             reply->new_handle = alloc_handle_no_access_check( current->process, token, req->access, objattr->attributes );
-@@ -1314,6 +1364,36 @@ DECL_HANDLER(duplicate_token)
+@@ -1321,6 +1371,36 @@ DECL_HANDLER(duplicate_token)
     }
 }
 
@@ -311,5 +325,5 @@ index 0810a61..2f6a467 100644
 DECL_HANDLER(check_token_privileges)
 {
 -- 
-2.7.4
+2.27.0

--- a/patches/advapi32-Token_Integrity_Level/0006-ntdll-Add-function-to-create-new-tokens-for-elevatio.patch
+++ b/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 182f23825cd873fc2b4ee2ddb81b21d7194e60d2 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 42ce9815489..401bdd61d21 100644
 --- a/dlls/ntdll/ntdll.spec
 +++ b/dlls/ntdll/ntdll.spec
-@@ -1586,6 +1586,9 @@
+@@ -1598,6 +1598,9 @@
 # Virtual memory
 @ cdecl __wine_locked_recvmsg(long ptr long)
 
@@ -25,27 +25,27 @@ index 1ebe07fc08c..7a19674b2f3 100644
 +@ cdecl __wine_create_default_token(long)
 +
 # Version
- @ cdecl wine_get_version() NTDLL_wine_get_version
- @ cdecl wine_get_build_id() NTDLL_wine_get_build_id
+ @ cdecl wine_get_version()
+ @ cdecl wine_get_build_id()
 diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
-index 27e7141bc65..4baf8a3967b 100644
+index c8fbc1ae09d..2603b57be38 100644
 --- a/dlls/ntdll/ntdll_misc.h
 +++ b/dlls/ntdll/ntdll_misc.h
-@@ -107,6 +107,9 @@ extern int __wine_main_argc;
- extern char **__wine_main_argv;
- extern WCHAR **__wine_main_wargv;
+@@ -69,6 +69,9 @@ extern void init_locale( HMODULE module ) DECLSPEC_HIDDEN;
+ extern void init_user_process_params(void) DECLSPEC_HIDDEN;
+ extern NTSTATUS restart_process( RTL_USER_PROCESS_PARAMETERS *params, NTSTATUS status ) DECLSPEC_HIDDEN;
 
 +/* token */
 +extern HANDLE CDECL __wine_create_default_token(BOOL admin);
 +
 /* server support */
- extern const char *build_dir DECLSPEC_HIDDEN;
- extern const char *data_dir DECLSPEC_HIDDEN;
+ extern BOOL is_wow64 DECLSPEC_HIDDEN;
+ extern NTSTATUS alloc_object_attributes( const OBJECT_ATTRIBUTES *attr, struct object_attributes **ret,
 diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c
-index 6c5f722b2a6..df81e061e7b 100644
+index 77ba5b371e2..3e91a1fa9c4 100644
 --- a/dlls/ntdll/process.c
 +++ b/dlls/ntdll/process.c
-@@ -119,6 +119,24 @@ HANDLE CDECL __wine_make_process_system(void)
+@@ -72,6 +72,24 @@ HANDLE CDECL __wine_make_process_system(void)
     return ret;
 }
 
@@ -67,14 +67,14 @@ index 6c5f722b2a6..df81e061e7b 100644
 +    return ret;
 +}
 +
- static UINT process_error_mode;
- 
- #define UNIMPLEMENTED_INFO_CLASS(c) \
+ /***********************************************************************
+  *           restart_process
+  */
 diff --git a/server/protocol.def b/server/protocol.def
-index c53ceb50d50..947a3c971f5 100644
+index 9da597e2773..abfc744c960 100644
 --- a/server/protocol.def
 +++ b/server/protocol.def
-@@ -3755,6 +3755,14 @@ struct handle_info
+@@ -3583,6 +3583,14 @@ struct handle_info
 @END
 
 
@@ -215,5 +215,5 @@ index c4f1cd943c2..970ed1838da 100644
 +    }
 +}
 -- 
-2.26.2
+2.27.0

--- a/patches/advapi32-Token_Integrity_Level/0008-ntdll-Implement-process-token-elevation-through-mani.patch
+++ b/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 b7e3ca4678d073c92f950708c1be35f37fda86d0 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 3513102b6f0..3b68f6685d0 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
+@@ -3489,6 +3489,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','\\',
+@@ -3922,6 +3948,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)
+@@ -4032,6 +4059,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,11 +74,11 @@ 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 c414717a8d7..100cb424623 100644
 --- a/server/process.c
 +++ b/server/process.c
-@@ -1107,6 +1107,14 @@ struct process_snapshot *process_snap( int *count )
-     return snapshot;
+@@ -1086,6 +1086,14 @@ int set_process_debug_flag( struct process *process, int flag )
+     return write_process_memory( process, process->peb + 2, 1, &data );
 }
 
 +/* replace the token of a process */
@@ -93,22 +93,22 @@ index 4c7da9223c1..d6f71a774f3 100644
 DECL_HANDLER(new_process)
 {
 diff --git a/server/process.h b/server/process.h
-index 5b83e111a6f..dfe5c4e52d8 100644
+index fb29f21cb12..d0b7ec4987b 100644
 --- a/server/process.h
 +++ b/server/process.h
-@@ -139,6 +139,7 @@ extern void kill_debugged_processes( struct thread *debugger, int exit_code );
+@@ -129,6 +129,7 @@ extern void kill_console_processes( struct thread *renderer, int exit_code );
+ extern void kill_debugged_processes( struct thread *debugger, int exit_code );
 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);
 +extern void replace_process_token( struct process *process, struct token *token );
 
 /* 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 bc0d0723eb3..ec67ce7ab87 100644
 --- a/server/protocol.def
 +++ b/server/protocol.def
-@@ -3762,6 +3762,13 @@ struct handle_info
+@@ -3737,6 +3737,13 @@ struct handle_info
 @END
 
 
@@ -145,5 +145,5 @@ index 970ed1838da..1c1d49989b3 100644
 +    }
 +}
 -- 
-2.26.0
+2.27.0

--- a/patches/advapi32-Token_Integrity_Level/0010-server-Implement-support-for-creating-processes-usin.patch
+++ b/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

--- a/patches/advapi32-Token_Integrity_Level/0013-server-Correctly-assign-security-labels-for-tokens.patch
+++ b/patches/advapi32-Token_Integrity_Level/0013-server-Correctly-assign-security-labels-for-tokens.patch
@@ -1,20 +1,21 @@
-From 6d8fd34cabbcbc64062675be610fb8704fcdc3ec Mon Sep 17 00:00:00 2001
+From a8915b8ebd4c06b0216fc82d1ba8d958a677eccf Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Mon, 7 Aug 2017 03:33:26 +0200
 Subject: [PATCH] server: Correctly assign security labels for tokens.

 ---
- dlls/advapi32/tests/security.c | 21 ++++++++++-----------
- server/process.c               |  8 +-------
+ dlls/advapi32/tests/security.c | 21 +++++++++--------
+ server/named_pipe.c            |  2 +-
+ server/process.c               |  8 +------
 server/security.h              |  2 +-
- server/token.c                 | 41 ++++++++++++++++++++++++-----------------
- 4 files changed, 36 insertions(+), 36 deletions(-)
+ server/token.c                 | 41 ++++++++++++++++++++--------------
+ 5 files changed, 37 insertions(+), 37 deletions(-)

 diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
-index bf4161c..0610ec7 100644
+index 94f3ea4601a..ab572421a73 100644
 --- a/dlls/advapi32/tests/security.c
 +++ b/dlls/advapi32/tests/security.c
-@@ -7186,7 +7186,6 @@ static void test_token_security_descriptor(void)
+@@ -7105,7 +7105,6 @@ static void test_token_security_descriptor(void)
     defaulted = TRUE;
     ret = GetSecurityDescriptorDacl(sd2, &present, &acl2, &defaulted);
     ok(ret, "GetSecurityDescriptorDacl failed with error %u\n", GetLastError());
@@ -22,7 +23,7 @@ index bf4161c..0610ec7 100644
     ok(present, "DACL not present\n");
 
     if (present)
-@@ -7307,7 +7306,7 @@ static void test_token_security_descriptor(void)
+@@ -7226,7 +7225,7 @@ static void test_token_security_descriptor(void)
                 ok(ret, "GetAce failed with error %u\n", GetLastError());
                 ok(ace->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE,
                    "Unexpected ACE type %#x\n", ace->Header.AceType);
@@ -31,7 +32,7 @@ index bf4161c..0610ec7 100644
                    "Expected medium integrity level\n");
             }
 
-@@ -7360,8 +7359,8 @@ static void test_token_security_descriptor(void)
+@@ -7279,8 +7278,8 @@ static void test_token_security_descriptor(void)
             sacl = NULL;
             ret = GetSecurityDescriptorSacl(sd3, &present, &sacl, &defaulted);
             ok(ret, "GetSecurityDescriptorSacl failed with error %u\n", GetLastError());
@@ -42,7 +43,7 @@ index bf4161c..0610ec7 100644
 
             if (sacl)
             {
-@@ -7410,8 +7409,8 @@ static void test_token_security_descriptor(void)
+@@ -7329,8 +7328,8 @@ static void test_token_security_descriptor(void)
             sacl = NULL;
             ret = GetSecurityDescriptorSacl(sd3, &present, &sacl, &defaulted);
             ok(ret, "GetSecurityDescriptorSacl failed with error %u\n", GetLastError());
@@ -53,7 +54,7 @@ index bf4161c..0610ec7 100644
 
             if (sacl)
             {
-@@ -7475,8 +7474,8 @@ static void test_token_security_descriptor(void)
+@@ -7394,8 +7393,8 @@ static void test_token_security_descriptor(void)
 
         ret = GetSecurityDescriptorSacl(sd3, &present, &sacl, &defaulted);
         ok(ret, "GetSecurityDescriptorSacl failed with error %u\n", GetLastError());
@@ -64,7 +65,7 @@ index bf4161c..0610ec7 100644
 
         if (sacl)
         {
-@@ -7513,8 +7512,8 @@ static void test_token_security_descriptor(void)
+@@ -7432,8 +7431,8 @@ static void test_token_security_descriptor(void)
         sacl = NULL;
         ret = GetSecurityDescriptorSacl(sd3, &present, &sacl, &defaulted);
         ok(ret, "GetSecurityDescriptorSacl failed with error %u\n", GetLastError());
@@ -75,7 +76,7 @@ index bf4161c..0610ec7 100644
 
         if (sacl)
         {
-@@ -7732,7 +7731,7 @@ static void test_child_token_sd_medium(void)
+@@ -7652,7 +7651,7 @@ static void test_child_token_sd_medium(void)
     ok(ret, "GetAce failed with error %u\n", GetLastError());
     ok(ace_label->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE,
        "Unexpected ACE type %#x\n", ace_label->Header.AceType);
@@ -84,11 +85,24 @@ index bf4161c..0610ec7 100644
        "Expected medium integrity level\n");
 
     memset(buffer_integrity, 0, sizeof(buffer_integrity));
+diff --git a/server/named_pipe.c b/server/named_pipe.c
+index 4cd4d7dc4a8..06bf8402aea 100644
+--- a/server/named_pipe.c
+++ b/server/named_pipe.c
+@@ -1142,7 +1142,7 @@ static int pipe_server_ioctl( struct fd *fd, ioctl_code_t code, struct async *as
+         if (current->process->token) /* FIXME: use the client token */
+         {
+             struct token *token;
+-            if (!(token = token_duplicate( current->process->token, 0, SecurityImpersonation, NULL, NULL, 0, NULL, 0 )))
+            if (!(token = token_duplicate( current->process->token, 0, SecurityImpersonation, NULL, NULL, 0, NULL, 0, NULL )))
+                 return 0;
+             if (current->token) release_object( current->token );
+             current->token = token;
 diff --git a/server/process.c b/server/process.c
-index b7c9da3..250f777 100644
+index 31d5b96a25d..2c485831e33 100644
 --- a/server/process.c
 +++ b/server/process.c
-@@ -562,17 +562,11 @@ struct process *create_process( int fd, struct thread *parent_thread, int inheri
+@@ -577,17 +577,11 @@ 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 */
@@ -108,7 +122,7 @@ index b7c9da3..250f777 100644
     return process;
 
 diff --git a/server/security.h b/server/security.h
-index 32dfe5f..87377cc 100644
+index 32dfe5f8db9..87377ccd673 100644
 --- a/server/security.h
 +++ b/server/security.h
@@ -59,7 +59,7 @@ extern int token_assign_label( struct token *token, PSID label );
@@ -121,10 +135,10 @@ index 32dfe5f..87377cc 100644
                                    const LUID_AND_ATTRIBUTES *reqprivs,
                                    unsigned int count, LUID_AND_ATTRIBUTES *usedprivs);
 diff --git a/server/token.c b/server/token.c
-index 5db97b4..bd251c7 100644
+index 2f466aa1b25..23bc1cc13f7 100644
 --- a/server/token.c
 +++ b/server/token.c
-@@ -668,7 +668,7 @@ static int filter_privilege( struct privilege *privilege, const LUID_AND_ATTRIBU
+@@ -675,7 +675,7 @@ static int filter_privilege( struct privilege *privilege, const LUID_AND_ATTRIBU
 struct token *token_duplicate( struct token *src_token, unsigned primary,
                                int impersonation_level, const struct security_descriptor *sd,
                                const LUID_AND_ATTRIBUTES *filter_privileges, unsigned int priv_count,
@@ -133,7 +147,7 @@ index 5db97b4..bd251c7 100644
 {
     const luid_t *modified_id =
         primary || (impersonation_level == src_token->impersonation_level) ?
-@@ -735,6 +735,12 @@ struct token *token_duplicate( struct token *src_token, unsigned primary,
+@@ -742,6 +742,12 @@ struct token *token_duplicate( struct token *src_token, unsigned primary,
     if (sd) default_set_sd( &token->obj, sd, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION |
                             DACL_SECURITY_INFORMATION | SACL_SECURITY_INFORMATION );
 
@@ -146,7 +160,7 @@ index 5db97b4..bd251c7 100644
     return token;
 }
 
-@@ -906,6 +912,12 @@ struct token *token_create_admin( void )
+@@ -913,6 +919,12 @@ struct token *token_create_admin( void )
                               admin_source, NULL, -1, TokenElevationTypeFull, &high_label_sid );
         /* we really need a primary group */
         assert( token->primary_group );
@@ -159,7 +173,7 @@ index 5db97b4..bd251c7 100644
     }
 
     free( logon_sid );
-@@ -964,6 +976,12 @@ static struct token *token_create_limited( void )
+@@ -971,6 +983,12 @@ static struct token *token_create_limited( void )
                               admin_source, NULL, -1, TokenElevationTypeLimited, &medium_label_sid );
         /* we really need a primary group */
         assert( token->primary_group );
@@ -172,7 +186,7 @@ index 5db97b4..bd251c7 100644
     }
 
     free( logon_sid );
-@@ -1432,7 +1450,8 @@ DECL_HANDLER(duplicate_token)
+@@ -1439,7 +1457,8 @@ DECL_HANDLER(duplicate_token)
                                                      TOKEN_DUPLICATE,
                                                      &token_ops )))
     {
@@ -182,7 +196,7 @@ index 5db97b4..bd251c7 100644
         if (token)
         {
             unsigned int access = req->access ? req->access : get_handle_access( current->process, req->handle );
-@@ -1462,7 +1481,7 @@ DECL_HANDLER(filter_token)
+@@ -1469,7 +1488,7 @@ DECL_HANDLER(filter_token)
         group_count = get_sid_count( filter_groups, get_req_data_size() - priv_count * sizeof(LUID_AND_ATTRIBUTES) );
 
         token = token_duplicate( src_token, src_token->primary, src_token->impersonation_level, NULL,
@@ -191,7 +205,7 @@ index 5db97b4..bd251c7 100644
         if (token)
         {
             unsigned int access = get_handle_access( current->process, req->handle );
-@@ -1788,23 +1807,11 @@ DECL_HANDLER(set_token_default_dacl)
+@@ -1795,23 +1814,11 @@ DECL_HANDLER(set_token_default_dacl)
 DECL_HANDLER(create_token)
 {
     struct token *token;
@@ -218,5 +232,5 @@ index 5db97b4..bd251c7 100644
     }
 }
 -- 
-2.7.4
+2.27.0

--- a/patches/bcrypt-ECDHSecretAgreement/0001-bcrypt-Implement-BCryptSecretAgreement-with-libgcryp.patch
+++ b/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

--- a/patches/configure-Absolute_RPATH/0001-configure-Also-add-the-absolute-RPATH-when-linking-a.patch
+++ b/patches/configure-Absolute_RPATH/0001-configure-Also-add-the-absolute-RPATH-when-linking-a.patch
@@ -1,4 +1,4 @@
-From 8a5768bc4dc64dd9a0df5d7b781a569622b8c9b6 Mon Sep 17 00:00:00 2001
+From 38d4fa059ffd4ecba4e7d04e2a5edd2bcff3c7df Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Wed, 27 Aug 2014 00:31:23 +0200
 Subject: [PATCH] configure: Also add the absolute RPATH when linking against
@@ -9,11 +9,11 @@ Subject: [PATCH] configure: Also add the absolute RPATH when linking against
 1 file changed, 2 insertions(+), 2 deletions(-)

 diff --git a/configure.ac b/configure.ac
-index e6acb786a4d..bd3fe968839 100644
+index c88013910af..a7f1866bf0d 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -956,10 +956,10 @@ case $host_os in
-       WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c400000"
+@@ -969,10 +969,10 @@ case $host_os in
+       WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7d400000"
 
       WINE_TRY_CFLAGS([-Wl,--rpath,\$ORIGIN/../lib],
 -                      [LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(MAKEDEP) -R \${bindir} \${libdir}\`"
@@ -26,5 +26,5 @@ index e6acb786a4d..bd3fe968839 100644
 
       WINE_TRY_CFLAGS([-Wl,--enable-new-dtags],
 -- 
-2.20.1
+2.27.0

--- a/patches/d3d11-Deferred_Context/0044-d3d11-Support-ID3D11DeviceContext1-for-deferred-cont.patch
+++ b/patches/d3d11-Deferred_Context/0044-d3d11-Support-ID3D11DeviceContext1-for-deferred-cont.patch
--- a/patches/d3d11-Deferred_Context/0045-d3d11-Implement-ID3D11Device2-GetImmediateContext1.patch
+++ b/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
+
--- a/patches/d3d11-Deferred_Context/definition
+++ b/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
--- a/patches/directmanipulation-new-dll/0002-directmanipulation-New-dll.patch
+++ b/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
-
--- a/patches/directmanipulation-new-dll/0003-uuid-Add-directmanipulation.h.patch
+++ b/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
-
--- a/patches/directmanipulation-new-dll/0004-directmanipulation-Create-DirectManipulationManager-.patch
+++ b/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
-
--- a/patches/directmanipulation-new-dll/0006-directmanipulation-Support-DCompManipulationComposit.patch
+++ b/patches/directmanipulation-new-dll/0006-directmanipulation-Support-DCompManipulationComposit.patch
@@ -1,182 +0,0 @@
-From 4e92430f5d923dba1aa6174957b3d589b38d5fd7 Mon Sep 17 00:00:00 2001
-From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Fri, 19 Jul 2019 08:49:51 +1000
-Subject: [PATCH 6/6] directmanipulation: Support DCompManipulationCompositor
- interface
-
---
- dlls/directmanipulation/directmanip.idl      |  10 ++
- dlls/directmanipulation/directmanipulation.c | 124 +++++++++++++++++++
- 2 files changed, 134 insertions(+)
-
-diff --git a/dlls/directmanipulation/directmanip.idl b/dlls/directmanipulation/directmanip.idl
-index ff00668ba5..9e1efa48ed 100644
--- a/dlls/directmanipulation/directmanip.idl
-+++ b/dlls/directmanipulation/directmanip.idl
-@@ -36,3 +36,13 @@ coclass DirectManipulationSharedManager
-     interface IDirectManipulationManager2;
-     [default] interface IDirectManipulationManager;
- }
-+
-+[
-+    uuid(79dea627-a08a-43ac-8ef5-6900b9299126),
-+    threading(both)
-+]
-+coclass DCompManipulationCompositor
-+{
-+    [default] interface IDirectManipulationCompositor;
-+    interface IDirectManipulationFrameInfoProvider;
-+}
-diff --git a/dlls/directmanipulation/directmanipulation.c b/dlls/directmanipulation/directmanipulation.c
-index 81efa3688b..0fe5c4be34 100644
--- a/dlls/directmanipulation/directmanipulation.c
-+++ b/dlls/directmanipulation/directmanipulation.c
-@@ -210,6 +210,117 @@ static HRESULT WINAPI DirectManipulation_CreateInstance(IClassFactory *iface, IU
-     return ret;
- }
- 
-+struct directcompositor
-+{
-+    IDirectManipulationCompositor IDirectManipulationCompositor_iface;
-+    LONG ref;
-+};
-+
-+static inline struct directcompositor *impl_from_IDirectManipulationCompositor(IDirectManipulationCompositor *iface)
-+{
-+    return CONTAINING_RECORD(iface, struct directcompositor, IDirectManipulationCompositor_iface);
-+}
-+
-+static HRESULT WINAPI compositor_QueryInterface(IDirectManipulationCompositor *iface, REFIID riid, void **ppv)
-+{
-+    if (IsEqualGUID(riid, &IID_IUnknown) ||
-+        IsEqualGUID(riid, &IID_IDirectManipulationCompositor))
-+    {
-+        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 compositor_AddRef(IDirectManipulationCompositor *iface)
-+{
-+    struct directcompositor *This = impl_from_IDirectManipulationCompositor(iface);
-+    ULONG ref = InterlockedIncrement(&This->ref);
-+
-+    TRACE("(%p) ref=%u\n", This, ref);
-+
-+    return ref;
-+}
-+
-+static ULONG WINAPI compositor_Release(IDirectManipulationCompositor *iface)
-+{
-+    struct directcompositor *This = impl_from_IDirectManipulationCompositor(iface);
-+    ULONG ref = InterlockedDecrement(&This->ref);
-+
-+    TRACE("(%p) ref=%u\n", This, ref);
-+
-+    if (!ref)
-+    {
-+        heap_free(This);
-+    }
-+    return ref;
-+}
-+
-+static HRESULT WINAPI compositor_AddContent(IDirectManipulationCompositor *iface, IDirectManipulationContent *content,
-+                IUnknown *device, IUnknown *parent, IUnknown *child)
-+{
-+    struct directcompositor *This = impl_from_IDirectManipulationCompositor(iface);
-+    FIXME("%p, %p, %p, %p, %p\n", This, content, device, parent, child);
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI compositor_RemoveContent(IDirectManipulationCompositor *iface, IDirectManipulationContent *content)
-+{
-+    struct directcompositor *This = impl_from_IDirectManipulationCompositor(iface);
-+    FIXME("%p, %p\n", This, content);
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI compositor_SetUpdateManager(IDirectManipulationCompositor *iface, IDirectManipulationUpdateManager *manager)
-+{
-+    struct directcompositor *This = impl_from_IDirectManipulationCompositor(iface);
-+    FIXME("%p, %p\n", This, manager);
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI compositor_Flush(IDirectManipulationCompositor *iface)
-+{
-+    struct directcompositor *This = impl_from_IDirectManipulationCompositor(iface);
-+    FIXME("%p\n", This);
-+    return E_NOTIMPL;
-+}
-+
-+static const struct IDirectManipulationCompositorVtbl  compositorVtbl =
-+{
-+    compositor_QueryInterface,
-+    compositor_AddRef,
-+    compositor_Release,
-+    compositor_AddContent,
-+    compositor_RemoveContent,
-+    compositor_SetUpdateManager,
-+    compositor_Flush
-+};
-+
-+static HRESULT WINAPI DirectCompositor_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv)
-+{
-+    struct directcompositor *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->IDirectManipulationCompositor_iface.lpVtbl = &compositorVtbl;
-+    object->ref = 1;
-+
-+    ret = compositor_QueryInterface(&object->IDirectManipulationCompositor_iface, riid, ppv);
-+    compositor_Release(&object->IDirectManipulationCompositor_iface);
-+
-+    return ret;
-+}
-+
- static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv)
- {
-     *ppv = NULL;
-@@ -253,7 +364,16 @@ static const IClassFactoryVtbl DirectFactoryVtbl = {
-     ClassFactory_LockServer
- };
- 
-+static const IClassFactoryVtbl DirectCompositorVtbl = {
-+    ClassFactory_QueryInterface,
-+    ClassFactory_AddRef,
-+    ClassFactory_Release,
-+    DirectCompositor_CreateInstance,
-+    ClassFactory_LockServer
-+};
-+
- static IClassFactory direct_factory = { &DirectFactoryVtbl };
-+static IClassFactory compositor_factory = { &DirectCompositorVtbl };
- 
- HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
- {
-@@ -262,6 +382,10 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
-         TRACE("(CLSID_DirectManipulationManager %s %p)\n", debugstr_guid(riid), ppv);
-         return IClassFactory_QueryInterface(&direct_factory, riid, ppv);
-     }
-+    else if(IsEqualGUID(&CLSID_DCompManipulationCompositor, rclsid)) {
-+        TRACE("(CLSID_DCompManipulationCompositor %s %p)\n", debugstr_guid(riid), ppv);
-+        return IClassFactory_QueryInterface(&compositor_factory, riid, ppv);
-+    }
- 
-     FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv);
-     return CLASS_E_CLASSNOTAVAILABLE;
-- 
-2.17.1
-
--- a/patches/directmanipulation-new-dll/0007-directmanipulation-Supprot-IDirectManipulationFrameI.patch
+++ b/patches/directmanipulation-new-dll/0007-directmanipulation-Supprot-IDirectManipulationFrameI.patch
@@ -1,104 +0,0 @@
-From c7190485c2cc3ccc4d6480d0621552aa488154bd 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
- IDirectManipulationFrameInfoProvider interface in
- IDirectManipulationCompositor.
-
---
- dlls/directmanipulation/directmanipulation.c | 49 ++++++++++++++++++++
- 1 file changed, 49 insertions(+)
-
-diff --git a/dlls/directmanipulation/directmanipulation.c b/dlls/directmanipulation/directmanipulation.c
-index 44d74b368d0..f5a8aee5de2 100644
--- a/dlls/directmanipulation/directmanipulation.c
-+++ b/dlls/directmanipulation/directmanipulation.c
-@@ -213,6 +213,7 @@ static HRESULT WINAPI DirectManipulation_CreateInstance(IClassFactory *iface, IU
- struct directcompositor
- {
-     IDirectManipulationCompositor IDirectManipulationCompositor_iface;
-+    IDirectManipulationFrameInfoProvider IDirectManipulationFrameInfoProvider_iface;
-     LONG ref;
- };
- 
-@@ -221,8 +222,15 @@ static inline struct directcompositor *impl_from_IDirectManipulationCompositor(I
-     return CONTAINING_RECORD(iface, struct directcompositor, IDirectManipulationCompositor_iface);
- }
- 
-+static inline struct directcompositor *impl_from_IDirectManipulationFrameInfoProvider(IDirectManipulationFrameInfoProvider *iface)
-+{
-+    return CONTAINING_RECORD(iface, struct directcompositor, IDirectManipulationFrameInfoProvider_iface);
-+}
-+
- static HRESULT WINAPI compositor_QueryInterface(IDirectManipulationCompositor *iface, REFIID riid, void **ppv)
- {
-+    struct directcompositor *This = impl_from_IDirectManipulationCompositor(iface);
-+
-     if (IsEqualGUID(riid, &IID_IUnknown) ||
-         IsEqualGUID(riid, &IID_IDirectManipulationCompositor))
-     {
-@@ -230,6 +238,12 @@ static HRESULT WINAPI compositor_QueryInterface(IDirectManipulationCompositor *i
-         *ppv = iface;
-         return S_OK;
-     }
-+    else if(IsEqualGUID(riid, &IID_IDirectManipulationFrameInfoProvider))
-+    {
-+        IUnknown_AddRef(iface);
-+        *ppv = &This->IDirectManipulationFrameInfoProvider_iface;
-+        return S_OK;
-+    }
- 
-     FIXME("(%p)->(%s,%p),not found\n", iface, debugstr_guid(riid), ppv);
-     return E_NOINTERFACE;
-@@ -299,6 +313,40 @@ static const struct IDirectManipulationCompositorVtbl  compositorVtbl =
-     compositor_Flush
- };
- 
-+static HRESULT WINAPI provider_QueryInterface(IDirectManipulationFrameInfoProvider *iface, REFIID riid, void **ppv)
-+{
-+    struct directcompositor *This = impl_from_IDirectManipulationFrameInfoProvider(iface);
-+    return IDirectManipulationCompositor_QueryInterface(&This->IDirectManipulationCompositor_iface, riid, ppv);
-+}
-+
-+static ULONG WINAPI provider_AddRef(IDirectManipulationFrameInfoProvider *iface)
-+{
-+    struct directcompositor *This = impl_from_IDirectManipulationFrameInfoProvider(iface);
-+    return IDirectManipulationCompositor_AddRef(&This->IDirectManipulationCompositor_iface);
-+}
-+
-+static ULONG WINAPI provider_Release(IDirectManipulationFrameInfoProvider *iface)
-+{
-+    struct directcompositor *This = impl_from_IDirectManipulationFrameInfoProvider(iface);
-+    return IDirectManipulationCompositor_Release(&This->IDirectManipulationCompositor_iface);
-+}
-+
-+static HRESULT WINAPI provider_GetNextFrameInfo(IDirectManipulationFrameInfoProvider *iface, ULONGLONG *time,
-+            ULONGLONG *process, ULONGLONG *composition)
-+{
-+    struct directcompositor *This = impl_from_IDirectManipulationFrameInfoProvider(iface);
-+    FIXME("%p, %p, %p, %p\n", This, time, process, composition);
-+    return E_NOTIMPL;
-+}
-+
-+static const struct IDirectManipulationFrameInfoProviderVtbl providerVtbl =
-+{
-+    provider_QueryInterface,
-+    provider_AddRef,
-+    provider_Release,
-+    provider_GetNextFrameInfo
-+};
-+
- 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
-         return E_OUTOFMEMORY;
- 
-     object->IDirectManipulationCompositor_iface.lpVtbl = &compositorVtbl;
-+    object->IDirectManipulationFrameInfoProvider_iface.lpVtbl = &providerVtbl;
-     object->ref = 1;
- 
-     ret = compositor_QueryInterface(&object->IDirectManipulationCompositor_iface, riid, ppv);
-- 
-2.17.1
-
--- a/patches/directmanipulation-new-dll/0008-directmanipulation-Implement-IDirectManipulationMana.patch
+++ b/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
-
--- a/patches/directmanipulation-new-dll/0009-directmanipulation-Implement-IDirectManipulationComp.patch
+++ b/patches/directmanipulation-new-dll/0009-directmanipulation-Implement-IDirectManipulationComp.patch
@@ -1,51 +0,0 @@
-From 6f2fd8dc5086a0c0982f71416b8a2b1e25ac6433 Mon Sep 17 00:00:00 2001
-From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Wed, 24 Jul 2019 09:15:18 +1000
-Subject: [PATCH] directmanipulation: Implement IDirectManipulationCompositor
- SetUpdateManager.
-
---
- dlls/directmanipulation/directmanipulation.c | 13 +++++++++++--
- 1 file changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/directmanipulation/directmanipulation.c b/dlls/directmanipulation/directmanipulation.c
-index 7d00354963..629a41c845 100644
--- a/dlls/directmanipulation/directmanipulation.c
-+++ b/dlls/directmanipulation/directmanipulation.c
-@@ -339,6 +339,7 @@ struct directcompositor
- {
-     IDirectManipulationCompositor IDirectManipulationCompositor_iface;
-     IDirectManipulationFrameInfoProvider IDirectManipulationFrameInfoProvider_iface;
-+    IDirectManipulationUpdateManager *manager;
-     LONG ref;
- };
- 
-@@ -393,6 +394,8 @@ static ULONG WINAPI compositor_Release(IDirectManipulationCompositor *iface)
- 
-     if (!ref)
-     {
-+        if(This->manager)
-+            IDirectManipulationUpdateManager_Release(This->manager);
-         heap_free(This);
-     }
-     return ref;
-@@ -416,8 +419,14 @@ static HRESULT WINAPI compositor_RemoveContent(IDirectManipulationCompositor *if
- static HRESULT WINAPI compositor_SetUpdateManager(IDirectManipulationCompositor *iface, IDirectManipulationUpdateManager *manager)
- {
-     struct directcompositor *This = impl_from_IDirectManipulationCompositor(iface);
-    FIXME("%p, %p\n", This, manager);
-    return E_NOTIMPL;
-+    TRACE("%p, %p\n", This, manager);
-+
-+    if(!manager)
-+        return E_INVALIDARG;
-+
-+    This->manager = manager;
-+    IDirectManipulationUpdateManager_AddRef(This->manager);
-+    return S_OK;
- }
- 
- static HRESULT WINAPI compositor_Flush(IDirectManipulationCompositor *iface)
-- 
-2.17.1
-
--- a/patches/directmanipulation-new-dll/0011-directmanipulation-Implement-IDirectManipulationMana.patch
+++ b/patches/directmanipulation-new-dll/0011-directmanipulation-Implement-IDirectManipulationMana.patch
@@ -1,373 +0,0 @@
-From 7d82a3f5a5bcdbf2b362c456080e59f882842b85 Mon Sep 17 00:00:00 2001
-From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Fri, 26 Jul 2019 09:51:05 +1000
-Subject: [PATCH] directmanipulation: Implement IDirectManipulationManager2
- CreateViewport
-
---
- dlls/directmanipulation/directmanipulation.c | 341 ++++++++++++++++++-
- 1 file changed, 339 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/directmanipulation/directmanipulation.c b/dlls/directmanipulation/directmanipulation.c
-index 629a41c845..86e9556e70 100644
--- a/dlls/directmanipulation/directmanipulation.c
-+++ b/dlls/directmanipulation/directmanipulation.c
-@@ -177,6 +177,334 @@ static HRESULT create_update_manager(IDirectManipulationUpdateManager **obj)
-     return S_OK;
- }
- 
-+struct directviewport
-+{
-+    IDirectManipulationViewport2 IDirectManipulationViewport2_iface;
-+    LONG ref;
-+};
-+
-+static inline struct directviewport *impl_from_IDirectManipulationViewport2(IDirectManipulationViewport2 *iface)
-+{
-+    return CONTAINING_RECORD(iface, struct directviewport, IDirectManipulationViewport2_iface);
-+}
-+
-+static HRESULT WINAPI viewport_QueryInterface(IDirectManipulationViewport2 *iface, REFIID riid, void **ppv)
-+{
-+    struct directviewport *This = impl_from_IDirectManipulationViewport2(iface);
-+    TRACE("(%p)->(%s,%p)\n", This, debugstr_guid(riid), ppv);
-+
-+    if (IsEqualGUID(riid, &IID_IUnknown) ||
-+        IsEqualGUID(riid, &IID_IDirectManipulationViewport) ||
-+        IsEqualGUID(riid, &IID_IDirectManipulationViewport2))
-+    {
-+        IDirectManipulationViewport2_AddRef(&This->IDirectManipulationViewport2_iface);
-+        *ppv = &This->IDirectManipulationViewport2_iface;
-+        return S_OK;
-+    }
-+
-+    FIXME("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppv);
-+    return E_NOINTERFACE;
-+}
-+
-+static ULONG WINAPI viewport_AddRef(IDirectManipulationViewport2 *iface)
-+{
-+    struct directviewport *This = impl_from_IDirectManipulationViewport2(iface);
-+    ULONG ref = InterlockedIncrement(&This->ref);
-+
-+    TRACE("(%p) ref=%u\n", This, ref);
-+
-+    return ref;
-+}
-+
-+static ULONG WINAPI viewport_Release(IDirectManipulationViewport2 *iface)
-+{
-+    struct directviewport *This = impl_from_IDirectManipulationViewport2(iface);
-+    ULONG ref = InterlockedDecrement(&This->ref);
-+
-+    TRACE("(%p) ref=%u\n", This, ref);
-+
-+    if (!ref)
-+    {
-+        heap_free(This);
-+    }
-+    return ref;
-+}
-+
-+static HRESULT WINAPI viewport_Enable(IDirectManipulationViewport2 *iface)
-+{
-+    struct directviewport *This = impl_from_IDirectManipulationViewport2(iface);
-+    FIXME("%p\n", This);
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI viewport_Disable(IDirectManipulationViewport2 *iface)
-+{
-+    struct directviewport *This = impl_from_IDirectManipulationViewport2(iface);
-+    FIXME("%p\n", This);
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI viewport_SetContact(IDirectManipulationViewport2 *iface, UINT32 id)
-+{
-+    struct directviewport *This = impl_from_IDirectManipulationViewport2(iface);
-+    FIXME("%p, %d\n", This, id);
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI viewport_ReleaseContact(IDirectManipulationViewport2 *iface, UINT32 id)
-+{
-+    struct directviewport *This = impl_from_IDirectManipulationViewport2(iface);
-+    FIXME("%p, %d\n", This, id);
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI viewport_ReleaseAllContacts(IDirectManipulationViewport2 *iface)
-+{
-+    struct directviewport *This = impl_from_IDirectManipulationViewport2(iface);
-+    FIXME("%p\n", This);
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI viewport_GetStatus(IDirectManipulationViewport2 *iface, DIRECTMANIPULATION_STATUS *status)
-+{
-+    struct directviewport *This = impl_from_IDirectManipulationViewport2(iface);
-+    FIXME("%p, %p\n", This, status);
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI viewport_GetTag(IDirectManipulationViewport2 *iface, REFIID riid, void **object, UINT32 *id)
-+{
-+    struct directviewport *This = impl_from_IDirectManipulationViewport2(iface);
-+    FIXME("%p, %s, %p, %p\n", This, debugstr_guid(riid), object, id);
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI viewport_SetTag(IDirectManipulationViewport2 *iface, IUnknown *object, UINT32 id)
-+{
-+    struct directviewport *This = impl_from_IDirectManipulationViewport2(iface);
-+    FIXME("%p, %p, %p\n", This, object, id);
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI viewport_GetViewportRect(IDirectManipulationViewport2 *iface, RECT *viewport)
-+{
-+    struct directviewport *This = impl_from_IDirectManipulationViewport2(iface);
-+    FIXME("%p, %p\n", This, viewport);
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI viewport_SetViewportRect(IDirectManipulationViewport2 *iface, const RECT *viewport)
-+{
-+    struct directviewport *This = impl_from_IDirectManipulationViewport2(iface);
-+    FIXME("%p, %p\n", This, viewport);
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI viewport_ZoomToRect(IDirectManipulationViewport2 *iface, const float left,
-+                    const float top, const float right, const float bottom, BOOL animate)
-+{
-+    struct directviewport *This = impl_from_IDirectManipulationViewport2(iface);
-+    FIXME("%p, %f, %f, %f, %f, %d\n", This, left, top, right, bottom, animate);
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI viewport_SetViewportTransform(IDirectManipulationViewport2 *iface,
-+                    const float *matrix, DWORD count)
-+{
-+    struct directviewport *This = impl_from_IDirectManipulationViewport2(iface);
-+    FIXME("%p, %p, %d\n", This, matrix, count);
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI viewport_SyncDisplayTransform(IDirectManipulationViewport2 *iface,
-+                    const float *matrix, DWORD count)
-+{
-+    struct directviewport *This = impl_from_IDirectManipulationViewport2(iface);
-+    FIXME("%p, %p, %d\n", This, matrix, count);
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI viewport_GetPrimaryContent(IDirectManipulationViewport2 *iface, REFIID riid, void **object)
-+{
-+    struct directviewport *This = impl_from_IDirectManipulationViewport2(iface);
-+    FIXME("%p, %s, %p\n", This, debugstr_guid(riid), object);
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI viewport_AddContent(IDirectManipulationViewport2 *iface, IDirectManipulationContent *content)
-+{
-+    struct directviewport *This = impl_from_IDirectManipulationViewport2(iface);
-+    FIXME("%p, %p\n", This, content);
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI viewport_RemoveContent(IDirectManipulationViewport2 *iface, IDirectManipulationContent *content)
-+{
-+    struct directviewport *This = impl_from_IDirectManipulationViewport2(iface);
-+    FIXME("%p, %p\n", This, content);
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI viewport_SetViewportOptions(IDirectManipulationViewport2 *iface, DIRECTMANIPULATION_VIEWPORT_OPTIONS options)
-+{
-+    struct directviewport *This = impl_from_IDirectManipulationViewport2(iface);
-+    FIXME("%p, %d\n", This, options);
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI viewport_AddConfiguration(IDirectManipulationViewport2 *iface, DIRECTMANIPULATION_CONFIGURATION configuration)
-+{
-+    struct directviewport *This = impl_from_IDirectManipulationViewport2(iface);
-+    FIXME("%p, %d\n", This, configuration);
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI viewport_RemoveConfiguration(IDirectManipulationViewport2 *iface, DIRECTMANIPULATION_CONFIGURATION configuration)
-+{
-+    struct directviewport *This = impl_from_IDirectManipulationViewport2(iface);
-+    FIXME("%p, %d\n", This, configuration);
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI viewport_ActivateConfiguration(IDirectManipulationViewport2 *iface, DIRECTMANIPULATION_CONFIGURATION configuration)
-+{
-+    struct directviewport *This = impl_from_IDirectManipulationViewport2(iface);
-+    FIXME("%p, %d\n", This, configuration);
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI viewport_SetManualGesture(IDirectManipulationViewport2 *iface, DIRECTMANIPULATION_GESTURE_CONFIGURATION configuration)
-+{
-+    struct directviewport *This = impl_from_IDirectManipulationViewport2(iface);
-+    FIXME("%p, %d\n", This, configuration);
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI viewport_SetChaining(IDirectManipulationViewport2 *iface, DIRECTMANIPULATION_MOTION_TYPES enabledTypes)
-+{
-+    struct directviewport *This = impl_from_IDirectManipulationViewport2(iface);
-+    FIXME("%p, %d\n", This, enabledTypes);
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI viewport_AddEventHandler(IDirectManipulationViewport2 *iface, HWND window,
-+                    IDirectManipulationViewportEventHandler *eventHandler, DWORD *cookie)
-+{
-+    struct directviewport *This = impl_from_IDirectManipulationViewport2(iface);
-+    FIXME("%p, %p, %p, %p\n", This, window, eventHandler, cookie);
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI viewport_RemoveEventHandler(IDirectManipulationViewport2 *iface, DWORD cookie)
-+{
-+    struct directviewport *This = impl_from_IDirectManipulationViewport2(iface);
-+    FIXME("%p, %d\n", This, cookie);
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI viewport_SetInputMode(IDirectManipulationViewport2 *iface, DIRECTMANIPULATION_INPUT_MODE mode)
-+{
-+    struct directviewport *This = impl_from_IDirectManipulationViewport2(iface);
-+    FIXME("%p, %d\n", This, mode);
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI viewport_SetUpdateMode(IDirectManipulationViewport2 *iface, DIRECTMANIPULATION_INPUT_MODE mode)
-+{
-+    struct directviewport *This = impl_from_IDirectManipulationViewport2(iface);
-+    FIXME("%p, %d\n", This, mode);
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI viewport_Stop(IDirectManipulationViewport2 *iface)
-+{
-+    struct directviewport *This = impl_from_IDirectManipulationViewport2(iface);
-+    FIXME("%p\n", This);
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI viewport_Abandon(IDirectManipulationViewport2 *iface)
-+{
-+    struct directviewport *This = impl_from_IDirectManipulationViewport2(iface);
-+    FIXME("%p\n", This);
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI viewport_AddBehavior(IDirectManipulationViewport2 *iface, IUnknown *behavior, DWORD *cookie)
-+{
-+    struct directviewport *This = impl_from_IDirectManipulationViewport2(iface);
-+    FIXME("%p, %p, %p\n", This, behavior, cookie);
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI viewport_RemoveBehavior(IDirectManipulationViewport2 *iface, DWORD cookie)
-+{
-+    struct directviewport *This = impl_from_IDirectManipulationViewport2(iface);
-+    FIXME("%p, %d\n", This, cookie);
-+    return E_NOTIMPL;
-+}
-+
-+static HRESULT WINAPI viewport_RemoveAllBehaviors(IDirectManipulationViewport2 *iface)
-+{
-+    struct directviewport *This = impl_from_IDirectManipulationViewport2(iface);
-+    FIXME("%p\n", This);
-+    return E_NOTIMPL;
-+}
-+
-+static const IDirectManipulationViewport2Vtbl viewportVtbl =
-+{
-+    viewport_QueryInterface,
-+    viewport_AddRef,
-+    viewport_Release,
-+    viewport_Enable,
-+    viewport_Disable,
-+    viewport_SetContact,
-+    viewport_ReleaseContact,
-+    viewport_ReleaseAllContacts,
-+    viewport_GetStatus,
-+    viewport_GetTag,
-+    viewport_SetTag,
-+    viewport_GetViewportRect,
-+    viewport_SetViewportRect,
-+    viewport_ZoomToRect,
-+    viewport_SetViewportTransform,
-+    viewport_SyncDisplayTransform,
-+    viewport_GetPrimaryContent,
-+    viewport_AddContent,
-+    viewport_RemoveContent,
-+    viewport_SetViewportOptions,
-+    viewport_AddConfiguration,
-+    viewport_RemoveConfiguration,
-+    viewport_ActivateConfiguration,
-+    viewport_SetManualGesture,
-+    viewport_SetChaining,
-+    viewport_AddEventHandler,
-+    viewport_RemoveEventHandler,
-+    viewport_SetInputMode,
-+    viewport_SetUpdateMode,
-+    viewport_Stop,
-+    viewport_Abandon,
-+    viewport_AddBehavior,
-+    viewport_RemoveBehavior,
-+    viewport_RemoveAllBehaviors
-+};
-+
-+static HRESULT create_viewport(IDirectManipulationViewport2 **obj)
-+{
-+    struct directviewport *object;
-+
-+    object = heap_alloc(sizeof(*object));
-+    if(!object)
-+        return E_OUTOFMEMORY;
-+
-+    object->IDirectManipulationViewport2_iface.lpVtbl = &viewportVtbl;
-+    object->ref = 1;
-+
-+    *obj = &object->IDirectManipulationViewport2_iface;
-+
-+    return S_OK;
-+}
-+
- static HRESULT WINAPI direct_manip_QueryInterface(IDirectManipulationManager2 *iface, REFIID riid, void **ppv)
- {
-     if (IsEqualGUID(riid, &IID_IUnknown) ||
-@@ -278,9 +606,18 @@ static HRESULT WINAPI direct_manip_GetUpdateManager(IDirectManipulationManager2
- static HRESULT WINAPI direct_manip_CreateViewport(IDirectManipulationManager2 *iface, IDirectManipulationFrameInfoProvider *frame,
-                 HWND window, REFIID riid, void **obj)
- {
-+    HRESULT hr = E_NOTIMPL;
-     struct directmanipulation *This = impl_from_IDirectManipulationManager2(iface);
-    FIXME("%p, %p, %p, %s, %p\n", This, frame, window, debugstr_guid(riid), obj);
-    return E_NOTIMPL;
-+    TRACE("%p, %p, %p, %s, %p\n", This, frame, window, debugstr_guid(riid), obj);
-+
-+    if(IsEqualGUID(riid, &IID_IDirectManipulationViewport) ||
-+       IsEqualGUID(riid, &IID_IDirectManipulationViewport2) )
-+    {
-+        hr = create_viewport( (IDirectManipulationViewport2**)obj);
-+    }
-+    else
-+        FIXME("Unsupported interface %s\n", debugstr_guid(riid));
-+    return hr;
- }
- 
- static HRESULT WINAPI direct_manip_CreateContent(IDirectManipulationManager2 *iface, IDirectManipulationFrameInfoProvider *frame,
-- 
-2.17.1
-
--- a/patches/directmanipulation-new-dll/0012-directmanipulation-tests-Initial-tests.patch
+++ b/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
-
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Alistair Leslie-Hughes	54ae005107	Release v5.13	2020-07-19 09:30:32 +10:00
Alistair Leslie-Hughes	0e493bcef1	Added user32-QueryDisplayConfig	2020-07-19 09:25:32 +10:00
Alistair Leslie-Hughes	ee89d77f18	Added ntdll-freebsd-compile	2020-07-19 09:06:06 +10:00
Zebediah Figura	4ffe305c90	ntdll-Junction_Points: Update with rebased patch set from Erich E. Hoover.	2020-07-18 11:58:32 -05:00
Zebediah Figura	1a87edb76b	Rebase against 536aec511612afd002808508d76bd5640f359f25.	2020-07-17 17:52:46 -05:00
Alistair Leslie-Hughes	914f67c020	Rebase against 9415667cdfbb4c94cdfe03a1e80a87482bee98c1.	2020-07-17 11:26:22 +10:00
Alistair Leslie-Hughes	c3c5d48b18	Rebase against 42cb7d2ad1caba08de235e6319b9967296b5d554.	2020-07-16 09:08:33 +10:00
Paul Gofman	884f646404	Updated winebuild-pe_syscall_thunks patchset. Fix context eip in NtGetContextThread() on i386.	2020-07-15 12:48:46 +03:00
Paul Gofman	5c4729e4ce	Updated winebuild-pe_syscall_thunks patchset. Fix non-PE build.	2020-07-15 02:55:55 +03:00
Zebediah Figura	103195f07d	Rebase against 54b2a10659871032720df31ae9ca6cba2ff4acf0.	2020-07-14 18:10:39 -05:00
Paul Gofman	3acacd0ee1	Updated and reenabled ntdll-Syscall_Emulation patchset.	2020-07-14 16:13:54 +03:00
Paul Gofman	d2d0366ce5	Added winebuild-pe_syscall_thunks patchset. Restores the major bits of functionality of the former 'winebuild-Fake_Dlls' patchset which are yet missing upstream.	2020-07-14 16:08:50 +03:00
Zebediah Figura	913b39b117	Rebase against fdb3d9ae320363c1bd9fa716b167a7ad313e638b.	2020-07-13 17:56:04 -05:00
Zebediah Figura	4d315a6098	ntdll-DOS_Attributes: Correct rebase.	2020-07-11 15:42:27 -05:00
Zebediah Figura	5e5dafe07a	ntdll-SystemRoot_Symlink: Remove patch set. This patch is just incorrect. wineserver always is case-sensitive unless OBJ_CASE_INSENSITIVE is specified. For reference, the relevant cygwin code: https://cygwin.com/git/?p=newlib-cygwin.git;a=blob;f=winsup/cygwin/shared.cc;h=c939e0d0fb88506684038c01c5fd6141c8f130f8;hb=refs/heads/master	2020-07-11 12:32:23 -05:00
Zebediah Figura	bb79717d86	ntdll-NtDevicePath: Remove incorrect CDECL from nt_to_unix_file_name(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49555	2020-07-11 10:21:36 -05:00
Zebediah Figura	b1219b7fae	Rebase against caa41d4917a84dbbeb4aa14f18cfecfd17efe71a.	2020-07-10 21:10:05 -05:00
Zebediah Figura	046f6604b7	Rebase against 18ae539c914a9b5a89f63d8cf9c2a21273eccc6c.	2020-07-09 23:17:40 -05:00
Zebediah Figura	f6954e6e77	Rebase against 262e4ab9e0eeb126dde5cb4cba13fbf7f1d1cef0.	2020-07-08 20:46:51 -05:00
Alistair Leslie-Hughes	553c1cff5a	dsound-EAX - Fix compile	2020-07-08 10:38:50 +10:00
Zebediah Figura	4ef21bcf82	dsound-EAX: Correct rebase against 130870084 and e09190399.	2020-07-07 18:10:13 -05:00
Zebediah Figura	ebbd01086e	kernel32-K32GetPerformanceInfo: Remove patch set. As of 8622eb326fb, SystemProcessInformation should now actually be reasonably fast, requiring only a couple of server calls. This patch set would make K32GetPerformanceInfo() even faster, but without any record of what it helps, it's not particularly likely that it's making a significant difference anymore.	2020-07-07 18:05:07 -05:00
Zebediah Figura	b1765ff74e	Rebase against e0e3b6bc91f7db956e3a66f2938eea45d4055a39.	2020-07-07 17:59:50 -05:00
Alistair Leslie-Hughes	21a97e1f88	Rebase against 6e2a54ec76d225d76506fe909a9c300702636d5b.	2020-07-07 08:50:59 +10:00
Alistair Leslie-Hughes	4f13965432	Release v5.12.1 Compile Fixes.	2020-07-06 07:55:07 +10:00
Zebediah Figura	3dd8d0e647	xactengine-initial: Correct a spelling error in the definition of IXACT3Engine_Initialize.	2020-07-05 11:36:37 -05:00
Zebediah Figura	3f3a05f91c	xactengine-initial: Get rid of the separate IXACT34Cue implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49514	2020-07-04 11:38:26 -05:00
Alistair Leslie-Hughes	f48f106853	Release v5.12	2020-07-04 11:59:57 +10:00
Zebediah Figura	2e111fae10	ntdll-NtQueryVirtualMemory: Correct rebase.	2020-07-03 19:21:33 -05:00
Zebediah Figura	9cca205cc2	ntdll-NtQueryVirtualMemory: Rebase and re-enable.	2020-07-03 18:23:02 -05:00
Zebediah Figura	502c444d9c	Rebase against 51dd1ba02e4a96a3e0c9381a434bfd1fd4347d83.	2020-07-03 18:18:38 -05:00
Alistair Leslie-Hughes	215d78f8e1	Rebase against 8bd5fe30014c2aa60f0c4570db4ef936e8c51245.	2020-07-03 08:19:34 +10:00
Alistair Leslie-Hughes	cbdc68f558	Updated patchinstall.sh for server-Key-State	2020-07-02 09:58:06 +10:00
Alistair Leslie-Hughes	6125243d3a	Rebase against 10b17932fa829fac10a5e6717d96ed5d56de80fe.	2020-07-02 08:27:54 +10:00
Zebediah Figura	262df397ef	server-Key_State: Rebase and restore mistakenly deleted patch.	2020-06-30 19:15:34 -05:00
Zebediah Figura	f904ca32a3	user32-rawinput-*: Rebase and re-enable. Thanks to Rémi Bernon for the rebased patch sets.	2020-06-30 17:30:13 -05:00
Zebediah Figura	70f6f6d7e4	Rebase against 359ee2ecc21b08e4118f0f77b3a208e4b5e1e63d.	2020-06-30 17:11:27 -05:00
Zebediah Figura	4995d0d3af	ntdll-ThreadTime: Correct rebase.	2020-06-29 20:55:04 -05:00
Zebediah Figura	40099e26bf	ntdll-ThreadTime: Rebase and re-enable.	2020-06-29 19:03:01 -05:00
Zebediah Figura	70d8178927	Rebase against ec9e556d31278d2de28b8ba82a063dc9fffdb440.	2020-06-29 18:56:48 -05:00
Zebediah Figura	b6c2818755	server-Desktop_Refcount: Add missing alloc_handle() callback. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49463	2020-06-27 11:22:04 -05:00
Alistair Leslie-Hughes	37fc290f77	Rebase against 13b2587d4f55d64a1381c60ac34acf4abe6bb1e8.	2020-06-27 11:39:24 +10:00
Alistair Leslie-Hughes	82cff8bbdb	Rebase against fe4379eb19a201d45bc0d2d51270db133fd23a77.	2020-06-26 11:07:53 +10:00
Alistair Leslie-Hughes	df2fd22e4d	Added winevulkan-vkGetPhysicalDeviceSurfaceCapabilitiesKHR patchset	2020-06-25 10:03:16 +10:00
Alistair Leslie-Hughes	60074b960f	Rebase against 1f6423f778f7036a3875613e10b9c8c3b84584f0.	2020-06-25 08:19:10 +10:00
Paul Gofman	97fbe3fe04	Updated ntdll-ForceBottomUpAlloc patchset.	2020-06-24 20:02:02 +03:00
Paul Gofman	f2686a1537	Updated ntdll-ForceBottomUpAlloc patchset.	2020-06-24 17:49:51 +03:00
Zebediah Figura	7766c17912	Rebase against bc282905d9491b9f9fe4ae4b69a8ccdf99c5aaa8.	2020-06-23 18:07:36 -05:00
Paul Gofman	8402c95961	Updated server-Stored_ACLs patchset. Do not turn file type into FD_TYPE_CHAR when setting security descriptor.	2020-06-23 13:11:59 +03:00
Zebediah Figura	6274392d27	Rebase against 449b8c7e9212d0a80e28babff20f2755b7370872.	2020-06-22 17:21:09 -05:00
Alistair Leslie-Hughes	102af10c89	Updated winemenubuilder-Desktop_Icon_Path patchset Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49415	2020-06-22 13:56:19 +10:00
Alistair Leslie-Hughes	3d9a927266	Release v5.11	2020-06-20 11:51:49 +10:00
Zebediah Figura	8e5546184f	ntdll-Junction_Points: Rebase and re-enable.	2020-06-18 20:41:39 -05:00
Zebediah Figura	d799e8fd82	Rebase against e80df2d2d54a3f16389bea77f6863cc1c05d6251.	2020-06-18 19:13:40 -05:00
Alistair Leslie-Hughes	02913f754f	Rebase against 67ef5151744b347d4a30c985da6712fb0061e675.	2020-06-18 08:59:21 +10:00
Zebediah Figura	03f5adcafb	advapi32-Token_Integrity_Level: Correct rebase.	2020-06-16 19:38:49 -05:00
Alistair Leslie-Hughes	984d402240	Rebase against f56e409c2feb62056eb133e53fe398eadd0a503e.	2020-06-17 10:06:04 +10:00
Zebediah Figura	32fcc0d75b	Rebase against 634cb775c27b61ad6ce1fbe3e9972b0edfa31dcb.	2020-06-15 17:43:18 -05:00
Zebediah Figura	b6595d9e28	Rebase against 948a6a47b8dbd0ddd86cad04de03f0e4ba81b65d.	2020-06-12 18:15:13 -05:00
Alistair Leslie-Hughes	eb4f9db59c	Updated wow64cpu-Wow64Transition patchset Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49025	2020-06-12 09:41:04 +10:00
Alistair Leslie-Hughes	11f545447b	Rebase against 22970932d014f024fcf7f0f98b1a5384b1b1eb99.	2020-06-12 09:35:12 +10:00
Paul Gofman	7934e14fc0	Updated ntdll-Syscall_Emulation patchset. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49362	2020-06-11 15:26:30 +03:00
Paul Gofman	5306e1df11	Updated winebuild-Fake_Dlls patchset. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49357	2020-06-11 15:23:16 +03:00
Alistair Leslie-Hughes	938c0aa155	Rebase against 343043153b44fa46a2081fa8a2c171eac7c8dab6.	2020-06-11 08:44:26 +10:00
Zebediah Figura	cb2a6551bc	Rebase against bf454cc39428fc5299e5c26d9c0ddc6a9277c7ae.	2020-06-09 18:27:57 -05:00
Zebediah Figura	9a4c8c5631	Rebase against 17529582402ebe27ef975fc7dcb8353f4f95e629.	2020-06-08 16:00:03 -05:00
Paul Gofman	044cb93066	Updated ntdll-ForceBottomUpAlloc patchset. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49326	2020-06-08 15:33:28 +03:00
Alistair Leslie-Hughes	8648971fa8	Release v5.10	2020-06-06 16:35:31 +10:00
Zebediah Figura	f1917e904a	Rebase against 3cc3b445752902e07231900befc296f74ad6576e.	2020-06-05 15:06:03 -05:00
Paul Gofman	f12808c094	Updated winebuild-Fake_Dlls patchset.	2020-06-05 13:34:50 +03:00
Zebediah Figura	8a2765d125	Rebase against 3c72034b72014a087eae8d181252c67cb0782e28. 64-bit syscalls are broken.	2020-06-04 18:26:58 -05:00
Zebediah Figura	7b78338b07	Rebase against aba27fd5a3241635adb15fa7ef40aa43bf3978a1.	2020-06-04 00:08:14 -05:00
Alistair Leslie-Hughes	0db92c336f	Updated d3d11-Deferred_Context patchset	2020-06-03 10:43:26 +10:00
Zebediah Figura	2fd3b9fdfd	ntdll-RtlCreateUserThread: Fix a compiler warning.	2020-06-02 18:36:41 -05:00
Zebediah Figura	92d52c3f4c	ntdll-Interrupt-0x2e: Fix a compiler warning.	2020-06-02 18:36:41 -05:00
Zebediah Figura	a4d98c48f9	Rebase against 48020f4846cca1a02f4e1dc037e2cc2068df5e9c.	2020-06-02 18:36:41 -05:00
Paul Gofman	676f261e5e	Updated ntdll-ForceBottomUpAlloc patchset.	2020-06-02 21:29:16 +03:00
Alistair Leslie-Hughes	6387991cc0	Fixed rebase for x64	2020-06-02 14:04:28 +10:00
Zebediah Figura	c81093882b	Rebase against 3c86adab766e3bc7c91da088c2dd6bc41a917055.	2020-06-01 22:31:00 -05:00
Alistair Leslie-Hughes	f132e60b9d	Updated d3d11-Deferred_Context patch Game: Trainz: A New Era.	2020-06-01 16:22:19 +10:00
Paul Gofman	934a09585a	Updated winebuild-Fake_Dlls patchset.	2020-05-31 23:12:03 +03:00
Zebediah Figura	06877e55b1	Rebase against bf83d755d987fec552cd1dce30638c31c49ab760.	2020-05-29 19:13:43 -05:00
Alistair Leslie-Hughes	4e692b5301	Rebase against e48fabff525061c8eea9558084a97308cebe6b7b.	2020-05-28 08:46:43 +10:00
Alistair Leslie-Hughes	9ff4e2dc44	Update commit-rebase.sh Make it work when tree already has patches applied.	2020-05-28 08:03:39 +10:00
Alistair Leslie-Hughes	76f206526a	Fix commit sha	2020-05-28 08:02:14 +10:00
Alistair Leslie-Hughes	f3298432f0	Rebase against 87733a69f7448d25539cbc4fc37d2e93466f38de.	2020-05-27 10:10:56 +10:00
Alistair Leslie-Hughes	8be56c21f9	Rebase against 86e388c9182a4121eab35353bdfae3f0f4fd5a40.	2020-05-26 09:08:07 +10:00
Alistair Leslie-Hughes	543cee79a8	Added ntdll-RtlQueryRegistryValuesEx patchset	2020-05-24 18:38:23 +10:00
Alistair Leslie-Hughes	c6132bcb28	Added ntoskrnl.exe-KeGenericCallDpc	2020-05-24 17:47:21 +10:00
Alistair Leslie-Hughes	9ffacb6b09	Added ntoskrnl.exe-KeQueryActiveProcessorCountEx patchset	2020-05-24 17:46:14 +10:00
Alistair Leslie-Hughes	bca232f190	Add ntoskrnl.exe-KeRevertToUserAffinityThreadEx patchset	2020-05-24 17:41:57 +10:00
Alistair Leslie-Hughes	2263ec0d3d	Add ntoskrnl.exe-KeSetSystemAffinityThreadEx patchset	2020-05-24 17:40:24 +10:00
Alistair Leslie-Hughes	2c7588eb2f	Add ntoskrnl.exe-KdRefreshDebuggerNotPresent patchset	2020-05-24 17:38:27 +10:00