[PATCH 4/5] d3drm: Avoid LPDIRECT3DRMVISUAL.
Henri Verbeet
hverbeet at codeweavers.com
Mon Apr 22 08:18:45 CDT 2013
---
dlls/d3drm/d3drm.c | 32 +++++++++++++-------------------
dlls/d3drm/frame.c | 26 ++++++++++++--------------
dlls/d3drm/tests/d3drm.c | 18 +++++++++---------
include/d3drm.h | 12 +++++++-----
include/d3drmobj.h | 24 +++++++++++++-----------
5 files changed, 54 insertions(+), 58 deletions(-)
diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c
index 2f16152..15524cd 100644
--- a/dlls/d3drm/d3drm.c
+++ b/dlls/d3drm/d3drm.c
@@ -281,11 +281,12 @@ static HRESULT WINAPI IDirect3DRMImpl_CreateTextureFromSurface(IDirect3DRM *ifac
return E_NOTIMPL;
}
-static HRESULT WINAPI IDirect3DRMImpl_CreateShadow(IDirect3DRM* iface, LPDIRECT3DRMVISUAL pVisual, LPDIRECT3DRMLIGHT pLight, D3DVALUE px, D3DVALUE py, D3DVALUE pz, D3DVALUE nx, D3DVALUE ny, D3DVALUE nz, LPDIRECT3DRMVISUAL * ppVisual)
+static HRESULT WINAPI IDirect3DRMImpl_CreateShadow(IDirect3DRM *iface, IDirect3DRMVisual *visual,
+ IDirect3DRMLight *light, D3DVALUE px, D3DVALUE py, D3DVALUE pz, D3DVALUE nx, D3DVALUE ny, D3DVALUE nz,
+ IDirect3DRMVisual **shadow)
{
- IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface);
-
- FIXME("(%p/%p)->(%p,%p,%f,%f,%f,%f,%f,%f,%p): stub\n", iface, This, pVisual, pLight, px, py, pz, nx, ny, nz, ppVisual);
+ FIXME("iface %p, visual %p, light %p, px %.8e, py %.8e, pz %.8e, nx %.8e, ny %.8e, nz %.8e, shadow %p stub!\n",
+ iface, visual, light, px, py, pz, nx, ny, nz, shadow);
return E_NOTIMPL;
}
@@ -665,16 +666,12 @@ static HRESULT WINAPI IDirect3DRM2Impl_CreateTextureFromSurface(IDirect3DRM2 *if
return E_NOTIMPL;
}
-static HRESULT WINAPI IDirect3DRM2Impl_CreateShadow(IDirect3DRM2* iface, LPDIRECT3DRMVISUAL pVisual,
- LPDIRECT3DRMLIGHT pLight,
- D3DVALUE px, D3DVALUE py, D3DVALUE pz,
- D3DVALUE nx, D3DVALUE ny, D3DVALUE nz,
- LPDIRECT3DRMVISUAL * ppVisual)
+static HRESULT WINAPI IDirect3DRM2Impl_CreateShadow(IDirect3DRM2 *iface, IDirect3DRMVisual *visual,
+ IDirect3DRMLight *light, D3DVALUE px, D3DVALUE py, D3DVALUE pz, D3DVALUE nx, D3DVALUE ny, D3DVALUE nz,
+ IDirect3DRMVisual **shadow)
{
- IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface);
-
- FIXME("(%p/%p)->(%p,%p,%f,%f,%f,%f,%f,%f,%p): stub\n", iface, This, pVisual, pLight, px, py, pz,
- nx, ny, nz, ppVisual);
+ FIXME("iface %p, visual %p, light %p, px %.8e, py %.8e, pz %.8e, nx %.8e, ny %.8e, nz %.8e, shadow %p stub!\n",
+ iface, visual, light, px, py, pz, nx, ny, nz, shadow);
return E_NOTIMPL;
}
@@ -1580,13 +1577,10 @@ static HRESULT WINAPI IDirect3DRM3Impl_UnregisterClient(IDirect3DRM3* iface, REF
return E_NOTIMPL;
}
-static HRESULT WINAPI IDirect3DRM3Impl_CreateClippedVisual(IDirect3DRM3* iface,
- LPDIRECT3DRMVISUAL vis,
- LPDIRECT3DRMCLIPPEDVISUAL* clippedvis)
+static HRESULT WINAPI IDirect3DRM3Impl_CreateClippedVisual(IDirect3DRM3 *iface,
+ IDirect3DRMVisual *visual, IDirect3DRMClippedVisual **clipped_visual)
{
- IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface);
-
- FIXME("(%p/%p)->(%p, %p): stub\n", iface, This, vis, clippedvis);
+ FIXME("iface %p, visual %p, clipped_visual %p stub!\n", iface, visual, clipped_visual);
return E_NOTIMPL;
}
diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c
index cdfd516..f539dd1 100644
--- a/dlls/d3drm/frame.c
+++ b/dlls/d3drm/frame.c
@@ -69,7 +69,7 @@ typedef struct {
IDirect3DRMVisualArray IDirect3DRMVisualArray_iface;
LONG ref;
ULONG size;
- LPDIRECT3DRMVISUAL* visuals;
+ IDirect3DRMVisual **visuals;
} IDirect3DRMVisualArrayImpl;
typedef struct {
@@ -275,7 +275,8 @@ static DWORD WINAPI IDirect3DRMVisualArrayImpl_GetSize(IDirect3DRMVisualArray* i
}
/*** IDirect3DRMVisualArray methods ***/
-static HRESULT WINAPI IDirect3DRMVisualArrayImpl_GetElement(IDirect3DRMVisualArray* iface, DWORD index, LPDIRECT3DRMVISUAL* visual)
+static HRESULT WINAPI IDirect3DRMVisualArrayImpl_GetElement(IDirect3DRMVisualArray *iface,
+ DWORD index, IDirect3DRMVisual **visual)
{
IDirect3DRMVisualArrayImpl *This = (IDirect3DRMVisualArrayImpl*)iface;
@@ -675,14 +676,13 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_AddRotation(IDirect3DRMFrame2* iface
return E_NOTIMPL;
}
-static HRESULT WINAPI IDirect3DRMFrame2Impl_AddVisual(IDirect3DRMFrame2* iface,
- LPDIRECT3DRMVISUAL vis)
+static HRESULT WINAPI IDirect3DRMFrame2Impl_AddVisual(IDirect3DRMFrame2 *iface, IDirect3DRMVisual *visual)
{
- IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface);
+ IDirect3DRMFrameImpl *frame = impl_from_IDirect3DRMFrame2(iface);
- TRACE("(%p/%p)->(%p)\n", iface, This, vis);
+ TRACE("iface %p, visual %p.\n", iface, visual);
- return IDirect3DRMFrame3_AddVisual(&This->IDirect3DRMFrame3_iface, (LPUNKNOWN)vis);
+ return IDirect3DRMFrame3_AddVisual(&frame->IDirect3DRMFrame3_iface, (IUnknown *)visual);
}
static HRESULT WINAPI IDirect3DRMFrame2Impl_GetChildren(IDirect3DRMFrame2* iface,
@@ -846,8 +846,7 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_GetVisuals(IDirect3DRMFrame2* iface,
if (This->nb_visuals)
{
ULONG i;
- obj->visuals = HeapAlloc(GetProcessHeap(), 0, This->nb_visuals * sizeof(LPDIRECT3DRMVISUAL));
- if (!obj->visuals)
+ if (!(obj->visuals = HeapAlloc(GetProcessHeap(), 0, This->nb_visuals * sizeof(*obj->visuals))))
return E_OUTOFMEMORY;
for (i = 0; i < This->nb_visuals; i++)
{
@@ -945,14 +944,13 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_DeleteMoveCallback(IDirect3DRMFrame2
return E_NOTIMPL;
}
-static HRESULT WINAPI IDirect3DRMFrame2Impl_DeleteVisual(IDirect3DRMFrame2* iface,
- LPDIRECT3DRMVISUAL vis)
+static HRESULT WINAPI IDirect3DRMFrame2Impl_DeleteVisual(IDirect3DRMFrame2 *iface, IDirect3DRMVisual *visual)
{
- IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface);
+ IDirect3DRMFrameImpl *frame = impl_from_IDirect3DRMFrame2(iface);
- TRACE("(%p/%p)->(%p)\n", iface, This, vis);
+ TRACE("iface %p, visual %p.\n", iface, visual);
- return IDirect3DRMFrame3_DeleteVisual(&This->IDirect3DRMFrame3_iface, (LPUNKNOWN)vis);
+ return IDirect3DRMFrame3_DeleteVisual(&frame->IDirect3DRMFrame3_iface, (IUnknown *)visual);
}
static D3DCOLOR WINAPI IDirect3DRMFrame2Impl_GetSceneBackground(IDirect3DRMFrame2* iface)
diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c
index 45b59ed..e63bec2 100644
--- a/dlls/d3drm/tests/d3drm.c
+++ b/dlls/d3drm/tests/d3drm.c
@@ -676,8 +676,8 @@ static void test_Frame(void)
IDirect3DRMFrame *pFrameTmp;
LPDIRECT3DRMFRAMEARRAY pArray;
LPDIRECT3DRMMESHBUILDER pMeshBuilder;
- LPDIRECT3DRMVISUAL pVisual1;
- LPDIRECT3DRMVISUAL pVisualTmp;
+ IDirect3DRMVisual *visual1;
+ IDirect3DRMVisual *visual_tmp;
LPDIRECT3DRMVISUALARRAY pVisualArray;
LPDIRECT3DRMLIGHT pLight1;
LPDIRECT3DRMLIGHT pLightTmp;
@@ -909,13 +909,13 @@ static void test_Frame(void)
/* Create Visual */
hr = IDirect3DRM_CreateMeshBuilder(d3drm, &pMeshBuilder);
ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder interface (hr = %x)\n", hr);
- pVisual1 = (LPDIRECT3DRMVISUAL)pMeshBuilder;
+ visual1 = (IDirect3DRMVisual *)pMeshBuilder;
/* Add Visual to first parent */
- hr = IDirect3DRMFrame_AddVisual(pFrameP1, pVisual1);
+ hr = IDirect3DRMFrame_AddVisual(pFrameP1, visual1);
ok(hr == D3DRM_OK, "Cannot add visual (hr = %x)\n", hr);
CHECK_REFCOUNT(pFrameP1, 3);
- CHECK_REFCOUNT(pVisual1, 2);
+ CHECK_REFCOUNT(visual1, 2);
pVisualArray = NULL;
hr = IDirect3DRMFrame_GetVisuals(pFrameP1, &pVisualArray);
@@ -924,15 +924,15 @@ static void test_Frame(void)
{
count = IDirect3DRMVisualArray_GetSize(pVisualArray);
ok(count == 1, "count = %u\n", count);
- hr = IDirect3DRMVisualArray_GetElement(pVisualArray, 0, &pVisualTmp);
+ hr = IDirect3DRMVisualArray_GetElement(pVisualArray, 0, &visual_tmp);
ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr);
- ok(pVisualTmp == pVisual1, "pVisualTmp = %p\n", pVisualTmp);
- IDirect3DRMVisual_Release(pVisualTmp);
+ ok(visual_tmp == visual1, "visual_tmp = %p\n", visual_tmp);
+ IDirect3DRMVisual_Release(visual_tmp);
IDirect3DRMVisualArray_Release(pVisualArray);
}
/* Delete Visual */
- hr = IDirect3DRMFrame_DeleteVisual(pFrameP1, pVisual1);
+ hr = IDirect3DRMFrame_DeleteVisual(pFrameP1, visual1);
ok(hr == D3DRM_OK, "Cannot delete visual (hr = %x)\n", hr);
CHECK_REFCOUNT(pFrameP1, 3);
IDirect3DRMMeshBuilder_Release(pMeshBuilder);
diff --git a/include/d3drm.h b/include/d3drm.h
index 2910232..528eb43 100644
--- a/include/d3drm.h
+++ b/include/d3drm.h
@@ -77,8 +77,9 @@ DECLARE_INTERFACE_(IDirect3DRM,IUnknown)
int width, int height, IDirect3DRMDevice **device) PURE;
STDMETHOD(CreateTextureFromSurface)(THIS_ IDirectDrawSurface *surface,
IDirect3DRMTexture **texture) PURE;
- STDMETHOD(CreateShadow)(THIS_ LPDIRECT3DRMVISUAL, LPDIRECT3DRMLIGHT, D3DVALUE px, D3DVALUE py, D3DVALUE pz,
- D3DVALUE nx, D3DVALUE ny, D3DVALUE nz, LPDIRECT3DRMVISUAL *) PURE;
+ STDMETHOD(CreateShadow)(THIS_ IDirect3DRMVisual *visual, IDirect3DRMLight *light,
+ D3DVALUE px, D3DVALUE py, D3DVALUE pz, D3DVALUE nx, D3DVALUE ny, D3DVALUE nz,
+ IDirect3DRMVisual **shadow) PURE;
STDMETHOD(CreateViewport)(THIS_ IDirect3DRMDevice *device, IDirect3DRMFrame *camera,
DWORD x, DWORD y, DWORD width, DWORD height, IDirect3DRMViewport **viewport) PURE;
STDMETHOD(CreateWrap)(THIS_ D3DRMWRAPTYPE type, IDirect3DRMFrame *reference, D3DVALUE ox, D3DVALUE oy, D3DVALUE oz,
@@ -214,8 +215,9 @@ DECLARE_INTERFACE_(IDirect3DRM2,IUnknown)
int width, int height, IDirect3DRMDevice2 **device) PURE;
STDMETHOD(CreateTextureFromSurface)(THIS_ IDirectDrawSurface *surface,
IDirect3DRMTexture2 **texture) PURE;
- STDMETHOD(CreateShadow)(THIS_ LPDIRECT3DRMVISUAL, LPDIRECT3DRMLIGHT, D3DVALUE px, D3DVALUE py, D3DVALUE pz,
- D3DVALUE nx, D3DVALUE ny, D3DVALUE nz, LPDIRECT3DRMVISUAL *) PURE;
+ STDMETHOD(CreateShadow)(THIS_ IDirect3DRMVisual *visual, IDirect3DRMLight *light,
+ D3DVALUE px, D3DVALUE py, D3DVALUE pz, D3DVALUE nx, D3DVALUE ny, D3DVALUE nz,
+ IDirect3DRMVisual **shadow) PURE;
STDMETHOD(CreateViewport)(THIS_ IDirect3DRMDevice *device, IDirect3DRMFrame *camera,
DWORD x, DWORD y, DWORD width, DWORD height, IDirect3DRMViewport **viewport) PURE;
STDMETHOD(CreateWrap)(THIS_ D3DRMWRAPTYPE type, IDirect3DRMFrame *reference, D3DVALUE ox, D3DVALUE oy, D3DVALUE oz,
@@ -380,7 +382,7 @@ DECLARE_INTERFACE_(IDirect3DRM3,IUnknown)
STDMETHOD(CreateProgressiveMesh)(THIS_ LPDIRECT3DRMPROGRESSIVEMESH) PURE;
STDMETHOD(RegisterClient)(THIS_ REFGUID rguid, LPDWORD lpdwID) PURE;
STDMETHOD(UnregisterClient)(THIS_ REFGUID rguid) PURE;
- STDMETHOD(CreateClippedVisual)(THIS_ LPDIRECT3DRMVISUAL, LPDIRECT3DRMCLIPPEDVISUAL *) PURE;
+ STDMETHOD(CreateClippedVisual)(THIS_ IDirect3DRMVisual *visual, IDirect3DRMClippedVisual **clipped_visual) PURE;
STDMETHOD(SetOptions)(THIS_ DWORD) PURE;
STDMETHOD(GetOptions)(THIS_ LPDWORD) PURE;
};
diff --git a/include/d3drmobj.h b/include/d3drmobj.h
index f7a47dd..c1c8a4a 100644
--- a/include/d3drmobj.h
+++ b/include/d3drmobj.h
@@ -1103,7 +1103,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame,IDirect3DRMVisual)
STDMETHOD(AddTranslation)(THIS_ D3DRMCOMBINETYPE, D3DVALUE x, D3DVALUE y, D3DVALUE z) PURE;
STDMETHOD(AddScale)(THIS_ D3DRMCOMBINETYPE, D3DVALUE sx, D3DVALUE sy, D3DVALUE sz) PURE;
STDMETHOD(AddRotation)(THIS_ D3DRMCOMBINETYPE, D3DVALUE x, D3DVALUE y, D3DVALUE z, D3DVALUE theta) PURE;
- STDMETHOD(AddVisual)(THIS_ LPDIRECT3DRMVISUAL) PURE;
+ STDMETHOD(AddVisual)(THIS_ IDirect3DRMVisual *visual) PURE;
STDMETHOD(GetChildren)(THIS_ LPDIRECT3DRMFRAMEARRAY *children) PURE;
STDMETHOD_(D3DCOLOR, GetColor)(THIS) PURE;
STDMETHOD(GetLights)(THIS_ LPDIRECT3DRMLIGHTARRAY *lights) PURE;
@@ -1128,7 +1128,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame,IDirect3DRMVisual)
STDMETHOD(DeleteChild)(THIS_ IDirect3DRMFrame *child) PURE;
STDMETHOD(DeleteLight)(THIS_ LPDIRECT3DRMLIGHT) PURE;
STDMETHOD(DeleteMoveCallback)(THIS_ D3DRMFRAMEMOVECALLBACK, VOID *arg) PURE;
- STDMETHOD(DeleteVisual)(THIS_ LPDIRECT3DRMVISUAL) PURE;
+ STDMETHOD(DeleteVisual)(THIS_ IDirect3DRMVisual *visual) PURE;
STDMETHOD_(D3DCOLOR, GetSceneBackground)(THIS) PURE;
STDMETHOD(GetSceneBackgroundDepth)(THIS_ IDirectDrawSurface **surface) PURE;
STDMETHOD_(D3DCOLOR, GetSceneFogColor)(THIS) PURE;
@@ -1336,7 +1336,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame2,IDirect3DRMFrame)
STDMETHOD(AddTranslation)(THIS_ D3DRMCOMBINETYPE, D3DVALUE x, D3DVALUE y, D3DVALUE z) PURE;
STDMETHOD(AddScale)(THIS_ D3DRMCOMBINETYPE, D3DVALUE sx, D3DVALUE sy, D3DVALUE sz) PURE;
STDMETHOD(AddRotation)(THIS_ D3DRMCOMBINETYPE, D3DVALUE x, D3DVALUE y, D3DVALUE z, D3DVALUE theta) PURE;
- STDMETHOD(AddVisual)(THIS_ LPDIRECT3DRMVISUAL) PURE;
+ STDMETHOD(AddVisual)(THIS_ IDirect3DRMVisual *visual) PURE;
STDMETHOD(GetChildren)(THIS_ LPDIRECT3DRMFRAMEARRAY *children) PURE;
STDMETHOD_(D3DCOLOR, GetColor)(THIS) PURE;
STDMETHOD(GetLights)(THIS_ LPDIRECT3DRMLIGHTARRAY *lights) PURE;
@@ -1361,7 +1361,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame2,IDirect3DRMFrame)
STDMETHOD(DeleteChild)(THIS_ IDirect3DRMFrame *child) PURE;
STDMETHOD(DeleteLight)(THIS_ LPDIRECT3DRMLIGHT) PURE;
STDMETHOD(DeleteMoveCallback)(THIS_ D3DRMFRAMEMOVECALLBACK, VOID *arg) PURE;
- STDMETHOD(DeleteVisual)(THIS_ LPDIRECT3DRMVISUAL) PURE;
+ STDMETHOD(DeleteVisual)(THIS_ IDirect3DRMVisual *visual) PURE;
STDMETHOD_(D3DCOLOR, GetSceneBackground)(THIS) PURE;
STDMETHOD(GetSceneBackgroundDepth)(THIS_ IDirectDrawSurface **surface) PURE;
STDMETHOD_(D3DCOLOR, GetSceneFogColor)(THIS) PURE;
@@ -2134,8 +2134,8 @@ DECLARE_INTERFACE_(IDirect3DRMShadow,IDirect3DRMVisual)
STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE;
STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE;
/*** IDirect3DRMShadow methods ***/
- STDMETHOD(Init)(THIS_ LPDIRECT3DRMVISUAL visual, LPDIRECT3DRMLIGHT light,
- D3DVALUE px, D3DVALUE py, D3DVALUE pz, D3DVALUE nx, D3DVALUE ny, D3DVALUE nz) PURE;
+ STDMETHOD(Init)(THIS_ IDirect3DRMVisual *visual, struct IDirect3DRMLight *light,
+ D3DVALUE px, D3DVALUE py, D3DVALUE pz, D3DVALUE nx, D3DVALUE ny, D3DVALUE nz) PURE;
};
#undef INTERFACE
@@ -2196,7 +2196,7 @@ DECLARE_INTERFACE_(IDirect3DRMShadow2,IDirect3DRMVisual)
STDMETHOD(Init)(THIS_ LPUNKNOWN pUNK, LPDIRECT3DRMLIGHT light,
D3DVALUE px, D3DVALUE py, D3DVALUE pz, D3DVALUE nx, D3DVALUE ny, D3DVALUE nz) PURE;
/*** IDirect3DRMShadow2 methods ***/
- STDMETHOD(GetVisual)(THIS_ LPDIRECT3DRMVISUAL *) PURE;
+ STDMETHOD(GetVisual)(THIS_ IDirect3DRMVisual **visual) PURE;
STDMETHOD(SetVisual)(THIS_ LPUNKNOWN pUNK, DWORD) PURE;
STDMETHOD(GetLight)(THIS_ LPDIRECT3DRMLIGHT *) PURE;
STDMETHOD(SetLight)(THIS_ LPDIRECT3DRMLIGHT, DWORD) PURE;
@@ -4332,7 +4332,7 @@ DECLARE_INTERFACE_(IDirect3DRMVisualArray, IDirect3DRMArray)
/*** IDirect3DRMArray methods ***/
STDMETHOD_(DWORD, GetSize)(THIS) PURE;
/*** IDirect3DRMVisualArray methods ***/
- STDMETHOD(GetElement)(THIS_ DWORD index, LPDIRECT3DRMVISUAL *) PURE;
+ STDMETHOD(GetElement)(THIS_ DWORD index, IDirect3DRMVisual **element) PURE;
};
#undef INTERFACE
@@ -4406,7 +4406,8 @@ DECLARE_INTERFACE_(IDirect3DRMPickedArray, IDirect3DRMArray)
/*** IDirect3DRMArray methods ***/
STDMETHOD_(DWORD, GetSize)(THIS) PURE;
/*** IDirect3DRMPickedArray methods ***/
- STDMETHOD(GetPick)(THIS_ DWORD index, LPDIRECT3DRMVISUAL *, LPDIRECT3DRMFRAMEARRAY *, LPD3DRMPICKDESC) PURE;
+ STDMETHOD(GetPick)(THIS_ DWORD index, IDirect3DRMVisual **visual,
+ IDirect3DRMFrameArray **frame_array, D3DRMPICKDESC *pick_desc) PURE;
};
#undef INTERFACE
@@ -4517,7 +4518,8 @@ DECLARE_INTERFACE_(IDirect3DRMPicked2Array, IDirect3DRMArray)
/*** IDirect3DRMArray methods ***/
STDMETHOD_(DWORD, GetSize)(THIS) PURE;
/*** IDirect3DRMPicked2Array methods ***/
- STDMETHOD(GetPick)(THIS_ DWORD index, LPDIRECT3DRMVISUAL *, LPDIRECT3DRMFRAMEARRAY *, LPD3DRMPICKDESC2) PURE;
+ STDMETHOD(GetPick)(THIS_ DWORD index, IDirect3DRMVisual **visual,
+ IDirect3DRMFrameArray **frame_array, D3DRMPICKDESC2 *pick_desc) PURE;
};
#undef INTERFACE
@@ -4634,7 +4636,7 @@ DECLARE_INTERFACE_(IDirect3DRMClippedVisual, IDirect3DRMVisual)
STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE;
STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE;
/*** IDirect3DRMClippedVisual methods ***/
- STDMETHOD(Init) (THIS_ LPDIRECT3DRMVISUAL) PURE;
+ STDMETHOD(Init) (THIS_ IDirect3DRMVisual *visual) PURE;
STDMETHOD(AddPlane) (THIS_ IDirect3DRMFrame3 *reference, D3DVECTOR *point,
D3DVECTOR *normal, DWORD flags, DWORD *id) PURE;
STDMETHOD(DeletePlane)(THIS_ DWORD, DWORD) PURE;
--
1.8.1.5
More information about the wine-patches
mailing list