Module: wine Branch: master Commit: a919735870c38f2c18748427394a593c60ee18e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a919735870c38f2c1874842739...
Author: Alexandre Julliard julliard@winehq.org Date: Fri Aug 27 13:53:17 2010 +0200
include: Specify calling convention explicitly in idl files where needed.
---
include/dxgi.idl | 2 +- include/wine/wined3d.idl | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/include/dxgi.idl b/include/dxgi.idl index b67674e..8a7b092 100644 --- a/include/dxgi.idl +++ b/include/dxgi.idl @@ -329,7 +329,7 @@ interface IDXGIFactory : IDXGIObject ); }
-[local] HRESULT CreateDXGIFactory(REFIID riid, void **factory); +[local] HRESULT __stdcall CreateDXGIFactory(REFIID riid, void **factory);
[ object, diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index b6e73ec..62810db 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2107,7 +2107,7 @@ struct wined3d_shader_signature
struct wined3d_parent_ops { - void (*wined3d_object_destroyed)(void *parent); + void (__stdcall *wined3d_object_destroyed)(void *parent); };
interface IWineD3DResource; @@ -2177,8 +2177,8 @@ interface IWineD3DDeviceParent : IUnknown [out] IWineD3DSwapChain **swapchain ); } -typedef ULONG (*D3DCB_DESTROYSWAPCHAINFN)(IWineD3DSwapChain *pSwapChain); -typedef HRESULT (*D3DCB_ENUMRESOURCES)(IWineD3DResource *resource, void *pData); +typedef ULONG (__stdcall *D3DCB_DESTROYSWAPCHAINFN)(IWineD3DSwapChain *pSwapChain); +typedef HRESULT (__stdcall *D3DCB_ENUMRESOURCES)(IWineD3DResource *resource, void *pData);
[ object, @@ -3399,7 +3399,7 @@ interface IWineD3DDevice : IWineD3DBase ); }
-IWineD3D *WineDirect3DCreate(UINT dxVersion, IUnknown *parent); -IWineD3DClipper *WineDirect3DCreateClipper(IUnknown *parent); -void wined3d_mutex_lock(void); -void wined3d_mutex_unlock(void); +IWineD3D * __stdcall WineDirect3DCreate(UINT dxVersion, IUnknown *parent); +IWineD3DClipper * __stdcall WineDirect3DCreateClipper(IUnknown *parent); +void __stdcall wined3d_mutex_lock(void); +void __stdcall wined3d_mutex_unlock(void);