summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/m_protoint.h1
-rw-r--r--include/m_protosvc.h15
-rw-r--r--libs/win32/mir_app.libbin189168 -> 188858 bytes
-rw-r--r--libs/win64/mir_app.libbin184494 -> 184174 bytes
-rw-r--r--protocols/EmLanProto/src/amdproto.cpp8
-rw-r--r--protocols/EmLanProto/src/mlan.cpp14
-rw-r--r--protocols/EmLanProto/src/mlan.h2
-rw-r--r--protocols/ICQ-WIM/src/proto.cpp8
-rw-r--r--protocols/ICQ-WIM/src/proto.h1
-rw-r--r--src/mir_app/src/mir_app.def1
-rw-r--r--src/mir_app/src/mir_app64.def1
-rw-r--r--src/mir_app/src/proto_internal.cpp6
-rw-r--r--src/mir_app/src/proto_utils.cpp5
-rw-r--r--src/mir_app/src/protocols.cpp34
14 files changed, 20 insertions, 76 deletions
diff --git a/include/m_protoint.h b/include/m_protoint.h
index d2d009a9f5..b7957f46f1 100644
--- a/include/m_protoint.h
+++ b/include/m_protoint.h
@@ -208,7 +208,6 @@ public:
virtual int SendContacts(MCONTACT hContact, int flags, int nContacts, MCONTACT *hContactsList);
virtual HANDLE SendFile(MCONTACT hContact, const wchar_t *szDescription, wchar_t **ppszFiles);
virtual int SendMsg(MCONTACT hContact, int flags, const char *msg);
- virtual int SendUrl(MCONTACT hContact, int flags, const char *url);
virtual int SetApparentMode(MCONTACT hContact, int mode);
virtual int SetStatus(int iNewStatus);
diff --git a/include/m_protosvc.h b/include/m_protosvc.h
index 6aabeffeea..d6a44e7c85 100644
--- a/include/m_protosvc.h
+++ b/include/m_protosvc.h
@@ -606,21 +606,6 @@ struct PROTOFILERESUME
#define PSS_MESSAGE "/SendMsg"
///////////////////////////////////////////////////////////////////////////////
-// Send an URL message
-// wParam = flags
-// lParam = (LPARAM)(const char*)szMessage
-// returns a hProcess corresponding to the one in the ack event.
-// szMessage should be encoded as the URL followed by the description, the
-// separator being a single nul (\0). If there is no description, do not forget
-// to end the URL with two nuls.
-// Will send an ack when the message actually gets sent
-// type = ACKTYPE_URL, result = success/failure, (char*)lParam = error message or NULL.
-// Protocols modules are free to define flags starting at 0x10000
-// The event will *not* be added to the database automatically.
-
-#define PSS_URL "/SendUrl"
-
-///////////////////////////////////////////////////////////////////////////////
// Send a set of contacts
// wParam = MAKEWPARAM(flags, nContacts)
// lParam = (LPARAM)(HANDLE*)hContactsList
diff --git a/libs/win32/mir_app.lib b/libs/win32/mir_app.lib
index 7d1f32b898..fe6362e403 100644
--- a/libs/win32/mir_app.lib
+++ b/libs/win32/mir_app.lib
Binary files differ
diff --git a/libs/win64/mir_app.lib b/libs/win64/mir_app.lib
index 50cddcd753..5db0ed6550 100644
--- a/libs/win64/mir_app.lib
+++ b/libs/win64/mir_app.lib
Binary files differ
diff --git a/protocols/EmLanProto/src/amdproto.cpp b/protocols/EmLanProto/src/amdproto.cpp
index 55dfb598e1..99746894a0 100644
--- a/protocols/EmLanProto/src/amdproto.cpp
+++ b/protocols/EmLanProto/src/amdproto.cpp
@@ -103,12 +103,7 @@ INT_PTR __cdecl EMPSetStatus(WPARAM new_status, LPARAM)
static INT_PTR __cdecl EMPSendMessage(WPARAM, LPARAM lParam)
{
- return g_lan->SendMessageUrl((CCSDATA*)lParam, false);
-}
-
-static INT_PTR __cdecl EMPSendUrl(WPARAM, LPARAM lParam)
-{
- return g_lan->SendMessageUrl((CCSDATA*)lParam, true);
+ return g_lan->SendMessageUrl((CCSDATA*)lParam);
}
static INT_PTR __cdecl EMPRecvMessageUrl(WPARAM, LPARAM lParam)
@@ -338,7 +333,6 @@ int CMPlugin::Load()
CreateProtoServiceFunction(MODULENAME, PS_BASICSEARCH, EMPBasicSearch);
CreateProtoServiceFunction(MODULENAME, PS_ADDTOLIST, EMPAddToList);
CreateProtoServiceFunction(MODULENAME, PSS_MESSAGE, EMPSendMessage);
- CreateProtoServiceFunction(MODULENAME, PSS_URL, EMPSendUrl);
CreateProtoServiceFunction(MODULENAME, PSR_MESSAGE, EMPRecvMessageUrl);
CreateProtoServiceFunction(MODULENAME, PSR_URL, EMPRecvMessageUrl);
CreateProtoServiceFunction(MODULENAME, PSS_GETAWAYMSG, EMPGetAwayMsg);
diff --git a/protocols/EmLanProto/src/mlan.cpp b/protocols/EmLanProto/src/mlan.cpp
index d20ef97336..cf15c9f7e2 100644
--- a/protocols/EmLanProto/src/mlan.cpp
+++ b/protocols/EmLanProto/src/mlan.cpp
@@ -383,20 +383,10 @@ INT_PTR CMLan::AddToContactList(u_int flags, EMPSEARCHRESULT *psr)
return (INT_PTR)contact;
}
-int CMLan::SendMessageUrl(CCSDATA *ccs, bool isUrl)
+int CMLan::SendMessageUrl(CCSDATA *ccs)
{
int cid = GetRandomProcId();
- size_t len = 0;
- if (isUrl) {
- len = mir_strlen((char*)ccs->lParam);
- ((char*)ccs->lParam)[len] = 1;
- }
- TDataHolder *hold = new TDataHolder(ccs, cid, isUrl ? LEXT_SENDURL : LEXT_SENDMESSAGE, this);
- if (isUrl) {
- ((char*)ccs->lParam)[len] = 0;
- hold->msg[len] = 0;
- }
- mir_forkthread(LaunchExt, hold);
+ mir_forkthread(LaunchExt, new TDataHolder(ccs, cid, LEXT_SENDMESSAGE, this));
return cid;
}
diff --git a/protocols/EmLanProto/src/mlan.h b/protocols/EmLanProto/src/mlan.h
index 27fad4e9ee..1af49fe6ce 100644
--- a/protocols/EmLanProto/src/mlan.h
+++ b/protocols/EmLanProto/src/mlan.h
@@ -52,7 +52,7 @@ public:
void SetMirandaStatus(u_int status);
void SetAllOffline();
void RecvMessageUrl(CCSDATA* ccs);
- int SendMessageUrl(CCSDATA* ccs, bool isUrl);
+ int SendMessageUrl(CCSDATA* ccs);
int GetAwayMsg(CCSDATA* ccs);
int RecvAwayMsg(CCSDATA* ccs);
int SetAwayMsg(u_int status, char* msg);
diff --git a/protocols/ICQ-WIM/src/proto.cpp b/protocols/ICQ-WIM/src/proto.cpp
index aeade1e3a9..082e9bdcbe 100644
--- a/protocols/ICQ-WIM/src/proto.cpp
+++ b/protocols/ICQ-WIM/src/proto.cpp
@@ -374,14 +374,6 @@ int CIcqProto::SendMsg(MCONTACT hContact, int, const char *pszSrc)
}
////////////////////////////////////////////////////////////////////////////////////////
-// SendUrl
-
-int CIcqProto::SendUrl(MCONTACT, int, const char*)
-{
- return 1; // Failure
-}
-
-////////////////////////////////////////////////////////////////////////////////////////
// PS_SetStatus - sets the protocol status
int CIcqProto::SetStatus(int iNewStatus)
diff --git a/protocols/ICQ-WIM/src/proto.h b/protocols/ICQ-WIM/src/proto.h
index 46bcb56e8f..06fc56c367 100644
--- a/protocols/ICQ-WIM/src/proto.h
+++ b/protocols/ICQ-WIM/src/proto.h
@@ -226,7 +226,6 @@ class CIcqProto : public PROTO<CIcqProto>
HANDLE SendFile(MCONTACT hContact, const wchar_t *szDescription, wchar_t **ppszFiles) override;
int SendMsg(MCONTACT hContact, int flags, const char *msg) override;
- int SendUrl(MCONTACT hContact, int flags, const char *url) override;
int SetApparentMode(MCONTACT hContact, int mode) override;
int SetStatus(int iNewStatus) override;
diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def
index 673016746d..3aee20c8d4 100644
--- a/src/mir_app/src/mir_app.def
+++ b/src/mir_app/src/mir_app.def
@@ -64,7 +64,6 @@ Skin_GetIconName @24
?SendContacts@PROTO_INTERFACE@@UAEHIHHPAI@Z @66 NONAME
?SendFile@PROTO_INTERFACE@@UAEPAXIPB_WPAPA_W@Z @67 NONAME
?SendMsg@PROTO_INTERFACE@@UAEHIHPBD@Z @68 NONAME
-?SendUrl@PROTO_INTERFACE@@UAEHIHPBD@Z @69 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 513a79e71c..208676636e 100644
--- a/src/mir_app/src/mir_app64.def
+++ b/src/mir_app/src/mir_app64.def
@@ -64,7 +64,6 @@ Skin_GetIconName @24
?SendContacts@PROTO_INTERFACE@@UEAAHIHHPEAI@Z @66 NONAME
?SendFile@PROTO_INTERFACE@@UEAAPEAXIPEB_WPEAPEA_W@Z @67 NONAME
?SendMsg@PROTO_INTERFACE@@UEAAHIHPEBD@Z @68 NONAME
-?SendUrl@PROTO_INTERFACE@@UEAAHIHPEBD@Z @69 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_internal.cpp b/src/mir_app/src/proto_internal.cpp
index 88f8418cea..919d779c56 100644
--- a/src/mir_app/src/proto_internal.cpp
+++ b/src/mir_app/src/proto_internal.cpp
@@ -239,12 +239,6 @@ struct DEFAULT_PROTO_INTERFACE : public PROTO_INTERFACE
return (int)ProtoCallService(m_szModuleName, PSS_MESSAGE, 0, (LPARAM)&ccs);
}
- int SendUrl(MCONTACT hContact, int flags, const char* url) override
- {
- CCSDATA ccs = { hContact, PSS_URL, (WPARAM)flags, (LPARAM)url };
- return (int)ProtoCallService(m_szModuleName, PSS_URL, 0, (LPARAM)&ccs);
- }
-
int SetApparentMode(MCONTACT hContact, int mode) override
{
CCSDATA ccs = { hContact, PSS_SETAPPARENTMODE, (WPARAM)mode, 0 };
diff --git a/src/mir_app/src/proto_utils.cpp b/src/mir_app/src/proto_utils.cpp
index d97d8f5396..6b3a6aa40a 100644
--- a/src/mir_app/src/proto_utils.cpp
+++ b/src/mir_app/src/proto_utils.cpp
@@ -555,11 +555,6 @@ int PROTO_INTERFACE::SendMsg(MCONTACT, int, const char*)
return 0; // error
}
-int PROTO_INTERFACE::SendUrl(MCONTACT, int, const char*)
-{
- return 1; // error
-}
-
int PROTO_INTERFACE::SetApparentMode(MCONTACT, int)
{
return 1; // error
diff --git a/src/mir_app/src/protocols.cpp b/src/mir_app/src/protocols.cpp
index 2e1261116b..e2eb88bbc4 100644
--- a/src/mir_app/src/protocols.cpp
+++ b/src/mir_app/src/protocols.cpp
@@ -68,15 +68,14 @@ static TServiceListItem serviceItems[] =
{ PSS_CONTACTS, 24 },
{ PSS_FILE, 25 },
{ PSS_MESSAGE, 26 },
- { PSS_URL, 27 },
- { PSS_SETAPPARENTMODE, 28 },
- { PS_SETSTATUS, 29 },
- { PSS_GETAWAYMSG, 30 },
- { PSR_AWAYMSG, 31 },
- { PS_SETAWAYMSG, 33 },
- { PSS_USERISTYPING, 34 },
- { PS_GETNAME, 35 },
- { PS_GETSTATUS, 36 }
+ { PSS_SETAPPARENTMODE, 27 },
+ { PS_SETSTATUS, 28 },
+ { PSS_GETAWAYMSG, 29 },
+ { PSR_AWAYMSG, 30 },
+ { PS_SETAWAYMSG, 31 },
+ { PSS_USERISTYPING, 32 },
+ { PS_GETNAME, 33 },
+ { PS_GETSTATUS, 34 }
};
//------------------------------------------------------------------------------------
@@ -430,15 +429,14 @@ INT_PTR CallProtoServiceInt(MCONTACT hContact, const char *szModule, const char
case 24: return (INT_PTR)ppi->SendContacts(hContact, LOWORD(wParam), HIWORD(wParam), (MCONTACT*)lParam);
case 25: return (INT_PTR)ppi->SendFile(hContact, (wchar_t*)wParam, (wchar_t**)lParam);
case 26: return (INT_PTR)ppi->SendMsg(hContact, wParam, (const char*)lParam);
- case 27: return (INT_PTR)ppi->SendUrl(hContact, wParam, (const char*)lParam);
- case 28: return (INT_PTR)ppi->SetApparentMode(hContact, wParam);
- case 29: return (INT_PTR)ppi->SetStatus(wParam);
- case 30: return (INT_PTR)ppi->GetAwayMsg(hContact);
- case 31: return (INT_PTR)ppi->RecvAwayMsg(hContact, wParam, (PROTORECVEVENT*)lParam);
- case 33: return (INT_PTR)ppi->SetAwayMsg(wParam, (wchar_t*)lParam);
- case 34: return (INT_PTR)ppi->UserIsTyping(wParam, lParam);
- case 35: mir_strncpy((char*)lParam, ppi->m_szModuleName, wParam); return 0;
- case 36:
+ case 27: return (INT_PTR)ppi->SetApparentMode(hContact, wParam);
+ case 28: return (INT_PTR)ppi->SetStatus(wParam);
+ case 29: return (INT_PTR)ppi->GetAwayMsg(hContact);
+ case 30: return (INT_PTR)ppi->RecvAwayMsg(hContact, wParam, (PROTORECVEVENT*)lParam);
+ case 31: return (INT_PTR)ppi->SetAwayMsg(wParam, (wchar_t*)lParam);
+ case 32: return (INT_PTR)ppi->UserIsTyping(wParam, lParam);
+ case 33: mir_strncpy((char*)lParam, ppi->m_szModuleName, wParam); return 0;
+ case 34:
return ppi->m_iStatus;
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 18:36:04 +0000