From 1261a0540cd10aeca3db9b68db2eb2b3997931c7 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sun, 15 Jan 2017 02:29:50 +0100
Subject: [PATCH] Added patch to avoid setting DDCAPS_ALIGNBOUNDARYSRC as cap
 for ddraw.

---
 patches/patchinstall.sh                       | 19 ++++++++++++++
 ...et-DDCAPS_ALIGNBOUNDARYSRC-as-cap-fo.patch | 26 +++++++++++++++++++
 .../definition                                |  1 +
 3 files changed, 46 insertions(+)
 create mode 100644 patches/wined3d-DDCAPS_ALIGNBOUNDARYSRC/0001-wined3d-Do-not-set-DDCAPS_ALIGNBOUNDARYSRC-as-cap-fo.patch
 create mode 100644 patches/wined3d-DDCAPS_ALIGNBOUNDARYSRC/definition

diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index 905729cf..3ef34367 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -389,6 +389,7 @@ patch_enable_all ()
 	enable_wined3d_Accounting="$1"
 	enable_wined3d_CSMT_Helper="$1"
 	enable_wined3d_CSMT_Main="$1"
+	enable_wined3d_DDCAPS_ALIGNBOUNDARYSRC="$1"
 	enable_wined3d_DXTn="$1"
 	enable_wined3d_GTX_560M="$1"
 	enable_wined3d_Limit_Vram="$1"
@@ -1372,6 +1373,9 @@ patch_enable ()
 		wined3d-CSMT_Main)
 			enable_wined3d_CSMT_Main="$2"
 			;;
+		wined3d-DDCAPS_ALIGNBOUNDARYSRC)
+			enable_wined3d_DDCAPS_ALIGNBOUNDARYSRC="$2"
+			;;
 		wined3d-DXTn)
 			enable_wined3d_DXTn="$2"
 			;;
@@ -8215,6 +8219,21 @@ if test "$enable_wined3d_CSMT_Helper" -eq 1; then
 	) >> "$patchlist"
 fi
 
+# Patchset wined3d-DDCAPS_ALIGNBOUNDARYSRC
+# |
+# | This patchset fixes the following Wine bugs:
+# |   *	[#28672] Do not set DDCAPS_ALIGNBOUNDARYSRC as cap for ddraw
+# |
+# | Modified files:
+# |   *	dlls/wined3d/directx.c
+# |
+if test "$enable_wined3d_DDCAPS_ALIGNBOUNDARYSRC" -eq 1; then
+	patch_apply wined3d-DDCAPS_ALIGNBOUNDARYSRC/0001-wined3d-Do-not-set-DDCAPS_ALIGNBOUNDARYSRC-as-cap-fo.patch
+	(
+		echo '+    { "Michael Müller", "wined3d: Do not set DDCAPS_ALIGNBOUNDARYSRC as cap for ddraw.", 1 },';
+	) >> "$patchlist"
+fi
+
 # Patchset wined3d-GTX_560M
 # |
 # | Modified files:
diff --git a/patches/wined3d-DDCAPS_ALIGNBOUNDARYSRC/0001-wined3d-Do-not-set-DDCAPS_ALIGNBOUNDARYSRC-as-cap-fo.patch b/patches/wined3d-DDCAPS_ALIGNBOUNDARYSRC/0001-wined3d-Do-not-set-DDCAPS_ALIGNBOUNDARYSRC-as-cap-fo.patch
new file mode 100644
index 00000000..83a92799
--- /dev/null
+++ b/patches/wined3d-DDCAPS_ALIGNBOUNDARYSRC/0001-wined3d-Do-not-set-DDCAPS_ALIGNBOUNDARYSRC-as-cap-fo.patch
@@ -0,0 +1,26 @@
+From 14c8ab57c3147379cdfee828f9e12a2210978e65 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
+Date: Sun, 15 Jan 2017 01:16:26 +0100
+Subject: wined3d: Do not set DDCAPS_ALIGNBOUNDARYSRC as cap for ddraw.
+
+---
+ dlls/wined3d/directx.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
+index edd640a507c..8616277dd2b 100644
+--- a/dlls/wined3d/directx.c
++++ b/dlls/wined3d/directx.c
+@@ -5820,8 +5820,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte
+                                         WINEDDCAPS_CANCLIP                  |
+                                         WINEDDCAPS_CANCLIPSTRETCHED         |
+                                         WINEDDCAPS_COLORKEY                 |
+-                                        WINEDDCAPS_COLORKEYHWASSIST         |
+-                                        WINEDDCAPS_ALIGNBOUNDARYSRC;
++                                        WINEDDCAPS_COLORKEYHWASSIST;
+ 
+     /* Fill the ddraw caps structure */
+     caps->ddraw_caps.caps =             WINEDDCAPS_GDI                      |
+-- 
+2.11.0
+
diff --git a/patches/wined3d-DDCAPS_ALIGNBOUNDARYSRC/definition b/patches/wined3d-DDCAPS_ALIGNBOUNDARYSRC/definition
new file mode 100644
index 00000000..ea14c9cc
--- /dev/null
+++ b/patches/wined3d-DDCAPS_ALIGNBOUNDARYSRC/definition
@@ -0,0 +1 @@
+Fixes: [28672] Do not set DDCAPS_ALIGNBOUNDARYSRC as cap for ddraw