diff --git a/README.md b/README.md index 2b5ff179..2cadf67f 100644 --- a/README.md +++ b/README.md @@ -128,7 +128,7 @@ Included bug fixes and improvements * Fix issues with dragging layers between images in Adobe Photoshop 7.0 ([Wine Bug #12007](https://bugs.winehq.org/show_bug.cgi?id=12007)) * Fix missing video introduced by pixelformat changes. ([Wine Bug #36900](https://bugs.winehq.org/show_bug.cgi?id=36900)) * ~~Fix mouse jittering in Planetside 2~~ ([Wine Bug #32913](https://bugs.winehq.org/show_bug.cgi?id=32913)) -* Fix parameters for ConvertToIndexedBlendedMesh stub ([Wine Bug #36449](https://bugs.winehq.org/show_bug.cgi?id=36449)) +* ~~Fix parameters for ConvertToIndexedBlendedMesh stub~~ ([Wine Bug #36449](https://bugs.winehq.org/show_bug.cgi?id=36449)) * Fix possible segfault in pulse_rd_loop of PulseAudio backend * Fix return value of ScrollWindowEx for invisible windows ([Wine Bug #37706](https://bugs.winehq.org/show_bug.cgi?id=37706)) * Fix texture corruption in CSI: Fatal Conspiracy ([Wine Bug #33768](https://bugs.winehq.org/show_bug.cgi?id=33768)) diff --git a/debian/changelog b/debian/changelog index ce9b9dd7..6bdc8397 100644 --- a/debian/changelog +++ b/debian/changelog @@ -53,6 +53,7 @@ wine-staging (1.7.38) UNRELEASED; urgency=low * Removed patch to fix definition of SECTION_BASIC_INFORMATION and SECTION_IMAGE_INFORMATION (accepted upstream). * Removed patch to add library override instead of closing winecfg when pressing ENTER (accepted upstream). * Removed patch to fix init of LONGLONG variable with a negative value in TGA decoder (accepted upstream). + * Removed patch to fix parameters for ConvertToIndexedBlendedMesh stub (accepted upstream). -- Sebastian Lackner Mon, 23 Feb 2015 18:24:51 +0100 wine-staging (1.7.37) unstable; urgency=low diff --git a/patches/d3dx9_36-ConvertToIndexedBlended/0001-d3dx9_36-Fix-d3dx9_skin_info_ConvertToIndexedBlended.patch b/patches/d3dx9_36-ConvertToIndexedBlended/0001-d3dx9_36-Fix-d3dx9_skin_info_ConvertToIndexedBlended.patch deleted file mode 100644 index 79a93e42..00000000 --- a/patches/d3dx9_36-ConvertToIndexedBlended/0001-d3dx9_36-Fix-d3dx9_skin_info_ConvertToIndexedBlended.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 36b08cffe8ab417c878ac0c10251b261bace58cd Mon Sep 17 00:00:00 2001 -From: Christian Costa -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 - diff --git a/patches/d3dx9_36-ConvertToIndexedBlended/definition b/patches/d3dx9_36-ConvertToIndexedBlended/definition deleted file mode 100644 index 64542ee2..00000000 --- a/patches/d3dx9_36-ConvertToIndexedBlended/definition +++ /dev/null @@ -1 +0,0 @@ -Fixes: [36449] Fix parameters for ConvertToIndexedBlendedMesh stub diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 81612051..7546ac7e 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -74,7 +74,6 @@ patch_enable_all () enable_d3d9_Surface_Refcount="$1" enable_d3drm_Specfile="$1" enable_d3dx9_36_AnimationController="$1" - enable_d3dx9_36_ConvertToIndexedBlended="$1" enable_d3dx9_36_D3DXStubs="$1" enable_d3dx9_36_DDS="$1" enable_d3dx9_36_DXTn="$1" @@ -265,9 +264,6 @@ patch_enable () d3dx9_36-AnimationController) enable_d3dx9_36_AnimationController="$2" ;; - d3dx9_36-ConvertToIndexedBlended) - enable_d3dx9_36_ConvertToIndexedBlended="$2" - ;; d3dx9_36-D3DXStubs) enable_d3dx9_36_D3DXStubs="$2" ;; @@ -1390,21 +1386,6 @@ if test "$enable_d3dx9_36_AnimationController" -eq 1; then ) >> "$patchlist" fi -# 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 -# | -if test "$enable_d3dx9_36_ConvertToIndexedBlended" -eq 1; then - patch_apply d3dx9_36-ConvertToIndexedBlended/0001-d3dx9_36-Fix-d3dx9_skin_info_ConvertToIndexedBlended.patch - ( - echo '+ { "Christian Costa", "d3dx9_36: Fix d3dx9_skin_info_ConvertToIndexedBlendedMesh stub.", 1 },'; - ) >> "$patchlist" -fi - # Patchset d3dx9_36-D3DXStubs # | # | This patchset fixes the following Wine bugs: