diff options
Diffstat (limited to 'src/modules/protocols')
| -rw-r--r-- | src/modules/protocols/protoaccs.cpp | 14 | ||||
| -rw-r--r-- | src/modules/protocols/protocols.cpp | 18 | ||||
| -rw-r--r-- | src/modules/protocols/protoopts.cpp | 2 |
3 files changed, 17 insertions, 17 deletions
diff --git a/src/modules/protocols/protoaccs.cpp b/src/modules/protocols/protoaccs.cpp index 393fb3aae4..1977816cf3 100644 --- a/src/modules/protocols/protoaccs.cpp +++ b/src/modules/protocols/protoaccs.cpp @@ -308,7 +308,7 @@ static INT_PTR stub3(PROTO_INTERFACE* ppi, WPARAM wParam, LPARAM) static INT_PTR stub4(PROTO_INTERFACE* ppi, WPARAM wParam, LPARAM lParam)
{
- return (INT_PTR)ppi->AuthDeny((MEVENT)wParam, StrConvT((const char*)lParam));
+ return (INT_PTR)ppi->AuthDeny((MEVENT)wParam, _A2T((const char*)lParam));
}
static INT_PTR stub11(PROTO_INTERFACE* ppi, WPARAM wParam, LPARAM lParam)
@@ -329,19 +329,19 @@ static INT_PTR stub13(PROTO_INTERFACE* ppi, WPARAM wParam, LPARAM) static INT_PTR stub15(PROTO_INTERFACE* ppi, WPARAM, LPARAM lParam)
{
- return (INT_PTR)ppi->SearchBasic(StrConvT((char*)lParam));
+ return (INT_PTR)ppi->SearchBasic(_A2T((char*)lParam));
}
static INT_PTR stub16(PROTO_INTERFACE* ppi, WPARAM, LPARAM lParam)
{
- return (INT_PTR)ppi->SearchByEmail(StrConvT((char*)lParam));
+ return (INT_PTR)ppi->SearchByEmail(_A2T((char*)lParam));
}
static INT_PTR stub17(PROTO_INTERFACE* ppi, WPARAM, LPARAM lParam)
{
PROTOSEARCHBYNAME* psbn = (PROTOSEARCHBYNAME*)lParam;
- return (INT_PTR)ppi->SearchByName(StrConvT((char*)psbn->pszNick),
- StrConvT((char*)psbn->pszFirstName), StrConvT((char*)psbn->pszLastName));
+ return (INT_PTR)ppi->SearchByName(_A2T((char*)psbn->pszNick),
+ _A2T((char*)psbn->pszFirstName), _A2T((char*)psbn->pszLastName));
}
static INT_PTR stub18(PROTO_INTERFACE* ppi, WPARAM, LPARAM lParam)
@@ -368,7 +368,7 @@ static INT_PTR stub29(PROTO_INTERFACE* ppi, WPARAM wParam, LPARAM) static INT_PTR stub33(PROTO_INTERFACE* ppi, WPARAM wParam, LPARAM lParam)
{
- return (INT_PTR)ppi->SetAwayMsg(wParam, StrConvT((const char*)lParam));
+ return (INT_PTR)ppi->SetAwayMsg(wParam, _A2T((const char*)lParam));
}
static INT_PTR stub41(PROTO_INTERFACE* ppi, WPARAM wParam, LPARAM lParam)
@@ -418,7 +418,7 @@ static INT_PTR stub44(PROTO_INTERFACE* ppi, WPARAM wParam, LPARAM lParam) static INT_PTR stub45(PROTO_INTERFACE* ppi, WPARAM wParam, LPARAM lParam)
{
- return CallProtoServiceInt(NULL, ppi->m_szModuleName, PS_SETMYAVATARW, wParam, (LPARAM)(LPCTSTR)StrConvT((char*)lParam));
+ return CallProtoServiceInt(NULL, ppi->m_szModuleName, PS_SETMYAVATARW, wParam, (LPARAM)(LPCTSTR)_A2T((char*)lParam));
}
static HANDLE CreateProtoServiceEx(const char* szModule, const char* szService, MIRANDASERVICEOBJ pFunc, void* param)
diff --git a/src/modules/protocols/protocols.cpp b/src/modules/protocols/protocols.cpp index 688c2f5428..2a0c2b9b2a 100644 --- a/src/modules/protocols/protocols.cpp +++ b/src/modules/protocols/protocols.cpp @@ -387,21 +387,21 @@ INT_PTR CallProtoServiceInt(MCONTACT hContact, const char *szModule, const char case 3: return (INT_PTR)ppi->Authorize((MEVENT)wParam);
case 4:
if (ppi->m_iVersion > 1)
- return (INT_PTR)ppi->AuthDeny((MEVENT)wParam, StrConvT((char*)lParam));
+ return (INT_PTR)ppi->AuthDeny((MEVENT)wParam, _A2T((char*)lParam));
return (INT_PTR)ppi->AuthDeny((MEVENT)wParam, (PROTOCHAR*)lParam);
case 5: return (INT_PTR)ppi->AuthRecv(hContact, (PROTORECVEVENT*)lParam);
case 6:
if (ppi->m_iVersion > 1)
- return (INT_PTR)ppi->AuthRequest(hContact, StrConvT((char*)lParam));
+ return (INT_PTR)ppi->AuthRequest(hContact, _A2T((char*)lParam));
return (INT_PTR)ppi->AuthRequest(hContact, (PROTOCHAR*)lParam);
case 8:
if (ppi->m_iVersion > 1)
- return (INT_PTR)ppi->FileAllow(hContact, (HANDLE)wParam, StrConvT((char*)lParam));
+ return (INT_PTR)ppi->FileAllow(hContact, (HANDLE)wParam, _A2T((char*)lParam));
return (INT_PTR)ppi->FileAllow(hContact, (HANDLE)wParam, (PROTOCHAR*)lParam);
case 9: return (INT_PTR)ppi->FileCancel(hContact, (HANDLE)wParam);
case 10:
if (ppi->m_iVersion > 1)
- return (INT_PTR)ppi->FileDeny(hContact, (HANDLE)wParam, StrConvT((char*)lParam));
+ return (INT_PTR)ppi->FileDeny(hContact, (HANDLE)wParam, _A2T((char*)lParam));
return (INT_PTR)ppi->FileDeny(hContact, (HANDLE)wParam, (PROTOCHAR*)lParam);
case 11: {
PROTOFILERESUME* pfr = (PROTOFILERESUME*)lParam;
@@ -419,16 +419,16 @@ INT_PTR CallProtoServiceInt(MCONTACT hContact, const char *szModule, const char case 14: return (INT_PTR)ppi->GetInfo(hContact, wParam);
case 15:
if (ppi->m_iVersion > 1)
- return (INT_PTR)ppi->SearchBasic(StrConvT((char*)lParam));
+ return (INT_PTR)ppi->SearchBasic(_A2T((char*)lParam));
return (INT_PTR)ppi->SearchBasic((TCHAR*)lParam);
case 16:
if (ppi->m_iVersion > 1)
- return (INT_PTR)ppi->SearchByEmail(StrConvT((char*)lParam));
+ return (INT_PTR)ppi->SearchByEmail(_A2T((char*)lParam));
return (INT_PTR)ppi->SearchByEmail((TCHAR*)lParam);
case 17: {
PROTOSEARCHBYNAME* psbn = (PROTOSEARCHBYNAME*)lParam;
if (ppi->m_iVersion > 1)
- return (INT_PTR)ppi->SearchByName(StrConvT((char*)psbn->pszNick), StrConvT((char*)psbn->pszFirstName), StrConvT((char*)psbn->pszLastName));
+ return (INT_PTR)ppi->SearchByName(_A2T((char*)psbn->pszNick), _A2T((char*)psbn->pszFirstName), _A2T((char*)psbn->pszLastName));
else
return (INT_PTR)ppi->SearchByName(psbn->pszNick, psbn->pszFirstName, psbn->pszLastName);
}
@@ -442,7 +442,7 @@ INT_PTR CallProtoServiceInt(MCONTACT hContact, const char *szModule, const char case 25:
if (ppi->m_iVersion > 1) {
TCHAR** files = Proto_FilesMatrixU((char**)lParam);
- INT_PTR res = (INT_PTR)ppi->SendFile(hContact, StrConvT((char*)wParam), (TCHAR**)files);
+ INT_PTR res = (INT_PTR)ppi->SendFile(hContact, _A2T((char*)wParam), (TCHAR**)files);
if (res == 0) FreeFilesMatrix(&files);
return res;
}
@@ -456,7 +456,7 @@ INT_PTR CallProtoServiceInt(MCONTACT hContact, const char *szModule, const char case 31: return (INT_PTR)ppi->RecvAwayMsg(hContact, wParam, (PROTORECVEVENT*)lParam);
case 33:
if (ppi->m_iVersion > 1)
- return (INT_PTR)ppi->SetAwayMsg(wParam, StrConvT((char*)lParam));
+ return (INT_PTR)ppi->SetAwayMsg(wParam, _A2T((char*)lParam));
return (INT_PTR)ppi->SetAwayMsg(wParam, (TCHAR*)lParam);
case 34: return (INT_PTR)ppi->UserIsTyping(wParam, lParam);
case 35: mir_strncpy((char*)lParam, ppi->m_szModuleName, wParam); return 0;
diff --git a/src/modules/protocols/protoopts.cpp b/src/modules/protocols/protoopts.cpp index f5d6a7a04d..7e1c34b770 100644 --- a/src/modules/protocols/protoopts.cpp +++ b/src/modules/protocols/protoopts.cpp @@ -143,7 +143,7 @@ static bool OnCreateAccount(HWND hwndDlg) if (param->action == PRAC_UPGRADED) {
BOOL oldProto = pa->bOldProto;
TCHAR szPlugin[MAX_PATH];
- mir_sntprintf(szPlugin, SIZEOF(szPlugin), _T("%s.dll"), StrConvT(pa->szProtoName));
+ mir_sntprintf(szPlugin, SIZEOF(szPlugin), _T("%s.dll"), _A2T(pa->szProtoName));
int idx = accounts.getIndex(pa);
UnloadAccount(pa, false, false);
accounts.remove(idx);
|