[ros-diffs] [reactos] 68/74: [WINESYNC] d3dx9_36: Return dummy skininfo interface in D3DXLoadSkinMeshFromXof when skin information is unavailable.

[winesync]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7b8f79e55048965285764…

commit 7b8f79e550489652857649708e0fedef9f257c41
Author:     winesync <ros-dev(a)reactos.org>
AuthorDate: Wed Feb 5 22:13:55 2020 +0100
Commit:     Jérôme Gardou <zefklop(a)users.noreply.github.com>
CommitDate: Wed Feb 26 18:19:18 2020 +0100

    [WINESYNC] d3dx9_36: Return dummy skininfo interface in D3DXLoadSkinMeshFromXof when
skin information is unavailable.
    
    wine-staging patch by Michael Müller <michael(a)fds-team.de>
---
 dll/directx/wine/d3dx9_36/d3dx9_private.h          |  2 +
 dll/directx/wine/d3dx9_36/mesh.c                   |  7 +++
 dll/directx/wine/d3dx9_36/skin.c                   | 22 +++++++-
 ...omXof_when_skin_information_is_unavailable.diff | 66 ++++++++++++++++++++++
 4 files changed, 96 insertions(+), 1 deletion(-)

diff --git a/dll/directx/wine/d3dx9_36/d3dx9_private.h
b/dll/directx/wine/d3dx9_36/d3dx9_private.h
index 5fc7f506760..4f0899f82f1 100644
--- a/dll/directx/wine/d3dx9_36/d3dx9_private.h
+++ b/dll/directx/wine/d3dx9_36/d3dx9_private.h
@@ -410,4 +410,6 @@ struct ctab_constant {
 const struct ctab_constant *d3dx_shader_get_ctab_constant(ID3DXConstantTable *iface,
         D3DXHANDLE constant) DECLSPEC_HIDDEN;
 
+HRESULT create_dummy_skin(ID3DXSkinInfo **iface) DECLSPEC_HIDDEN;
+
 #endif /* __WINE_D3DX9_PRIVATE_H */
diff --git a/dll/directx/wine/d3dx9_36/mesh.c b/dll/directx/wine/d3dx9_36/mesh.c
index 2a9ee0627c0..898a88c1131 100644
--- a/dll/directx/wine/d3dx9_36/mesh.c
+++ b/dll/directx/wine/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 = create_dummy_skin(&mesh_data->skin_info);
+        if (FAILED(hr))
+            goto end;
+    }
+
     hr = D3D_OK;
 
 end:
diff --git a/dll/directx/wine/d3dx9_36/skin.c b/dll/directx/wine/d3dx9_36/skin.c
index f197d33582a..bed4b9f49d2 100644
--- a/dll/directx/wine/d3dx9_36/skin.c
+++ b/dll/directx/wine/d3dx9_36/skin.c
@@ -94,7 +94,7 @@ static ULONG WINAPI d3dx9_skin_info_Release(ID3DXSkinInfo *iface)
             HeapFree(GetProcessHeap(), 0, skin->bones[i].vertices);
             HeapFree(GetProcessHeap(), 0, skin->bones[i].weights);
         }
-        HeapFree(GetProcessHeap(), 0, skin->bones);
+        if (skin->bones) HeapFree(GetProcessHeap(), 0, skin->bones);
         HeapFree(GetProcessHeap(), 0, skin);
     }
 
@@ -495,3 +495,23 @@ HRESULT WINAPI D3DXCreateSkinInfoFVF(DWORD num_vertices, DWORD fvf,
DWORD num_bo
 
     return D3DXCreateSkinInfo(num_vertices, declaration, num_bones, skin_info);
 }
+
+HRESULT create_dummy_skin(ID3DXSkinInfo **iface)
+{
+    static const D3DVERTEXELEMENT9 empty_declaration = D3DDECL_END();
+    struct d3dx9_skin_info *object = NULL;
+
+    object = HeapAlloc(GetProcessHeap(), 0, sizeof(*object));
+    if (!object) return E_OUTOFMEMORY;
+
+    object->ID3DXSkinInfo_iface.lpVtbl = &d3dx9_skin_info_vtbl;
+    object->ref = 1;
+    object->num_vertices = 0;
+    object->num_bones = 0;
+    object->vertex_declaration[0] = empty_declaration;
+    object->fvf = 0;
+    object->bones = NULL;
+
+    *iface = &object->ID3DXSkinInfo_iface;
+    return D3D_OK;
+}
diff --git
a/sdk/tools/winesync/d3dx9_staging/0019-d3dx9_36__Return_dummy_skininfo_interface_in_D3DXLoadSkinMeshFromXof_when_skin_information_is_unavailable.diff
b/sdk/tools/winesync/d3dx9_staging/0019-d3dx9_36__Return_dummy_skininfo_interface_in_D3DXLoadSkinMeshFromXof_when_skin_information_is_unavailable.diff
new file mode 100644
index 00000000000..89f8bcaf7bd
--- /dev/null
+++
b/sdk/tools/winesync/d3dx9_staging/0019-d3dx9_36__Return_dummy_skininfo_interface_in_D3DXLoadSkinMeshFromXof_when_skin_information_is_unavailable.diff
@@ -0,0 +1,66 @@
+diff --git a/dll/directx/wine/d3dx9_36/d3dx9_private.h
b/dll/directx/wine/d3dx9_36/d3dx9_private.h
+index 158aae3..7a3d1cb 100644
+--- a/dll/directx/wine/d3dx9_36/d3dx9_private.h
++++ b/dll/directx/wine/d3dx9_36/d3dx9_private.h
+@@ -404,4 +404,6 @@ struct ctab_constant {
+ const struct ctab_constant *d3dx_shader_get_ctab_constant(ID3DXConstantTable *iface,
+         D3DXHANDLE constant) DECLSPEC_HIDDEN;
+ 
++HRESULT create_dummy_skin(ID3DXSkinInfo **iface) DECLSPEC_HIDDEN;
++
+ #endif /* __WINE_D3DX9_PRIVATE_H */
+diff --git a/dll/directx/wine/d3dx9_36/mesh.c b/dll/directx/wine/d3dx9_36/mesh.c
+index 2a9ee06..898a88c 100644
+--- a/dll/directx/wine/d3dx9_36/mesh.c
++++ b/dll/directx/wine/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 = create_dummy_skin(&mesh_data->skin_info);
++        if (FAILED(hr))
++            goto end;
++    }
++
+     hr = D3D_OK;
+ 
+ end:
+diff --git a/dll/directx/wine/d3dx9_36/skin.c b/dll/directx/wine/d3dx9_36/skin.c
+index f197d33..bed4b9f 100644
+--- a/dll/directx/wine/d3dx9_36/skin.c
++++ b/dll/directx/wine/d3dx9_36/skin.c
+@@ -94,7 +94,7 @@ static ULONG WINAPI d3dx9_skin_info_Release(ID3DXSkinInfo *iface)
+             HeapFree(GetProcessHeap(), 0, skin->bones[i].vertices);
+             HeapFree(GetProcessHeap(), 0, skin->bones[i].weights);
+         }
+-        HeapFree(GetProcessHeap(), 0, skin->bones);
++        if (skin->bones) HeapFree(GetProcessHeap(), 0, skin->bones);
+         HeapFree(GetProcessHeap(), 0, skin);
+     }
+ 
+@@ -495,3 +495,23 @@ HRESULT WINAPI D3DXCreateSkinInfoFVF(DWORD num_vertices, DWORD fvf,
DWORD num_bo
+ 
+     return D3DXCreateSkinInfo(num_vertices, declaration, num_bones, skin_info);
+ }
++
++HRESULT create_dummy_skin(ID3DXSkinInfo **iface)
++{
++    static const D3DVERTEXELEMENT9 empty_declaration = D3DDECL_END();
++    struct d3dx9_skin_info *object = NULL;
++
++    object = HeapAlloc(GetProcessHeap(), 0, sizeof(*object));
++    if (!object) return E_OUTOFMEMORY;
++
++    object->ID3DXSkinInfo_iface.lpVtbl = &d3dx9_skin_info_vtbl;
++    object->ref = 1;
++    object->num_vertices = 0;
++    object->num_bones = 0;
++    object->vertex_declaration[0] = empty_declaration;
++    object->fvf = 0;
++    object->bones = NULL;
++
++    *iface = &object->ID3DXSkinInfo_iface;
++    return D3D_OK;
++}