Added patch to fix wrong version of ID3DXEffect interface for d3dx9_25.

README.md

@@ -38,10 +38,11 @@ Wine. All those differences are also documented on the
 Included bug fixes and improvements
 ===================================
 
-**Bugfixes and features included in the next upcoming release [4]:**
+**Bugfixes and features included in the next upcoming release [5]:**
 
 * Fix caps lock state issues with multiple processes ([Wine Bug #35907](https://bugs.winehq.org/show_bug.cgi?id=35907))
 * Fix multithreading issues with fullscreen clipping ([Wine Bug #38087](https://bugs.winehq.org/show_bug.cgi?id=38087))
+* Fix wrong version of ID3DXEffect interface for d3dx9_25
 * Implement locking and synchronization of key states ([Wine Bug #31899](https://bugs.winehq.org/show_bug.cgi?id=31899))
 * Python PIP needs better NtQueryInformationJobObject stub
 

debian/changelog

@@ -5,6 +5,7 @@ wine-staging (1.7.39) UNRELEASED; urgency=low
   * Added patch to implement proper locking of keystate and synchronization with desktop thread.
   * Added patch to implement better stub function for NtQueryInformationJobObject.
   * Added patch to avoid crash in d3d9 tests by skipping when texture/surface creation fails.
+  * Added patch to fix wrong version of ID3DXEffect interface for d3dx9_25.
   * Removed patch to avoid hardcoded values for sizeof(GUID) (accepted upstream).
   * Removed patches for SLGetWindowsInformationDWORD (accepted upstream).
  -- Sebastian Lackner <sebastian@fds-team.de>  Mon, 09 Mar 2015 16:52:35 +0100

patches/d3dx9_25-ID3DXEffect/definition

@@ -0,0 +1 @@
+Fixes: Fix wrong version of ID3DXEffect interface for d3dx9_25

patches/patchinstall.sh

@@ -74,6 +74,7 @@ patch_enable_all ()
 	enable_d3d9_Skip_Tests="$1"
 	enable_d3d9_Surface_Refcount="$1"
 	enable_d3drm_Specfile="$1"
+	enable_d3dx9_25_ID3DXEffect="$1"
 	enable_d3dx9_36_AnimationController="$1"
 	enable_d3dx9_36_D3DXStubs="$1"
 	enable_d3dx9_36_DDS="$1"
@@ -265,6 +266,9 @@ patch_enable ()
 		d3drm-Specfile)
 			enable_d3drm_Specfile="$2"
 			;;
+		d3dx9_25-ID3DXEffect)
+			enable_d3dx9_25_ID3DXEffect="$2"
+			;;
 		d3dx9_36-AnimationController)
 			enable_d3dx9_36_AnimationController="$2"
 			;;
@@ -1355,6 +1359,18 @@ if test "$enable_d3drm_Specfile" -eq 1; then
 	) >> "$patchlist"
 fi
 
+# Patchset d3dx9_25-ID3DXEffect
+# |
+# | Modified files:
+# |   *	dlls/d3dx9_25/Makefile.in, dlls/d3dx9_25/d3dx9_25.spec, dlls/d3dx9_25/effect.c
+# |
+if test "$enable_d3dx9_25_ID3DXEffect" -eq 1; then
+	patch_apply d3dx9_25-ID3DXEffect/0001-d3dx9_25-Add-an-interface-wrapper-for-different-vers.patch
+	(
+		echo '+    { "Sebastian Lackner", "d3dx9_25: Add an interface wrapper for different version of ID3DXEffect.", 1 },';
+	) >> "$patchlist"
+fi
+
 # Patchset wined3d-DXTn
 # |
 # | This patchset fixes the following Wine bugs:
@@ -1643,18 +1659,6 @@ if test "$enable_dxgi_GetDesc" -eq 1; then
 	) >> "$patchlist"
 fi
 
-# Patchset makedep-PARENTSPEC
-# |
-# | Modified files:
-# |   *	tools/makedep.c
-# |
-if test "$enable_makedep_PARENTSPEC" -eq 1; then
-	patch_apply makedep-PARENTSPEC/0001-makedep-Add-support-for-PARENTSPEC-Makefile-variable.patch
-	(
-		echo '+    { "Sebastian Lackner", "makedep: Add support for PARENTSPEC Makefile variable.", 1 },';
-	) >> "$patchlist"
-fi
-
 # Patchset ntdll-DllRedirects
 # |
 # | Modified files:
@@ -1675,6 +1679,18 @@ if test "$enable_ntdll_DllRedirects" -eq 1; then
 	) >> "$patchlist"
 fi
 
+# Patchset makedep-PARENTSPEC
+# |
+# | Modified files:
+# |   *	tools/makedep.c
+# |
+if test "$enable_makedep_PARENTSPEC" -eq 1; then
+	patch_apply makedep-PARENTSPEC/0001-makedep-Add-support-for-PARENTSPEC-Makefile-variable.patch
+	(
+		echo '+    { "Sebastian Lackner", "makedep: Add support for PARENTSPEC Makefile variable.", 1 },';
+	) >> "$patchlist"
+fi
+
 # Patchset wined3d-CSMT_Helper
 # |
 # | Modified files: