January 2017 - Wine-Commits

Jacek Caban : mshtml: Initialize nsAString in IHTMLDocument3::get_dir.
by Alexandre Julliard Jan. 25, 2017

Jan. 25, 2017

Module: wine Branch: master Commit: 4823119a79152f7cf3808b9744e2143776970edb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4823119a79152f7cf3808b974… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 24 13:26:25 2017 +0100 mshtml: Initialize nsAString in IHTMLDocument3::get_dir. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 47e087d..cf9344f 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2207,6 +2207,7 @@ static HRESULT WINAPI HTMLDocument3_get_dir(IHTMLDocument3 *iface, BSTR *p) return E_UNEXPECTED; } + nsAString_Init(&dir_str, NULL); nsres = nsIDOMHTMLDocument_GetDir(This->doc_node->nsdoc, &dir_str); return return_nsstr(nsres, &dir_str, p); }

1 0

Zebediah Figura : ws2_32/tests: Fix memcmp size in test_TransmitFile().
by Alexandre Julliard Jan. 25, 2017

Jan. 25, 2017

Module: wine Branch: master Commit: b655102ca38dd8120d5437d6aeae9289eb37cd4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b655102ca38dd8120d5437d6a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jan 22 15:25:04 2017 -0600 ws2_32/tests: Fix memcmp size in test_TransmitFile(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 5856718..7208088 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -8296,17 +8296,17 @@ static void test_TransmitFile(void) /* Test TransmitFile with only buffer data */ buffers.Head = &header_msg[0]; - buffers.HeadLength = sizeof(header_msg)+1; + buffers.HeadLength = sizeof(header_msg); buffers.Tail = &footer_msg[0]; - buffers.TailLength = sizeof(footer_msg)+1; + buffers.TailLength = sizeof(footer_msg); bret = pTransmitFile(client, NULL, 0, 0, NULL, &buffers, 0); ok(bret, "TransmitFile failed unexpectedly.\n"); iret = recv(dest, buf, sizeof(buf), 0); - ok(iret == sizeof(header_msg)+sizeof(footer_msg)+2, + ok(iret == sizeof(header_msg)+sizeof(footer_msg), "Returned an unexpected buffer from TransmitFile: %d\n", iret ); - ok(memcmp(&buf[0], &header_msg[0], sizeof(header_msg)+1) == 0, + ok(memcmp(&buf[0], &header_msg[0], sizeof(header_msg)) == 0, "TransmitFile header buffer did not match!\n"); - ok(memcmp(&buf[sizeof(header_msg)+1], &footer_msg[0], sizeof(footer_msg)+1) == 0, + ok(memcmp(&buf[sizeof(header_msg)], &footer_msg[0], sizeof(footer_msg)) == 0, "TransmitFile footer buffer did not match!\n"); /* Test TransmitFile with only file data */ @@ -8316,18 +8316,18 @@ static void test_TransmitFile(void) /* Test TransmitFile with both file and buffer data */ buffers.Head = &header_msg[0]; - buffers.HeadLength = sizeof(header_msg)+1; + buffers.HeadLength = sizeof(header_msg); buffers.Tail = &footer_msg[0]; - buffers.TailLength = sizeof(footer_msg)+1; + buffers.TailLength = sizeof(footer_msg); SetFilePointer(file, 0, NULL, FILE_BEGIN); bret = pTransmitFile(client, file, 0, 0, NULL, &buffers, 0); ok(bret, "TransmitFile failed unexpectedly.\n"); - iret = recv(dest, buf, sizeof(header_msg)+1, 0); - ok(memcmp(buf, &header_msg[0], sizeof(header_msg)+1) == 0, + iret = recv(dest, buf, sizeof(header_msg), 0); + ok(memcmp(buf, &header_msg[0], sizeof(header_msg)) == 0, "TransmitFile header buffer did not match!\n"); compare_file(file, dest, 0); - iret = recv(dest, buf, sizeof(footer_msg)+1, 0); - ok(memcmp(buf, &footer_msg[0], sizeof(footer_msg)+1) == 0, + iret = recv(dest, buf, sizeof(footer_msg), 0); + ok(memcmp(buf, &footer_msg[0], sizeof(footer_msg)) == 0, "TransmitFile footer buffer did not match!\n"); /* Test overlapped TransmitFile */ @@ -8381,9 +8381,9 @@ static void test_TransmitFile(void) goto cleanup; } buffers.Head = &header_msg[0]; - buffers.HeadLength = sizeof(header_msg)+1; + buffers.HeadLength = sizeof(header_msg); buffers.Tail = &footer_msg[0]; - buffers.TailLength = sizeof(footer_msg)+1; + buffers.TailLength = sizeof(footer_msg); SetFilePointer(file, 0, NULL, FILE_BEGIN); ov.Offset = 0; bret = pTransmitFile(client, file, 0, 0, &ov, &buffers, 0); @@ -8396,12 +8396,12 @@ static void test_TransmitFile(void) ok(total_sent == (file_size + buffers.HeadLength + buffers.TailLength), "Overlapped TransmitFile sent an unexpected number of bytes (%d != %d).\n", total_sent, file_size + buffers.HeadLength + buffers.TailLength); - iret = recv(dest, buf, sizeof(header_msg)+1, 0); - ok(memcmp(buf, &header_msg[0], sizeof(header_msg)+1) == 0, + iret = recv(dest, buf, sizeof(header_msg), 0); + ok(memcmp(buf, &header_msg[0], sizeof(header_msg)) == 0, "TransmitFile header buffer did not match!\n"); compare_file(file, dest, 0); - iret = recv(dest, buf, sizeof(footer_msg)+1, 0); - ok(memcmp(buf, &footer_msg[0], sizeof(footer_msg)+1) == 0, + iret = recv(dest, buf, sizeof(footer_msg), 0); + ok(memcmp(buf, &footer_msg[0], sizeof(footer_msg)) == 0, "TransmitFile footer buffer did not match!\n"); /* Test TransmitFile with a UDP datagram socket */

1 0

Nikolay Sivov : wshom: Added IProvideClassInfo support for implemented interfaces.
by Alexandre Julliard Jan. 25, 2017

Jan. 25, 2017

Module: wine Branch: master Commit: 722c28cb5de076a4894a0a23500b160531a8b744 URL: http://source.winehq.org/git/wine.git/?a=commit;h=722c28cb5de076a4894a0a235… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 25 00:50:36 2017 +0300 wshom: Added IProvideClassInfo support for implemented interfaces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wshom.ocx/shell.c | 93 +++++++++++++++++++++++++++++------------- dlls/wshom.ocx/tests/wshom.c | 31 +++++++++++++- dlls/wshom.ocx/tests/wshom.idl | 8 ++++ dlls/wshom.ocx/wshom.idl | 8 ++++ dlls/wshom.ocx/wshom_main.c | 72 ++++++++++++++++++++++++++++++-- dlls/wshom.ocx/wshom_private.h | 9 ++++ 6 files changed, 189 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=722c28cb5de076a4894a0…

1 0

Gerald Pfeifer : rpcrt4: Avoid potential overflow in rpcrt4_protseq_ncacn_np_open_endpoint.
by Alexandre Julliard Jan. 25, 2017

Jan. 25, 2017

Module: wine Branch: master Commit: 042b41dd5705d6412236ed81d4a03aff7831c631 URL: http://source.winehq.org/git/wine.git/?a=commit;h=042b41dd5705d6412236ed81d… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Jan 21 16:32:22 2017 +0100 rpcrt4: Avoid potential overflow in rpcrt4_protseq_ncacn_np_open_endpoint. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_transport.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 2537a3f..fb3edb4 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -346,7 +346,7 @@ static RPC_STATUS rpcrt4_protseq_ncacn_np_open_endpoint(RpcServerProtseq *protse RPC_STATUS r; LPSTR pname; RpcConnection *Connection; - char generated_endpoint[21]; + char generated_endpoint[26]; if (!endpoint) {

1 0

Henri Verbeet : wined3d: Use the depth/ stencil view to acquire a context for depth-only draws.
by Alexandre Julliard Jan. 25, 2017

Jan. 25, 2017

Module: wine Branch: master Commit: c93f2e3f8544d4c4fcfe24bb894bdf7661ba4fac URL: http://source.winehq.org/git/wine.git/?a=commit;h=c93f2e3f8544d4c4fcfe24bb8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 24 22:15:25 2017 +0100 wined3d: Use the depth/stencil view to acquire a context for depth-only draws. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/drawprim.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index ebccb1d..9be696b 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -414,8 +414,8 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s const struct wined3d_fb_state *fb = state->fb; const struct wined3d_stream_info *stream_info; struct wined3d_event_query *ib_query = NULL; + struct wined3d_rendertarget_view *dsv, *rtv; struct wined3d_stream_info si_emulated; - struct wined3d_rendertarget_view *dsv; const struct wined3d_gl_info *gl_info; struct wined3d_context *context; unsigned int i, idx_size = 0; @@ -425,7 +425,9 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s if (!index_count) return; - context = context_acquire(device, wined3d_rendertarget_view_get_surface(fb->render_targets[0])); + if (!(rtv = fb->render_targets[0])) + rtv = fb->depth_stencil; + context = context_acquire(device, wined3d_rendertarget_view_get_surface(rtv)); if (!context->valid) { context_release(context); @@ -436,10 +438,9 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s for (i = 0; i < gl_info->limits.buffers; ++i) { - struct wined3d_rendertarget_view *rtv = fb->render_targets[i]; struct wined3d_texture *rt; - if (!rtv || rtv->format->id == WINED3DFMT_NULL) + if (!(rtv = fb->render_targets[i]) || rtv->format->id == WINED3DFMT_NULL) continue; rt = wined3d_texture_from_resource(rtv->resource);

1 0

Henri Verbeet : wined3d: Get rid of the "AlwaysOffscreen" setting.
by Alexandre Julliard Jan. 25, 2017

Jan. 25, 2017

Module: wine Branch: master Commit: ff85cd5f4af3408e35bbfd51446c4ea516856e5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff85cd5f4af3408e35bbfd514… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 24 22:15:26 2017 +0100 wined3d: Get rid of the "AlwaysOffscreen" setting. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 5 ++--- dlls/wined3d/swapchain.c | 21 --------------------- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_main.c | 7 ------- dlls/wined3d/wined3d_private.h | 1 - 5 files changed, 3 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 6112b40..b4e40fd 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1752,7 +1752,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, if (color_format->id == WINED3DFMT_P8_UINT) color_format = wined3d_get_format(gl_info, WINED3DFMT_B8G8R8A8_UNORM, target_usage); - /* When "always_offscreen" is enabled, we only use the drawable for + /* When using FBOs for off-screen rendering, we only use the drawable for * presentation blits, and don't do any rendering to it. That means we * don't need depth or stencil buffers, and can mostly ignore the render * target format. This wouldn't necessarily be quite correct for 10bpc @@ -1760,8 +1760,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, * Using the same format regardless of the color/depth/stencil targets * makes it much less likely that different wined3d instances will set * conflicting pixel formats. */ - if (wined3d_settings.offscreen_rendering_mode != ORM_BACKBUFFER - && wined3d_settings.always_offscreen) + if (wined3d_settings.offscreen_rendering_mode != ORM_BACKBUFFER) { color_format = wined3d_get_format(gl_info, WINED3DFMT_B8G8R8A8_UNORM, target_usage); ds_format = wined3d_get_format(gl_info, WINED3DFMT_UNKNOWN, WINED3DUSAGE_DEPTHSTENCIL); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 06215fc..e52ab41 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -749,8 +749,6 @@ static const struct wined3d_swapchain_ops swapchain_gdi_ops = static void swapchain_update_render_to_fbo(struct wined3d_swapchain *swapchain) { - RECT client_rect; - if (wined3d_settings.offscreen_rendering_mode != ORM_FBO) return; @@ -761,25 +759,6 @@ static void swapchain_update_render_to_fbo(struct wined3d_swapchain *swapchain) return; } - GetClientRect(swapchain->win_handle, &client_rect); - - TRACE("Backbuffer %ux%u, window %ux%u.\n", - swapchain->desc.backbuffer_width, - swapchain->desc.backbuffer_height, - client_rect.right, client_rect.bottom); - TRACE("Multisample type %#x, quality %#x.\n", - swapchain->desc.multisample_type, - swapchain->desc.multisample_quality); - - if (!wined3d_settings.always_offscreen && !swapchain->desc.multisample_type - && swapchain->desc.backbuffer_width == client_rect.right - && swapchain->desc.backbuffer_height == client_rect.bottom) - { - TRACE("Backbuffer dimensions match window dimensions, rendering onscreen.\n"); - swapchain->render_to_fbo = FALSE; - return; - } - TRACE("Rendering to FBO.\n"); swapchain->render_to_fbo = TRUE; } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index da003e1..b4267ed 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1366,7 +1366,7 @@ BOOL wined3d_texture_prepare_location(struct wined3d_texture *texture, unsigned return TRUE; case WINED3D_LOCATION_DRAWABLE: - if (!texture->swapchain && wined3d_settings.always_offscreen) + if (!texture->swapchain && wined3d_settings.offscreen_rendering_mode != ORM_BACKBUFFER) ERR("Texture %p does not have a drawable.\n", texture); return TRUE; diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index eb566bc..442a970 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -82,7 +82,6 @@ struct wined3d_settings wined3d_settings = TRUE, /* Multisampling enabled by default. */ ~0u, /* Don't force a specific sample count by default. */ FALSE, /* No strict draw ordering. */ - TRUE, /* Don't try to render onscreen by default. */ FALSE, /* Don't range check relative addressing indices in float constants. */ ~0U, /* No VS shader model limit by default. */ ~0U, /* No HS shader model limit by default. */ @@ -304,12 +303,6 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) TRACE("Enforcing strict draw ordering.\n"); wined3d_settings.strict_draw_ordering = TRUE; } - if (!get_config_key(hkey, appkey, "AlwaysOffscreen", buffer, size) - && !strcmp(buffer,"disabled")) - { - TRACE("Not always rendering backbuffers offscreen.\n"); - wined3d_settings.always_offscreen = FALSE; - } if (!get_config_key(hkey, appkey, "CheckFloatConstants", buffer, size) && !strcmp(buffer, "enabled")) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 271c605..71c9523 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -298,7 +298,6 @@ struct wined3d_settings int allow_multisampling; unsigned int sample_count; BOOL strict_draw_ordering; - BOOL always_offscreen; BOOL check_float_constants; unsigned int max_sm_vs; unsigned int max_sm_hs;

1 0

Henri Verbeet : wined3d: Get rid of surface_load_ds_location().
by Alexandre Julliard Jan. 25, 2017

Jan. 25, 2017

Module: wine Branch: master Commit: 1bd56b6ca5638cdf026938eb89fac0ccfd24874b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bd56b6ca5638cdf026938eb8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 24 22:15:27 2017 +0100 wined3d: Get rid of surface_load_ds_location(). This should be unused now that "AlwaysOffscreen" is gone. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 186 ------------------------------------- dlls/wined3d/glsl_shader.c | 179 ------------------------------------ dlls/wined3d/shader.c | 5 - dlls/wined3d/surface.c | 188 -------------------------------------- dlls/wined3d/wined3d_private.h | 3 - 5 files changed, 561 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1bd56b6ca5638cdf02693…

1 0

Fabian Maurer : gdi32: Add traces for painting functions.
by Alexandre Julliard Jan. 25, 2017

Jan. 25, 2017

Module: wine Branch: master Commit: e0ad2c3e5f59ae977595915fcd8159e02ce1e2f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0ad2c3e5f59ae977595915fc… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Wed Jan 25 03:56:15 2017 +0100 gdi32: Add traces for painting functions. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/painting.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 52 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index b12f312..d61ab4a 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -237,6 +237,8 @@ BOOL WINAPI LineTo( HDC hdc, INT x, INT y ) PHYSDEV physdev; BOOL ret; + TRACE( "%p, (%d, %d)\n", hdc, x, y ); + if(!dc) return FALSE; update_dc( dc ); @@ -262,6 +264,8 @@ BOOL WINAPI MoveToEx( HDC hdc, INT x, INT y, LPPOINT pt ) PHYSDEV physdev; DC * dc = get_dc_ptr( hdc ); + TRACE( "%p, (%d, %d), %p\n", hdc, x, y, pt ); + if(!dc) return FALSE; if(pt) @@ -288,6 +292,8 @@ BOOL WINAPI Arc( HDC hdc, INT left, INT top, INT right, BOOL ret; DC * dc = get_dc_ptr( hdc ); + TRACE( "%p, (%d, %d)-(%d, %d), (%d, %d), (%d, %d)\n", hdc, left, top, right, bottom, xstart, ystart, xend, yend ); + if (!dc) return FALSE; update_dc( dc ); physdev = GET_DC_PHYSDEV( dc, pArc ); @@ -315,8 +321,10 @@ BOOL WINAPI ArcTo( HDC hdc, PHYSDEV physdev; BOOL result; DC * dc = get_dc_ptr( hdc ); - if(!dc) return FALSE; + TRACE( "%p, (%d, %d)-(%d, %d), (%d, %d), (%d, %d)\n", hdc, left, top, right, bottom, xstart, ystart, xend, yend ); + + if(!dc) return FALSE; update_dc( dc ); physdev = GET_DC_PHYSDEV( dc, pArcTo ); result = physdev->funcs->pArcTo( physdev, left, top, right, bottom, xstart, ystart, xend, yend ); @@ -343,8 +351,10 @@ BOOL WINAPI Pie( HDC hdc, INT left, INT top, BOOL ret; PHYSDEV physdev; DC * dc = get_dc_ptr( hdc ); - if (!dc) return FALSE; + TRACE( "%p, (%d, %d)-(%d, %d), (%d, %d), (%d, %d)\n", hdc, left, top, right, bottom, xstart, ystart, xend, yend ); + + if (!dc) return FALSE; update_dc( dc ); physdev = GET_DC_PHYSDEV( dc, pPie ); ret = physdev->funcs->pPie( physdev, left, top, right, bottom, xstart, ystart, xend, yend ); @@ -363,8 +373,10 @@ BOOL WINAPI Chord( HDC hdc, INT left, INT top, BOOL ret; PHYSDEV physdev; DC * dc = get_dc_ptr( hdc ); - if (!dc) return FALSE; + TRACE( "%p, (%d, %d)-(%d, %d), (%d, %d), (%d, %d)\n", hdc, left, top, right, bottom, xstart, ystart, xend, yend ); + + if (!dc) return FALSE; update_dc( dc ); physdev = GET_DC_PHYSDEV( dc, pChord ); ret = physdev->funcs->pChord( physdev, left, top, right, bottom, xstart, ystart, xend, yend ); @@ -382,8 +394,10 @@ BOOL WINAPI Ellipse( HDC hdc, INT left, INT top, BOOL ret; PHYSDEV physdev; DC * dc = get_dc_ptr( hdc ); - if (!dc) return FALSE; + TRACE( "%p, (%d, %d)-(%d, %d)\n", hdc, left, top, right, bottom ); + + if (!dc) return FALSE; update_dc( dc ); physdev = GET_DC_PHYSDEV( dc, pEllipse ); ret = physdev->funcs->pEllipse( physdev, left, top, right, bottom ); @@ -402,6 +416,8 @@ BOOL WINAPI Rectangle( HDC hdc, INT left, INT top, BOOL ret; DC * dc = get_dc_ptr( hdc ); + TRACE( "%p, (%d, %d)-(%d, %d)\n", hdc, left, top, right, bottom ); + if (!dc) return FALSE; update_dc( dc ); physdev = GET_DC_PHYSDEV( dc, pRectangle ); @@ -421,6 +437,8 @@ BOOL WINAPI RoundRect( HDC hdc, INT left, INT top, INT right, BOOL ret; DC *dc = get_dc_ptr( hdc ); + TRACE( "%p, (%d, %d)-(%d, %d), %dx%d\n", hdc, left, top, right, bottom, ell_width, ell_height ); + if (!dc) return FALSE; update_dc( dc ); physdev = GET_DC_PHYSDEV( dc, pRoundRect ); @@ -534,6 +552,8 @@ BOOL WINAPI PaintRgn( HDC hdc, HRGN hrgn ) BOOL ret; DC * dc = get_dc_ptr( hdc ); + TRACE( "%p, %p\n", hdc, hrgn ); + if (!dc) return FALSE; update_dc( dc ); physdev = GET_DC_PHYSDEV( dc, pPaintRgn ); @@ -552,6 +572,8 @@ BOOL WINAPI FillRgn( HDC hdc, HRGN hrgn, HBRUSH hbrush ) BOOL retval; DC * dc = get_dc_ptr( hdc ); + TRACE( "%p, %p, %p\n", hdc, hrgn, hbrush ); + if (!dc) return FALSE; update_dc( dc ); physdev = GET_DC_PHYSDEV( dc, pFillRgn ); @@ -571,6 +593,8 @@ BOOL WINAPI FrameRgn( HDC hdc, HRGN hrgn, HBRUSH hbrush, BOOL ret; DC *dc = get_dc_ptr( hdc ); + TRACE( "%p, %p, %p, %dx%d\n", hdc, hrgn, hbrush, nWidth, nHeight ); + if (!dc) return FALSE; update_dc( dc ); physdev = GET_DC_PHYSDEV( dc, pFrameRgn ); @@ -589,6 +613,8 @@ BOOL WINAPI InvertRgn( HDC hdc, HRGN hrgn ) BOOL ret; DC *dc = get_dc_ptr( hdc ); + TRACE( "%p, %p\n", hdc, hrgn ); + if (!dc) return FALSE; update_dc( dc ); physdev = GET_DC_PHYSDEV( dc, pInvertRgn ); @@ -607,6 +633,8 @@ BOOL WINAPI Polyline( HDC hdc, const POINT* pt, INT count ) BOOL ret; DC * dc = get_dc_ptr( hdc ); + TRACE( "%p, %p, %d\n", hdc, pt, count ); + if (!dc) return FALSE; update_dc( dc ); physdev = GET_DC_PHYSDEV( dc, pPolyline ); @@ -624,6 +652,8 @@ BOOL WINAPI PolylineTo( HDC hdc, const POINT* pt, DWORD cCount ) PHYSDEV physdev; BOOL ret; + TRACE( "%p, %p, %u\n", hdc, pt, cCount ); + if(!dc) return FALSE; update_dc( dc ); @@ -647,6 +677,8 @@ BOOL WINAPI Polygon( HDC hdc, const POINT* pt, INT count ) BOOL ret; DC * dc = get_dc_ptr( hdc ); + TRACE( "%p, %p, %d\n", hdc, pt, count ); + if (!dc) return FALSE; update_dc( dc ); physdev = GET_DC_PHYSDEV( dc, pPolygon ); @@ -666,6 +698,8 @@ BOOL WINAPI PolyPolygon( HDC hdc, const POINT* pt, const INT* counts, BOOL ret; DC * dc = get_dc_ptr( hdc ); + TRACE( "%p, %p, %p, %u\n", hdc, pt, counts, polygons ); + if (!dc) return FALSE; update_dc( dc ); physdev = GET_DC_PHYSDEV( dc, pPolyPolygon ); @@ -684,6 +718,8 @@ BOOL WINAPI PolyPolyline( HDC hdc, const POINT* pt, const DWORD* counts, BOOL ret; DC * dc = get_dc_ptr( hdc ); + TRACE( "%p, %p, %p, %u\n", hdc, pt, counts, polylines ); + if (!dc) return FALSE; update_dc( dc ); physdev = GET_DC_PHYSDEV( dc, pPolyPolyline ); @@ -702,6 +738,8 @@ BOOL WINAPI ExtFloodFill( HDC hdc, INT x, INT y, COLORREF color, BOOL ret; DC * dc = get_dc_ptr( hdc ); + TRACE( "%p, (%d, %d), %08x, %x\n", hdc, x, y, color, fillType ); + if (!dc) return FALSE; update_dc( dc ); physdev = GET_DC_PHYSDEV( dc, pExtFloodFill ); @@ -739,6 +777,8 @@ BOOL WINAPI PolyBezier( HDC hdc, const POINT* lppt, DWORD cPoints ) BOOL ret; DC * dc; + TRACE( "%p, %p, %u\n", hdc, lppt, cPoints ); + /* cPoints must be 3 * n + 1 (where n>=1) */ if (cPoints == 1 || (cPoints % 3) != 1) return FALSE; @@ -771,6 +811,8 @@ BOOL WINAPI PolyBezierTo( HDC hdc, const POINT* lppt, DWORD cPoints ) BOOL ret; PHYSDEV physdev; + TRACE( "%p, %p, %u\n", hdc, lppt, cPoints ); + /* cbPoints must be 3 * n (where n>=1) */ if (!cPoints || (cPoints % 3) != 0) return FALSE; @@ -797,6 +839,8 @@ BOOL WINAPI AngleArc(HDC hdc, INT x, INT y, DWORD dwRadius, FLOAT eStartAngle, F BOOL result; DC *dc; + TRACE( "%p, (%d, %d), %u, %f, %f\n", hdc, x, y, dwRadius, eStartAngle, eSweepAngle ); + if( (signed int)dwRadius < 0 ) return FALSE; @@ -826,6 +870,8 @@ BOOL WINAPI PolyDraw(HDC hdc, const POINT *lppt, const BYTE *lpbTypes, PHYSDEV physdev; BOOL result; + TRACE( "%p, %p, %p, %u\n", hdc, lppt, lpbTypes, cCount ); + if(!dc) return FALSE; update_dc( dc ); @@ -851,6 +897,8 @@ BOOL WINAPI LineDDA(INT nXStart, INT nYStart, INT nXEnd, INT nYEnd, INT dx = nXEnd - nXStart; INT dy = nYEnd - nYStart; + TRACE( "(%d, %d), (%d, %d), %p, %lx\n", nXStart, nYStart, nXEnd, nYEnd, callback, lParam ); + if (dx < 0) { dx = -dx;

1 0

Huw Davies : urlmon/tests: Windows 10 has changed the behaviour of domain detection.
by Alexandre Julliard Jan. 25, 2017

Jan. 25, 2017

Module: wine Branch: master Commit: df6143325a78dea3ab5d62baff2affc6b9f00b43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df6143325a78dea3ab5d62baf… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jan 25 08:59:56 2017 +0000 urlmon/tests: Windows 10 has changed the behaviour of domain detection. The changes seem to be for the better, so the new values are not marked as broken. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/uri.c | 98 ++++++++++++++++++++++++++++++++++++------------- 1 file changed, 72 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=df6143325a78dea3ab5d6…

1 0

Nikolay Sivov : dwrite: Use OpenType 1.8 'head' table structure.
by Alexandre Julliard Jan. 25, 2017

Jan. 25, 2017

Module: wine Branch: master Commit: 08a729fc152762cdbb22fa07ddf3e219ff84e63d URL: http://source.winehq.org/git/wine.git/?a=commit;h=08a729fc152762cdbb22fa07d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 25 00:54:13 2017 +0300 dwrite: Use OpenType 1.8 'head' table structure. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 3 ++- dlls/dwrite/tests/font.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index c829813..f4ed51f 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -113,7 +113,8 @@ enum OPENTYPE_CMAP_TABLE_FORMAT #include "pshpack2.h" typedef struct { - ULONG version; + USHORT majorVersion; + USHORT minorVersion; ULONG revision; ULONG checksumadj; ULONG magic; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index ba9866a..9382569 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -113,7 +113,8 @@ static const WCHAR emojiW[] = {'S','e','g','o','e',' ','U','I',' ','E','m','o',' #include "pshpack2.h" typedef struct { - ULONG version; + USHORT majorVersion; + USHORT minorVersion; ULONG revision; ULONG checksumadj; ULONG magic;

1 0