April 2011 - Wine-commits - list.winehq.org

Michael Stefaniuc : d3d9: COM cleanup for the IDirect3DQuery9 iface.
by Alexandre Julliard 12 Apr '11

12 Apr '11

Module: wine Branch: master Commit: 78ea105b85c18b7e840a6a600898e5f256d99319 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78ea105b85c18b7e840a6a600… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 12 04:04:02 2011 +0200 d3d9: COM cleanup for the IDirect3DQuery9 iface. --- dlls/d3d9/d3d9_private.h | 5 +-- dlls/d3d9/device.c | 4 +- dlls/d3d9/query.c | 51 ++++++++++++++++++++++++++++----------------- 3 files changed, 36 insertions(+), 24 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index f1c0a8c..0947a54 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -465,15 +465,14 @@ HRESULT pixelshader_init(IDirect3DPixelShader9Impl *shader, * IDirect3DPixelShader implementation structure */ typedef struct IDirect3DQuery9Impl { - /* IUnknown fields */ - const IDirect3DQuery9Vtbl *lpVtbl; + IDirect3DQuery9 IDirect3DQuery9_iface; LONG ref; /* IDirect3DQuery9 fields */ struct wined3d_query *wineD3DQuery; /* Parent reference */ - LPDIRECT3DDEVICE9EX parentDevice; + IDirect3DDevice9Ex *parentDevice; } IDirect3DQuery9Impl; HRESULT query_init(IDirect3DQuery9Impl *query, IDirect3DDevice9Impl *device, diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 9565815..bd5b167 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2706,8 +2706,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_CreateQuery(IDirect3DDevice9Ex *iface } TRACE("Created query %p.\n", object); - if (query) *query = (IDirect3DQuery9 *)object; - else IDirect3DQuery9_Release((IDirect3DQuery9 *)object); + if (query) *query = &object->IDirect3DQuery9_iface; + else IDirect3DQuery9_Release(&object->IDirect3DQuery9_iface); return D3D_OK; } diff --git a/dlls/d3d9/query.c b/dlls/d3d9/query.c index 34debd9..918c21f 100644 --- a/dlls/d3d9/query.c +++ b/dlls/d3d9/query.c @@ -25,9 +25,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d9); -/* IDirect3DQuery9 IUnknown parts follow: */ -static HRESULT WINAPI IDirect3DQuery9Impl_QueryInterface(LPDIRECT3DQUERY9 iface, REFIID riid, LPVOID* ppobj) { - IDirect3DQuery9Impl *This = (IDirect3DQuery9Impl *)iface; +static inline IDirect3DQuery9Impl *impl_from_IDirect3DQuery9(IDirect3DQuery9 *iface) +{ + return CONTAINING_RECORD(iface, IDirect3DQuery9Impl, IDirect3DQuery9_iface); +} + +static HRESULT WINAPI IDirect3DQuery9Impl_QueryInterface(IDirect3DQuery9 *iface, REFIID riid, + void **ppobj) +{ + IDirect3DQuery9Impl *This = impl_from_IDirect3DQuery9(iface); TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); @@ -43,8 +49,9 @@ static HRESULT WINAPI IDirect3DQuery9Impl_QueryInterface(LPDIRECT3DQUERY9 iface, return E_NOINTERFACE; } -static ULONG WINAPI IDirect3DQuery9Impl_AddRef(LPDIRECT3DQUERY9 iface) { - IDirect3DQuery9Impl *This = (IDirect3DQuery9Impl *)iface; +static ULONG WINAPI IDirect3DQuery9Impl_AddRef(IDirect3DQuery9 *iface) +{ + IDirect3DQuery9Impl *This = impl_from_IDirect3DQuery9(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("%p increasing refcount to %u.\n", iface, ref); @@ -52,8 +59,9 @@ static ULONG WINAPI IDirect3DQuery9Impl_AddRef(LPDIRECT3DQUERY9 iface) { return ref; } -static ULONG WINAPI IDirect3DQuery9Impl_Release(LPDIRECT3DQUERY9 iface) { - IDirect3DQuery9Impl *This = (IDirect3DQuery9Impl *)iface; +static ULONG WINAPI IDirect3DQuery9Impl_Release(IDirect3DQuery9 *iface) +{ + IDirect3DQuery9Impl *This = impl_from_IDirect3DQuery9(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("%p decreasing refcount to %u.\n", iface, ref); @@ -69,10 +77,10 @@ static ULONG WINAPI IDirect3DQuery9Impl_Release(LPDIRECT3DQUERY9 iface) { return ref; } -/* IDirect3DQuery9 Interface follow: */ -static HRESULT WINAPI IDirect3DQuery9Impl_GetDevice(IDirect3DQuery9 *iface, IDirect3DDevice9 **device) +static HRESULT WINAPI IDirect3DQuery9Impl_GetDevice(IDirect3DQuery9 *iface, + IDirect3DDevice9 **device) { - IDirect3DQuery9Impl *This = (IDirect3DQuery9Impl *)iface; + IDirect3DQuery9Impl *This = impl_from_IDirect3DQuery9(iface); TRACE("iface %p, device %p.\n", iface, device); @@ -84,8 +92,9 @@ static HRESULT WINAPI IDirect3DQuery9Impl_GetDevice(IDirect3DQuery9 *iface, IDir return D3D_OK; } -static D3DQUERYTYPE WINAPI IDirect3DQuery9Impl_GetType(LPDIRECT3DQUERY9 iface) { - IDirect3DQuery9Impl *This = (IDirect3DQuery9Impl *)iface; +static D3DQUERYTYPE WINAPI IDirect3DQuery9Impl_GetType(IDirect3DQuery9 *iface) +{ + IDirect3DQuery9Impl *This = impl_from_IDirect3DQuery9(iface); HRESULT hr; TRACE("iface %p.\n", iface); @@ -97,8 +106,9 @@ static D3DQUERYTYPE WINAPI IDirect3DQuery9Impl_GetType(LPDIRECT3DQUERY9 iface) { return hr; } -static DWORD WINAPI IDirect3DQuery9Impl_GetDataSize(LPDIRECT3DQUERY9 iface) { - IDirect3DQuery9Impl *This = (IDirect3DQuery9Impl *)iface; +static DWORD WINAPI IDirect3DQuery9Impl_GetDataSize(IDirect3DQuery9 *iface) +{ + IDirect3DQuery9Impl *This = impl_from_IDirect3DQuery9(iface); DWORD ret; TRACE("iface %p.\n", iface); @@ -110,8 +120,9 @@ static DWORD WINAPI IDirect3DQuery9Impl_GetDataSize(LPDIRECT3DQUERY9 iface) { return ret; } -static HRESULT WINAPI IDirect3DQuery9Impl_Issue(LPDIRECT3DQUERY9 iface, DWORD dwIssueFlags) { - IDirect3DQuery9Impl *This = (IDirect3DQuery9Impl *)iface; +static HRESULT WINAPI IDirect3DQuery9Impl_Issue(IDirect3DQuery9 *iface, DWORD dwIssueFlags) +{ + IDirect3DQuery9Impl *This = impl_from_IDirect3DQuery9(iface); HRESULT hr; TRACE("iface %p, flags %#x.\n", iface, dwIssueFlags); @@ -123,8 +134,10 @@ static HRESULT WINAPI IDirect3DQuery9Impl_Issue(LPDIRECT3DQUERY9 iface, DWORD dw return hr; } -static HRESULT WINAPI IDirect3DQuery9Impl_GetData(LPDIRECT3DQUERY9 iface, void* pData, DWORD dwSize, DWORD dwGetDataFlags) { - IDirect3DQuery9Impl *This = (IDirect3DQuery9Impl *)iface; +static HRESULT WINAPI IDirect3DQuery9Impl_GetData(IDirect3DQuery9 *iface, void *pData, + DWORD dwSize, DWORD dwGetDataFlags) +{ + IDirect3DQuery9Impl *This = impl_from_IDirect3DQuery9(iface); HRESULT hr; TRACE("iface %p, data %p, size %u, flags %#x.\n", @@ -154,7 +167,7 @@ HRESULT query_init(IDirect3DQuery9Impl *query, IDirect3DDevice9Impl *device, D3D { HRESULT hr; - query->lpVtbl = &Direct3DQuery9_Vtbl; + query->IDirect3DQuery9_iface.lpVtbl = &Direct3DQuery9_Vtbl; query->ref = 1; wined3d_mutex_lock();

1 0

Michael Stefaniuc : d3d9: COM cleanup for the IDirect3DStateBlock9 iface.
by Alexandre Julliard 12 Apr '11

12 Apr '11

Module: wine Branch: master Commit: a991b6708b4eb5a72f59c6c08ccbd0ea7b7266a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a991b6708b4eb5a72f59c6c08… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 12 04:10:34 2011 +0200 d3d9: COM cleanup for the IDirect3DStateBlock9 iface. --- dlls/d3d9/d3d9_private.h | 5 ++--- dlls/d3d9/device.c | 4 ++-- dlls/d3d9/stateblock.c | 39 +++++++++++++++++++++++++-------------- 3 files changed, 29 insertions(+), 19 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 0947a54..4d13ce7 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -377,15 +377,14 @@ HRESULT volumetexture_init(IDirect3DVolumeTexture9Impl *texture, IDirect3DDevice * IDirect3DStateBlock9 implementation structure */ typedef struct IDirect3DStateBlock9Impl { - /* IUnknown fields */ - const IDirect3DStateBlock9Vtbl *lpVtbl; + IDirect3DStateBlock9 IDirect3DStateBlock9_iface; LONG ref; /* IDirect3DStateBlock9 fields */ struct wined3d_stateblock *wined3d_stateblock; /* Parent reference */ - LPDIRECT3DDEVICE9EX parentDevice; + IDirect3DDevice9Ex *parentDevice; } IDirect3DStateBlock9Impl; HRESULT stateblock_init(IDirect3DStateBlock9Impl *stateblock, IDirect3DDevice9Impl *device, diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index bd5b167..1f38f36 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1509,7 +1509,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_CreateStateBlock(IDirect3DDevice9Ex * } TRACE("Created stateblock %p.\n", object); - *stateblock = (IDirect3DStateBlock9 *)object; + *stateblock = &object->IDirect3DStateBlock9_iface; return D3D_OK; } @@ -1568,7 +1568,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_EndStateBlock(IDirect3DDevice9Ex *ifa } TRACE("Created stateblock %p.\n", object); - *stateblock = (IDirect3DStateBlock9 *)object; + *stateblock = &object->IDirect3DStateBlock9_iface; return D3D_OK; } diff --git a/dlls/d3d9/stateblock.c b/dlls/d3d9/stateblock.c index 13f2b9f..46a4de5 100644 --- a/dlls/d3d9/stateblock.c +++ b/dlls/d3d9/stateblock.c @@ -25,9 +25,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d9); -/* IDirect3DStateBlock9 IUnknown parts follow: */ -static HRESULT WINAPI IDirect3DStateBlock9Impl_QueryInterface(LPDIRECT3DSTATEBLOCK9 iface, REFIID riid, LPVOID* ppobj) { - IDirect3DStateBlock9Impl *This = (IDirect3DStateBlock9Impl *)iface; +static inline IDirect3DStateBlock9Impl *impl_from_IDirect3DStateBlock9(IDirect3DStateBlock9 *iface) +{ + return CONTAINING_RECORD(iface, IDirect3DStateBlock9Impl, IDirect3DStateBlock9_iface); +} + +static HRESULT WINAPI IDirect3DStateBlock9Impl_QueryInterface(IDirect3DStateBlock9 *iface, + REFIID riid, void **ppobj) +{ + IDirect3DStateBlock9Impl *This = impl_from_IDirect3DStateBlock9(iface); TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); @@ -43,8 +49,9 @@ static HRESULT WINAPI IDirect3DStateBlock9Impl_QueryInterface(LPDIRECT3DSTATEBLO return E_NOINTERFACE; } -static ULONG WINAPI IDirect3DStateBlock9Impl_AddRef(LPDIRECT3DSTATEBLOCK9 iface) { - IDirect3DStateBlock9Impl *This = (IDirect3DStateBlock9Impl *)iface; +static ULONG WINAPI IDirect3DStateBlock9Impl_AddRef(IDirect3DStateBlock9 *iface) +{ + IDirect3DStateBlock9Impl *This = impl_from_IDirect3DStateBlock9(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("%p increasing refcount to %u.\n", iface, ref); @@ -52,8 +59,9 @@ static ULONG WINAPI IDirect3DStateBlock9Impl_AddRef(LPDIRECT3DSTATEBLOCK9 iface) return ref; } -static ULONG WINAPI IDirect3DStateBlock9Impl_Release(LPDIRECT3DSTATEBLOCK9 iface) { - IDirect3DStateBlock9Impl *This = (IDirect3DStateBlock9Impl *)iface; +static ULONG WINAPI IDirect3DStateBlock9Impl_Release(IDirect3DStateBlock9 *iface) +{ + IDirect3DStateBlock9Impl *This = impl_from_IDirect3DStateBlock9(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("%p decreasing refcount to %u.\n", iface, ref); @@ -70,9 +78,10 @@ static ULONG WINAPI IDirect3DStateBlock9Impl_Release(LPDIRECT3DSTATEBLOCK9 iface } /* IDirect3DStateBlock9 Interface follow: */ -static HRESULT WINAPI IDirect3DStateBlock9Impl_GetDevice(IDirect3DStateBlock9 *iface, IDirect3DDevice9 **device) +static HRESULT WINAPI IDirect3DStateBlock9Impl_GetDevice(IDirect3DStateBlock9 *iface, + IDirect3DDevice9 **device) { - IDirect3DStateBlock9Impl *This = (IDirect3DStateBlock9Impl *)iface; + IDirect3DStateBlock9Impl *This = impl_from_IDirect3DStateBlock9(iface); TRACE("iface %p, device %p.\n", iface, device); @@ -84,8 +93,9 @@ static HRESULT WINAPI IDirect3DStateBlock9Impl_GetDevice(IDirect3DStateBlock9 *i return D3D_OK; } -static HRESULT WINAPI IDirect3DStateBlock9Impl_Capture(LPDIRECT3DSTATEBLOCK9 iface) { - IDirect3DStateBlock9Impl *This = (IDirect3DStateBlock9Impl *)iface; +static HRESULT WINAPI IDirect3DStateBlock9Impl_Capture(IDirect3DStateBlock9 *iface) +{ + IDirect3DStateBlock9Impl *This = impl_from_IDirect3DStateBlock9(iface); HRESULT hr; TRACE("iface %p.\n", iface); @@ -97,8 +107,9 @@ static HRESULT WINAPI IDirect3DStateBlock9Impl_Capture(LPDIRECT3DSTATEBLOCK9 ifa return hr; } -static HRESULT WINAPI IDirect3DStateBlock9Impl_Apply(LPDIRECT3DSTATEBLOCK9 iface) { - IDirect3DStateBlock9Impl *This = (IDirect3DStateBlock9Impl *)iface; +static HRESULT WINAPI IDirect3DStateBlock9Impl_Apply(IDirect3DStateBlock9 *iface) +{ + IDirect3DStateBlock9Impl *This = impl_from_IDirect3DStateBlock9(iface); HRESULT hr; TRACE("iface %p.\n", iface); @@ -128,7 +139,7 @@ HRESULT stateblock_init(IDirect3DStateBlock9Impl *stateblock, IDirect3DDevice9Im { HRESULT hr; - stateblock->lpVtbl = &Direct3DStateBlock9_Vtbl; + stateblock->IDirect3DStateBlock9_iface.lpVtbl = &Direct3DStateBlock9_Vtbl; stateblock->ref = 1; if (wined3d_stateblock)

1 0

Michael Stefaniuc : d3d9: COM cleanup for the IDirect3DCubeTexture9 iface.
by Alexandre Julliard 12 Apr '11

12 Apr '11

Module: wine Branch: master Commit: 29116e24003f1bb64d3f30ba9944fe288b653cff URL: http://source.winehq.org/git/wine.git/?a=commit;h=29116e24003f1bb64d3f30ba9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 12 04:17:09 2011 +0200 d3d9: COM cleanup for the IDirect3DCubeTexture9 iface. --- dlls/d3d9/cubetexture.c | 112 ++++++++++++++++++++++++++++----------------- dlls/d3d9/d3d9_private.h | 4 +- dlls/d3d9/device.c | 2 +- 3 files changed, 73 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=29116e24003f1bb64d3f3…

1 0

Henri Verbeet : wined3d: Depth-only clears are done offscreen.
by Alexandre Julliard 12 Apr '11

12 Apr '11

Module: wine Branch: master Commit: 68c4a1b61ae58db1e315347c04d115dc589bb1be URL: http://source.winehq.org/git/wine.git/?a=commit;h=68c4a1b61ae58db1e315347c0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 11 20:55:13 2011 +0200 wined3d: Depth-only clears are done offscreen. This fixes a regression introduced by commit 99bfd817141ca32f9c50e539aa4d0dcbfded24b7. --- 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 e05c732..7b4ad8a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -701,7 +701,7 @@ HRESULT device_clear_render_targets(IWineD3DDeviceImpl *device, UINT rt_count, I } else { - render_offscreen = FALSE; + render_offscreen = TRUE; drawable_width = depth_stencil->pow2Width; drawable_height = depth_stencil->pow2Height; }

1 0

Henri Verbeet : wined3d: Flush after accessing the front buffer in surface_blt_fbo().
by Alexandre Julliard 12 Apr '11

12 Apr '11

Module: wine Branch: master Commit: 55e957a31a8fea55a27285483202723db06407bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=55e957a31a8fea55a27285483… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 11 20:55:14 2011 +0200 wined3d: Flush after accessing the front buffer in surface_blt_fbo(). --- dlls/wined3d/surface.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c2d92ed..102ddc9 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3456,7 +3456,10 @@ static void surface_blt_fbo(IWineD3DDeviceImpl *device, const WINED3DTEXTUREFILT LEAVE_GL(); - if (wined3d_settings.strict_draw_ordering) wglFlush(); /* Flush to ensure ordering across contexts. */ + if (wined3d_settings.strict_draw_ordering + || (dst_location == SFLAG_INDRAWABLE + && dst_surface->container.u.swapchain->front_buffer == dst_surface)) + wglFlush(); context_release(context); }

1 0

Henri Verbeet : wined3d: Flush after accessing the front buffer in flush_to_framebuffer_drawpixels( ).
by Alexandre Julliard 12 Apr '11

12 Apr '11

Module: wine Branch: master Commit: 17c51d49b765dfc260f42bdda934c56c7b82241a URL: http://source.winehq.org/git/wine.git/?a=commit;h=17c51d49b765dfc260f42bdda… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 11 20:55:15 2011 +0200 wined3d: Flush after accessing the front buffer in flush_to_framebuffer_drawpixels(). --- dlls/wined3d/surface.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 102ddc9..8d50793 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2053,6 +2053,12 @@ static void flush_to_framebuffer_drawpixels(IWineD3DSurfaceImpl *surface, checkGLcall("glPixelStorei(GL_UNPACK_ROW_LENGTH, 0)"); LEAVE_GL(); + + if (wined3d_settings.strict_draw_ordering + || (surface->container.type == WINED3D_CONTAINER_SWAPCHAIN + && surface->container.u.swapchain->front_buffer == surface)) + wglFlush(); + context_release(context); }

1 0

Henri Verbeet : d3d8: Get rid of the implicit swapchain refcounting hacks.
by Alexandre Julliard 12 Apr '11

12 Apr '11

Module: wine Branch: master Commit: 4e56a4fe793c2dd54793d011768cdf5f8c157f11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e56a4fe793c2dd54793d0117… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 11 20:55:16 2011 +0200 d3d8: Get rid of the implicit swapchain refcounting hacks. --- dlls/d3d8/device.c | 15 ++++++--------- dlls/d3d8/swapchain.c | 2 +- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 10a567d..54ee3f2 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -256,12 +256,9 @@ static void *d3d8_get_object(struct d3d8_handle_table *t, DWORD handle, enum d3d static ULONG WINAPI D3D8CB_DestroySwapChain(IWineD3DSwapChain *swapchain) { - IUnknown *parent; - TRACE("swapchain %p.\n", swapchain); - parent = IWineD3DSwapChain_GetParent(swapchain); - return IUnknown_Release(parent); + return IWineD3DSwapChain_Release(swapchain); } static inline IDirect3DDevice8Impl *impl_from_IDirect3DDevice8(IDirect3DDevice8 *iface) @@ -2913,8 +2910,8 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateSwapChain(IWineD3DDevicePar WINED3DPRESENT_PARAMETERS *present_parameters, IWineD3DSwapChain **swapchain) { IDirect3DDevice8Impl *This = impl_from_IWineD3DDeviceParent(iface); - IDirect3DSwapChain8Impl *d3d_swapchain; D3DPRESENT_PARAMETERS local_parameters; + IDirect3DSwapChain8 *d3d_swapchain; HRESULT hr; TRACE("iface %p, present_parameters %p, swapchain %p\n", iface, present_parameters, swapchain); @@ -2935,7 +2932,7 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateSwapChain(IWineD3DDevicePar local_parameters.FullScreen_PresentationInterval = present_parameters->PresentationInterval; hr = IDirect3DDevice8_CreateAdditionalSwapChain(&This->IDirect3DDevice8_iface, - &local_parameters, (IDirect3DSwapChain8 **)&d3d_swapchain); + &local_parameters, &d3d_swapchain); if (FAILED(hr)) { ERR("(%p) CreateAdditionalSwapChain failed, returning %#x\n", iface, hr); @@ -2943,9 +2940,9 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateSwapChain(IWineD3DDevicePar return hr; } - *swapchain = d3d_swapchain->wineD3DSwapChain; - IUnknown_Release(d3d_swapchain->parentDevice); - d3d_swapchain->parentDevice = NULL; + *swapchain = ((IDirect3DSwapChain8Impl *)d3d_swapchain)->wineD3DSwapChain; + IWineD3DSwapChain_AddRef(*swapchain); + IDirect3DSwapChain8_Release(d3d_swapchain); /* Copy back the presentation parameters */ present_parameters->BackBufferWidth = local_parameters.BackBufferWidth; diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c index 654e153..a38cba1 100644 --- a/dlls/d3d8/swapchain.c +++ b/dlls/d3d8/swapchain.c @@ -78,7 +78,7 @@ static ULONG WINAPI IDirect3DSwapChain8Impl_Release(IDirect3DSwapChain8 *iface) IDirect3DDevice8 *parentDevice = This->parentDevice; wined3d_mutex_lock(); - IWineD3DSwapChain_Destroy(This->wineD3DSwapChain); + IWineD3DSwapChain_Release(This->wineD3DSwapChain); wined3d_mutex_unlock(); if (parentDevice)

1 0

Henri Verbeet : d3d9: Get rid of the implicit swapchain refcounting hacks.
by Alexandre Julliard 12 Apr '11

12 Apr '11

Module: wine Branch: master Commit: 3c07f7a68e00cdd1be0db62ec6a6c5924d751dd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c07f7a68e00cdd1be0db62ec… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 11 20:55:17 2011 +0200 d3d9: Get rid of the implicit swapchain refcounting hacks. --- dlls/d3d9/d3d9_private.h | 3 --- dlls/d3d9/device.c | 16 +++++----------- dlls/d3d9/swapchain.c | 17 ++++++----------- 3 files changed, 11 insertions(+), 25 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 6e5d6d8..f1c0a8c 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -222,9 +222,6 @@ typedef struct IDirect3DSwapChain9Impl /* Parent reference */ LPDIRECT3DDEVICE9EX parentDevice; - - /* Flags an implicit swap chain */ - BOOL isImplicit; } IDirect3DSwapChain9Impl; HRESULT swapchain_init(IDirect3DSwapChain9Impl *swapchain, IDirect3DDevice9Impl *device, diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 1a66104..9565815 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -183,14 +183,9 @@ static UINT vertex_count_from_primitive_count(D3DPRIMITIVETYPE primitive_type, U static ULONG WINAPI D3D9CB_DestroySwapChain(IWineD3DSwapChain *swapchain) { - IDirect3DSwapChain9Impl *parent; - TRACE("swapchain %p.\n", swapchain); - parent = IWineD3DSwapChain_GetParent(swapchain); - parent->isImplicit = FALSE; - IDirect3DSwapChain9_AddRef((IDirect3DSwapChain9 *)parent); - return IDirect3DSwapChain9_Release((IDirect3DSwapChain9 *)parent); + return IWineD3DSwapChain_Release(swapchain); } /* IDirect3D IUnknown parts follow: */ @@ -3174,8 +3169,8 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateSwapChain(IWineD3DDevicePar WINED3DPRESENT_PARAMETERS *present_parameters, IWineD3DSwapChain **swapchain) { struct IDirect3DDevice9Impl *This = device_from_device_parent(iface); - IDirect3DSwapChain9Impl *d3d_swapchain; D3DPRESENT_PARAMETERS local_parameters; + IDirect3DSwapChain9 *d3d_swapchain; HRESULT hr; TRACE("iface %p, present_parameters %p, swapchain %p\n", iface, present_parameters, swapchain); @@ -3197,7 +3192,7 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateSwapChain(IWineD3DDevicePar local_parameters.PresentationInterval = present_parameters->PresentationInterval; hr = IDirect3DDevice9Impl_CreateAdditionalSwapChain((IDirect3DDevice9Ex *)This, - &local_parameters, (IDirect3DSwapChain9 **)&d3d_swapchain); + &local_parameters, &d3d_swapchain); if (FAILED(hr)) { ERR("(%p) CreateAdditionalSwapChain failed, returning %#x\n", iface, hr); @@ -3205,9 +3200,8 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateSwapChain(IWineD3DDevicePar return hr; } - *swapchain = d3d_swapchain->wineD3DSwapChain; - d3d_swapchain->isImplicit = TRUE; - /* Implicit swap chains are created with an refcount of 0 */ + *swapchain = ((IDirect3DSwapChain9Impl *)d3d_swapchain)->wineD3DSwapChain; + IWineD3DSwapChain_AddRef(*swapchain); IDirect3DSwapChain9_Release((IDirect3DSwapChain9 *)d3d_swapchain); /* Copy back the presentation parameters */ diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index df1cc77..7301247 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -55,12 +55,9 @@ static ULONG WINAPI IDirect3DSwapChain9Impl_AddRef(LPDIRECT3DSWAPCHAIN9 iface) { if (This->parentDevice) IDirect3DDevice9Ex_AddRef(This->parentDevice); - if (!This->isImplicit) - { - wined3d_mutex_lock(); - IWineD3DSwapChain_AddRef(This->wineD3DSwapChain); - wined3d_mutex_unlock(); - } + wined3d_mutex_lock(); + IWineD3DSwapChain_AddRef(This->wineD3DSwapChain); + wined3d_mutex_unlock(); } return ref; @@ -75,11 +72,9 @@ static ULONG WINAPI IDirect3DSwapChain9Impl_Release(LPDIRECT3DSWAPCHAIN9 iface) if (ref == 0) { IDirect3DDevice9Ex *parentDevice = This->parentDevice; - if (!This->isImplicit) { - wined3d_mutex_lock(); - IWineD3DSwapChain_Destroy(This->wineD3DSwapChain); - wined3d_mutex_unlock(); - } + wined3d_mutex_lock(); + IWineD3DSwapChain_Release(This->wineD3DSwapChain); + wined3d_mutex_unlock(); /* Release the device last, as it may cause the device to be destroyed. */ if (parentDevice) IDirect3DDevice9Ex_Release(parentDevice);

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 12 Apr '11

12 Apr '11

Module: wine Branch: master Commit: 3e54f6b5d9026b265e1f2d15c5cbfcd9a1dc974e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e54f6b5d9026b265e1f2d15c… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Mon Apr 11 21:43:41 2011 +0300 po: Update Lithuanian translation. --- po/lt.po | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/po/lt.po b/po/lt.po index ff87277..4120638 100644 --- a/po/lt.po +++ b/po/lt.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-04-01 18:46+0300\n" +"PO-Revision-Date: 2011-04-11 21:43+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -2016,13 +2016,12 @@ msgid "Default MidiOut Device" msgstr "Numatytasis MidiOut įrenginys" #: dxdiagn.rc:25 -#, fuzzy msgid "Regional Setting" -msgstr "Numatytosios nuostatos" +msgstr "Regiono nuostatos" #: dxdiagn.rc:26 msgid "%uMB used, %uMB available" -msgstr "" +msgstr "%u MB sunaudota, %u MB laisva" #: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155 msgid "Options" @@ -10971,9 +10970,8 @@ msgid "Large" msgstr "&Didelis" #: winhlp32.rc:54 -#, fuzzy msgid "&Help on help\tF1" -msgstr "Pa&galba apie žinyną" +msgstr "Pa&galba apie žinyną\tF1" #: winhlp32.rc:55 msgid "Always on &top"

1 0

Eric Pouech : dbghelp: For codeview/ bprel symbols force the register to be EBP, other CPUs should use regrel symbol instead of bprel.
by Alexandre Julliard 12 Apr '11

12 Apr '11

Module: wine Branch: master Commit: 2dd45a12c15da2912b77277fe7225378072f7615 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dd45a12c15da2912b77277fe… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Apr 11 20:47:13 2011 +0200 dbghelp: For codeview/bprel symbols force the register to be EBP, other CPUs should use regrel symbol instead of bprel. --- dlls/dbghelp/msc.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 7d64239..9abd065 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1692,7 +1692,8 @@ static int codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* root */ case S_BPREL_V1: loc.kind = loc_regrel; - loc.reg = 0; /* FIXME */ + /* Yes, it's i386 dependent, but that's the symbol purpose. S_REGREL is used on other CPUs */ + loc.reg = CV_REG_EBP; loc.offset = sym->stack_v1.offset; symt_add_func_local(msc_dbg->module, curr_func, sym->stack_v1.offset > 0 ? DataIsParam : DataIsLocal, @@ -1702,7 +1703,8 @@ static int codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* root break; case S_BPREL_V2: loc.kind = loc_regrel; - loc.reg = 0; /* FIXME */ + /* Yes, it's i386 dependent, but that's the symbol purpose. S_REGREL is used on other CPUs */ + loc.reg = CV_REG_EBP; loc.offset = sym->stack_v2.offset; symt_add_func_local(msc_dbg->module, curr_func, sym->stack_v2.offset > 0 ? DataIsParam : DataIsLocal, @@ -1712,7 +1714,8 @@ static int codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* root break; case S_BPREL_V3: loc.kind = loc_regrel; - loc.reg = 0; /* FIXME */ + /* Yes, it's i386 dependent, but that's the symbol purpose. S_REGREL is used on other CPUs */ + loc.reg = CV_REG_EBP; loc.offset = sym->stack_v3.offset; symt_add_func_local(msc_dbg->module, curr_func, sym->stack_v3.offset > 0 ? DataIsParam : DataIsLocal,

1 0