wine-commits August 2017

wine-commits@winehq.org

2 participants
351 discussions

Zebediah Figura : include: Add initial IDL for cmnquery.h.
by Alexandre Julliard 02 Aug '17

02 Aug '17

Module: wine Branch: master Commit: bc89730e51b713a3bf5bbcda3c30268818cba34a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc89730e51b713a3bf5bbcda3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 1 10:03:36 2017 -0500 include: Add initial IDL for cmnquery.h. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/cmnquery.idl | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 063c4ec..81c646e 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -24,6 +24,7 @@ IDL_SRCS = \ chprst.idl \ cmdbas.idl \ cmdtxt.idl \ + cmnquery.idl \ colinf.idl \ comcat.idl \ commoncontrols.idl \ diff --git a/include/cmnquery.idl b/include/cmnquery.idl new file mode 100644 index 0000000..f9d2991 --- /dev/null +++ b/include/cmnquery.idl @@ -0,0 +1,79 @@ +/* + * Copyright 2017 Zebediah Figura 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 + */ + +import "oaidl.idl"; + +[ + object, + uuid(1a3114b8-a62e-11d0-a6c5-00a0c906af45), + local +] +interface IPersistQuery : IPersist +{ + HRESULT WriteString([in] LPCWSTR section, [in] LPCWSTR name, [in] LPCWSTR value); + + HRESULT ReadString([in] LPCWSTR section, [in] LPCWSTR name, [out, size_is(buflen)] LPWSTR buffer, [in] INT buflen); + + HRESULT WriteInt([in] LPCWSTR section, [in] LPCWSTR name, [in] INT value); + + HRESULT ReadInt([in] LPCWSTR section, [in] LPCWSTR name, [out] INT *value); + + HRESULT WriteStruct([in] LPCWSTR section, [in] LPCWSTR name, [in] LPVOID value, [in] DWORD size); + + HRESULT ReadStruct([in] LPCWSTR section, [in] LPCWSTR name, [out, size_is(buflen)] LPVOID buffer, [in] DWORD buflen); + + HRESULT Clear(); +} + +cpp_quote("#define OQWF_OKCANCEL 0x00000001") +cpp_quote("#define OQWF_DEFAULTFORM 0x00000002") +cpp_quote("#define OQWF_SINGLESELECT 0x00000004") +cpp_quote("#define OQWF_LOADQUERY 0x00000008") +cpp_quote("#define OQWF_REMOVESCOPES 0x00000010") +cpp_quote("#define OQWF_REMOVEFORMS 0x00000020") +cpp_quote("#define OQWF_ISSUEONOPEN 0x00000040") +cpp_quote("#define OQWF_SHOWOPTIONAL 0x00000080") +cpp_quote("#define OQWF_SAVEQUERYONOK 0x00000200") +cpp_quote("#define OQWF_HIDEMENUS 0x00000400") +cpp_quote("#define OQWF_HIDESEARCHUI 0x00000800") +cpp_quote("#define OQWF_PARAMISPROPERTYBAG 0x80000000") + +typedef struct { + DWORD cbStruct; + DWORD dwFlags; + CLSID clsidHandler; + LPVOID pHandlerParameters; + CLSID clsidDefaultForm; + IPersistQuery *pPersistQuery; + union { + void *pFormParameters; + IPropertyBag *ppbFormParameters; + }; +} OPENQUERYWINDOW, *LPOPENQUERYWINDOW; + +[ + object, + uuid(ab50dec0-6f1d-11d0-a1c4-00aa00c16e65), + local +] +interface ICommonQuery : IUnknown +{ + HRESULT OpenQueryWindow([in] HWND parent, [in] LPOPENQUERYWINDOW query_window, [out] IDataObject **data_object); +} + +cpp_quote("DEFINE_GUID(CLSID_CommonQuery, 0x83bc5ec0, 0x6f2a, 0x11d0, 0xa1,0xc4, 0x00,0xaa,0x00,0xc1,0x6e,0x65);")

1 0

Jacek Caban : ws2_32/tests: Added GetAddrInfoExW tests.
by Alexandre Julliard 02 Aug '17

02 Aug '17

Module: wine Branch: master Commit: eb32d1a52b4c5a4728b4eab830559e0a9916cb19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb32d1a52b4c5a4728b4eab83… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 1 18:29:55 2017 +0200 ws2_32/tests: Added GetAddrInfoExW tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 99 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index e975ea4..43008cf 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -66,7 +66,13 @@ static void (WINAPI *pfreeaddrinfo)(struct addrinfo *); static int (WINAPI *pgetaddrinfo)(LPCSTR,LPCSTR,const struct addrinfo *,struct addrinfo **); static void (WINAPI *pFreeAddrInfoW)(PADDRINFOW); +static void (WINAPI *pFreeAddrInfoExW)(ADDRINFOEXW *ai); static int (WINAPI *pGetAddrInfoW)(LPCWSTR,LPCWSTR,const ADDRINFOW *,PADDRINFOW *); +static int (WINAPI *pGetAddrInfoExW)(const WCHAR *name, const WCHAR *servname, DWORD namespace, + GUID *namespace_id, const ADDRINFOEXW *hints, ADDRINFOEXW **result, + struct timeval *timeout, OVERLAPPED *overlapped, + LPLOOKUPSERVICE_COMPLETION_ROUTINE completion_routine, HANDLE *handle); +static int (WINAPI *pGetAddrInfoExOverlappedResult)(OVERLAPPED *overlapped); static PCSTR (WINAPI *pInetNtop)(INT,LPVOID,LPSTR,ULONG); static PCWSTR(WINAPI *pInetNtopW)(INT,LPVOID,LPWSTR,ULONG); static int (WINAPI *pInetPtonA)(INT,LPCSTR,LPVOID); @@ -1226,7 +1232,10 @@ static void Init (void) pfreeaddrinfo = (void *)GetProcAddress(hws2_32, "freeaddrinfo"); pgetaddrinfo = (void *)GetProcAddress(hws2_32, "getaddrinfo"); pFreeAddrInfoW = (void *)GetProcAddress(hws2_32, "FreeAddrInfoW"); + pFreeAddrInfoExW = (void *)GetProcAddress(hws2_32, "FreeAddrInfoExW"); pGetAddrInfoW = (void *)GetProcAddress(hws2_32, "GetAddrInfoW"); + pGetAddrInfoExW = (void *)GetProcAddress(hws2_32, "GetAddrInfoExW"); + pGetAddrInfoExOverlappedResult = (void *)GetProcAddress(hws2_32, "GetAddrInfoExOverlappedResult"); pInetNtop = (void *)GetProcAddress(hws2_32, "inet_ntop"); pInetNtopW = (void *)GetProcAddress(hws2_32, "InetNtopW"); pInetPtonA = (void *)GetProcAddress(hws2_32, "inet_pton"); @@ -7334,6 +7343,95 @@ static void test_GetAddrInfoW(void) ok(result2 == NULL, "got %p\n", result2); } +static void test_GetAddrInfoExW(void) +{ + static const WCHAR empty[] = {0}; + static const WCHAR localhost[] = {'l','o','c','a','l','h','o','s','t',0}; + static const WCHAR winehq[] = {'t','e','s','t','.','w','i','n','e','h','q','.','o','r','g',0}; + ADDRINFOEXW *result; + OVERLAPPED overlapped; + HANDLE event; + int ret; + + if (!pGetAddrInfoExW || !pGetAddrInfoExOverlappedResult) + { + win_skip("GetAddrInfoExW and/or GetAddrInfoExOverlappedResult not present\n"); + return; + } + + event = WSACreateEvent(); + + result = (ADDRINFOEXW *)0xdeadbeef; + WSASetLastError(0xdeadbeef); + ret = pGetAddrInfoExW(NULL, NULL, NS_DNS, NULL, NULL, &result, NULL, NULL, NULL, NULL); + ok(ret == WSAHOST_NOT_FOUND, "got %d expected WSAHOST_NOT_FOUND\n", ret); + ok(WSAGetLastError() == WSAHOST_NOT_FOUND, "expected 11001, got %d\n", WSAGetLastError()); + ok(result == NULL, "got %p\n", result); + + result = NULL; + WSASetLastError(0xdeadbeef); + ret = pGetAddrInfoExW(empty, NULL, NS_DNS, NULL, NULL, &result, NULL, NULL, NULL, NULL); + ok(!ret, "GetAddrInfoExW failed with %d\n", WSAGetLastError()); + ok(result != NULL, "GetAddrInfoW failed\n"); + ok(WSAGetLastError() == 0, "expected 0, got %d\n", WSAGetLastError()); + pFreeAddrInfoExW(result); + + result = NULL; + ret = pGetAddrInfoExW(localhost, NULL, NS_DNS, NULL, NULL, &result, NULL, NULL, NULL, NULL); + ok(!ret, "GetAddrInfoExW failed with %d\n", WSAGetLastError()); + pFreeAddrInfoExW(result); + + result = (void*)0xdeadbeef; + memset(&overlapped, 0xcc, sizeof(overlapped)); + overlapped.hEvent = event; + ResetEvent(event); + ret = pGetAddrInfoExW(localhost, NULL, NS_DNS, NULL, NULL, &result, NULL, &overlapped, NULL, NULL); + ok(ret == ERROR_IO_PENDING, "GetAddrInfoExW failed with %d\n", WSAGetLastError()); + ok(!result, "result != NULL\n"); + ok(WaitForSingleObject(event, 1000) == WAIT_OBJECT_0, "wait failed\n"); + ret = pGetAddrInfoExOverlappedResult(&overlapped); + ok(!ret, "overlapped result is %d\n", ret); + pFreeAddrInfoExW(result); + + result = (void*)0xdeadbeef; + memset(&overlapped, 0xcc, sizeof(overlapped)); + ResetEvent(event); + overlapped.hEvent = event; + WSASetLastError(0xdeadbeef); + ret = pGetAddrInfoExW(winehq, NULL, NS_DNS, NULL, NULL, &result, NULL, &overlapped, NULL, NULL); + ok(ret == ERROR_IO_PENDING, "GetAddrInfoExW failed with %d\n", WSAGetLastError()); + ok(WSAGetLastError() == ERROR_IO_PENDING, "expected 11001, got %d\n", WSAGetLastError()); + ret = overlapped.Internal; + ok(ret == WSAEINPROGRESS || ret == ERROR_SUCCESS, "overlapped.Internal = %u\n", ret); + ok(WaitForSingleObject(event, 1000) == WAIT_OBJECT_0, "wait failed\n"); + ret = pGetAddrInfoExOverlappedResult(&overlapped); + ok(!ret, "overlapped result is %d\n", ret); + ok(overlapped.hEvent == event, "hEvent changed %p\n", overlapped.hEvent); + ok(overlapped.Internal == ERROR_SUCCESS, "overlapped.Internal = %lx\n", overlapped.Internal); + ok(overlapped.Pointer == &result, "overlapped.Pointer != &result\n"); + ok(result != NULL, "result == NULL\n"); + ok(!result->ai_blob, "ai_blob != NULL\n"); + ok(!result->ai_bloblen, "ai_bloblen != 0\n"); + ok(!result->ai_provider, "ai_provider = %s\n", wine_dbgstr_guid(result->ai_provider)); + pFreeAddrInfoExW(result); + + result = (void*)0xdeadbeef; + memset(&overlapped, 0xcc, sizeof(overlapped)); + ResetEvent(event); + overlapped.hEvent = event; + ret = pGetAddrInfoExW(NULL, NULL, NS_DNS, NULL, NULL, &result, NULL, &overlapped, NULL, NULL); + todo_wine + ok(ret == WSAHOST_NOT_FOUND, "got %d expected WSAHOST_NOT_FOUND\n", ret); + todo_wine + ok(WSAGetLastError() == WSAHOST_NOT_FOUND, "expected 11001, got %d\n", WSAGetLastError()); + ok(result == NULL, "got %p\n", result); + ret = WaitForSingleObject(event, 0); + todo_wine_if(ret != WAIT_TIMEOUT) /* Remove when abowe todo_wines are fixed */ + ok(ret == WAIT_TIMEOUT, "wait failed\n"); + + WSACloseEvent(event); +} + static void verify_ipv6_addrinfo(ADDRINFOA *result, const char *expectedIp) { SOCKADDR_IN6 *sockaddr6; @@ -10579,6 +10677,7 @@ START_TEST( sock ) test_ipv6only(); test_TransmitFile(); test_GetAddrInfoW(); + test_GetAddrInfoExW(); test_getaddrinfo(); test_AcceptEx(); test_ConnectEx();

1 0

Jacek Caban : ws2_32: Added support for overlapped GetAddrInfoExW.
by Alexandre Julliard 02 Aug '17

02 Aug '17

Module: wine Branch: master Commit: a71c18e7fd11611da6775e6dee1100c51fbffeb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a71c18e7fd11611da6775e6de… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 1 19:36:28 2017 +0200 ws2_32: Added support for overlapped GetAddrInfoExW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 62 insertions(+), 8 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index b47e84d..9cae18f 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6826,7 +6826,39 @@ static struct WS_addrinfo *addrinfo_WtoA(const struct WS_addrinfoW *ai) return ret; } -static int WS_getaddrinfoW(const WCHAR *nodename, const WCHAR *servname, const struct WS_addrinfo *hints, ADDRINFOEXW **res) +struct getaddrinfo_args +{ + OVERLAPPED *overlapped; + ADDRINFOEXW **result; + char *nodename; + char *servname; +}; + +static void WINAPI getaddrinfo_callback(TP_CALLBACK_INSTANCE *instance, void *context) +{ + struct getaddrinfo_args *args = context; + OVERLAPPED *overlapped = args->overlapped; + HANDLE event = overlapped->hEvent; + struct WS_addrinfo *res; + int ret; + + ret = WS_getaddrinfo(args->nodename, args->servname, NULL, &res); + if (res) + { + *args->result = addrinfo_list_AtoW(res); + overlapped->u.Pointer = args->result; + WS_freeaddrinfo(res); + } + + HeapFree(GetProcessHeap(), 0, args->nodename); + HeapFree(GetProcessHeap(), 0, args->servname); + HeapFree(GetProcessHeap(), 0, args); + + overlapped->Internal = ret; + if (event) SetEvent(event); +} + +static int WS_getaddrinfoW(const WCHAR *nodename, const WCHAR *servname, const struct WS_addrinfo *hints, ADDRINFOEXW **res, OVERLAPPED *overlapped) { int ret = EAI_MEMORY, len, i; char *nodenameA = NULL, *servnameA = NULL; @@ -6878,8 +6910,32 @@ static int WS_getaddrinfoW(const WCHAR *nodename, const WCHAR *servname, const s WideCharToMultiByte(CP_ACP, 0, servname, -1, servnameA, len, NULL, NULL); } - ret = WS_getaddrinfo(nodenameA, servnameA, hints, &resA); + if (overlapped) + { + struct getaddrinfo_args *args; + + if (!(args = HeapAlloc(GetProcessHeap(), 0, sizeof(*args)))) goto end; + args->overlapped = overlapped; + args->result = res; + args->nodename = nodenameA; + args->servname = servnameA; + + overlapped->Internal = WSAEINPROGRESS; + if (!TrySubmitThreadpoolCallback(getaddrinfo_callback, args, NULL)) + { + HeapFree(GetProcessHeap(), 0, args); + ret = GetLastError(); + goto end; + } + + if (local_nodenameW != nodename) + HeapFree(GetProcessHeap(), 0, local_nodenameW); + WSASetLastError(ERROR_IO_PENDING); + return ERROR_IO_PENDING; + } + + ret = WS_getaddrinfo(nodenameA, servnameA, hints, &resA); if (!ret) { *res = addrinfo_list_AtoW(resA); @@ -6914,14 +6970,12 @@ int WINAPI GetAddrInfoExW(const WCHAR *name, const WCHAR *servname, DWORD namesp FIXME("Unsupported hints\n"); if (timeout) FIXME("Unsupported timeout\n"); - if (overlapped) - FIXME("Unsupported overlapped\n"); if (completion_routine) FIXME("Unsupported completion_routine\n"); if (handle) FIXME("Unsupported cancel handle\n"); - ret = WS_getaddrinfoW(name, servname, NULL, result); + ret = WS_getaddrinfoW(name, servname, NULL, result, overlapped); if (ret) return ret; if (handle) *handle = (HANDLE)0xdeadbeef; return 0; @@ -6932,8 +6986,8 @@ int WINAPI GetAddrInfoExW(const WCHAR *name, const WCHAR *servname, DWORD namesp */ int WINAPI GetAddrInfoExOverlappedResult(OVERLAPPED *overlapped) { - FIXME("(%p)\n", overlapped); - return SOCKET_ERROR; + TRACE("(%p)\n", overlapped); + return overlapped->Internal; } /*********************************************************************** @@ -6959,7 +7013,7 @@ int WINAPI GetAddrInfoW(LPCWSTR nodename, LPCWSTR servname, const ADDRINFOW *hin *res = NULL; if (hints) hintsA = addrinfo_WtoA(hints); - ret = WS_getaddrinfoW(nodename, servname, hintsA, &resex); + ret = WS_getaddrinfoW(nodename, servname, hintsA, &resex, NULL); WS_freeaddrinfo(hintsA); if (ret) return ret;

1 0

Jacek Caban : ws2_32: Added partial GetAddrInfoExW implementation.
by Alexandre Julliard 02 Aug '17

02 Aug '17

Module: wine Branch: master Commit: a17ac691bc0618fdf66e3c2e23ee99dcc6b66b4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a17ac691bc0618fdf66e3c2e2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 1 18:29:39 2017 +0200 ws2_32: Added partial GetAddrInfoExW implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 37931a5..b47e84d 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6901,9 +6901,30 @@ int WINAPI GetAddrInfoExW(const WCHAR *name, const WCHAR *servname, DWORD namesp const ADDRINFOEXW *hints, ADDRINFOEXW **result, struct timeval *timeout, OVERLAPPED *overlapped, LPLOOKUPSERVICE_COMPLETION_ROUTINE completion_routine, HANDLE *handle) { - FIXME("(%s %s %x %s %p %p %p %p %p %p)\n", debugstr_w(name), debugstr_w(servname), namespace, + int ret; + + TRACE("(%s %s %x %s %p %p %p %p %p %p)\n", debugstr_w(name), debugstr_w(servname), namespace, debugstr_guid(namespace_id), hints, result, timeout, overlapped, completion_routine, handle); - return WSAHOST_NOT_FOUND; + + if (namespace != NS_DNS) + FIXME("Unsupported namespace %u\n", namespace); + if (namespace_id) + FIXME("Unsupported naemspace_id %s\n", debugstr_guid(namespace_id)); + if (hints) + FIXME("Unsupported hints\n"); + if (timeout) + FIXME("Unsupported timeout\n"); + if (overlapped) + FIXME("Unsupported overlapped\n"); + if (completion_routine) + FIXME("Unsupported completion_routine\n"); + if (handle) + FIXME("Unsupported cancel handle\n"); + + ret = WS_getaddrinfoW(name, servname, NULL, result); + if (ret) return ret; + if (handle) *handle = (HANDLE)0xdeadbeef; + return 0; } /***********************************************************************

1 0

Jacek Caban : ws2_32: Return ADDRINFOEXW type from WS_getaddrinfoW.
by Alexandre Julliard 02 Aug '17

02 Aug '17

Module: wine Branch: master Commit: 037e6010dac62a6d5cb419aac47d5b8df1ce7da4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=037e6010dac62a6d5cb419aac… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 1 18:29:35 2017 +0200 ws2_32: Return ADDRINFOEXW type from WS_getaddrinfoW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 71241c6..37931a5 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6733,11 +6733,11 @@ outofmem: #endif } -static struct WS_addrinfoW *addrinfo_AtoW(const struct WS_addrinfo *ai) +static ADDRINFOEXW *addrinfo_AtoW(const struct WS_addrinfo *ai) { - struct WS_addrinfoW *ret; + ADDRINFOEXW *ret; - if (!(ret = HeapAlloc(GetProcessHeap(), 0, sizeof(struct WS_addrinfoW)))) return NULL; + if (!(ret = HeapAlloc(GetProcessHeap(), 0, sizeof(ADDRINFOEXW)))) return NULL; ret->ai_flags = ai->ai_flags; ret->ai_family = ai->ai_family; ret->ai_socktype = ai->ai_socktype; @@ -6745,6 +6745,9 @@ static struct WS_addrinfoW *addrinfo_AtoW(const struct WS_addrinfo *ai) ret->ai_addrlen = ai->ai_addrlen; ret->ai_canonname = NULL; ret->ai_addr = NULL; + ret->ai_blob = NULL; + ret->ai_bloblen = 0; + ret->ai_provider = NULL; ret->ai_next = NULL; if (ai->ai_canonname) { @@ -6769,16 +6772,16 @@ static struct WS_addrinfoW *addrinfo_AtoW(const struct WS_addrinfo *ai) return ret; } -static struct WS_addrinfoW *addrinfo_list_AtoW(const struct WS_addrinfo *info) +static ADDRINFOEXW *addrinfo_list_AtoW(const struct WS_addrinfo *info) { - struct WS_addrinfoW *ret, *infoW; + ADDRINFOEXW *ret, *infoW; if (!(ret = infoW = addrinfo_AtoW(info))) return NULL; while (info->ai_next) { if (!(infoW->ai_next = addrinfo_AtoW(info->ai_next))) { - FreeAddrInfoW(ret); + FreeAddrInfoExW(ret); return NULL; } infoW = infoW->ai_next; @@ -6823,7 +6826,7 @@ static struct WS_addrinfo *addrinfo_WtoA(const struct WS_addrinfoW *ai) return ret; } -static int WS_getaddrinfoW(const WCHAR *nodename, const WCHAR *servname, const struct WS_addrinfo *hints, PADDRINFOW *res) +static int WS_getaddrinfoW(const WCHAR *nodename, const WCHAR *servname, const struct WS_addrinfo *hints, ADDRINFOEXW **res) { int ret = EAI_MEMORY, len, i; char *nodenameA = NULL, *servnameA = NULL; @@ -6927,15 +6930,29 @@ int WINAPI GetAddrInfoExCancel(HANDLE *handle) int WINAPI GetAddrInfoW(LPCWSTR nodename, LPCWSTR servname, const ADDRINFOW *hints, PADDRINFOW *res) { struct WS_addrinfo *hintsA = NULL; + ADDRINFOEXW *resex; int ret = EAI_MEMORY; TRACE("nodename %s, servname %s, hints %p, result %p\n", debugstr_w(nodename), debugstr_w(servname), hints, res); + *res = NULL; if (hints) hintsA = addrinfo_WtoA(hints); - ret = WS_getaddrinfoW(nodename, servname, hintsA, res); + ret = WS_getaddrinfoW(nodename, servname, hintsA, &resex); WS_freeaddrinfo(hintsA); - return ret; + if (ret) return ret; + + if (resex) + { + /* ADDRINFOEXW has layout compatible with ADDRINFOW except for ai_next field, + * so we may convert it in place */ + *res = (ADDRINFOW*)resex; + do { + ((ADDRINFOW*)resex)->ai_next = (ADDRINFOW*)resex->ai_next; + resex = resex->ai_next; + } while (resex); + } + return 0; } /***********************************************************************

1 0

Jacek Caban : ws2_32: Added FreeAddrInfoEx implementation.
by Alexandre Julliard 02 Aug '17

02 Aug '17

Module: wine Branch: master Commit: 001a8a4f2725dc48f989b0aafdc2d6145ee31237 URL: http://source.winehq.org/git/wine.git/?a=commit;h=001a8a4f2725dc48f989b0aaf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 1 18:29:31 2017 +0200 ws2_32: Added FreeAddrInfoEx implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 12 +++++++++++- include/ws2tcpip.h | 1 + 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index e1cc15f..71241c6 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6959,7 +6959,17 @@ void WINAPI FreeAddrInfoW(PADDRINFOW ai) */ void WINAPI FreeAddrInfoExW(ADDRINFOEXW *ai) { - FIXME("%p\n", ai); + TRACE("(%p)\n", ai); + + while (ai) + { + ADDRINFOEXW *next; + HeapFree(GetProcessHeap(), 0, ai->ai_canonname); + HeapFree(GetProcessHeap(), 0, ai->ai_addr); + next = ai->ai_next; + HeapFree(GetProcessHeap(), 0, ai); + ai = next; + } } int WINAPI WS_getnameinfo(const SOCKADDR *sa, WS_socklen_t salen, PCHAR host, diff --git a/include/ws2tcpip.h b/include/ws2tcpip.h index 2d509be..f12deec 100644 --- a/include/ws2tcpip.h +++ b/include/ws2tcpip.h @@ -173,6 +173,7 @@ void WINAPI WS(freeaddrinfo)(LPADDRINFO); #define FreeAddrInfoA WS(freeaddrinfo) void WINAPI FreeAddrInfoW(PADDRINFOW); #define FreeAddrInfo WINELIB_NAME_AW(FreeAddrInfo) +void WINAPI FreeAddrInfoExW(ADDRINFOEXW*); int WINAPI WS(getaddrinfo)(const char*,const char*,const struct WS(addrinfo)*,struct WS(addrinfo)**); #define GetAddrInfoA WS(getaddrinfo) int WINAPI GetAddrInfoW(PCWSTR,PCWSTR,const ADDRINFOW*,PADDRINFOW*);

1 0

Jacek Caban : ws2_32: Factor out GetAddrInfoW implementation.
by Alexandre Julliard 02 Aug '17

02 Aug '17

Module: wine Branch: master Commit: 39fe376e92d1ac8a456424802be4bc28be955293 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39fe376e92d1ac8a456424802… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 1 18:29:21 2017 +0200 ws2_32: Factor out GetAddrInfoW implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 91 +++++++++++++++++++++++++++++----------------------- 1 file changed, 50 insertions(+), 41 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 620b19b..e1cc15f 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6823,49 +6823,13 @@ static struct WS_addrinfo *addrinfo_WtoA(const struct WS_addrinfoW *ai) return ret; } -/*********************************************************************** - * GetAddrInfoExW (WS2_32.@) - */ -int WINAPI GetAddrInfoExW(const WCHAR *name, const WCHAR *servname, DWORD namespace, GUID *namespace_id, - const ADDRINFOEXW *hints, ADDRINFOEXW **result, struct timeval *timeout, OVERLAPPED *overlapped, - LPLOOKUPSERVICE_COMPLETION_ROUTINE completion_routine, HANDLE *handle) -{ - FIXME("(%s %s %x %s %p %p %p %p %p %p)\n", debugstr_w(name), debugstr_w(servname), namespace, - debugstr_guid(namespace_id), hints, result, timeout, overlapped, completion_routine, handle); - return WSAHOST_NOT_FOUND; -} - -/*********************************************************************** - * GetAddrInfoExOverlappedResult (WS2_32.@) - */ -int WINAPI GetAddrInfoExOverlappedResult(OVERLAPPED *overlapped) -{ - FIXME("(%p)\n", overlapped); - return SOCKET_ERROR; -} - -/*********************************************************************** - * GetAddrInfoExCancel (WS2_32.@) - */ -int WINAPI GetAddrInfoExCancel(HANDLE *handle) -{ - FIXME("(%p)\n", handle); - return WSA_INVALID_HANDLE; -} - -/*********************************************************************** - * GetAddrInfoW (WS2_32.@) - */ -int WINAPI GetAddrInfoW(LPCWSTR nodename, LPCWSTR servname, const ADDRINFOW *hints, PADDRINFOW *res) +static int WS_getaddrinfoW(const WCHAR *nodename, const WCHAR *servname, const struct WS_addrinfo *hints, PADDRINFOW *res) { int ret = EAI_MEMORY, len, i; char *nodenameA = NULL, *servnameA = NULL; - struct WS_addrinfo *resA, *hintsA = NULL; + struct WS_addrinfo *resA; WCHAR *local_nodenameW = (WCHAR *)nodename; - TRACE("nodename %s, servname %s, hints %p, result %p\n", - debugstr_w(nodename), debugstr_w(servname), hints, res); - *res = NULL; if (nodename) { @@ -6911,9 +6875,7 @@ int WINAPI GetAddrInfoW(LPCWSTR nodename, LPCWSTR servname, const ADDRINFOW *hin WideCharToMultiByte(CP_ACP, 0, servname, -1, servnameA, len, NULL, NULL); } - if (hints) hintsA = addrinfo_WtoA(hints); - ret = WS_getaddrinfo(nodenameA, servnameA, hintsA, &resA); - WS_freeaddrinfo(hintsA); + ret = WS_getaddrinfo(nodenameA, servnameA, hints, &resA); if (!ret) { @@ -6930,6 +6892,53 @@ end: } /*********************************************************************** + * GetAddrInfoExW (WS2_32.@) + */ +int WINAPI GetAddrInfoExW(const WCHAR *name, const WCHAR *servname, DWORD namespace, GUID *namespace_id, + const ADDRINFOEXW *hints, ADDRINFOEXW **result, struct timeval *timeout, OVERLAPPED *overlapped, + LPLOOKUPSERVICE_COMPLETION_ROUTINE completion_routine, HANDLE *handle) +{ + FIXME("(%s %s %x %s %p %p %p %p %p %p)\n", debugstr_w(name), debugstr_w(servname), namespace, + debugstr_guid(namespace_id), hints, result, timeout, overlapped, completion_routine, handle); + return WSAHOST_NOT_FOUND; +} + +/*********************************************************************** + * GetAddrInfoExOverlappedResult (WS2_32.@) + */ +int WINAPI GetAddrInfoExOverlappedResult(OVERLAPPED *overlapped) +{ + FIXME("(%p)\n", overlapped); + return SOCKET_ERROR; +} + +/*********************************************************************** + * GetAddrInfoExCancel (WS2_32.@) + */ +int WINAPI GetAddrInfoExCancel(HANDLE *handle) +{ + FIXME("(%p)\n", handle); + return WSA_INVALID_HANDLE; +} + +/*********************************************************************** + * GetAddrInfoW (WS2_32.@) + */ +int WINAPI GetAddrInfoW(LPCWSTR nodename, LPCWSTR servname, const ADDRINFOW *hints, PADDRINFOW *res) +{ + struct WS_addrinfo *hintsA = NULL; + int ret = EAI_MEMORY; + + TRACE("nodename %s, servname %s, hints %p, result %p\n", + debugstr_w(nodename), debugstr_w(servname), hints, res); + + if (hints) hintsA = addrinfo_WtoA(hints); + ret = WS_getaddrinfoW(nodename, servname, hintsA, res); + WS_freeaddrinfo(hintsA); + return ret; +} + +/*********************************************************************** * FreeAddrInfoW (WS2_32.@) */ void WINAPI FreeAddrInfoW(PADDRINFOW ai)

1 0

Jeremy Newman : remove appHitStats and catHitStats, no longer used
by Jeremy Newman 02 Aug '17

02 Aug '17

Module: appdb Branch: master Commit: 75edc0778910135ac90365b6e72ed0741f81ee56 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=75edc0778910135ac90365b6… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Aug 2 08:33:33 2017 -0500 remove appHitStats and catHitStats, no longer used There are better ways of tracking that information than storing it in sql tables. --- tables/appdb_tables.sql | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/tables/appdb_tables.sql b/tables/appdb_tables.sql index d4c5b6b..30af6ca 100644 --- a/tables/appdb_tables.sql +++ b/tables/appdb_tables.sql @@ -6,8 +6,6 @@ drop table if exists vendor; drop table if exists appFamily; drop table if exists appVersion; drop table if exists appCategory; -drop table if exists appHitStats; -drop table if exists catHitStats; drop table if exists appComments; drop table if exists appData; drop table if exists appBundle; @@ -94,28 +92,6 @@ create table appBundle ( /* - * appHitStats and catHitStats are to record statistics - */ -create table appHitStats ( - appHitId int not null auto_increment, - time datetime, - ip varchar(16), - appId int not null, - count int, - key(appHitId) -); - -create table catHitStats ( - catHitId int not null auto_increment, - time datetime, - ip varchar(16), - catId int not null, - count int, - key(catHitId) -); - - -/* * user comments */ create table appComments (

1 0

Vincent Povirk : mscoree: Update Wine Mono to 4.7.1.
by Alexandre Julliard 01 Aug '17

01 Aug '17

Module: wine Branch: master Commit: 619b7e07d7ee1a20bb816ebec8e40eaedc47f870 URL: http://source.winehq.org/git/wine.git/?a=commit;h=619b7e07d7ee1a20bb816ebec… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Aug 1 13:54:27 2017 -0500 mscoree: Update Wine Mono to 4.7.1. This has some bug fixes from Mono, and it no longer ships debug symbols for the whole managed class library, which were accidentally included in 4.7.0. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_main.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index dcd6535..5ec49cf 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -65,8 +65,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "4.7.0" -#define MONO_SHA "7698474dd9cb9eb80796b5812dff37386ba97b78b21ca23b20079ca5ad6ca5a1" +#define MONO_VERSION "4.7.1" +#define MONO_SHA "2c8d5db7f833c3413b2519991f5af1f433d59a927564ec6f38a3f1f8b2c629aa" typedef struct { const char *version; diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 49b319c..2c5d2cb 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -675,7 +675,7 @@ static BOOL install_wine_mono(void) LONG len; BOOL ret; - static const char* mono_version = "4.7.0"; + static const char* mono_version = "4.7.1"; static const char* mono_product_code = "{E45D8920-A758-4088-B6C6-31DBB276992E}"; static const WCHAR controlW[] = {'\\','c','o','n','t','r','o','l','.','e','x','e',0};

1 0

Alex Henrie : msvcrt: Don't set errno in sqrt(f) if x is positive infinity.
by Alexandre Julliard 01 Aug '17

01 Aug '17

Module: wine Branch: master Commit: d20b89cf93f5d670d3be0fae78be93c6ad866799 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d20b89cf93f5d670d3be0fae7… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 1 00:13:35 2017 -0600 msvcrt: Don't set errno in sqrt(f) if x is positive infinity. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 2001d44..c141fea 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -279,7 +279,7 @@ float CDECL MSVCRT_sinhf( float x ) */ float CDECL MSVCRT_sqrtf( float x ) { - if (x < 0.0 || !finitef(x)) *MSVCRT__errno() = MSVCRT_EDOM; + if (x < 0.0) *MSVCRT__errno() = MSVCRT_EDOM; return sqrtf(x); } @@ -476,7 +476,7 @@ double CDECL MSVCRT_sinh( double x ) */ double CDECL MSVCRT_sqrt( double x ) { - if (x < 0.0 || !isfinite(x)) *MSVCRT__errno() = MSVCRT_EDOM; + if (x < 0.0) *MSVCRT__errno() = MSVCRT_EDOM; return sqrt(x); }

1 0

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 August 2017