diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-09-16 11:50:15 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-09-16 11:50:15 +0000 |
| commit | 5161fd3fe53b85f579cfece81e25b562f1fa56ae (patch) | |
| tree | 3ac6979cd3774351cb68431da64ca014f1170e98 /protocols/MSN/msn_p2p.cpp | |
| parent | ce6e5ab03d58151c4eda36d05a8436d337b2d3c0 (diff) | |
- event code standardization for protocols
- fix for EVENTTYPE_AUTHREQUEST processing
- protocols' custom CallService core removed
git-svn-id: http://svn.miranda-ng.org/main/trunk@1576 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/MSN/msn_p2p.cpp')
| -rw-r--r-- | protocols/MSN/msn_p2p.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/protocols/MSN/msn_p2p.cpp b/protocols/MSN/msn_p2p.cpp index 84d1ee8d2c..599dee57fd 100644 --- a/protocols/MSN/msn_p2p.cpp +++ b/protocols/MSN/msn_p2p.cpp @@ -86,7 +86,7 @@ bool CMsnProto::p2p_createListener(filetransfer* ft, directconnection *dc, MimeH nlb.cbSize = sizeof(nlb);
nlb.pfnNewConnectionV2 = MSN_ConnectionProc;
nlb.pExtra = this;
- HANDLE sb = (HANDLE) MSN_CallService(MS_NETLIB_BINDPORT, (WPARAM) hNetlibUser, (LPARAM)&nlb);
+ HANDLE sb = (HANDLE) CallService(MS_NETLIB_BINDPORT, (WPARAM) hNetlibUser, (LPARAM)&nlb);
if (sb == NULL)
{
MSN_DebugLog("Unable to bind the port for incoming transfers");
@@ -278,7 +278,7 @@ void CMsnProto::p2p_savePicture2disk(filetransfer* ft) cont.path = pathcpy;
- MSN_CallService(MS_SMILEYADD_LOADCONTACTSMILEYS, 0, (LPARAM)&cont);
+ CallService(MS_SMILEYADD_LOADCONTACTSMILEYS, 0, (LPARAM)&cont);
mir_free(pathcpy);
}
break;
@@ -731,7 +731,7 @@ bool CMsnProto::p2p_connectTo(ThreadData* info, directconnection *dc) MSN_DebugLog("Connecting to %s:%d", tConn.szHost, tConn.wPort);
- info->s = (HANDLE)MSN_CallService(MS_NETLIB_OPENCONNECTION, (WPARAM)hNetlibUser, (LPARAM)&tConn);
+ info->s = (HANDLE)CallService(MS_NETLIB_OPENCONNECTION, (WPARAM)hNetlibUser, (LPARAM)&tConn);
if (info->s == NULL)
{
TWinErrorCode err;
@@ -1335,7 +1335,7 @@ void CMsnProto::p2p_InitFileTransfer( ccs.szProtoService = PSR_FILE;
ccs.wParam = 0;
ccs.lParam = (LPARAM)⪯
- MSN_CallService(MS_PROTO_CHAINRECV, 0, (LPARAM)&ccs);
+ CallService(MS_PROTO_CHAINRECV, 0, (LPARAM)&ccs);
}
break;
@@ -2318,7 +2318,7 @@ void CMsnProto::p2p_invite(unsigned iAppID, filetransfer* ft, const char *wlid) int cbContextEnc = Netlib_GetBase64EncodedBufferSize((int)cbContext);
char* szContextEnc = (char*)alloca(cbContextEnc);
NETLIBBASE64 nlb = { szContextEnc, cbContextEnc, (PBYTE)pContext, (int)cbContext };
- MSN_CallService(MS_NETLIB_BASE64ENCODE, 0, LPARAM(&nlb));
+ CallService(MS_NETLIB_BASE64ENCODE, 0, LPARAM(&nlb));
MimeHeaders chdrs(10);
chdrs.addString("EUF-GUID", szAppID);
|