summaryrefslogtreecommitdiff
path: root/src/mir_app
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2024-01-19 13:46:30 +0300
committerGeorge Hazan <george.hazan@gmail.com>2024-01-19 13:46:30 +0300
commitb509e969b7e5e6991c0590cbe43282f219bcc2c1 (patch)
treef9c5e204449c175b11ad16fd7df8e1198a27d99f /src/mir_app
parent4f96ac493ef8e912cd1507fe79e4831a8cf7efb0 (diff)
useless code removed
Diffstat (limited to 'src/mir_app')
-rw-r--r--src/mir_app/src/proto_chains.cpp13
-rw-r--r--src/mir_app/src/protocols.cpp97
2 files changed, 50 insertions, 60 deletions
diff --git a/src/mir_app/src/proto_chains.cpp b/src/mir_app/src/proto_chains.cpp
index 7e7d650c2c..707e8996f9 100644
--- a/src/mir_app/src/proto_chains.cpp
+++ b/src/mir_app/src/proto_chains.cpp
@@ -71,10 +71,6 @@ MIR_APP_DLL(INT_PTR) Proto_ChainSend(int iOrder, CCSDATA *ccs)
if (GetProtocolP(ccs->hContact, szProto, sizeof(szProto)))
return 1;
- PROTOACCOUNT *pa = Proto_GetAccount(szProto);
- if (pa == nullptr || pa->ppro == nullptr)
- return 1;
-
ret = CallContactServiceInt(ccs->hContact, szProto, ccs->szProtoService, ccs->wParam, ccs->lParam);
if (ret == CALLSERVICE_NOTFOUND)
ret = 1;
@@ -117,14 +113,7 @@ MIR_APP_DLL(INT_PTR) Proto_ChainRecv(int iOrder, CCSDATA *ccs)
if (GetProtocolP(ccs->hContact, szProto, sizeof(szProto)))
return 1;
- PROTOACCOUNT *pa = Proto_GetAccount(szProto);
- if (pa == nullptr || pa->ppro == nullptr)
- return 1;
-
- if (pa->bOldProto)
- ret = CallContactServiceInt(ccs->hContact, szProto, ccs->szProtoService, -1, (LPARAM)ccs);
- else
- ret = CallContactServiceInt(ccs->hContact, szProto, ccs->szProtoService, ccs->wParam, ccs->lParam);
+ ret = CallContactServiceInt(ccs->hContact, szProto, ccs->szProtoService, ccs->wParam, ccs->lParam);
if (ret == CALLSERVICE_NOTFOUND)
ret = 1;
diff --git a/src/mir_app/src/protocols.cpp b/src/mir_app/src/protocols.cpp
index 0c0f834562..4b14130520 100644
--- a/src/mir_app/src/protocols.cpp
+++ b/src/mir_app/src/protocols.cpp
@@ -386,57 +386,58 @@ INT_PTR CallContactServiceInt(MCONTACT hContact, const char *szModule, const cha
if (item) {
auto *pa = Proto_GetAccount(szModule);
auto *ppi = (pa) ? pa->ppro : 0;
- if (ppi != nullptr) {
- switch (item->id) {
- case 1: return (INT_PTR)ppi->AddToList(wParam, (PROTOSEARCHRESULT *)lParam);
- case 2: return (INT_PTR)ppi->AddToListByEvent(LOWORD(wParam), HIWORD(wParam), (MEVENT)lParam);
- case 3: return (INT_PTR)ppi->Authorize((MEVENT)wParam);
- case 4: return (INT_PTR)ppi->AuthDeny((MEVENT)wParam, (wchar_t *)lParam);
- case 5: return (INT_PTR)ppi->AuthRecv(hContact, (PROTORECVEVENT *)lParam);
- case 6: return (INT_PTR)ppi->AuthRequest(hContact, (wchar_t *)lParam);
- case 8: return (INT_PTR)ppi->FileAllow(hContact, (HANDLE)wParam, (wchar_t *)lParam);
- case 9: return (INT_PTR)ppi->FileCancel(hContact, (HANDLE)wParam);
- case 10: return (INT_PTR)ppi->FileDeny(hContact, (HANDLE)wParam, (wchar_t *)lParam);
- case 11:
- {
- PROTOFILERESUME *pfr = (PROTOFILERESUME *)lParam;
- return (INT_PTR)ppi->FileResume((HANDLE)wParam, pfr->action, (const wchar_t *)pfr->szFilename);
- }
+ if (ppi == nullptr)
+ return CALLSERVICE_NOTFOUND;
+
+ switch (item->id) {
+ case 1: return (INT_PTR)ppi->AddToList(wParam, (PROTOSEARCHRESULT *)lParam);
+ case 2: return (INT_PTR)ppi->AddToListByEvent(LOWORD(wParam), HIWORD(wParam), (MEVENT)lParam);
+ case 3: return (INT_PTR)ppi->Authorize((MEVENT)wParam);
+ case 4: return (INT_PTR)ppi->AuthDeny((MEVENT)wParam, (wchar_t *)lParam);
+ case 5: return (INT_PTR)ppi->AuthRecv(hContact, (PROTORECVEVENT *)lParam);
+ case 6: return (INT_PTR)ppi->AuthRequest(hContact, (wchar_t *)lParam);
+ case 8: return (INT_PTR)ppi->FileAllow(hContact, (HANDLE)wParam, (wchar_t *)lParam);
+ case 9: return (INT_PTR)ppi->FileCancel(hContact, (HANDLE)wParam);
+ case 10: return (INT_PTR)ppi->FileDeny(hContact, (HANDLE)wParam, (wchar_t *)lParam);
+ case 11:
+ {
+ PROTOFILERESUME *pfr = (PROTOFILERESUME *)lParam;
+ return (INT_PTR)ppi->FileResume((HANDLE)wParam, pfr->action, (const wchar_t *)pfr->szFilename);
+ }
- case 12: return (INT_PTR)ppi->GetCaps(wParam, lParam);
- case 13: return (INT_PTR)Proto_GetIcon(ppi, wParam);
- case 14: return (INT_PTR)ppi->GetInfo(hContact, wParam);
- case 15: return (INT_PTR)ppi->SearchBasic((wchar_t *)lParam);
- case 16: return (INT_PTR)ppi->SearchByEmail((wchar_t *)lParam);
- case 17:
- {
- PROTOSEARCHBYNAME *psbn = (PROTOSEARCHBYNAME *)lParam;
- return (INT_PTR)ppi->SearchByName(psbn->pszNick, psbn->pszFirstName, psbn->pszLastName);
- }
- case 18: return (INT_PTR)ppi->SearchAdvanced((HWND)lParam);
- case 19: return (INT_PTR)ppi->CreateExtendedSearchUI((HWND)lParam);
- case 20: return (INT_PTR)ppi->RecvContacts(hContact, (PROTORECVEVENT *)lParam);
- case 21: return (INT_PTR)ppi->RecvFile(hContact, (PROTORECVFILE *)lParam);
- case 22: return (INT_PTR)ppi->RecvMsg(hContact, (PROTORECVEVENT *)lParam);
- case 23: return (INT_PTR)ppi->SendContacts(hContact, LOWORD(wParam), HIWORD(wParam), (MCONTACT *)lParam);
- case 24: return (INT_PTR)ppi->SendFile(hContact, (wchar_t *)wParam, (wchar_t **)lParam);
- case 25:
- {
- int msgId = ppi->SendMsg(hContact, wParam, (const char *)lParam);
- if (msgId == -1) {
- ppi->ProtoBroadcastAsync(hContact, ACKTYPE_MESSAGE, ACKRESULT_FAILED, (HANDLE)-1, (LPARAM)TranslateT("Protocol is offline"));
- return -1;
- }
- return msgId;
+ case 12: return (INT_PTR)ppi->GetCaps(wParam, lParam);
+ case 13: return (INT_PTR)Proto_GetIcon(ppi, wParam);
+ case 14: return (INT_PTR)ppi->GetInfo(hContact, wParam);
+ case 15: return (INT_PTR)ppi->SearchBasic((wchar_t *)lParam);
+ case 16: return (INT_PTR)ppi->SearchByEmail((wchar_t *)lParam);
+ case 17:
+ {
+ PROTOSEARCHBYNAME *psbn = (PROTOSEARCHBYNAME *)lParam;
+ return (INT_PTR)ppi->SearchByName(psbn->pszNick, psbn->pszFirstName, psbn->pszLastName);
+ }
+ case 18: return (INT_PTR)ppi->SearchAdvanced((HWND)lParam);
+ case 19: return (INT_PTR)ppi->CreateExtendedSearchUI((HWND)lParam);
+ case 20: return (INT_PTR)ppi->RecvContacts(hContact, (PROTORECVEVENT *)lParam);
+ case 21: return (INT_PTR)ppi->RecvFile(hContact, (PROTORECVFILE *)lParam);
+ case 22: return (INT_PTR)ppi->RecvMsg(hContact, (PROTORECVEVENT *)lParam);
+ case 23: return (INT_PTR)ppi->SendContacts(hContact, LOWORD(wParam), HIWORD(wParam), (MCONTACT *)lParam);
+ case 24: return (INT_PTR)ppi->SendFile(hContact, (wchar_t *)wParam, (wchar_t **)lParam);
+ case 25:
+ {
+ int msgId = ppi->SendMsg(hContact, wParam, (const char *)lParam);
+ if (msgId == -1) {
+ ppi->ProtoBroadcastAsync(hContact, ACKTYPE_MESSAGE, ACKRESULT_FAILED, (HANDLE)-1, (LPARAM)TranslateT("Protocol is offline"));
+ return -1;
}
- case 27: return (INT_PTR)ppi->SetStatus(wParam);
- case 28: return (INT_PTR)ppi->GetAwayMsg(hContact);
- case 29: return (INT_PTR)ppi->SetAwayMsg(wParam, (wchar_t *)lParam);
- case 30: return (INT_PTR)ppi->UserIsTyping(wParam, lParam);
- case 31: mir_strncpy((char *)lParam, ppi->m_szModuleName, wParam); return 0;
- case 32:
- return ppi->m_iStatus;
+ return msgId;
}
+ case 27: return (INT_PTR)ppi->SetStatus(wParam);
+ case 28: return (INT_PTR)ppi->GetAwayMsg(hContact);
+ case 29: return (INT_PTR)ppi->SetAwayMsg(wParam, (wchar_t *)lParam);
+ case 30: return (INT_PTR)ppi->UserIsTyping(wParam, lParam);
+ case 31: mir_strncpy((char *)lParam, ppi->m_szModuleName, wParam); return 0;
+ case 32:
+ return ppi->m_iStatus;
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-29 14:12:09 +0000