[PATCH] d3dx9: Return skininfo interface in D3DXLoadSkinMeshFromXof even when skin information is unavailable
Based on a patch by Michael Müller.
From: Vijay Kiran Kamuju infyquest@gmail.com Signed-off-by: Vijay Kiran Kamuju infyquest@gmail.com Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=33904 --- dlls/d3dx9_36/mesh.c | 7 +++++++ dlls/d3dx9_36/tests/mesh.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index acbb247767..6a0ba5564a 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -3332,6 +3332,13 @@ static HRESULT parse_mesh(ID3DXFileData *filedata, struct mesh_data *mesh_data, goto end; }
+ if ((provide_flags & PROVIDE_SKININFO) && !mesh_data->skin_info) + { + hr = D3DXCreateSkinInfoFVF(mesh_data->num_vertices, mesh_data->fvf, mesh_data->nb_bones, &mesh_data->skin_info); + if (FAILED(hr)) + goto end; + } + hr = D3D_OK;
end: diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index a33ed2cbab..56cc98251a 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -11319,7 +11319,7 @@ static void test_load_skin_mesh_from_xof(void) ok(!materials, "Got unexpected value %p.\n", materials); ok(!effects, "Got unexpected value %p.\n", effects); ok(!count, "Got unexpected value %u.\n", count); - todo_wine ok(!!skin_info, "Got unexpected value %p.\n", skin_info); + ok(!!skin_info, "Got unexpected value %p.\n", skin_info); ok(!!mesh, "Got unexpected value %p.\n", mesh); count = mesh->lpVtbl->GetNumVertices(mesh); ok(count == 3, "Got unexpected value %u.\n", count);
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=50091
Your paranoid android.
=== debian9 (32 bit report) ===
d3dx9_36: mesh.c:11346: Test failed: Got unexpected value 0x80004001. mesh.c:11347: Test failed: Got unexpected value 1431655765.
=== debian9 (32 bit French report) ===
d3dx9_36: mesh.c:11346: Test failed: Got unexpected value 0x80004001. mesh.c:11347: Test failed: Got unexpected value 1431655765.
=== debian9 (32 bit Japanese:Japan report) ===
d3dx9_36: mesh.c:11346: Test failed: Got unexpected value 0x80004001. mesh.c:11347: Test failed: Got unexpected value 1431655765.
=== debian9 (32 bit Chinese:China report) ===
d3dx9_36: mesh.c:11346: Test failed: Got unexpected value 0x80004001. mesh.c:11347: Test failed: Got unexpected value 1431655765.
=== debian9 (32 bit WoW report) ===
d3dx9_36: mesh.c:11346: Test failed: Got unexpected value 0x80004001. mesh.c:11347: Test failed: Got unexpected value 1431655765.
=== debian9 (64 bit WoW report) ===
d3dx9_36: mesh.c:11346: Test failed: Got unexpected value 0x80004001. mesh.c:11347: Test failed: Got unexpected value 1431655765.
-
Marvin -
Vijay Kiran Kamuju