From: Andrey Gusev Subject: d3dx9: Add D3DXFrameFind stub. Message-Id: Date: Fri, 12 Aug 2016 13:00:42 +0300 From e0b7ba6aa4f353c5c61940d444ee2901c30892eb Mon Sep 17 00:00:00 2001 Message-Id: From: Andrey Gusev Date: Fri, 12 Aug 2016 12:59:30 +0300 Subject: [PATCH] d3dx9: Add D3DXFrameFind stub. Signed-off-by: Andrey Gusev --- dlls/d3dx9_24/d3dx9_24.spec | 2 +- dlls/d3dx9_25/d3dx9_25.spec | 2 +- dlls/d3dx9_26/d3dx9_26.spec | 2 +- dlls/d3dx9_27/d3dx9_27.spec | 2 +- dlls/d3dx9_28/d3dx9_28.spec | 2 +- dlls/d3dx9_29/d3dx9_29.spec | 2 +- dlls/d3dx9_30/d3dx9_30.spec | 2 +- dlls/d3dx9_31/d3dx9_31.spec | 2 +- dlls/d3dx9_32/d3dx9_32.spec | 2 +- dlls/d3dx9_33/d3dx9_33.spec | 2 +- dlls/d3dx9_34/d3dx9_34.spec | 2 +- dlls/d3dx9_35/d3dx9_35.spec | 2 +- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/mesh.c | 7 +++++++ dlls/d3dx9_37/d3dx9_37.spec | 2 +- dlls/d3dx9_38/d3dx9_38.spec | 2 +- dlls/d3dx9_39/d3dx9_39.spec | 2 +- dlls/d3dx9_40/d3dx9_40.spec | 2 +- dlls/d3dx9_41/d3dx9_41.spec | 2 +- dlls/d3dx9_42/d3dx9_42.spec | 2 +- dlls/d3dx9_43/d3dx9_43.spec | 2 +- include/d3dx9anim.h | 2 +- 22 files changed, 28 insertions(+), 21 deletions(-) diff --git a/dlls/d3dx9_24/d3dx9_24.spec b/dlls/d3dx9_24/d3dx9_24.spec index ff372a1..b3706fe 100644 --- a/dlls/d3dx9_24/d3dx9_24.spec +++ b/dlls/d3dx9_24/d3dx9_24.spec @@ -131,7 +131,7 @@ @ stub D3DXFrameAppendChild(ptr ptr) @ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) @ stdcall D3DXFrameDestroy(ptr ptr) -@ stub D3DXFrameFind(ptr str) +@ stdcall D3DXFrameFind(ptr str) @ stub D3DXFrameNumNamedMatrices(ptr) @ stub D3DXFrameRegisterNamedMatrices(ptr ptr) @ stdcall D3DXFresnelTerm(float float) diff --git a/dlls/d3dx9_25/d3dx9_25.spec b/dlls/d3dx9_25/d3dx9_25.spec index cc1cd11..5767914 100644 --- a/dlls/d3dx9_25/d3dx9_25.spec +++ b/dlls/d3dx9_25/d3dx9_25.spec @@ -131,7 +131,7 @@ @ stub D3DXFrameAppendChild(ptr ptr) @ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) @ stdcall D3DXFrameDestroy(ptr ptr) -@ stub D3DXFrameFind(ptr str) +@ stdcall D3DXFrameFind(ptr str) @ stub D3DXFrameNumNamedMatrices(ptr) @ stub D3DXFrameRegisterNamedMatrices(ptr ptr) @ stdcall D3DXFresnelTerm(float float) diff --git a/dlls/d3dx9_26/d3dx9_26.spec b/dlls/d3dx9_26/d3dx9_26.spec index ab09fa9..a24298e 100644 --- a/dlls/d3dx9_26/d3dx9_26.spec +++ b/dlls/d3dx9_26/d3dx9_26.spec @@ -135,7 +135,7 @@ @ stub D3DXFrameAppendChild(ptr ptr) @ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) @ stdcall D3DXFrameDestroy(ptr ptr) -@ stub D3DXFrameFind(ptr str) +@ stdcall D3DXFrameFind(ptr str) @ stub D3DXFrameNumNamedMatrices(ptr) @ stub D3DXFrameRegisterNamedMatrices(ptr ptr) @ stdcall D3DXFresnelTerm(float float) diff --git a/dlls/d3dx9_27/d3dx9_27.spec b/dlls/d3dx9_27/d3dx9_27.spec index ab09fa9..a24298e 100644 --- a/dlls/d3dx9_27/d3dx9_27.spec +++ b/dlls/d3dx9_27/d3dx9_27.spec @@ -135,7 +135,7 @@ @ stub D3DXFrameAppendChild(ptr ptr) @ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) @ stdcall D3DXFrameDestroy(ptr ptr) -@ stub D3DXFrameFind(ptr str) +@ stdcall D3DXFrameFind(ptr str) @ stub D3DXFrameNumNamedMatrices(ptr) @ stub D3DXFrameRegisterNamedMatrices(ptr ptr) @ stdcall D3DXFresnelTerm(float float) diff --git a/dlls/d3dx9_28/d3dx9_28.spec b/dlls/d3dx9_28/d3dx9_28.spec index 43e52fa..83a4eaa 100644 --- a/dlls/d3dx9_28/d3dx9_28.spec +++ b/dlls/d3dx9_28/d3dx9_28.spec @@ -135,7 +135,7 @@ @ stub D3DXFrameAppendChild(ptr ptr) @ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) @ stdcall D3DXFrameDestroy(ptr ptr) -@ stub D3DXFrameFind(ptr str) +@ stdcall D3DXFrameFind(ptr str) @ stub D3DXFrameNumNamedMatrices(ptr) @ stub D3DXFrameRegisterNamedMatrices(ptr ptr) @ stdcall D3DXFresnelTerm(float float) diff --git a/dlls/d3dx9_29/d3dx9_29.spec b/dlls/d3dx9_29/d3dx9_29.spec index 43e52fa..83a4eaa 100644 --- a/dlls/d3dx9_29/d3dx9_29.spec +++ b/dlls/d3dx9_29/d3dx9_29.spec @@ -135,7 +135,7 @@ @ stub D3DXFrameAppendChild(ptr ptr) @ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) @ stdcall D3DXFrameDestroy(ptr ptr) -@ stub D3DXFrameFind(ptr str) +@ stdcall D3DXFrameFind(ptr str) @ stub D3DXFrameNumNamedMatrices(ptr) @ stub D3DXFrameRegisterNamedMatrices(ptr ptr) @ stdcall D3DXFresnelTerm(float float) diff --git a/dlls/d3dx9_30/d3dx9_30.spec b/dlls/d3dx9_30/d3dx9_30.spec index 5bed6cd..15a281d 100644 --- a/dlls/d3dx9_30/d3dx9_30.spec +++ b/dlls/d3dx9_30/d3dx9_30.spec @@ -135,7 +135,7 @@ @ stub D3DXFrameAppendChild(ptr ptr) @ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) @ stdcall D3DXFrameDestroy(ptr ptr) -@ stub D3DXFrameFind(ptr str) +@ stdcall D3DXFrameFind(ptr str) @ stub D3DXFrameNumNamedMatrices(ptr) @ stub D3DXFrameRegisterNamedMatrices(ptr ptr) @ stdcall D3DXFresnelTerm(float float) diff --git a/dlls/d3dx9_31/d3dx9_31.spec b/dlls/d3dx9_31/d3dx9_31.spec index 02e40cb..108d44f 100644 --- a/dlls/d3dx9_31/d3dx9_31.spec +++ b/dlls/d3dx9_31/d3dx9_31.spec @@ -134,7 +134,7 @@ @ stub D3DXFrameAppendChild(ptr ptr) @ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) @ stdcall D3DXFrameDestroy(ptr ptr) -@ stub D3DXFrameFind(ptr str) +@ stdcall D3DXFrameFind(ptr str) @ stub D3DXFrameNumNamedMatrices(ptr) @ stub D3DXFrameRegisterNamedMatrices(ptr ptr) @ stdcall D3DXFresnelTerm(float float) diff --git a/dlls/d3dx9_32/d3dx9_32.spec b/dlls/d3dx9_32/d3dx9_32.spec index 81d20d5..c98ebed 100644 --- a/dlls/d3dx9_32/d3dx9_32.spec +++ b/dlls/d3dx9_32/d3dx9_32.spec @@ -134,7 +134,7 @@ @ stub D3DXFrameAppendChild(ptr ptr) @ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) @ stdcall D3DXFrameDestroy(ptr ptr) -@ stub D3DXFrameFind(ptr str) +@ stdcall D3DXFrameFind(ptr str) @ stub D3DXFrameNumNamedMatrices(ptr) @ stub D3DXFrameRegisterNamedMatrices(ptr ptr) @ stdcall D3DXFresnelTerm(float float) diff --git a/dlls/d3dx9_33/d3dx9_33.spec b/dlls/d3dx9_33/d3dx9_33.spec index 81d20d5..c98ebed 100644 --- a/dlls/d3dx9_33/d3dx9_33.spec +++ b/dlls/d3dx9_33/d3dx9_33.spec @@ -134,7 +134,7 @@ @ stub D3DXFrameAppendChild(ptr ptr) @ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) @ stdcall D3DXFrameDestroy(ptr ptr) -@ stub D3DXFrameFind(ptr str) +@ stdcall D3DXFrameFind(ptr str) @ stub D3DXFrameNumNamedMatrices(ptr) @ stub D3DXFrameRegisterNamedMatrices(ptr ptr) @ stdcall D3DXFresnelTerm(float float) diff --git a/dlls/d3dx9_34/d3dx9_34.spec b/dlls/d3dx9_34/d3dx9_34.spec index 81d20d5..c98ebed 100644 --- a/dlls/d3dx9_34/d3dx9_34.spec +++ b/dlls/d3dx9_34/d3dx9_34.spec @@ -134,7 +134,7 @@ @ stub D3DXFrameAppendChild(ptr ptr) @ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) @ stdcall D3DXFrameDestroy(ptr ptr) -@ stub D3DXFrameFind(ptr str) +@ stdcall D3DXFrameFind(ptr str) @ stub D3DXFrameNumNamedMatrices(ptr) @ stub D3DXFrameRegisterNamedMatrices(ptr ptr) @ stdcall D3DXFresnelTerm(float float) diff --git a/dlls/d3dx9_35/d3dx9_35.spec b/dlls/d3dx9_35/d3dx9_35.spec index 81d20d5..c98ebed 100644 --- a/dlls/d3dx9_35/d3dx9_35.spec +++ b/dlls/d3dx9_35/d3dx9_35.spec @@ -134,7 +134,7 @@ @ stub D3DXFrameAppendChild(ptr ptr) @ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) @ stdcall D3DXFrameDestroy(ptr ptr) -@ stub D3DXFrameFind(ptr str) +@ stdcall D3DXFrameFind(ptr str) @ stub D3DXFrameNumNamedMatrices(ptr) @ stub D3DXFrameRegisterNamedMatrices(ptr ptr) @ stdcall D3DXFresnelTerm(float float) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 58f456a..61fe68d 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -135,7 +135,7 @@ @ stub D3DXFrameAppendChild(ptr ptr) @ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) @ stdcall D3DXFrameDestroy(ptr ptr) -@ stub D3DXFrameFind(ptr str) +@ stdcall D3DXFrameFind(ptr str) @ stub D3DXFrameNumNamedMatrices(ptr) @ stub D3DXFrameRegisterNamedMatrices(ptr ptr) @ stdcall D3DXFresnelTerm(float float) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index c26aa72..d034b23 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -4046,6 +4046,13 @@ HRESULT WINAPI D3DXFrameDestroy(D3DXFRAME *frame, ID3DXAllocateHierarchy *alloc_ return D3D_OK; } +D3DXFRAME * WINAPI D3DXFrameFind(const D3DXFRAME *frame_root, const char *name) +{ + FIXME("frame_root %p, name %s stub!\n", frame_root, debugstr_a(name)); + + return NULL; +} + HRESULT WINAPI D3DXLoadMeshFromXA(const char *filename, DWORD options, struct IDirect3DDevice9 *device, struct ID3DXBuffer **adjacency, struct ID3DXBuffer **materials, struct ID3DXBuffer **effect_instances, DWORD *num_materials, struct ID3DXMesh **mesh) diff --git a/dlls/d3dx9_37/d3dx9_37.spec b/dlls/d3dx9_37/d3dx9_37.spec index 58f456a..61fe68d 100644 --- a/dlls/d3dx9_37/d3dx9_37.spec +++ b/dlls/d3dx9_37/d3dx9_37.spec @@ -135,7 +135,7 @@ @ stub D3DXFrameAppendChild(ptr ptr) @ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) @ stdcall D3DXFrameDestroy(ptr ptr) -@ stub D3DXFrameFind(ptr str) +@ stdcall D3DXFrameFind(ptr str) @ stub D3DXFrameNumNamedMatrices(ptr) @ stub D3DXFrameRegisterNamedMatrices(ptr ptr) @ stdcall D3DXFresnelTerm(float float) diff --git a/dlls/d3dx9_38/d3dx9_38.spec b/dlls/d3dx9_38/d3dx9_38.spec index 58f456a..61fe68d 100644 --- a/dlls/d3dx9_38/d3dx9_38.spec +++ b/dlls/d3dx9_38/d3dx9_38.spec @@ -135,7 +135,7 @@ @ stub D3DXFrameAppendChild(ptr ptr) @ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) @ stdcall D3DXFrameDestroy(ptr ptr) -@ stub D3DXFrameFind(ptr str) +@ stdcall D3DXFrameFind(ptr str) @ stub D3DXFrameNumNamedMatrices(ptr) @ stub D3DXFrameRegisterNamedMatrices(ptr ptr) @ stdcall D3DXFresnelTerm(float float) diff --git a/dlls/d3dx9_39/d3dx9_39.spec b/dlls/d3dx9_39/d3dx9_39.spec index 58f456a..61fe68d 100644 --- a/dlls/d3dx9_39/d3dx9_39.spec +++ b/dlls/d3dx9_39/d3dx9_39.spec @@ -135,7 +135,7 @@ @ stub D3DXFrameAppendChild(ptr ptr) @ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) @ stdcall D3DXFrameDestroy(ptr ptr) -@ stub D3DXFrameFind(ptr str) +@ stdcall D3DXFrameFind(ptr str) @ stub D3DXFrameNumNamedMatrices(ptr) @ stub D3DXFrameRegisterNamedMatrices(ptr ptr) @ stdcall D3DXFresnelTerm(float float) diff --git a/dlls/d3dx9_40/d3dx9_40.spec b/dlls/d3dx9_40/d3dx9_40.spec index 58f456a..61fe68d 100644 --- a/dlls/d3dx9_40/d3dx9_40.spec +++ b/dlls/d3dx9_40/d3dx9_40.spec @@ -135,7 +135,7 @@ @ stub D3DXFrameAppendChild(ptr ptr) @ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) @ stdcall D3DXFrameDestroy(ptr ptr) -@ stub D3DXFrameFind(ptr str) +@ stdcall D3DXFrameFind(ptr str) @ stub D3DXFrameNumNamedMatrices(ptr) @ stub D3DXFrameRegisterNamedMatrices(ptr ptr) @ stdcall D3DXFresnelTerm(float float) diff --git a/dlls/d3dx9_41/d3dx9_41.spec b/dlls/d3dx9_41/d3dx9_41.spec index 58f456a..61fe68d 100644 --- a/dlls/d3dx9_41/d3dx9_41.spec +++ b/dlls/d3dx9_41/d3dx9_41.spec @@ -135,7 +135,7 @@ @ stub D3DXFrameAppendChild(ptr ptr) @ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) @ stdcall D3DXFrameDestroy(ptr ptr) -@ stub D3DXFrameFind(ptr str) +@ stdcall D3DXFrameFind(ptr str) @ stub D3DXFrameNumNamedMatrices(ptr) @ stub D3DXFrameRegisterNamedMatrices(ptr ptr) @ stdcall D3DXFresnelTerm(float float) diff --git a/dlls/d3dx9_42/d3dx9_42.spec b/dlls/d3dx9_42/d3dx9_42.spec index 4e18a63..4cbe6bb 100644 --- a/dlls/d3dx9_42/d3dx9_42.spec +++ b/dlls/d3dx9_42/d3dx9_42.spec @@ -133,7 +133,7 @@ @ stub D3DXFrameAppendChild(ptr ptr) @ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) @ stdcall D3DXFrameDestroy(ptr ptr) -@ stub D3DXFrameFind(ptr str) +@ stdcall D3DXFrameFind(ptr str) @ stub D3DXFrameNumNamedMatrices(ptr) @ stub D3DXFrameRegisterNamedMatrices(ptr ptr) @ stdcall D3DXFresnelTerm(float float) diff --git a/dlls/d3dx9_43/d3dx9_43.spec b/dlls/d3dx9_43/d3dx9_43.spec index 4e18a63..4cbe6bb 100644 --- a/dlls/d3dx9_43/d3dx9_43.spec +++ b/dlls/d3dx9_43/d3dx9_43.spec @@ -133,7 +133,7 @@ @ stub D3DXFrameAppendChild(ptr ptr) @ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr) @ stdcall D3DXFrameDestroy(ptr ptr) -@ stub D3DXFrameFind(ptr str) +@ stdcall D3DXFrameFind(ptr str) @ stub D3DXFrameNumNamedMatrices(ptr) @ stub D3DXFrameRegisterNamedMatrices(ptr ptr) @ stdcall D3DXFresnelTerm(float float) diff --git a/include/d3dx9anim.h b/include/d3dx9anim.h index 81b8e2f..3ec93f9 100644 --- a/include/d3dx9anim.h +++ b/include/d3dx9anim.h @@ -387,7 +387,7 @@ HRESULT WINAPI D3DXSaveMeshHierarchyToFileW(const WCHAR *filename, DWORD format, #define D3DXSaveMeshHierarchyToFile WINELIB_NAME_AW(D3DXSaveMeshHierarchyToFile) HRESULT WINAPI D3DXFrameDestroy(D3DXFRAME *frame_root, ID3DXAllocateHierarchy *alloc); HRESULT WINAPI D3DXFrameAppendChild(D3DXFRAME *parent, const D3DXFRAME *child); -D3DXFRAME * WINAPI D3DXFrameFind(const D3DXFRAME *root, const char *name); +D3DXFRAME * WINAPI D3DXFrameFind(const D3DXFRAME *frame_root, const char *name); HRESULT WINAPI D3DXFrameRegisterNamedMatrices(D3DXFRAME *frame_root, ID3DXAnimationController *animation_controller); UINT WINAPI D3DXFrameNumNamedMatrices(const D3DXFRAME *frame_root); HRESULT WINAPI D3DXFrameCalculateBoundingSphere(const D3DXFRAME *frame_root, D3DXVECTOR3 *center, -- 2.7.4