Release v5.0-rc6

Disabled by request

Causing regressions
https://bugs.winehq.org/show_bug.cgi?id=48419
https://bugs.winehq.org/show_bug.cgi?id=48462

LICENSE.md

@@ -9,7 +9,7 @@ are part of **Wine Staging** and are licensed under the terms of the
 ```
 Copyright (C) 2014-2017 the Wine Staging project authors.
 Copyright (C) 2018 Alistair Leslie-Hughes, Zebediah Figura
-Copyright (C) 2019 Alistair Leslie-Hughes, Zebediah Figura, Paul Gofman
+Copyright (C) 2019-2020 Alistair Leslie-Hughes, Zebediah Figura, Paul Gofman
 
 Wine Staging is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public

patches/activeds-ADsOpenObject/0001-include-Add-adserr.h.patch

@@ -1,16 +1,27 @@
-From f517c6095f355529ccbd44585d22458fb52f9197 Mon Sep 17 00:00:00 2001
+From e5500b9a3c7d36563725dc7975c2436a02165906 Mon Sep 17 00:00:00 2001
 From: Dmitry Timoshkov <dmitry@baikal.ru>
 Date: Fri, 15 Nov 2019 15:46:23 +0800
-Subject: [PATCH 1/5] include: Add adserr.h.
-Content-Type: text/plain; charset=UTF-8
-To: wine-devel@winehq.org
+Subject: [PATCH] include: Add adserr.h.
 
 Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru>
 ---
- include/adserr.h | 50 ++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 50 insertions(+)
+ include/Makefile.in |  1 +
+ include/adserr.h    | 50 +++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 51 insertions(+)
  create mode 100644 include/adserr.h
 
+diff --git a/include/Makefile.in b/include/Makefile.in
+index cbad4d604f..2e0a10d650 100644
+--- a/include/Makefile.in
++++ b/include/Makefile.in
+@@ -7,6 +7,7 @@ SOURCES = \
+ 	activaut.idl \
+ 	activdbg.idl \
+ 	activscp.idl \
++	adserr.h \
+ 	adshlp.h \
+ 	advpub.h \
+ 	af_irda.h \
 diff --git a/include/adserr.h b/include/adserr.h
 new file mode 100644
 index 0000000000..83da568763
@@ -68,5 +79,5 @@ index 0000000000..83da568763
 +
 +#endif /* __ADSERR_H */
 -- 
-2.20.1
+2.17.1
 

patches/advapi32-Token_Integrity_Level/0001-advapi32-tests-Extend-security-label-token-integrity.patch

@@ -1,15 +1,16 @@
-From ba50fc98ee4690e62899d48efc856c2bc910536c Mon Sep 17 00:00:00 2001
+From 8044f571b7e674ce9e562488864d48646a9c7b88 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Mon, 7 Aug 2017 01:25:02 +0200
-Subject: advapi32/tests: Extend security label / token integrity tests.
+Subject: [PATCH] advapi32/tests: Extend security label / token integrity
+ tests.
 
 ---
  dlls/advapi32/tests/Makefile.in |   2 +-
- dlls/advapi32/tests/security.c  | 389 +++++++++++++++++++++++++++++++++++++++-
+ dlls/advapi32/tests/security.c  | 389 +++++++++++++++++++++++++++++++-
  2 files changed, 387 insertions(+), 4 deletions(-)
 
 diff --git a/dlls/advapi32/tests/Makefile.in b/dlls/advapi32/tests/Makefile.in
-index 36ce031ef62..4437e6e5de7 100644
+index 12583e59f57..caee5fae308 100644
 --- a/dlls/advapi32/tests/Makefile.in
 +++ b/dlls/advapi32/tests/Makefile.in
 @@ -1,5 +1,5 @@
@@ -20,10 +21,10 @@ index 36ce031ef62..4437e6e5de7 100644
  C_SRCS = \
  	cred.c \
 diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
-index 0fd41fe82fa..4a03db27e69 100644
+index a736dbffd22..4529469d932 100644
 --- a/dlls/advapi32/tests/security.c
 +++ b/dlls/advapi32/tests/security.c
-@@ -7191,13 +7191,19 @@ static void test_token_security_descriptor(void)
+@@ -7034,13 +7034,19 @@ static void test_token_security_descriptor(void)
  {
      static SID low_level = {SID_REVISION, 1, {SECURITY_MANDATORY_LABEL_AUTHORITY},
                              {SECURITY_MANDATORY_LOW_RID}};
@@ -46,7 +47,7 @@ index 0fd41fe82fa..4a03db27e69 100644
      PROCESS_INFORMATION info;
      DWORD size, index, retd;
      ACCESS_ALLOWED_ACE *ace;
-@@ -7347,6 +7353,185 @@ static void test_token_security_descriptor(void)
+@@ -7190,6 +7196,185 @@ static void test_token_security_descriptor(void)
      /* The security label is also not inherited */
      if (pAddMandatoryAce)
      {
@@ -103,7 +104,7 @@ index 0fd41fe82fa..4a03db27e69 100644
 +
 +            if (sacl)
 +            {
-+                ret = pGetAce(sacl, 0, (void **)&ace);
++                ret = GetAce(sacl, 0, (void **)&ace);
 +                ok(ret, "GetAce failed with error %u\n", GetLastError());
 +                ok(ace->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE,
 +                   "Unexpected ACE type %#x\n", ace->Header.AceType);
@@ -165,7 +166,7 @@ index 0fd41fe82fa..4a03db27e69 100644
 +
 +            if (sacl)
 +            {
-+                ret = pGetAce(sacl, 0, (void **)&ace);
++                ret = GetAce(sacl, 0, (void **)&ace);
 +                ok(ret, "GetAce failed with error %u\n", GetLastError());
 +                ok(ace->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE,
 +                   "Unexpected ACE type %#x\n", ace->Header.AceType);
@@ -215,7 +216,7 @@ index 0fd41fe82fa..4a03db27e69 100644
 +
 +            if (sacl)
 +            {
-+                ret = pGetAce(sacl, 0, (void **)&ace);
++                ret = GetAce(sacl, 0, (void **)&ace);
 +                ok(ret, "GetAce failed with error %u\n", GetLastError());
 +                ok(ace->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE,
 +                   "Unexpected ACE type %#x\n", ace->Header.AceType);
@@ -232,7 +233,7 @@ index 0fd41fe82fa..4a03db27e69 100644
          ret = InitializeAcl(acl, 256, ACL_REVISION);
          ok(ret, "InitializeAcl failed with error %u\n", GetLastError());
  
-@@ -7362,6 +7547,90 @@ static void test_token_security_descriptor(void)
+@@ -7205,6 +7390,90 @@ static void test_token_security_descriptor(void)
  
          ret = SetKernelObjectSecurity(token, LABEL_SECURITY_INFORMATION, sd);
          ok(ret, "SetKernelObjectSecurity failed with error %u\n", GetLastError());
@@ -272,7 +273,7 @@ index 0fd41fe82fa..4a03db27e69 100644
 +
 +        if (sacl)
 +        {
-+            ret = pGetAce(sacl, 0, (void **)&ace);
++            ret = GetAce(sacl, 0, (void **)&ace);
 +            ok(ret, "GetAce failed with error %u\n", GetLastError());
 +            ok(ace->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE,
 +               "Unexpected ACE type %#x\n", ace->Header.AceType);
@@ -310,7 +311,7 @@ index 0fd41fe82fa..4a03db27e69 100644
 +
 +        if (sacl)
 +        {
-+            ret = pGetAce(sacl, 0, (void **)&ace);
++            ret = GetAce(sacl, 0, (void **)&ace);
 +            ok(ret, "GetAce failed with error %u\n", GetLastError());
 +            ok(ace->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE,
 +               "Unexpected ACE type %#x\n", ace->Header.AceType);
@@ -323,7 +324,7 @@ index 0fd41fe82fa..4a03db27e69 100644
      }
      else
          win_skip("SYSTEM_MANDATORY_LABEL not supported\n");
-@@ -7467,6 +7736,116 @@ static void test_child_token_sd(void)
+@@ -7312,6 +7581,116 @@ static void test_child_token_sd(void)
      HeapFree(GetProcessHeap(), 0, sd);
  }
  
@@ -366,7 +367,7 @@ index 0fd41fe82fa..4a03db27e69 100644
 +    ok(acl && acl != (void *)0xdeadbeef, "Got invalid SACL\n");
 +    ok(!defaulted, "SACL defaulted\n");
 +    ok(acl->AceCount == 1, "Expected exactly one ACE\n");
-+    ret = pGetAce(acl, 0, (void **)&ace_label);
++    ret = GetAce(acl, 0, (void **)&ace_label);
 +    ok(ret, "GetAce failed with error %u\n", GetLastError());
 +    ok(ace_label->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE,
 +       "Unexpected ACE type %#x\n", ace_label->Header.AceType);
@@ -421,7 +422,7 @@ index 0fd41fe82fa..4a03db27e69 100644
 +    ok(acl && acl != (void *)0xdeadbeef, "Got invalid SACL\n");
 +    ok(!defaulted, "SACL defaulted\n");
 +    ok(acl->AceCount == 1, "Expected exactly one ACE\n");
-+    ret = pGetAce(acl, 0, (void **)&ace_label);
++    ret = GetAce(acl, 0, (void **)&ace_label);
 +    ok(ret, "GetAce failed with error %u\n", GetLastError());
 +    ok(ace_label->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE,
 +       "Unexpected ACE type %#x\n", ace_label->Header.AceType);
@@ -440,7 +441,7 @@ index 0fd41fe82fa..4a03db27e69 100644
  static void test_GetExplicitEntriesFromAclW(void)
  {
      static const WCHAR wszCurrentUser[] = { 'C','U','R','R','E','N','T','_','U','S','E','R','\0'};
-@@ -7653,6 +8032,10 @@ START_TEST(security)
+@@ -7571,6 +7950,10 @@ START_TEST(security)
      {
          if (!strcmp(myARGV[2], "test_token_sd"))
              test_child_token_sd();
@@ -452,5 +453,5 @@ index 0fd41fe82fa..4a03db27e69 100644
              test_process_security_child();
          return;
 -- 
-2.13.1
+2.17.1
 

patches/combase-GetRestrictedErrorInfo/0002-combase-Add-GetRestrictedErrorInfo-and-RoOriginateLa.patch

@@ -1,105 +0,0 @@
-From 61b96f3dab24d3aec26237c8760d75f964474bc5 Mon Sep 17 00:00:00 2001
-From: Louis Lenders <xerox.xerox2000x@gmail.com>
-Date: Mon, 8 Apr 2019 17:06:58 +0200
-Subject: [PATCH 2/2] combase: Add GetRestrictedErrorInfo and
- RoOriginateLanguageException stubs.
-
-Signed-off-by: Louis Lenders <xerox.xerox2000x@gmail.com>
----
- .../api-ms-win-core-winrt-error-l1-1-0.spec           |  2 +-
- .../api-ms-win-core-winrt-error-l1-1-1.spec           |  4 ++--
- dlls/combase/combase.spec                             |  4 ++--
- dlls/combase/roapi.c                                  | 19 +++++++++++++++++++
- 4 files changed, 24 insertions(+), 5 deletions(-)
-
-diff --git a/dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec b/dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec
-index de0a6d8..99f1ca3 100644
---- a/dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec
-+++ b/dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec
-@@ -1,4 +1,4 @@
--@ stub GetRestrictedErrorInfo
-+@ stdcall GetRestrictedErrorInfo(ptr) combase.GetRestrictedErrorInfo
- @ stub RoCaptureErrorContext
- @ stub RoFailFastWithErrorContext
- @ stub RoGetErrorReportingFlags
-diff --git a/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec b/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec
-index b1ad813..0b390f1 100644
---- a/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec
-+++ b/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec
-@@ -1,4 +1,4 @@
--@ stub GetRestrictedErrorInfo
-+@ stdcall GetRestrictedErrorInfo(ptr) combase.GetRestrictedErrorInfo
- @ stub IsErrorPropagationEnabled
- @ stub RoCaptureErrorContext
- @ stub RoClearError
-@@ -9,7 +9,7 @@
- @ stub RoInspectThreadErrorInfo
- @ stub RoOriginateError
- @ stub RoOriginateErrorW
--@ stub RoOriginateLanguageException
-+@ stdcall RoOriginateLanguageException(long ptr ptr) combase.RoOriginateLanguageException
- @ stub RoReportFailedDelegate
- @ stub RoReportUnhandledError
- @ stub RoResolveRestrictedErrorInfoReference
-diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec
-index 93575d5..f67527a 100644
---- a/dlls/combase/combase.spec
-+++ b/dlls/combase/combase.spec
-@@ -180,7 +180,7 @@
- @ stub GetFuncDescs
- @ stdcall GetHGlobalFromStream(ptr ptr) ole32.GetHGlobalFromStream
- @ stub GetHookInterface
--@ stub GetRestrictedErrorInfo
-+@ stdcall GetRestrictedErrorInfo(ptr)
- @ stub HSTRING_UserFree
- @ stub HSTRING_UserFree64
- @ stub HSTRING_UserMarshal
-@@ -260,7 +260,7 @@
- @ stub RoInspectThreadErrorInfo
- @ stub RoOriginateError
- @ stub RoOriginateErrorW
--@ stub RoOriginateLanguageException
-+@ stdcall RoOriginateLanguageException(long ptr ptr)
- @ stub RoParameterizedTypeExtraGetTypeSignature
- @ stdcall RoRegisterActivationFactories(ptr ptr long ptr)
- @ stdcall RoRegisterForApartmentShutdown(ptr ptr ptr)
-diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c
-index c9fe80f..2a6dcdf 100644
---- a/dlls/combase/roapi.c
-+++ b/dlls/combase/roapi.c
-@@ -21,6 +21,7 @@
- #include "initguid.h"
- #include "roapi.h"
- #include "roparameterizediid.h"
-+#include "restrictederrorinfo.h"
- #include "winstring.h"
- 
- #include "wine/debug.h"
-@@ -276,6 +277,24 @@ HRESULT WINAPI RoRegisterActivationFactories(HSTRING *classes, PFNGETACTIVATIONF
- }
- 
- /***********************************************************************
-+ *      GetRestrictedErrorInfo (combase.@)
-+ */
-+HRESULT WINAPI GetRestrictedErrorInfo( IRestrictedErrorInfo **info )
-+{
-+    FIXME( "(%p)\n", info );
-+    return E_NOTIMPL;
-+}
-+
-+/***********************************************************************
-+ *      RoOriginateLanguageException (combase.@)
-+ */
-+BOOL WINAPI RoOriginateLanguageException( HRESULT error, HSTRING message, IUnknown *language_exception )
-+{
-+    FIXME("(%x %s %p) stub\n", error, debugstr_hstring(message), language_exception);
-+    return FALSE;
-+}
-+
-+/***********************************************************************
-  *      CleanupTlsOleState (combase.@)
-  */
- void WINAPI CleanupTlsOleState(void *unknown)
--- 
-1.9.1
-

patches/combase-GetRestrictedErrorInfo/definition

@@ -1 +0,0 @@
-Fixes: [46972] combase: Add GetRestrictedErrorInfo/RoOriginateLanguageException stubs.

patches/comctl32-Listview_DrawItem/0001-comctl32-Preserve-custom-colors-between-subitems.patch

@@ -56,57 +56,6 @@ index 56e2563..a35f5f2 100644
  
              if (subitemstage & CDRF_NOTIFYPOSTPAINT)
                  subitemstage = notify_customdraw(infoPtr, CDDS_SUBITEM | CDDS_ITEMPOSTPAINT, &nmlvcd);
-diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c
-index ec87e3b..eb4db0e 100644
---- a/dlls/comctl32/tests/listview.c
-+++ b/dlls/comctl32/tests/listview.c
-@@ -1830,12 +1830,16 @@ static LRESULT WINAPI cd_wndproc(HWND hwnd, UINT message, WPARAM wParam, LPARAM
-                 clr = GetBkColor(nmlvcd->nmcd.hdc);
-                 ok(nmlvcd->clrTextBk == CLR_DEFAULT, "got 0x%x\n", nmlvcd->clrTextBk);
-                 ok(nmlvcd->clrText == RGB(0, 255, 0), "got 0x%x\n", nmlvcd->clrText);
--                todo_wine_if(nmlvcd->iSubItem)
--                    ok(clr == c0ffee, "clr=%.8x\n", clr);
-+                if (!(GetWindowLongW(nmhdr->hwndFrom, GWL_STYLE) & LVS_SHOWSELALWAYS))
-+                {
-+                    todo_wine_if(nmlvcd->iSubItem)
-+                        ok(clr == c0ffee, "clr=%.8x\n", clr);
-+                }
-                 return CDRF_NOTIFYPOSTPAINT;
-             case CDDS_ITEMPOSTPAINT | CDDS_SUBITEM:
-                 clr = GetBkColor(nmlvcd->nmcd.hdc);
--                todo_wine ok(clr == c0ffee, "clr=%.8x\n", clr);
-+                if (!(GetWindowLongW(nmhdr->hwndFrom, GWL_STYLE) & LVS_SHOWSELALWAYS))
-+                    todo_wine ok(clr == c0ffee, "clr=%.8x\n", clr);
-                 ok(nmlvcd->clrTextBk == CLR_DEFAULT, "got 0x%x\n", nmlvcd->clrTextBk);
-                 ok(nmlvcd->clrText == RGB(0, 255, 0), "got 0x%x\n", nmlvcd->clrText);
-                 return CDRF_DODEFAULT;
-@@ -1851,6 +1855,7 @@ static void test_customdraw(void)
- {
-     HWND hwnd;
-     WNDPROC oldwndproc;
-+    LVITEMA item;
- 
-     hwnd = create_listview_control(LVS_REPORT);
- 
-@@ -1870,6 +1875,18 @@ static void test_customdraw(void)
-     UpdateWindow(hwnd);
-     ok_sequence(sequences, PARENT_CD_SEQ_INDEX, parent_report_cd_seq, "parent customdraw, LVS_REPORT", FALSE);
- 
-+    /* check colors when item is selected */
-+    SetWindowLongW(hwnd, GWL_STYLE, GetWindowLongW(hwnd, GWL_STYLE) | LVS_SHOWSELALWAYS);
-+    item.mask = LVIF_STATE;
-+    item.stateMask = LVIS_SELECTED;
-+    item.state = LVIS_SELECTED;
-+    SendMessageA(hwnd, LVM_SETITEMSTATE, 0, (LPARAM)&item);
-+
-+    flush_sequences(sequences, NUM_MSG_SEQUENCES);
-+    InvalidateRect(hwnd, NULL, TRUE);
-+    UpdateWindow(hwnd);
-+    ok_sequence(sequences, PARENT_CD_SEQ_INDEX, parent_report_cd_seq, "parent customdraw, LVS_REPORT, selection", FALSE);
-+
-     DestroyWindow(hwnd);
- 
-     hwnd = create_listview_control(LVS_LIST);
 -- 
 2.9.0
 

patches/comctl32-version_6/0001-comctl32-Bump-version-to-6.0.patch

@@ -0,0 +1,57 @@
+From ad23e816eb724d81032306f8ac6d4faa96ccaf4a Mon Sep 17 00:00:00 2001
+From: Dmitry Timoshkov <dmitry@baikal.ru>
+Date: Tue, 12 Nov 2019 18:13:20 +0800
+Subject: [PATCH] comctl32: Bump version to 6.0.
+
+An application that I have here checks comctl32.dll version information
+and refuses to run, changing DLL version to 6.0 makes it run.
+
+Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru>
+---
+ dlls/comctl32/comctl32.h  | 2 +-
+ dlls/comctl32/comctl32.rc | 2 +-
+ include/commctrl.h        | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/dlls/comctl32/comctl32.h b/dlls/comctl32/comctl32.h
+index 78e97983381..42b434a96d9 100644
+--- a/dlls/comctl32/comctl32.h
++++ b/dlls/comctl32/comctl32.h
+@@ -192,7 +192,7 @@ INT  Str_GetPtrAtoW (LPCSTR lpSrc, LPWSTR lpDest, INT nMaxLen) DECLSPEC_HIDDEN;
+ BOOL Str_SetPtrAtoW (LPWSTR *lppDest, LPCSTR lpSrc) DECLSPEC_HIDDEN;
+ BOOL Str_SetPtrWtoA (LPSTR *lppDest, LPCWSTR lpSrc) DECLSPEC_HIDDEN;
+ 
+-#define COMCTL32_VERSION_MINOR 81
++#define COMCTL32_VERSION_MINOR 0
+ 
+ /* Our internal stack structure of the window procedures to subclass */
+ typedef struct _SUBCLASSPROCS {
+diff --git a/dlls/comctl32/comctl32.rc b/dlls/comctl32/comctl32.rc
+index c9aa1ba6253..be6e2425193 100644
+--- a/dlls/comctl32/comctl32.rc
++++ b/dlls/comctl32/comctl32.rc
+@@ -114,7 +114,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+ #define WINE_FILEDESCRIPTION_STR "Wine Common Controls"
+ #define WINE_FILENAME_STR "comctl32.dll"
+ #define WINE_FILEVERSION COMCTL32_VERSION, COMCTL32_VERSION_MINOR, 4704, 1100
+-#define WINE_FILEVERSION_STR "5.81"
++#define WINE_FILEVERSION_STR "6.00.4704.1100"
+ #define WINE_PRODUCTVERSION WINE_FILEVERSION
+ #define WINE_PRODUCTVERSION_STR WINE_FILEVERSION_STR
+ 
+diff --git a/include/commctrl.h b/include/commctrl.h
+index 700b335fbb7..029a4b45457 100644
+--- a/include/commctrl.h
++++ b/include/commctrl.h
+@@ -51,7 +51,7 @@ enum _LI_METRIC
+ HRESULT WINAPI LoadIconWithScaleDown(HINSTANCE, const WCHAR *, int, int, HICON *);
+ HRESULT WINAPI LoadIconMetric(HINSTANCE, const WCHAR *, int, HICON *);
+ 
+-#define COMCTL32_VERSION                5  /* dll version */
++#define COMCTL32_VERSION                6  /* dll version */
+ 
+ #ifndef _WIN32_IE
+ #define _WIN32_IE 0x0400
+-- 
+2.24.1
+

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

@@ -1,18 +1,18 @@
-From 47a1e3618a1629a6f7cca1b84f761eaab3627f75 Mon Sep 17 00:00:00 2001
+From e72af998f5382092726cfdb4d57c3b5f8b7d5401 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 +++++++++++++++++++++++++++++---------
+ 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
+index b5418d805cc..2434af600ac 100644
 --- a/dlls/dinput/joystick_linuxinput.c
 +++ b/dlls/dinput/joystick_linuxinput.c
-@@ -83,6 +83,13 @@ struct wine_input_absinfo {
+@@ -84,6 +84,13 @@ struct wine_input_absinfo {
      LONG flat;
  };
  
@@ -26,7 +26,7 @@ index ace4641..233dd25 100644
  /* 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
+@@ -123,6 +130,7 @@ struct JoystickImpl
  
  	/* joystick private */
  	int				joyfd;
@@ -34,7 +34,7 @@ index ace4641..233dd25 100644
  
  	int                             dev_axes_to_di[ABS_MAX];
          POINTL                          povs[4];
-@@ -466,6 +474,7 @@ static JoystickImpl *alloc_device(REFGUID rguid, IDirectInputImpl *dinput, unsig
+@@ -473,6 +481,7 @@ static JoystickImpl *alloc_device(REFGUID rguid, IDirectInputImpl *dinput, unsig
      newDevice->generic.base.dinput = dinput;
      newDevice->generic.joy_polldev = joy_polldev;
      newDevice->joyfd       = -1;
@@ -42,7 +42,7 @@ index ace4641..233dd25 100644
      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
+@@ -680,38 +689,15 @@ static HRESULT joydev_create_device(IDirectInputImpl *dinput, REFGUID rguid, REF
      return DIERR_DEVICENOTREG;
  }
  
@@ -85,7 +85,7 @@ index ace4641..233dd25 100644
          }
          else
          {
-@@ -715,18 +701,53 @@ static HRESULT WINAPI JoystickWImpl_Acquire(LPDIRECTINPUTDEVICE8W iface)
+@@ -726,18 +712,53 @@ static HRESULT WINAPI JoystickWImpl_Acquire(LPDIRECTINPUTDEVICE8W iface)
          event.type = EV_FF;
          event.code = FF_GAIN;
          event.value = This->ff_gain;
@@ -141,7 +141,7 @@ index ace4641..233dd25 100644
      return DI_OK;
  }
  
-@@ -764,6 +785,7 @@ static HRESULT WINAPI JoystickWImpl_Unacquire(LPDIRECTINPUTDEVICE8W iface)
+@@ -775,6 +796,7 @@ static HRESULT WINAPI JoystickWImpl_Unacquire(LPDIRECTINPUTDEVICE8W iface)
  
        close(This->joyfd);
        This->joyfd = -1;
@@ -149,7 +149,7 @@ index ace4641..233dd25 100644
      }
      return res;
  }
-@@ -808,23 +830,79 @@ static void joy_polldev(LPDIRECTINPUTDEVICE8A iface)
+@@ -819,23 +841,79 @@ static void joy_polldev(LPDIRECTINPUTDEVICE8A iface)
      struct input_event ie;
      JoystickImpl *This = impl_from_IDirectInputDevice8A(iface);
  
@@ -236,5 +236,5 @@ index ace4641..233dd25 100644
  	TRACE("input_event: type %d, code %d, value %d\n",ie.type,ie.code,ie.value);
  	switch (ie.type) {
 -- 
-1.9.1
+2.17.1
 

patches/dinput-reconnect-joystick/definition

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

patches/dsound-SRW/0001-dsound-Use-an-SRW-lock-for-buffer_list_lock.patch

@@ -0,0 +1,166 @@
+From 410d340084e24732e3d7423f74dbe8aa92dddd09 Mon Sep 17 00:00:00 2001
+From: Zebediah Figura <z.figura12@gmail.com>
+Date: Thu, 9 Jan 2020 14:51:36 -0600
+Subject: [PATCH] dsound: Use an SRW lock for buffer_list_lock.
+
+Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48408
+
+Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
+---
+ dlls/dsound/buffer.c         |  4 ++--
+ dlls/dsound/dsound.c         | 15 +++++++--------
+ dlls/dsound/dsound_private.h |  2 +-
+ dlls/dsound/mixer.c          |  4 ++--
+ dlls/dsound/primary.c        |  4 ++--
+ 5 files changed, 14 insertions(+), 15 deletions(-)
+
+diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c
+index c61868a7820..82a23eb8907 100644
+--- a/dlls/dsound/buffer.c
++++ b/dlls/dsound/buffer.c
+@@ -644,7 +644,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Unlock(IDirectSoundBuffer8 *iface,
+ 
+ 	if (x1 || x2)
+ 	{
+-		RtlAcquireResourceShared(&This->device->buffer_list_lock, TRUE);
++		AcquireSRWLockShared(&This->device->buffer_list_lock);
+ 		LIST_FOR_EACH_ENTRY(iter, &This->buffer->buffers, IDirectSoundBufferImpl, entry )
+ 		{
+ 			RtlAcquireResourceShared(&iter->lock, TRUE);
+@@ -665,7 +665,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Unlock(IDirectSoundBuffer8 *iface,
+ 			}
+ 			RtlReleaseResource(&iter->lock);
+ 		}
+-		RtlReleaseResource(&This->device->buffer_list_lock);
++		ReleaseSRWLockShared(&This->device->buffer_list_lock);
+ 	}
+ 
+ 	return hres;
+diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c
+index 4dcea9e29e9..e991210621f 100644
+--- a/dlls/dsound/dsound.c
++++ b/dlls/dsound/dsound.c
+@@ -181,7 +181,7 @@ static HRESULT DirectSoundDevice_Create(DirectSoundDevice ** ppDevice)
+     InitializeCriticalSection(&(device->mixlock));
+     device->mixlock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": DirectSoundDevice.mixlock");
+ 
+-    RtlInitializeResource(&(device->buffer_list_lock));
++    InitializeSRWLock(&device->buffer_list_lock);
+ 
+     init_eax_device(device);
+ 
+@@ -242,7 +242,6 @@ static ULONG DirectSoundDevice_Release(DirectSoundDevice * device)
+         HeapFree(GetProcessHeap(), 0, device->tmp_buffer);
+         HeapFree(GetProcessHeap(), 0, device->cp_buffer);
+         HeapFree(GetProcessHeap(), 0, device->buffer);
+-        RtlDeleteResource(&device->buffer_list_lock);
+         device->mixlock.DebugInfo->Spare[0] = 0;
+         DeleteCriticalSection(&device->mixlock);
+         HeapFree(GetProcessHeap(),0,device);
+@@ -616,7 +615,7 @@ HRESULT DirectSoundDevice_AddBuffer(
+ 
+     TRACE("(%p, %p)\n", device, pDSB);
+ 
+-    RtlAcquireResourceExclusive(&(device->buffer_list_lock), TRUE);
++    AcquireSRWLockExclusive(&device->buffer_list_lock);
+ 
+     if (device->buffers)
+         newbuffers = HeapReAlloc(GetProcessHeap(),0,device->buffers,sizeof(IDirectSoundBufferImpl*)*(device->nrofbuffers+1));
+@@ -633,7 +632,7 @@ HRESULT DirectSoundDevice_AddBuffer(
+         hr = DSERR_OUTOFMEMORY;
+     }
+ 
+-    RtlReleaseResource(&(device->buffer_list_lock));
++    ReleaseSRWLockExclusive(&device->buffer_list_lock);
+ 
+     return hr;
+ }
+@@ -648,7 +647,7 @@ void DirectSoundDevice_RemoveBuffer(DirectSoundDevice * device, IDirectSoundBuff
+ 
+     TRACE("(%p, %p)\n", device, pDSB);
+ 
+-    RtlAcquireResourceExclusive(&(device->buffer_list_lock), TRUE);
++    AcquireSRWLockExclusive(&device->buffer_list_lock);
+ 
+     if (device->nrofbuffers == 1) {
+         assert(device->buffers[0] == pDSB);
+@@ -666,7 +665,7 @@ void DirectSoundDevice_RemoveBuffer(DirectSoundDevice * device, IDirectSoundBuff
+     device->nrofbuffers--;
+     TRACE("buffer count is now %d\n", device->nrofbuffers);
+ 
+-    RtlReleaseResource(&(device->buffer_list_lock));
++    ReleaseSRWLockExclusive(&device->buffer_list_lock);
+ }
+ 
+ /*******************************************************************************
+@@ -873,14 +872,14 @@ static HRESULT WINAPI IDirectSound8Impl_SetCooperativeLevel(IDirectSound8 *iface
+              level==DSSCL_PRIORITY ? "DSSCL_PRIORITY" : "DSSCL_EXCLUSIVE");
+     }
+ 
+-    RtlAcquireResourceExclusive(&device->buffer_list_lock, TRUE);
++    AcquireSRWLockExclusive(&device->buffer_list_lock);
+     EnterCriticalSection(&device->mixlock);
+     if ((level == DSSCL_WRITEPRIMARY) != (device->priolevel == DSSCL_WRITEPRIMARY))
+         hr = DSOUND_ReopenDevice(device, level == DSSCL_WRITEPRIMARY);
+     if (SUCCEEDED(hr))
+         device->priolevel = level;
+     LeaveCriticalSection(&device->mixlock);
+-    RtlReleaseResource(&device->buffer_list_lock);
++    ReleaseSRWLockExclusive(&device->buffer_list_lock);
+     return hr;
+ }
+ 
+diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
+index dcb67d56948..87786c6b11b 100644
+--- a/dlls/dsound/dsound_private.h
++++ b/dlls/dsound/dsound_private.h
+@@ -83,7 +83,7 @@ struct DirectSoundDevice
+     DWORD                       writelead, buflen, ac_frames, frag_frames, playpos, pad, stopped;
+     int                         nrofbuffers;
+     IDirectSoundBufferImpl**    buffers;
+-    RTL_RWLOCK                  buffer_list_lock;
++    RTL_SRWLOCK                 buffer_list_lock;
+     CRITICAL_SECTION            mixlock;
+     IDirectSoundBufferImpl     *primary;
+     DWORD                       speaker_config;
+diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c
+index 023622a9f98..3006d249d43 100644
+--- a/dlls/dsound/mixer.c
++++ b/dlls/dsound/mixer.c
+@@ -856,9 +856,9 @@ DWORD CALLBACK DSOUND_mixthread(void *p)
+ 		if (!dev->ref)
+ 			break;
+ 
+-		RtlAcquireResourceShared(&(dev->buffer_list_lock), TRUE);
++		AcquireSRWLockShared(&dev->buffer_list_lock);
+ 		DSOUND_PerformMix(dev);
+-		RtlReleaseResource(&(dev->buffer_list_lock));
++		ReleaseSRWLockShared(&dev->buffer_list_lock);
+ 	}
+ 	return 0;
+ }
+diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c
+index 852ec51b7ff..8d42fe0ed90 100644
+--- a/dlls/dsound/primary.c
++++ b/dlls/dsound/primary.c
+@@ -472,7 +472,7 @@ HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX passe
+ 	}
+ 
+ 	/* **** */
+-	RtlAcquireResourceExclusive(&(device->buffer_list_lock), TRUE);
++	AcquireSRWLockExclusive(&device->buffer_list_lock);
+ 	EnterCriticalSection(&(device->mixlock));
+ 
+ 	if (device->priolevel == DSSCL_WRITEPRIMARY) {
+@@ -508,7 +508,7 @@ HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX passe
+ 
+ out:
+ 	LeaveCriticalSection(&(device->mixlock));
+-	RtlReleaseResource(&(device->buffer_list_lock));
++	ReleaseSRWLockExclusive(&device->buffer_list_lock);
+ 	/* **** */
+ 
+ 	return err;
+-- 
+2.24.1
+

patches/dsound-SRW/definition

@@ -0,0 +1 @@
+Fixes: [48408] dsound: Use an SRW lock for buffer_list_lock.

patches/dxva2-Video_Decoder/0001-dxva2-Implement-semi-stub-for-Direct3DDeviceManager9.patch

@@ -1,4 +1,4 @@
-From 34fefc056a65053060d7de738087f2527b7ed6bb Mon Sep 17 00:00:00 2001
+From 32344f3d3cb10c07b4dc2c5547d2226e293f730b Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Tue, 10 Feb 2015 16:34:05 +0100
 Subject: [PATCH] dxva2: Implement semi-stub for Direct3DDeviceManager9
@@ -6,15 +6,15 @@ Subject: [PATCH] dxva2: Implement semi-stub for Direct3DDeviceManager9
 
 ---
  dlls/dxva2/Makefile.in     |   2 +
- dlls/dxva2/devicemanager.c | 212 +++++++++++++++++++++++++++++++++++++
+ dlls/dxva2/devicemanager.c | 213 +++++++++++++++++++++++++++++++++++++
  dlls/dxva2/dxva2_private.h |  21 ++++
  dlls/dxva2/main.c          |   7 +-
- 4 files changed, 240 insertions(+), 2 deletions(-)
+ 4 files changed, 241 insertions(+), 2 deletions(-)
  create mode 100644 dlls/dxva2/devicemanager.c
  create mode 100644 dlls/dxva2/dxva2_private.h
 
 diff --git a/dlls/dxva2/Makefile.in b/dlls/dxva2/Makefile.in
-index 44e125e9b5f..5c3e3842d79 100644
+index 44e125e9b5..5c3e3842d7 100644
 --- a/dlls/dxva2/Makefile.in
 +++ b/dlls/dxva2/Makefile.in
 @@ -1,6 +1,8 @@
@@ -28,10 +28,10 @@ index 44e125e9b5f..5c3e3842d79 100644
  	main.c
 diff --git a/dlls/dxva2/devicemanager.c b/dlls/dxva2/devicemanager.c
 new file mode 100644
-index 00000000000..15d78aa7ff0
+index 0000000000..bba0fbc619
 --- /dev/null
 +++ b/dlls/dxva2/devicemanager.c
-@@ -0,0 +1,212 @@
+@@ -0,0 +1,213 @@
 +/*
 + * Copyright 2014 Sebastian Lackner for Pipelight
 + *
@@ -187,6 +187,7 @@ index 00000000000..15d78aa7ff0
 +    FIXME("(%p)->(%p, %p, %d): semi-stub\n", This, hDevice, ppDevice, fBlock);
 +
 +    *ppDevice = (IDirect3DDevice9 *)hDevice;
++    IDirect3DDevice9_AddRef(*ppDevice);
 +    return S_OK;
 +}
 +
@@ -246,7 +247,7 @@ index 00000000000..15d78aa7ff0
 +}
 diff --git a/dlls/dxva2/dxva2_private.h b/dlls/dxva2/dxva2_private.h
 new file mode 100644
-index 00000000000..d6e59fc6da8
+index 0000000000..d6e59fc6da
 --- /dev/null
 +++ b/dlls/dxva2/dxva2_private.h
 @@ -0,0 +1,21 @@
@@ -272,7 +273,7 @@ index 00000000000..d6e59fc6da8
 +
 +extern HRESULT devicemanager_create( UINT *resetToken, void **ppv ) DECLSPEC_HIDDEN;
 diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c
-index 782f0dfa3d4..df8f2030104 100644
+index 782f0dfa3d..df8f203010 100644
 --- a/dlls/dxva2/main.c
 +++ b/dlls/dxva2/main.c
 @@ -19,8 +19,11 @@
@@ -300,5 +301,5 @@ index 782f0dfa3d4..df8f2030104 100644
  
  HRESULT WINAPI DXVA2CreateVideoService( IDirect3DDevice9 *device, REFIID riid, void **ppv )
 -- 
-2.20.1
+2.17.1
 

patches/gdiplus-DC_Handling/0001-gdiplus-Ignore-an-externally-set-DC-origin.patch

@@ -1,28 +0,0 @@
-From 36195993f4774dc100437f2aef60201041ee752a Mon Sep 17 00:00:00 2001
-From: Dmitry Timoshkov <dmitry@baikal.ru>
-Date: Mon, 26 Dec 2016 21:17:29 +0800
-Subject: gdiplus: Ignore an externally set DC origin.
-
-gdiplus maintains its own graphics state.
-
-FIXME: perhaps some other places need a similar fix.
----
- dlls/gdiplus/graphics.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c
-index f9a6f3e..e086dfc 100644
---- a/dlls/gdiplus/graphics.c
-+++ b/dlls/gdiplus/graphics.c
-@@ -497,6 +497,8 @@ static GpStatus alpha_blend_pixels_hrgn(GpGraphics *graphics, INT dst_x, INT dst
- 
-         save = SaveDC(graphics->hdc);
- 
-+        SetViewportOrgEx(graphics->hdc, 0, 0, NULL);
-+
-         if (hrgn)
-             ExtSelectClipRgn(graphics->hdc, hrgn, RGN_AND);
- 
--- 
-2.9.0
-

patches/gdiplus-DC_Handling/definition

@@ -1,2 +0,0 @@
-# Fixes: [35372] Ignore externally set DC state in gdiplus
-Disabled: true

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

@@ -1,4 +1,4 @@
-From e51af93f24d248e0f20fe0688c2dba4a6f3f9344 Mon Sep 17 00:00:00 2001
+From 7889f94f7680ac2a42e279f7a6e8662e0748a4b9 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sat, 4 Feb 2017 16:20:37 +0100
 Subject: [PATCH] kernel32: Implement some processor group functions.
@@ -13,7 +13,7 @@ Subject: [PATCH] kernel32: Implement some processor group functions.
  6 files changed, 49 insertions(+), 10 deletions(-)
 
 diff --git a/dlls/api-ms-win-core-kernel32-legacy-l1-1-0/api-ms-win-core-kernel32-legacy-l1-1-0.spec b/dlls/api-ms-win-core-kernel32-legacy-l1-1-0/api-ms-win-core-kernel32-legacy-l1-1-0.spec
-index e653ac6d2..b6af37ab0 100644
+index e653ac6d212..b6af37ab0aa 100644
 --- a/dlls/api-ms-win-core-kernel32-legacy-l1-1-0/api-ms-win-core-kernel32-legacy-l1-1-0.spec
 +++ b/dlls/api-ms-win-core-kernel32-legacy-l1-1-0/api-ms-win-core-kernel32-legacy-l1-1-0.spec
 @@ -21,7 +21,7 @@
@@ -26,7 +26,7 @@ index e653ac6d2..b6af37ab0 100644
  @ stdcall GetNamedPipeServerProcessId(long ptr) kernel32.GetNamedPipeServerProcessId
  @ stdcall GetShortPathNameA(str ptr long) kernel32.GetShortPathNameA
 diff --git a/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec b/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec
-index fd1a0bcf0..b281fd963 100644
+index 4998af04d9b..5ce8e24713b 100644
 --- a/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec
 +++ b/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec
 @@ -26,7 +26,7 @@
@@ -39,10 +39,10 @@ index fd1a0bcf0..b281fd963 100644
  @ stdcall GetNamedPipeServerProcessId(long ptr) kernel32.GetNamedPipeServerProcessId
  @ stdcall GetNumaAvailableMemoryNodeEx(long ptr) kernel32.GetNumaAvailableMemoryNodeEx
 diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c
-index 0849ac551..f0b06dcc1 100644
+index 993bc8588f4..199a54b9deb 100644
 --- a/dlls/kernel32/cpu.c
 +++ b/dlls/kernel32/cpu.c
-@@ -122,7 +122,9 @@ err:
+@@ -106,7 +106,9 @@ err:
   */
  WORD WINAPI GetActiveProcessorGroupCount(void)
  {
@@ -53,7 +53,7 @@ index 0849ac551..f0b06dcc1 100644
      return 1;
  }
  
-@@ -131,14 +133,26 @@ WORD WINAPI GetActiveProcessorGroupCount(void)
+@@ -115,14 +117,26 @@ WORD WINAPI GetActiveProcessorGroupCount(void)
   */
  DWORD WINAPI GetActiveProcessorCount(WORD group)
  {
@@ -87,11 +87,11 @@ index 0849ac551..f0b06dcc1 100644
  
  /***********************************************************************
 diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
-index 04fa5f2e7..44681ebb3 100644
+index a14bed04bef..a2feb9dfa14 100644
 --- a/dlls/kernel32/kernel32.spec
 +++ b/dlls/kernel32/kernel32.spec
 @@ -717,7 +717,7 @@
- @ stdcall -import GetLongPathNameW (wstr long long)
+ @ stdcall -import GetLongPathNameW(wstr ptr long)
  @ stdcall GetMailslotInfo(long ptr ptr ptr ptr)
  @ stdcall GetMaximumProcessorCount(long)
 -# @ stub GetMaximumProcessorGroupCount
@@ -100,7 +100,7 @@ index 04fa5f2e7..44681ebb3 100644
  @ stdcall -import GetModuleFileNameW(long ptr long)
  @ stdcall -import GetModuleHandleA(str)
 diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c
-index a3118d11b..520c2b09f 100644
+index 5cdc9fa03be..4c998e2fe6e 100644
 --- a/dlls/kernel32/tests/process.c
 +++ b/dlls/kernel32/tests/process.c
 @@ -92,6 +92,7 @@ static SIZE_T (WINAPI *pGetLargePageMinimum)(void);
@@ -119,7 +119,7 @@ index a3118d11b..520c2b09f 100644
  
      return TRUE;
  }
-@@ -3923,6 +3925,26 @@ void test_parent_process_attribute(unsigned int level, HANDLE read_pipe)
+@@ -4101,6 +4103,26 @@ void test_parent_process_attribute(unsigned int level, HANDLE read_pipe)
      }
  }
  
@@ -146,7 +146,7 @@ index a3118d11b..520c2b09f 100644
  START_TEST(process)
  {
      HANDLE job;
-@@ -4013,6 +4035,7 @@ START_TEST(process)
+@@ -4191,6 +4213,7 @@ START_TEST(process)
      test_GetNumaProcessorNode();
      test_session_info();
      test_GetLogicalProcessorInformationEx();
@@ -155,10 +155,10 @@ index a3118d11b..520c2b09f 100644
      test_ProcThreadAttributeList();
      test_SuspendProcessState();
 diff --git a/include/winnt.h b/include/winnt.h
-index d18b2e03b..86f30ade4 100644
+index 40534338d05..068a5782465 100644
 --- a/include/winnt.h
 +++ b/include/winnt.h
-@@ -6459,6 +6459,8 @@ typedef struct _GROUP_AFFINITY
+@@ -6475,6 +6475,8 @@ typedef struct _GROUP_AFFINITY
      WORD Reserved[3];
  } GROUP_AFFINITY, *PGROUP_AFFINITY;
  
@@ -168,5 +168,5 @@ index d18b2e03b..86f30ade4 100644
  {
      WORD Group;
 -- 
-2.23.0
+2.24.1
 

patches/libs-Unicode_Collation/0001-libs-Fix-most-problems-with-CompareString.patch

@@ -1,18 +1,19 @@
-From 374ad574cfb7f7cdfcb8534effa83efa02d59bb0 Mon Sep 17 00:00:00 2001
+From b1b0fe600eb400b8a7ba8f03614ebb92b76b989a Mon Sep 17 00:00:00 2001
 From: Dmitry Timoshkov <dtimoshkov@codeweavers.com>
 Date: Mon, 28 Jul 2003 07:39:25 -0500
 Subject: [PATCH] libs: Fix most problems with CompareString.
 
 ---
- dlls/kernel32/tests/locale.c |  9 +++----
- libs/port/collation.c        | 60 ++++++++++++++++++++++----------------------
- 2 files changed, 34 insertions(+), 35 deletions(-)
+ dlls/kernel32/tests/locale.c |  9 +++---
+ dlls/kernelbase/collation.c  | 60 ++++++++++++++++++------------------
+ libs/port/collation.c        | 60 ++++++++++++++++++------------------
+ 3 files changed, 64 insertions(+), 65 deletions(-)
 
 diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c
-index cf781e5..bba3664 100644
+index c8cc90479..2455cc58e 100644
 --- a/dlls/kernel32/tests/locale.c
 +++ b/dlls/kernel32/tests/locale.c
-@@ -1963,13 +1963,13 @@ static void test_CompareStringA(void)
+@@ -1948,13 +1948,13 @@ static void test_CompareStringA(void)
      todo_wine ok(ret != CSTR_EQUAL, "\\2 vs \\1 expected unequal\n");
  
      ret = CompareStringA(lcid, NORM_IGNORECASE | LOCALE_USE_CP_ACP, "#", -1, ".", -1);
@@ -29,7 +30,7 @@ index cf781e5..bba3664 100644
  
      lcid = MAKELCID(MAKELANGID(LANG_POLISH, SUBLANG_DEFAULT), SORT_DEFAULT);
  
-@@ -6026,6 +6026,5 @@ START_TEST(locale)
+@@ -6337,6 +6337,5 @@ START_TEST(locale)
    test_SetThreadUILanguage();
    test_NormalizeString();
    test_SpecialCasing();
@@ -37,8 +38,138 @@ index cf781e5..bba3664 100644
 -  if (0) test_sorting();
 +  test_sorting();
  }
+diff --git a/dlls/kernelbase/collation.c b/dlls/kernelbase/collation.c
+index f56cf02c2..d4f15c396 100644
+--- a/dlls/kernelbase/collation.c
++++ b/dlls/kernelbase/collation.c
+@@ -77,34 +77,34 @@ const unsigned int DECLSPEC_HIDDEN collation_table[12800] =
+     0x00000000, 0x02010111, 0x02020111, 0x02030111, 0x02040111, 0x02050111, 0x00000000, 0x00000000,
+     0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+     0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+-    0x02090111, 0x024b0111, 0x02700111, 0x02a90111, 0x09e00111, 0x02aa0111, 0x02a70111, 0x02690111,
+-    0x027a0111, 0x027b0111, 0x02a20111, 0x039f0111, 0x022d0111, 0x02210111, 0x02550111, 0x02a40111,
+-    0x0a0b0111, 0x0a0c0111, 0x0a0d0111, 0x0a0e0111, 0x0a0f0111, 0x0a100111, 0x0a110111, 0x0a120111,
+-    0x0a130111, 0x0a140111, 0x02370111, 0x02350111, 0x03a30111, 0x03a40111, 0x03a50111, 0x024e0111,
+-    0x02a10111, 0x0a150151, 0x0a290141, 0x0a3d0151, 0x0a490151, 0x0a650151, 0x0a910151, 0x0a990151,
++    0x01290111, 0x020c0111, 0x020d0111, 0x020f0111, 0x02100111, 0x02140111, 0x02190111, 0x01200111,
++    0x021b0111, 0x022d0111, 0x02350111, 0x02a70111, 0x02370111, 0x01210111, 0x024b0111, 0x024c0111,
++    0x0a0b0111, 0x0a0c0111, 0x0a0d0111, 0x0a0e0111, 0x0a0f0181, 0x0a100111, 0x0a110111, 0x0a120111,
++    0x0a130111, 0x0a140111, 0x024e0111, 0x024f0111, 0x02a90111, 0x02aa0111, 0x030a0111, 0x02550111,
++    0x025f0111, 0x0a150151, 0x0a290141, 0x0a3d0151, 0x0a490151, 0x0a650151, 0x0a910151, 0x0a990151,
+     0x0ab90151, 0x0ad30161, 0x0ae70141, 0x0af70141, 0x0b030161, 0x0b2b0151, 0x0b330151, 0x0b4b0161,
+     0x0b670141, 0x0b730141, 0x0b7f0141, 0x0ba70151, 0x0bbf0151, 0x0bd70141, 0x0bef0151, 0x0bfb0141,
+-    0x0c030151, 0x0c070141, 0x0c130141, 0x027c0111, 0x02a60111, 0x027d0111, 0x020f0111, 0x021b0111,
+-    0x020c0111, 0x0a150111, 0x0a290111, 0x0a3d0111, 0x0a490111, 0x0a650111, 0x0a910111, 0x0a990111,
++    0x0c030151, 0x0c070141, 0x0c130141, 0x02700111, 0x02780111, 0x02790111, 0x027a0111, 0x027b0111,
++    0x027c0111, 0x0a150111, 0x0a290111, 0x0a3d0111, 0x0a490111, 0x0a650111, 0x0a910111, 0x0a990111,
+     0x0ab90111, 0x0ad30111, 0x0ae70111, 0x0af70111, 0x0b030111, 0x0b2b0111, 0x0b330111, 0x0b4b0111,
+     0x0b670111, 0x0b730111, 0x0b7f0111, 0x0ba70111, 0x0bbf0111, 0x0bd70111, 0x0bef0111, 0x0bfb0111,
+-    0x0c030111, 0x0c070111, 0x0c130111, 0x027e0111, 0x03a70111, 0x027f0111, 0x03aa0111, 0x00000000,
+-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x02060111, 0x00000000, 0x00000000,
++    0x0c030111, 0x0c070111, 0x0c130111, 0x027d0111, 0x027e0111, 0x027f0111, 0x029c0111, 0x00000000,
++    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+     0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+     0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+     0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+-    0x02090141, 0x024c0111, 0x09df0111, 0x09e10111, 0x09de0111, 0x09e20111, 0x03a80111, 0x029c0111,
+-    0x02140111, 0x029f0111, 0x0a150181, 0x02780111, 0x03a60111, 0x02200111, 0x02a00111, 0x02100111,
+-    0x030a0111, 0x03a00111, 0x0a0d0151, 0x0a0e0151, 0x020d0111, 0x0c9f0121, 0x029d0111, 0x025f0111,
+-    0x02190111, 0x0a0c0151, 0x0b4b01a1, 0x02790111, 0x0a0c0171, 0x0a0c0171, 0x0a0e0171, 0x024f0111,
++    0x01290121, 0x029d0111, 0x03a40111, 0x03a50111, 0x03a60111, 0x03a70111, 0x029f0111, 0x03a80111,
++    0x02a00111, 0x03aa0111, 0x0a150181, 0x03a00111, 0x09de0111, 0x01220111, 0x09df0111, 0x02a10111,
++    0x09e00111, 0x039f0111, 0x0a0d0151, 0x0a0e0151, 0x02a20111, 0x09e10111, 0x09e20111, 0x09ef0111,
++    0x02a40111, 0x0a0c0151, 0x0b4b01a1, 0x03a10111, 0x0a0c0171, 0x0a0c0171, 0x0a0c0171, 0x02a60111,
+     0x0a150151, 0x0a150151, 0x0a150151, 0x0a150151, 0x0a150151, 0x0a150151, 0x0a190121, 0x0a3d0151,
+     0x0a650151, 0x0a650151, 0x0a650151, 0x0a650151, 0x0ad30161, 0x0ad30161, 0x0ad30161, 0x0ad30161,
+     0x0a5d0121, 0x0b330151, 0x0b4b0161, 0x0b4b0161, 0x0b4b0161, 0x0b4b0161, 0x0b4b0161, 0x03a20111,
+-    0x0b530121, 0x0bd70141, 0x0bd70141, 0x0bd70141, 0x0bd70141, 0x0c070141, 0x0c3b0121, 0x0ba70131,
++    0x0b530121, 0x0bd70141, 0x0bd70141, 0x0bd70141, 0x0bd70141, 0x0c070141, 0x0bd40121, 0x0ba70131,
+     0x0a150111, 0x0a150111, 0x0a150111, 0x0a150111, 0x0a150111, 0x0a150111, 0x0a190111, 0x0a3d0111,
+     0x0a650111, 0x0a650111, 0x0a650111, 0x0a650111, 0x0ad30111, 0x0ad30111, 0x0ad30111, 0x0ad30111,
+-    0x0a5d0111, 0x0b330111, 0x0b4b0111, 0x0b4b0111, 0x0b4b0111, 0x0b4b0111, 0x0b4b0111, 0x03a10111,
+-    0x0b530111, 0x0bd70111, 0x0bd70111, 0x0bd70111, 0x0bd70111, 0x0c070111, 0x0c3b0111, 0x0c070111,
++    0x0a5d0111, 0x0b330111, 0x0b4b0111, 0x0b4b0111, 0x0b4b0111, 0x0b4b0111, 0x0b4b0111, 0x03a30111,
++    0x0b530111, 0x0bd70111, 0x0bd70111, 0x0bd70111, 0x0bd70111, 0x0c070111, 0x0bd40111, 0x0c070111,
+     /* 0x0100 .. 0x01ff */
+     0x0a150151, 0x0a150111, 0x0a150151, 0x0a150111, 0x0a150151, 0x0a150111, 0x0a3d0151, 0x0a3d0111,
+     0x0a3d0151, 0x0a3d0111, 0x0a3d0151, 0x0a3d0111, 0x0a3d0151, 0x0a3d0111, 0x0a490151, 0x0a490111,
+@@ -191,7 +191,7 @@ const unsigned int DECLSPEC_HIDDEN collation_table[12800] =
+     0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0x020d0111, 0x02140111, 0x0c910121, 0x025f0111,
+     0x0c950131, 0x0c990121, 0x0c9b0121, 0xffffffff, 0x0ca20121, 0xffffffff, 0x0ca80121, 0x0cac0121,
+     0x0c9b0111, 0x0c910121, 0x0c920131, 0x0c930121, 0x0c940121, 0x0c950131, 0x0c980121, 0x0c990121,
+-    0x0c9a0131, 0x0c9b0121, 0x0c9d0131, 0x0c9e0121, 0x0c9f0131, 0x0ca00121, 0x0ca10121, 0x0ca20121,
++    0x0c9a0131, 0x0c9b0121, 0x0c9d0131, 0x0c9e0121, 0x0c9f0121, 0x0ca00121, 0x0ca10121, 0x0ca20121,
+     0x0ca30131, 0x0ca50131, 0xffffffff, 0x0ca60131, 0x0ca70121, 0x0ca80121, 0x0ca90131, 0x0caa0121,
+     0x0cab0121, 0x0cac0121, 0x0c9b0121, 0x0ca80121, 0x0c910111, 0x0c950111, 0x0c990111, 0x0c9b0111,
+     0x0ca80111, 0x0c910111, 0x0c920111, 0x0c930111, 0x0c940111, 0x0c950111, 0x0c980111, 0x0c990111,
+@@ -931,12 +931,12 @@ const unsigned int DECLSPEC_HIDDEN collation_table[12800] =
+     0xffffffff, 0xffffffff, 0x0cac0111, 0x0cac0111, 0x0cac0111, 0xffffffff, 0x0cac0111, 0x0cac0111,
+     0x0ca20121, 0x0ca20121, 0x0cac0121, 0x0cac0121, 0x0cac0121, 0x020d0111, 0x02180111, 0xffffffff,
+     /* 0x2000 .. 0x20ff */
+-    0x02090131, 0x02090131, 0x02090131, 0x02090131, 0x02090131, 0x02090131, 0x02090131, 0x02090141,
+-    0x02090131, 0x02090131, 0x02090131, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
++    0x02090121, 0x02090121, 0x02090121, 0x02090121, 0x02090121, 0x02090121, 0x02090121, 0x02090131,
++    0x02090121, 0x02090121, 0x02090121, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+     0x02250111, 0x02250121, 0x02260111, 0x02270111, 0x02280111, 0x02290111, 0x03a90111, 0x021c0111,
+     0x026a0111, 0x026b0111, 0x026c0111, 0x026d0111, 0x02710111, 0x02720111, 0x02730111, 0x02740111,
+     0x02ae0111, 0x02af0111, 0x02b00111, 0x02b10111, 0x02550131, 0x02550131, 0x02550131, 0x02b20111,
+-    0x02070111, 0x02080111, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x02090141,
++    0x02070111, 0x02080111, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x02090131,
+     0x02ac0111, 0x02ad0111, 0x02b60111, 0x02b60121, 0x02b60121, 0x02b70111, 0x02b70121, 0x02b70121,
+     0x02b90111, 0x026e0111, 0x026f0111, 0x02ba0111, 0x024b0131, 0x02540111, 0x02110111, 0x02bb0111,
+     0x02bc0111, 0x02bd0111, 0x02be0111, 0x02b30111, 0x02a50111, 0x02860111, 0x02870111, 0xffffffff,
+@@ -1294,7 +1294,7 @@ const unsigned int DECLSPEC_HIDDEN collation_table[12800] =
+     0x09a90111, 0x09aa0111, 0x09ab0111, 0x09ac0111, 0x09ad0111, 0x09ae0111, 0x09af0111, 0x09b00111,
+     0x09b10111, 0x09b20111, 0x09b30111, 0x09b40111, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+     /* 0x3000 .. 0x30ff */
+-    0x02090121, 0x02340111, 0x025e0111, 0x02b80111, 0x09b50111, 0x09d70111, 0x192c0111, 0x0a0b0111,
++    0x02090111, 0x02340111, 0x025e0111, 0x02b80111, 0x09b50111, 0x09d70111, 0x192c0111, 0x0a0b0111,
+     0x02880111, 0x02890111, 0x028a0111, 0x028b0111, 0x028c0111, 0x028d0111, 0x028e0111, 0x028f0111,
+     0x02900111, 0x02910111, 0x09b60111, 0x09b70111, 0x02920111, 0x02930111, 0x02940111, 0x02950111,
+     0x02960111, 0x02970111, 0x02980111, 0x02990111, 0x022a0111, 0x02750111, 0x02760111, 0x02770111,
+@@ -1409,14 +1409,14 @@ const unsigned int DECLSPEC_HIDDEN collation_table[12800] =
+     0x0a0c0131, 0x0a0c0131, 0x0a0c0131, 0x0a0c0131, 0x0a0d0131, 0x0a0d0131, 0x0a0d0131, 0x0a0d0131,
+     0x0a0d0131, 0x0ab901a1, 0x0a490191, 0x0a1501a1, 0x0a290181, 0x0b4b01b1, 0x0b670181, 0xffffffff,
+     0xffffffff, 0xffffffff, 0xffffffff, 0xfb400151, 0xfb400151, 0xfb400151, 0xfb400151, 0xfb400151,
+-    0x0b670181, 0x0b3301b1, 0x0c9f0141, 0x0b2b01a1, 0x0af70171, 0x0af70181, 0x0b2b01b1, 0x0a990181,
+-    0x0a3d01a1, 0x0af70171, 0x0b670181, 0x0b3301b1, 0x0c9f0141, 0x0c9f0141, 0x0b2b01a1, 0x0af70171,
+-    0x0ab901b1, 0x0af70171, 0x0b2b01b1, 0x0a990181, 0x0bbf01a1, 0x0c9f0141, 0x0b2b01a1, 0x0a490191,
+-    0x0af70171, 0x0a910191, 0x0b3301b1, 0x0c9f0141, 0x0b2b01a1, 0x0a3d01a1, 0x0af70171, 0x0b2b01a1,
++    0x0b670181, 0x0b3301b1, 0x0c9f0131, 0x0b2b01a1, 0x0af70171, 0x0af70181, 0x0b2b01b1, 0x0a990181,
++    0x0a3d01a1, 0x0af70171, 0x0b670181, 0x0b3301b1, 0x0c9f0131, 0x0c9f0131, 0x0b2b01a1, 0x0af70171,
++    0x0ab901b1, 0x0af70171, 0x0b2b01b1, 0x0a990181, 0x0bbf01a1, 0x0c9f0131, 0x0b2b01a1, 0x0a490191,
++    0x0af70171, 0x0a910191, 0x0b3301b1, 0x0c9f0131, 0x0b2b01a1, 0x0a3d01a1, 0x0af70171, 0x0b2b01a1,
+     0x0a3d01a1, 0x0b2b01a1, 0x0af70171, 0x0b2b01a1, 0x0a3d01a1, 0x0b2b01a1, 0x0af70171, 0x0b2b01a1,
+     0x0b2b01a1, 0x0b670191, 0x0af70171, 0x0b2b01b1, 0x0a990181, 0x0b7f01a1, 0x0b7f01a1, 0x0b7f01a1,
+-    0x0b670181, 0x0b3301b1, 0x0c9f0141, 0x0b2b01a1, 0x0b670181, 0x0b3301b1, 0x0c9f0141, 0x0b2b01a1,
+-    0x0af70171, 0x0b2b01b1, 0x0b670181, 0x0b3301b1, 0x0c9f0141, 0x0b2b01a1, 0x0af70171, 0x0b2b01b1,
++    0x0b670181, 0x0b3301b1, 0x0c9f0131, 0x0b2b01a1, 0x0b670181, 0x0b3301b1, 0x0c9f0131, 0x0b2b01a1,
++    0x0af70171, 0x0b2b01b1, 0x0b670181, 0x0b3301b1, 0x0c9f0131, 0x0b2b01a1, 0x0af70171, 0x0b2b01b1,
+     0x0af70171, 0x0b2b01b1, 0x0a150191, 0x0a290191, 0x0a3d01a1, 0x0a3d01a1, 0x0a3d01b1, 0x0a3d01b1,
+     0x0a490191, 0x0a990181, 0x0ab901a1, 0x0ab901b1, 0x0ad301b1, 0x0af70181, 0x0af70181, 0x0af70171,
+     0x0b0301c1, 0x0b0301c1, 0x0b0301c1, 0x0b0301c1, 0x0b2b01a1, 0x0b2b01a1, 0x0b2b01a1, 0x0b670191,
+@@ -1603,7 +1603,7 @@ const unsigned int DECLSPEC_HIDDEN collation_table[12800] =
+     0xffffffff, 0x02110121, 0x02110121, 0x02110121, 0x02110121, 0x021b0131, 0x021b0131, 0x021b0131,
+     0x022d0131, 0x02340121, 0x02550141, 0xffffffff, 0x02350131, 0x02370131, 0x024e0141, 0x024b0141,
+     0x02280121, 0x027a0141, 0x027b0131, 0x027e0131, 0x027f0131, 0x02920121, 0x02930121, 0x02a90131,
+-    0x02a70131, 0x02a20131, 0x039f0141, 0x02210131, 0x03a30131, 0x03a50131, 0x03a40131, 0xffffffff,
++    0x02a70131, 0x02a20131, 0x039f0141, 0x02210121, 0x03a30131, 0x03a50131, 0x03a40131, 0xffffffff,
+     0x02a60131, 0x09e00131, 0x02aa0131, 0x02a10131, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+     0x00006831, 0x00006821, 0x00006921, 0xffffffff, 0x00006a21, 0xffffffff, 0x00006b31, 0x00006b21,
+     0x00006c31, 0x00006c21, 0x00006d31, 0x00006d21, 0x00006e31, 0x00006e21, 0x00006f31, 0x00006f21,
+@@ -1624,8 +1624,8 @@ const unsigned int DECLSPEC_HIDDEN collation_table[12800] =
+     0x0f480141, 0x0f490161, 0x0f490151, 0x0f490131, 0x0f490141, 0x0f2d0151, 0x0f2d0141, 0x0f2d0151,
+     0x0f2d0141, 0x0f2d0151, 0x0f2d0141, 0x0f2d0151, 0x0f2d0141, 0xffffffff, 0xffffffff, 0x00000000,
+     /* 0xff00 .. 0xffff */
+-    0xffffffff, 0x024b0121, 0x02700121, 0x02a90121, 0x09e00121, 0x02aa0121, 0x02a70121, 0x02690121,
+-    0x027a0121, 0x027b0121, 0x02a20121, 0x039f0121, 0x022d0121, 0x02210121, 0x02550121, 0x02a40121,
++    0xffffffff, 0x024b0121, 0x02700121, 0x02a90121, 0x09e00121, 0x02aa0121, 0x02a70121, 0x02690111,
++    0x027a0121, 0x027b0121, 0x02a20121, 0x039f0121, 0x022d0121, 0x02210111, 0x02550121, 0x02a40121,
+     0x0a0b0121, 0x0a0c0121, 0x0a0d0121, 0x0a0e0121, 0x0a0f0121, 0x0a100121, 0x0a110121, 0x0a120121,
+     0x0a130121, 0x0a140121, 0x02370121, 0x02350121, 0x03a30121, 0x03a40121, 0x03a50121, 0x024e0121,
+     0x02a10121, 0x0a150161, 0x0a290151, 0x0a3d0161, 0x0a490161, 0x0a650161, 0x0a910161, 0x0a990161,
 diff --git a/libs/port/collation.c b/libs/port/collation.c
-index 2d990d8..290fa98 100644
+index f56cf02c2..d4f15c396 100644
 --- a/libs/port/collation.c
 +++ b/libs/port/collation.c
 @@ -77,34 +77,34 @@ const unsigned int DECLSPEC_HIDDEN collation_table[12800] =
@@ -168,5 +299,5 @@ index 2d990d8..290fa98 100644
      0x0a130121, 0x0a140121, 0x02370121, 0x02350121, 0x03a30121, 0x03a40121, 0x03a50121, 0x024e0121,
      0x02a10121, 0x0a150161, 0x0a290151, 0x0a3d0161, 0x0a490161, 0x0a650161, 0x0a910161, 0x0a990161,
 -- 
-1.9.1
+2.24.0
 

patches/ntdll-ForceBottomUpAlloc/0001-ntdll-Stop-search-on-mmap-error-in-try_map_free_area.patch

@@ -0,0 +1,36 @@
+From d326b5e1f14765fed43f674f3693bb881c9e2c55 Mon Sep 17 00:00:00 2001
+From: Paul Gofman <gofmanp@gmail.com>
+Date: Thu, 9 Jan 2020 15:05:09 +0300
+Subject: [PATCH] ntdll: Stop search on mmap() error in try_map_free_area().
+
+The anon mmap errors do not depend on start address hint. Ignoring them
+makes the search take incredible time until it fails.
+---
+ dlls/ntdll/virtual.c | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c
+index 8b515fcbce..e74179b711 100644
+--- a/dlls/ntdll/virtual.c
++++ b/dlls/ntdll/virtual.c
+@@ -570,8 +570,16 @@ static void* try_map_free_area( void *base, void *end, ptrdiff_t step,
+             return start;
+         TRACE( "Found free area is already mapped, start %p.\n", start );
+ 
+-        if (ptr != (void *)-1)
++        if (ptr == (void *)-1)
++        {
++            ERR("wine_anon_mmap() error %s, start %p, size %p, unix_prot %#x.\n",
++                    strerror(errno), start, (void *)size, unix_prot);
++            return NULL;
++        }
++        else
++        {
+             munmap( ptr, size );
++        }
+ 
+         if ((step > 0 && (char *)end - (char *)start < step) ||
+             (step < 0 && (char *)start - (char *)base < -step) ||
+-- 
+2.24.1
+

patches/ntdll-Syscall_Emulation/0001-ntdll-Support-x86_64-syscall-emulation.patch

@@ -0,0 +1,189 @@
+From 608b46ac43e9b4de89282850ac8e4010e1df0af1 Mon Sep 17 00:00:00 2001
+From: Paul Gofman <gofmanp@gmail.com>
+Date: Mon, 30 Dec 2019 13:27:53 +0300
+Subject: [PATCH] ntdll: Support x86_64 syscall emulation.
+
+The patch assigns the range of syscall numbers which does not
+overlap with native syscalls and assumes these numbers are
+used in the applications (i. e., that the applications
+get the number from syscall thunks). Linux specific Seccomp
+is used for trapping syscalls.
+---
+ configure.ac               |  1 +
+ dlls/ntdll/signal_x86_64.c | 85 ++++++++++++++++++++++++++++++++++++++
+ tools/winebuild/spec32.c   |  9 +++-
+ 3 files changed, 93 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index c437da7db4..98cdf1ec84 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -483,6 +483,7 @@ AC_CHECK_HEADERS(\
+ 	linux/joystick.h \
+ 	linux/major.h \
+ 	linux/param.h \
++	linux/seccomp.h \
+ 	linux/serial.h \
+ 	linux/types.h \
+ 	linux/ucdrom.h \
+diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c
+index 6cde57a0c5..ff11b7fa8d 100644
+--- a/dlls/ntdll/signal_x86_64.c
++++ b/dlls/ntdll/signal_x86_64.c
+@@ -59,6 +59,13 @@
+ # include <mach/mach.h>
+ #endif
+ 
++#if defined(HAVE_LINUX_FILTER_H) && defined(HAVE_LINUX_SECCOMP_H) && defined(HAVE_SYS_PRCTL_H)
++#define HAVE_SECCOMP 1
++# include <linux/filter.h>
++# include <linux/seccomp.h>
++# include <sys/prctl.h>
++#endif
++
+ #define NONAMELESSUNION
+ #define NONAMELESSSTRUCT
+ #include "ntstatus.h"
+@@ -3097,6 +3104,38 @@ static void usr1_handler( int signal, siginfo_t *siginfo, void *ucontext )
+     restore_context( &context, ucontext );
+ }
+ 
++extern unsigned int __wine_nb_syscalls;
++
++#ifdef HAVE_SECCOMP
++static void sigsys_handler( int signal, siginfo_t *siginfo, void *sigcontext )
++{
++    unsigned int thunk_ret_offset;
++    ucontext_t *ctx = sigcontext;
++    unsigned int syscall_nr;
++    void ***rsp;
++
++    WARN("SIGSYS, rax %#llx.\n", ctx->uc_mcontext.gregs[REG_RAX]);
++
++    syscall_nr = ctx->uc_mcontext.gregs[REG_RAX] - 0xf000;
++    if (syscall_nr >= __wine_nb_syscalls)
++    {
++        ERR("Syscall %u is undefined.\n", syscall_nr);
++        return;
++    }
++
++    rsp = (void ***)&ctx->uc_mcontext.gregs[REG_RSP];
++    *rsp -= 1;
++
++#ifdef __APPLE__
++    thunk_ret_offset = 0xb;
++#else
++    thunk_ret_offset = 0xc;
++#endif
++
++    **rsp = (void *)(ctx->uc_mcontext.gregs[REG_RIP] + thunk_ret_offset);
++    ctx->uc_mcontext.gregs[REG_RIP] = (ULONG64)__wine_syscall_dispatcher;
++}
++#endif
+ 
+ /***********************************************************************
+  *           __wine_set_signal_handler   (NTDLL.@)
+@@ -3267,6 +3306,49 @@ void signal_init_thread( TEB *teb )
+ #endif
+ }
+ 
++static void install_bpf(struct sigaction *sig_act)
++{
++#ifdef HAVE_SECCOMP
++    static struct sock_filter filter[] =
++    {
++       BPF_STMT(BPF_LD | BPF_W | BPF_ABS,
++                (offsetof(struct seccomp_data, nr))),
++       BPF_JUMP(BPF_JMP | BPF_JGE | BPF_K, 0xf000, 0, 1),
++       BPF_STMT(BPF_RET | BPF_K, SECCOMP_RET_TRAP),
++       BPF_STMT(BPF_RET | BPF_K, SECCOMP_RET_ALLOW),
++    };
++    struct sock_fprog prog;
++
++    memset(&prog, 0, sizeof(prog));
++    prog.len = ARRAY_SIZE(filter);
++    prog.filter = filter;
++
++    if (prctl(PR_GET_SECCOMP, 0, NULL, 0, 0) != 2)
++    {
++        if (prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0))
++        {
++            perror("prctl(PR_SET_NO_NEW_PRIVS, ...)");
++            exit(1);
++        }
++
++        if (prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, &prog, 0, 0))
++        {
++            perror("prctl(PR_SET_SECCOMP, ...)");
++            exit(1);
++        }
++    }
++    else
++    {
++        TRACE("Seccomp filters already installed.\n");
++    }
++
++    sig_act->sa_sigaction = sigsys_handler;
++    sigaction(SIGSYS, sig_act, NULL);
++#else
++    WARN("Built without seccomp.\n");
++#endif
++}
++
+ /**********************************************************************
+  *		signal_init_process
+  */
+@@ -3299,6 +3381,9 @@ void signal_init_process(void)
+     sig_act.sa_sigaction = trap_handler;
+     if (sigaction( SIGTRAP, &sig_act, NULL ) == -1) goto error;
+ #endif
++
++    install_bpf(&sig_act);
++
+     return;
+ 
+  error:
+diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c
+index 05f5be6e48..4454f56c0b 100644
+--- a/tools/winebuild/spec32.c
++++ b/tools/winebuild/spec32.c
+@@ -531,7 +531,7 @@ static void output_syscall_thunks_x64( DLLSPEC *spec )
+         output_cfi( ".cfi_startproc" );
+         output( "\t.byte 0x4c,0x8b,0xd1\n" );                               /* mov r10, rcx */
+         output( "\t.byte 0xb8\n" );                                         /* mov eax, SYSCALL */
+-        output( "\t.long %d\n", i );
++        output( "\t.long %d\n", i + 0xf000 );
+         output( "\t.byte 0xf6,0x04,0x25,0x08,0x03,0xfe,0x7f,0x01\n" );      /* test byte ptr [0x7ffe0308], 1 */
+         output( "\t.byte 0x75,0x03\n" );                                    /* jne (over syscall) */
+         output( "\t.byte 0x0f,0x05\n" );                                    /* syscall */
+@@ -576,6 +576,9 @@ static void output_syscall_thunks_x64( DLLSPEC *spec )
+         output( "\t.byte %d\n", max(get_args_size(odp), 32) - 32 );
+     }
+ 
++    output( "%s\n", asm_globl("__wine_nb_syscalls") );
++    output( "\t.long %u\n", spec->nb_syscalls );
++
+     output( "\n/* syscall dispatcher */\n\n" );
+     output( "\t.text\n" );
+     output( "\t.align %d\n", get_alignment(16) );
+@@ -601,6 +604,8 @@ static void output_syscall_thunks_x64( DLLSPEC *spec )
+     else
+         output( "\tsubq $0xc,0x8(%%rbp)\n" );
+ 
++    output( "\tsub $0xf000,%%rax\n" );
++
+     /* copy over any arguments on the stack */
+     output( "\tleaq 0x38(%%rbp),%%rsi\n" );
+     if (UsePIC)
+@@ -1233,7 +1238,7 @@ static void create_stub_exports_text_x64( DLLSPEC *spec )
+         align_output_rva( 16, 16 );
+         put_label( odp->link_name );
+         put_byte( 0x4c ); put_byte( 0x8b ); put_byte( 0xd1 );  /* mov r10, rcx */
+-        put_byte( 0xb8 ); put_dword( i );                      /* mov eax, SYSCALL */
++        put_byte( 0xb8 ); put_dword( i + 0xf000 );             /* mov eax, SYSCALL */
+         put_byte( 0xf6 ); put_byte( 0x04 ); put_byte( 0x25 );  /* test byte ptr [0x7ffe0308], 1 */
+                 put_byte( 0x08 ); put_byte( 0x03 ); put_byte( 0xfe );
+                 put_byte( 0x7f ); put_byte( 0x01 );
+-- 
+2.24.1
+

patches/ntdll-Syscall_Emulation/definition

@@ -0,0 +1,2 @@
+Fixes: [48291] Detroit: Become Human crashes on launch
+Depends: winebuild-Fake_Dlls