[PATCH 4/5] d3dx9: Avoid LPVOID.
Henri Verbeet
hverbeet at codeweavers.com
Wed Sep 4 01:56:46 CDT 2013
---
dlls/d3dx9_36/core.c | 2 +-
dlls/d3dx9_36/d3dx9_36_main.c | 2 +-
dlls/d3dx9_36/d3dx9_36_private.h | 2 +-
dlls/d3dx9_36/effect.c | 12 +++++---
dlls/d3dx9_36/line.c | 6 ++--
dlls/d3dx9_36/mesh.c | 65 ++++++++++++++++++++--------------------
dlls/d3dx9_36/shader.c | 8 ++---
dlls/d3dx9_36/tests/mesh.c | 8 ++---
dlls/d3dx9_36/tests/shader.c | 2 +-
dlls/d3dx9_36/texture.c | 9 +++---
dlls/d3dx9_36/util.c | 2 +-
include/d3dx9anim.h | 26 ++++++++--------
include/d3dx9core.h | 14 ++++-----
include/d3dx9effect.h | 16 +++++-----
include/d3dx9math.h | 2 +-
include/d3dx9mesh.h | 44 +++++++++++++--------------
include/d3dx9shader.h | 4 +--
include/d3dx9tex.h | 6 ++--
include/d3dx9xof.h | 15 +++++-----
19 files changed, 126 insertions(+), 119 deletions(-)
diff --git a/dlls/d3dx9_36/core.c b/dlls/d3dx9_36/core.c
index 961f023..53e9531 100644
--- a/dlls/d3dx9_36/core.c
+++ b/dlls/d3dx9_36/core.c
@@ -87,7 +87,7 @@ static ULONG WINAPI ID3DXBufferImpl_Release(ID3DXBuffer *iface)
return ref;
}
-static LPVOID WINAPI ID3DXBufferImpl_GetBufferPointer(ID3DXBuffer *iface)
+static void * WINAPI ID3DXBufferImpl_GetBufferPointer(ID3DXBuffer *iface)
{
struct ID3DXBufferImpl *This = impl_from_ID3DXBuffer(iface);
diff --git a/dlls/d3dx9_36/d3dx9_36_main.c b/dlls/d3dx9_36/d3dx9_36_main.c
index 31f720a..4a94b28 100644
--- a/dlls/d3dx9_36/d3dx9_36_main.c
+++ b/dlls/d3dx9_36/d3dx9_36_main.c
@@ -36,7 +36,7 @@
/***********************************************************************
* DllMain.
*/
-BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved)
+BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved)
{
switch(reason)
{
diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h
index 88db3ff..83d4de9 100644
--- a/dlls/d3dx9_36/d3dx9_36_private.h
+++ b/dlls/d3dx9_36/d3dx9_36_private.h
@@ -68,7 +68,7 @@ struct pixel_format_desc {
};
HRESULT map_view_of_file(const WCHAR *filename, void **buffer, DWORD *length) DECLSPEC_HIDDEN;
-HRESULT load_resource_into_memory(HMODULE module, HRSRC resinfo, LPVOID *buffer, DWORD *length) DECLSPEC_HIDDEN;
+HRESULT load_resource_into_memory(HMODULE module, HRSRC resinfo, void **buffer, DWORD *length) DECLSPEC_HIDDEN;
HRESULT write_buffer_to_file(const WCHAR *filename, ID3DXBuffer *buffer) DECLSPEC_HIDDEN;
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index ce67771..4a3f3b0 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -5507,11 +5507,14 @@ HRESULT WINAPI D3DXCreateEffectFromFileExW(struct IDirect3DDevice9 *device, cons
const D3DXMACRO *defines, struct ID3DXInclude *include, const char *skipconstants, DWORD flags,
struct ID3DXEffectPool *pool, struct ID3DXEffect **effect, struct ID3DXBuffer **compilationerrors)
{
- LPVOID buffer;
+ void *buffer;
HRESULT ret;
DWORD size;
- TRACE("(%s): relay\n", debugstr_w(srcfile));
+ TRACE("device %p, srcfile %s, defines %p, include %p, skipconstants %s, "
+ "flags %#x, pool %p, effect %p, compilationerrors %p.\n",
+ device, debugstr_w(srcfile), defines, include, debugstr_a(skipconstants),
+ flags, pool, effect, compilationerrors);
if (!device || !srcfile)
return D3DERR_INVALIDCALL;
@@ -5640,11 +5643,12 @@ HRESULT WINAPI D3DXCreateEffectFromResourceA(struct IDirect3DDevice9 *device, HM
HRESULT WINAPI D3DXCreateEffectCompilerFromFileW(const WCHAR *srcfile, const D3DXMACRO *defines,
ID3DXInclude *include, DWORD flags, ID3DXEffectCompiler **effectcompiler, ID3DXBuffer **parseerrors)
{
- LPVOID buffer;
+ void *buffer;
HRESULT ret;
DWORD size;
- TRACE("(%s): relay\n", debugstr_w(srcfile));
+ TRACE("srcfile %s, defines %p, include %p, flags %#x, effectcompiler %p, parseerrors %p.\n",
+ debugstr_w(srcfile), defines, include, flags, effectcompiler, parseerrors);
if (!srcfile)
return D3DERR_INVALIDCALL;
diff --git a/dlls/d3dx9_36/line.c b/dlls/d3dx9_36/line.c
index a9f53a7..4b2e514 100644
--- a/dlls/d3dx9_36/line.c
+++ b/dlls/d3dx9_36/line.c
@@ -36,15 +36,15 @@ static inline ID3DXLineImpl *impl_from_ID3DXLine(ID3DXLine *iface)
}
/*** IUnknown methods ***/
-static HRESULT WINAPI ID3DXLineImpl_QueryInterface(ID3DXLine* iface, REFIID riid, LPVOID* object)
+static HRESULT WINAPI ID3DXLineImpl_QueryInterface(ID3DXLine *iface, REFIID riid, void **out)
{
- TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), object);
+ TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out);
if (IsEqualGUID(riid, &IID_IUnknown) ||
IsEqualGUID(riid, &IID_ID3DXLine))
{
ID3DXLine_AddRef(iface);
- *object = iface;
+ *out = iface;
return S_OK;
}
diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c
index b49e894..34274d8 100644
--- a/dlls/d3dx9_36/mesh.c
+++ b/dlls/d3dx9_36/mesh.c
@@ -95,16 +95,16 @@ static inline ID3DXMeshImpl *impl_from_ID3DXMesh(ID3DXMesh *iface)
return CONTAINING_RECORD(iface, ID3DXMeshImpl, ID3DXMesh_iface);
}
-static HRESULT WINAPI ID3DXMeshImpl_QueryInterface(ID3DXMesh *iface, REFIID riid, LPVOID *object)
+static HRESULT WINAPI ID3DXMeshImpl_QueryInterface(ID3DXMesh *iface, REFIID riid, void **out)
{
- TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), object);
+ TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out);
if (IsEqualGUID(riid, &IID_IUnknown) ||
IsEqualGUID(riid, &IID_ID3DXBaseMesh) ||
IsEqualGUID(riid, &IID_ID3DXMesh))
{
iface->lpVtbl->AddRef(iface);
- *object = iface;
+ *out = iface;
return S_OK;
}
@@ -801,13 +801,13 @@ static HRESULT WINAPI ID3DXMeshImpl_GetIndexBuffer(struct ID3DXMesh *iface,
return D3D_OK;
}
-static HRESULT WINAPI ID3DXMeshImpl_LockVertexBuffer(ID3DXMesh *iface, DWORD flags, LPVOID *data)
+static HRESULT WINAPI ID3DXMeshImpl_LockVertexBuffer(ID3DXMesh *iface, DWORD flags, void **data)
{
- ID3DXMeshImpl *This = impl_from_ID3DXMesh(iface);
+ ID3DXMeshImpl *mesh = impl_from_ID3DXMesh(iface);
- TRACE("(%p)->(%u,%p)\n", This, flags, data);
+ TRACE("iface %p, flags %#x, data %p.\n", iface, flags, data);
- return IDirect3DVertexBuffer9_Lock(This->vertex_buffer, 0, 0, data, flags);
+ return IDirect3DVertexBuffer9_Lock(mesh->vertex_buffer, 0, 0, data, flags);
}
static HRESULT WINAPI ID3DXMeshImpl_UnlockVertexBuffer(ID3DXMesh *iface)
@@ -819,13 +819,13 @@ static HRESULT WINAPI ID3DXMeshImpl_UnlockVertexBuffer(ID3DXMesh *iface)
return IDirect3DVertexBuffer9_Unlock(This->vertex_buffer);
}
-static HRESULT WINAPI ID3DXMeshImpl_LockIndexBuffer(ID3DXMesh *iface, DWORD flags, LPVOID *data)
+static HRESULT WINAPI ID3DXMeshImpl_LockIndexBuffer(ID3DXMesh *iface, DWORD flags, void **data)
{
- ID3DXMeshImpl *This = impl_from_ID3DXMesh(iface);
+ ID3DXMeshImpl *mesh = impl_from_ID3DXMesh(iface);
- TRACE("(%p)->(%u,%p)\n", This, flags, data);
+ TRACE("iface %p, flags %#x, data %p.\n", iface, flags, data);
- return IDirect3DIndexBuffer9_Lock(This->index_buffer, 0, 0, data, flags);
+ return IDirect3DIndexBuffer9_Lock(mesh->index_buffer, 0, 0, data, flags);
}
static HRESULT WINAPI ID3DXMeshImpl_UnlockIndexBuffer(ID3DXMesh *iface)
@@ -3703,12 +3703,14 @@ HRESULT WINAPI D3DXLoadMeshHierarchyFromXW(const WCHAR *filename, DWORD options,
struct ID3DXAllocateHierarchy *alloc_hier, struct ID3DXLoadUserData *load_user_data,
D3DXFRAME **frame_hierarchy, struct ID3DXAnimationController **anim_controller)
{
+ void *buffer;
HRESULT hr;
DWORD size;
- LPVOID buffer;
- TRACE("(%s, %x, %p, %p, %p, %p, %p)\n", debugstr_w(filename), options,
- device, alloc_hier, load_user_data, frame_hierarchy, anim_controller);
+ TRACE("filename %s, options %#x, device %p, alloc_hier %p, "
+ "load_user_data %p, frame_hierarchy %p, anim_controller %p.\n",
+ debugstr_w(filename), options, device, alloc_hier,
+ load_user_data, frame_hierarchy, anim_controller);
if (!filename)
return D3DERR_INVALIDCALL;
@@ -4057,12 +4059,14 @@ HRESULT WINAPI D3DXLoadMeshFromXW(const WCHAR *filename, DWORD options, struct I
struct ID3DXBuffer **adjacency, struct ID3DXBuffer **materials, struct ID3DXBuffer **effect_instances,
DWORD *num_materials, struct ID3DXMesh **mesh)
{
+ void *buffer;
HRESULT hr;
DWORD size;
- LPVOID buffer;
- TRACE("(%s, %x, %p, %p, %p, %p, %p, %p)\n", debugstr_w(filename), options,
- device, adjacency, materials, effect_instances, num_materials, mesh);
+ TRACE("filename %s, options %#x, device %p, adjacency %p, materials %p, "
+ "effect_instances %p, num_materials %p, mesh %p.\n",
+ debugstr_w(filename), options, device, adjacency, materials,
+ effect_instances, num_materials, mesh);
if (!filename)
return D3DERR_INVALIDCALL;
@@ -4085,12 +4089,13 @@ HRESULT WINAPI D3DXLoadMeshFromXResource(HMODULE module, const char *name, const
{
HRESULT hr;
HRSRC resinfo;
+ void *buffer;
DWORD size;
- LPVOID buffer;
- TRACE("(%p, %s, %s, %x, %p, %p, %p, %p, %p, %p)\n",
- module, debugstr_a(name), debugstr_a(type), options, device,
- adjacency, materials, effect_instances, num_materials, mesh);
+ TRACE("module %p, name %s, type %s, options %#x, device %p, adjacency %p, "
+ "materials %p, effect_instances %p, num_materials %p, mesh %p.\n",
+ module, debugstr_a(name), debugstr_a(type), options, device, adjacency,
+ materials, effect_instances, num_materials, mesh);
resinfo = FindResourceA(module, name, type);
if (!resinfo) return D3DXERR_INVALIDDATA;
@@ -4619,15 +4624,13 @@ HRESULT WINAPI D3DXCreateSphere(struct IDirect3DDevice9 *device, float radius, U
return hr;
}
- hr = sphere->lpVtbl->LockVertexBuffer(sphere, 0, (LPVOID *)&vertices);
- if (FAILED(hr))
+ if (FAILED(hr = sphere->lpVtbl->LockVertexBuffer(sphere, 0, (void **)&vertices)))
{
sphere->lpVtbl->Release(sphere);
return hr;
}
- hr = sphere->lpVtbl->LockIndexBuffer(sphere, 0, (LPVOID *)&faces);
- if (FAILED(hr))
+ if (FAILED(hr = sphere->lpVtbl->LockIndexBuffer(sphere, 0, (void **)&faces)))
{
sphere->lpVtbl->UnlockVertexBuffer(sphere);
sphere->lpVtbl->Release(sphere);
@@ -4790,15 +4793,13 @@ HRESULT WINAPI D3DXCreateCylinder(struct IDirect3DDevice9 *device, float radius1
return hr;
}
- hr = cylinder->lpVtbl->LockVertexBuffer(cylinder, 0, (LPVOID *)&vertices);
- if (FAILED(hr))
+ if (FAILED(hr = cylinder->lpVtbl->LockVertexBuffer(cylinder, 0, (void **)&vertices)))
{
cylinder->lpVtbl->Release(cylinder);
return hr;
}
- hr = cylinder->lpVtbl->LockIndexBuffer(cylinder, 0, (LPVOID *)&faces);
- if (FAILED(hr))
+ if (FAILED(hr = cylinder->lpVtbl->LockIndexBuffer(cylinder, 0, (void **)&faces)))
{
cylinder->lpVtbl->UnlockVertexBuffer(cylinder);
cylinder->lpVtbl->Release(cylinder);
@@ -5897,12 +5898,10 @@ HRESULT WINAPI D3DXCreateTextW(struct IDirect3DDevice9 *device, HDC hdc, const W
if (FAILED(hr))
goto error;
- hr = mesh->lpVtbl->LockVertexBuffer(mesh, 0, (LPVOID *)&vertices);
- if (FAILED(hr))
+ if (FAILED(hr = mesh->lpVtbl->LockVertexBuffer(mesh, 0, (void **)&vertices)))
goto error;
- hr = mesh->lpVtbl->LockIndexBuffer(mesh, 0, (LPVOID *)&faces);
- if (FAILED(hr))
+ if (FAILED(hr = mesh->lpVtbl->LockIndexBuffer(mesh, 0, (void **)&faces)))
goto error;
/* convert 2D vertices and faces into 3D mesh */
diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c
index 41be22c..08c5aad 100644
--- a/dlls/d3dx9_36/shader.c
+++ b/dlls/d3dx9_36/shader.c
@@ -865,13 +865,13 @@ static ULONG WINAPI ID3DXConstantTableImpl_Release(ID3DXConstantTable *iface)
}
/*** ID3DXBuffer methods ***/
-static LPVOID WINAPI ID3DXConstantTableImpl_GetBufferPointer(ID3DXConstantTable *iface)
+static void * WINAPI ID3DXConstantTableImpl_GetBufferPointer(ID3DXConstantTable *iface)
{
- struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface);
+ struct ID3DXConstantTableImpl *table = impl_from_ID3DXConstantTable(iface);
- TRACE("(%p)->()\n", This);
+ TRACE("iface %p.\n", iface);
- return This->ctab;
+ return table->ctab;
}
static DWORD WINAPI ID3DXConstantTableImpl_GetBufferSize(ID3DXConstantTable *iface)
diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c
index 911fe63..46d8b24 100644
--- a/dlls/d3dx9_36/tests/mesh.c
+++ b/dlls/d3dx9_36/tests/mesh.c
@@ -278,7 +278,7 @@ static void compare_mesh(const char *name, ID3DXMesh *d3dxmesh, struct mesh *mes
/* specify offset and size to avoid potential overruns */
hr = IDirect3DVertexBuffer9_Lock(vertex_buffer, 0, number_of_vertices * sizeof(D3DXVECTOR3) * 2,
- (LPVOID *)&vertices, D3DLOCK_DISCARD);
+ (void **)&vertices, D3DLOCK_DISCARD);
ok(hr == D3D_OK, "Test %s, result %x, expected 0 (D3D_OK)\n", name, hr);
if (hr != D3D_OK)
@@ -339,7 +339,7 @@ static void compare_mesh(const char *name, ID3DXMesh *d3dxmesh, struct mesh *mes
/* specify offset and size to avoid potential overruns */
hr = IDirect3DIndexBuffer9_Lock(index_buffer, 0, number_of_faces * sizeof(WORD) * 3,
- (LPVOID *)&faces, D3DLOCK_DISCARD);
+ (void **)&faces, D3DLOCK_DISCARD);
ok(hr == D3D_OK, "Test %s, result %x, expected 0 (D3D_OK)\n", name, hr);
if (hr != D3D_OK)
@@ -3687,7 +3687,7 @@ static void compare_text_outline_mesh(const char *name, ID3DXMesh *d3dxmesh, str
/* specify offset and size to avoid potential overruns */
hr = IDirect3DVertexBuffer9_Lock(vertex_buffer, 0, number_of_vertices * sizeof(D3DXVECTOR3) * 2,
- (LPVOID *)&vertices, D3DLOCK_DISCARD);
+ (void **)&vertices, D3DLOCK_DISCARD);
ok(hr == D3D_OK, "Test %s, result %x, expected 0 (D3D_OK)\n", name, hr);
if (hr != D3D_OK)
{
@@ -3695,7 +3695,7 @@ static void compare_text_outline_mesh(const char *name, ID3DXMesh *d3dxmesh, str
goto error;
}
hr = IDirect3DIndexBuffer9_Lock(index_buffer, 0, number_of_faces * sizeof(WORD) * 3,
- (LPVOID *)&faces, D3DLOCK_DISCARD);
+ (void **)&faces, D3DLOCK_DISCARD);
ok(hr == D3D_OK, "Test %s, result %x, expected 0 (D3D_OK)\n", name, hr);
if (hr != D3D_OK)
{
diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c
index 3d0d55b..d773a39 100644
--- a/dlls/d3dx9_36/tests/shader.c
+++ b/dlls/d3dx9_36/tests/shader.c
@@ -357,7 +357,7 @@ static void test_get_shader_constant_table_ex(void)
{
ID3DXConstantTable *constant_table;
HRESULT hr;
- LPVOID data;
+ void *data;
DWORD size;
D3DXCONSTANTTABLE_DESC desc;
diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c
index 416ca13..8e62059 100644
--- a/dlls/d3dx9_36/texture.c
+++ b/dlls/d3dx9_36/texture.c
@@ -691,13 +691,14 @@ HRESULT WINAPI D3DXCreateTextureFromFileExW(struct IDirect3DDevice9 *device, con
D3DPOOL pool, DWORD filter, DWORD mipfilter, D3DCOLOR colorkey, D3DXIMAGE_INFO *srcinfo,
PALETTEENTRY *palette, struct IDirect3DTexture9 **texture)
{
+ void *buffer;
HRESULT hr;
DWORD size;
- LPVOID buffer;
- TRACE("(%p, %s, %u, %u, %u, %x, %x, %x, %u, %u, %x, %p, %p, %p): relay\n",
- device, debugstr_w(srcfile), width, height, miplevels, usage, format, pool, filter,
- mipfilter, colorkey, srcinfo, palette, texture);
+ TRACE("device %p, srcfile %s, width %u, height %u, miplevels %u, usage %#x, format %#x, "
+ "pool %#x, filter %#x, mipfilter %#x, colorkey 0x%08x, srcinfo %p, palette %p, texture %p.\n",
+ device, debugstr_w(srcfile), width, height, miplevels, usage, format,
+ pool, filter, mipfilter, colorkey, srcinfo, palette, texture);
if (!srcfile)
return D3DERR_INVALIDCALL;
diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c
index ecfa672..c180d71 100644
--- a/dlls/d3dx9_36/util.c
+++ b/dlls/d3dx9_36/util.c
@@ -156,7 +156,7 @@ error:
* The memory doesn't need to be freed by the caller manually
*
*/
-HRESULT load_resource_into_memory(HMODULE module, HRSRC resinfo, LPVOID *buffer, DWORD *length)
+HRESULT load_resource_into_memory(HMODULE module, HRSRC resinfo, void **buffer, DWORD *length)
{
HGLOBAL resource;
diff --git a/include/d3dx9anim.h b/include/d3dx9anim.h
index e340328..bbb72d8 100644
--- a/include/d3dx9anim.h
+++ b/include/d3dx9anim.h
@@ -125,8 +125,8 @@ typedef struct _D3DXKEY_QUATERNION
typedef struct _D3DXKEY_CALLBACK
{
- FLOAT Time;
- LPVOID pCallbackData;
+ float Time;
+ void *pCallbackData;
} D3DXKEY_CALLBACK, *LPD3DXKEY_CALLBACK;
typedef struct _D3DXTRACK_DESC
@@ -207,7 +207,7 @@ DECLARE_INTERFACE(ID3DXSaveUserData)
DECLARE_INTERFACE_(ID3DXAnimationSet, IUnknown)
{
/*** IUnknown methods ***/
- STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID* object) PURE;
+ STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE;
STDMETHOD_(ULONG, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE;
/*** ID3DXAnimationSet methods ***/
@@ -219,8 +219,8 @@ DECLARE_INTERFACE_(ID3DXAnimationSet, IUnknown)
STDMETHOD(GetAnimationIndexByName)(THIS_ const char *name, UINT *index) PURE;
STDMETHOD(GetSRT)(THIS_ DOUBLE periodic_position, UINT animation, D3DXVECTOR3 *scale,
D3DXQUATERNION *rotation, D3DXVECTOR3 *translation) PURE;
- STDMETHOD(GetCallback)(THIS_ DOUBLE position, DWORD flags, DOUBLE *callback_position,
- LPVOID *callback_data) PURE;
+ STDMETHOD(GetCallback)(THIS_ double position, DWORD flags, double *callback_position,
+ void **callback_data) PURE;
};
#undef INTERFACE
@@ -228,7 +228,7 @@ DECLARE_INTERFACE_(ID3DXAnimationSet, IUnknown)
DECLARE_INTERFACE_(ID3DXKeyframedAnimationSet, ID3DXAnimationSet)
{
/*** IUnknown methods ***/
- STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID* object) PURE;
+ STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE;
STDMETHOD_(ULONG, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE;
/*** ID3DXAnimationSet methods ***/
@@ -240,8 +240,8 @@ DECLARE_INTERFACE_(ID3DXKeyframedAnimationSet, ID3DXAnimationSet)
STDMETHOD(GetAnimationIndexByName)(THIS_ const char *name, UINT *index) PURE;
STDMETHOD(GetSRT)(THIS_ DOUBLE periodic_position, UINT animation, D3DXVECTOR3 *scale,
D3DXQUATERNION *rotation, D3DXVECTOR3 *translation) PURE;
- STDMETHOD(GetCallback)(THIS_ DOUBLE position, DWORD flags, DOUBLE *callback_position,
- LPVOID *callback_data) PURE;
+ STDMETHOD(GetCallback)(THIS_ double position, DWORD flags, double *callback_position,
+ void **callback_data) PURE;
/*** ID3DXKeyframedAnimationSet methods ***/
STDMETHOD_(D3DXPLAYBACK_TYPE, GetPlaybackType)(THIS) PURE;
STDMETHOD_(DOUBLE, GetSourceTicksPerSecond)(THIS) PURE;
@@ -278,7 +278,7 @@ DECLARE_INTERFACE_(ID3DXKeyframedAnimationSet, ID3DXAnimationSet)
DECLARE_INTERFACE_(ID3DXCompressedAnimationSet, ID3DXAnimationSet)
{
/*** IUnknown methods ***/
- STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID* object) PURE;
+ STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE;
STDMETHOD_(ULONG, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE;
/*** ID3DXAnimationSet methods ***/
@@ -290,8 +290,8 @@ DECLARE_INTERFACE_(ID3DXCompressedAnimationSet, ID3DXAnimationSet)
STDMETHOD(GetAnimationIndexByName)(THIS_ const char *name, UINT *index) PURE;
STDMETHOD(GetSRT)(THIS_ DOUBLE periodic_position, UINT animation, D3DXVECTOR3 *scale,
D3DXQUATERNION *rotation, D3DXVECTOR3 *translation) PURE;
- STDMETHOD(GetCallback)(THIS_ DOUBLE position, DWORD flags, DOUBLE *callback_position,
- LPVOID *callback_data) PURE;
+ STDMETHOD(GetCallback)(THIS_ double position, DWORD flags, double *callback_position,
+ void **callback_data) PURE;
/*** ID3DXCompressedAnimationSet methods ***/
STDMETHOD_(D3DXPLAYBACK_TYPE, GetPlaybackType)(THIS) PURE;
STDMETHOD_(DOUBLE, GetSourceTicksPerSecond)(THIS) PURE;
@@ -304,7 +304,7 @@ DECLARE_INTERFACE_(ID3DXCompressedAnimationSet, ID3DXAnimationSet)
#define INTERFACE ID3DXAnimationCallbackHandler
DECLARE_INTERFACE(ID3DXAnimationCallbackHandler)
{
- STDMETHOD(HandleCallback)(THIS_ UINT track, LPVOID callback_data) PURE;
+ STDMETHOD(HandleCallback)(THIS_ UINT track, void *callback_data) PURE;
};
#undef INTERFACE
@@ -312,7 +312,7 @@ DECLARE_INTERFACE(ID3DXAnimationCallbackHandler)
DECLARE_INTERFACE_(ID3DXAnimationController, IUnknown)
{
/*** IUnknown methods ***/
- STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID* object) PURE;
+ STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE;
STDMETHOD_(ULONG, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE;
/*** ID3DXAnimationController methods ***/
diff --git a/include/d3dx9core.h b/include/d3dx9core.h
index 9f7ed5d..56f5fdd 100644
--- a/include/d3dx9core.h
+++ b/include/d3dx9core.h
@@ -65,11 +65,11 @@ typedef struct ID3DXSprite *LPD3DXSPRITE;
DECLARE_INTERFACE_(ID3DXBuffer, IUnknown)
{
/*** IUnknown methods ***/
- STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID *object) PURE;
+ STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE;
STDMETHOD_(ULONG, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE;
/*** ID3DXBuffer methods ***/
- STDMETHOD_(LPVOID, GetBufferPointer)(THIS) PURE;
+ STDMETHOD_(void *, GetBufferPointer)(THIS) PURE;
STDMETHOD_(DWORD, GetBufferSize)(THIS) PURE;
};
#undef INTERFACE
@@ -127,7 +127,7 @@ DECL_WINELIB_TYPE_AW(LPD3DXFONT_DESC)
DECLARE_INTERFACE_(ID3DXFont, IUnknown)
{
/*** IUnknown methods ***/
- STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID *object) PURE;
+ STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE;
STDMETHOD_(ULONG, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE;
/*** ID3DXFont methods ***/
@@ -209,7 +209,7 @@ DECLARE_INTERFACE_(ID3DXFont, IUnknown)
DECLARE_INTERFACE_(ID3DXLine, IUnknown)
{
/*** IUnknown methods ***/
- STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID *object) PURE;
+ STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE;
STDMETHOD_(ULONG, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE;
@@ -298,7 +298,7 @@ typedef struct _D3DXRTE_DESC
DECLARE_INTERFACE_(ID3DXRenderToEnvMap, IUnknown)
{
/*** IUnknown methods ***/
- STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID *object) PURE;
+ STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE;
STDMETHOD_(ULONG, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE;
@@ -366,7 +366,7 @@ typedef struct _D3DXRTS_DESC
DECLARE_INTERFACE_(ID3DXRenderToSurface, IUnknown)
{
/*** IUnknown methods ***/
- STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID *object) PURE;
+ STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE;
STDMETHOD_(ULONG, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE;
/*** ID3DXRenderToSurface methods ***/
@@ -411,7 +411,7 @@ DECLARE_INTERFACE_(ID3DXRenderToSurface, IUnknown)
DECLARE_INTERFACE_(ID3DXSprite, IUnknown)
{
/*** IUnknown methods ***/
- STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID *object) PURE;
+ STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **object) PURE;
STDMETHOD_(ULONG, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE;
/*** ID3DXSprite methods ***/
diff --git a/include/d3dx9effect.h b/include/d3dx9effect.h
index 2efffbb..90b7f70 100644
--- a/include/d3dx9effect.h
+++ b/include/d3dx9effect.h
@@ -85,7 +85,7 @@ DEFINE_GUID(IID_ID3DXEffectPool, 0x9537ab04, 0x3250, 0x412e, 0x82, 0x13, 0xfc, 0
DECLARE_INTERFACE_(ID3DXEffectPool, IUnknown)
{
/*** IUnknown methods ***/
- STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID* object) PURE;
+ STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE;
STDMETHOD_(ULONG, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE;
};
@@ -100,7 +100,7 @@ DEFINE_GUID(IID_ID3DXBaseEffect, 0x17c18ac, 0x103f, 0x4417, 0x8c, 0x51, 0x6b, 0x
DECLARE_INTERFACE_(ID3DXBaseEffect, IUnknown)
{
/*** IUnknown methods ***/
- STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID* object) PURE;
+ STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE;
STDMETHOD_(ULONG, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE;
/*** ID3DXBaseEffect methods ***/
@@ -122,7 +122,7 @@ DECLARE_INTERFACE_(ID3DXBaseEffect, IUnknown)
STDMETHOD_(D3DXHANDLE, GetAnnotation)(THIS_ D3DXHANDLE object, UINT index) PURE;
STDMETHOD_(D3DXHANDLE, GetAnnotationByName)(THIS_ D3DXHANDLE object, const char *name) PURE;
STDMETHOD(SetValue)(THIS_ D3DXHANDLE parameter, const void *data, UINT bytes) PURE;
- STDMETHOD(GetValue)(THIS_ D3DXHANDLE parameter, LPVOID data, UINT bytes) PURE;
+ STDMETHOD(GetValue)(THIS_ D3DXHANDLE parameter, void *data, UINT bytes) PURE;
STDMETHOD(SetBool)(THIS_ D3DXHANDLE parameter, BOOL b) PURE;
STDMETHOD(GetBool)(THIS_ D3DXHANDLE parameter, BOOL* b) PURE;
STDMETHOD(SetBoolArray)(THIS_ D3DXHANDLE parameter, CONST BOOL* b, UINT count) PURE;
@@ -170,7 +170,7 @@ DEFINE_GUID(IID_ID3DXEffectStateManager, 0x79aab587, 0x6dbc, 0x4fa7, 0x82, 0xde,
DECLARE_INTERFACE_(ID3DXEffectStateManager, IUnknown)
{
/*** IUnknown methods ***/
- STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID* object) PURE;
+ STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE;
STDMETHOD_(ULONG, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE;
/*** ID3DXEffectStateManager methods ***/
@@ -204,7 +204,7 @@ DEFINE_GUID(IID_ID3DXEffect, 0xf6ceb4b3, 0x4e4c, 0x40dd, 0xb8, 0x83, 0x8d, 0x8d,
DECLARE_INTERFACE_(ID3DXEffect, ID3DXBaseEffect)
{
/*** IUnknown methods ***/
- STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID* object) PURE;
+ STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE;
STDMETHOD_(ULONG, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE;
/*** ID3DXBaseEffect methods ***/
@@ -226,7 +226,7 @@ DECLARE_INTERFACE_(ID3DXEffect, ID3DXBaseEffect)
STDMETHOD_(D3DXHANDLE, GetAnnotation)(THIS_ D3DXHANDLE object, UINT index) PURE;
STDMETHOD_(D3DXHANDLE, GetAnnotationByName)(THIS_ D3DXHANDLE object, const char *name) PURE;
STDMETHOD(SetValue)(THIS_ D3DXHANDLE parameter, const void *data, UINT bytes) PURE;
- STDMETHOD(GetValue)(THIS_ D3DXHANDLE parameter, LPVOID data, UINT bytes) PURE;
+ STDMETHOD(GetValue)(THIS_ D3DXHANDLE parameter, void *data, UINT bytes) PURE;
STDMETHOD(SetBool)(THIS_ D3DXHANDLE parameter, BOOL b) PURE;
STDMETHOD(GetBool)(THIS_ D3DXHANDLE parameter, BOOL* b) PURE;
STDMETHOD(SetBoolArray)(THIS_ D3DXHANDLE parameter, CONST BOOL* b, UINT count) PURE;
@@ -297,7 +297,7 @@ DEFINE_GUID(IID_ID3DXEffectCompiler, 0x51b8a949, 0x1a31, 0x47e6, 0xbe, 0xa0, 0x4
DECLARE_INTERFACE_(ID3DXEffectCompiler, ID3DXBaseEffect)
{
/*** IUnknown methods ***/
- STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID* object) PURE;
+ STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE;
STDMETHOD_(ULONG, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE;
/*** ID3DXBaseEffect methods ***/
@@ -319,7 +319,7 @@ DECLARE_INTERFACE_(ID3DXEffectCompiler, ID3DXBaseEffect)
STDMETHOD_(D3DXHANDLE, GetAnnotation)(THIS_ D3DXHANDLE object, UINT index) PURE;
STDMETHOD_(D3DXHANDLE, GetAnnotationByName)(THIS_ D3DXHANDLE object, const char *name) PURE;
STDMETHOD(SetValue)(THIS_ D3DXHANDLE parameter, const void *data, UINT bytes) PURE;
- STDMETHOD(GetValue)(THIS_ D3DXHANDLE parameter, LPVOID data, UINT bytes) PURE;
+ STDMETHOD(GetValue)(THIS_ D3DXHANDLE parameter, void *data, UINT bytes) PURE;
STDMETHOD(SetBool)(THIS_ D3DXHANDLE parameter, BOOL b) PURE;
STDMETHOD(GetBool)(THIS_ D3DXHANDLE parameter, BOOL* b) PURE;
STDMETHOD(SetBoolArray)(THIS_ D3DXHANDLE parameter, CONST BOOL* b, UINT count) PURE;
diff --git a/include/d3dx9math.h b/include/d3dx9math.h
index 36c9df0..2c41b73 100644
--- a/include/d3dx9math.h
+++ b/include/d3dx9math.h
@@ -414,7 +414,7 @@ DEFINE_GUID(IID_ID3DXMatrixStack,
DECLARE_INTERFACE_(ID3DXMatrixStack, IUnknown)
{
- STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID * ppvObj) PURE;
+ STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE;
STDMETHOD_(ULONG,AddRef)(THIS) PURE;
STDMETHOD_(ULONG,Release)(THIS) PURE;
STDMETHOD(Pop)(THIS) PURE;
diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h
index 94e3734..90fc147 100644
--- a/include/d3dx9mesh.h
+++ b/include/d3dx9mesh.h
@@ -201,7 +201,7 @@ typedef struct _D3DXEFFECTDEFAULT
char *pParamName;
D3DXEFFECTDEFAULTTYPE Type;
DWORD NumBytes;
- LPVOID pValue;
+ void *pValue;
} D3DXEFFECTDEFAULT, *LPD3DXEFFECTDEFAULT;
typedef struct _D3DXEFFECTINSTANCE
@@ -297,9 +297,9 @@ typedef struct _XFILECOMPRESSEDANIMATIONSET
DWORD BufferLength;
} XFILECOMPRESSEDANIMATIONSET;
-typedef HRESULT (WINAPI *LPD3DXUVATLASCB)(FLOAT, LPVOID);
+typedef HRESULT (WINAPI *LPD3DXUVATLASCB)(float complete, void *ctx);
typedef HRESULT (WINAPI *LPD3DXIMTSIGNALCALLBACK)(CONST D3DXVECTOR2 *, UINT, UINT, VOID *, FLOAT *);
-typedef HRESULT (WINAPI *LPD3DXSHPRTSIMCB)(float, LPVOID);
+typedef HRESULT (WINAPI *LPD3DXSHPRTSIMCB)(float complete, void *ctx);
#undef INTERFACE
#define INTERFACE ID3DXBaseMesh
@@ -307,7 +307,7 @@ typedef HRESULT (WINAPI *LPD3DXSHPRTSIMCB)(float, LPVOID);
DECLARE_INTERFACE_(ID3DXBaseMesh, IUnknown)
{
/*** IUnknown methods ***/
- STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID* object) PURE;
+ STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE;
STDMETHOD_(ULONG, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE;
/*** ID3DXBaseMesh ***/
@@ -325,9 +325,9 @@ DECLARE_INTERFACE_(ID3DXBaseMesh, IUnknown)
struct IDirect3DDevice9 *device, struct ID3DXMesh **clone_mesh) PURE;
STDMETHOD(GetVertexBuffer)(THIS_ struct IDirect3DVertexBuffer9 **vertex_buffer) PURE;
STDMETHOD(GetIndexBuffer)(THIS_ struct IDirect3DIndexBuffer9 **index_buffer) PURE;
- STDMETHOD(LockVertexBuffer)(THIS_ DWORD flags, LPVOID* data) PURE;
+ STDMETHOD(LockVertexBuffer)(THIS_ DWORD flags, void **data) PURE;
STDMETHOD(UnlockVertexBuffer)(THIS) PURE;
- STDMETHOD(LockIndexBuffer)(THIS_ DWORD flags, LPVOID* data) PURE;
+ STDMETHOD(LockIndexBuffer)(THIS_ DWORD flags, void **data) PURE;
STDMETHOD(UnlockIndexBuffer)(THIS) PURE;
STDMETHOD(GetAttributeTable)(THIS_ D3DXATTRIBUTERANGE* attrib_table, DWORD* attrib_table_size) PURE;
STDMETHOD(ConvertPointRepsToAdjacency)(THIS_ CONST DWORD* point_reps, DWORD* adjacency) PURE;
@@ -341,7 +341,7 @@ DECLARE_INTERFACE_(ID3DXBaseMesh, IUnknown)
DECLARE_INTERFACE_(ID3DXMesh, ID3DXBaseMesh)
{
/*** IUnknown methods ***/
- STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID* object) PURE;
+ STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE;
STDMETHOD_(ULONG, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE;
/*** ID3DXBaseMesh ***/
@@ -359,9 +359,9 @@ DECLARE_INTERFACE_(ID3DXMesh, ID3DXBaseMesh)
struct IDirect3DDevice9 *device, struct ID3DXMesh **clone_mesh) PURE;
STDMETHOD(GetVertexBuffer)(THIS_ struct IDirect3DVertexBuffer9 **vertex_buffer) PURE;
STDMETHOD(GetIndexBuffer)(THIS_ struct IDirect3DIndexBuffer9 **index_buffer) PURE;
- STDMETHOD(LockVertexBuffer)(THIS_ DWORD flags, LPVOID* data) PURE;
+ STDMETHOD(LockVertexBuffer)(THIS_ DWORD flags, void **data) PURE;
STDMETHOD(UnlockVertexBuffer)(THIS) PURE;
- STDMETHOD(LockIndexBuffer)(THIS_ DWORD flags, LPVOID* data) PURE;
+ STDMETHOD(LockIndexBuffer)(THIS_ DWORD flags, void **data) PURE;
STDMETHOD(UnlockIndexBuffer)(THIS) PURE;
STDMETHOD(GetAttributeTable)(THIS_ D3DXATTRIBUTERANGE* attrib_table, DWORD* attrib_table_size) PURE;
STDMETHOD(ConvertPointRepsToAdjacency)(THIS_ CONST DWORD* point_reps, DWORD* adjacency) PURE;
@@ -383,7 +383,7 @@ DECLARE_INTERFACE_(ID3DXMesh, ID3DXBaseMesh)
DECLARE_INTERFACE_(ID3DXPMesh, ID3DXBaseMesh)
{
/*** IUnknown methods ***/
- STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID* object) PURE;
+ STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE;
STDMETHOD_(ULONG, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE;
/*** ID3DXBaseMesh ***/
@@ -401,9 +401,9 @@ DECLARE_INTERFACE_(ID3DXPMesh, ID3DXBaseMesh)
struct IDirect3DDevice9 *device, struct ID3DXMesh **clone_mesh) PURE;
STDMETHOD(GetVertexBuffer)(THIS_ struct IDirect3DVertexBuffer9 **vertex_buffer) PURE;
STDMETHOD(GetIndexBuffer)(THIS_ struct IDirect3DIndexBuffer9 **index_buffer) PURE;
- STDMETHOD(LockVertexBuffer)(THIS_ DWORD flags, LPVOID* data) PURE;
+ STDMETHOD(LockVertexBuffer)(THIS_ DWORD flags, void **data) PURE;
STDMETHOD(UnlockVertexBuffer)(THIS) PURE;
- STDMETHOD(LockIndexBuffer)(THIS_ DWORD flags, LPVOID* data) PURE;
+ STDMETHOD(LockIndexBuffer)(THIS_ DWORD flags, void **data) PURE;
STDMETHOD(UnlockIndexBuffer)(THIS) PURE;
STDMETHOD(GetAttributeTable)(THIS_ D3DXATTRIBUTERANGE* attrib_table, DWORD* attrib_table_size) PURE;
STDMETHOD(ConvertPointRepsToAdjacency)(THIS_ CONST DWORD* point_reps, DWORD* adjacency) PURE;
@@ -436,7 +436,7 @@ DECLARE_INTERFACE_(ID3DXPMesh, ID3DXBaseMesh)
DECLARE_INTERFACE_(ID3DXSPMesh, IUnknown)
{
/*** IUnknown methods ***/
- STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID* object) PURE;
+ STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE;
STDMETHOD_(ULONG, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE;
/*** ID3DXSPMesh ***/
@@ -471,7 +471,7 @@ DECLARE_INTERFACE_(ID3DXSPMesh, IUnknown)
DECLARE_INTERFACE_(ID3DXPatchMesh, IUnknown)
{
/*** IUnknown methods ***/
- STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID* object) PURE;
+ STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE;
STDMETHOD_(ULONG, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE;
/*** ID3DXPatchMesh ***/
@@ -484,9 +484,9 @@ DECLARE_INTERFACE_(ID3DXPatchMesh, IUnknown)
STDMETHOD(GetPatchInfo)(THIS_ LPD3DXPATCHINFO patch_info) PURE;
STDMETHOD(GetVertexBuffer)(THIS_ struct IDirect3DVertexBuffer9 **vertex_buffer) PURE;
STDMETHOD(GetIndexBuffer)(THIS_ struct IDirect3DIndexBuffer9 **index_buffer) PURE;
- STDMETHOD(LockVertexBuffer)(THIS_ DWORD flags, LPVOID* data) PURE;
+ STDMETHOD(LockVertexBuffer)(THIS_ DWORD flags, void **data) PURE;
STDMETHOD(UnlockVertexBuffer)(THIS) PURE;
- STDMETHOD(LockIndexBuffer)(THIS_ DWORD flags, LPVOID* data) PURE;
+ STDMETHOD(LockIndexBuffer)(THIS_ DWORD flags, void **data) PURE;
STDMETHOD(UnlockIndexBuffer)(THIS) PURE;
STDMETHOD(LockAttributeBuffer)(THIS_ DWORD flags, DWORD** data) PURE;
STDMETHOD(UnlockAttributeBuffer)(THIS) PURE;
@@ -510,7 +510,7 @@ DECLARE_INTERFACE_(ID3DXPatchMesh, IUnknown)
DECLARE_INTERFACE_(ID3DXSkinInfo, IUnknown)
{
/*** IUnknown methods ***/
- STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID* object) PURE;
+ STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE;
STDMETHOD_(ULONG, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE;
/*** ID3DXSkinInfo ***/
@@ -551,7 +551,7 @@ DECLARE_INTERFACE_(ID3DXSkinInfo, IUnknown)
DECLARE_INTERFACE_(ID3DXPRTBuffer, IUnknown)
{
/*** IUnknown methods ***/
- STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID* object) PURE;
+ STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE;
STDMETHOD_(ULONG, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE;
/*** ID3DXPRTBuffer methods ***/
@@ -580,7 +580,7 @@ DECLARE_INTERFACE_(ID3DXPRTBuffer, IUnknown)
DECLARE_INTERFACE_(ID3DXPRTCompBuffer, IUnknown)
{
/*** IUnknown methods ***/
- STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID* object) PURE;
+ STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE;
STDMETHOD_(ULONG, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE;
/*** ID3DXPRTCompBuffer methods ***/
@@ -605,7 +605,7 @@ DECLARE_INTERFACE_(ID3DXPRTCompBuffer, IUnknown)
DECLARE_INTERFACE_(ID3DXTextureGutterHelper, IUnknown)
{
/*** IUnknown methods ***/
- STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID* object) PURE;
+ STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE;
STDMETHOD_(ULONG, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE;
/*** ID3DXTextureGutterHelper methods ***/
@@ -632,7 +632,7 @@ DECLARE_INTERFACE_(ID3DXTextureGutterHelper, IUnknown)
DECLARE_INTERFACE_(ID3DXPRTEngine, IUnknown)
{
/*** IUnknown methods ***/
- STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID* object) PURE;
+ STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE;
STDMETHOD_(ULONG, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE;
/*** ID3DXPRTEngine methods ***/
@@ -681,7 +681,7 @@ DECLARE_INTERFACE_(ID3DXPRTEngine, IUnknown)
ID3DXPRTBuffer *data_out) PURE;
STDMETHOD(ScaleMeshChunk)(THIS_ UINT mesh_chunk, float scale, ID3DXPRTBuffer *data_out) PURE;
STDMETHOD(MultiplyAlbedo)(THIS_ ID3DXPRTBuffer *data_out) PURE;
- STDMETHOD(SetCallback)(THIS_ LPD3DXSHPRTSIMCB cb, FLOAT frequency, LPVOID user_context) PURE;
+ STDMETHOD(SetCallback)(THIS_ LPD3DXSHPRTSIMCB cb, float frequency, void *user_context) PURE;
STDMETHOD_(BOOL, ShadowRayIntersects)(THIS_ CONST D3DXVECTOR3 *ray_pos, CONST D3DXVECTOR3 *ray_dir) PURE;
STDMETHOD_(BOOL, ClosestRayIntersects)(THIS_ CONST D3DXVECTOR3 *ray_pos, CONST D3DXVECTOR3 *ray_dir,
DWORD *face_index, FLOAT *u, FLOAT *v, FLOAT *dist) PURE;
diff --git a/include/d3dx9shader.h b/include/d3dx9shader.h
index 0586544..2a083da 100644
--- a/include/d3dx9shader.h
+++ b/include/d3dx9shader.h
@@ -120,11 +120,11 @@ DEFINE_GUID(IID_ID3DXConstantTable, 0x9dca3190, 0x38b9, 0x4fc3, 0x92, 0xe3, 0x39
DECLARE_INTERFACE_(ID3DXConstantTable, ID3DXBuffer)
{
/*** IUnknown methods ***/
- STDMETHOD(QueryInterface)(THIS_ REFIID iid, LPVOID *ppv) PURE;
+ STDMETHOD(QueryInterface)(THIS_ REFIID iid, void **out) PURE;
STDMETHOD_(ULONG, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE;
/*** ID3DXBuffer methods ***/
- STDMETHOD_(LPVOID, GetBufferPointer)(THIS) PURE;
+ STDMETHOD_(void *, GetBufferPointer)(THIS) PURE;
STDMETHOD_(DWORD, GetBufferSize)(THIS) PURE;
/*** ID3DXConstantTable methods ***/
STDMETHOD(GetDesc)(THIS_ D3DXCONSTANTTABLE_DESC *pDesc) PURE;
diff --git a/include/d3dx9tex.h b/include/d3dx9tex.h
index 26c395f..205d897 100644
--- a/include/d3dx9tex.h
+++ b/include/d3dx9tex.h
@@ -83,8 +83,10 @@ typedef struct _D3DXIMAGE_INFO
****************** Functions *****************
**********************************************/
/* Typedefs for callback functions */
-typedef VOID (WINAPI *LPD3DXFILL2D)(D3DXVECTOR4 *out, CONST D3DXVECTOR2 *texcoord, CONST D3DXVECTOR2 *texelsize, LPVOID data);
-typedef VOID (WINAPI *LPD3DXFILL3D)(D3DXVECTOR4 *out, CONST D3DXVECTOR3 *texcoord, CONST D3DXVECTOR3 *texelsize, LPVOID data);
+typedef void (WINAPI *LPD3DXFILL2D)(D3DXVECTOR4 *out, const D3DXVECTOR2 *texcoord,
+ const D3DXVECTOR2 *texelsize, void *data);
+typedef void (WINAPI *LPD3DXFILL3D)(D3DXVECTOR4 *out, const D3DXVECTOR3 *texcoord,
+ const D3DXVECTOR3 *texelsize, void *data);
#ifdef __cplusplus
extern "C" {
diff --git a/include/d3dx9xof.h b/include/d3dx9xof.h
index ee30572..35019f2 100644
--- a/include/d3dx9xof.h
+++ b/include/d3dx9xof.h
@@ -47,8 +47,9 @@ typedef struct _D3DXF_FILELOADRESOURCE
const char *lpType;
} D3DXF_FILELOADRESOURCE;
-typedef struct _D3DXF_FILELOADMEMORY {
- LPVOID lpMemory;
+typedef struct _D3DXF_FILELOADMEMORY
+{
+ void *lpMemory;
SIZE_T dSize;
} D3DXF_FILELOADMEMORY;
@@ -73,7 +74,7 @@ STDAPI D3DXFileCreate(struct ID3DXFile **file);
DECLARE_INTERFACE_IID_(ID3DXFile,IUnknown,"cef08cf9-7b4f-4429-9624-2a690a933201")
{
/*** IUnknown methods ***/
- STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID, LPVOID*) PURE;
+ STDMETHOD(QueryInterface)(THIS_ REFIID iid, void **out) PURE;
STDMETHOD_(ULONG,AddRef)(THIS) PURE;
STDMETHOD_(ULONG,Release)(THIS) PURE;
/*** ID3DXFile methods ***/
@@ -90,7 +91,7 @@ DECLARE_INTERFACE_IID_(ID3DXFile,IUnknown,"cef08cf9-7b4f-4429-9624-2a690a933201"
DECLARE_INTERFACE_IID_(ID3DXFileSaveObject,IUnknown,"cef08cfa-7b4f-4429-9624-2a690a933201")
{
/*** IUnknown methods ***/
- STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID, LPVOID*) PURE;
+ STDMETHOD(QueryInterface)(THIS_ REFIID iid, void **out) PURE;
STDMETHOD_(ULONG,AddRef)(THIS) PURE;
STDMETHOD_(ULONG,Release)(THIS) PURE;
/*** ID3DXFileSaveObject methods ***/
@@ -105,7 +106,7 @@ DECLARE_INTERFACE_IID_(ID3DXFileSaveObject,IUnknown,"cef08cfa-7b4f-4429-9624-2a6
DECLARE_INTERFACE_IID_(ID3DXFileSaveData,IUnknown,"cef08cfb-7b4f-4429-9624-2a690a933201")
{
/*** IUnknown methods ***/
- STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID, LPVOID*) PURE;
+ STDMETHOD(QueryInterface)(THIS_ REFIID iid, void **out) PURE;
STDMETHOD_(ULONG,AddRef)(THIS) PURE;
STDMETHOD_(ULONG,Release)(THIS) PURE;
/*** ID3DXFileSaveObject methods ***/
@@ -124,7 +125,7 @@ DECLARE_INTERFACE_IID_(ID3DXFileSaveData,IUnknown,"cef08cfb-7b4f-4429-9624-2a690
DECLARE_INTERFACE_IID_(ID3DXFileEnumObject,IUnknown,"cef08cfc-7b4f-4429-9624-2a690a933201")
{
/*** IUnknown methods ***/
- STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID, LPVOID*) PURE;
+ STDMETHOD(QueryInterface)(THIS_ REFIID iid, void **out) PURE;
STDMETHOD_(ULONG,AddRef)(THIS) PURE;
STDMETHOD_(ULONG,Release)(THIS) PURE;
/*** ID3DXFileEnumObject methods ***/
@@ -140,7 +141,7 @@ DECLARE_INTERFACE_IID_(ID3DXFileEnumObject,IUnknown,"cef08cfc-7b4f-4429-9624-2a6
DECLARE_INTERFACE_IID_(ID3DXFileData,IUnknown,"cef08cfd-7b4f-4429-9624-2a690a933201")
{
/*** IUnknown methods ***/
- STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID, LPVOID*) PURE;
+ STDMETHOD(QueryInterface)(THIS_ REFIID iid, void **out) PURE;
STDMETHOD_(ULONG,AddRef)(THIS) PURE;
STDMETHOD_(ULONG,Release)(THIS) PURE;
/*** ID3DXFileData methods ***/
--
1.8.1.5
More information about the wine-patches
mailing list