diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index abc35ee1511..cc5ac2ab305 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -337,29 +337,6 @@ HRESULT WINAPI IWineD3DSurfaceImpl_GetParent(IWineD3DSurface *iface, IUnknown ** IWineD3DSurface IWineD3DSurface parts follow ****************************************************** */ -HRESULT WINAPI IWineD3DSurfaceImpl_GetContainerParent(IWineD3DSurface* iface, IUnknown **ppContainerParent) { - IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)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; -} - HRESULT WINAPI IWineD3DSurfaceImpl_GetContainer(IWineD3DSurface* iface, REFIID riid, void** ppContainer) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; IWineD3DBase *container = 0; @@ -3115,7 +3092,6 @@ const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl = IWineD3DSurfaceImpl_PreLoad, IWineD3DSurfaceImpl_GetType, /* IWineD3DSurface */ - IWineD3DSurfaceImpl_GetContainerParent, IWineD3DSurfaceImpl_GetContainer, IWineD3DSurfaceImpl_GetDesc, IWineD3DSurfaceImpl_LockRect, diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index c316fd82cf2..292059325d1 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -1568,7 +1568,6 @@ const IWineD3DSurfaceVtbl IWineGDISurface_Vtbl = IWineGDISurfaceImpl_PreLoad, IWineD3DSurfaceImpl_GetType, /* IWineD3DSurface */ - IWineD3DSurfaceImpl_GetContainerParent, IWineD3DSurfaceImpl_GetContainer, IWineD3DSurfaceImpl_GetDesc, IWineGDISurfaceImpl_LockRect, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2f5e8874bdb..da3fbe97094 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -961,7 +961,6 @@ DWORD WINAPI IWineD3DSurfaceImpl_SetPriority(IWineD3DSurface *iface, DWORD Pri DWORD WINAPI IWineD3DSurfaceImpl_GetPriority(IWineD3DSurface *iface); void WINAPI IWineD3DSurfaceImpl_PreLoad(IWineD3DSurface *iface); WINED3DRESOURCETYPE WINAPI IWineD3DSurfaceImpl_GetType(IWineD3DSurface *iface); -HRESULT WINAPI IWineD3DSurfaceImpl_GetContainerParent(IWineD3DSurface* iface, IUnknown **ppContainerParent); HRESULT WINAPI IWineD3DSurfaceImpl_GetContainer(IWineD3DSurface* iface, REFIID riid, void** ppContainer); HRESULT WINAPI IWineD3DSurfaceImpl_GetDesc(IWineD3DSurface *iface, WINED3DSURFACE_DESC *pDesc); HRESULT WINAPI IWineD3DSurfaceImpl_GetBltStatus(IWineD3DSurface *iface, DWORD Flags); diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index 6017818b3bc..a14bdf04379 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -1096,7 +1096,6 @@ DECLARE_INTERFACE_(IWineD3DSurface,IWineD3DResource) STDMETHOD_(void,PreLoad)(THIS) PURE; STDMETHOD_(WINED3DRESOURCETYPE,GetType)(THIS) PURE; /*** IWineD3DSurface methods ***/ - STDMETHOD(GetContainerParent)(THIS_ IUnknown **ppContainerParent) PURE; STDMETHOD(GetContainer)(THIS_ REFIID riid, void ** ppContainer) PURE; STDMETHOD(GetDesc)(THIS_ WINED3DSURFACE_DESC * pDesc) PURE; STDMETHOD(LockRect)(THIS_ WINED3DLOCKED_RECT * pLockedRect, CONST RECT * pRect,DWORD Flags) PURE; @@ -1152,7 +1151,6 @@ DECLARE_INTERFACE_(IWineD3DSurface,IWineD3DResource) #define IWineD3DSurface_PreLoad(p) (p)->lpVtbl->PreLoad(p) #define IWineD3DSurface_GetType(p) (p)->lpVtbl->GetType(p) /*** IWineD3DSurface methods ***/ -#define IWineD3DSurface_GetContainerParent(p,a) (p)->lpVtbl->GetContainerParent(p,a) #define IWineD3DSurface_GetContainer(p,a,b) (p)->lpVtbl->GetContainer(p,a,b) #define IWineD3DSurface_GetDesc(p,a) (p)->lpVtbl->GetDesc(p,a) #define IWineD3DSurface_LockRect(p,a,b,c) (p)->lpVtbl->LockRect(p,a,b,c)