define CreateEventLoop() even if wxUSE_CONSOLE_EVENTLOOP == 0 (because it's declared...

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

diff --git a/src/msw/gsockmsw.cpp b/src/msw/gsockmsw.cpp
index df90c628adc8cace88bd4c4bd9484cf3950e3fae..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$

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


@@ -15,11 +17,13 @@
 #endif
 
 /*
 #endif
 
 /*

- * TODO: for WinCE we need to replace WSAAsyncSelect
+ * DONE: for WinCE we need to replace WSAAsyncSelect

  * (Windows message-based notification of network events for a socket)
  * with another mechanism.
  * (Windows message-based notification of network events for a socket)
  * with another mechanism.

- * We may need to have a separate thread that polls for socket events
- * using select() and sends a message to the main thread.
+ * As WSAAsyncSelect is not present on WinCE, it now uses
+ * WSACreateEvent, WSAEventSelect, WSAWaitForMultipleEvents and WSAEnumNetworkEvents.
+ * When enabling eventhandling for a socket a new thread it created that keeps track of the events
+ * and posts a messageto the hidden window to use the standard message loop.

  */
 
 /* including rasasync.h (included from windows.h itself included from
  */
 
 /* including rasasync.h (included from windows.h itself included from


@@ -48,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__)


@@ -61,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"


@@ -73,7 +76,7 @@ extern "C" WXDLLIMPEXP_BASE HINSTANCE wxGetInstance(void);
 extern HINSTANCE hInst;
 #define INSTANCE hInst
 
 extern HINSTANCE hInst;
 #define INSTANCE hInst
 

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

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


@@ -81,6 +84,8 @@ extern HINSTANCE hInst;
 #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>


@@ -111,7 +116,20 @@ wxCreateHiddenWindow(LPCTSTR *pclassname, LPCTSTR classname, WNDPROC wndproc);
 #error "MAXSOCKETS is too big!"
 #endif
 
 #error "MAXSOCKETS is too big!"
 #endif
 

+#ifndef __WXWINCE__

 typedef int (PASCAL *WSAAsyncSelectFunc)(SOCKET,HWND,u_int,long);
 typedef int (PASCAL *WSAAsyncSelectFunc)(SOCKET,HWND,u_int,long);

+#else
+/* Typedef the needed function prototypes and the WSANETWORKEVENTS structure
+*/
+typedef struct _WSANETWORKEVENTS {
+       long lNetworkEvents;
+       int iErrorCode[10];
+} WSANETWORKEVENTS, FAR * LPWSANETWORKEVENTS;
+typedef HANDLE (PASCAL *WSACreateEventFunc)(void);
+typedef int (PASCAL *WSAEventSelectFunc)(SOCKET,HANDLE,long);
+typedef int (PASCAL *WSAWaitForMultipleEventsFunc)(long,HANDLE,BOOL,long,BOOL);
+typedef int (PASCAL *WSAEnumNetworkEventsFunc)(SOCKET,HANDLE,LPWSANETWORKEVENTS);
+#endif //__WXWINCE__

 
 LRESULT CALLBACK _GSocket_Internal_WinProc(HWND, UINT, WPARAM, LPARAM);
 
 
 LRESULT CALLBACK _GSocket_Internal_WinProc(HWND, UINT, WPARAM, LPARAM);
 


@@ -121,11 +139,82 @@ static HWND hWin;
 static CRITICAL_SECTION critical;
 static GSocket* socketList[MAXSOCKETS];
 static int firstAvailable;
 static CRITICAL_SECTION critical;
 static GSocket* socketList[MAXSOCKETS];
 static int firstAvailable;

+
+#ifndef __WXWINCE__

 static WSAAsyncSelectFunc gs_WSAAsyncSelect = NULL;
 static WSAAsyncSelectFunc gs_WSAAsyncSelect = NULL;

+#else
+static SocketHash socketHash;
+static unsigned int currSocket;
+HANDLE hThread[MAXSOCKETS];
+static WSACreateEventFunc gs_WSACreateEvent = NULL;
+static WSAEventSelectFunc gs_WSAEventSelect = NULL;
+static WSAWaitForMultipleEventsFunc gs_WSAWaitForMultipleEvents = NULL;
+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{
+    HWND hEvtWin;
+    unsigned long msgnumber;
+    unsigned long fd;
+    unsigned long lEvent;
+}thread_data;
+#endif
+

 static HMODULE gs_wsock32dll = 0;
 
 static HMODULE gs_wsock32dll = 0;
 

+
+#ifdef __WXWINCE__
+/* This thread handles socket events on WinCE using WSAEventSelect() as WSAAsyncSelect is not supported.
+*  When an event occures for the socket, it is checked what kind of event happend and the correct message gets posted
+*  so that the hidden window can handle it as it would in other MSW builds.
+*/
+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(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()
 bool GSocketGUIFunctionsTableConcrete::CanUseEventLoop()

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

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


@@ -151,19 +240,53 @@ bool GSocketGUIFunctionsTableConcrete::OnInit()
   /* Load WSAAsyncSelect from wsock32.dll (we don't link against it
      statically to avoid dependency on wsock32.dll for apps that don't use
      sockets): */
   /* Load WSAAsyncSelect from wsock32.dll (we don't link against it
      statically to avoid dependency on wsock32.dll for apps that don't use
      sockets): */

-  gs_wsock32dll = LoadLibraryA("wsock32.dll");
+#ifndef __WXWINCE__
+  gs_wsock32dll = LoadLibrary(wxT("wsock32.dll"));

   if (!gs_wsock32dll)
       return false;
   gs_WSAAsyncSelect =(WSAAsyncSelectFunc)GetProcAddress(gs_wsock32dll,
                                                         "WSAAsyncSelect");
   if (!gs_WSAAsyncSelect)
       return false;
   if (!gs_wsock32dll)
       return false;
   gs_WSAAsyncSelect =(WSAAsyncSelectFunc)GetProcAddress(gs_wsock32dll,
                                                         "WSAAsyncSelect");
   if (!gs_WSAAsyncSelect)
       return false;

+#else
+/*  On WinCE we load ws2.dll which will provide the needed functions.
+*/
+  gs_wsock32dll = LoadLibrary(wxT("ws2.dll"));
+  if (!gs_wsock32dll)
+      return false;
+  gs_WSAEventSelect =(WSAEventSelectFunc)GetProcAddress(gs_wsock32dll,
+                                                        wxT("WSAEventSelect"));
+  if (!gs_WSAEventSelect)
+      return false;
+
+  gs_WSACreateEvent =(WSACreateEventFunc)GetProcAddress(gs_wsock32dll,
+                                                        wxT("WSACreateEvent"));
+  if (!gs_WSACreateEvent)
+      return false;
+
+  gs_WSAWaitForMultipleEvents =(WSAWaitForMultipleEventsFunc)GetProcAddress(gs_wsock32dll,
+                                                                            wxT("WSAWaitForMultipleEvents"));
+  if (!gs_WSAWaitForMultipleEvents)
+      return false;
+
+  gs_WSAEnumNetworkEvents =(WSAEnumNetworkEventsFunc)GetProcAddress(gs_wsock32dll,
+                                                                    wxT("WSAEnumNetworkEvents"));
+  if (!gs_WSAEnumNetworkEvents)
+      return false;
+
+  currSocket = 0;
+#endif

 
   return true;
 }
 
 void GSocketGUIFunctionsTableConcrete::OnExit()
 {
 
   return true;
 }
 
 void GSocketGUIFunctionsTableConcrete::OnExit()
 {

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

   /* Destroy internal window */
   DestroyWindow(hWin);
   UnregisterClass(CLASSNAME, INSTANCE);
   /* Destroy internal window */
   DestroyWindow(hWin);
   UnregisterClass(CLASSNAME, INSTANCE);


@@ -212,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);
 }
 


@@ -303,8 +427,22 @@ void GSocketGUIFunctionsTableConcrete::Enable_Events(GSocket *socket)
      */
     long lEvent = socket->m_server?
                   FD_ACCEPT : (FD_READ | FD_WRITE | FD_CONNECT | FD_CLOSE);
      */
     long lEvent = socket->m_server?
                   FD_ACCEPT : (FD_READ | FD_WRITE | FD_CONNECT | FD_CLOSE);

-
+#ifndef __WXWINCE__

     gs_WSAAsyncSelect(socket->m_fd, hWin, socket->m_msgnumber, lEvent);
     gs_WSAAsyncSelect(socket->m_fd, hWin, socket->m_msgnumber, lEvent);

+#else
+/*
+*  WinCE creates a thread for socket event handling.
+*  All needed parameters get passed through the thread_data structure.
+*/
+
+    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

   }
 }
 
   }
 }
 


@@ -317,7 +455,12 @@ void GSocketGUIFunctionsTableConcrete::Disable_Events(GSocket *socket)
 
   if (socket->m_fd != INVALID_SOCKET)
   {
 
   if (socket->m_fd != INVALID_SOCKET)
   {

+#ifndef __WXWINCE__

     gs_WSAAsyncSelect(socket->m_fd, hWin, socket->m_msgnumber, 0);
     gs_WSAAsyncSelect(socket->m_fd, hWin, socket->m_msgnumber, 0);

+#else
+    //Destroy the thread
+    socketHash[socket->m_fd] = false;
+#endif

   }
 }
 
   }
 }