From 58580c677c86d54c83b351bebab33f488350107f Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 10 May 2021 15:10:00 +0300 Subject: hidden function Proto_GetAccount exported as Proto_GetContactAccount (cherry picked from commit 922d0cccd71e54d1ad5af0a3f59ac54de065eb6f) --- src/mir_app/src/mir_app.def | 1 + src/mir_app/src/mir_app64.def | 1 + src/mir_app/src/miranda.h | 2 -- src/mir_app/src/proto_chains.cpp | 4 ++-- src/mir_app/src/proto_utils.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def index c7b62601aa..5b47571ebc 100644 --- a/src/mir_app/src/mir_app.def +++ b/src/mir_app/src/mir_app.def @@ -121,6 +121,7 @@ GetPluginLangId @129 Proto_GetAccount @130 Proto_EnumProtocols @131 Proto_EnumAccounts @132 +Proto_GetContactAccount @133 Proto_GetBaseAccountName @135 Proto_AddToContact @137 Proto_ChainRecv @138 diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def index 3885bb7d91..3c61daf61d 100644 --- a/src/mir_app/src/mir_app64.def +++ b/src/mir_app/src/mir_app64.def @@ -121,6 +121,7 @@ GetPluginLangId @129 Proto_GetAccount @130 Proto_EnumProtocols @131 Proto_EnumAccounts @132 +Proto_GetContactAccount @133 Proto_GetBaseAccountName @135 Proto_AddToContact @137 Proto_ChainRecv @138 diff --git a/src/mir_app/src/miranda.h b/src/mir_app/src/miranda.h index 7878f792f7..ec43c2c428 100644 --- a/src/mir_app/src/miranda.h +++ b/src/mir_app/src/miranda.h @@ -164,8 +164,6 @@ extern LIST g_arFilters; INT_PTR ProtoCallService(const char *szModule, const char *szService, WPARAM wParam, LPARAM lParam); -PROTOACCOUNT* __fastcall Proto_GetAccount(MCONTACT hContact); - PROTO_INTERFACE* AddDefaultAccount(const char *szProtoName); int FreeDefaultAccount(PROTO_INTERFACE* ppi); diff --git a/src/mir_app/src/proto_chains.cpp b/src/mir_app/src/proto_chains.cpp index c66d4e1230..83391ccc0d 100644 --- a/src/mir_app/src/proto_chains.cpp +++ b/src/mir_app/src/proto_chains.cpp @@ -134,7 +134,7 @@ MIR_APP_DLL(INT_PTR) Proto_ChainRecv(int iOrder, CCSDATA *ccs) return ret; } -PROTOACCOUNT* __fastcall Proto_GetAccount(MCONTACT hContact) +MIR_APP_DLL(PROTOACCOUNT*) Proto_GetContactAccount(MCONTACT hContact) { if (hContact == 0) return nullptr; @@ -148,7 +148,7 @@ PROTOACCOUNT* __fastcall Proto_GetAccount(MCONTACT hContact) MIR_APP_DLL(char*) Proto_GetBaseAccountName(MCONTACT hContact) { - PROTOACCOUNT *pa = Proto_GetAccount(hContact); + PROTOACCOUNT *pa = Proto_GetContactAccount(hContact); return pa->IsEnabled() ? pa->szModuleName : nullptr; } diff --git a/src/mir_app/src/proto_utils.cpp b/src/mir_app/src/proto_utils.cpp index 78166d67ac..cbb86b6589 100644 --- a/src/mir_app/src/proto_utils.cpp +++ b/src/mir_app/src/proto_utils.cpp @@ -54,7 +54,7 @@ MIR_APP_DLL(PROTOCOLDESCRIPTOR*) Proto_IsProtocolLoaded(const char *szProtoName) MIR_APP_DLL(PROTO_INTERFACE *) Proto_GetInstance(MCONTACT hContact) { - PROTOACCOUNT *pa = Proto_GetAccount(hContact); + PROTOACCOUNT *pa = Proto_GetContactAccount(hContact); if (pa == nullptr || pa->bOldProto) return nullptr; -- cgit v1.2.3