January 2017 - Wine-commits

Henri Verbeet : wined3d: Get rid of a superfluous floatBitsToUint() in shader_glsl_texkill().
by Alexandre Julliard 25 Jan '17

25 Jan '17

Module: wine Branch: master Commit: 87c6ac4258bb7b741d4a5eff950807ca1a3e0d1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=87c6ac4258bb7b741d4a5eff9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 24 22:15:24 2017 +0100 wined3d: Get rid of a superfluous floatBitsToUint() in shader_glsl_texkill(). shader_glsl_add_src_param() already adds floatBitsToUint(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a8d208e..40bbfdc 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5450,7 +5450,7 @@ static void shader_glsl_texkill(const struct wined3d_shader_instruction *ins) struct glsl_src_param src_param; shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &src_param); - shader_addline(ins->ctx->buffer, "if (bool(floatBitsToUint(%s))) discard;\n", src_param.param_str); + shader_addline(ins->ctx->buffer, "if (bool(%s)) discard;\n", src_param.param_str); } else {

1 0

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

25 Jan '17

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 25 Jan '17

25 Jan '17

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 25 Jan '17

25 Jan '17

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

Henri Verbeet : ddraw: Kill stray tabs.
by Alexandre Julliard 25 Jan '17

25 Jan '17

Module: wine Branch: master Commit: 31fcbb6bf2fc65ec5e6b1ac735c6a043b85b5a7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=31fcbb6bf2fc65ec5e6b1ac73… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 24 22:15:28 2017 +0100 ddraw: Kill stray tabs. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/executebuffer.c | 75 ++++++++++++++++++++++------------------------ dlls/ddraw/main.c | 6 ---- 2 files changed, 36 insertions(+), 45 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 09226cd..98e9404 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -75,12 +75,12 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, for (;;) { D3DINSTRUCTION *current = (D3DINSTRUCTION *)instr; - BYTE size; - WORD count; - - count = current->wCount; - size = current->bSize; - instr += sizeof(D3DINSTRUCTION); + BYTE size; + WORD count; + + count = current->wCount; + size = current->bSize; + instr += sizeof(*current); primitive_size = 0; switch (current->bOpcode) @@ -203,10 +203,10 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, break; } - case D3DOP_MATRIXLOAD: - WARN("MATRIXLOAD-s (%d)\n", count); - instr += count * size; - break; + case D3DOP_MATRIXLOAD: + WARN("MATRIXLOAD-s (%u)\n", count); + instr += count * size; + break; case D3DOP_MATRIXMULTIPLY: TRACE("MATRIXMULTIPLY (%d)\n", count); @@ -351,19 +351,15 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, } break; - case D3DOP_TEXTURELOAD: { - WARN("TEXTURELOAD-s (%d)\n", count); - - instr += count * size; - } break; + case D3DOP_TEXTURELOAD: + WARN("TEXTURELOAD-s (%u)\n", count); + instr += count * size; + break; - case D3DOP_EXIT: { - TRACE("EXIT (%d)\n", count); - /* We did this instruction */ - instr += size; - /* Exit this loop */ - goto end_of_buffer; - } break; + case D3DOP_EXIT: + TRACE("EXIT (%u)\n", count); + instr += size; + goto end_of_buffer; case D3DOP_BRANCHFORWARD: TRACE("BRANCHFORWARD (%d)\n", count); @@ -380,26 +376,28 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, instr = (char*)current + ci->dwOffset; break; } - } - } else { - if (ci->bNegate) { + } + } + else + { + if (ci->bNegate) + { TRACE(" Branch to %d\n", ci->dwOffset); if (ci->dwOffset) { instr = (char*)current + ci->dwOffset; break; } - } - } + } + } - instr += size; + instr += size; } break; - case D3DOP_SPAN: { - WARN("SPAN-s (%d)\n", count); - - instr += count * size; - } break; + case D3DOP_SPAN: + WARN("SPAN-s (%u)\n", count); + instr += count * size; + break; case D3DOP_SETSTATUS: TRACE("SETSTATUS (%d)\n", count); @@ -410,12 +408,11 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, } break; - default: - ERR("Unhandled OpCode %d !!!\n",current->bOpcode); - /* Try to save ... */ - instr += count * size; - break; - } + default: + ERR("Unhandled OpCode %#x.\n",current->bOpcode); + instr += count * size; + break; + } } end_of_buffer: diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index bb9e37f..4c94dd1 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -748,17 +748,11 @@ HRESULT WINAPI DllCanUnloadNow(void) } -/*********************************************************************** - * DllRegisterServer (DDRAW.@) - */ HRESULT WINAPI DllRegisterServer(void) { return __wine_register_resources( instance ); } -/*********************************************************************** - * DllUnregisterServer (DDRAW.@) - */ HRESULT WINAPI DllUnregisterServer(void) { return __wine_unregister_resources( instance );

1 0

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

25 Jan '17

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

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

25 Jan '17

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

Nikolay Sivov : dwrite: Use OpenType 1.8 'hhea' table structure.
by Alexandre Julliard 25 Jan '17

25 Jan '17

Module: wine Branch: master Commit: 669d033ee160dfe3dd76e9ee14cc6868d10d90a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=669d033ee160dfe3dd76e9ee1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 25 00:54:14 2017 +0300 dwrite: Use OpenType 1.8 'hhea' 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 f4ed51f..7a3e641 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -205,7 +205,8 @@ typedef struct } TT_OS2_V2; typedef struct { - ULONG version; + USHORT majorVersion; + USHORT minorVersion; SHORT ascender; SHORT descender; SHORT linegap; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 9382569..c373d14 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -217,7 +217,8 @@ typedef struct { } TT_POST; typedef struct { - ULONG version; + USHORT majorVersion; + USHORT minorVersion; SHORT ascender; SHORT descender; SHORT linegap;

1 0

Nikolay Sivov : comctl32/tests: Use win_skip() for tests that should not be skipped on Wine.
by Alexandre Julliard 25 Jan '17

25 Jan '17

Module: wine Branch: master Commit: ad566da137f495a43d7c502146596d258f0d8f9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad566da137f495a43d7c50214… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 25 02:31:00 2017 +0300 comctl32/tests: Use win_skip() for tests that should not be skipped on Wine. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/datetime.c | 23 +++++++---------------- dlls/comctl32/tests/header.c | 2 +- dlls/comctl32/tests/monthcal.c | 2 +- dlls/comctl32/tests/mru.c | 2 +- 4 files changed, 10 insertions(+), 19 deletions(-) diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c index 708921f..85fb940 100644 --- a/dlls/comctl32/tests/datetime.c +++ b/dlls/comctl32/tests/datetime.c @@ -527,23 +527,14 @@ static void test_dtm_set_and_get_system_time(void) { LRESULT r; SYSTEMTIME st, getSt, ref; - HWND hWnd, hWndDateTime_test_gdt_none; - - hWndDateTime_test_gdt_none = create_datetime_control(0); - - ok(hWndDateTime_test_gdt_none!=NULL, "Expected non NULL, got %p\n", hWndDateTime_test_gdt_none); - if(hWndDateTime_test_gdt_none) { - r = SendMessageA(hWndDateTime_test_gdt_none, DTM_SETSYSTEMTIME, GDT_NONE, (LPARAM)&st); - expect(0, r); - } - else { - skip("hWndDateTime_test_gdt_none is NULL\n"); - flush_sequences(sequences, NUM_MSG_SEQUENCES); + HWND hWnd; - return; - } + hWnd = create_datetime_control(0); + ok(hWnd !=NULL, "Expected non NULL, got %p\n", hWnd); + r = SendMessageA(hWnd, DTM_SETSYSTEMTIME, GDT_NONE, (LPARAM)&st); + expect(0, r); - DestroyWindow(hWndDateTime_test_gdt_none); + DestroyWindow(hWnd); hWnd = create_datetime_control(DTS_SHOWNONE); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -797,7 +788,7 @@ START_TEST(datetime) pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx"); if (!pInitCommonControlsEx) { - skip("InitCommonControlsEx() is missing. Skipping the tests\n"); + win_skip("InitCommonControlsEx() is missing. Skipping the tests\n"); return; } iccex.dwSize = sizeof(iccex); diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index 5c35b60..3ae83f8 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -1662,7 +1662,7 @@ static BOOL init(void) pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx"); if (!pInitCommonControlsEx) { - skip("InitCommonControlsEx() is missing. Skipping the tests\n"); + win_skip("InitCommonControlsEx() is missing. Skipping the tests\n"); return FALSE; } diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 30da089..003a1ec 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -2053,7 +2053,7 @@ START_TEST(monthcal) pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx"); if (!pInitCommonControlsEx) { - skip("InitCommonControlsEx() is missing. Skipping the tests\n"); + win_skip("InitCommonControlsEx() is missing. Skipping the tests\n"); return; } iccex.dwSize = sizeof(iccex); diff --git a/dlls/comctl32/tests/mru.c b/dlls/comctl32/tests/mru.c index 5b5f98e..af49aba 100644 --- a/dlls/comctl32/tests/mru.c +++ b/dlls/comctl32/tests/mru.c @@ -236,7 +236,7 @@ static void test_MRUListA(void) if (!pCreateMRUListA || !pFreeMRUList || !pAddMRUStringA || !pEnumMRUListA) { - skip("MRU entry points not found\n"); + win_skip("MRU entry points not found\n"); return; }

1 0

Fabian Maurer : gdi32: Add traces for painting functions.
by Alexandre Julliard 25 Jan '17

25 Jan '17

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