[PATCH v3 2/2] ws2_32/tests: Remove todo_wine from now-successful tests.

[Ally Sommers]

From: Ally Sommers

---
 dlls/ws2_32/tests/sock.c | 16 ++++++++--------
 server/sock.c            |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
index cff4acb0b3c..48d1141da92 100644
--- a/dlls/ws2_32/tests/sock.c
+++ b/dlls/ws2_32/tests/sock.c
@@ -9158,16 +9158,16 @@ static void test_shutdown(void)

addrlen = sizeof(addr);
     ret = getpeername(client, (struct sockaddr *)&addr, &addrlen);
-    todo_wine ok(!ret, "got error %u\n", WSAGetLastError());
-    todo_wine ok(!memcmp(&addr, &server_addr, sizeof(server_addr)), "address didn't match\n");
+    ok(!ret, "got error %u\n", WSAGetLastError());
+    ok(!memcmp(&addr, &server_addr, sizeof(server_addr)), "address didn't match\n");

addrlen = sizeof(client_addr);
     ret = getsockname(client, (struct sockaddr *)&client_addr, &addrlen);
     ok(!ret, "got error %u\n", WSAGetLastError());
     addrlen = sizeof(addr);
     ret = getpeername(server, (struct sockaddr *)&addr, &addrlen);
-    todo_wine ok(!ret, "got error %u\n", WSAGetLastError());
-    todo_wine ok(!memcmp(&addr, &client_addr, sizeof(addr)), "address didn't match\n");
+    ok(!ret, "got error %u\n", WSAGetLastError());
+    ok(!memcmp(&addr, &client_addr, sizeof(addr)), "address didn't match\n");

WSASetLastError(0xdeadbeef);
     ret = connect(client, (struct sockaddr *)&server_addr, sizeof(server_addr));
@@ -9226,16 +9226,16 @@ static void test_shutdown(void)

addrlen = sizeof(addr);
     ret = getpeername(client, (struct sockaddr *)&addr, &addrlen);
-    todo_wine ok(!ret, "got error %u\n", WSAGetLastError());
-    todo_wine ok(!memcmp(&addr, &server_addr, sizeof(server_addr)), "address didn't match\n");
+    ok(!ret, "got error %u\n", WSAGetLastError());
+    ok(!memcmp(&addr, &server_addr, sizeof(server_addr)), "address didn't match\n");

addrlen = sizeof(client_addr);
     ret = getsockname(client, (struct sockaddr *)&client_addr, &addrlen);
     ok(!ret, "got error %u\n", WSAGetLastError());
     addrlen = sizeof(addr);
     ret = getpeername(server, (struct sockaddr *)&addr, &addrlen);
-    todo_wine ok(!ret, "got error %u\n", WSAGetLastError());
-    todo_wine ok(!memcmp(&addr, &client_addr, sizeof(addr)), "address didn't match\n");
+    ok(!ret, "got error %u\n", WSAGetLastError());
+    ok(!memcmp(&addr, &client_addr, sizeof(addr)), "address didn't match\n");

closesocket(client);
     closesocket(server);
diff --git a/server/sock.c b/server/sock.c
index 5068bbca025..f80d43d28a4 100644
--- a/server/sock.c
+++ b/server/sock.c
@@ -2089,7 +2089,7 @@ static int accept_into_socket( struct sock *sock, struct sock *acceptsock )
     if (!getsockname( get_unix_fd( newfd ), &unix_addr.addr, &unix_len ))
     {
         acceptsock->addr_len = sockaddr_from_unix( &unix_addr, &acceptsock->addr.addr, sizeof(acceptsock->addr) );
-        if (!getpeername( acceptfd, &unix_addr.addr, &unix_len ))
+        if (!getpeername( get_unix_fd( newfd ), &unix_addr.addr, &unix_len ))
         acceptsock->peer_addr_len = sockaddr_from_unix( &unix_addr,
                                                         &acceptsock->peer_addr.addr,
                                                         sizeof(acceptsock->peer_addr) );