Skip to content

W
wine-cw
Commit be6b54f5 authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard
Browse files
Options

d3drm: Avoid LPUNKNOWN.

parent 19b8ba0c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 89 additions and 147 deletions
dlls/d3drm/d3drm.c
View file @ be6b54f5
...@@ -128,11 +128,11 @@ static ULONG WINAPI IDirect3DRMImpl_Release(IDirect3DRM* iface) ...@@ -128,11 +128,11 @@ static ULONG WINAPI IDirect3DRMImpl_Release(IDirect3DRM* iface)
} }
/*** IDirect3DRM methods ***/ /*** IDirect3DRM methods ***/
static HRESULT WINAPI IDirect3DRMImpl_CreateObject(IDirect3DRM* iface, REFCLSID rclsid, LPUNKNOWN pUnkOuter, REFIID riid, LPVOID *ppvObj) static HRESULT WINAPI IDirect3DRMImpl_CreateObject(IDirect3DRM *iface,
REFCLSID clsid, IUnknown *outer, REFIID iid, void **out)
{ {
IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface); FIXME("iface %p, clsid %s, outer %p, iid %s, out %p stub!\n",
iface, debugstr_guid(clsid), outer, debugstr_guid(iid), out);
FIXME("(%p/%p)->(%s,%p,%s,%p): stub\n", iface, This, debugstr_guid(rclsid), pUnkOuter, debugstr_guid(riid), ppvObj);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -492,14 +492,11 @@ static ULONG WINAPI IDirect3DRM2Impl_Release(IDirect3DRM2* iface) ...@@ -492,14 +492,11 @@ static ULONG WINAPI IDirect3DRM2Impl_Release(IDirect3DRM2* iface)
} }
/*** IDirect3DRM2 methods ***/ /*** IDirect3DRM2 methods ***/
static HRESULT WINAPI IDirect3DRM2Impl_CreateObject(IDirect3DRM2* iface, REFCLSID rclsid, static HRESULT WINAPI IDirect3DRM2Impl_CreateObject(IDirect3DRM2 *iface,
LPUNKNOWN pUnkOuter, REFIID riid, REFCLSID clsid, IUnknown *outer, REFIID iid, void **out)
LPVOID *ppvObj)
{ {
IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface); FIXME("iface %p, clsid %s, outer %p, iid %s, out %p stub!\n",
iface, debugstr_guid(clsid), outer, debugstr_guid(iid), out);
FIXME("(%p/%p)->(%s,%p,%s,%p): stub\n", iface, This, debugstr_guid(rclsid), pUnkOuter,
debugstr_guid(riid), ppvObj);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -872,13 +869,11 @@ static ULONG WINAPI IDirect3DRM3Impl_Release(IDirect3DRM3* iface) ...@@ -872,13 +869,11 @@ static ULONG WINAPI IDirect3DRM3Impl_Release(IDirect3DRM3* iface)
} }
/*** IDirect3DRM3 methods ***/ /*** IDirect3DRM3 methods ***/
static HRESULT WINAPI IDirect3DRM3Impl_CreateObject(IDirect3DRM3* iface, REFCLSID rclsid, static HRESULT WINAPI IDirect3DRM3Impl_CreateObject(IDirect3DRM3 *iface,
LPUNKNOWN unkwn, REFIID riid, LPVOID* object) REFCLSID clsid, IUnknown *outer, REFIID iid, void **out)
{ {
IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface); FIXME("iface %p, clsid %s, outer %p, iid %s, out %p stub!\n",
iface, debugstr_guid(clsid), outer, debugstr_guid(iid), out);
FIXME("(%p/%p)->(%s,%p,%s,%p): stub\n", iface, This, debugstr_guid(rclsid), unkwn,
debugstr_guid(riid), object);
return E_NOTIMPL; return E_NOTIMPL;
} }
......
dlls/d3drm/device.c
View file @ be6b54f5
...@@ -119,13 +119,10 @@ static ULONG WINAPI IDirect3DRMDevice2Impl_Release(IDirect3DRMDevice2* iface) ...@@ -119,13 +119,10 @@ static ULONG WINAPI IDirect3DRMDevice2Impl_Release(IDirect3DRMDevice2* iface)
} }
/*** IDirect3DRMObject methods ***/ /*** IDirect3DRMObject methods ***/
static HRESULT WINAPI IDirect3DRMDevice2Impl_Clone(IDirect3DRMDevice2* iface, static HRESULT WINAPI IDirect3DRMDevice2Impl_Clone(IDirect3DRMDevice2 *iface,
LPUNKNOWN unkwn, REFIID riid, IUnknown *outer, REFIID iid, void **out)
LPVOID* object)
{ {
IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice2(iface); FIXME("iface %p, outer %p, iid %s, out %p stub!\n", iface, outer, debugstr_guid(iid), out);
FIXME("(%p/%p)->(%p, %s, %p): stub\n", iface, This, unkwn, debugstr_guid(riid), object);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -534,13 +531,10 @@ static ULONG WINAPI IDirect3DRMDevice3Impl_Release(IDirect3DRMDevice3* iface) ...@@ -534,13 +531,10 @@ static ULONG WINAPI IDirect3DRMDevice3Impl_Release(IDirect3DRMDevice3* iface)
} }
/*** IDirect3DRMObject methods ***/ /*** IDirect3DRMObject methods ***/
static HRESULT WINAPI IDirect3DRMDevice3Impl_Clone(IDirect3DRMDevice3* iface, static HRESULT WINAPI IDirect3DRMDevice3Impl_Clone(IDirect3DRMDevice3 *iface,
LPUNKNOWN unkwn, REFIID riid, IUnknown *outer, REFIID iid, void **out)
LPVOID* object)
{ {
IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice3(iface); FIXME("iface %p, outer %p, iid %s, out %p stub!\n", iface, outer, debugstr_guid(iid), out);
FIXME("(%p/%p)->(%p, %s, %p): stub\n", iface, This, unkwn, debugstr_guid(riid), object);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -1027,13 +1021,10 @@ static ULONG WINAPI IDirect3DRMWinDeviceImpl_Release(IDirect3DRMWinDevice* iface ...@@ -1027,13 +1021,10 @@ static ULONG WINAPI IDirect3DRMWinDeviceImpl_Release(IDirect3DRMWinDevice* iface
} }
/*** IDirect3DRMObject methods ***/ /*** IDirect3DRMObject methods ***/
static HRESULT WINAPI IDirect3DRMWinDeviceImpl_Clone(IDirect3DRMWinDevice* iface, static HRESULT WINAPI IDirect3DRMWinDeviceImpl_Clone(IDirect3DRMWinDevice *iface,
LPUNKNOWN unkwn, REFIID riid, IUnknown *outer, REFIID iid, void **out)
LPVOID* object)
{ {
IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMWinDevice(iface); FIXME("iface %p, outer %p, iid %s, out %p stub!\n", iface, outer, debugstr_guid(iid), out);
FIXME("(%p/%p)->(%p, %s, %p): stub\n", iface, This, unkwn, debugstr_guid(riid), object);
return E_NOTIMPL; return E_NOTIMPL;
} }
......
dlls/d3drm/face.c
View file @ be6b54f5
...@@ -102,12 +102,10 @@ static ULONG WINAPI IDirect3DRMFaceImpl_Release(IDirect3DRMFace* iface) ...@@ -102,12 +102,10 @@ static ULONG WINAPI IDirect3DRMFaceImpl_Release(IDirect3DRMFace* iface)
} }
/*** IDirect3DRMObject methods ***/ /*** IDirect3DRMObject methods ***/
static HRESULT WINAPI IDirect3DRMFaceImpl_Clone(IDirect3DRMFace* iface, static HRESULT WINAPI IDirect3DRMFaceImpl_Clone(IDirect3DRMFace *iface,
LPUNKNOWN unkwn, REFIID riid, LPVOID* object) IUnknown *outer, REFIID iid, void **out)
{ {
IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace(iface); FIXME("iface %p, outer %p, iid %s, out %p stub!\n", iface, outer, debugstr_guid(iid), out);
FIXME("(%p/%p)->(%p, %s, %p): stub\n", iface, This, unkwn, debugstr_guid(riid), object);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -426,13 +424,10 @@ static ULONG WINAPI IDirect3DRMFace2Impl_Release(IDirect3DRMFace2* iface) ...@@ -426,13 +424,10 @@ static ULONG WINAPI IDirect3DRMFace2Impl_Release(IDirect3DRMFace2* iface)
} }
/*** IDirect3DRMObject methods ***/ /*** IDirect3DRMObject methods ***/
static HRESULT WINAPI IDirect3DRMFace2Impl_Clone(IDirect3DRMFace2* iface, static HRESULT WINAPI IDirect3DRMFace2Impl_Clone(IDirect3DRMFace2 *iface,
LPUNKNOWN unkwn, REFIID riid, IUnknown *outer, REFIID iid, void **out)
LPVOID* object)
{ {
IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace2(iface); FIXME("iface %p, outer %p, iid %s, out %p stub!\n", iface, outer, debugstr_guid(iid), out);
FIXME("(%p/%p)->(%p, %s, %p): stub\n", iface, This, unkwn, debugstr_guid(riid), object);
return E_NOTIMPL; return E_NOTIMPL;
} }
......
dlls/d3drm/frame.c
View file @ be6b54f5
...@@ -512,13 +512,10 @@ static ULONG WINAPI IDirect3DRMFrame2Impl_Release(IDirect3DRMFrame2* iface) ...@@ -512,13 +512,10 @@ static ULONG WINAPI IDirect3DRMFrame2Impl_Release(IDirect3DRMFrame2* iface)
} }
/*** IDirect3DRMObject methods ***/ /*** IDirect3DRMObject methods ***/
static HRESULT WINAPI IDirect3DRMFrame2Impl_Clone(IDirect3DRMFrame2* iface, static HRESULT WINAPI IDirect3DRMFrame2Impl_Clone(IDirect3DRMFrame2 *iface,
LPUNKNOWN unkwn, REFIID riid, IUnknown *outer, REFIID iid, void **out)
LPVOID* object)
{ {
IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); FIXME("iface %p, outer %p, iid %s, out %p stub!\n", iface, outer, debugstr_guid(iid), out);
FIXME("(%p/%p)->(%p, %s, %p): stub\n", iface, This, unkwn, debugstr_guid(riid), object);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -1373,13 +1370,10 @@ static ULONG WINAPI IDirect3DRMFrame3Impl_Release(IDirect3DRMFrame3* iface) ...@@ -1373,13 +1370,10 @@ static ULONG WINAPI IDirect3DRMFrame3Impl_Release(IDirect3DRMFrame3* iface)
} }
/*** IDirect3DRMObject methods ***/ /*** IDirect3DRMObject methods ***/
static HRESULT WINAPI IDirect3DRMFrame3Impl_Clone(IDirect3DRMFrame3* iface, static HRESULT WINAPI IDirect3DRMFrame3Impl_Clone(IDirect3DRMFrame3 *iface,
LPUNKNOWN unkwn, REFIID riid, IUnknown *outer, REFIID iid, void **out)
LPVOID* object)
{ {
IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface); FIXME("iface %p, outer %p, iid %s, out %p stub!\n", iface, outer, debugstr_guid(iid), out);
FIXME("(%p/%p)->(%p, %s, %p): stub\n", iface, This, unkwn, debugstr_guid(riid), object);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -1636,20 +1630,20 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_AddRotation(IDirect3DRMFrame3* iface ...@@ -1636,20 +1630,20 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_AddRotation(IDirect3DRMFrame3* iface
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI IDirect3DRMFrame3Impl_AddVisual(IDirect3DRMFrame3* iface, LPUNKNOWN vis) static HRESULT WINAPI IDirect3DRMFrame3Impl_AddVisual(IDirect3DRMFrame3 *iface, IUnknown *visual)
{ {
IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface); IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface);
ULONG i; ULONG i;
IDirect3DRMVisual** visuals; IDirect3DRMVisual** visuals;
TRACE("(%p/%p)->(%p)\n", iface, This, vis); TRACE("iface %p, visual %p.\n", iface, visual);
if (!vis) if (!visual)
return D3DRMERR_BADOBJECT; return D3DRMERR_BADOBJECT;
/* Check if already existing and return gracefully without increasing ref count */ /* Check if already existing and return gracefully without increasing ref count */
for (i = 0; i < This->nb_visuals; i++) for (i = 0; i < This->nb_visuals; i++)
if (This->visuals[i] == (IDirect3DRMVisual*)vis) if (This->visuals[i] == (IDirect3DRMVisual *)visual)
return D3DRM_OK; return D3DRM_OK;
if ((This->nb_visuals + 1) > This->visuals_capacity) if ((This->nb_visuals + 1) > This->visuals_capacity)
...@@ -1674,8 +1668,8 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_AddVisual(IDirect3DRMFrame3* iface, ...@@ -1674,8 +1668,8 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_AddVisual(IDirect3DRMFrame3* iface,
This->visuals = visuals; This->visuals = visuals;
} }
This->visuals[This->nb_visuals++] = (IDirect3DRMVisual*)vis; This->visuals[This->nb_visuals++] = (IDirect3DRMVisual *)visual;
IDirect3DRMVisual_AddRef(vis); IDirect3DRMVisual_AddRef(visual);
return D3DRM_OK; return D3DRM_OK;
} }
...@@ -1860,12 +1854,10 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_GetOrientation(IDirect3DRMFrame3 *if ...@@ -1860,12 +1854,10 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_GetOrientation(IDirect3DRMFrame3 *if
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI IDirect3DRMFrame3Impl_GetVisuals(IDirect3DRMFrame3* iface, LPDWORD num, static HRESULT WINAPI IDirect3DRMFrame3Impl_GetVisuals(IDirect3DRMFrame3 *iface,
LPUNKNOWN *visuals) DWORD *count, IUnknown **visuals)
{ {
IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface); FIXME("iface %p, count %p, visuals %p stub!\n", iface, count, visuals);
FIXME("(%p/%p)->(%p,%p): stub\n", iface, This, num, visuals);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -1971,26 +1963,26 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_DeleteMoveCallback(IDirect3DRMFrame3 ...@@ -1971,26 +1963,26 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_DeleteMoveCallback(IDirect3DRMFrame3
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI IDirect3DRMFrame3Impl_DeleteVisual(IDirect3DRMFrame3* iface, LPUNKNOWN vis) static HRESULT WINAPI IDirect3DRMFrame3Impl_DeleteVisual(IDirect3DRMFrame3 *iface, IUnknown *visual)
{ {
IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface); IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface);
ULONG i; ULONG i;
TRACE("(%p/%p)->(%p)\n", iface, This, vis); TRACE("iface %p, visual %p.\n", iface, visual);
if (!vis) if (!visual)
return D3DRMERR_BADOBJECT; return D3DRMERR_BADOBJECT;
/* Check if visual exists */ /* Check if visual exists */
for (i = 0; i < This->nb_visuals; i++) for (i = 0; i < This->nb_visuals; i++)
if (This->visuals[i] == (IDirect3DRMVisual*)vis) if (This->visuals[i] == (IDirect3DRMVisual *)visual)
break; break;
if (i == This->nb_visuals) if (i == This->nb_visuals)
return D3DRMERR_BADVALUE; return D3DRMERR_BADVALUE;
memmove(This->visuals + i, This->visuals + i + 1, sizeof(IDirect3DRMVisual*) * (This->nb_visuals - 1 - i)); memmove(This->visuals + i, This->visuals + i + 1, sizeof(IDirect3DRMVisual*) * (This->nb_visuals - 1 - i));
IDirect3DRMVisual_Release(vis); IDirect3DRMVisual_Release(visual);
This->nb_visuals--; This->nb_visuals--;
return D3DRM_OK; return D3DRM_OK;
......
dlls/d3drm/light.c
View file @ be6b54f5
...@@ -96,13 +96,10 @@ static ULONG WINAPI IDirect3DRMLightImpl_Release(IDirect3DRMLight* iface) ...@@ -96,13 +96,10 @@ static ULONG WINAPI IDirect3DRMLightImpl_Release(IDirect3DRMLight* iface)
} }
/*** IDirect3DRMObject methods ***/ /*** IDirect3DRMObject methods ***/
static HRESULT WINAPI IDirect3DRMLightImpl_Clone(IDirect3DRMLight* iface, static HRESULT WINAPI IDirect3DRMLightImpl_Clone(IDirect3DRMLight *iface,
LPUNKNOWN unkwn, REFIID riid, IUnknown *outer, REFIID iid, void **out)
LPVOID* object)
{ {
IDirect3DRMLightImpl *This = impl_from_IDirect3DRMLight(iface); FIXME("iface %p, outer %p, iid %s, out %p stub!\n", iface, outer, debugstr_guid(iid), out);
FIXME("(%p/%p)->(%p, %s, %p): stub\n", iface, This, unkwn, debugstr_guid(riid), object);
return E_NOTIMPL; return E_NOTIMPL;
} }
......
dlls/d3drm/material.c
View file @ be6b54f5
...@@ -100,11 +100,10 @@ static ULONG WINAPI IDirect3DRMMaterial2Impl_Release(IDirect3DRMMaterial2* iface ...@@ -100,11 +100,10 @@ static ULONG WINAPI IDirect3DRMMaterial2Impl_Release(IDirect3DRMMaterial2* iface
} }
/*** IDirect3DRMObject methods ***/ /*** IDirect3DRMObject methods ***/
static HRESULT WINAPI IDirect3DRMMaterial2Impl_Clone(IDirect3DRMMaterial2* iface, static HRESULT WINAPI IDirect3DRMMaterial2Impl_Clone(IDirect3DRMMaterial2 *iface,
LPUNKNOWN unknown, REFIID riid, IUnknown *outer, REFIID iid, void **out)
LPVOID* object)
{ {
FIXME("(%p)->(%p, %s, %p): stub\n", iface, unknown, debugstr_guid(riid), object); FIXME("iface %p, outer %p, iid %s, out %p stub!\n", iface, outer, debugstr_guid(iid), out);
return E_NOTIMPL; return E_NOTIMPL;
} }
......
dlls/d3drm/meshbuilder.c
View file @ be6b54f5
...@@ -415,13 +415,10 @@ static ULONG WINAPI IDirect3DRMMeshBuilder2Impl_Release(IDirect3DRMMeshBuilder2* ...@@ -415,13 +415,10 @@ static ULONG WINAPI IDirect3DRMMeshBuilder2Impl_Release(IDirect3DRMMeshBuilder2*
} }
/*** IDirect3DRMObject methods ***/ /*** IDirect3DRMObject methods ***/
static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_Clone(IDirect3DRMMeshBuilder2* iface, static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_Clone(IDirect3DRMMeshBuilder2 *iface,
LPUNKNOWN pUnkOuter, REFIID riid, IUnknown *outer, REFIID iid, void **out)
LPVOID *ppvObj)
{ {
IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder2(iface); FIXME("iface %p, outer %p, iid %s, out %p stub!\n", iface, outer, debugstr_guid(iid), out);
FIXME("(%p)->(%p,%s,%p): stub\n", This, pUnkOuter, debugstr_guid(riid), ppvObj);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -1003,13 +1000,10 @@ static ULONG WINAPI IDirect3DRMMeshBuilder3Impl_Release(IDirect3DRMMeshBuilder3* ...@@ -1003,13 +1000,10 @@ static ULONG WINAPI IDirect3DRMMeshBuilder3Impl_Release(IDirect3DRMMeshBuilder3*
} }
/*** IDirect3DRMObject methods ***/ /*** IDirect3DRMObject methods ***/
static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_Clone(IDirect3DRMMeshBuilder3* iface, static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_Clone(IDirect3DRMMeshBuilder3 *iface,
LPUNKNOWN pUnkOuter, REFIID riid, IUnknown *outer, REFIID iid, void **out)
LPVOID *ppvObj)
{ {
IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); FIXME("iface %p, outer %p, iid %s, out %p stub!\n", iface, outer, debugstr_guid(iid), out);
FIXME("(%p)->(%p,%s,%p): stub\n", This, pUnkOuter, debugstr_guid(riid), ppvObj);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -2262,42 +2256,32 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_AddFacesIndexed(IDirect3DRMMes ...@@ -2262,42 +2256,32 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_AddFacesIndexed(IDirect3DRMMes
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_CreateSubMesh(IDirect3DRMMeshBuilder3* iface, static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_CreateSubMesh(IDirect3DRMMeshBuilder3 *iface, IUnknown **mesh)
LPUNKNOWN *unkwn)
{ {
IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); FIXME("iface %p, mesh %p stub!\n", iface, mesh);
FIXME("(%p)->(%p): stub\n", This, unkwn);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_GetParentMesh(IDirect3DRMMeshBuilder3* iface, static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_GetParentMesh(IDirect3DRMMeshBuilder3 *iface,
DWORD flags, LPUNKNOWN *unkwn) DWORD flags, IUnknown **parent)
{ {
IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); FIXME("iface %p, flags %#x, parent %p stub!\n", iface, flags, parent);
FIXME("(%p)->(%u,%p): stub\n", This, flags, unkwn);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_GetSubMeshes(IDirect3DRMMeshBuilder3* iface, static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_GetSubMeshes(IDirect3DRMMeshBuilder3 *iface,
LPDWORD count, LPUNKNOWN *unkwn) DWORD *count, IUnknown **meshes)
{ {
IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); FIXME("iface %p, count %p, meshes %p stub!\n", iface, count, meshes);
FIXME("(%p)->(%p,%p): stub\n", This, count, unkwn);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_DeleteSubMesh(IDirect3DRMMeshBuilder3* iface, static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_DeleteSubMesh(IDirect3DRMMeshBuilder3 *iface, IUnknown *mesh)
LPUNKNOWN unkwn)
{ {
IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); FIXME("iface %p, mesh %p stub!\n", iface, mesh);
FIXME("(%p)->(%p): stub\n", This, unkwn);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -2556,13 +2540,10 @@ static ULONG WINAPI IDirect3DRMMeshImpl_Release(IDirect3DRMMesh* iface) ...@@ -2556,13 +2540,10 @@ static ULONG WINAPI IDirect3DRMMeshImpl_Release(IDirect3DRMMesh* iface)
} }
/*** IDirect3DRMObject methods ***/ /*** IDirect3DRMObject methods ***/
static HRESULT WINAPI IDirect3DRMMeshImpl_Clone(IDirect3DRMMesh* iface, static HRESULT WINAPI IDirect3DRMMeshImpl_Clone(IDirect3DRMMesh *iface,
LPUNKNOWN pUnkOuter, REFIID riid, IUnknown *outer, REFIID iid, void **out)
LPVOID *ppvObj)
{ {
IDirect3DRMMeshImpl *This = impl_from_IDirect3DRMMesh(iface); FIXME("iface %p, outer %p, iid %s, out %p stub!\n", iface, outer, debugstr_guid(iid), out);
FIXME("(%p)->(%p,%s,%p): stub\n", This, pUnkOuter, debugstr_guid(riid), ppvObj);
return E_NOTIMPL; return E_NOTIMPL;
} }
......
dlls/d3drm/texture.c
View file @ be6b54f5
...@@ -101,11 +101,10 @@ static ULONG WINAPI IDirect3DRMTexture2Impl_Release(IDirect3DRMTexture2* iface) ...@@ -101,11 +101,10 @@ static ULONG WINAPI IDirect3DRMTexture2Impl_Release(IDirect3DRMTexture2* iface)
} }
/*** IDirect3DRMObject methods ***/ /*** IDirect3DRMObject methods ***/
static HRESULT WINAPI IDirect3DRMTexture2Impl_Clone(IDirect3DRMTexture2* iface, static HRESULT WINAPI IDirect3DRMTexture2Impl_Clone(IDirect3DRMTexture2 *iface,
LPUNKNOWN unknown, REFIID riid, IUnknown *outer, REFIID iid, void **out)
LPVOID* object)
{ {
FIXME("(%p)->(%p, %s, %p): stub\n", iface, unknown, debugstr_guid(riid), object); FIXME("iface %p, outer %p, iid %s, out %p stub!\n", iface, outer, debugstr_guid(iid), out);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -470,11 +469,10 @@ static ULONG WINAPI IDirect3DRMTexture3Impl_Release(IDirect3DRMTexture3* iface) ...@@ -470,11 +469,10 @@ static ULONG WINAPI IDirect3DRMTexture3Impl_Release(IDirect3DRMTexture3* iface)
} }
/*** IDirect3DRMObject methods ***/ /*** IDirect3DRMObject methods ***/
static HRESULT WINAPI IDirect3DRMTexture3Impl_Clone(IDirect3DRMTexture3* iface, static HRESULT WINAPI IDirect3DRMTexture3Impl_Clone(IDirect3DRMTexture3 *iface,
LPUNKNOWN unknown, REFIID riid, IUnknown *outer, REFIID iid, void **out)
LPVOID* object)
{ {
FIXME("(%p)->(%p, %s, %p): stub\n", iface, unknown, debugstr_guid(riid), object); FIXME("iface %p, outer %p, iid %s, out %p stub!\n", iface, outer, debugstr_guid(iid), out);
return E_NOTIMPL; return E_NOTIMPL;
} }
......
dlls/d3drm/viewport.c
View file @ be6b54f5
...@@ -105,13 +105,10 @@ static ULONG WINAPI IDirect3DRMViewportImpl_Release(IDirect3DRMViewport* iface) ...@@ -105,13 +105,10 @@ static ULONG WINAPI IDirect3DRMViewportImpl_Release(IDirect3DRMViewport* iface)
} }
/*** IDirect3DRMObject methods ***/ /*** IDirect3DRMObject methods ***/
static HRESULT WINAPI IDirect3DRMViewportImpl_Clone(IDirect3DRMViewport* iface, static HRESULT WINAPI IDirect3DRMViewportImpl_Clone(IDirect3DRMViewport *iface,
LPUNKNOWN unkwn, REFIID riid, IUnknown *outer, REFIID iid, void **out)
LPVOID* object)
{ {
IDirect3DRMViewportImpl *This = impl_from_IDirect3DRMViewport(iface); FIXME("iface %p, outer %p, iid %s, out %p stub!\n", iface, outer, debugstr_guid(iid), out);
FIXME("(%p/%p)->(%p, %s, %p): stub\n", iface, This, unkwn, debugstr_guid(riid), object);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -508,13 +505,10 @@ static ULONG WINAPI IDirect3DRMViewport2Impl_Release(IDirect3DRMViewport2* iface ...@@ -508,13 +505,10 @@ static ULONG WINAPI IDirect3DRMViewport2Impl_Release(IDirect3DRMViewport2* iface
} }
/*** IDirect3DRMObject methods ***/ /*** IDirect3DRMObject methods ***/
static HRESULT WINAPI IDirect3DRMViewport2Impl_Clone(IDirect3DRMViewport2* iface, static HRESULT WINAPI IDirect3DRMViewport2Impl_Clone(IDirect3DRMViewport2 *iface,
LPUNKNOWN unkwn, REFIID riid, IUnknown *outer, REFIID iid, void **out)
LPVOID* object)
{ {
IDirect3DRMViewportImpl *This = impl_from_IDirect3DRMViewport2(iface); FIXME("iface %p, outer %p, iid %s, out %p stub!\n", iface, outer, debugstr_guid(iid), out);
FIXME("(%p/%p)->(%p, %s, %p): stub\n", iface, This, unkwn, debugstr_guid(riid), object);
return E_NOTIMPL; return E_NOTIMPL;
} }
......
include/d3drm.h
View file @ be6b54f5
...@@ -57,7 +57,7 @@ DECLARE_INTERFACE_(IDirect3DRM,IUnknown) ...@@ -57,7 +57,7 @@ DECLARE_INTERFACE_(IDirect3DRM,IUnknown)
STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,AddRef)(THIS) PURE;
STDMETHOD_(ULONG,Release)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE;
/*** IDirect3DRM methods ***/ /*** IDirect3DRM methods ***/
STDMETHOD(CreateObject)(THIS_ REFCLSID rclsid, LPUNKNOWN pUnkOuter, REFIID riid, LPVOID *ppvObj) PURE; STDMETHOD(CreateObject)(THIS_ REFCLSID clsid, IUnknown *outer, REFIID iid, void **out) PURE;
STDMETHOD(CreateFrame)(THIS_ IDirect3DRMFrame *parent, IDirect3DRMFrame **frame) PURE; STDMETHOD(CreateFrame)(THIS_ IDirect3DRMFrame *parent, IDirect3DRMFrame **frame) PURE;
STDMETHOD(CreateMesh)(THIS_ IDirect3DRMMesh **mesh) PURE; STDMETHOD(CreateMesh)(THIS_ IDirect3DRMMesh **mesh) PURE;
STDMETHOD(CreateMeshBuilder)(THIS_ IDirect3DRMMeshBuilder **mesh_builder) PURE; STDMETHOD(CreateMeshBuilder)(THIS_ IDirect3DRMMeshBuilder **mesh_builder) PURE;
...@@ -196,7 +196,7 @@ DECLARE_INTERFACE_(IDirect3DRM2,IUnknown) ...@@ -196,7 +196,7 @@ DECLARE_INTERFACE_(IDirect3DRM2,IUnknown)
STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,AddRef)(THIS) PURE;
STDMETHOD_(ULONG,Release)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE;
/*** IDirect3DRM2 methods ***/ /*** IDirect3DRM2 methods ***/
STDMETHOD(CreateObject)(THIS_ REFCLSID rclsid, LPUNKNOWN pUnkOuter, REFIID riid, LPVOID *ppvObj) PURE; STDMETHOD(CreateObject)(THIS_ REFCLSID clsid, IUnknown *outer, REFIID iid, void **out) PURE;
STDMETHOD(CreateFrame)(THIS_ IDirect3DRMFrame *parent, IDirect3DRMFrame2 **frame) PURE; STDMETHOD(CreateFrame)(THIS_ IDirect3DRMFrame *parent, IDirect3DRMFrame2 **frame) PURE;
STDMETHOD(CreateMesh)(THIS_ IDirect3DRMMesh **mesh) PURE; STDMETHOD(CreateMesh)(THIS_ IDirect3DRMMesh **mesh) PURE;
STDMETHOD(CreateMeshBuilder)(THIS_ IDirect3DRMMeshBuilder2 **mesh_builder) PURE; STDMETHOD(CreateMeshBuilder)(THIS_ IDirect3DRMMeshBuilder2 **mesh_builder) PURE;
...@@ -339,7 +339,7 @@ DECLARE_INTERFACE_(IDirect3DRM3,IUnknown) ...@@ -339,7 +339,7 @@ DECLARE_INTERFACE_(IDirect3DRM3,IUnknown)
STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,AddRef)(THIS) PURE;
STDMETHOD_(ULONG,Release)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE;
/*** IDirect3DRM2 methods ***/ /*** IDirect3DRM2 methods ***/
STDMETHOD(CreateObject)(THIS_ REFCLSID rclsid, LPUNKNOWN pUnkOuter, REFIID riid, LPVOID *ppvObj) PURE; STDMETHOD(CreateObject)(THIS_ REFCLSID clsid, IUnknown *outer, REFIID iid, void **out) PURE;
STDMETHOD(CreateFrame)(THIS_ IDirect3DRMFrame3 *parent, IDirect3DRMFrame3 **frame) PURE; STDMETHOD(CreateFrame)(THIS_ IDirect3DRMFrame3 *parent, IDirect3DRMFrame3 **frame) PURE;
STDMETHOD(CreateMesh)(THIS_ IDirect3DRMMesh **mesh) PURE; STDMETHOD(CreateMesh)(THIS_ IDirect3DRMMesh **mesh) PURE;
STDMETHOD(CreateMeshBuilder)(THIS_ IDirect3DRMMeshBuilder3 **mesh_builder) PURE; STDMETHOD(CreateMeshBuilder)(THIS_ IDirect3DRMMeshBuilder3 **mesh_builder) PURE;
......
include/d3drmdef.h
View file @ be6b54f5
...@@ -243,7 +243,7 @@ typedef struct _D3DRMMATERIALOVERRIDE { ...@@ -243,7 +243,7 @@ typedef struct _D3DRMMATERIALOVERRIDE {
D3DCOLORVALUE dcEmissive; D3DCOLORVALUE dcEmissive;
D3DCOLORVALUE dcSpecular; D3DCOLORVALUE dcSpecular;
D3DVALUE dvPower; D3DVALUE dvPower;
LPUNKNOWN lpD3DRMTex; IUnknown *lpD3DRMTex;
} D3DRMMATERIALOVERRIDE, *LPD3DRMMATERIALOVERRIDE; } D3DRMMATERIALOVERRIDE, *LPD3DRMMATERIALOVERRIDE;
#define D3DRMMATERIALOVERRIDE_DIFFUSE_ALPHAONLY 0x00000001 #define D3DRMMATERIALOVERRIDE_DIFFUSE_ALPHAONLY 0x00000001
......
include/d3drmwin.h
View file @ be6b54f5
...@@ -46,7 +46,7 @@ DECLARE_INTERFACE_(IDirect3DRMWinDevice,IDirect3DRMObject) ...@@ -46,7 +46,7 @@ DECLARE_INTERFACE_(IDirect3DRMWinDevice,IDirect3DRMObject)
STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,AddRef)(THIS) PURE;
STDMETHOD_(ULONG,Release)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE;
/*** IDirect3DRMObject methods ***/ /*** IDirect3DRMObject methods ***/
STDMETHOD(Clone)(THIS_ LPUNKNOWN pUnkOuter, REFIID riid, LPVOID *ppvObj) PURE; STDMETHOD(Clone)(THIS_ IUnknown *outer, REFIID iid, void **out) PURE;
STDMETHOD(AddDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK, LPVOID argument) PURE; STDMETHOD(AddDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK, LPVOID argument) PURE;
STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK, LPVOID argument) PURE; STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK, LPVOID argument) PURE;
STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; STDMETHOD(SetAppData)(THIS_ DWORD data) 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