Compile fix for gcc on MSW

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

diff --git a/src/msw/gsockmsw.cpp b/src/msw/gsockmsw.cpp
index 4035e4707e84cfa50aa53a902e4942498db77597..12ae969e4ccfa42b9f30acfb3c4cb9de5add9bf1 100644 (file)
--- a/src/msw/gsockmsw.cpp
+++ b/src/msw/gsockmsw.cpp
@@ -1,9 +1,11 @@
 /* -------------------------------------------------------------------------
 /* -------------------------------------------------------------------------

- * Project: GSocket (Generic Socket)
- * Name:    gsockmsw.cpp
- * Author:  Guillermo Rodriguez Garcia <guille@iies.es>
- * Purpose: GSocket GUI-specific MSW code
- * CVSID:   $Id$
+ * Project:     GSocket (Generic Socket)
+ * Name:        src/msw/gsockmsw.cpp
+ * Copyright:   (c) Guilhem Lavaux
+ * Licence:     wxWindows Licence
+ * Author:      Guillermo Rodriguez Garcia <guille@iies.es>
+ * Purpose:     GSocket GUI-specific MSW code
+ * CVSID:       $Id$

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


@@ -50,7 +52,6 @@
 
 #ifndef __GSOCKET_STANDALONE__
 #   include "wx/platform.h"
 
 #ifndef __GSOCKET_STANDALONE__
 #   include "wx/platform.h"

-#   include "wx/setup.h"

 #endif
 
 #if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)
 #endif
 
 #if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)


@@ -63,7 +64,7 @@
 extern "C" WXDLLIMPEXP_BASE HINSTANCE wxGetInstance(void);
 #define INSTANCE wxGetInstance()
 
 extern "C" WXDLLIMPEXP_BASE HINSTANCE wxGetInstance(void);
 #define INSTANCE wxGetInstance()
 

-#else
+#else /* __GSOCKET_STANDALONE__ */

 
 #include "gsockmsw.h"
 #include "gsocket.h"
 
 #include "gsockmsw.h"
 #include "gsocket.h"


@@ -72,10 +73,10 @@ extern "C" WXDLLIMPEXP_BASE HINSTANCE wxGetInstance(void);
  * be available and it must contain the app's instance
  * handle.
  */
  * be available and it must contain the app's instance
  * handle.
  */

- extern HINSTANCE hInst;
+extern HINSTANCE hInst;

 #define INSTANCE hInst
 
 #define INSTANCE hInst
 

-#endif /* __GSOCKET_STANDALONE__ */
+#endif /* !__GSOCKET_STANDALONE__/__GSOCKET_STANDALONE__ */

 
 #ifndef __WXWINCE__
 #include <assert.h>
 
 #ifndef __WXWINCE__
 #include <assert.h>


@@ -83,6 +84,8 @@ extern "C" WXDLLIMPEXP_BASE HINSTANCE wxGetInstance(void);
 #define assert(x)
 #include <winsock.h>
 #include "wx/msw/wince/net.h"
 #define assert(x)
 #include <winsock.h>
 #include "wx/msw/wince/net.h"

+#include "wx/hashmap.h"
+WX_DECLARE_HASH_MAP(int,bool,wxIntegerHash,wxIntegerEqual,SocketHash);

 #endif
 
 #include <string.h>
 #endif
 
 #include <string.h>


@@ -132,7 +135,6 @@ LRESULT CALLBACK _GSocket_Internal_WinProc(HWND, UINT, WPARAM, LPARAM);
 
 /* Global variables */
 
 
 /* Global variables */
 

-extern HINSTANCE INSTANCE;

 static HWND hWin;
 static CRITICAL_SECTION critical;
 static GSocket* socketList[MAXSOCKETS];
 static HWND hWin;
 static CRITICAL_SECTION critical;
 static GSocket* socketList[MAXSOCKETS];


@@ -141,9 +143,7 @@ static int firstAvailable;
 #ifndef __WXWINCE__
 static WSAAsyncSelectFunc gs_WSAAsyncSelect = NULL;
 #else
 #ifndef __WXWINCE__
 static WSAAsyncSelectFunc gs_WSAAsyncSelect = NULL;
 #else

-/* Setup WinCE specific stuff
-*/
-static socket_running;
+static SocketHash socketHash;

 static unsigned int currSocket;
 HANDLE hThread[MAXSOCKETS];
 static WSACreateEventFunc gs_WSACreateEvent = NULL;
 static unsigned int currSocket;
 HANDLE hThread[MAXSOCKETS];
 static WSACreateEventFunc gs_WSACreateEvent = NULL;


@@ -153,10 +153,10 @@ static WSAEnumNetworkEventsFunc gs_WSAEnumNetworkEvents = NULL;
 /* This structure will be used to pass data on to the thread that handles socket events.
 */
 typedef struct thread_data{
 /* This structure will be used to pass data on to the thread that handles socket events.
 */
 typedef struct thread_data{

-       HWND hEvtWin;
-       unsigned long msgnumber;
-       unsigned long fd;
-       unsigned long lEvent;
+    HWND hEvtWin;
+    unsigned long msgnumber;
+    unsigned long fd;
+    unsigned long lEvent;

 }thread_data;
 #endif
 
 }thread_data;
 #endif
 


@@ -170,49 +170,51 @@ static HMODULE gs_wsock32dll = 0;
 */
 DWORD WINAPI SocketThread(LPVOID data)
 {
 */
 DWORD WINAPI SocketThread(LPVOID data)
 {

-       WSANETWORKEVENTS NetworkEvents;
-       thread_data* d = (thread_data *)data;
-
-       HANDLE  NetworkEvent = gs_WSACreateEvent();
-       gs_WSAEventSelect(d->fd, NetworkEvent, d->lEvent);
-
-       while(socket_running)
-       {
-               if ((gs_WSAWaitForMultipleEvents(1, &NetworkEvent, FALSE,INFINITE, FALSE)) == WAIT_FAILED)
-               {
-                        printf("WSAWaitForMultipleEvents failed with error %d\n", WSAGetLastError());
-                return 0;
-               }
-               if (gs_WSAEnumNetworkEvents(d->fd ,NetworkEvent, &NetworkEvents) == SOCKET_ERROR)
-               {
-                        printf("WSAEnumNetworkEvents failed with error %d\n", WSAGetLastError());
-                        return 0;
-               }
-
-               long flags = NetworkEvents.lNetworkEvents;
-               if (flags & FD_READ)
-                       ::PostMessage(d->hEvtWin, d->msgnumber,d->fd, FD_READ);
-               if (flags & FD_WRITE)
-                       ::PostMessage(d->hEvtWin, d->msgnumber,d->fd, FD_WRITE);
-               if (flags & FD_OOB)
-                       ::PostMessage(d->hEvtWin, d->msgnumber,d->fd, FD_OOB);
-               if (flags & FD_ACCEPT)
-                       ::PostMessage(d->hEvtWin, d->msgnumber,d->fd, FD_ACCEPT);
-               if (flags & FD_CONNECT)
-                       ::PostMessage(d->hEvtWin, d->msgnumber,d->fd, FD_CONNECT);
-               if (flags & FD_CLOSE)
-                       ::PostMessage(d->hEvtWin, d->msgnumber,d->fd, FD_CLOSE);
-
-       }
-       gs_WSAEventSelect(d->fd, NetworkEvent, 0);
-       ExitThread(0);
-       return 0;
+    WSANETWORKEVENTS NetworkEvents;
+    thread_data* d = (thread_data *)data;
+
+    HANDLE NetworkEvent = gs_WSACreateEvent();
+    gs_WSAEventSelect(d->fd, NetworkEvent, d->lEvent);
+
+    while(socketHash[d->fd] == true)
+    {
+        if ((gs_WSAWaitForMultipleEvents(1, &NetworkEvent, FALSE,INFINITE, FALSE)) == WAIT_FAILED)
+        {
+            printf("WSAWaitForMultipleEvents failed with error %d\n", WSAGetLastError());
+            return 0;
+        }
+        if (gs_WSAEnumNetworkEvents(d->fd ,NetworkEvent, &NetworkEvents) == SOCKET_ERROR)
+        {
+            printf("WSAEnumNetworkEvents failed with error %d\n", WSAGetLastError());
+            return 0;
+        }
+
+        long flags = NetworkEvents.lNetworkEvents;
+        if (flags & FD_READ)
+            ::PostMessage(d->hEvtWin, d->msgnumber,d->fd, FD_READ);
+        if (flags & FD_WRITE)
+            ::PostMessage(d->hEvtWin, d->msgnumber,d->fd, FD_WRITE);
+        if (flags & FD_OOB)
+            ::PostMessage(d->hEvtWin, d->msgnumber,d->fd, FD_OOB);
+        if (flags & FD_ACCEPT)
+            ::PostMessage(d->hEvtWin, d->msgnumber,d->fd, FD_ACCEPT);
+        if (flags & FD_CONNECT)
+            ::PostMessage(d->hEvtWin, d->msgnumber,d->fd, FD_CONNECT);
+        if (flags & FD_CLOSE)
+            ::PostMessage(d->hEvtWin, d->msgnumber,d->fd, FD_CLOSE);
+
+    }
+    gs_WSAEventSelect(d->fd, NetworkEvent, 0);
+    ExitThread(0);
+    return 0;

 }
 #endif
 
 
 bool GSocketGUIFunctionsTableConcrete::CanUseEventLoop()
 }
 #endif
 
 
 bool GSocketGUIFunctionsTableConcrete::CanUseEventLoop()

-{   return true; }
+{
+    return true;
+}

 
 /* Global initializers */
 
 
 /* Global initializers */
 


@@ -243,13 +245,13 @@ bool GSocketGUIFunctionsTableConcrete::OnInit()
   if (!gs_wsock32dll)
       return false;
   gs_WSAAsyncSelect =(WSAAsyncSelectFunc)GetProcAddress(gs_wsock32dll,
   if (!gs_wsock32dll)
       return false;
   gs_WSAAsyncSelect =(WSAAsyncSelectFunc)GetProcAddress(gs_wsock32dll,

-                                                        wxT("WSAAsyncSelect"));
+                                                        "WSAAsyncSelect");

   if (!gs_WSAAsyncSelect)
       return false;
 #else
 /*  On WinCE we load ws2.dll which will provide the needed functions.
 */
   if (!gs_WSAAsyncSelect)
       return false;
 #else
 /*  On WinCE we load ws2.dll which will provide the needed functions.
 */

-       gs_wsock32dll = LoadLibrary(wxT("ws2.dll"));
+  gs_wsock32dll = LoadLibrary(wxT("ws2.dll"));

   if (!gs_wsock32dll)
       return false;
   gs_WSAEventSelect =(WSAEventSelectFunc)GetProcAddress(gs_wsock32dll,
   if (!gs_wsock32dll)
       return false;
   gs_WSAEventSelect =(WSAEventSelectFunc)GetProcAddress(gs_wsock32dll,


@@ -258,32 +260,32 @@ bool GSocketGUIFunctionsTableConcrete::OnInit()
       return false;
 
   gs_WSACreateEvent =(WSACreateEventFunc)GetProcAddress(gs_wsock32dll,
       return false;
 
   gs_WSACreateEvent =(WSACreateEventFunc)GetProcAddress(gs_wsock32dll,

-                                                                                                               wxT("WSACreateEvent"));
+                                                        wxT("WSACreateEvent"));

   if (!gs_WSACreateEvent)
       return false;
 
   gs_WSAWaitForMultipleEvents =(WSAWaitForMultipleEventsFunc)GetProcAddress(gs_wsock32dll,
   if (!gs_WSACreateEvent)
       return false;
 
   gs_WSAWaitForMultipleEvents =(WSAWaitForMultipleEventsFunc)GetProcAddress(gs_wsock32dll,

-                                                                                                               wxT("WSAWaitForMultipleEvents"));
+                                                                            wxT("WSAWaitForMultipleEvents"));

   if (!gs_WSAWaitForMultipleEvents)
       return false;
 
   gs_WSAEnumNetworkEvents =(WSAEnumNetworkEventsFunc)GetProcAddress(gs_wsock32dll,
   if (!gs_WSAWaitForMultipleEvents)
       return false;
 
   gs_WSAEnumNetworkEvents =(WSAEnumNetworkEventsFunc)GetProcAddress(gs_wsock32dll,

-                                                                                                               wxT("WSAEnumNetworkEvents"));
+                                                                    wxT("WSAEnumNetworkEvents"));

   if (!gs_WSAEnumNetworkEvents)
       return false;
 
   currSocket = 0;
 #endif
   if (!gs_WSAEnumNetworkEvents)
       return false;
 
   currSocket = 0;
 #endif

- 
+

   return true;
 }
 
 void GSocketGUIFunctionsTableConcrete::OnExit()
 {
 #ifdef __WXWINCE__
   return true;
 }
 
 void GSocketGUIFunctionsTableConcrete::OnExit()
 {
 #ifdef __WXWINCE__

-/* Delete the threads here */ 
-       for(unsigned int i=0; i < currSocket; i++)
-               CloseHandle(hThread[i]);
+/* Delete the threads here */
+    for(unsigned int i=0; i < currSocket; i++)
+        CloseHandle(hThread[i]);

 #endif
   /* Destroy internal window */
   DestroyWindow(hWin);
 #endif
   /* Destroy internal window */
   DestroyWindow(hWin);


@@ -333,7 +335,8 @@ void GSocketGUIFunctionsTableConcrete::Destroy_Socket(GSocket *socket)
 {
   /* Remove the socket from the list */
   EnterCriticalSection(&critical);
 {
   /* Remove the socket from the list */
   EnterCriticalSection(&critical);

-  socketList[(socket->m_msgnumber - WM_USER)] = NULL;
+  if ( socket->IsOk() )
+      socketList[(socket->m_msgnumber - WM_USER)] = NULL;

   LeaveCriticalSection(&critical);
 }
 
   LeaveCriticalSection(&critical);
 }
 


@@ -429,15 +432,16 @@ void GSocketGUIFunctionsTableConcrete::Enable_Events(GSocket *socket)
 #else
 /*
 *  WinCE creates a thread for socket event handling.
 #else
 /*
 *  WinCE creates a thread for socket event handling.

-*  All needed parameters get passed through the thread_data structure.   
+*  All needed parameters get passed through the thread_data structure.

 */
 */

-       socket_running = true;
-       thread_data* d = new thread_data;
-       d->lEvent = lEvent;
-       d->hEvtWin = hWin;
-       d->msgnumber = socket->m_msgnumber;
-       d->fd = socket->m_fd;
-       hThread[currSocket++] = CreateThread(NULL, 0, &SocketThread,(LPVOID)d, 0, NULL);
+
+    thread_data* d = new thread_data;
+    d->lEvent = lEvent;
+    d->hEvtWin = hWin;
+    d->msgnumber = socket->m_msgnumber;
+    d->fd = socket->m_fd;
+    socketHash[socket->m_fd] = true;
+    hThread[currSocket++] = CreateThread(NULL, 0, &SocketThread,(LPVOID)d, 0, NULL);

 #endif
   }
 }
 #endif
   }
 }


@@ -454,9 +458,8 @@ void GSocketGUIFunctionsTableConcrete::Disable_Events(GSocket *socket)
 #ifndef __WXWINCE__
     gs_WSAAsyncSelect(socket->m_fd, hWin, socket->m_msgnumber, 0);
 #else
 #ifndef __WXWINCE__
     gs_WSAAsyncSelect(socket->m_fd, hWin, socket->m_msgnumber, 0);
 #else

-       //Destroy the thread
-       //TODO: This needs to be changed, maybe using another global event that could be triggered.
-       socket_running = false;
+    //Destroy the thread
+    socketHash[socket->m_fd] = false;

 #endif
   }
 }
 #endif
   }
 }