X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1c6dd11c9825f2ec1efd321556f932b671f7ffec..c77eea28f955e9c5e59d952594ccc5e96de1597e:/src/msw/gsockmsw.cpp diff --git a/src/msw/gsockmsw.cpp b/src/msw/gsockmsw.cpp index 73fe0f50a8..12ae969e4c 100644 --- 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 - * 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 + * Purpose: GSocket GUI-specific MSW code + * CVSID: $Id$ * ------------------------------------------------------------------------- */ @@ -50,7 +52,6 @@ #ifndef __GSOCKET_STANDALONE__ # include "wx/platform.h" -# include "wx/setup.h" #endif #if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) @@ -63,7 +64,7 @@ extern "C" WXDLLIMPEXP_BASE HINSTANCE wxGetInstance(void); #define INSTANCE wxGetInstance() -#else +#else /* __GSOCKET_STANDALONE__ */ #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. */ - extern HINSTANCE hInst; +extern HINSTANCE hInst; #define INSTANCE hInst -#endif /* __GSOCKET_STANDALONE__ */ +#endif /* !__GSOCKET_STANDALONE__/__GSOCKET_STANDALONE__ */ #ifndef __WXWINCE__ #include @@ -83,6 +84,8 @@ extern "C" WXDLLIMPEXP_BASE HINSTANCE wxGetInstance(void); #define assert(x) #include #include "wx/msw/wince/net.h" +#include "wx/hashmap.h" +WX_DECLARE_HASH_MAP(int,bool,wxIntegerHash,wxIntegerEqual,SocketHash); #endif #include @@ -132,7 +135,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 +143,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 +176,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) { @@ -220,64 +220,64 @@ bool GSocketGUIFunctionsTableConcrete::CanUseEventLoop() bool GSocketGUIFunctionsTableConcrete::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() @@ -335,7 +335,8 @@ void GSocketGUIFunctionsTableConcrete::Destroy_Socket(GSocket *socket) { /* 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); } @@ -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 } @@ -457,8 +459,7 @@ void GSocketGUIFunctionsTableConcrete::Disable_Events(GSocket *socket) 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 } }