From 02bac39966af06c5ca6abe3ae9692e2a50a17f66 Mon Sep 17 00:00:00 2001
From: Kirill Volinsky <mataes2007@gmail.com>
Date: Mon, 11 May 2015 16:03:05 +0000
Subject: minus CreateThread

git-svn-id: http://svn.miranda-ng.org/main/trunk@13546 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/EmLanProto/src/lan.cpp | 53 ++++++++++++++++++----------------------
 1 file changed, 24 insertions(+), 29 deletions(-)

(limited to 'protocols/EmLanProto/src/lan.cpp')

diff --git a/protocols/EmLanProto/src/lan.cpp b/protocols/EmLanProto/src/lan.cpp
index ee24fc59fc..1828e782b5 100644
--- a/protocols/EmLanProto/src/lan.cpp
+++ b/protocols/EmLanProto/src/lan.cpp
@@ -22,18 +22,18 @@ CLan::~CLan()
 void CLan::Startup()
 {
 	WSADATA wsa;
-	if (WSAStartup(MAKEWORD(2,2), &wsa)==0)
+	if (WSAStartup(MAKEWORD(2, 2), &wsa) == 0)
 	{
 		m_status = LS_OK;
 		m_mode = LM_ON;
 
 		char hostname[256];
-		if (gethostname(hostname, 256)==0)
+		if (gethostname(hostname, 256) == 0)
 		{
 			hostent* host = gethostbyname(hostname);
 			char** pAddr = host->h_addr_list;
 			m_hostAddrCount = 0;
-			while (*pAddr && m_hostAddrCount<MAX_INTERNAL_IP)
+			while (*pAddr && m_hostAddrCount < MAX_INTERNAL_IP)
 			{
 				in_addr addr;
 				addr.S_un.S_addr = *((u_long*)(*pAddr));
@@ -68,7 +68,7 @@ void CLan::Shutdown()
 
 void CLan::StopListen()
 {
-	if (m_mode==LM_OFF)
+	if (m_mode == LM_OFF)
 		return;
 
 	if (m_hListenThread)
@@ -96,7 +96,7 @@ void CLan::StopListen()
 
 void CLan::StartListen()
 {
-	if (m_mode!=LM_ON)
+	if (m_mode != LM_ON)
 		return;
 
 	m_income = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
@@ -109,7 +109,7 @@ void CLan::StartListen()
 	else
 	{
 		int enable = 1;
-		if (setsockopt(m_income, SOL_SOCKET, SO_BROADCAST, (const char*)&enable, sizeof(enable))!=0)
+		if (setsockopt(m_income, SOL_SOCKET, SO_BROADCAST, (const char*)&enable, sizeof(enable)) != 0)
 		{
 			m_mode = LM_ON;
 			m_status = LS_CANT_TURN_ON_BROADCAST;
@@ -121,7 +121,7 @@ void CLan::StartListen()
 		addr.sin_addr = m_curAddr;
 		addr.sin_family = AF_INET;
 		addr.sin_port = PORT_NUMBER;
-		if (bind(m_income, (sockaddr*)&addr, sizeof(addr))!=0)
+		if (bind(m_income, (sockaddr*)&addr, sizeof(addr)) != 0)
 		{
 			m_mode = LM_ON;
 			m_status = LS_CANT_BIND_SOCKET;
@@ -129,7 +129,7 @@ void CLan::StartListen()
 			return;
 		}
 
-		if (bind(m_filesoc, (sockaddr*)&addr, sizeof(addr))!=0)
+		if (bind(m_filesoc, (sockaddr*)&addr, sizeof(addr)) != 0)
 		{
 			m_mode = LM_ON;
 			m_status = LS_CANT_BIND_SOCKET;
@@ -137,7 +137,7 @@ void CLan::StartListen()
 			return;
 		}
 
-		if (listen(m_filesoc, SOMAXCONN)!=0)
+		if (listen(m_filesoc, SOMAXCONN) != 0)
 		{
 			m_mode = LM_ON;
 			m_status = LS_CANT_START_LISTEN;
@@ -145,10 +145,9 @@ void CLan::StartListen()
 			return;
 		}
 
-		DWORD threadId;
-		m_hListenThread =  CreateThread(NULL, 0, ListenProc, (LPVOID)this, 0, &threadId);
-		m_hAcceptTCPThread = CreateThread(NULL, 0, AcceptTCPProc, (LPVOID)this, 0, &threadId);
-		if (m_hListenThread==NULL || m_hAcceptTCPThread==NULL)
+		m_hListenThread = mir_forkthread(ListenProc, (void*)this);
+		m_hAcceptTCPThread = mir_forkthread(AcceptTCPProc, (void*)this);
+		if (m_hListenThread == NULL || m_hAcceptTCPThread == NULL)
 		{
 			m_mode = LM_ON;
 			m_status = LS_CANT_CREATE_THREADS;
@@ -160,35 +159,34 @@ void CLan::StartListen()
 
 void CLan::SetCurHostAddress(in_addr addr)
 {
-	if (m_mode!=LM_OFF)
+	if (m_mode != LM_OFF)
 	{
 		int oldMode = m_mode;
 		StopListen();
 		m_curAddr = addr;
-		if (oldMode==LM_LISTEN)
+		if (oldMode == LM_LISTEN)
 			StartListen();
 	}
 }
 
-DWORD WINAPI CLan::ListenProc(LPVOID lpParameter)
+void __cdecl CLan::ListenProc(void *lpParameter)
 {
 	CLan* lan = (CLan*)lpParameter;
 	lan->Listen();
-	return 0;
 }
 
 void CLan::Listen()
 {
-	if (m_mode==LM_LISTEN)
+	if (m_mode == LM_LISTEN)
 	{
 		char buf[65536];
-		while(1)
+		while (1)
 		{
 			sockaddr_in addr;
 			int addrLen = sizeof(addr);
 			Sleep(20);
 			int recLen = recvfrom(m_income, buf, 65536, 0, (sockaddr*)&addr, &addrLen);
-			if (recLen!=SOCKET_ERROR)
+			if (recLen != SOCKET_ERROR)
 				OnRecvPacket((u_char*)buf, recLen, addr.sin_addr);
 		}
 	}
@@ -203,7 +201,7 @@ void CLan::SendPacketBroadcast(const u_char* mes, int len)
 
 void CLan::SendPacket(in_addr addr, const u_char* mes, int len)
 {
-	if (m_mode==LM_LISTEN)
+	if (m_mode == LM_LISTEN)
 	{
 		sockaddr_in addrTo;
 		addrTo.sin_addr = addr;
@@ -215,11 +213,10 @@ void CLan::SendPacket(in_addr addr, const u_char* mes, int len)
 
 //////////////////////////////////////////////////////////////////////////
 
-DWORD WINAPI CLan::AcceptTCPProc(LPVOID lpParameter)
+void __cdecl CLan::AcceptTCPProc(void *lpParameter)
 {
 	CLan* lan = (CLan*)lpParameter;
 	lan->AcceptTCP();
-	return 0;
 }
 
 void CLan::AcceptTCP()
@@ -254,14 +251,14 @@ void __cdecl CLan::OnInTCPConnectionProc(void *lpParameter)
 SOCKET CLan::CreateTCPConnection(u_long addr, LPVOID lpParameter)
 {
 	SOCKET out_socket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
-	if (out_socket==INVALID_SOCKET)
+	if (out_socket == INVALID_SOCKET)
 		return INVALID_SOCKET;
 
 	sockaddr_in addrTo;
 	addrTo.sin_addr.S_un.S_addr = addr;
 	addrTo.sin_family = AF_INET;
 	addrTo.sin_port = PORT_NUMBER;
-	if (connect(out_socket, (sockaddr*)&addrTo, sizeof(addrTo))!=0)
+	if (connect(out_socket, (sockaddr*)&addrTo, sizeof(addrTo)) != 0)
 	{
 		closesocket(out_socket);
 		out_socket = INVALID_SOCKET;
@@ -274,18 +271,16 @@ SOCKET CLan::CreateTCPConnection(u_long addr, LPVOID lpParameter)
 	tcp_conn->m_addr = addr;
 	tcp_conn->m_lpParameter = lpParameter;
 
-	DWORD threadId;
-	CreateThread(NULL, 0, OnOutTCPConnectionProc, (LPVOID)tcp_conn, 0, &threadId);
+	mir_forkthread(OnOutTCPConnectionProc, (void*)tcp_conn);
 
 	return out_socket;
 }
 
-DWORD WINAPI CLan::OnOutTCPConnectionProc(LPVOID lpParameter)
+void __cdecl CLan::OnOutTCPConnectionProc(void *lpParameter)
 {
 	TTCPConnect* tcp_conn = (TTCPConnect*)lpParameter;
 	tcp_conn->m_lan->OnOutTCPConnection(tcp_conn->m_addr, tcp_conn->m_socket, tcp_conn->m_lpParameter);
 	shutdown(tcp_conn->m_socket, SD_BOTH);
 	closesocket(tcp_conn->m_socket);
 	delete tcp_conn;
-	return 0;
 }
-- 
cgit v1.2.3