November 2016 - Wine-Devel - list.winehq.org

Re: [v4 PATCH 1/4] dpnet/test: Add IDirectPlay8Client EnumHost tests
by Stefan Dösinger Nov. 17, 2016

Nov. 17, 2016

Am 2016-11-17 um 07:08 schrieb Alistair Leslie-Hughes: > + Sleep(1000); I think there should be ways to avoid this sleep. E.g. you could store the expected number of callbacks in a global variable and signal an event in the callback handler when it has been reached. If any additional callbacks are invoked report an error in the callback. In the main thread do a timed wait for the event and check for timeouts to catch cases where too few callback invocations take place. That way you limit the timeout to error cases. A one second sleep may not be long, but these things do sum up over the entire testsuite, so we should put in some effort to minimize the time make test requires. You also have some PCRAP uses in the code (PDPNMSG_ASYNC_OP_COMPLETE). Stefan

1 0

Re: [PATCH] msvcrt: Implement nearbyint and nearbyintf
by Piotr Caban Nov. 17, 2016

Nov. 17, 2016

Hi Stefan, On 17/11/16 08:15, Stefan Silviu wrote: > /********************************************************************* > + * _nearbyint (MSVCRT.@) > + */ > +double CDECL MSVCRT_nearbyint(double num) > +{ > + return nearbyint(num); > +} > The nearbyint function is not available in C89 standard. Could you please implement the function without using it or do something similar as in MSVCR120_rint? Thank you, Piotr

2 2

Re: [v3 PATCH 4/4] dpnet: Add Sync support in IDirectPlay8Client EnumHost
by Marvin Nov. 17, 2016

Nov. 17, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=26697 Your paranoid android. === wxppro (32 bit client) === client.c:254: Test failed: got 0x00000002 === w2003std (32 bit client) === client.c:254: Test failed: got 0x00000002 === wvistau64 (32 bit client) === client.c:254: Test failed: got 0x00000002 === w2008s64 (32 bit client) === client.c:254: Test failed: got 0x00000002 === w7u (32 bit client) === client.c:254: Test failed: got 0x00000002 === w7pro64 (32 bit client) === client.c:254: Test failed: got 0x00000002 === wvistau64 (64 bit client) === client.c:254: Test failed: got 0x00000002 === w2008s64 (64 bit client) === client.c:254: Test failed: got 0x00000002 === w7pro64 (64 bit client) === client.c:254: Test failed: got 0x00000002

1 0

Re: [v3 PATCH 2/4] dpnet: Add basic validation in IDirectPlay8Client EnumHosts
by Marvin Nov. 17, 2016

Nov. 17, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=26696 Your paranoid android. === wxppro (32 bit client) === client.c:252: Test failed: got 0x00000002 === w2003std (32 bit client) === client.c:252: Test failed: got 0x00000002 === wvistau64 (32 bit client) === client.c:252: Test failed: got 0x00000002 === w2008s64 (32 bit client) === client.c:252: Test failed: got 0x00000002 === w7u (32 bit client) === client.c:244: Test failed: got 0x80004005 client.c:245: Test failed: got 0x00000002 client.c:251: Test failed: got 0x80004005 client.c:252: Test failed: got 0x00000002 === w7pro64 (32 bit client) === client.c:252: Test failed: got 0x00000002 === wvistau64 (64 bit client) === client.c:252: Test failed: got 0x00000002 === w2008s64 (64 bit client) === client.c:252: Test failed: got 0x00000002 === w7pro64 (64 bit client) === client.c:252: Test failed: got 0x00000002

1 0

Re: [v3 PATCH 1/4] dpnet/test: Add IDirectPlay8Client EnumHost tests
by Marvin Nov. 17, 2016

Nov. 17, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=26695 Your paranoid android. === wxppro (32 bit client) === client.c:252: Test failed: got 0x00000002 === w2003std (32 bit client) === client.c:252: Test failed: got 0x00000002 === wvistau64 (32 bit client) === client.c:252: Test failed: got 0x00000002 === w2008s64 (32 bit client) === client.c:252: Test failed: got 0x00000002 === w7u (32 bit client) === client.c:252: Test failed: got 0x00000002 === w7pro64 (32 bit client) === client.c:252: Test failed: got 0x00000002 === wvistau64 (64 bit client) === client.c:252: Test failed: got 0x00000002 === w2008s64 (64 bit client) === client.c:252: Test failed: got 0x00000002 === w7pro64 (64 bit client) === client.c:252: Test failed: got 0x00000002

1 0

Re: [PATCH] wininet: Resize buffer when call to InternetCanonicalizeUrlW fails in InternetCrackUrlW
by Sebastian Lackner Nov. 16, 2016

Nov. 16, 2016

On 13.11.2016 21:15, Marcus Meissner wrote: > From: Michael Müller <michael(a)fds-team.de> > > Import from wine-staging > Fixes wine bug 40598 in staging > > Signed-off-by: Michael Mueller <michael(a)fds-team.de> > Signed-off-by: Marcus Meissner <meissner(a)suse.de> If the patch submission rules have not been changed at this WineConf, it is still not allowed to add Signed-off-by lines for other people. Also, the patch is most likely not the right way to fix it, as I already pointed out in https://www.winehq.org/pipermail/wine-patches/2016-July/152110.html: """ Reason for the failure is because after decoding a "/" is added, and it does not fit into the buffer anymore. Michael wrote a patch to dynamically allocate a buffer, however I do not think the "/" should be added in the first place. """ Regards, Sebastian

3 2

Re: [PATCH] urlmon: Fix buffer overflow in parse_canonicalize
by Marvin Nov. 16, 2016

Nov. 16, 2016

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=26694 Your paranoid android. === w1064 (32 bit uri) === uri.c:7620: Test failed: Expected google.com.uk but got L"com.uk" on uri_tests[71].str_props[3]. uri.c:7620: Test failed: Expected google.uk.1 but got L"uk.1" on uri_tests[73].str_props[3]. uri.c:7618: Test failed: GetPropertyBSTR returned 0x00000000, expected 0x00000001. On uri_tests[76].str_props[3]. uri.c:7620: Test failed: Expected but got L".uk" on uri_tests[76].str_props[3]. uri.c:7620: Test failed: Expected google.com.[] but got L"com.[]" on uri_tests[77].str_props[3]. uri.c:7805: Test failed: Error: Expected google.com.uk but got L"com.uk" on uri_tests[71]. uri.c:7805: Test failed: Error: Expected google.uk.1 but got L"uk.1" on uri_tests[73]. uri.c:7803: Test failed: Error: GetDomain returned 0x00000000, expected 0x00000001 on uri_tests[76]. uri.c:7805: Test failed: Error: Expected but got L".uk" on uri_tests[76]. uri.c:7805: Test failed: Error: Expected google.com.[] but got L"com.[]" on uri_tests[77]. uri.c:8085: Test failed: Error: Expected a length of 13 but got 6 on uri_tests[71].str_props[3]. uri.c:8085: Test failed: Error: Expected a length of 11 but got 4 on uri_tests[73].str_props[3]. uri.c:8083: Test failed: Error: GetPropertyLength returned 0x00000000, expected 0x00000001 on uri_tests[76].str_props[3]. uri.c:8085: Test failed: Error: Expected a length of 0 but got 3 on uri_tests[76].str_props[3]. uri.c:8085: Test failed: Error: Expected a length of 13 but got 6 on uri_tests[77].str_props[3]. uri.c:8152: Test failed: Error: Received flag for property 3 when not expected on uri_tests[76]. uri.c:8202: Test failed: Error: Wasn't expecting to have property 3 on uri_tests[76]. uri.c:10521: Test failed: Error: Expected google.com.uk but got L"com.uk" instead on uri_parse_tests[42]. uri.c:10524: Test failed: Error: Expected 13, but got 6 instead on uri_parse_tests[42]. === w1064 (64 bit uri) === uri.c:7620: Test failed: Expected google.com.uk but got L"com.uk" on uri_tests[71].str_props[3]. uri.c:7620: Test failed: Expected google.uk.1 but got L"uk.1" on uri_tests[73].str_props[3]. uri.c:7618: Test failed: GetPropertyBSTR returned 0x00000000, expected 0x00000001. On uri_tests[76].str_props[3]. uri.c:7620: Test failed: Expected but got L".uk" on uri_tests[76].str_props[3]. uri.c:7620: Test failed: Expected google.com.[] but got L"com.[]" on uri_tests[77].str_props[3]. uri.c:7805: Test failed: Error: Expected google.com.uk but got L"com.uk" on uri_tests[71]. uri.c:7805: Test failed: Error: Expected google.uk.1 but got L"uk.1" on uri_tests[73]. uri.c:7803: Test failed: Error: GetDomain returned 0x00000000, expected 0x00000001 on uri_tests[76]. uri.c:7805: Test failed: Error: Expected but got L".uk" on uri_tests[76]. uri.c:7805: Test failed: Error: Expected google.com.[] but got L"com.[]" on uri_tests[77]. uri.c:8085: Test failed: Error: Expected a length of 13 but got 6 on uri_tests[71].str_props[3]. uri.c:8085: Test failed: Error: Expected a length of 11 but got 4 on uri_tests[73].str_props[3]. uri.c:8083: Test failed: Error: GetPropertyLength returned 0x00000000, expected 0x00000001 on uri_tests[76].str_props[3]. uri.c:8085: Test failed: Error: Expected a length of 0 but got 3 on uri_tests[76].str_props[3]. uri.c:8085: Test failed: Error: Expected a length of 13 but got 6 on uri_tests[77].str_props[3]. uri.c:8152: Test failed: Error: Received flag for property 3 when not expected on uri_tests[76]. uri.c:8202: Test failed: Error: Wasn't expecting to have property 3 on uri_tests[76]. uri.c:10521: Test failed: Error: Expected google.com.uk but got L"com.uk" instead on uri_parse_tests[42]. uri.c:10524: Test failed: Error: Expected 13, but got 6 instead on uri_parse_tests[42].

2 1

[PATCH] winemapi: Directly use xdg-email if available, enabling file attachments.
by Jeremy White Nov. 16, 2016

Nov. 16, 2016

Signed-off-by: Jeremy White <jwhite(a)codeweavers.com> --- This addresses https://bugs.winehq.org/show_bug.cgi?id=11770 for systems with xdg-email. --- dlls/winemapi/Makefile.in | 3 +- dlls/winemapi/sendmail.c | 45 +++++--- dlls/winemapi/winemapi_private.h | 28 +++++ dlls/winemapi/xdg-email.c | 230 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 291 insertions(+), 15 deletions(-) create mode 100644 dlls/winemapi/winemapi_private.h create mode 100644 dlls/winemapi/xdg-email.c diff --git a/dlls/winemapi/Makefile.in b/dlls/winemapi/Makefile.in index 813ee42..d6f79b4 100644 --- a/dlls/winemapi/Makefile.in +++ b/dlls/winemapi/Makefile.in @@ -3,4 +3,5 @@ IMPORTS = shlwapi shell32 mapi32 C_SRCS = \ main.c \ - sendmail.c + sendmail.c \ + xdg-email.c diff --git a/dlls/winemapi/sendmail.c b/dlls/winemapi/sendmail.c index 03a29ba..f7a63ca 100644 --- a/dlls/winemapi/sendmail.c +++ b/dlls/winemapi/sendmail.c @@ -36,6 +36,8 @@ #include "shlwapi.h" #include "wine/debug.h" +#include "winemapi_private.h" + WINE_DEFAULT_DEBUG_CHANNEL(winemapi); /* Escapes a string for use in mailto: URL */ @@ -70,23 +72,12 @@ static char *escape_string(char *in, char *empty_string) } /************************************************************************** - * MAPISendMail + * BrowserSendMail * - * Send a message using a native mail client. - * - * PARAMS - * session [I] Handle to a MAPI session. - * uiparam [I] Parent window handle. - * message [I] Pointer to a MAPIMessage structure. - * flags [I] Flags. - * reserved [I] Reserved, pass 0. - * - * RETURNS - * Success: SUCCESS_SUCCESS - * Failure: MAPI_E_FAILURE + * Send an email by forming a mailto uri and invoking a browser. * */ -ULONG WINAPI MAPISendMail(LHANDLE session, ULONG_PTR uiparam, +static ULONG BrowserSendMail(LHANDLE session, ULONG_PTR uiparam, lpMapiMessage message, FLAGS flags, ULONG reserved) { ULONG ret = MAPI_E_FAILURE; @@ -291,6 +282,32 @@ exit: return ret; } +/************************************************************************** + * MAPISendMail + * + * Send a message using a native mail client. + * + * PARAMS + * session [I] Handle to a MAPI session. + * uiparam [I] Parent window handle. + * message [I] Pointer to a MAPIMessage structure. + * flags [I] Flags. + * reserved [I] Reserved, pass 0. + * + * RETURNS + * Success: SUCCESS_SUCCESS + * Failure: MAPI_E_FAILURE + * + */ +ULONG WINAPI MAPISendMail(LHANDLE session, ULONG_PTR uiparam, + lpMapiMessage message, FLAGS flags, ULONG reserved) +{ + if (XDGMailAvailable()) + return XDGSendMail(session, uiparam, message, flags, reserved); + + return BrowserSendMail(session, uiparam, message, flags, reserved); +} + ULONG WINAPI MAPISendDocuments(ULONG_PTR uiparam, LPSTR delim, LPSTR paths, LPSTR filenames, ULONG reserved) { diff --git a/dlls/winemapi/winemapi_private.h b/dlls/winemapi/winemapi_private.h new file mode 100644 index 0000000..ac76ab3 --- /dev/null +++ b/dlls/winemapi/winemapi_private.h @@ -0,0 +1,28 @@ +/* + * + * Copyright 2016 Jeremy White + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINEMAPI_PRIVATE_INCLUDED__ +#define __WINEMAPI_PRIVATE_INCLUDED__ + +ULONG XDGSendMail(LHANDLE session, ULONG_PTR uiparam, + lpMapiMessage message, FLAGS flags, ULONG reserved); +BOOLEAN XDGMailAvailable(void); + +#endif /* __WINEMAPI_PRIVATE_INCLUDED__ */ + diff --git a/dlls/winemapi/xdg-email.c b/dlls/winemapi/xdg-email.c new file mode 100644 index 0000000..6008d6e --- /dev/null +++ b/dlls/winemapi/xdg-email.c @@ -0,0 +1,230 @@ +/* + * MAPISendMail implementation for xdg-email + * + * Copyright 2016 Jeremy White for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include "wine/port.h" + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "winnls.h" +#include "mapi.h" +#include "wine/debug.h" +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#endif + +#include "winemapi_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(winemapi); + +static void add_argument(char **argv, int *argc, const char *arg, const char *param) +{ + argv[(*argc)] = HeapAlloc(GetProcessHeap(), 0, strlen(arg) + 1); + strcpy(argv[(*argc)++], arg); + if (param) + { + argv[(*argc)] = HeapAlloc(GetProcessHeap(), 0, strlen(param) + 1); + strcpy(argv[(*argc)++], param); + } +} + +static void add_target(char **argv, int *argc, ULONG class, const char *address) +{ + static const char smtp[] = "smtp:"; + + if (!strncasecmp(address, smtp, sizeof(smtp) - 1)) + address += sizeof(smtp) - 1; + + switch (class) + { + case MAPI_ORIG: + TRACE("From: %s\n (unused)", debugstr_a(address)); + break; + + case MAPI_TO: + TRACE("To: %s\n", debugstr_a(address)); + add_argument(argv, argc, address, NULL); + break; + + case MAPI_CC: + TRACE("CC: %s\n", debugstr_a(address)); + add_argument(argv, argc, "--cc", address); + break; + + case MAPI_BCC: + TRACE("BCC: %s\n", debugstr_a(address)); + add_argument(argv, argc, "--bcc", address); + break; + + default: + TRACE("Unknown recipient class: %d\n", class); + } +} + +static void add_file(char **argv, int *argc, const char *path, const char *file) +{ + WCHAR *fullname, *p; + char *unixpath; + int namelen = 1; + + if (path) + namelen += strlen(path) + 1; + if (file) + namelen += strlen(file); + + p = fullname = HeapAlloc(GetProcessHeap(), 0, namelen * sizeof(WCHAR)); + ZeroMemory(fullname, namelen * sizeof(WCHAR)); + if (path) + { + MultiByteToWideChar(CP_ACP, 0, path, -1, p, namelen); + p += namelen; + MultiByteToWideChar(CP_ACP, 0, "\\", 1, p, 1); + p ++; + } + if (file) + MultiByteToWideChar(CP_ACP, 0, file, -1, p, namelen - (p - fullname)); + + unixpath = wine_get_unix_file_name(fullname); + if (!unixpath) + TRACE("Cannot find unix path of '%s'; not attaching.\n", debugstr_w(fullname)); + HeapFree(GetProcessHeap(), 0, fullname); + if (!unixpath) + return; + + add_argument(argv, argc, "--attach", unixpath); + HeapFree(GetProcessHeap(), 0, unixpath); +} + +/************************************************************************** + * XDGIsAvailable + * + */ +BOOLEAN XDGMailAvailable(void) +{ +#ifdef HAVE_UNISTD_H + char *p, *q, *test; + int len; + int rc; + + for (p = getenv("PATH"); p; p = q) + { + while (*p == ':') + p++; + + if (!*p) + break; + + q = strchr(p, ':'); + len = q ? q - p : strlen(p); + + test = HeapAlloc(GetProcessHeap(), 0, len + strlen("xdg-email") + 1 + 1); + memcpy(test, p, len); + strcpy(test + len, "/"); + strcat(test, "xdg-email"); + + rc = access(test, X_OK); + HeapFree(GetProcessHeap(), 0, test); + + if (rc == 0) + return TRUE; + } +#endif + return FALSE; +} + +/************************************************************************** + * XDGSendMail + * + * Send a message using xdg-email mail client. + * + */ +ULONG XDGSendMail(LHANDLE session, ULONG_PTR uiparam, + lpMapiMessage message, FLAGS flags, ULONG reserved) +{ + int i; + int argc = 0; + int max_args; + char **argv = NULL; + ULONG ret = MAPI_E_FAILURE; + + TRACE("(0x%08lx 0x%08lx %p 0x%08x 0x%08x)\n", session, uiparam, message, flags, reserved); + + if (!message) + return MAPI_E_FAILURE; + + max_args = 1 + (2 + message->nRecipCount + message->nFileCount) * 2; + argv = HeapAlloc(GetProcessHeap(), 0, (max_args + 1) * sizeof(*argv)); + ZeroMemory(argv, (max_args + 1) * sizeof(*argv)); + + add_argument(argv, &argc, "xdg-email", NULL); + + if (message->lpOriginator) + TRACE("From: %s (unused)\n", debugstr_a(message->lpOriginator->lpszAddress)); + + for (i = 0; i < message->nRecipCount; i++) + { + if (!message->lpRecips) + { + WARN("Recipient %d missing\n", i); + goto exit; + } + + if (message->lpRecips[i].lpszAddress) + add_target(argv, &argc, message->lpRecips[i].ulRecipClass, + message->lpRecips[i].lpszAddress); + else + FIXME("Name resolution and entry identifiers not supported\n"); + } + + for (i = 0; i < message->nFileCount; i++) + { + TRACE("File Path: %s, name %s\n", debugstr_a(message->lpFiles[i].lpszPathName), + debugstr_a(message->lpFiles[i].lpszFileName)); + add_file(argv, &argc, message->lpFiles[i].lpszPathName, message->lpFiles[i].lpszFileName); + } + + if (message->lpszSubject) + { + TRACE("Subject: %s\n", debugstr_a(message->lpszSubject)); + add_argument(argv, &argc, "--subject", message->lpszSubject); + } + + if (message->lpszNoteText) + { + TRACE("Body: %s\n", debugstr_a(message->lpszNoteText)); + add_argument(argv, &argc, "--body", message->lpszNoteText); + } + + TRACE("Executing xdg-email; parameters:\n"); + for (i = 0; argv[i] && i <= max_args; i++) + TRACE(" %d: [%s]\n", i, argv[i]); + if (_spawnvp(_P_WAIT, "xdg-email", (const char **) argv) == 0) + ret = SUCCESS_SUCCESS; + +exit: + HeapFree(GetProcessHeap(), 0, argv); + return ret; +} + -- 2.1.4

2 1

Re: [PATCH] winemapi: Directly use xdg-email if available, enabling file attachments.
by Józef Kucia Nov. 16, 2016

Nov. 16, 2016

On Thu, Nov 17, 2016, Jeremy White <jwhite(a)codeweavers.com> wrote: > +static void add_argument(char **argv, int *argc, const char *arg, const char *param) > +{ > + argv[(*argc)] = HeapAlloc(GetProcessHeap(), 0, strlen(arg) + 1); > + strcpy(argv[(*argc)++], arg); > + if (param) > + { > + argv[(*argc)] = HeapAlloc(GetProcessHeap(), 0, strlen(param) + 1); > + strcpy(argv[(*argc)++], param); > + } > +} It looks like a memory leak.

1 0

Re: [PATCH] ntdll: Make LdrUnloadDLL() a stub for musl libc.
by Alexandre Julliard Nov. 16, 2016

Nov. 16, 2016

He X <xw897002528(a)gmail.com> writes: > @@ -2898,6 +2898,7 @@ static void MODULE_DecRefCount( WINE_MODREF *wm ) > */ > NTSTATUS WINAPI LdrUnloadDll( HMODULE hModule ) > { > +#ifndef UNLOAD_AFTER_DLCLOSE > WINE_MODREF *wm; > NTSTATUS retv = STATUS_SUCCESS; > > @@ -2932,6 +2933,10 @@ NTSTATUS WINAPI LdrUnloadDll( HMODULE hModule ) > RtlLeaveCriticalSection( &loader_section ); > > return retv; > +#else > + TRACE("stab for musl\n"); > + return STATUS_SUCCESS; > +#endif You can't do that, unloading dlls is necessary in many cases. The corresponding .so not being unloaded could probably be detected by using destructors, though fixing musl may be preferable. -- Alexandre Julliard julliard(a)winehq.org

1 0