diff --git a/patches/api-ms-win-Stub_DLLs/0006-iertutil-Add-dll-and-add-stub-for-ordinal-811.patch b/patches/api-ms-win-Stub_DLLs/0006-iertutil-Add-dll-and-add-stub-for-ordinal-811.patch
index 78e436fc..3952d142 100644
--- a/patches/api-ms-win-Stub_DLLs/0006-iertutil-Add-dll-and-add-stub-for-ordinal-811.patch
+++ b/patches/api-ms-win-Stub_DLLs/0006-iertutil-Add-dll-and-add-stub-for-ordinal-811.patch
@@ -1,28 +1,26 @@
-From 0f81943e8bdac5e3917e937bc4cb4215227c544d Mon Sep 17 00:00:00 2001
+From 3aee4225a4ce8907cd7f907b1dc3191f96eee4a0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sun, 17 Jan 2016 01:11:46 +0100
 Subject: [PATCH] iertutil: Add dll and add stub for ordinal 811.
 
 ---
- configure.ac                |   3 +-
+ configure.ac                |   1 +
  dlls/iertutil/Makefile.in   |   4 +
  dlls/iertutil/iertutil.spec | 521 ++++++++++++++++++++++++++++++++++++++++++++
  dlls/iertutil/main.c        |  48 ++++
- 4 files changed, 575 insertions(+), 1 deletion(-)
+ 4 files changed, 574 insertions(+)
  create mode 100644 dlls/iertutil/Makefile.in
  create mode 100644 dlls/iertutil/iertutil.spec
  create mode 100644 dlls/iertutil/main.c
 
 diff --git a/configure.ac b/configure.ac
-index 6f63217..fd0c99d 100644
+index 7b796ef..48656d1 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3274,7 +3274,8 @@ WINE_CONFIG_DLL(iccvid)
- WINE_CONFIG_DLL(icmp)
+@@ -3275,6 +3275,7 @@ WINE_CONFIG_DLL(icmp)
  WINE_CONFIG_DLL(ieframe)
  WINE_CONFIG_TEST(dlls/ieframe/tests)
--WINE_CONFIG_DLL(ieproxy)
-+WINE_CONFIG_DLL(ieproxy,,[clean])
+ WINE_CONFIG_DLL(ieproxy)
 +WINE_CONFIG_DLL(iertutil)
  WINE_CONFIG_DLL(ifsmgr.vxd,enable_win16)
  WINE_CONFIG_DLL(imaadp32.acm)
@@ -619,5 +617,5 @@ index 0000000..2b993a4
 +    return FALSE;
 +}
 -- 
-1.9.1
+2.7.4
 
diff --git a/patches/api-ms-win-Stub_DLLs/0009-ext-ms-win-xaml-pal-l1-1-0-Add-dll-and-add-stub-for-.patch b/patches/api-ms-win-Stub_DLLs/0009-ext-ms-win-xaml-pal-l1-1-0-Add-dll-and-add-stub-for-.patch
index dd3ff2ae..81c24baf 100644
--- a/patches/api-ms-win-Stub_DLLs/0009-ext-ms-win-xaml-pal-l1-1-0-Add-dll-and-add-stub-for-.patch
+++ b/patches/api-ms-win-Stub_DLLs/0009-ext-ms-win-xaml-pal-l1-1-0-Add-dll-and-add-stub-for-.patch
@@ -1,33 +1,31 @@
-From cdc37e086bd04654655663b9408640a0b484f999 Mon Sep 17 00:00:00 2001
+From 3b3bb661ed74bea58b863601e1c7e5d21c854a1d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sun, 17 Jan 2016 17:07:35 +0100
-Subject: [PATCH] ext-ms-win-xaml-pal-l1-1-0: Add dll and add stub
- for XamlBehaviorEnabled.
+Subject: [PATCH] ext-ms-win-xaml-pal-l1-1-0: Add dll and add stub for
+ XamlBehaviorEnabled.
 
 ---
- configure.ac                                       |  3 +-
+ configure.ac                                       |  1 +
  dlls/ext-ms-win-xaml-pal-l1-1-0/Makefile.in        |  4 +++
  .../ext-ms-win-xaml-pal-l1-1-0.spec                |  6 ++++
  dlls/ext-ms-win-xaml-pal-l1-1-0/main.c             | 35 ++++++++++++++++++++++
- 4 files changed, 47 insertions(+), 1 deletion(-)
+ 4 files changed, 46 insertions(+)
  create mode 100644 dlls/ext-ms-win-xaml-pal-l1-1-0/Makefile.in
  create mode 100644 dlls/ext-ms-win-xaml-pal-l1-1-0/ext-ms-win-xaml-pal-l1-1-0.spec
  create mode 100644 dlls/ext-ms-win-xaml-pal-l1-1-0/main.c
 
 diff --git a/configure.ac b/configure.ac
-index a011d82..ba0fcb4 100644
+index 7a48b00..321757c 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3241,7 +3241,8 @@ WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-dpi-l1-1-0)
+@@ -3241,6 +3241,7 @@ WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-dpi-l1-1-0)
  WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-sysparams-l1-1-0)
  WINE_CONFIG_DLL(ext-ms-win-security-credui-l1-1-0)
  WINE_CONFIG_DLL(ext-ms-win-security-cryptui-l1-1-0)
--WINE_CONFIG_DLL(faultrep)
 +WINE_CONFIG_DLL(ext-ms-win-xaml-pal-l1-1-0)
-+WINE_CONFIG_DLL(faultrep,,[implib])
+ WINE_CONFIG_DLL(faultrep)
  WINE_CONFIG_TEST(dlls/faultrep/tests)
  WINE_CONFIG_DLL(fltlib)
- WINE_CONFIG_DLL(fltmgr.sys)
 diff --git a/dlls/ext-ms-win-xaml-pal-l1-1-0/Makefile.in b/dlls/ext-ms-win-xaml-pal-l1-1-0/Makefile.in
 new file mode 100644
 index 0000000..6382d85
@@ -92,5 +90,5 @@ index 0000000..3e28275
 +    return TRUE;
 +}
 -- 
-1.9.1
+2.7.4
 
diff --git a/patches/api-ms-win-Stub_DLLs/0016-ext-ms-win-uxtheme-themes-l1-1-0-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0016-ext-ms-win-uxtheme-themes-l1-1-0-Add-dll.patch
index 36e508c8..8f2cb8f4 100644
--- a/patches/api-ms-win-Stub_DLLs/0016-ext-ms-win-uxtheme-themes-l1-1-0-Add-dll.patch
+++ b/patches/api-ms-win-Stub_DLLs/0016-ext-ms-win-uxtheme-themes-l1-1-0-Add-dll.patch
@@ -1,7 +1,7 @@
-From 8ac935e746234726007a479f7d351405a53b932d Mon Sep 17 00:00:00 2001
+From 18bd05629631a5d059f2c63402fa74581dfdef54 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sat, 23 Jan 2016 21:02:52 +0100
-Subject: ext-ms-win-uxtheme-themes-l1-1-0: Add dll.
+Subject: [PATCH] ext-ms-win-uxtheme-themes-l1-1-0: Add dll.
 
 ---
  configure.ac                                       |  1 +
@@ -13,27 +13,27 @@ Subject: ext-ms-win-uxtheme-themes-l1-1-0: Add dll.
  create mode 100644 dlls/ext-ms-win-uxtheme-themes-l1-1-0/ext-ms-win-uxtheme-themes-l1-1-0.spec
 
 diff --git a/configure.ac b/configure.ac
-index 6fa34f04129..fa7423fb29b 100644
+index 9305559..4edebb1 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3119,6 +3119,7 @@ WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-dpi-l1-1-0)
+@@ -3245,6 +3245,7 @@ WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-dpi-l1-1-0)
  WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-sysparams-l1-1-0)
  WINE_CONFIG_DLL(ext-ms-win-security-credui-l1-1-0)
  WINE_CONFIG_DLL(ext-ms-win-security-cryptui-l1-1-0)
 +WINE_CONFIG_DLL(ext-ms-win-uxtheme-themes-l1-1-0)
  WINE_CONFIG_DLL(ext-ms-win-xaml-pal-l1-1-0)
- WINE_CONFIG_DLL(faultrep,,[implib])
+ WINE_CONFIG_DLL(faultrep)
  WINE_CONFIG_TEST(dlls/faultrep/tests)
 diff --git a/dlls/ext-ms-win-uxtheme-themes-l1-1-0/Makefile.in b/dlls/ext-ms-win-uxtheme-themes-l1-1-0/Makefile.in
 new file mode 100644
-index 00000000000..576b6f69b41
+index 0000000..576b6f6
 --- /dev/null
 +++ b/dlls/ext-ms-win-uxtheme-themes-l1-1-0/Makefile.in
 @@ -0,0 +1 @@
 +MODULE    = ext-ms-win-uxtheme-themes-l1-1-0.dll
 diff --git a/dlls/ext-ms-win-uxtheme-themes-l1-1-0/ext-ms-win-uxtheme-themes-l1-1-0.spec b/dlls/ext-ms-win-uxtheme-themes-l1-1-0/ext-ms-win-uxtheme-themes-l1-1-0.spec
 new file mode 100644
-index 00000000000..0a96983936d
+index 0000000..0a96983
 --- /dev/null
 +++ b/dlls/ext-ms-win-uxtheme-themes-l1-1-0/ext-ms-win-uxtheme-themes-l1-1-0.spec
 @@ -0,0 +1,24 @@
@@ -62,10 +62,10 @@ index 00000000000..0a96983936d
 +@ stdcall OpenThemeDataEx(ptr wstr long) uxtheme.OpenThemeDataEx
 +@ stdcall SetWindowTheme(ptr wstr wstr) uxtheme.SetWindowTheme
 diff --git a/tools/make_specfiles b/tools/make_specfiles
-index 7e2a921ed18..1bd5c68f4ec 100755
+index 7839542..2232de6 100755
 --- a/tools/make_specfiles
 +++ b/tools/make_specfiles
-@@ -382,6 +382,10 @@ my @dll_groups =
+@@ -403,6 +403,10 @@ my @dll_groups =
    "api-ms-win-core-winrt-string-l1-1-0",
   ],
   [
@@ -77,5 +77,5 @@ index 7e2a921ed18..1bd5c68f4ec 100755
    "irprops.cpl",
   ],
 -- 
-2.13.1
+2.7.4
 
diff --git a/patches/api-ms-win-Stub_DLLs/0026-feclient-Add-stub-dll.patch b/patches/api-ms-win-Stub_DLLs/0026-feclient-Add-stub-dll.patch
index 2c946097..7c6a5a70 100644
--- a/patches/api-ms-win-Stub_DLLs/0026-feclient-Add-stub-dll.patch
+++ b/patches/api-ms-win-Stub_DLLs/0026-feclient-Add-stub-dll.patch
@@ -1,7 +1,7 @@
-From 4a8b29b5a4c923cec3a78bd9f43e0fc736721cd7 Mon Sep 17 00:00:00 2001
+From d781adf58a895bfa34e1634c2f953dae45538f60 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Tue, 12 Apr 2016 01:00:02 +0200
-Subject: feclient: Add stub dll.
+Subject: [PATCH] feclient: Add stub dll.
 
 ---
  configure.ac                |  1 +
@@ -14,12 +14,12 @@ Subject: feclient: Add stub dll.
  create mode 100644 dlls/feclient/main.c
 
 diff --git a/configure.ac b/configure.ac
-index 98bb7d7..39097d1 100644
+index 8935eee..d8b240a 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2957,6 +2957,7 @@ WINE_CONFIG_DLL(ext-ms-win-uxtheme-themes-l1-1-0)
+@@ -3252,6 +3252,7 @@ WINE_CONFIG_DLL(ext-ms-win-uxtheme-themes-l1-1-0)
  WINE_CONFIG_DLL(ext-ms-win-xaml-pal-l1-1-0)
- WINE_CONFIG_DLL(faultrep,,[implib])
+ WINE_CONFIG_DLL(faultrep)
  WINE_CONFIG_TEST(dlls/faultrep/tests)
 +WINE_CONFIG_DLL(feclient)
  WINE_CONFIG_DLL(fltlib)
@@ -129,5 +129,5 @@ index 0000000..91aed70
 +    return TRUE;
 +}
 -- 
-2.7.1
+2.7.4
 
diff --git a/patches/dxva2-Video_Decoder/0006-dxva2-tests-Add-tests-for-dxva2-decoder.patch b/patches/dxva2-Video_Decoder/0006-dxva2-tests-Add-tests-for-dxva2-decoder.patch
index dc7cf28e..7d52ce61 100644
--- a/patches/dxva2-Video_Decoder/0006-dxva2-tests-Add-tests-for-dxva2-decoder.patch
+++ b/patches/dxva2-Video_Decoder/0006-dxva2-tests-Add-tests-for-dxva2-decoder.patch
@@ -1,4 +1,4 @@
-From 6dff4fbc02c7281a02c26d6ef46df3db9a65b20f Mon Sep 17 00:00:00 2001
+From 48e3213aa30f783ebc6a1c099c374ae9a69a8697 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sun, 22 Feb 2015 01:21:18 +0100
 Subject: [PATCH] dxva2/tests: Add tests for dxva2 decoder.
@@ -12,10 +12,10 @@ Subject: [PATCH] dxva2/tests: Add tests for dxva2 decoder.
  create mode 100644 dlls/dxva2/tests/dxva2.c
 
 diff --git a/configure.ac b/configure.ac
-index a36ae73..9163f71 100644
+index 7b796ef..4a93549 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3209,6 +3209,7 @@ WINE_CONFIG_DLL(dxgi,,[implib])
+@@ -3212,6 +3212,7 @@ WINE_CONFIG_DLL(dxgi)
  WINE_CONFIG_TEST(dlls/dxgi/tests)
  WINE_CONFIG_LIB(dxguid)
  WINE_CONFIG_DLL(dxva2)
@@ -412,5 +412,5 @@ index 0000000..dcbb990
 +    test_decoder_service(window);
 +}
 -- 
-1.9.1
+2.7.4
 
diff --git a/patches/dxva2-Video_Decoder/0007-dxva2-Initial-implementation-of-MPEG2-decoder-using-.patch b/patches/dxva2-Video_Decoder/0007-dxva2-Initial-implementation-of-MPEG2-decoder-using-.patch
index e1bfa823..e33c9c6e 100644
--- a/patches/dxva2-Video_Decoder/0007-dxva2-Initial-implementation-of-MPEG2-decoder-using-.patch
+++ b/patches/dxva2-Video_Decoder/0007-dxva2-Initial-implementation-of-MPEG2-decoder-using-.patch
@@ -1,11 +1,11 @@
-From a1932246122fadf7ade2bf258cf06fea30366523 Mon Sep 17 00:00:00 2001
+From 161924178484a0b2835946704241d2ae287202f1 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sun, 22 Feb 2015 01:25:20 +0100
-Subject: [PATCH] dxva2: Initial implementation of MPEG2 decoder
- using vaapi backend.
+Subject: [PATCH] dxva2: Initial implementation of MPEG2 decoder using
+ vaapi backend.
 
 ---
- configure.ac                |  18 +-
+ configure.ac                |  16 +
  dlls/dxva2/Makefile.in      |  12 +-
  dlls/dxva2/backend.idl      |  96 ++++++
  dlls/dxva2/dxva2_private.h  | 115 ++++++-
@@ -15,14 +15,14 @@ Subject: [PATCH] dxva2: Initial implementation of MPEG2 decoder
  dlls/dxva2/vaapi-mpeg2.c    | 753 +++++++++++++++++++++++++++++++++++++++++++
  dlls/dxva2/vaapi.c          | 767 ++++++++++++++++++++++++++++++++++++++++++++
  dlls/dxva2/videoservices.c  |  74 ++---
- 10 files changed, 2293 insertions(+), 67 deletions(-)
+ 10 files changed, 2292 insertions(+), 66 deletions(-)
  create mode 100644 dlls/dxva2/backend.idl
  create mode 100644 dlls/dxva2/genericdecoder.c
  create mode 100644 dlls/dxva2/vaapi-mpeg2.c
  create mode 100644 dlls/dxva2/vaapi.c
 
 diff --git a/configure.ac b/configure.ac
-index bf04f97..7954a73 100644
+index 4a93549..f5a20d5 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -107,6 +107,8 @@ AC_ARG_WITH(xxf86vm,   AS_HELP_STRING([--without-xxf86vm],[do not use XFree vide
@@ -55,15 +55,6 @@ index bf04f97..7954a73 100644
      CPPFLAGS="$ac_save_CPPFLAGS"
  else
      X_CFLAGS=""
-@@ -3219,7 +3235,7 @@ WINE_CONFIG_LIB(dxerr9)
- WINE_CONFIG_DLL(dxgi)
- WINE_CONFIG_TEST(dlls/dxgi/tests)
- WINE_CONFIG_LIB(dxguid)
--WINE_CONFIG_DLL(dxva2)
-+WINE_CONFIG_DLL(dxva2,,[clean])
- WINE_CONFIG_TEST(dlls/dxva2/tests)
- WINE_CONFIG_DLL(esent)
- WINE_CONFIG_DLL(evr)
 diff --git a/dlls/dxva2/Makefile.in b/dlls/dxva2/Makefile.in
 index d484cb1..68a7e3c 100644
 --- a/dlls/dxva2/Makefile.in
@@ -2644,5 +2635,5 @@ index 46e431a..84222dc 100644
          return E_NOINTERFACE;
      }
 -- 
-1.9.1
+2.7.4
 
diff --git a/patches/kernelbase-PathCchCombineEx/0001-kernelbase-Add-semi-stub-for-PathCchCombineEx.patch b/patches/kernelbase-PathCchCombineEx/0001-kernelbase-Add-semi-stub-for-PathCchCombineEx.patch
index 9acda715..a9401dee 100644
--- a/patches/kernelbase-PathCchCombineEx/0001-kernelbase-Add-semi-stub-for-PathCchCombineEx.patch
+++ b/patches/kernelbase-PathCchCombineEx/0001-kernelbase-Add-semi-stub-for-PathCchCombineEx.patch
@@ -1,10 +1,10 @@
-From 2d1834fcb5993b569fa1fb6edc0c6e782b4cd385 Mon Sep 17 00:00:00 2001
+From 800f9e5129a1f5eabe4dbdc971ead453ee93e26e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Wed, 16 Aug 2017 02:45:23 +0200
 Subject: [PATCH] kernelbase: Add semi-stub for PathCchCombineEx.
 
 ---
- configure.ac                                       |   3 +-
+ configure.ac                                       |   1 +
  .../api-ms-win-core-path-l1-1-0.spec               |   2 +-
  dlls/kernelbase/Makefile.in                        |   4 +-
  dlls/kernelbase/kernelbase.spec                    |   2 +-
@@ -13,21 +13,19 @@ Subject: [PATCH] kernelbase: Add semi-stub for PathCchCombineEx.
  dlls/kernelbase/tests/path.c                       | 113 +++++++++++++++++++++
  include/Makefile.in                                |   1 +
  include/pathcch.h                                  |  26 +++++
- 9 files changed, 181 insertions(+), 4 deletions(-)
+ 9 files changed, 180 insertions(+), 3 deletions(-)
  create mode 100644 dlls/kernelbase/tests/Makefile.in
  create mode 100644 dlls/kernelbase/tests/path.c
  create mode 100644 include/pathcch.h
 
 diff --git a/configure.ac b/configure.ac
-index 1559d4d..cd79406 100644
+index 7b796ef..f9e5e1d 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3340,7 +3340,8 @@ WINE_CONFIG_TEST(dlls/jsproxy/tests)
- WINE_CONFIG_DLL(kerberos)
+@@ -3308,6 +3308,7 @@ WINE_CONFIG_DLL(kerberos)
  WINE_CONFIG_DLL(kernel32)
  WINE_CONFIG_TEST(dlls/kernel32/tests)
--WINE_CONFIG_DLL(kernelbase)
-+WINE_CONFIG_DLL(kernelbase,,[implib])
+ WINE_CONFIG_DLL(kernelbase)
 +WINE_CONFIG_TEST(dlls/kernelbase/tests)
  WINE_CONFIG_DLL(keyboard.drv16,enable_win16)
  WINE_CONFIG_DLL(krnl386.exe16,enable_win16)
@@ -58,7 +56,7 @@ index 74df98c..247c6bf 100644
  C_SRCS = \
  	main.c
 diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec
-index 6c61c51..55737f9 100644
+index eb6edbe..065af41 100644
 --- a/dlls/kernelbase/kernelbase.spec
 +++ b/dlls/kernelbase/kernelbase.spec
 @@ -1037,7 +1037,7 @@
@@ -71,10 +69,10 @@ index 6c61c51..55737f9 100644
  # @ stub PathCchIsRoot
  # @ stub PathCchRemoveBackslash
 diff --git a/dlls/kernelbase/main.c b/dlls/kernelbase/main.c
-index 920fd12..eadb130 100644
+index 9c89ff4..7e5ffde 100644
 --- a/dlls/kernelbase/main.c
 +++ b/dlls/kernelbase/main.c
-@@ -20,7 +20,11 @@
+@@ -19,7 +19,11 @@
  #include "windows.h"
  #include "appmodel.h"
  
@@ -86,7 +84,7 @@ index 920fd12..eadb130 100644
  
  WINE_DEFAULT_DEBUG_CHANNEL(kernelbase);
  
-@@ -97,3 +101,28 @@ BOOL WINAPI QuirkIsEnabled3(void *unk1, void *unk2)
+@@ -87,3 +91,28 @@ BOOL WINAPI QuirkIsEnabled3(void *unk1, void *unk2)
  
      return FALSE;
  }
@@ -246,10 +244,10 @@ index 0000000..c848640
 +    test_PathCchCombineEx();
 +}
 diff --git a/include/Makefile.in b/include/Makefile.in
-index 563d10c..ac0ff21 100644
+index f1bcba3..72304d6 100644
 --- a/include/Makefile.in
 +++ b/include/Makefile.in
-@@ -495,6 +495,7 @@ SOURCES = \
+@@ -494,6 +494,7 @@ SOURCES = \
  	opnrst.idl \
  	optary.idl \
  	patchapi.h \
@@ -290,5 +288,5 @@ index 0000000..8831c52
 +
 +HRESULT WINAPI PathCchCombineEx(WCHAR *out, SIZE_T size, const WCHAR *path1, const WCHAR *path2, DWORD flags);
 -- 
-1.9.1
+2.7.4
 
diff --git a/patches/uxtheme-GTK_Theming/0001-uxthemegtk-Add-configure-check-and-stub-dll.patch b/patches/uxtheme-GTK_Theming/0001-uxthemegtk-Add-configure-check-and-stub-dll.patch
index e3eee9da..ed455f8e 100644
--- a/patches/uxtheme-GTK_Theming/0001-uxthemegtk-Add-configure-check-and-stub-dll.patch
+++ b/patches/uxtheme-GTK_Theming/0001-uxthemegtk-Add-configure-check-and-stub-dll.patch
@@ -1,4 +1,4 @@
-From 7ce95ff47cea6dab389a8f7bc7db0d8daddba5e1 Mon Sep 17 00:00:00 2001
+From 406f6a268d3b4b831e4daaccc5fa2f4877be151b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sun, 9 Aug 2015 02:38:18 +0200
 Subject: [PATCH] uxthemegtk: Add configure check and stub dll.
@@ -6,13 +6,13 @@ Subject: [PATCH] uxthemegtk: Add configure check and stub dll.
 List of functions updated by Ivan Akulinchev <ivan.akulinchev@gmail.com>.
 ---
  aclocal.m4                        |  20 ++++
- configure.ac                      |  24 ++++-
+ configure.ac                      |  22 ++++
  dlls/uxtheme-gtk/Makefile.in      |   7 ++
  dlls/uxtheme-gtk/uxtheme-gtk.spec |   1 +
  dlls/uxtheme-gtk/uxtheme.c        | 218 ++++++++++++++++++++++++++++++++++++++
  dlls/uxtheme-gtk/uxthemegtk.h     |  88 +++++++++++++++
  dlls/uxtheme-gtk/version.rc       |  21 ++++
- 7 files changed, 378 insertions(+), 1 deletion(-)
+ 7 files changed, 377 insertions(+)
  create mode 100644 dlls/uxtheme-gtk/Makefile.in
  create mode 100644 dlls/uxtheme-gtk/uxtheme-gtk.spec
  create mode 100644 dlls/uxtheme-gtk/uxtheme.c
@@ -51,7 +51,7 @@ index 3688165..fbc5ebf 100644
  dnl
  dnl Usage: WINE_TRY_ASM_LINK(asm-code,includes,function,[action-if-found,[action-if-not-found]])
 diff --git a/configure.ac b/configure.ac
-index 59d392a..ef9419c 100644
+index 7b796ef..e27f922 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -56,6 +56,7 @@ AC_ARG_WITH(gsm,       AS_HELP_STRING([--without-gsm],[do not use libgsm (GSM 06
@@ -62,7 +62,7 @@ index 59d392a..ef9419c 100644
  AC_ARG_WITH(hal,       AS_HELP_STRING([--without-hal],[do not use HAL (dynamic device support)]))
  AC_ARG_WITH(jpeg,      AS_HELP_STRING([--without-jpeg],[do not use JPEG]))
  AC_ARG_WITH(krb5,      AS_HELP_STRING([--without-krb5],[do not use krb5 (Kerberos)]))
-@@ -1490,6 +1491,26 @@ fi
+@@ -1441,6 +1442,26 @@ fi
  WINE_NOTICE_WITH(cms,[test "$ac_cv_lib_lcms2_cmsOpenProfileFromFile" != "yes"],
                   [liblcms2 ${notice_platform}development files not found, Color Management won't be supported.])
  
@@ -89,19 +89,17 @@ index 59d392a..ef9419c 100644
  dnl **** Check for FreeType 2 ****
  if test "x$with_freetype" != "xno"
  then
-@@ -3715,7 +3736,8 @@ WINE_CONFIG_TEST(dlls/userenv/tests)
+@@ -3627,6 +3648,7 @@ WINE_CONFIG_TEST(dlls/userenv/tests)
  WINE_CONFIG_DLL(usp10)
  WINE_CONFIG_TEST(dlls/usp10/tests)
  WINE_CONFIG_LIB(uuid)
--WINE_CONFIG_DLL(uxtheme)
 +WINE_CONFIG_DLL(uxtheme-gtk)
-+WINE_CONFIG_DLL(uxtheme,,[implib])
+ WINE_CONFIG_DLL(uxtheme)
  WINE_CONFIG_TEST(dlls/uxtheme/tests)
  WINE_CONFIG_DLL(vbscript)
- WINE_CONFIG_TEST(dlls/vbscript/tests)
 diff --git a/dlls/uxtheme-gtk/Makefile.in b/dlls/uxtheme-gtk/Makefile.in
 new file mode 100644
-index 0000000..07cf3a0f
+index 0000000..07cf3a0
 --- /dev/null
 +++ b/dlls/uxtheme-gtk/Makefile.in
 @@ -0,0 +1,7 @@
@@ -465,5 +463,5 @@ index 0000000..38db521
 +
 +#include <wine/wine_common_ver.rc>
 -- 
-1.9.1
+2.7.4
 
diff --git a/patches/winedevice-Default_Drivers/0001-win32k.sys-Add-stub-driver.patch b/patches/winedevice-Default_Drivers/0001-win32k.sys-Add-stub-driver.patch
index 05a2bc48..52c6982a 100644
--- a/patches/winedevice-Default_Drivers/0001-win32k.sys-Add-stub-driver.patch
+++ b/patches/winedevice-Default_Drivers/0001-win32k.sys-Add-stub-driver.patch
@@ -1,7 +1,7 @@
-From b96844dcc3a0845422e8392614e41148241f54ff Mon Sep 17 00:00:00 2001
+From ae853a70af3455e1da80e89944a1cbc91e787421 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Thu, 8 Jun 2017 23:38:38 +0200
-Subject: win32k.sys: Add stub driver.
+Subject: [PATCH] win32k.sys: Add stub driver.
 
 ---
  configure.ac                    |   1 +
@@ -15,10 +15,10 @@ Subject: win32k.sys: Add stub driver.
  create mode 100644 dlls/win32k.sys/win32k.sys.spec
 
 diff --git a/configure.ac b/configure.ac
-index 5b9af9eece1..34f2a1af63d 100644
+index 9033656..4ce2e89 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3621,6 +3621,7 @@ WINE_CONFIG_DLL(wiaservc,,[clean])
+@@ -3685,6 +3685,7 @@ WINE_CONFIG_DLL(wiaservc)
  WINE_CONFIG_TEST(dlls/wiaservc/tests)
  WINE_CONFIG_DLL(wimgapi)
  WINE_CONFIG_DLL(win32s16.dll16,enable_win16)
@@ -28,7 +28,7 @@ index 5b9af9eece1..34f2a1af63d 100644
  WINE_CONFIG_DLL(windebug.dll16,enable_win16)
 diff --git a/dlls/win32k.sys/Makefile.in b/dlls/win32k.sys/Makefile.in
 new file mode 100644
-index 00000000000..615d8335c36
+index 0000000..615d833
 --- /dev/null
 +++ b/dlls/win32k.sys/Makefile.in
 @@ -0,0 +1,6 @@
@@ -40,7 +40,7 @@ index 00000000000..615d8335c36
 +	main.c
 diff --git a/dlls/win32k.sys/main.c b/dlls/win32k.sys/main.c
 new file mode 100644
-index 00000000000..a1ec2d4fa3f
+index 0000000..a1ec2d4
 --- /dev/null
 +++ b/dlls/win32k.sys/main.c
 @@ -0,0 +1,39 @@
@@ -85,7 +85,7 @@ index 00000000000..a1ec2d4fa3f
 +}
 diff --git a/dlls/win32k.sys/win32k.sys.spec b/dlls/win32k.sys/win32k.sys.spec
 new file mode 100644
-index 00000000000..c79439151e4
+index 0000000..c794391
 --- /dev/null
 +++ b/dlls/win32k.sys/win32k.sys.spec
 @@ -0,0 +1,246 @@
@@ -336,10 +336,10 @@ index 00000000000..c79439151e4
 +@ cdecl -private memmove(ptr ptr long) ntoskrnl.exe.memmove
 +@ cdecl -private memset(ptr long long) ntoskrnl.exe.memset
 diff --git a/tools/make_specfiles b/tools/make_specfiles
-index 58207ad8824..eb2201b46e3 100755
+index 6b59b32..e476c0d 100755
 --- a/tools/make_specfiles
 +++ b/tools/make_specfiles
-@@ -385,6 +385,7 @@ my @dll_groups =
+@@ -410,6 +410,7 @@ my @dll_groups =
   [
    "ntoskrnl.exe",
    "hal",
@@ -348,5 +348,5 @@ index 58207ad8824..eb2201b46e3 100755
  );
  
 -- 
-2.13.1
+2.7.4
 
diff --git a/patches/winedevice-Default_Drivers/0002-dxgkrnl.sys-Add-stub-driver.patch b/patches/winedevice-Default_Drivers/0002-dxgkrnl.sys-Add-stub-driver.patch
index a33a6f20..a08b9432 100644
--- a/patches/winedevice-Default_Drivers/0002-dxgkrnl.sys-Add-stub-driver.patch
+++ b/patches/winedevice-Default_Drivers/0002-dxgkrnl.sys-Add-stub-driver.patch
@@ -1,4 +1,4 @@
-From 63db6f4c97b04136eaf47c73a16eea4cbf7ae6a8 Mon Sep 17 00:00:00 2001
+From e898a695975defcd91cf6d81ee356937177975d8 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Thu, 8 Jun 2017 23:41:02 +0200
 Subject: [PATCH] dxgkrnl.sys: Add stub driver.
@@ -15,16 +15,16 @@ Subject: [PATCH] dxgkrnl.sys: Add stub driver.
  create mode 100644 dlls/dxgkrnl.sys/main.c
 
 diff --git a/configure.ac b/configure.ac
-index 588eecb..cf1ba3d 100644
+index 4ce2e89..3d5aef7 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3319,6 +3319,7 @@ WINE_CONFIG_LIB(dxerr8)
+@@ -3227,6 +3227,7 @@ WINE_CONFIG_LIB(dxerr8)
  WINE_CONFIG_LIB(dxerr9)
  WINE_CONFIG_DLL(dxgi)
  WINE_CONFIG_TEST(dlls/dxgi/tests)
 +WINE_CONFIG_DLL(dxgkrnl.sys)
  WINE_CONFIG_LIB(dxguid)
- WINE_CONFIG_DLL(dxva2,,[clean])
+ WINE_CONFIG_DLL(dxva2)
  WINE_CONFIG_TEST(dlls/dxva2/tests)
 diff --git a/dlls/dxgkrnl.sys/Makefile.in b/dlls/dxgkrnl.sys/Makefile.in
 new file mode 100644
@@ -116,10 +116,10 @@ index 0000000..c5639c2
 +    return STATUS_SUCCESS;
 +}
 diff --git a/loader/wine.inf.in b/loader/wine.inf.in
-index a76bb0a..f0ff79f 100644
+index 3c55125..c69b880 100644
 --- a/loader/wine.inf.in
 +++ b/loader/wine.inf.in
-@@ -2604,6 +2604,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
+@@ -2548,6 +2548,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
  10,syswow64,stdole2.tlb
  11,,iexplore.exe
  11,,winetest.exe,-
@@ -127,7 +127,7 @@ index a76bb0a..f0ff79f 100644
  12,,fltmgr.sys,-
  12,,mountmgr.sys,-
  12,,ndis.sys,-
-@@ -2648,6 +2649,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
+@@ -2592,6 +2593,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
  11,,iexplore.exe
  11,,notepad.exe
  11,,winetest.exe,-
@@ -136,5 +136,5 @@ index a76bb0a..f0ff79f 100644
  12,,mountmgr.sys
  12,,ndis.sys
 -- 
-1.9.1
+2.7.4
 
diff --git a/patches/winedevice-Default_Drivers/0003-dxgmms1.sys-Add-stub-driver.patch b/patches/winedevice-Default_Drivers/0003-dxgmms1.sys-Add-stub-driver.patch
index 1fc79747..5adda243 100644
--- a/patches/winedevice-Default_Drivers/0003-dxgmms1.sys-Add-stub-driver.patch
+++ b/patches/winedevice-Default_Drivers/0003-dxgmms1.sys-Add-stub-driver.patch
@@ -1,4 +1,4 @@
-From cf71906be02cd7ac2862f7066108a32b2bb48de4 Mon Sep 17 00:00:00 2001
+From b1ca94de8e18fd482609c5b6e9ae38126ecfaa65 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Thu, 8 Jun 2017 23:42:32 +0200
 Subject: [PATCH] dxgmms1.sys: Add stub driver.
@@ -15,16 +15,16 @@ Subject: [PATCH] dxgmms1.sys: Add stub driver.
  create mode 100644 dlls/dxgmms1.sys/main.c
 
 diff --git a/configure.ac b/configure.ac
-index cf1ba3d..343f4b4 100644
+index 3d5aef7..ab6752a 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3320,6 +3320,7 @@ WINE_CONFIG_LIB(dxerr9)
+@@ -3228,6 +3228,7 @@ WINE_CONFIG_LIB(dxerr9)
  WINE_CONFIG_DLL(dxgi)
  WINE_CONFIG_TEST(dlls/dxgi/tests)
  WINE_CONFIG_DLL(dxgkrnl.sys)
 +WINE_CONFIG_DLL(dxgmms1.sys)
  WINE_CONFIG_LIB(dxguid)
- WINE_CONFIG_DLL(dxva2,,[clean])
+ WINE_CONFIG_DLL(dxva2)
  WINE_CONFIG_TEST(dlls/dxva2/tests)
 diff --git a/dlls/dxgmms1.sys/Makefile.in b/dlls/dxgmms1.sys/Makefile.in
 new file mode 100644
@@ -92,10 +92,10 @@ index 0000000..686493d
 +    return STATUS_SUCCESS;
 +}
 diff --git a/loader/wine.inf.in b/loader/wine.inf.in
-index f0ff79f..bd83ba2 100644
+index c69b880..03016c1 100644
 --- a/loader/wine.inf.in
 +++ b/loader/wine.inf.in
-@@ -2605,6 +2605,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
+@@ -2549,6 +2549,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
  11,,iexplore.exe
  11,,winetest.exe,-
  12,,dxgkrnl.sys,-
@@ -103,7 +103,7 @@ index f0ff79f..bd83ba2 100644
  12,,fltmgr.sys,-
  12,,mountmgr.sys,-
  12,,ndis.sys,-
-@@ -2650,6 +2651,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
+@@ -2594,6 +2595,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
  11,,notepad.exe
  11,,winetest.exe,-
  12,,dxgkrnl.sys
@@ -112,5 +112,5 @@ index f0ff79f..bd83ba2 100644
  12,,mountmgr.sys
  12,,ndis.sys
 -- 
-1.9.1
+2.7.4