bunch of incorrect thread calls

git-svn-id: http://svn.miranda-ng.org/main/trunk@950 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

11 files changed, 15 insertions, 15 deletions

diff --git a/include/m_core.h b/include/m_core.h
index 43cc67a417..2fb4031bd6 100644
--- a/include/m_core.h
+++ b/include/m_core.h
@@ -467,8 +467,8 @@ __forceinline HANDLE mir_forkthread(pThreadFunc aFunc, void* arg)
 {	return (HANDLE)forkthread(aFunc, 0, arg);

 }

 

-__forceinline HANDLE mir_forkthreadex(pThreadFuncEx aFunc, void* arg, int stackSize, unsigned* pThreadID)

-{	return (HANDLE)forkthreadex(NULL, stackSize, aFunc, NULL, arg, pThreadID);

+__forceinline HANDLE mir_forkthreadex(pThreadFuncEx aFunc, void* arg, unsigned* pThreadID)

+{	return (HANDLE)forkthreadex(NULL, 0, aFunc, NULL, arg, pThreadID);

 }

 

 __forceinline HANDLE mir_forkthreadowner(pThreadFuncOwner aFunc, void* owner, void* arg, unsigned* pThreadID)

diff --git a/plugins/Clist_nicer/CLUIFrames/cluiframes.cpp b/plugins/Clist_nicer/CLUIFrames/cluiframes.cpp
index 0a6d6a0a55..8fbaa547e6 100644
--- a/plugins/Clist_nicer/CLUIFrames/cluiframes.cpp
+++ b/plugins/Clist_nicer/CLUIFrames/cluiframes.cpp
@@ -3354,7 +3354,7 @@ static int CLUIFrameOnModulesLoad(WPARAM wParam, LPARAM lParam)
 {

 	mir_sntprintf(g_ptszEventName, SIZEOF(g_ptszEventName), _T("mf_update_evt_%d"), GetCurrentThreadId());

 	g_hEventThread = CreateEvent(NULL, TRUE, FALSE, g_ptszEventName);

-	hThreadMFUpdate = (HANDLE)mir_forkthreadex(reinterpret_cast<pThreadFuncEx>(MF_UpdateThread), NULL, 0, NULL);

+	hThreadMFUpdate = (HANDLE)mir_forkthreadex(reinterpret_cast<pThreadFuncEx>(MF_UpdateThread), NULL, NULL);

 	SetThreadPriority(hThreadMFUpdate, THREAD_PRIORITY_IDLE);

 	CLUIFramesLoadMainMenu();

 	CLUIFramesCreateMenuForFrame(-1, -1, 000010000, Menu_AddContextFrameMenuItem);

diff --git a/plugins/SeenPlugin/utils.cpp b/plugins/SeenPlugin/utils.cpp
index 533882977e..74e688e54b 100644
--- a/plugins/SeenPlugin/utils.cpp
+++ b/plugins/SeenPlugin/utils.cpp
@@ -701,7 +701,7 @@ int UpdateValues(WPARAM wparam,LPARAM lparam)
 				strncpy(contactQueue[index]->sProtoName,cws->szModule,MAXMODULELABELLENGTH);

 	

 				unsigned int dwThreadId;

-				forkthreadex(NULL, 0, (pThreadFuncEx)waitThread, contactQueue[index], 0, &dwThreadId);

+				mir_forkthreadex((pThreadFuncEx)waitThread, contactQueue[index], &dwThreadId);

 			}

 			contactQueue[index]->courStatus = isIdleEvent ? DBGetContactSettingWord((HANDLE)wparam, cws->szModule, "Status", ID_STATUS_OFFLINE) : cws->value.wVal;

 	}	}	

@@ -789,7 +789,7 @@ int ModeChange(WPARAM wparam,LPARAM lparam)
 			info->courStatus = 0;

 

 			unsigned int dwThreadId;

-			forkthreadex(NULL, 0, (pThreadFuncEx)cleanThread, info, 0, &dwThreadId);

+			mir_forkthreadex((pThreadFuncEx)cleanThread, info, &dwThreadId);

 		}

 	} else if ((isetting==ID_STATUS_OFFLINE)&&((WORD)ack->hProcess>ID_STATUS_OFFLINE)) {

 		//we have just loged-off

diff --git a/plugins/TabSRMM/src/generic_msghandlers.cpp b/plugins/TabSRMM/src/generic_msghandlers.cpp
index 7462c68890..ce104c6c11 100644
--- a/plugins/TabSRMM/src/generic_msghandlers.cpp
+++ b/plugins/TabSRMM/src/generic_msghandlers.cpp
@@ -1167,7 +1167,7 @@ LRESULT TSAPI DM_LoadLocale(TWindowData *dat)
 				GetLocaleID(dat, dbv.ptszVal);

 				PostMessage(dat->hwnd, DM_SETLOCALE, 0, 0);*/

 				DBFreeVariant(&dbv);

-				CloseHandle((HANDLE)mir_forkthreadex(LoadKLThread, reinterpret_cast<void *>(dat->hContact), 16000, NULL));

+				CloseHandle((HANDLE)mir_forkthreadex(LoadKLThread, dat->hContact, NULL));

 			} else {

 				if (!PluginConfig.m_dontUseDefaultKbd) {

 					TCHAR	szBuf[20];

@@ -1183,7 +1183,7 @@ LRESULT TSAPI DM_LoadLocale(TWindowData *dat)
 				/*dat->hkl = LoadKeyboardLayout(szKLName, KLF_NOTELLSHELL | KLF_REPLACELANG);

 				GetLocaleID(dat, szKLName);

 				PostMessage(dat->hwnd, DM_SETLOCALE, 0, 0);*/

-				CloseHandle((HANDLE)mir_forkthreadex(LoadKLThread, reinterpret_cast<void *>(dat->hContact), 16000, NULL));

+				CloseHandle((HANDLE)mir_forkthreadex(LoadKLThread, reinterpret_cast<void *>(dat->hContact), NULL));

 			}

 		}

 	}

diff --git a/plugins/TabSRMM/src/trayicon.cpp b/plugins/TabSRMM/src/trayicon.cpp
index 51affe1520..c9c3471f2a 100644
--- a/plugins/TabSRMM/src/trayicon.cpp
+++ b/plugins/TabSRMM/src/trayicon.cpp
@@ -107,7 +107,7 @@ void TSAPI CreateTrayMenus(int mode)
 		mir_sntprintf(g_eventName, 100, _T("tsr_evt_%d"), GetCurrentThreadId());

 		g_hEvent = CreateEvent(NULL, FALSE, FALSE, g_eventName);

 		isAnimThreadRunning = TRUE;

-		hTrayAnimThread = (HANDLE)mir_forkthreadex(TrayAnimThread, NULL, 16000, NULL);

+		hTrayAnimThread = (HANDLE)mir_forkthreadex(TrayAnimThread, NULL, NULL);

 

 		PluginConfig.g_hMenuTrayUnread = CreatePopupMenu();

 		PluginConfig.g_hMenuFavorites = CreatePopupMenu();

diff --git a/plugins/TipperYM/message_pump.cpp b/plugins/TipperYM/message_pump.cpp
index ed29d48234..7032ad84b2 100644
--- a/plugins/TipperYM/message_pump.cpp
+++ b/plugins/TipperYM/message_pump.cpp
@@ -268,7 +268,7 @@ void InitMessagePump()
 	if (hDwmapiDll)

 		MyDwmEnableBlurBehindWindow = (HRESULT (WINAPI *)(HWND, DWM_BLURBEHIND *))GetProcAddress(hDwmapiDll, "DwmEnableBlurBehindWindow");

 

-	CloseHandle(mir_forkthreadex(MessagePumpThread, NULL, 0, &uintMessagePumpThreadId));

+	CloseHandle(mir_forkthreadex(MessagePumpThread, NULL, &uintMessagePumpThreadId));

 }

 

 void DeinitMessagePump()

diff --git a/plugins/YAPP/message_pump.cpp b/plugins/YAPP/message_pump.cpp
index c59c03f025..4a2b05b081 100644
--- a/plugins/YAPP/message_pump.cpp
+++ b/plugins/YAPP/message_pump.cpp
@@ -176,7 +176,7 @@ void InitMessagePump() {
 	InitServices();

 

 	hMPEvent = CreateEvent(0, TRUE, 0, 0);

-	CloseHandle(mir_forkthreadex(MessagePumpThread, hMPEvent, 0, &message_pump_thread_id));

+	CloseHandle(mir_forkthreadex(MessagePumpThread, hMPEvent, &message_pump_thread_id));

 	WaitForSingleObject(hMPEvent, INFINITE);

 	CloseHandle(hMPEvent);

 }

diff --git a/protocols/GTalkExt/inbox.cpp b/protocols/GTalkExt/inbox.cpp
index dc556ddc6d..53a4aa2fcb 100644
--- a/protocols/GTalkExt/inbox.cpp
+++ b/protocols/GTalkExt/inbox.cpp
@@ -315,7 +315,7 @@ BOOL OpenUrlWithAuth(LPCSTR acc, LPCTSTR mailbox, LPCTSTR url)
 

 		data->acc = acc;

 

-		if (HANDLE h = mir_forkthreadex((pThreadFuncEx)OpenUrlThread, data, 0, NULL)) {

+		if (HANDLE h = mir_forkthreadex((pThreadFuncEx)OpenUrlThread, data, NULL)) {

 			CloseHandle(h);

 			data = NULL;

 		}

@@ -343,7 +343,7 @@ void StartShellExecuteThread(LPCTSTR url)
 {

 	LPTSTR urlCopy = _tcsdup(url);

 	__try {

-		if (HANDLE h = mir_forkthreadex(ShellExecuteThread, urlCopy, 0, NULL)) {

+		if (HANDLE h = mir_forkthreadex(ShellExecuteThread, urlCopy, NULL)) {

 			CloseHandle(h);

 			urlCopy = NULL;

 		}

diff --git a/protocols/Gadu-Gadu/libgadu/pthread.c b/protocols/Gadu-Gadu/libgadu/pthread.c
index ecaab64a4f..2496bb4964 100644
--- a/protocols/Gadu-Gadu/libgadu/pthread.c
+++ b/protocols/Gadu-Gadu/libgadu/pthread.c
@@ -29,7 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 /* create thread */

 int pthread_create(pthread_t *tid, const pthread_attr_t *attr, void *(__stdcall * thread_start) (void *), void *param)

 {

-	tid->hThread = (HANDLE)mir_forkthreadex((pThreadFuncEx)*(void**)&thread_start, param, 0, (unsigned *)&tid->dwThreadId);

+	tid->hThread = (HANDLE)mir_forkthreadex((pThreadFuncEx)*(void**)&thread_start, param, (unsigned *)&tid->dwThreadId);

 

 	return 0;

 }

diff --git a/src/modules/netlib/netlibautoproxy.cpp b/src/modules/netlib/netlibautoproxy.cpp
index e0428bf687..292a743109 100644
--- a/src/modules/netlib/netlibautoproxy.cpp
+++ b/src/modules/netlib/netlibautoproxy.cpp
@@ -354,7 +354,7 @@ char* NetlibGetIeProxy(char *szUrl)
 	{

 		unsigned dwThreadId;

 		IeProxyParam param = { szUrl, szHost, NULL };

-		HANDLE hThread = (HANDLE)forkthreadex(NULL, 0, NetlibIeProxyThread, 0, &param, &dwThreadId);

+		HANDLE hThread = (HANDLE)mir_forkthreadex(NetlibIeProxyThread, &param, &dwThreadId);

 		WaitForSingleObject(hThread, INFINITE);

 		CloseHandle(hThread);

 		res = param.szProxy;

diff --git a/src/modules/netlib/netlibbind.cpp b/src/modules/netlib/netlibbind.cpp
index 7bb862f284..1a4970fe64 100644
--- a/src/modules/netlib/netlibbind.cpp
+++ b/src/modules/netlib/netlibbind.cpp
@@ -326,6 +326,6 @@ INT_PTR NetlibBindPort(WPARAM wParam, LPARAM lParam)
 		}

 	}

 

-	nlbp->hThread = (HANDLE)forkthreadex(NULL, 0, NetlibBindAcceptThread, 0, nlbp, &dwThreadId);

+	nlbp->hThread = (HANDLE)mir_forkthreadex(NetlibBindAcceptThread, nlbp, &dwThreadId);

 	return (INT_PTR)nlbp;

 }