December 2006 - Wine-commits

Markus Amsler : d3d: Callback infrastructure for implicit swap chain destruction in IWineD3DDevice .
by Alexandre Julliard 18 Dec '06

18 Dec '06

Module: wine Branch: master Commit: 5e0fc62135005323bf9e27abbf18c38daf171397 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e0fc62135005323bf9e27abb… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Mon Dec 18 00:17:24 2006 +0100 d3d: Callback infrastructure for implicit swap chain destruction in IWineD3DDevice. --- dlls/d3d8/d3d8_private.h | 2 ++ dlls/d3d8/device.c | 2 +- dlls/d3d8/directx.c | 9 +++++++++ dlls/d3d9/d3d9_private.h | 2 ++ dlls/d3d9/device.c | 2 +- dlls/d3d9/directx.c | 9 +++++++++ dlls/ddraw/ddraw.c | 11 ++++++++++- dlls/ddraw/ddraw_private.h | 2 ++ dlls/ddraw/surface.c | 2 +- dlls/wined3d/device.c | 8 ++------ include/wine/wined3d_interface.h | 8 +++++--- 11 files changed, 44 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5e0fc62135005323bf9e2…

1 0

Markus Amsler : d3d9: Fix implicit swap chain refcounting.
by Alexandre Julliard 18 Dec '06

18 Dec '06

Module: wine Branch: master Commit: 73b5fb059f8a62bb2862515cdfe7624963cce974 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73b5fb059f8a62bb2862515cd… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Mon Dec 18 00:17:31 2006 +0100 d3d9: Fix implicit swap chain refcounting. --- dlls/d3d9/d3d9_private.h | 3 +++ dlls/d3d9/directx.c | 14 ++++++++------ dlls/d3d9/swapchain.c | 8 ++++++-- dlls/d3d9/tests/device.c | 46 +++++++++++++++++++++++----------------------- 4 files changed, 40 insertions(+), 31 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 1fba1b3..9799104 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -261,6 +261,9 @@ typedef struct IDirect3DSwapChain9Impl /* Parent reference */ LPDIRECT3DDEVICE9 parentDevice; + + /* Flags an implicit swap chain */ + BOOL isImplicit; } IDirect3DSwapChain9Impl; /* ------------------ */ diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 548d790..899463a 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -236,8 +236,9 @@ HRESULT WINAPI D3D9CB_CreateAdditionalSw if (SUCCEEDED(res)) { *ppSwapChain = d3dSwapChain->wineD3DSwapChain; - IUnknown_Release(d3dSwapChain->parentDevice); - d3dSwapChain->parentDevice = NULL; + d3dSwapChain->isImplicit = TRUE; + /* Implicit swap chains are created with an refcount of 0 */ + IUnknown_Release((IUnknown *)d3dSwapChain); } else { *ppSwapChain = NULL; } @@ -261,12 +262,13 @@ HRESULT WINAPI D3D9CB_CreateAdditionalSw } ULONG WINAPI D3D9CB_DestroySwapChain(IWineD3DSwapChain *pSwapChain) { - IUnknown* swapChainParent; + IDirect3DSwapChain9Impl* swapChainParent; TRACE("(%p) call back\n", pSwapChain); - IWineD3DSwapChain_GetParent(pSwapChain, &swapChainParent); - IUnknown_Release(swapChainParent); - return IUnknown_Release(swapChainParent); + IWineD3DSwapChain_GetParent(pSwapChain,(IUnknown **) &swapChainParent); + swapChainParent->isImplicit = FALSE; + /* Swap chain had refcount of 0 GetParent addrefed to 1, so 1 Release is enough */ + return IDirect3DSwapChain9_Release((IDirect3DSwapChain9*) swapChainParent); } /* Internal function called back during the CreateDevice to create a render target */ diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index 07b93d6..093ad43 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -48,6 +48,8 @@ static ULONG WINAPI IDirect3DSwapChain9I TRACE("(%p) : AddRef from %d\n", This, ref - 1); + if(ref == 1 && This->parentDevice) IUnknown_AddRef(This->parentDevice); + return ref; } @@ -58,9 +60,11 @@ static ULONG WINAPI IDirect3DSwapChain9I TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { - IWineD3DSwapChain_Destroy(This->wineD3DSwapChain, D3D9CB_DestroyRenderTarget); if (This->parentDevice) IUnknown_Release(This->parentDevice); - HeapFree(GetProcessHeap(), 0, This); + if (!This->isImplicit) { + IWineD3DSwapChain_Destroy(This->wineD3DSwapChain, D3D9CB_DestroyRenderTarget); + HeapFree(GetProcessHeap(), 0, This); + } } return ref; } diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index dac04b7..96fdfc2 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -358,41 +358,41 @@ static void test_refcount(void) * - the refcount is not forwarded to the container. */ hr = IDirect3DDevice9_GetSwapChain(pDevice, 0, &pSwapChain); - todo_wine CHECK_CALL( hr, "GetSwapChain", pDevice, ++refcount); + CHECK_CALL( hr, "GetSwapChain", pDevice, ++refcount); if (pSwapChain) { - todo_wine CHECK_REFCOUNT( pSwapChain, 1); + CHECK_REFCOUNT( pSwapChain, 1); hr = IDirect3DDevice9_GetRenderTarget(pDevice, 0, &pRenderTarget); - todo_wine CHECK_CALL( hr, "GetRenderTarget", pDevice, ++refcount); - todo_wine CHECK_REFCOUNT( pSwapChain, 1); + CHECK_CALL( hr, "GetRenderTarget", pDevice, ++refcount); + CHECK_REFCOUNT( pSwapChain, 1); if(pRenderTarget) { CHECK_SURFACE_CONTAINER( pRenderTarget, IID_IDirect3DSwapChain9, pSwapChain); CHECK_REFCOUNT( pRenderTarget, 1); CHECK_ADDREF_REFCOUNT(pRenderTarget, 2); - todo_wine CHECK_REFCOUNT(pDevice, refcount); + CHECK_REFCOUNT(pDevice, refcount); CHECK_RELEASE_REFCOUNT(pRenderTarget, 1); - todo_wine CHECK_REFCOUNT(pDevice, refcount); + CHECK_REFCOUNT(pDevice, refcount); hr = IDirect3DDevice9_GetRenderTarget(pDevice, 0, &pRenderTarget); - todo_wine CHECK_CALL( hr, "GetRenderTarget", pDevice, refcount); + CHECK_CALL( hr, "GetRenderTarget", pDevice, refcount); CHECK_REFCOUNT( pRenderTarget, 2); CHECK_RELEASE_REFCOUNT( pRenderTarget, 1); CHECK_RELEASE_REFCOUNT( pRenderTarget, 0); - todo_wine CHECK_REFCOUNT( pDevice, --refcount); + CHECK_REFCOUNT( pDevice, --refcount); /* The render target is released with the device, so AddRef with refcount=0 is fine here. */ CHECK_ADDREF_REFCOUNT(pRenderTarget, 1); - todo_wine CHECK_REFCOUNT(pDevice, ++refcount); + CHECK_REFCOUNT(pDevice, ++refcount); CHECK_RELEASE_REFCOUNT(pRenderTarget, 0); - todo_wine CHECK_REFCOUNT(pDevice, --refcount); + CHECK_REFCOUNT(pDevice, --refcount); } /* Render target and back buffer are identical. */ hr = IDirect3DDevice9_GetBackBuffer(pDevice, 0, 0, 0, &pBackBuffer); - todo_wine CHECK_CALL( hr, "GetBackBuffer", pDevice, ++refcount); + CHECK_CALL( hr, "GetBackBuffer", pDevice, ++refcount); if(pBackBuffer) { CHECK_RELEASE_REFCOUNT(pBackBuffer, 0); @@ -400,39 +400,39 @@ static void test_refcount(void) pRenderTarget, pBackBuffer); pBackBuffer = NULL; } - todo_wine CHECK_REFCOUNT( pDevice, --refcount); + CHECK_REFCOUNT( pDevice, --refcount); hr = IDirect3DDevice9_GetDepthStencilSurface(pDevice, &pStencilSurface); - todo_wine CHECK_CALL( hr, "GetDepthStencilSurface", pDevice, ++refcount); - todo_wine CHECK_REFCOUNT( pSwapChain, 1); + CHECK_CALL( hr, "GetDepthStencilSurface", pDevice, ++refcount); + CHECK_REFCOUNT( pSwapChain, 1); if(pStencilSurface) { CHECK_SURFACE_CONTAINER( pStencilSurface, IID_IDirect3DDevice9, pDevice); CHECK_REFCOUNT( pStencilSurface, 1); CHECK_ADDREF_REFCOUNT(pStencilSurface, 2); - todo_wine CHECK_REFCOUNT(pDevice, refcount); + CHECK_REFCOUNT(pDevice, refcount); CHECK_RELEASE_REFCOUNT(pStencilSurface, 1); - todo_wine CHECK_REFCOUNT(pDevice, refcount); + CHECK_REFCOUNT(pDevice, refcount); CHECK_RELEASE_REFCOUNT( pStencilSurface, 0); - todo_wine CHECK_REFCOUNT( pDevice, --refcount); + CHECK_REFCOUNT( pDevice, --refcount); /* The stencil surface is released with the device, so AddRef with refcount=0 is fine here. */ CHECK_ADDREF_REFCOUNT(pStencilSurface, 1); - todo_wine CHECK_REFCOUNT(pDevice, ++refcount); + CHECK_REFCOUNT(pDevice, ++refcount); CHECK_RELEASE_REFCOUNT(pStencilSurface, 0); - todo_wine CHECK_REFCOUNT(pDevice, --refcount); + CHECK_REFCOUNT(pDevice, --refcount); pStencilSurface = NULL; } - todo_wine CHECK_RELEASE_REFCOUNT( pSwapChain, 0); + CHECK_RELEASE_REFCOUNT( pSwapChain, 0); CHECK_REFCOUNT( pDevice, --refcount); /* The implicit swapchwin is released with the device, so AddRef with refcount=0 is fine here. */ - todo_wine CHECK_ADDREF_REFCOUNT(pSwapChain, 1); - todo_wine CHECK_REFCOUNT(pDevice, ++refcount); - todo_wine CHECK_RELEASE_REFCOUNT(pSwapChain, 0); + CHECK_ADDREF_REFCOUNT(pSwapChain, 1); + CHECK_REFCOUNT(pDevice, ++refcount); + CHECK_RELEASE_REFCOUNT(pSwapChain, 0); CHECK_REFCOUNT(pDevice, --refcount); pSwapChain = NULL; }

1 0

Markus Amsler : wined3d: Remove IWineD3DVolume_GetContainerParent.
by Alexandre Julliard 18 Dec '06

18 Dec '06

Module: wine Branch: master Commit: 4ca9fccf31816c83cd619e8e82eac8c21574a11f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ca9fccf31816c83cd619e8e8… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Mon Dec 18 00:17:09 2006 +0100 wined3d: Remove IWineD3DVolume_GetContainerParent. --- dlls/wined3d/volume.c | 24 ------------------------ include/wine/wined3d_interface.h | 2 -- 2 files changed, 0 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 375a59c..dc768e1 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -104,29 +104,6 @@ static WINED3DRESOURCETYPE WINAPI IWineD /* ******************************************* IWineD3DVolume parts follow ******************************************* */ -static HRESULT WINAPI IWineD3DVolumeImpl_GetContainerParent(IWineD3DVolume *iface, IUnknown **ppContainerParent) { - IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface; - - TRACE("(%p) : ppContainerParent %p\n", This, ppContainerParent); - - if (!ppContainerParent) { - ERR("(%p) : Called without a valid ppContainerParent\n", This); - } - - if (This->container) { - IWineD3DBase_GetParent(This->container, ppContainerParent); - if (!ppContainerParent) { - /* WineD3D objects should always have a parent */ - ERR("(%p) : GetParent returned NULL\n", This); - } - IUnknown_Release(*ppContainerParent); /* GetParent adds a reference; we want just the pointer */ - } else { - *ppContainerParent = NULL; - } - - return WINED3D_OK; -} - static HRESULT WINAPI IWineD3DVolumeImpl_GetContainer(IWineD3DVolume *iface, REFIID riid, void** ppContainer) { IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface; @@ -332,7 +309,6 @@ const IWineD3DVolumeVtbl IWineD3DVolume_ IWineD3DVolumeImpl_PreLoad, IWineD3DVolumeImpl_GetType, /* IWineD3DVolume */ - IWineD3DVolumeImpl_GetContainerParent, IWineD3DVolumeImpl_GetContainer, IWineD3DVolumeImpl_GetDesc, IWineD3DVolumeImpl_LockBox, diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index a14bdf0..6947d26 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -1210,7 +1210,6 @@ DECLARE_INTERFACE_(IWineD3DVolume,IWineD STDMETHOD_(void,PreLoad)(THIS) PURE; STDMETHOD_(WINED3DRESOURCETYPE, GetType)(THIS) PURE; /*** IWineD3DVolume methods ***/ - STDMETHOD(GetContainerParent)(THIS_ IUnknown **ppContainerParent) PURE; STDMETHOD(GetContainer)(THIS_ REFIID riid, void ** ppContainer) PURE; STDMETHOD(GetDesc)(THIS_ WINED3DVOLUME_DESC * pDesc) PURE; STDMETHOD(LockBox)(THIS_ WINED3DLOCKED_BOX* pLockedVolume, CONST WINED3DBOX* pBox, DWORD Flags) PURE; @@ -1239,7 +1238,6 @@ DECLARE_INTERFACE_(IWineD3DVolume,IWineD #define IWineD3DVolume_PreLoad(p) (p)->lpVtbl->PreLoad(p) #define IWineD3DVolume_GetType(p) (p)->lpVtbl->GetType(p) /*** IWineD3DVolume methods ***/ -#define IWineD3DVolume_GetContainerParent(p,a) (p)->lpVtbl->GetContainerParent(p,a) #define IWineD3DVolume_GetContainer(p,a,b) (p)->lpVtbl->GetContainer(p,a,b) #define IWineD3DVolume_GetDesc(p,a) (p)->lpVtbl->GetDesc(p,a) #define IWineD3DVolume_LockBox(p,a,b,c) (p)->lpVtbl->LockBox(p,a,b,c)

1 0

Markus Amsler : d3d9: Fix implicit surface refcounting.
by Alexandre Julliard 18 Dec '06

18 Dec '06

Module: wine Branch: master Commit: f9f3ec2f007776c92c7ea1183f0bfdb2f92a6a12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9f3ec2f007776c92c7ea1183… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Mon Dec 18 00:17:16 2006 +0100 d3d9: Fix implicit surface refcounting. --- dlls/d3d9/d3d9_private.h | 8 +++++++ dlls/d3d9/device.c | 6 ++++- dlls/d3d9/directx.c | 23 ++++++++++++++++---- dlls/d3d9/surface.c | 7 ++++- dlls/d3d9/swapchain.c | 2 +- dlls/d3d9/tests/device.c | 49 ++++++++++++++++++++++++--------------------- 6 files changed, 63 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f9f3ec2f007776c92c7ea…

1 0

Markus Amsler : d3d9: Handle surface refcount forwarding in d3d9.
by Alexandre Julliard 18 Dec '06

18 Dec '06

Module: wine Branch: master Commit: 04dcffe393da66d458255c2c4bcd70ef40d72584 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04dcffe393da66d458255c2c4… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Mon Dec 18 00:16:48 2006 +0100 d3d9: Handle surface refcount forwarding in d3d9. --- dlls/d3d9/cubetexture.c | 2 +- dlls/d3d9/d3d9_private.h | 5 +++++ dlls/d3d9/device.c | 12 ++++++++++++ dlls/d3d9/surface.c | 18 +++++++----------- dlls/d3d9/tests/device.c | 2 +- dlls/d3d9/texture.c | 2 +- 6 files changed, 27 insertions(+), 14 deletions(-) diff --git a/dlls/d3d9/cubetexture.c b/dlls/d3d9/cubetexture.c index e140b2e..c372314 100644 --- a/dlls/d3d9/cubetexture.c +++ b/dlls/d3d9/cubetexture.c @@ -60,7 +60,7 @@ static ULONG WINAPI IDirect3DCubeTexture if (ref == 0) { TRACE("Releasing child %p\n", This->wineD3DCubeTexture); - IWineD3DCubeTexture_Release(This->wineD3DCubeTexture); + IWineD3DCubeTexture_Destroy(This->wineD3DCubeTexture, D3D9CB_DestroySurface); IUnknown_Release(This->parentDevice); HeapFree(GetProcessHeap(), 0, This); } diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 5aa7ea6..0555b3a 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -301,6 +301,9 @@ typedef struct IDirect3DSurface9Impl /* Parent reference */ LPDIRECT3DDEVICE9 parentDevice; + + /* If set forward refcounting to this object */ + IUnknown *forwardReference; } IDirect3DSurface9Impl; /* ---------------------- */ @@ -543,4 +546,6 @@ extern HRESULT WINAPI D3D9CB_CreateRende extern ULONG WINAPI D3D9CB_DestroyDepthStencilSurface (IWineD3DSurface *pSurface); +extern ULONG WINAPI D3D9CB_DestroySurface(IWineD3DSurface *pSurface); + #endif /* __WINE_D3D9_PRIVATE_H */ diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index bd96b10..82fe762 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1011,8 +1011,20 @@ HRESULT WINAPI D3D9CB_CreateSurface(IUnk *ppSurface = d3dSurface->wineD3DSurface; IUnknown_Release(d3dSurface->parentDevice); d3dSurface->parentDevice = NULL; + d3dSurface->forwardReference = pSuperior; } else { FIXME("(%p) IDirect3DDevice9_CreateSurface failed\n", device); } return res; } + +ULONG WINAPI D3D9CB_DestroySurface(IWineD3DSurface *pSurface) { + IDirect3DSurface9Impl* surfaceParent; + TRACE("(%p) call back\n", pSurface); + + IWineD3DSurface_GetParent(pSurface, (IUnknown **) &surfaceParent); + /* GetParent's AddRef was forwarded to an object in destruction. + * Releasing it here again would cause an endless recursion. */ + surfaceParent->forwardReference = NULL; + return IDirect3DSurface9_Release((IDirect3DSurface9*) surfaceParent); +} diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index e953540..c2f94a6 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -43,15 +43,13 @@ static HRESULT WINAPI IDirect3DSurface9I static ULONG WINAPI IDirect3DSurface9Impl_AddRef(LPDIRECT3DSURFACE9 iface) { IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; - IUnknown *containerParent = NULL; TRACE("(%p)\n", This); - IWineD3DSurface_GetContainerParent(This->wineD3DSurface, &containerParent); - if (containerParent) { - /* Forward to the containerParent */ - TRACE("(%p) : Forwarding to %p\n", This, containerParent); - return IUnknown_AddRef(containerParent); + if (This->forwardReference) { + /* Forward refcounting */ + TRACE("(%p) : Forwarding to %p\n", This, This->forwardReference); + return IUnknown_AddRef(This->forwardReference); } else { /* No container, handle our own refcounting */ ULONG ref = InterlockedIncrement(&This->ref); @@ -64,15 +62,13 @@ static ULONG WINAPI IDirect3DSurface9Imp static ULONG WINAPI IDirect3DSurface9Impl_Release(LPDIRECT3DSURFACE9 iface) { IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; - IUnknown *containerParent = NULL; TRACE("(%p)\n", This); - IWineD3DSurface_GetContainerParent(This->wineD3DSurface, &containerParent); - if (containerParent) { + if (This->forwardReference) { /* Forward to the containerParent */ - TRACE("(%p) : Forwarding to %p\n", This, containerParent); - return IUnknown_Release(containerParent); + TRACE("(%p) : Forwarding to %p\n", This, This->forwardReference); + return IUnknown_Release(This->forwardReference); } else { /* No container, handle our own refcounting */ ULONG ref = InterlockedDecrement(&This->ref); diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index a1336f2..de8f661 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -540,7 +540,7 @@ static void test_refcount(void) /* check implicit back buffer */ hr = IDirect3DSwapChain9_GetBackBuffer(pSwapChain, 0, 0, &pBackBuffer); todo_wine CHECK_CALL( hr, "GetBackBuffer", pDevice, ++refcount); - todo_wine CHECK_REFCOUNT( pSwapChain, 1); + CHECK_REFCOUNT( pSwapChain, 1); if(pBackBuffer) { CHECK_SURFACE_CONTAINER( pBackBuffer, IID_IDirect3DSwapChain9, pSwapChain); diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 427a7a2..7eecacd 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -59,7 +59,7 @@ static ULONG WINAPI IDirect3DTexture9Imp TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { - IWineD3DTexture_Release(This->wineD3DTexture); + IWineD3DTexture_Destroy(This->wineD3DTexture, D3D9CB_DestroySurface); IUnknown_Release(This->parentDevice); HeapFree(GetProcessHeap(), 0, This); }

1 0

Markus Amsler : d3d9: Handle volume refcount forwarding in d3d9.
by Alexandre Julliard 18 Dec '06

18 Dec '06

Module: wine Branch: master Commit: 63e23995bc73d206a55d3dd559f46fb4423777f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63e23995bc73d206a55d3dd55… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Mon Dec 18 00:16:56 2006 +0100 d3d9: Handle volume refcount forwarding in d3d9. --- dlls/d3d9/d3d9_private.h | 6 +++++- dlls/d3d9/volume.c | 31 +++++++++++++++++++------------ dlls/d3d9/volumetexture.c | 2 +- 3 files changed, 25 insertions(+), 14 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 0555b3a..aa4a49f 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -235,7 +235,9 @@ typedef struct IDirect3DVolume9Impl /* IDirect3DVolume9 fields */ IWineD3DVolume *wineD3DVolume; - + + /* If set forward refcounting to this object */ + IUnknown *forwardReference; } IDirect3DVolume9Impl; /* ------------------- */ @@ -548,4 +550,6 @@ extern ULONG WINAPI D3D9CB_DestroyDepthS extern ULONG WINAPI D3D9CB_DestroySurface(IWineD3DSurface *pSurface); +extern ULONG WINAPI D3D9CB_DestroyVolume(IWineD3DVolume *pVolume); + #endif /* __WINE_D3D9_PRIVATE_H */ diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c index 1575763..f9ce7fc 100644 --- a/dlls/d3d9/volume.c +++ b/dlls/d3d9/volume.c @@ -42,15 +42,13 @@ static HRESULT WINAPI IDirect3DVolume9Im static ULONG WINAPI IDirect3DVolume9Impl_AddRef(LPDIRECT3DVOLUME9 iface) { IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface; - IUnknown *containerParent = NULL; TRACE("(%p)\n", This); - IWineD3DVolume_GetContainerParent(This->wineD3DVolume, &containerParent); - if (containerParent) { - /* Forward to the containerParent */ - TRACE("(%p) : Forwarding to %p\n", This, containerParent); - return IUnknown_AddRef(containerParent); + if (This->forwardReference) { + /* Forward refcounting */ + TRACE("(%p) : Forwarding to %p\n", This, This->forwardReference); + return IUnknown_AddRef(This->forwardReference); } else { /* No container, handle our own refcounting */ ULONG ref = InterlockedIncrement(&This->ref); @@ -61,15 +59,13 @@ static ULONG WINAPI IDirect3DVolume9Impl static ULONG WINAPI IDirect3DVolume9Impl_Release(LPDIRECT3DVOLUME9 iface) { IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface; - IUnknown *containerParent = NULL; TRACE("(%p)\n", This); - IWineD3DVolume_GetContainerParent(This->wineD3DVolume, &containerParent); - if (containerParent) { - /* Forward to the containerParent */ - TRACE("(%p) : Forwarding to %p\n", This, containerParent); - return IUnknown_Release(containerParent); + if (This->forwardReference) { + /* Forward refcounting */ + TRACE("(%p) : Forwarding to %p\n", This, This->forwardReference); + return IUnknown_Release(This->forwardReference); } else { /* No container, handle our own refcounting */ ULONG ref = InterlockedDecrement(&This->ref); @@ -228,7 +224,18 @@ HRESULT WINAPI D3D9CB_CreateVolume(IUnkn *ppVolume = NULL; } else { *ppVolume = (IWineD3DVolume *)object->wineD3DVolume; + object->forwardReference = pSuperior; } TRACE("(%p) Created volume %p\n", This, *ppVolume); return hrc; } + +ULONG WINAPI D3D9CB_DestroyVolume(IWineD3DVolume *pVolume) { + IDirect3DVolume9Impl* volumeParent; + + IWineD3DVolume_GetParent(pVolume, (IUnknown **) &volumeParent); + /* GetParent's AddRef was forwarded to an object in destruction. + * Releasing it here again would cause an endless recursion. */ + volumeParent->forwardReference = NULL; + return IDirect3DVolume9_Release((IDirect3DVolume9*) volumeParent); +} diff --git a/dlls/d3d9/volumetexture.c b/dlls/d3d9/volumetexture.c index 3397bb7..d45ca0e 100644 --- a/dlls/d3d9/volumetexture.c +++ b/dlls/d3d9/volumetexture.c @@ -58,7 +58,7 @@ static ULONG WINAPI IDirect3DVolumeTextu TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { - IWineD3DVolumeTexture_Release(This->wineD3DVolumeTexture); + IWineD3DVolumeTexture_Destroy(This->wineD3DVolumeTexture, D3D9CB_DestroyVolume); IUnknown_Release(This->parentDevice); HeapFree(GetProcessHeap(), 0, This); }

1 0

Markus Amsler : wined3d: Remove IWineD3DSurface_GetContainerParent.
by Alexandre Julliard 18 Dec '06

18 Dec '06

Module: wine Branch: master Commit: 9b397ec2d50f0c760768f08cbedc405f57b2426a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b397ec2d50f0c760768f08cb… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Mon Dec 18 00:17:03 2006 +0100 wined3d: Remove IWineD3DSurface_GetContainerParent. --- dlls/wined3d/surface.c | 24 ------------------------ dlls/wined3d/surface_gdi.c | 1 - dlls/wined3d/wined3d_private.h | 1 - include/wine/wined3d_interface.h | 2 -- 4 files changed, 0 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index abc35ee..cc5ac2a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -337,29 +337,6 @@ HRESULT WINAPI IWineD3DSurfaceImpl_GetPa IWineD3DSurface IWineD3DSurface parts follow ****************************************************** */ -HRESULT WINAPI IWineD3DSurfaceImpl_GetContainerParent(IWineD3DSurface* iface, IUnknown **ppContainerParent) { - IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; - - TRACE("(%p) : ppContainerParent %p)\n", This, ppContainerParent); - - if (!ppContainerParent) { - ERR("(%p) : Called without a valid ppContainerParent.\n", This); - } - - if (This->container) { - IWineD3DBase_GetParent(This->container, ppContainerParent); - if (!ppContainerParent) { - /* WineD3D objects should always have a parent */ - ERR("(%p) : GetParent returned NULL\n", This); - } - IUnknown_Release(*ppContainerParent); /* GetParent adds a reference; we want just the pointer */ - } else { - *ppContainerParent = NULL; - } - - return WINED3D_OK; -} - HRESULT WINAPI IWineD3DSurfaceImpl_GetContainer(IWineD3DSurface* iface, REFIID riid, void** ppContainer) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; IWineD3DBase *container = 0; @@ -3115,7 +3092,6 @@ const IWineD3DSurfaceVtbl IWineD3DSurfac IWineD3DSurfaceImpl_PreLoad, IWineD3DSurfaceImpl_GetType, /* IWineD3DSurface */ - IWineD3DSurfaceImpl_GetContainerParent, IWineD3DSurfaceImpl_GetContainer, IWineD3DSurfaceImpl_GetDesc, IWineD3DSurfaceImpl_LockRect, diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index c316fd8..2920593 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -1568,7 +1568,6 @@ const IWineD3DSurfaceVtbl IWineGDISurfac IWineGDISurfaceImpl_PreLoad, IWineD3DSurfaceImpl_GetType, /* IWineD3DSurface */ - IWineD3DSurfaceImpl_GetContainerParent, IWineD3DSurfaceImpl_GetContainer, IWineD3DSurfaceImpl_GetDesc, IWineGDISurfaceImpl_LockRect, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2f5e887..da3fbe9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -961,7 +961,6 @@ DWORD WINAPI IWineD3DSurfaceImpl_SetPr DWORD WINAPI IWineD3DSurfaceImpl_GetPriority(IWineD3DSurface *iface); void WINAPI IWineD3DSurfaceImpl_PreLoad(IWineD3DSurface *iface); WINED3DRESOURCETYPE WINAPI IWineD3DSurfaceImpl_GetType(IWineD3DSurface *iface); -HRESULT WINAPI IWineD3DSurfaceImpl_GetContainerParent(IWineD3DSurface* iface, IUnknown **ppContainerParent); HRESULT WINAPI IWineD3DSurfaceImpl_GetContainer(IWineD3DSurface* iface, REFIID riid, void** ppContainer); HRESULT WINAPI IWineD3DSurfaceImpl_GetDesc(IWineD3DSurface *iface, WINED3DSURFACE_DESC *pDesc); HRESULT WINAPI IWineD3DSurfaceImpl_GetBltStatus(IWineD3DSurface *iface, DWORD Flags); diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index 6017818..a14bdf0 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -1096,7 +1096,6 @@ DECLARE_INTERFACE_(IWineD3DSurface,IWine STDMETHOD_(void,PreLoad)(THIS) PURE; STDMETHOD_(WINED3DRESOURCETYPE,GetType)(THIS) PURE; /*** IWineD3DSurface methods ***/ - STDMETHOD(GetContainerParent)(THIS_ IUnknown **ppContainerParent) PURE; STDMETHOD(GetContainer)(THIS_ REFIID riid, void ** ppContainer) PURE; STDMETHOD(GetDesc)(THIS_ WINED3DSURFACE_DESC * pDesc) PURE; STDMETHOD(LockRect)(THIS_ WINED3DLOCKED_RECT * pLockedRect, CONST RECT * pRect,DWORD Flags) PURE; @@ -1152,7 +1151,6 @@ DECLARE_INTERFACE_(IWineD3DSurface,IWine #define IWineD3DSurface_PreLoad(p) (p)->lpVtbl->PreLoad(p) #define IWineD3DSurface_GetType(p) (p)->lpVtbl->GetType(p) /*** IWineD3DSurface methods ***/ -#define IWineD3DSurface_GetContainerParent(p,a) (p)->lpVtbl->GetContainerParent(p,a) #define IWineD3DSurface_GetContainer(p,a,b) (p)->lpVtbl->GetContainer(p,a,b) #define IWineD3DSurface_GetDesc(p,a) (p)->lpVtbl->GetDesc(p,a) #define IWineD3DSurface_LockRect(p,a,b,c) (p)->lpVtbl->LockRect(p,a,b,c)

1 0

James Hawkins : msi: Update the text control when the selection path changes.
by Alexandre Julliard 18 Dec '06

18 Dec '06

Module: wine Branch: master Commit: fdfb10e02b13276286300739bdc8669c61a32d01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdfb10e02b13276286300739b… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Dec 18 01:49:36 2006 -0600 msi: Update the text control when the selection path changes. --- dlls/msi/dialog.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index e222dcb..739fcd5 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -614,6 +614,16 @@ void msi_dialog_handle_event( msi_dialog MSIFEATURE *feature = msi_seltree_get_selected_feature( ctrl ); MSI_SetPropertyW( dialog->package, ctrl->property, feature->Directory ); } + else if ( !lstrcmpW(attribute, szSelectionPath) ) + { + LPWSTR prop = msi_dialog_dup_property( dialog, ctrl->property, TRUE ); + LPWSTR path; + if (!prop) return; + path = msi_dup_property( dialog->package, prop ); + SetWindowTextW( ctrl->hwnd, path ); + msi_free(prop); + msi_free(path); + } else { FIXME("Attribute %s not being set\n", debugstr_w(attribute)); @@ -730,7 +740,7 @@ static UINT msi_dialog_text_control( msi { msi_control *control; struct msi_text_info *info; - LPCWSTR text, ptr; + LPCWSTR text, ptr, prop; LPWSTR font_name; TRACE("%p %p\n", dialog, rec); @@ -743,6 +753,10 @@ static UINT msi_dialog_text_control( msi if( !info ) return ERROR_SUCCESS; + control->attributes = MSI_RecordGetInteger( rec, 8 ); + prop = MSI_RecordGetString( rec, 9 ); + control->property = msi_dialog_dup_property( dialog, prop, FALSE ); + text = MSI_RecordGetString( rec, 10 ); font_name = msi_dialog_get_style( text, &ptr ); info->font = ( font_name ) ? msi_dialog_find_font( dialog, font_name ) : NULL; @@ -756,6 +770,9 @@ static UINT msi_dialog_text_control( msi (LONG_PTR)MSIText_WndProc ); SetPropW( control->hwnd, szButtonData, info ); + ControlEvent_SubscribeToEvent( dialog->package, dialog, + szSelectionPath, control->name, szSelectionPath ); + return ERROR_SUCCESS; }

1 0

Markus Amsler : wined3d: Call the depth stencil destroy callback function.
by Alexandre Julliard 18 Dec '06

18 Dec '06

Module: wine Branch: master Commit: 0bceec1be8d1253230479709ce3d1172dbe495a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bceec1be8d1253230479709c… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Mon Dec 18 00:16:40 2006 +0100 wined3d: Call the depth stencil destroy callback function. --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ff3c987..5ff0b34 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2189,7 +2189,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl This->renderTarget = NULL; if (This->depthStencilBuffer) { - if(D3DCB_DestroyDepthStencilSurface > 0) { + if(D3DCB_DestroyDepthStencilSurface(This->depthStencilBuffer) > 0) { FIXME("(%p) Something's still holding the depthStencilBuffer\n", This); } This->depthStencilBuffer = NULL;

1 0

Vitaliy Margolen : dinput: Make mouse use axis mode flag set in base class. Add tests.
by Alexandre Julliard 18 Dec '06

18 Dec '06

Module: wine Branch: master Commit: 975d7ff2920048bebaabaff8df9b95b5914a5bce URL: http://source.winehq.org/git/wine.git/?a=commit;h=975d7ff2920048bebaabaff8d… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Dec 17 23:22:34 2006 -0700 dinput: Make mouse use axis mode flag set in base class. Add tests. --- dlls/dinput/mouse.c | 50 +++--------- dlls/dinput/tests/Makefile.in | 1 + dlls/dinput/tests/device.c | 174 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 188 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=975d7ff2920048bebaaba…

1 0