diff options
| author | George Hazan <george.hazan@gmail.com> | 2023-12-03 17:14:30 +0300 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2023-12-03 17:14:30 +0300 |
| commit | 1338ad89ee45bdb681c531476dca00a377d7d033 (patch) | |
| tree | 3eae8ad7620848a1a8b12ced532d826aae81a224 /src | |
| parent | 8a0d55713496fe7c8eecc0267d775b1bb29e0842 (diff) | |
PROTO_INTERFACE::SendMsg: second parameter became a reply event id
Diffstat (limited to 'src')
| -rw-r--r-- | src/mir_app/src/mir_app.def | 2 | ||||
| -rw-r--r-- | src/mir_app/src/mir_app64.def | 2 | ||||
| -rw-r--r-- | src/mir_app/src/proto_interface.cpp | 2 | ||||
| -rw-r--r-- | src/mir_app/src/proto_internal.cpp | 4 | ||||
| -rw-r--r-- | src/mir_app/src/protocols.cpp | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def index ba74665e56..36020e3579 100644 --- a/src/mir_app/src/mir_app.def +++ b/src/mir_app/src/mir_app.def @@ -63,7 +63,7 @@ Button_SetSkin_IcoLib @24 ?SearchByName@PROTO_INTERFACE@@UAEPAXPB_W00@Z @65 NONAME
?SendContacts@PROTO_INTERFACE@@UAEHIHHPAI@Z @66 NONAME
?SendFile@PROTO_INTERFACE@@UAEPAXIPB_WPAPA_W@Z @67 NONAME
-?SendMsg@PROTO_INTERFACE@@UAEHIPBD@Z @68 NONAME
+?SendMsg@PROTO_INTERFACE@@UAEHIIPBD@Z @68 NONAME
?SetApparentMode@PROTO_INTERFACE@@UAEHIH@Z @70 NONAME
?SetAwayMsg@PROTO_INTERFACE@@UAEHHPB_W@Z @71 NONAME
?SetStatus@PROTO_INTERFACE@@UAEHH@Z @72 NONAME
diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def index 257fa93dfd..3ec92dc0dc 100644 --- a/src/mir_app/src/mir_app64.def +++ b/src/mir_app/src/mir_app64.def @@ -63,7 +63,7 @@ Button_SetSkin_IcoLib @24 ?SearchByName@PROTO_INTERFACE@@UEAAPEAXPEB_W00@Z @65 NONAME
?SendContacts@PROTO_INTERFACE@@UEAAHIHHPEAI@Z @66 NONAME
?SendFile@PROTO_INTERFACE@@UEAAPEAXIPEB_WPEAPEA_W@Z @67 NONAME
-?SendMsg@PROTO_INTERFACE@@UEAAHIPEBD@Z @68 NONAME
+?SendMsg@PROTO_INTERFACE@@UEAAHIIPEBD@Z @68 NONAME
?SetApparentMode@PROTO_INTERFACE@@UEAAHIH@Z @70 NONAME
?SetAwayMsg@PROTO_INTERFACE@@UEAAHHPEB_W@Z @71 NONAME
?SetStatus@PROTO_INTERFACE@@UEAAHH@Z @72 NONAME
diff --git a/src/mir_app/src/proto_interface.cpp b/src/mir_app/src/proto_interface.cpp index 88488be82c..00d7fb2f26 100644 --- a/src/mir_app/src/proto_interface.cpp +++ b/src/mir_app/src/proto_interface.cpp @@ -255,7 +255,7 @@ HANDLE PROTO_INTERFACE::SendFile(MCONTACT, const wchar_t*, wchar_t**) return nullptr; // error
}
-int PROTO_INTERFACE::SendMsg(MCONTACT, const char*)
+int PROTO_INTERFACE::SendMsg(MCONTACT, MEVENT, const char*)
{
return 0; // error
}
diff --git a/src/mir_app/src/proto_internal.cpp b/src/mir_app/src/proto_internal.cpp index b8d0cabb5c..b876e221ea 100644 --- a/src/mir_app/src/proto_internal.cpp +++ b/src/mir_app/src/proto_internal.cpp @@ -209,9 +209,9 @@ struct DEFAULT_PROTO_INTERFACE : public PROTO_INTERFACE return res;
}
- int SendMsg(MCONTACT hContact, const char *msg) override
+ int SendMsg(MCONTACT hContact, MEVENT hEvent, const char *msg) override
{
- CCSDATA ccs = { hContact, PSS_MESSAGE, 0, (LPARAM)msg };
+ CCSDATA ccs = { hContact, PSS_MESSAGE, hEvent, (LPARAM)msg };
return (int)ProtoCallService(m_szModuleName, PSS_MESSAGE, 0, (LPARAM)&ccs);
}
diff --git a/src/mir_app/src/protocols.cpp b/src/mir_app/src/protocols.cpp index 6a472ee64e..bafd0d0d04 100644 --- a/src/mir_app/src/protocols.cpp +++ b/src/mir_app/src/protocols.cpp @@ -425,7 +425,7 @@ INT_PTR CallProtoServiceInt(MCONTACT hContact, const char *szModule, const char 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, (const char *)lParam);
+ 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;
|