Fix some whitespace errors.

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

@@ -1,15 +1,14 @@
-From ce5e1fc75139e4de9d92dfe27b4a513a96da013c Mon Sep 17 00:00:00 2001
+From cfcc687562d4fa68b507cbf2c29722ef523d26aa Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Thu, 2 Oct 2014 19:53:46 +0200
 Subject: [PATCH] winelib: Append '(Staging)' at the end of the version string.
 
 ---
- Makefile.in            | 2 +-
- dlls/ntdll/Makefile.in | 1 +
- 2 files changed, 2 insertions(+), 1 deletion(-)
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index 307a95b3b1a..61019fed949 100644
+index b52495f741f..d5a8cad20da 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -116,7 +116,7 @@ install-manpages:: manpages
@@ -21,15 +20,6 @@ index 307a95b3b1a..61019fed949 100644
  
  programs/winetest/build.rc: dummy
  	@build="STRINGTABLE { 1 \"`GIT_DIR=$(srcdir)/.git git rev-parse HEAD 2>/dev/null`\" }" && (echo $$build | cmp -s - $@) || echo $$build >$@ || (rm -f $@ && exit 1)
-diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in
-index f39ffb42c6f..67847bb9392 100644
---- a/dlls/ntdll/Makefile.in
-+++ b/dlls/ntdll/Makefile.in
-@@ -79,3 +79,4 @@ unix_loader_EXTRADEFS = \
- 	-DBINDIR=\"${bindir}\" \
- 	-DDLL_TO_BINDIR=\"`${MAKEDEP} -R ${dlldir} ${bindir}`\" \
- 	-DBIN_TO_DATADIR=\"`${MAKEDEP} -R ${bindir} ${datadir}/wine`\"
-+
 -- 
-2.28.0
+2.20.1
 

patches/dxdiag-new-dlls/0004-dpmodemx-add-stub-dll.patch

@@ -1,4 +1,4 @@
-From 1772676c96491d8e5a2c4d8cd43c12196b972bc5 Mon Sep 17 00:00:00 2001
+From a7842fd86fc2aa314226bfe204b3f5e89c4314d9 Mon Sep 17 00:00:00 2001
 From: Austin English <austinenglish@gmail.com>
 Date: Tue, 13 Oct 2020 04:42:02 -0500
 Subject: [PATCH] dpmodemx: add stub dll
@@ -40,12 +40,11 @@ index 00000000000..c15b7a33112
 +RC_SRCS = version.rc
 diff --git a/dlls/dpmodemx/dpmodemx.spec b/dlls/dpmodemx/dpmodemx.spec
 new file mode 100644
-index 00000000000..14fb05053a8
+index 00000000000..c4c4ef212a7
 --- /dev/null
 +++ b/dlls/dpmodemx/dpmodemx.spec
 @@ -0,0 +1 @@
 +@ stub SPInit
-\ No newline at end of file
 diff --git a/dlls/dpmodemx/version.rc b/dlls/dpmodemx/version.rc
 new file mode 100644
 index 00000000000..b0c644aed83

patches/dxdiag-new-dlls/0016-dpmodemx-Add-stub-SPInit.patch

@@ -1,4 +1,4 @@
-From 6fe8944830f612188c670f2c5d5f26c8fd572ca2 Mon Sep 17 00:00:00 2001
+From b3579602a731dd7398b113f397cd358554af7567 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Sun, 27 Dec 2020 09:57:46 +1100
 Subject: [PATCH] dpmodemx: Add stub SPInit
@@ -6,8 +6,8 @@ Subject: [PATCH] dpmodemx: Add stub SPInit
 ---
  dlls/dpmodemx/Makefile.in     |  5 ++++-
  dlls/dpmodemx/dpmodemx.spec   |  2 +-
- dlls/dpmodemx/dpmodemx_main.c | 35 +++++++++++++++++++++++++++++++++++
- 3 files changed, 40 insertions(+), 2 deletions(-)
+ dlls/dpmodemx/dpmodemx_main.c | 34 ++++++++++++++++++++++++++++++++++
+ 3 files changed, 39 insertions(+), 2 deletions(-)
  create mode 100644 dlls/dpmodemx/dpmodemx_main.c
 
 diff --git a/dlls/dpmodemx/Makefile.in b/dlls/dpmodemx/Makefile.in
@@ -26,20 +26,18 @@ index c15b7a33112..b7897fb1cf6 100644
 +C_SRCS = \
 +	dpmodemx_main.c
 diff --git a/dlls/dpmodemx/dpmodemx.spec b/dlls/dpmodemx/dpmodemx.spec
-index 14fb05053a8..e3beb3f8cc7 100644
+index c4c4ef212a7..2ef9c5bf45c 100644
 --- a/dlls/dpmodemx/dpmodemx.spec
 +++ b/dlls/dpmodemx/dpmodemx.spec
 @@ -1 +1 @@
 -@ stub SPInit
-\ No newline at end of file
 +@ stdcall SPInit(ptr)
-\ No newline at end of file
 diff --git a/dlls/dpmodemx/dpmodemx_main.c b/dlls/dpmodemx/dpmodemx_main.c
 new file mode 100644
-index 00000000000..d87be210165
+index 00000000000..f35e0804299
 --- /dev/null
 +++ b/dlls/dpmodemx/dpmodemx_main.c
-@@ -0,0 +1,35 @@
+@@ -0,0 +1,34 @@
 +/*
 + *
 + * Copyright 2020 Austin English
@@ -74,7 +72,6 @@ index 00000000000..d87be210165
 +    FIXME("Currently not implemented.\n");
 +    return DPERR_UNAVAILABLE;
 +}
-+
 -- 
 2.20.1
 

patches/patchinstall.sh

@@ -1652,7 +1652,7 @@ fi
 # Patchset Staging
 # |
 # | Modified files:
-# |   *	Makefile.in, dlls/ntdll/Makefile.in, dlls/ntdll/loader.c
+# |   *	Makefile.in, dlls/ntdll/loader.c
 # |
 if test "$enable_Staging" -eq 1; then
 	patch_apply Staging/0001-kernel32-Add-winediag-message-to-show-warning-that-t.patch

patches/windows.gaming.input-dll/0006-windows.gaming.input-Implement-IRawGameControllerSta.patch

@@ -1,4 +1,4 @@
-From b875ea79f656a5192b8214f2598cd62866b9fbee Mon Sep 17 00:00:00 2001
+From 12605782b6c72810d35780e522dfd86d9b11a89d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
 Date: Mon, 12 Oct 2020 12:50:32 +0200
 Subject: [PATCH] windows.gaming.input: Implement IRawGameControllerStatics
@@ -213,7 +213,7 @@ index ac403a78a4d..90e9b660633 100644
  	wine/debug.h \
 diff --git a/include/asyncinfo.idl b/include/asyncinfo.idl
 new file mode 100644
-index 00000000000..61784bc65ac
+index 00000000000..9185bf6880a
 --- /dev/null
 +++ b/include/asyncinfo.idl
 @@ -0,0 +1,45 @@
@@ -244,8 +244,8 @@ index 00000000000..61784bc65ac
 +typedef [v1_enum] enum AsyncStatus
 +{
 +    Started = 0,
-+    Completed, 
-+    Canceled, 
++    Completed,
++    Canceled,
 +    Error,
 +} AsyncStatus;
 +