summaryrefslogtreecommitdiff
path: root/plugins/MirOTR
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/MirOTR')
-rw-r--r--plugins/MirOTR/src/dialogs.cpp50
-rw-r--r--plugins/MirOTR/src/mirotrmenu.cpp4
-rw-r--r--plugins/MirOTR/src/options.cpp20
-rw-r--r--plugins/MirOTR/src/otr.cpp44
-rw-r--r--plugins/MirOTR/src/svcs_menu.cpp12
-rw-r--r--plugins/MirOTR/src/svcs_proto.cpp2
-rw-r--r--plugins/MirOTR/src/utils.cpp44
7 files changed, 88 insertions, 88 deletions
diff --git a/plugins/MirOTR/src/dialogs.cpp b/plugins/MirOTR/src/dialogs.cpp
index cc3ab94d61..98d0d5edef 100644
--- a/plugins/MirOTR/src/dialogs.cpp
+++ b/plugins/MirOTR/src/dialogs.cpp
@@ -40,11 +40,11 @@ static INT_PTR CALLBACK DlgSMPUpdateProc(HWND hwndDlg, UINT msg, WPARAM wParam,
smp_for_contact[context->app_data].responder = data->responder;
mir_free(data);
- wchar_t title[512], *proto = mir_a2t(GetContactProto(hContact));
+ wchar_t title[512], *proto = mir_a2u(GetContactProto(hContact));
const wchar_t *name = contact_get_nameT(hContact);
- mir_sntprintf(title, TranslateW(LANG_SMP_PROGRESS_TITLE), name, proto);
+ mir_snwprintf(title, TranslateW(LANG_SMP_PROGRESS_TITLE), name, proto);
SetWindowText(hwndDlg, title);
- mir_sntprintf(title, TranslateW(LANG_SMP_PROGRESS_DESC), name, proto);
+ mir_snwprintf(title, TranslateW(LANG_SMP_PROGRESS_DESC), name, proto);
mir_free(proto);
SetDlgItemText(hwndDlg, IDC_STC_SMP_HEADPRO, title);
SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)context);
@@ -183,15 +183,15 @@ static INT_PTR CALLBACK DlgSMPResponseProc(HWND hwndDlg, UINT msg, WPARAM wParam
smp_for_contact[context->app_data].oldlevel = data->oldlevel;
smp_for_contact[context->app_data].responder = data->responder;
- wchar_t buff[512], *proto = mir_a2t(GetContactProto(hContact));
- mir_sntprintf(buff, TranslateW(LANG_SMP_VERIFY_TITLE), contact_get_nameT(hContact), proto);
+ wchar_t buff[512], *proto = mir_a2u(GetContactProto(hContact));
+ mir_snwprintf(buff, TranslateW(LANG_SMP_VERIFY_TITLE), contact_get_nameT(hContact), proto);
mir_free(proto);
SetWindowText(hwndDlg, buff);
SetDlgItemText(hwndDlg, IDC_STC_SMP_HEAD, buff);
SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)context);
if (data->question) {
- mir_sntprintf(buff, TranslateW(LANG_OTR_SMPQUESTION_RESPOND_DESC), contact_get_nameT(hContact));
+ mir_snwprintf(buff, TranslateW(LANG_OTR_SMPQUESTION_RESPOND_DESC), contact_get_nameT(hContact));
SetDlgItemText(hwndDlg, IDC_STC_SMP_INFO, buff);
@@ -211,7 +211,7 @@ static INT_PTR CALLBACK DlgSMPResponseProc(HWND hwndDlg, UINT msg, WPARAM wParam
mir_free(data->question);
}
else {
- mir_sntprintf(buff, TranslateW(LANG_OTR_SMPPASSWORD_RESPOND_DESC), contact_get_nameT(hContact));
+ mir_snwprintf(buff, TranslateW(LANG_OTR_SMPPASSWORD_RESPOND_DESC), contact_get_nameT(hContact));
SetDlgItemText(hwndDlg, IDC_STC_SMP_INFO, buff);
@@ -303,7 +303,7 @@ void SMPInitResponseDialog(ConnContext *context, const wchar_t *question) {
data->context = context;
data->oldlevel = TRUST_NOT_PRIVATE;
data->responder = true;
- data->question = (question) ? mir_tstrdup(question) : NULL;
+ data->question = (question) ? mir_wstrdup(question) : NULL;
CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_SMP_INPUT), 0, DlgSMPResponseProc, (LPARAM) data);
}
*/
@@ -326,8 +326,8 @@ static INT_PTR CALLBACK DlgProcSMPInitProc(HWND hwndDlg, UINT msg, WPARAM wParam
}
MCONTACT hContact = (UINT_PTR)context->app_data;
- wchar_t title[512], *proto = mir_a2t(GetContactProto(hContact));
- mir_sntprintf(title, TranslateW(LANG_SMP_VERIFY_TITLE), contact_get_nameT(hContact), proto);
+ wchar_t title[512], *proto = mir_a2u(GetContactProto(hContact));
+ mir_snwprintf(title, TranslateW(LANG_SMP_VERIFY_TITLE), contact_get_nameT(hContact), proto);
mir_free(proto);
SetWindowText(hwndDlg, title);
SetDlgItemText(hwndDlg, IDC_STC_SMP_HEAD, title);
@@ -380,9 +380,9 @@ static INT_PTR CALLBACK DlgProcSMPInitProc(HWND hwndDlg, UINT msg, WPARAM wParam
}
wchar_t buff[1024];
if (!fp->trust || fp->trust[0] == '\0')
- mir_sntprintf(buff, TranslateW(LANG_OTR_SMPQUESTION_VERIFY_DESC), contact_get_nameT(hContact));
+ mir_snwprintf(buff, TranslateW(LANG_OTR_SMPQUESTION_VERIFY_DESC), contact_get_nameT(hContact));
else
- mir_sntprintf(buff, TranslateW(LANG_OTR_SMPQUESTION_VERIFIED_DESC), contact_get_nameT(hContact));
+ mir_snwprintf(buff, TranslateW(LANG_OTR_SMPQUESTION_VERIFIED_DESC), contact_get_nameT(hContact));
SetDlgItemText(hwndDlg, IDC_STC_SMP_INFO, buff);
@@ -418,7 +418,7 @@ static INT_PTR CALLBACK DlgProcSMPInitProc(HWND hwndDlg, UINT msg, WPARAM wParam
GetDlgItemText(hwndDlg, IDC_CBO_SMP_CHOOSE, szMsg, _countof(szMsg));
if (wcsncmp(szMsg, TranslateW(LANG_SMPTYPE_QUESTION), _countof(szMsg)) == 0) {
if (smp_for_contact.find(context->app_data) != smp_for_contact.end()) {
- mir_sntprintf(szMsg, TranslateW(LANG_SMP_IN_PROGRESS), contact_get_nameT(hContact));
+ mir_snwprintf(szMsg, TranslateW(LANG_SMP_IN_PROGRESS), contact_get_nameT(hContact));
ShowError(szMsg);
}
else {
@@ -441,7 +441,7 @@ static INT_PTR CALLBACK DlgProcSMPInitProc(HWND hwndDlg, UINT msg, WPARAM wParam
}
else if (wcsncmp(szMsg, TranslateW(LANG_SMPTYPE_PASSWORD), _countof(szMsg)) == 0) {
if (smp_for_contact.find(context->app_data) != smp_for_contact.end()) {
- mir_sntprintf(szMsg, TranslateW(LANG_SMP_IN_PROGRESS), contact_get_nameT(hContact));
+ mir_snwprintf(szMsg, TranslateW(LANG_SMP_IN_PROGRESS), contact_get_nameT(hContact));
ShowError(szMsg);
}
else {
@@ -489,9 +489,9 @@ static INT_PTR CALLBACK DlgProcSMPInitProc(HWND hwndDlg, UINT msg, WPARAM wParam
GetDlgItemText(hwndDlg, IDC_CBO_SMP_CHOOSE, buff, 255);
if (wcsncmp(buff, TranslateW(LANG_SMPTYPE_QUESTION), 255) == 0) {
if (trusted)
- mir_sntprintf(buff, TranslateW(LANG_OTR_SMPQUESTION_VERIFIED_DESC), contact_get_nameT(hContact));
+ mir_snwprintf(buff, TranslateW(LANG_OTR_SMPQUESTION_VERIFIED_DESC), contact_get_nameT(hContact));
else
- mir_sntprintf(buff, TranslateW(LANG_OTR_SMPQUESTION_VERIFY_DESC), contact_get_nameT(hContact));
+ mir_snwprintf(buff, TranslateW(LANG_OTR_SMPQUESTION_VERIFY_DESC), contact_get_nameT(hContact));
SetDlgItemText(hwndDlg, IDC_STC_SMP_INFO, buff);
@@ -510,9 +510,9 @@ static INT_PTR CALLBACK DlgProcSMPInitProc(HWND hwndDlg, UINT msg, WPARAM wParam
}
else if (wcsncmp(buff, TranslateW(LANG_SMPTYPE_PASSWORD), 255) == 0) {
if (trusted)
- mir_sntprintf(buff, TranslateW(LANG_OTR_SMPPASSWORD_VERIFIED_DESC), contact_get_nameT(hContact));
+ mir_snwprintf(buff, TranslateW(LANG_OTR_SMPPASSWORD_VERIFIED_DESC), contact_get_nameT(hContact));
else
- mir_sntprintf(buff, TranslateW(LANG_OTR_SMPPASSWORD_VERIFY_DESC), contact_get_nameT(hContact));
+ mir_snwprintf(buff, TranslateW(LANG_OTR_SMPPASSWORD_VERIFY_DESC), contact_get_nameT(hContact));
SetDlgItemText(hwndDlg, IDC_STC_SMP_INFO, buff);
@@ -531,9 +531,9 @@ static INT_PTR CALLBACK DlgProcSMPInitProc(HWND hwndDlg, UINT msg, WPARAM wParam
}
else if (wcsncmp(buff, TranslateW(LANG_SMPTYPE_FINGERPRINT), 255) == 0) {
if (trusted)
- mir_sntprintf(buff, TranslateW(LANG_OTR_FPVERIFIED_DESC), contact_get_nameT(hContact));
+ mir_snwprintf(buff, TranslateW(LANG_OTR_FPVERIFIED_DESC), contact_get_nameT(hContact));
else
- mir_sntprintf(buff, TranslateW(LANG_OTR_FPVERIFY_DESC), contact_get_nameT(hContact));
+ mir_snwprintf(buff, TranslateW(LANG_OTR_FPVERIFY_DESC), contact_get_nameT(hContact));
SetDlgItemText(hwndDlg, IDC_STC_SMP_INFO, buff);
@@ -608,7 +608,7 @@ void SMPDialogReply(ConnContext *context, const char* question)
data->context = context;
data->oldlevel = TRUST_NOT_PRIVATE;
data->responder = true;
- data->question = (question) ? mir_utf8decodeT(question) : NULL;
+ data->question = (question) ? mir_utf8decodeW(question) : NULL;
CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_SMP_INPUT), 0, DlgSMPResponseProc, (LPARAM)data);
/*
ShowError(L"SMP requires user password (NOT IMPL YET)");
@@ -671,9 +671,9 @@ static INT_PTR CALLBACK DlgBoxProcVerifyContext(HWND hwndDlg, UINT msg, WPARAM w
}
wchar_t buff[512];
if (!fp->trust || fp->trust[0] == '\0')
- mir_sntprintf(buff, TranslateW(LANG_OTR_FPVERIFY_DESC), contact_get_nameT(hContact));
+ mir_snwprintf(buff, TranslateW(LANG_OTR_FPVERIFY_DESC), contact_get_nameT(hContact));
else
- mir_sntprintf(buff, TranslateW(LANG_OTR_FPVERIFIED_DESC), contact_get_nameT(hContact));
+ mir_snwprintf(buff, TranslateW(LANG_OTR_FPVERIFIED_DESC), contact_get_nameT(hContact));
SetDlgItemText(hwndDlg, IDC_STC_SMP_INFO, buff);
@@ -735,7 +735,7 @@ static unsigned int CALLBACK verify_context_thread(void *param)
lib_cs_lock();
otrl_context_set_trust(context->active_fingerprint, "verified");
otrl_privkey_write_fingerprints(otr_user_state, _T2A(g_fingerprint_store_filename));
- mir_sntprintf(msg, TranslateW(LANG_FINGERPRINT_VERIFIED), contact_get_nameT(hContact));
+ mir_snwprintf(msg, TranslateW(LANG_FINGERPRINT_VERIFIED), contact_get_nameT(hContact));
ShowMessage(hContact, msg);
SetEncryptionStatus(hContact, otr_context_get_trust(context));
break;
@@ -744,7 +744,7 @@ static unsigned int CALLBACK verify_context_thread(void *param)
lib_cs_lock();
otrl_context_set_trust(context->active_fingerprint, NULL);
otrl_privkey_write_fingerprints(otr_user_state, _T2A(g_fingerprint_store_filename));
- mir_sntprintf(msg, TranslateW(LANG_FINGERPRINT_NOT_VERIFIED), contact_get_nameT(hContact));
+ mir_snwprintf(msg, TranslateW(LANG_FINGERPRINT_NOT_VERIFIED), contact_get_nameT(hContact));
ShowMessage(hContact, msg);
SetEncryptionStatus(hContact, otr_context_get_trust(context));
break;
diff --git a/plugins/MirOTR/src/mirotrmenu.cpp b/plugins/MirOTR/src/mirotrmenu.cpp
index 23e7ecf35c..2629202ed3 100644
--- a/plugins/MirOTR/src/mirotrmenu.cpp
+++ b/plugins/MirOTR/src/mirotrmenu.cpp
@@ -68,12 +68,12 @@ INT_PTR MirOTRMenuCheckService(WPARAM wParam, LPARAM)
switch (level) {
case TRUST_PRIVATE:
- mir_sntprintf(text, L"%s [v%i]", TranslateW(LANG_STATUS_PRIVATE), context->protocol_version);
+ mir_snwprintf(text, L"%s [v%i]", TranslateW(LANG_STATUS_PRIVATE), context->protocol_version);
Menu_ModifyItem(hStatusInfoItem, text, IcoLib_GetIconHandle(ICON_PRIVATE));
break;
case TRUST_UNVERIFIED:
- mir_sntprintf(text, L"%s [v%i]", TranslateW(LANG_STATUS_UNVERIFIED), context->protocol_version);
+ mir_snwprintf(text, L"%s [v%i]", TranslateW(LANG_STATUS_UNVERIFIED), context->protocol_version);
Menu_ModifyItem(hStatusInfoItem, text, IcoLib_GetIconHandle(ICON_UNVERIFIED));
break;
diff --git a/plugins/MirOTR/src/options.cpp b/plugins/MirOTR/src/options.cpp
index a3a4d04ec0..861dec4677 100644
--- a/plugins/MirOTR/src/options.cpp
+++ b/plugins/MirOTR/src/options.cpp
@@ -21,9 +21,9 @@ void SetFilenames(const wchar_t *path)
return;
CreateDirectoryTreeT(path);
- mir_sntprintf(g_private_key_filename, L"%s\\" _A2W(PRIVATE_KEY_FILENAME), path);
- mir_sntprintf(g_fingerprint_store_filename, L"%s\\" _A2W(FINGERPRINT_STORE_FILENAME), path);
- mir_sntprintf(g_instag_filename, L"%s\\" _A2W(INSTAG_FILENAME), path);
+ mir_snwprintf(g_private_key_filename, L"%s\\" _A2W(PRIVATE_KEY_FILENAME), path);
+ mir_snwprintf(g_fingerprint_store_filename, L"%s\\" _A2W(FINGERPRINT_STORE_FILENAME), path);
+ mir_snwprintf(g_instag_filename, L"%s\\" _A2W(INSTAG_FILENAME), path);
}
int FoldersChanged(WPARAM, LPARAM)
@@ -161,7 +161,7 @@ static INT_PTR CALLBACK DlgProcMirOTROpts(HWND hwndDlg, UINT msg, WPARAM wParam,
CheckDlgButton(hwndDlg, IDC_CHK_ENDOFFLINE, options.end_offline ? BST_CHECKED : BST_UNCHECKED);
CheckDlgButton(hwndDlg, IDC_CHK_ENDCLOSE, options.end_window_close ? BST_CHECKED : BST_UNCHECKED);
- prefix = mir_utf8decodeT(options.prefix);
+ prefix = mir_utf8decodeW(options.prefix);
SetDlgItemText(hwndDlg, IDC_ED_PREFIX, prefix);
mir_free(prefix);
bInit = true;
@@ -238,10 +238,10 @@ static unsigned int CALLBACK regen_key_thread(void* param)
PROTOREGENKEYOPTIONS *opts = (PROTOREGENKEYOPTIONS *)param;
wchar_t buff[512];
- mir_sntprintf(buff, TranslateW(LANG_OTR_ASK_NEWKEY), opts->proto);
+ mir_snwprintf(buff, TranslateW(LANG_OTR_ASK_NEWKEY), opts->proto);
EnableWindow(opts->refresh, FALSE);
if (IDYES == MessageBox(opts->refresh, buff, TranslateT(LANG_OTR_INFO), MB_ICONQUESTION|MB_YESNO)) {
- char* proto = mir_t2a(opts->proto);
+ char* proto = mir_u2a(opts->proto);
otr_gui_create_privkey(0, proto, proto);
mir_free(proto);
SendMessage(opts->refresh, WMU_REFRESHPROTOLIST, 0, 0);
@@ -332,7 +332,7 @@ static INT_PTR CALLBACK DlgProcMirOTROptsProto(HWND hwndDlg, UINT msg, WPARAM wP
char fprint[45];
if (otrl_privkey_fingerprint(otr_user_state, fprint, pppDesc[i]->szModuleName, pppDesc[i]->szModuleName)) {
- wchar_t *temp = mir_a2t(fprint);
+ wchar_t *temp = mir_a2u(fprint);
ListView_SetItemText(lv, ilvItem, 2, temp);
mir_free(temp);
}
@@ -360,7 +360,7 @@ static INT_PTR CALLBACK DlgProcMirOTROptsProto(HWND hwndDlg, UINT msg, WPARAM wP
wchar_t buff_proto[128];
ListView_GetItemText(GetDlgItem(hwndDlg, IDC_LV_PROTO_PROTOS), sel, 0, buff_proto, _countof(buff_proto));
wchar_t buff[512];
- mir_sntprintf(buff, TranslateW(LANG_OTR_ASK_REMOVEKEY), buff_proto);
+ mir_snwprintf(buff, TranslateW(LANG_OTR_ASK_REMOVEKEY), buff_proto);
if (IDYES == MessageBox(hwndDlg, buff, TranslateT(LANG_OTR_INFO), MB_ICONQUESTION | MB_YESNO)) {
char *proto = GetProtoName(lv, sel);
if (proto == NULL)
@@ -745,7 +745,7 @@ static INT_PTR CALLBACK DlgProcMirOTROptsFinger(HWND hwndDlg, UINT msg, WPARAM w
wchar_t buff[1024], hash[45];
otrl_privkey_hash_to_humanT(hash, fp->fingerprint);
PROTOACCOUNT *pa = Proto_GetAccount(GetContactProto(hContact));
- mir_sntprintf(buff, TranslateW(LANG_FINGERPRINT_STILL_IN_USE), hash, contact_get_nameT(hContact), pa->tszAccountName);
+ mir_snwprintf(buff, TranslateW(LANG_FINGERPRINT_STILL_IN_USE), hash, contact_get_nameT(hContact), pa->tszAccountName);
ShowError(buff);
}
else {
@@ -775,7 +775,7 @@ static INT_PTR CALLBACK DlgProcMirOTROptsFinger(HWND hwndDlg, UINT msg, WPARAM w
wchar_t buff[1024], hash[45];
otrl_privkey_hash_to_humanT(hash, it->first->fingerprint);
PROTOACCOUNT *pa = Proto_GetAccount(GetContactProto(hContact));
- mir_sntprintf(buff, TranslateW(LANG_FINGERPRINT_NOT_DELETED), hash, contact_get_nameT(hContact), pa->tszAccountName);
+ mir_snwprintf(buff, TranslateW(LANG_FINGERPRINT_NOT_DELETED), hash, contact_get_nameT(hContact), pa->tszAccountName);
ShowError(buff);
}
else otrl_context_forget_fingerprint(it->first, 1);
diff --git a/plugins/MirOTR/src/otr.cpp b/plugins/MirOTR/src/otr.cpp
index da2af8a178..c521025ef2 100644
--- a/plugins/MirOTR/src/otr.cpp
+++ b/plugins/MirOTR/src/otr.cpp
@@ -57,8 +57,8 @@ INT_PTR CALLBACK GenKeyDlgBoxProc(HWND hWndDlg, UINT msg, WPARAM, LPARAM lParam)
TranslateDialogDefault(hWndDlg);
SetClassLongPtr(hWndDlg, GCLP_HICON, (LONG_PTR)IcoLib_GetIcon(ICON_OTR, 1));
wchar_t buff[256];
- wchar_t *proto = mir_a2t((char*)lParam);
- mir_sntprintf(buff, TranslateW(LANG_GENERATE_KEY), proto);
+ wchar_t *proto = mir_a2u((char*)lParam);
+ mir_snwprintf(buff, TranslateW(LANG_GENERATE_KEY), proto);
mir_free(proto);
SetDlgItemText(hWndDlg, IDC_GENERATE, buff);
GenKeyData *data = (GenKeyData *)mir_calloc(sizeof(GenKeyData));
@@ -177,20 +177,20 @@ extern "C" {
SetEncryptionStatus(hContact, trusted);
wchar_t buff[512];
if (trusted == TRUST_PRIVATE) {
- mir_sntprintf(buff, TranslateW(LANG_SESSION_START_OTR), contact_get_nameT(hContact));
+ mir_snwprintf(buff, TranslateW(LANG_SESSION_START_OTR), contact_get_nameT(hContact));
}
else if (trusted == TRUST_UNVERIFIED) {
if (options.autoshow_verify) SMPInitDialog(context); //VerifyContextDialog(context);
- mir_sntprintf(buff, TranslateW(LANG_SESSION_START_OTR_VERIFY), contact_get_nameT(hContact));
+ mir_snwprintf(buff, TranslateW(LANG_SESSION_START_OTR_VERIFY), contact_get_nameT(hContact));
}
else { // should never happen
- mir_sntprintf(buff, TranslateW(LANG_SESSION_NOT_STARTED_OTR), contact_get_nameT(hContact));
+ mir_snwprintf(buff, TranslateW(LANG_SESSION_NOT_STARTED_OTR), contact_get_nameT(hContact));
}
if (context->protocol_version < MIROTR_PROTO_LATEST){
- size_t remaining = mir_tstrlen(buff);
+ size_t remaining = mir_wstrlen(buff);
wchar_t *offset = buff + remaining;
remaining = _countof(buff) - remaining;
- mir_sntprintf(offset, remaining, TranslateT("\nusing older protocol version %i"), context->protocol_version);
+ mir_snwprintf(offset, remaining, TranslateT("\nusing older protocol version %i"), context->protocol_version);
}
ShowMessage(hContact, buff);
@@ -201,7 +201,7 @@ extern "C" {
MCONTACT hContact = (UINT_PTR)opdata;
DEBUGOUTA("OTR_GUI_GONE_INSECURE\n");
wchar_t buff[512];
- mir_sntprintf(buff, TranslateW(LANG_SESSION_TERMINATED_BY_OTR), contact_get_nameT(hContact));
+ mir_snwprintf(buff, TranslateW(LANG_SESSION_TERMINATED_BY_OTR), contact_get_nameT(hContact));
//MessageBox(0, buff, Translate("OTR Information"), MB_OK);
if (!Miranda_Terminated()) {
ShowMessage(hContact, buff);
@@ -221,27 +221,27 @@ extern "C" {
wchar_t buff[1024];
if (!is_reply) {
if (trusted == TRUST_PRIVATE) {
- mir_sntprintf(buff, TranslateW(LANG_SESSION_CONTINUE_OTR), contact_get_nameT(hContact));
+ mir_snwprintf(buff, TranslateW(LANG_SESSION_CONTINUE_OTR), contact_get_nameT(hContact));
}
else if (trusted == TRUST_UNVERIFIED) {
if (options.autoshow_verify) SMPInitDialog(context); //VerifyContextDialog(context);
- mir_sntprintf(buff, TranslateW(LANG_SESSION_CONTINUE_OTR_VERIFY), contact_get_nameT(hContact));
+ mir_snwprintf(buff, TranslateW(LANG_SESSION_CONTINUE_OTR_VERIFY), contact_get_nameT(hContact));
}
else { // should never happen
- mir_sntprintf(buff, TranslateW(LANG_SESSION_NOT_STARTED_OTR), contact_get_nameT(hContact));
+ mir_snwprintf(buff, TranslateW(LANG_SESSION_NOT_STARTED_OTR), contact_get_nameT(hContact));
}
// opdata is hContact
ShowMessage(hContact, buff);
}
else {
if (trusted == TRUST_PRIVATE) {
- mir_sntprintf(buff, TranslateW(LANG_SESSION_HAS_CONTINUE_OTR), contact_get_nameT(hContact));
+ mir_snwprintf(buff, TranslateW(LANG_SESSION_HAS_CONTINUE_OTR), contact_get_nameT(hContact));
}
else if (trusted == TRUST_UNVERIFIED) {
- mir_sntprintf(buff, TranslateW(LANG_SESSION_HAS_CONTINUE_OTR_VERIFY), contact_get_nameT(hContact));
+ mir_snwprintf(buff, TranslateW(LANG_SESSION_HAS_CONTINUE_OTR_VERIFY), contact_get_nameT(hContact));
}
else { // should never happen
- mir_sntprintf(buff, TranslateW(LANG_SESSION_NOT_STARTED_OTR), contact_get_nameT(hContact));
+ mir_snwprintf(buff, TranslateW(LANG_SESSION_NOT_STARTED_OTR), contact_get_nameT(hContact));
}
}
@@ -328,11 +328,11 @@ extern "C" {
break;
case OTRL_MSGEVENT_ENCRYPTION_REQUIRED:
msgfunc = ShowMessageInline;
- mir_tstrncpy(msg, TranslateT("Attempting to start a private conversation..."), _countof(msg));
+ mir_wstrncpy(msg, TranslateT("Attempting to start a private conversation..."), _countof(msg));
break;
case OTRL_MSGEVENT_ENCRYPTION_ERROR:
msgfunc = ShowMessageInline;
- mir_tstrncpy(msg, TranslateT("An error occurred when encrypting your message.\nThe message was not sent"), _countof(msg));
+ mir_wstrncpy(msg, TranslateT("An error occurred when encrypting your message.\nThe message was not sent"), _countof(msg));
break;
case OTRL_MSGEVENT_CONNECTION_ENDED:
msgfunc = ShowMessageInline;
@@ -346,14 +346,14 @@ extern "C" {
mir_snwprintf(msg, _countof(msg), TranslateT("Error setting up private conversation: %s"), TranslateT("Malformed message received"));
break;
default:{
- wchar_t* tmp = mir_utf8decodeT(gcry_strerror(err));
+ wchar_t* tmp = mir_utf8decodeW(gcry_strerror(err));
mir_snwprintf(msg, _countof(msg), TranslateT("Error setting up private conversation: %s"), tmp);
mir_free(tmp); }
}
break;
case OTRL_MSGEVENT_MSG_REFLECTED:
// title = TranslateT("OTR Error");
- mir_tstrncpy(msg, TranslateT("We are receiving our own OTR messages.\nYou are either trying to talk to yourself, or someone is reflecting your messages back at you"), _countof(msg));
+ mir_wstrncpy(msg, TranslateT("We are receiving our own OTR messages.\nYou are either trying to talk to yourself, or someone is reflecting your messages back at you"), _countof(msg));
break;
case OTRL_MSGEVENT_MSG_RESENT:
// title = TranslateT("Message resent");
@@ -373,14 +373,14 @@ extern "C" {
break;
case OTRL_MSGEVENT_RCVDMSG_GENERAL_ERR:{
// title = TranslateT("OTR Error");
- wchar_t* tmp = mir_utf8decodeT(message);
- mir_tstrncpy(msg, tmp, _countof(msg));
+ wchar_t* tmp = mir_utf8decodeW(message);
+ mir_wstrncpy(msg, tmp, _countof(msg));
mir_free(tmp);
break; }
case OTRL_MSGEVENT_RCVDMSG_UNENCRYPTED:{
// title = TranslateT("Received unencrypted message");
msgfunc = ShowMessageInline;
- wchar_t* tmp = mir_utf8decodeT(message);
+ wchar_t* tmp = mir_utf8decodeW(message);
mir_snwprintf(msg, _countof(msg), TranslateT("The following message received from '%s' was NOT encrypted:\n\n%s"), contact, tmp);
mir_free(tmp);
ProtoChainSend(hContact, PSS_MESSAGE, PREF_BYPASS_OTR, (LPARAM)message);
@@ -391,7 +391,7 @@ extern "C" {
break;
default:
// title = TranslateT("OTR Error");
- mir_tstrncpy(msg, TranslateT("unknown OTR message received, please report that to Miranda NG developers"), _countof(msg));
+ mir_wstrncpy(msg, TranslateT("unknown OTR message received, please report that to Miranda NG developers"), _countof(msg));
}
if (msg[0])
msgfunc(hContact, msg);
diff --git a/plugins/MirOTR/src/svcs_menu.cpp b/plugins/MirOTR/src/svcs_menu.cpp
index 8bd87e7dd0..c86d81ef4f 100644
--- a/plugins/MirOTR/src/svcs_menu.cpp
+++ b/plugins/MirOTR/src/svcs_menu.cpp
@@ -31,7 +31,7 @@ int StartOTR(MCONTACT hContact) {
LCID langid = Langpack_GetDefaultLocale();
if(langid != 0x0409/*US*/ && langid != 0x1009/*CA*/ && langid != 0x0809/*GB*/){ // non english
const wchar_t* translated=TranslateTS(MIROTR_PROTO_HELLO_MSG);
- if(mir_tstrcmp(MIROTR_PROTO_HELLO_MSG,translated)){
+ if(mir_wstrcmp(MIROTR_PROTO_HELLO_MSG,translated)){
*msgoff++ = '\n';
for(const wchar_t* c=nick; *c && msgoff<msgend; *msgoff++=*c++);
for(const wchar_t* c=translated; *c && msgoff<msgend; *msgoff++=*c++);
@@ -57,12 +57,12 @@ INT_PTR SVC_StartOTR(WPARAM hContact, LPARAM)
hContact = hSub;
if ( options.bHaveSecureIM && CallService("SecureIM/IsContactSecured", hContact, 0) != 0 ) {
- mir_sntprintf(buff, TranslateW(LANG_OTR_SECUREIM_STARTED), contact_get_nameT(hContact));
+ mir_snwprintf(buff, TranslateW(LANG_OTR_SECUREIM_STARTED), contact_get_nameT(hContact));
ShowError(buff);
return 0;
}
- mir_sntprintf(buff, TranslateW(LANG_SESSION_REQUEST_OTR), contact_get_nameT(hContact));
+ mir_snwprintf(buff, TranslateW(LANG_SESSION_REQUEST_OTR), contact_get_nameT(hContact));
ShowMessage(hContact, buff);
return StartOTR(hContact);
@@ -77,12 +77,12 @@ INT_PTR SVC_RefreshOTR(WPARAM hContact, LPARAM)
hContact = hSub;
if ( options.bHaveSecureIM && CallService("SecureIM/IsContactSecured", hContact, 0) != 0 ) {
- mir_sntprintf(buff, 512, TranslateW(LANG_OTR_SECUREIM_STARTED), contact_get_nameT(hContact));
+ mir_snwprintf(buff, 512, TranslateW(LANG_OTR_SECUREIM_STARTED), contact_get_nameT(hContact));
ShowError(buff);
return 0;
}
- mir_sntprintf(buff, TranslateW(LANG_SESSION_TRY_CONTINUE_OTR), contact_get_nameT(hContact));
+ mir_snwprintf(buff, TranslateW(LANG_SESSION_TRY_CONTINUE_OTR), contact_get_nameT(hContact));
ShowMessage(hContact, buff);
int res = StartOTR(hContact);
@@ -116,7 +116,7 @@ INT_PTR SVC_StopOTR(WPARAM hContact, LPARAM)
SetEncryptionStatus(hContact, TRUST_NOT_PRIVATE);
wchar_t buff[512];
- mir_sntprintf(buff, TranslateW(LANG_SESSION_TERMINATED_OTR), contact_get_nameT(hContact));
+ mir_snwprintf(buff, TranslateW(LANG_SESSION_TERMINATED_OTR), contact_get_nameT(hContact));
ShowMessage(hContact, buff);
return 0;
}
diff --git a/plugins/MirOTR/src/svcs_proto.cpp b/plugins/MirOTR/src/svcs_proto.cpp
index 375484f775..74934fbfd1 100644
--- a/plugins/MirOTR/src/svcs_proto.cpp
+++ b/plugins/MirOTR/src/svcs_proto.cpp
@@ -111,7 +111,7 @@ INT_PTR SVC_OTRRecvMessage(WPARAM wParam,LPARAM lParam)
if (tlv && !Miranda_Terminated()) {
/* Notify the user that the other side disconnected. */
wchar_t buff[256];
- mir_sntprintf(buff, TranslateW(LANG_SESSION_TERMINATED_BY_OTR), contact_get_nameT(ccs->hContact));
+ mir_snwprintf(buff, TranslateW(LANG_SESSION_TERMINATED_BY_OTR), contact_get_nameT(ccs->hContact));
SetEncryptionStatus(ccs->hContact, otr_context_get_trust(context)); // required since libotr 4!?
ShowMessage(ccs->hContact, buff);
}
diff --git a/plugins/MirOTR/src/utils.cpp b/plugins/MirOTR/src/utils.cpp
index e4fbc217ec..5b10c37451 100644
--- a/plugins/MirOTR/src/utils.cpp
+++ b/plugins/MirOTR/src/utils.cpp
@@ -93,11 +93,11 @@ void otrl_privkey_hash_to_humanT(wchar_t human[45], const unsigned char hash[20]
char* contact_get_id(MCONTACT hContact, bool bNameOnError)
{
- ptrT pszUniqueID(Contact_GetInfo(CNF_UNIQUEID, hContact));
+ ptrW pszUniqueID(Contact_GetInfo(CNF_UNIQUEID, hContact));
if (!pszUniqueID && bNameOnError)
- pszUniqueID = mir_tstrdup(pcli->pfnGetContactDisplayName(hContact, 0));
+ pszUniqueID = mir_wstrdup(pcli->pfnGetContactDisplayName(hContact, 0));
- return mir_t2a(pszUniqueID);
+ return mir_u2a(pszUniqueID);
}
__inline const wchar_t* contact_get_nameT(MCONTACT hContact) {
@@ -107,7 +107,7 @@ __inline const wchar_t* contact_get_nameT(MCONTACT hContact) {
wchar_t* ProtoGetNickname(const char* proto)
{
wchar_t *p = Contact_GetInfo(CNF_NICK, NULL, proto);
- return (p != NULL) ? p : mir_tstrdup(L"");
+ return (p != NULL) ? p : mir_wstrdup(L"");
}
void ShowPopup(const wchar_t* line1, const wchar_t* line2, int timeout, const MCONTACT hContact) {
@@ -115,12 +115,12 @@ void ShowPopup(const wchar_t* line1, const wchar_t* line2, int timeout, const MC
if ( !options.bHavePopups) {
wchar_t title[256];
- mir_sntprintf(title, L"%s Message", _A2W(MODULENAME));
+ mir_snwprintf(title, L"%s Message", _A2W(MODULENAME));
if(line1 && line2) {
- int size = int(mir_tstrlen(line1) + mir_tstrlen(line2) + 3);
+ int size = int(mir_wstrlen(line1) + mir_wstrlen(line2) + 3);
wchar_t *message = new wchar_t[size]; // newline and null terminator
- mir_sntprintf(message, size, L"%s\r\n%s", line1, line2);
+ mir_snwprintf(message, size, L"%s\r\n%s", line1, line2);
MessageBox( NULL, message, title, MB_OK | MB_ICONINFORMATION );
delete[] message;
} else if(line1) {
@@ -165,15 +165,15 @@ void ShowWarning(wchar_t *msg) {
if(disp == ED_POP && !options.bHavePopups) disp = ED_BAL;
if(disp == ED_BAL && !ServiceExists(MS_CLIST_SYSTRAY_NOTIFY)) disp = ED_MB;
- mir_sntprintf(buffer, L"%s Warning", _A2W(MODULENAME));
+ mir_snwprintf(buffer, L"%s Warning", _A2W(MODULENAME));
switch(disp) {
case ED_POP:
{
- int size = int(mir_tstrlen(msg) + 515);
+ int size = int(mir_wstrlen(msg) + 515);
wchar_t *message = new wchar_t[size]; // newline and null terminator
- mir_sntprintf(message, size, L"%s\r\n%s", buffer, msg);
+ mir_snwprintf(message, size, L"%s\r\n%s", buffer, msg);
PUShowMessageT(message, SM_WARNING);
delete[] message;
}
@@ -211,16 +211,16 @@ void ShowError(wchar_t *msg) {
if(disp == ED_POP && !options.bHavePopups) disp = ED_BAL;
if(disp == ED_BAL && !ServiceExists(MS_CLIST_SYSTRAY_NOTIFY)) disp = ED_MB;
- mir_sntprintf(buffer, L"%s Error", _A2W(MODULENAME));
+ mir_snwprintf(buffer, L"%s Error", _A2W(MODULENAME));
wchar_t *message;
switch(disp) {
case ED_POP:
{
- int size = int(mir_tstrlen(msg) + 515);
+ int size = int(mir_wstrlen(msg) + 515);
message = new wchar_t[size]; // newline and null terminator
- mir_sntprintf(message, size, L"%s\r\n%s", buffer, msg);
+ mir_snwprintf(message, size, L"%s\r\n%s", buffer, msg);
PUShowMessageT(message, SM_WARNING);
delete[] message;
}
@@ -249,27 +249,27 @@ void ShowError(wchar_t *msg) {
void ShowPopupUtf(const char* line1, const char* line2, int timeout, const MCONTACT hContact) {
- wchar_t* l1 = (line1) ? mir_utf8decodeT(line1) : NULL;
- wchar_t* l2 = (line2) ? mir_utf8decodeT(line2) : NULL;
+ wchar_t* l1 = (line1) ? mir_utf8decodeW(line1) : NULL;
+ wchar_t* l2 = (line2) ? mir_utf8decodeW(line2) : NULL;
ShowPopup(l1, l2, timeout, hContact);
if (l1) mir_free(l1);
if (l2) mir_free(l2);
}
void ShowWarningUtf(char* msg) {
- wchar_t* m = (msg) ? mir_utf8decodeT(msg) : NULL;
+ wchar_t* m = (msg) ? mir_utf8decodeW(msg) : NULL;
ShowWarning(m);
if (m) mir_free(m);
}
void ShowErrorUtf(char* msg) {
- wchar_t* m = (msg) ? mir_utf8decodeT(msg) : NULL;
+ wchar_t* m = (msg) ? mir_utf8decodeW(msg) : NULL;
ShowError(m);
if (m) mir_free(m);
}
void ShowMessageInline(const MCONTACT hContact, const wchar_t *msg) {
wchar_t buff[1024];
- mir_sntprintf(buff, L"%s%s", _A2W(LANG_INLINE_PREFIX), msg);
+ mir_snwprintf(buff, L"%s%s", _A2W(LANG_INLINE_PREFIX), msg);
T2Utf utf(buff);
PROTORECVEVENT pre = {0};
@@ -321,13 +321,13 @@ const wchar_t *policy_to_string(OtrlPolicy policy) {
}
OtrlPolicy policy_from_string(const wchar_t *polstring) {
- if (mir_tstrcmp(polstring, TranslateW(LANG_POLICY_NEVER)) == 0)
+ if (mir_wstrcmp(polstring, TranslateW(LANG_POLICY_NEVER)) == 0)
return OTRL_POLICY_NEVER;
- else if (mir_tstrcmp(polstring, TranslateW(LANG_POLICY_OPP)) == 0)
+ else if (mir_wstrcmp(polstring, TranslateW(LANG_POLICY_OPP)) == 0)
return OTRL_POLICY_OPPORTUNISTIC;
- else if (mir_tstrcmp(polstring, TranslateW(LANG_POLICY_MANUAL)) == 0)
+ else if (mir_wstrcmp(polstring, TranslateW(LANG_POLICY_MANUAL)) == 0)
return OTRL_POLICY_MANUAL_MOD;
- else if (mir_tstrcmp(polstring, TranslateW(LANG_POLICY_ALWAYS)) == 0)
+ else if (mir_wstrcmp(polstring, TranslateW(LANG_POLICY_ALWAYS)) == 0)
return OTRL_POLICY_ALWAYS;
else
return CONTACT_DEFAULT_POLICY;
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 03:16:29 +0000