From 81dfe1bf71946f983584f6241d97046d5f897857 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 28 Nov 2012 12:32:41 +0000 Subject: - removed borkred clutch for RecvChain; - fixed problems with PROTOTYPE_VIRTUAL registration - restored hMainThreadId variable in miranda32.exe git-svn-id: http://svn.miranda-ng.org/main/trunk@2536 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/modules/protocols/protochains.cpp | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) (limited to 'src/modules/protocols/protochains.cpp') diff --git a/src/modules/protocols/protochains.cpp b/src/modules/protocols/protochains.cpp index d9737bdb06..176711ce34 100644 --- a/src/modules/protocols/protochains.cpp +++ b/src/modules/protocols/protochains.cpp @@ -127,23 +127,24 @@ INT_PTR Proto_CallContactService(WPARAM wParam, LPARAM lParam) ///////////////////////////////////////////////////////////////////////////////////////// -static INT_PTR CallRecvChain(WPARAM wParam, LPARAM lParam) +static INT_PTR Proto_RecvChain(WPARAM wParam, LPARAM lParam) { CCSDATA *ccs = (CCSDATA*)lParam; INT_PTR ret; if (wParam == (WPARAM)(-1)) return 1; //shouldn't happen - sanity check - if (wParam == 0) //begin processing by finding end of chain + if (wParam == 0) { //begin processing by finding end of chain + if (GetCurrentThreadId() != hMainThreadId) // restart this function in the main thread + return CallServiceSync(MS_PROTO_CHAINRECV, wParam, lParam); + wParam = filters.getCount(); - else - wParam--; + } + else wParam--; - for (int i = wParam-1; i >= 0; i--) { - if ((ret = CallProtoServiceInt(NULL, filters[i]->szName, ccs->szProtoService, i+1, lParam)) != CALLSERVICE_NOTFOUND) { + for (int i = wParam-1; i >= 0; i--) + if ((ret = CallProtoServiceInt(NULL, filters[i]->szName, ccs->szProtoService, i+1, lParam)) != CALLSERVICE_NOTFOUND) //chain was started, exit return ret; - } - } //end of chain, call network protocol again char szProto[40]; @@ -164,12 +165,6 @@ static INT_PTR CallRecvChain(WPARAM wParam, LPARAM lParam) return ret; } -static INT_PTR Proto_ChainRecv(WPARAM wParam, LPARAM lParam) -{ - /* this will switch threads just like before */ - return CallServiceSync(MS_PROTO_CHAINRECV "ThreadSafe", wParam, lParam); -} - PROTOACCOUNT* __fastcall Proto_GetAccount(HANDLE hContact) { if (hContact == NULL) @@ -252,8 +247,7 @@ int LoadProtoChains(void) CreateServiceFunction(MS_PROTO_CALLCONTACTSERVICE, Proto_CallContactService); CreateServiceFunction(MS_PROTO_CHAINSEND, Proto_CallContactService); - CreateServiceFunction(MS_PROTO_CHAINRECV, Proto_ChainRecv); - CreateServiceFunction(MS_PROTO_CHAINRECV "ThreadSafe", CallRecvChain); + CreateServiceFunction(MS_PROTO_CHAINRECV, Proto_RecvChain); CreateServiceFunction(MS_PROTO_GETCONTACTBASEPROTO, Proto_GetContactBaseProto); CreateServiceFunction(MS_PROTO_GETCONTACTBASEACCOUNT, Proto_GetContactBaseAccount); CreateServiceFunction(MS_PROTO_ISPROTOONCONTACT, Proto_IsProtoOnContact); -- cgit v1.2.3