Markus Amsler : d3d9: Handle surface container in d3d9.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Dec 18 05:34:42 CST 2006
Module: wine
Branch: master
Commit: 467b1dd3ad0b6034f042901dc5ef15d3bfc4ea5c
URL: http://source.winehq.org/git/wine.git/?a=commit;h=467b1dd3ad0b6034f042901dc5ef15d3bfc4ea5c
Author: Markus Amsler <markus.amsler at oribi.org>
Date: Mon Dec 18 00:17:51 2006 +0100
d3d9: Handle surface container in d3d9.
---
dlls/d3d9/d3d9_private.h | 3 +++
dlls/d3d9/device.c | 1 +
dlls/d3d9/directx.c | 2 ++
dlls/d3d9/surface.c | 24 +++---------------------
4 files changed, 9 insertions(+), 21 deletions(-)
diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h
index 9799104..391f91e 100644
--- a/dlls/d3d9/d3d9_private.h
+++ b/dlls/d3d9/d3d9_private.h
@@ -310,6 +310,9 @@ typedef struct IDirect3DSurface9Impl
/* Parent reference */
LPDIRECT3DDEVICE9 parentDevice;
+ /* The surface container */
+ IUnknown *container;
+
/* If set forward refcounting to this object */
IUnknown *forwardReference;
diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index f89694f..06534e7 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -1013,6 +1013,7 @@ HRESULT WINAPI D3D9CB_CreateSurface(IUnk
if (SUCCEEDED(res)) {
*ppSurface = d3dSurface->wineD3DSurface;
+ d3dSurface->container = pSuperior;
IUnknown_Release(d3dSurface->parentDevice);
d3dSurface->parentDevice = NULL;
d3dSurface->forwardReference = pSuperior;
diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c
index 899463a..1d68e42 100644
--- a/dlls/d3d9/directx.c
+++ b/dlls/d3d9/directx.c
@@ -189,6 +189,7 @@ HRESULT WINAPI D3D9CB_CreateRenderTarget
if (SUCCEEDED(res)) {
*ppSurface = d3dSurface->wineD3DSurface;
+ d3dSurface->container = pSuperior;
d3dSurface->isImplicit = TRUE;
/* Implicit surfaces are created with an refcount of 0 */
IUnknown_Release((IUnknown *)d3dSurface);
@@ -285,6 +286,7 @@ HRESULT WINAPI D3D9CB_CreateDepthStencil
(IDirect3DSurface9 **)&d3dSurface, pSharedHandle);
if (SUCCEEDED(res)) {
*ppSurface = d3dSurface->wineD3DSurface;
+ d3dSurface->container = device;
d3dSurface->isImplicit = TRUE;
/* Implicit surfaces are created with an refcount of 0 */
IUnknown_Release((IUnknown *)d3dSurface);
diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c
index 250204a..a9a93b4 100644
--- a/dlls/d3d9/surface.c
+++ b/dlls/d3d9/surface.c
@@ -139,35 +139,17 @@ static D3DRESOURCETYPE WINAPI IDirect3DS
/* IDirect3DSurface9 Interface follow: */
static HRESULT WINAPI IDirect3DSurface9Impl_GetContainer(LPDIRECT3DSURFACE9 iface, REFIID riid, void** ppContainer) {
IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)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 = IWineD3DSurface_GetContainer(This->wineD3DSurface, &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);
More information about the wine-cvs
mailing list