d3d10: Avoid LPVOID.

This commit is contained in:
Henri Verbeet 2013-09-18 10:57:13 +02:00 committed by Alexandre Julliard
parent 708615056c
commit 69fe799c25
4 changed files with 11 additions and 12 deletions

View File

@ -27,16 +27,15 @@
WINE_DEFAULT_DEBUG_CHANNEL(d3d10); WINE_DEFAULT_DEBUG_CHANNEL(d3d10);
/* At process attach */ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved)
BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
{ {
TRACE("fdwReason=%d\n", fdwReason); switch (reason)
switch(fdwReason)
{ {
case DLL_PROCESS_ATTACH: case DLL_PROCESS_ATTACH:
DisableThreadLibraryCalls( hInstDLL ); DisableThreadLibraryCalls(inst);
break; break;
} }
return TRUE; return TRUE;
} }

View File

@ -27,7 +27,7 @@ DEFINE_GUID(IID_ID3D10ShaderReflection1, 0xc3457783, 0xa846, 0x47ce, 0x95, 0x20,
DECLARE_INTERFACE_(ID3D10ShaderReflection1, IUnknown) DECLARE_INTERFACE_(ID3D10ShaderReflection1, IUnknown)
{ {
/* IUnknown methods */ /* 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, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE; STDMETHOD_(ULONG, Release)(THIS) PURE;
/* ID3D10ShaderReflection1 methods */ /* ID3D10ShaderReflection1 methods */

View File

@ -755,7 +755,7 @@ DEFINE_GUID(IID_ID3D10Effect, 0x51b0ca8b, 0xec0b, 0x4519, 0x87, 0x0d, 0x8e, 0xe1
DECLARE_INTERFACE_(ID3D10Effect, IUnknown) DECLARE_INTERFACE_(ID3D10Effect, IUnknown)
{ {
/* IUnknown methods */ /* 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, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE; STDMETHOD_(ULONG, Release)(THIS) PURE;
/* ID3D10Effect methods */ /* ID3D10Effect methods */
@ -781,7 +781,7 @@ DEFINE_GUID(IID_ID3D10EffectPool, 0x9537ab04, 0x3250, 0x412e, 0x82, 0x13, 0xfc,
DECLARE_INTERFACE_(ID3D10EffectPool, IUnknown) DECLARE_INTERFACE_(ID3D10EffectPool, IUnknown)
{ {
/* IUnknown methods */ /* 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, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE; STDMETHOD_(ULONG, Release)(THIS) PURE;
/* ID3D10EffectPool methods */ /* ID3D10EffectPool methods */

View File

@ -140,7 +140,7 @@ typedef struct _D3D10_SHADER_VARIABLE_DESC
UINT StartOffset; UINT StartOffset;
UINT Size; UINT Size;
UINT uFlags; UINT uFlags;
LPVOID DefaultValue; void *DefaultValue;
} D3D10_SHADER_VARIABLE_DESC; } D3D10_SHADER_VARIABLE_DESC;
typedef struct _D3D10_SHADER_TYPE_DESC typedef struct _D3D10_SHADER_TYPE_DESC
@ -193,7 +193,7 @@ DEFINE_GUID(IID_ID3D10ShaderReflection, 0xd40e20b6, 0xf8f7, 0x42ad, 0xab, 0x20,
DECLARE_INTERFACE_(ID3D10ShaderReflection, IUnknown) DECLARE_INTERFACE_(ID3D10ShaderReflection, IUnknown)
{ {
/* IUnknown methods */ /* 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, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE; STDMETHOD_(ULONG, Release)(THIS) PURE;
/* ID3D10ShaderReflection methods */ /* ID3D10ShaderReflection methods */