August 2017 - Wine-Commits - list.winehq.org

Henri Verbeet : d3d8/tests: Introduce a test for drawing with a destroyed window.
by Alexandre Julliard Aug. 2, 2017

Aug. 2, 2017

Module: wine Branch: master Commit: d6160213452ec0265f276af10494531b8910f9f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6160213452ec0265f276af10… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 2 18:40:36 2017 +0200 d3d8/tests: Introduce a test for drawing with a destroyed window. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 54f6505..2c0565a 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -8277,6 +8277,43 @@ static void test_format_unknown(void) DestroyWindow(window); } +static void test_destroyed_window(void) +{ + IDirect3DDevice8 *device; + IDirect3D8 *d3d8; + ULONG refcount; + HWND window; + HRESULT hr; + + /* No WS_VISIBLE. */ + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + ok(!!window, "Failed to create a window.\n"); + + d3d8 = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d8, "Failed to create a D3D object.\n"); + device = create_device(d3d8, window, NULL); + IDirect3D8_Release(d3d8); + DestroyWindow(window); + if (!device) + { + skip("Failed to create a 3D device, skipping test.\n"); + return; + } + + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x00000000, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); @@ -8383,6 +8420,7 @@ START_TEST(device) test_miptree_layout(); test_render_target_device_mismatch(); test_format_unknown(); + test_destroyed_window(); UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); }

1 0

Alistair Leslie-Hughes : msvcrt/tests: Use standard wine_dbgstr_longlong.
by Alexandre Julliard Aug. 2, 2017

Aug. 2, 2017

Module: wine Branch: master Commit: d379dc4cb0428cfcf5cd71a17e905fb7c26780ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=d379dc4cb0428cfcf5cd71a17… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Aug 1 01:26:05 2017 +0000 msvcrt/tests: Use standard wine_dbgstr_longlong. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 2c356ea..d92a6e4 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -184,11 +184,11 @@ static void test_fileops( void ) rewind(file); ok(fgetpos(file,&pos) == 0, "fgetpos failed unexpected for bufmode=%x\n", bufmodes[bufmode]); - ok(pos == 0, "Unexpected result of fgetpos %x%08x for bufmode=%x\n", (DWORD)(pos >> 32), (DWORD)pos, bufmodes[bufmode]); + ok(pos == 0, "Unexpected result of fgetpos %s for bufmode=%x\n", wine_dbgstr_longlong(pos), bufmodes[bufmode]); pos = sizeof (outbuffer); ok(fsetpos(file, &pos) == 0, "fsetpos failed unexpected for bufmode=%x\n", bufmodes[bufmode]); ok(fgetpos(file,&pos) == 0, "fgetpos failed unexpected for bufmode=%x\n", bufmodes[bufmode]); - ok(pos == sizeof (outbuffer), "Unexpected result of fgetpos %x%08x for bufmode=%x\n", (DWORD)(pos >> 32), (DWORD)pos, bufmodes[bufmode]); + ok(pos == sizeof (outbuffer), "Unexpected result of fgetpos %s for bufmode=%x\n", wine_dbgstr_longlong(pos), bufmodes[bufmode]); fclose (file); }

1 0

Jacek Caban : ws2_32: Added partial GetAddrInfoExW implementation.
by Alexandre Julliard Aug. 2, 2017

Aug. 2, 2017

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: Added support for overlapped GetAddrInfoExW.
by Alexandre Julliard Aug. 2, 2017

Aug. 2, 2017

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 FreeAddrInfoEx implementation.
by Alexandre Julliard Aug. 2, 2017

Aug. 2, 2017

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 Aug. 2, 2017

Aug. 2, 2017

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

Jacek Caban : ws2_32: Return ADDRINFOEXW type from WS_getaddrinfoW.
by Alexandre Julliard Aug. 2, 2017

Aug. 2, 2017

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

Jeremy Newman : remove appHitStats and catHitStats, no longer used
by Jeremy Newman Aug. 2, 2017

Aug. 2, 2017

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 Aug. 1, 2017

Aug. 1, 2017

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 Aug. 1, 2017

Aug. 1, 2017

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