X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dbfb61b3a4a26996b936fb9384b6100d8d42b135..c81c6d5400f732e89d41a7a3ab0eb824761ac52c:/src/msw/gsockmsw.cpp

diff --git a/src/msw/gsockmsw.cpp b/src/msw/gsockmsw.cpp
index 4035e4707e..4fb65b9106 100644
--- a/src/msw/gsockmsw.cpp
+++ b/src/msw/gsockmsw.cpp
@@ -63,7 +63,7 @@
 extern "C" WXDLLIMPEXP_BASE HINSTANCE wxGetInstance(void);
 #define INSTANCE wxGetInstance()
 
-#else
+#else /* __GSOCKET_STANDALONE__ */
 
 #include "gsockmsw.h"
 #include "gsocket.h"
@@ -72,10 +72,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 <assert.h>
@@ -83,6 +83,8 @@ extern "C" WXDLLIMPEXP_BASE HINSTANCE wxGetInstance(void);
 #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>
@@ -132,7 +134,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 +142,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 +175,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)
 		{
@@ -188,7 +187,7 @@ DWORD WINAPI SocketThread(LPVOID data)
 			 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);
@@ -202,7 +201,7 @@ DWORD WINAPI SocketThread(LPVOID data)
 			::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);
@@ -212,7 +211,9 @@ DWORD WINAPI SocketThread(LPVOID data)
 
 
 bool GSocketGUIFunctionsTableConcrete::CanUseEventLoop()
-{   return true; }
+{
+    return true;
+}
 
 /* Global initializers */
 
@@ -243,7 +244,7 @@ bool GSocketGUIFunctionsTableConcrete::OnInit()
   if (!gs_wsock32dll)
       return false;
   gs_WSAAsyncSelect =(WSAAsyncSelectFunc)GetProcAddress(gs_wsock32dll,
-                                                        wxT("WSAAsyncSelect"));
+                                                        "WSAAsyncSelect");
   if (!gs_WSAAsyncSelect)
       return false;
 #else
@@ -281,7 +282,7 @@ bool GSocketGUIFunctionsTableConcrete::OnInit()
 void GSocketGUIFunctionsTableConcrete::OnExit()
 {
 #ifdef __WXWINCE__
-/* Delete the threads here */ 
+/* Delete the threads here */
 	for(unsigned int i=0; i < currSocket; i++)
 		CloseHandle(hThread[i]);
 #endif
@@ -429,14 +430,15 @@ void GSocketGUIFunctionsTableConcrete::Enable_Events(GSocket *socket)
 #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;
+	socketHash[socket->m_fd] = true;
 	hThread[currSocket++] = CreateThread(NULL, 0, &SocketThread,(LPVOID)d, 0, NULL);
 #endif
   }
@@ -455,8 +457,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
   }
 }