Markus Amsler : d3d9: Handle volume container in d3d9.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Dec 18 05:34:44 CST 2006
Module: wine
Branch: master
Commit: d80dc79280ce9db70e1801a2f05b30bee1021c78
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d80dc79280ce9db70e1801a2f05b30bee1021c78
Author: Markus Amsler <markus.amsler at oribi.org>
Date: Mon Dec 18 00:18:05 2006 +0100
d3d9: Handle volume container in d3d9.
---
dlls/d3d9/d3d9_private.h | 3 +++
dlls/d3d9/volume.c | 25 ++++---------------------
2 files changed, 7 insertions(+), 21 deletions(-)
diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h
index 391f91e..58969e3 100644
--- a/dlls/d3d9/d3d9_private.h
+++ b/dlls/d3d9/d3d9_private.h
@@ -239,6 +239,9 @@ typedef struct IDirect3DVolume9Impl
/* IDirect3DVolume9 fields */
IWineD3DVolume *wineD3DVolume;
+ /* The volume container */
+ IUnknown *container;
+
/* If set forward refcounting to this object */
IUnknown *forwardReference;
} IDirect3DVolume9Impl;
diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c
index f9ce7fc..1a6f32d 100644
--- a/dlls/d3d9/volume.c
+++ b/dlls/d3d9/volume.c
@@ -111,35 +111,17 @@ static HRESULT WINAPI IDirect3DVolume9Im
static HRESULT WINAPI IDirect3DVolume9Impl_GetContainer(LPDIRECT3DVOLUME9 iface, REFIID riid, void** ppContainer) {
IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface;
- IWineD3DBase *wineD3DContainer = NULL;
- IUnknown *wineD3DContainerParent = NULL;
HRESULT res;
TRACE("(This %p, riid %s, ppContainer %p)\n", This, debugstr_guid(riid), ppContainer);
+ if (!This->container) return E_NOINTERFACE;
+
if (!ppContainer) {
ERR("Called without a valid ppContainer.\n");
}
- /* Get the WineD3D container. */
- res = IWineD3DVolume_GetContainer(This->wineD3DVolume, &IID_IWineD3DBase, (void **)&wineD3DContainer);
- if (res != D3D_OK) return res;
-
- if (!wineD3DContainer) {
- ERR("IWineD3DSurface_GetContainer should never return NULL\n");
- }
-
- /* Get the parent */
- IWineD3DBase_GetParent(wineD3DContainer, &wineD3DContainerParent);
- IUnknown_Release(wineD3DContainer);
-
- if (!wineD3DContainerParent) {
- ERR("IWineD3DBase_GetParent should never return NULL\n");
- }
-
- /* Now, query the interface of the parent for the riid */
- res = IUnknown_QueryInterface(wineD3DContainerParent, riid, ppContainer);
- IUnknown_Release(wineD3DContainerParent);
+ res = IUnknown_QueryInterface(This->container, riid, ppContainer);
TRACE("Returning ppContainer %p, *ppContainer %p\n", ppContainer, *ppContainer);
@@ -224,6 +206,7 @@ HRESULT WINAPI D3D9CB_CreateVolume(IUnkn
*ppVolume = NULL;
} else {
*ppVolume = (IWineD3DVolume *)object->wineD3DVolume;
+ object->container = pSuperior;
object->forwardReference = pSuperior;
}
TRACE("(%p) Created volume %p\n", This, *ppVolume);
More information about the wine-cvs
mailing list