diff options
| author | George Hazan <ghazan@miranda.im> | 2020-07-23 14:15:06 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2020-07-23 14:15:06 +0300 |
| commit | bc8768c453fade64f20ff18c24092a41f94993a0 (patch) | |
| tree | 908a832615b7dab0ff09c70d1c70e39bf3ff247e /plugins/Variables/src/parse_miranda.cpp | |
| parent | db937fbda0117e8bec530e7deda7b94eea106e78 (diff) | |
fixes #2493 (Проблема с Юникодом в диалоге добавления контакта)
Diffstat (limited to 'plugins/Variables/src/parse_miranda.cpp')
| -rw-r--r-- | plugins/Variables/src/parse_miranda.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/plugins/Variables/src/parse_miranda.cpp b/plugins/Variables/src/parse_miranda.cpp index 0e733a79ce..660cac158d 100644 --- a/plugins/Variables/src/parse_miranda.cpp +++ b/plugins/Variables/src/parse_miranda.cpp @@ -344,14 +344,14 @@ static wchar_t* parseProtoInfo(ARGUMENTSINFO *ai) return nullptr;
const char *szRes = nullptr;
- wchar_t *tszRes = nullptr;
+ wchar_t *wszRes = nullptr;
ptrA szProto(mir_u2a(ai->argv.w[1]));
if (!mir_wstrcmp(ai->argv.w[2], _A2W(STR_PINAME)))
- tszRes = Hlp_GetProtocolName(szProto);
+ wszRes = Hlp_GetProtocolName(szProto);
else if (!mir_wstrcmp(ai->argv.w[2], _A2W(STR_PIUIDTEXT))) {
- szRes = (const char *)CallProtoService(szProto, PS_GETCAPS, (WPARAM)PFLAG_UNIQUEIDTEXT, 0);
- if (INT_PTR(szRes) == CALLSERVICE_NOTFOUND || szRes == nullptr)
+ wszRes = (wchar_t *)CallProtoService(szProto, PS_GETCAPS, PFLAG_UNIQUEIDTEXT, 0);
+ if (INT_PTR(wszRes) == CALLSERVICE_NOTFOUND || wszRes == nullptr)
return nullptr;
}
else if (!mir_wstrcmp(ai->argv.w[2], _A2W(STR_PIUIDSETTING))) {
@@ -360,15 +360,15 @@ static wchar_t* parseProtoInfo(ARGUMENTSINFO *ai) return nullptr;
}
else if (!mir_wstrcmp(ai->argv.w[2], _A2W(STR_PINICK)))
- tszRes = Contact_GetInfo(CNF_DISPLAY, NULL, szProto);
+ wszRes = Contact_GetInfo(CNF_DISPLAY, NULL, szProto);
- if (szRes == nullptr && tszRes == nullptr)
+ if (szRes == nullptr && wszRes == nullptr)
return nullptr;
- if (szRes != nullptr && tszRes == nullptr)
- tszRes = mir_a2u(szRes);
+ if (szRes != nullptr && wszRes == nullptr)
+ wszRes = mir_a2u(szRes);
- return tszRes;
+ return wszRes;
}
static wchar_t* parseSpecialContact(ARGUMENTSINFO *ai)
|