September 2017 - Wine-Commits

Alexandre Julliard : ntdll: Add helper functions for getting and setting page protection bytes.
by Alexandre Julliard Sept. 5, 2017

Sept. 5, 2017

Module: wine Branch: master Commit: 727b94842e643d498b36d0e676f29b193c48db72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=727b94842e643d498b36d0e67… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 5 13:55:36 2017 +0200 ntdll: Add helper functions for getting and setting page protection bytes. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 74 ++++++++++++++++++++++++++++++++++------------------ 1 file changed, 48 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=727b94842e643d498b36d…

1 0

Nikolay Sivov : d2d1: Use 8bpp text bitmaps for grayscale mode.
by Alexandre Julliard Sept. 5, 2017

Sept. 5, 2017

Module: wine Branch: master Commit: 38d314ba927a56d4e3c242d19c5898cd5bbf9bd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38d314ba927a56d4e3c242d19… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 5 13:35:30 2017 +0300 d2d1: Use 8bpp text bitmaps for grayscale mode. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/render_target.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index f37565d..02f926f 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -1141,7 +1141,7 @@ static void d2d_rt_draw_glyph_run_bitmap(struct d2d_d3d_render_target *render_ta return; } - if (rendering_mode == DWRITE_RENDERING_MODE_ALIASED) + if (rendering_mode == DWRITE_RENDERING_MODE_ALIASED || antialias_mode == DWRITE_TEXT_ANTIALIAS_MODE_GRAYSCALE) texture_type = DWRITE_TEXTURE_ALIASED_1x1; else texture_type = DWRITE_TEXTURE_CLEARTYPE_3x1;

1 0

Alexandre Julliard : ntdll: Pass the allocation size to the alloc_virtual_heap function.
by Alexandre Julliard Sept. 5, 2017

Sept. 5, 2017

Module: wine Branch: master Commit: eb5c1872540a71ebef4703387c11c414516233f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb5c1872540a71ebef4703387… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 5 16:09:51 2017 +0200 ntdll: Pass the allocation size to the alloc_virtual_heap function. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 80d83d8..ea4834f 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1404,17 +1404,23 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz } +struct alloc_virtual_heap +{ + void *base; + size_t size; +}; + /* callback for wine_mmap_enum_reserved_areas to allocate space for the virtual heap */ static int alloc_virtual_heap( void *base, size_t size, void *arg ) { - void **heap_base = arg; + struct alloc_virtual_heap *alloc = arg; if (is_beyond_limit( base, size, address_space_limit )) address_space_limit = (char *)base + size; - if (size < VIRTUAL_HEAP_SIZE) return 0; + if (size < alloc->size) return 0; if (is_win64 && base < (void *)0x80000000) return 0; - *heap_base = wine_anon_mmap( (char *)base + size - VIRTUAL_HEAP_SIZE, - VIRTUAL_HEAP_SIZE, PROT_READ|PROT_WRITE, MAP_FIXED ); - return (*heap_base != (void *)-1); + alloc->base = wine_anon_mmap( (char *)base + size - alloc->size, alloc->size, + PROT_READ|PROT_WRITE, MAP_FIXED ); + return (alloc->base != (void *)-1); } /*********************************************************************** @@ -1423,7 +1429,7 @@ static int alloc_virtual_heap( void *base, size_t size, void *arg ) void virtual_init(void) { const char *preload; - void *heap_base; + struct alloc_virtual_heap alloc_heap; size_t size; struct file_view *heap_view; @@ -1447,13 +1453,14 @@ void virtual_init(void) } /* try to find space in a reserved area for the virtual heap */ - if (!wine_mmap_enum_reserved_areas( alloc_virtual_heap, &heap_base, 1 )) - heap_base = wine_anon_mmap( NULL, VIRTUAL_HEAP_SIZE, PROT_READ|PROT_WRITE, 0 ); + alloc_heap.size = VIRTUAL_HEAP_SIZE; + if (!wine_mmap_enum_reserved_areas( alloc_virtual_heap, &alloc_heap, 1 )) + alloc_heap.base = wine_anon_mmap( NULL, alloc_heap.size, PROT_READ|PROT_WRITE, 0 ); - assert( heap_base != (void *)-1 ); - virtual_heap = RtlCreateHeap( HEAP_NO_SERIALIZE, heap_base, VIRTUAL_HEAP_SIZE, + assert( alloc_heap.base != (void *)-1 ); + virtual_heap = RtlCreateHeap( HEAP_NO_SERIALIZE, alloc_heap.base, VIRTUAL_HEAP_SIZE, VIRTUAL_HEAP_SIZE, NULL, NULL ); - create_view( &heap_view, heap_base, VIRTUAL_HEAP_SIZE, VPROT_COMMITTED | VPROT_READ | VPROT_WRITE ); + create_view( &heap_view, alloc_heap.base, alloc_heap.size, VPROT_COMMITTED|VPROT_READ|VPROT_WRITE ); /* make the DOS area accessible (except the low 64K) to hide bugs in broken apps like Excel 2003 */ size = (char *)address_space_start - (char *)0x10000;

1 0

Alexandre Julliard : Wine release 2.16
by Alexandre Julliard Sept. 1, 2017

Sept. 1, 2017

Module: website Branch: master Commit: ef322bc1186f175e0119d403658cfecf0fd4ad32 URL: http://source.winehq.org/git/website.git/?a=commit;h=ef322bc1186f175e0119d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 1 19:23:30 2017 +0200 Wine release 2.16 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2017090101.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2017090101.xml b/news/en/2017090101.xml new file mode 100644 index 0000000..2c18f86 --- /dev/null +++ b/news/en/2017090101.xml @@ -0,0 +1,17 @@ +<news> +<date>September 1, 2017</date> +<title>Wine 2.16 Released</title> +<body> + The Wine development release 2.16 is now available. + <a href="{$root}/announce/2.16">What's new</a> in this release: +<ul> + <li>Support for pasting metafiles in RichEdit.</li> + <li>Better support for grayscale PNG images.</li> + <li>Support for safety features in library loading.</li> + <li>Better handling of transforms in GdiPlus.</li> + <li>Rendering improvements in DirectWrite.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/2.x/wine-2.16.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Austin English : advapi32: Only show NotifyServiceStatusChangeW FIXME once.
by Alexandre Julliard Sept. 1, 2017

Sept. 1, 2017

Module: wine Branch: master Commit: e2283db410562273feb297748eeb4f151d4c3e18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2283db410562273feb297748… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Aug 31 11:50:25 2017 -0500 advapi32: Only show NotifyServiceStatusChangeW FIXME once. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/service.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 1150805..fa6ebfe 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -2427,8 +2427,9 @@ DWORD WINAPI NotifyServiceStatusChangeW(SC_HANDLE hService, DWORD dwNotifyMask, DWORD dummy; BOOL ret; SERVICE_STATUS_PROCESS st; + static int once; - FIXME("%p 0x%x %p - semi-stub\n", hService, dwNotifyMask, pNotifyBuffer); + if (!once++) FIXME("%p 0x%x %p - semi-stub\n", hService, dwNotifyMask, pNotifyBuffer); ret = QueryServiceStatusEx(hService, SC_STATUS_PROCESS_INFO, (void*)&st, sizeof(st), &dummy); if (ret)

1 0

Vincent Povirk : gdiplus: Use SOFTWARE_GdipDrawPath with alpha hdc's.
by Alexandre Julliard Sept. 1, 2017

Sept. 1, 2017

Module: wine Branch: master Commit: be952527f2c95c85532fd4a7e28e3ab5689235ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=be952527f2c95c85532fd4a7e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Aug 31 14:14:05 2017 -0500 gdiplus: Use SOFTWARE_GdipDrawPath with alpha hdc's. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index e19fefc..a7da283 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3859,7 +3859,7 @@ GpStatus WINGDIPAPI GdipDrawPath(GpGraphics *graphics, GpPen *pen, GpPath *path) if (graphics->image && graphics->image->type == ImageTypeMetafile) retval = METAFILE_DrawPath((GpMetafile*)graphics->image, pen, path); - else if (!graphics->hdc || !brush_can_fill_path(pen->brush, FALSE)) + else if (!graphics->hdc || graphics->alpha_hdc || !brush_can_fill_path(pen->brush, FALSE)) retval = SOFTWARE_GdipDrawPath(graphics, pen, path); else retval = GDI32_GdipDrawPath(graphics, pen, path);

1 0

Vincent Povirk : gdiplus: Account for gdi transform in brush_fill_pixels.
by Alexandre Julliard Sept. 1, 2017

Sept. 1, 2017

Module: wine Branch: master Commit: 0914f626af73b6fb10826178d6736a873113fc84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0914f626af73b6fb10826178d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Aug 31 14:14:04 2017 -0500 gdiplus: Account for gdi transform in brush_fill_pixels. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 7aa1dac..e19fefc 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1169,8 +1169,8 @@ static GpStatus brush_fill_pixels(GpGraphics *graphics, GpBrush *brush, /* Transform the points to a co-ordinate space where X is the point's * position in the gradient, 0.0 being the start point and 1.0 the * end point. */ - stat = GdipTransformPoints(graphics, CoordinateSpaceWorld, - CoordinateSpaceDevice, draw_points, 3); + stat = gdip_transform_points(graphics, CoordinateSpaceWorld, + WineCoordinateSpaceGdiDevice, draw_points, 3); if (stat == Ok) { @@ -1230,8 +1230,8 @@ static GpStatus brush_fill_pixels(GpGraphics *graphics, GpBrush *brush, draw_points[2].Y = fill_area->Y+1; /* Transform the points to the co-ordinate space of the bitmap. */ - stat = GdipTransformPoints(graphics, CoordinateSpaceWorld, - CoordinateSpaceDevice, draw_points, 3); + stat = gdip_transform_points(graphics, CoordinateSpaceWorld, + WineCoordinateSpaceGdiDevice, draw_points, 3); if (stat == Ok) { @@ -1361,7 +1361,7 @@ static GpStatus brush_fill_pixels(GpGraphics *graphics, GpBrush *brush, if (stat != Ok) return stat; - stat = get_graphics_transform(graphics, CoordinateSpaceDevice, + stat = get_graphics_transform(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, &world_to_device); if (stat == Ok) {

1 0

Tag wine-2.16 : Alexandre Julliard : Release 2.16
by Alexandre Julliard Sept. 1, 2017

Sept. 1, 2017

Module: wine Branch: refs/tags/wine-2.16 Tag: b4af8d6c9bc7eee56fbe2704b083d8ef1f5f7a20 URL: http://source.winehq.org/git/wine.git/?a=tag;h=b4af8d6c9bc7eee56fbe2704b083… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 1 19:20:52 2017 +0200 Release 2.16

1 0

Alexandre Julliard : Release 2.16.
by Alexandre Julliard Sept. 1, 2017

Sept. 1, 2017

Module: wine Branch: master Commit: 0b1d7ff7655c5aa7ff073f67400bd4401727183f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b1d7ff7655c5aa7ff073f674… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 1 19:20:52 2017 +0200 Release 2.16. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 410 ++++++++++++++++++++++++++++++++++---------------------------- VERSION | 2 +- configure | 18 +-- 3 files changed, 236 insertions(+), 194 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0b1d7ff7655c5aa7ff073…

1 0

Alexandre Julliard : user32: Use the correct top-level window when activating through a mouse click.
by Alexandre Julliard Sept. 1, 2017

Sept. 1, 2017

Module: wine Branch: master Commit: 3ab617499768132df134bab2a7c036413a9af50c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ab617499768132df134bab2a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 1 09:15:44 2017 +0200 user32: Use the correct top-level window when activating through a mouse click. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 3d3736d..406eff3 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2637,14 +2637,9 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H if (msg->hwnd != info.hwndActive) { - HWND hwndTop = msg->hwnd; - while (hwndTop) - { - if ((GetWindowLongW( hwndTop, GWL_STYLE ) & (WS_POPUP|WS_CHILD)) != WS_CHILD) break; - hwndTop = GetParent( hwndTop ); - } + HWND hwndTop = GetAncestor( msg->hwnd, GA_ROOT ); - if (hwndTop) + if ((GetWindowLongW( hwndTop, GWL_STYLE ) & (WS_POPUP|WS_CHILD)) != WS_CHILD) { LONG ret = SendMessageW( msg->hwnd, WM_MOUSEACTIVATE, (WPARAM)hwndTop, MAKELONG( hittest, msg->message ) );

1 0