Rebase against 6d26689484070b2c4ad4e0e16812c6eb8176cd40.

patches/dxdiag-new-dlls/0010-dxapi.sys-add-stub-dll.patch

@@ -1,4 +1,4 @@
-From c4e663329366c37bca65a0beb83d656afea45ecc Mon Sep 17 00:00:00 2001
+From 338fc447537dd45e07a3c2d9ef8069af910c936f Mon Sep 17 00:00:00 2001
 From: Austin English <austinenglish@gmail.com>
 Date: Tue, 13 Oct 2020 04:42:03 -0500
 Subject: [PATCH] dxapi.sys: add stub dll
@@ -9,17 +9,16 @@ Signed-off-by: Austin English <austinenglish@gmail.com>
  dlls/dxapi.sys/Makefile.in    |  6 ++++++
  dlls/dxapi.sys/dxapi.sys.spec |  7 +++++++
  dlls/dxapi.sys/version.rc     | 26 ++++++++++++++++++++++++++
- loader/wine.inf.in            |  2 ++
- 5 files changed, 42 insertions(+)
+ 4 files changed, 40 insertions(+)
  create mode 100644 dlls/dxapi.sys/Makefile.in
  create mode 100644 dlls/dxapi.sys/dxapi.sys.spec
  create mode 100644 dlls/dxapi.sys/version.rc
 
 diff --git a/configure.ac b/configure.ac
-index da6ada3013b..47e8427f6b8 100644
+index d3cb3ed1fd6..86d6912b4e0 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3248,6 +3248,7 @@ WINE_CONFIG_MAKEFILE(dlls/dwmapi/tests)
+@@ -3274,6 +3274,7 @@ WINE_CONFIG_MAKEFILE(dlls/dwmapi/tests)
  WINE_CONFIG_MAKEFILE(dlls/dwrite)
  WINE_CONFIG_MAKEFILE(dlls/dwrite/tests)
  WINE_CONFIG_MAKEFILE(dlls/dx8vb)
@@ -84,26 +83,6 @@ index 00000000000..7ecd1565052
 +#define WINE_PRODUCTVERSION_STR "5.0.2180.1"
 +
 +#include "wine/wine_common_ver.rc"
-diff --git a/loader/wine.inf.in b/loader/wine.inf.in
-index 20d5243aa4b..b4052b146b4 100644
---- a/loader/wine.inf.in
-+++ b/loader/wine.inf.in
-@@ -2632,6 +2632,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
- 10,syswow64,stdole2.tlb
- 11,,iexplore.exe
- 11,,winetest.exe,-
-+12,,dxapi.sys,-
- 12,,dxgkrnl.sys,-
- 12,,dxgmms1.sys,-
- 12,,fltmgr.sys,-
-@@ -2689,6 +2690,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
- 11,,iexplore.exe
- 11,,notepad.exe
- 11,,winetest.exe,-
-+12,,dxapi.sys,-
- 12,,dxgkrnl.sys
- 12,,dxgmms1.sys
- 12,,fltmgr.sys
 -- 
-2.20.1
+2.30.1