[PATCH 4/5] d3dx9_36/tests: Fix calling convention specification.
Stefan Dösinger
stefan at codeweavers.com
Thu Jan 2 08:23:52 CST 2014
Msvc wants __stdcall after the type, otherwise it generates an error.
---
dlls/d3dx9_36/tests/mesh.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c
index c700e43..3a876e5 100644
--- a/dlls/d3dx9_36/tests/mesh.c
+++ b/dlls/d3dx9_36/tests/mesh.c
@@ -1785,7 +1785,7 @@ static char *strdupA(const char *p)
return ret;
}
-static CALLBACK HRESULT ID3DXAllocateHierarchyImpl_DestroyFrame(ID3DXAllocateHierarchy *iface, LPD3DXFRAME frame)
+static HRESULT CALLBACK ID3DXAllocateHierarchyImpl_DestroyFrame(ID3DXAllocateHierarchy *iface, LPD3DXFRAME frame)
{
TRACECALLBACK("ID3DXAllocateHierarchyImpl_DestroyFrame(%p, %p)\n", iface, frame);
if (frame) {
@@ -1795,7 +1795,7 @@ static CALLBACK HRESULT ID3DXAllocateHierarchyImpl_DestroyFrame(ID3DXAllocateHie
return D3D_OK;
}
-static CALLBACK HRESULT ID3DXAllocateHierarchyImpl_CreateFrame(ID3DXAllocateHierarchy *iface,
+static HRESULT CALLBACK ID3DXAllocateHierarchyImpl_CreateFrame(ID3DXAllocateHierarchy *iface,
const char *name, D3DXFRAME **new_frame)
{
D3DXFRAME *frame;
@@ -1850,13 +1850,13 @@ static HRESULT destroy_mesh_container(LPD3DXMESHCONTAINER mesh_container)
return D3D_OK;
}
-static CALLBACK HRESULT ID3DXAllocateHierarchyImpl_DestroyMeshContainer(ID3DXAllocateHierarchy *iface, LPD3DXMESHCONTAINER mesh_container)
+static HRESULT CALLBACK ID3DXAllocateHierarchyImpl_DestroyMeshContainer(ID3DXAllocateHierarchy *iface, LPD3DXMESHCONTAINER mesh_container)
{
TRACECALLBACK("ID3DXAllocateHierarchyImpl_DestroyMeshContainer(%p, %p)\n", iface, mesh_container);
return destroy_mesh_container(mesh_container);
}
-static CALLBACK HRESULT ID3DXAllocateHierarchyImpl_CreateMeshContainer(ID3DXAllocateHierarchy *iface,
+static HRESULT CALLBACK ID3DXAllocateHierarchyImpl_CreateMeshContainer(ID3DXAllocateHierarchy *iface,
const char *name, const D3DXMESHDATA *mesh_data, const D3DXMATERIAL *materials,
const D3DXEFFECTINSTANCE *effects, DWORD num_materials, const DWORD *adjacency,
ID3DXSkinInfo *skin_info, D3DXMESHCONTAINER **new_mesh_container)
--
1.8.3.2
More information about the wine-patches
mailing list