wine-commits May 2020

wine-commits@winehq.org

1 participants
743 discussions

Alexandre Julliard : ntdll: Don't use libwine during the Unix library initialization.
by Alexandre Julliard 19 May '20

19 May '20

Module: wine Branch: master Commit: 67bc4a6d765941d830477f749ab7b0697f1488b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67bc4a6d765941d830477f74… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 19 14:08:30 2020 +0200 ntdll: Don't use libwine during the Unix library initialization. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 427eeaf413..9028b2de81 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -156,6 +156,17 @@ static void fatal_error( const char *err, ... ) exit(1); } +static void set_max_limit( int limit ) +{ + struct rlimit rlimit; + + if (!getrlimit( limit, &rlimit )) + { + rlimit.rlim_cur = rlimit.rlim_max; + setrlimit( limit, &rlimit ); + } +} + /* canonicalize path and return its directory name */ static char *realpath_dirname( const char *name ) { @@ -905,23 +916,11 @@ static void check_vmsplit( void *stack ) } } -static void set_max_limit( int limit ) -{ - struct rlimit rlimit; - - if (!getrlimit( limit, &rlimit )) - { - rlimit.rlim_cur = rlimit.rlim_max; - setrlimit( limit, &rlimit ); - } -} - static int pre_exec(void) { int temp; check_vmsplit( &temp ); - set_max_limit( RLIMIT_AS ); #ifdef __i386__ return 1; /* we have a preloader on x86 */ #else @@ -1004,7 +1003,6 @@ void __wine_main( int argc, char *argv[], char *envp[] ) { HMODULE module; - wine_init_argv0_path( argv[0] ); init_paths( argc, argv, envp ); if (!getenv( "WINELOADERNOEXEC" )) /* first time around */ @@ -1015,11 +1013,20 @@ void __wine_main( int argc, char *argv[], char *envp[] ) check_command_line( argc, argv ); if (pre_exec()) { - wine_exec_wine_binary( NULL, argv, getenv( "WINELOADER" )); + char **new_argv = malloc( (argc + 2) * sizeof(*argv) ); + memcpy( new_argv + 1, argv, (argc + 1) * sizeof(*argv) ); + loader_exec( argv0, new_argv, is_win64 ); fatal_error( "could not exec the wine loader\n" ); } } +#ifdef RLIMIT_NOFILE + set_max_limit( RLIMIT_NOFILE ); +#endif +#ifdef RLIMIT_AS + set_max_limit( RLIMIT_AS ); +#endif + virtual_init(); module = load_ntdll();

1 0

Alexandre Julliard : ntdll: Move the wineloader exec support to the Unix library.
by Alexandre Julliard 19 May '20

19 May '20

Module: wine Branch: master Commit: fb310724f6c6ca25d7c77131d0df0e90f0e13575 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb310724f6c6ca25d7c77131… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 19 14:08:16 2020 +0200 ntdll: Move the wineloader exec support to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/Makefile.in | 1 + dlls/ntdll/process.c | 8 ++- dlls/ntdll/server.c | 119 ------------------------------------------- dlls/ntdll/unix/loader.c | 130 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unixlib.h | 4 ++ 5 files changed, 141 insertions(+), 121 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fb310724f6c6ca25d7c7…

1 0

Alexandre Julliard : ntdll: Move configuration paths setup to the Unix library.
by Alexandre Julliard 19 May '20

19 May '20

Module: wine Branch: master Commit: e6194290357343674f75f2fc577da7518e84be6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6194290357343674f75f2fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 19 12:35:54 2020 +0200 ntdll: Move configuration paths setup to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/Makefile.in | 4 +- dlls/ntdll/env.c | 3 + dlls/ntdll/loader.c | 4 + dlls/ntdll/ntdll_misc.h | 2 - dlls/ntdll/server.c | 67 +-------------- dlls/ntdll/unix/loader.c | 208 +++++++++++++++++++++++++++++++++++++++++------ dlls/ntdll/unixlib.h | 4 +- 7 files changed, 199 insertions(+), 93 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e6194290357343674f75…

1 0

Alex Henrie : ws2_32: Reimplement inet_pton on top of ntdll functions.
by Alexandre Julliard 19 May '20

19 May '20

Module: wine Branch: master Commit: 41e9a8c5fbf95bceba5be06f825bf9ae59814f3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=41e9a8c5fbf95bceba5be06f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon May 18 21:39:48 2020 -0600 ws2_32: Reimplement inet_pton on top of ntdll functions. And add a test to show that inet_pton does not accept hexadecimal IPv4 addresses, and another test to demonstrate that it has the same leading double colon bug as RtlIpv6StringToAddress. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - dlls/ws2_32/socket.c | 25 ++++++++++++------------- dlls/ws2_32/tests/sock.c | 6 +++++- include/config.h.in | 3 --- 5 files changed, 17 insertions(+), 19 deletions(-) diff --git a/configure b/configure index 7e4a153c20..a6c4384dda 100755 --- a/configure +++ b/configure @@ -18262,7 +18262,6 @@ for ac_func in \ inet_addr \ inet_network \ inet_ntop \ - inet_pton \ do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` diff --git a/configure.ac b/configure.ac index b7916fcca7..8ddeb0710a 100644 --- a/configure.ac +++ b/configure.ac @@ -2247,7 +2247,6 @@ AC_CHECK_FUNCS(\ inet_addr \ inet_network \ inet_ntop \ - inet_pton \ ) dnl Check for clock_gettime which may be in -lrt diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index d57fc9ecd2..8e66ab8fec 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -8394,10 +8394,10 @@ PCSTR WINAPI WS_inet_ntop( INT family, PVOID addr, PSTR buffer, SIZE_T len ) /*********************************************************************** * inet_pton (WS2_32.@) */ -INT WINAPI WS_inet_pton( INT family, PCSTR addr, PVOID buffer) +INT WINAPI WS_inet_pton(INT family, const char *addr, void *buffer) { -#ifdef HAVE_INET_PTON - int unixaf, ret; + NTSTATUS status; + const char *terminator; TRACE("family %d, addr %s, buffer (%p)\n", family, debugstr_a(addr), buffer); @@ -8407,21 +8407,20 @@ INT WINAPI WS_inet_pton( INT family, PCSTR addr, PVOID buffer) return SOCKET_ERROR; } - unixaf = convert_af_w2u(family); - if (unixaf != AF_INET && unixaf != AF_INET6) + switch (family) { + case WS_AF_INET: + status = RtlIpv4StringToAddressA(addr, TRUE, &terminator, buffer); + break; + case WS_AF_INET6: + status = RtlIpv6StringToAddressA(addr, &terminator, buffer); + break; + default: SetLastError(WSAEAFNOSUPPORT); return SOCKET_ERROR; } - ret = inet_pton(unixaf, addr, buffer); - if (ret == -1) SetLastError(wsaErrno()); - return ret; -#else - FIXME( "not supported on this platform\n" ); - SetLastError( WSAEAFNOSUPPORT ); - return SOCKET_ERROR; -#endif + return (status == STATUS_SUCCESS && *terminator == 0); } /*********************************************************************** diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 8bf4e3a83b..134c4d383f 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4993,7 +4993,11 @@ static void test_inet_pton(void) "\x20\x01\xcd\xba\x00\x00\x00\x00\x00\x00\x00\x00\x32\x57\x96\x52"}, {AF_INET6, 1, 0, "2001:cdba:0:0:0:0:3257:9652", "2001:cdba::3257:9652", - "\x20\x01\xcd\xba\x00\x00\x00\x00\x00\x00\x00\x00\x32\x57\x96\x52"} + "\x20\x01\xcd\xba\x00\x00\x00\x00\x00\x00\x00\x00\x32\x57\x96\x52"}, + {AF_INET, 0, 0, + "0x12345678", NULL, NULL}, + {AF_INET6, 0, 0, /* windows bug */ + "::1:2:3:4:5:6:7", NULL, NULL}, }; int i, ret; DWORD err; diff --git a/include/config.h.in b/include/config.h.in index 24a037a50e..d2933eee65 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -308,9 +308,6 @@ /* Define to 1 if you have the `inet_ntop' function. */ #undef HAVE_INET_NTOP -/* Define to 1 if you have the `inet_pton' function. */ -#undef HAVE_INET_PTON - /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H

1 0

Alex Henrie : ws2_32: Set WSAEINVAL in InetPtonW if the address string is unparsable.
by Alexandre Julliard 19 May '20

19 May '20

Module: wine Branch: master Commit: f21b25ae8e20090565a37826179c412da3ef75e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f21b25ae8e20090565a37826… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon May 18 21:22:12 2020 -0600 ws2_32: Set WSAEINVAL in InetPtonW if the address string is unparsable. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 1 + dlls/ws2_32/tests/sock.c | 15 +++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index a5df51d421..d57fc9ecd2 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -8450,6 +8450,7 @@ INT WINAPI InetPtonW(INT family, PCWSTR addr, PVOID buffer) WideCharToMultiByte(CP_ACP, 0, addr, -1, addrA, len, NULL, NULL); ret = WS_inet_pton(family, addrA, buffer); + if (!ret) SetLastError(WSAEINVAL); HeapFree(GetProcessHeap(), 0, addrA); return ret; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 9c996037ce..8bf4e3a83b 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5014,11 +5014,11 @@ static void test_inet_pton(void) WSASetLastError(0xdeadbeef); ret = pInetPtonA(tests[i].family, tests[i].printable, buffer); ok (ret == tests[i].ret, "Test [%d]: Expected %d, got %d\n", i, tests[i].ret, ret); + err = WSAGetLastError(); if (tests[i].ret == -1) - { - err = WSAGetLastError(); ok (tests[i].err == err, "Test [%d]: Expected 0x%x, got 0x%x\n", i, tests[i].err, err); - } + else + ok (err == 0xdeadbeef, "Test [%d]: Expected 0xdeadbeef, got 0x%x\n", i, err); if (tests[i].ret != 1) continue; ok (memcmp(buffer, tests[i].raw_data, tests[i].family == AF_INET ? sizeof(struct in_addr) : sizeof(struct in6_addr)) == 0, @@ -5041,11 +5041,14 @@ static void test_inet_pton(void) WSASetLastError(0xdeadbeef); ret = pInetPtonW(tests[i].family, tests[i].printable ? printableW : NULL, buffer); ok(ret == tests[i].ret, "Test [%d]: Expected %d, got %d\n", i, tests[i].ret, ret); + err = WSAGetLastError(); if (tests[i].ret == -1) - { - err = WSAGetLastError(); ok(tests[i].err == err, "Test [%d]: Expected 0x%x, got 0x%x\n", i, tests[i].err, err); - } + else if (tests[i].ret == 0) + ok(err == WSAEINVAL || broken(err == 0xdeadbeef) /* win2008 */, + "Test [%d]: Expected WSAEINVAL, got 0x%x\n", i, err); + else + ok(err == 0xdeadbeef, "Test [%d]: Expected 0xdeadbeef, got 0x%x\n", i, err); if (tests[i].ret != 1) continue; ok(memcmp(buffer, tests[i].raw_data, tests[i].family == AF_INET ? sizeof(struct in_addr) : sizeof(struct in6_addr)) == 0,

1 0

Zebediah Figura : ntdll: Remove extraneous newline from debugstr_ObjectAttributes().
by Alexandre Julliard 19 May '20

19 May '20

Module: wine Branch: master Commit: 4cb95848fd0de6d96e246bfa2633236cafc43873 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4cb95848fd0de6d96e246bfa… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 18 15:59:23 2020 -0500 ntdll: Remove extraneous newline from debugstr_ObjectAttributes(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index fd9ba49113..3336d6390f 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -37,7 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntdll); LPCSTR debugstr_ObjectAttributes(const OBJECT_ATTRIBUTES *oa) { if (!oa) return "<null>"; - return wine_dbg_sprintf( "{name=%s, attr=0x%08x, hRoot=%p, sd=%p}\n", + return wine_dbg_sprintf( "{name=%s, attr=0x%08x, hRoot=%p, sd=%p}", debugstr_us(oa->ObjectName), oa->Attributes, oa->RootDirectory, oa->SecurityDescriptor ); }

1 0

Zebediah Figura : quartz: Implement IMediaControl::StopWhenReady().
by Alexandre Julliard 19 May '20

19 May '20

Module: wine Branch: master Commit: fe5292bf500302879c7d5c3fcb3d87a684fef632 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe5292bf500302879c7d5c3f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 18 15:57:59 2020 -0500 quartz: Implement IMediaControl::StopWhenReady(). This allows The Bunker to exit cleanly. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 56 +++++++++++++++++++++++++++++++++++++++-- dlls/quartz/tests/filtergraph.c | 20 +++++++++++++++ 2 files changed, 74 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 2afd128919..6217516db1 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2132,11 +2132,63 @@ static HRESULT WINAPI MediaControl_get_RegFilterCollection(IMediaControl *iface, return S_OK; } +static void CALLBACK wait_pause_cb(TP_CALLBACK_INSTANCE *instance, void *context) +{ + IMediaControl *control = context; + OAFilterState state; + HRESULT hr; + + if ((hr = IMediaControl_GetState(control, INFINITE, &state)) != S_OK) + ERR("Failed to get paused state, hr %#x.\n", hr); + + if (FAILED(hr = IMediaControl_Stop(control))) + ERR("Failed to stop, hr %#x.\n", hr); + + if ((hr = IMediaControl_GetState(control, INFINITE, &state)) != S_OK) + ERR("Failed to get paused state, hr %#x.\n", hr); + + IMediaControl_Release(control); +} + +static void CALLBACK wait_stop_cb(TP_CALLBACK_INSTANCE *instance, void *context) +{ + IMediaControl *control = context; + OAFilterState state; + HRESULT hr; + + if ((hr = IMediaControl_GetState(control, INFINITE, &state)) != S_OK) + ERR("Failed to get state, hr %#x.\n", hr); + + IMediaControl_Release(control); +} + static HRESULT WINAPI MediaControl_StopWhenReady(IMediaControl *iface) { - IFilterGraphImpl *This = impl_from_IMediaControl(iface); + IFilterGraphImpl *graph = impl_from_IMediaControl(iface); + HRESULT hr; + + TRACE("graph %p.\n", graph); + + /* Even if we are already stopped, we still pause. */ + hr = IMediaControl_Pause(iface); + if (FAILED(hr)) + return hr; + else if (hr == S_FALSE) + { + IMediaControl_AddRef(iface); + TrySubmitThreadpoolCallback(wait_pause_cb, iface, NULL); + return S_FALSE; + } - FIXME("(%p/%p)->(): stub !!!\n", This, iface); + hr = IMediaControl_Stop(iface); + if (FAILED(hr)) + return hr; + else if (hr == S_FALSE) + { + IMediaControl_AddRef(iface); + TrySubmitThreadpoolCallback(wait_stop_cb, iface, NULL); + return S_FALSE; + } return S_OK; } diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 9aad189979..e926b109ec 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -3178,6 +3178,26 @@ static void test_filter_state(void) ok(hr == S_OK, "Got hr %#x.\n", hr); check_filter_state(graph, State_Stopped); + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + check_filter_state(graph, State_Paused); + + hr = IMediaControl_StopWhenReady(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + check_filter_state(graph, State_Stopped); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + check_filter_state(graph, State_Running); + + hr = IMediaControl_StopWhenReady(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + check_filter_state(graph, State_Stopped); + + hr = IMediaControl_StopWhenReady(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + check_filter_state(graph, State_Stopped); + IReferenceClock_Release(clock); IMediaFilter_Release(filter); IMediaControl_Release(control);

1 0

Zebediah Figura : quartz: Complain louder if a filter reports the wrong state.
by Alexandre Julliard 19 May '20

19 May '20

Module: wine Branch: master Commit: 925e5ddefe411856d443a84636feb949fbe700da URL: https://source.winehq.org/git/wine.git/?a=commit;h=925e5ddefe411856d443a846… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 18 15:57:58 2020 -0500 quartz: Complain louder if a filter reports the wrong state. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index d9530189d5..2afd128919 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -5215,7 +5215,7 @@ static HRESULT WINAPI MediaFilter_GetState(IMediaFilter *iface, DWORD timeout, F else if (filter_hr != S_OK && filter_hr != VFW_S_STATE_INTERMEDIATE) hr = filter_hr; if (filter_state != graph->state) - WARN("Filter %p reported incorrect state %u.\n", filter->filter, filter_state); + ERR("Filter %p reported incorrect state %u.\n", filter->filter, filter_state); } LeaveCriticalSection(&graph->cs);

1 0

Alex Henrie : ws2_32: Reimplement WSAStringToAddress on top of ntdll functions.
by Alexandre Julliard 18 May '20

18 May '20

Module: wine Branch: master Commit: 3bb824f98891e8eb907c9c652fe528373a17b10d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3bb824f98891e8eb907c9c65… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun May 17 23:49:37 2020 -0600 ws2_32: Reimplement WSAStringToAddress on top of ntdll functions. And add tests to show that the address is always zeroed out even if there is an error, and that WSAStringToAddress has the same bug with leading double colons as RtlIpv6StringToAddress. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 82 +++++++++--------------------------------------- dlls/ws2_32/tests/sock.c | 10 +++--- 2 files changed, 20 insertions(+), 72 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index d688994e62..a5df51d421 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -154,6 +154,7 @@ #include "winnt.h" #define USE_WC_PREFIX /* For CMSG_DATA */ #include "iphlpapi.h" +#include "ip2string.h" #include "wine/server.h" #include "wine/debug.h" #include "wine/exception.h" @@ -8484,7 +8485,7 @@ INT WINAPI WSAStringToAddressA(LPSTR AddressString, LPINT lpAddressLength) { INT res=0; - LPSTR workBuffer=NULL,ptrPort; + NTSTATUS status; TRACE( "(%s, %x, %p, %p, %p)\n", debugstr_a(AddressString), AddressFamily, lpProtocolInfo, lpAddress, lpAddressLength ); @@ -8500,21 +8501,11 @@ INT WINAPI WSAStringToAddressA(LPSTR AddressString, if (lpProtocolInfo) FIXME("ProtocolInfo not implemented.\n"); - workBuffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - strlen(AddressString) + 1); - if (!workBuffer) - { - SetLastError(WSA_NOT_ENOUGH_MEMORY); - return SOCKET_ERROR; - } - - strcpy(workBuffer, AddressString); - switch(AddressFamily) { case WS_AF_INET: { - struct in_addr inetaddr; + SOCKADDR_IN *addr4 = (SOCKADDR_IN *)lpAddress; /* If lpAddressLength is too small, tell caller the size we need */ if (*lpAddressLength < sizeof(SOCKADDR_IN)) @@ -8526,35 +8517,18 @@ INT WINAPI WSAStringToAddressA(LPSTR AddressString, *lpAddressLength = sizeof(SOCKADDR_IN); memset(lpAddress, 0, sizeof(SOCKADDR_IN)); - ((LPSOCKADDR_IN)lpAddress)->sin_family = WS_AF_INET; - - ptrPort = strchr(workBuffer, ':'); - if(ptrPort) - { - /* User may have entered an IPv6 and asked to parse as IPv4 */ - if(strchr(ptrPort + 1, ':')) - { - res = WSAEINVAL; - break; - } - ((LPSOCKADDR_IN)lpAddress)->sin_port = htons(atoi(ptrPort+1)); - *ptrPort = '\0'; - } - - if(inet_aton(workBuffer, &inetaddr) > 0) + status = RtlIpv4StringToAddressExA(AddressString, FALSE, &addr4->sin_addr, &addr4->sin_port); + if (status != STATUS_SUCCESS) { - ((LPSOCKADDR_IN)lpAddress)->sin_addr.WS_s_addr = inetaddr.s_addr; - res = 0; - } - else res = WSAEINVAL; - + break; + } + addr4->sin_family = WS_AF_INET; break; } case WS_AF_INET6: { - struct in6_addr inetaddr; - char *ptrAddr = workBuffer; + SOCKADDR_IN6 *addr6 = (SOCKADDR_IN6 *)lpAddress; /* If lpAddressLength is too small, tell caller the size we need */ if (*lpAddressLength < sizeof(SOCKADDR_IN6)) @@ -8563,42 +8537,16 @@ INT WINAPI WSAStringToAddressA(LPSTR AddressString, res = WSAEFAULT; break; } -#ifdef HAVE_INET_PTON *lpAddressLength = sizeof(SOCKADDR_IN6); memset(lpAddress, 0, sizeof(SOCKADDR_IN6)); - ((LPSOCKADDR_IN6)lpAddress)->sin6_family = WS_AF_INET6; - - /* Valid IPv6 addresses can also be surrounded by [ ], and in this case - * a port number may follow after like in [fd12:3456:7890::1]:12345 - * We need to cut the brackets and find the port if any. */ - - if(*workBuffer == '[') - { - ptrPort = strchr(workBuffer, ']'); - if (!ptrPort) - { - SetLastError(WSAEINVAL); - return SOCKET_ERROR; - } - - if (ptrPort[1] == ':') - ((LPSOCKADDR_IN6)lpAddress)->sin6_port = htons(atoi(ptrPort + 2)); - - *ptrPort = '\0'; - ptrAddr = workBuffer + 1; - } - - if(inet_pton(AF_INET6, ptrAddr, &inetaddr) > 0) + status = RtlIpv6StringToAddressExA(AddressString, &addr6->sin6_addr, &addr6->sin6_scope_id, &addr6->sin6_port); + if (status != STATUS_SUCCESS) { - memcpy(&((LPSOCKADDR_IN6)lpAddress)->sin6_addr, &inetaddr, - sizeof(struct in6_addr)); - res = 0; - } - else -#endif /* HAVE_INET_PTON */ res = WSAEINVAL; - + break; + } + addr6->sin6_family = WS_AF_INET6; break; } default: @@ -8607,8 +8555,6 @@ INT WINAPI WSAStringToAddressA(LPSTR AddressString, res = WSAEINVAL; } - HeapFree(GetProcessHeap(), 0, workBuffer); - if (!res) return 0; SetLastError(res); return SOCKET_ERROR; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index c6021f5ac3..9c996037ce 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3429,6 +3429,8 @@ static void test_WSAStringToAddress(void) { "127.127.127.127:65535", 0x7f7f7f7f, 65535 }, { "255.255.255.255:65535", 0xffffffff, 65535 }, { "2001::1", 0xd1070000, 0, WSAEINVAL }, + { "1.2.3.", 0, 0, WSAEINVAL }, + { "", 0, 0, WSAEINVAL }, }; static struct { @@ -3445,6 +3447,10 @@ static void test_WSAStringToAddress(void) { "2001::1", { 0x120, 0, 0, 0, 0, 0, 0, 0x100 } }, { "::1]:65535", { 0, 0, 0, 0, 0, 0, 0, 0x100 }, 0, WSAEINVAL }, { "001::1", { 0x100, 0, 0, 0, 0, 0, 0, 0x100 } }, + { "::1:2:3:4:5:6:7", { 0, 0, 0x100, 0x200, 0x300, 0x400, 0x500, 0x600 }, 0, WSAEINVAL }, /* Windows bug */ + { "1.2.3.4", { 0x201, 0x3, 0, 0, 0, 0, 0, 0 }, 0, WSAEINVAL }, + { "1:2:3:", { 0x100, 0x200, 0x300, 0, 0, 0, 0 }, 0, WSAEINVAL }, + { "", { 0, 0, 0, 0, 0, 0, 0, 0 }, 0, WSAEINVAL }, }; WCHAR inputW[64]; @@ -3485,11 +3491,9 @@ static void test_WSAStringToAddress(void) ok( WSAGetLastError() == ipv4_tests[j].error, "WSAStringToAddress(%s) gave error %d, expected %d\n", wine_dbgstr_a( ipv4_tests[j].input ), WSAGetLastError(), ipv4_tests[j].error ); -todo_wine_if(ipv4_tests[j].error) ok( sockaddr.sin_family == expected_family, "WSAStringToAddress(%s) gave family %d, expected %d\n", wine_dbgstr_a( ipv4_tests[j].input ), sockaddr.sin_family, expected_family ); -todo_wine_if(ipv4_tests[j].error) ok( sockaddr.sin_addr.s_addr == ipv4_tests[j].address, "WSAStringToAddress(%s) gave address %08x, expected %08x\n", wine_dbgstr_a( ipv4_tests[j].input ), sockaddr.sin_addr.s_addr, ipv4_tests[j].address ); @@ -3526,11 +3530,9 @@ todo_wine_if(ipv4_tests[j].error) ok( WSAGetLastError() == ipv6_tests[j].error, "WSAStringToAddress(%s) gave error %d, expected %d\n", wine_dbgstr_a( ipv6_tests[j].input ), WSAGetLastError(), ipv6_tests[j].error ); -todo_wine_if(ipv6_tests[j].error) ok( sockaddr6.sin6_family == expected_family, "WSAStringToAddress(%s) gave family %d, expected %d\n", wine_dbgstr_a( ipv4_tests[j].input ), sockaddr6.sin6_family, expected_family ); -todo_wine_if(ipv6_tests[j].error) ok( memcmp(&sockaddr6.sin6_addr, ipv6_tests[j].address, sizeof(sockaddr6.sin6_addr)) == 0, "WSAStringToAddress(%s) gave address %x:%x:%x:%x:%x:%x:%x:%x, expected %x:%x:%x:%x:%x:%x:%x:%x\n", wine_dbgstr_a( ipv6_tests[j].input ),

1 0

Alex Henrie : ws2_32/tests: Put WSAStringToAddress tests in tables.
by Alexandre Julliard 18 May '20

18 May '20

Module: wine Branch: master Commit: 2756b68559b22bcd1d40d0680ccfcd69922b30c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2756b68559b22bcd1d40d068… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun May 17 23:49:36 2020 -0600 ws2_32/tests: Put WSAStringToAddress tests in tables. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 380 ++++++++++++++++------------------------------- 1 file changed, 130 insertions(+), 250 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2756b68559b22bcd1d40…

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
75
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2020