diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 375a59c178032ac5ce6765f0d5993a3a749da88a..dc768e1ecca1c3235fba87b7fc506431b11ab4c9 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -104,29 +104,6 @@ static WINED3DRESOURCETYPE WINAPI IWineD3DVolumeImpl_GetType(IWineD3DVolume *ifa /* ******************************************* IWineD3DVolume parts follow ******************************************* */ -static HRESULT WINAPI IWineD3DVolumeImpl_GetContainerParent(IWineD3DVolume *iface, IUnknown **ppContainerParent) { - IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface; - - TRACE("(%p) : ppContainerParent %p\n", This, ppContainerParent); - - if (!ppContainerParent) { - ERR("(%p) : Called without a valid ppContainerParent\n", This); - } - - if (This->container) { - IWineD3DBase_GetParent(This->container, ppContainerParent); - if (!ppContainerParent) { - /* WineD3D objects should always have a parent */ - ERR("(%p) : GetParent returned NULL\n", This); - } - IUnknown_Release(*ppContainerParent); /* GetParent adds a reference; we want just the pointer */ - } else { - *ppContainerParent = NULL; - } - - return WINED3D_OK; -} - static HRESULT WINAPI IWineD3DVolumeImpl_GetContainer(IWineD3DVolume *iface, REFIID riid, void** ppContainer) { IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface; @@ -332,7 +309,6 @@ const IWineD3DVolumeVtbl IWineD3DVolume_Vtbl = IWineD3DVolumeImpl_PreLoad, IWineD3DVolumeImpl_GetType, /* IWineD3DVolume */ - IWineD3DVolumeImpl_GetContainerParent, IWineD3DVolumeImpl_GetContainer, IWineD3DVolumeImpl_GetDesc, IWineD3DVolumeImpl_LockBox, diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index a14bdf043796156dde9f30cbeffcda5f7d763fd0..6947d26cd6f2b91e21b95013eddf9832e531a3dc 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -1210,7 +1210,6 @@ DECLARE_INTERFACE_(IWineD3DVolume,IWineD3DResource) STDMETHOD_(void,PreLoad)(THIS) PURE; STDMETHOD_(WINED3DRESOURCETYPE, GetType)(THIS) PURE; /*** IWineD3DVolume methods ***/ - STDMETHOD(GetContainerParent)(THIS_ IUnknown **ppContainerParent) PURE; STDMETHOD(GetContainer)(THIS_ REFIID riid, void ** ppContainer) PURE; STDMETHOD(GetDesc)(THIS_ WINED3DVOLUME_DESC * pDesc) PURE; STDMETHOD(LockBox)(THIS_ WINED3DLOCKED_BOX* pLockedVolume, CONST WINED3DBOX* pBox, DWORD Flags) PURE; @@ -1239,7 +1238,6 @@ DECLARE_INTERFACE_(IWineD3DVolume,IWineD3DResource) #define IWineD3DVolume_PreLoad(p) (p)->lpVtbl->PreLoad(p) #define IWineD3DVolume_GetType(p) (p)->lpVtbl->GetType(p) /*** IWineD3DVolume methods ***/ -#define IWineD3DVolume_GetContainerParent(p,a) (p)->lpVtbl->GetContainerParent(p,a) #define IWineD3DVolume_GetContainer(p,a,b) (p)->lpVtbl->GetContainer(p,a,b) #define IWineD3DVolume_GetDesc(p,a) (p)->lpVtbl->GetDesc(p,a) #define IWineD3DVolume_LockBox(p,a,b,c) (p)->lpVtbl->LockBox(p,a,b,c)