December 2010 - Wine-Commits

Michael Stefaniuc : msxml3: Use an iface instead of a vtbl pointer in domcdata.
by Alexandre Julliard Dec. 17, 2010

Dec. 17, 2010

Module: wine Branch: master Commit: 6a319a33280563db7052e60be37aa54f377cc55c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a319a33280563db7052e60be… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 16 01:04:06 2010 +0100 msxml3: Use an iface instead of a vtbl pointer in domcdata. --- dlls/msxml3/cdata.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index e4f24c5..227563f 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -40,13 +40,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); typedef struct _domcdata { xmlnode node; - const struct IXMLDOMCDATASectionVtbl *lpVtbl; + IXMLDOMCDATASection IXMLDOMCDATASection_iface; LONG ref; } domcdata; static inline domcdata *impl_from_IXMLDOMCDATASection( IXMLDOMCDATASection *iface ) { - return (domcdata *)((char*)iface - FIELD_OFFSET(domcdata, lpVtbl)); + return CONTAINING_RECORD(iface, domcdata, IXMLDOMCDATASection_iface); } static HRESULT WINAPI domcdata_QueryInterface( @@ -177,8 +177,8 @@ static HRESULT WINAPI domcdata_Invoke( hr = get_typeinfo(IXMLDOMCDATASection_tid, &typeinfo); if(SUCCEEDED(hr)) { - hr = ITypeInfo_Invoke(typeinfo, &(This->lpVtbl), dispIdMember, wFlags, pDispParams, - pVarResult, pExcepInfo, puArgErr); + hr = ITypeInfo_Invoke(typeinfo, &This->IXMLDOMCDATASection_iface, dispIdMember, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); ITypeInfo_Release(typeinfo); } @@ -892,12 +892,12 @@ IUnknown* create_cdata( xmlNodePtr text ) if ( !This ) return NULL; - This->lpVtbl = &domcdata_vtbl; + This->IXMLDOMCDATASection_iface.lpVtbl = &domcdata_vtbl; This->ref = 1; - init_xmlnode(&This->node, text, (IXMLDOMNode*)&This->lpVtbl, NULL); + init_xmlnode(&This->node, text, (IXMLDOMNode*)&This->IXMLDOMCDATASection_iface, NULL); - return (IUnknown*) &This->lpVtbl; + return (IUnknown*)&This->IXMLDOMCDATASection_iface; } #endif

1 0

Michael Stefaniuc : msxml3: Use an iface instead of a vtbl pointer in xmlnodelist.
by Alexandre Julliard Dec. 17, 2010

Dec. 17, 2010

Module: wine Branch: master Commit: 8db9985fee614d73337f6aff4172d8ff1cac32bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=8db9985fee614d73337f6aff4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 16 01:04:15 2010 +0100 msxml3: Use an iface instead of a vtbl pointer in xmlnodelist. --- dlls/msxml3/nodelist.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/nodelist.c b/dlls/msxml3/nodelist.c index beda9e0..2cc6960 100644 --- a/dlls/msxml3/nodelist.c +++ b/dlls/msxml3/nodelist.c @@ -48,7 +48,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); typedef struct _xmlnodelist { - const struct IXMLDOMNodeListVtbl *lpVtbl; + IXMLDOMNodeList IXMLDOMNodeList_iface; LONG ref; xmlNodePtr parent; xmlNodePtr current; @@ -56,7 +56,7 @@ typedef struct _xmlnodelist static inline xmlnodelist *impl_from_IXMLDOMNodeList( IXMLDOMNodeList *iface ) { - return (xmlnodelist *)((char*)iface - FIELD_OFFSET(xmlnodelist, lpVtbl)); + return CONTAINING_RECORD(iface, xmlnodelist, IXMLDOMNodeList_iface); } static HRESULT WINAPI xmlnodelist_QueryInterface( @@ -188,8 +188,8 @@ static HRESULT WINAPI xmlnodelist_Invoke( hr = get_typeinfo(IXMLDOMNodeList_tid, &typeinfo); if(SUCCEEDED(hr)) { - hr = ITypeInfo_Invoke(typeinfo, &(This->lpVtbl), dispIdMember, wFlags, pDispParams, - pVarResult, pExcepInfo, puArgErr); + hr = ITypeInfo_Invoke(typeinfo, &This->IXMLDOMNodeList_iface, dispIdMember, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); ITypeInfo_Release(typeinfo); } @@ -319,14 +319,14 @@ IXMLDOMNodeList* create_children_nodelist( xmlNodePtr node ) if ( !nodelist ) return NULL; - nodelist->lpVtbl = &xmlnodelist_vtbl; + nodelist->IXMLDOMNodeList_iface.lpVtbl = &xmlnodelist_vtbl; nodelist->ref = 1; nodelist->parent = node; nodelist->current = node->children; xmldoc_add_ref( node->doc ); - return (IXMLDOMNodeList*) &nodelist->lpVtbl; + return &nodelist->IXMLDOMNodeList_iface; } #endif

1 0

Michael Stefaniuc : msxml3: Use an iface instead of a vtbl pointer in entityref.
by Alexandre Julliard Dec. 17, 2010

Dec. 17, 2010

Module: wine Branch: master Commit: ba7c7547260485f36ebcf2b90d665651287fafdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba7c7547260485f36ebcf2b90… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 16 01:04:14 2010 +0100 msxml3: Use an iface instead of a vtbl pointer in entityref. --- dlls/msxml3/entityref.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index 698f1e5..032c779 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -40,13 +40,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); typedef struct _entityref { xmlnode node; - const struct IXMLDOMEntityReferenceVtbl *lpVtbl; + IXMLDOMEntityReference IXMLDOMEntityReference_iface; LONG ref; } entityref; static inline entityref *impl_from_IXMLDOMEntityReference( IXMLDOMEntityReference *iface ) { - return (entityref *)((char*)iface - FIELD_OFFSET(entityref, lpVtbl)); + return CONTAINING_RECORD(iface, entityref, IXMLDOMEntityReference_iface); } static HRESULT WINAPI entityref_QueryInterface( @@ -169,8 +169,8 @@ static HRESULT WINAPI entityref_Invoke( hr = get_typeinfo(IXMLDOMEntityReference_tid, &typeinfo); if(SUCCEEDED(hr)) { - hr = ITypeInfo_Invoke(typeinfo, &(This->lpVtbl), dispIdMember, wFlags, pDispParams, - pVarResult, pExcepInfo, puArgErr); + hr = ITypeInfo_Invoke(typeinfo, &This->IXMLDOMEntityReference_iface, dispIdMember, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); ITypeInfo_Release(typeinfo); } @@ -582,12 +582,12 @@ IUnknown* create_doc_entity_ref( xmlNodePtr entity ) if ( !This ) return NULL; - This->lpVtbl = &entityref_vtbl; + This->IXMLDOMEntityReference_iface.lpVtbl = &entityref_vtbl; This->ref = 1; - init_xmlnode(&This->node, entity, (IXMLDOMNode*)&This->lpVtbl, NULL); + init_xmlnode(&This->node, entity, (IXMLDOMNode*)&This->IXMLDOMEntityReference_iface, NULL); - return (IUnknown*) &This->lpVtbl; + return (IUnknown*)&This->IXMLDOMEntityReference_iface; } #endif

1 0

Piotr Caban : kernel32: Add support for completion routine invocation in ReadDirectoryChangesW.
by Alexandre Julliard Dec. 17, 2010

Dec. 17, 2010

Module: wine Branch: master Commit: 45b65d0fb69142fb55f08fd6674f322bc69cf5e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45b65d0fb69142fb55f08fd66… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 16 01:02:31 2010 +0100 kernel32: Add support for completion routine invocation in ReadDirectoryChangesW. --- dlls/kernel32/change.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/change.c b/dlls/kernel32/change.c index 0505ca9..ab9432f 100644 --- a/dlls/kernel32/change.c +++ b/dlls/kernel32/change.c @@ -134,6 +134,12 @@ BOOL WINAPI FindCloseChangeNotification( HANDLE handle ) return CloseHandle( handle ); } +static void WINAPI invoke_completion(LPVOID ctx, IO_STATUS_BLOCK *ios, ULONG res) +{ + LPOVERLAPPED_COMPLETION_ROUTINE completion = ctx; + completion(ios->u.Status, ios->Information, (LPOVERLAPPED)ios); +} + /**************************************************************************** * ReadDirectoryChangesW (KERNEL32.@) * @@ -169,14 +175,16 @@ BOOL WINAPI ReadDirectoryChangesW( HANDLE handle, LPVOID buffer, DWORD len, BOOL else { pov = overlapped; - if (!completion && ((ULONG_PTR)overlapped->hEvent & 1) == 0) cvalue = overlapped; + if(completion) cvalue = completion; + else if (((ULONG_PTR)overlapped->hEvent & 1) == 0) cvalue = overlapped; } ios = (PIO_STATUS_BLOCK) pov; ios->u.Status = STATUS_PENDING; - status = NtNotifyChangeDirectoryFile( handle, pov->hEvent, NULL, cvalue, - ios, buffer, len, filter, subtree ); + status = NtNotifyChangeDirectoryFile( handle, completion && overlapped ? NULL : pov->hEvent, + completion && overlapped ? invoke_completion : NULL, + cvalue, ios, buffer, len, filter, subtree ); if (status == STATUS_PENDING) { if (overlapped)

1 0

Michael Stefaniuc : msxml3: Use ifaces instead of vtbl pointers in xmlnodemap.
by Alexandre Julliard Dec. 17, 2010

Dec. 17, 2010

Module: wine Branch: master Commit: 11b24354ff52d0ae327ad4b0063e6f339e825578 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11b24354ff52d0ae327ad4b00… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 16 01:04:17 2010 +0100 msxml3: Use ifaces instead of vtbl pointers in xmlnodemap. --- dlls/msxml3/nodemap.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c index 78d9d46..9f23602 100644 --- a/dlls/msxml3/nodemap.c +++ b/dlls/msxml3/nodemap.c @@ -40,8 +40,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); typedef struct _xmlnodemap { - const struct IXMLDOMNamedNodeMapVtbl *lpVtbl; - const struct ISupportErrorInfoVtbl *lpSEIVtbl; + IXMLDOMNamedNodeMap IXMLDOMNamedNodeMap_iface; + ISupportErrorInfo ISupportErrorInfo_iface; LONG ref; IXMLDOMNode *node; LONG iterator; @@ -49,12 +49,12 @@ typedef struct _xmlnodemap static inline xmlnodemap *impl_from_IXMLDOMNamedNodeMap( IXMLDOMNamedNodeMap *iface ) { - return (xmlnodemap *)((char*)iface - FIELD_OFFSET(xmlnodemap, lpVtbl)); + return CONTAINING_RECORD(iface, xmlnodemap, IXMLDOMNamedNodeMap_iface); } static inline xmlnodemap *impl_from_ISupportErrorInfo( ISupportErrorInfo *iface ) { - return (xmlnodemap *)((char*)iface - FIELD_OFFSET(xmlnodemap, lpSEIVtbl)); + return CONTAINING_RECORD(iface, xmlnodemap, ISupportErrorInfo_iface); } static HRESULT WINAPI xmlnodemap_QueryInterface( @@ -72,7 +72,7 @@ static HRESULT WINAPI xmlnodemap_QueryInterface( } else if( IsEqualGUID( riid, &IID_ISupportErrorInfo )) { - *ppvObject = &This->lpSEIVtbl; + *ppvObject = &This->ISupportErrorInfo_iface; } else { @@ -172,8 +172,8 @@ static HRESULT WINAPI xmlnodemap_Invoke( hr = get_typeinfo(IXMLDOMNamedNodeMap_tid, &typeinfo); if(SUCCEEDED(hr)) { - hr = ITypeInfo_Invoke(typeinfo, &(This->lpVtbl), dispIdMember, wFlags, pDispParams, - pVarResult, pExcepInfo, puArgErr); + hr = ITypeInfo_Invoke(typeinfo, &This->IXMLDOMNamedNodeMap_iface, dispIdMember, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); ITypeInfo_Release(typeinfo); } @@ -513,21 +513,21 @@ static HRESULT WINAPI support_error_QueryInterface( { xmlnodemap *This = impl_from_ISupportErrorInfo( iface ); TRACE("%p %s %p\n", iface, debugstr_guid(riid), ppvObject); - return IXMLDOMNamedNodeMap_QueryInterface((IXMLDOMNamedNodeMap*)&This->lpVtbl, riid, ppvObject); + return IXMLDOMNamedNodeMap_QueryInterface(&This->IXMLDOMNamedNodeMap_iface, riid, ppvObject); } static ULONG WINAPI support_error_AddRef( ISupportErrorInfo *iface ) { xmlnodemap *This = impl_from_ISupportErrorInfo( iface ); - return IXMLDOMNamedNodeMap_AddRef((IXMLDOMNamedNodeMap*)&This->lpVtbl); + return IXMLDOMNamedNodeMap_AddRef(&This->IXMLDOMNamedNodeMap_iface); } static ULONG WINAPI support_error_Release( ISupportErrorInfo *iface ) { xmlnodemap *This = impl_from_ISupportErrorInfo( iface ); - return IXMLDOMNamedNodeMap_Release((IXMLDOMNamedNodeMap*)&This->lpVtbl); + return IXMLDOMNamedNodeMap_Release(&This->IXMLDOMNamedNodeMap_iface); } static HRESULT WINAPI support_error_InterfaceSupportsErrorInfo( @@ -554,8 +554,8 @@ IXMLDOMNamedNodeMap *create_nodemap( IXMLDOMNode *node ) if ( !nodemap ) return NULL; - nodemap->lpVtbl = &xmlnodemap_vtbl; - nodemap->lpSEIVtbl = &support_error_vtbl; + nodemap->IXMLDOMNamedNodeMap_iface.lpVtbl = &xmlnodemap_vtbl; + nodemap->ISupportErrorInfo_iface.lpVtbl = &support_error_vtbl; nodemap->node = node; nodemap->ref = 1; nodemap->iterator = 0; @@ -563,7 +563,7 @@ IXMLDOMNamedNodeMap *create_nodemap( IXMLDOMNode *node ) IXMLDOMNode_AddRef( node ); /* Since we AddRef a node here, we don't need to call xmldoc_add_ref() */ - return (IXMLDOMNamedNodeMap*) &nodemap->lpVtbl; + return &nodemap->IXMLDOMNamedNodeMap_iface; } #endif

1 0

Michael Stefaniuc : msxml3: Use an iface instead of a vtbl pointer in domattr.
by Alexandre Julliard Dec. 17, 2010

Dec. 17, 2010

Module: wine Branch: master Commit: 41ac7a3b5c2d3e96c928abf4c517bef02a2403b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41ac7a3b5c2d3e96c928abf4c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 16 01:04:05 2010 +0100 msxml3: Use an iface instead of a vtbl pointer in domattr. --- dlls/msxml3/attribute.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index e634867..b99d1d1 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -40,13 +40,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); typedef struct _domattr { xmlnode node; - const struct IXMLDOMAttributeVtbl *lpVtbl; + IXMLDOMAttribute IXMLDOMAttribute_iface; LONG ref; } domattr; static inline domattr *impl_from_IXMLDOMAttribute( IXMLDOMAttribute *iface ) { - return (domattr *)((char*)iface - FIELD_OFFSET(domattr, lpVtbl)); + return CONTAINING_RECORD(iface, domattr, IXMLDOMAttribute_iface); } static HRESULT WINAPI domattr_QueryInterface( @@ -170,8 +170,8 @@ static HRESULT WINAPI domattr_Invoke( hr = get_typeinfo(IXMLDOMAttribute_tid, &typeinfo); if(SUCCEEDED(hr)) { - hr = ITypeInfo_Invoke(typeinfo, &(This->lpVtbl), dispIdMember, wFlags, pDispParams, - pVarResult, pExcepInfo, puArgErr); + hr = ITypeInfo_Invoke(typeinfo, &This->IXMLDOMAttribute_iface, dispIdMember, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); ITypeInfo_Release(typeinfo); } return hr; @@ -616,12 +616,12 @@ IUnknown* create_attribute( xmlNodePtr attribute ) if ( !This ) return NULL; - This->lpVtbl = &domattr_vtbl; + This->IXMLDOMAttribute_iface.lpVtbl = &domattr_vtbl; This->ref = 1; - init_xmlnode(&This->node, attribute, (IXMLDOMNode*)&This->lpVtbl, NULL); + init_xmlnode(&This->node, attribute, (IXMLDOMNode*)&This->IXMLDOMAttribute_iface, NULL); - return (IUnknown*) &This->lpVtbl; + return (IUnknown*)&This->IXMLDOMAttribute_iface; } #endif

1 0

Henri Verbeet : wined3d: Pass an IWineD3DBaseTextureImpl pointer to basetexture_get_level_count().
by Alexandre Julliard Dec. 17, 2010

Dec. 17, 2010

Module: wine Branch: master Commit: f5d96d1701daa051e9c32ac3df557cf7463b8247 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5d96d1701daa051e9c32ac3d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 15 21:06:26 2010 +0100 wined3d: Pass an IWineD3DBaseTextureImpl pointer to basetexture_get_level_count(). --- dlls/wined3d/basetexture.c | 7 +++---- dlls/wined3d/cubetexture.c | 5 +++-- dlls/wined3d/texture.c | 5 +++-- dlls/wined3d/volumetexture.c | 5 +++-- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index 6db8a5d..cd1b687 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -167,11 +167,10 @@ DWORD basetexture_get_lod(IWineD3DBaseTexture *iface) return This->baseTexture.LOD; } -DWORD basetexture_get_level_count(IWineD3DBaseTexture *iface) +DWORD basetexture_get_level_count(IWineD3DBaseTextureImpl *texture) { - IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface; - TRACE("iface %p, returning %u.\n", iface, This->baseTexture.level_count); - return This->baseTexture.level_count; + TRACE("texture %p, returning %u.\n", texture, texture->baseTexture.level_count); + return texture->baseTexture.level_count; } HRESULT basetexture_set_autogen_filter_type(IWineD3DBaseTexture *iface, WINED3DTEXTUREFILTERTYPE FilterType) diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index eb92729..da39701 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -254,8 +254,9 @@ static DWORD WINAPI IWineD3DCubeTextureImpl_GetLOD(IWineD3DCubeTexture *iface) { return basetexture_get_lod((IWineD3DBaseTexture *)iface); } -static DWORD WINAPI IWineD3DCubeTextureImpl_GetLevelCount(IWineD3DCubeTexture *iface) { - return basetexture_get_level_count((IWineD3DBaseTexture *)iface); +static DWORD WINAPI IWineD3DCubeTextureImpl_GetLevelCount(IWineD3DCubeTexture *iface) +{ + return basetexture_get_level_count((IWineD3DBaseTextureImpl *)iface); } static HRESULT WINAPI IWineD3DCubeTextureImpl_SetAutoGenFilterType(IWineD3DCubeTexture *iface, WINED3DTEXTUREFILTERTYPE FilterType) { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index b8b3867..d3a757f 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -245,8 +245,9 @@ static DWORD WINAPI IWineD3DTextureImpl_GetLOD(IWineD3DTexture *iface) { return basetexture_get_lod((IWineD3DBaseTexture *)iface); } -static DWORD WINAPI IWineD3DTextureImpl_GetLevelCount(IWineD3DTexture *iface) { - return basetexture_get_level_count((IWineD3DBaseTexture *)iface); +static DWORD WINAPI IWineD3DTextureImpl_GetLevelCount(IWineD3DTexture *iface) +{ + return basetexture_get_level_count((IWineD3DBaseTextureImpl *)iface); } static HRESULT WINAPI IWineD3DTextureImpl_SetAutoGenFilterType(IWineD3DTexture *iface, WINED3DTEXTUREFILTERTYPE FilterType) { diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index dde1f4c..b2a6102 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -209,8 +209,9 @@ static DWORD WINAPI IWineD3DVolumeTextureImpl_GetLOD(IWineD3DVolumeTexture *ifac return basetexture_get_lod((IWineD3DBaseTexture *)iface); } -static DWORD WINAPI IWineD3DVolumeTextureImpl_GetLevelCount(IWineD3DVolumeTexture *iface) { - return basetexture_get_level_count((IWineD3DBaseTexture *)iface); +static DWORD WINAPI IWineD3DVolumeTextureImpl_GetLevelCount(IWineD3DVolumeTexture *iface) +{ + return basetexture_get_level_count((IWineD3DBaseTextureImpl *)iface); } static HRESULT WINAPI IWineD3DVolumeTextureImpl_SetAutoGenFilterType(IWineD3DVolumeTexture *iface, WINED3DTEXTUREFILTERTYPE FilterType) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c63c24e..e73776e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1916,7 +1916,7 @@ HRESULT basetexture_bind(IWineD3DBaseTexture *iface, BOOL srgb, BOOL *set_surfac void basetexture_cleanup(IWineD3DBaseTextureImpl *texture) DECLSPEC_HIDDEN; void basetexture_generate_mipmaps(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN; WINED3DTEXTUREFILTERTYPE basetexture_get_autogen_filter_type(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN; -DWORD basetexture_get_level_count(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN; +DWORD basetexture_get_level_count(IWineD3DBaseTextureImpl *texture) DECLSPEC_HIDDEN; DWORD basetexture_get_lod(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN; IWineD3DResourceImpl *basetexture_get_sub_resource(IWineD3DBaseTextureImpl *texture, UINT sub_resource_idx) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Pass an IWineD3DBaseTextureImpl pointer to basetexture_unload().
by Alexandre Julliard Dec. 17, 2010

Dec. 17, 2010

Module: wine Branch: master Commit: 47fcc00cce253d7bd59fdf0c34d3e66952f85b66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47fcc00cce253d7bd59fdf0c3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 15 21:06:24 2010 +0100 wined3d: Pass an IWineD3DBaseTextureImpl pointer to basetexture_unload(). --- dlls/wined3d/basetexture.c | 26 ++++++++++++-------------- dlls/wined3d/cubetexture.c | 2 +- dlls/wined3d/texture.c | 2 +- dlls/wined3d/volumetexture.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 16 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index 5047081..b48aaf3 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -76,7 +76,7 @@ HRESULT basetexture_init(IWineD3DBaseTextureImpl *texture, UINT layer_count, UIN void basetexture_cleanup(IWineD3DBaseTexture *iface) { - basetexture_unload(iface); + basetexture_unload((IWineD3DBaseTextureImpl *)iface); HeapFree(GetProcessHeap(), 0, ((IWineD3DBaseTextureImpl *)iface)->baseTexture.sub_resources); resource_cleanup((IWineD3DResource *)iface); } @@ -103,30 +103,28 @@ static void gltexture_delete(struct gl_texture *tex) tex->name = 0; } -void basetexture_unload(IWineD3DBaseTexture *iface) +void basetexture_unload(IWineD3DBaseTextureImpl *texture) { - IWineD3DTextureImpl *This = (IWineD3DTextureImpl *)iface; - IWineD3DDeviceImpl *device = This->resource.device; + IWineD3DDeviceImpl *device = texture->resource.device; struct wined3d_context *context = NULL; - if (This->baseTexture.texture_rgb.name || This->baseTexture.texture_srgb.name) + if (texture->baseTexture.texture_rgb.name || texture->baseTexture.texture_srgb.name) { context = context_acquire(device, NULL); } - if(This->baseTexture.texture_rgb.name) { - gltexture_delete(&This->baseTexture.texture_rgb); - } - if(This->baseTexture.texture_srgb.name) { - gltexture_delete(&This->baseTexture.texture_srgb); - } + if (texture->baseTexture.texture_rgb.name) + gltexture_delete(&texture->baseTexture.texture_rgb); + + if (texture->baseTexture.texture_srgb.name) + gltexture_delete(&texture->baseTexture.texture_srgb); if (context) context_release(context); - This->baseTexture.texture_rgb.dirty = TRUE; - This->baseTexture.texture_srgb.dirty = TRUE; + texture->baseTexture.texture_rgb.dirty = TRUE; + texture->baseTexture.texture_srgb.dirty = TRUE; - resource_unload((IWineD3DResourceImpl *)This); + resource_unload((IWineD3DResourceImpl *)texture); } DWORD basetexture_set_lod(IWineD3DBaseTexture *iface, DWORD LODNew) diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index 5287e37..66df6ba 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -229,7 +229,7 @@ static void WINAPI IWineD3DCubeTextureImpl_UnLoad(IWineD3DCubeTexture *iface) surface_set_texture_name(surface, 0, FALSE); } - basetexture_unload((IWineD3DBaseTexture *)iface); + basetexture_unload((IWineD3DBaseTextureImpl *)This); } static WINED3DRESOURCETYPE WINAPI IWineD3DCubeTextureImpl_GetType(IWineD3DCubeTexture *iface) { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index e610846..86dd01a 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -220,7 +220,7 @@ static void WINAPI IWineD3DTextureImpl_UnLoad(IWineD3DTexture *iface) { surface_set_texture_name(surface, 0, TRUE); /* delete srgb name */ } - basetexture_unload((IWineD3DBaseTexture *)iface); + basetexture_unload((IWineD3DBaseTextureImpl *)This); } static WINED3DRESOURCETYPE WINAPI IWineD3DTextureImpl_GetType(IWineD3DTexture *iface) { diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index 0c61111..ae819fe 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -184,7 +184,7 @@ static void WINAPI IWineD3DVolumeTextureImpl_UnLoad(IWineD3DVolumeTexture *iface IWineD3DVolume_UnLoad((IWineD3DVolume *)This->baseTexture.sub_resources[i]); } - basetexture_unload((IWineD3DBaseTexture *)iface); + basetexture_unload((IWineD3DBaseTextureImpl *)This); } static WINED3DRESOURCETYPE WINAPI IWineD3DVolumeTextureImpl_GetType(IWineD3DVolumeTexture *iface) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7db7f26..6a15f38 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1928,7 +1928,7 @@ HRESULT basetexture_set_autogen_filter_type(IWineD3DBaseTexture *iface, WINED3DTEXTUREFILTERTYPE filter_type) DECLSPEC_HIDDEN; BOOL basetexture_set_dirty(IWineD3DBaseTextureImpl *texture, BOOL dirty) DECLSPEC_HIDDEN; DWORD basetexture_set_lod(IWineD3DBaseTexture *iface, DWORD new_lod) DECLSPEC_HIDDEN; -void basetexture_unload(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN; +void basetexture_unload(IWineD3DBaseTextureImpl *texture) DECLSPEC_HIDDEN; /***************************************************************************** * IWineD3DTexture implementation structure (extends IWineD3DBaseTextureImpl)

1 0

Henri Verbeet : wined3d: Pass an IWineD3DBaseTextureImpl pointer to basetexture_cleanup().
by Alexandre Julliard Dec. 17, 2010

Dec. 17, 2010

Module: wine Branch: master Commit: 2438968c34f2e01bd720c64002d43f16c02eecc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2438968c34f2e01bd720c6400… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 15 21:06:25 2010 +0100 wined3d: Pass an IWineD3DBaseTextureImpl pointer to basetexture_cleanup(). --- dlls/wined3d/basetexture.c | 8 ++++---- dlls/wined3d/cubetexture.c | 2 +- dlls/wined3d/texture.c | 2 +- dlls/wined3d/volumetexture.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index b48aaf3..6db8a5d 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -74,11 +74,11 @@ HRESULT basetexture_init(IWineD3DBaseTextureImpl *texture, UINT layer_count, UIN return WINED3D_OK; } -void basetexture_cleanup(IWineD3DBaseTexture *iface) +void basetexture_cleanup(IWineD3DBaseTextureImpl *texture) { - basetexture_unload((IWineD3DBaseTextureImpl *)iface); - HeapFree(GetProcessHeap(), 0, ((IWineD3DBaseTextureImpl *)iface)->baseTexture.sub_resources); - resource_cleanup((IWineD3DResource *)iface); + basetexture_unload(texture); + HeapFree(GetProcessHeap(), 0, texture->baseTexture.sub_resources); + resource_cleanup((IWineD3DResource *)texture); } IWineD3DResourceImpl *basetexture_get_sub_resource(IWineD3DBaseTextureImpl *texture, UINT sub_resource_idx) diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index 66df6ba..eb92729 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -132,7 +132,7 @@ static void cubetexture_cleanup(IWineD3DCubeTextureImpl *This) IWineD3DSurface_Release((IWineD3DSurface *)surface); } } - basetexture_cleanup((IWineD3DBaseTexture *)This); + basetexture_cleanup((IWineD3DBaseTextureImpl *)This); } /* ******************************************* diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 86dd01a..b8b3867 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -126,7 +126,7 @@ static void texture_cleanup(IWineD3DTextureImpl *This) } TRACE("(%p) : Cleaning up base texture\n", This); - basetexture_cleanup((IWineD3DBaseTexture *)This); + basetexture_cleanup((IWineD3DBaseTextureImpl *)This); } /* ******************************************* diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index ae819fe..dde1f4c 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -95,7 +95,7 @@ static void volumetexture_cleanup(IWineD3DVolumeTextureImpl *This) IWineD3DVolume_Release((IWineD3DVolume *)volume); } } - basetexture_cleanup((IWineD3DBaseTexture *)This); + basetexture_cleanup((IWineD3DBaseTextureImpl *)This); } /* ******************************************* diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6a15f38..c63c24e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1913,7 +1913,7 @@ void basetexture_apply_state_changes(IWineD3DBaseTexture *iface, const DWORD samplerStates[WINED3D_HIGHEST_SAMPLER_STATE + 1], const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; HRESULT basetexture_bind(IWineD3DBaseTexture *iface, BOOL srgb, BOOL *set_surface_desc) DECLSPEC_HIDDEN; -void basetexture_cleanup(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN; +void basetexture_cleanup(IWineD3DBaseTextureImpl *texture) DECLSPEC_HIDDEN; void basetexture_generate_mipmaps(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN; WINED3DTEXTUREFILTERTYPE basetexture_get_autogen_filter_type(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN; DWORD basetexture_get_level_count(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Pass an IWineD3DBaseTextureImpl array to pixelshader_update_samplers().
by Alexandre Julliard Dec. 17, 2010

Dec. 17, 2010

Module: wine Branch: master Commit: 7bc7caf4233f41ba4225be5bae77b775d555e6ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bc7caf4233f41ba4225be5ba… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 15 21:06:23 2010 +0100 wined3d: Pass an IWineD3DBaseTextureImpl array to pixelshader_update_samplers(). --- dlls/wined3d/arb_program_shader.c | 3 +-- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/shader.c | 6 +++--- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 3bc7224..101de6d 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4296,8 +4296,7 @@ static struct arb_ps_compiled_shader *find_arb_pshader(IWineD3DPixelShaderImpl * shader_data->gl_shaders[shader_data->num_gl_shaders].args = *args; - pixelshader_update_samplers(&shader->baseShader.reg_maps, - (IWineD3DBaseTexture **)device->stateBlock->state.textures); + pixelshader_update_samplers(&shader->baseShader.reg_maps, device->stateBlock->state.textures); if (!shader_buffer_init(&buffer)) { diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6b0cce5..a59e54b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4195,7 +4195,7 @@ static GLhandleARB find_glsl_pshader(const struct wined3d_context *context, memset(&shader_data->gl_shaders[shader_data->num_gl_shaders].np2fixup, 0, sizeof(struct ps_np2fixup_info)); if (args->np2_fixup) np2fixup = &shader_data->gl_shaders[shader_data->num_gl_shaders].np2fixup; - pixelshader_update_samplers(&shader->baseShader.reg_maps, (IWineD3DBaseTexture **)state->textures); + pixelshader_update_samplers(&shader->baseShader.reg_maps, state->textures); shader_buffer_clear(buffer); ret = shader_glsl_generate_pshader(context, buffer, shader, args, np2fixup); diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 97b3e64..086936c 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2313,7 +2313,7 @@ HRESULT pixelshader_init(IWineD3DPixelShaderImpl *shader, IWineD3DDeviceImpl *de return WINED3D_OK; } -void pixelshader_update_samplers(struct wined3d_shader_reg_maps *reg_maps, IWineD3DBaseTexture * const *textures) +void pixelshader_update_samplers(struct wined3d_shader_reg_maps *reg_maps, IWineD3DBaseTextureImpl * const *textures) { WINED3DSAMPLER_TEXTURE_TYPE *sampler_type = reg_maps->sampler_type; unsigned int i; @@ -2332,7 +2332,7 @@ void pixelshader_update_samplers(struct wined3d_shader_reg_maps *reg_maps, IWine continue; } - switch (((IWineD3DBaseTextureImpl *)textures[i])->baseTexture.target) + switch (textures[i]->baseTexture.target) { case GL_TEXTURE_RECTANGLE_ARB: case GL_TEXTURE_2D: @@ -2352,7 +2352,7 @@ void pixelshader_update_samplers(struct wined3d_shader_reg_maps *reg_maps, IWine default: FIXME("Unrecognized texture type %#x, using 2D.\n", - ((IWineD3DBaseTextureImpl *)textures[i])->baseTexture.target); + textures[i]->baseTexture.target); sampler_type[i] = WINED3DSTT_2D; } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e0749a7..7db7f26 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2932,7 +2932,7 @@ HRESULT pixelshader_init(IWineD3DPixelShaderImpl *shader, IWineD3DDeviceImpl *de const DWORD *byte_code, const struct wined3d_shader_signature *output_signature, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; void pixelshader_update_samplers(struct wined3d_shader_reg_maps *reg_maps, - IWineD3DBaseTexture * const *textures) DECLSPEC_HIDDEN; + IWineD3DBaseTextureImpl * const *textures) DECLSPEC_HIDDEN; void find_ps_compile_args(const struct wined3d_state *state, IWineD3DPixelShaderImpl *shader, struct ps_compile_args *args) DECLSPEC_HIDDEN;

1 0