diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c
index ac3eee56330..01fefbac6c3 100644
--- a/dlls/d3d10/d3d10_main.c
+++ b/dlls/d3d10/d3d10_main.c
@@ -27,16 +27,15 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d10);
 
-/* At process attach */
-BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
+BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved)
 {
-    TRACE("fdwReason=%d\n", fdwReason);
-    switch(fdwReason)
+    switch (reason)
     {
-    case DLL_PROCESS_ATTACH:
-        DisableThreadLibraryCalls( hInstDLL );
-        break;
+        case DLL_PROCESS_ATTACH:
+            DisableThreadLibraryCalls(inst);
+            break;
     }
+
     return TRUE;
 }
 
diff --git a/include/d3d10_1shader.h b/include/d3d10_1shader.h
index 92f5ebf6891..06dded7e0e8 100644
--- a/include/d3d10_1shader.h
+++ b/include/d3d10_1shader.h
@@ -27,7 +27,7 @@ DEFINE_GUID(IID_ID3D10ShaderReflection1, 0xc3457783, 0xa846, 0x47ce, 0x95, 0x20,
 DECLARE_INTERFACE_(ID3D10ShaderReflection1, 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;
     /* ID3D10ShaderReflection1 methods */
diff --git a/include/d3d10effect.h b/include/d3d10effect.h
index 5af2ef55cc8..14948941bd0 100644
--- a/include/d3d10effect.h
+++ b/include/d3d10effect.h
@@ -755,7 +755,7 @@ DEFINE_GUID(IID_ID3D10Effect, 0x51b0ca8b, 0xec0b, 0x4519, 0x87, 0x0d, 0x8e, 0xe1
 DECLARE_INTERFACE_(ID3D10Effect, 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;
     /* ID3D10Effect methods */
@@ -781,7 +781,7 @@ DEFINE_GUID(IID_ID3D10EffectPool, 0x9537ab04, 0x3250, 0x412e, 0x82, 0x13, 0xfc,
 DECLARE_INTERFACE_(ID3D10EffectPool, 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;
     /* ID3D10EffectPool methods */
diff --git a/include/d3d10shader.h b/include/d3d10shader.h
index 894b833a35f..4a2fef95372 100644
--- a/include/d3d10shader.h
+++ b/include/d3d10shader.h
@@ -140,7 +140,7 @@ typedef struct _D3D10_SHADER_VARIABLE_DESC
     UINT StartOffset;
     UINT Size;
     UINT uFlags;
-    LPVOID DefaultValue;
+    void *DefaultValue;
 } D3D10_SHADER_VARIABLE_DESC;
 
 typedef struct _D3D10_SHADER_TYPE_DESC
@@ -193,7 +193,7 @@ DEFINE_GUID(IID_ID3D10ShaderReflection, 0xd40e20b6, 0xf8f7, 0x42ad, 0xab, 0x20,
 DECLARE_INTERFACE_(ID3D10ShaderReflection, 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;
     /* ID3D10ShaderReflection methods */