Henri Verbeet : wined3d: Get rid of the IWineD3DBase interface.
Alexandre Julliard
julliard at winehq.org
Fri Apr 15 10:19:24 CDT 2011
Module: wine
Branch: master
Commit: 6a135a15119f71ab712eed811c55d0dba0b6cd94
URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a135a15119f71ab712eed811c55d0dba0b6cd94
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Thu Apr 14 22:41:51 2011 +0200
wined3d: Get rid of the IWineD3DBase 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 d72f9d1..906c7ef 100644
--- a/dlls/wined3d/surface_base.c
+++ b/dlls/wined3d/surface_base.c
@@ -93,7 +93,6 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_QueryInterface(IWineD3DSurface *iface, RE
TRACE("(%p)->(%s,%p)\n", This,debugstr_guid(riid),ppobj);
if (IsEqualGUID(riid, &IID_IUnknown)
- || IsEqualGUID(riid, &IID_IWineD3DBase)
|| IsEqualGUID(riid, &IID_IWineD3DSurface)) {
IUnknown_AddRef((IUnknown*)iface);
*ppobj = This;
diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl
index 5a6a91f..82f5f76 100644
--- a/include/wine/wined3d.idl
+++ b/include/wine/wined3d.idl
@@ -2167,21 +2167,12 @@ typedef HRESULT (__stdcall *D3DCB_ENUMRESOURCES)(struct wined3d_resource *resour
[
object,
local,
- uuid(46799311-8e0e-40ce-b2ec-ddb99f18fcb4)
+ uuid(37cd5526-6f30-11d9-c687-00046142c14f)
]
-interface IWineD3DBase : IUnknown
+interface IWineD3DSurface : IUnknown
{
void *GetParent(
);
-}
-
-[
- object,
- local,
- uuid(37cd5526-6f30-11d9-c687-00046142c14f)
-]
-interface IWineD3DSurface : IWineD3DBase
-{
HRESULT SetPrivateData(
[in] REFGUID guid,
[in] const void *data,
More information about the wine-cvs
mailing list