Release v5.12

Thanks to Rémi Bernon for the rebased patch sets.

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

@@ -1,4 +1,4 @@
-From 494fc3abe1eddabcf7cede677ee907284e89eea8 Mon Sep 17 00:00:00 2001
+From a349cc8bdcc3a083ea507dbbdeba9053e3a338e4 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Tue, 22 Mar 2016 23:08:30 +0100
 Subject: [PATCH] include: Check element type in CONTAINING_RECORD and similar
@@ -11,7 +11,7 @@ Subject: [PATCH] include: Check element type in CONTAINING_RECORD and similar
  3 files changed, 24 insertions(+), 6 deletions(-)
 
 diff --git a/include/wine/list.h b/include/wine/list.h
-index b4d681fe..287ad394 100644
+index b4d681fe0f3..287ad394fae 100644
 --- a/include/wine/list.h
 +++ b/include/wine/list.h
 @@ -228,7 +228,13 @@ static inline void list_move_head( struct list *dst, struct list *src )
@@ -31,7 +31,7 @@ index b4d681fe..287ad394 100644
  
  #endif  /* __WINE_SERVER_LIST_H */
 diff --git a/include/wine/rbtree.h b/include/wine/rbtree.h
-index dc50b5e7..8130deb5 100644
+index 8aae29c8c10..330b3e8fbc9 100644
 --- a/include/wine/rbtree.h
 +++ b/include/wine/rbtree.h
 @@ -23,8 +23,14 @@
@@ -52,10 +52,10 @@ index dc50b5e7..8130deb5 100644
  struct wine_rb_entry
  {
 diff --git a/include/winnt.h b/include/winnt.h
-index 2b489382..a156efc4 100644
+index 46e17c546a7..d5c65d2017b 100644
 --- a/include/winnt.h
 +++ b/include/winnt.h
-@@ -760,8 +760,14 @@ typedef struct _MEMORY_BASIC_INFORMATION
+@@ -793,8 +793,14 @@ typedef struct _MEMORY_BASIC_INFORMATION
  #define RTL_FIELD_SIZE(type, field) (sizeof(((type *)0)->field))
  #define RTL_SIZEOF_THROUGH_FIELD(type, field) (FIELD_OFFSET(type, field) + RTL_FIELD_SIZE(type, field))
  
@@ -70,8 +70,8 @@ index 2b489382..a156efc4 100644
 +   ((type *)((PCHAR)(address) - offsetof(type, field)))
 +#endif
  
+ #define ARRAYSIZE(x) (sizeof(x) / sizeof((x)[0]))
  #ifdef __WINESRC__
- # define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 -- 
-2.20.1
+2.26.2
 

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

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

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

@@ -1,17 +1,31 @@
-From 05ca39b029f8f710ca53aeafc36384fd39fd6b89 Mon Sep 17 00:00:00 2001
+From c097870c69720ece3874ad4ff987408a8c24ffb2 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Thu, 2 Oct 2014 19:53:46 +0200
 Subject: [PATCH] winelib: Append '(Staging)' at the end of the version string.
 
 ---
- libs/wine/Makefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ dlls/ntdll/Makefile.in | 2 +-
+ libs/wine/Makefile.in  | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
 
+diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in
+index ebf607e9d43..de93445d4e3 100644
+--- a/dlls/ntdll/Makefile.in
++++ b/dlls/ntdll/Makefile.in
+@@ -69,7 +69,7 @@ server_EXTRADEFS = \
+ 	-DBIN_TO_DATADIR=\"`$(MAKEDEP) -R ${bindir} ${datadir}/wine`\"
+ 
+ unix/version.c: dummy
+-	version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-$(PACKAGE_VERSION)") | sed -n -e '$$s/\(.*\)/const char wine_build[] = "\1";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || (rm -f $@ && exit 1)
++	version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-$(PACKAGE_VERSION)") | sed -n -e '$$s/\(.*\)/const char wine_build[] = "\1 (Staging)";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || (rm -f $@ && exit 1)
+ 
+ dummy:
+ .PHONY: dummy
 diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in
-index 4833eb5..3cfa4f4 100644
+index fe2a2b45e58..1e55a6b1f46 100644
 --- a/libs/wine/Makefile.in
 +++ b/libs/wine/Makefile.in
-@@ -31,7 +31,7 @@ libwine_LDFLAGS = $(LIBWINE_LDFLAGS)
+@@ -100,7 +100,7 @@ libwine_LDFLAGS = $(LIBWINE_LDFLAGS)
  libwine_DEPS = $(LIBWINE_DEPENDS)
  
  version.c: dummy
@@ -21,5 +35,5 @@ index 4833eb5..3cfa4f4 100644
  dummy:
  .PHONY: dummy
 -- 
-1.9.1
+2.26.2
 

patches/Staging/0003-loader-Add-commandline-option-patches-to-show-the-pa.patch

@@ -1,66 +1,33 @@
-From 63d2046a8f4388fbc7c12a07ae5f412fccc1b202 Mon Sep 17 00:00:00 2001
+From 599c50c9e339fe04e96fdb665b3d7ccb1a7708b7 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Thu, 29 May 2014 23:43:45 +0200
 Subject: [PATCH] loader: Add commandline option --patches to show the patch
  list.
 
 ---
- dlls/ntdll/misc.c      |  8 ++++++++
- dlls/ntdll/ntdll.spec  |  1 +
  include/wine/library.h |  1 +
  libs/wine/config.c     |  6 ++++++
  libs/wine/wine.map     |  1 +
  loader/main.c          | 42 +++++++++++++++++++++++++++++++++++++++++-
- 6 files changed, 58 insertions(+), 1 deletion(-)
+ 4 files changed, 49 insertions(+), 1 deletion(-)
 
-diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c
-index c29a1c26c26..8906e194272 100644
---- a/dlls/ntdll/misc.c
-+++ b/dlls/ntdll/misc.c
-@@ -60,6 +60,14 @@ const char * CDECL NTDLL_wine_get_version(void)
-     return wine_get_version();
- }
- 
-+/*********************************************************************
-+ *                  wine_get_patches   (NTDLL.@)
-+ */
-+const void * CDECL NTDLL_wine_get_patches(void)
-+{
-+    return wine_get_patches();
-+}
-+
- /*********************************************************************
-  *                  wine_get_build_id   (NTDLL.@)
-  */
-diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
-index e61a2578da5..52db67fd978 100644
---- a/dlls/ntdll/ntdll.spec
-+++ b/dlls/ntdll/ntdll.spec
-@@ -1571,6 +1571,7 @@
- 
- # Version
- @ cdecl wine_get_version() NTDLL_wine_get_version
-+@ cdecl wine_get_patches() NTDLL_wine_get_patches
- @ cdecl wine_get_build_id() NTDLL_wine_get_build_id
- @ cdecl wine_get_host_version(ptr ptr) NTDLL_wine_get_host_version
- 
 diff --git a/include/wine/library.h b/include/wine/library.h
-index f338c4da190..1f992da6062 100644
+index 090b8349559..b8a4a2df576 100644
 --- a/include/wine/library.h
 +++ b/include/wine/library.h
-@@ -47,6 +47,7 @@ extern const char *wine_get_data_dir(void);
- extern const char *wine_get_server_dir(void);
- extern const char *wine_get_user_name(void);
+@@ -42,6 +42,7 @@ extern "C" {
+ /* configuration */
+ 
  extern const char *wine_get_version(void);
 +extern const void *wine_get_patches(void);
  extern const char *wine_get_build_id(void);
  extern void wine_init_argv0_path( const char *argv0 );
  extern void wine_exec_wine_binary( const char *name, char **argv, const char *env_var );
 diff --git a/libs/wine/config.c b/libs/wine/config.c
-index 2a3314cbfda..5b66c063db6 100644
+index f5b4c0de9af..e52739d55ad 100644
 --- a/libs/wine/config.c
 +++ b/libs/wine/config.c
-@@ -504,6 +504,12 @@ const char *wine_get_version(void)
+@@ -515,6 +515,12 @@ const char *wine_get_version(void)
      return PACKAGE_VERSION;
  }
  
@@ -74,22 +41,22 @@ index 2a3314cbfda..5b66c063db6 100644
  const char *wine_get_build_id(void)
  {
 diff --git a/libs/wine/wine.map b/libs/wine/wine.map
-index 7ea849b908e..a7359ee7872 100644
+index 1143b129734..55f874d3e74 100644
 --- a/libs/wine/wine.map
 +++ b/libs/wine/wine.map
-@@ -22,6 +22,7 @@ WINE_1.0
-     wine_get_server_dir;
-     wine_get_user_name;
+@@ -13,6 +13,7 @@ WINE_1.0
+     wine_exec_wine_binary;
+     wine_get_build_id;
      wine_get_version;
 +    wine_get_patches;
      wine_init;
      wine_init_argv0_path;
      wine_mmap_add_reserved_area;
 diff --git a/loader/main.c b/loader/main.c
-index 407c897892d..d97d6b28bf8 100644
+index 0e6b6f66b50..24bcfff8c4c 100644
 --- a/loader/main.c
 +++ b/loader/main.c
-@@ -53,7 +53,8 @@ static void check_command_line( int argc, char *argv[] )
+@@ -55,7 +55,8 @@ static void check_command_line( int argc, char *argv[] )
      static const char usage[] =
          "Usage: wine PROGRAM [ARGUMENTS...]   Run the specified program\n"
          "       wine --help                   Display this help and exit\n"
@@ -99,7 +66,7 @@ index 407c897892d..d97d6b28bf8 100644
  
      if (argc <= 1)
      {
-@@ -70,6 +71,45 @@ static void check_command_line( int argc, char *argv[] )
+@@ -72,6 +73,45 @@ static void check_command_line( int argc, char *argv[] )
          printf( "%s\n", wine_get_build_id() );
          exit(0);
      }
@@ -146,5 +113,5 @@ index 407c897892d..d97d6b28bf8 100644
  
  
 -- 
-2.25.1
+2.26.2
 

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

@@ -1,4 +1,4 @@
-From 8fe522dadc480b57415a7b63e0752de113851231 Mon Sep 17 00:00:00 2001
+From 2588eb4eb5fe56aca7d229ea42b0eaa3786ff600 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 853da5c3fcf..33c1355c8b5 100644
+index e5db07f0a4e..d52f6b76aa4 100644
 --- a/dlls/ntdll/ntdll.spec
 +++ b/dlls/ntdll/ntdll.spec
-@@ -1569,6 +1569,9 @@
+@@ -1594,6 +1594,9 @@
  # Virtual memory
  @ cdecl __wine_locked_recvmsg(long ptr long)
  
@@ -25,27 +25,27 @@ index 853da5c3fcf..33c1355c8b5 100644
 +@ cdecl __wine_create_default_token(long)
 +
  # Version
- @ cdecl wine_get_version() NTDLL_wine_get_version
- @ cdecl wine_get_patches() NTDLL_wine_get_patches
+ @ cdecl wine_get_version()
+ @ cdecl wine_get_build_id()
 diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
-index b62239de5b4..d494dc71263 100644
+index 92fcde95a8a..80be882e76d 100644
 --- a/dlls/ntdll/ntdll_misc.h
 +++ b/dlls/ntdll/ntdll_misc.h
-@@ -96,6 +96,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 timeout_t server_start_time DECLSPEC_HIDDEN;
- extern unsigned int server_cpus 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 6d506c85306..9940e6cf7c9 100644
+index 992721d133f..24cb8f53de2 100644
 --- a/dlls/ntdll/process.c
 +++ b/dlls/ntdll/process.c
-@@ -124,6 +124,24 @@ HANDLE CDECL __wine_make_process_system(void)
+@@ -82,6 +82,24 @@ HANDLE CDECL __wine_make_process_system(void)
      return ret;
  }
  
@@ -67,14 +67,14 @@ index 6d506c85306..9940e6cf7c9 100644
 +    return ret;
 +}
 +
- static UINT process_error_mode;
- 
- #define UNIMPLEMENTED_INFO_CLASS(c) \
+ /******************************************************************************
+ *  NtQueryInformationProcess		[NTDLL.@]
+ *  ZwQueryInformationProcess		[NTDLL.@]
 diff --git a/server/protocol.def b/server/protocol.def
-index efacadac42b..434cd11baf0 100644
+index 96bc9250ab0..14b811684d8 100644
 --- a/server/protocol.def
 +++ b/server/protocol.def
-@@ -3749,6 +3749,14 @@ struct handle_info
+@@ -3759,6 +3759,14 @@ struct handle_info
  @END
  
  
@@ -215,5 +215,5 @@ index c4f1cd943c2..970ed1838da 100644
 +    }
 +}
 -- 
-2.26.0
+2.27.0
 

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

@@ -1,4 +1,4 @@
-From 6a09d34647aa517e45bc0bb20a92d0d94a1da888 Mon Sep 17 00:00:00 2001
+From 1f2b1bafabfd457836f18741f178b3745e129c36 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sat, 5 Aug 2017 03:39:55 +0200
 Subject: [PATCH] ntdll: Implement process token elevation through manifests.
@@ -12,10 +12,10 @@ Subject: [PATCH] ntdll: Implement process token elevation through manifests.
  5 files changed, 67 insertions(+)
 
 diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
-index 2f203447e..7c5dd308b 100644
+index 0c8f05285c4..92ae87c6e6d 100644
 --- a/dlls/ntdll/loader.c
 +++ b/dlls/ntdll/loader.c
-@@ -3804,6 +3804,32 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, void **entry, ULONG_PTR unknow
+@@ -3898,6 +3898,32 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, void **entry, ULONG_PTR unknow
  }
  
  
@@ -48,17 +48,17 @@ index 2f203447e..7c5dd308b 100644
  /***********************************************************************
   *           load_global_options
   */
-@@ -4233,6 +4259,7 @@ void __wine_process_init(void)
-                                       's','y','s','t','e','m','3','2','\\',
+@@ -4359,6 +4385,7 @@ void __wine_process_init(void)
                                        'k','e','r','n','e','l','3','2','.','d','l','l',0};
+     void (WINAPI *kernel32_start_process)(LPTHREAD_START_ROUTINE,void*) = NULL;
      RTL_USER_PROCESS_PARAMETERS *params;
 +    ACTIVATION_CONTEXT_RUN_LEVEL_INFORMATION runlevel;
      WINE_MODREF *wm;
      NTSTATUS status;
      ANSI_STRING func_name;
-@@ -4324,6 +4351,16 @@ void __wine_process_init(void)
+@@ -4453,6 +4480,16 @@ void __wine_process_init(void)
  
-     virtual_set_large_address_space();
+     unix_funcs->virtual_set_large_address_space();
  
 +    /* elevate process if necessary */
 +    status = RtlQueryInformationActivationContext( 0, NULL, 0, RunlevelInformationInActivationContext,
@@ -71,13 +71,13 @@ index 2f203447e..7c5dd308b 100644
 +    }
 +
      /* the main exe needs to be the first in the load order list */
-     RemoveEntryList( &wm->ldr.InLoadOrderModuleList );
-     InsertHeadList( &peb->LdrData->InLoadOrderModuleList, &wm->ldr.InLoadOrderModuleList );
+     RemoveEntryList( &wm->ldr.InLoadOrderLinks );
+     InsertHeadList( &peb->LdrData->InLoadOrderModuleList, &wm->ldr.InLoadOrderLinks );
 diff --git a/server/process.c b/server/process.c
-index 4c7da9223..d6f71a774 100644
+index ac85cace95d..52604ec4d61 100644
 --- a/server/process.c
 +++ b/server/process.c
-@@ -1107,6 +1107,14 @@ struct process_snapshot *process_snap( int *count )
+@@ -1115,6 +1115,14 @@ struct process_snapshot *process_snap( int *count )
      return snapshot;
  }
  
@@ -93,7 +93,7 @@ index 4c7da9223..d6f71a774 100644
  DECL_HANDLER(new_process)
  {
 diff --git a/server/process.h b/server/process.h
-index 5b83e111a..dfe5c4e52 100644
+index 5b83e111a6f..dfe5c4e52d8 100644
 --- a/server/process.h
 +++ b/server/process.h
 @@ -139,6 +139,7 @@ extern void kill_debugged_processes( struct thread *debugger, int exit_code );
@@ -105,10 +105,10 @@ index 5b83e111a..dfe5c4e52 100644
  /* console functions */
  extern void inherit_console( struct thread *parent_thread, struct process *parent,
 diff --git a/server/protocol.def b/server/protocol.def
-index 6022e1715..45ab670ea 100644
+index 7315f8ac4ea..901c380b721 100644
 --- a/server/protocol.def
 +++ b/server/protocol.def
-@@ -3755,6 +3755,13 @@ struct handle_info
+@@ -3763,6 +3763,13 @@ struct handle_info
  @END
  
  
@@ -123,10 +123,10 @@ index 6022e1715..45ab670ea 100644
  @REQ(create_completion)
      unsigned int access;          /* desired access to a port */
 diff --git a/server/token.c b/server/token.c
-index fcab79955..181219d21 100644
+index 970ed1838da..1c1d49989b3 100644
 --- a/server/token.c
 +++ b/server/token.c
-@@ -1806,3 +1806,17 @@ DECL_HANDLER(create_token)
+@@ -1804,3 +1804,17 @@ DECL_HANDLER(create_token)
          release_object( token );
      }
  }
@@ -145,5 +145,5 @@ index fcab79955..181219d21 100644
 +    }
 +}
 -- 
-2.24.0
+2.26.2
 

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

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

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

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

patches/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
 

patches/d3d11-Deferred_Context/0043-d3d11-tests-Add-a-basic-test-for-drawing-with-deferr.patch

@@ -1,4 +1,4 @@
-From c01cbb5811cb9de58a0c3fa7822382f45900b435 Mon Sep 17 00:00:00 2001
+From 929513c89e71d0675dd2c80a29ddf94f2c331dd8 Mon Sep 17 00:00:00 2001
 From: Paul Gofman <gofmanp@gmail.com>
 Date: Fri, 27 Sep 2019 16:26:04 +0300
 Subject: [PATCH] d3d11/tests: Add a basic test for drawing with deferred
@@ -9,10 +9,10 @@ Subject: [PATCH] d3d11/tests: Add a basic test for drawing with deferred
  1 file changed, 81 insertions(+), 19 deletions(-)
 
 diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c
-index 7f11a59d0cb..c63bae8bbab 100644
+index 214b9b164988..26c9f8555ff6 100644
 --- a/dlls/d3d11/tests/d3d11.c
 +++ b/dlls/d3d11/tests/d3d11.c
-@@ -1692,10 +1692,11 @@ static void release_test_context_(unsigned int line, struct d3d11_test_context *
+@@ -1691,10 +1691,11 @@ static void release_test_context_(unsigned int line, struct d3d11_test_context *
      ok_(__FILE__, line)(!ref, "Device has %u references left.\n", ref);
  }
  
@@ -27,7 +27,7 @@ index 7f11a59d0cb..c63bae8bbab 100644
  {
      static const D3D11_INPUT_ELEMENT_DESC default_layout_desc[] =
      {
-@@ -1764,14 +1765,14 @@ static void draw_quad_vs_(unsigned int line, struct d3d11_test_context *context,
+@@ -1763,14 +1764,14 @@ static void draw_quad_vs_(unsigned int line, struct d3d11_test_context *context,
      if (!context->vb)
          context->vb = create_buffer(device, D3D11_BIND_VERTEX_BUFFER, sizeof(quad), quad);
  
@@ -47,7 +47,7 @@ index 7f11a59d0cb..c63bae8bbab 100644
  }
  
  #define draw_quad_z(context, z) draw_quad_z_(__LINE__, context, z)
-@@ -1807,19 +1808,27 @@ static void draw_quad_z_(unsigned int line, struct d3d11_test_context *context,
+@@ -1806,19 +1807,27 @@ static void draw_quad_z_(unsigned int line, struct d3d11_test_context *context,
              (ID3D11Resource *)context->vs_cb, 0, NULL, &data, 0, 0);
  
      ID3D11DeviceContext_VSSetConstantBuffers(context->immediate_context, 0, 1, &context->vs_cb);
@@ -81,7 +81,7 @@ index 7f11a59d0cb..c63bae8bbab 100644
  {
      static const DWORD ps_color_code[] =
      {
-@@ -1856,12 +1865,12 @@ static void draw_color_quad_(unsigned int line, struct d3d11_test_context *conte
+@@ -1855,12 +1864,12 @@ static void draw_color_quad_(unsigned int line, struct d3d11_test_context *conte
      if (!context->ps_cb)
          context->ps_cb = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, sizeof(*color), NULL);
  
@@ -98,7 +98,7 @@ index 7f11a59d0cb..c63bae8bbab 100644
  }
  
  static void test_create_device(void)
-@@ -2088,6 +2097,59 @@ static void test_create_device(void)
+@@ -2087,6 +2096,59 @@ static void test_create_device(void)
      DestroyWindow(window);
  }
  
@@ -158,19 +158,19 @@ index 7f11a59d0cb..c63bae8bbab 100644
  static void test_device_interfaces(const D3D_FEATURE_LEVEL feature_level)
  {
      struct device_desc device_desc;
-@@ -29639,11 +29701,11 @@ START_TEST(d3d11)
+@@ -30114,11 +30176,11 @@ START_TEST(d3d11)
      }
  
      print_adapter_info();
 -
      queue_test(test_create_device);
      queue_for_each_feature_level(test_device_interfaces);
-     queue_test(test_get_immediate_context);
+     queue_test(test_immediate_context);
      queue_test(test_create_deferred_context);
 +    queue_test(test_draw_deferred_context);
      queue_test(test_create_texture1d);
      queue_test(test_texture1d_interfaces);
      queue_test(test_create_texture2d);
 -- 
-2.17.1
+2.26.2
 

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

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

patches/d3d11-Deferred_Context/definition

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

patches/d3dx9_36-D3DXOptimizeVertices/0001-d3dx9_36-tests-Remove-useless-n-within-some-ok-messa.patch

@@ -1,64 +0,0 @@
-From cdcb9581d105a7964b06ca9c5525e28db25d6206 Mon Sep 17 00:00:00 2001
-From: Christian Costa <titan.costa@gmail.com>
-Date: Sun, 16 Jul 2017 17:39:28 +0200
-Subject: d3dx9_36/tests: Remove useless \n within some ok messages.
-
----
- dlls/d3dx9_36/tests/mesh.c | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c
-index 95dd06e4662..b1ab0aaf594 100644
---- a/dlls/d3dx9_36/tests/mesh.c
-+++ b/dlls/d3dx9_36/tests/mesh.c
-@@ -10195,10 +10195,10 @@ static void test_clone_mesh(void)
- 
-         hr = mesh->lpVtbl->CloneMesh(mesh, tc[i].clone_options, tc[i].new_declaration,
-                                      test_context->device, &mesh_clone);
--        ok(hr == D3D_OK, "CloneMesh test case %d failed. Got %x\n, expected D3D_OK\n", i, hr);
-+        ok(hr == D3D_OK, "CloneMesh test case %d failed. Got %x, expected D3D_OK.\n", i, hr);
- 
-         hr = mesh_clone->lpVtbl->GetDeclaration(mesh_clone, new_declaration);
--        ok(hr == D3D_OK, "GetDeclaration test case %d failed. Got %x\n, expected D3D_OK\n", i, hr);
-+        ok(hr == D3D_OK, "GetDeclaration test case %d failed. Got %x, expected D3D_OK.\n", i, hr);
-         /* Check declaration elements */
-         for (j = 0; tc[i].new_declaration[j].Stream != 0xFF; j++)
-         {
-@@ -10385,7 +10385,7 @@ static void test_valid_mesh(void)
- 
-         hr = D3DXValidMesh(mesh, tc[i].adjacency, &errors_and_warnings);
-         todo_wine ok(hr == tc[i].exp_hr, "D3DXValidMesh test case %d failed. "
--                     "Got %x\n, expected %x\n", i, hr, tc[i].exp_hr);
-+                "Got %x, expected %x.\n", i, hr, tc[i].exp_hr);
- 
-         /* Note errors_and_warnings is deliberately not checked because that
-          * would require copying wast amounts of the text output. */
-@@ -10529,7 +10529,7 @@ static void test_optimize_faces(void)
-                                tc[i].num_vertices, tc[i].indices_are_32bit,
-                                face_remap);
-         ok(hr == D3D_OK, "D3DXOptimizeFaces test case %d failed. "
--           "Got %x\n, expected D3D_OK\n", i, hr);
-+                "Got %x, expected D3D_OK.\n", i, hr);
- 
-         /* Compare face remap with expected face remap */
-         for (j = 0; j < tc[i].num_faces; j++)
-@@ -10547,14 +10547,14 @@ static void test_optimize_faces(void)
-                            tc[0].num_vertices, tc[0].indices_are_32bit,
-                            NULL);
-     ok(hr == D3DERR_INVALIDCALL, "D3DXOptimizeFaces passed NULL face_remap "
--       "pointer. Got %x\n, expected D3DERR_INVALIDCALL\n", hr);
-+            "pointer. Got %x, expected D3DERR_INVALIDCALL.\n", hr);
- 
-     /* Number of faces must be smaller than 2^15 */
-     hr = D3DXOptimizeFaces(tc[0].indices, 2 << 15,
-                            tc[0].num_vertices, FALSE,
-                            &smallest_face_remap);
-     ok(hr == D3DERR_INVALIDCALL, "D3DXOptimizeFaces should not accept 2^15 "
--    "faces when using 16-bit indices. Got %x\n, expected D3DERR_INVALIDCALL\n", hr);
-+            "faces when using 16-bit indices. Got %x, expected D3DERR_INVALIDCALL.\n", hr);
- }
- 
- static HRESULT clear_normals(ID3DXMesh *mesh)
--- 
-2.13.1
-

patches/dbghelp-Debug_Symbols/0001-dbghelp-Always-check-for-debug-symbols-in-BINDIR.patch

@@ -1,4 +1,4 @@
-From b17741a716e2633c02c2237eb424f126860a0c39 Mon Sep 17 00:00:00 2001
+From 30c01cb08a47b706a4ae49ddbd28f39cb065b5c9 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Mon, 6 Oct 2014 05:06:06 +0200
 Subject: [PATCH] dbghelp: Always check for debug symbols in BINDIR.
@@ -9,7 +9,7 @@ Subject: [PATCH] dbghelp: Always check for debug symbols in BINDIR.
  2 files changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/dbghelp/Makefile.in b/dlls/dbghelp/Makefile.in
-index 076c50323dd..ddb69c96dd4 100644
+index 076c50323dda..ddb69c96dd42 100644
 --- a/dlls/dbghelp/Makefile.in
 +++ b/dlls/dbghelp/Makefile.in
 @@ -1,6 +1,6 @@
@@ -21,17 +21,17 @@ index 076c50323dd..ddb69c96dd4 100644
  
  EXTRADLLFLAGS = -mno-cygwin
 diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c
-index ab2a693ecaf..2add1025e39 100644
+index e44629f016e1..923608f35e31 100644
 --- a/dlls/dbghelp/elf_module.c
 +++ b/dlls/dbghelp/elf_module.c
 @@ -1436,6 +1436,7 @@ static BOOL elf_search_and_load_file(struct process* pcs, const WCHAR* filename,
          load_elf.elf_info    = elf_info;
  
-         ret = search_unix_path(filename, getenv("LD_LIBRARY_PATH"), elf_load_file_cb, &load_elf)
+         ret = search_unix_path(filename, process_getenv(pcs, L"LD_LIBRARY_PATH"), elf_load_file_cb, &load_elf)
 +            || search_unix_path(filename, BINDIR, elf_load_file_cb, &load_elf)
              || search_dll_path(pcs, filename, elf_load_file_cb, &load_elf);
      }
  
 -- 
-2.26.0
+2.26.2
 

patches/ddraw-EnumSurfaces/0001-ddraw-tests-Add-more-tests-for-IDirectDraw7-EnumSurf.patch

@@ -1,235 +0,0 @@
-From 4c6b3da41feef98226bbfe14c2b0e88acf39807e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Tue, 25 Aug 2015 11:15:59 +0200
-Subject: ddraw/tests: Add more tests for IDirectDraw7::EnumSurfaces.
-
----
- dlls/ddraw/ddraw.c     |   3 +
- dlls/ddraw/tests/d3d.c | 177 ++++++++++++++++++++++++++++++++++++++++++++++---
- 2 files changed, 172 insertions(+), 8 deletions(-)
-
-diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
-index b3caba2..4b7a207 100644
---- a/dlls/ddraw/ddraw.c
-+++ b/dlls/ddraw/ddraw.c
-@@ -3135,6 +3135,9 @@ static HRESULT WINAPI ddraw7_EnumSurfaces(IDirectDraw7 *iface, DWORD Flags,
-     if (!Callback)
-         return DDERR_INVALIDPARAMS;
- 
-+    if (!all && !DDSD)
-+        return DDERR_INVALIDPARAMS;
-+
-     wined3d_mutex_lock();
- 
-     /* Use the _SAFE enumeration, the app may destroy enumerated surfaces */
-diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c
-index ec4197a..e9c616e 100644
---- a/dlls/ddraw/tests/d3d.c
-+++ b/dlls/ddraw/tests/d3d.c
-@@ -57,6 +57,12 @@ typedef struct {
-     int total;
- } D3D7ECancelTest;
- 
-+typedef struct
-+{
-+    int found;
-+    int surfaces;
-+} EnumSurfaceTest;
-+
- #define MAX_ENUMERATION_COUNT 10
- typedef struct
- {
-@@ -85,17 +91,21 @@ static ULONG getRefcount(IUnknown *iface)
- 
- static HRESULT WINAPI SurfaceCounter(IDirectDrawSurface7 *surface, DDSURFACEDESC2 *desc, void *context)
- {
--    UINT *num = context;
--    (*num)++;
--    IDirectDrawSurface_Release(surface);
-+    EnumSurfaceTest *count = context;
-+    count->found++;
-+    if (surface)
-+    {
-+        count->surfaces++;
-+        IDirectDrawSurface_Release(surface);
-+    }
-     return DDENUMRET_OK;
- }
- 
- static BOOL CreateDirect3D(void)
- {
-     HRESULT rc;
--    DDSURFACEDESC2 ddsd;
--    UINT num;
-+    DDSURFACEDESC2 ddsd, ddsd2;
-+    EnumSurfaceTest count;
- 
-     rc = pDirectDrawCreateEx(NULL, (void**)&lpDD,
-         &IID_IDirectDraw7, NULL);
-@@ -122,9 +132,160 @@ static BOOL CreateDirect3D(void)
-     if (FAILED(rc))
-         return FALSE;
- 
--    num = 0;
--    IDirectDraw7_EnumSurfaces(lpDD, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST, NULL, &num, SurfaceCounter);
--    ok(num == 1, "Has %d surfaces, expected 1\n", num);
-+    memset(&ddsd2, 0, sizeof(ddsd2));
-+    ddsd2.dwSize = sizeof(ddsd2);
-+    ddsd2.dwFlags = DDSD_WIDTH | DDSD_HEIGHT;
-+    ddsd2.dwWidth = 256;
-+    ddsd2.dwHeight = 256;
-+
-+    /* without search type flags */
-+    count.found = count.surfaces = 0;
-+    rc = IDirectDraw7_EnumSurfaces(lpDD, 0, NULL, &count, SurfaceCounter);
-+    ok(rc == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %x\n", rc);
-+    ok(count.found == 0, "Has %d surface descriptions, expected 0\n", count.found);
-+    ok(count.surfaces == 0, "Has %d surfaces, expected 0\n", count.surfaces);
-+
-+    count.found = count.surfaces = 0;
-+    rc = IDirectDraw7_EnumSurfaces(lpDD, 0, &ddsd, &count, SurfaceCounter);
-+    todo_wine ok(rc == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %x\n", rc);
-+    ok(count.found == 0, "Has %d surface descriptions, expected 0\n", count.found);
-+    ok(count.surfaces == 0, "Has %d surfaces, expected 0\n", count.surfaces);
-+
-+    count.found = count.surfaces = 0;
-+    rc = IDirectDraw7_EnumSurfaces(lpDD, DDENUMSURFACES_ALL, NULL, &count, SurfaceCounter);
-+    todo_wine ok(rc == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %x\n", rc);
-+    todo_wine ok(count.found == 0, "Has %d surface descriptions, expected 0\n", count.found);
-+    todo_wine ok(count.surfaces == 0, "Has %d surfaces, expected 0\n", count.surfaces);
-+
-+    count.found = count.surfaces = 0;
-+    rc = IDirectDraw7_EnumSurfaces(lpDD, DDENUMSURFACES_MATCH, NULL, &count, SurfaceCounter);
-+    ok(rc == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %x\n", rc);
-+    ok(count.found == 0, "Has %d surface descriptions, expected 0\n", count.found);
-+    ok(count.surfaces == 0, "Has %d surfaces, expected 0\n", count.surfaces);
-+
-+    count.found = count.surfaces = 0;
-+    rc = IDirectDraw7_EnumSurfaces(lpDD, DDENUMSURFACES_NOMATCH, NULL, &count, SurfaceCounter);
-+    ok(rc == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %x\n", rc);
-+    ok(count.found == 0, "Has %d surface descriptions, expected 0\n", count.found);
-+    ok(count.surfaces == 0, "Has %d surfaces, expected 0\n", count.surfaces);
-+
-+    /* search type DDENUMSURFACES_DOESEXIST */
-+    count.found = count.surfaces = 0;
-+    rc = IDirectDraw7_EnumSurfaces(lpDD, DDENUMSURFACES_DOESEXIST, NULL, &count, SurfaceCounter);
-+    ok(rc == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %x\n", rc);
-+    ok(count.found == 0, "Has %d surface descriptions, expected 0\n", count.found);
-+    ok(count.surfaces == 0, "Has %d surfaces, expected 0\n", count.surfaces);
-+
-+    count.found = count.surfaces = 0;
-+    rc = IDirectDraw7_EnumSurfaces(lpDD, DDENUMSURFACES_DOESEXIST, &ddsd, &count, SurfaceCounter);
-+    ok(rc == DD_OK, "Expected DD_OK, got %x\n", rc);
-+    ok(count.found == 0, "Has %d surface descriptions, expected 0\n", count.found);
-+    ok(count.surfaces == 0, "Has %d surfaces, expected 0\n", count.surfaces);
-+
-+    count.found = count.surfaces = 0;
-+    rc = IDirectDraw7_EnumSurfaces(lpDD, DDENUMSURFACES_DOESEXIST, &ddsd2, &count, SurfaceCounter);
-+    ok(rc == DD_OK, "Expected DD_OK, got %x\n", rc);
-+    ok(count.found == 1, "Has %d surface descriptions, expected 1\n", count.found);
-+    ok(count.surfaces == 1, "Has %d surfaces, expected 1\n", count.surfaces);
-+
-+    count.found = count.surfaces = 0;
-+    rc = IDirectDraw7_EnumSurfaces(lpDD, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL,
-+            NULL, &count, SurfaceCounter);
-+    ok(rc == DD_OK, "Expected DD_OK, got %x\n", rc);
-+    ok(count.found == 1, "Has %d surface descriptions, expected 1\n", count.found);
-+    ok(count.surfaces == 1, "Has %d surfaces, expected 1\n", count.surfaces);
-+
-+    count.found = count.surfaces = 0;
-+    rc = IDirectDraw7_EnumSurfaces(lpDD, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_MATCH,
-+            &ddsd, &count, SurfaceCounter);
-+    ok(rc == DD_OK, "Expected DD_OK, got %x\n", rc);
-+    ok(count.found == 0, "Has %d surface descriptions, expected 0\n", count.found);
-+    ok(count.surfaces == 0, "Has %d surfaces, expected 0\n", count.surfaces);
-+
-+    count.found = count.surfaces = 0;
-+    rc = IDirectDraw7_EnumSurfaces(lpDD, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_NOMATCH,
-+            &ddsd, &count, SurfaceCounter);
-+    ok(rc == DD_OK, "Expected DD_OK, got %x\n", rc);
-+    ok(count.found == 1, "Has %d surface descriptions, expected 1\n", count.found);
-+    ok(count.surfaces == 1, "Has %d surfaces, expected 1\n", count.surfaces);
-+
-+    count.found = count.surfaces = 0;
-+    rc = IDirectDraw7_EnumSurfaces(lpDD, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_MATCH,
-+            &ddsd2, &count, SurfaceCounter);
-+    ok(rc == DD_OK, "Expected DD_OK, got %x\n", rc);
-+    ok(count.found == 1, "Has %d surface descriptions, expected 1\n", count.found);
-+    ok(count.surfaces == 1, "Has %d surfaces, expected 1\n", count.surfaces);
-+
-+    count.found = count.surfaces = 0;
-+    rc = IDirectDraw7_EnumSurfaces(lpDD, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_NOMATCH,
-+            &ddsd2, &count, SurfaceCounter);
-+    ok(rc == DD_OK, "Expected DD_OK, got %x\n", rc);
-+    todo_wine ok(count.found == 0, "Has %d surface descriptions, expected 0\n", count.found);
-+    todo_wine ok(count.surfaces == 0, "Has %d surfaces, expected 0\n", count.surfaces);
-+
-+    count.found = count.surfaces = 0;
-+    rc = IDirectDraw7_EnumSurfaces(lpDD, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL |
-+            DDENUMSURFACES_MATCH, NULL, &count, SurfaceCounter);
-+    todo_wine ok(rc == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %x\n", rc);
-+    todo_wine ok(count.found == 0, "Has %d surface descriptions, expected 0\n", count.found);
-+    todo_wine ok(count.surfaces == 0, "Has %d surfaces, expected 0\n", count.surfaces);
-+
-+    count.found = count.surfaces = 0;
-+    rc = IDirectDraw7_EnumSurfaces(lpDD, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL |
-+            DDENUMSURFACES_NOMATCH, NULL, &count, SurfaceCounter);
-+    todo_wine ok(rc == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %x\n", rc);
-+    todo_wine ok(count.found == 0, "Has %d surface descriptions, expected 0\n", count.found);
-+    todo_wine ok(count.surfaces == 0, "Has %d surfaces, expected 0\n", count.surfaces);
-+
-+    count.found = count.surfaces = 0;
-+    rc = IDirectDraw7_EnumSurfaces(lpDD, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_MATCH |
-+            DDENUMSURFACES_NOMATCH, NULL, &count, SurfaceCounter);
-+    ok(rc == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %x\n", rc);
-+    ok(count.found == 0, "Has %d surface descriptions, expected 0\n", count.found);
-+    ok(count.surfaces == 0, "Has %d surfaces, expected 0\n", count.surfaces);
-+
-+    /* search type DDENUMSURFACES_CANBECREATED */
-+    count.found = count.surfaces = 0;
-+    rc = IDirectDraw7_EnumSurfaces(lpDD, DDENUMSURFACES_CANBECREATED, &ddsd, &count, SurfaceCounter);
-+    todo_wine ok(rc == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %x\n", rc);
-+    ok(count.found == 0, "Has %d surface descriptions, expected 0\n", count.found);
-+    ok(count.surfaces == 0, "Has %d surfaces, expected 0\n", count.surfaces);
-+
-+    count.found = count.surfaces = 0;
-+    rc = IDirectDraw7_EnumSurfaces(lpDD, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_ALL,
-+            &ddsd, &count, SurfaceCounter);
-+    todo_wine ok(rc == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %x\n", rc);
-+    todo_wine ok(count.found == 0, "Has %d surface descriptions, expected 0\n", count.found);
-+    todo_wine ok(count.surfaces == 0, "Has %d surfaces, expected 0\n", count.surfaces);
-+
-+    count.found = count.surfaces = 0;
-+    rc = IDirectDraw7_EnumSurfaces(lpDD, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_NOMATCH,
-+            &ddsd, &count, SurfaceCounter);
-+    todo_wine ok(rc == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %x\n", rc);
-+    todo_wine ok(count.found == 0, "Has %d surface descriptions, expected 0\n", count.found);
-+    todo_wine ok(count.surfaces == 0, "Has %d surfaces, expected 0\n", count.surfaces);
-+
-+    count.found = count.surfaces = 0;
-+    rc = IDirectDraw7_EnumSurfaces(lpDD, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_MATCH,
-+            NULL, &count, SurfaceCounter);
-+    ok(rc == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %x\n", rc);
-+    ok(count.found == 0, "Has %d surface descriptions, expected 0\n", count.found);
-+    ok(count.surfaces == 0, "Has %d surfaces, expected 0\n", count.surfaces);
-+
-+    count.found = count.surfaces = 0;
-+    rc = IDirectDraw7_EnumSurfaces(lpDD, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_MATCH,
-+            &ddsd, &count, SurfaceCounter);
-+    ok(rc == DD_OK, "Expected DD_OK, got %x\n", rc);
-+    todo_wine ok(count.found == 1, "Has %d surface descriptions, expected 1\n", count.found);
-+    ok(count.surfaces == 0, "Has %d surfaces, expected 0\n", count.surfaces);
-+
-+    /* combination of DDENUMSURFACES_DOESEXIST and DDENUMSURFACES_CANBECREATED */
-+    count.found = count.surfaces = 0;
-+    rc = IDirectDraw7_EnumSurfaces(lpDD, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_CANBECREATED |
-+            DDENUMSURFACES_MATCH, &ddsd, &count, SurfaceCounter);
-+    ok(rc == DD_OK, "Expected DD_OK, got %x\n", rc);
-+    todo_wine ok(count.found == 1, "Has %d surface descriptions, expected 1\n", count.found);
-+    ok(count.surfaces == 0, "Has %d surfaces, expected 0\n", count.surfaces);
- 
-     memset(&ddsd, 0, sizeof(ddsd));
-     ddsd.dwSize = sizeof(ddsd);
--- 
-2.5.0
-

patches/ddraw-EnumSurfaces/0003-ddraw-Implement-DDENUMSURFACES_CANBECREATED-flag-in-.patch

@@ -1,248 +0,0 @@
-From 5dcbd836e663da908a9a39b5791da65d64a00eb8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Tue, 25 Aug 2015 11:17:07 +0200
-Subject: ddraw: Implement DDENUMSURFACES_CANBECREATED flag in
- ddraw7_EnumSurfaces.
-
-Also fixes various test failures related to DDENUMSURFACES_DOESEXIST.
-
-The "Unexpected destination texture level pixels" testfailure on the w8 VM is not related to this patch.
----
- dlls/ddraw/ddraw.c     | 98 +++++++++++++++++++++++++++++++++++++-------------
- dlls/ddraw/tests/d3d.c | 42 +++++++++++-----------
- 2 files changed, 94 insertions(+), 46 deletions(-)
-
-diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
-index 4b7a207..19ed213 100644
---- a/dlls/ddraw/ddraw.c
-+++ b/dlls/ddraw/ddraw.c
-@@ -3122,49 +3122,97 @@ static HRESULT WINAPI ddraw7_EnumSurfaces(IDirectDraw7 *iface, DWORD Flags,
- {
-     struct ddraw *ddraw = impl_from_IDirectDraw7(iface);
-     struct ddraw_surface *surf;
--    BOOL all, nomatch;
--    DDSURFACEDESC2 desc;
--    struct list *entry, *entry2;
-+    DWORD match_flags = Flags & (DDENUMSURFACES_ALL | DDENUMSURFACES_NOMATCH | DDENUMSURFACES_MATCH);
- 
-     TRACE("iface %p, flags %#x, surface_desc %p, context %p, callback %p.\n",
-             iface, Flags, DDSD, Context, Callback);
- 
--    all = Flags & DDENUMSURFACES_ALL;
--    nomatch = Flags & DDENUMSURFACES_NOMATCH;
--
-     if (!Callback)
-         return DDERR_INVALIDPARAMS;
- 
--    if (!all && !DDSD)
--        return DDERR_INVALIDPARAMS;
-+    if (Flags & DDENUMSURFACES_CANBECREATED)
-+    {
-+         IDirectDrawSurface7 *surface;
-+         DDSURFACEDESC2 testdesc;
-+         HRESULT hr;
- 
--    wined3d_mutex_lock();
-+        if (match_flags != DDENUMSURFACES_MATCH)
-+            return DDERR_INVALIDPARAMS;
- 
--    /* Use the _SAFE enumeration, the app may destroy enumerated surfaces */
--    LIST_FOR_EACH_SAFE(entry, entry2, &ddraw->surface_list)
--    {
--        surf = LIST_ENTRY(entry, struct ddraw_surface, surface_list_entry);
-+        if (!DDSD)
-+            return DDERR_INVALIDPARAMS;
-+
-+        memcpy(&testdesc, DDSD, sizeof(testdesc));
-+        if (!(testdesc.dwFlags & DDSD_WIDTH))
-+        {
-+            testdesc.dwFlags |= DDSD_WIDTH;
-+            testdesc.dwWidth = 512;
-+        }
-+        if (!(testdesc.dwFlags & DDSD_HEIGHT))
-+        {
-+            testdesc.dwFlags |= DDSD_HEIGHT;
-+            testdesc.dwHeight = 512;
-+        }
- 
--        if (!surf->iface_count)
-+        hr = IDirectDraw7_CreateSurface(iface, &testdesc, &surface, NULL);
-+        if (SUCCEEDED(hr))
-         {
--            WARN("Not enumerating surface %p because it doesn't have any references.\n", surf);
--            continue;
-+            surf = unsafe_impl_from_IDirectDrawSurface7(surface);
-+            Callback(NULL, &surf->surface_desc, Context);
-+            IDirectDrawSurface7_Release(surface);
-         }
-+        else
-+            ERR("Failed to create surface, hr %#x.\n", hr);
-+    }
-+    else if (Flags & DDENUMSURFACES_DOESEXIST)
-+    {
-+        BOOL all, nomatch;
-+        DDSURFACEDESC2 desc;
-+        struct list *entry, *entry2;
-+
-+        /* a combination of match flags is not allowed */
-+        if (match_flags != 0 &&
-+                match_flags != DDENUMSURFACES_ALL &&
-+                match_flags != DDENUMSURFACES_MATCH &&
-+                match_flags != DDENUMSURFACES_NOMATCH)
-+            return DDERR_INVALIDPARAMS;
-+
-+        all = (Flags & DDENUMSURFACES_ALL) != 0;
-+        nomatch = (Flags & DDENUMSURFACES_NOMATCH) != 0;
-+
-+        if (!all && !DDSD)
-+            return DDERR_INVALIDPARAMS;
- 
--        if (all || (nomatch != ddraw_match_surface_desc(DDSD, &surf->surface_desc)))
-+        wined3d_mutex_lock();
-+
-+        /* Use the _SAFE enumeration, the app may destroy enumerated surfaces */
-+        LIST_FOR_EACH_SAFE(entry, entry2, &ddraw->surface_list)
-         {
--            TRACE("Enumerating surface %p.\n", surf);
--            desc = surf->surface_desc;
--            IDirectDrawSurface7_AddRef(&surf->IDirectDrawSurface7_iface);
--            if (Callback(&surf->IDirectDrawSurface7_iface, &desc, Context) != DDENUMRET_OK)
-+            surf = LIST_ENTRY(entry, struct ddraw_surface, surface_list_entry);
-+
-+            if (!surf->iface_count)
-             {
--                wined3d_mutex_unlock();
--                return DD_OK;
-+                WARN("Not enumerating surface %p because it doesn't have any references.\n", surf);
-+                continue;
-+            }
-+
-+            if (all || (nomatch != ddraw_match_surface_desc(DDSD, &surf->surface_desc)))
-+            {
-+                TRACE("Enumerating surface %p.\n", surf);
-+                desc = surf->surface_desc;
-+                IDirectDrawSurface7_AddRef(&surf->IDirectDrawSurface7_iface);
-+                if (Callback(&surf->IDirectDrawSurface7_iface, &desc, Context) != DDENUMRET_OK)
-+                {
-+                    wined3d_mutex_unlock();
-+                    return DD_OK;
-+                }
-             }
-         }
--    }
- 
--    wined3d_mutex_unlock();
-+        wined3d_mutex_unlock();
-+    }
-+    else
-+        return DDERR_INVALIDPARAMS;
- 
-     return DD_OK;
- }
-diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c
-index e9c616e..930460f 100644
---- a/dlls/ddraw/tests/d3d.c
-+++ b/dlls/ddraw/tests/d3d.c
-@@ -147,15 +147,15 @@ static BOOL CreateDirect3D(void)
- 
-     count.found = count.surfaces = 0;
-     rc = IDirectDraw7_EnumSurfaces(lpDD, 0, &ddsd, &count, SurfaceCounter);
--    todo_wine ok(rc == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %x\n", rc);
-+    ok(rc == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %x\n", rc);
-     ok(count.found == 0, "Has %d surface descriptions, expected 0\n", count.found);
-     ok(count.surfaces == 0, "Has %d surfaces, expected 0\n", count.surfaces);
- 
-     count.found = count.surfaces = 0;
-     rc = IDirectDraw7_EnumSurfaces(lpDD, DDENUMSURFACES_ALL, NULL, &count, SurfaceCounter);
--    todo_wine ok(rc == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %x\n", rc);
--    todo_wine ok(count.found == 0, "Has %d surface descriptions, expected 0\n", count.found);
--    todo_wine ok(count.surfaces == 0, "Has %d surfaces, expected 0\n", count.surfaces);
-+    ok(rc == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %x\n", rc);
-+    ok(count.found == 0, "Has %d surface descriptions, expected 0\n", count.found);
-+    ok(count.surfaces == 0, "Has %d surfaces, expected 0\n", count.surfaces);
- 
-     count.found = count.surfaces = 0;
-     rc = IDirectDraw7_EnumSurfaces(lpDD, DDENUMSURFACES_MATCH, NULL, &count, SurfaceCounter);
-@@ -220,22 +220,22 @@ static BOOL CreateDirect3D(void)
-     rc = IDirectDraw7_EnumSurfaces(lpDD, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_NOMATCH,
-             &ddsd2, &count, SurfaceCounter);
-     ok(rc == DD_OK, "Expected DD_OK, got %x\n", rc);
--    todo_wine ok(count.found == 0, "Has %d surface descriptions, expected 0\n", count.found);
--    todo_wine ok(count.surfaces == 0, "Has %d surfaces, expected 0\n", count.surfaces);
-+    ok(count.found == 0, "Has %d surface descriptions, expected 0\n", count.found);
-+    ok(count.surfaces == 0, "Has %d surfaces, expected 0\n", count.surfaces);
- 
-     count.found = count.surfaces = 0;
-     rc = IDirectDraw7_EnumSurfaces(lpDD, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL |
-             DDENUMSURFACES_MATCH, NULL, &count, SurfaceCounter);
--    todo_wine ok(rc == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %x\n", rc);
--    todo_wine ok(count.found == 0, "Has %d surface descriptions, expected 0\n", count.found);
--    todo_wine ok(count.surfaces == 0, "Has %d surfaces, expected 0\n", count.surfaces);
-+    ok(rc == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %x\n", rc);
-+    ok(count.found == 0, "Has %d surface descriptions, expected 0\n", count.found);
-+    ok(count.surfaces == 0, "Has %d surfaces, expected 0\n", count.surfaces);
- 
-     count.found = count.surfaces = 0;
-     rc = IDirectDraw7_EnumSurfaces(lpDD, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL |
-             DDENUMSURFACES_NOMATCH, NULL, &count, SurfaceCounter);
--    todo_wine ok(rc == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %x\n", rc);
--    todo_wine ok(count.found == 0, "Has %d surface descriptions, expected 0\n", count.found);
--    todo_wine ok(count.surfaces == 0, "Has %d surfaces, expected 0\n", count.surfaces);
-+    ok(rc == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %x\n", rc);
-+    ok(count.found == 0, "Has %d surface descriptions, expected 0\n", count.found);
-+    ok(count.surfaces == 0, "Has %d surfaces, expected 0\n", count.surfaces);
- 
-     count.found = count.surfaces = 0;
-     rc = IDirectDraw7_EnumSurfaces(lpDD, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_MATCH |
-@@ -247,23 +247,23 @@ static BOOL CreateDirect3D(void)
-     /* search type DDENUMSURFACES_CANBECREATED */
-     count.found = count.surfaces = 0;
-     rc = IDirectDraw7_EnumSurfaces(lpDD, DDENUMSURFACES_CANBECREATED, &ddsd, &count, SurfaceCounter);
--    todo_wine ok(rc == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %x\n", rc);
-+    ok(rc == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %x\n", rc);
-     ok(count.found == 0, "Has %d surface descriptions, expected 0\n", count.found);
-     ok(count.surfaces == 0, "Has %d surfaces, expected 0\n", count.surfaces);
- 
-     count.found = count.surfaces = 0;
-     rc = IDirectDraw7_EnumSurfaces(lpDD, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_ALL,
-             &ddsd, &count, SurfaceCounter);
--    todo_wine ok(rc == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %x\n", rc);
--    todo_wine ok(count.found == 0, "Has %d surface descriptions, expected 0\n", count.found);
--    todo_wine ok(count.surfaces == 0, "Has %d surfaces, expected 0\n", count.surfaces);
-+    ok(rc == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %x\n", rc);
-+    ok(count.found == 0, "Has %d surface descriptions, expected 0\n", count.found);
-+    ok(count.surfaces == 0, "Has %d surfaces, expected 0\n", count.surfaces);
- 
-     count.found = count.surfaces = 0;
-     rc = IDirectDraw7_EnumSurfaces(lpDD, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_NOMATCH,
-             &ddsd, &count, SurfaceCounter);
--    todo_wine ok(rc == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %x\n", rc);
--    todo_wine ok(count.found == 0, "Has %d surface descriptions, expected 0\n", count.found);
--    todo_wine ok(count.surfaces == 0, "Has %d surfaces, expected 0\n", count.surfaces);
-+    ok(rc == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %x\n", rc);
-+    ok(count.found == 0, "Has %d surface descriptions, expected 0\n", count.found);
-+    ok(count.surfaces == 0, "Has %d surfaces, expected 0\n", count.surfaces);
- 
-     count.found = count.surfaces = 0;
-     rc = IDirectDraw7_EnumSurfaces(lpDD, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_MATCH,
-@@ -276,7 +276,7 @@ static BOOL CreateDirect3D(void)
-     rc = IDirectDraw7_EnumSurfaces(lpDD, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_MATCH,
-             &ddsd, &count, SurfaceCounter);
-     ok(rc == DD_OK, "Expected DD_OK, got %x\n", rc);
--    todo_wine ok(count.found == 1, "Has %d surface descriptions, expected 1\n", count.found);
-+    ok(count.found == 1, "Has %d surface descriptions, expected 1\n", count.found);
-     ok(count.surfaces == 0, "Has %d surfaces, expected 0\n", count.surfaces);
- 
-     /* combination of DDENUMSURFACES_DOESEXIST and DDENUMSURFACES_CANBECREATED */
-@@ -284,7 +284,7 @@ static BOOL CreateDirect3D(void)
-     rc = IDirectDraw7_EnumSurfaces(lpDD, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_CANBECREATED |
-             DDENUMSURFACES_MATCH, &ddsd, &count, SurfaceCounter);
-     ok(rc == DD_OK, "Expected DD_OK, got %x\n", rc);
--    todo_wine ok(count.found == 1, "Has %d surface descriptions, expected 1\n", count.found);
-+    ok(count.found == 1, "Has %d surface descriptions, expected 1\n", count.found);
-     ok(count.surfaces == 0, "Has %d surfaces, expected 0\n", count.surfaces);
- 
-     memset(&ddsd, 0, sizeof(ddsd));
--- 
-2.5.0
-

patches/ddraw-EnumSurfaces/definition

@@ -1 +0,0 @@
-Fixes: [17233] Implement DDENUMSURFACES_CANBECREATED in IDirectDraw7::EnumSurfaces

patches/ddraw-Texture_Wrong_Caps/0001-ddraw-Allow-setting-texture-without-DDSCAPS_TEXTURE-.patch

@@ -1,4 +1,4 @@
-From a6f14f05fefc9510f673b47092cbc62a2366ccf9 Mon Sep 17 00:00:00 2001
+From 17363db79c4a12613236ef88386b2294920cc9bc Mon Sep 17 00:00:00 2001
 From: Paul Gofman <gofmanp@gmail.com>
 Date: Thu, 4 Apr 2019 02:25:00 +0300
 Subject: [PATCH] ddraw: Allow setting texture without DDSCAPS_TEXTURE for
@@ -11,10 +11,10 @@ Signed-off-by: Paul Gofman <gofmanp@gmail.com>
  2 files changed, 141 insertions(+), 7 deletions(-)
 
 diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c
-index 11e60f80c..324475303 100644
+index 5bd5b2c70911..010fed303969 100644
 --- a/dlls/ddraw/device.c
 +++ b/dlls/ddraw/device.c
-@@ -4798,7 +4798,8 @@ static HRESULT d3d_device7_SetTexture(IDirect3DDevice7 *iface,
+@@ -4776,7 +4776,8 @@ static HRESULT d3d_device7_SetTexture(IDirect3DDevice7 *iface,
      struct ddraw_surface *surf = unsafe_impl_from_IDirectDrawSurface7(texture);
      struct wined3d_texture *wined3d_texture = NULL;
  
@@ -24,7 +24,7 @@ index 11e60f80c..324475303 100644
  
      if (surf && (surf->surface_desc.ddsCaps.dwCaps & DDSCAPS_TEXTURE))
          wined3d_texture = surf->wined3d_texture;
-@@ -4834,19 +4835,30 @@ static HRESULT WINAPI d3d_device3_SetTexture(IDirect3DDevice3 *iface,
+@@ -4812,19 +4813,30 @@ static HRESULT WINAPI d3d_device3_SetTexture(IDirect3DDevice3 *iface,
  {
      struct d3d_device *device = impl_from_IDirect3DDevice3(iface);
      struct ddraw_surface *tex = unsafe_impl_from_IDirect3DTexture2(texture);
@@ -59,10 +59,10 @@ index 11e60f80c..324475303 100644
  
  static const struct tss_lookup
 diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
-index e1d5bac18..e18f3c638 100644
+index 5dc2b4e7e527..d0a1f59c0a59 100644
 --- a/dlls/ddraw/tests/ddraw4.c
 +++ b/dlls/ddraw/tests/ddraw4.c
-@@ -330,7 +330,7 @@ static IDirectDraw4 *create_ddraw(void)
+@@ -359,7 +359,7 @@ static IDirectDraw4 *create_ddraw(void)
      return ddraw4;
  }
  
@@ -71,7 +71,7 @@ index e1d5bac18..e18f3c638 100644
  {
      IDirectDrawSurface4 *surface, *ds;
      IDirect3DDevice3 *device = NULL;
-@@ -350,6 +350,8 @@ static IDirect3DDevice3 *create_device(HWND window, DWORD coop_level)
+@@ -379,6 +379,8 @@ static IDirect3DDevice3 *create_device(HWND window, DWORD coop_level)
      surface_desc.dwSize = sizeof(surface_desc);
      surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT;
      surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE;
@@ -80,7 +80,7 @@ index e1d5bac18..e18f3c638 100644
      surface_desc.dwWidth = 640;
      surface_desc.dwHeight = 480;
  
-@@ -378,7 +380,8 @@ static IDirect3DDevice3 *create_device(HWND window, DWORD coop_level)
+@@ -407,7 +409,8 @@ static IDirect3DDevice3 *create_device(HWND window, DWORD coop_level)
      }
  
      memset(&z_fmt, 0, sizeof(z_fmt));
@@ -90,7 +90,7 @@ index e1d5bac18..e18f3c638 100644
      if (FAILED(hr) || !z_fmt.dwSize)
      {
          IDirect3D3_Release(d3d3);
-@@ -390,6 +393,8 @@ static IDirect3DDevice3 *create_device(HWND window, DWORD coop_level)
+@@ -419,6 +422,8 @@ static IDirect3DDevice3 *create_device(HWND window, DWORD coop_level)
      surface_desc.dwSize = sizeof(surface_desc);
      surface_desc.dwFlags = DDSD_CAPS | DDSD_PIXELFORMAT | DDSD_WIDTH | DDSD_HEIGHT;
      surface_desc.ddsCaps.dwCaps = DDSCAPS_ZBUFFER;
@@ -99,7 +99,7 @@ index e1d5bac18..e18f3c638 100644
      U4(surface_desc).ddpfPixelFormat = z_fmt;
      surface_desc.dwWidth = 640;
      surface_desc.dwHeight = 480;
-@@ -412,7 +417,8 @@ static IDirect3DDevice3 *create_device(HWND window, DWORD coop_level)
+@@ -441,7 +446,8 @@ static IDirect3DDevice3 *create_device(HWND window, DWORD coop_level)
          return NULL;
      }
  
@@ -109,7 +109,7 @@ index e1d5bac18..e18f3c638 100644
      IDirect3D3_Release(d3d3);
      IDirectDrawSurface4_Release(surface);
      if (FAILED(hr))
-@@ -421,6 +427,11 @@ static IDirect3DDevice3 *create_device(HWND window, DWORD coop_level)
+@@ -450,6 +456,11 @@ static IDirect3DDevice3 *create_device(HWND window, DWORD coop_level)
      return device;
  }
  
@@ -121,8 +121,8 @@ index e1d5bac18..e18f3c638 100644
  static IDirect3DViewport3 *create_viewport(IDirect3DDevice3 *device, UINT x, UINT y, UINT w, UINT h)
  {
      IDirect3DViewport3 *viewport;
-@@ -16980,6 +16991,116 @@ static void test_surface_format_conversion_alpha(void)
-     DestroyWindow(window);
+@@ -17530,6 +17541,116 @@ static void test_get_display_mode(void)
+     EnumDisplayMonitors(NULL, NULL, test_get_display_mode_cb, 0);
  }
  
 +static void test_texture_wrong_caps_(BOOL software)
@@ -238,7 +238,7 @@ index e1d5bac18..e18f3c638 100644
  START_TEST(ddraw4)
  {
      DDDEVICEIDENTIFIER identifier;
-@@ -17112,6 +17233,7 @@ START_TEST(ddraw4)
+@@ -17662,6 +17783,7 @@ START_TEST(ddraw4)
      test_gdi_surface();
      test_alphatest();
      test_clipper_refcount();
@@ -247,5 +247,5 @@ index e1d5bac18..e18f3c638 100644
      test_d32_support();
      test_surface_format_conversion_alpha();
 -- 
-2.25.1
+2.26.2
 

patches/ddraw-Write_Vtable/0001-ddraw-Remove-const-from-ddraw1_vtbl-and-ddraw_surfac.patch

@@ -1,45 +0,0 @@
-From 9ac9e58e5c76a02e3746c4e4bd16b43766b35066 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Fri, 2 Oct 2015 17:29:43 +0200
-Subject: ddraw: Remove const from ddraw1_vtbl and ddraw_surface1_vtbl.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Bad Mojo Redux tries to hook ddraw1 and expects both interfaces to be writable.
-
-Signed-off-by: Michael Müller <michael@fds-team.de>
----
- dlls/ddraw/ddraw.c   | 2 +-
- dlls/ddraw/surface.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
-index c94bfee..bcb1608 100644
---- a/dlls/ddraw/ddraw.c
-+++ b/dlls/ddraw/ddraw.c
-@@ -4494,7 +4494,7 @@ static const struct IDirectDraw2Vtbl ddraw2_vtbl =
-     ddraw2_GetAvailableVidMem,
- };
- 
--static const struct IDirectDrawVtbl ddraw1_vtbl =
-+static struct IDirectDrawVtbl ddraw1_vtbl =
- {
-     /* IUnknown */
-     ddraw1_QueryInterface,
-diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
-index 6b6ddb9..71bcba4 100644
---- a/dlls/ddraw/surface.c
-+++ b/dlls/ddraw/surface.c
-@@ -5421,7 +5421,7 @@ static const struct IDirectDrawSurface2Vtbl ddraw_surface2_vtbl =
-     ddraw_surface2_PageUnlock,
- };
- 
--static const struct IDirectDrawSurfaceVtbl ddraw_surface1_vtbl =
-+static struct IDirectDrawSurfaceVtbl ddraw_surface1_vtbl =
- {
-     /* IUnknown */
-     ddraw_surface1_QueryInterface,
--- 
-2.5.1
-