]> git.saurik.com Git - wxWidgets.git/blobdiff - src/msw/gsockmsw.cpp
fix bug with wxCSConv("ASCII")
[wxWidgets.git] / src / msw / gsockmsw.cpp
index 73fe0f50a81e29a767fd7e312ffe4aa7ee4fa4a5..489feff570b45f59d255b128d01ac6ddd446dde3 100644 (file)
@@ -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$
  * -------------------------------------------------------------------------
  */
 
@@ -14,6 +16,8 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_SOCKETS
+
 /*
  * DONE: for WinCE we need to replace WSAAsyncSelect
  * (Windows message-based notification of network events for a socket)
 #   pragma warning(disable:4115) /* named type definition in parentheses */
 #endif
 
-/* This needs to be before the wx/defs/h inclusion
- * for some reason
- */
-
-#ifdef __WXWINCE__
-    /* windows.h results in tons of warnings at max warning level */
-#   ifdef _MSC_VER
-#       pragma warning(push, 1)
-#   endif
-#   include <windows.h>
-#   ifdef _MSC_VER
-#       pragma warning(pop)
-#       pragma warning(disable:4514)
-#   endif
-#endif
-
-#ifndef __GSOCKET_STANDALONE__
-#   include "wx/platform.h"
-#   include "wx/setup.h"
-#endif
-
-#if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)
-
-#ifndef __GSOCKET_STANDALONE__
-
-#include "wx/msw/gsockmsw.h"
 #include "wx/gsocket.h"
+#include "wx/apptrait.h"
+#include "wx/link.h"
 
-extern "C" WXDLLIMPEXP_BASE HINSTANCE wxGetInstance(void);
-#define INSTANCE wxGetInstance()
-
-#else
-
-#include "gsockmsw.h"
-#include "gsocket.h"
-
-/* If not using wxWidgets, a global var called hInst must
- * be available and it must contain the app's instance
- * handle.
- */
- extern HINSTANCE hInst;
-#define INSTANCE hInst
+wxFORCE_LINK_THIS_MODULE(gsockmsw)
 
-#endif /* __GSOCKET_STANDALONE__ */
+extern "C" WXDLLIMPEXP_BASE HINSTANCE wxGetInstance();
+#define INSTANCE wxGetInstance()
 
-#ifndef __WXWINCE__
-#include <assert.h>
-#else
-#define assert(x)
+#ifdef __WXWINCE__
 #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>
@@ -122,7 +89,7 @@ typedef struct _WSANETWORKEVENTS {
        long lNetworkEvents;
        int iErrorCode[10];
 } WSANETWORKEVENTS, FAR * LPWSANETWORKEVENTS;
-typedef HANDLE (PASCAL *WSACreateEventFunc)(void);
+typedef HANDLE (PASCAL *WSACreateEventFunc)();
 typedef int (PASCAL *WSAEventSelectFunc)(SOCKET,HANDLE,long);
 typedef int (PASCAL *WSAWaitForMultipleEventsFunc)(long,HANDLE,BOOL,long,BOOL);
 typedef int (PASCAL *WSAEnumNetworkEventsFunc)(SOCKET,HANDLE,LPWSANETWORKEVENTS);
@@ -132,7 +99,6 @@ LRESULT CALLBACK _GSocket_Internal_WinProc(HWND, UINT, WPARAM, LPARAM);
 
 /* Global variables */
 
-extern HINSTANCE INSTANCE;
 static HWND hWin;
 static CRITICAL_SECTION critical;
 static GSocket* socketList[MAXSOCKETS];
@@ -141,9 +107,7 @@ static int firstAvailable;
 #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;
@@ -176,7 +140,7 @@ DWORD WINAPI SocketThread(LPVOID data)
     HANDLE NetworkEvent = gs_WSACreateEvent();
     gs_WSAEventSelect(d->fd, NetworkEvent, d->lEvent);
 
-    while(socket_running)
+    while(socketHash[d->fd] == true)
     {
         if ((gs_WSAWaitForMultipleEvents(1, &NetworkEvent, FALSE,INFINITE, FALSE)) == WAIT_FAILED)
         {
@@ -210,77 +174,91 @@ DWORD WINAPI SocketThread(LPVOID data)
 }
 #endif
 
+// ----------------------------------------------------------------------------
+// MSW implementation of GSocketManager
+// ----------------------------------------------------------------------------
 
-bool GSocketGUIFunctionsTableConcrete::CanUseEventLoop()
+class GSocketMSWManager : public GSocketManager
 {
-    return true;
-}
+public:
+    virtual bool OnInit();
+    virtual void OnExit();
+
+    virtual bool Init_Socket(GSocket *socket);
+    virtual void Destroy_Socket(GSocket *socket);
+
+    virtual void Install_Callback(GSocket *socket, GSocketEvent event);
+    virtual void Uninstall_Callback(GSocket *socket, GSocketEvent event);
+
+    virtual void Enable_Events(GSocket *socket);
+    virtual void Disable_Events(GSocket *socket);
+};
 
 /* Global initializers */
 
-bool GSocketGUIFunctionsTableConcrete::OnInit()
+bool GSocketMSWManager::OnInit()
 {
-    static LPCTSTR pclassname = NULL;
-    int i;
+  static LPCTSTR pclassname = NULL;
+  int i;
 
-    /* Create internal window for event notifications */
-    hWin = wxCreateHiddenWindow(&pclassname, CLASSNAME, _GSocket_Internal_WinProc);
-    if (!hWin)
-        return false;
+  /* Create internal window for event notifications */
+  hWin = wxCreateHiddenWindow(&pclassname, CLASSNAME, _GSocket_Internal_WinProc);
+  if (!hWin)
+      return false;
 
-    /* Initialize socket list */
-    InitializeCriticalSection(&critical);
+  /* Initialize socket list */
+  InitializeCriticalSection(&critical);
 
-    for (i = 0; i < MAXSOCKETS; i++)
-    {
-        socketList[i] = NULL;
-    }
-    firstAvailable = 0;
+  for (i = 0; i < MAXSOCKETS; i++)
+  {
+    socketList[i] = NULL;
+  }
+  firstAvailable = 0;
 
-    /* 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): */
 #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;
+  gs_wsock32dll = LoadLibrary(wxT("wsock32.dll"));
+  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;
+  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;
+  return true;
 }
 
-void GSocketGUIFunctionsTableConcrete::OnExit()
+void GSocketMSWManager::OnExit()
 {
 #ifdef __WXWINCE__
 /* Delete the threads here */
@@ -304,7 +282,7 @@ void GSocketGUIFunctionsTableConcrete::OnExit()
 
 /* Per-socket GUI initialization / cleanup */
 
-bool GSocketGUIFunctionsTableConcrete::Init_Socket(GSocket *socket)
+bool GSocketMSWManager::Init_Socket(GSocket *socket)
 {
   int i;
 
@@ -331,14 +309,39 @@ bool GSocketGUIFunctionsTableConcrete::Init_Socket(GSocket *socket)
   return true;
 }
 
-void GSocketGUIFunctionsTableConcrete::Destroy_Socket(GSocket *socket)
+void GSocketMSWManager::Destroy_Socket(GSocket *socket)
 {
   /* Remove the socket from the list */
   EnterCriticalSection(&critical);
-  socketList[(socket->m_msgnumber - WM_USER)] = NULL;
+  if ( socket->IsOk() )
+  {
+      const int msgnum = socket->m_msgnumber;
+
+      // we need to remove any pending messages for this socket to avoid having
+      // them sent to a new socket which could reuse the same message number as
+      // soon as we destroy this one
+      MSG msg;
+      while ( ::PeekMessage(&msg, hWin, msgnum, msgnum, PM_REMOVE) )
+          ;
+
+      socketList[msgnum - WM_USER] = NULL;
+  }
+
   LeaveCriticalSection(&critical);
 }
 
+void GSocketMSWManager::Install_Callback(GSocket * WXUNUSED(socket),
+                                         GSocketEvent WXUNUSED(event))
+{
+    wxFAIL_MSG( _T("not used under MSW") );
+}
+
+void GSocketMSWManager::Uninstall_Callback(GSocket * WXUNUSED(socket),
+                                           GSocketEvent WXUNUSED(event))
+{
+    wxFAIL_MSG( _T("not used under MSW") );
+}
+
 /* Windows proc for asynchronous event handling */
 
 LRESULT CALLBACK _GSocket_Internal_WinProc(HWND hWnd,
@@ -415,10 +418,8 @@ LRESULT CALLBACK _GSocket_Internal_WinProc(HWND hWnd,
  *  events for internal processing, but we will only notify users
  *  when an appropiate callback function has been installed.
  */
-void GSocketGUIFunctionsTableConcrete::Enable_Events(GSocket *socket)
+void GSocketMSWManager::Enable_Events(GSocket *socket)
 {
-  assert (socket != NULL);
-
   if (socket->m_fd != INVALID_SOCKET)
   {
     /* We could probably just subscribe to all events regardless
@@ -433,12 +434,13 @@ void GSocketGUIFunctionsTableConcrete::Enable_Events(GSocket *socket)
 *  WinCE creates a thread for socket event handling.
 *  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;
+    socketHash[socket->m_fd] = true;
     hThread[currSocket++] = CreateThread(NULL, 0, &SocketThread,(LPVOID)d, 0, NULL);
 #endif
   }
@@ -447,28 +449,30 @@ void GSocketGUIFunctionsTableConcrete::Enable_Events(GSocket *socket)
 /* _GSocket_Disable_Events:
  *  Disable event notifications (when shutdowning the socket)
  */
-void GSocketGUIFunctionsTableConcrete::Disable_Events(GSocket *socket)
+void GSocketMSWManager::Disable_Events(GSocket *socket)
 {
-  assert (socket != NULL);
-
   if (socket->m_fd != INVALID_SOCKET)
   {
 #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;
+    socketHash[socket->m_fd] = false;
 #endif
   }
 }
 
-#else /* !wxUSE_SOCKETS */
-
-/*
- * Translation unit shouldn't be empty, so include this typedef to make the
- * compiler (VC++ 6.0, for example) happy
- */
-typedef void (*wxDummy)();
+// set the wxBase variable to point to our GSocketManager implementation
+//
+// see comments in wx/msw/apptbase.h for the explanation of why do we do it
+// like this
+static struct ManagerSetter
+{
+    ManagerSetter()
+    {
+        static GSocketMSWManager s_manager;
+        wxAppTraits::SetDefaultSocketManager(&s_manager);
+    }
+} gs_managerSetter;
 
-#endif  /* wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) */
+#endif  // wxUSE_SOCKETS