Henri Verbeet : d3dcompiler: Avoid LPVOID.
Alexandre Julliard
julliard at winehq.org
Fri Sep 6 12:39:51 CDT 2013
Module: wine
Branch: master
Commit: 5daf5e80fbb2ce5043163f46fdaaf831d340850a
URL: http://source.winehq.org/git/wine.git/?a=commit;h=5daf5e80fbb2ce5043163f46fdaaf831d340850a
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Fri Sep 6 09:57:42 2013 +0200
d3dcompiler: Avoid LPVOID.
---
dlls/d3dcompiler_43/d3dcompiler_43_main.c | 2 +-
dlls/d3dcompiler_43/reflection.c | 2 +-
dlls/d3dcompiler_43/tests/asm.c | 2 +-
include/d3d11shader.h | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dlls/d3dcompiler_43/d3dcompiler_43_main.c b/dlls/d3dcompiler_43/d3dcompiler_43_main.c
index 0c66471..929cec0 100644
--- a/dlls/d3dcompiler_43/d3dcompiler_43_main.c
+++ b/dlls/d3dcompiler_43/d3dcompiler_43_main.c
@@ -28,7 +28,7 @@
#include "d3dcompiler_private.h"
-BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved)
+BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved)
{
switch (reason)
{
diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c
index 77e7ac3..97d4148 100644
--- a/dlls/d3dcompiler_43/reflection.c
+++ b/dlls/d3dcompiler_43/reflection.c
@@ -72,7 +72,7 @@ struct d3dcompiler_shader_reflection_variable
UINT start_offset;
UINT size;
UINT flags;
- LPVOID default_value;
+ void *default_value;
};
struct d3dcompiler_shader_reflection_constant_buffer
diff --git a/dlls/d3dcompiler_43/tests/asm.c b/dlls/d3dcompiler_43/tests/asm.c
index cb1453f..331b864 100644
--- a/dlls/d3dcompiler_43/tests/asm.c
+++ b/dlls/d3dcompiler_43/tests/asm.c
@@ -1486,7 +1486,7 @@ static HRESULT WINAPI testD3DInclude_open(ID3DInclude *iface, D3D_INCLUDE_TYPE i
static HRESULT WINAPI testD3DInclude_close(ID3DInclude *iface, const void *data)
{
- HeapFree(GetProcessHeap(), 0, (LPVOID)data);
+ HeapFree(GetProcessHeap(), 0, (void *)data);
return S_OK;
}
diff --git a/include/d3d11shader.h b/include/d3d11shader.h
index ea271f6..9ee78a8 100644
--- a/include/d3d11shader.h
+++ b/include/d3d11shader.h
@@ -80,7 +80,7 @@ typedef struct _D3D11_SHADER_VARIABLE_DESC
UINT StartOffset;
UINT Size;
UINT uFlags;
- LPVOID DefaultValue;
+ void *DefaultValue;
UINT StartTexture;
UINT TextureSize;
UINT StartSampler;
@@ -180,7 +180,7 @@ DEFINE_GUID(IID_ID3D11ShaderReflection, 0x0a233719, 0x3960, 0x4578, 0x9d, 0x7c,
DECLARE_INTERFACE_(ID3D11ShaderReflection, 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;
/* ID3D11ShaderReflection methods */
More information about the wine-cvs
mailing list