Added back shlwapi.h inclusion with comment

[wxWidgets.git] / src / msw / gsocket.cpp

diff --git a/src/msw/gsocket.cpp b/src/msw/gsocket.cpp
index 4a1101840d8fd1951c62dda68d824936b7f6f5ee..83fb30a935b8098a765607ff3510000d2b61c782 100644 (file)
--- a/src/msw/gsocket.cpp
+++ b/src/msw/gsocket.cpp
@@ -8,14 +8,6 @@
  * -------------------------------------------------------------------------
  */
 
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -51,6 +43,12 @@
 
 #endif /* _MSC_VER */
 
+#if defined(__CYGWIN__)
+    //CYGWIN gives annoying warning about runtime stuff if we don't do this
+#   define USE_SYS_TYPES_FD_SET
+#   include <sys/types.h>
+#endif
+
 #include <winsock.h>
 
 #ifndef __GSOCKET_STANDALONE__
@@ -92,7 +90,7 @@
 /* Table of GUI-related functions. We must call them indirectly because
  * of wxBase and GUI separation: */
 
-static class GSocketGUIFunctionsTable *gs_gui_functions;
+static GSocketGUIFunctionsTable *gs_gui_functions;
 
 class GSocketGUIFunctionsTableNull: public GSocketGUIFunctionsTable
 {
@@ -122,7 +120,7 @@ void GSocketGUIFunctionsTableNull::Disable_Events(GSocket *WXUNUSED(socket))
 {}
 /* Global initialisers */
 
-void GSocket_SetGUIFunctions(struct GSocketGUIFunctionsTable *guifunc)
+void GSocket_SetGUIFunctions(GSocketGUIFunctionsTable *guifunc)
 {
   gs_gui_functions = guifunc;
 }
@@ -133,7 +131,7 @@ int GSocket_Init(void)
 
   if (!gs_gui_functions)
   {
-    static class GSocketGUIFunctionsTableNull table;
+    static GSocketGUIFunctionsTableNull table;
     gs_gui_functions = &table;
   }
   if ( !gs_gui_functions->OnInit() )
@@ -171,13 +169,13 @@ GSocket::GSocket()
   m_local           = NULL;
   m_peer            = NULL;
   m_error           = GSOCK_NOERROR;
-  m_server          = FALSE;
-  m_stream          = TRUE;
+  m_server          = false;
+  m_stream          = true;
   m_non_blocking    = false;
   m_timeout.tv_sec  = 10 * 60;  /* 10 minutes */
   m_timeout.tv_usec = 0;
-  m_establishing    = FALSE;
-  m_reusable        = FALSE;
+  m_establishing    = false;
+  m_reusable        = false;
 
   assert(gs_gui_functions);
   /* Per-socket GUI-specific initialization */
@@ -382,8 +380,8 @@ GSocketError GSocket::SetServer()
   }
 
   /* Initialize all fields */
-  m_server   = TRUE;
-  m_stream   = TRUE;
+  m_server   = true;
+  m_stream   = true;
 
   /* Create the socket */
   m_fd = socket(m_local->m_realfamily, SOCK_STREAM, 0);
@@ -466,7 +464,7 @@ GSocket *GSocket::WaitConnection()
   /* Wait for a connection (with timeout) */
   if (Input_Timeout() == GSOCK_TIMEDOUT)
   {
-    GSocket_destroy(connection);
+    delete connection;
     /* m_error set by _GSocket_Input_Timeout */
     return NULL;
   }
@@ -480,19 +478,19 @@ GSocket *GSocket::WaitConnection()
     else
       m_error = GSOCK_IOERR;
 
-    GSocket_destroy(connection);
+    delete connection;
     return NULL;
   }
 
   /* Initialize all fields */
-  connection->m_server   = FALSE;
-  connection->m_stream   = TRUE;
+  connection->m_server   = false;
+  connection->m_stream   = true;
 
   /* Setup the peer address field */
   connection->m_peer = GAddress_new();
   if (!connection->m_peer)
   {
-    GSocket_destroy(connection);
+    delete connection;
     m_error = GSOCK_MEMERR;
     return NULL;
   }
@@ -500,7 +498,7 @@ GSocket *GSocket::WaitConnection()
   if (err != GSOCK_NOERROR)
   {
     GAddress_destroy(connection->m_peer);
-    GSocket_destroy(connection);
+    delete connection;
     m_error = err;
     return NULL;
   }
@@ -516,17 +514,17 @@ GSocket *GSocket::WaitConnection()
 *  make the appropriate setsockopt() call.
 *  Implemented as a GSocket function because clients (ie, wxSocketServer)
 *  don't have access to the GSocket struct information.
-*  Returns TRUE if the flag was set correctly, FALSE if an error occured
+*  Returns true if the flag was set correctly, false if an error occured
 *  (ie, if the parameter was NULL)
 */
-int GSocket::SetReusable()
+bool GSocket::SetReusable()
 {
     /* socket must not be null, and must not be in use/already bound */
     if (this && m_fd == INVALID_SOCKET) {
-        m_reusable = TRUE;
-        return TRUE;
+        m_reusable = true;
+        return true;
     }
-    return FALSE;
+    return false;
 }
 
 /* Client specific parts */
@@ -578,8 +576,8 @@ GSocketError GSocket::Connect(GSocketStream stream)
 
   /* Streamed or dgram socket? */
   m_stream   = (stream == GSOCK_STREAMED);
-  m_server   = FALSE;
-  m_establishing = FALSE;
+  m_server   = false;
+  m_establishing = false;
 
   /* Create the socket */
   m_fd = socket(m_peer->m_realfamily,
@@ -627,7 +625,7 @@ GSocketError GSocket::Connect(GSocketStream stream)
      */
     if ((err == WSAEWOULDBLOCK) && (m_non_blocking))
     {
-      m_establishing = TRUE;
+      m_establishing = true;
       m_error = GSOCK_WOULDBLOCK;
       return GSOCK_WOULDBLOCK;
     }
@@ -675,8 +673,8 @@ GSocketError GSocket::SetNonOriented()
   }
 
   /* Initialize all fields */
-  m_stream   = FALSE;
-  m_server   = FALSE;
+  m_stream   = false;
+  m_server   = false;
 
   /* Create the socket */
   m_fd = socket(m_local->m_realfamily, SOCK_DGRAM, 0);
@@ -821,7 +819,7 @@ GSocketEventFlags GSocket::Select(GSocketEventFlags flags)
      */
     if ((m_detected & GSOCK_LOST_FLAG) != 0)
     {
-      m_establishing = FALSE;
+      m_establishing = false;
 
       return (GSOCK_LOST_FLAG & flags);
     }
@@ -853,7 +851,7 @@ GSocketEventFlags GSocket::Select(GSocketEventFlags flags)
         else
         {
           m_detected = GSOCK_LOST_FLAG;
-          m_establishing = FALSE;
+          m_establishing = false;
 
           /* LOST event: Abort any further processing */
           return (GSOCK_LOST_FLAG & flags);
@@ -869,7 +867,7 @@ GSocketEventFlags GSocket::Select(GSocketEventFlags flags)
         int error;
         SOCKLEN_T len = sizeof(error);
 
-        m_establishing = FALSE;
+        m_establishing = false;
 
         getsockopt(m_fd, SOL_SOCKET, SO_ERROR, (char*)&error, &len);
 
@@ -895,7 +893,7 @@ GSocketEventFlags GSocket::Select(GSocketEventFlags flags)
     /* Check for exceptions and errors (is this useful in Unices?) */
     if (FD_ISSET(m_fd, &exceptfds))
     {
-      m_establishing = FALSE;
+      m_establishing = false;
       m_detected = GSOCK_LOST_FLAG;
 
       /* LOST event: Abort any further processing */
@@ -1536,24 +1534,15 @@ GSocketError _GAddress_Init_UNIX(GAddress *address)
   return GSOCK_INVADDR;
 }
 
-GSocketError GAddress_UNIX_SetPath(GAddress *address, const char *path)
+GSocketError GAddress_UNIX_SetPath(GAddress *address, const char *WXUNUSED(path))
 {
-#if defined(__BORLANDC__)
-  /* prevents unused variable message in Borland */
-  (void)path;
-#endif
   assert (address != NULL);
   address->m_error = GSOCK_INVADDR;
   return GSOCK_INVADDR;
 }
 
-GSocketError GAddress_UNIX_GetPath(GAddress *address, char *path, size_t sbuf)
+GSocketError GAddress_UNIX_GetPath(GAddress *address, char *WXUNUSED(path), size_t WXUNUSED(sbuf))
 {
-#if defined(__BORLANDC__)
-  /* prevents unused variable message in Borland */
-  (void)path;
-  (void)sbuf;
-#endif
   assert (address != NULL);
   address->m_error = GSOCK_INVADDR;
   return GSOCK_INVADDR;