Added macos-compile patchset

This is currently causing a regression in Overwatch.
Disabled until an updated patch corrects the regression found.

patches/Compiler_Warnings/definition

@@ -1,2 +1,2 @@
 Fixes: Fixes compile warnings.
-Depends: mailing-list-patches
+#Depends: mailing-list-patches

patches/advapi32-Token_Integrity_Level/0014-programs-runas-Basic-implementation-for-starting-pro.patch

@@ -1,4 +1,4 @@
-From 0616176a3276be4ae49dc86c7d96b11240afca78 Mon Sep 17 00:00:00 2001
+From 5bf0baa79c46ec44dfd5e1340e96ff9289bc37f8 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sun, 6 Aug 2017 03:15:34 +0200
 Subject: [PATCH] programs/runas: Basic implementation for starting processes
@@ -7,9 +7,9 @@ Subject: [PATCH] programs/runas: Basic implementation for starting processes
 ---
  configure.ac               |   1 +
  programs/runas/Makefile.in |   8 ++
- programs/runas/runas.c     | 214 +++++++++++++++++++++++++++++++++++++++++++++
- programs/runas/runas.h     |  26 ++++++
- programs/runas/runas.rc    |  39 +++++++++
+ programs/runas/runas.c     | 214 +++++++++++++++++++++++++++++++++++++
+ programs/runas/runas.h     |  26 +++++
+ programs/runas/runas.rc    |  39 +++++++
  5 files changed, 288 insertions(+)
  create mode 100644 programs/runas/Makefile.in
  create mode 100644 programs/runas/runas.c
@@ -17,10 +17,10 @@ Subject: [PATCH] programs/runas: Basic implementation for starting processes
  create mode 100644 programs/runas/runas.rc
 
 diff --git a/configure.ac b/configure.ac
-index b9ef668..404ab7a 100644
+index 499c4f37ca..6f12614af1 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3879,6 +3879,7 @@ WINE_CONFIG_MAKEFILE(programs/regedit/tests)
+@@ -3891,6 +3891,7 @@ WINE_CONFIG_MAKEFILE(programs/regedit/tests)
  WINE_CONFIG_MAKEFILE(programs/regsvcs)
  WINE_CONFIG_MAKEFILE(programs/regsvr32)
  WINE_CONFIG_MAKEFILE(programs/rpcss)
@@ -30,12 +30,12 @@ index b9ef668..404ab7a 100644
  WINE_CONFIG_MAKEFILE(programs/sc)
 diff --git a/programs/runas/Makefile.in b/programs/runas/Makefile.in
 new file mode 100644
-index 0000000..be9434b
+index 0000000000..33aa00ab03
 --- /dev/null
 +++ b/programs/runas/Makefile.in
 @@ -0,0 +1,8 @@
 +MODULE    = runas.exe
-+APPMODE   = -mconsole -municode
++APPMODE   = -mconsole -municode -mno-cygwin
 +IMPORTS   = advapi32 user32
 +
 +C_SRCS = \
@@ -44,7 +44,7 @@ index 0000000..be9434b
 +RC_SRCS = runas.rc
 diff --git a/programs/runas/runas.c b/programs/runas/runas.c
 new file mode 100644
-index 0000000..8e96aff
+index 0000000000..412755afa0
 --- /dev/null
 +++ b/programs/runas/runas.c
 @@ -0,0 +1,214 @@
@@ -69,7 +69,7 @@ index 0000000..8e96aff
 + */
 +
 +#include <windows.h>
-+#include <wine/unicode.h>
++#include <wchar.h>
 +#include <wine/debug.h>
 +
 +#include "runas.h"
@@ -153,10 +153,10 @@ index 0000000..8e96aff
 +
 +static WCHAR *starts_with(WCHAR *str, const WCHAR *start)
 +{
-+    DWORD start_len = strlenW(start);
-+    if (strlenW(str) < start_len)
++    DWORD start_len = lstrlenW(start);
++    if (lstrlenW(str) < start_len)
 +        return NULL;
-+    if (strncmpW(str, start, start_len))
++    if (wcsncmp(str, start, start_len))
 +        return NULL;
 +    return str + start_len;
 +}
@@ -176,8 +176,8 @@ index 0000000..8e96aff
 +            WCHAR *arg;
 +
 +            if ((arg = starts_with(argv[i], trustlevelW)))
-+                cmd->trustlevel = strtoulW(arg, NULL, 0);
-+            else if (!strcmpW(argv[i], showtrustlevelsW))
++                cmd->trustlevel = wcstoul(arg, NULL, 0);
++            else if (!lstrcmpW(argv[i], showtrustlevelsW))
 +                show_trustlevels();
 +            else
 +                WINE_FIXME("Ignoring parameter %s\n", wine_dbgstr_w(argv[i]));
@@ -264,7 +264,7 @@ index 0000000..8e96aff
 +}
 diff --git a/programs/runas/runas.h b/programs/runas/runas.h
 new file mode 100644
-index 0000000..40599a3
+index 0000000000..40599a3b33
 --- /dev/null
 +++ b/programs/runas/runas.h
 @@ -0,0 +1,26 @@
@@ -296,7 +296,7 @@ index 0000000..40599a3
 +#define STRING_START_ERROR          104
 diff --git a/programs/runas/runas.rc b/programs/runas/runas.rc
 new file mode 100644
-index 0000000..f9297a4
+index 0000000000..f9297a4479
 --- /dev/null
 +++ b/programs/runas/runas.rc
 @@ -0,0 +1,39 @@
@@ -340,5 +340,5 @@ index 0000000..f9297a4
 +    %2!u!: %3\n"
 +}
 -- 
-2.7.4
+2.23.0.rc1
 

patches/cryptext-CryptExtOpenCER/definition

@@ -0,0 +1,2 @@
+# Taken from the mailing list - July 2019.
+Fixes: cryptext: Implement CryptExtOpenCER.

patches/d3dx9_36-DDS/0002-d3dx9_36-Improve-D3DXSaveTextureToFile-to-save-simpl.patch

@@ -1,4 +1,4 @@
-From 4e692713dface59a0e717e4ab9e2abf6b8223995 Mon Sep 17 00:00:00 2001
+From f22ce02d880a9a6723d202eaf959d1eaa7a4c3df Mon Sep 17 00:00:00 2001
 From: Christian Costa <titan.costa@gmail.com>
 Date: Sun, 11 Jan 2015 16:29:30 +0100
 Subject: [PATCH] d3dx9_36: Improve D3DXSaveTextureToFile to save simple
@@ -6,17 +6,17 @@ Subject: [PATCH] d3dx9_36: Improve D3DXSaveTextureToFile to save simple
 
 ---
  dlls/d3dx9_36/d3dx9_private.h |  2 ++
- dlls/d3dx9_36/surface.c       | 62 +++++++++++++++++++++++++++++++++++++++++++
- dlls/d3dx9_36/texture.c       |  5 +---
+ dlls/d3dx9_36/surface.c       | 62 +++++++++++++++++++++++++++++++++++
+ dlls/d3dx9_36/texture.c       |  5 +--
  3 files changed, 65 insertions(+), 4 deletions(-)
 
 diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h
-index 5a28f2e..158aae3 100644
+index 9497343f422..679b57b2626 100644
 --- a/dlls/d3dx9_36/d3dx9_private.h
 +++ b/dlls/d3dx9_36/d3dx9_private.h
-@@ -125,6 +125,8 @@ HRESULT lock_surface(IDirect3DSurface9 *surface, D3DLOCKED_RECT *lock,
+@@ -125,6 +125,8 @@ HRESULT lock_surface(IDirect3DSurface9 *surface, const RECT *surface_rect, D3DLO
          IDirect3DSurface9 **temp_surface, BOOL write) DECLSPEC_HIDDEN;
- HRESULT unlock_surface(IDirect3DSurface9 *surface, D3DLOCKED_RECT *lock,
+ HRESULT unlock_surface(IDirect3DSurface9 *surface, const RECT *surface_rect,
          IDirect3DSurface9 *temp_surface, BOOL update) DECLSPEC_HIDDEN;
 +HRESULT save_dds_texture_to_memory(ID3DXBuffer **dst_buffer, IDirect3DBaseTexture9 *src_texture,
 +    const PALETTEENTRY *src_palette) DECLSPEC_HIDDEN;
@@ -24,10 +24,10 @@ index 5a28f2e..158aae3 100644
  unsigned short float_32_to_16(const float in) DECLSPEC_HIDDEN;
  float float_16_to_32(const unsigned short in) DECLSPEC_HIDDEN;
 diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c
-index f5dc799..e0d84fd 100644
+index aa9ee891b54..9871d211a7c 100644
 --- a/dlls/d3dx9_36/surface.c
 +++ b/dlls/d3dx9_36/surface.c
-@@ -611,6 +611,68 @@ static HRESULT save_dds_surface_to_memory(ID3DXBuffer **dst_buffer, IDirect3DSur
+@@ -636,6 +636,68 @@ static HRESULT save_dds_surface_to_memory(ID3DXBuffer **dst_buffer, IDirect3DSur
      return D3D_OK;
  }
  
@@ -97,10 +97,10 @@ index f5dc799..e0d84fd 100644
      const D3DBOX *dst_box, const void *src_data, const D3DBOX *src_box, DWORD filter, D3DCOLOR color_key,
      const D3DXIMAGE_INFO *src_info)
 diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c
-index e2dfab8..9f0e541 100644
+index 26d07ca9f66..b743d5cfad0 100644
 --- a/dlls/d3dx9_36/texture.c
 +++ b/dlls/d3dx9_36/texture.c
-@@ -1906,10 +1906,7 @@ HRESULT WINAPI D3DXSaveTextureToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE
+@@ -1904,10 +1904,7 @@ HRESULT WINAPI D3DXSaveTextureToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE
      if (!dst_buffer || !src_texture) return D3DERR_INVALIDCALL;
  
      if (file_format == D3DXIFF_DDS)
@@ -113,5 +113,5 @@ index e2dfab8..9f0e541 100644
      type = IDirect3DBaseTexture9_GetType(src_texture);
      switch (type)
 -- 
-1.9.1
+2.17.1
 

patches/d3dx9_36-DXTn/0001-d3dx9_36-Add-dxtn-support.patch

@@ -1,4 +1,4 @@
-From 4595b49c9c878e8a86fcd22dc82a9f5cfadfc7a8 Mon Sep 17 00:00:00 2001
+From 3fb7038ed7f1ebbadd60465f68ed0e61ba81e730 Mon Sep 17 00:00:00 2001
 From: Christian Costa <titan.costa@gmail.com>
 Date: Fri, 30 Mar 2018 08:22:02 +0000
 Subject: [PATCH] d3dx9_36: add DXTn support
@@ -29,164 +29,164 @@ Subject: [PATCH] d3dx9_36: add DXTn support
  22 files changed, 118 insertions(+), 32 deletions(-)
 
 diff --git a/dlls/d3dx9_24/Makefile.in b/dlls/d3dx9_24/Makefile.in
-index 99db5f355..0c3fb8a90 100644
+index a327292b8..b43b1be81 100644
 --- a/dlls/d3dx9_24/Makefile.in
 +++ b/dlls/d3dx9_24/Makefile.in
 @@ -1,6 +1,6 @@
  EXTRADEFS = -DD3DX_SDK_VERSION=24
  MODULE    = d3dx9_24.dll
--IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
-+IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
+-IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase
++IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase wined3d
  PARENTSRC = ../d3dx9_36
  DELAYIMPORTS = windowscodecs
  
 diff --git a/dlls/d3dx9_25/Makefile.in b/dlls/d3dx9_25/Makefile.in
-index 9e54aba2c..4419b18b8 100644
+index ccf374832..edcba8b59 100644
 --- a/dlls/d3dx9_25/Makefile.in
 +++ b/dlls/d3dx9_25/Makefile.in
 @@ -1,6 +1,6 @@
  EXTRADEFS = -DD3DX_SDK_VERSION=25
  MODULE    = d3dx9_25.dll
--IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
-+IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
+-IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase
++IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase wined3d
  PARENTSRC = ../d3dx9_36
  DELAYIMPORTS = windowscodecs
  
 diff --git a/dlls/d3dx9_26/Makefile.in b/dlls/d3dx9_26/Makefile.in
-index 104f7c19b..cfc9711ef 100644
+index 21ef9e00b..72d0e0ce1 100644
 --- a/dlls/d3dx9_26/Makefile.in
 +++ b/dlls/d3dx9_26/Makefile.in
 @@ -1,6 +1,6 @@
  EXTRADEFS = -DD3DX_SDK_VERSION=26
  MODULE    = d3dx9_26.dll
--IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
-+IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
+-IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase
++IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase wined3d
  PARENTSRC = ../d3dx9_36
  DELAYIMPORTS = windowscodecs
  
 diff --git a/dlls/d3dx9_27/Makefile.in b/dlls/d3dx9_27/Makefile.in
-index db04c8310..d598c9bbf 100644
+index 3adea191c..24763cb10 100644
 --- a/dlls/d3dx9_27/Makefile.in
 +++ b/dlls/d3dx9_27/Makefile.in
 @@ -1,6 +1,6 @@
  EXTRADEFS = -DD3DX_SDK_VERSION=27
  MODULE    = d3dx9_27.dll
--IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
-+IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
+-IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase
++IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase wined3d
  PARENTSRC = ../d3dx9_36
  DELAYIMPORTS = windowscodecs
  
 diff --git a/dlls/d3dx9_28/Makefile.in b/dlls/d3dx9_28/Makefile.in
-index 8a2b9c690..8e9979092 100644
+index bd75a23d2..ce041b069 100644
 --- a/dlls/d3dx9_28/Makefile.in
 +++ b/dlls/d3dx9_28/Makefile.in
 @@ -1,6 +1,6 @@
  EXTRADEFS = -DD3DX_SDK_VERSION=28
  MODULE    = d3dx9_28.dll
--IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
-+IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
+-IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase
++IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase wined3d
  PARENTSRC = ../d3dx9_36
  DELAYIMPORTS = windowscodecs
  
 diff --git a/dlls/d3dx9_29/Makefile.in b/dlls/d3dx9_29/Makefile.in
-index 6e1f45c02..efe538fde 100644
+index 491c105ab..99ab2ded7 100644
 --- a/dlls/d3dx9_29/Makefile.in
 +++ b/dlls/d3dx9_29/Makefile.in
 @@ -1,6 +1,6 @@
  EXTRADEFS = -DD3DX_SDK_VERSION=29
  MODULE    = d3dx9_29.dll
--IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
-+IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
+-IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase
++IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase wined3d
  PARENTSRC = ../d3dx9_36
  DELAYIMPORTS = windowscodecs
  
 diff --git a/dlls/d3dx9_30/Makefile.in b/dlls/d3dx9_30/Makefile.in
-index 092a6b154..4a1ee6304 100644
+index 44e28b79f..bcf0b1c82 100644
 --- a/dlls/d3dx9_30/Makefile.in
 +++ b/dlls/d3dx9_30/Makefile.in
 @@ -1,6 +1,6 @@
  EXTRADEFS = -DD3DX_SDK_VERSION=30
  MODULE    = d3dx9_30.dll
--IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
-+IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
+-IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase
++IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase wined3d
  PARENTSRC = ../d3dx9_36
  DELAYIMPORTS = windowscodecs
  
 diff --git a/dlls/d3dx9_31/Makefile.in b/dlls/d3dx9_31/Makefile.in
-index 48c67e6e0..dcbb7a01b 100644
+index 0f16d27fd..7c980fbb8 100644
 --- a/dlls/d3dx9_31/Makefile.in
 +++ b/dlls/d3dx9_31/Makefile.in
 @@ -1,6 +1,6 @@
  EXTRADEFS = -DD3DX_SDK_VERSION=31
  MODULE    = d3dx9_31.dll
--IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
-+IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
+-IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase
++IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase wined3d
  PARENTSRC = ../d3dx9_36
  DELAYIMPORTS = windowscodecs
  
 diff --git a/dlls/d3dx9_32/Makefile.in b/dlls/d3dx9_32/Makefile.in
-index d51d6a0db..fb89ea7c2 100644
+index 99357dcce..e493bd8a6 100644
 --- a/dlls/d3dx9_32/Makefile.in
 +++ b/dlls/d3dx9_32/Makefile.in
 @@ -1,6 +1,6 @@
  EXTRADEFS = -DD3DX_SDK_VERSION=32
  MODULE    = d3dx9_32.dll
--IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
-+IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
+-IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase
++IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase wined3d
  PARENTSRC = ../d3dx9_36
  DELAYIMPORTS = windowscodecs
  
 diff --git a/dlls/d3dx9_33/Makefile.in b/dlls/d3dx9_33/Makefile.in
-index 52cdde13a..487255e43 100644
+index 5a92dca61..fba4106af 100644
 --- a/dlls/d3dx9_33/Makefile.in
 +++ b/dlls/d3dx9_33/Makefile.in
 @@ -1,6 +1,6 @@
  EXTRADEFS = -DD3DX_SDK_VERSION=33
  MODULE    = d3dx9_33.dll
--IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
-+IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
+-IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase
++IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase wined3d
  PARENTSRC = ../d3dx9_36
  DELAYIMPORTS = windowscodecs
  
 diff --git a/dlls/d3dx9_34/Makefile.in b/dlls/d3dx9_34/Makefile.in
-index 37f431228..9b0b500f7 100644
+index 84cca56ec..e03d8ebd5 100644
 --- a/dlls/d3dx9_34/Makefile.in
 +++ b/dlls/d3dx9_34/Makefile.in
 @@ -1,6 +1,6 @@
  EXTRADEFS = -DD3DX_SDK_VERSION=34
  MODULE    = d3dx9_34.dll
--IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
-+IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
+-IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase
++IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase wined3d
  PARENTSRC = ../d3dx9_36
  DELAYIMPORTS = windowscodecs
  
 diff --git a/dlls/d3dx9_35/Makefile.in b/dlls/d3dx9_35/Makefile.in
-index 4441b5f6e..ac4291359 100644
+index 640f30620..ea19e55b2 100644
 --- a/dlls/d3dx9_35/Makefile.in
 +++ b/dlls/d3dx9_35/Makefile.in
 @@ -1,6 +1,6 @@
  EXTRADEFS = -DD3DX_SDK_VERSION=35
  MODULE    = d3dx9_35.dll
--IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
-+IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
+-IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase
++IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase wined3d
  PARENTSRC = ../d3dx9_36
  DELAYIMPORTS = windowscodecs
  
 diff --git a/dlls/d3dx9_36/Makefile.in b/dlls/d3dx9_36/Makefile.in
-index 5e76ab7f5..c95dc0707 100644
+index b8a173ce0..3f96b6656 100644
 --- a/dlls/d3dx9_36/Makefile.in
 +++ b/dlls/d3dx9_36/Makefile.in
 @@ -1,7 +1,7 @@
  EXTRADEFS = -DD3DX_SDK_VERSION=36
  MODULE    = d3dx9_36.dll
  IMPORTLIB = d3dx9
--IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
-+IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
+-IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase
++IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase wined3d
  DELAYIMPORTS = windowscodecs
  
  EXTRADLLFLAGS = -mno-cygwin
 diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c
-index 57d9818cd..f05bad5ab 100644
+index 8e9b834d8..83c30338e 100644
 --- a/dlls/d3dx9_36/surface.c
 +++ b/dlls/d3dx9_36/surface.c
 @@ -25,6 +25,8 @@
@@ -198,7 +198,7 @@ index 57d9818cd..f05bad5ab 100644
  WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
  
  HRESULT WINAPI WICCreateImagingFactory_Proxy(UINT, IWICImagingFactory**);
-@@ -1772,6 +1774,24 @@ void point_filter_argb_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slic
+@@ -1798,6 +1800,24 @@ void point_filter_argb_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slic
      }
  }
  
@@ -223,7 +223,7 @@ index 57d9818cd..f05bad5ab 100644
  /************************************************************
   * D3DXLoadSurfaceFromMemory
   *
-@@ -1811,10 +1831,12 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface,
+@@ -1837,10 +1857,12 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface,
  {
      const struct pixel_format_desc *srcformatdesc, *destformatdesc;
      IDirect3DSurface9 *surface;
@@ -237,7 +237,7 @@ index 57d9818cd..f05bad5ab 100644
  
      TRACE("(%p, %p, %s, %p, %#x, %u, %p, %s, %#x, 0x%08x)\n",
              dst_surface, dst_palette, wine_dbgstr_rect(dst_rect), src_memory, src_format,
-@@ -1895,18 +1917,65 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface,
+@@ -1921,18 +1943,65 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface,
      }
      else /* Stretching or format conversion. */
      {
@@ -252,7 +252,7 @@ index 57d9818cd..f05bad5ab 100644
 +                (!post_convert && !is_conversion_to_supported(destformatdesc)))
          {
              FIXME("Unsupported format conversion %#x -> %#x.\n", src_format, surfdesc.Format);
-             unlock_surface(dst_surface, &lockrect, surface, FALSE);
+             unlock_surface(dst_surface, dst_rect, surface, FALSE);
              return E_NOTIMPL;
          }
  
@@ -307,7 +307,7 @@ index 57d9818cd..f05bad5ab 100644
          }
          else /* if ((filter & 0xf) == D3DX_FILTER_POINT) */
          {
-@@ -1915,12 +1984,29 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface,
+@@ -1941,12 +2010,29 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface,
  
              /* Always apply a point filter until D3DX_FILTER_LINEAR,
               * D3DX_FILTER_TRIANGLE and D3DX_FILTER_BOX are implemented. */
@@ -328,23 +328,23 @@ index 57d9818cd..f05bad5ab 100644
          }
      }
  
--    return unlock_surface(dst_surface, &lockrect, surface, TRUE);
+-    return unlock_surface(dst_surface, dst_rect, surface, TRUE);
 +done:
 +    if (pre_convert)
 +        HeapFree(GetProcessHeap(), 0, tmp_src_memory);
 +    if (post_convert)
 +        HeapFree(GetProcessHeap(), 0, tmp_dst_memory);
 +
-+    unlock_surface(dst_surface, &lockrect, surface, TRUE);
++    unlock_surface(dst_surface, dst_rect, surface, TRUE);
 +    return hr;
  }
  
  /************************************************************
 diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c
-index 56b79d80c..8614cec4c 100644
+index 4a10492a0..d59ff028a 100644
 --- a/dlls/d3dx9_36/tests/surface.c
 +++ b/dlls/d3dx9_36/tests/surface.c
-@@ -1225,7 +1225,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device)
+@@ -1242,7 +1242,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device)
              hr = IDirect3DTexture9_GetSurfaceLevel(tex, 0, &newsurf);
              ok(SUCCEEDED(hr), "Failed to get the surface, hr %#x.\n", hr);
              hr = D3DXLoadSurfaceFromSurface(newsurf, NULL, NULL, surf, NULL, NULL, D3DX_FILTER_NONE, 0);
@@ -353,7 +353,7 @@ index 56b79d80c..8614cec4c 100644
              check_release((IUnknown*)newsurf, 1);
              check_release((IUnknown*)tex, 0);
          }
-@@ -1251,7 +1251,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device)
+@@ -1268,7 +1268,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device)
              hr = IDirect3DTexture9_GetSurfaceLevel(tex, 0, &newsurf);
              ok(SUCCEEDED(hr), "Failed to get the surface, hr %#x.\n", hr);
              hr = D3DXLoadSurfaceFromSurface(newsurf, NULL, NULL, surf, NULL, NULL, D3DX_FILTER_NONE, 0);
@@ -362,7 +362,7 @@ index 56b79d80c..8614cec4c 100644
              check_release((IUnknown*)newsurf, 1);
              check_release((IUnknown*)tex, 0);
          }
-@@ -1264,10 +1264,10 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device)
+@@ -1281,10 +1281,10 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device)
              hr = IDirect3DTexture9_GetSurfaceLevel(tex, 0, &newsurf);
              ok(SUCCEEDED(hr), "Failed to get the surface, hr %#x.\n", hr);
              hr = D3DXLoadSurfaceFromSurface(newsurf, NULL, NULL, surf, NULL, NULL, D3DX_FILTER_NONE, 0);
@@ -376,89 +376,89 @@ index 56b79d80c..8614cec4c 100644
              check_release((IUnknown*)newsurf, 1);
              check_release((IUnknown*)tex, 0);
 diff --git a/dlls/d3dx9_37/Makefile.in b/dlls/d3dx9_37/Makefile.in
-index ea0a04807..a710cef03 100644
+index d16a0ce05..669482dee 100644
 --- a/dlls/d3dx9_37/Makefile.in
 +++ b/dlls/d3dx9_37/Makefile.in
 @@ -1,6 +1,6 @@
  EXTRADEFS = -DD3DX_SDK_VERSION=37
  MODULE    = d3dx9_37.dll
--IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
-+IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
+-IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase
++IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase wined3d
  PARENTSRC = ../d3dx9_36
  DELAYIMPORTS = windowscodecs
  
 diff --git a/dlls/d3dx9_38/Makefile.in b/dlls/d3dx9_38/Makefile.in
-index af62f823d..543a482af 100644
+index 4a02ab417..1f43705e7 100644
 --- a/dlls/d3dx9_38/Makefile.in
 +++ b/dlls/d3dx9_38/Makefile.in
 @@ -1,6 +1,6 @@
  EXTRADEFS = -DD3DX_SDK_VERSION=38
  MODULE    = d3dx9_38.dll
--IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
-+IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
+-IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase
++IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase wined3d
  PARENTSRC = ../d3dx9_36
  DELAYIMPORTS = windowscodecs
  
 diff --git a/dlls/d3dx9_39/Makefile.in b/dlls/d3dx9_39/Makefile.in
-index ab71712d4..cacb0c00d 100644
+index 5a3840574..690ed7d31 100644
 --- a/dlls/d3dx9_39/Makefile.in
 +++ b/dlls/d3dx9_39/Makefile.in
 @@ -1,6 +1,6 @@
  EXTRADEFS = -DD3DX_SDK_VERSION=39
  MODULE    = d3dx9_39.dll
--IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
-+IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
+-IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase
++IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase wined3d
  PARENTSRC = ../d3dx9_36
  DELAYIMPORTS = windowscodecs
  
 diff --git a/dlls/d3dx9_40/Makefile.in b/dlls/d3dx9_40/Makefile.in
-index 76428d2fd..a58a99ef2 100644
+index 581e18dba..8e6984683 100644
 --- a/dlls/d3dx9_40/Makefile.in
 +++ b/dlls/d3dx9_40/Makefile.in
 @@ -1,6 +1,6 @@
  EXTRADEFS = -DD3DX_SDK_VERSION=40
  MODULE    = d3dx9_40.dll
--IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
-+IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
+-IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase
++IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase wined3d
  PARENTSRC = ../d3dx9_36
  DELAYIMPORTS = windowscodecs
  
 diff --git a/dlls/d3dx9_41/Makefile.in b/dlls/d3dx9_41/Makefile.in
-index d3647f895..93fb6b508 100644
+index 63a0be753..37fb2f3e6 100644
 --- a/dlls/d3dx9_41/Makefile.in
 +++ b/dlls/d3dx9_41/Makefile.in
 @@ -1,6 +1,6 @@
  EXTRADEFS = -DD3DX_SDK_VERSION=41
  MODULE    = d3dx9_41.dll
--IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
-+IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
+-IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase
++IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase wined3d
  PARENTSRC = ../d3dx9_36
  DELAYIMPORTS = windowscodecs
  
 diff --git a/dlls/d3dx9_42/Makefile.in b/dlls/d3dx9_42/Makefile.in
-index 88bd746da..197d0d45b 100644
+index ff391a202..2d706c5f8 100644
 --- a/dlls/d3dx9_42/Makefile.in
 +++ b/dlls/d3dx9_42/Makefile.in
 @@ -1,6 +1,6 @@
  EXTRADEFS = -DD3DX_SDK_VERSION=42
  MODULE    = d3dx9_42.dll
--IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
-+IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
+-IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase
++IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase wined3d
  PARENTSRC = ../d3dx9_36
  DELAYIMPORTS = windowscodecs
  
 diff --git a/dlls/d3dx9_43/Makefile.in b/dlls/d3dx9_43/Makefile.in
-index 2f6b8634a..17895954a 100644
+index e009a41c5..d539f6b22 100644
 --- a/dlls/d3dx9_43/Makefile.in
 +++ b/dlls/d3dx9_43/Makefile.in
 @@ -1,6 +1,6 @@
  EXTRADEFS = -DD3DX_SDK_VERSION=43
  MODULE    = d3dx9_43.dll
--IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
-+IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
+-IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase
++IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ucrtbase wined3d
  PARENTSRC = ../d3dx9_36
  DELAYIMPORTS = windowscodecs
  
 -- 
-2.21.0
+2.22.0
 

patches/dbgeng-IDebugClient7/definition

@@ -1 +0,0 @@
-Fixes: [44958] dbgeng: Support IDebugClient7 interface.

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

@@ -237,7 +237,7 @@ index bc58c1817c..3c643afe15 100644
 +    DestroyWindow(window);
 +}
 +
-+static void test_texture_wrong_caps()
++static void test_texture_wrong_caps(void)
 +{
 +    trace("Hardware device.\n");
 +    test_texture_wrong_caps_(FALSE);

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

@@ -81,7 +81,7 @@ index 0000000000..9ecc3d54be
 +
 +#include "wine/test.h"
 +
-+static void test_IDirectManipulationManager2()
++static void test_IDirectManipulationManager2(void)
 +{
 +    IDirectManipulationManager2 *manager2;
 +    IDirectManipulationUpdateManager *update;

patches/eventfd_synchronization/0020-server-Create-eventfd-file-descriptors-for-thread-ob.patch

@@ -1,4 +1,4 @@
-From e13e9f7a5403d5aa7598bd788d9566ce445d3d67 Mon Sep 17 00:00:00 2001
+From 08285be7bf233a38a95b0902c6bac9b24e1fe34f Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <z.figura12@gmail.com>
 Date: Fri, 8 Jun 2018 22:04:29 -0500
 Subject: [PATCH] server: Create eventfd file descriptors for thread objects.
@@ -9,7 +9,7 @@ Subject: [PATCH] server: Create eventfd file descriptors for thread objects.
  2 files changed, 16 insertions(+), 1 deletion(-)
 
 diff --git a/server/thread.c b/server/thread.c
-index a7dcf1088af..1bd09ff4810 100644
+index f5bf4a8d2..b3da4a2f4 100644
 --- a/server/thread.c
 +++ b/server/thread.c
 @@ -133,6 +133,7 @@ static const struct object_ops thread_apc_ops =
@@ -35,9 +35,9 @@ index a7dcf1088af..1bd09ff4810 100644
      thread->entry_point     = 0;
 +    thread->esync_fd        = -1;
      thread->debug_ctx       = NULL;
-     thread->debug_event     = NULL;
      thread->system_regs     = 0;
-@@ -293,6 +295,9 @@ struct thread *create_thread( int fd, struct process *process, const struct secu
+     thread->queue           = NULL;
+@@ -292,6 +294,9 @@ struct thread *create_thread( int fd, struct process *process, const struct secu
          return NULL;
      }
  
@@ -47,7 +47,7 @@ index a7dcf1088af..1bd09ff4810 100644
      set_fd_events( thread->request_fd, POLLIN );  /* start listening to events */
      add_process_thread( thread->process, thread );
      return thread;
-@@ -371,6 +376,9 @@ static void destroy_thread( struct object *obj )
+@@ -370,6 +375,9 @@ static void destroy_thread( struct object *obj )
      if (thread->exit_poll) remove_timeout_user( thread->exit_poll );
      if (thread->id) free_ptid( thread->id );
      if (thread->token) release_object( thread->token );
@@ -57,7 +57,7 @@ index a7dcf1088af..1bd09ff4810 100644
  }
  
  /* dump a thread on stdout for debugging purposes */
-@@ -396,6 +404,12 @@ static int thread_signaled( struct object *obj, struct wait_queue_entry *entry )
+@@ -395,6 +403,12 @@ static int thread_signaled( struct object *obj, struct wait_queue_entry *entry )
      return mythread->state == TERMINATED && !mythread->exit_poll;
  }
  
@@ -71,7 +71,7 @@ index a7dcf1088af..1bd09ff4810 100644
  {
      if (access & GENERIC_READ)    access |= STANDARD_RIGHTS_READ | THREAD_QUERY_INFORMATION | THREAD_GET_CONTEXT;
 diff --git a/server/thread.h b/server/thread.h
-index d2b511145b9..29bf6b51359 100644
+index 382b10b5b..dd06333fd 100644
 --- a/server/thread.h
 +++ b/server/thread.h
 @@ -54,6 +54,7 @@ struct thread
@@ -80,8 +80,8 @@ index d2b511145b9..29bf6b51359 100644
      struct list            mutex_list;    /* list of currently owned mutexes */
 +    int                    esync_fd;      /* esync file descriptor (signalled on exit) */
      struct debug_ctx      *debug_ctx;     /* debugger context if this thread is a debugger */
-     struct debug_event    *debug_event;   /* debug event being sent to debugger */
      unsigned int           system_regs;   /* which system regs have been set */
+     struct msg_queue      *queue;         /* message queue */
 -- 
-2.20.1
+2.22.0
 

patches/eventfd_synchronization/0045-server-ntdll-Implement-alertable-waits.patch

@@ -1,4 +1,4 @@
-From 241237ce6d96ac33915e002518b550d41baaf413 Mon Sep 17 00:00:00 2001
+From f55b5ebadbc078201d81f5f53ad248be58bfac13 Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <z.figura12@gmail.com>
 Date: Fri, 15 Jun 2018 14:12:22 -0500
 Subject: [PATCH] server, ntdll: Implement alertable waits.
@@ -16,7 +16,7 @@ We do this quite simply by waiting on an extra eventfd descriptor, which the ser
  8 files changed, 121 insertions(+), 17 deletions(-)
 
 diff --git a/dlls/ntdll/esync.c b/dlls/ntdll/esync.c
-index 119a36f3611..8a41f6961f9 100644
+index 119a36f36..8a41f6961 100644
 --- a/dlls/ntdll/esync.c
 +++ b/dlls/ntdll/esync.c
 @@ -684,19 +684,43 @@ static int do_poll( struct pollfd *fds, nfds_t nfds, ULONGLONG *end )
@@ -196,7 +196,7 @@ index 119a36f3611..8a41f6961f9 100644
  
  NTSTATUS esync_signal_and_wait( HANDLE signal, HANDLE wait, BOOLEAN alertable,
 diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
-index 31714f90516..009dd33ede0 100644
+index 31714f905..009dd33ed 100644
 --- a/dlls/ntdll/ntdll_misc.h
 +++ b/dlls/ntdll/ntdll_misc.h
 @@ -239,6 +239,7 @@ struct ntdll_thread_data
@@ -208,7 +208,7 @@ index 31714f90516..009dd33ede0 100644
      int                request_fd;    /* fd for sending server requests */
      int                reply_fd;      /* fd for receiving server replies */
 diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
-index 95c175aa7fe..711505242c0 100644
+index 95c175aa7..711505242 100644
 --- a/dlls/ntdll/thread.c
 +++ b/dlls/ntdll/thread.c
 @@ -328,6 +328,7 @@ void thread_init(void)
@@ -228,7 +228,7 @@ index 95c175aa7fe..711505242c0 100644
      pthread_attr_init( &pthread_attr );
      pthread_attr_setstack( &pthread_attr, teb->DeallocationStack,
 diff --git a/server/esync.c b/server/esync.c
-index 5ef4dd282ee..4fb42e6f9d2 100644
+index 5ef4dd282..4fb42e6f9 100644
 --- a/server/esync.c
 +++ b/server/esync.c
 @@ -247,19 +247,25 @@ int esync_create_fd( int initval, int flags )
@@ -272,7 +272,7 @@ index 5ef4dd282ee..4fb42e6f9d2 100644
 +    send_client_fd( current->process, current->esync_apc_fd, current->id );
 +}
 diff --git a/server/esync.h b/server/esync.h
-index aeb58c5469c..cea025d9308 100644
+index aeb58c546..cea025d93 100644
 --- a/server/esync.h
 +++ b/server/esync.h
 @@ -21,6 +21,7 @@
@@ -284,7 +284,7 @@ index aeb58c5469c..cea025d9308 100644
  void esync_clear( int fd );
  
 diff --git a/server/protocol.def b/server/protocol.def
-index 65a6696e38f..d577edc0e02 100644
+index 65a6696e3..d577edc0e 100644
 --- a/server/protocol.def
 +++ b/server/protocol.def
 @@ -4054,6 +4054,11 @@ struct handle_info
@@ -300,7 +300,7 @@ index 65a6696e38f..d577edc0e02 100644
  {
      ESYNC_SEMAPHORE = 1,
 diff --git a/server/thread.c b/server/thread.c
-index 9a014b15459..4b4e342243c 100644
+index b7ed72a5c..fc751c2cb 100644
 --- a/server/thread.c
 +++ b/server/thread.c
 @@ -188,6 +188,7 @@ static inline void init_thread_structure( struct thread *thread )
@@ -309,9 +309,9 @@ index 9a014b15459..4b4e342243c 100644
      thread->esync_fd        = -1;
 +    thread->esync_apc_fd    = -1;
      thread->debug_ctx       = NULL;
-     thread->debug_event     = NULL;
      thread->system_regs     = 0;
-@@ -296,7 +297,10 @@ struct thread *create_thread( int fd, struct process *process, const struct secu
+     thread->queue           = NULL;
+@@ -295,7 +296,10 @@ struct thread *create_thread( int fd, struct process *process, const struct secu
      }
  
      if (do_esync())
@@ -322,7 +322,7 @@ index 9a014b15459..4b4e342243c 100644
  
      set_fd_events( thread->request_fd, POLLIN );  /* start listening to events */
      add_process_thread( thread->process, thread );
-@@ -1051,8 +1055,13 @@ static int queue_apc( struct process *process, struct thread *thread, struct thr
+@@ -1050,8 +1054,13 @@ static int queue_apc( struct process *process, struct thread *thread, struct thr
      grab_object( apc );
      list_add_tail( queue, &apc->entry );
      if (!list_prev( queue, &apc->entry ))  /* first one */
@@ -336,7 +336,7 @@ index 9a014b15459..4b4e342243c 100644
      return 1;
  }
  
-@@ -1099,6 +1108,10 @@ static struct thread_apc *thread_dequeue_apc( struct thread *thread, int system_
+@@ -1098,6 +1107,10 @@ static struct thread_apc *thread_dequeue_apc( struct thread *thread, int system_
          apc = LIST_ENTRY( ptr, struct thread_apc, entry );
          list_remove( ptr );
      }
@@ -348,7 +348,7 @@ index 9a014b15459..4b4e342243c 100644
  }
  
 diff --git a/server/thread.h b/server/thread.h
-index 29bf6b51359..620f8aa9c81 100644
+index dd06333fd..a62559dc4 100644
 --- a/server/thread.h
 +++ b/server/thread.h
 @@ -55,6 +55,7 @@ struct thread
@@ -357,8 +357,8 @@ index 29bf6b51359..620f8aa9c81 100644
      int                    esync_fd;      /* esync file descriptor (signalled on exit) */
 +    int                    esync_apc_fd;  /* esync apc fd (signalled when APCs are present) */
      struct debug_ctx      *debug_ctx;     /* debugger context if this thread is a debugger */
-     struct debug_event    *debug_event;   /* debug event being sent to debugger */
      unsigned int           system_regs;   /* which system regs have been set */
+     struct msg_queue      *queue;         /* message queue */
 -- 
-2.20.1
+2.22.0
 

patches/eventfd_synchronization/0051-kernel32-tests-Add-some-tests-for-wait-timeouts.patch

@@ -1,25 +1,25 @@
-From 7dac195394ed70c62bf7c20794e737071b94e0cb Mon Sep 17 00:00:00 2001
+From 5e739bc4d78bbf6598a8feb7a8cf50e875f86e7f Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <z.figura12@gmail.com>
 Date: Wed, 13 Jun 2018 23:58:01 -0500
-Subject: [PATCH 51/83] kernel32/tests: Add some tests for wait timeouts.
+Subject: [PATCH] kernel32/tests: Add some tests for wait timeouts.
 
 ---
  dlls/kernel32/tests/sync.c | 68 ++++++++++++++++++++++++++++++++++++++
  1 file changed, 68 insertions(+)
 
 diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c
-index 0fb3fd70e..c79e0595e 100644
+index 5fd758118fa..6b1d11a8a3c 100644
 --- a/dlls/kernel32/tests/sync.c
 +++ b/dlls/kernel32/tests/sync.c
-@@ -54,6 +54,7 @@ static BOOLEAN (WINAPI *pTryAcquireSRWLockShared)(PSRWLOCK);
+@@ -55,6 +55,7 @@ static BOOLEAN (WINAPI *pTryAcquireSRWLockShared)(PSRWLOCK);
  
- static NTSTATUS (WINAPI *pNtAllocateVirtualMemory)(HANDLE, PVOID *, ULONG, SIZE_T *, ULONG, ULONG);
+ static NTSTATUS (WINAPI *pNtAllocateVirtualMemory)(HANDLE, PVOID *, ULONG_PTR, SIZE_T *, ULONG, ULONG);
  static NTSTATUS (WINAPI *pNtFreeVirtualMemory)(HANDLE, PVOID *, SIZE_T *, ULONG);
 +static NTSTATUS (WINAPI *pNtQuerySystemTime)(LARGE_INTEGER *);
  static NTSTATUS (WINAPI *pNtWaitForSingleObject)(HANDLE, BOOLEAN, const LARGE_INTEGER *);
  static NTSTATUS (WINAPI *pNtWaitForMultipleObjects)(ULONG,const HANDLE*,BOOLEAN,BOOLEAN,const LARGE_INTEGER*);
  static PSLIST_ENTRY (__fastcall *pRtlInterlockedPushListSList)(PSLIST_HEADER list, PSLIST_ENTRY first,
-@@ -1480,11 +1481,15 @@ static HANDLE modify_handle(HANDLE handle, DWORD modify)
+@@ -1481,11 +1482,15 @@ static HANDLE modify_handle(HANDLE handle, DWORD modify)
      return ULongToHandle(tmp);
  }
  
@@ -35,7 +35,7 @@ index 0fb3fd70e..c79e0595e 100644
      DWORD ret;
  
      signaled = CreateEventW(NULL, TRUE, TRUE, NULL);
-@@ -1569,6 +1574,68 @@ static void test_WaitForSingleObject(void)
+@@ -1570,6 +1575,68 @@ static void test_WaitForSingleObject(void)
      status = pNtWaitForSingleObject(GetCurrentThread(), FALSE, &timeout);
      ok(status == STATUS_TIMEOUT, "expected STATUS_TIMEOUT, got %08x\n", status);
  
@@ -104,7 +104,7 @@ index 0fb3fd70e..c79e0595e 100644
      CloseHandle(signaled);
      CloseHandle(nonsignaled);
  }
-@@ -2963,6 +3030,7 @@ START_TEST(sync)
+@@ -3003,6 +3070,7 @@ START_TEST(sync)
      pTryAcquireSRWLockShared = (void *)GetProcAddress(hdll, "TryAcquireSRWLockShared");
      pNtAllocateVirtualMemory = (void *)GetProcAddress(hntdll, "NtAllocateVirtualMemory");
      pNtFreeVirtualMemory = (void *)GetProcAddress(hntdll, "NtFreeVirtualMemory");
@@ -113,5 +113,5 @@ index 0fb3fd70e..c79e0595e 100644
      pNtWaitForMultipleObjects = (void *)GetProcAddress(hntdll, "NtWaitForMultipleObjects");
      pRtlInterlockedPushListSList = (void *)GetProcAddress(hntdll, "RtlInterlockedPushListSList");
 -- 
-2.20.1
+2.17.1
 

patches/fsutil-Stub_Program/0001-fsutil-Add-fsutil-program-with-support-for-creating-.patch

@@ -1,27 +1,26 @@
-From 7edfe7dd563c746ab2eb896b36dc9f6cafb13a91 Mon Sep 17 00:00:00 2001
+From 8289235edb964f494c221044e36f2ea4294721ae Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Fri, 1 Apr 2016 01:29:51 +0200
 Subject: [PATCH] fsutil: Add fsutil program with support for creating hard
  links.
 
 ---
- programs/fsutil/Makefile.in |   5 +-
+ programs/fsutil/Makefile.in |   3 +
  programs/fsutil/fsutil.rc   |  34 ++++++++++
- programs/fsutil/main.c      | 131 ++++++++++++++++++++++++++++++++++--
+ programs/fsutil/main.c      | 130 ++++++++++++++++++++++++++++++++++--
  programs/fsutil/resources.h |  25 +++++++
- 4 files changed, 188 insertions(+), 7 deletions(-)
+ 4 files changed, 186 insertions(+), 6 deletions(-)
  create mode 100644 programs/fsutil/fsutil.rc
  create mode 100644 programs/fsutil/resources.h
 
 diff --git a/programs/fsutil/Makefile.in b/programs/fsutil/Makefile.in
-index 64307e83a..1cc7f87e2 100644
+index 64307e83ac..e10bd433ba 100644
 --- a/programs/fsutil/Makefile.in
 +++ b/programs/fsutil/Makefile.in
 @@ -1,6 +1,9 @@
  MODULE    = fsutil.exe
  
--EXTRADLLFLAGS = -mconsole -municode -mno-cygwin
-+EXTRADLLFLAGS = -mconsole -municode
+ EXTRADLLFLAGS = -mconsole -municode -mno-cygwin
 +IMPORTS   = user32
  
  C_SRCS = \
@@ -30,7 +29,7 @@ index 64307e83a..1cc7f87e2 100644
 +RC_SRCS = fsutil.rc
 diff --git a/programs/fsutil/fsutil.rc b/programs/fsutil/fsutil.rc
 new file mode 100644
-index 000000000..593f8175a
+index 0000000000..593f8175a2
 --- /dev/null
 +++ b/programs/fsutil/fsutil.rc
 @@ -0,0 +1,34 @@
@@ -69,7 +68,7 @@ index 000000000..593f8175a
 +    STRING_HARDLINK_CREATE_USAGE, "Syntax: fsutil hardlink create old new\n\n"
 +}
 diff --git a/programs/fsutil/main.c b/programs/fsutil/main.c
-index 2bce87edc..508419682 100644
+index 2bce87edc8..6f7974ad1d 100644
 --- a/programs/fsutil/main.c
 +++ b/programs/fsutil/main.c
 @@ -1,5 +1,6 @@
@@ -79,13 +78,12 @@ index 2bce87edc..508419682 100644
   *
   * This library is free software; you can redistribute it and/or
   * modify it under the terms of the GNU Lesser General Public
-@@ -16,18 +17,136 @@
+@@ -16,18 +17,135 @@
   * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
   */
  
 -#include "wine/debug.h"
 +#include <windows.h>
-+#include <wine/unicode.h>
 +#include <wine/debug.h>
 +
 +#include "resources.h"
@@ -179,7 +177,7 @@ index 2bce87edc..508419682 100644
 +
 +    if (argc > 2)
 +    {
-+        if (!strcmpiW(argv[2], createW))
++        if (!_wcsicmp(argv[2], createW))
 +            return create_hardlink(argc, argv);
 +        else
 +        {
@@ -209,7 +207,7 @@ index 2bce87edc..508419682 100644
 -    return 0;
 +    if (argc > 1)
 +    {
-+        if (!strcmpiW(argv[1], hardlinkW))
++        if (!_wcsicmp(argv[1], hardlinkW))
 +            return hardlink(argc, argv);
 +        else
 +        {
@@ -224,7 +222,7 @@ index 2bce87edc..508419682 100644
  }
 diff --git a/programs/fsutil/resources.h b/programs/fsutil/resources.h
 new file mode 100644
-index 000000000..b85826ac4
+index 0000000000..b85826ac42
 --- /dev/null
 +++ b/programs/fsutil/resources.h
 @@ -0,0 +1,25 @@
@@ -254,5 +252,5 @@ index 000000000..b85826ac4
 +#define STRING_HARDLINK_USAGE           104
 +#define STRING_HARDLINK_CREATE_USAGE    105
 -- 
-2.21.0
+2.23.0.rc1
 

patches/gdi32-MultiMonitor/0004-winemac-Make-GetMonitorInfo-give-a-different-device-.patch

@@ -1,42 +0,0 @@
-From 804021e621413998b319f887eed3f754df784fcd Mon Sep 17 00:00:00 2001
-From: Ken Thomases <ken@codeweavers.com>
-Date: Thu, 27 Mar 2014 18:18:46 -0500
-Subject: winemac: Make GetMonitorInfo() give a different device name
- (\\.\DISPLAY<n>) to each monitor.
-
----
- dlls/winemac.drv/display.c | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c
-index e1357d8..f82289d 100644
---- a/dlls/winemac.drv/display.c
-+++ b/dlls/winemac.drv/display.c
-@@ -1210,7 +1210,7 @@ done:
-  */
- BOOL CDECL macdrv_GetMonitorInfo(HMONITOR monitor, LPMONITORINFO info)
- {
--    static const WCHAR adapter_name[] = { '\\','\\','.','\\','D','I','S','P','L','A','Y','1',0 };
-+    static const WCHAR adapter_name[] = { '\\','\\','.','\\','D','I','S','P','L','A','Y','%','d',0 };
-     struct macdrv_display *displays;
-     int num_displays;
-     CGDirectDisplayID display_id;
-@@ -1240,10 +1240,12 @@ BOOL CDECL macdrv_GetMonitorInfo(HMONITOR monitor, LPMONITORINFO info)
-         info->dwFlags = (i == 0) ? MONITORINFOF_PRIMARY : 0;
- 
-         if (info->cbSize >= sizeof(MONITORINFOEXW))
--            lstrcpyW(((MONITORINFOEXW*)info)->szDevice, adapter_name);
-+            snprintfW(((MONITORINFOEXW*)info)->szDevice, sizeof(((MONITORINFOEXW*)info)->szDevice) / sizeof(WCHAR),
-+                      adapter_name, i + 1);
- 
--        TRACE(" -> rcMonitor %s rcWork %s dwFlags %08x\n", wine_dbgstr_rect(&info->rcMonitor),
--              wine_dbgstr_rect(&info->rcWork), info->dwFlags);
-+        TRACE(" -> rcMonitor %s rcWork %s dwFlags %08x szDevice %s\n", wine_dbgstr_rect(&info->rcMonitor),
-+              wine_dbgstr_rect(&info->rcWork), info->dwFlags,
-+              info->cbSize >= sizeof(MONITORINFOEXW) ? debugstr_w(((MONITORINFOEXW*)info)->szDevice) : "n/a");
-     }
-     else
-     {
--- 
-2.6.1
-

patches/gdi32-MultiMonitor/definition

@@ -1,3 +0,0 @@
-Fixes: [34978] Multiple applications need EnumDisplayDevicesW implementation
-Fixes: [37709] GetMonitorInfo returns the same name for all monitors
-Fixes: [41258] Return a more reasonable display DeviceID

patches/httpapi-HttpCreateServerSession/0001-httpapi-Fake-success-from-HttpCreateServerSession.patch

@@ -1,78 +0,0 @@
-From 81d946aef87b60fa5a013eda5656c10726c5bd0a Mon Sep 17 00:00:00 2001
-From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Wed, 30 Jan 2019 16:23:25 +1100
-Subject: [PATCH] httpapi: Fake success from HttpCreateServerSession
-
-Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46549
----
- dlls/httpapi/httpapi_main.c  | 10 +++++++++-
- dlls/httpapi/tests/httpapi.c | 10 +++++-----
- 2 files changed, 14 insertions(+), 6 deletions(-)
-
-diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c
-index 3ab03995e4..44e72c6f41 100644
---- a/dlls/httpapi/httpapi_main.c
-+++ b/dlls/httpapi/httpapi_main.c
-@@ -190,7 +190,15 @@ ULONG WINAPI HttpAddUrl( HANDLE handle, PCWSTR url, PVOID reserved )
- ULONG WINAPI HttpCreateServerSession( HTTPAPI_VERSION version, HTTP_SERVER_SESSION_ID *id, ULONG reserved )
- {
-     FIXME( "({%d,%d}, %p, %d): stub!\n", version.HttpApiMajorVersion, version.HttpApiMinorVersion, id, reserved );
--    return ERROR_ACCESS_DENIED;
-+
-+    if(!id || reserved)
-+        return ERROR_INVALID_PARAMETER;
-+    if((version.HttpApiMajorVersion != 1 && version.HttpApiMajorVersion != 2)  || version.HttpApiMinorVersion != 0)
-+        return ERROR_REVISION_MISMATCH;
-+
-+    *id = 0xabcdefff;
-+
-+    return NO_ERROR;
- }
- 
- /***********************************************************************
-diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c
-index e1437552a8..e090390b89 100644
---- a/dlls/httpapi/tests/httpapi.c
-+++ b/dlls/httpapi/tests/httpapi.c
-@@ -92,25 +92,26 @@ static void test_HttpCreateServerSession(void)
-     version.HttpApiMajorVersion = 1;
-     version.HttpApiMinorVersion = 0;
-     ret = pHttpCreateServerSession(version, NULL, 0);
--todo_wine
-+    ok(ret == ERROR_INVALID_PARAMETER, "Unexpected return value %u.\n", ret);
-+
-+    version.HttpApiMajorVersion = 1;
-+    version.HttpApiMinorVersion = 0;
-+    ret = pHttpCreateServerSession(version, &session, 1);
-     ok(ret == ERROR_INVALID_PARAMETER, "Unexpected return value %u.\n", ret);
- 
-     version.HttpApiMajorVersion = 1;
-     version.HttpApiMinorVersion = 1;
-     ret = pHttpCreateServerSession(version, &session, 0);
--todo_wine
-     ok(ret == ERROR_REVISION_MISMATCH, "Unexpected return value %u.\n", ret);
- 
-     version.HttpApiMajorVersion = 3;
-     version.HttpApiMinorVersion = 0;
-     ret = pHttpCreateServerSession(version, &session, 0);
--todo_wine
-     ok(ret == ERROR_REVISION_MISMATCH, "Unexpected return value %u.\n", ret);
- 
-     version.HttpApiMajorVersion = 2;
-     version.HttpApiMinorVersion = 0;
-     ret = pHttpCreateServerSession(version, &session, 0);
--todo_wine
-     ok(!ret, "Unexpected return value %u.\n", ret);
-     ret = pHttpCloseServerSession(session);
- todo_wine
-@@ -119,7 +120,6 @@ todo_wine
-     version.HttpApiMajorVersion = 1;
-     version.HttpApiMinorVersion = 0;
-     ret = pHttpCreateServerSession(version, &session, 0);
--todo_wine
-     ok(!ret, "Unexpected return value %u.\n", ret);
-     ret = pHttpCloseServerSession(session);
- todo_wine
--- 
-2.20.1
-

patches/httpapi-HttpCreateServerSession/0002-httpapi-Add-CreateUrlGroup-stub.patch

@@ -1,59 +0,0 @@
-From fd6e709fad9b70a8d19ed6521e3375658c2c951f Mon Sep 17 00:00:00 2001
-From: Esdras Tarsis <esdrastarsis@gmail.com>
-Date: Sat, 30 Mar 2019 18:59:05 -0300
-Subject: [PATCH] httpapi: Add CreateUrlGroup stub.
-
----
- dlls/httpapi/httpapi.spec   |  1 +
- dlls/httpapi/httpapi_main.c | 12 ++++++++++++
- include/http.h              |  1 +
- 3 files changed, 14 insertions(+)
-
-diff --git a/dlls/httpapi/httpapi.spec b/dlls/httpapi/httpapi.spec
-index 1d8fcd8..bcd09e7 100644
---- a/dlls/httpapi/httpapi.spec
-+++ b/dlls/httpapi/httpapi.spec
-@@ -7,6 +7,7 @@
- @ stub HttpCreateFilter
- @ stdcall HttpCreateHttpHandle(ptr long)
- @ stdcall HttpCreateServerSession(long ptr long)
-+@ stdcall HttpCreateUrlGroup(int64 ptr long)
- @ stdcall HttpCloseServerSession(int64)
- @ stub HttpDeleteConfigGroup
- @ stdcall HttpDeleteServiceConfiguration(ptr long ptr long ptr)
-diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c
-index 3ab0399..9280fc1 100644
---- a/dlls/httpapi/httpapi_main.c
-+++ b/dlls/httpapi/httpapi_main.c
-@@ -201,3 +201,15 @@ ULONG WINAPI HttpCloseServerSession( HTTP_SERVER_SESSION_ID id )
-     FIXME( "(%s): stub!\n", wine_dbgstr_longlong(id));
-     return ERROR_INVALID_PARAMETER;
- }
-+
-+/***********************************************************************
-+ *        HttpCreateUrlGroup     (HTTPAPI.@)
-+ */
-+ULONG WINAPI HttpCreateUrlGroup( HTTP_SERVER_SESSION_ID id, HTTP_URL_GROUP_ID *urlgroupid, ULONG reserved )
-+{
-+    FIXME( "(%s, %p, %d): stub!\n", wine_dbgstr_longlong(id), urlgroupid, reserved );
-+
-+    *urlgroupid = 0xdeadbeef;
-+
-+    return NO_ERROR;
-+}
-\ No newline at end of file
-diff --git a/include/http.h b/include/http.h
-index 8f284a8..50a10f8 100644
---- a/include/http.h
-+++ b/include/http.h
-@@ -59,6 +59,7 @@ ULONG WINAPI HttpTerminate(ULONG,PVOID);
- 
- ULONG WINAPI HttpAddUrl(HANDLE,PCWSTR,PVOID);
- ULONG WINAPI HttpCreateHttpHandle(PHANDLE,ULONG);
-+ULONG WINAPI HttpCreateUrlGroup(HTTP_SERVER_SESSION_ID,PHTTP_URL_GROUP_ID,ULONG);
- ULONG WINAPI HttpCreateServerSession(HTTPAPI_VERSION,PHTTP_SERVER_SESSION_ID,ULONG);
- ULONG WINAPI HttpCloseServerSession(HTTP_SERVER_SESSION_ID);
- ULONG WINAPI HttpDeleteServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,LPOVERLAPPED);
--- 
-1.9.1
-