mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-09-13 09:17:20 -07:00
Added patch to fix parameters for ConvertToIndexedBlendedMesh stub.
This commit is contained in:
Sebastian Lackner
parent
b5e303e711
commit
9f43cabb0a
@ -37,7 +37,7 @@ Wine. All those differences are also documented on the
|
||||
Included bug fixes and improvements
|
||||
===================================
|
||||
|
||||
**Bugfixes and features included in the next upcoming release [15]:**
|
||||
**Bugfixes and features included in the next upcoming release [16]:**
|
||||
|
||||
* Add stub for D3DXComputeTangentFrameEx ([Wine Bug #31984](https://bugs.winehq.org/show_bug.cgi?id=31984))
|
||||
* Add stub for D3DXIntersect
|
||||
@ -45,6 +45,7 @@ Included bug fixes and improvements
|
||||
* Expose PKEY_AudioEndpoint_PhysicalSpeakers device property in PulseAudio driver
|
||||
* Fix access violation when calling GetStringTypeW with NULL src. ([Wine Bug #37759](https://bugs.winehq.org/show_bug.cgi?id=37759))
|
||||
* Fix handling of subdirectory in FtpFindFirstFile ([Wine Bug #16526](https://bugs.winehq.org/show_bug.cgi?id=16526))
|
||||
* Fix parameters for ConvertToIndexedBlendedMesh stub ([Wine Bug #36449](https://bugs.winehq.org/show_bug.cgi?id=36449))
|
||||
* GetMonitorInfo returns the same name for all monitors ([Wine Bug #37709](https://bugs.winehq.org/show_bug.cgi?id=37709))
|
||||
* IOCTL_DVD_READ_STRUCTURE expects the wrong size of output buffer for some requests ([Wine Bug #37767](https://bugs.winehq.org/show_bug.cgi?id=37767))
|
||||
* Implement ID3DXEffect::FindNextValidTechnique ([Wine Bug #34101](https://bugs.winehq.org/show_bug.cgi?id=34101))
|
||||
|
||||
1
debian/changelog
vendored
1
debian/changelog
vendored
@ -23,6 +23,7 @@ wine-staging (1.7.34) UNRELEASED; urgency=low
|
||||
* Added patch to avoid calling IDirect3DDevice7_DrawIndexedPrimitive if there is no primitive.
|
||||
* Added patch to fix access violation when calling GetStringTypeW with NULL src.
|
||||
* Added patch for ID3DXFont::DrawTextA/W support.
|
||||
* Added patch to fix parameters for ConvertToIndexedBlendedMesh stub.
|
||||
* 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).
|
||||
|
||||
@ -27,6 +27,7 @@ PATCHLIST := \
|
||||
comctl32-LoadIconMetric.ok \
|
||||
configure-Absolute_RPATH.ok \
|
||||
d3d9-Surface_Refcount.ok \
|
||||
d3dx9_36-ConvertToIndexedBlended.ok \
|
||||
d3dx9_36-D3DXComputeTangentFrameEx.ok \
|
||||
d3dx9_36-D3DXIntersect.ok \
|
||||
d3dx9_36-DXTn.ok \
|
||||
@ -335,6 +336,21 @@ d3d9-Surface_Refcount.ok:
|
||||
echo '+ { "Henri Verbeet", "d3d9: Don'\''t decrease surface refcount when its already zero.", 1 },'; \
|
||||
) > d3d9-Surface_Refcount.ok
|
||||
|
||||
# Patchset d3dx9_36-ConvertToIndexedBlended
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#36449] Fix parameters for ConvertToIndexedBlendedMesh stub
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/d3dx9_36/skin.c, include/d3dx9mesh.h
|
||||
# |
|
||||
.INTERMEDIATE: d3dx9_36-ConvertToIndexedBlended.ok
|
||||
d3dx9_36-ConvertToIndexedBlended.ok:
|
||||
$(call APPLY_FILE,d3dx9_36-ConvertToIndexedBlended/0001-d3dx9_36-Fix-d3dx9_skin_info_ConvertToIndexedBlended.patch)
|
||||
@( \
|
||||
echo '+ { "Christian Costa", "d3dx9_36: Fix d3dx9_skin_info_ConvertToIndexedBlendedMesh stub.", 1 },'; \
|
||||
) > d3dx9_36-ConvertToIndexedBlended.ok
|
||||
|
||||
# Patchset d3dx9_36-D3DXComputeTangentFrameEx
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
|
||||
@ -0,0 +1,52 @@
|
||||
From 36b08cffe8ab417c878ac0c10251b261bace58cd Mon Sep 17 00:00:00 2001
|
||||
From: Christian Costa <titan.costa@gmail.com>
|
||||
Date: Wed, 31 Dec 2014 10:42:01 +0100
|
||||
Subject: d3dx9_36: Fix d3dx9_skin_info_ConvertToIndexedBlendedMesh stub.
|
||||
|
||||
---
|
||||
dlls/d3dx9_36/skin.c | 6 +++---
|
||||
include/d3dx9mesh.h | 7 ++++---
|
||||
2 files changed, 7 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/dlls/d3dx9_36/skin.c b/dlls/d3dx9_36/skin.c
|
||||
index aa5acf2..9b93af6 100644
|
||||
--- a/dlls/d3dx9_36/skin.c
|
||||
+++ b/dlls/d3dx9_36/skin.c
|
||||
@@ -395,13 +395,13 @@ static HRESULT WINAPI d3dx9_skin_info_ConvertToBlendedMesh(ID3DXSkinInfo *iface,
|
||||
}
|
||||
|
||||
static HRESULT WINAPI d3dx9_skin_info_ConvertToIndexedBlendedMesh(ID3DXSkinInfo *iface, ID3DXMesh *mesh_in,
|
||||
- DWORD options, const DWORD *adjacency_in, DWORD *adjacency_out, DWORD *face_remap,
|
||||
+ DWORD options, DWORD palette_size, const DWORD *adjacency_in, DWORD *adjacency_out, DWORD *face_remap,
|
||||
ID3DXBuffer **vertex_remap, DWORD *max_face_infl, DWORD *num_bone_combinations,
|
||||
ID3DXBuffer **bone_combination_table, ID3DXMesh **mesh_out)
|
||||
{
|
||||
- FIXME("iface %p, mesh_in %p, options %#x, adjacency_in %p, adjacency_out %p, face_remap %p, vertex_remap %p, "
|
||||
+ FIXME("iface %p, mesh_in %p, options %#x, palette_size %u, adjacency_in %p, adjacency_out %p, face_remap %p, vertex_remap %p, "
|
||||
"max_face_infl %p, num_bone_combinations %p, bone_combination_table %p, mesh_out %p stub!\n",
|
||||
- iface, mesh_in, options, adjacency_in, adjacency_out, face_remap, vertex_remap,
|
||||
+ iface, mesh_in, options, palette_size, adjacency_in, adjacency_out, face_remap, vertex_remap,
|
||||
max_face_infl, num_bone_combinations, bone_combination_table, mesh_out);
|
||||
|
||||
return E_NOTIMPL;
|
||||
diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h
|
||||
index 1dcc244..8777749 100644
|
||||
--- a/include/d3dx9mesh.h
|
||||
+++ b/include/d3dx9mesh.h
|
||||
@@ -544,9 +544,10 @@ DECLARE_INTERFACE_(ID3DXSkinInfo, IUnknown)
|
||||
STDMETHOD(ConvertToBlendedMesh)(THIS_ ID3DXMesh *mesh_in, DWORD options, const DWORD *adjacency_in,
|
||||
DWORD *adjacency_out, DWORD *face_remap, ID3DXBuffer **vertex_remap, DWORD *max_face_infl,
|
||||
DWORD *num_bone_combinations, ID3DXBuffer **bone_combination_table, ID3DXMesh **mesh_out) PURE;
|
||||
- STDMETHOD(ConvertToIndexedBlendedMesh)(THIS_ ID3DXMesh *mesh_in, DWORD options, const DWORD *adjacency_in,
|
||||
- DWORD *adjacency_out, DWORD *face_remap, ID3DXBuffer **vertex_remap, DWORD *max_face_infl,
|
||||
- DWORD *num_bone_combinations, ID3DXBuffer **bone_combination_table, ID3DXMesh **mesh_out) PURE;
|
||||
+ STDMETHOD(ConvertToIndexedBlendedMesh)(THIS_ ID3DXMesh *mesh_in, DWORD options, DWORD palette_size,
|
||||
+ const DWORD *adjacency_in, DWORD *adjacency_out, DWORD *face_remap, ID3DXBuffer **vertex_remap,
|
||||
+ DWORD *max_face_infl, DWORD *num_bone_combinations, ID3DXBuffer **bone_combination_table,
|
||||
+ ID3DXMesh **mesh_out) PURE;
|
||||
};
|
||||
#undef INTERFACE
|
||||
|
||||
--
|
||||
2.2.1
|
||||
|
||||
1
patches/d3dx9_36-ConvertToIndexedBlended/definition
Normal file
1
patches/d3dx9_36-ConvertToIndexedBlended/definition
Normal file
@ -0,0 +1 @@
|
||||
Fixes: [36449] Fix parameters for ConvertToIndexedBlendedMesh stub
|
||||
Loading…
Reference in New Issue
Block a user