Module: wine Branch: master Commit: f8e7ddd7980fdf949cceab3e936a284ccf1be3bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8e7ddd7980fdf949cceab3e93...
Author: Markus Amsler markus.amsler@oribi.org Date: Thu Nov 30 13:33:52 2006 +0100
Revert "d3d: Remove AddRef from IWineD3DDevice_GetBackBuffer.".
This reverts commit 478a414e5820c56fb7bb65d0c41c831932ca26e8.
---
dlls/d3d8/device.c | 1 + dlls/d3d8/swapchain.c | 1 + dlls/d3d9/device.c | 1 + dlls/d3d9/swapchain.c | 1 + dlls/ddraw/ddraw.c | 3 +++ dlls/wined3d/swapchain.c | 2 ++ 6 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 429b918..e128930 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -295,6 +295,7 @@ static HRESULT WINAPI IDirect3DDevice8Im rc = IWineD3DDevice_GetBackBuffer(This->WineD3DDevice, 0, BackBuffer, (WINED3DBACKBUFFER_TYPE) Type, (IWineD3DSurface **)&retSurface); if (rc == D3D_OK && NULL != retSurface && NULL != ppBackBuffer) { IWineD3DSurface_GetParent(retSurface, (IUnknown **)ppBackBuffer); + IWineD3DSurface_Release(retSurface); } return rc; } diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c index 9012b35..f5b75d8 100644 --- a/dlls/d3d8/swapchain.c +++ b/dlls/d3d8/swapchain.c @@ -80,6 +80,7 @@ static HRESULT WINAPI IDirect3DSwapChain hrc = IWineD3DSwapChain_GetBackBuffer(This->wineD3DSwapChain, iBackBuffer, (WINED3DBACKBUFFER_TYPE )Type, &mySurface); if (hrc == D3D_OK && NULL != mySurface) { IWineD3DSurface_GetParent(mySurface, (IUnknown **)ppBackBuffer); + IWineD3DSurface_Release(mySurface); } return hrc; } diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 8ed7b8d..2ebb677 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -205,6 +205,7 @@ static HRESULT WINAPI IDirect3DDevice9 rc = IWineD3DDevice_GetBackBuffer(This->WineD3DDevice, iSwapChain, BackBuffer, (WINED3DBACKBUFFER_TYPE) Type, (IWineD3DSurface **)&retSurface); if (rc == D3D_OK && NULL != retSurface && NULL != ppBackBuffer) { IWineD3DSurface_GetParent(retSurface, (IUnknown **)ppBackBuffer); + IWineD3DSurface_Release(retSurface); } return rc; } diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index a4007ad..0b06049 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -88,6 +88,7 @@ static HRESULT WINAPI IDirect3DSwapChain hrc = IWineD3DSwapChain_GetBackBuffer(This->wineD3DSwapChain, iBackBuffer, (WINED3DBACKBUFFER_TYPE) Type, &mySurface); if (hrc == D3D_OK && NULL != mySurface) { IWineD3DSurface_GetParent(mySurface, (IUnknown **)ppBackBuffer); + IWineD3DSurface_Release(mySurface); } /* Do not touch the **ppBackBuffer pointer otherwise! (see device test) */ return hrc; diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index de3c704..11de3ef 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1212,6 +1212,9 @@ IDirectDrawImpl_GetGDISurface(IDirectDra return DDERR_NOTFOUND; }
+ /* GetBackBuffer AddRef()ed the surface, release it */ + IWineD3DSurface_Release(Surf); + IWineD3DSurface_GetParent(Surf, (IUnknown **) &ddsurf); IDirectDrawSurface7_Release(ddsurf); /* For the GetParent */ diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 4e8f97f..b9bf032 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -461,6 +461,8 @@ static HRESULT WINAPI IWineD3DSwapChainI *ppBackBuffer = This->backBuffer[iBackBuffer]; TRACE("(%p) : BackBuf %d Type %d returning %p\n", This, iBackBuffer, Type, *ppBackBuffer);
+ /* Note inc ref on returned surface */ + if(*ppBackBuffer) IWineD3DSurface_AddRef(*ppBackBuffer); return WINED3D_OK;
}
-
Alexandre Julliard