wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Sebastian Lackner
2015-03-14 05:03:07 +01:00
parent 74f4207916
commit dfd778f392
5 changed files with 54 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
patches/d3dx9_24-ID3DXEffect/0001-d3dx9_24-Add-an-interface-wrapper-for-different-vers.patch Normal file
View File

@@ -0,0 +1,26 @@
From 5b9b5bcfe1c8241f5f0f8502aff184425797e207 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 14 Mar 2015 05:01:05 +0100
Subject: d3dx9_24: Add an interface wrapper for different version of
ID3DXEffect.
---
dlls/d3dx9_24/d3dx9_24.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/d3dx9_24/d3dx9_24.spec b/dlls/d3dx9_24/d3dx9_24.spec
index f111618..f714284 100644
--- a/dlls/d3dx9_24/d3dx9_24.spec
+++ b/dlls/d3dx9_24/d3dx9_24.spec
@@ -43,7 +43,7 @@
@ stdcall D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) d3dx9_36.D3DXCreateCubeTextureFromResourceExW
@ stdcall D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr) d3dx9_36.D3DXCreateCubeTextureFromResourceW
@ stdcall D3DXCreateCylinder(ptr long long long long long ptr ptr) d3dx9_36.D3DXCreateCylinder
-@ stdcall D3DXCreateEffect(ptr ptr long ptr ptr long ptr ptr ptr) d3dx9_36.D3DXCreateEffect
+@ stdcall D3DXCreateEffect(ptr ptr long ptr ptr long ptr ptr ptr) d3dx9_25.D3DXCreateEffect
@ stdcall D3DXCreateEffectCompiler(ptr long ptr ptr long ptr ptr) d3dx9_36.D3DXCreateEffectCompiler
@ stdcall D3DXCreateEffectCompilerFromFileA(str ptr ptr long ptr ptr) d3dx9_36.D3DXCreateEffectCompilerFromFileA
@ stdcall D3DXCreateEffectCompilerFromFileW(wstr ptr ptr long ptr ptr) d3dx9_36.D3DXCreateEffectCompilerFromFileW
--
2.3.2

2
patches/d3dx9_24-ID3DXEffect/definition Normal file
View File

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

23
patches/patchinstall.sh
View File

@@ -74,6 +74,7 @@ patch_enable_all ()
enable_d3d9_Skip_Tests="$1"
enable_d3d9_Surface_Refcount="$1"
enable_d3drm_Specfile="$1"
enable_d3dx9_24_ID3DXEffect="$1"
enable_d3dx9_25_ID3DXEffect="$1"
enable_d3dx9_36_AnimationController="$1"
enable_d3dx9_36_D3DXStubs="$1"
@@ -266,6 +267,9 @@ patch_enable ()
d3drm-Specfile)
enable_d3drm_Specfile="$2"
;;
d3dx9_24-ID3DXEffect)
enable_d3dx9_24_ID3DXEffect="$2"
;;
d3dx9_25-ID3DXEffect)
enable_d3dx9_25_ID3DXEffect="$2"
;;
@@ -1097,6 +1101,13 @@ if test "$enable_d3dx9_36_DXTn" -eq 1; then
enable_wined3d_DXTn=1
fi
if test "$enable_d3dx9_24_ID3DXEffect" -eq 1; then
if test "$enable_d3dx9_25_ID3DXEffect" -gt 1; then
abort "Patchset d3dx9_25-ID3DXEffect disabled, but d3dx9_24-ID3DXEffect depends on that."
fi
enable_d3dx9_25_ID3DXEffect=1
fi
if test "$enable_Exagear" -eq 1; then
if test "$enable_ntdll_WRITECOPY" -gt 1; then
abort "Patchset ntdll-WRITECOPY disabled, but Exagear depends on that."
@@ -1371,6 +1382,18 @@ if test "$enable_d3dx9_25_ID3DXEffect" -eq 1; then
) >> "$patchlist"
fi
# Patchset d3dx9_24-ID3DXEffect
# |
# | Modified files:
# | * dlls/d3dx9_24/d3dx9_24.spec
# |
if test "$enable_d3dx9_24_ID3DXEffect" -eq 1; then
patch_apply d3dx9_24-ID3DXEffect/0001-d3dx9_24-Add-an-interface-wrapper-for-different-vers.patch
(
echo '+ { "Sebastian Lackner", "d3dx9_24: Add an interface wrapper for different version of ID3DXEffect.", 1 },';
) >> "$patchlist"
fi
# Patchset wined3d-DXTn
# |
# | This patchset fixes the following Wine bugs: