wine-commits January 2017

wine-commits@winehq.org

2 participants
492 discussions

Julian Rüger : German translation for release 2.0-rc5
by Jeremy Newman 16 Jan '17

16 Jan '17

Module: website Branch: master Commit: 8cab6520536e08e409ddd74401d62125df0574bd URL: http://source.winehq.org/git/website.git/?a=commit;h=8cab6520536e08e409ddd7… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Jan 16 14:32:20 2017 +0100 German translation for release 2.0-rc5 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2017011301.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/de/2017011301.xml b/news/de/2017011301.xml new file mode 100644 index 0000000..cbe3153 --- /dev/null +++ b/news/de/2017011301.xml @@ -0,0 +1,12 @@ +<news> +<date>13. Januar 2017</date> +<title>Wine 2.0-rc5 freigegeben</title> +<body> + Die Entwicklungsversion 2.0-rc5 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/2.0-rc5">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Nur Fehlerkorrekturen, da wir uns im Code-freeze befinden.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/2.0/wine-2.0-rc5.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 2.0-rc4
by Jeremy Newman 16 Jan '17

16 Jan '17

Module: website Branch: master Commit: 8fa746d4b8859f9cc827d305e7120ee5db489d1c URL: http://source.winehq.org/git/website.git/?a=commit;h=8fa746d4b8859f9cc827d3… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Jan 16 14:31:33 2017 +0100 German translation for release 2.0-rc4 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2017010601.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/de/2017010601.xml b/news/de/2017010601.xml new file mode 100644 index 0000000..a907ef3 --- /dev/null +++ b/news/de/2017010601.xml @@ -0,0 +1,12 @@ +<news> +<date>6. Januar 2017</date> +<title>Wine 2.0-rc4 freigegeben</title> +<body> + Die Entwicklungsversion 2.0-rc4 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/2.0-rc4">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Nur Fehlerkorrekturen, da wir uns im Code-freeze befinden.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/2.0/wine-2.0-rc4.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : Wine release 2.0-rc5
by Alexandre Julliard 13 Jan '17

13 Jan '17

Module: website Branch: master Commit: 927715d9b343734afa76d546249ed1488c009c09 URL: http://source.winehq.org/git/website.git/?a=commit;h=927715d9b343734afa76d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 13 21:13:06 2017 +0100 Wine release 2.0-rc5 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2017011301.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/en/2017011301.xml b/news/en/2017011301.xml new file mode 100644 index 0000000..828e55e --- /dev/null +++ b/news/en/2017011301.xml @@ -0,0 +1,12 @@ +<news> +<date>January 13, 2017</date> +<title>Wine 2.0-rc5 Released</title> +<body> + The Wine development release 2.0-rc5 is now available. + <a href="{$root}/announce/2.0-rc5">What's new</a> in this release: +<ul> + <li>Bug fixes only, we are in code freeze.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/2.0/wine-2.0-rc5.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

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

13 Jan '17

Module: wine Branch: refs/tags/wine-2.0-rc5 Tag: f5f99635f175aee1ddb7553e26f53789cff0bde4 URL: http://source.winehq.org/git/wine.git/?a=tag;h=f5f99635f175aee1ddb7553e26f5… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 13 21:11:08 2017 +0100 Release 2.0-rc5

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

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

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: 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

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

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

← Newer
1
...
34
35
36
37
38
39
40
...
50
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2017