January 2017 - Wine-commits

Józef Kucia : d3d10core/tests: Port test_depth_stencil_sampling() from d3d11.
by Alexandre Julliard 13 Jan '17

13 Jan '17

Module: wine Branch: master Commit: 6a45ea7dd976e84b185c7b51a11bb5128249d18d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a45ea7dd976e84b185c7b51a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 13 12:53:51 2017 +0100 d3d10core/tests: Port test_depth_stencil_sampling() from d3d11. 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 | 375 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 372 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6a45ea7dd976e84b185c7…

1 0

Józef Kucia : d3d8/tests: Remove redundant state setting calls.
by Alexandre Julliard 13 Jan '17

13 Jan '17

Module: wine Branch: master Commit: f040f89d278bff1338bbcb9bf004847c575b91dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f040f89d278bff1338bbcb9bf… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 13 12:53:53 2017 +0100 d3d8/tests: Remove redundant state setting calls. 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/d3d8/tests/visual.c | 50 ------------------------------------------------ 1 file changed, 50 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 20005d0..c0ecc6a 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -9334,13 +9334,6 @@ static void test_edge_antialiasing_blending(void) HWND window; HRESULT hr; - static const D3DMATRIX mat = - {{{ - 1.0f, 0.0f, 0.0f, 0.0f, - 0.0f, 1.0f, 0.0f, 0.0f, - 0.0f, 0.0f, 1.0f, 0.0f, - 0.0f, 0.0f, 0.0f, 1.0f, - }}}; static const struct { struct vec3 position; @@ -9381,22 +9374,10 @@ static void test_edge_antialiasing_blending(void) ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); trace("Edge antialiasing support: %#x.\n", caps.RasterCaps & D3DPRASTERCAPS_ANTIALIASEDGES); - hr = IDirect3DDevice8_SetTransform(device, D3DTS_WORLD, &mat); - ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetTransform(device, D3DTS_VIEW, &mat); - ok(SUCCEEDED(hr), "Failed to set view transform, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetTransform(device, D3DTS_PROJECTION, &mat); - ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#x.\n", hr); hr = IDirect3DDevice8_SetRenderState(device, D3DRS_CLIPPING, FALSE); ok(SUCCEEDED(hr), "Failed to disable clipping, hr %#x.\n", hr); hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ZENABLE, FALSE); ok(SUCCEEDED(hr), "Failed to disable Z test, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGENABLE, FALSE); - ok(SUCCEEDED(hr), "Failed to disable fog, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetRenderState(device, D3DRS_STENCILENABLE, FALSE); - ok(SUCCEEDED(hr), "Failed to disable stencil test, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_NONE); - ok(SUCCEEDED(hr), "Failed to disable culling, hr %#x.\n", hr); hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, FALSE); ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); @@ -9502,13 +9483,6 @@ static void test_edge_antialiasing_blending(void) /* This test shows that 0xffff is valid index in D3D8. */ static void test_max_index16(void) { - static const D3DMATRIX mat = - {{{ - 1.0f, 0.0f, 0.0f, 0.0f, - 0.0f, 1.0f, 0.0f, 0.0f, - 0.0f, 0.0f, 1.0f, 0.0f, - 0.0f, 0.0f, 0.0f, 1.0f, - }}}; static const struct vertex { struct vec3 position; @@ -9573,37 +9547,13 @@ static void test_max_index16(void) D3DFMT_INDEX16, D3DPOOL_MANAGED, &ib); ok(SUCCEEDED(hr), "Failed to create index buffer, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetTransform(device, D3DTS_WORLD, &mat); - ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetTransform(device, D3DTS_VIEW, &mat); - ok(SUCCEEDED(hr), "Failed to set view transform, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetTransform(device, D3DTS_PROJECTION, &mat); - ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#x.\n", hr); hr = IDirect3DDevice8_SetRenderState(device, D3DRS_CLIPPING, FALSE); ok(SUCCEEDED(hr), "Failed to disable clipping, hr %#x.\n", hr); hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ZENABLE, FALSE); ok(SUCCEEDED(hr), "Failed to disable Z test, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGENABLE, FALSE); - ok(SUCCEEDED(hr), "Failed to disable fog, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetRenderState(device, D3DRS_STENCILENABLE, FALSE); - ok(SUCCEEDED(hr), "Failed to disable stencil test, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_NONE); - ok(SUCCEEDED(hr), "Failed to disable culling, hr %#x.\n", hr); hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, FALSE); ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ALPHABLENDENABLE, FALSE); - ok(SUCCEEDED(hr), "Failed to disable blending, hr %#x.\n", hr); - - hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); - ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_DIFFUSE); - ok(SUCCEEDED(hr), "Failed to set color arg, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_ALPHAOP, D3DTOP_SELECTARG1); - ok(SUCCEEDED(hr), "Failed to set alpha op, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_ALPHAARG1, D3DTA_DIFFUSE); - ok(SUCCEEDED(hr), "Failed to set alpha arg, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr);

1 0

Józef Kucia : d3d9/tests: Accept 64-bit Windows FPU setup behavior.
by Alexandre Julliard 13 Jan '17

13 Jan '17

Module: wine Branch: master Commit: 07392b39fb2c4aa5f1f6a389d8ba812cb1164285 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07392b39fb2c4aa5f1f6a389d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 13 12:53:54 2017 +0100 d3d9/tests: Accept 64-bit Windows FPU setup behavior. 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/d3d9/tests/device.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 758e5c8..14a9cc1 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -4390,14 +4390,15 @@ static const GUID d3d9_private_data_test_guid = static void test_fpu_setup(void) { #if defined(D3D9_TEST_SET_FPU_CW) && defined(D3D9_TEST_GET_FPU_CW) + static const BOOL is_64bit = sizeof(void *) > sizeof(int); + IUnknown dummy_object = {&dummy_object_vtbl}; struct device_desc device_desc; + IDirect3DSurface9 *surface; IDirect3DDevice9 *device; + WORD cw, expected_cw; HWND window = NULL; IDirect3D9 *d3d9; - WORD cw; - IDirect3DSurface9 *surface; HRESULT hr; - IUnknown dummy_object = {&dummy_object_vtbl}; window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_CAPTION, 0, 0, registry_mode.dmPelsWidth, registry_mode.dmPelsHeight, 0, 0, 0, 0); @@ -4421,8 +4422,11 @@ static void test_fpu_setup(void) goto done; } + expected_cw = is_64bit ? 0xf60 : 0x7f; + cw = get_fpu_cw(); - ok(cw == 0x7f, "cw is %#x, expected 0x7f.\n", cw); + todo_wine_if(is_64bit) + ok(cw == expected_cw, "cw is %#x, expected %#x.\n", cw, expected_cw); hr = IDirect3DDevice9_GetRenderTarget(device, 0, &surface); ok(SUCCEEDED(hr), "Failed to get render target surface, hr %#x.\n", hr); @@ -4431,7 +4435,8 @@ static void test_fpu_setup(void) hr = IDirect3DSurface9_SetPrivateData(surface, &d3d9_private_data_test_guid, &dummy_object, sizeof(IUnknown *), D3DSPD_IUNKNOWN); ok(SUCCEEDED(hr), "Failed to set private data, hr %#x.\n", hr); - ok(callback_cw == 0x7f, "Callback cw is %#x, expected 0x7f.\n", callback_cw); + todo_wine_if(is_64bit) + ok(callback_cw == expected_cw, "Callback cw is %#x, expected %#x.\n", callback_cw, expected_cw); ok(callback_tid == GetCurrentThreadId(), "Got unexpected thread id.\n"); cw = get_fpu_cw(); ok(cw == 0xf60, "cw is %#x, expected 0xf60.\n", cw);

1 0

Józef Kucia : d3d9: Avoid '\n' in middle of TRACE() message.
by Alexandre Julliard 13 Jan '17

13 Jan '17

Module: wine Branch: master Commit: cb46a245c133fd1dfbb8538da836d22a7166ce48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb46a245c133fd1dfbb8538da… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 13 12:53:55 2017 +0100 d3d9: Avoid '\n' in middle of TRACE() message. 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/d3d9/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index e6ddaf4..e0bc585 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -922,9 +922,9 @@ static HRESULT WINAPI d3d9_device_CreateVolumeTexture(IDirect3DDevice9Ex *iface, struct d3d9_texture *object; HRESULT hr; - TRACE("iface %p, width %u, height %u, depth %u, levels %u\n", - iface, width, height, depth, levels); - TRACE("usage %#x, format %#x, pool %#x, texture %p, shared_handle %p.\n", + TRACE("iface %p, width %u, height %u, depth %u, levels %u, " + "usage %#x, format %#x, pool %#x, texture %p, shared_handle %p.\n", + iface, width, height, depth, levels, usage, format, pool, texture, shared_handle); *texture = NULL;

1 0

Jacek Caban : secur32/tests: Use importlib for functions available since Windows XP.
by Alexandre Julliard 13 Jan '17

13 Jan '17

Module: wine Branch: master Commit: 81861dddccef48ede5e675c53282ea707e7d1b33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81861dddccef48ede5e675c53… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 13 19:54:22 2017 +0100 secur32/tests: Use importlib for functions available since Windows XP. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/tests/schannel.c | 200 ++++++++++++++++-------------------------- 1 file changed, 76 insertions(+), 124 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=81861dddccef48ede5e67…

1 0

Jacek Caban : secur32: Don' t change input buffer in InitializeSecurityContext.
by Alexandre Julliard 13 Jan '17

13 Jan '17

Module: wine Branch: master Commit: c1f055d8dfda4cb4349db319a9e8734022d74895 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1f055d8dfda4cb4349db319a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 13 19:57:48 2017 +0100 secur32: Don't change input buffer in InitializeSecurityContext. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 13 ++++++++++--- dlls/secur32/tests/schannel.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 3 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index c6cc4d1..71f219c 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -732,7 +732,14 @@ schan_imp_session schan_session_for_transport(struct schan_transport* t) return t->ctx->session; } -static int schan_init_sec_ctx_get_next_buffer(const struct schan_transport *t, struct schan_buffers *s) +static int schan_init_sec_ctx_get_next_input_buffer(const struct schan_transport *t, struct schan_buffers *s) +{ + if (s->current_buffer_idx != -1) + return -1; + return schan_find_sec_buffer_idx(s->desc, 0, SECBUFFER_TOKEN); +} + +static int schan_init_sec_ctx_get_next_output_buffer(const struct schan_transport *t, struct schan_buffers *s) { if (s->current_buffer_idx == -1) { @@ -884,9 +891,9 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( ctx->req_ctx_attr = fContextReq; transport.ctx = ctx; - init_schan_buffers(&transport.in, pInput, schan_init_sec_ctx_get_next_buffer); + init_schan_buffers(&transport.in, pInput, schan_init_sec_ctx_get_next_input_buffer); transport.in.limit = expected_size; - init_schan_buffers(&transport.out, pOutput, schan_init_sec_ctx_get_next_buffer); + init_schan_buffers(&transport.out, pOutput, schan_init_sec_ctx_get_next_output_buffer); schan_imp_set_session_transport(ctx->session, &transport); /* Perform the TLS handshake */ diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 4b8adc4..ead0e8c 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -636,6 +636,36 @@ static int receive_data(SOCKET sock, SecBuffer *buf) return received; } +static void test_InitializeSecurityContext(void) +{ + SCHANNEL_CRED cred; + CredHandle cred_handle; + CtxtHandle context; + SECURITY_STATUS status; + SecBuffer out_buffer = {1000, SECBUFFER_TOKEN, NULL}; + SecBuffer in_buffer = {0, SECBUFFER_EMPTY, NULL}; + SecBufferDesc out_buffers = {SECBUFFER_VERSION, 1, &out_buffer}; + SecBufferDesc in_buffers = {SECBUFFER_VERSION, 1, &in_buffer}; + ULONG attrs; + + init_cred(&cred); + cred.grbitEnabledProtocols = SP_PROT_TLS1_CLIENT; + cred.dwFlags = SCH_CRED_NO_DEFAULT_CREDS|SCH_CRED_MANUAL_CRED_VALIDATION; + status = AcquireCredentialsHandleA(NULL, (SEC_CHAR *)UNISP_NAME_A, SECPKG_CRED_OUTBOUND, NULL, + &cred, NULL, NULL, &cred_handle, NULL); + ok(status == SEC_E_OK, "AcquireCredentialsHandleA failed: %08x\n", status); + if (status != SEC_E_OK) return; + + status = InitializeSecurityContextA(&cred_handle, NULL, (SEC_CHAR *)"localhost", + ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM|ISC_REQ_ALLOCATE_MEMORY, + 0, 0, &in_buffers, 0, &context, &out_buffers, &attrs, NULL); + ok(status == SEC_I_CONTINUE_NEEDED, "Expected SEC_I_CONTINUE_NEEDED, got %08x\n", status); + + FreeContextBuffer(out_buffer.pvBuffer); + DeleteSecurityContext(&context); + FreeCredentialsHandle(&cred_handle); +} + static void test_communication(void) { int ret; @@ -940,5 +970,6 @@ START_TEST(schannel) test_cread_attrs(); testAcquireSecurityContext(); + test_InitializeSecurityContext(); test_communication(); }

1 0

Ken Thomases : winemac: Add basic support for importing the public.html pasteboard format.
by Alexandre Julliard 13 Jan '17

13 Jan '17

Module: wine Branch: master Commit: ed0de54f456d3b32405141ec608116ac106ba67d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed0de54f456d3b32405141ec6… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Jan 13 13:36:20 2017 -0600 winemac: Add basic support for importing the public.html pasteboard format. Continue exporting in the original format under org.winehq.registered.HTML Format for fidelity when copying and pasting within Wine. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/clipboard.c | 62 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 53 insertions(+), 9 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index fc1589f..fdd1110 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -70,6 +70,7 @@ static HANDLE import_clipboard_data(CFDataRef data); static HANDLE import_bmp_to_bitmap(CFDataRef data); static HANDLE import_bmp_to_dib(CFDataRef data); static HANDLE import_enhmetafile(CFDataRef data); +static HANDLE import_html(CFDataRef data); static HANDLE import_metafilepict(CFDataRef data); static HANDLE import_nsfilenames_to_hdrop(CFDataRef data); static HANDLE import_utf8_to_text(CFDataRef data); @@ -177,13 +178,15 @@ static const struct CFStringRef type; DRVIMPORTFUNC import; DRVEXPORTFUNC export; + BOOL synthesized; } builtin_format_names[] = { { wszRichTextFormat, CFSTR("public.rtf"), import_clipboard_data, export_clipboard_data }, { wszGIF, CFSTR("com.compuserve.gif"), import_clipboard_data, export_clipboard_data }, { wszJFIF, CFSTR("public.jpeg"), import_clipboard_data, export_clipboard_data }, { wszPNG, CFSTR("public.png"), import_clipboard_data, export_clipboard_data }, - { wszHTMLFormat, CFSTR("public.html"), import_clipboard_data, export_clipboard_data }, + { wszHTMLFormat, NULL, import_clipboard_data, export_clipboard_data }, + { wszHTMLFormat, CFSTR("public.html"), import_html, NULL, TRUE }, { CFSTR_SHELLURLW, CFSTR("public.url"), import_utf8_to_text, export_text_to_utf8 }, }; @@ -355,24 +358,32 @@ static void register_builtin_formats(void) list_add_tail(&format_list, &format->entry); } - LIST_FOR_EACH_ENTRY(format, &format_list, WINE_CLIPFORMAT, entry) - { - if (format->synthesized) - format->natural_format = natural_format_for_format(format->format_id); - } - /* Register known mappings between Windows formats and Mac types */ for (i = 0; i < sizeof(builtin_format_names)/sizeof(builtin_format_names[0]); i++) { if (!(format = HeapAlloc(GetProcessHeap(), 0, sizeof(*format)))) break; format->format_id = RegisterClipboardFormatW(builtin_format_names[i].name); - format->type = CFRetain(builtin_format_names[i].type); format->import_func = builtin_format_names[i].import; format->export_func = builtin_format_names[i].export; - format->synthesized = FALSE; + format->synthesized = builtin_format_names[i].synthesized; format->natural_format = NULL; + + if (builtin_format_names[i].type) + format->type = CFRetain(builtin_format_names[i].type); + else + { + format->type = CFStringCreateWithFormat(NULL, NULL, CFSTR("%@%S"), + registered_name_type_prefix, builtin_format_names[i].name); + } + list_add_tail(&format_list, &format->entry); } + + LIST_FOR_EACH_ENTRY(format, &format_list, WINE_CLIPFORMAT, entry) + { + if (format->synthesized) + format->natural_format = natural_format_for_format(format->format_id); + } } @@ -616,6 +627,39 @@ static HANDLE import_enhmetafile(CFDataRef data) /************************************************************************** + * import_html + * + * Import HTML data. + */ +static HANDLE import_html(CFDataRef data) +{ + static const char header[] = + "Version:0.9\n" + "StartHTML:0000000100\n" + "EndHTML:%010lu\n" + "StartFragment:%010lu\n" + "EndFragment:%010lu\n" + ""; + static const char trailer[] = "\n"; + HANDLE ret; + SIZE_T len, total; + size_t size = CFDataGetLength(data); + + len = strlen(header) + 12; /* 3 * 4 extra chars for %010lu */ + total = len + size + sizeof(trailer); + if ((ret = GlobalAlloc(GMEM_FIXED, total))) + { + char *p = ret; + p += sprintf(p, header, total - 1, len, len + size + 1 /* include the final \n in the data */); + CFDataGetBytes(data, CFRangeMake(0, size), (UInt8*)p); + strcpy(p + size, trailer); + TRACE("returning %s\n", debugstr_a(ret)); + } + return ret; +} + + +/************************************************************************** * import_metafilepict * * Import metafile picture data, converting it to CF_METAFILEPICT.

1 0

Ken Thomases : winemac: Export HTML Format clipboard data to the public.html pasteboard type.
by Alexandre Julliard 13 Jan '17

13 Jan '17

Module: wine Branch: master Commit: 961703427dc107760cbd0d5101f59ea777a0b526 URL: http://source.winehq.org/git/wine.git/?a=commit;h=961703427dc107760cbd0d510… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Jan 13 13:36:21 2017 -0600 winemac: Export HTML Format clipboard data to the public.html pasteboard type. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/clipboard.c | 68 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 67 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index fdd1110..49a3ed3 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -82,6 +82,7 @@ static CFDataRef export_bitmap_to_bmp(HANDLE data); static CFDataRef export_dib_to_bmp(HANDLE data); static CFDataRef export_enhmetafile(HANDLE data); static CFDataRef export_hdrop_to_filenames(HANDLE data); +static CFDataRef export_html(HANDLE data); static CFDataRef export_metafilepict(HANDLE data); static CFDataRef export_text_to_utf8(HANDLE data); static CFDataRef export_unicodetext_to_utf8(HANDLE data); @@ -186,7 +187,7 @@ static const struct { wszJFIF, CFSTR("public.jpeg"), import_clipboard_data, export_clipboard_data }, { wszPNG, CFSTR("public.png"), import_clipboard_data, export_clipboard_data }, { wszHTMLFormat, NULL, import_clipboard_data, export_clipboard_data }, - { wszHTMLFormat, CFSTR("public.html"), import_html, NULL, TRUE }, + { wszHTMLFormat, CFSTR("public.html"), import_html, export_html, TRUE }, { CFSTR_SHELLURLW, CFSTR("public.url"), import_utf8_to_text, export_text_to_utf8 }, }; @@ -522,6 +523,28 @@ static HANDLE create_bitmap_from_dib(HANDLE dib) /************************************************************************** + * get_html_description_field + * + * Find the value of a field in an HTML Format description. + */ +static const char* get_html_description_field(const char* data, const char* keyword) +{ + const char* pos = data; + + while (pos && *pos && *pos != '<') + { + if (memcmp(pos, keyword, strlen(keyword)) == 0) + return pos + strlen(keyword); + + pos = strchr(pos, '\n'); + if (pos) pos++; + } + + return NULL; +} + + +/************************************************************************** * import_clipboard_data * * Generic import clipboard data routine. @@ -1141,6 +1164,49 @@ done: /************************************************************************** + * export_html + * + * Export HTML Format to public.html data. + * + * FIXME: We should attempt to add an <a base> tag and convert windows paths. + */ +static CFDataRef export_html(HANDLE handle) +{ + CFDataRef ret; + const char *data, *field_value; + int fragmentstart, fragmentend; + + data = GlobalLock(handle); + + /* read the important fields */ + field_value = get_html_description_field(data, "StartFragment:"); + if (!field_value) + { + ERR("Couldn't find StartFragment value\n"); + goto failed; + } + fragmentstart = atoi(field_value); + + field_value = get_html_description_field(data, "EndFragment:"); + if (!field_value) + { + ERR("Couldn't find EndFragment value\n"); + goto failed; + } + fragmentend = atoi(field_value); + + /* export only the fragment */ + ret = CFDataCreate(NULL, (const UInt8*)&data[fragmentstart], fragmentend - fragmentstart); + GlobalUnlock(handle); + return ret; + +failed: + GlobalUnlock(handle); + return NULL; +} + + +/************************************************************************** * export_metafilepict * * Export a metafile to data.

1 0

Ken Thomases : winemac: Ignore an additional expected error in the clipboard pipe communication code.
by Alexandre Julliard 13 Jan '17

13 Jan '17

Module: wine Branch: master Commit: 52e20d82f88785c3b49a7616ea1d6c0ae5bcf38d URL: http://source.winehq.org/git/wine.git/?a=commit;h=52e20d82f88785c3b49a7616e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Jan 13 13:36:22 2017 -0600 winemac: Ignore an additional expected error in the clipboard pipe communication code. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/clipboard.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 49a3ed3..7115c3b 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -2141,7 +2141,8 @@ void CDECL macdrv_UpdateClipboard(void) else { result = GetLastError(); - if (result != ERROR_BROKEN_PIPE && result != ERROR_OPERATION_ABORTED) + if (result != ERROR_BROKEN_PIPE && result != ERROR_OPERATION_ABORTED && + result != ERROR_HANDLES_CLOSED) WARN("failed to read from pipe: %d\n", result); }

1 0

Alexandre Julliard : Release 2.0-rc5.
by Alexandre Julliard 13 Jan '17

13 Jan '17

Module: wine Branch: master Commit: 3c54d4fb6926195e43a1163b0a243d2614a5951f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c54d4fb6926195e43a1163b0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 13 21:11:08 2017 +0100 Release 2.0-rc5. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 243 ++++++++++++++++++++++++++++++++++++-------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 ++--- 4 files changed, 151 insertions(+), 113 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3c54d4fb6926195e43a11…

1 0