wine-commits March 2011

wine-commits@winehq.org

2 participants
849 discussions

Łukasz Wojniłowicz : inetcpl.cpl: Update Polish translation.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: 1d9354f6673c7222a0bfcc0cc2f70489a0cf62c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d9354f6673c7222a0bfcc0cc… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Mon Mar 14 19:25:05 2011 +0100 inetcpl.cpl: Update Polish translation. --- dlls/inetcpl.cpl/cpl_Pl.rc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/inetcpl.cpl/cpl_Pl.rc b/dlls/inetcpl.cpl/cpl_Pl.rc index cf33137..78fd221 100644 --- a/dlls/inetcpl.cpl/cpl_Pl.rc +++ b/dlls/inetcpl.cpl/cpl_Pl.rc @@ -37,11 +37,11 @@ BEGIN PUSHBUTTON "U�yj &bie��cej", IDC_HOME_CURRENT, 58, 36, 80, 14 PUSHBUTTON "U�yj d&omy�lnej", IDC_HOME_DEFAULT, 144, 36, 80, 14 PUSHBUTTON "U�yj pu&stej", IDC_HOME_BLANK, 230, 36, 80, 14 - GROUPBOX " Browsing history ", IDC_STATIC, 4, 60, 312, 46 - LTEXT "You can delete cached pages, cookies and other data.", + GROUPBOX " Historia przegl�dania ", IDC_STATIC, 4, 60, 312, 46 + LTEXT "Mo�esz usun�� przechowywane strony, ciasteczka i inne dane.", IDC_STATIC, 58, 72, 252, 10 - PUSHBUTTON "Delete &files...", IDC_HISTORY_DELETE, 144, 86, 80, 14 - PUSHBUTTON "&Settings...", IDC_HISTORY_SETTINGS, 230, 86, 80, 14 + PUSHBUTTON "&Usu� pliki...", IDC_HISTORY_DELETE, 144, 86, 80, 14 + PUSHBUTTON "Usta&wienia...", IDC_HISTORY_SETTINGS, 230, 86, 80, 14 END

1 0

Henri Verbeet : d3d9: Use IDirect3DVolume9_AddRef to increment the volume' s refcount.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: e51f6b644d9d6ba9424d4b3e99e62aa582508226 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e51f6b644d9d6ba9424d4b3e9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 14 21:03:00 2011 +0100 d3d9: Use IDirect3DVolume9_AddRef to increment the volume's refcount. --- dlls/d3d9/volumetexture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/volumetexture.c b/dlls/d3d9/volumetexture.c index a423ff3..313e5cd 100644 --- a/dlls/d3d9/volumetexture.c +++ b/dlls/d3d9/volumetexture.c @@ -333,7 +333,7 @@ static HRESULT WINAPI IDirect3DVolumeTexture9Impl_GetVolumeLevel(IDirect3DVolume } *volume = wined3d_resource_get_parent(sub_resource); - IDirect3DVolumeTexture9_AddRef(*volume); + IDirect3DVolume9_AddRef(*volume); wined3d_mutex_unlock(); return D3D_OK;

1 0

Henri Verbeet : wined3d: Generalize AddDirtyRect() / AddDirtyBox() to AddDirtyRegion().
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: 4a10bbc76d5e6b6654717d590dde7354eff5d396 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a10bbc76d5e6b6654717d590… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 14 21:02:59 2011 +0100 wined3d: Generalize AddDirtyRect() / AddDirtyBox() to AddDirtyRegion(). --- dlls/d3d8/cubetexture.c | 22 ++++++++++++++++++---- dlls/d3d8/texture.c | 23 ++++++++++++++++++----- dlls/d3d8/volumetexture.c | 10 ++++++---- dlls/d3d9/cubetexture.c | 25 ++++++++++++++++++++----- dlls/d3d9/texture.c | 23 +++++++++++++++++++---- dlls/d3d9/volumetexture.c | 12 ++++++------ dlls/wined3d/cubetexture.c | 15 ++++++--------- dlls/wined3d/surface.c | 29 ++++++++++++++++++++++------- dlls/wined3d/texture.c | 12 ++++++------ dlls/wined3d/volumetexture.c | 12 ++++++------ dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.idl | 14 ++++---------- 12 files changed, 132 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4a10bbc76d5e6b6654717…

1 0

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

15 Mar '11

Module: wine Branch: master Commit: e409b83bcbad1c44ac20e0b9c585f9b0fae48f24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e409b83bcbad1c44ac20e0b9c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 14 21:02:58 2011 +0100 wined3d: Get rid of IWineD3DVolumeTexture::Unmap(). --- dlls/d3d10core/texture.c | 12 +++++++++--- dlls/d3d8/volumetexture.c | 13 +++++++++---- dlls/d3d9/volumetexture.c | 15 +++++++++------ dlls/wined3d/volumetexture.c | 17 ----------------- include/wine/wined3d.idl | 3 --- 5 files changed, 27 insertions(+), 33 deletions(-) diff --git a/dlls/d3d10core/texture.c b/dlls/d3d10core/texture.c index 8379605..2f73a75 100644 --- a/dlls/d3d10core/texture.c +++ b/dlls/d3d10core/texture.c @@ -375,11 +375,17 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture3d_Map(ID3D10Texture3D *iface, UIN return hr; } -static void STDMETHODCALLTYPE d3d10_texture3d_Unmap(ID3D10Texture3D *iface, UINT sub_resource) +static void STDMETHODCALLTYPE d3d10_texture3d_Unmap(ID3D10Texture3D *iface, UINT sub_resource_idx) { - TRACE("iface %p, sub_resource %u.\n", iface, sub_resource); + struct d3d10_texture3d *texture = (struct d3d10_texture3d *)iface; + struct wined3d_resource *sub_resource; + + TRACE("iface %p, sub_resource_idx %u.\n", iface, sub_resource_idx); + + if (!(sub_resource = IWineD3DVolumeTexture_GetSubResource(texture->wined3d_texture, sub_resource_idx))) + return; - IWineD3DVolumeTexture_Unmap(((struct d3d10_texture3d *)iface)->wined3d_texture, sub_resource); + IWineD3DVolume_Unmap(wined3d_volume_from_resource(sub_resource)); } static void STDMETHODCALLTYPE d3d10_texture3d_GetDesc(ID3D10Texture3D *iface, D3D10_TEXTURE3D_DESC *desc) diff --git a/dlls/d3d8/volumetexture.c b/dlls/d3d8/volumetexture.c index 873822b..8c693f0 100644 --- a/dlls/d3d8/volumetexture.c +++ b/dlls/d3d8/volumetexture.c @@ -298,14 +298,19 @@ static HRESULT WINAPI IDirect3DVolumeTexture8Impl_LockBox(IDirect3DVolumeTexture return hr; } -static HRESULT WINAPI IDirect3DVolumeTexture8Impl_UnlockBox(LPDIRECT3DVOLUMETEXTURE8 iface, UINT Level) { - IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; +static HRESULT WINAPI IDirect3DVolumeTexture8Impl_UnlockBox(IDirect3DVolumeTexture8 *iface, UINT level) +{ + IDirect3DVolumeTexture8Impl *texture = (IDirect3DVolumeTexture8Impl *)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 = IWineD3DVolumeTexture_Unmap(This->wineD3DVolumeTexture, Level); + if (!(sub_resource = IWineD3DVolumeTexture_GetSubResource(texture->wineD3DVolumeTexture, level))) + hr = D3DERR_INVALIDCALL; + else + hr = IDirect3DVolume8_UnlockBox((IDirect3DVolume8 *)wined3d_resource_get_parent(sub_resource)); wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d9/volumetexture.c b/dlls/d3d9/volumetexture.c index b4b5503..0a8932c 100644 --- a/dlls/d3d9/volumetexture.c +++ b/dlls/d3d9/volumetexture.c @@ -360,16 +360,19 @@ static HRESULT WINAPI IDirect3DVolumeTexture9Impl_LockBox(IDirect3DVolumeTexture return hr; } -static HRESULT WINAPI IDirect3DVolumeTexture9Impl_UnlockBox(LPDIRECT3DVOLUMETEXTURE9 iface, UINT Level) { - IDirect3DVolumeTexture9Impl *This = (IDirect3DVolumeTexture9Impl *)iface; +static HRESULT WINAPI IDirect3DVolumeTexture9Impl_UnlockBox(IDirect3DVolumeTexture9 *iface, UINT level) +{ + IDirect3DVolumeTexture9Impl *texture = (IDirect3DVolumeTexture9Impl *)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 = IWineD3DVolumeTexture_Unmap(This->wineD3DVolumeTexture, Level); - + if (!(sub_resource = IWineD3DVolumeTexture_GetSubResource(texture->wineD3DVolumeTexture, level))) + hr = D3DERR_INVALIDCALL; + else + hr = IDirect3DVolume9_UnlockBox((IDirect3DVolume9 *)wined3d_resource_get_parent(sub_resource)); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index 643141f..9d942d7 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -273,22 +273,6 @@ static struct wined3d_resource * WINAPI IWineD3DVolumeTextureImpl_GetSubResource return basetexture_get_sub_resource(texture, sub_resource_idx); } -static HRESULT WINAPI IWineD3DVolumeTextureImpl_Unmap(IWineD3DVolumeTexture *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 IWineD3DVolume_Unmap((IWineD3DVolume *)volume_from_resource(sub_resource)); -} - static HRESULT WINAPI IWineD3DVolumeTextureImpl_AddDirtyBox(IWineD3DVolumeTexture *iface, const WINED3DBOX *dirty_box) { IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *)iface; @@ -333,7 +317,6 @@ static const IWineD3DVolumeTextureVtbl IWineD3DVolumeTexture_Vtbl = IWineD3DVolumeTextureImpl_IsCondNP2, IWineD3DVolumeTextureImpl_GetSubResource, /* volume texture */ - IWineD3DVolumeTextureImpl_Unmap, IWineD3DVolumeTextureImpl_AddDirtyBox }; diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index d7c8b97..34449d0 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2395,9 +2395,6 @@ interface IWineD3DCubeTexture : IWineD3DBaseTexture ] interface IWineD3DVolumeTexture : IWineD3DBaseTexture { - HRESULT Unmap( - [in] UINT sub_resource_idx - ); HRESULT AddDirtyBox( [in] const WINED3DBOX *dirty_box );

1 0

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

15 Mar '11

Module: wine Branch: master Commit: 4c3d55f10ea94b7911f58b1a9199938035021f04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c3d55f10ea94b7911f58b1a9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 14 21:02:57 2011 +0100 wined3d: Get rid of IWineD3DVolumeTexture::Map(). --- dlls/d3d10core/texture.c | 22 +++++++++++----------- dlls/d3d8/volumetexture.c | 16 +++++++++++----- dlls/d3d9/volumetexture.c | 18 +++++++++++------- dlls/wined3d/volume.c | 5 +++++ dlls/wined3d/volumetexture.c | 20 -------------------- dlls/wined3d/wined3d.spec | 2 ++ include/wine/wined3d.idl | 8 ++------ 7 files changed, 42 insertions(+), 49 deletions(-) diff --git a/dlls/d3d10core/texture.c b/dlls/d3d10core/texture.c index 920b64f..8379605 100644 --- a/dlls/d3d10core/texture.c +++ b/dlls/d3d10core/texture.c @@ -346,32 +346,32 @@ static UINT STDMETHODCALLTYPE d3d10_texture3d_GetEvictionPriority(ID3D10Texture3 return 0; } -static HRESULT STDMETHODCALLTYPE d3d10_texture3d_Map(ID3D10Texture3D *iface, UINT sub_resource, +static HRESULT STDMETHODCALLTYPE d3d10_texture3d_Map(ID3D10Texture3D *iface, UINT sub_resource_idx, D3D10_MAP map_type, UINT map_flags, D3D10_MAPPED_TEXTURE3D *mapped_texture) { struct d3d10_texture3d *texture = (struct d3d10_texture3d *)iface; + struct wined3d_resource *sub_resource; WINED3DLOCKED_BOX wined3d_map_desc; HRESULT hr; - TRACE("iface %p, sub_resource %u, map_type %u, map_flags %#x, mapped_texture %p.\n", - iface, sub_resource, map_type, map_flags, mapped_texture); + TRACE("iface %p, sub_resource_idx %u, map_type %u, map_flags %#x, mapped_texture %p.\n", + iface, sub_resource_idx, map_type, map_flags, mapped_texture); if (map_type != D3D10_MAP_READ_WRITE) FIXME("Ignoring map_type %#x.\n", map_type); if (map_flags) FIXME("Ignoring map_flags %#x.\n", map_flags); - hr = IWineD3DVolumeTexture_Map(texture->wined3d_texture, sub_resource, &wined3d_map_desc, NULL, 0); - if (FAILED(hr)) + if (!(sub_resource = IWineD3DVolumeTexture_GetSubResource(texture->wined3d_texture, sub_resource_idx))) + hr = E_INVALIDARG; + else if (SUCCEEDED(hr = IWineD3DVolume_Map(wined3d_volume_from_resource(sub_resource), + &wined3d_map_desc, NULL, 0))) { - WARN("Failed to map texture, hr %#x.\n", hr); - return hr; + mapped_texture->pData = wined3d_map_desc.pBits; + mapped_texture->RowPitch = wined3d_map_desc.RowPitch; + mapped_texture->DepthPitch = wined3d_map_desc.SlicePitch; } - mapped_texture->pData = wined3d_map_desc.pBits; - mapped_texture->RowPitch = wined3d_map_desc.RowPitch; - mapped_texture->DepthPitch = wined3d_map_desc.SlicePitch; - return hr; } diff --git a/dlls/d3d8/volumetexture.c b/dlls/d3d8/volumetexture.c index 429f112..873822b 100644 --- a/dlls/d3d8/volumetexture.c +++ b/dlls/d3d8/volumetexture.c @@ -277,16 +277,22 @@ static HRESULT WINAPI IDirect3DVolumeTexture8Impl_GetVolumeLevel(IDirect3DVolume return D3D_OK; } -static HRESULT WINAPI IDirect3DVolumeTexture8Impl_LockBox(LPDIRECT3DVOLUMETEXTURE8 iface, UINT Level, D3DLOCKED_BOX *pLockedVolume, CONST D3DBOX *pBox, DWORD Flags) { - IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; +static HRESULT WINAPI IDirect3DVolumeTexture8Impl_LockBox(IDirect3DVolumeTexture8 *iface, + UINT level, D3DLOCKED_BOX *locked_box, const D3DBOX *box, DWORD flags) +{ + IDirect3DVolumeTexture8Impl *texture = (IDirect3DVolumeTexture8Impl *)iface; + struct wined3d_resource *sub_resource; HRESULT hr; TRACE("iface %p, level %u, locked_box %p, box %p, flags %#x.\n", - iface, Level, pLockedVolume, pBox, Flags); + iface, level, locked_box, box, flags); wined3d_mutex_lock(); - hr = IWineD3DVolumeTexture_Map(This->wineD3DVolumeTexture, Level, - (WINED3DLOCKED_BOX *)pLockedVolume, (const WINED3DBOX *)pBox, Flags); + if (!(sub_resource = IWineD3DVolumeTexture_GetSubResource(texture->wineD3DVolumeTexture, level))) + hr = D3DERR_INVALIDCALL; + else + hr = IDirect3DVolume8_LockBox((IDirect3DVolume8 *)wined3d_resource_get_parent(sub_resource), + locked_box, box, flags); wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d9/volumetexture.c b/dlls/d3d9/volumetexture.c index e97d1a4..b4b5503 100644 --- a/dlls/d3d9/volumetexture.c +++ b/dlls/d3d9/volumetexture.c @@ -339,18 +339,22 @@ static HRESULT WINAPI IDirect3DVolumeTexture9Impl_GetVolumeLevel(IDirect3DVolume return D3D_OK; } -static HRESULT WINAPI IDirect3DVolumeTexture9Impl_LockBox(LPDIRECT3DVOLUMETEXTURE9 iface, UINT Level, D3DLOCKED_BOX* pLockedVolume, CONST D3DBOX* pBox, DWORD Flags) { - IDirect3DVolumeTexture9Impl *This = (IDirect3DVolumeTexture9Impl *)iface; +static HRESULT WINAPI IDirect3DVolumeTexture9Impl_LockBox(IDirect3DVolumeTexture9 *iface, + UINT level, D3DLOCKED_BOX *locked_box, const D3DBOX *box, DWORD flags) +{ + IDirect3DVolumeTexture9Impl *texture = (IDirect3DVolumeTexture9Impl *)iface; + struct wined3d_resource *sub_resource; HRESULT hr; TRACE("iface %p, level %u, locked_box %p, box %p, flags %#x.\n", - iface, Level, pLockedVolume, pBox, Flags); + iface, level, locked_box, box, flags); wined3d_mutex_lock(); - - hr = IWineD3DVolumeTexture_Map(This->wineD3DVolumeTexture, Level, - (WINED3DLOCKED_BOX *)pLockedVolume, (const WINED3DBOX *)pBox, Flags); - + if (!(sub_resource = IWineD3DVolumeTexture_GetSubResource(texture->wineD3DVolumeTexture, level))) + hr = D3DERR_INVALIDCALL; + else + hr = IDirect3DVolume9_LockBox((IDirect3DVolume9 *)wined3d_resource_get_parent(sub_resource), + locked_box, box, flags); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index d05a9f2..3f7090c 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -277,6 +277,11 @@ static HRESULT WINAPI IWineD3DVolumeImpl_Map(IWineD3DVolume *iface, return WINED3D_OK; } +IWineD3DVolume * CDECL wined3d_volume_from_resource(struct wined3d_resource *resource) +{ + return (IWineD3DVolume *)volume_from_resource(resource); +} + static HRESULT WINAPI IWineD3DVolumeImpl_Unmap(IWineD3DVolume *iface) { IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface; diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index e53d4f5..643141f 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -273,25 +273,6 @@ static struct wined3d_resource * WINAPI IWineD3DVolumeTextureImpl_GetSubResource return basetexture_get_sub_resource(texture, sub_resource_idx); } -static HRESULT WINAPI IWineD3DVolumeTextureImpl_Map(IWineD3DVolumeTexture *iface, - UINT sub_resource_idx, WINED3DLOCKED_BOX *locked_box, const WINED3DBOX *box, DWORD flags) -{ - IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *)iface; - struct wined3d_resource *sub_resource; - - TRACE("iface %p, sub_resource_idx %u, locked_box %p, box %p, flags %#x.\n", - iface, sub_resource_idx, locked_box, box, flags); - - if (!(sub_resource = basetexture_get_sub_resource(texture, sub_resource_idx))) - { - WARN("Failed to get sub-resource.\n"); - return WINED3DERR_INVALIDCALL; - } - - return IWineD3DVolume_Map((IWineD3DVolume *)volume_from_resource(sub_resource), - locked_box, box, flags); -} - static HRESULT WINAPI IWineD3DVolumeTextureImpl_Unmap(IWineD3DVolumeTexture *iface, UINT sub_resource_idx) { IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *)iface; @@ -352,7 +333,6 @@ static const IWineD3DVolumeTextureVtbl IWineD3DVolumeTexture_Vtbl = IWineD3DVolumeTextureImpl_IsCondNP2, IWineD3DVolumeTextureImpl_GetSubResource, /* volume texture */ - IWineD3DVolumeTextureImpl_Map, IWineD3DVolumeTextureImpl_Unmap, IWineD3DVolumeTextureImpl_AddDirtyBox }; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 558fd82..f8e2121 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -69,3 +69,5 @@ @ cdecl wined3d_vertex_declaration_decref(ptr) @ cdecl wined3d_vertex_declaration_get_parent(ptr) @ cdecl wined3d_vertex_declaration_incref(ptr) + +@ cdecl wined3d_volume_from_resource(ptr) diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 7827080..d7c8b97 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2395,12 +2395,6 @@ interface IWineD3DCubeTexture : IWineD3DBaseTexture ] interface IWineD3DVolumeTexture : IWineD3DBaseTexture { - HRESULT Map( - [in] UINT sub_resource_idx, - [out] WINED3DLOCKED_BOX *locked_box, - [in] const WINED3DBOX *box, - [in] DWORD flags - ); HRESULT Unmap( [in] UINT sub_resource_idx ); @@ -3200,3 +3194,5 @@ ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock); ULONG __cdecl wined3d_vertex_declaration_decref(struct wined3d_vertex_declaration *declaration); void * __cdecl wined3d_vertex_declaration_get_parent(const struct wined3d_vertex_declaration *declaration); ULONG __cdecl wined3d_vertex_declaration_incref(struct wined3d_vertex_declaration *declaration); + +IWineD3DVolume * __cdecl wined3d_volume_from_resource(struct wined3d_resource *resource);

1 0

Vincent Povirk : gdiplus: Use GdipFillPath to implement GdipFillPie.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: 2ce5be2ce3e36250c588523dfc27261283fcab41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ce5be2ce3e36250c588523df… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Mar 10 16:36:08 2011 -0600 gdiplus: Use GdipFillPath to implement GdipFillPie. --- dlls/gdiplus/graphics.c | 26 +++++++++++--------------- 1 files changed, 11 insertions(+), 15 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 6682f74..262828b 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3472,7 +3472,8 @@ GpStatus WINGDIPAPI GdipFillPath(GpGraphics *graphics, GpBrush *brush, GpPath *p GpStatus WINGDIPAPI GdipFillPie(GpGraphics *graphics, GpBrush *brush, REAL x, REAL y, REAL width, REAL height, REAL startAngle, REAL sweepAngle) { - INT save_state; + GpStatus stat; + GpPath *path; TRACE("(%p, %p, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f)\n", graphics, brush, x, y, width, height, startAngle, sweepAngle); @@ -3483,24 +3484,19 @@ GpStatus WINGDIPAPI GdipFillPie(GpGraphics *graphics, GpBrush *brush, REAL x, if(graphics->busy) return ObjectBusy; - if(!graphics->hdc) - { - FIXME("graphics object has no HDC\n"); - return Ok; - } - - save_state = SaveDC(graphics->hdc); - EndPath(graphics->hdc); + stat = GdipCreatePath(FillModeAlternate, &path); - BeginPath(graphics->hdc); - draw_pie(graphics, x, y, width, height, startAngle, sweepAngle); - EndPath(graphics->hdc); + if (stat == Ok) + { + stat = GdipAddPathPie(path, x, y, width, height, startAngle, sweepAngle); - brush_fill_path(graphics, brush); + if (stat == Ok) + stat = GdipFillPath(graphics, brush, path); - RestoreDC(graphics->hdc, save_state); + GdipDeletePath(path); + } - return Ok; + return stat; } GpStatus WINGDIPAPI GdipFillPieI(GpGraphics *graphics, GpBrush *brush, INT x,

1 0

Vincent Povirk : gdiplus: Use GdipFillPath to implement GdipFillEllipse.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: 4aa99eaf3b1981f89632674dbb7b2adbce163aed URL: http://source.winehq.org/git/wine.git/?a=commit;h=4aa99eaf3b1981f89632674db… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Mar 10 16:29:08 2011 -0600 gdiplus: Use GdipFillPath to implement GdipFillEllipse. --- dlls/gdiplus/graphics.c | 35 +++++++++++------------------------ 1 files changed, 11 insertions(+), 24 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 978e12b..6682f74 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3355,9 +3355,8 @@ GpStatus WINGDIPAPI GdipFillClosedCurveI(GpGraphics *graphics, GpBrush *brush, GpStatus WINGDIPAPI GdipFillEllipse(GpGraphics *graphics, GpBrush *brush, REAL x, REAL y, REAL width, REAL height) { - INT save_state; - GpPointF ptf[2]; - POINT pti[2]; + GpStatus stat; + GpPath *path; TRACE("(%p, %p, %.2f, %.2f, %.2f, %.2f)\n", graphics, brush, x, y, width, height); @@ -3367,31 +3366,19 @@ GpStatus WINGDIPAPI GdipFillEllipse(GpGraphics *graphics, GpBrush *brush, REAL x if(graphics->busy) return ObjectBusy; - if(!graphics->hdc) - { - FIXME("graphics object has no HDC\n"); - return Ok; - } - - ptf[0].X = x; - ptf[0].Y = y; - ptf[1].X = x + width; - ptf[1].Y = y + height; - - save_state = SaveDC(graphics->hdc); - EndPath(graphics->hdc); - - transform_and_round_points(graphics, pti, ptf, 2); + stat = GdipCreatePath(FillModeAlternate, &path); - BeginPath(graphics->hdc); - Ellipse(graphics->hdc, pti[0].x, pti[0].y, pti[1].x, pti[1].y); - EndPath(graphics->hdc); + if (stat == Ok) + { + stat = GdipAddPathEllipse(path, x, y, width, height); - brush_fill_path(graphics, brush); + if (stat == Ok) + stat = GdipFillPath(graphics, brush, path); - RestoreDC(graphics->hdc, save_state); + GdipDeletePath(path); + } - return Ok; + return stat; } GpStatus WINGDIPAPI GdipFillEllipseI(GpGraphics *graphics, GpBrush *brush, INT x,

1 0

Vincent Povirk : gdiplus: Add software implementation of GdipFillPath.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: b5c2015999853030905ddae129a26a512825064b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5c2015999853030905ddae12… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Mar 10 16:16:26 2011 -0600 gdiplus: Add software implementation of GdipFillPath. --- dlls/gdiplus/graphics.c | 66 +++++++++++++++++++++++++++++++++++++---------- 1 files changed, 52 insertions(+), 14 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 83e0f24..978e12b 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3402,24 +3402,13 @@ GpStatus WINGDIPAPI GdipFillEllipseI(GpGraphics *graphics, GpBrush *brush, INT x return GdipFillEllipse(graphics,brush,(REAL)x,(REAL)y,(REAL)width,(REAL)height); } -GpStatus WINGDIPAPI GdipFillPath(GpGraphics *graphics, GpBrush *brush, GpPath *path) +static GpStatus GDI32_GdipFillPath(GpGraphics *graphics, GpBrush *brush, GpPath *path) { INT save_state; GpStatus retval; - TRACE("(%p, %p, %p)\n", graphics, brush, path); - - if(!brush || !graphics || !path) - return InvalidParameter; - - if(graphics->busy) - return ObjectBusy; - - if(!graphics->hdc) - { - FIXME("graphics object has no HDC\n"); - return Ok; - } + if(!graphics->hdc || !brush_can_fill_path(brush)) + return NotImplemented; save_state = SaveDC(graphics->hdc); EndPath(graphics->hdc); @@ -3444,6 +3433,55 @@ end: return retval; } +static GpStatus SOFTWARE_GdipFillPath(GpGraphics *graphics, GpBrush *brush, GpPath *path) +{ + GpStatus stat; + GpRegion *rgn; + + if (!brush_can_fill_pixels(brush)) + return NotImplemented; + + /* FIXME: This could probably be done more efficiently without regions. */ + + stat = GdipCreateRegionPath(path, &rgn); + + if (stat == Ok) + { + stat = GdipFillRegion(graphics, brush, rgn); + + GdipDeleteRegion(rgn); + } + + return stat; +} + +GpStatus WINGDIPAPI GdipFillPath(GpGraphics *graphics, GpBrush *brush, GpPath *path) +{ + GpStatus stat = NotImplemented; + + TRACE("(%p, %p, %p)\n", graphics, brush, path); + + if(!brush || !graphics || !path) + return InvalidParameter; + + if(graphics->busy) + return ObjectBusy; + + if (!graphics->image) + stat = GDI32_GdipFillPath(graphics, brush, path); + + if (stat == NotImplemented) + stat = SOFTWARE_GdipFillPath(graphics, brush, path); + + if (stat == NotImplemented) + { + FIXME("Not implemented for brushtype %i\n", brush->bt); + stat = Ok; + } + + return stat; +} + GpStatus WINGDIPAPI GdipFillPie(GpGraphics *graphics, GpBrush *brush, REAL x, REAL y, REAL width, REAL height, REAL startAngle, REAL sweepAngle) {

1 0

Vincent Povirk : gdiplus: Call GdiAlphaBlend only once per GdipFillRegion call.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: 833316f91d428955744f88ee02c71f4bad38e4c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=833316f91d428955744f88ee0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Mar 10 15:58:22 2011 -0600 gdiplus: Call GdiAlphaBlend only once per GdipFillRegion call. --- dlls/gdiplus/graphics.c | 93 ++++++++++++++++++++++++++++++++++++----------- 1 files changed, 72 insertions(+), 21 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 4d059f8..83e0f24 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3856,39 +3856,90 @@ static GpStatus SOFTWARE_GdipFillRegion(GpGraphics *graphics, GpBrush *brush, if (stat == Ok) { - UINT max_size=0; - - for (i=0; i<scans_count; i++) + if (!graphics->image) { - UINT size = scans[i].Width * scans[i].Height; + /* If we have to go through gdi32, use as few alpha blends as possible. */ + INT min_x, min_y, max_x, max_y; + UINT data_width, data_height; - if (size > max_size) - max_size = size; - } + min_x = scans[0].X; + min_y = scans[0].Y; + max_x = scans[0].X+scans[0].Width; + max_y = scans[0].Y+scans[0].Height; - pixel_data = GdipAlloc(sizeof(*pixel_data) * max_size); - if (!pixel_data) - stat = OutOfMemory; + for (i=1; i<scans_count; i++) + { + min_x = min(min_x, scans[i].X); + min_y = min(min_y, scans[i].Y); + max_x = max(max_x, scans[i].X+scans[i].Width); + max_y = max(max_y, scans[i].Y+scans[i].Height); + } - if (stat == Ok) - { - for (i=0; i<scans_count; i++) + data_width = max_x - min_x; + data_height = max_y - min_y; + + pixel_data = GdipAlloc(sizeof(*pixel_data) * data_width * data_height); + if (!pixel_data) + stat = OutOfMemory; + + if (stat == Ok) { - stat = brush_fill_pixels(graphics, brush, pixel_data, &scans[i], - scans[i].Width); + for (i=0; i<scans_count; i++) + { + stat = brush_fill_pixels(graphics, brush, + pixel_data + (scans[i].X - min_x) + (scans[i].Y - min_y) * data_width, + &scans[i], data_width); + + if (stat != Ok) + break; + } if (stat == Ok) { - stat = alpha_blend_pixels(graphics, scans[i].X, scans[i].Y, - (BYTE*)pixel_data, scans[i].Width, scans[i].Height, - scans[i].Width * 4); + stat = alpha_blend_pixels(graphics, min_x, min_y, + (BYTE*)pixel_data, data_width, data_height, + data_width * 4); } - if (stat != Ok) - break; + GdipFree(pixel_data); } + } + else + { + UINT max_size=0; - GdipFree(pixel_data); + for (i=0; i<scans_count; i++) + { + UINT size = scans[i].Width * scans[i].Height; + + if (size > max_size) + max_size = size; + } + + pixel_data = GdipAlloc(sizeof(*pixel_data) * max_size); + if (!pixel_data) + stat = OutOfMemory; + + if (stat == Ok) + { + for (i=0; i<scans_count; i++) + { + stat = brush_fill_pixels(graphics, brush, pixel_data, &scans[i], + scans[i].Width); + + if (stat == Ok) + { + stat = alpha_blend_pixels(graphics, scans[i].X, scans[i].Y, + (BYTE*)pixel_data, scans[i].Width, scans[i].Height, + scans[i].Width * 4); + } + + if (stat != Ok) + break; + } + + GdipFree(pixel_data); + } } GdipFree(scans);

1 0

Vincent Povirk : gdiplus: Remove gdi32 fallback for bitmaps from GdipFillRegion.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: 77f5a07c1bd351524fe294b051aee7f37a7f77ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=77f5a07c1bd351524fe294b05… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Mar 10 16:17:20 2011 -0600 gdiplus: Remove gdi32 fallback for bitmaps from GdipFillRegion. We can always do a fill directly to the image bits when gdi32 can do it. --- dlls/gdiplus/graphics.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 29dea0a..4d059f8 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3919,9 +3919,6 @@ GpStatus WINGDIPAPI GdipFillRegion(GpGraphics* graphics, GpBrush* brush, if (stat == NotImplemented) stat = SOFTWARE_GdipFillRegion(graphics, brush, region); - if (stat == NotImplemented && graphics->image) - stat = GDI32_GdipFillRegion(graphics, brush, region); - if (stat == NotImplemented) { FIXME("not implemented for brushtype %i\n", brush->bt);

1 0

← Newer
1
...
39
40
41
42
43
44
45
...
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