March 2015 - Wine-commits - list.winehq.org

Henri Verbeet : d2d1: Properly take the source offset into account in d2d_d3d_render_target_DrawBitmap ().
by Alexandre Julliard 25 Mar '15

25 Mar '15

Module: wine Branch: master Commit: f87b0ce4d77fb99c74e16935b1d2ed7d218860f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f87b0ce4d77fb99c74e16935b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 25 10:05:27 2015 +0100 d2d1: Properly take the source offset into account in d2d_d3d_render_target_DrawBitmap(). --- dlls/d2d1/render_target.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index f109849..83b4dab 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -752,10 +752,10 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawBitmap(ID2D1RenderTarget brush_desc.opacity = opacity; brush_desc.transform._11 = (d.right - d.left) / (s.right - s.left); brush_desc.transform._21 = 0.0f; - brush_desc.transform._31 = d.left; + brush_desc.transform._31 = d.left - s.left; brush_desc.transform._12 = 0.0f; brush_desc.transform._22 = (d.bottom - d.top) / (s.bottom - s.top); - brush_desc.transform._32 = d.top; + brush_desc.transform._32 = d.top - s.top; if (FAILED(hr = ID2D1RenderTarget_CreateBitmapBrush(iface, bitmap, &bitmap_brush_desc, &brush_desc, &brush))) {

1 0

Henri Verbeet : d2d1: Implement d2d_state_block_GetTextRenderingParams().
by Alexandre Julliard 25 Mar '15

25 Mar '15

Module: wine Branch: master Commit: 063080f747375bbb6df6afb46a2a6938efbbf825 URL: http://source.winehq.org/git/wine.git/?a=commit;h=063080f747375bbb6df6afb46… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 25 10:05:28 2015 +0100 d2d1: Implement d2d_state_block_GetTextRenderingParams(). --- dlls/d2d1/d2d1_private.h | 2 ++ dlls/d2d1/state_block.c | 16 +++++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 42694d2..89d2377 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -174,6 +174,8 @@ struct d2d_state_block { ID2D1DrawingStateBlock ID2D1DrawingStateBlock_iface; LONG refcount; + + IDWriteRenderingParams *text_rendering_params; }; void d2d_state_block_init(struct d2d_state_block *state_block, const D2D1_DRAWING_STATE_DESCRIPTION *desc, diff --git a/dlls/d2d1/state_block.c b/dlls/d2d1/state_block.c index 4aa8cd4..62458fb 100644 --- a/dlls/d2d1/state_block.c +++ b/dlls/d2d1/state_block.c @@ -65,7 +65,11 @@ static ULONG STDMETHODCALLTYPE d2d_state_block_Release(ID2D1DrawingStateBlock *i TRACE("%p decreasing refcount to %u.\n", iface, refcount); if (!refcount) + { + if (state_block->text_rendering_params) + IDWriteRenderingParams_Release(state_block->text_rendering_params); HeapFree(GetProcessHeap(), 0, state_block); + } return refcount; } @@ -98,7 +102,12 @@ static void STDMETHODCALLTYPE d2d_state_block_SetTextRenderingParams(ID2D1Drawin static void STDMETHODCALLTYPE d2d_state_block_GetTextRenderingParams(ID2D1DrawingStateBlock *iface, IDWriteRenderingParams **text_rendering_params) { - FIXME("iface %p, text_rendering_params %p stub!\n", iface, text_rendering_params); + struct d2d_state_block *state_block = impl_from_ID2D1DrawingStateBlock(iface); + + TRACE("iface %p, text_rendering_params %p.\n", iface, text_rendering_params); + + if ((*text_rendering_params = state_block->text_rendering_params)) + IDWriteRenderingParams_AddRef(*text_rendering_params); } static const struct ID2D1DrawingStateBlockVtbl d2d_state_block_vtbl = @@ -120,4 +129,9 @@ void d2d_state_block_init(struct d2d_state_block *state_block, const D2D1_DRAWIN state_block->ID2D1DrawingStateBlock_iface.lpVtbl = &d2d_state_block_vtbl; state_block->refcount = 1; + if (text_rendering_params) + { + state_block->text_rendering_params = text_rendering_params; + IDWriteRenderingParams_AddRef(state_block->text_rendering_params); + } }

1 0

Henri Verbeet : d2d1: Implement d2d_state_block_SetTextRenderingParams().
by Alexandre Julliard 25 Mar '15

25 Mar '15

Module: wine Branch: master Commit: 29af90be0c42f73ac57caa0f712a2557981ac00a URL: http://source.winehq.org/git/wine.git/?a=commit;h=29af90be0c42f73ac57caa0f7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 25 10:05:29 2015 +0100 d2d1: Implement d2d_state_block_SetTextRenderingParams(). --- dlls/d2d1/state_block.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/state_block.c b/dlls/d2d1/state_block.c index 62458fb..978c7df 100644 --- a/dlls/d2d1/state_block.c +++ b/dlls/d2d1/state_block.c @@ -96,7 +96,15 @@ static void STDMETHODCALLTYPE d2d_state_block_SetDescription(ID2D1DrawingStateBl static void STDMETHODCALLTYPE d2d_state_block_SetTextRenderingParams(ID2D1DrawingStateBlock *iface, IDWriteRenderingParams *text_rendering_params) { - FIXME("iface %p, text_rendering_params %p stub!\n", iface, text_rendering_params); + struct d2d_state_block *state_block = impl_from_ID2D1DrawingStateBlock(iface); + + TRACE("iface %p, text_rendering_params %p.\n", iface, text_rendering_params); + + if (text_rendering_params) + IDWriteRenderingParams_AddRef(text_rendering_params); + if (state_block->text_rendering_params) + IDWriteRenderingParams_Release(state_block->text_rendering_params); + state_block->text_rendering_params = text_rendering_params; } static void STDMETHODCALLTYPE d2d_state_block_GetTextRenderingParams(ID2D1DrawingStateBlock *iface,

1 0

Henri Verbeet : d2d1: Implement d2d_state_block_GetDescription().
by Alexandre Julliard 25 Mar '15

25 Mar '15

Module: wine Branch: master Commit: 95f5dc72a2ba0ad1e1ddf194eda1a0e461bb70fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=95f5dc72a2ba0ad1e1ddf194e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 25 10:05:30 2015 +0100 d2d1: Implement d2d_state_block_GetDescription(). --- dlls/d2d1/d2d1_private.h | 1 + dlls/d2d1/state_block.c | 22 ++++++++++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 89d2377..bbceb7f 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -175,6 +175,7 @@ struct d2d_state_block ID2D1DrawingStateBlock ID2D1DrawingStateBlock_iface; LONG refcount; + D2D1_DRAWING_STATE_DESCRIPTION drawing_state; IDWriteRenderingParams *text_rendering_params; }; diff --git a/dlls/d2d1/state_block.c b/dlls/d2d1/state_block.c index 978c7df..e893264 100644 --- a/dlls/d2d1/state_block.c +++ b/dlls/d2d1/state_block.c @@ -84,7 +84,11 @@ static void STDMETHODCALLTYPE d2d_state_block_GetFactory(ID2D1DrawingStateBlock static void STDMETHODCALLTYPE d2d_state_block_GetDescription(ID2D1DrawingStateBlock *iface, D2D1_DRAWING_STATE_DESCRIPTION *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct d2d_state_block *state_block = impl_from_ID2D1DrawingStateBlock(iface); + + TRACE("iface %p, desc %p.\n", iface, desc); + + *desc = state_block->drawing_state; } static void STDMETHODCALLTYPE d2d_state_block_SetDescription(ID2D1DrawingStateBlock *iface, @@ -133,13 +137,19 @@ static const struct ID2D1DrawingStateBlockVtbl d2d_state_block_vtbl = void d2d_state_block_init(struct d2d_state_block *state_block, const D2D1_DRAWING_STATE_DESCRIPTION *desc, IDWriteRenderingParams *text_rendering_params) { - FIXME("Ignoring state block properties.\n"); + static const D2D1_MATRIX_3X2_F identity = + { + 1.0f, 0.0f, + 0.0f, 1.0f, + 0.0f, 0.0f, + }; state_block->ID2D1DrawingStateBlock_iface.lpVtbl = &d2d_state_block_vtbl; state_block->refcount = 1; - if (text_rendering_params) - { - state_block->text_rendering_params = text_rendering_params; + if (desc) + state_block->drawing_state = *desc; + else + state_block->drawing_state.transform = identity; + if ((state_block->text_rendering_params = text_rendering_params)) IDWriteRenderingParams_AddRef(state_block->text_rendering_params); - } }

1 0

Henri Verbeet : d2d1: Implement d2d_state_block_SetDescription().
by Alexandre Julliard 25 Mar '15

25 Mar '15

Module: wine Branch: master Commit: 1b93c01048e2394194cc088ab1fd0efb9f5fbf4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b93c01048e2394194cc088ab… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 25 10:05:31 2015 +0100 d2d1: Implement d2d_state_block_SetDescription(). --- dlls/d2d1/state_block.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/state_block.c b/dlls/d2d1/state_block.c index e893264..28da331 100644 --- a/dlls/d2d1/state_block.c +++ b/dlls/d2d1/state_block.c @@ -94,7 +94,11 @@ static void STDMETHODCALLTYPE d2d_state_block_GetDescription(ID2D1DrawingStateBl static void STDMETHODCALLTYPE d2d_state_block_SetDescription(ID2D1DrawingStateBlock *iface, const D2D1_DRAWING_STATE_DESCRIPTION *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct d2d_state_block *state_block = impl_from_ID2D1DrawingStateBlock(iface); + + TRACE("iface %p, desc %p.\n", iface, desc); + + state_block->drawing_state = *desc; } static void STDMETHODCALLTYPE d2d_state_block_SetTextRenderingParams(ID2D1DrawingStateBlock *iface,

1 0

Zheng Chen : msvcrt: Correct atan/exp/tanh errno setting.
by Alexandre Julliard 25 Mar '15

25 Mar '15

Module: wine Branch: master Commit: e95dbb3b747dcd92b614578b3ca4b1c2dbfdaece URL: http://source.winehq.org/git/wine.git/?a=commit;h=e95dbb3b747dcd92b614578b3… Author: Zheng Chen <chanchengcc(a)gmail.com> Date: Tue Mar 24 18:09:50 2015 +0800 msvcrt: Correct atan/exp/tanh errno setting. --- dlls/msvcrt/math.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index acac35d..73f01aa 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -363,7 +363,7 @@ double CDECL MSVCRT_asin( double x ) */ double CDECL MSVCRT_atan( double x ) { - if (!isfinite(x)) *MSVCRT__errno() = MSVCRT_EDOM; + if (isnan(x)) *MSVCRT__errno() = MSVCRT_EDOM; return atan(x); } @@ -399,7 +399,7 @@ double CDECL MSVCRT_cosh( double x ) */ double CDECL MSVCRT_exp( double x ) { - if (!isfinite(x)) *MSVCRT__errno() = MSVCRT_EDOM; + if (isnan(x)) *MSVCRT__errno() = MSVCRT_EDOM; return exp(x); } @@ -484,7 +484,7 @@ double CDECL MSVCRT_tan( double x ) */ double CDECL MSVCRT_tanh( double x ) { - if (!isfinite(x)) *MSVCRT__errno() = MSVCRT_EDOM; + if (isnan(x)) *MSVCRT__errno() = MSVCRT_EDOM; return tanh(x); }

1 0

Vincent Povirk : gdiplus: Fix blend_colors when alpha channel differs.
by Alexandre Julliard 25 Mar '15

25 Mar '15

Module: wine Branch: master Commit: 9c579023f0750539bdf7815f8545c4620540387a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c579023f0750539bdf7815f8… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Mar 24 12:50:18 2015 -0500 gdiplus: Fix blend_colors when alpha channel differs. When picking a color halfway between 100% white (0xffffffff) and fully transparent (0x00000000), the result was 50% opaque 50% grey (0x80808080) when it should really be 50% opaque white (0x80ffffff). This had a tendency to create grey fringes on things. The fix is to weight the non-alpha components based on how much they contribute to the final alpha value. --- dlls/gdiplus/graphics.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index ae530a9..580390f 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -521,20 +521,22 @@ static GpStatus alpha_blend_pixels(GpGraphics *graphics, INT dst_x, INT dst_y, static ARGB blend_colors(ARGB start, ARGB end, REAL position) { - ARGB result=0; - ARGB i; - INT a1, a2, a3; + INT start_a, end_a, final_a; + INT pos; - a1 = (start >> 24) & 0xff; - a2 = (end >> 24) & 0xff; + pos = gdip_round(position * 0xff); - a3 = (int)(a1*(1.0f - position)+a2*(position)); + start_a = ((start >> 24) & 0xff) * (pos ^ 0xff); + end_a = ((end >> 24) & 0xff) * pos; - result |= a3 << 24; + final_a = start_a + end_a; - for (i=0xff; i<=0xff0000; i = i << 8) - result |= (int)((start&i)*(1.0f - position)+(end&i)*(position))&i; - return result; + if (final_a < 0xff) return 0; + + return (final_a / 0xff) << 24 | + ((((start >> 16) & 0xff) * start_a + (((end >> 16) & 0xff) * end_a)) / final_a) << 16 | + ((((start >> 8) & 0xff) * start_a + (((end >> 8) & 0xff) * end_a)) / final_a) << 8 | + (((start & 0xff) * start_a + ((end & 0xff) * end_a)) / final_a); } static ARGB blend_line_gradient(GpLineGradient* brush, REAL position)

1 0

Michael Stefaniuc : taskschd/tests: Test the correct return value.
by Alexandre Julliard 25 Mar '15

25 Mar '15

Module: wine Branch: master Commit: 39f1184ee12bc12c27b6a56b4a5598a802eb9de7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39f1184ee12bc12c27b6a56b4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 25 11:47:31 2015 +0100 taskschd/tests: Test the correct return value. --- dlls/taskschd/tests/scheduler.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 5e906ce..9a745b8 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -345,7 +345,7 @@ todo_wine hr = ITaskFolder_DeleteFolder(folder, Wine_Folder1_Folder2, 0); ok(hr == S_OK, "DeleteFolder error %#x\n", hr); - ITaskFolder_DeleteFolder(folder, Wine_Folder1+1, 0); + hr = ITaskFolder_DeleteFolder(folder, Wine_Folder1+1, 0); ok(hr == S_OK, "DeleteFolder error %#x\n", hr); hr = ITaskFolder_DeleteFolder(folder, Wine+1, 0); ok(hr == S_OK, "DeleteFolder error %#x\n", hr);

1 0

Francois Gouget : storage.dll16: Remove an unneeded NONAMELESSSTRUCT directive.
by Alexandre Julliard 24 Mar '15

24 Mar '15

Module: wine Branch: master Commit: 890153e8c0a8c2570b4ad8b76fc4159ad5cde39f URL: http://source.winehq.org/git/wine.git/?a=commit;h=890153e8c0a8c2570b4ad8b76… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 24 11:40:41 2015 +0100 storage.dll16: Remove an unneeded NONAMELESSSTRUCT directive. --- dlls/storage.dll16/storage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/storage.dll16/storage.c b/dlls/storage.dll16/storage.c index 4807bcd..dcaff5c 100644 --- a/dlls/storage.dll16/storage.c +++ b/dlls/storage.dll16/storage.c @@ -33,7 +33,7 @@ #endif #define NONAMELESSUNION -#define NONAMELESSSTRUCT + #include "windef.h" #include "winbase.h" #include "winternl.h"

1 0

Francois Gouget : system.drv16: Remove an unneeded NONAMELESSSTRUCT directive.
by Alexandre Julliard 24 Mar '15

24 Mar '15

Module: wine Branch: master Commit: bd07c3af86362653fe827cf9ea4aa629a0676558 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd07c3af86362653fe827cf9e… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 24 11:40:55 2015 +0100 system.drv16: Remove an unneeded NONAMELESSSTRUCT directive. --- dlls/system.drv16/system.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/system.drv16/system.c b/dlls/system.drv16/system.c index 83c0c87..8bb5cf9 100644 --- a/dlls/system.drv16/system.c +++ b/dlls/system.drv16/system.c @@ -18,10 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include <stdarg.h> +#define NONAMELESSUNION + #include "windef.h" #include "winbase.h" #include "wine/winbase16.h"

1 0