wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

Added patch with stub for D3DXIntersect.

Browse Source
This commit is contained in:
Sebastian Lackner 2014-12-20 17:13:13 +01:00
parent a59b542fd6
commit 0d1d699881
5 changed files with 64 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -37,9 +37,10 @@ Wine. All those differences are also documented on the
Included bug fixes and improvements
===================================
**Bugfixes and features included in the next upcoming release [5]:**
**Bugfixes and features included in the next upcoming release [6]:**
* Add stub for D3DXComputeTangentFrameEx ([Wine Bug #31984](https://bugs.winehq.org/show_bug.cgi?id=31984))
* Add stub for D3DXIntersect
* Ensure X11 input events are handled even without explicit message loop ([Wine Bug #8854](https://bugs.winehq.org/show_bug.cgi?id=8854))
* Fix handling of subdirectory in FtpFindFirstFile ([Wine Bug #16526](https://bugs.winehq.org/show_bug.cgi?id=16526))
* Implement ID3DXEffect::FindNextValidTechnique ([Wine Bug #34101](https://bugs.winehq.org/show_bug.cgi?id=34101))

1
debian/changelog vendored
View File

@ -11,6 +11,7 @@ wine-staging (1.7.34) UNRELEASED; urgency=low
* Added patch for IDXGIOutput::GetDesc.
* Added patch for ID3DXEffect::FindNextValidTechnique.
* Added patch with stub for D3DXComputeTangentFrameEx.
* Added patch with stub for D3DXIntersect.
* Removed patch to implement combase HSTRING objects (accepted upstream).
* Removed patch to add fake ProductId to registry (accepted upstream).
* Removed patch to implement stubs for MFStartup and MFShutdown (accepted upstream).

13
patches/Makefile
View File

@ -29,6 +29,7 @@ PATCHLIST := \
configure-Absolute_RPATH.ok \
d3d9-Surface_Refcount.ok \
d3dx9_36-D3DXComputeTangentFrameEx.ok \
d3dx9_36-D3DXIntersect.ok \
d3dx9_36-DXTn.ok \
d3dx9_36-Filter_Warnings.ok \
d3dx9_36-FindNextValidTechnique.ok \
@ -365,6 +366,18 @@ d3dx9_36-D3DXComputeTangentFrameEx.ok:
echo '+ { "Christian Costa", "d3dx9_36: Add stub for D3DXComputeTangentFrameEx.", 1 },'; \
) > d3dx9_36-D3DXComputeTangentFrameEx.ok
# Patchset d3dx9_36-D3DXIntersect
# |
# | Modified files:
# | * dlls/d3dx9_36/d3dx9_36.spec, dlls/d3dx9_36/mesh.c
# |
.INTERMEDIATE: d3dx9_36-D3DXIntersect.ok
d3dx9_36-D3DXIntersect.ok: d3dx9_36-D3DXComputeTangentFrameEx.ok
$(call APPLY_FILE,d3dx9_36-D3DXIntersect/0001-d3dx9_36-Add-stub-for-D3DXIntersect.patch)
@( \
echo '+ { "Christian Costa", "d3dx9_36: Add stub for D3DXIntersect.", 1 },'; \
) > d3dx9_36-D3DXIntersect.ok
# Patchset d3dx9_36-DXTn
# |
# | This patchset fixes the following Wine bugs:

46
patches/d3dx9_36-D3DXIntersect/0001-d3dx9_36-Add-stub-for-D3DXIntersect.patch Normal file
View File

@ -0,0 +1,46 @@
From 6be11442b0b1e9591ab10c3d24cade5b2b01b043 Mon Sep 17 00:00:00 2001
From: Christian Costa <titan.costa@gmail.com>
Date: Sat, 20 Dec 2014 16:28:58 +0100
Subject: d3dx9_36: Add stub for D3DXIntersect.
---
dlls/d3dx9_36/d3dx9_36.spec | 2 +-
dlls/d3dx9_36/mesh.c | 12 ++++++++++++
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec
index 54f57c9..be5f819 100644
--- a/dlls/d3dx9_36/d3dx9_36.spec
+++ b/dlls/d3dx9_36/d3dx9_36.spec
@@ -165,7 +165,7 @@
@ stdcall D3DXGetShaderSize(ptr)
@ stdcall D3DXGetShaderVersion(ptr)
@ stdcall D3DXGetVertexShaderProfile(ptr)
-@ stub D3DXIntersect(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr)
+@ stdcall D3DXIntersect(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr)
@ stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXIntersectTri(ptr ptr ptr ptr ptr ptr ptr ptr)
@ stdcall D3DXLoadMeshFromXA(str long ptr ptr ptr ptr ptr ptr)
diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c
index 39ee53b..5e6d267 100644
--- a/dlls/d3dx9_36/mesh.c
+++ b/dlls/d3dx9_36/mesh.c
@@ -7254,3 +7254,15 @@ HRESULT WINAPI D3DXComputeTangentFrameEx(ID3DXMesh *Mesh, DWORD TextureInSemanti
return E_NOTIMPL;
}
+
+/*************************************************************************
+ * D3DXIntersect (D3DX9_36.@)
+ */
+HRESULT WINAPI D3DXIntersect(ID3DXBaseMesh *Mesh, const D3DXVECTOR3 *RayPos, const D3DXVECTOR3 *RayDir, BOOL *Hit,
+ DWORD *FaceIndex, FLOAT *U, FLOAT *V, FLOAT *Dist, ID3DXBuffer **AllHits, DWORD *CountOfHits)
+{
+ FIXME("Mesh %p, RayPos %p, RayDir %p, Hit %p, FaceIndex %p, U %p, V %p, Dist %p, AllHits %p, CountOfHits %p stub.\n",
+ Mesh, RayPos, RayDir, Hit, FaceIndex, U, V, Dist, AllHits, CountOfHits);
+
+ return E_NOTIMPL;
+}
--
2.1.3

2
patches/d3dx9_36-D3DXIntersect/definition Normal file
View File

@ -0,0 +1,2 @@
Depends: d3dx9_36-D3DXComputeTangentFrameEx
Fixes: Add stub for D3DXIntersect