June 2016 - Wine-commits - list.winehq.org

Alex Henrie : ntdll: Skip synchronous read if a serial read interval timeout is set.
by Alexandre Julliard 09 Jun '16

09 Jun '16

Module: wine Branch: master Commit: 84fcaafb895f08b3513486f7b687882a2ffca1f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84fcaafb895f08b3513486f7b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu May 26 23:34:26 2016 -0600 ntdll: Skip synchronous read if a serial read interval timeout is set. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 7d09c8f..7fbde50 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -904,6 +904,20 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, } } + if (type == FD_TYPE_SERIAL && async_read && length) + { + /* an asynchronous serial port read with a read interval timeout needs to + skip the synchronous read to make sure that the server starts the read + interval timer after the first read */ + if ((status = get_io_timeouts( hFile, type, length, TRUE, &timeouts ))) goto err; + if (timeouts.interval) + { + status = register_async_file_read( hFile, hEvent, apc, apc_user, io_status, + buffer, total, length, FALSE ); + goto err; + } + } + for (;;) { if ((result = read( unix_handle, (char *)buffer + total, length - total )) >= 0)

1 0

Alex Henrie : msvcrt: Stub out _(get|set) _thread_local_invalid_parameter_handler.
by Alexandre Julliard 09 Jun '16

09 Jun '16

Module: wine Branch: master Commit: a88c35d0dc91b4f28baf656c65667f5ddff53ade URL: http://source.winehq.org/git/wine.git/?a=commit;h=a88c35d0dc91b4f28baf656c6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jun 7 16:36:50 2016 -0600 msvcrt: Stub out _(get|set)_thread_local_invalid_parameter_handler. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-runtime-l1-1-0.spec | 4 ++-- dlls/msvcrt/errno.c | 19 +++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 4 ++-- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec index e138bf6..9864c6c 100644 --- a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec +++ b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec @@ -46,7 +46,7 @@ @ stub _get_narrow_winmain_command_line @ cdecl _get_pgmptr(ptr) ucrtbase._get_pgmptr @ cdecl _get_terminate() ucrtbase._get_terminate -@ stub _get_thread_local_invalid_parameter_handler +@ cdecl _get_thread_local_invalid_parameter_handler() ucrtbase._get_thread_local_invalid_parameter_handler @ stub _get_wide_winmain_command_line @ cdecl _get_wpgmptr(ptr) ucrtbase._get_wpgmptr @ cdecl _getdllprocaddr(long str long) ucrtbase._getdllprocaddr @@ -73,7 +73,7 @@ @ cdecl _set_error_mode(long) ucrtbase._set_error_mode @ cdecl _set_invalid_parameter_handler(ptr) ucrtbase._set_invalid_parameter_handler @ cdecl _set_new_handler(ptr) ucrtbase._set_new_handler -@ stub _set_thread_local_invalid_parameter_handler +@ cdecl _set_thread_local_invalid_parameter_handler(ptr) ucrtbase._set_thread_local_invalid_parameter_handler @ cdecl _seterrormode(long) ucrtbase._seterrormode @ cdecl _sleep(long) ucrtbase._sleep @ cdecl _statusfp() ucrtbase._statusfp diff --git a/dlls/msvcrt/errno.c b/dlls/msvcrt/errno.c index 6c1a912..75e211e 100644 --- a/dlls/msvcrt/errno.c +++ b/dlls/msvcrt/errno.c @@ -473,3 +473,22 @@ MSVCRT_invalid_parameter_handler CDECL _set_invalid_parameter_handler( invalid_parameter_handler = handler; return old; } + +/********************************************************************* + * _get_thread_local_invalid_parameter_handler (UCRTBASE.@) + */ +MSVCRT_invalid_parameter_handler CDECL _get_thread_local_invalid_parameter_handler(void) +{ + FIXME(" stub\n"); + return NULL; +} + +/********************************************************************* + * _set_thread_local_invalid_parameter_handler (UCRTBASE.@) + */ +MSVCRT_invalid_parameter_handler CDECL _set_thread_local_invalid_parameter_handler( + MSVCRT_invalid_parameter_handler handler) +{ + FIXME("(%p) stub\n", handler); + return NULL; +} diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index bda6d3d..9d65d3c 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -375,7 +375,7 @@ @ stub _get_purecall_handler @ cdecl _get_stream_buffer_pointers(ptr ptr ptr ptr) MSVCRT__get_stream_buffer_pointers @ cdecl _get_terminate() MSVCRT__get_terminate -@ stub _get_thread_local_invalid_parameter_handler +@ cdecl _get_thread_local_invalid_parameter_handler() @ cdecl _get_timezone(ptr) @ cdecl _get_tzname(ptr str long long) MSVCRT__get_tzname @ cdecl _get_unexpected() MSVCRT__get_unexpected @@ -1893,7 +1893,7 @@ @ cdecl _set_printf_count_output(long) MSVCRT__set_printf_count_output @ cdecl _set_purecall_handler(ptr) @ stub _set_se_translator -@ stub _set_thread_local_invalid_parameter_handler +@ cdecl _set_thread_local_invalid_parameter_handler(ptr) @ cdecl _seterrormode(long) @ cdecl -arch=i386 -norelay _setjmp3(ptr long) MSVCRT__setjmp3 @ cdecl _setmaxstdio(long) MSVCRT__setmaxstdio

1 0

Hugh McMaster : reg: Avoid possible out-of-bounds memory access when a switch is only a forward slash or hyphen.
by Alexandre Julliard 09 Jun '16

09 Jun '16

Module: wine Branch: master Commit: 7d962327b12cc0f07681fe46c8d4c5715faeb819 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d962327b12cc0f07681fe46c… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jun 9 05:48:29 2016 +0000 reg: Avoid possible out-of-bounds memory access when a switch is only a forward slash or hyphen. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 7d9c972..20df2dd 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -937,7 +937,7 @@ int wmain(int argc, WCHAR *argvW[]) value_all = TRUE; continue; } - else if (ptr[1]) + else if (!ptr[0] || ptr[1]) { output_message(STRING_INVALID_CMDLINE); return 1;

1 0

Józef Kucia : d3d10core/tests: Add more tests for creating shader resource views.
by Alexandre Julliard 09 Jun '16

09 Jun '16

Module: wine Branch: master Commit: cc9b4d8a9eb20eeb61dbaffb7b37619b217b7b2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc9b4d8a9eb20eeb61dbaffb7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jun 8 14:54:56 2016 +0200 d3d10core/tests: Add more tests for creating shader resource views. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 211 +++++++++++++++++++++++++++++------------- 1 file changed, 145 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cc9b4d8a9eb20eeb61dba…

1 0

Józef Kucia : d3d11: Normalize "ArraySize" field in D3D11_RENDER_TARGET_VIEW_DESC.
by Alexandre Julliard 09 Jun '16

09 Jun '16

Module: wine Branch: master Commit: 723f73aeb69cb94c842f7ad5b29d3224fecbadd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=723f73aeb69cb94c842f7ad5b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jun 8 14:54:57 2016 +0200 d3d11: Normalize "ArraySize" field in D3D11_RENDER_TARGET_VIEW_DESC. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/view.c | 73 +++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 47 insertions(+), 26 deletions(-) diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 7bec5b9..5a2ef39 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -282,7 +282,7 @@ static HRESULT set_rtdesc_from_resource(D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3 desc->ViewDimension = D3D11_RTV_DIMENSION_TEXTURE3D; desc->u.Texture3D.MipSlice = 0; desc->u.Texture3D.FirstWSlice = 0; - desc->u.Texture3D.WSize = 1; + desc->u.Texture3D.WSize = texture_desc.Depth; return S_OK; } @@ -296,52 +296,73 @@ static HRESULT set_rtdesc_from_resource(D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3 static void normalize_rtv_desc(D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3D11Resource *resource) { D3D11_RESOURCE_DIMENSION dimension; - - if (desc->Format != DXGI_FORMAT_UNKNOWN) - return; + unsigned int layer_count; + DXGI_FORMAT format; ID3D11Resource_GetType(resource, &dimension); switch (dimension) { - case D3D11_RESOURCE_DIMENSION_TEXTURE1D: + case D3D11_RESOURCE_DIMENSION_TEXTURE2D: { - D3D11_TEXTURE1D_DESC texture_desc; - ID3D11Texture1D *texture; + const struct d3d_texture2d *texture; - if (FAILED(ID3D11Resource_QueryInterface(resource, &IID_ID3D11Texture1D, (void **)&texture))) + if (!(texture = unsafe_impl_from_ID3D11Texture2D((ID3D11Texture2D *)resource))) { - ERR("Resource of type TEXTURE1D doesn't implement ID3D11Texture1D.\n"); - break; + ERR("Cannot get implementation from ID3D11Texture2D.\n"); + return; } - ID3D11Texture1D_GetDesc(texture, &texture_desc); - ID3D11Texture1D_Release(texture); - - if (desc->Format == DXGI_FORMAT_UNKNOWN) - desc->Format = texture_desc.Format; + format = texture->desc.Format; + layer_count = texture->desc.ArraySize; break; } - case D3D11_RESOURCE_DIMENSION_TEXTURE2D: + case D3D11_RESOURCE_DIMENSION_TEXTURE3D: { - D3D11_TEXTURE2D_DESC texture_desc; - ID3D11Texture2D *texture; + const struct d3d_texture3d *texture; - if (FAILED(ID3D11Resource_QueryInterface(resource, &IID_ID3D11Texture2D, (void **)&texture))) + if (!(texture = unsafe_impl_from_ID3D11Texture3D((ID3D11Texture3D *)resource))) { - ERR("Resource of type TEXTURE2D doesn't implement ID3D11Texture2D.\n"); - break; + ERR("Cannot get implementation from ID3D11Texture3D.\n"); + return; } - ID3D11Texture2D_GetDesc(texture, &texture_desc); - ID3D11Texture2D_Release(texture); - - if (desc->Format == DXGI_FORMAT_UNKNOWN) - desc->Format = texture_desc.Format; + format = texture->desc.Format; + layer_count = texture->desc.Depth; break; } default: + return; + } + + if (desc->Format == DXGI_FORMAT_UNKNOWN) + desc->Format = format; + + switch (desc->ViewDimension) + { + case D3D11_RTV_DIMENSION_TEXTURE1DARRAY: + if (desc->u.Texture1DArray.ArraySize == -1 && desc->u.Texture1DArray.FirstArraySlice < layer_count) + desc->u.Texture1DArray.ArraySize = layer_count - desc->u.Texture1DArray.ArraySize; + break; + + case D3D11_RTV_DIMENSION_TEXTURE2DARRAY: + if (desc->u.Texture2DArray.ArraySize == -1 && desc->u.Texture2DArray.FirstArraySlice < layer_count) + desc->u.Texture2DArray.ArraySize = layer_count - desc->u.Texture2DArray.FirstArraySlice; + break; + + case D3D11_RTV_DIMENSION_TEXTURE2DMSARRAY: + if (desc->u.Texture2DMSArray.ArraySize == -1 && desc->u.Texture2DMSArray.FirstArraySlice < layer_count) + desc->u.Texture2DMSArray.ArraySize = layer_count - desc->u.Texture2DMSArray.FirstArraySlice; + break; + + case D3D11_RTV_DIMENSION_TEXTURE3D: + layer_count = max(1, layer_count >> desc->u.Texture3D.MipSlice); + if (desc->u.Texture3D.WSize == -1 && desc->u.Texture3D.FirstWSlice < layer_count) + desc->u.Texture3D.WSize = layer_count - desc->u.Texture3D.FirstWSlice; + break; + + default: break; } }

1 0

Józef Kucia : wined3d: Fix wined3d_rendertarget_view_desc validation for 3D textures.
by Alexandre Julliard 09 Jun '16

09 Jun '16

Module: wine Branch: master Commit: 6c39a1aeab074fce870f4a27273bffe9ad53c121 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c39a1aeab074fce870f4a272… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jun 8 14:54:58 2016 +0200 wined3d: Fix wined3d_rendertarget_view_desc validation for 3D textures. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 1604443..95e1162 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -109,12 +109,21 @@ static HRESULT wined3d_rendertarget_view_init(struct wined3d_rendertarget_view * else { struct wined3d_texture *texture = texture_from_resource(resource); + unsigned int depth_or_layer_count; + + if (resource->type == WINED3D_RTYPE_TEXTURE_3D) + depth_or_layer_count = wined3d_texture_get_level_depth(texture, desc->u.texture.level_idx); + else + depth_or_layer_count = texture->layer_count; if (desc->u.texture.level_idx >= texture->level_count - || desc->u.texture.layer_idx >= texture->layer_count - || desc->u.texture.layer_count > texture->layer_count - desc->u.texture.layer_idx) + || desc->u.texture.layer_idx >= depth_or_layer_count + || desc->u.texture.layer_count > depth_or_layer_count - desc->u.texture.layer_idx) return WINED3DERR_INVALIDCALL; - view->sub_resource_idx = desc->u.texture.layer_idx * texture->level_count + desc->u.texture.level_idx; + + view->sub_resource_idx = desc->u.texture.level_idx; + if (resource->type != WINED3D_RTYPE_TEXTURE_3D) + view->sub_resource_idx += desc->u.texture.layer_idx * texture->level_count; view->buffer_offset = 0; view->width = wined3d_texture_get_level_width(texture, desc->u.texture.level_idx); view->height = wined3d_texture_get_level_height(texture, desc->u.texture.level_idx);

1 0

Jeremy Newman : fix possible XSS attack vector
by Jeremy Newman 08 Jun '16

08 Jun '16

Module: website Branch: master Commit: dfec0f52db8f557b00d2304a09079c3d08a26a4f URL: http://source.winehq.org/git/website.git/?a=commit;h=dfec0f52db8f557b00d230… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Jun 8 13:33:58 2016 -0500 fix possible XSS attack vector --- site.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/site.php b/site.php index 29c5159..e108f77 100644 --- a/site.php +++ b/site.php @@ -77,7 +77,7 @@ if (isset($_SERVER['PATH_INFO'])) } // clean page path - $page = $html->clean_input($page); + $page = $html->clean_input($page, true); // template PAGE path verification if (preg_match('%^global/%', $page)) @@ -87,11 +87,16 @@ if (isset($_SERVER['PATH_INFO'])) $html->in404 = 1; define("PAGE", '404'); } - else + else if (preg_match('/[a-z0-9_-]/i', $page)) { // good path define("PAGE", $page); } + else + { + // unknown + define("PAGE", '404'); + } unset($page, $dirs, $good_dirs); } else

1 0

Michael Stefaniuc : comctl32/tests: Use wine_dbgstr_rect() to print RECTs.
by Alexandre Julliard 08 Jun '16

08 Jun '16

Module: wine Branch: master Commit: 96185e23b4ed64d89a420eb5bc6ba49926dde201 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96185e23b4ed64d89a420eb5b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 8 12:28:46 2016 +0200 comctl32/tests: Use wine_dbgstr_rect() to print RECTs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/header.c | 4 ++-- dlls/comctl32/tests/progress.c | 12 ++++-------- dlls/comctl32/tests/rebar.c | 9 ++++----- dlls/comctl32/tests/status.c | 5 ++--- dlls/comctl32/tests/toolbar.c | 4 ++-- 5 files changed, 14 insertions(+), 20 deletions(-) diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index c828465..5c35b60 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -1350,8 +1350,8 @@ static void test_hds_nosizing(HWND hParent) ok(nm->lItemlParam == lparam, "Invalid lItemlParam %d vs %ld\n", lparam, nm->lItemlParam); \ ok((nm->rc.top == _top && nm->rc.bottom == _bottom && nm->rc.left == _left && nm->rc.right == _right) || \ broken(draw_stage != CDDS_ITEMPREPAINT), /* comctl32 < 5.80 */ \ - "Invalid rect (%d,%d) (%d,%d) vs (%d,%d) (%d,%d)\n", _left, _top, _right, _bottom, \ - nm->rc.left, nm->rc.top, nm->rc.right, nm->rc.bottom); + "Invalid rect (%d,%d)-(%d,%d) vs %s\n", _left, _top, _right, _bottom, \ + wine_dbgstr_rect(&nm->rc)); static LRESULT customdraw_1(int n, NMCUSTOMDRAW *nm) { diff --git a/dlls/comctl32/tests/progress.c b/dlls/comctl32/tests/progress.c index f7ae328..7f69c35 100644 --- a/dlls/comctl32/tests/progress.c +++ b/dlls/comctl32/tests/progress.c @@ -206,10 +206,8 @@ static void test_redraw(void) SetRectEmpty(&last_paint_rect); SendMessageA(hProgressWnd, PBM_SETPOS, 10, 0); GetClientRect(hProgressWnd, &client_rect); - ok(EqualRect(&last_paint_rect, &client_rect), - "last_paint_rect was { %d, %d, %d, %d } instead of { %d, %d, %d, %d }\n", - last_paint_rect.left, last_paint_rect.top, last_paint_rect.right, last_paint_rect.bottom, - client_rect.left, client_rect.top, client_rect.right, client_rect.bottom); + ok(EqualRect(&last_paint_rect, &client_rect), "last_paint_rect was %s instead of %s\n", + wine_dbgstr_rect(&last_paint_rect), wine_dbgstr_rect(&client_rect)); update_window(hProgressWnd); ok(!erased, "Progress bar shouldn't have erased the background\n"); @@ -218,10 +216,8 @@ static void test_redraw(void) SetRectEmpty(&last_paint_rect); SendMessageA(hProgressWnd, PBM_SETPOS, 0, 0); GetClientRect(hProgressWnd, &client_rect); - ok(EqualRect(&last_paint_rect, &client_rect), - "last_paint_rect was { %d, %d, %d, %d } instead of { %d, %d, %d, %d }\n", - last_paint_rect.left, last_paint_rect.top, last_paint_rect.right, last_paint_rect.bottom, - client_rect.left, client_rect.top, client_rect.right, client_rect.bottom); + ok(EqualRect(&last_paint_rect, &client_rect), "last_paint_rect was %s instead of %s\n", + wine_dbgstr_rect(&last_paint_rect), wine_dbgstr_rect(&client_rect)); update_window(hProgressWnd); ok(erased, "Progress bar should have erased the background\n"); } diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c index 0c3e2dd..6430ba2 100644 --- a/dlls/comctl32/tests/rebar.c +++ b/dlls/comctl32/tests/rebar.c @@ -36,14 +36,13 @@ static int system_font_height; #define check_rect(name, val, exp) ok(EqualRect(&val, &exp), \ - "invalid rect (" name ") (%d,%d) (%d,%d) - expected (%d,%d) (%d,%d)\n", \ - val.left, val.top, val.right, val.bottom, exp.left, exp.top, exp.right, exp.bottom); + "invalid rect (" name ") %s - expected %s\n", wine_dbgstr_rect(&val), wine_dbgstr_rect(&exp)); #define check_rect_no_top(name, val, exp) { \ ok((val.bottom - val.top == exp.bottom - exp.top) && \ - val.left == exp.left && val.right == exp.right, "invalid rect (" name ") (%d,%d) (%d,%d) - expected (%d,%d) (%d,%d), ignoring top\n", \ - val.left, val.top, val.right, val.bottom, exp.left, exp.top, exp.right, exp.bottom); \ - } + val.left == exp.left && val.right == exp.right, \ + "invalid rect (" name ") %s - expected %s, ignoring top\n", \ + wine_dbgstr_rect(&val), wine_dbgstr_rect(&exp)); } #define compare(val, exp, format) ok((val) == (exp), #val " value " format " expected " format "\n", (val), (exp)); diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index f537fe0..fa0d970 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -30,9 +30,8 @@ RECT exp = {abs(got.left - _left), abs(got.top - _top), \ abs(got.right - _right), abs(got.bottom - _bottom)}; \ ok(exp.left <= 2 && exp.top <= 2 && exp.right <= 2 && exp.bottom <= 2, \ - "Expected rect {%d,%d, %d,%d}, got {%d,%d, %d,%d}\n", \ - _left, _top, _right, _bottom, \ - (got).left, (got).top, (got).right, (got).bottom); } while (0) + "Expected rect (%d,%d)-(%d,%d), got %s\n", _left, _top, _right, _bottom, \ + wine_dbgstr_rect(&(got))); } while (0) static HINSTANCE hinst; static WNDPROC g_status_wndproc; diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 01c4214..d825e18 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -109,8 +109,8 @@ static const struct message restore_parent_seq[] = { #define expect(EXPECTED,GOT) ok((GOT)==(EXPECTED), "Expected %d, got %d\n", (EXPECTED), (GOT)) #define check_rect(name, val, exp, ...) ok(EqualRect(&val, &exp), \ - "invalid rect (%d,%d) (%d,%d) - expected (%d,%d) (%d,%d) - (" name ")\n", \ - val.left, val.top, val.right, val.bottom, exp.left, exp.top, exp.right, exp.bottom, __VA_ARGS__); + "invalid rect %s - expected %s - (" name ")\n", \ + wine_dbgstr_rect(&val), wine_dbgstr_rect(&exp), __VA_ARGS__); #define compare(val, exp, format) ok((val) == (exp), #val " value " format " expected " format "\n", (val), (exp));

1 0

Huw Davies : gdi32: Rename the struct representing an embedded EMF in a WMF.
by Alexandre Julliard 08 Jun '16

08 Jun '16

Module: wine Branch: master Commit: 7be1c53d8297561c7616b4a3ba7698dea01ffd7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7be1c53d8297561c7616b4a3b… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 8 11:00:45 2016 +0100 gdi32: Rename the struct representing an embedded EMF in a WMF. Also, use an array rather than a pointer to represent the start of the data. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/metafile.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/metafile.c b/dlls/gdi32/metafile.c index 0cb36af..925d648 100644 --- a/dlls/gdi32/metafile.c +++ b/dlls/gdi32/metafile.c @@ -1128,8 +1128,8 @@ typedef struct DWORD chunk_size; DWORD remaining_size; DWORD emf_size; - BYTE *emf_data; -} mf_comment_chunk; + BYTE emf_data[1]; +} emf_in_wmf_comment; #include <poppack.h> static const DWORD wmfc_magic = 0x43464d57; @@ -1146,7 +1146,7 @@ static BOOL add_mf_comment(HDC hdc, HENHMETAFILE emf) { DWORD size = GetEnhMetaFileBits(emf, 0, NULL), i; BYTE *bits, *chunk_data; - mf_comment_chunk *chunk = NULL; + emf_in_wmf_comment *chunk = NULL; BOOL ret = FALSE; static const DWORD max_chunk_size = 0x2000; @@ -1155,7 +1155,7 @@ static BOOL add_mf_comment(HDC hdc, HENHMETAFILE emf) if(!bits) return FALSE; if(!GetEnhMetaFileBits(emf, size, bits)) goto end; - chunk = HeapAlloc(GetProcessHeap(), 0, max_chunk_size + FIELD_OFFSET(mf_comment_chunk, emf_data)); + chunk = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(emf_in_wmf_comment, emf_data[max_chunk_size])); if(!chunk) goto end; chunk->magic = wmfc_magic; @@ -1176,10 +1176,10 @@ static BOOL add_mf_comment(HDC hdc, HENHMETAFILE emf) chunk->chunk_size = chunk->remaining_size; chunk->remaining_size -= chunk->chunk_size; - memcpy(&chunk->emf_data, chunk_data, chunk->chunk_size); + memcpy(chunk->emf_data, chunk_data, chunk->chunk_size); chunk_data += chunk->chunk_size; - if(!Escape(hdc, MFCOMMENT, chunk->chunk_size + FIELD_OFFSET(mf_comment_chunk, emf_data), (char*)chunk, NULL)) + if(!Escape(hdc, MFCOMMENT, FIELD_OFFSET(emf_in_wmf_comment, emf_data[chunk->chunk_size]), (char*)chunk, NULL)) goto end; } ret = TRUE;

1 0

Huw Davies : gdi32: If the WMF was created by GetWinMetaFileBits() then return the original EMF.
by Alexandre Julliard 08 Jun '16

08 Jun '16

Module: wine Branch: master Commit: 19d1416ceff5ebd47a7a41196cf5629d9925fee4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19d1416ceff5ebd47a7a41196… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 8 11:00:46 2016 +0100 gdi32: If the WMF was created by GetWinMetaFileBits() then return the original EMF. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmetafile.c | 56 +++++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/gdi_private.h | 21 +++++++++++++++++ dlls/gdi32/metafile.c | 22 +----------------- dlls/gdi32/tests/metafile.c | 22 +++++++++++++++--- 4 files changed, 97 insertions(+), 24 deletions(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 17ccd1f..c251b4e 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -2686,6 +2686,59 @@ UINT WINAPI GetEnhMetaFilePaletteEntries( HENHMETAFILE hEmf, return infoForCallBack.cEntries; } +/****************************************************************** + * extract_emf_from_comment + * + * If the WMF was created by GetWinMetaFileBits, then extract the + * original EMF that is stored in MFCOMMENT chunks. + */ +static HENHMETAFILE extract_emf_from_comment( const BYTE *buf, UINT mf_size ) +{ + METAHEADER *mh = (METAHEADER *)buf; + METARECORD *mr; + emf_in_wmf_comment *chunk; + WORD checksum = 0; + DWORD size = 0, remaining, chunks; + BYTE *emf_bits = NULL, *ptr; + UINT offset; + HENHMETAFILE emf = NULL; + + if (mf_size < sizeof(*mh)) return NULL; + + for (offset = mh->mtHeaderSize * 2; offset < mf_size; offset += (mr->rdSize * 2)) + { + mr = (METARECORD *)((char *)mh + offset); + chunk = (emf_in_wmf_comment *)(mr->rdParm + 2); + + if (mr->rdFunction != META_ESCAPE || mr->rdParm[0] != MFCOMMENT) goto done; + if (chunk->magic != WMFC_MAGIC) goto done; + + if (!emf_bits) + { + size = remaining = chunk->emf_size; + chunks = chunk->num_chunks; + emf_bits = ptr = HeapAlloc( GetProcessHeap(), 0, size ); + if (!emf_bits) goto done; + } + if (chunk->chunk_size > remaining) goto done; + remaining -= chunk->chunk_size; + if (chunk->remaining_size != remaining) goto done; + memcpy( ptr, chunk->emf_data, chunk->chunk_size ); + ptr += chunk->chunk_size; + if (--chunks == 0) break; + } + + for (offset = 0; offset < mf_size / 2; offset++) + checksum += *((WORD *)buf + offset); + if (checksum) goto done; + + emf = SetEnhMetaFileBits( size, emf_bits ); + +done: + HeapFree( GetProcessHeap(), 0, emf_bits ); + return emf; +} + typedef struct gdi_mf_comment { DWORD ident; @@ -2722,6 +2775,9 @@ HENHMETAFILE WINAPI SetWinMetaFileBits(UINT cbBuffer, const BYTE *lpbBuffer, HDC return NULL; } + ret = extract_emf_from_comment( lpbBuffer, cbBuffer ); + if (ret) return ret; + if(!hdcRef) hdcRef = hdcdisp = CreateDCW(szDisplayW, NULL, NULL, NULL); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index cde9867..08a5d3b 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -311,6 +311,27 @@ extern void GDI_hdc_not_using_object(HGDIOBJ obj, HDC hdc) DECLSPEC_HIDDEN; extern HMETAFILE MF_Create_HMETAFILE(METAHEADER *mh) DECLSPEC_HIDDEN; extern METAHEADER *MF_CreateMetaHeaderDisk(METAHEADER *mr, LPCVOID filename, BOOL unicode ) DECLSPEC_HIDDEN; +/* Format of comment record added by GetWinMetaFileBits */ +#include <pshpack2.h> +typedef struct +{ + DWORD magic; /* WMFC */ + WORD unk04; /* 1 */ + WORD unk06; /* 0 */ + WORD unk08; /* 0 */ + WORD unk0a; /* 1 */ + WORD checksum; + DWORD unk0e; /* 0 */ + DWORD num_chunks; + DWORD chunk_size; + DWORD remaining_size; + DWORD emf_size; + BYTE emf_data[1]; +} emf_in_wmf_comment; +#include <poppack.h> + +#define WMFC_MAGIC 0x43464d57 + /* path.c */ extern void free_gdi_path( struct gdi_path *path ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/metafile.c b/dlls/gdi32/metafile.c index 925d648..c7e25a7 100644 --- a/dlls/gdi32/metafile.c +++ b/dlls/gdi32/metafile.c @@ -1114,26 +1114,6 @@ UINT WINAPI GetMetaFileBitsEx( HMETAFILE hmf, UINT nSize, LPVOID buf ) return mfSize; } -#include <pshpack2.h> -typedef struct -{ - DWORD magic; /* WMFC */ - WORD unk04; /* 1 */ - WORD unk06; /* 0 */ - WORD unk08; /* 0 */ - WORD unk0a; /* 1 */ - WORD checksum; - DWORD unk0e; /* 0 */ - DWORD num_chunks; - DWORD chunk_size; - DWORD remaining_size; - DWORD emf_size; - BYTE emf_data[1]; -} emf_in_wmf_comment; -#include <poppack.h> - -static const DWORD wmfc_magic = 0x43464d57; - /****************************************************************** * add_mf_comment * @@ -1158,7 +1138,7 @@ static BOOL add_mf_comment(HDC hdc, HENHMETAFILE emf) chunk = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(emf_in_wmf_comment, emf_data[max_chunk_size])); if(!chunk) goto end; - chunk->magic = wmfc_magic; + chunk->magic = WMFC_MAGIC; chunk->unk04 = 1; chunk->unk06 = 0; chunk->unk08 = 0; diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 9a5c1a5..79f072b 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -3249,16 +3249,17 @@ static BOOL near_match(int x, int y) static void getwinmetafilebits(UINT mode, int scale, RECT *rc) { - HENHMETAFILE emf; + HENHMETAFILE emf, emf2; HDC display_dc, emf_dc; - ENHMETAHEADER *enh_header; - UINT size, emf_size, i; + ENHMETAHEADER *enh_header, *enh2_header; + UINT size, emf_size, i, emf2_size; WORD check = 0; DWORD rec_num = 0; METAHEADER *mh = NULL; METARECORD *rec; INT horz_res, vert_res, horz_size, vert_size; INT curve_caps, line_caps, poly_caps; + METAFILEPICT mfp; display_dc = GetDC(NULL); ok(display_dc != NULL, "display_dc is NULL\n"); @@ -3401,6 +3402,21 @@ static void getwinmetafilebits(UINT mode, int scale, RECT *rc) rec = (METARECORD*)((WORD*)rec + rec->rdSize); } + /* Show that we get the original back when we do the reverse conversion. + mfp is ignored in this case. */ + mfp.mm = MM_ISOTROPIC; + mfp.xExt = 0xcafe; + mfp.yExt = 0xbeef; + emf2 = SetWinMetaFileBits( size, (BYTE*)mh, NULL, &mfp ); + ok( !!emf2, "got NULL\n" ); + emf2_size = GetEnhMetaFileBits( emf2, 0, NULL ); + enh2_header = HeapAlloc( GetProcessHeap(), 0, emf2_size ); + emf2_size = GetEnhMetaFileBits( emf2, emf2_size, (BYTE*)enh2_header ); + ok( emf_size == emf2_size, "%d %d\n", emf_size, emf2_size ); + ok( !memcmp( enh_header, enh2_header, emf_size ), "mismatch\n" ); + HeapFree( GetProcessHeap(), 0, enh2_header ); + DeleteEnhMetaFile( emf2 ); + end: HeapFree(GetProcessHeap(), 0, mh); HeapFree(GetProcessHeap(), 0, enh_header);

1 0