[PATCH 4/5] d3drm: Avoid LPDWORD.
Henri Verbeet
hverbeet at codeweavers.com
Tue Sep 10 02:32:35 CDT 2013
---
dlls/d3drm/d3drm.c | 13 ++++---------
dlls/d3drm/device.c | 10 ++++------
dlls/d3drm/frame.c | 14 ++++----------
dlls/d3drm/texture.c | 7 +++----
include/d3drm.h | 4 ++--
include/d3drmobj.h | 22 +++++++++++-----------
6 files changed, 28 insertions(+), 42 deletions(-)
diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c
index 39875b5..e1aa368 100644
--- a/dlls/d3drm/d3drm.c
+++ b/dlls/d3drm/d3drm.c
@@ -1449,12 +1449,9 @@ static HRESULT WINAPI IDirect3DRM3Impl_CreateProgressiveMesh(IDirect3DRM3 *iface
return E_NOTIMPL;
}
-static HRESULT WINAPI IDirect3DRM3Impl_RegisterClient(IDirect3DRM3* iface, REFGUID rguid,
- LPDWORD id)
+static HRESULT WINAPI IDirect3DRM3Impl_RegisterClient(IDirect3DRM3 *iface, REFGUID guid, DWORD *id)
{
- IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface);
-
- FIXME("(%p/%p)->(%s, %p): stub\n", iface, This, debugstr_guid(rguid), id);
+ FIXME("iface %p, guid %s, id %p stub!\n", iface, debugstr_guid(guid), id);
return E_NOTIMPL;
}
@@ -1485,11 +1482,9 @@ static HRESULT WINAPI IDirect3DRM3Impl_SetOptions(IDirect3DRM3* iface, DWORD opt
return E_NOTIMPL;
}
-static HRESULT WINAPI IDirect3DRM3Impl_GetOptions(IDirect3DRM3* iface, LPDWORD opt)
+static HRESULT WINAPI IDirect3DRM3Impl_GetOptions(IDirect3DRM3 *iface, DWORD *flags)
{
- IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface);
-
- FIXME("(%p/%p)->(%p): stub\n", iface, This, opt);
+ FIXME("iface %p, flags %p stub!\n", iface, flags);
return E_NOTIMPL;
}
diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c
index 254dd8d..39bf161 100644
--- a/dlls/d3drm/device.c
+++ b/dlls/d3drm/device.c
@@ -888,13 +888,11 @@ static HRESULT WINAPI IDirect3DRMDevice3Impl_LightStateChange(IDirect3DRMDevice3
return E_NOTIMPL;
}
-static HRESULT WINAPI IDirect3DRMDevice3Impl_GetStateChangeOptions(IDirect3DRMDevice3* iface,
- DWORD stateclass, DWORD statenum,
- LPDWORD flags)
+static HRESULT WINAPI IDirect3DRMDevice3Impl_GetStateChangeOptions(IDirect3DRMDevice3 *iface,
+ DWORD state_class, DWORD state_idx, DWORD *flags)
{
- IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice3(iface);
-
- FIXME("(%p/%p)->(%u, %u, %p): stub\n", iface, This, stateclass, statenum, flags);
+ FIXME("iface %p, state_class %#x, state_idx %#x, flags %p stub!\n",
+ iface, state_class, state_idx, flags);
return E_NOTIMPL;
}
diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c
index 76dc053..33dfb65 100644
--- a/dlls/d3drm/frame.c
+++ b/dlls/d3drm/frame.c
@@ -2365,12 +2365,9 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_SetTraversalOptions(IDirect3DRMFrame
return E_NOTIMPL;
}
-static HRESULT WINAPI IDirect3DRMFrame3Impl_GetTraversalOptions(IDirect3DRMFrame3* iface,
- LPDWORD flags)
+static HRESULT WINAPI IDirect3DRMFrame3Impl_GetTraversalOptions(IDirect3DRMFrame3 *iface, DWORD *flags)
{
- IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface);
-
- FIXME("(%p/%p)->(%p): stub\n", iface, This, flags);
+ FIXME("iface %p, flags %p stub!\n", iface, flags);
return E_NOTIMPL;
}
@@ -2385,12 +2382,9 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_SetSceneFogMethod(IDirect3DRMFrame3*
return E_NOTIMPL;
}
-static HRESULT WINAPI IDirect3DRMFrame3Impl_GetSceneFogMethod(IDirect3DRMFrame3* iface,
- LPDWORD flags)
+static HRESULT WINAPI IDirect3DRMFrame3Impl_GetSceneFogMethod(IDirect3DRMFrame3 *iface, DWORD *fog_mode)
{
- IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface);
-
- FIXME("(%p/%p)->(%p): stub\n", iface, This, flags);
+ FIXME("iface %p, fogmode %p stub!\n", iface, fog_mode);
return E_NOTIMPL;
}
diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c
index 5eaa092..b2ea078 100644
--- a/dlls/d3drm/texture.c
+++ b/dlls/d3drm/texture.c
@@ -755,11 +755,10 @@ static HRESULT WINAPI IDirect3DRMTexture3Impl_SetCacheOptions(IDirect3DRMTexture
return E_NOTIMPL;
}
-static HRESULT WINAPI IDirect3DRMTexture3Impl_GetCacheOptions(IDirect3DRMTexture3* iface, LPLONG importance, LPDWORD flags)
+static HRESULT WINAPI IDirect3DRMTexture3Impl_GetCacheOptions(IDirect3DRMTexture3 *iface,
+ LONG *importance, DWORD *flags)
{
- IDirect3DRMTextureImpl *This = impl_from_IDirect3DRMTexture3(iface);
-
- FIXME("(%p/%p)->(%p, %p): stub\n", iface, This, importance, flags);
+ FIXME("iface %p, importance %p, flags %p stub!\n", iface, importance, flags);
return E_NOTIMPL;
}
diff --git a/include/d3drm.h b/include/d3drm.h
index a38440a..07e39c1 100644
--- a/include/d3drm.h
+++ b/include/d3drm.h
@@ -385,11 +385,11 @@ DECLARE_INTERFACE_(IDirect3DRM3,IUnknown)
IDirect3DRMFrame3 *parent_frame) PURE;
STDMETHOD(Tick)(THIS_ D3DVALUE) PURE;
STDMETHOD(CreateProgressiveMesh)(THIS_ IDirect3DRMProgressiveMesh **mesh) PURE;
- STDMETHOD(RegisterClient)(THIS_ REFGUID rguid, LPDWORD lpdwID) PURE;
+ STDMETHOD(RegisterClient)(THIS_ REFGUID guid, DWORD *id) PURE;
STDMETHOD(UnregisterClient)(THIS_ REFGUID rguid) PURE;
STDMETHOD(CreateClippedVisual)(THIS_ IDirect3DRMVisual *visual, IDirect3DRMClippedVisual **clipped_visual) PURE;
STDMETHOD(SetOptions)(THIS_ DWORD) PURE;
- STDMETHOD(GetOptions)(THIS_ LPDWORD) PURE;
+ STDMETHOD(GetOptions)(THIS_ DWORD *flags) PURE;
};
#undef INTERFACE
diff --git a/include/d3drmobj.h b/include/d3drmobj.h
index a349a64..d9de5c3 100644
--- a/include/d3drmobj.h
+++ b/include/d3drmobj.h
@@ -265,7 +265,7 @@ DECLARE_INTERFACE_(IDirect3DRMObject2,IUnknown)
STDMETHOD(GetName)(THIS_ DWORD *size, char *name) PURE;
STDMETHOD(SetClientData)(THIS_ DWORD id, void *data, DWORD flags) PURE;
STDMETHOD(SetName)(THIS_ const char *name) PURE;
- STDMETHOD(GetAge)(THIS_ DWORD flags, LPDWORD pAge) PURE;
+ STDMETHOD(GetAge)(THIS_ DWORD flags, DWORD *age) PURE;
};
#undef INTERFACE
@@ -681,7 +681,7 @@ DECLARE_INTERFACE_(IDirect3DRMDevice3,IDirect3DRMObject)
STDMETHOD(FindPreferredTextureFormat)(THIS_ DWORD BitDepths, DWORD flags, DDPIXELFORMAT *format) PURE;
STDMETHOD(RenderStateChange)(THIS_ D3DRENDERSTATETYPE drsType, DWORD val, DWORD flags) PURE;
STDMETHOD(LightStateChange)(THIS_ D3DLIGHTSTATETYPE drsType, DWORD val, DWORD flags) PURE;
- STDMETHOD(GetStateChangeOptions)(THIS_ DWORD StateClass, DWORD StateNum, LPDWORD pFlags) PURE;
+ STDMETHOD(GetStateChangeOptions)(THIS_ DWORD state_class, DWORD state_idx, DWORD *flags) PURE;
STDMETHOD(SetStateChangeOptions)(THIS_ DWORD StateClass, DWORD StateNum, DWORD flags) PURE;
};
#undef INTERFACE
@@ -1693,9 +1693,9 @@ DECLARE_INTERFACE_(IDirect3DRMFrame3,IDirect3DRMVisual)
STDMETHOD(InverseTransformVectors)(THIS_ IDirect3DRMFrame3 *reference, DWORD vector_count,
D3DVECTOR *dst_vectors, D3DVECTOR *src_vectors) PURE;
STDMETHOD(SetTraversalOptions)(THIS_ DWORD flags) PURE;
- STDMETHOD(GetTraversalOptions)(THIS_ LPDWORD pFlags) PURE;
+ STDMETHOD(GetTraversalOptions)(THIS_ DWORD *flags) PURE;
STDMETHOD(SetSceneFogMethod)(THIS_ DWORD flags) PURE;
- STDMETHOD(GetSceneFogMethod)(THIS_ LPDWORD pFlags) PURE;
+ STDMETHOD(GetSceneFogMethod)(THIS_ DWORD *fog_mode) PURE;
STDMETHOD(SetMaterialOverride)(THIS_ D3DRMMATERIALOVERRIDE *override) PURE;
STDMETHOD(GetMaterialOverride)(THIS_ D3DRMMATERIALOVERRIDE *override) PURE;
};
@@ -2029,12 +2029,12 @@ DECLARE_INTERFACE_(IDirect3DRMProgressiveMesh,IDirect3DRMVisual)
STDMETHOD(GetLoadStatus) (THIS_ D3DRMPMESHLOADSTATUS *status) PURE;
STDMETHOD(SetMinRenderDetail) (THIS_ D3DVALUE d3dVal) PURE;
STDMETHOD(Abort) (THIS_ DWORD flags) PURE;
- STDMETHOD(GetFaceDetail) (THIS_ LPDWORD pCount) PURE;
- STDMETHOD(GetVertexDetail) (THIS_ LPDWORD pCount) PURE;
+ STDMETHOD(GetFaceDetail) (THIS_ DWORD *count) PURE;
+ STDMETHOD(GetVertexDetail) (THIS_ DWORD *count) PURE;
STDMETHOD(SetFaceDetail) (THIS_ DWORD count) PURE;
STDMETHOD(SetVertexDetail) (THIS_ DWORD count) PURE;
- STDMETHOD(GetFaceDetailRange) (THIS_ LPDWORD pMin, LPDWORD pMax) PURE;
- STDMETHOD(GetVertexDetailRange) (THIS_ LPDWORD pMin, LPDWORD pMax) PURE;
+ STDMETHOD(GetFaceDetailRange) (THIS_ DWORD *min_detail, DWORD *max_detail) PURE;
+ STDMETHOD(GetVertexDetailRange) (THIS_ DWORD *min_detail, DWORD *max_detail) PURE;
STDMETHOD(GetDetail) (THIS_ D3DVALUE *pdvVal) PURE;
STDMETHOD(SetDetail) (THIS_ D3DVALUE d3dVal) PURE;
STDMETHOD(RegisterEvents) (THIS_ HANDLE event, DWORD flags, DWORD reserved) PURE;
@@ -2204,7 +2204,7 @@ DECLARE_INTERFACE_(IDirect3DRMShadow2,IDirect3DRMVisual)
D3DVALUE *nx, D3DVALUE *ny, D3DVALUE *nz) PURE;
STDMETHOD(SetPlane)(THIS_ D3DVALUE px, D3DVALUE py, D3DVALUE pz,
D3DVALUE nx, D3DVALUE ny, D3DVALUE nz, DWORD) PURE;
- STDMETHOD(GetOptions)(THIS_ LPDWORD) PURE;
+ STDMETHOD(GetOptions)(THIS_ DWORD *flags) PURE;
STDMETHOD(SetOptions)(THIS_ DWORD) PURE;
};
#undef INTERFACE
@@ -3463,7 +3463,7 @@ DECLARE_INTERFACE_(IDirect3DRMTexture3, IDirect3DRMVisual)
STDMETHOD(GenerateMIPMap)(THIS_ DWORD) PURE;
STDMETHOD(GetSurface)(THIS_ DWORD flags, IDirectDrawSurface **surface) PURE;
STDMETHOD(SetCacheOptions)(THIS_ LONG lImportance, DWORD dwFlags) PURE;
- STDMETHOD(GetCacheOptions)(THIS_ LPLONG lplImportance, LPDWORD lpdwFlags) PURE;
+ STDMETHOD(GetCacheOptions)(THIS_ LONG *importance, DWORD *flags) PURE;
STDMETHOD(SetDownsampleCallback)(THIS_ D3DRMDOWNSAMPLECALLBACK cb, void *ctx) PURE;
STDMETHOD(SetValidationCallback)(THIS_ D3DRMVALIDATIONCALLBACK cb, void *ctx) PURE;
};
@@ -4643,7 +4643,7 @@ DECLARE_INTERFACE_(IDirect3DRMClippedVisual, IDirect3DRMVisual)
STDMETHOD(AddPlane) (THIS_ IDirect3DRMFrame3 *reference, D3DVECTOR *point,
D3DVECTOR *normal, DWORD flags, DWORD *id) PURE;
STDMETHOD(DeletePlane)(THIS_ DWORD, DWORD) PURE;
- STDMETHOD(GetPlaneIDs)(THIS_ LPDWORD, LPDWORD, DWORD) PURE;
+ STDMETHOD(GetPlaneIDs)(THIS_ DWORD *count, DWORD *id, DWORD flags) PURE;
STDMETHOD(GetPlane) (THIS_ DWORD id, IDirect3DRMFrame3 *reference, D3DVECTOR *point,
D3DVECTOR *normal, DWORD flags) PURE;
STDMETHOD(SetPlane) (THIS_ DWORD id, IDirect3DRMFrame3 *reference, D3DVECTOR *point,
--
1.8.1.5
More information about the wine-patches
mailing list