Release v4.3

This reverts commit 06ad40cfd0.

It come to out attention that FreeRDP may not be a clean source
for this patch.

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

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

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

@@ -1,4 +1,4 @@
-From d67d7293a17592b580d284fa68881a613e61f591 Mon Sep 17 00:00:00 2001
+From f94296129eb249a04ccb012a10f50b79fb0a631a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sat, 5 Aug 2017 01:45:29 +0200
 Subject: [PATCH] ntdll: Add function to create new tokens for elevation
@@ -14,10 +14,10 @@ Subject: [PATCH] ntdll: Add function to create new tokens for elevation
  6 files changed, 117 insertions(+)
 
 diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
-index dbead5e..586b504 100644
+index 969cee7..008abb7 100644
 --- a/dlls/ntdll/ntdll.spec
 +++ b/dlls/ntdll/ntdll.spec
-@@ -1482,6 +1482,9 @@
+@@ -1508,6 +1508,9 @@
  # Virtual memory
  @ cdecl __wine_locked_recvmsg(long ptr long)
  
@@ -28,12 +28,12 @@ index dbead5e..586b504 100644
  @ cdecl wine_get_version() NTDLL_wine_get_version
  @ cdecl wine_get_patches() NTDLL_wine_get_patches
 diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
-index 8a64338..137a22d 100644
+index 5a93ede..cb02bd1 100644
 --- a/dlls/ntdll/ntdll_misc.h
 +++ b/dlls/ntdll/ntdll_misc.h
-@@ -80,6 +80,9 @@ extern void virtual_init_threading(void) DECLSPEC_HIDDEN;
- extern void fill_cpu_info(void) DECLSPEC_HIDDEN;
- extern void heap_set_debug_flags( HANDLE handle ) DECLSPEC_HIDDEN;
+@@ -83,6 +83,9 @@ extern void heap_set_debug_flags( HANDLE handle ) DECLSPEC_HIDDEN;
+ extern void init_user_process_params( SIZE_T data_size ) DECLSPEC_HIDDEN;
+ extern void update_user_process_params( const UNICODE_STRING *image ) DECLSPEC_HIDDEN;
  
 +/* token */
 +extern HANDLE CDECL __wine_create_default_token(BOOL admin);
@@ -42,10 +42,10 @@ index 8a64338..137a22d 100644
  extern timeout_t server_start_time DECLSPEC_HIDDEN;
  extern unsigned int server_cpus DECLSPEC_HIDDEN;
 diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c
-index 40034b4..1ebbb79 100644
+index 2ff8610..bb4a171 100644
 --- a/dlls/ntdll/process.c
 +++ b/dlls/ntdll/process.c
-@@ -99,6 +99,24 @@ HANDLE CDECL __wine_make_process_system(void)
+@@ -118,6 +118,24 @@ HANDLE CDECL __wine_make_process_system(void)
      return ret;
  }
  
@@ -71,10 +71,10 @@ index 40034b4..1ebbb79 100644
  
  #define UNIMPLEMENTED_INFO_CLASS(c) \
 diff --git a/server/protocol.def b/server/protocol.def
-index 0bb04cd..f2deca6 100644
+index 493100b..071f740 100644
 --- a/server/protocol.def
 +++ b/server/protocol.def
-@@ -3641,6 +3641,14 @@ struct handle_info
+@@ -3666,6 +3666,14 @@ struct handle_info
  @END
  
  
@@ -102,7 +102,7 @@ index 6c33714..21e90cc 100644
  
  /* token functions */
 diff --git a/server/token.c b/server/token.c
-index 7776cbe..64ab565 100644
+index 4c37c67..e449e61 100644
 --- a/server/token.c
 +++ b/server/token.c
 @@ -79,6 +79,7 @@ static const SID anonymous_logon_sid = { SID_REVISION, 1, { SECURITY_NT_AUTHORIT
@@ -121,7 +121,7 @@ index 7776cbe..64ab565 100644
  
  static luid_t prev_luid_value = { 1000, 0 };
  
-@@ -901,6 +903,64 @@ struct token *token_create_admin( void )
+@@ -908,6 +910,64 @@ struct token *token_create_admin( void )
      return token;
  }
  
@@ -186,7 +186,7 @@ index 7776cbe..64ab565 100644
  static struct privilege *token_find_privilege( struct token *token, const LUID *luid, int enabled_only )
  {
      struct privilege *privilege;
-@@ -1718,3 +1778,27 @@ DECL_HANDLER(set_token_default_dacl)
+@@ -1713,3 +1773,27 @@ DECL_HANDLER(set_token_default_dacl)
          release_object( token );
      }
  }

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

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

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

@@ -1,4 +1,4 @@
-From ab6be2f28c6a3501a056e890a41b44d49c1e2eb0 Mon Sep 17 00:00:00 2001
+From 9a67b4c62e5a575a38081114d4434f274355020e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Tue, 12 Apr 2016 01:02:34 +0200
 Subject: [PATCH] uiautomationcore: Add dll and stub some functions.
@@ -9,17 +9,18 @@ Subject: [PATCH] uiautomationcore: Add dll and stub some functions.
  2 files changed, 48 insertions(+), 6 deletions(-)
 
 diff --git a/dlls/uiautomationcore/Makefile.in b/dlls/uiautomationcore/Makefile.in
-index 78d6254..029fc2e 100644
+index 5221450..5173f23 100644
 --- a/dlls/uiautomationcore/Makefile.in
 +++ b/dlls/uiautomationcore/Makefile.in
-@@ -1,4 +1,5 @@
+@@ -1,5 +1,6 @@
  MODULE = uiautomationcore.dll
+ IMPORTLIB = uiautomationcore
 +IMPORTS   = uuid
  
  C_SRCS = \
  	uia_main.c
 diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c
-index 31b7d3e..cc4831e 100644
+index f0d8247..b9c24b4 100644
 --- a/dlls/uiautomationcore/uia_main.c
 +++ b/dlls/uiautomationcore/uia_main.c
 @@ -1,4 +1,5 @@

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

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

patches/bcrypt-BCryptDeriveKeyPBKDF2/definition

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

patches/bcrypt-BCryptGenerateKeyPair/definition

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

patches/bcrypt-BCryptSecretAgreement/definition

@@ -1,2 +1 @@
 Fixes: [46564] Add BCryptDestroySecret/BCryptSecretAgreement stubs.
-Depends: bcrypt-BCryptGenerateKeyPair

patches/comctrl-rebar-capture/0001-comctl32-Fixed-rebar-behaviour-when-there-s-capture-.patch

@@ -0,0 +1,35 @@
+From 37c7da9a71e327dfe86c0c550cabc50968abd04d Mon Sep 17 00:00:00 2001
+From: Andrew Shadura <bugzilla@tut.by>
+Date: Fri, 1 Feb 2019 08:38:10 +1100
+Subject: [PATCH] comctl32: Fixed rebar behaviour when there's capture and no
+ drag
+
+Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=14750
+---
+ dlls/comctl32/rebar.c | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c
+index aaa1047..29fc854 100644
+--- a/dlls/comctl32/rebar.c
++++ b/dlls/comctl32/rebar.c
+@@ -3119,7 +3119,15 @@ REBAR_MouseMove (REBAR_INFO *infoPtr, LPARAM lParam)
+         int yPtMove = (infoPtr->dwStyle & CCS_VERT ? ptMove.x : ptMove.y);
+ 
+         if (GetCapture() != infoPtr->hwndSelf)
+-            ERR("We are dragging but haven't got capture?!?\n");
++        {
++            if (infoPtr->fStatus & BEGIN_DRAG_ISSUED)
++            {
++                REBAR_Notify_NMREBAR (infoPtr, infoPtr->iGrabbedBand, RBN_ENDDRAG);
++                infoPtr->fStatus &= ~BEGIN_DRAG_ISSUED;
++            }
++            infoPtr->iGrabbedBand = -1;
++            return 0;
++        }
+ 
+         band = REBAR_GetBand(infoPtr, infoPtr->iGrabbedBand);
+ 
+-- 
+1.9.1
+

patches/comctrl-rebar-capture/definition

@@ -0,0 +1 @@
+Fixes: [14750] comctl32: Fixed rebar behaviour when there's capture and no drag.

patches/d2d1-ID2D1Factory1/0003-d2d1-Use-ID2D1Factory1-in-d2d_geometry.patch

@@ -1,7 +1,7 @@
-From 2af2d1c51ec73862a156850d702dcb4608d73558 Mon Sep 17 00:00:00 2001
+From 30d0aa2712dbdfe8f532118f9829c7999c0326a7 Mon Sep 17 00:00:00 2001
 From: Lucian Poston <lucian.poston@gmail.com>
 Date: Thu, 3 May 2018 00:38:06 -0700
-Subject: d2d1: Use ID2D1Factory1 in d2d_geometry
+Subject: [PATCH] d2d1: Use ID2D1Factory1 in d2d_geometry
 
 https://bugs.winehq.org/show_bug.cgi?id=44052
 
@@ -13,10 +13,10 @@ Signed-off-by: Lucian Poston <lucian.poston@gmail.com>
  3 files changed, 28 insertions(+), 16 deletions(-)
 
 diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h
-index 21e2b88..0bb0112 100644
+index 70b841df8cb..85c56524de4 100644
 --- a/dlls/d2d1/d2d1_private.h
 +++ b/dlls/d2d1/d2d1_private.h
-@@ -406,7 +406,7 @@ struct d2d_geometry
+@@ -424,7 +424,7 @@ struct d2d_geometry
      ID2D1Geometry ID2D1Geometry_iface;
      LONG refcount;
  
@@ -25,7 +25,7 @@ index 21e2b88..0bb0112 100644
  
      D2D_MATRIX_3X2_F transform;
  
-@@ -470,10 +470,10 @@ struct d2d_geometry
+@@ -494,10 +494,10 @@ struct d2d_geometry
      } u;
  };
  
@@ -37,13 +37,13 @@ index 21e2b88..0bb0112 100644
 +        ID2D1Factory1 *factory, const D2D1_RECT_F *rect) DECLSPEC_HIDDEN;
 +void d2d_transformed_geometry_init(struct d2d_geometry *geometry, ID2D1Factory1 *factory,
          ID2D1Geometry *src_geometry, const D2D_MATRIX_3X2_F *transform) DECLSPEC_HIDDEN;
- struct d2d_geometry *unsafe_impl_from_ID2D1Geometry(ID2D1Geometry *iface) DECLSPEC_HIDDEN;
- 
+ HRESULT d2d_geometry_group_init(struct d2d_geometry *geometry, ID2D1Factory *factory,
+         D2D1_FILL_MODE fill_mode, ID2D1Geometry **src_geometries, unsigned int geometry_count) DECLSPEC_HIDDEN;
 diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c
-index 7810e95..2a1a536 100644
+index c2a0405abdd..33c2d173596 100644
 --- a/dlls/d2d1/factory.c
 +++ b/dlls/d2d1/factory.c
-@@ -140,7 +140,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateRectangleGeometry(ID2D1Factor
+@@ -141,7 +141,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateRectangleGeometry(ID2D1Factor
      if (!(object = heap_alloc_zero(sizeof(*object))))
          return E_OUTOFMEMORY;
  
@@ -52,7 +52,7 @@ index 7810e95..2a1a536 100644
      {
          WARN("Failed to initialize rectangle geometry, hr %#x.\n", hr);
          heap_free(object);
-@@ -190,7 +190,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateTransformedGeometry(ID2D1Fact
+@@ -207,7 +207,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateTransformedGeometry(ID2D1Fact
      if (!(object = heap_alloc_zero(sizeof(*object))))
          return E_OUTOFMEMORY;
  
@@ -61,7 +61,7 @@ index 7810e95..2a1a536 100644
  
      TRACE("Created transformed geometry %p.\n", object);
      *transformed_geometry = (ID2D1TransformedGeometry *)&object->ID2D1Geometry_iface;
-@@ -207,7 +207,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreatePathGeometry(ID2D1Factory1 *i
+@@ -224,7 +224,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreatePathGeometry(ID2D1Factory2 *i
      if (!(object = heap_alloc_zero(sizeof(*object))))
          return E_OUTOFMEMORY;
  
@@ -71,7 +71,7 @@ index 7810e95..2a1a536 100644
      TRACE("Created path geometry %p.\n", object);
      *geometry = (ID2D1PathGeometry *)&object->ID2D1Geometry_iface;
 diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c
-index d716fb1..5bf63f6 100644
+index 250ff0c5535..7b67e247f7a 100644
 --- a/dlls/d2d1/geometry.c
 +++ b/dlls/d2d1/geometry.c
 @@ -2343,15 +2343,15 @@ static void d2d_geometry_cleanup(struct d2d_geometry *geometry)
@@ -134,7 +134,7 @@ index d716fb1..5bf63f6 100644
  }
  
  static HRESULT STDMETHODCALLTYPE d2d_rectangle_geometry_GetBounds(ID2D1RectangleGeometry *iface,
-@@ -3780,7 +3788,7 @@ static const struct ID2D1RectangleGeometryVtbl d2d_rectangle_geometry_vtbl =
+@@ -3779,7 +3787,7 @@ static const struct ID2D1RectangleGeometryVtbl d2d_rectangle_geometry_vtbl =
      d2d_rectangle_geometry_GetRect,
  };
  
@@ -143,7 +143,7 @@ index d716fb1..5bf63f6 100644
  {
      struct d2d_face *f;
      D2D1_POINT_2F *v;
-@@ -3901,10 +3909,14 @@ static void STDMETHODCALLTYPE d2d_transformed_geometry_GetFactory(ID2D1Transform
+@@ -3900,10 +3908,14 @@ static void STDMETHODCALLTYPE d2d_transformed_geometry_GetFactory(ID2D1Transform
          ID2D1Factory **factory)
  {
      struct d2d_geometry *geometry = impl_from_ID2D1TransformedGeometry(iface);
@@ -159,7 +159,7 @@ index d716fb1..5bf63f6 100644
  }
  
  static HRESULT STDMETHODCALLTYPE d2d_transformed_geometry_GetBounds(ID2D1TransformedGeometry *iface,
-@@ -4098,7 +4110,7 @@ static const struct ID2D1TransformedGeometryVtbl d2d_transformed_geometry_vtbl =
+@@ -4096,7 +4108,7 @@ static const struct ID2D1TransformedGeometryVtbl d2d_transformed_geometry_vtbl =
      d2d_transformed_geometry_GetTransform,
  };
  
@@ -169,5 +169,5 @@ index d716fb1..5bf63f6 100644
  {
      struct d2d_geometry *src_impl;
 -- 
-2.7.4
+2.20.1
 

patches/d3d8-ValidateShader/0001-d3d8-Improve-ValidateVertexShader-stub.patch

@@ -1,151 +0,0 @@
-From 577b48296711a6ad2bd507687a05f3aac9d7a54a Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Sat, 14 Jan 2017 07:50:36 +0100
-Subject: [PATCH] d3d8: Improve ValidateVertexShader stub.
-
----
- dlls/d3d8/d3d8_main.c    | 39 ++++++++++++++++++++++-----------------
- dlls/d3d8/tests/device.c | 40 +++++++++++++++++++++++++---------------
- 2 files changed, 47 insertions(+), 32 deletions(-)
-
-diff --git a/dlls/d3d8/d3d8_main.c b/dlls/d3d8/d3d8_main.c
-index 5fbd165..c48b397 100644
---- a/dlls/d3d8/d3d8_main.c
-+++ b/dlls/d3d8/d3d8_main.c
-@@ -64,33 +64,38 @@ IDirect3D8 * WINAPI DECLSPEC_HOTPATCH Direct3DCreate8(UINT sdk_version)
-  * boolean seems always passed as 0 or 1, but other values work as well...
-  * toto       result?
-  */
--HRESULT WINAPI ValidateVertexShader(DWORD* vertexshader, DWORD* reserved1, DWORD* reserved2, BOOL boolean, DWORD* toto)
-+HRESULT WINAPI ValidateVertexShader(DWORD *vertexshader, DWORD *reserved1, DWORD *reserved2,
-+                                    BOOL return_error, char **errors)
- {
--  HRESULT ret;
--  static BOOL warned;
-+    const char *message = "";
-+    HRESULT hr = E_FAIL;
- 
--  if (TRACE_ON(d3d8) || !warned) {
--      FIXME("(%p %p %p %d %p): stub\n", vertexshader, reserved1, reserved2, boolean, toto);
--      warned = TRUE;
--  }
-+    TRACE("(%p %p %p %d %p): semi-stub\n", vertexshader, reserved1, reserved2, return_error, errors);
- 
--  if (!vertexshader)
--      return E_FAIL;
--
--  if (reserved1 || reserved2)
--      return E_FAIL;
-+    if (!vertexshader)
-+    {
-+        message = "(Global Validation Error) Version Token: Code pointer cannot be NULL.\n";
-+        goto done;
-+    }
- 
--  switch(*vertexshader) {
-+    switch (*vertexshader)
-+    {
-         case 0xFFFE0101:
-         case 0xFFFE0100:
--            ret=S_OK;
-+            hr = S_OK;
-             break;
-+
-         default:
-             WARN("Invalid shader version token %#x.\n", *vertexshader);
--            ret=E_FAIL;
--        }
-+            message = "(Global Validation Error) Version Token: Unsupported vertex shader version.\n";
-+    }
- 
--  return ret;
-+done:
-+    if (!return_error) message = "";
-+    if (errors && (*errors = HeapAlloc(GetProcessHeap(), 0, strlen(message) + 1)))
-+        strcpy(*errors, message);
-+
-+    return hr;
- }
- 
- /***********************************************************************
-diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c
-index 884cdb1..6b9e70d 100644
---- a/dlls/d3d8/tests/device.c
-+++ b/dlls/d3d8/tests/device.c
-@@ -51,7 +51,7 @@ struct device_desc
- 
- static DEVMODEW registry_mode;
- 
--static HRESULT (WINAPI *ValidateVertexShader)(DWORD *, DWORD *, DWORD *, int, DWORD *);
-+static HRESULT (WINAPI *ValidateVertexShader)(DWORD *, DWORD *, DWORD *, BOOL, char **);
- static HRESULT (WINAPI *ValidatePixelShader)(DWORD *, DWORD *, int, DWORD *);
- 
- static BOOL (WINAPI *pGetCursorInfo)(PCURSORINFO);
-@@ -4369,18 +4369,31 @@ static void test_validate_vs(void)
-         0x00000009, 0xc0080000, 0x90e40000, 0xa0e40003,                         /* dp4 oPos.w, v0, c3           */
-         0x0000ffff,                                                             /* end                          */
-     };
-+    char *errors;
-     HRESULT hr;
- 
-     hr = ValidateVertexShader(0, 0, 0, 0, 0);
-     ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr);
-     hr = ValidateVertexShader(0, 0, 0, 1, 0);
-     ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr);
-+
-+    errors = (void *)0xdeadbeef;
-+    hr = ValidateVertexShader(0, 0, 0, 0, &errors);
-+    ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr);
-+    ok(!strcmp(errors, ""), "Got unexpected string '%s'.\n", errors);
-+    HeapFree(GetProcessHeap(), 0, errors);
-+
-+    errors = (void *)0xdeadbeef;
-+    hr = ValidateVertexShader(0, 0, 0, 1, &errors);
-+    ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr);
-+    ok(strstr(errors, "Validation Error") != NULL, "Got unexpected string '%s'.\n", errors);
-+    HeapFree(GetProcessHeap(), 0, errors);
-+
-     hr = ValidateVertexShader(vs, 0, 0, 0, 0);
-     ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
--
-     hr = ValidateVertexShader(vs, 0, 0, 1, 0);
-     ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
--    /* Seems to do some version checking. */
-+
-     *vs = 0xfffe0100;                                                           /* vs_1_0                       */
-     hr = ValidateVertexShader(vs, 0, 0, 0, 0);
-     ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
-@@ -4388,21 +4401,18 @@ static void test_validate_vs(void)
-     *vs = 0xfffe0102;                                                           /* bogus version                */
-     hr = ValidateVertexShader(vs, 0, 0, 1, 0);
-     ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr);
--    /* I've seen that applications always pass the 2nd and 3rd parameter as 0.
--     * Simple test with non-zero parameters. */
--    *vs = 0xfffe0101;                                                           /* vs_1_1                       */
--    hr = ValidateVertexShader(vs, vs, 0, 1, 0);
-+
-+    errors = (void *)0xdeadbeef;
-+    hr = ValidateVertexShader(vs, 0, 0, 0, &errors);
-     ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr);
-+    ok(!strcmp(errors, ""), "Got unexpected string '%s'.\n", errors);
-+    HeapFree(GetProcessHeap(), 0, errors);
- 
--    hr = ValidateVertexShader(vs, 0, vs, 1, 0);
-+    errors = (void *)0xdeadbeef;
-+    hr = ValidateVertexShader(vs, 0, 0, 1, &errors);
-     ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr);
--    /* I've seen the 4th parameter always passed as either 0 or 1, but passing
--     * other values doesn't seem to hurt. */
--    hr = ValidateVertexShader(vs, 0, 0, 12345, 0);
--    ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
--    /* What is the 5th parameter? The following seems to work ok. */
--    hr = ValidateVertexShader(vs, 0, 0, 1, vs);
--    ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
-+    ok(strstr(errors, "Validation Error") != NULL, "Got unexpected string '%s'.\n", errors);
-+    HeapFree(GetProcessHeap(), 0, errors);
- }
- 
- static void test_validate_ps(void)
--- 
-1.9.1
-

patches/d3d8-ValidateShader/0002-d3d8-Improve-ValidatePixelShader-stub.patch

@@ -1,4 +1,4 @@
-From f13fda7095a5fa275232f7440d7737a54c1f1c6c Mon Sep 17 00:00:00 2001
+From a26d43a10fb5de70732970b20a29ce4437b33076 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Sat, 14 Jan 2017 07:54:39 +0100
 Subject: [PATCH] d3d8: Improve ValidatePixelShader stub.
@@ -9,10 +9,10 @@ Subject: [PATCH] d3d8: Improve ValidatePixelShader stub.
  2 files changed, 37 insertions(+), 34 deletions(-)
 
 diff --git a/dlls/d3d8/d3d8_main.c b/dlls/d3d8/d3d8_main.c
-index c48b397..6feb8e5 100644
+index 17f35c90..7b28bdf1 100644
 --- a/dlls/d3d8/d3d8_main.c
 +++ b/dlls/d3d8/d3d8_main.c
-@@ -100,39 +100,36 @@ done:
+@@ -105,39 +105,36 @@ done:
  
  /***********************************************************************
   *              ValidatePixelShader (D3D8.@)
@@ -70,19 +70,19 @@ index c48b397..6feb8e5 100644
  
  void d3d8_resource_cleanup(struct d3d8_resource *resource)
 diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c
-index 6b9e70d..4a4c0e5 100644
+index 315640d3..6f8354f4 100644
 --- a/dlls/d3d8/tests/device.c
 +++ b/dlls/d3d8/tests/device.c
-@@ -52,7 +52,7 @@ struct device_desc
+@@ -53,7 +53,7 @@ struct device_desc
  static DEVMODEW registry_mode;
  
- static HRESULT (WINAPI *ValidateVertexShader)(DWORD *, DWORD *, DWORD *, BOOL, char **);
+ static HRESULT (WINAPI *ValidateVertexShader)(const DWORD *, const DWORD *, const D3DCAPS8 *, BOOL, char **);
 -static HRESULT (WINAPI *ValidatePixelShader)(DWORD *, DWORD *, int, DWORD *);
 +static HRESULT (WINAPI *ValidatePixelShader)(DWORD *, DWORD *, BOOL, char **);
  
  static BOOL (WINAPI *pGetCursorInfo)(PCURSORINFO);
  
-@@ -4427,33 +4427,39 @@ static void test_validate_ps(void)
+@@ -4474,33 +4474,39 @@ static void test_validate_ps(void)
          0x00000005, 0x800f0000, 0xb0e40000, 0x80e40000,                         /* mul r0, t0, r0               */
          0x0000ffff,                                                             /* end                          */
      };
@@ -116,12 +116,6 @@ index 6b9e70d..4a4c0e5 100644
 +
 +    errors = (void *)0xdeadbeef;
 +    hr = ValidatePixelShader(ps, 0, 0, &errors);
-+    ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr);
-+    ok(!strcmp(errors, ""), "Got unexpected string '%s'.\n", errors);
-+    HeapFree(GetProcessHeap(), 0, errors);
-+
-+    errors = (void *)0xdeadbeef;
-+    hr = ValidatePixelShader(ps, 0, 1, &errors);
      ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr);
 -    /* I've seen the 3rd parameter always passed as either 0 or 1, but passing
 -     * other values doesn't seem to hurt. */
@@ -130,11 +124,17 @@ index 6b9e70d..4a4c0e5 100644
 -    /* What is the 4th parameter? The following seems to work ok. */
 -    hr = ValidatePixelShader(ps, 0, 1, ps);
 -    ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
++    ok(!strcmp(errors, ""), "Got unexpected string '%s'.\n", errors);
++    HeapFree(GetProcessHeap(), 0, errors);
++
++    errors = (void *)0xdeadbeef;
++    hr = ValidatePixelShader(ps, 0, 1, &errors);
++    ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr);
 +    ok(strstr(errors, "Validation Error") != NULL, "Got unexpected string '%s'.\n", errors);
 +    HeapFree(GetProcessHeap(), 0, errors);
  }
  
  static void test_volume_get_container(void)
 -- 
-1.9.1
+2.20.1
 

patches/ddraw-version-check/0001-ddraw-Return-correct-devices-based-off-requested-Dir.patch

@@ -0,0 +1,345 @@
+From 88412e5d16a242a1d0fed2db46ffd7ad7eb87ca8 Mon Sep 17 00:00:00 2001
+From: Andrew D'Addesio <andrew@fatbag.net>
+Date: Fri, 8 Feb 2019 18:48:33 -1000
+Subject: [PATCH] ddraw: Return correct devices based off requested DirectX
+ version.
+
+---
+ dlls/ddraw/ddraw.c | 230 +++++++++++++++++++++++++--------------------
+ 1 file changed, 129 insertions(+), 101 deletions(-)
+
+diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
+index 8a1d0a4f..274a0907 100644
+--- a/dlls/ddraw/ddraw.c
++++ b/dlls/ddraw/ddraw.c
+@@ -47,37 +47,80 @@ static const DDDEVICEIDENTIFIER2 deviceidentifier =
+     0
+ };
+ 
++#define D3D_VERSION(x) (1 << (x))
++
+ static struct enum_device_entry
+ {
+-    char interface_name[100];
++    unsigned int version_mask;
++    /* Some games (Motoracer 2 demo) have the bad idea to modify the device
++     * name/description strings. Let's put the strings in sufficiently sized
++     * arrays in static-lifetime writable memory. */
++    char device_desc[100];
+     char device_name[100];
+     const GUID *device_guid;
+     DWORD remove_caps;
+-} device_list7[] =
++} device_list[] =
+ {
+-    /* T&L HAL device */
++    /* Ramp Emulation (D3D 1&2 only) */
+     {
+-        "WINE Direct3D7 Hardware Transform and Lighting acceleration using WineD3D",
+-        "Wine D3D7 T&L HAL",
+-        &IID_IDirect3DTnLHalDevice,
++        D3D_VERSION(1)|D3D_VERSION(2),
++        "WineD3D Ramp Software Emulation",
++        "Ramp Emulation",
++        &IID_IDirect3DRampDevice,
+         0,
+     },
+ 
+-    /* HAL device */
++    /* RGB Emulation (D3D 1-7) */
+     {
+-        "WINE Direct3D7 Hardware acceleration using WineD3D",
++        D3D_VERSION(1)|D3D_VERSION(2)|D3D_VERSION(3)|D3D_VERSION(7),
++        "WineD3D RGB Software Emulation",
++        "RGB Emulation",
++        &IID_IDirect3DRGBDevice,
++        D3DDEVCAPS_HWTRANSFORMANDLIGHT,
++    },
++
++    /* Direct3D HAL (D3D 1-7) */
++    {
++        D3D_VERSION(1)|D3D_VERSION(2)|D3D_VERSION(3)|D3D_VERSION(7),
++        "WineD3D Hardware Acceleration",
+         "Direct3D HAL",
+         &IID_IDirect3DHALDevice,
+         0,
+     },
+ 
+-    /* RGB device */
++    /* MMX Emulation (D3D2 only) */
+     {
+-        "WINE Direct3D7 RGB Software Emulation using WineD3D",
+-        "Wine D3D7 RGB",
+-        &IID_IDirect3DRGBDevice,
+-        D3DDEVCAPS_HWTRANSFORMANDLIGHT,
++        D3D_VERSION(2),
++        "WineD3D MMX Software Emulation",
++        "MMX Emulation",
++        &IID_IDirect3DMMXDevice,
++        0,
++    },
++
++    /* Direct3D T&L HAL (D3D7 only) */
++    {
++        D3D_VERSION(7),
++        "WineD3D Hardware Transform and Lighting Acceleration",
++        "Direct3D T&L HAL",
++        &IID_IDirect3DTnLHalDevice,
++        0,
+     },
++
++    /* In the future, we may wish to add the "Reference Rasterizer" and
++     * "Null device", which are only available in DX6-8 and must be explicitly
++     * enabled by the registry values:
++     * * EnumReference
++     * * EnumNullDevice,
++     * which are DWORD values which must be created under
++     * HKLM\Software\Microsoft\Direct3D\Drivers and set to any nonzero value.
++     * (Refer to enablerefrast.reg/disablerefrast.reg in the DX6/7 SDKs and
++     * KB249579 for more information.)
++     *
++     * DirectX 9.0 and higher appear to no longer recognize these settings,
++     * so apparently these devices were removed starting with DX9.
++     *
++     * Some games (AvP, Motoracer 2) break if these devices are enumerated.
++     */
+ };
+ 
+ static void STDMETHODCALLTYPE ddraw_null_wined3d_object_destroyed(void *parent) {}
+@@ -1396,15 +1439,6 @@ HRESULT ddraw_get_d3dcaps(const struct ddraw *ddraw, D3DDEVICEDESC7 *caps)
+         D3DPTADDRESSCAPS_WRAP            | D3DPTADDRESSCAPS_MIRROR             | D3DPTADDRESSCAPS_CLAMP              |
+         D3DPTADDRESSCAPS_BORDER          | D3DPTADDRESSCAPS_INDEPENDENTUV);
+ 
+-    if (!(caps->dpcLineCaps.dwTextureCaps & D3DPTEXTURECAPS_POW2))
+-    {
+-        /* DirectX7 always has the np2 flag set, no matter what the card
+-         * supports. Some old games (Rollcage) check the caps incorrectly.
+-         * If wined3d supports nonpow2 textures it also has np2 conditional
+-         * support. */
+-        caps->dpcLineCaps.dwTextureCaps |= D3DPTEXTURECAPS_POW2 | D3DPTEXTURECAPS_NONPOW2CONDITIONAL;
+-    }
+-
+     /* Fill the missing members, and do some fixup */
+     caps->dpcLineCaps.dwSize = sizeof(caps->dpcLineCaps);
+     caps->dpcLineCaps.dwTextureBlendCaps = D3DPTBLENDCAPS_ADD
+@@ -1547,6 +1581,8 @@ static HRESULT WINAPI ddraw7_GetCaps(IDirectDraw7 *iface, DDCAPS *DriverCaps, DD
+ 
+     IDirect3D7_EnumZBufferFormats(&ddraw->IDirect3D7_iface, &IID_IDirect3DHALDevice, enum_zbuffer, &caps);
+ 
++    caps.ddsOldCaps.dwCaps = caps.ddsCaps.dwCaps;
++
+     if(DriverCaps)
+     {
+         DD_STRUCT_COPY_BYSIZE(DriverCaps, &caps);
+@@ -3669,8 +3705,7 @@ static HRESULT WINAPI ddraw1_DuplicateSurface(IDirectDraw *iface, IDirectDrawSur
+ /*****************************************************************************
+  * IDirect3D7::EnumDevices
+  *
+- * The EnumDevices method for IDirect3D7. It enumerates all supported
+- * D3D7 devices. Currently the T&L, HAL and RGB devices are enumerated.
++ * The EnumDevices method for IDirect3D7. It enumerates all D3D7 devices.
+  *
+  * Params:
+  *  callback: Function to call for each enumerated device
+@@ -3703,14 +3738,14 @@ static HRESULT WINAPI d3d7_EnumDevices(IDirect3D7 *iface, LPD3DENUMDEVICESCALLBA
+ 
+     dev_caps = device_desc7.dwDevCaps;
+ 
+-    for (i = 0; i < ARRAY_SIZE(device_list7); i++)
++    for (i = 0; i < ARRAY_SIZE(device_list); i++)
+     {
+         HRESULT ret;
+ 
+-        device_desc7.deviceGUID = *device_list7[i].device_guid;
+-        device_desc7.dwDevCaps  = dev_caps & ~device_list7[i].remove_caps;
++        device_desc7.deviceGUID = *device_list[i].device_guid;
++        device_desc7.dwDevCaps  = dev_caps & ~device_list[i].remove_caps;
+ 
+-        ret = callback(device_list7[i].interface_name, device_list7[i].device_name, &device_desc7, context);
++        ret = callback(device_list[i].device_name, device_list[i].device_name, &device_desc7, context);
+         if (ret != DDENUMRET_OK)
+         {
+             TRACE("Application cancelled the enumeration.\n");
+@@ -3726,11 +3761,21 @@ static HRESULT WINAPI d3d7_EnumDevices(IDirect3D7 *iface, LPD3DENUMDEVICESCALLBA
+     return D3D_OK;
+ }
+ 
++static void clear_device_desc(D3DDEVICEDESC *device_desc)
++{
++    memset(device_desc, 0, sizeof(*device_desc));
++    device_desc->dwSize = sizeof(*device_desc);
++    device_desc->dtcTransformCaps.dwSize = sizeof(device_desc->dtcTransformCaps);
++    device_desc->dlcLightingCaps.dwSize = sizeof(device_desc->dlcLightingCaps);
++    device_desc->dpcLineCaps.dwSize = sizeof(device_desc->dpcLineCaps);
++    device_desc->dpcTriCaps.dwSize = sizeof(device_desc->dpcTriCaps);
++}
++
+ /*****************************************************************************
+  * IDirect3D3::EnumDevices
+  *
+- * Enumerates all supported Direct3DDevice interfaces. This is the
+- * implementation for Direct3D 1 to Direc3D 3, Version 7 has its own.
++ * Enumerates all Direct3DDevice interfaces. This is the implementation for
++ * Direct3D 1 to Direct3D 3; Version 7 has its own.
+  *
+  * Versions 1, 2 and 3
+  *
+@@ -3745,18 +3790,18 @@ static HRESULT WINAPI d3d7_EnumDevices(IDirect3D7 *iface, LPD3DENUMDEVICESCALLBA
+  *****************************************************************************/
+ static HRESULT WINAPI d3d3_EnumDevices(IDirect3D3 *iface, LPD3DENUMDEVICESCALLBACK callback, void *context)
+ {
+-    static CHAR wined3d_description[] = "Wine D3DDevice using WineD3D and OpenGL";
+-
++/* Size of D3DDEVICEDESC in Direct3D 1-3 */
++enum {
++    D3D1_DESC_SIZE = FIELD_OFFSET(D3DDEVICEDESC, dwMinTextureWidth), /* 172 */
++    D3D2_DESC_SIZE = FIELD_OFFSET(D3DDEVICEDESC, dwMaxTextureRepeat), /* 204 */
++    D3D3_DESC_SIZE = sizeof(D3DDEVICEDESC) /* 252 */
++};
+     struct ddraw *ddraw = impl_from_IDirect3D3(iface);
+-    D3DDEVICEDESC device_desc1, hal_desc, hel_desc;
++    DWORD desc_size;
++    D3DDEVICEDESC device_desc1, empty_desc1, hal_desc, hel_desc;
+     D3DDEVICEDESC7 device_desc7;
+     HRESULT hr;
+-
+-    /* Some games (Motoracer 2 demo) have the bad idea to modify the device
+-     * name string. Let's put the string in a sufficiently sized array in
+-     * writable memory. */
+-    char device_name[50];
+-    strcpy(device_name,"Direct3D HEL");
++    size_t i;
+ 
+     TRACE("iface %p, callback %p, context %p.\n", iface, callback, context);
+ 
+@@ -3765,52 +3810,58 @@ static HRESULT WINAPI d3d3_EnumDevices(IDirect3D3 *iface, LPD3DENUMDEVICESCALLBA
+ 
+     wined3d_mutex_lock();
+ 
++    switch (ddraw->d3dversion)
++    {
++        case 1:  desc_size = D3D1_DESC_SIZE; break;
++        case 2:  desc_size = D3D2_DESC_SIZE; break;
++        default: desc_size = D3D3_DESC_SIZE; break;
++    }
++
+     if (FAILED(hr = ddraw_get_d3dcaps(ddraw, &device_desc7)))
+     {
+         wined3d_mutex_unlock();
+         return hr;
+     }
++
+     ddraw_d3dcaps1_from_7(&device_desc1, &device_desc7);
++    device_desc1.dwSize = desc_size;
+ 
+-    /* Do I have to enumerate the reference id? Note from old d3d7:
+-     * "It seems that enumerating the reference IID on Direct3D 1 games
+-     * (AvP / Motoracer2) breaks them". So do not enumerate this iid in V1
+-     *
+-     * There's a registry key HKLM\Software\Microsoft\Direct3D\Drivers,
+-     * EnumReference which enables / disables enumerating the reference
+-     * rasterizer. It's a DWORD, 0 means disabled, 2 means enabled. The
+-     * enablerefrast.reg and disablerefrast.reg files in the DirectX 7.0 sdk
+-     * demo directory suggest this.
+-     *
+-     * Some games(GTA 2) seem to use the second enumerated device, so I have
+-     * to enumerate at least 2 devices. So enumerate the reference device to
+-     * have 2 devices.
+-     *
+-     * Other games (Rollcage) tell emulation and hal device apart by certain
+-     * flags. Rollcage expects D3DPTEXTURECAPS_POW2 to be set (yeah, it is a
+-     * limitation flag), and it refuses all devices that have the perspective
+-     * flag set. This way it refuses the emulation device, and HAL devices
+-     * never have POW2 unset in d3d7 on windows. */
+-    if (ddraw->d3dversion != 1)
+-    {
+-        static CHAR reference_description[] = "RGB Direct3D emulation";
+-
+-        TRACE("Enumerating WineD3D D3DDevice interface.\n");
+-        hal_desc = device_desc1;
+-        hel_desc = device_desc1;
+-        /* The rgb device has the pow2 flag set in the hel caps, but not in the hal caps. */
+-        hal_desc.dpcLineCaps.dwTextureCaps &= ~(D3DPTEXTURECAPS_POW2
+-                | D3DPTEXTURECAPS_NONPOW2CONDITIONAL | D3DPTEXTURECAPS_PERSPECTIVE);
+-        hal_desc.dpcTriCaps.dwTextureCaps &= ~(D3DPTEXTURECAPS_POW2
+-                | D3DPTEXTURECAPS_NONPOW2CONDITIONAL | D3DPTEXTURECAPS_PERSPECTIVE);
+-        /* RGB, RAMP and MMX devices have a HAL dcmColorModel of 0 */
+-        hal_desc.dcmColorModel = 0;
+-        /* RGB, RAMP and MMX devices cannot report HAL hardware flags */
+-        hal_desc.dwFlags = 0;
+-
+-        hr = callback((GUID *)&IID_IDirect3DRGBDevice, reference_description,
+-                device_name, &hal_desc, &hel_desc, context);
+-        if (hr != D3DENUMRET_OK)
++    clear_device_desc(&empty_desc1);
++    empty_desc1.dwSize = desc_size;
++
++    for (i = 0; i < ARRAY_SIZE(device_list); i++)
++    {
++        if (!(device_list[i].version_mask & D3D_VERSION(ddraw->d3dversion)))
++            continue;
++
++        if (IsEqualGUID(&IID_IDirect3DHALDevice, device_list[i].device_guid))
++        {
++            hal_desc = device_desc1;
++
++            /* The HAL device's hel_desc is almost empty -- but not completely */
++            hel_desc = empty_desc1;
++            hel_desc.dwFlags = D3DDD_COLORMODEL | D3DDD_DEVCAPS | D3DDD_TRANSFORMCAPS
++                | D3DDD_LIGHTINGCAPS | D3DDD_BCLIPPING;
++            hel_desc.dcmColorModel = 0;
++            hel_desc.dwDevCaps = D3DDEVCAPS_FLOATTLVERTEX;
++            hel_desc.dtcTransformCaps.dwCaps = hal_desc.dtcTransformCaps.dwCaps;
++            hel_desc.dlcLightingCaps = hal_desc.dlcLightingCaps;
++            hel_desc.bClipping = hal_desc.bClipping;
++            hel_desc.dwMaxVertexCount = hal_desc.dwMaxVertexCount;
++        }
++        else
++        {
++            hal_desc = empty_desc1;
++
++            hel_desc = device_desc1;
++            /* Ramp device supports grayscale only */
++            if (IsEqualGUID(&IID_IDirect3DRampDevice, device_list[i].device_guid))
++                hel_desc.dcmColorModel = D3DCOLOR_MONO;
++        }
++
++        hr = callback((GUID *)device_list[i].device_guid, device_list[i].device_desc,
++                device_list[i].device_name, &hal_desc, &hel_desc, context);
++        if (hr != DDENUMRET_OK)
+         {
+             TRACE("Application cancelled the enumeration.\n");
+             wined3d_mutex_unlock();
+@@ -3818,29 +3869,6 @@ static HRESULT WINAPI d3d3_EnumDevices(IDirect3D3 *iface, LPD3DENUMDEVICESCALLBA
+         }
+     }
+ 
+-    strcpy(device_name,"Direct3D HAL");
+-
+-    TRACE("Enumerating HAL Direct3D device.\n");
+-    hal_desc = device_desc1;
+-    hel_desc = device_desc1;
+-
+-    /* The hal device does not have the pow2 flag set in hel, but in hal. */
+-    hel_desc.dpcLineCaps.dwTextureCaps &= ~(D3DPTEXTURECAPS_POW2
+-            | D3DPTEXTURECAPS_NONPOW2CONDITIONAL | D3DPTEXTURECAPS_PERSPECTIVE);
+-    hel_desc.dpcTriCaps.dwTextureCaps &= ~(D3DPTEXTURECAPS_POW2
+-            | D3DPTEXTURECAPS_NONPOW2CONDITIONAL | D3DPTEXTURECAPS_PERSPECTIVE);
+-    /* HAL devices have a HEL dcmColorModel of 0 */
+-    hel_desc.dcmColorModel = 0;
+-
+-    hr = callback((GUID *)&IID_IDirect3DHALDevice, wined3d_description,
+-            device_name, &hal_desc, &hel_desc, context);
+-    if (hr != D3DENUMRET_OK)
+-    {
+-        TRACE("Application cancelled the enumeration.\n");
+-        wined3d_mutex_unlock();
+-        return D3D_OK;
+-    }
+-
+     TRACE("End of enumeration.\n");
+ 
+     wined3d_mutex_unlock();
+-- 
+2.20.1
+

patches/ddraw-version-check/definition

@@ -0,0 +1,10 @@
+# Games from code comments 
+#   Rollcage
+#   GTA 2
+#   Motoracer 2 demo
+# Games that require testing from the bug report.
+#   Resident Evil
+#   Carmageddon 2 demo
+#   The Sims Online
+Fixes: [19153] https://bugs.winehq.org/show_bug.cgi?id=19153
+Depends: ddraw-Device_Caps

patches/dinput-axis-recalc/0001-dinput-Recalculated-Axis-after-deadzone-change.patch

@@ -0,0 +1,214 @@
+From b5311918d5fbdc15b3321fed444daa0d0c8507de Mon Sep 17 00:00:00 2001
+From: Bruno Jesus <bjesus@codeweavers.com>
+Date: Thu, 28 Feb 2019 15:56:18 +1100
+Subject: [PATCH] dinput: Recalculated Axis after deadzone change.
+
+Wine-bugs: https://bugs.winehq.org/show_bug.cgi?id=41317
+---
+ dlls/dinput/joystick.c | 149 ++++++++++++++++++++++++++-----------------------
+ 1 file changed, 80 insertions(+), 69 deletions(-)
+
+diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c
+index 0ec1ceb..fd3d44d 100644
+--- a/dlls/dinput/joystick.c
++++ b/dlls/dinput/joystick.c
+@@ -271,6 +271,76 @@ BOOL device_disabled_registry(const char* name)
+     return do_disable;
+ }
+ 
++static void remap_init(JoystickGenericImpl *This, int obj, ObjProps *remap_props)
++{
++    /* Configure as if nothing changed so the helper functions can only change
++     * what they need, thus reducing code duplication. */
++    remap_props->lDevMin = remap_props->lMin = This->props[obj].lMin;
++    remap_props->lDevMax = remap_props->lMax = This->props[obj].lMax;
++
++    remap_props->lDeadZone = This->props[obj].lDeadZone;
++    remap_props->lSaturation = This->props[obj].lSaturation;
++}
++
++static void remap_apply(JoystickGenericImpl *This, int obj, ObjProps *remap_props)
++{
++    /* Many games poll the joystick immediately after setting the range
++     * for calibration purposes, so the old values need to be remapped
++     * to the new range before it does so */
++    switch (This->base.data_format.wine_df->rgodf[obj].dwOfs){
++    case DIJOFS_X        : This->js.lX  = joystick_map_axis(remap_props, This->js.lX); break;
++    case DIJOFS_Y        : This->js.lY  = joystick_map_axis(remap_props, This->js.lY); break;
++    case DIJOFS_Z        : This->js.lZ  = joystick_map_axis(remap_props, This->js.lZ); break;
++    case DIJOFS_RX       : This->js.lRx = joystick_map_axis(remap_props, This->js.lRx); break;
++    case DIJOFS_RY       : This->js.lRy = joystick_map_axis(remap_props, This->js.lRy); break;
++    case DIJOFS_RZ       : This->js.lRz = joystick_map_axis(remap_props, This->js.lRz); break;
++    case DIJOFS_SLIDER(0): This->js.rglSlider[0] = joystick_map_axis(remap_props, This->js.rglSlider[0]); break;
++    case DIJOFS_SLIDER(1): This->js.rglSlider[1] = joystick_map_axis(remap_props, This->js.rglSlider[1]); break;
++    default: break;
++    }
++}
++
++static void remap_range(JoystickGenericImpl *This, int obj, LPCDIPROPRANGE pr)
++{
++    ObjProps remap_props;
++    remap_init(This, obj, &remap_props);
++
++    remap_props.lMin = pr->lMin;
++    remap_props.lMax = pr->lMax;
++
++    remap_apply(This, obj, &remap_props);
++
++    /* Store new values */
++    This->props[obj].lMin = pr->lMin;
++    This->props[obj].lMax = pr->lMax;
++}
++
++static void remap_deadzone(JoystickGenericImpl *This, int obj, LPCDIPROPDWORD pd)
++{
++    ObjProps remap_props;
++    remap_init(This, obj, &remap_props);
++
++    remap_props.lDeadZone = pd->dwData;
++
++    remap_apply(This, obj, &remap_props);
++
++    /* Store new value */
++    This->props[obj].lDeadZone = pd->dwData;
++}
++
++static void remap_saturation(JoystickGenericImpl *This, int obj, LPCDIPROPDWORD pd)
++{
++    ObjProps remap_props;
++    remap_init(This, obj, &remap_props);
++
++    remap_props.lSaturation = pd->dwData;
++
++    remap_apply(This, obj, &remap_props);
++
++    /* Store new value */
++    This->props[obj].lSaturation = pd->dwData;
++}
++
+ /******************************************************************************
+   *     SetProperty : change input device properties
+   */
+@@ -278,7 +348,6 @@ HRESULT WINAPI JoystickWGenericImpl_SetProperty(LPDIRECTINPUTDEVICE8W iface, REF
+ {
+     JoystickGenericImpl *This = impl_from_IDirectInputDevice8W(iface);
+     DWORD i;
+-    ObjProps remap_props;
+ 
+     TRACE("(%p,%s,%p)\n",This,debugstr_guid(rguid),ph);
+ 
+@@ -295,69 +364,15 @@ HRESULT WINAPI JoystickWGenericImpl_SetProperty(LPDIRECTINPUTDEVICE8W iface, REF
+         case (DWORD_PTR)DIPROP_RANGE: {
+             LPCDIPROPRANGE pr = (LPCDIPROPRANGE)ph;
+             if (ph->dwHow == DIPH_DEVICE) {
+-
+-                /* Many games poll the joystick immediately after setting the range
+-                 * for calibration purposes, so the old values need to be remapped
+-                 * to the new range before it does so */
+-
+                 TRACE("proprange(%d,%d) all\n", pr->lMin, pr->lMax);
+-                for (i = 0; i < This->base.data_format.wine_df->dwNumObjs; i++) {
+-
+-                    remap_props.lDevMin = This->props[i].lMin;
+-                    remap_props.lDevMax = This->props[i].lMax;
+-
+-                    remap_props.lDeadZone = This->props[i].lDeadZone;
+-                    remap_props.lSaturation = This->props[i].lSaturation;
+-
+-                    remap_props.lMin = pr->lMin;
+-                    remap_props.lMax = pr->lMax;
+-
+-                    switch (This->base.data_format.wine_df->rgodf[i].dwOfs) {
+-                    case DIJOFS_X        : This->js.lX  = joystick_map_axis(&remap_props, This->js.lX); break;
+-                    case DIJOFS_Y        : This->js.lY  = joystick_map_axis(&remap_props, This->js.lY); break;
+-                    case DIJOFS_Z        : This->js.lZ  = joystick_map_axis(&remap_props, This->js.lZ); break;
+-                    case DIJOFS_RX       : This->js.lRx = joystick_map_axis(&remap_props, This->js.lRx); break;
+-                    case DIJOFS_RY       : This->js.lRy = joystick_map_axis(&remap_props, This->js.lRy); break;
+-                    case DIJOFS_RZ       : This->js.lRz = joystick_map_axis(&remap_props, This->js.lRz); break;
+-                    case DIJOFS_SLIDER(0): This->js.rglSlider[0] = joystick_map_axis(&remap_props, This->js.rglSlider[0]); break;
+-                    case DIJOFS_SLIDER(1): This->js.rglSlider[1] = joystick_map_axis(&remap_props, This->js.rglSlider[1]); break;
+-	            default: break;
+-                    }
+-
+-                    This->props[i].lMin = pr->lMin;
+-                    This->props[i].lMax = pr->lMax;
+-                }
++                for (i = 0; i < This->base.data_format.wine_df->dwNumObjs; i++)
++                    remap_range(This, i, pr);
+             } else {
+                 int obj = find_property(&This->base.data_format, ph);
+ 
+                 TRACE("proprange(%d,%d) obj=%d\n", pr->lMin, pr->lMax, obj);
+-                if (obj >= 0) {
+-
+-                    remap_props.lDevMin = This->props[obj].lMin;
+-                    remap_props.lDevMax = This->props[obj].lMax;
+-
+-                    remap_props.lDeadZone = This->props[obj].lDeadZone;
+-                    remap_props.lSaturation = This->props[obj].lSaturation;
+-
+-                    remap_props.lMin = pr->lMin;
+-                    remap_props.lMax = pr->lMax;
+-
+-                    switch (This->base.data_format.wine_df->rgodf[obj].dwOfs) {
+-                    case DIJOFS_X        : This->js.lX  = joystick_map_axis(&remap_props, This->js.lX); break;
+-                    case DIJOFS_Y        : This->js.lY  = joystick_map_axis(&remap_props, This->js.lY); break;
+-                    case DIJOFS_Z        : This->js.lZ  = joystick_map_axis(&remap_props, This->js.lZ); break;
+-                    case DIJOFS_RX       : This->js.lRx = joystick_map_axis(&remap_props, This->js.lRx); break;
+-                    case DIJOFS_RY       : This->js.lRy = joystick_map_axis(&remap_props, This->js.lRy); break;
+-                    case DIJOFS_RZ       : This->js.lRz = joystick_map_axis(&remap_props, This->js.lRz); break;
+-                    case DIJOFS_SLIDER(0): This->js.rglSlider[0] = joystick_map_axis(&remap_props, This->js.rglSlider[0]); break;
+-                    case DIJOFS_SLIDER(1): This->js.rglSlider[1] = joystick_map_axis(&remap_props, This->js.rglSlider[1]); break;
+-		    default: break;
+-                    }
+-
+-                    This->props[obj].lMin = pr->lMin;
+-                    This->props[obj].lMax = pr->lMax;
+-                    return DI_OK;
+-                }
++                if (obj >= 0)
++                    remap_range(This, obj, pr);
+             }
+             break;
+         }
+@@ -366,15 +381,13 @@ HRESULT WINAPI JoystickWGenericImpl_SetProperty(LPDIRECTINPUTDEVICE8W iface, REF
+             if (ph->dwHow == DIPH_DEVICE) {
+                 TRACE("deadzone(%d) all\n", pd->dwData);
+                 for (i = 0; i < This->base.data_format.wine_df->dwNumObjs; i++)
+-                    This->props[i].lDeadZone  = pd->dwData;
++                    remap_deadzone(This, i, pd);
+             } else {
+                 int obj = find_property(&This->base.data_format, ph);
+ 
+                 TRACE("deadzone(%d) obj=%d\n", pd->dwData, obj);
+-                if (obj >= 0) {
+-                    This->props[obj].lDeadZone  = pd->dwData;
+-                    return DI_OK;
+-                }
++                if (obj >= 0)
++                    remap_deadzone(This, obj, pd);
+             }
+             break;
+         }
+@@ -383,15 +396,13 @@ HRESULT WINAPI JoystickWGenericImpl_SetProperty(LPDIRECTINPUTDEVICE8W iface, REF
+             if (ph->dwHow == DIPH_DEVICE) {
+                 TRACE("saturation(%d) all\n", pd->dwData);
+                 for (i = 0; i < This->base.data_format.wine_df->dwNumObjs; i++)
+-                    This->props[i].lSaturation = pd->dwData;
++                    remap_saturation(This, i, pd);
+             } else {
+                 int obj = find_property(&This->base.data_format, ph);
+ 
+                 TRACE("saturation(%d) obj=%d\n", pd->dwData, obj);
+-                if (obj >= 0) {
+-                    This->props[obj].lSaturation = pd->dwData;
+-                    return DI_OK;
+-                }
++                if (obj >= 0)
++                    remap_saturation(This, obj, pd);
+             }
+             break;
+         }
+-- 
+1.9.1
+

patches/dinput-axis-recalc/definition

@@ -0,0 +1 @@
+Fixes: [41317] dinput: Recalculated Axis after deadzone change.

patches/dinput-reconnect-joystick/0001-dinput-Allow-reconnecting-to-disconnected-joysticks.patch

@@ -0,0 +1,240 @@
+From 47a1e3618a1629a6f7cca1b84f761eaab3627f75 Mon Sep 17 00:00:00 2001
+From: Andrew Church <achurch@achurch.org>
+Date: Mon, 25 Feb 2019 11:23:12 +1100
+Subject: [PATCH] dinput: Allow reconnecting to disconnected joysticks
+
+Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=34297
+---
+ dlls/dinput/joystick_linuxinput.c | 148 +++++++++++++++++++++++++++++---------
+ 1 file changed, 113 insertions(+), 35 deletions(-)
+
+diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c
+index ace4641..233dd25 100644
+--- a/dlls/dinput/joystick_linuxinput.c
++++ b/dlls/dinput/joystick_linuxinput.c
+@@ -83,6 +83,13 @@ struct wine_input_absinfo {
+     LONG flat;
+ };
+ 
++enum wine_joystick_linuxinput_fd_state {
++    WINE_FD_STATE_CLOSED = 0,    /* No device has been opened yet */
++    WINE_FD_STATE_OK,            /* File descriptor is open and ready for reading */
++    WINE_FD_STATE_DISCONNECTED,  /* Read error occurred; might be able to reopen later */
++    WINE_FD_STATE_INVALID,       /* Device is no longer available at original pathname */
++};
++
+ /* implemented in effect_linuxinput.c */
+ HRESULT linuxinput_create_effect(int* fd, REFGUID rguid, struct list *parent_list_entry, LPDIRECTINPUTEFFECT* peff);
+ HRESULT linuxinput_get_info_A(int fd, REFGUID rguid, LPDIEFFECTINFOA info);
+@@ -122,6 +129,7 @@ struct JoystickImpl
+ 
+ 	/* joystick private */
+ 	int				joyfd;
++	enum wine_joystick_linuxinput_fd_state joyfd_state;
+ 
+ 	int                             dev_axes_to_di[ABS_MAX];
+         POINTL                          povs[4];
+@@ -466,6 +474,7 @@ static JoystickImpl *alloc_device(REFGUID rguid, IDirectInputImpl *dinput, unsig
+     newDevice->generic.base.dinput = dinput;
+     newDevice->generic.joy_polldev = joy_polldev;
+     newDevice->joyfd       = -1;
++    newDevice->joyfd_state = WINE_FD_STATE_CLOSED;
+     newDevice->joydev      = &joydevs[index];
+     newDevice->generic.name        = newDevice->joydev->name;
+     list_init(&newDevice->ff_effects);
+@@ -669,38 +678,15 @@ static HRESULT joydev_create_device(IDirectInputImpl *dinput, REFGUID rguid, REF
+     return DIERR_DEVICENOTREG;
+ }
+ 
+-
+-const struct dinput_device joystick_linuxinput_device = {
+-  "Wine Linux-input joystick driver",
+-  joydev_enum_deviceA,
+-  joydev_enum_deviceW,
+-  joydev_create_device
+-};
+-
+-/******************************************************************************
+-  *     Acquire : gets exclusive control of the joystick
+-  */
+-static HRESULT WINAPI JoystickWImpl_Acquire(LPDIRECTINPUTDEVICE8W iface)
++static int joydev_open_evdev(JoystickImpl *This)
+ {
+-    JoystickImpl *This = impl_from_IDirectInputDevice8W(iface);
+-    HRESULT res;
+-
+-    TRACE("(this=%p)\n",This);
++    int fd;
+ 
+-    if ((res = IDirectInputDevice2WImpl_Acquire(iface)) != DI_OK)
++    if ((fd = open(This->joydev->device, O_RDWR)) == -1)
+     {
+-        WARN("Failed to acquire: %x\n", res);
+-        return res;
+-    }
+-
+-    if ((This->joyfd = open(This->joydev->device, O_RDWR)) == -1)
+-    {
+-        if ((This->joyfd = open(This->joydev->device, O_RDONLY)) == -1)
++        if ((fd = open(This->joydev->device, O_RDONLY)) == -1)
+         {
+             /* Couldn't open the device at all */
+-            ERR("Failed to open device %s: %d %s\n", This->joydev->device, errno, strerror(errno));
+-            IDirectInputDevice2WImpl_Unacquire(iface);
+-            return DIERR_NOTFOUND;
+         }
+         else
+         {
+@@ -715,18 +701,53 @@ static HRESULT WINAPI JoystickWImpl_Acquire(LPDIRECTINPUTDEVICE8W iface)
+         event.type = EV_FF;
+         event.code = FF_GAIN;
+         event.value = This->ff_gain;
+-        if (write(This->joyfd, &event, sizeof(event)) == -1)
++        if (write(fd, &event, sizeof(event)) == -1)
+             ERR("Failed to set gain (%i): %d %s\n", This->ff_gain, errno, strerror(errno));
+         if (!This->ff_autocenter)
+         {
+             /* Disable autocenter. */
+             event.code = FF_AUTOCENTER;
+             event.value = 0;
+-            if (write(This->joyfd, &event, sizeof(event)) == -1)
++            if (write(fd, &event, sizeof(event)) == -1)
+                 ERR("Failed disabling autocenter: %d %s\n", errno, strerror(errno));
+         }
+     }
+ 
++    return fd;
++}
++
++
++const struct dinput_device joystick_linuxinput_device = {
++  "Wine Linux-input joystick driver",
++  joydev_enum_deviceA,
++  joydev_enum_deviceW,
++  joydev_create_device
++};
++
++/******************************************************************************
++  *     Acquire : gets exclusive control of the joystick
++  */
++static HRESULT WINAPI JoystickWImpl_Acquire(LPDIRECTINPUTDEVICE8W iface)
++{
++    JoystickImpl *This = impl_from_IDirectInputDevice8W(iface);
++    HRESULT res;
++
++    TRACE("(this=%p)\n",This);
++
++    if ((res = IDirectInputDevice2WImpl_Acquire(iface)) != DI_OK)
++    {
++        WARN("Failed to acquire: %x\n", res);
++        return res;
++    }
++
++    if ((This->joyfd = joydev_open_evdev(This)) == -1)
++    {
++        ERR("Failed to open device %s: %d %s\n", This->joydev->device, errno, strerror(errno));
++        IDirectInputDevice2WImpl_Unacquire(iface);
++        return DIERR_NOTFOUND;
++    }
++
++    This->joyfd_state = WINE_FD_STATE_OK;
+     return DI_OK;
+ }
+ 
+@@ -764,6 +785,7 @@ static HRESULT WINAPI JoystickWImpl_Unacquire(LPDIRECTINPUTDEVICE8W iface)
+ 
+       close(This->joyfd);
+       This->joyfd = -1;
++      This->joyfd_state = WINE_FD_STATE_CLOSED;
+     }
+     return res;
+ }
+@@ -808,23 +830,79 @@ static void joy_polldev(LPDIRECTINPUTDEVICE8A iface)
+     struct input_event ie;
+     JoystickImpl *This = impl_from_IDirectInputDevice8A(iface);
+ 
+-    if (This->joyfd==-1)
+-	return;
++    if (This->joyfd == -1)
++    {
++        int fd;
++        char namebuf[MAX_PATH + 8];  /* 8 == strlen(EVDEVDRIVER) */
++
++        if (This->joyfd_state != WINE_FD_STATE_DISCONNECTED)
++            return;
++        /* Try to reconnect to the device. */
++        fd = joydev_open_evdev(This);
++        if (fd == -1)
++            return;
++        namebuf[sizeof(namebuf) - strlen(EVDEVDRIVER) - 1] = 0;
++        if (ioctl(fd, EVIOCGNAME(sizeof(namebuf) - strlen(EVDEVDRIVER) - 1), namebuf) == -1)
++        {
++            /* Couldn't get the name; assume it's a different device. */
++            ERR("EVIOCGNAME(%s) failed: %d %s", This->joydev->device, errno, strerror(errno));
++            This->joyfd_state = WINE_FD_STATE_INVALID;
++            return;
++        }
++        strcat(namebuf, EVDEVDRIVER);  /* Guaranteed to be safe. */
++        if (strcmp(namebuf, This->joydev->name) != 0)
++        {
++            ERR("Device %s changed from \"%s\" to \"%s\"!  Can't reconnect.\n", This->joydev->device, This->joydev->name, namebuf);
++            This->joyfd_state = WINE_FD_STATE_INVALID;
++            return;
++        }
++        if (InterlockedCompareExchange(&This->joyfd, fd, -1) == -1)
++        {
++            This->joyfd_state = WINE_FD_STATE_OK;
++            TRACE("Reconnected to \"%s\" on %s", This->joydev->name, This->joydev->device);
++        }
++        else
++        {
++            /* Somebody beat us to it!  Throw away our fd and use theirs. */
++            close(fd);
++        }
++    }
+ 
+     while (1)
+     {
+         LONG value = 0;
+         int inst_id = -1;
++        int result;
+ 
+ 	plfd.fd = This->joyfd;
+ 	plfd.events = POLLIN;
+ 
+-	if (poll(&plfd,1,0) != 1)
+-	    return;
++        result = poll(&plfd,1,0);
++        if (result != 1)
++        {
++            if (result == -1)
++            {
++                ERR("poll failed: %d %s\n", errno, strerror(errno));
++                close(This->joyfd);
++                This->joyfd = -1;
++                This->joyfd_state = WINE_FD_STATE_DISCONNECTED;
++            }
++            return;
++        }
+ 
+ 	/* we have one event, so we can read */
+-	if (sizeof(ie)!=read(This->joyfd,&ie,sizeof(ie)))
+-	    return;
++        result = read(This->joyfd,&ie,sizeof(ie));
++        if (result != sizeof(ie))
++        {
++            if (result == -1)
++            {
++                ERR("read failed: %d %s\n", errno, strerror(errno));
++                close(This->joyfd);
++                This->joyfd = -1;
++                This->joyfd_state = WINE_FD_STATE_DISCONNECTED;
++            }
++            return;
++        }
+ 
+ 	TRACE("input_event: type %d, code %d, value %d\n",ie.type,ie.code,ie.value);
+ 	switch (ie.type) {
+-- 
+1.9.1
+

patches/dinput-reconnect-joystick/definition

@@ -0,0 +1,2 @@
+Fixes: [34297] dinput: Allow reconnecting to disconnected joysticks
+