[PATCH 2/5] wined3d: Remove the GetContainer() methods from the public wined3d interface.
Henri Verbeet
hverbeet at codeweavers.com
Wed Aug 25 13:46:50 CDT 2010
There's nothing left that uses these.
---
dlls/wined3d/surface.c | 1 -
dlls/wined3d/surface_base.c | 18 ------------------
dlls/wined3d/surface_gdi.c | 1 -
dlls/wined3d/volume.c | 24 ++----------------------
dlls/wined3d/wined3d_private.h | 2 --
include/wine/wined3d.idl | 8 --------
6 files changed, 2 insertions(+), 52 deletions(-)
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 93559a1..2be3706 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -4719,7 +4719,6 @@ const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl =
IWineD3DSurfaceImpl_UnLoad,
IWineD3DBaseSurfaceImpl_GetType,
/* IWineD3DSurface */
- IWineD3DBaseSurfaceImpl_GetContainer,
IWineD3DBaseSurfaceImpl_GetDesc,
IWineD3DSurfaceImpl_LockRect,
IWineD3DSurfaceImpl_UnlockRect,
diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c
index 6c19218..64c5a28 100644
--- a/dlls/wined3d/surface_base.c
+++ b/dlls/wined3d/surface_base.c
@@ -148,24 +148,6 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetParent(IWineD3DSurface *iface, IUnknow
IWineD3DSurface IWineD3DSurface parts follow
****************************************************** */
-HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetContainer(IWineD3DSurface* iface, REFIID riid, void** ppContainer) {
- IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface;
- IWineD3DBase *container = 0;
-
- TRACE("(This %p, riid %s, ppContainer %p)\n", This, debugstr_guid(riid), ppContainer);
-
- if (!ppContainer) {
- ERR("Called without a valid ppContainer.\n");
- }
-
- /* Standalone surfaces return the device as container. */
- if (This->container.u.base) container = This->container.u.base;
- else container = (IWineD3DBase *)This->resource.device;
-
- TRACE("Relaying to QueryInterface\n");
- return IUnknown_QueryInterface(container, riid, ppContainer);
-}
-
HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetDesc(IWineD3DSurface *iface, WINED3DSURFACE_DESC *pDesc) {
IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface;
diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c
index bd1b775..68e36ee 100644
--- a/dlls/wined3d/surface_gdi.c
+++ b/dlls/wined3d/surface_gdi.c
@@ -503,7 +503,6 @@ const IWineD3DSurfaceVtbl IWineGDISurface_Vtbl =
IWineGDISurfaceImpl_UnLoad,
IWineD3DBaseSurfaceImpl_GetType,
/* IWineD3DSurface */
- IWineD3DBaseSurfaceImpl_GetContainer,
IWineD3DBaseSurfaceImpl_GetDesc,
IWineGDISurfaceImpl_LockRect,
IWineGDISurfaceImpl_UnlockRect,
diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c
index eeb9361..349c7ec 100644
--- a/dlls/wined3d/volume.c
+++ b/dlls/wined3d/volume.c
@@ -184,27 +184,8 @@ static WINED3DRESOURCETYPE WINAPI IWineD3DVolumeImpl_GetType(IWineD3DVolume *ifa
/* *******************************************
IWineD3DVolume parts follow
******************************************* */
-static HRESULT WINAPI IWineD3DVolumeImpl_GetContainer(IWineD3DVolume *iface, REFIID riid, void** ppContainer) {
- IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface;
-
- TRACE("(This %p, riid %s, ppContainer %p)\n", This, debugstr_guid(riid), ppContainer);
-
- if (!ppContainer) {
- ERR("Called without a valid ppContainer.\n");
- return E_FAIL;
- }
-
- /* Although surfaces can be standalone, volumes can't */
- if (!This->container) {
- ERR("Volume without an container. Should not happen.\n");
- return E_FAIL;
- }
-
- TRACE("Relaying to QueryInterface\n");
- return IUnknown_QueryInterface((IWineD3DVolumeTexture *)This->container, riid, ppContainer);
-}
-
-static HRESULT WINAPI IWineD3DVolumeImpl_GetDesc(IWineD3DVolume *iface, WINED3DVOLUME_DESC* pDesc) {
+static HRESULT WINAPI IWineD3DVolumeImpl_GetDesc(IWineD3DVolume *iface, WINED3DVOLUME_DESC *pDesc)
+{
IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface;
TRACE("(%p) : copying into %p\n", This, pDesc);
@@ -349,7 +330,6 @@ static const IWineD3DVolumeVtbl IWineD3DVolume_Vtbl =
IWineD3DVolumeImpl_UnLoad,
IWineD3DVolumeImpl_GetType,
/* IWineD3DVolume */
- IWineD3DVolumeImpl_GetContainer,
IWineD3DVolumeImpl_GetDesc,
IWineD3DVolumeImpl_LockBox,
IWineD3DVolumeImpl_UnlockBox,
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 84415d6..22fb79b 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -2124,8 +2124,6 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_FreePrivateData(IWineD3DSurface *iface, R
DWORD WINAPI IWineD3DBaseSurfaceImpl_SetPriority(IWineD3DSurface *iface, DWORD PriorityNew) DECLSPEC_HIDDEN;
DWORD WINAPI IWineD3DBaseSurfaceImpl_GetPriority(IWineD3DSurface *iface) DECLSPEC_HIDDEN;
WINED3DRESOURCETYPE WINAPI IWineD3DBaseSurfaceImpl_GetType(IWineD3DSurface *iface) DECLSPEC_HIDDEN;
-HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetContainer(IWineD3DSurface* iface,
- REFIID riid, void **ppContainer) DECLSPEC_HIDDEN;
HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetDesc(IWineD3DSurface *iface, WINED3DSURFACE_DESC *pDesc) DECLSPEC_HIDDEN;
HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetBltStatus(IWineD3DSurface *iface, DWORD Flags) DECLSPEC_HIDDEN;
HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetFlipStatus(IWineD3DSurface *iface, DWORD Flags) DECLSPEC_HIDDEN;
diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl
index ee3f364..b6e73ec 100644
--- a/include/wine/wined3d.idl
+++ b/include/wine/wined3d.idl
@@ -2384,10 +2384,6 @@ interface IWineD3DClipper : IWineD3DBase
]
interface IWineD3DSurface : IWineD3DResource
{
- HRESULT GetContainer(
- [in] REFIID riid,
- [out] void **container
- );
HRESULT GetDesc(
[out] WINED3DSURFACE_DESC *desc
);
@@ -2501,10 +2497,6 @@ interface IWineD3DSurface : IWineD3DResource
]
interface IWineD3DVolume : IWineD3DResource
{
- HRESULT GetContainer(
- [in] REFIID riid,
- [out] void **container
- );
HRESULT GetDesc(
[out] WINED3DVOLUME_DESC *desc
);
--
1.7.1
More information about the wine-patches
mailing list