[MSWSOCK] Revert r74753 and r74755 as it showed regressions

svn path=/trunk/; revision=74756

reactos/dll/win32/mswsock/CMakeLists.txt

@@ -16,7 +16,6 @@ add_library(mswsock SHARED
     ${CMAKE_CURRENT_BINARY_DIR}/mswsock.def)
 
 set_module_type(mswsock win32dll UNICODE)
-target_link_libraries(mswsock wine)
 add_importlibs(mswsock ws2_32 advapi32 dnsapi msvcrt kernel32 ntdll)
 add_pch(mswsock precomp.h SOURCE)
 add_cd_file(TARGET mswsock DESTINATION reactos/system32 FOR all)

reactos/dll/win32/mswsock/extensions.c

@@ -12,9 +12,6 @@
 #include <winsock2.h>
 #include <mswsock.h>
 
-#include <wine/debug.h>
-WINE_DEFAULT_DEBUG_CHANNEL(mswsock);
-
 LPFN_TRANSMITFILE pfnTransmitFile = NULL;
 LPFN_GETACCEPTEXSOCKADDRS pfnGetAcceptExSockaddrs = NULL;
 LPFN_ACCEPTEX pfnAcceptEx = NULL;
@@ -33,10 +30,8 @@ TransmitFile(SOCKET Socket,
 {
     GUID TransmitFileGUID = WSAID_TRANSMITFILE;
     DWORD cbBytesReturned;
-    BOOL  Ret;
 
-    TRACE("TransmitFile %p %p %ld %ld %p %p %lx\n", Socket, File, NumberOfBytesToWrite, NumberOfBytesPerSend, Overlapped, TransmitBuffers, Flags);
+    if (WSAIoctl(Socket,
-    if (!pfnTransmitFile && WSAIoctl(Socket,
                  SIO_GET_EXTENSION_FUNCTION_POINTER,
                  &TransmitFileGUID,
                  sizeof(TransmitFileGUID),
@@ -46,22 +41,16 @@ TransmitFile(SOCKET Socket,
                  NULL,
                  NULL) == SOCKET_ERROR)
     {
-        ERR("TransmitFile WSAIoctl %lx\n", WSAGetLastError());
         return FALSE;
     }
 
-    Ret = pfnTransmitFile(Socket,
+    return pfnTransmitFile(Socket,
                            File,
                            NumberOfBytesToWrite,
                            NumberOfBytesPerSend,
                            Overlapped,
                            TransmitBuffers,
                            Flags);
-    if (!Ret)
-    {
-        ERR("TransmitFile %lx\n", WSAGetLastError());
-    }
-    return Ret;
 }
 
 /*
@@ -81,10 +70,8 @@ AcceptEx(SOCKET ListenSocket,
     GUID AcceptExGUID = WSAID_ACCEPTEX;
     GUID GetAcceptExSockaddrsGUID = WSAID_GETACCEPTEXSOCKADDRS;
     DWORD cbBytesReturned;
-    BOOL  Ret;
 
-    TRACE("AcceptEx %p %p %p %ld %ld %ld %p %p\n", ListenSocket, AcceptSocket, OutputBuffer, ReceiveDataLength, LocalAddressLength, RemoteAddressLength, BytesReceived, Overlapped);
+    if (WSAIoctl(ListenSocket,
-    if (!pfnAcceptEx && WSAIoctl(ListenSocket,
                  SIO_GET_EXTENSION_FUNCTION_POINTER,
                  &AcceptExGUID,
                  sizeof(AcceptExGUID),
@@ -94,11 +81,10 @@ AcceptEx(SOCKET ListenSocket,
                  NULL,
                  NULL) == SOCKET_ERROR)
     {
-        ERR("AcceptEx WSAIoctl %lx\n", WSAGetLastError());
         return FALSE;
     }
 
-    if (!pfnGetAcceptExSockaddrs && WSAIoctl(ListenSocket,
+    if (WSAIoctl(ListenSocket,
                  SIO_GET_EXTENSION_FUNCTION_POINTER,
                  &GetAcceptExSockaddrsGUID,
                  sizeof(GetAcceptExSockaddrsGUID),
@@ -108,12 +94,11 @@ AcceptEx(SOCKET ListenSocket,
                  NULL,
                  NULL) == SOCKET_ERROR)
     {
-        ERR("GetAcceptExSockaddrs WSAIoctl %lx\n", WSAGetLastError());
         pfnAcceptEx = NULL;
         return FALSE;
     }
 
-    Ret = pfnAcceptEx(ListenSocket,
+    return pfnAcceptEx(ListenSocket,
                        AcceptSocket,
                        OutputBuffer,
                        ReceiveDataLength,
@@ -121,11 +106,6 @@ AcceptEx(SOCKET ListenSocket,
                        RemoteAddressLength,
                        BytesReceived,
                        Overlapped);
-    if (!Ret)
-    {
-        ERR("AcceptEx %lx\n", WSAGetLastError());
-    }
-    return Ret;
 }
 
 
@@ -143,12 +123,8 @@ GetAcceptExSockaddrs(PVOID OutputBuffer,
                      LPSOCKADDR* RemoteSockaddr,
                      LPINT RemoteSockaddrLength)
 {
-    TRACE("AcceptEx %p %ld %ld %ld %p %p %p %p\n", OutputBuffer, ReceiveDataLength, LocalAddressLength, RemoteAddressLength, LocalSockaddr, LocalSockaddrLength, RemoteSockaddr, RemoteSockaddrLength);
+    if (pfnGetAcceptExSockaddrs)
-    if (!pfnGetAcceptExSockaddrs)
     {
-        ERR("GetAcceptExSockaddrs is NULL\n");
-        return;
-    }
         pfnGetAcceptExSockaddrs(OutputBuffer,
                                 ReceiveDataLength,
                                 LocalAddressLength,
@@ -157,5 +133,6 @@ GetAcceptExSockaddrs(PVOID OutputBuffer,
                                 LocalSockaddrLength,
                                 RemoteSockaddr,
                                 RemoteSockaddrLength);
+    }
 }
 /* EOF */