Skip to content

W
wine-cw
Commit 9e3ef4ab authored by Stefan Dösinger's avatar Stefan Dösinger Committed by Alexandre Julliard
Browse files
Options

d3dx9_36/tests: Fix calling convention specification.

Msvc wants __stdcall after the type, otherwise it generates an error.
parent aa2baf8c
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
dlls/d3dx9_36/tests/mesh.c
View file @ 9e3ef4ab
...@@ -1785,7 +1785,7 @@ static char *strdupA(const char *p) ...@@ -1785,7 +1785,7 @@ static char *strdupA(const char *p)
return ret; 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); TRACECALLBACK("ID3DXAllocateHierarchyImpl_DestroyFrame(%p, %p)\n", iface, frame);
if (frame) { if (frame) {
...@@ -1795,7 +1795,7 @@ static CALLBACK HRESULT ID3DXAllocateHierarchyImpl_DestroyFrame(ID3DXAllocateHie ...@@ -1795,7 +1795,7 @@ static CALLBACK HRESULT ID3DXAllocateHierarchyImpl_DestroyFrame(ID3DXAllocateHie
return D3D_OK; return D3D_OK;
} }
static CALLBACK HRESULT ID3DXAllocateHierarchyImpl_CreateFrame(ID3DXAllocateHierarchy *iface, static HRESULT CALLBACK ID3DXAllocateHierarchyImpl_CreateFrame(ID3DXAllocateHierarchy *iface,
const char *name, D3DXFRAME **new_frame) const char *name, D3DXFRAME **new_frame)
{ {
D3DXFRAME *frame; D3DXFRAME *frame;
...@@ -1850,13 +1850,13 @@ static HRESULT destroy_mesh_container(LPD3DXMESHCONTAINER mesh_container) ...@@ -1850,13 +1850,13 @@ static HRESULT destroy_mesh_container(LPD3DXMESHCONTAINER mesh_container)
return D3D_OK; 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); TRACECALLBACK("ID3DXAllocateHierarchyImpl_DestroyMeshContainer(%p, %p)\n", iface, mesh_container);
return destroy_mesh_container(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 char *name, const D3DXMESHDATA *mesh_data, const D3DXMATERIAL *materials,
const D3DXEFFECTINSTANCE *effects, DWORD num_materials, const DWORD *adjacency, const D3DXEFFECTINSTANCE *effects, DWORD num_materials, const DWORD *adjacency,
ID3DXSkinInfo *skin_info, D3DXMESHCONTAINER **new_mesh_container) ID3DXSkinInfo *skin_info, D3DXMESHCONTAINER **new_mesh_container)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment