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 return a valid mesh in D3DXCreateTeapot.

Browse Source
This commit is contained in:
Sebastian Lackner
2015-08-23 00:59:52 +02:00
parent cd3a07933a
commit 78204c282f
5 changed files with 49 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
patches/d3dx9_36-D3DXCreateTeapot/0001-d3dx9_36-Return-a-mesh-in-D3DXCreateTeapot.patch Normal file
View File

@@ -0,0 +1,26 @@
From 34607775675c9475973fd249b8a68a59935b0391 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Thu, 30 Jul 2015 11:57:28 +1000
Subject: d3dx9_36: Return a mesh in D3DXCreateTeapot
Fixes https://bugs.winehq.org/show_bug.cgi?id=36884
---
dlls/d3dx9_36/mesh.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c
index 39d279d..59e385e4 100644
--- a/dlls/d3dx9_36/mesh.c
+++ b/dlls/d3dx9_36/mesh.c
@@ -5153,7 +5153,7 @@ HRESULT WINAPI D3DXCreateTeapot(struct IDirect3DDevice9 *device,
{
FIXME("(%p, %p, %p): stub\n", device, mesh, adjacency);
- return E_NOTIMPL;
+ return D3DXCreateSphere(device, 1.0f, 4, 4, mesh, adjacency);
}
HRESULT WINAPI D3DXCreateTextA(struct IDirect3DDevice9 *device, HDC hdc, const char *text, float deviation,
--
2.5.0

1
patches/d3dx9_36-D3DXCreateTeapot/definition Normal file
View File

@@ -0,0 +1 @@
Fixes: [36884] Return a valid mesh in D3DXCreateTeapot

19
patches/patchinstall.sh
View File

@@ -97,6 +97,7 @@ patch_enable_all ()
enable_d3dx9_33_Share_Source="$1"
enable_d3dx9_36_AnimationController="$1"
enable_d3dx9_36_CloneEffect="$1"
enable_d3dx9_36_D3DXCreateTeapot="$1"
enable_d3dx9_36_D3DXStubs="$1"
enable_d3dx9_36_DDS="$1"
enable_d3dx9_36_DXTn="$1"
@@ -382,6 +383,9 @@ patch_enable ()
d3dx9_36-CloneEffect)
enable_d3dx9_36_CloneEffect="$2"
;;
d3dx9_36-D3DXCreateTeapot)
enable_d3dx9_36_D3DXCreateTeapot="$2"
;;
d3dx9_36-D3DXStubs)
enable_d3dx9_36_D3DXStubs="$2"
;;
@@ -2493,6 +2497,21 @@ if test "$enable_d3dx9_36_CloneEffect" -eq 1; then
) >> "$patchlist"
fi
# Patchset d3dx9_36-D3DXCreateTeapot
# |
# | This patchset fixes the following Wine bugs:
# | * [#36884] Return a valid mesh in D3DXCreateTeapot
# |
# | Modified files:
# | * dlls/d3dx9_36/mesh.c
# |
if test "$enable_d3dx9_36_D3DXCreateTeapot" -eq 1; then
patch_apply d3dx9_36-D3DXCreateTeapot/0001-d3dx9_36-Return-a-mesh-in-D3DXCreateTeapot.patch
(
echo '+ { "Alistair Leslie-Hughes", "d3dx9_36: Return a mesh in D3DXCreateTeapot.", 1 },';
) >> "$patchlist"
fi
# Patchset d3dx9_36-DDS
# |
# | This patchset fixes the following Wine bugs: