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
December 2010
----- 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
1099 discussions
Start a n
N
ew thread
Michael Stefaniuc : wuapi: Use an iface instead of a vtbl pointer in update_session.
by Alexandre Julliard
10 Dec '10
10 Dec '10
Module: wine Branch: master Commit: c3827f1b7b19e87370c2427cd2d8222fb5493474 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=c3827f1b7b19e87370c2427cd…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Dec 10 09:32:32 2010 +0100 wuapi: Use an iface instead of a vtbl pointer in update_session. --- dlls/wuapi/session.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wuapi/session.c b/dlls/wuapi/session.c index 5f163c7..a6abbc6 100644 --- a/dlls/wuapi/session.c +++ b/dlls/wuapi/session.c @@ -36,13 +36,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(wuapi); typedef struct _update_session { - const struct IUpdateSessionVtbl *vtbl; + IUpdateSession IUpdateSession_iface; LONG refs; } update_session; static inline update_session *impl_from_IUpdateSession( IUpdateSession *iface ) { - return (update_session *)((char *)iface - FIELD_OFFSET( update_session, vtbl )); + return CONTAINING_RECORD(iface, update_session, IUpdateSession_iface); } static ULONG WINAPI update_session_AddRef( @@ -226,10 +226,10 @@ HRESULT UpdateSession_create( IUnknown *pUnkOuter, LPVOID *ppObj ) session = HeapAlloc( GetProcessHeap(), 0, sizeof(*session) ); if (!session) return E_OUTOFMEMORY; - session->vtbl = &update_session_vtbl; + session->IUpdateSession_iface.lpVtbl = &update_session_vtbl; session->refs = 1; - *ppObj = &session->vtbl; + *ppObj = &session->IUpdateSession_iface; TRACE("returning iface %p\n", *ppObj); return S_OK;
1
0
0
0
Michael Stefaniuc : wuapi: Use an iface instead of a vtbl pointer in update_installer.
by Alexandre Julliard
10 Dec '10
10 Dec '10
Module: wine Branch: master Commit: 079c36629239e25df2e5669d4d7e9ef4c8eb30cf URL:
http://source.winehq.org/git/wine.git/?a=commit;h=079c36629239e25df2e5669d4…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Dec 10 09:32:04 2010 +0100 wuapi: Use an iface instead of a vtbl pointer in update_installer. --- dlls/wuapi/installer.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wuapi/installer.c b/dlls/wuapi/installer.c index 1a2c553..efc6ea3 100644 --- a/dlls/wuapi/installer.c +++ b/dlls/wuapi/installer.c @@ -35,13 +35,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(wuapi); typedef struct _update_installer { - const struct IUpdateInstallerVtbl *vtbl; + IUpdateInstaller IUpdateInstaller_iface; LONG refs; } update_installer; static inline update_installer *impl_from_IUpdateInstaller( IUpdateInstaller *iface ) { - return (update_installer *)((char *)iface - FIELD_OFFSET( update_installer, vtbl )); + return CONTAINING_RECORD(iface, update_installer, IUpdateInstaller_iface); } static ULONG WINAPI update_installer_AddRef( @@ -243,10 +243,10 @@ HRESULT UpdateInstaller_create( IUnknown *pUnkOuter, LPVOID *ppObj ) installer = HeapAlloc( GetProcessHeap(), 0, sizeof(*installer) ); if (!installer) return E_OUTOFMEMORY; - installer->vtbl = &update_installer_vtbl; + installer->IUpdateInstaller_iface.lpVtbl = &update_installer_vtbl; installer->refs = 1; - *ppObj = &installer->vtbl; + *ppObj = &installer->IUpdateInstaller_iface; TRACE("returning iface %p\n", *ppObj); return S_OK;
1
0
0
0
Michael Stefaniuc : browseui: Use ifaces instead of vtbl pointers in ACLMulti.
by Alexandre Julliard
10 Dec '10
10 Dec '10
Module: wine Branch: master Commit: 2085922d78e167eb47751ea3473c79259fc5cbaf URL:
http://source.winehq.org/git/wine.git/?a=commit;h=2085922d78e167eb47751ea34…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Dec 10 09:31:27 2010 +0100 browseui: Use ifaces instead of vtbl pointers in ACLMulti. --- dlls/browseui/aclmulti.c | 47 +++++++++++++++++++++++++-------------------- 1 files changed, 26 insertions(+), 21 deletions(-) diff --git a/dlls/browseui/aclmulti.c b/dlls/browseui/aclmulti.c index c7daba0..0ca6758 100644 --- a/dlls/browseui/aclmulti.c +++ b/dlls/browseui/aclmulti.c @@ -49,23 +49,28 @@ struct ACLMultiSublist { }; typedef struct tagACLMulti { - const IEnumStringVtbl *vtbl; - const IACListVtbl *aclVtbl; - const IObjMgrVtbl *objmgrVtbl; + IEnumString IEnumString_iface; + IACList IACList_iface; + IObjMgr IObjMgr_iface; LONG refCount; INT nObjs; INT currObj; struct ACLMultiSublist *objs; } ACLMulti; +static inline ACLMulti *impl_from_IEnumString(IEnumString *iface) +{ + return CONTAINING_RECORD(iface, ACLMulti, IEnumString_iface); +} + static inline ACLMulti *impl_from_IACList(IACList *iface) { - return (ACLMulti *)((char *)iface - FIELD_OFFSET(ACLMulti, aclVtbl)); + return CONTAINING_RECORD(iface, ACLMulti, IACList_iface); } static inline ACLMulti *impl_from_IObjMgr(IObjMgr *iface) { - return (ACLMulti *)((char *)iface - FIELD_OFFSET(ACLMulti, objmgrVtbl)); + return CONTAINING_RECORD(iface, ACLMulti, IObjMgr_iface); } static void release_obj(struct ACLMultiSublist *obj) @@ -90,7 +95,7 @@ static void ACLMulti_Destructor(ACLMulti *This) static HRESULT WINAPI ACLMulti_QueryInterface(IEnumString *iface, REFIID iid, LPVOID *ppvOut) { - ACLMulti *This = (ACLMulti *)iface; + ACLMulti *This = impl_from_IEnumString(iface); *ppvOut = NULL; if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_IEnumString)) @@ -99,11 +104,11 @@ static HRESULT WINAPI ACLMulti_QueryInterface(IEnumString *iface, REFIID iid, LP } else if (IsEqualIID(iid, &IID_IACList)) { - *ppvOut = &This->aclVtbl; + *ppvOut = &This->IACList_iface; } else if (IsEqualIID(iid, &IID_IObjMgr)) { - *ppvOut = &This->objmgrVtbl; + *ppvOut = &This->IObjMgr_iface; } if (*ppvOut) @@ -118,13 +123,13 @@ static HRESULT WINAPI ACLMulti_QueryInterface(IEnumString *iface, REFIID iid, LP static ULONG WINAPI ACLMulti_AddRef(IEnumString *iface) { - ACLMulti *This = (ACLMulti *)iface; + ACLMulti *This = impl_from_IEnumString(iface); return InterlockedIncrement(&This->refCount); } static ULONG WINAPI ACLMulti_Release(IEnumString *iface) { - ACLMulti *This = (ACLMulti *)iface; + ACLMulti *This = impl_from_IEnumString(iface); ULONG ret; ret = InterlockedDecrement(&This->refCount); @@ -173,7 +178,7 @@ static HRESULT WINAPI ACLMulti_Remove(IObjMgr *iface, IUnknown *obj) static HRESULT WINAPI ACLMulti_Next(IEnumString *iface, ULONG celt, LPOLESTR *rgelt, ULONG *pceltFetched) { - ACLMulti *This = (ACLMulti *)iface; + ACLMulti *This = impl_from_IEnumString(iface); TRACE("(%p, %d, %p, %p)\n", iface, celt, rgelt, pceltFetched); while (This->currObj < This->nObjs) @@ -196,7 +201,7 @@ static HRESULT WINAPI ACLMulti_Next(IEnumString *iface, ULONG celt, LPOLESTR *rg static HRESULT WINAPI ACLMulti_Reset(IEnumString *iface) { - ACLMulti *This = (ACLMulti *)iface; + ACLMulti *This = impl_from_IEnumString(iface); int i; This->currObj = 0; @@ -252,19 +257,19 @@ static const IEnumStringVtbl ACLMultiVtbl = static HRESULT WINAPI ACLMulti_IObjMgr_QueryInterface(IObjMgr *iface, REFIID iid, LPVOID *ppvOut) { ACLMulti *This = impl_from_IObjMgr(iface); - return ACLMulti_QueryInterface((IEnumString *)This, iid, ppvOut); + return ACLMulti_QueryInterface(&This->IEnumString_iface, iid, ppvOut); } static ULONG WINAPI ACLMulti_IObjMgr_AddRef(IObjMgr *iface) { ACLMulti *This = impl_from_IObjMgr(iface); - return ACLMulti_AddRef((IEnumString *)This); + return ACLMulti_AddRef(&This->IEnumString_iface); } static ULONG WINAPI ACLMulti_IObjMgr_Release(IObjMgr *iface) { ACLMulti *This = impl_from_IObjMgr(iface); - return ACLMulti_Release((IEnumString *)This); + return ACLMulti_Release(&This->IEnumString_iface); } static const IObjMgrVtbl ACLMulti_ObjMgrVtbl = @@ -280,19 +285,19 @@ static const IObjMgrVtbl ACLMulti_ObjMgrVtbl = static HRESULT WINAPI ACLMulti_IACList_QueryInterface(IACList *iface, REFIID iid, LPVOID *ppvOut) { ACLMulti *This = impl_from_IACList(iface); - return ACLMulti_QueryInterface((IEnumString *)This, iid, ppvOut); + return ACLMulti_QueryInterface(&This->IEnumString_iface, iid, ppvOut); } static ULONG WINAPI ACLMulti_IACList_AddRef(IACList *iface) { ACLMulti *This = impl_from_IACList(iface); - return ACLMulti_AddRef((IEnumString *)This); + return ACLMulti_AddRef(&This->IEnumString_iface); } static ULONG WINAPI ACLMulti_IACList_Release(IACList *iface) { ACLMulti *This = impl_from_IACList(iface); - return ACLMulti_Release((IEnumString *)This); + return ACLMulti_Release(&This->IEnumString_iface); } static const IACListVtbl ACLMulti_ACListVtbl = @@ -314,9 +319,9 @@ HRESULT ACLMulti_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) if (This == NULL) return E_OUTOFMEMORY; - This->vtbl = &ACLMultiVtbl; - This->aclVtbl = &ACLMulti_ACListVtbl; - This->objmgrVtbl = &ACLMulti_ObjMgrVtbl; + This->IEnumString_iface.lpVtbl = &ACLMultiVtbl; + This->IACList_iface.lpVtbl = &ACLMulti_ACListVtbl; + This->IObjMgr_iface.lpVtbl = &ACLMulti_ObjMgrVtbl; This->refCount = 1; TRACE("returning %p\n", This);
1
0
0
0
Henri Verbeet : wined3d: Explicitly pass gl_info to unset_shader().
by Alexandre Julliard
10 Dec '10
10 Dec '10
Module: wine Branch: master Commit: 0e3c60786edee04277981e13f89b43dc00506e91 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=0e3c60786edee04277981e13f…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 9 23:41:19 2010 +0100 wined3d: Explicitly pass gl_info to unset_shader(). --- dlls/wined3d/arb_program_shader.c | 8 +++----- dlls/wined3d/surface.c | 9 +++------ dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index cf684e8..6c10fa6 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7094,10 +7094,8 @@ static HRESULT arbfp_blit_set(void *blit_priv, const struct wined3d_gl_info *gl_ } /* Context activation is done by the caller. */ -static void arbfp_blit_unset(IWineD3DDevice *iface) { - IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) iface; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - +static void arbfp_blit_unset(const struct wined3d_gl_info *gl_info) +{ ENTER_GL(); glDisable(GL_FRAGMENT_PROGRAM_ARB); checkGLcall("glDisable(GL_FRAGMENT_PROGRAM_ARB)"); @@ -7198,7 +7196,7 @@ HRESULT arbfp_blit_surface(IWineD3DDeviceImpl *device, IWineD3DSurfaceImpl *src_ LEAVE_GL(); /* Leave the opengl state valid for blitting */ - arbfp_blit_unset((IWineD3DDevice *)device); + arbfp_blit_unset(context->gl_info); dst_swapchain = dst_surface->container.type == WINED3D_CONTAINER_SWAPCHAIN ? dst_surface->container.u.swapchain : NULL; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 02b07b9..6b5258b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3394,7 +3394,7 @@ static void surface_blt_to_drawable(IWineD3DDeviceImpl *device, LEAVE_GL(); /* Leave the opengl state valid for blitting */ - device->blitter->unset_shader((IWineD3DDevice *)device); + device->blitter->unset_shader(context->gl_info); if (wined3d_settings.strict_draw_ordering || (swapchain && (dst_surface == swapchain->front_buffer || swapchain->num_contexts > 1))) @@ -4770,11 +4770,8 @@ static HRESULT ffp_blit_set(void *blit_priv, const struct wined3d_gl_info *gl_in } /* Context activation is done by the caller. */ -static void ffp_blit_unset(IWineD3DDevice *iface) +static void ffp_blit_unset(const struct wined3d_gl_info *gl_info) { - IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) iface; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - ENTER_GL(); glDisable(GL_TEXTURE_2D); checkGLcall("glDisable(GL_TEXTURE_2D)"); @@ -4880,7 +4877,7 @@ static HRESULT cpu_blit_set(void *blit_priv, const struct wined3d_gl_info *gl_in } /* Context activation is done by the caller. */ -static void cpu_blit_unset(IWineD3DDevice *iface) +static void cpu_blit_unset(const struct wined3d_gl_info *gl_info) { } diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 7e1f031..e5ff786 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -212,7 +212,7 @@ static void swapchain_blit(IWineD3DSwapChainImpl *This, struct wined3d_context * glPopMatrix(); glPopAttrib(); - device->blitter->unset_shader((IWineD3DDevice *) device); + device->blitter->unset_shader(context->gl_info); checkGLcall("Swapchain present blit(manual)\n"); LEAVE_GL(); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bbed40c..d7612eb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1178,7 +1178,7 @@ struct blit_shader HRESULT (*alloc_private)(IWineD3DDeviceImpl *device); void (*free_private)(IWineD3DDeviceImpl *device); HRESULT (*set_shader)(void *blit_priv, const struct wined3d_gl_info *gl_info, IWineD3DSurfaceImpl *surface); - void (*unset_shader)(IWineD3DDevice *iface); + void (*unset_shader)(const struct wined3d_gl_info *gl_info); BOOL (*blit_supported)(const struct wined3d_gl_info *gl_info, enum blit_operation blit_op, const RECT *src_rect, DWORD src_usage, WINED3DPOOL src_pool, const struct wined3d_format *src_format, const RECT *dst_rect, DWORD dst_usage, WINED3DPOOL dst_pool, const struct wined3d_format *dst_format);
1
0
0
0
Henri Verbeet : wined3d: Explicitly pass blit_priv and gl_info to set_shader().
by Alexandre Julliard
10 Dec '10
10 Dec '10
Module: wine Branch: master Commit: ae7a20af2fc5e4c9e762b8f0e74fd6a487472cee URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ae7a20af2fc5e4c9e762b8f0e…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 9 23:41:18 2010 +0100 wined3d: Explicitly pass blit_priv and gl_info to set_shader(). --- dlls/wined3d/arb_program_shader.c | 8 +++----- dlls/wined3d/surface.c | 8 +++----- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 2b4004a..cf684e8 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7027,13 +7027,11 @@ static GLuint gen_yuv_shader(struct arbfp_blit_priv *priv, const struct wined3d_ } /* Context activation is done by the caller. */ -static HRESULT arbfp_blit_set(IWineD3DDevice *iface, IWineD3DSurfaceImpl *surface) +static HRESULT arbfp_blit_set(void *blit_priv, const struct wined3d_gl_info *gl_info, IWineD3DSurfaceImpl *surface) { GLenum shader; - IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) iface; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; float size[4] = {(float) surface->pow2Width, (float) surface->pow2Height, 1.0f, 1.0f}; - struct arbfp_blit_priv *priv = device->blit_priv; + struct arbfp_blit_priv *priv = blit_priv; enum complex_fixup fixup; GLenum textype = surface->texture_target; @@ -7190,7 +7188,7 @@ HRESULT arbfp_blit_surface(IWineD3DDeviceImpl *device, IWineD3DSurfaceImpl *src_ if (!surface_is_offscreen(dst_surface)) surface_translate_drawable_coords(dst_surface, context->win_handle, &dst_rect); - arbfp_blit_set((IWineD3DDevice *)device, src_surface); + arbfp_blit_set(device->blit_priv, context->gl_info, src_surface); ENTER_GL(); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 994f3bc..02b07b9 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3358,7 +3358,7 @@ static void surface_blt_to_drawable(IWineD3DDeviceImpl *device, if (!surface_is_offscreen(dst_surface)) surface_translate_drawable_coords(dst_surface, context->win_handle, &dst_rect); - device->blitter->set_shader((IWineD3DDevice *)device, src_surface); + device->blitter->set_shader(device->blit_priv, context->gl_info, src_surface); ENTER_GL(); @@ -4752,10 +4752,8 @@ static void ffp_blit_p8_upload_palette(IWineD3DSurfaceImpl *surface, const struc } /* Context activation is done by the caller. */ -static HRESULT ffp_blit_set(IWineD3DDevice *iface, IWineD3DSurfaceImpl *surface) +static HRESULT ffp_blit_set(void *blit_priv, const struct wined3d_gl_info *gl_info, IWineD3DSurfaceImpl *surface) { - IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) iface; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; enum complex_fixup fixup = get_complex_fixup(surface->resource.format->color_fixup); /* When EXT_PALETTED_TEXTURE is around, palette conversion is done by the GPU @@ -4876,7 +4874,7 @@ static void cpu_blit_free(IWineD3DDeviceImpl *device) } /* Context activation is done by the caller. */ -static HRESULT cpu_blit_set(IWineD3DDevice *iface, IWineD3DSurfaceImpl *surface) +static HRESULT cpu_blit_set(void *blit_priv, const struct wined3d_gl_info *gl_info, IWineD3DSurfaceImpl *surface) { return WINED3D_OK; } diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index d0934ba..7e1f031 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -171,7 +171,7 @@ static void swapchain_blit(IWineD3DSwapChainImpl *This, struct wined3d_context * /* Set up the texture. The surface is not in a IWineD3D*Texture container, * so there are no d3d texture settings to dirtify */ - device->blitter->set_shader((IWineD3DDevice *) device, backbuffer); + device->blitter->set_shader(device->blit_priv, context2->gl_info, backbuffer); glTexParameteri(backbuffer->texture_target, GL_TEXTURE_MIN_FILTER, gl_filter); glTexParameteri(backbuffer->texture_target, GL_TEXTURE_MAG_FILTER, gl_filter); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bb7b1f5..bbed40c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1177,7 +1177,7 @@ struct blit_shader { HRESULT (*alloc_private)(IWineD3DDeviceImpl *device); void (*free_private)(IWineD3DDeviceImpl *device); - HRESULT (*set_shader)(IWineD3DDevice *iface, IWineD3DSurfaceImpl *surface); + HRESULT (*set_shader)(void *blit_priv, const struct wined3d_gl_info *gl_info, IWineD3DSurfaceImpl *surface); void (*unset_shader)(IWineD3DDevice *iface); BOOL (*blit_supported)(const struct wined3d_gl_info *gl_info, enum blit_operation blit_op, const RECT *src_rect, DWORD src_usage, WINED3DPOOL src_pool, const struct wined3d_format *src_format,
1
0
0
0
Henri Verbeet : wined3d: Explicitly pass blit_priv and gl_info to gen_p8_shader().
by Alexandre Julliard
10 Dec '10
10 Dec '10
Module: wine Branch: master Commit: 0caed0a771fecc2d974f32981cc78061592b6293 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=0caed0a771fecc2d974f32981…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 9 23:41:17 2010 +0100 wined3d: Explicitly pass blit_priv and gl_info to gen_p8_shader(). --- dlls/wined3d/arb_program_shader.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 397ad87..2b4004a 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6771,12 +6771,11 @@ static BOOL gen_yv12_read(struct wined3d_shader_buffer *buffer, GLenum textype, return TRUE; } -static GLuint gen_p8_shader(IWineD3DDeviceImpl *device, GLenum textype) +static GLuint gen_p8_shader(struct arbfp_blit_priv *priv, + const struct wined3d_gl_info *gl_info, GLenum textype) { - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; GLenum shader; struct wined3d_shader_buffer buffer; - struct arbfp_blit_priv *priv = device->blit_priv; GLint pos; /* Shader header */ @@ -7068,7 +7067,7 @@ static HRESULT arbfp_blit_set(IWineD3DDevice *iface, IWineD3DSurfaceImpl *surfac case COMPLEX_FIXUP_P8: shader = textype == GL_TEXTURE_RECTANGLE_ARB ? priv->p8_rect_shader : priv->p8_2d_shader; - if (!shader) shader = gen_p8_shader(device, textype); + if (!shader) shader = gen_p8_shader(priv, gl_info, textype); upload_palette(surface); break;
1
0
0
0
Henri Verbeet : wined3d: Explicitly pass blit_priv and gl_info to gen_yuv_shader().
by Alexandre Julliard
10 Dec '10
10 Dec '10
Module: wine Branch: master Commit: fa755171559d32e306aca300bfdc5b1d04b1aeb5 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=fa755171559d32e306aca300b…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 9 23:41:16 2010 +0100 wined3d: Explicitly pass blit_priv and gl_info to gen_yuv_shader(). --- dlls/wined3d/arb_program_shader.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 7dc3c81..397ad87 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6872,13 +6872,12 @@ static void upload_palette(IWineD3DSurfaceImpl *surface) } /* Context activation is done by the caller. */ -static GLuint gen_yuv_shader(IWineD3DDeviceImpl *device, enum complex_fixup yuv_fixup, GLenum textype) +static GLuint gen_yuv_shader(struct arbfp_blit_priv *priv, const struct wined3d_gl_info *gl_info, + enum complex_fixup yuv_fixup, GLenum textype) { - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; GLenum shader; struct wined3d_shader_buffer buffer; char luminance_component; - struct arbfp_blit_priv *priv = device->blit_priv; GLint pos; /* Shader header */ @@ -7083,7 +7082,7 @@ static HRESULT arbfp_blit_set(IWineD3DDevice *iface, IWineD3DSurfaceImpl *surfac return E_NOTIMPL; } - if (!shader) shader = gen_yuv_shader(device, fixup, textype); + if (!shader) shader = gen_yuv_shader(priv, gl_info, fixup, textype); ENTER_GL(); glEnable(GL_FRAGMENT_PROGRAM_ARB);
1
0
0
0
Alexandre Julliard : winetest: Sill output an entry for a dll when it' s skipped entirely.
by Alexandre Julliard
10 Dec '10
10 Dec '10
Module: wine Branch: master Commit: 6d8a19def43e11bb3c0e459f4ed9377882999108 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=6d8a19def43e11bb3c0e459f4…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 10 12:13:41 2010 +0100 winetest: Sill output an entry for a dll when it's skipped entirely. --- programs/winetest/main.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index c1ee938..7caf9f9 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -708,19 +708,20 @@ extract_test_proc (HMODULE hModule, LPCTSTR lpszType, ULONG_PTR cookie; if (aborting) return TRUE; + + /* Check if the main dll is present on this system */ + CharLowerA(lpszName); + strcpy(dllname, lpszName); + *strstr(dllname, testexe) = 0; + if (test_filtered_out( lpszName, NULL )) { nr_of_skips++; + xprintf (" %s=skipped\n", dllname); return TRUE; } - - CharLowerA(lpszName); extract_test (&wine_tests[nr_of_files], tempdir, lpszName); - /* Check if the main dll is present on this system */ - strcpy(dllname, lpszName); - *strstr(dllname, testexe) = 0; - if (pCreateActCtxA != NULL && pActivateActCtx != NULL && pDeactivateActCtx != NULL && pReleaseActCtx != NULL) {
1
0
0
0
Alexandre Julliard : winetest: Fix filtering of whole dll when individual tests are excluded.
by Alexandre Julliard
10 Dec '10
10 Dec '10
Module: wine Branch: master Commit: 17e2cbd4dc86a9001e90e84ef0af45fe6634cbea URL:
http://source.winehq.org/git/wine.git/?a=commit;h=17e2cbd4dc86a9001e90e84ef…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 10 12:13:15 2010 +0100 winetest: Fix filtering of whole dll when individual tests are excluded. --- programs/winetest/main.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 1ea308b..c1ee938 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -99,7 +99,8 @@ static BOOL test_filtered_out( LPCSTR module, LPCSTR testname ) { if (!filters[i][len]) return exclude_tests; if (filters[i][len] != ':') continue; - if (!testname || !strcmp( testname, &filters[i][len+1] )) return exclude_tests; + if (testname && !strcmp( testname, &filters[i][len+1] )) return exclude_tests; + if (!testname && !exclude_tests) return FALSE; } } return !exclude_tests;
1
0
0
0
Alexandre Julliard : widl: Don' t create the CurVer key if the ProgId is already version-independent.
by Alexandre Julliard
10 Dec '10
10 Dec '10
Module: wine Branch: master Commit: f3f5230b927968b0b3fce1d2d84c6721951a5dd3 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=f3f5230b927968b0b3fce1d2d…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 9 22:42:30 2010 +0100 widl: Don't create the CurVer key if the ProgId is already version-independent. --- tools/widl/register.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/register.c b/tools/widl/register.c index 736ec2c..f709214 100644 --- a/tools/widl/register.c +++ b/tools/widl/register.c @@ -166,7 +166,7 @@ static int write_progid( const type_t *class ) put_str( indent, "'%s' = s '%s'\n", vi_progid, descr ); put_str( indent++, "{\n" ); put_str( indent, "CLSID = s '%s'\n", format_uuid( uuid ) ); - if (progid) put_str( indent, "CurVer = s '%s'\n", progid ); + if (progid && strcmp( progid, vi_progid )) put_str( indent, "CurVer = s '%s'\n", progid ); put_str( --indent, "}\n" ); } return 1;
1
0
0
0
← Newer
1
...
55
56
57
58
59
60
61
...
110
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
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
Results per page:
10
25
50
100
200