November 2021 - Wine-commits

Jacek Caban : user.exe: Use WINPROC_CallProc16To32A for DefWindowProc16.
by Alexandre Julliard 30 Nov '21

30 Nov '21

Module: wine Branch: master Commit: 1bfae238c861f83e6ccb9e8821d5fb0de5a48a61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bfae238c861f83e6ccb9e88… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 30 16:51:35 2021 +0100 user.exe: Use WINPROC_CallProc16To32A for DefWindowProc16. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51624 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51899 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user.exe16/message.c | 80 +++++------------------------------------------ 1 file changed, 8 insertions(+), 72 deletions(-) diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index 93e2cc018bf..e0f5bfa5d19 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -78,6 +78,12 @@ static LRESULT defdlg_proc_callback( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, return *result; } +static LRESULT defwnd_proc_callback( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, + LRESULT *result, void *arg ) +{ + return *result = DefWindowProcA( hwnd, msg, wp, lp ); +} + static LRESULT call_window_proc_callback( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, LRESULT *result, void *arg ) { @@ -1601,78 +1607,8 @@ BOOL16 WINAPI PeekMessage32_16( MSG32_16 *msg16, HWND16 hwnd16, LRESULT WINAPI DefWindowProc16( HWND16 hwnd16, UINT16 msg, WPARAM16 wParam, LPARAM lParam ) { LRESULT result; - HWND hwnd = WIN_Handle32( hwnd16 ); - - switch(msg) - { - case WM_NCCREATE: - { - CREATESTRUCT16 *cs16 = MapSL(lParam); - CREATESTRUCTA cs32; - - cs32.lpCreateParams = ULongToPtr(cs16->lpCreateParams); - cs32.hInstance = HINSTANCE_32(cs16->hInstance); - cs32.hMenu = HMENU_32(cs16->hMenu); - cs32.hwndParent = WIN_Handle32(cs16->hwndParent); - cs32.cy = cs16->cy; - cs32.cx = cs16->cx; - cs32.y = cs16->y; - cs32.x = cs16->x; - cs32.style = cs16->style; - cs32.dwExStyle = cs16->dwExStyle; - cs32.lpszName = MapSL(cs16->lpszName); - cs32.lpszClass = MapSL(cs16->lpszClass); - return DefWindowProcA( hwnd, msg, wParam, (LPARAM)&cs32 ); - } - case WM_NCCALCSIZE: - { - RECT16 *rect16 = MapSL(lParam); - RECT rect32; - - rect32.left = rect16->left; - rect32.top = rect16->top; - rect32.right = rect16->right; - rect32.bottom = rect16->bottom; - - result = DefWindowProcA( hwnd, msg, wParam, (LPARAM)&rect32 ); - - rect16->left = rect32.left; - rect16->top = rect32.top; - rect16->right = rect32.right; - rect16->bottom = rect32.bottom; - return result; - } - case WM_WINDOWPOSCHANGING: - case WM_WINDOWPOSCHANGED: - { - WINDOWPOS16 *pos16 = MapSL(lParam); - WINDOWPOS pos32; - - pos32.hwnd = WIN_Handle32(pos16->hwnd); - pos32.hwndInsertAfter = WIN_Handle32(pos16->hwndInsertAfter); - pos32.x = pos16->x; - pos32.y = pos16->y; - pos32.cx = pos16->cx; - pos32.cy = pos16->cy; - pos32.flags = pos16->flags; - - result = DefWindowProcA( hwnd, msg, wParam, (LPARAM)&pos32 ); - - pos16->hwnd = HWND_16(pos32.hwnd); - pos16->hwndInsertAfter = HWND_16(pos32.hwndInsertAfter); - pos16->x = pos32.x; - pos16->y = pos32.y; - pos16->cx = pos32.cx; - pos16->cy = pos32.cy; - pos16->flags = pos32.flags; - return result; - } - case WM_GETTEXT: - case WM_SETTEXT: - return DefWindowProcA( hwnd, msg, wParam, (LPARAM)MapSL(lParam) ); - default: - return DefWindowProcA( hwnd, msg, wParam, lParam ); - } + WINPROC_CallProc16To32A( defwnd_proc_callback, hwnd16, msg, wParam, lParam, &result, 0 ); + return result; }

1 0

Nikolay Sivov : user.exe: Fix WM_ERASEBKGND HDC param conversion in WINPROC_CallProc16To32A.
by Alexandre Julliard 30 Nov '21

30 Nov '21

Module: wine Branch: master Commit: 0f16aa1842d2bb9f5b8410cfd342680a9a1844ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f16aa1842d2bb9f5b8410cf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 30 16:51:41 2021 +0100 user.exe: Fix WM_ERASEBKGND HDC param conversion in WINPROC_CallProc16To32A. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51624 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51899 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user.exe16/message.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index e0f5bfa5d19..b79b0cb7751 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -905,6 +905,9 @@ LRESULT WINPROC_CallProc16To32A( winproc_callback_t callback, HWND16 hwnd, UINT1 case WM_SIZECLIPBOARD: FIXME_(msg)( "message %04x needs translation\n", msg ); break; + case WM_ERASEBKGND: + ret = callback( hwnd32, msg, (WPARAM)HDC_32(wParam), lParam, result, arg ); + break; default: ret = callback( hwnd32, msg, wParam, lParam, result, arg ); break;

1 0

Paul Gofman : d3d9/tests: Add more tests for fullscreen window size reset.
by Alexandre Julliard 30 Nov '21

30 Nov '21

Module: wine Branch: master Commit: 78533e9e94d4fcae06dd44d29dbed4755d4ac1f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=78533e9e94d4fcae06dd44d2… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Nov 29 22:27:37 2021 +0300 d3d9/tests: Add more tests for fullscreen window size reset. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 3ef9361886d..c480a9d163e 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -14572,10 +14572,10 @@ static void test_window_position(void) { unsigned int adapter_idx, adapter_count; struct device_desc device_desc; + RECT window_rect, new_rect; IDirect3DDevice9 *device; MONITORINFO monitor_info; HMONITOR monitor; - RECT window_rect; IDirect3D9 *d3d; HWND window; HRESULT hr; @@ -14612,6 +14612,42 @@ static void test_window_position(void) "Adapter %u: Expect window rect %s, got %s.\n", adapter_idx, wine_dbgstr_rect(&monitor_info.rcMonitor), wine_dbgstr_rect(&window_rect)); + new_rect = window_rect; + --new_rect.right; + --new_rect.bottom; + + ret = MoveWindow(window, new_rect.left, new_rect.top, new_rect.right - new_rect.left, + new_rect.bottom - new_rect.top, TRUE); + ok(ret, "Got unexpected ret %#x, error %#x, Adapter %u.\n", ret, GetLastError(), adapter_idx); + ret = GetWindowRect(window, &window_rect); + ok(ret, "Got unexpected ret %#x, error %#x, Adapter %u.\n", ret, GetLastError(), adapter_idx); + ok(EqualRect(&window_rect, &new_rect), + "Adapter %u: Expect window rect %s, got %s.\n", adapter_idx, + wine_dbgstr_rect(&monitor_info.rcMonitor), wine_dbgstr_rect(&window_rect)); + /* After processing window events window rectangle gets restored. But only once, the size set + * on the second resize remains. */ + flush_events(); + ret = GetWindowRect(window, &window_rect); + ok(ret, "Got unexpected ret %#x, error %#x, Adapter %u.\n", ret, GetLastError(), adapter_idx); + todo_wine ok(EqualRect(&window_rect, &monitor_info.rcMonitor), + "Adapter %u: Expect window rect %s, got %s.\n", adapter_idx, + wine_dbgstr_rect(&monitor_info.rcMonitor), wine_dbgstr_rect(&window_rect)); + + ret = MoveWindow(window, new_rect.left, new_rect.top, new_rect.right - new_rect.left, + new_rect.bottom - new_rect.top, TRUE); + ok(ret, "Got unexpected ret %#x, error %#x, Adapter %u.\n", ret, GetLastError(), adapter_idx); + ret = GetWindowRect(window, &window_rect); + ok(ret, "Got unexpected ret %#x, error %#x, Adapter %u.\n", ret, GetLastError(), adapter_idx); + ok(EqualRect(&window_rect, &new_rect), + "Adapter %u: Expect window rect %s, got %s.\n", adapter_idx, + wine_dbgstr_rect(&monitor_info.rcMonitor), wine_dbgstr_rect(&window_rect)); + flush_events(); + ret = GetWindowRect(window, &window_rect); + ok(ret, "Got unexpected ret %#x, error %#x, Adapter %u.\n", ret, GetLastError(), adapter_idx); + ok(EqualRect(&window_rect, &new_rect), + "Adapter %u: Expect window rect %s, got %s.\n", adapter_idx, + wine_dbgstr_rect(&monitor_info.rcMonitor), wine_dbgstr_rect(&window_rect)); + /* Device resets should restore the window rectangle to fit the whole monitor */ ret = SetWindowPos(window, 0, 0, 0, 0, 0, SWP_NOZORDER | SWP_NOSIZE); ok(ret, "Adapter %u: SetWindowPos failed, error %#x.\n", adapter_idx, GetLastError());

1 0

Alistair Leslie-Hughes : dxgi: Silence a noisy fixme.
by Alexandre Julliard 30 Nov '21

30 Nov '21

Module: wine Branch: master Commit: c5773b8c76f0e0f9ecdf9b9688b30a1ee39ccb6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5773b8c76f0e0f9ecdf9b96… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 30 08:05:01 2021 +1100 dxgi: Silence a noisy fixme. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/factory.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 4c3e3cf0f34..e3aa554ae85 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -253,7 +253,12 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSoftwareAdapter(IWineDXGIFac static BOOL STDMETHODCALLTYPE dxgi_factory_IsCurrent(IWineDXGIFactory *iface) { - FIXME("iface %p stub!\n", iface); + static BOOL once = FALSE; + + if (!once++) + FIXME("iface %p stub!\n", iface); + else + WARN("iface %p stub!\n", iface); return TRUE; }

1 0

Zebediah Figura : wined3d: Always set GL_PIXEL_PACK_BUFFER binding before downloading texture data.
by Alexandre Julliard 30 Nov '21

30 Nov '21

Module: wine Branch: master Commit: f4cbd110d9234a339fede7e005135fd31c926cb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4cbd110d9234a339fede7e0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 29 18:13:41 2021 -0600 wined3d: Always set GL_PIXEL_PACK_BUFFER binding before downloading texture data. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 48202c2142c..d4c7082912b 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2695,6 +2695,8 @@ static void wined3d_texture_gl_download_data_slow_path(struct wined3d_texture_gl if (temporary_mem) { + GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, 0)); + checkGLcall("glBindBuffer"); mem = temporary_mem; } else if (bo) @@ -2705,6 +2707,8 @@ static void wined3d_texture_gl_download_data_slow_path(struct wined3d_texture_gl } else { + GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, 0)); + checkGLcall("glBindBuffer"); mem = data->addr; } @@ -2918,6 +2922,11 @@ static void wined3d_texture_gl_download_data(struct wined3d_context *context, checkGLcall("glBindBuffer"); offset += dst_bo->buffer_offset; } + else + { + GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, 0)); + checkGLcall("glBindBuffer"); + } if (src_texture->resource.format_flags & WINED3DFMT_FLAG_COMPRESSED) {

1 0

Zebediah Figura : wined3d: Always set GL_PIXEL_PACK_BUFFER binding in texture2d_read_from_framebuffer().
by Alexandre Julliard 30 Nov '21

30 Nov '21

Module: wine Branch: master Commit: d3d9785483dd0735de2b93f3376d79b1b1d9b0b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3d9785483dd0735de2b93f3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 29 18:13:42 2021 -0600 wined3d: Always set GL_PIXEL_PACK_BUFFER binding in texture2d_read_from_framebuffer(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 060ac84b8b7..9a5b4cbff72 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -475,6 +475,11 @@ void texture2d_read_from_framebuffer(struct wined3d_texture *texture, unsigned i checkGLcall("glBindBuffer"); offset += data.buffer_object->buffer_offset; } + else + { + GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, 0)); + checkGLcall("glBindBuffer"); + } level = sub_resource_idx % texture->level_count; wined3d_texture_get_pitch(texture, level, &row_pitch, &slice_pitch);

1 0

Zebediah Figura : include: Add _fpreset().
by Alexandre Julliard 30 Nov '21

30 Nov '21

Module: wine Branch: master Commit: d0acbcb0d730651af12ba2774990e515e278dd44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0acbcb0d730651af12ba277… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 29 11:01:15 2021 -0600 include: Add _fpreset(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/float.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/msvcrt/float.h b/include/msvcrt/float.h index 4ed5a79b5b3..c24ac3c3aee 100644 --- a/include/msvcrt/float.h +++ b/include/msvcrt/float.h @@ -135,6 +135,7 @@ extern "C" { #endif _ACRTIMP unsigned int __cdecl _clearfp(void); +_ACRTIMP void __cdecl _fpreset(void); _ACRTIMP unsigned int __cdecl _statusfp(void); _ACRTIMP int __cdecl __fpe_flt_rounds(void); _ACRTIMP unsigned int __cdecl _control87(unsigned int, unsigned int);

1 0

Hans Leidekker : ws2_32: Implement AI_DNS_ONLY using DNS APIs.
by Alexandre Julliard 30 Nov '21

30 Nov '21

Module: wine Branch: master Commit: 7c39ce0a6cf8a3df1337a0768045c43044fce2f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c39ce0a6cf8a3df1337a076… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 30 17:29:07 2021 +0100 ws2_32: Implement AI_DNS_ONLY using DNS APIs. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52133 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/Makefile.in | 2 +- dlls/ws2_32/protocol.c | 84 ++++++++++++++++++++++++++++++++++++++++++++ dlls/ws2_32/tests/protocol.c | 20 +++++++++++ dlls/ws2_32/ws2_32_private.h | 1 + include/ws2def.h | 6 ++++ 5 files changed, 112 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/Makefile.in b/dlls/ws2_32/Makefile.in index 232ce7f31fd..83ae5e915ae 100644 --- a/dlls/ws2_32/Makefile.in +++ b/dlls/ws2_32/Makefile.in @@ -1,7 +1,7 @@ MODULE = ws2_32.dll UNIXLIB = ws2_32.so IMPORTLIB = ws2_32 -DELAYIMPORTS = advapi32 iphlpapi user32 +DELAYIMPORTS = dnsapi advapi32 iphlpapi user32 C_SRCS = \ async.c \ diff --git a/dlls/ws2_32/protocol.c b/dlls/ws2_32/protocol.c index 492400b17a7..239e4d14cd2 100644 --- a/dlls/ws2_32/protocol.c +++ b/dlls/ws2_32/protocol.c @@ -69,6 +69,84 @@ static int do_getaddrinfo( const char *node, const char *service, } } +static int dns_only_query( const char *node, const struct addrinfo *hints, struct addrinfo **result ) +{ + DNS_STATUS status; + DNS_RECORDA *rec = NULL, *rec6 = NULL, *ptr; + struct addrinfo *info, *next; + struct sockaddr_in *addr; + struct sockaddr_in6 *addr6; + ULONG count = 0; + + if (hints->ai_family != AF_INET && hints->ai_family != AF_INET6 && hints->ai_family != AF_UNSPEC) + { + FIXME( "unsupported family %u\n", hints->ai_family ); + return EAI_FAMILY; + } + if (hints->ai_family == AF_INET || hints->ai_family == AF_UNSPEC) + { + status = DnsQuery_A( node, DNS_TYPE_A, DNS_QUERY_NO_NETBT | DNS_QUERY_NO_MULTICAST, NULL, &rec, NULL ); + if (status != ERROR_SUCCESS && status != DNS_ERROR_RCODE_NAME_ERROR) return EAI_FAIL; + } + if (hints->ai_family == AF_INET6 || hints->ai_family == AF_UNSPEC) + { + status = DnsQuery_A( node, DNS_TYPE_AAAA, DNS_QUERY_NO_NETBT | DNS_QUERY_NO_MULTICAST, NULL, &rec6, NULL ); + if (status != ERROR_SUCCESS && status != DNS_ERROR_RCODE_NAME_ERROR) + { + DnsRecordListFree( (DNS_RECORD *)rec, DnsFreeRecordList ); + return EAI_FAIL; + } + } + + for (ptr = rec; ptr; ptr = ptr->pNext) count++; + for (ptr = rec6; ptr; ptr = ptr->pNext) count++; + if (!count) + { + DnsRecordListFree( (DNS_RECORD *)rec, DnsFreeRecordList ); + DnsRecordListFree( (DNS_RECORD *)rec6, DnsFreeRecordList ); + return WSAHOST_NOT_FOUND; + } + if (!(info = calloc( count, sizeof(*info) + sizeof(SOCKADDR_STORAGE) ))) + { + DnsRecordListFree( (DNS_RECORD *)rec, DnsFreeRecordList ); + DnsRecordListFree( (DNS_RECORD *)rec6, DnsFreeRecordList ); + return WSA_NOT_ENOUGH_MEMORY; + } + *result = info; + + for (ptr = rec; ptr; ptr = ptr->pNext) + { + info->ai_family = AF_INET; + info->ai_socktype = hints->ai_socktype; + info->ai_protocol = hints->ai_protocol; + info->ai_addrlen = sizeof(struct sockaddr_in); + info->ai_addr = (struct sockaddr *)(info + 1); + addr = (struct sockaddr_in *)info->ai_addr; + addr->sin_family = info->ai_family; + addr->sin_addr.S_un.S_addr = ptr->Data.A.IpAddress; + next = (struct addrinfo *)((char *)info + sizeof(*info) + sizeof(SOCKADDR_STORAGE)); + if (--count) info->ai_next = next; + info = next; + } + for (ptr = rec6; ptr; ptr = ptr->pNext) + { + info->ai_family = AF_INET6; + info->ai_socktype = hints->ai_socktype; + info->ai_protocol = hints->ai_protocol; + info->ai_addrlen = sizeof(struct sockaddr_in6); + info->ai_addr = (struct sockaddr *)(info + 1); + addr6 = (struct sockaddr_in6 *)info->ai_addr; + addr6->sin6_family = info->ai_family; + memcpy( &addr6->sin6_addr, &ptr->Data.AAAA.Ip6Address, sizeof(addr6->sin6_addr) ); + next = (struct addrinfo *)((char *)info + sizeof(*info) + sizeof(SOCKADDR_STORAGE)); + if (--count) info->ai_next = next; + info = next; + } + + DnsRecordListFree( (DNS_RECORD *)rec, DnsFreeRecordList ); + DnsRecordListFree( (DNS_RECORD *)rec6, DnsFreeRecordList ); + return 0; +} /*********************************************************************** * getaddrinfo (ws2_32.@) @@ -96,6 +174,11 @@ int WINAPI getaddrinfo( const char *node, const char *service, if (!(fqdn = get_fqdn())) return WSA_NOT_ENOUGH_MEMORY; node = fqdn; } + else if (!service && hints && (hints->ai_flags == AI_DNS_ONLY || hints->ai_flags == (AI_ALL | AI_DNS_ONLY))) + { + ret = dns_only_query( node, hints, info ); + goto done; + } else if (!hints || hints->ai_family == AF_UNSPEC || hints->ai_family == AF_INET6) { /* [ipv6] or [ipv6]:portnumber are supported by Windows */ @@ -139,6 +222,7 @@ int WINAPI getaddrinfo( const char *node, const char *service, free( fqdn ); free( nodev6 ); +done: if (!ret && TRACE_ON(winsock)) { struct addrinfo *ai; diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index bb09dc98f1c..6eebb5f6b4d 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -2328,6 +2328,26 @@ static void test_getaddrinfo(void) memset(&hint, 0, sizeof(hint)); ret = getaddrinfo(NULL, "nonexistentservice", &hint, &result); ok(ret == WSATYPE_NOT_FOUND, "got %d\n", ret); + + result = NULL; + memset(&hint, 0, sizeof(hint)); + hint.ai_flags = AI_ALL | AI_DNS_ONLY; + hint.ai_family = AF_UNSPEC; + hint.ai_socktype = SOCK_STREAM; + hint.ai_protocol = IPPROTO_TCP; + ret = getaddrinfo("winehq.org", NULL, &hint, &result); + ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); + ok(!result->ai_flags, "ai_flags == %08x\n", result->ai_flags); + ok(result->ai_family == AF_INET, "ai_family == %d\n", result->ai_family); + ok(result->ai_socktype == SOCK_STREAM, "ai_socktype == %d\n", result->ai_socktype); + ok(result->ai_protocol == IPPROTO_TCP, "ai_protocol == %d\n", result->ai_protocol); + ok(!result->ai_canonname, "ai_canonname == %s\n", result->ai_canonname); + ok(result->ai_addrlen == sizeof(struct sockaddr_in), "ai_addrlen == %d\n", (int)result->ai_addrlen); + ok(result->ai_addr != NULL, "ai_addr == NULL\n"); + sockaddr = (SOCKADDR_IN *)result->ai_addr; + ok(sockaddr->sin_family == AF_INET, "ai_addr->sin_family == %d\n", sockaddr->sin_family); + ok(sockaddr->sin_port == 0, "ai_addr->sin_port == %d\n", sockaddr->sin_port); + freeaddrinfo(result); } static void test_dns(void) diff --git a/dlls/ws2_32/ws2_32_private.h b/dlls/ws2_32/ws2_32_private.h index 8ad3e0d17e9..fa2f89f6e98 100644 --- a/dlls/ws2_32/ws2_32_private.h +++ b/dlls/ws2_32/ws2_32_private.h @@ -48,6 +48,7 @@ #define USE_WC_PREFIX /* For CMSG_DATA */ #include "iphlpapi.h" #include "ip2string.h" +#include "windns.h" #include "wine/afd.h" #include "wine/debug.h" #include "wine/unixlib.h" diff --git a/include/ws2def.h b/include/ws2def.h index 9ddfa031633..46fb80db470 100644 --- a/include/ws2def.h +++ b/include/ws2def.h @@ -284,6 +284,12 @@ typedef struct _WSAMSG { (((unsigned char*)cmsg + WSA_CMSG_ALIGN(cmsg->cmsg_len)+WSA_CMSG_ALIGN(((WSACMSGHDR*)((unsigned char*)cmsg + WSA_CMSG_ALIGN(cmsg->cmsg_len)))->cmsg_len) > ((unsigned char*)(mhdr)->Control.buf + (mhdr)->Control.len)) ? NULL : \ (WSACMSGHDR*)((unsigned char*)cmsg + WSA_CMSG_ALIGN(cmsg->cmsg_len)))))) +#ifndef USE_WS_PREFIX +#define AI_DNS_ONLY 0x00000010 +#else +#define WS_AI_DNS_ONLY 0x00000010 +#endif + typedef struct addrinfoexA { int ai_flags; int ai_family;

1 0

Hans Leidekker : winhttp: Use DNS only for proxy auto-detection.
by Alexandre Julliard 30 Nov '21

30 Nov '21

Module: wine Branch: master Commit: 859f9daada0292a2ce69e5302424905f3b1e335d URL: https://source.winehq.org/git/wine.git/?a=commit;h=859f9daada0292a2ce69e530… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 30 17:29:08 2021 +0100 winhttp: Use DNS only for proxy auto-detection. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52133 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/session.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 3c8cb0fa992..2620bf30ac0 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1466,7 +1466,7 @@ static WCHAR *detect_autoproxyconfig_url_dns(void) while ((p = strchr( p, '.' )) && is_domain_suffix( p + 1, domain )) { char *name; - struct addrinfo *ai; + struct addrinfo *ai, hints; int res; if (!(name = malloc( sizeof("wpad") + strlen(p) ))) @@ -1477,7 +1477,10 @@ static WCHAR *detect_autoproxyconfig_url_dns(void) } strcpy( name, "wpad" ); strcat( name, p ); - res = getaddrinfo( name, NULL, NULL, &ai ); + memset( &hints, 0, sizeof(hints) ); + hints.ai_flags = AI_ALL | AI_DNS_ONLY; + hints.ai_family = AF_UNSPEC; + res = getaddrinfo( name, NULL, &hints, &ai ); if (!res) { ret = build_wpad_url( name, ai );

1 0

Hans Leidekker : wininet: Use DNS only for proxy auto-detection.
by Alexandre Julliard 30 Nov '21

30 Nov '21

Module: wine Branch: master Commit: d13ec212c3311f671d4519f4d81833635f12505d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d13ec212c3311f671d4519f4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 30 17:29:09 2021 +0100 wininet: Use DNS only for proxy auto-detection. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52133 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 46fbe86f549..b0fe8a5e3fb 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2431,7 +2431,7 @@ static WCHAR *detect_proxy_autoconfig_url_dns(void) while ((p = strchr( p, '.' )) && is_domain_suffix( p + 1, domain )) { char *name; - struct addrinfo *ai; + struct addrinfo *ai, hints; int res; if (!(name = heap_alloc( sizeof("wpad") + strlen(p) ))) @@ -2442,7 +2442,10 @@ static WCHAR *detect_proxy_autoconfig_url_dns(void) } strcpy( name, "wpad" ); strcat( name, p ); - res = getaddrinfo( name, NULL, NULL, &ai ); + memset( &hints, 0, sizeof(hints) ); + hints.ai_flags = AI_ALL | AI_DNS_ONLY; + hints.ai_family = AF_UNSPEC; + res = getaddrinfo( name, NULL, &hints, &ai ); if (!res) { ret = build_wpad_url( name, ai );

1 0