Markus Amsler : d3d: Remove AddRef from IWineD3DDevice_GetBackBuffer.

Alexandre Julliard julliard at wine.codeweavers.com
Wed Nov 22 05:21:25 CST 2006


Module: wine
Branch: master
Commit: 478a414e5820c56fb7bb65d0c41c831932ca26e8
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=478a414e5820c56fb7bb65d0c41c831932ca26e8

Author: Markus Amsler <markus.amsler at oribi.org>
Date:   Mon Nov 20 10:47:37 2006 +0100

d3d: Remove AddRef from IWineD3DDevice_GetBackBuffer.

---

 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, 0 insertions(+), 9 deletions(-)

diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c
index e128930..429b918 100644
--- a/dlls/d3d8/device.c
+++ b/dlls/d3d8/device.c
@@ -295,7 +295,6 @@ 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 f5b75d8..9012b35 100644
--- a/dlls/d3d8/swapchain.c
+++ b/dlls/d3d8/swapchain.c
@@ -80,7 +80,6 @@ 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 2ebb677..8ed7b8d 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -205,7 +205,6 @@ 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 0b06049..a4007ad 100644
--- a/dlls/d3d9/swapchain.c
+++ b/dlls/d3d9/swapchain.c
@@ -88,7 +88,6 @@ 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 11de3ef..de3c704 100644
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -1212,9 +1212,6 @@ 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 b9bf032..4e8f97f 100644
--- a/dlls/wined3d/swapchain.c
+++ b/dlls/wined3d/swapchain.c
@@ -461,8 +461,6 @@ 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;
 
 }




More information about the wine-cvs mailing list