diff options
Diffstat (limited to 'src/modules/protocols')
| -rw-r--r-- | src/modules/protocols/protochains.cpp | 26 | ||||
| -rw-r--r-- | src/modules/protocols/protocols.cpp | 2 |
2 files changed, 11 insertions, 17 deletions
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);
diff --git a/src/modules/protocols/protocols.cpp b/src/modules/protocols/protocols.cpp index 7589693e3b..0b471da68a 100644 --- a/src/modules/protocols/protocols.cpp +++ b/src/modules/protocols/protocols.cpp @@ -147,7 +147,7 @@ static INT_PTR Proto_RegisterModule(WPARAM, LPARAM lParam) else *p = *pd;
p->szName = mir_strdup(pd->szName);
protos.insert(p);
- if (p->type != PROTOTYPE_PROTOCOL)
+ if (p->type != PROTOTYPE_PROTOCOL && p->type != PROTOTYPE_VIRTUAL)
filters.insert(p);
return 0;
}
|