winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
July 2016
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
680 discussions
Start a n
N
ew thread
Józef Kucia : d3d10core/tests: Avoid using -1 in place of unsigned integer.
by Alexandre Julliard
04 Jul '16
04 Jul '16
Module: wine Branch: master Commit: 53126c3e1787da7dc1a2a1952eb54141dcd46172 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=53126c3e1787da7dc1a2a1952…
Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jul 4 12:26:25 2016 +0200 d3d10core/tests: Avoid using -1 in place of unsigned integer. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 270 +++++++++++++++++++++--------------------- 1 file changed, 135 insertions(+), 135 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=53126c3e1787da7dc1a2a…
1
0
0
0
Józef Kucia : d3d11/tests: Avoid using -1 in place of unsigned integer.
by Alexandre Julliard
04 Jul '16
04 Jul '16
Module: wine Branch: master Commit: 0aa14512fb4126c45ca32ce2df93cef3d642ef33 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=0aa14512fb4126c45ca32ce2d…
Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jul 4 12:26:23 2016 +0200 d3d11/tests: Avoid using -1 in place of unsigned integer. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 258 +++++++++++++++++++++++------------------------ 1 file changed, 129 insertions(+), 129 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=0aa14512fb4126c45ca32…
1
0
0
0
Józef Kucia : d3d11: Implement ID3D11UnorderedAccessView interface.
by Alexandre Julliard
04 Jul '16
04 Jul '16
Module: wine Branch: master Commit: 80334776b3d56d6d3d8572e758dfbcdfc319ebd8 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=80334776b3d56d6d3d8572e75…
Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jul 4 12:26:22 2016 +0200 d3d11: Implement ID3D11UnorderedAccessView interface. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 16 ++ dlls/d3d11/device.c | 13 +- dlls/d3d11/view.c | 442 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 469 insertions(+), 2 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=80334776b3d56d6d3d857…
1
0
0
0
Józef Kucia : d3d11: Implement d3d11_immediate_context_OMGetDepthStencilState().
by Alexandre Julliard
04 Jul '16
04 Jul '16
Module: wine Branch: master Commit: 006ff5aa3a1ec5684cffefbc715ec81366382a14 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=006ff5aa3a1ec5684cffefbc7…
Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jul 4 12:26:21 2016 +0200 d3d11: Implement d3d11_immediate_context_OMGetDepthStencilState(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 5 +++++ dlls/d3d11/device.c | 22 +++++++++++++++++----- dlls/d3d11/state.c | 5 ----- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 0dee4a1..55cd579 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -382,6 +382,11 @@ struct d3d_depthstencil_state ID3D11Device *device; }; +static inline struct d3d_depthstencil_state *impl_from_ID3D11DepthStencilState(ID3D11DepthStencilState *iface) +{ + return CONTAINING_RECORD(iface, struct d3d_depthstencil_state, ID3D11DepthStencilState_iface); +} + HRESULT d3d_depthstencil_state_init(struct d3d_depthstencil_state *state, struct d3d_device *device, const D3D11_DEPTH_STENCIL_DESC *desc) DECLSPEC_HIDDEN; struct d3d_depthstencil_state *unsafe_impl_from_ID3D11DepthStencilState( diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 867b294..74a6055 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1671,7 +1671,15 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetBlendState(ID3D11Devi static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetDepthStencilState(ID3D11DeviceContext *iface, ID3D11DepthStencilState **depth_stencil_state, UINT *stencil_ref) { - FIXME("iface %p, depth_stencil_state %p, stencil_ref %p stub!\n", iface, depth_stencil_state, stencil_ref); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + + TRACE("iface %p, depth_stencil_state %p, stencil_ref %p.\n", + iface, depth_stencil_state, stencil_ref); + + if ((*depth_stencil_state = device->depth_stencil_state + ? &device->depth_stencil_state->ID3D11DepthStencilState_iface : NULL)) + ID3D11DepthStencilState_AddRef(*depth_stencil_state); + *stencil_ref = device->stencil_ref; } static void STDMETHODCALLTYPE d3d11_immediate_context_SOGetTargets(ID3D11DeviceContext *iface, @@ -4090,14 +4098,18 @@ static void STDMETHODCALLTYPE d3d10_device_OMGetDepthStencilState(ID3D10Device1 ID3D10DepthStencilState **depth_stencil_state, UINT *stencil_ref) { struct d3d_device *device = impl_from_ID3D10Device(iface); + ID3D11DepthStencilState *d3d11_iface; TRACE("iface %p, depth_stencil_state %p, stencil_ref %p.\n", iface, depth_stencil_state, stencil_ref); - if ((*depth_stencil_state = device->depth_stencil_state - ? &device->depth_stencil_state->ID3D10DepthStencilState_iface : NULL)) - ID3D10DepthStencilState_AddRef(*depth_stencil_state); - *stencil_ref = device->stencil_ref; + d3d11_immediate_context_OMGetDepthStencilState(&device->immediate_context.ID3D11DeviceContext_iface, + &d3d11_iface, stencil_ref); + + if (d3d11_iface) + *depth_stencil_state = &impl_from_ID3D11DepthStencilState(d3d11_iface)->ID3D10DepthStencilState_iface; + else + *depth_stencil_state = NULL; } static void STDMETHODCALLTYPE d3d10_device_SOGetTargets(ID3D10Device1 *iface, diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index ba90664..68ad1bd 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -328,11 +328,6 @@ struct d3d_blend_state *unsafe_impl_from_ID3D10BlendState(ID3D10BlendState *ifac /* ID3D11DepthStencilState methods */ -static inline struct d3d_depthstencil_state *impl_from_ID3D11DepthStencilState(ID3D11DepthStencilState *iface) -{ - return CONTAINING_RECORD(iface, struct d3d_depthstencil_state, ID3D11DepthStencilState_iface); -} - static HRESULT STDMETHODCALLTYPE d3d11_depthstencil_state_QueryInterface(ID3D11DepthStencilState *iface, REFIID riid, void **object) {
1
0
0
0
Józef Kucia : d3d11: Implement d3d11_immediate_context_OMGetBlendState().
by Alexandre Julliard
04 Jul '16
04 Jul '16
Module: wine Branch: master Commit: fd4f1d9c48f10ca7b08f850ba395d7b4c56e6ddb URL:
http://source.winehq.org/git/wine.git/?a=commit;h=fd4f1d9c48f10ca7b08f850ba…
Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jul 4 12:26:20 2016 +0200 d3d11: Implement d3d11_immediate_context_OMGetBlendState(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 5 +++++ dlls/d3d11/device.c | 25 ++++++++++++++++++------- dlls/d3d11/state.c | 5 ----- 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index bd43aa6..0dee4a1 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -359,6 +359,11 @@ struct d3d_blend_state ID3D11Device *device; }; +static inline struct d3d_blend_state *impl_from_ID3D11BlendState(ID3D11BlendState *iface) +{ + return CONTAINING_RECORD(iface, struct d3d_blend_state, ID3D11BlendState_iface); +} + HRESULT d3d_blend_state_init(struct d3d_blend_state *state, struct d3d_device *device, const D3D11_BLEND_DESC *desc) DECLSPEC_HIDDEN; struct d3d_blend_state *unsafe_impl_from_ID3D11BlendState(ID3D11BlendState *iface) DECLSPEC_HIDDEN; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 03fafc6..867b294 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1655,8 +1655,17 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetRenderTargetsAndUnord static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetBlendState(ID3D11DeviceContext *iface, ID3D11BlendState **blend_state, FLOAT blend_factor[4], UINT *sample_mask) { - FIXME("iface %p, blend_state %p, blend_factor %p, sample_mask %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + + TRACE("iface %p, blend_state %p, blend_factor %p, sample_mask %p.\n", iface, blend_state, blend_factor, sample_mask); + + if ((*blend_state = device->blend_state ? &device->blend_state->ID3D11BlendState_iface : NULL)) + ID3D11BlendState_AddRef(*blend_state); + wined3d_mutex_lock(); + memcpy(blend_factor, device->blend_factor, 4 * sizeof(*blend_factor)); + *sample_mask = wined3d_device_get_render_state(device->wined3d_device, WINED3D_RS_MULTISAMPLEMASK); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetDepthStencilState(ID3D11DeviceContext *iface, @@ -4063,16 +4072,18 @@ static void STDMETHODCALLTYPE d3d10_device_OMGetBlendState(ID3D10Device1 *iface, ID3D10BlendState **blend_state, FLOAT blend_factor[4], UINT *sample_mask) { struct d3d_device *device = impl_from_ID3D10Device(iface); + ID3D11BlendState *d3d11_blend_state; TRACE("iface %p, blend_state %p, blend_factor %p, sample_mask %p.\n", iface, blend_state, blend_factor, sample_mask); - if ((*blend_state = device->blend_state ? (ID3D10BlendState *)&device->blend_state->ID3D10BlendState1_iface : NULL)) - ID3D10BlendState_AddRef(*blend_state); - wined3d_mutex_lock(); - memcpy(blend_factor, device->blend_factor, 4 * sizeof(*blend_factor)); - *sample_mask = wined3d_device_get_render_state(device->wined3d_device, WINED3D_RS_MULTISAMPLEMASK); - wined3d_mutex_unlock(); + d3d11_immediate_context_OMGetBlendState(&device->immediate_context.ID3D11DeviceContext_iface, + &d3d11_blend_state, blend_factor, sample_mask); + + if (d3d11_blend_state) + *blend_state = (ID3D10BlendState *)&impl_from_ID3D11BlendState(d3d11_blend_state)->ID3D10BlendState1_iface; + else + *blend_state = NULL; } static void STDMETHODCALLTYPE d3d10_device_OMGetDepthStencilState(ID3D10Device1 *iface, diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 665d142..ba90664 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -26,11 +26,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d11); /* ID3D11BlendState methods */ -static inline struct d3d_blend_state *impl_from_ID3D11BlendState(ID3D11BlendState *iface) -{ - return CONTAINING_RECORD(iface, struct d3d_blend_state, ID3D11BlendState_iface); -} - static HRESULT STDMETHODCALLTYPE d3d11_blend_state_QueryInterface(ID3D11BlendState *iface, REFIID riid, void **object) {
1
0
0
0
Stefan Dösinger : wined3d: Destroy the resource after view in wined3d_rendertarget_view_decref.
by Alexandre Julliard
04 Jul '16
04 Jul '16
Module: wine Branch: master Commit: d8da1db891c3cb33c16ccfbfbaf48cfeefc7b020 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=d8da1db891c3cb33c16ccfbfb…
Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sun Jul 3 16:49:35 2016 +0100 wined3d: Destroy the resource after view in wined3d_rendertarget_view_decref. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 985c343..7f07d57 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -46,13 +46,14 @@ ULONG CDECL wined3d_rendertarget_view_decref(struct wined3d_rendertarget_view *v if (!refcount) { - struct wined3d_device *device = view->resource->device; + struct wined3d_resource *resource = view->resource; + struct wined3d_device *device = resource->device; /* Call wined3d_object_destroyed() before releasing the resource, * since releasing the resource may end up destroying the parent. */ view->parent_ops->wined3d_object_destroyed(view->parent); - wined3d_resource_decref(view->resource); wined3d_cs_emit_destroy_object(device->cs, wined3d_rendertarget_view_destroy_object, view); + wined3d_resource_decref(resource); } return refcount;
1
0
0
0
Stefan Dösinger : wined3d: Destroy the resource after view in wined3d_unordered_access_view_decref.
by Alexandre Julliard
04 Jul '16
04 Jul '16
Module: wine Branch: master Commit: 4c71e37bbd13349665b1f219d10ed0bbb93b4fe3 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=4c71e37bbd13349665b1f219d…
Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sun Jul 3 16:49:34 2016 +0100 wined3d: Destroy the resource after view in wined3d_unordered_access_view_decref. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 5318a5d..985c343 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -439,13 +439,14 @@ ULONG CDECL wined3d_unordered_access_view_decref(struct wined3d_unordered_access if (!refcount) { - struct wined3d_device *device = view->resource->device; + struct wined3d_resource *resource = view->resource; + struct wined3d_device *device = resource->device; /* Call wined3d_object_destroyed() before releasing the resource, * since releasing the resource may end up destroying the parent. */ view->parent_ops->wined3d_object_destroyed(view->parent); - wined3d_resource_decref(view->resource); wined3d_cs_emit_destroy_object(device->cs, wined3d_unordered_access_view_destroy_object, view); + wined3d_resource_decref(resource); } return refcount;
1
0
0
0
Stefan Dösinger : wined3d: Avoid reading freed memory when destroying shader resource views.
by Alexandre Julliard
04 Jul '16
04 Jul '16
Module: wine Branch: master Commit: 80348ec5b47dd0de18105fc50e0cf940601bfdda URL:
http://source.winehq.org/git/wine.git/?a=commit;h=80348ec5b47dd0de18105fc50…
Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sun Jul 3 16:49:33 2016 +0100 wined3d: Avoid reading freed memory when destroying shader resource views. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index e39f6f8..5318a5d 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -228,13 +228,14 @@ ULONG CDECL wined3d_shader_resource_view_decref(struct wined3d_shader_resource_v if (!refcount) { - struct wined3d_device *device = view->resource->device; + struct wined3d_resource *resource = view->resource; + struct wined3d_device *device = resource->device; /* Call wined3d_object_destroyed() before releasing the resource, * since releasing the resource may end up destroying the parent. */ view->parent_ops->wined3d_object_destroyed(view->parent); - wined3d_resource_decref(view->resource); wined3d_cs_emit_destroy_object(device->cs, wined3d_shader_resource_view_destroy_object, view); + wined3d_resource_decref(resource); } return refcount;
1
0
0
0
Michael Stefaniuc : ddraw: Get rid of a cast from a COM object to an iface.
by Alexandre Julliard
04 Jul '16
04 Jul '16
Module: wine Branch: master Commit: 36a1bc1f0451064cc36209496ad58da432d4966e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=36a1bc1f0451064cc36209496…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 1 10:22:57 2016 +0200 ddraw: Get rid of a cast from a COM object to an iface. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 1cbd6c3..398a3ec 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4289,7 +4289,7 @@ static HRESULT WINAPI ddraw_surface7_GetClipper(IDirectDrawSurface7 *iface, IDir return DDERR_NOCLIPPERATTACHED; } - *Clipper = (IDirectDrawClipper *)surface->clipper; + *Clipper = &surface->clipper->IDirectDrawClipper_iface; IDirectDrawClipper_AddRef(*Clipper); wined3d_mutex_unlock();
1
0
0
0
Francois Gouget : d3drm/tests: Fix typos in a couple of ok() messages.
by Alexandre Julliard
04 Jul '16
04 Jul '16
Module: wine Branch: master Commit: 4046616efdf3c800e37b83ed00840b7689ad2ef1 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=4046616efdf3c800e37b83ed0…
Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 2 11:58:47 2016 +0200 d3drm/tests: Fix typos in a couple of ok() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 0a95afc..a685b1e 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -3983,7 +3983,7 @@ static void test_create_device_from_d3d1(void) hr = IDirect3DRMDevice_GetDirect3DDevice(device1, &d3drm_d3ddevice1); ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface (hr = %x).\n", hr); - ok(d3ddevice1 == d3drm_d3ddevice1, "Expected Immediate Mode deivce created == %p, got %p.\n", d3ddevice1, d3drm_d3ddevice1); + ok(d3ddevice1 == d3drm_d3ddevice1, "Expected Immediate Mode device created == %p, got %p.\n", d3ddevice1, d3drm_d3ddevice1); /* Check properties of render target and depth surfaces */ hr = IDirect3DDevice_QueryInterface(d3drm_d3ddevice1, &IID_IDirectDrawSurface, (void **)&surface); @@ -4174,7 +4174,7 @@ static void test_create_device_from_d3d2(void) hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3drm_d3ddevice2); ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr); - ok(d3ddevice2 == d3drm_d3ddevice2, "Expected Immediate Mode deivce created == %p, got %p.\n", d3ddevice2, d3drm_d3ddevice2); + ok(d3ddevice2 == d3drm_d3ddevice2, "Expected Immediate Mode device created == %p, got %p.\n", d3ddevice2, d3drm_d3ddevice2); /* Check properties of render target and depth surfaces */ hr = IDirect3DDevice2_GetRenderTarget(d3drm_d3ddevice2, &surface); @@ -4300,7 +4300,7 @@ static void test_create_device_from_d3d3(void) hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3drm_d3ddevice2); ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr); - ok(d3ddevice2 == d3drm_d3ddevice2, "Expected Immediate Mode deivce created == %p, got %p.\n", d3ddevice2, d3drm_d3ddevice2); + ok(d3ddevice2 == d3drm_d3ddevice2, "Expected Immediate Mode device created == %p, got %p.\n", d3ddevice2, d3drm_d3ddevice2); /* Check properties of render target and depth surfaces */ hr = IDirect3DDevice2_GetRenderTarget(d3drm_d3ddevice2, &surface);
1
0
0
0
← Newer
1
...
56
57
58
59
60
61
62
...
68
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
Results per page:
10
25
50
100
200