wine-commits March 2011

wine-commits@winehq.org

2 participants
849 discussions

Henri Verbeet : wined3d: Get rid of IWineD3DCubeTexture::Unmap().
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 3494106d7797f2f3216f027aa661a591685ef9f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3494106d7797f2f3216f027aa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 13 20:54:31 2011 +0100 wined3d: Get rid of IWineD3DCubeTexture::Unmap(). --- dlls/d3d8/cubetexture.c | 14 +++++++++----- dlls/d3d9/cubetexture.c | 14 +++++++++----- dlls/wined3d/cubetexture.c | 19 ------------------- include/wine/wined3d.idl | 3 --- 4 files changed, 18 insertions(+), 32 deletions(-) diff --git a/dlls/d3d8/cubetexture.c b/dlls/d3d8/cubetexture.c index 891042e..1ecf47c8 100644 --- a/dlls/d3d8/cubetexture.c +++ b/dlls/d3d8/cubetexture.c @@ -330,17 +330,21 @@ static HRESULT WINAPI IDirect3DCubeTexture8Impl_LockRect(IDirect3DCubeTexture8 * } static HRESULT WINAPI IDirect3DCubeTexture8Impl_UnlockRect(IDirect3DCubeTexture8 *iface, - D3DCUBEMAP_FACES FaceType, UINT Level) + D3DCUBEMAP_FACES face, UINT level) { - IDirect3DCubeTexture8Impl *This = impl_from_IDirect3DCubeTexture8(iface); + IDirect3DCubeTexture8Impl *texture = impl_from_IDirect3DCubeTexture8(iface); + struct wined3d_resource *sub_resource; UINT sub_resource_idx; HRESULT hr; - TRACE("iface %p, face %#x, level %u.\n", iface, FaceType, Level); + TRACE("iface %p, face %#x, level %u.\n", iface, face, level); wined3d_mutex_lock(); - sub_resource_idx = IWineD3DCubeTexture_GetLevelCount(This->wineD3DCubeTexture) * FaceType + Level; - hr = IWineD3DCubeTexture_Unmap(This->wineD3DCubeTexture, sub_resource_idx); + sub_resource_idx = IWineD3DCubeTexture_GetLevelCount(texture->wineD3DCubeTexture) * face + level; + if (!(sub_resource = IWineD3DCubeTexture_GetSubResource(texture->wineD3DCubeTexture, sub_resource_idx))) + hr = D3DERR_INVALIDCALL; + else + hr = IDirect3DSurface8_UnlockRect((IDirect3DSurface8 *)wined3d_resource_get_parent(sub_resource)); wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d9/cubetexture.c b/dlls/d3d9/cubetexture.c index 87d00c1..798ffc9 100644 --- a/dlls/d3d9/cubetexture.c +++ b/dlls/d3d9/cubetexture.c @@ -345,17 +345,21 @@ static HRESULT WINAPI IDirect3DCubeTexture9Impl_LockRect(IDirect3DCubeTexture9 * } static HRESULT WINAPI IDirect3DCubeTexture9Impl_UnlockRect(IDirect3DCubeTexture9 *iface, - D3DCUBEMAP_FACES FaceType, UINT Level) + D3DCUBEMAP_FACES face, UINT level) { - IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface; + IDirect3DCubeTexture9Impl *texture = (IDirect3DCubeTexture9Impl *)iface; + struct wined3d_resource *sub_resource; UINT sub_resource_idx; HRESULT hr; - TRACE("iface %p, face %#x, level %u.\n", iface, FaceType, Level); + TRACE("iface %p, face %#x, level %u.\n", iface, face, level); wined3d_mutex_lock(); - sub_resource_idx = IWineD3DCubeTexture_GetLevelCount(This->wineD3DCubeTexture) * FaceType + Level; - hr = IWineD3DCubeTexture_Unmap(This->wineD3DCubeTexture, sub_resource_idx); + sub_resource_idx = IWineD3DCubeTexture_GetLevelCount(texture->wineD3DCubeTexture) * face + level; + if (!(sub_resource = IWineD3DCubeTexture_GetSubResource(texture->wineD3DCubeTexture, sub_resource_idx))) + hr = D3DERR_INVALIDCALL; + else + hr = IDirect3DSurface9_UnlockRect((IDirect3DSurface9 *)wined3d_resource_get_parent(sub_resource)); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index b5294dd..db5cbd3 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -336,24 +336,6 @@ static struct wined3d_resource * WINAPI IWineD3DCubeTextureImpl_GetSubResource(I return basetexture_get_sub_resource(texture, sub_resource_idx); } -static HRESULT WINAPI IWineD3DCubeTextureImpl_Unmap(IWineD3DCubeTexture *iface, - UINT sub_resource_idx) -{ - IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *)iface; - struct wined3d_resource *sub_resource; - - TRACE("iface %p, sub_resource_idx %u.\n", - iface, sub_resource_idx); - - if (!(sub_resource = basetexture_get_sub_resource(texture, sub_resource_idx))) - { - WARN("Failed to get sub-resource.\n"); - return WINED3DERR_INVALIDCALL; - } - - return IWineD3DSurface_Unmap((IWineD3DSurface *)surface_from_resource(sub_resource)); -} - static HRESULT WINAPI IWineD3DCubeTextureImpl_AddDirtyRect(IWineD3DCubeTexture *iface, WINED3DCUBEMAP_FACES face, const RECT *dirty_rect) { @@ -401,7 +383,6 @@ static const IWineD3DCubeTextureVtbl IWineD3DCubeTexture_Vtbl = IWineD3DCubeTextureImpl_IsCondNP2, IWineD3DCubeTextureImpl_GetSubResource, /* IWineD3DCubeTexture */ - IWineD3DCubeTextureImpl_Unmap, IWineD3DCubeTextureImpl_AddDirtyRect }; diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 83e0479..7827080 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2382,9 +2382,6 @@ interface IWineD3DTexture : IWineD3DBaseTexture ] interface IWineD3DCubeTexture : IWineD3DBaseTexture { - HRESULT Unmap( - [in] UINT sub_resource_idx - ); HRESULT AddDirtyRect( [in] WINED3DCUBEMAP_FACES face, [in] const RECT *dirty_rect

1 0

Henri Verbeet : wined3d: Get rid of IWineD3DCubeTexture::Map().
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 3ac924a2da111fe553ebe1e28312c281256a0baf URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ac924a2da111fe553ebe1e28… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 13 20:54:30 2011 +0100 wined3d: Get rid of IWineD3DCubeTexture::Map(). --- dlls/d3d8/cubetexture.c | 18 +++++++++++------- dlls/d3d9/cubetexture.c | 16 ++++++++++------ dlls/wined3d/cubetexture.c | 20 -------------------- include/wine/wined3d.idl | 6 ------ 4 files changed, 21 insertions(+), 39 deletions(-) diff --git a/dlls/d3d8/cubetexture.c b/dlls/d3d8/cubetexture.c index 515be63..891042e 100644 --- a/dlls/d3d8/cubetexture.c +++ b/dlls/d3d8/cubetexture.c @@ -306,20 +306,24 @@ static HRESULT WINAPI IDirect3DCubeTexture8Impl_GetCubeMapSurface(IDirect3DCubeT } static HRESULT WINAPI IDirect3DCubeTexture8Impl_LockRect(IDirect3DCubeTexture8 *iface, - D3DCUBEMAP_FACES FaceType, UINT Level, D3DLOCKED_RECT *pLockedRect, const RECT *pRect, - DWORD Flags) + D3DCUBEMAP_FACES face, UINT level, D3DLOCKED_RECT *locked_rect, const RECT *rect, + DWORD flags) { - IDirect3DCubeTexture8Impl *This = impl_from_IDirect3DCubeTexture8(iface); + IDirect3DCubeTexture8Impl *texture = impl_from_IDirect3DCubeTexture8(iface); + struct wined3d_resource *sub_resource; UINT sub_resource_idx; HRESULT hr; TRACE("iface %p, face %#x, level %u, locked_rect %p, rect %p, flags %#x.\n", - iface, FaceType, Level, pLockedRect, pRect, Flags); + iface, face, level, locked_rect, rect, flags); wined3d_mutex_lock(); - sub_resource_idx = IWineD3DCubeTexture_GetLevelCount(This->wineD3DCubeTexture) * FaceType + Level; - hr = IWineD3DCubeTexture_Map(This->wineD3DCubeTexture, sub_resource_idx, - (WINED3DLOCKED_RECT *)pLockedRect, pRect, Flags); + sub_resource_idx = IWineD3DCubeTexture_GetLevelCount(texture->wineD3DCubeTexture) * face + level; + if (!(sub_resource = IWineD3DCubeTexture_GetSubResource(texture->wineD3DCubeTexture, sub_resource_idx))) + hr = D3DERR_INVALIDCALL; + else + hr = IDirect3DSurface8_LockRect((IDirect3DSurface8 *)wined3d_resource_get_parent(sub_resource), + locked_rect, rect, flags); wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d9/cubetexture.c b/dlls/d3d9/cubetexture.c index f6cacd9..87d00c1 100644 --- a/dlls/d3d9/cubetexture.c +++ b/dlls/d3d9/cubetexture.c @@ -322,19 +322,23 @@ static HRESULT WINAPI IDirect3DCubeTexture9Impl_GetCubeMapSurface(IDirect3DCubeT } static HRESULT WINAPI IDirect3DCubeTexture9Impl_LockRect(IDirect3DCubeTexture9 *iface, - D3DCUBEMAP_FACES FaceType, UINT Level, D3DLOCKED_RECT *pLockedRect, const RECT *pRect, DWORD Flags) + D3DCUBEMAP_FACES face, UINT level, D3DLOCKED_RECT *locked_rect, const RECT *rect, DWORD flags) { - IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface; + IDirect3DCubeTexture9Impl *texture = (IDirect3DCubeTexture9Impl *)iface; + struct wined3d_resource *sub_resource; UINT sub_resource_idx; HRESULT hr; TRACE("iface %p, face %#x, level %u, locked_rect %p, rect %p, flags %#x.\n", - iface, FaceType, Level, pLockedRect, pRect, Flags); + iface, face, level, locked_rect, rect, flags); wined3d_mutex_lock(); - sub_resource_idx = IWineD3DCubeTexture_GetLevelCount(This->wineD3DCubeTexture) * FaceType + Level; - hr = IWineD3DCubeTexture_Map(This->wineD3DCubeTexture, sub_resource_idx, - (WINED3DLOCKED_RECT *)pLockedRect, pRect, Flags); + sub_resource_idx = IWineD3DCubeTexture_GetLevelCount(texture->wineD3DCubeTexture) * face + level; + if (!(sub_resource = IWineD3DCubeTexture_GetSubResource(texture->wineD3DCubeTexture, sub_resource_idx))) + hr = D3DERR_INVALIDCALL; + else + hr = IDirect3DSurface9_LockRect((IDirect3DSurface9 *)wined3d_resource_get_parent(sub_resource), + locked_rect, rect, flags); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index 4031162..b5294dd 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -336,25 +336,6 @@ static struct wined3d_resource * WINAPI IWineD3DCubeTextureImpl_GetSubResource(I return basetexture_get_sub_resource(texture, sub_resource_idx); } -static HRESULT WINAPI IWineD3DCubeTextureImpl_Map(IWineD3DCubeTexture *iface, - UINT sub_resource_idx, WINED3DLOCKED_RECT *locked_rect, const RECT *rect, DWORD flags) -{ - IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *)iface; - struct wined3d_resource *sub_resource; - - TRACE("iface %p, sub_resource_idx %u, locked_rect %p, rect %s, flags %#x.\n", - iface, sub_resource_idx, locked_rect, wine_dbgstr_rect(rect), flags); - - if (!(sub_resource = basetexture_get_sub_resource(texture, sub_resource_idx))) - { - WARN("Failed to get sub-resource.\n"); - return WINED3DERR_INVALIDCALL; - } - - return IWineD3DSurface_Map((IWineD3DSurface *)surface_from_resource(sub_resource), - locked_rect, rect, flags); -} - static HRESULT WINAPI IWineD3DCubeTextureImpl_Unmap(IWineD3DCubeTexture *iface, UINT sub_resource_idx) { @@ -420,7 +401,6 @@ static const IWineD3DCubeTextureVtbl IWineD3DCubeTexture_Vtbl = IWineD3DCubeTextureImpl_IsCondNP2, IWineD3DCubeTextureImpl_GetSubResource, /* IWineD3DCubeTexture */ - IWineD3DCubeTextureImpl_Map, IWineD3DCubeTextureImpl_Unmap, IWineD3DCubeTextureImpl_AddDirtyRect }; diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index a74b941..83e0479 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2382,12 +2382,6 @@ interface IWineD3DTexture : IWineD3DBaseTexture ] interface IWineD3DCubeTexture : IWineD3DBaseTexture { - HRESULT Map( - [in] UINT sub_resource_idx, - [out] WINED3DLOCKED_RECT *locked_rect, - [in] const RECT *rect, - [in] DWORD flags - ); HRESULT Unmap( [in] UINT sub_resource_idx );

1 0

Henri Verbeet : wined3d: Get rid of IWineD3DTexture::Unmap().
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 13b05b9dbecbb8bd73dc4aa8c0c4899a12901c25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13b05b9dbecbb8bd73dc4aa8c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 13 20:54:29 2011 +0100 wined3d: Get rid of IWineD3DTexture::Unmap(). --- dlls/d3d8/texture.c | 12 ++++++++---- dlls/d3d9/texture.c | 13 +++++++++---- dlls/wined3d/texture.c | 17 ----------------- include/wine/wined3d.idl | 3 --- 4 files changed, 17 insertions(+), 28 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index ebab8a0..d153b8f 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -321,15 +321,19 @@ static HRESULT WINAPI IDirect3DTexture8Impl_LockRect(IDirect3DTexture8 *iface, U return hr; } -static HRESULT WINAPI IDirect3DTexture8Impl_UnlockRect(IDirect3DTexture8 *iface, UINT Level) +static HRESULT WINAPI IDirect3DTexture8Impl_UnlockRect(IDirect3DTexture8 *iface, UINT level) { - IDirect3DTexture8Impl *This = impl_from_IDirect3DTexture8(iface); + IDirect3DTexture8Impl *texture = impl_from_IDirect3DTexture8(iface); + struct wined3d_resource *sub_resource; HRESULT hr; - TRACE("iface %p, level %u.\n", iface, Level); + TRACE("iface %p, level %u.\n", iface, level); wined3d_mutex_lock(); - hr = IWineD3DTexture_Unmap(This->wineD3DTexture, Level); + if (!(sub_resource = IWineD3DTexture_GetSubResource(texture->wineD3DTexture, level))) + hr = D3DERR_INVALIDCALL; + else + hr = IDirect3DSurface8_UnlockRect((IDirect3DSurface8 *)wined3d_resource_get_parent(sub_resource)); wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index fa84116..9816bfb 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -336,14 +336,19 @@ static HRESULT WINAPI IDirect3DTexture9Impl_LockRect(IDirect3DTexture9 *iface, return hr; } -static HRESULT WINAPI IDirect3DTexture9Impl_UnlockRect(LPDIRECT3DTEXTURE9 iface, UINT Level) { - IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; +static HRESULT WINAPI IDirect3DTexture9Impl_UnlockRect(IDirect3DTexture9 *iface, UINT level) +{ + IDirect3DTexture9Impl *texture = (IDirect3DTexture9Impl *)iface; + struct wined3d_resource *sub_resource; HRESULT hr; - TRACE("iface %p, level %u.\n", iface, Level); + TRACE("iface %p, level %u.\n", iface, level); wined3d_mutex_lock(); - hr = IWineD3DTexture_Unmap(This->wineD3DTexture, Level); + if (!(sub_resource = IWineD3DTexture_GetSubResource(texture->wineD3DTexture, level))) + hr = D3DERR_INVALIDCALL; + else + hr = IDirect3DSurface9_UnlockRect((IDirect3DSurface9 *)wined3d_resource_get_parent(sub_resource)); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 8fe4883..99446b6 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -361,22 +361,6 @@ static struct wined3d_resource * WINAPI IWineD3DTextureImpl_GetSubResource(IWine return basetexture_get_sub_resource(texture, sub_resource_idx); } -static HRESULT WINAPI IWineD3DTextureImpl_Unmap(IWineD3DTexture *iface, UINT sub_resource_idx) -{ - IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *)iface; - struct wined3d_resource *sub_resource; - - TRACE("iface %p, sub_resource_idx %u.\n", iface, sub_resource_idx); - - if (!(sub_resource = basetexture_get_sub_resource(texture, sub_resource_idx))) - { - WARN("Failed to get sub-resource.\n"); - return WINED3DERR_INVALIDCALL; - } - - return IWineD3DSurface_Unmap((IWineD3DSurface *)surface_from_resource(sub_resource)); -} - static HRESULT WINAPI IWineD3DTextureImpl_AddDirtyRect(IWineD3DTexture *iface, const RECT *dirty_rect) { IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *)iface; @@ -421,7 +405,6 @@ static const IWineD3DTextureVtbl IWineD3DTexture_Vtbl = IWineD3DTextureImpl_IsCondNP2, IWineD3DTextureImpl_GetSubResource, /* IWineD3DTexture */ - IWineD3DTextureImpl_Unmap, IWineD3DTextureImpl_AddDirtyRect }; diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index df4bba7..a74b941 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2370,9 +2370,6 @@ interface IWineD3DBaseTexture : IWineD3DResource ] interface IWineD3DTexture : IWineD3DBaseTexture { - HRESULT Unmap( - [in] UINT sub_resource_idx - ); HRESULT AddDirtyRect( [in] const RECT *dirty_rect );

1 0

Henri Verbeet : wined3d: Get rid of IWineD3DTexture::Map().
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: b77a661515c7cdb1bf7ae98f6b265ae643f22ffb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b77a661515c7cdb1bf7ae98f6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 13 20:54:28 2011 +0100 wined3d: Get rid of IWineD3DTexture::Map(). --- dlls/d3d8/texture.c | 15 ++++++++++----- dlls/d3d9/texture.c | 15 +++++++++++---- dlls/wined3d/texture.c | 19 ------------------- include/wine/wined3d.idl | 6 ------ 4 files changed, 21 insertions(+), 34 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index 31196ac..ebab8a0 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -300,17 +300,22 @@ static HRESULT WINAPI IDirect3DTexture8Impl_GetSurfaceLevel(IDirect3DTexture8 *i return D3D_OK; } -static HRESULT WINAPI IDirect3DTexture8Impl_LockRect(IDirect3DTexture8 *iface, UINT Level, - D3DLOCKED_RECT *pLockedRect, const RECT *pRect, DWORD Flags) +static HRESULT WINAPI IDirect3DTexture8Impl_LockRect(IDirect3DTexture8 *iface, UINT level, + D3DLOCKED_RECT *locked_rect, const RECT *rect, DWORD flags) { - IDirect3DTexture8Impl *This = impl_from_IDirect3DTexture8(iface); + IDirect3DTexture8Impl *texture = impl_from_IDirect3DTexture8(iface); + struct wined3d_resource *sub_resource; HRESULT hr; TRACE("iface %p, level %u, locked_rect %p, rect %p, flags %#x.\n", - iface, Level, pLockedRect, pRect, Flags); + iface, level, locked_rect, rect, flags); wined3d_mutex_lock(); - hr = IWineD3DTexture_Map(This->wineD3DTexture, Level, (WINED3DLOCKED_RECT *)pLockedRect, pRect, Flags); + if (!(sub_resource = IWineD3DTexture_GetSubResource(texture->wineD3DTexture, level))) + hr = D3DERR_INVALIDCALL; + else + hr = IDirect3DSurface8_LockRect((IDirect3DSurface8 *)wined3d_resource_get_parent(sub_resource), + locked_rect, rect, flags); wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 611ef67..fa84116 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -315,15 +315,22 @@ static HRESULT WINAPI IDirect3DTexture9Impl_GetSurfaceLevel(IDirect3DTexture9 *i return D3D_OK; } -static HRESULT WINAPI IDirect3DTexture9Impl_LockRect(LPDIRECT3DTEXTURE9 iface, UINT Level, D3DLOCKED_RECT* pLockedRect, CONST RECT* pRect, DWORD Flags) { - IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; +static HRESULT WINAPI IDirect3DTexture9Impl_LockRect(IDirect3DTexture9 *iface, + UINT level, D3DLOCKED_RECT *locked_rect, const RECT *rect, DWORD flags) +{ + IDirect3DTexture9Impl *texture = (IDirect3DTexture9Impl *)iface; + struct wined3d_resource *sub_resource; HRESULT hr; TRACE("iface %p, level %u, locked_rect %p, rect %p, flags %#x.\n", - iface, Level, pLockedRect, pRect, Flags); + iface, level, locked_rect, rect, flags); wined3d_mutex_lock(); - hr = IWineD3DTexture_Map(This->wineD3DTexture, Level, (WINED3DLOCKED_RECT *)pLockedRect, pRect, Flags); + if (!(sub_resource = IWineD3DTexture_GetSubResource(texture->wineD3DTexture, level))) + hr = D3DERR_INVALIDCALL; + else + hr = IDirect3DSurface9_LockRect((IDirect3DSurface9 *)wined3d_resource_get_parent(sub_resource), + locked_rect, rect, flags); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 752ea8f..8fe4883 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -361,24 +361,6 @@ static struct wined3d_resource * WINAPI IWineD3DTextureImpl_GetSubResource(IWine return basetexture_get_sub_resource(texture, sub_resource_idx); } -static HRESULT WINAPI IWineD3DTextureImpl_Map(IWineD3DTexture *iface, - UINT sub_resource_idx, WINED3DLOCKED_RECT *locked_rect, const RECT *rect, DWORD flags) -{ - IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *)iface; - struct wined3d_resource *sub_resource; - - TRACE("iface %p, sub_resource_idx %u, locked_rect %p, rect %s, flags %#x.\n", - iface, sub_resource_idx, locked_rect, wine_dbgstr_rect(rect), flags); - - if (!(sub_resource = basetexture_get_sub_resource(texture, sub_resource_idx))) - { - WARN("Failed to get sub-resource.\n"); - return WINED3DERR_INVALIDCALL; - } - - return IWineD3DSurface_Map((IWineD3DSurface *)surface_from_resource(sub_resource), locked_rect, rect, flags); -} - static HRESULT WINAPI IWineD3DTextureImpl_Unmap(IWineD3DTexture *iface, UINT sub_resource_idx) { IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *)iface; @@ -439,7 +421,6 @@ static const IWineD3DTextureVtbl IWineD3DTexture_Vtbl = IWineD3DTextureImpl_IsCondNP2, IWineD3DTextureImpl_GetSubResource, /* IWineD3DTexture */ - IWineD3DTextureImpl_Map, IWineD3DTextureImpl_Unmap, IWineD3DTextureImpl_AddDirtyRect }; diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 21f7039..df4bba7 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2370,12 +2370,6 @@ interface IWineD3DBaseTexture : IWineD3DResource ] interface IWineD3DTexture : IWineD3DBaseTexture { - HRESULT Map( - [in] UINT sub_resource_idx, - [out] WINED3DLOCKED_RECT *locked_rect, - [in] const RECT *rect, - [in] DWORD flags - ); HRESULT Unmap( [in] UINT sub_resource_idx );

1 0

Nikolay Sivov : msxml3: Downgrade FIXME to TRACE for unsupported interfaces .
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 9176c9e886f1f28163e433495f61b61a4a74a9ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=9176c9e886f1f28163e433495… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 13 16:40:26 2011 +0300 msxml3: Downgrade FIXME to TRACE for unsupported interfaces. --- dlls/msxml3/attribute.c | 2 +- dlls/msxml3/cdata.c | 2 +- dlls/msxml3/comment.c | 2 +- dlls/msxml3/docfrag.c | 2 +- dlls/msxml3/doctype.c | 2 +- dlls/msxml3/domdoc.c | 7 +------ dlls/msxml3/domimpl.c | 2 +- dlls/msxml3/element.c | 2 +- dlls/msxml3/entityref.c | 2 +- dlls/msxml3/nodelist.c | 2 +- dlls/msxml3/nodemap.c | 2 +- dlls/msxml3/pi.c | 2 +- dlls/msxml3/selection.c | 2 +- dlls/msxml3/text.c | 2 +- 14 files changed, 14 insertions(+), 19 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index f61428a..603477c 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -76,7 +76,7 @@ static HRESULT WINAPI domattr_QueryInterface( } else { - FIXME("Unsupported interface %s\n", debugstr_guid(riid)); + TRACE("Unsupported interface %s\n", debugstr_guid(riid)); *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index e9de472..2622e1b 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -76,7 +76,7 @@ static HRESULT WINAPI domcdata_QueryInterface( } else { - FIXME("Unsupported interface %s\n", debugstr_guid(riid)); + TRACE("Unsupported interface %s\n", debugstr_guid(riid)); *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index a75d178..cb5cada 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -76,7 +76,7 @@ static HRESULT WINAPI domcomment_QueryInterface( } else { - FIXME("Unsupported interface %s\n", debugstr_guid(riid)); + TRACE("Unsupported interface %s\n", debugstr_guid(riid)); *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index bc2b77f..0342bae 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -75,7 +75,7 @@ static HRESULT WINAPI domfrag_QueryInterface( } else { - FIXME("Unsupported interface %s\n", debugstr_guid(riid)); + TRACE("Unsupported interface %s\n", debugstr_guid(riid)); *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/doctype.c b/dlls/msxml3/doctype.c index 6c757b3..6a1952f 100644 --- a/dlls/msxml3/doctype.c +++ b/dlls/msxml3/doctype.c @@ -77,7 +77,7 @@ static HRESULT WINAPI domdoctype_QueryInterface( } else { - FIXME("interface %s not implemented\n", debugstr_guid(riid)); + TRACE("interface %s not implemented\n", debugstr_guid(riid)); *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 1277ce1..7d1b352 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -916,14 +916,9 @@ static HRESULT WINAPI domdoc_QueryInterface( IXMLDOMDocument3 *iface, REFIID rii { *ppvObject = &This->lpVtblConnectionPointContainer; } - else if(IsEqualGUID(&IID_IRunnableObject, riid)) - { - TRACE("IID_IRunnableObject not supported returning NULL\n"); - return E_NOINTERFACE; - } else { - FIXME("interface %s not implemented\n", debugstr_guid(riid)); + TRACE("interface %s not implemented\n", debugstr_guid(riid)); return E_NOINTERFACE; } diff --git a/dlls/msxml3/domimpl.c b/dlls/msxml3/domimpl.c index 9743cc6..2ecf073 100644 --- a/dlls/msxml3/domimpl.c +++ b/dlls/msxml3/domimpl.c @@ -69,7 +69,7 @@ static HRESULT WINAPI dimimpl_QueryInterface( } else { - FIXME("Unsupported interface %s\n", debugstr_guid(riid)); + TRACE("Unsupported interface %s\n", debugstr_guid(riid)); *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 55f463a..18a2577 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -85,7 +85,7 @@ static HRESULT WINAPI domelem_QueryInterface( } else { - FIXME("interface %s not implemented\n", debugstr_guid(riid)); + TRACE("interface %s not implemented\n", debugstr_guid(riid)); *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index 7ce85ed..b317606 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -75,7 +75,7 @@ static HRESULT WINAPI entityref_QueryInterface( } else { - FIXME("Unsupported interface %s\n", debugstr_guid(riid)); + TRACE("Unsupported interface %s\n", debugstr_guid(riid)); *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/nodelist.c b/dlls/msxml3/nodelist.c index 67bcd2a..6a25463 100644 --- a/dlls/msxml3/nodelist.c +++ b/dlls/msxml3/nodelist.c @@ -79,7 +79,7 @@ static HRESULT WINAPI xmlnodelist_QueryInterface( } else { - FIXME("interface %s not implemented\n", debugstr_guid(riid)); + TRACE("interface %s not implemented\n", debugstr_guid(riid)); *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c index a504934..1970840 100644 --- a/dlls/msxml3/nodemap.c +++ b/dlls/msxml3/nodemap.c @@ -82,7 +82,7 @@ static HRESULT WINAPI xmlnodemap_QueryInterface( } else { - FIXME("interface %s not implemented\n", debugstr_guid(riid)); + TRACE("interface %s not implemented\n", debugstr_guid(riid)); *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 1766781..89b2b5a 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -75,7 +75,7 @@ static HRESULT WINAPI dom_pi_QueryInterface( } else { - FIXME("Unsupported interface %s\n", debugstr_guid(riid)); + TRACE("Unsupported interface %s\n", debugstr_guid(riid)); *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/selection.c b/dlls/msxml3/selection.c index 97165fa..abd9347 100644 --- a/dlls/msxml3/selection.c +++ b/dlls/msxml3/selection.c @@ -97,7 +97,7 @@ static HRESULT WINAPI domselection_QueryInterface( } else { - FIXME("interface %s not implemented\n", debugstr_guid(riid)); + TRACE("interface %s not implemented\n", debugstr_guid(riid)); *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index 3e3d3b2..0f40cf5 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -77,7 +77,7 @@ static HRESULT WINAPI domtext_QueryInterface( } else { - FIXME("Unsupported interface %s\n", debugstr_guid(riid)); + TRACE("Unsupported interface %s\n", debugstr_guid(riid)); *ppvObject = NULL; return E_NOINTERFACE; }

1 0

Nikolay Sivov : msxml3: Silence compile time warnings for dynamically loaded libxslt.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 49d69e440fcaa8715a2ef56cd480de2e610c8215 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49d69e440fcaa8715a2ef56cd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 13 14:10:24 2011 +0300 msxml3: Silence compile time warnings for dynamically loaded libxslt. --- dlls/msxml3/main.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 741858b..6cbdd99 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -193,7 +193,9 @@ static void init_libxslt(void) if (!libxslt_handle) return; -#define LOAD_FUNCPTR(f, needed) if ((p##f = wine_dlsym(libxslt_handle, #f, NULL, 0)) == NULL && needed) { WARN("Can't find symbol %s\n", #f); goto sym_not_found; } +#define LOAD_FUNCPTR(f, needed) \ + if ((p##f = wine_dlsym(libxslt_handle, #f, NULL, 0)) == NULL) \ + if (needed) { WARN("Can't find symbol %s\n", #f); goto sym_not_found; } LOAD_FUNCPTR(xsltInit, 0); LOAD_FUNCPTR(xsltApplyStylesheet, 1); LOAD_FUNCPTR(xsltCleanupGlobals, 1);

1 0

Nikolay Sivov : msxml3: Protect SAX character callback from null node.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 610725289b18f07c3ec62438773ff52a01426565 URL: http://source.winehq.org/git/wine.git/?a=commit;h=610725289b18f07c3ec624387… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 13 13:46:45 2011 +0300 msxml3: Protect SAX character callback from null node. --- dlls/msxml3/domdoc.c | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 81ffb49..1277ce1 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -421,19 +421,22 @@ static inline BOOL strn_isspace(xmlChar const* str, int len) static void sax_characters(void *ctx, const xmlChar *ch, int len) { - xmlParserCtxtPtr pctx; - domdoc const* This; + xmlParserCtxtPtr ctxt; + const domdoc *This; - pctx = (xmlParserCtxtPtr) ctx; - This = (domdoc const*) pctx->_private; + ctxt = (xmlParserCtxtPtr) ctx; + This = (const domdoc*) ctxt->_private; - /* during domdoc_loadXML() the xmlDocPtr->_private data is not available */ - if (!This->properties->preserving && - !is_preserving_whitespace(pctx->node) && - strn_isspace(ch, len)) - return; + if (ctxt->node) + { + /* during domdoc_loadXML() the xmlDocPtr->_private data is not available */ + if (!This->properties->preserving && + !is_preserving_whitespace(ctxt->node) && + strn_isspace(ch, len)) + return; + } - xmlSAX2Characters(ctx, ch, len); + xmlSAX2Characters(ctxt, ch, len); } static void LIBXML2_LOG_CALLBACK sax_error(void* ctx, char const* msg, ...)

1 0

Nikolay Sivov : msxml3: No need to zero memory on allocation.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 072b2db2afa2b5c87bac496d325072c6a5c68cab URL: http://source.winehq.org/git/wine.git/?a=commit;h=072b2db2afa2b5c87bac496d3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 13 03:00:54 2011 +0300 msxml3: No need to zero memory on allocation. --- dlls/msxml3/selection.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/selection.c b/dlls/msxml3/selection.c index 2a46e1d..97165fa 100644 --- a/dlls/msxml3/selection.c +++ b/dlls/msxml3/selection.c @@ -605,7 +605,7 @@ static void query_serror(void* ctx, xmlErrorPtr err) HRESULT create_selection(xmlNodePtr node, xmlChar* query, IXMLDOMNodeList **out) { - domselection *This = heap_alloc_zero(sizeof(domselection)); + domselection *This = heap_alloc(sizeof(domselection)); xmlXPathContextPtr ctxt = xmlXPathNewContext(node->doc); HRESULT hr;

1 0

Nikolay Sivov : msxml3: Add IXMLDOMSelection stub.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: c26c55995a2446601fee56931cc831e38205a78c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c26c55995a2446601fee56931… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 13 02:54:47 2011 +0300 msxml3: Add IXMLDOMSelection stub. --- dlls/msxml3/Makefile.in | 2 +- dlls/msxml3/domdoc.c | 2 +- dlls/msxml3/element.c | 2 +- dlls/msxml3/msxml_private.h | 25 +-- dlls/msxml3/node.c | 2 +- dlls/msxml3/{queryresult.c => selection.c} | 300 +++++++++++++++++++--------- dlls/msxml3/tests/domdoc.c | 36 ++++ 7 files changed, 258 insertions(+), 111 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c26c55995a2446601fee5…

1 0

Nikolay Sivov : msxml3: Unlink node first before adding it as a child.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: c48b7566bd1296dba3b17e1d30c5e8b29275cd86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c48b7566bd1296dba3b17e1d3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 13 01:57:36 2011 +0300 msxml3: Unlink node first before adding it as a child. --- dlls/msxml3/node.c | 2 + dlls/msxml3/tests/domdoc.c | 156 ++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 146 insertions(+), 12 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index a492759..db3153d 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -354,6 +354,8 @@ HRESULT node_insert_before(xmlnode *This, IXMLDOMNode *new_child, const VARIANT } doc = node_obj->node->doc; xmldoc_add_ref(This->node->doc); + /* xmlAddChild doesn't unlink node from previous parent */ + xmlUnlinkNode(node_obj->node); xmlAddChild(This->node, node_obj->node); xmldoc_release(doc); node_obj->parent = This->iface; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 370c56e..f49b5c9 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -4,6 +4,7 @@ * Copyright 2005 Mike McCormack for CodeWeavers * Copyright 2007-2008 Alistair Leslie-Hughes * Copyright 2010 Adam Martinson for CodeWeavers + * Copyright 2010-2011 Nikolay Sivov for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -180,6 +181,21 @@ static void _expect_ref(IUnknown* obj, ULONG ref, int line) ok_(__FILE__,line)(rc-1 == ref, "expected refcount %d, got %d\n", ref, rc-1); } +#define EXPECT_LIST_LEN(list,len) _expect_list_len(list, len, __LINE__) +static void _expect_list_len(IXMLDOMNodeList *list, LONG len, int line) +{ + LONG length; + HRESULT hr; + + length = 0; + hr = IXMLDOMNodeList_get_length(list, &length); + ok_(__FILE__,line)(hr == S_OK, "got 0x%08x\n", hr); + ok_(__FILE__,line)(length == len, "got %d, expected %d\n", length, len); +} + +#define EXPECT_HR(hr,hr_exp) \ + ok(hr == hr_exp, "got 0x%08x, expected 0x%08x\n", hr, hr_exp) + static const WCHAR szEmpty[] = { 0 }; static const WCHAR szIncomplete[] = { '<','?','x','m','l',' ', @@ -3985,32 +4001,46 @@ static void test_XPath(void) VARIANT var; VARIANT_BOOL b; IXMLDOMDocument2 *doc; + IXMLDOMDocument *doc2; IXMLDOMNode *rootNode; IXMLDOMNode *elem1Node; IXMLDOMNode *node; IXMLDOMNodeList *list; + IXMLDOMElement *elem; + IXMLDOMAttribute *attr; + HRESULT hr; + BSTR str; doc = create_document(&IID_IXMLDOMDocument2); if (!doc) return; - ole_check(IXMLDOMDocument_loadXML(doc, _bstr_(szExampleXML), &b)); + ole_check(IXMLDOMDocument2_loadXML(doc, _bstr_(szExampleXML), &b)); ok(b == VARIANT_TRUE, "failed to load XML string\n"); /* switch to XPath */ ole_check(IXMLDOMDocument2_setProperty(doc, _bstr_("SelectionLanguage"), _variantbstr_("XPath"))); /* some simple queries*/ - ole_check(IXMLDOMDocument_selectNodes(doc, _bstr_("root"), &list)); - ole_check(IXMLDOMNodeList_get_item(list, 0, &rootNode)); - ole_check(IXMLDOMNodeList_reset(list)); + EXPECT_REF(doc, 1); + hr = IXMLDOMDocument2_selectNodes(doc, _bstr_("root"), &list); + EXPECT_HR(hr, S_OK); + EXPECT_REF(doc, 1); + EXPECT_LIST_LEN(list, 1); + + EXPECT_REF(list, 1); + hr = IXMLDOMNodeList_get_item(list, 0, &rootNode); + EXPECT_HR(hr, S_OK); + EXPECT_REF(list, 1); + EXPECT_REF(rootNode, 1); + + hr = IXMLDOMNodeList_reset(list); + EXPECT_HR(hr, S_OK); expect_list_and_release(list, "E2.D1"); - if (rootNode == NULL) - return; - ole_check(IXMLDOMDocument_selectNodes(doc, _bstr_("root//c"), &list)); + ole_check(IXMLDOMDocument2_selectNodes(doc, _bstr_("root//c"), &list)); expect_list_and_release(list, "E3.E1.E2.D1 E3.E2.E2.D1"); - ole_check(IXMLDOMDocument_selectNodes(doc, _bstr_("//c[@type]"), &list)); + ole_check(IXMLDOMDocument2_selectNodes(doc, _bstr_("//c[@type]"), &list)); expect_list_and_release(list, "E3.E2.E2.D1"); ole_check(IXMLDOMNode_selectNodes(rootNode, _bstr_("elem"), &list)); @@ -4054,7 +4084,7 @@ static void test_XPath(void) expect_list_and_release(list, ""); /* foo undeclared in document node */ - ole_expect(IXMLDOMDocument_selectNodes(doc, _bstr_("root//foo:c"), &list), E_FAIL); + ole_expect(IXMLDOMDocument2_selectNodes(doc, _bstr_("root//foo:c"), &list), E_FAIL); /* undeclared in <root> node */ ole_expect(IXMLDOMNode_selectNodes(rootNode, _bstr_(".//foo:c"), &list), E_FAIL); /* undeclared in <elem> node */ @@ -4068,7 +4098,7 @@ static void test_XPath(void) _variantbstr_("xmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'"))); /* now the namespace can be used */ - ole_check(IXMLDOMDocument_selectNodes(doc, _bstr_("root//test:c"), &list)); + ole_check(IXMLDOMDocument2_selectNodes(doc, _bstr_("root//test:c"), &list)); expect_list_and_release(list, "E3.E3.E2.D1 E3.E4.E2.D1"); ole_check(IXMLDOMNode_selectNodes(rootNode, _bstr_(".//test:c"), &list)); expect_list_and_release(list, "E3.E3.E2.D1 E3.E4.E2.D1"); @@ -4081,7 +4111,7 @@ static void test_XPath(void) ole_expect(IXMLDOMDocument2_setProperty(doc, _bstr_("SelectionNamespaces"), _variantbstr_("xmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29' xmlns:foo=###")), E_FAIL); - ole_expect(IXMLDOMDocument_selectNodes(doc, _bstr_("root//foo:c"), &list), E_FAIL); + ole_expect(IXMLDOMDocument2_selectNodes(doc, _bstr_("root//foo:c"), &list), E_FAIL); VariantInit(&var); ole_check(IXMLDOMDocument2_getProperty(doc, _bstr_("SelectionNamespaces"), &var)); @@ -4096,7 +4126,109 @@ static void test_XPath(void) IXMLDOMNode_Release(rootNode); IXMLDOMNode_Release(elem1Node); - IXMLDOMDocument_Release(doc); + + /* alter document with already built list */ + hr = IXMLDOMDocument2_selectNodes(doc, _bstr_("root"), &list); + EXPECT_HR(hr, S_OK); + EXPECT_LIST_LEN(list, 1); + + hr = IXMLDOMDocument2_get_lastChild(doc, &rootNode); + EXPECT_HR(hr, S_OK); + EXPECT_REF(rootNode, 1); + EXPECT_REF(doc, 1); + + hr = IXMLDOMDocument2_removeChild(doc, rootNode, NULL); + EXPECT_HR(hr, S_OK); + IXMLDOMNode_Release(rootNode); + + EXPECT_LIST_LEN(list, 1); + + hr = IXMLDOMNodeList_get_item(list, 0, &rootNode); + EXPECT_HR(hr, S_OK); + EXPECT_REF(rootNode, 1); + + IXMLDOMNodeList_Release(list); + + hr = IXMLDOMNode_get_nodeName(rootNode, &str); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(str, _bstr_("root")), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + IXMLDOMNode_Release(rootNode); + + /* alter node from list and get it another time */ + hr = IXMLDOMDocument2_loadXML(doc, _bstr_(szExampleXML), &b); + EXPECT_HR(hr, S_OK); + ok(b == VARIANT_TRUE, "failed to load XML string\n"); + + hr = IXMLDOMDocument2_selectNodes(doc, _bstr_("root"), &list); + EXPECT_HR(hr, S_OK); + EXPECT_LIST_LEN(list, 1); + + hr = IXMLDOMNodeList_get_item(list, 0, &rootNode); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMNode_QueryInterface(rootNode, &IID_IXMLDOMElement, (void**)&elem); + EXPECT_HR(hr, S_OK); + + V_VT(&var) = VT_I2; + V_I2(&var) = 1; + hr = IXMLDOMElement_setAttribute(elem, _bstr_("attrtest"), var); + EXPECT_HR(hr, S_OK); + IXMLDOMElement_Release(elem); + IXMLDOMNode_Release(rootNode); + + /* now check attribute to be present */ + hr = IXMLDOMNodeList_get_item(list, 0, &rootNode); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMNode_QueryInterface(rootNode, &IID_IXMLDOMElement, (void**)&elem); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMElement_getAttributeNode(elem, _bstr_("attrtest"), &attr); + EXPECT_HR(hr, S_OK); + IXMLDOMAttribute_Release(attr); + + IXMLDOMElement_Release(elem); + IXMLDOMNode_Release(rootNode); + + /* and now check for attribute in original document */ + hr = IXMLDOMDocument_get_documentElement(doc, &elem); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMElement_getAttributeNode(elem, _bstr_("attrtest"), &attr); + EXPECT_HR(hr, S_OK); + IXMLDOMAttribute_Release(attr); + + IXMLDOMElement_Release(elem); + + /* attach node from list to another document */ + doc2 = create_document(&IID_IXMLDOMDocument); + + hr = IXMLDOMDocument2_loadXML(doc, _bstr_(szExampleXML), &b); + EXPECT_HR(hr, S_OK); + ok(b == VARIANT_TRUE, "failed to load XML string\n"); + + hr = IXMLDOMDocument2_selectNodes(doc, _bstr_("root"), &list); + EXPECT_HR(hr, S_OK); + EXPECT_LIST_LEN(list, 1); + + hr = IXMLDOMNodeList_get_item(list, 0, &rootNode); + EXPECT_HR(hr, S_OK); + EXPECT_REF(rootNode, 1); + + hr = IXMLDOMDocument_appendChild(doc2, rootNode, NULL); + EXPECT_HR(hr, S_OK); + EXPECT_REF(rootNode, 1); + EXPECT_REF(doc2, 1); + EXPECT_REF(list, 1); + + EXPECT_LIST_LEN(list, 1); + + IXMLDOMNode_Release(rootNode); + IXMLDOMNodeList_Release(list); + IXMLDOMDocument_Release(doc2); + + IXMLDOMDocument2_Release(doc); free_bstrs(); }

1 0

← Newer
1
...
47
48
49
50
51
52
53
...
85
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2011