Commit 81de7e15 authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard

include: Avoid using CONST in the d3dx9 headers.

parent e22d33e6
...@@ -386,11 +386,12 @@ HRESULT WINAPI D3DXSaveMeshHierarchyToFileW(const WCHAR *filename, DWORD format, ...@@ -386,11 +386,12 @@ HRESULT WINAPI D3DXSaveMeshHierarchyToFileW(const WCHAR *filename, DWORD format,
ID3DXSaveUserData *user_data_saver); ID3DXSaveUserData *user_data_saver);
#define D3DXSaveMeshHierarchyToFile WINELIB_NAME_AW(D3DXSaveMeshHierarchyToFile) #define D3DXSaveMeshHierarchyToFile WINELIB_NAME_AW(D3DXSaveMeshHierarchyToFile)
HRESULT WINAPI D3DXFrameDestroy(D3DXFRAME *frame_root, ID3DXAllocateHierarchy *alloc); HRESULT WINAPI D3DXFrameDestroy(D3DXFRAME *frame_root, ID3DXAllocateHierarchy *alloc);
HRESULT WINAPI D3DXFrameAppendChild(LPD3DXFRAME, CONST D3DXFRAME*); HRESULT WINAPI D3DXFrameAppendChild(D3DXFRAME *parent, const D3DXFRAME *child);
D3DXFRAME * WINAPI D3DXFrameFind(const D3DXFRAME *root, const char *name); D3DXFRAME * WINAPI D3DXFrameFind(const D3DXFRAME *root, const char *name);
HRESULT WINAPI D3DXFrameRegisterNamedMatrices(D3DXFRAME *frame_root, ID3DXAnimationController *animation_controller); HRESULT WINAPI D3DXFrameRegisterNamedMatrices(D3DXFRAME *frame_root, ID3DXAnimationController *animation_controller);
UINT WINAPI D3DXFrameNumNamedMatrices(CONST D3DXFRAME *frame_root); UINT WINAPI D3DXFrameNumNamedMatrices(const D3DXFRAME *frame_root);
HRESULT WINAPI D3DXFrameCalculateBoundingSphere(CONST D3DXFRAME*, LPD3DXVECTOR3, FLOAT*); HRESULT WINAPI D3DXFrameCalculateBoundingSphere(const D3DXFRAME *frame_root, D3DXVECTOR3 *center,
FLOAT *radius);
HRESULT WINAPI D3DXCreateKeyframedAnimationSet(const char *name, double ticks_per_second, HRESULT WINAPI D3DXCreateKeyframedAnimationSet(const char *name, double ticks_per_second,
D3DXPLAYBACK_TYPE playback_type, UINT animation_count, UINT callback_key_count, D3DXPLAYBACK_TYPE playback_type, UINT animation_count, UINT callback_key_count,
const D3DXKEY_CALLBACK *callback_keys, ID3DXKeyframedAnimationSet **animation_set); const D3DXKEY_CALLBACK *callback_keys, ID3DXKeyframedAnimationSet **animation_set);
......
...@@ -217,9 +217,9 @@ DECLARE_INTERFACE_(ID3DXLine, IUnknown) ...@@ -217,9 +217,9 @@ DECLARE_INTERFACE_(ID3DXLine, IUnknown)
STDMETHOD(GetDevice)(THIS_ struct IDirect3DDevice9 **device) PURE; STDMETHOD(GetDevice)(THIS_ struct IDirect3DDevice9 **device) PURE;
STDMETHOD(Begin)(THIS) PURE; STDMETHOD(Begin)(THIS) PURE;
STDMETHOD(Draw)(THIS_ CONST D3DXVECTOR2 *vertexlist, DWORD vertexlistcount, D3DCOLOR color) PURE; STDMETHOD(Draw)(THIS_ const D3DXVECTOR2 *vertexlist, DWORD vertexlistcount, D3DCOLOR color) PURE;
STDMETHOD(DrawTransform)(THIS_ CONST D3DXVECTOR3 *vertexlist, DWORD vertexlistcount, STDMETHOD(DrawTransform)(THIS_ const D3DXVECTOR3 *vertexlist, DWORD vertexlistcount,
CONST D3DXMATRIX *transform, D3DCOLOR color) PURE; const D3DXMATRIX *transform, D3DCOLOR color) PURE;
STDMETHOD(SetPattern)(THIS_ DWORD pattern) PURE; STDMETHOD(SetPattern)(THIS_ DWORD pattern) PURE;
STDMETHOD_(DWORD, GetPattern)(THIS) PURE; STDMETHOD_(DWORD, GetPattern)(THIS) PURE;
STDMETHOD(SetPatternScale)(THIS_ FLOAT scale) PURE; STDMETHOD(SetPatternScale)(THIS_ FLOAT scale) PURE;
...@@ -418,9 +418,9 @@ DECLARE_INTERFACE_(ID3DXSprite, IUnknown) ...@@ -418,9 +418,9 @@ DECLARE_INTERFACE_(ID3DXSprite, IUnknown)
STDMETHOD(GetDevice)(THIS_ struct IDirect3DDevice9 **device) PURE; STDMETHOD(GetDevice)(THIS_ struct IDirect3DDevice9 **device) PURE;
STDMETHOD(GetTransform)(THIS_ D3DXMATRIX *transform) PURE; STDMETHOD(GetTransform)(THIS_ D3DXMATRIX *transform) PURE;
STDMETHOD(SetTransform)(THIS_ CONST D3DXMATRIX *transform) PURE; STDMETHOD(SetTransform)(THIS_ const D3DXMATRIX *transform) PURE;
STDMETHOD(SetWorldViewRH)(THIS_ CONST D3DXMATRIX *world, CONST D3DXMATRIX *view) PURE; STDMETHOD(SetWorldViewRH)(THIS_ const D3DXMATRIX *world, const D3DXMATRIX *view) PURE;
STDMETHOD(SetWorldViewLH)(THIS_ CONST D3DXMATRIX *world, CONST D3DXMATRIX *view) PURE; STDMETHOD(SetWorldViewLH)(THIS_ const D3DXMATRIX *world, const D3DXMATRIX *view) PURE;
STDMETHOD(Begin)(THIS_ DWORD flags) PURE; STDMETHOD(Begin)(THIS_ DWORD flags) PURE;
STDMETHOD(Draw)(THIS_ struct IDirect3DTexture9 *texture, const RECT *rect, STDMETHOD(Draw)(THIS_ struct IDirect3DTexture9 *texture, const RECT *rect,
......
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