From 11194ea339743fe3bf2341489e65bd33d2051811 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Thu, 20 Jun 2019 08:28:26 +1000
Subject: [PATCH] Rebase against 48f93bc3290596b8da4455496fa88cd13ea6f3c9

---
 ...bs-for-MakeWindowAssociation-and-Get.patch | 61 -------------------
 patches/dxgi-MakeWindowAssociation/definition |  1 -
 patches/patchinstall.sh                       | 18 +-----
 3 files changed, 1 insertion(+), 79 deletions(-)
 delete mode 100644 patches/dxgi-MakeWindowAssociation/0001-dxgi-Improve-stubs-for-MakeWindowAssociation-and-Get.patch
 delete mode 100644 patches/dxgi-MakeWindowAssociation/definition

diff --git a/patches/dxgi-MakeWindowAssociation/0001-dxgi-Improve-stubs-for-MakeWindowAssociation-and-Get.patch b/patches/dxgi-MakeWindowAssociation/0001-dxgi-Improve-stubs-for-MakeWindowAssociation-and-Get.patch
deleted file mode 100644
index 64174778..00000000
--- a/patches/dxgi-MakeWindowAssociation/0001-dxgi-Improve-stubs-for-MakeWindowAssociation-and-Get.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 42e7bd210fe641367962b04f5d8b3df4c09c2818 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Tue, 19 Aug 2014 22:47:51 +0200
-Subject: [PATCH 314/358] dxgi: Improve stubs for MakeWindowAssociation and
- GetWindowAssociation.
-
----
- dlls/dxgi/dxgi_private.h |  1 +
- dlls/dxgi/factory.c      | 15 ++++++++++++++-
- 2 files changed, 15 insertions(+), 1 deletion(-)
-
-diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h
-index 24487c3..9c5cfcc 100644
---- a/dlls/dxgi/dxgi_private.h
-+++ b/dlls/dxgi/dxgi_private.h
-@@ -113,6 +113,7 @@ struct dxgi_factory
-     struct wined3d *wined3d;
-     BOOL extended;
-     HWND device_window;
-+    HWND assoc_window;
- };
- 
- HRESULT dxgi_factory_create(REFIID riid, void **factory, BOOL extended) DECLSPEC_HIDDEN;
-diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c
-index 7fc3279..d983928 100644
---- a/dlls/dxgi/factory.c
-+++ b/dlls/dxgi/factory.c
-@@ -174,16 +174,29 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_EnumAdapters(IWineDXGIFactory *ifa
- static HRESULT STDMETHODCALLTYPE dxgi_factory_MakeWindowAssociation(IWineDXGIFactory *iface,
-         HWND window, UINT flags)
- {
-+    struct dxgi_factory *factory = impl_from_IWineDXGIFactory(iface);
-+
-     FIXME("iface %p, window %p, flags %#x stub!\n", iface, window, flags);
- 
-+    if (!window && flags)
-+        return DXGI_ERROR_INVALID_CALL;
-+
-+    factory->assoc_window = window;
-+
-     return S_OK;
- }
- 
- static HRESULT STDMETHODCALLTYPE dxgi_factory_GetWindowAssociation(IWineDXGIFactory *iface, HWND *window)
- {
-+    struct dxgi_factory *factory = impl_from_IWineDXGIFactory(iface);
-+
-     FIXME("iface %p, window %p stub!\n", iface, window);
- 
--    return E_NOTIMPL;
-+    if (!window)
-+        return DXGI_ERROR_INVALID_CALL;
-+
-+    *window = factory->assoc_window;
-+    return S_OK;
- }
- 
- static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChain(IWineDXGIFactory *iface,
--- 
-1.9.1
-
diff --git a/patches/dxgi-MakeWindowAssociation/definition b/patches/dxgi-MakeWindowAssociation/definition
deleted file mode 100644
index 1f430dc7..00000000
--- a/patches/dxgi-MakeWindowAssociation/definition
+++ /dev/null
@@ -1 +0,0 @@
-Fixes: Improve stubs for dxgi MakeWindowAssociation and GetWindowAssociation
diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index 0108ead8..77fb91f0 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -52,7 +52,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "1bc9c4fdb2e6c2762105c14cdafb7d4ea3370625"
+	echo "48f93bc3290596b8da4455496fa88cd13ea6f3c9"
 }
 
 # Show version information
@@ -137,7 +137,6 @@ patch_enable_all ()
 	enable_dwrite_FontFallback="$1"
 	enable_dxdiagn_Enumerate_DirectSound="$1"
 	enable_dxdiagn_GetChildContainer_Leaf_Nodes="$1"
-	enable_dxgi_MakeWindowAssociation="$1"
 	enable_dxva2_Video_Decoder="$1"
 	enable_eventfd_synchronization="$1"
 	enable_explorer_Video_Registry_Key="$1"
@@ -536,9 +535,6 @@ patch_enable ()
 		dxdiagn-GetChildContainer_Leaf_Nodes)
 			enable_dxdiagn_GetChildContainer_Leaf_Nodes="$2"
 			;;
-		dxgi-MakeWindowAssociation)
-			enable_dxgi_MakeWindowAssociation="$2"
-			;;
 		dxva2-Video_Decoder)
 			enable_dxva2_Video_Decoder="$2"
 			;;
@@ -3183,18 +3179,6 @@ if test "$enable_dxdiagn_GetChildContainer_Leaf_Nodes" -eq 1; then
 	) >> "$patchlist"
 fi
 
-# Patchset dxgi-MakeWindowAssociation
-# |
-# | Modified files:
-# |   *	dlls/dxgi/dxgi_private.h, dlls/dxgi/factory.c
-# |
-if test "$enable_dxgi_MakeWindowAssociation" -eq 1; then
-	patch_apply dxgi-MakeWindowAssociation/0001-dxgi-Improve-stubs-for-MakeWindowAssociation-and-Get.patch
-	(
-		printf '%s\n' '+    { "Michael Müller", "dxgi: Improve stubs for MakeWindowAssociation and GetWindowAssociation.", 1 },';
-	) >> "$patchlist"
-fi
-
 # Patchset dxva2-Video_Decoder
 # |
 # | Modified files: