Skip to content

W
wine-winehq
Commit 7a0390d8 authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard
Browse files
Options

d3drm: Avoid VOID.

parent bff80b8b
Show whitespace changes
Inline Side-by-side
Showing with 22 additions and 35 deletions
dlls/d3drm/frame.c
View file @ 7a0390d8
...@@ -606,12 +606,10 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_AddLight(IDirect3DRMFrame2 *iface, I ...@@ -606,12 +606,10 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_AddLight(IDirect3DRMFrame2 *iface, I
return IDirect3DRMFrame3_AddLight(&This->IDirect3DRMFrame3_iface, light); return IDirect3DRMFrame3_AddLight(&This->IDirect3DRMFrame3_iface, light);
} }
static HRESULT WINAPI IDirect3DRMFrame2Impl_AddMoveCallback(IDirect3DRMFrame2* iface, static HRESULT WINAPI IDirect3DRMFrame2Impl_AddMoveCallback(IDirect3DRMFrame2 *iface,
D3DRMFRAMEMOVECALLBACK cb, VOID *arg) D3DRMFRAMEMOVECALLBACK cb, void *ctx)
{ {
IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); FIXME("iface %p, cb %p, ctx %p stub!\n", iface, cb, ctx);
FIXME("(%p/%p)->(%p,%p): stub\n", iface, This, cb, arg);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -910,12 +908,10 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_DeleteLight(IDirect3DRMFrame2 *iface ...@@ -910,12 +908,10 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_DeleteLight(IDirect3DRMFrame2 *iface
return IDirect3DRMFrame3_DeleteLight(&This->IDirect3DRMFrame3_iface, light); return IDirect3DRMFrame3_DeleteLight(&This->IDirect3DRMFrame3_iface, light);
} }
static HRESULT WINAPI IDirect3DRMFrame2Impl_DeleteMoveCallback(IDirect3DRMFrame2* iface, static HRESULT WINAPI IDirect3DRMFrame2Impl_DeleteMoveCallback(IDirect3DRMFrame2 *iface,
D3DRMFRAMEMOVECALLBACK cb, VOID *arg) D3DRMFRAMEMOVECALLBACK cb, void *ctx)
{ {
IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); FIXME("iface %p, cb %p, ctx %p stub!\n", iface, cb, ctx);
FIXME("(%p/%p)->(%p,%p): stub\n", iface, This, cb, arg);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -1187,13 +1183,10 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_Transform(IDirect3DRMFrame2* iface, ...@@ -1187,13 +1183,10 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_Transform(IDirect3DRMFrame2* iface,
} }
/*** IDirect3DRMFrame2 methods ***/ /*** IDirect3DRMFrame2 methods ***/
static HRESULT WINAPI IDirect3DRMFrame2Impl_AddMoveCallback2(IDirect3DRMFrame2* iface, static HRESULT WINAPI IDirect3DRMFrame2Impl_AddMoveCallback2(IDirect3DRMFrame2 *iface,
D3DRMFRAMEMOVECALLBACK cb, VOID *arg, D3DRMFRAMEMOVECALLBACK cb, void *ctx, DWORD flags)
DWORD flags)
{ {
IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); FIXME("iface %p, cb %p, ctx %p, flags %#x stub!\n", iface, cb, ctx, flags);
FIXME("(%p/%p)->(%p,%p,%u): stub\n", iface, This, cb, arg, flags);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -1527,13 +1520,10 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_AddLight(IDirect3DRMFrame3 *iface, I ...@@ -1527,13 +1520,10 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_AddLight(IDirect3DRMFrame3 *iface, I
return D3DRM_OK; return D3DRM_OK;
} }
static HRESULT WINAPI IDirect3DRMFrame3Impl_AddMoveCallback(IDirect3DRMFrame3* iface, static HRESULT WINAPI IDirect3DRMFrame3Impl_AddMoveCallback(IDirect3DRMFrame3 *iface,
D3DRMFRAME3MOVECALLBACK cb, VOID *arg, D3DRMFRAME3MOVECALLBACK cb, void *ctx, DWORD flags)
DWORD flags)
{ {
IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface); FIXME("iface %p, cb %p, ctx %p flags %#x stub!\n", iface, cb, ctx, flags);
FIXME("(%p/%p)->(%p,%p,%u): stub\n", iface, This, cb, arg, flags);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -1922,13 +1912,10 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_DeleteLight(IDirect3DRMFrame3 *iface ...@@ -1922,13 +1912,10 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_DeleteLight(IDirect3DRMFrame3 *iface
return D3DRM_OK; return D3DRM_OK;
} }
static HRESULT WINAPI IDirect3DRMFrame3Impl_DeleteMoveCallback(IDirect3DRMFrame3* iface, static HRESULT WINAPI IDirect3DRMFrame3Impl_DeleteMoveCallback(IDirect3DRMFrame3 *iface,
D3DRMFRAME3MOVECALLBACK cb, D3DRMFRAME3MOVECALLBACK cb, void *ctx)
VOID *arg)
{ {
IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface); FIXME("iface %p, cb %p, ctx %p stub!\n", iface, cb, ctx);
FIXME("(%p/%p)->(%p,%p): stub\n", iface, This, cb, arg);
return E_NOTIMPL; return E_NOTIMPL;
} }
......
include/d3drmobj.h
View file @ 7a0390d8
...@@ -1098,7 +1098,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame,IDirect3DRMVisual) ...@@ -1098,7 +1098,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame,IDirect3DRMVisual)
/*** IDirect3DRMFrame methods ***/ /*** IDirect3DRMFrame methods ***/
STDMETHOD(AddChild)(THIS_ IDirect3DRMFrame *child) PURE; STDMETHOD(AddChild)(THIS_ IDirect3DRMFrame *child) PURE;
STDMETHOD(AddLight)(THIS_ struct IDirect3DRMLight *light) PURE; STDMETHOD(AddLight)(THIS_ struct IDirect3DRMLight *light) PURE;
STDMETHOD(AddMoveCallback)(THIS_ D3DRMFRAMEMOVECALLBACK, VOID *arg) PURE; STDMETHOD(AddMoveCallback)(THIS_ D3DRMFRAMEMOVECALLBACK cb, void *ctx) PURE;
STDMETHOD(AddTransform)(THIS_ D3DRMCOMBINETYPE, D3DRMMATRIX4D) PURE; STDMETHOD(AddTransform)(THIS_ D3DRMCOMBINETYPE, D3DRMMATRIX4D) PURE;
STDMETHOD(AddTranslation)(THIS_ D3DRMCOMBINETYPE, D3DVALUE x, D3DVALUE y, D3DVALUE z) PURE; STDMETHOD(AddTranslation)(THIS_ D3DRMCOMBINETYPE, D3DVALUE x, D3DVALUE y, D3DVALUE z) PURE;
STDMETHOD(AddScale)(THIS_ D3DRMCOMBINETYPE, D3DVALUE sx, D3DVALUE sy, D3DVALUE sz) PURE; STDMETHOD(AddScale)(THIS_ D3DRMCOMBINETYPE, D3DVALUE sx, D3DVALUE sy, D3DVALUE sz) PURE;
...@@ -1127,7 +1127,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame,IDirect3DRMVisual) ...@@ -1127,7 +1127,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame,IDirect3DRMVisual)
STDMETHOD(Move)(THIS_ D3DVALUE delta) PURE; STDMETHOD(Move)(THIS_ D3DVALUE delta) PURE;
STDMETHOD(DeleteChild)(THIS_ IDirect3DRMFrame *child) PURE; STDMETHOD(DeleteChild)(THIS_ IDirect3DRMFrame *child) PURE;
STDMETHOD(DeleteLight)(THIS_ struct IDirect3DRMLight *light) PURE; STDMETHOD(DeleteLight)(THIS_ struct IDirect3DRMLight *light) PURE;
STDMETHOD(DeleteMoveCallback)(THIS_ D3DRMFRAMEMOVECALLBACK, VOID *arg) PURE; STDMETHOD(DeleteMoveCallback)(THIS_ D3DRMFRAMEMOVECALLBACK cb, void *ctx) PURE;
STDMETHOD(DeleteVisual)(THIS_ IDirect3DRMVisual *visual) PURE; STDMETHOD(DeleteVisual)(THIS_ IDirect3DRMVisual *visual) PURE;
STDMETHOD_(D3DCOLOR, GetSceneBackground)(THIS) PURE; STDMETHOD_(D3DCOLOR, GetSceneBackground)(THIS) PURE;
STDMETHOD(GetSceneBackgroundDepth)(THIS_ IDirectDrawSurface **surface) PURE; STDMETHOD(GetSceneBackgroundDepth)(THIS_ IDirectDrawSurface **surface) PURE;
...@@ -1331,7 +1331,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame2,IDirect3DRMFrame) ...@@ -1331,7 +1331,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame2,IDirect3DRMFrame)
/*** IDirect3DRMFrame methods ***/ /*** IDirect3DRMFrame methods ***/
STDMETHOD(AddChild)(THIS_ IDirect3DRMFrame *child) PURE; STDMETHOD(AddChild)(THIS_ IDirect3DRMFrame *child) PURE;
STDMETHOD(AddLight)(THIS_ struct IDirect3DRMLight *light) PURE; STDMETHOD(AddLight)(THIS_ struct IDirect3DRMLight *light) PURE;
STDMETHOD(AddMoveCallback)(THIS_ D3DRMFRAMEMOVECALLBACK, VOID *arg) PURE; STDMETHOD(AddMoveCallback)(THIS_ D3DRMFRAMEMOVECALLBACK cb, void *ctx) PURE;
STDMETHOD(AddTransform)(THIS_ D3DRMCOMBINETYPE, D3DRMMATRIX4D) PURE; STDMETHOD(AddTransform)(THIS_ D3DRMCOMBINETYPE, D3DRMMATRIX4D) PURE;
STDMETHOD(AddTranslation)(THIS_ D3DRMCOMBINETYPE, D3DVALUE x, D3DVALUE y, D3DVALUE z) PURE; STDMETHOD(AddTranslation)(THIS_ D3DRMCOMBINETYPE, D3DVALUE x, D3DVALUE y, D3DVALUE z) PURE;
STDMETHOD(AddScale)(THIS_ D3DRMCOMBINETYPE, D3DVALUE sx, D3DVALUE sy, D3DVALUE sz) PURE; STDMETHOD(AddScale)(THIS_ D3DRMCOMBINETYPE, D3DVALUE sx, D3DVALUE sy, D3DVALUE sz) PURE;
...@@ -1360,7 +1360,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame2,IDirect3DRMFrame) ...@@ -1360,7 +1360,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame2,IDirect3DRMFrame)
STDMETHOD(Move)(THIS_ D3DVALUE delta) PURE; STDMETHOD(Move)(THIS_ D3DVALUE delta) PURE;
STDMETHOD(DeleteChild)(THIS_ IDirect3DRMFrame *child) PURE; STDMETHOD(DeleteChild)(THIS_ IDirect3DRMFrame *child) PURE;
STDMETHOD(DeleteLight)(THIS_ struct IDirect3DRMLight *light) PURE; STDMETHOD(DeleteLight)(THIS_ struct IDirect3DRMLight *light) PURE;
STDMETHOD(DeleteMoveCallback)(THIS_ D3DRMFRAMEMOVECALLBACK, VOID *arg) PURE; STDMETHOD(DeleteMoveCallback)(THIS_ D3DRMFRAMEMOVECALLBACK cb, void *ctx) PURE;
STDMETHOD(DeleteVisual)(THIS_ IDirect3DRMVisual *visual) PURE; STDMETHOD(DeleteVisual)(THIS_ IDirect3DRMVisual *visual) PURE;
STDMETHOD_(D3DCOLOR, GetSceneBackground)(THIS) PURE; STDMETHOD_(D3DCOLOR, GetSceneBackground)(THIS) PURE;
STDMETHOD(GetSceneBackgroundDepth)(THIS_ IDirectDrawSurface **surface) PURE; STDMETHOD(GetSceneBackgroundDepth)(THIS_ IDirectDrawSurface **surface) PURE;
...@@ -1392,7 +1392,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame2,IDirect3DRMFrame) ...@@ -1392,7 +1392,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame2,IDirect3DRMFrame)
STDMETHOD(SetZbufferMode)(THIS_ D3DRMZBUFFERMODE) PURE; STDMETHOD(SetZbufferMode)(THIS_ D3DRMZBUFFERMODE) PURE;
STDMETHOD(Transform)(THIS_ D3DVECTOR *d, D3DVECTOR *s) PURE; STDMETHOD(Transform)(THIS_ D3DVECTOR *d, D3DVECTOR *s) PURE;
/*** IDirect3DRMFrame2 methods ***/ /*** IDirect3DRMFrame2 methods ***/
STDMETHOD(AddMoveCallback2)(THIS_ D3DRMFRAMEMOVECALLBACK, VOID *arg, DWORD flags) PURE; STDMETHOD(AddMoveCallback2)(THIS_ D3DRMFRAMEMOVECALLBACK cb, void *ctx, DWORD flags) PURE;
STDMETHOD(GetBox)(THIS_ D3DRMBOX *box) PURE; STDMETHOD(GetBox)(THIS_ D3DRMBOX *box) PURE;
STDMETHOD_(BOOL, GetBoxEnable)(THIS) PURE; STDMETHOD_(BOOL, GetBoxEnable)(THIS) PURE;
STDMETHOD(GetAxes)(THIS_ D3DVECTOR *dir, D3DVECTOR *up); STDMETHOD(GetAxes)(THIS_ D3DVECTOR *dir, D3DVECTOR *up);
...@@ -1613,7 +1613,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame3,IDirect3DRMVisual) ...@@ -1613,7 +1613,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame3,IDirect3DRMVisual)
/*** IDirect3DRMFrame3 methods ***/ /*** IDirect3DRMFrame3 methods ***/
STDMETHOD(AddChild)(THIS_ IDirect3DRMFrame3 *child) PURE; STDMETHOD(AddChild)(THIS_ IDirect3DRMFrame3 *child) PURE;
STDMETHOD(AddLight)(THIS_ struct IDirect3DRMLight *light) PURE; STDMETHOD(AddLight)(THIS_ struct IDirect3DRMLight *light) PURE;
STDMETHOD(AddMoveCallback)(THIS_ D3DRMFRAME3MOVECALLBACK, VOID *arg, DWORD flags) PURE; STDMETHOD(AddMoveCallback)(THIS_ D3DRMFRAME3MOVECALLBACK cb, void *ctx, DWORD flags) PURE;
STDMETHOD(AddTransform)(THIS_ D3DRMCOMBINETYPE, D3DRMMATRIX4D) PURE; STDMETHOD(AddTransform)(THIS_ D3DRMCOMBINETYPE, D3DRMMATRIX4D) PURE;
STDMETHOD(AddTranslation)(THIS_ D3DRMCOMBINETYPE, D3DVALUE x, D3DVALUE y, D3DVALUE z) PURE; STDMETHOD(AddTranslation)(THIS_ D3DRMCOMBINETYPE, D3DVALUE x, D3DVALUE y, D3DVALUE z) PURE;
STDMETHOD(AddScale)(THIS_ D3DRMCOMBINETYPE, D3DVALUE sx, D3DVALUE sy, D3DVALUE sz) PURE; STDMETHOD(AddScale)(THIS_ D3DRMCOMBINETYPE, D3DVALUE sx, D3DVALUE sy, D3DVALUE sz) PURE;
...@@ -1641,7 +1641,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame3,IDirect3DRMVisual) ...@@ -1641,7 +1641,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame3,IDirect3DRMVisual)
STDMETHOD(Move)(THIS_ D3DVALUE delta) PURE; STDMETHOD(Move)(THIS_ D3DVALUE delta) PURE;
STDMETHOD(DeleteChild)(THIS_ IDirect3DRMFrame3 *child) PURE; STDMETHOD(DeleteChild)(THIS_ IDirect3DRMFrame3 *child) PURE;
STDMETHOD(DeleteLight)(THIS_ struct IDirect3DRMLight *light) PURE; STDMETHOD(DeleteLight)(THIS_ struct IDirect3DRMLight *light) PURE;
STDMETHOD(DeleteMoveCallback)(THIS_ D3DRMFRAME3MOVECALLBACK, VOID *arg) PURE; STDMETHOD(DeleteMoveCallback)(THIS_ D3DRMFRAME3MOVECALLBACK cb, void *ctx) PURE;
STDMETHOD(DeleteVisual)(THIS_ IUnknown *visual) PURE; STDMETHOD(DeleteVisual)(THIS_ IUnknown *visual) PURE;
STDMETHOD_(D3DCOLOR, GetSceneBackground)(THIS) PURE; STDMETHOD_(D3DCOLOR, GetSceneBackground)(THIS) PURE;
STDMETHOD(GetSceneBackgroundDepth)(THIS_ IDirectDrawSurface **surface) PURE; STDMETHOD(GetSceneBackgroundDepth)(THIS_ IDirectDrawSurface **surface) PURE;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment