Henri Verbeet : wined3d: Get rid of the IWineD3DResource interface.
Alexandre Julliard
julliard at winehq.org
Fri Apr 15 10:19:24 CDT 2011
Module: wine
Branch: master
Commit: 7b8bbdcc440010c0965ac85222ba97903064fe41
URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b8bbdcc440010c0965ac85222ba97903064fe41
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Thu Apr 14 22:41:50 2011 +0200
wined3d: Get rid of the IWineD3DResource interface.
---
dlls/wined3d/surface_base.c | 1 -
include/wine/wined3d.idl | 13 ++-----------
2 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c
index 4239f69..d72f9d1 100644
--- a/dlls/wined3d/surface_base.c
+++ b/dlls/wined3d/surface_base.c
@@ -94,7 +94,6 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_QueryInterface(IWineD3DSurface *iface, RE
if (IsEqualGUID(riid, &IID_IUnknown)
|| IsEqualGUID(riid, &IID_IWineD3DBase)
- || IsEqualGUID(riid, &IID_IWineD3DResource)
|| IsEqualGUID(riid, &IID_IWineD3DSurface)) {
IUnknown_AddRef((IUnknown*)iface);
*ppobj = This;
diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl
index 79d7afd..5a6a91f 100644
--- a/include/wine/wined3d.idl
+++ b/include/wine/wined3d.idl
@@ -2178,9 +2178,9 @@ interface IWineD3DBase : IUnknown
[
object,
local,
- uuid(1f3bfb34-6f30-11d9-c687-00046142c14f)
+ uuid(37cd5526-6f30-11d9-c687-00046142c14f)
]
-interface IWineD3DResource : IWineD3DBase
+interface IWineD3DSurface : IWineD3DBase
{
HRESULT SetPrivateData(
[in] REFGUID guid,
@@ -2205,15 +2205,6 @@ interface IWineD3DResource : IWineD3DBase
);
WINED3DRESOURCETYPE GetType(
);
-}
-
-[
- object,
- local,
- uuid(37cd5526-6f30-11d9-c687-00046142c14f)
-]
-interface IWineD3DSurface : IWineD3DResource
-{
struct wined3d_resource *GetResource(
);
HRESULT Map(
More information about the wine-cvs
mailing list