Use closesocket() for closing sockets under MSW

If accepting a socket connection failed, wxSocketImpl::Accept() used
close() to close the socket even under MSW, but it can be only used for
the file descriptors there and closesocket() must be used instead for
the sockets.

Add new (private) wxCloseSocket define and use it both here, to fix the
bug, and elsewhere to make the code more clear.

Closes #18407.

include/wx/msw/private/sockmsw.h

@@ -34,6 +34,8 @@
     #define wxIoctlSocketArg_t u_long
 #endif
 
+#define wxCloseSocket closesocket
+
 // ----------------------------------------------------------------------------
 // MSW-specific socket implementation
 // ----------------------------------------------------------------------------

include/wx/unix/private/sockunix.h

@@ -23,6 +23,8 @@
 
 #include "wx/private/fdiomanager.h"
 
+#define wxCloseSocket close
+
 class wxSocketImplUnix : public wxSocketImpl,
                          public wxFDIOHandler
 {
@@ -64,7 +66,7 @@ private:
     {
         DisableEvents();
 
-        close(m_fd);
+        wxCloseSocket(m_fd);
     }
 
     virtual void UnblockAndRegisterWithEventLoop() wxOVERRIDE

src/common/socket.cpp

@@ -529,7 +529,7 @@ wxSocketImpl *wxSocketImpl::Accept(wxSocketBase& wxsocket)
     WX_SOCKLEN_T fromlen = sizeof(from);
     const wxSOCKET_T fd = accept(m_fd, &from.addr, &fromlen);
 
-    wxScopeGuard closeSocket = wxMakeGuard(wxClose, fd);
+    wxScopeGuard closeSocket = wxMakeGuard(wxCloseSocket, fd);
 
     // accepting is similar to reading in the sense that it resets "ready for
     // read" flag on the socket

src/msw/sockmsw.cpp

@@ -310,7 +310,7 @@ void wxSocketImplMSW::DoClose()
 {
     wxSocketManager::Get()->Uninstall_Callback(this);
 
-    closesocket(m_fd);
+    wxCloseSocket(m_fd);
 }
 
 wxSocketError wxSocketImplMSW::GetLastError() const