Preserve logging state during QT plugin initialization.

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

diff --git a/src/msw/gsocket.cpp b/src/msw/gsocket.cpp
index 7c8a3450b84dac4d029d180b50fef3680dddc60d..5992a1db63e0877daf0b78f6eba75d89b51d3eb7 100644 (file)
--- a/src/msw/gsocket.cpp
+++ b/src/msw/gsocket.cpp
@@ -1,21 +1,15 @@
 /* -------------------------------------------------------------------------
 /* -------------------------------------------------------------------------

- * Project: GSocket (Generic Socket)
- * Name:    gsocket.cpp
- * Author:  Guillermo Rodriguez Garcia <guille@iies.es>
- * Purpose: GSocket main MSW file
- * Licence: The wxWindows licence
- * CVSID:   $Id$
+ * Project:     GSocket (Generic Socket)
+ * Name:        gsocket.cpp
+ * Copyright:   (c) Guilhem Lavaux
+ * Licence:     wxWindows Licence
+ * Author:      Guillermo Rodriguez Garcia <guille@iies.es>
+ * Purpose:     GSocket main MSW file
+ * Licence:     The wxWindows licence
+ * CVSID:       $Id$

  * -------------------------------------------------------------------------
  */
 
  * -------------------------------------------------------------------------
  */
 

-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -51,6 +45,12 @@
 
 #endif /* _MSC_VER */
 
 
 #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__
 #include <winsock.h>
 
 #ifndef __GSOCKET_STANDALONE__


@@ -92,7 +92,7 @@
 /* Table of GUI-related functions. We must call them indirectly because
  * of wxBase and GUI separation: */
 
 /* 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
 {
 
 class GSocketGUIFunctionsTableNull: public GSocketGUIFunctionsTable
 {


@@ -112,17 +112,17 @@ void GSocketGUIFunctionsTableNull::OnExit()
 {}
 bool GSocketGUIFunctionsTableNull::CanUseEventLoop()
 {   return false; }
 {}
 bool GSocketGUIFunctionsTableNull::CanUseEventLoop()
 {   return false; }

-bool GSocketGUIFunctionsTableNull::Init_Socket(GSocket *socket)
+bool GSocketGUIFunctionsTableNull::Init_Socket(GSocket *WXUNUSED(socket))

 {   return true; }
 {   return true; }

-void GSocketGUIFunctionsTableNull::Destroy_Socket(GSocket *socket)
+void GSocketGUIFunctionsTableNull::Destroy_Socket(GSocket *WXUNUSED(socket))

 {}
 {}

-void GSocketGUIFunctionsTableNull::Enable_Events(GSocket *socket)
+void GSocketGUIFunctionsTableNull::Enable_Events(GSocket *WXUNUSED(socket))

 {}
 {}

-void GSocketGUIFunctionsTableNull::Disable_Events(GSocket *socket)
+void GSocketGUIFunctionsTableNull::Disable_Events(GSocket *WXUNUSED(socket))

 {}
 /* Global initialisers */
 
 {}
 /* Global initialisers */
 

-void GSocket_SetGUIFunctions(struct GSocketGUIFunctionsTable *guifunc)
+void GSocket_SetGUIFunctions(GSocketGUIFunctionsTable *guifunc)

 {
   gs_gui_functions = guifunc;
 }
 {
   gs_gui_functions = guifunc;
 }


@@ -133,7 +133,7 @@ int GSocket_Init(void)
 
   if (!gs_gui_functions)
   {
 
   if (!gs_gui_functions)
   {

-    static class GSocketGUIFunctionsTableNull table;
+    static GSocketGUIFunctionsTableNull table;

     gs_gui_functions = &table;
   }
   if ( !gs_gui_functions->OnInit() )
     gs_gui_functions = &table;
   }
   if ( !gs_gui_functions->OnInit() )


@@ -171,13 +171,13 @@ GSocket::GSocket()
   m_local           = NULL;
   m_peer            = NULL;
   m_error           = GSOCK_NOERROR;
   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_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 */
 
   assert(gs_gui_functions);
   /* Per-socket GUI-specific initialization */


@@ -382,8 +382,8 @@ GSocketError GSocket::SetServer()
   }
 
   /* Initialize all fields */
   }
 
   /* 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);
 
   /* Create the socket */
   m_fd = socket(m_local->m_realfamily, SOCK_STREAM, 0);


@@ -466,7 +466,7 @@ GSocket *GSocket::WaitConnection()
   /* Wait for a connection (with timeout) */
   if (Input_Timeout() == GSOCK_TIMEDOUT)
   {
   /* 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;
   }
     /* m_error set by _GSocket_Input_Timeout */
     return NULL;
   }


@@ -480,19 +480,19 @@ GSocket *GSocket::WaitConnection()
     else
       m_error = GSOCK_IOERR;
 
     else
       m_error = GSOCK_IOERR;
 

-    GSocket_destroy(connection);
+    delete connection;

     return NULL;
   }
 
   /* Initialize all fields */
     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)
   {
 
   /* 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;
   }
     m_error = GSOCK_MEMERR;
     return NULL;
   }


@@ -500,7 +500,7 @@ GSocket *GSocket::WaitConnection()
   if (err != GSOCK_NOERROR)
   {
     GAddress_destroy(connection->m_peer);
   if (err != GSOCK_NOERROR)
   {
     GAddress_destroy(connection->m_peer);

-    GSocket_destroy(connection);
+    delete connection;

     m_error = err;
     return NULL;
   }
     m_error = err;
     return NULL;
   }


@@ -516,17 +516,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.
 *  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 occurred

 *  (ie, if the parameter was NULL)
 */
 *  (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) {
 {
     /* 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 */
 }
 
 /* Client specific parts */


@@ -535,7 +535,7 @@ int GSocket::SetReusable()
  *  For stream (connection oriented) sockets, GSocket_Connect() tries
  *  to establish a client connection to a server using the peer address
  *  as established with GSocket_SetPeer(). Returns GSOCK_NOERROR if the
  *  For stream (connection oriented) sockets, GSocket_Connect() tries
  *  to establish a client connection to a server using the peer address
  *  as established with GSocket_SetPeer(). Returns GSOCK_NOERROR if the

- *  connection has been succesfully established, or one of the error
+ *  connection has been successfully established, or one of the error

  *  codes listed below. Note that for nonblocking sockets, a return
  *  value of GSOCK_WOULDBLOCK doesn't mean a failure. The connection
  *  request can be completed later; you should use GSocket_Select()
  *  codes listed below. Note that for nonblocking sockets, a return
  *  value of GSOCK_WOULDBLOCK doesn't mean a failure. The connection
  *  request can be completed later; you should use GSocket_Select()


@@ -578,8 +578,8 @@ GSocketError GSocket::Connect(GSocketStream stream)
 
   /* Streamed or dgram socket? */
   m_stream   = (stream == GSOCK_STREAMED);
 
   /* 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,
 
   /* Create the socket */
   m_fd = socket(m_peer->m_realfamily,


@@ -627,7 +627,7 @@ GSocketError GSocket::Connect(GSocketStream stream)
      */
     if ((err == WSAEWOULDBLOCK) && (m_non_blocking))
     {
      */
     if ((err == WSAEWOULDBLOCK) && (m_non_blocking))
     {

-      m_establishing = TRUE;
+      m_establishing = true;

       m_error = GSOCK_WOULDBLOCK;
       return GSOCK_WOULDBLOCK;
     }
       m_error = GSOCK_WOULDBLOCK;
       return GSOCK_WOULDBLOCK;
     }


@@ -675,8 +675,8 @@ GSocketError GSocket::SetNonOriented()
   }
 
   /* Initialize all fields */
   }
 
   /* 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);
 
   /* Create the socket */
   m_fd = socket(m_local->m_realfamily, SOCK_DGRAM, 0);


@@ -821,7 +821,7 @@ GSocketEventFlags GSocket::Select(GSocketEventFlags flags)
      */
     if ((m_detected & GSOCK_LOST_FLAG) != 0)
     {
      */
     if ((m_detected & GSOCK_LOST_FLAG) != 0)
     {

-      m_establishing = FALSE;
+      m_establishing = false;

 
       return (GSOCK_LOST_FLAG & flags);
     }
 
       return (GSOCK_LOST_FLAG & flags);
     }


@@ -853,7 +853,7 @@ GSocketEventFlags GSocket::Select(GSocketEventFlags flags)
         else
         {
           m_detected = GSOCK_LOST_FLAG;
         else
         {
           m_detected = GSOCK_LOST_FLAG;

-          m_establishing = FALSE;
+          m_establishing = false;

 
           /* LOST event: Abort any further processing */
           return (GSOCK_LOST_FLAG & flags);
 
           /* LOST event: Abort any further processing */
           return (GSOCK_LOST_FLAG & flags);


@@ -869,7 +869,7 @@ GSocketEventFlags GSocket::Select(GSocketEventFlags flags)
         int error;
         SOCKLEN_T len = sizeof(error);
 
         int error;
         SOCKLEN_T len = sizeof(error);
 

-        m_establishing = FALSE;
+        m_establishing = false;

 
         getsockopt(m_fd, SOL_SOCKET, SO_ERROR, (char*)&error, &len);
 
 
         getsockopt(m_fd, SOL_SOCKET, SO_ERROR, (char*)&error, &len);
 


@@ -895,7 +895,7 @@ GSocketEventFlags GSocket::Select(GSocketEventFlags flags)
     /* Check for exceptions and errors (is this useful in Unices?) */
     if (FD_ISSET(m_fd, &exceptfds))
     {
     /* 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 */
       m_detected = GSOCK_LOST_FLAG;
 
       /* LOST event: Abort any further processing */


@@ -937,7 +937,7 @@ void GSocket::SetTimeout(unsigned long millis)
 }
 
 /* GSocket_GetError:
 }
 
 /* GSocket_GetError:

- *  Returns the last error occured for this socket. Note that successful
+ *  Returns the last error occurred for this socket. Note that successful

  *  operations do not clear this back to GSOCK_NOERROR, so use it only
  *  after an error.
  */
  *  operations do not clear this back to GSOCK_NOERROR, so use it only
  *  after an error.
  */


@@ -962,7 +962,7 @@ GSocketError WXDLLIMPEXP_NET GSocket::GetError()
  *   assume that it can write since the first OUTPUT event, and no more
  *   OUTPUT events will be generated unless an error occurs.
  * GSOCK_CONNECTION:
  *   assume that it can write since the first OUTPUT event, and no more
  *   OUTPUT events will be generated unless an error occurs.
  * GSOCK_CONNECTION:

- *   Connection succesfully established, for client sockets, or incoming
+ *   Connection successfully established, for client sockets, or incoming

  *   client connection, for server sockets. Wait for this event (also watch
  *   out for GSOCK_LOST) after you issue a nonblocking GSocket_Connect() call.
  * GSOCK_LOST:
  *   client connection, for server sockets. Wait for this event (also watch
  *   out for GSOCK_LOST) after you issue a nonblocking GSocket_Connect() call.
  * GSOCK_LOST:


@@ -1420,7 +1420,7 @@ GSocketError GAddress_INET_SetHostAddress(GAddress *address,
   CHECK_ADDRESS(address, INET);
 
   addr = &(((struct sockaddr_in *)address->m_addr)->sin_addr);
   CHECK_ADDRESS(address, INET);
 
   addr = &(((struct sockaddr_in *)address->m_addr)->sin_addr);

-  addr->s_addr = htonl(hostaddr);;
+  addr->s_addr = htonl(hostaddr);

 
   return GSOCK_NOERROR;
 }
 
   return GSOCK_NOERROR;
 }


@@ -1536,24 +1536,15 @@ GSocketError _GAddress_Init_UNIX(GAddress *address)
   return GSOCK_INVADDR;
 }
 
   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;
 }
 
   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;
   assert (address != NULL);
   address->m_error = GSOCK_INVADDR;
   return GSOCK_INVADDR;