Release v4.14

Dropped scalling patch as it's causing regressions.

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/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/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/kernel32-Processor_Group/0001-kernel32-Implement-some-processor-group-functions.patch

@@ -1,4 +1,4 @@
-From e5b50178db3b0e1fdd7f4c3c88c2c6d4dd5ebd86 Mon Sep 17 00:00:00 2001
+From 296432e173a7d08f8f3b78df7c5a54d5ca2ca0c7 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.
@@ -87,7 +87,7 @@ index 96180bed4ec..a71d961eefa 100644
  
  /***********************************************************************
 diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
-index c01f132371e..cedd84efbc7 100644
+index 016c3022dcb..2f34e1c763c 100644
 --- a/dlls/kernel32/kernel32.spec
 +++ b/dlls/kernel32/kernel32.spec
 @@ -717,7 +717,7 @@
@@ -96,11 +96,11 @@ index c01f132371e..cedd84efbc7 100644
  @ stdcall GetMaximumProcessorCount(long)
 -# @ stub GetMaximumProcessorGroupCount
 +@ stdcall GetMaximumProcessorGroupCount()
- @ stdcall GetModuleFileNameA(long ptr long)
- @ stdcall GetModuleFileNameW(long ptr long)
- @ stdcall GetModuleHandleA(str)
+ @ stdcall -import GetModuleFileNameA(long ptr long)
+ @ 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 0892d842ff7..71d141df8ea 100644
+index 973c1a919bb..b5ff2c69869 100644
 --- a/dlls/kernel32/tests/process.c
 +++ b/dlls/kernel32/tests/process.c
 @@ -91,6 +91,7 @@ static SIZE_T (WINAPI *pGetLargePageMinimum)(void);
@@ -119,7 +119,7 @@ index 0892d842ff7..71d141df8ea 100644
  
      return TRUE;
  }
-@@ -3880,6 +3882,26 @@ static void test_ProcThreadAttributeList(void)
+@@ -3908,6 +3910,26 @@ static void test_ProcThreadAttributeList(void)
      pDeleteProcThreadAttributeList(&list);
  }
  
@@ -146,7 +146,7 @@ index 0892d842ff7..71d141df8ea 100644
  START_TEST(process)
  {
      HANDLE job;
-@@ -3964,6 +3986,7 @@ START_TEST(process)
+@@ -3992,6 +4014,7 @@ START_TEST(process)
      test_GetNumaProcessorNode();
      test_session_info();
      test_GetLogicalProcessorInformationEx();
@@ -155,10 +155,10 @@ index 0892d842ff7..71d141df8ea 100644
      test_ProcThreadAttributeList();
      test_SuspendProcessState();
 diff --git a/include/winnt.h b/include/winnt.h
-index fad4c7c47fa..a77633bcf7e 100644
+index 3f91ede6a68..9484bc0e14b 100644
 --- a/include/winnt.h
 +++ b/include/winnt.h
-@@ -6326,6 +6326,8 @@ typedef struct _GROUP_AFFINITY
+@@ -6338,6 +6338,8 @@ typedef struct _GROUP_AFFINITY
      WORD Reserved[3];
  } GROUP_AFFINITY, *PGROUP_AFFINITY;
  
@@ -168,5 +168,5 @@ index fad4c7c47fa..a77633bcf7e 100644
  {
      WORD Group;
 -- 
-2.20.1
+2.17.1
 

patches/kernel32-Processor_Group/0002-kernel32-Add-stub-for-SetThreadIdealProcessorEx.patch

@@ -1,25 +1,27 @@
-From ac7b880c08822aac4e5241753dc919b7ab0e796e Mon Sep 17 00:00:00 2001
+From b23c9ccff82d2262c48ae2a32ab642cc6ba07556 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:31:59 +0100
-Subject: kernel32: Add stub for SetThreadIdealProcessorEx.
+Subject: [PATCH] kernel32: Add stub for SetThreadIdealProcessorEx.
 
 ---
- dlls/kernel32/thread.c | 32 ++++++++++++++++++++++----------
- 1 file changed, 22 insertions(+), 10 deletions(-)
+ dlls/kernelbase/thread.c | 21 +++++++++++++++++----
+ 1 file changed, 17 insertions(+), 4 deletions(-)
 
-diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c
-index ac2c3687789..499fbe24d09 100644
---- a/dlls/kernel32/thread.c
-+++ b/dlls/kernel32/thread.c
-@@ -450,6 +450,28 @@ DWORD_PTR WINAPI SetThreadAffinityMask( HANDLE hThread, DWORD_PTR dwThreadAffini
-     return tbi.AffinityMask;
- }
- 
-+/**********************************************************************
-+ *           SetThreadIdealProcessorEx   (KERNEL32.@)
-+ */
-+BOOL WINAPI SetThreadIdealProcessorEx(HANDLE thread, PROCESSOR_NUMBER *processor, PROCESSOR_NUMBER *previous)
-+{
+diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c
+index cf8e6be2b..d775b3c0e 100644
+--- a/dlls/kernelbase/thread.c
++++ b/dlls/kernelbase/thread.c
+@@ -437,12 +437,25 @@ DWORD WINAPI DECLSPEC_HOTPATCH SetThreadIdealProcessor( HANDLE thread, DWORD pro
+ /***********************************************************************
+  *           SetThreadIdealProcessorEx   (kernelbase.@)
+  */
+-BOOL WINAPI DECLSPEC_HOTPATCH SetThreadIdealProcessorEx( HANDLE thread, PROCESSOR_NUMBER *ideal,
++BOOL WINAPI DECLSPEC_HOTPATCH SetThreadIdealProcessorEx( HANDLE thread, PROCESSOR_NUMBER *processor,
+                                                          PROCESSOR_NUMBER *previous )
+ {
+-    FIXME( "(%p %p %p): stub\n", thread, ideal, previous );
+-    SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
+-    return FALSE;
 +    FIXME("(%p, %p, %p): stub\n", thread, processor, previous);
 +
 +    if (!processor || processor->Group > 0 || processor->Number > MAXIMUM_PROCESSORS)
@@ -36,27 +38,9 @@ index ac2c3687789..499fbe24d09 100644
 +    }
 +
 +    return TRUE;
-+}
- 
- /**********************************************************************
-  * SetThreadIdealProcessor [KERNEL32.@]  Sets preferred processor for thread.
-@@ -472,16 +494,6 @@ DWORD WINAPI SetThreadIdealProcessor(
  }
  
- /***********************************************************************
-- *              SetThreadIdealProcessorEx (KERNEL32.@)
-- */
--BOOL WINAPI SetThreadIdealProcessorEx( HANDLE thread, PROCESSOR_NUMBER *ideal, PROCESSOR_NUMBER *previous )
--{
--    FIXME("(%p %p %p): stub\n", thread, ideal, previous);
--    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
--    return FALSE;
--}
--
--/***********************************************************************
-  *           GetThreadSelectorEntry   (KERNEL32.@)
-  */
- BOOL WINAPI GetThreadSelectorEntry( HANDLE hthread, DWORD sel, LPLDT_ENTRY ldtent )
+ 
 -- 
-2.12.2
+2.22.0
 

patches/kernel32-SetProcessDEPPolicy/0001-kernel32-Implement-SetProcessDEPPolicy.patch

@@ -1,14 +1,14 @@
-From 71cb9b2d7c41098881516a2b8f5db2f17f84dca6 Mon Sep 17 00:00:00 2001
+From d14d9f0265a8adb9bbcb6eb3b0e76b6c88655218 Mon Sep 17 00:00:00 2001
 From: "Olivier F. R. Dierick" <o.dierick@piezo-forte.be>
 Date: Tue, 19 Apr 2016 07:25:39 +0200
-Subject: [PATCH 1/3] kernel32: Implement SetProcessDEPPolicy().
+Subject: [PATCH] kernel32: Implement SetProcessDEPPolicy().
 
 ---
  dlls/kernel32/process.c | 34 +++++++++++++++++++++++++++++++---
  1 file changed, 31 insertions(+), 3 deletions(-)
 
 diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
-index 0d0de93eee..7a89207388 100644
+index 992437047..e10bfd95a 100644
 --- a/dlls/kernel32/process.c
 +++ b/dlls/kernel32/process.c
 @@ -114,6 +114,8 @@ static WCHAR winevdm[] = {'C',':','\\','w','i','n','d','o','w','s',
@@ -19,8 +19,8 @@ index 0d0de93eee..7a89207388 100644
 +
  static void exec_process( LPCWSTR name );
  
- extern void SHELL_LoadRegistry(void);
-@@ -4376,9 +4378,35 @@ DEP_SYSTEM_POLICY_TYPE WINAPI GetSystemDEPPolicy(void)
+ /* return values for get_binary_info */
+@@ -3919,9 +3921,35 @@ DEP_SYSTEM_POLICY_TYPE WINAPI GetSystemDEPPolicy(void)
   */
  BOOL WINAPI SetProcessDEPPolicy(DWORD newDEP)
  {
@@ -60,5 +60,5 @@ index 0d0de93eee..7a89207388 100644
  
  /**********************************************************************
 -- 
-2.17.1
+2.22.0
 

patches/mailing-list-patches/0012-strmbase-Remove-unused-wine-unicode.h-import.patch

@@ -1,25 +0,0 @@
-From 616ad4e053abdc48810064993caef067a3452587 Mon Sep 17 00:00:00 2001
-From: Zebediah Figura <zfigura@codeweavers.com>
-Date: Mon, 8 Jul 2019 11:24:39 -0500
-Subject: [PATCH] strmbase: Remove unused wine/unicode.h import.
-
-Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
----
- dlls/strmbase/strmbase_private.h | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/dlls/strmbase/strmbase_private.h b/dlls/strmbase/strmbase_private.h
-index 439ab9aefa..06fbe62a42 100644
---- a/dlls/strmbase/strmbase_private.h
-+++ b/dlls/strmbase/strmbase_private.h
-@@ -31,7 +31,6 @@
- #include "wine/heap.h"
- #include "wine/list.h"
- #include "wine/strmbase.h"
--#include "wine/unicode.h"
- 
- /* Quality Control */
- typedef struct QualityControlImpl {
--- 
-2.17.1
-

patches/mailing-list-patches/0013-qedit-Build-with-msvcrt.patch

@@ -1,26 +0,0 @@
-From b263d3d0958c18b2b8f105b87c27f9cbee176503 Mon Sep 17 00:00:00 2001
-From: Zebediah Figura <zfigura@codeweavers.com>
-Date: Mon, 8 Jul 2019 11:24:43 -0500
-Subject: [PATCH] qedit: Build with msvcrt.
-
-Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
----
- dlls/qedit/Makefile.in | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/dlls/qedit/Makefile.in b/dlls/qedit/Makefile.in
-index b47ee260ab..4891328c7a 100644
---- a/dlls/qedit/Makefile.in
-+++ b/dlls/qedit/Makefile.in
-@@ -1,6 +1,8 @@
- MODULE    = qedit.dll
- IMPORTS   = strmiids strmbase uuid oleaut32 ole32 advapi32
- 
-+EXTRADLLFLAGS = -mno-cygwin
-+
- C_SRCS = \
- 	main.c \
- 	mediadet.c \
--- 
-2.17.1
-

patches/mailing-list-patches/0014-qedit-Share-source-with-strmbase.patch

@@ -1,40 +0,0 @@
-From 4018f0ee2e502ded20bc907e3baa47ca348a61b8 Mon Sep 17 00:00:00 2001
-From: Zebediah Figura <zfigura@codeweavers.com>
-Date: Mon, 8 Jul 2019 11:24:42 -0500
-Subject: [PATCH] qedit: Share source with strmbase.
-
-Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
----
- dlls/qedit/Makefile.in | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/dlls/qedit/Makefile.in b/dlls/qedit/Makefile.in
-index 4891328c7a..c5bf8f9cac 100644
---- a/dlls/qedit/Makefile.in
-+++ b/dlls/qedit/Makefile.in
-@@ -1,12 +1,21 @@
- MODULE    = qedit.dll
--IMPORTS   = strmiids strmbase uuid oleaut32 ole32 advapi32
-+IMPORTS   = strmiids uuid oleaut32 ole32 advapi32
-+PARENTSRC = ../strmbase
- 
- EXTRADLLFLAGS = -mno-cygwin
- 
- C_SRCS = \
-+	dispatch.c \
-+	enumpins.c \
-+	filter.c \
- 	main.c \
- 	mediadet.c \
-+	mediatype.c \
- 	nullrenderer.c \
-+	pin.c \
-+	pospass.c \
-+	qualitycontrol.c \
-+	renderer.c \
- 	samplegrabber.c \
- 	timeline.c
- 
--- 
-2.17.1
-

patches/mailing-list-patches/0015-evr-Build-with-msvcrt.patch

@@ -1,53 +0,0 @@
-From 4b3eebfae7a5a03f3c1644c65d5f1c00af0c4ae3 Mon Sep 17 00:00:00 2001
-From: Zebediah Figura <zfigura@codeweavers.com>
-Date: Mon, 8 Jul 2019 11:24:41 -0500
-Subject: [PATCH] evr: Build with msvcrt.
-
-Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
----
- dlls/evr/Makefile.in | 2 ++
- dlls/evr/evr.c       | 1 -
- dlls/evr/main.c      | 2 --
- 3 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/dlls/evr/Makefile.in b/dlls/evr/Makefile.in
-index dc7989e835..053d80e61d 100644
---- a/dlls/evr/Makefile.in
-+++ b/dlls/evr/Makefile.in
-@@ -1,6 +1,8 @@
- MODULE    = evr.dll
- IMPORTS   = mfuuid strmiids strmbase uuid ole32 oleaut32
- 
-+EXTRADLLFLAGS = -mno-cygwin
-+
- C_SRCS = \
- 	evr.c \
- 	main.c
-diff --git a/dlls/evr/evr.c b/dlls/evr/evr.c
-index b64b0468ac..655ca79b0d 100644
---- a/dlls/evr/evr.c
-+++ b/dlls/evr/evr.c
-@@ -18,7 +18,6 @@
- 
- #define COBJMACROS
- 
--#include "config.h"
- #include "wine/debug.h"
- 
- #include <stdio.h>
-diff --git a/dlls/evr/main.c b/dlls/evr/main.c
-index ba48207326..000ed7c55b 100644
---- a/dlls/evr/main.c
-+++ b/dlls/evr/main.c
-@@ -18,8 +18,6 @@
- 
- #define COBJMACROS
- 
--#include "config.h"
--
- #include <stdarg.h>
- 
- #include "windef.h"
--- 
-2.17.1
-

patches/mailing-list-patches/0016-evr-Share-source-with-strmbase.patch

@@ -1,39 +0,0 @@
-From 29294a8ce4ae5114396464e8aa177e267881e734 Mon Sep 17 00:00:00 2001
-From: Zebediah Figura <zfigura@codeweavers.com>
-Date: Mon, 8 Jul 2019 11:24:40 -0500
-Subject: [PATCH] evr: Share source with strmbase.
-
-Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
----
- dlls/evr/Makefile.in | 13 +++++++++++--
- 1 file changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/evr/Makefile.in b/dlls/evr/Makefile.in
-index 053d80e61d..e605ce227c 100644
---- a/dlls/evr/Makefile.in
-+++ b/dlls/evr/Makefile.in
-@@ -1,10 +1,19 @@
- MODULE    = evr.dll
--IMPORTS   = mfuuid strmiids strmbase uuid ole32 oleaut32
-+IMPORTS   = mfuuid strmiids uuid ole32 oleaut32
-+PARENTSRC = ../strmbase
- 
- EXTRADLLFLAGS = -mno-cygwin
- 
- C_SRCS = \
-+	dispatch.c \
-+	enumpins.c \
- 	evr.c \
--	main.c
-+	filter.c \
-+	main.c \
-+	mediatype.c \
-+	pin.c \
-+	pospass.c \
-+	qualitycontrol.c \
-+	renderer.c
- 
- IDL_SRCS = evr_classes.idl
--- 
-2.17.1
-

patches/mailing-list-patches/0034-msvcrt-Do-not-use-casting-in-min-max-macros.patch

@@ -1,40 +0,0 @@
-From 2d1a3062bcb0e0716168c75b9c4ccef17189a47d Mon Sep 17 00:00:00 2001
-From: Peter Dons Tychsen <pdt@dontech.dk>
-Date: Sun, 21 Jul 2019 23:38:02 +0200
-Subject: [PATCH] msvcrt: Do not use casting in min/max macros
-
-Macros like ULLONG_MAX are meant to be able to be used in macro conditionals like "#if (UULONG_MAX >= 1)". This is not possible as there are casts in them currently which of course the preprocessor cannot parse.
-
-Fix this by using type prefixes instead which the preprocessor does understand.
-This makes libraries like "libtom" compile with Wine headers.
-
-Signed-off-by: Peter Dons Tychsen <pdt@dontech.dk>
----
- include/msvcrt/limits.h | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/include/msvcrt/limits.h b/include/msvcrt/limits.h
-index 13bab8679ba..8d3a0387cd3 100644
---- a/include/msvcrt/limits.h
-+++ b/include/msvcrt/limits.h
-@@ -30,13 +30,13 @@
- #define LONG_MAX    0x7fffffffL
- #define ULONG_MAX   0xffffffffUL
- 
--#define LLONG_MAX   (((__int64)0x7fffffff << 32) | 0xffffffff)
-+#define LLONG_MAX   ((0x7fffffffLL << 32) | 0xffffffff)
- #define LLONG_MIN   (-LLONG_MAX-1)
--#define ULLONG_MAX  (((unsigned __int64)0xffffffff << 32) | 0xffffffff)
-+#define ULLONG_MAX  ((0xffffffffULL << 32) | 0xffffffff)
- 
--#define _I64_MAX    (((__int64)0x7fffffff << 32) | 0xffffffff)
-+#define _I64_MAX    ((0x7fffffffLL << 32) | 0xffffffff)
- #define _I64_MIN    (-_I64_MAX-1)
--#define _UI64_MAX   (((unsigned __int64)0xffffffff << 32) | 0xffffffff)
-+#define _UI64_MAX   ((0xffffffffULL << 32) | 0xffffffff)
- 
- #define I64_MIN  _I64_MIN
- #define I64_MAX  _I64_MAX
--- 
-2.17.1
-

patches/ntdll-DOS_Attributes/0003-ntdll-Implement-storing-DOS-attributes-in-NtSetInfor.patch

@@ -1,4 +1,4 @@
-From 9dc5bc2dda6026276cc44db68f51dcba2394a6de Mon Sep 17 00:00:00 2001
+From b8d44b453c650178926c9d2a4eb44a3f05d34389 Mon Sep 17 00:00:00 2001
 From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
 Date: Wed, 20 Aug 2014 00:08:52 -0600
 Subject: [PATCH] ntdll: Implement storing DOS attributes in
@@ -12,7 +12,7 @@ Subject: [PATCH] ntdll: Implement storing DOS attributes in
  4 files changed, 60 insertions(+), 24 deletions(-)
 
 diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
-index bdc3faacac7..d968f06b02d 100644
+index 71706c832..674e0abea 100644
 --- a/dlls/ntdll/file.c
 +++ b/dlls/ntdll/file.c
 @@ -169,6 +169,39 @@ int fd_get_file_info( int fd, struct stat *st, ULONG *attr )
@@ -55,16 +55,16 @@ index bdc3faacac7..d968f06b02d 100644
  /* get the stat info and file attributes for a file (by name) */
  int get_file_info( const char *path, struct stat *st, ULONG *attr )
  {
-@@ -3062,7 +3095,6 @@ NTSTATUS WINAPI NtSetInformationFile(HANDLE handle, PIO_STATUS_BLOCK io,
+@@ -3050,7 +3083,6 @@ NTSTATUS WINAPI NtSetInformationFile(HANDLE handle, PIO_STATUS_BLOCK io,
      case FileBasicInformation:
          if (len >= sizeof(FILE_BASIC_INFORMATION))
          {
 -            struct stat st;
              const FILE_BASIC_INFORMATION *info = ptr;
+             LARGE_INTEGER mtime, atime;
  
-             if ((io->u.Status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL )))
-@@ -3072,25 +3104,7 @@ NTSTATUS WINAPI NtSetInformationFile(HANDLE handle, PIO_STATUS_BLOCK io,
-                 io->u.Status = set_file_times( fd, &info->LastWriteTime, &info->LastAccessTime );
+@@ -3064,25 +3096,7 @@ NTSTATUS WINAPI NtSetInformationFile(HANDLE handle, PIO_STATUS_BLOCK io,
+                 io->u.Status = set_file_times( fd, &mtime, &atime );
  
              if (io->u.Status == STATUS_SUCCESS && info->FileAttributes)
 -            {
@@ -91,10 +91,10 @@ index bdc3faacac7..d968f06b02d 100644
              if (needs_close) close( fd );
          }
 diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
-index 8336bba8739..ce1d763c121 100644
+index cfc48c4ab..e59cdba5e 100644
 --- a/dlls/ntdll/tests/file.c
 +++ b/dlls/ntdll/tests/file.c
-@@ -1341,7 +1341,7 @@ static void test_file_basic_information(void)
+@@ -1364,7 +1364,7 @@ static void test_file_basic_information(void)
      memset(&fbi, 0, sizeof(fbi));
      res = pNtQueryInformationFile(h, &io, &fbi, sizeof fbi, FileBasicInformation);
      ok ( res == STATUS_SUCCESS, "can't get attributes\n");
@@ -103,7 +103,7 @@ index 8336bba8739..ce1d763c121 100644
  
      /* Then HIDDEN */
      memset(&fbi, 0, sizeof(fbi));
-@@ -1354,7 +1354,7 @@ static void test_file_basic_information(void)
+@@ -1377,7 +1377,7 @@ static void test_file_basic_information(void)
      memset(&fbi, 0, sizeof(fbi));
      res = pNtQueryInformationFile(h, &io, &fbi, sizeof fbi, FileBasicInformation);
      ok ( res == STATUS_SUCCESS, "can't get attributes\n");
@@ -112,7 +112,7 @@ index 8336bba8739..ce1d763c121 100644
  
      /* Check NORMAL last of all (to make sure we can clear attributes) */
      memset(&fbi, 0, sizeof(fbi));
-@@ -1411,7 +1411,7 @@ static void test_file_all_information(void)
+@@ -1434,7 +1434,7 @@ static void test_file_all_information(void)
      memset(&fai_buf.fai, 0, sizeof(fai_buf.fai));
      res = pNtQueryInformationFile(h, &io, &fai_buf.fai, sizeof fai_buf, FileAllInformation);
      ok ( res == STATUS_SUCCESS, "can't get attributes, res %x\n", res);
@@ -121,7 +121,7 @@ index 8336bba8739..ce1d763c121 100644
  
      /* Then HIDDEN */
      memset(&fai_buf.fai.BasicInformation, 0, sizeof(fai_buf.fai.BasicInformation));
-@@ -1424,7 +1424,7 @@ static void test_file_all_information(void)
+@@ -1447,7 +1447,7 @@ static void test_file_all_information(void)
      memset(&fai_buf.fai, 0, sizeof(fai_buf.fai));
      res = pNtQueryInformationFile(h, &io, &fai_buf.fai, sizeof fai_buf, FileAllInformation);
      ok ( res == STATUS_SUCCESS, "can't get attributes\n");
@@ -131,7 +131,7 @@ index 8336bba8739..ce1d763c121 100644
      /* Check NORMAL last of all (to make sure we can clear attributes) */
      memset(&fai_buf.fai.BasicInformation, 0, sizeof(fai_buf.fai.BasicInformation));
 diff --git a/include/wine/port.h b/include/wine/port.h
-index de6b9955ecc..c0759584131 100644
+index d4fc47080..44375d94e 100644
 --- a/include/wine/port.h
 +++ b/include/wine/port.h
 @@ -351,6 +351,8 @@ extern int mkstemps(char *template, int suffix_len);
@@ -144,7 +144,7 @@ index de6b9955ecc..c0759584131 100644
  
  /* Interlocked functions */
 diff --git a/libs/port/xattr.c b/libs/port/xattr.c
-index 88e900dac6d..6918c9956cc 100644
+index 88e900dac..6918c9956 100644
 --- a/libs/port/xattr.c
 +++ b/libs/port/xattr.c
 @@ -38,6 +38,26 @@ int xattr_fget( int filedes, const char *name, void *value, size_t size )
@@ -175,5 +175,5 @@ index 88e900dac6d..6918c9956cc 100644
  {
  #if defined(HAVE_ATTR_XATTR_H)
 -- 
-2.17.1
+2.22.0
 

patches/ntdll-DOS_Attributes/definition

@@ -1,3 +1,4 @@
 Fixes: [9158] Support for DOS hidden/system file attributes
 Fixes: [15679] cygwin symlinks not working in wine
 # Depends: ntdll-Syscall_Wrappers
+Depends: ntdll-Junction_Points

patches/ntdll-NtQueryVirtualMemory/0008-ntdll-Resolve-drive-symlinks-before-returning-sectio.patch

@@ -1,4 +1,4 @@
-From 7eab2b3aaa657c6db87de440786dedecae1abe21 Mon Sep 17 00:00:00 2001
+From c2736168d1010e311233bfc078b75bfcd68b959d Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Sun, 28 May 2017 11:17:26 +0200
 Subject: [PATCH] ntdll: Resolve drive symlinks before returning section name.
@@ -11,10 +11,10 @@ Subject: [PATCH] ntdll: Resolve drive symlinks before returning section name.
  4 files changed, 35 insertions(+), 12 deletions(-)
 
 diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c
-index 4810a9b7962..c6d496abdf2 100644
+index 6ea95037153..725c002ab62 100644
 --- a/dlls/ntdll/directory.c
 +++ b/dlls/ntdll/directory.c
-@@ -2928,7 +2928,7 @@ static NTSTATUS nt_to_unix_file_name_internal( const UNICODE_STRING *nameW, ANSI
+@@ -2875,7 +2875,7 @@ static NTSTATUS nt_to_unix_file_name_internal( const UNICODE_STRING *nameW, ANSI
  }
  
  /* read the contents of an NT symlink object */
@@ -24,19 +24,19 @@ index 4810a9b7962..c6d496abdf2 100644
      OBJECT_ATTRIBUTES attr;
      UNICODE_STRING targetW;
 diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
-index 5edd53c4610..6e1f14c432d 100644
+index 59393e3a414..1b2b4e701bb 100644
 --- a/dlls/ntdll/ntdll_misc.h
 +++ b/dlls/ntdll/ntdll_misc.h
-@@ -176,6 +176,7 @@ extern NTSTATUS nt_to_unix_file_name_attr( const OBJECT_ATTRIBUTES *attr, ANSI_S
+@@ -171,6 +171,7 @@ extern NTSTATUS nt_to_unix_file_name_attr( const OBJECT_ATTRIBUTES *attr, ANSI_S
  /* virtual memory */
- extern NTSTATUS virtual_alloc_aligned( PVOID *ret, ULONG zero_bits, SIZE_T *size_ptr,
+ extern NTSTATUS virtual_alloc_aligned( PVOID *ret, unsigned short zero_bits_64, SIZE_T *size_ptr,
                                         ULONG type, ULONG protect, ULONG alignment ) DECLSPEC_HIDDEN;
 +extern NTSTATUS read_nt_symlink( HANDLE root, UNICODE_STRING *name, WCHAR *target, size_t length ) DECLSPEC_HIDDEN;
- extern NTSTATUS virtual_map_section( HANDLE handle, PVOID *addr_ptr, ULONG zero_bits, SIZE_T commit_size,
-                                      const LARGE_INTEGER *offset_ptr, SIZE_T *size_ptr, ULONG protect,
-                                      pe_image_info_t *image_info ) DECLSPEC_HIDDEN;
+ extern NTSTATUS virtual_map_section( HANDLE handle, PVOID *addr_ptr, unsigned short zero_bits_64, SIZE_T commit_size,
+                                      const LARGE_INTEGER *offset_ptr, SIZE_T *size_ptr, ULONG alloc_type,
+                                      ULONG protect, pe_image_info_t *image_info ) DECLSPEC_HIDDEN;
 diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c
-index ff0df9de70f..0641e1310e1 100644
+index 966b2a4c386..26963020c1b 100644
 --- a/dlls/ntdll/virtual.c
 +++ b/dlls/ntdll/virtual.c
 @@ -56,6 +56,7 @@
@@ -56,7 +56,7 @@ index ff0df9de70f..0641e1310e1 100644
  static struct file_view *view_block_start, *view_block_end, *next_free_view;
  static const size_t view_block_size = 0x100000;
  static void *preload_reserve_start;
-@@ -2999,12 +3002,15 @@ static NTSTATUS get_section_name( HANDLE process, LPCVOID addr,
+@@ -3075,12 +3078,15 @@ static NTSTATUS get_section_name( HANDLE process, LPCVOID addr,
                                    MEMORY_SECTION_NAME *info,
                                    SIZE_T len, SIZE_T *res_len )
  {
@@ -73,7 +73,7 @@ index ff0df9de70f..0641e1310e1 100644
  
      if (!addr || !info || !res_len) return STATUS_INVALID_PARAMETER;
  
-@@ -3063,14 +3069,34 @@ static NTSTATUS get_section_name( HANDLE process, LPCVOID addr,
+@@ -3139,14 +3145,34 @@ static NTSTATUS get_section_name( HANDLE process, LPCVOID addr,
      }
  
  found: