December 2010 - Wine-commits

Michael Stefaniuc : msxml3: Use an iface instead of a vtbl pointer in domelem.
by Alexandre Julliard 17 Dec '10

17 Dec '10

Module: wine Branch: master Commit: 25df7aac27b8d3618f688826a64f15ff5d8ae2bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=25df7aac27b8d3618f688826a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 16 01:04:12 2010 +0100 msxml3: Use an iface instead of a vtbl pointer in domelem. --- dlls/msxml3/element.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index adb2bb3..f76bf60 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -44,13 +44,13 @@ static const xmlChar DT_nsURI[] = "urn:schemas-microsoft-com:datatypes"; typedef struct _domelem { xmlnode node; - const struct IXMLDOMElementVtbl *lpVtbl; + IXMLDOMElement IXMLDOMElement_iface; LONG ref; } domelem; static inline domelem *impl_from_IXMLDOMElement( IXMLDOMElement *iface ) { - return (domelem *)((char*)iface - FIELD_OFFSET(domelem, lpVtbl)); + return CONTAINING_RECORD(iface, domelem, IXMLDOMElement_iface); } static inline xmlNodePtr get_element( const domelem *This ) @@ -72,7 +72,7 @@ static HRESULT WINAPI domelem_QueryInterface( IsEqualGUID( riid, &IID_IDispatch ) || IsEqualGUID( riid, &IID_IUnknown ) ) { - *ppvObject = &This->lpVtbl; + *ppvObject = &This->IXMLDOMElement_iface; } else if(node_query_interface(&This->node, riid, ppvObject)) { @@ -184,8 +184,8 @@ static HRESULT WINAPI domelem_Invoke( hr = get_typeinfo(IXMLDOMElement_tid, &typeinfo); if(SUCCEEDED(hr)) { - hr = ITypeInfo_Invoke(typeinfo, &(This->lpVtbl), dispIdMember, wFlags, pDispParams, - pVarResult, pExcepInfo, puArgErr); + hr = ITypeInfo_Invoke(typeinfo, &This->IXMLDOMElement_iface, dispIdMember, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); ITypeInfo_Release(typeinfo); } @@ -314,7 +314,7 @@ static HRESULT WINAPI domelem_get_attributes( TRACE("(%p)->(%p)\n", This, attributeMap); - *attributeMap = create_nodemap((IXMLDOMNode*)&This->lpVtbl); + *attributeMap = create_nodemap((IXMLDOMNode*)&This->IXMLDOMElement_iface); return S_OK; } @@ -1333,12 +1333,12 @@ IUnknown* create_element( xmlNodePtr element ) if ( !This ) return NULL; - This->lpVtbl = &domelem_vtbl; + This->IXMLDOMElement_iface.lpVtbl = &domelem_vtbl; This->ref = 1; - init_xmlnode(&This->node, element, (IXMLDOMNode*)&This->lpVtbl, &domelem_dispex); + init_xmlnode(&This->node, element, (IXMLDOMNode*)&This->IXMLDOMElement_iface, &domelem_dispex); - return (IUnknown*) &This->lpVtbl; + return (IUnknown*)&This->IXMLDOMElement_iface; } #endif

1 0

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

17 Dec '10

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 dom_pi.
by Alexandre Julliard 17 Dec '10

17 Dec '10

Module: wine Branch: master Commit: 92a93a5c26a4de763e94d341304ac3c57e7bdf65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92a93a5c26a4de763e94d3413… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 16 01:04:18 2010 +0100 msxml3: Use an iface instead of a vtbl pointer in dom_pi. --- dlls/msxml3/pi.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 9ada032..9c3857d 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -40,13 +40,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); typedef struct _dom_pi { xmlnode node; - const struct IXMLDOMProcessingInstructionVtbl *lpVtbl; + IXMLDOMProcessingInstruction IXMLDOMProcessingInstruction_iface; LONG ref; } dom_pi; static inline dom_pi *impl_from_IXMLDOMProcessingInstruction( IXMLDOMProcessingInstruction *iface ) { - return (dom_pi *)((char*)iface - FIELD_OFFSET(dom_pi, lpVtbl)); + return CONTAINING_RECORD(iface, dom_pi, IXMLDOMProcessingInstruction_iface); } static HRESULT WINAPI dom_pi_QueryInterface( @@ -170,8 +170,8 @@ static HRESULT WINAPI dom_pi_Invoke( hr = get_typeinfo(IXMLDOMProcessingInstruction_tid, &typeinfo); if(SUCCEEDED(hr)) { - hr = ITypeInfo_Invoke(typeinfo, &(This->lpVtbl), dispIdMember, wFlags, pDispParams, - pVarResult, pExcepInfo, puArgErr); + hr = ITypeInfo_Invoke(typeinfo, &This->IXMLDOMProcessingInstruction_iface, dispIdMember, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); ITypeInfo_Release(typeinfo); } @@ -313,7 +313,7 @@ static HRESULT WINAPI dom_pi_get_attributes( TRACE("(%p)->(%p)\n", This, attributeMap); - *attributeMap = create_nodemap((IXMLDOMNode*)&This->lpVtbl); + *attributeMap = create_nodemap((IXMLDOMNode*)&This->IXMLDOMProcessingInstruction_iface); return S_OK; } @@ -668,12 +668,12 @@ IUnknown* create_pi( xmlNodePtr pi ) if ( !This ) return NULL; - This->lpVtbl = &dom_pi_vtbl; + This->IXMLDOMProcessingInstruction_iface.lpVtbl = &dom_pi_vtbl; This->ref = 1; - init_xmlnode(&This->node, pi, (IXMLDOMNode*)&This->lpVtbl, NULL); + init_xmlnode(&This->node, pi, (IXMLDOMNode*)&This->IXMLDOMProcessingInstruction_iface, NULL); - return (IUnknown*) &This->lpVtbl; + return (IUnknown*)&This->IXMLDOMProcessingInstruction_iface; } #endif

1 0

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

17 Dec '10

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

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

17 Dec '10

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 an iface instead of a vtbl pointer in domattr.
by Alexandre Julliard 17 Dec '10

17 Dec '10

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

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

17 Dec '10

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

Jacek Caban : jscript: Move some of registration process to IRegistrar mechanism.
by Alexandre Julliard 17 Dec '10

17 Dec '10

Module: wine Branch: master Commit: eda1787b3cbb4aa4f52bc80a0df4e91f1a19d3d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eda1787b3cbb4aa4f52bc80a0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 15 19:33:17 2010 +0100 jscript: Move some of registration process to IRegistrar mechanism. --- .gitignore | 1 + dlls/jscript/Makefile.in | 2 + dlls/jscript/jscript.inf | 18 ---------------- dlls/jscript/jscript_classes.idl | 41 ++++++++++++++++++++++++++++++++++++++ dlls/jscript/jscript_main.c | 23 ++++++++++++++------ 5 files changed, 60 insertions(+), 25 deletions(-) diff --git a/.gitignore b/.gitignore index 0f96790..16370d3 100644 --- a/.gitignore +++ b/.gitignore @@ -52,6 +52,7 @@ dlls/dispex/disp_ex_p.c dlls/dxdiagn/fil_data.h dlls/gameux/gameux_tlb.tlb dlls/infosoft/infosoft.h +dlls/jscript/jscript_classes.h dlls/jscript/jsglobal.tlb dlls/jscript/parser.tab.c dlls/jscript/parser.tab.h diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in index 24f5fdb..5819753 100644 --- a/dlls/jscript/Makefile.in +++ b/dlls/jscript/Makefile.in @@ -46,6 +46,8 @@ C_SRCS = \ vbarray.c IDL_TLB_SRCS = jsglobal.idl +IDL_R_SRCS = jscript_classes.idl +IDL_H_SRCS = jscript_classes.idl BISON_SRCS = \ parser.y diff --git a/dlls/jscript/jscript.inf b/dlls/jscript/jscript.inf index d6a6f8c..c8f0105 100644 --- a/dlls/jscript/jscript.inf +++ b/dlls/jscript/jscript.inf @@ -11,29 +11,17 @@ DelReg=Classes.Reg, FileType.Reg [Classes.Reg] -HKCR,"CLSID\%CLSID_JScript%",,,"JScript Language" HKCR,"CLSID\%CLSID_JScript%\Implemented Categories\%CATID_ActiveScript%",,16 HKCR,"CLSID\%CLSID_JScript%\Implemented Categories\%CATID_ActiveScriptParse%",,16 -HKCR,"CLSID\%CLSID_JScript%\InprocServer32",,,"%MODULE%" -HKCR,"CLSID\%CLSID_JScript%\InprocServer32","ThreadingModel",,"Both" HKCR,"CLSID\%CLSID_JScript%\OLEScript",,16 -HKCR,"CLSID\%CLSID_JScript%\ProgID",,,"JScript" -HKCR,"CLSID\%CLSID_JScriptAuthor%",,,"JScript Language Authoring" HKCR,"CLSID\%CLSID_JScriptAuthor%\Implemented Categories\%CATID_ActiveScriptAuthor%",,16 -HKCR,"CLSID\%CLSID_JScriptAuthor%\InprocServer32",,,"%MODULE%" -HKCR,"CLSID\%CLSID_JScriptAuthor%\InprocServer32","ThreadingModel",,"Both" HKCR,"CLSID\%CLSID_JScriptAuthor%\OLEScript",,16 -HKCR,"CLSID\%CLSID_JScriptAuthor%\ProgID",,,"JScript Author" -HKCR,"CLSID\%CLSID_JScriptEncode%",,,"JScript Language Encoding" HKCR,"CLSID\%CLSID_JScriptEncode%\Implemented Categories\%CATID_ActiveScript%",,16 HKCR,"CLSID\%CLSID_JScriptEncode%\Implemented Categories\%CATID_ActiveScriptParse%",,16 HKCR,"CLSID\%CLSID_JScriptEncode%\Implemented Categories\%CATID_ActiveScriptEncode%",,16 -HKCR,"CLSID\%CLSID_JScriptEncode%\InprocServer32",,,"%MODULE%" -HKCR,"CLSID\%CLSID_JScriptEncode%\InprocServer32","ThreadingModel",,"Both" HKCR,"CLSID\%CLSID_JScriptEncode%\OLEScript",,16 -HKCR,"CLSID\%CLSID_JScriptEncode%\ProgID",,,"JScript.Encode" HKCR,"Component Categories\%CATID_ActiveScriptAuthor%","409",,"Active Scripting Engine with Authoring" HKCR,"Component Categories\%CATID_ActiveScript%","409",,"Active Scripting Engine" @@ -48,8 +36,6 @@ HKCR,"JavaScript",,,"JScript Language" HKCR,"JavaScript\CLSID",,,"%CLSID_JScript%" HKCR,"JavaScript\OLEScript",,16 -HKCR,"JavaScript Author",,,"JScript Language Authoring" -HKCR,"JavaScript Author\CLSID",,,"%CLSID_JScriptAuthor%" HKCR,"JavaScript Author\OLEScript",,16 HKCR,"JavaScript1.1",,,"JScript Language" @@ -72,16 +58,12 @@ HKCR,"JavaScript1.3",,,"JScript Language" HKCR,"JavaScript1.3\CLSID",,,"%CLSID_JScript%" HKCR,"JavaScript1.3\OLEScript",,16 -HKCR,"JScript",,,"JScript Language" -HKCR,"JScript\CLSID",,,"%CLSID_JScript%" HKCR,"JScript\OLEScript",,16 HKCR,"JScript Author",,,"JScript Language Authoring" HKCR,"JScript Author\CLSID",,,"%CLSID_JScriptAuthor%" HKCR,"JScript Author\OLEScript",,16 -HKCR,"JScript.Encode",,,"JScript Language Encoding" -HKCR,"JScript.Encode\CLSID",,,"%CLSID_JScriptEncode%" HKCR,"JScript.Encode\OLEScript",,16 HKCR,"LiveScript",,,"JScript Language" diff --git a/dlls/jscript/jscript_classes.idl b/dlls/jscript/jscript_classes.idl new file mode 100644 index 0000000..d9f481e --- /dev/null +++ b/dlls/jscript/jscript_classes.idl @@ -0,0 +1,41 @@ +/* + * Copyright 2010 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +[ + helpstring("JScript Language"), + threading(both), + progid("JScript"), + uuid(f414c260-6ac0-11cf-b6d1-00aa00bbbb58) +] +coclass JScript {} + +[ + helpstring("JScript Language Authoring"), + threading(both), + progid("JScript Author"), + uuid(f414c261-6ac0-11cf-b6d1-00aa00bbbb58) +] +coclass JScriptAuthor {} + +[ + helpstring("JScript Language Encoding"), + threading(both), + progid("JScript.Encode"), + uuid(f414c262-6ac0-11cf-b6d1-00aa00bbbb58) +] +coclass JScriptEncode {} diff --git a/dlls/jscript/jscript_main.c b/dlls/jscript/jscript_main.c index 78f8f00..3f5b7de 100644 --- a/dlls/jscript/jscript_main.c +++ b/dlls/jscript/jscript_main.c @@ -25,6 +25,8 @@ #include "activaut.h" #include "objsafe.h" #include "mshtmhst.h" +#include "rpcproxy.h" +#include "jscript_classes.h" #include "wine/debug.h" @@ -32,13 +34,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); LONG module_ref = 0; -static const CLSID CLSID_JScript = - {0xf414c260,0x6ac0,0x11cf,{0xb6,0xd1,0x00,0xaa,0x00,0xbb,0xbb,0x58}}; -static const CLSID CLSID_JScriptAuthor = - {0xf414c261,0x6ac0,0x11cf,{0xb6,0xd1,0x00,0xaa,0x00,0xbb,0xbb,0x58}}; -static const CLSID CLSID_JScriptEncode = - {0xf414c262,0x6ac0,0x11cf,{0xb6,0xd1,0x00,0xaa,0x00,0xbb,0xbb,0x58}}; - DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); HINSTANCE jscript_hinstance; @@ -204,7 +199,14 @@ static HRESULT register_inf(BOOL doregister) */ HRESULT WINAPI DllRegisterServer(void) { + HRESULT hres; + TRACE("()\n"); + + hres = __wine_register_resources(jscript_hinstance, NULL); + if(FAILED(hres)) + return hres; + return register_inf(TRUE); } @@ -213,6 +215,13 @@ HRESULT WINAPI DllRegisterServer(void) */ HRESULT WINAPI DllUnregisterServer(void) { + HRESULT hres; + TRACE("()\n"); + + hres = __wine_unregister_resources(jscript_hinstance, NULL); + if(FAILED(hres)) + return hres; + return register_inf(FALSE); }

1 0

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

17 Dec '10

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

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

17 Dec '10

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