From d7e53c4d5a748d5ef8c934e90dc59ff23c667420 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 26 Dec 2021 15:13:30 +0300 Subject: WCHAR -> wchar_t --- plugins/CmdLine/src/mimcmd_handlers.cpp | 4 ++-- plugins/CmdLine/src/utils.cpp | 4 ++-- plugins/CmdLine/src/utils.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'plugins/CmdLine/src') diff --git a/plugins/CmdLine/src/mimcmd_handlers.cpp b/plugins/CmdLine/src/mimcmd_handlers.cpp index d4393eae43..d46e7b55b1 100644 --- a/plugins/CmdLine/src/mimcmd_handlers.cpp +++ b/plugins/CmdLine/src/mimcmd_handlers.cpp @@ -106,7 +106,7 @@ int ParseValueParam(wchar_t *param, void *&result) case 'w': { size_t len = mir_wstrlen(param); - result = (WCHAR *)malloc(len * sizeof(WCHAR)); + result = (wchar_t *)malloc(len * sizeof(wchar_t)); wcsncpy_s((wchar_t*)result, len, param + 1, _TRUNCATE); return VALUE_WIDE; } @@ -823,7 +823,7 @@ void HandleDatabaseCommand(PCommand command, TArgument *argv, int argc, PReply r break; case VALUE_WIDE: - db_set_ws(0, module, key, (WCHAR *)value); + db_set_ws(0, module, key, (wchar_t *)value); wrote = Translate("wide string"); break; diff --git a/plugins/CmdLine/src/utils.cpp b/plugins/CmdLine/src/utils.cpp index 86da417721..9dba308c9b 100644 --- a/plugins/CmdLine/src/utils.cpp +++ b/plugins/CmdLine/src/utils.cpp @@ -90,7 +90,7 @@ int GetStringFromDatabase(MCONTACT hContact, char *szModule, char *szSettingName return res; } -int GetStringFromDatabase(MCONTACT hContact, char *szModule, char *szSettingName, WCHAR *szError, WCHAR *szResult, size_t count) +int GetStringFromDatabase(MCONTACT hContact, char *szModule, char *szSettingName, wchar_t *szError, wchar_t *szResult, size_t count) { DBVARIANT dbv = { 0 }; int res = 1; @@ -129,7 +129,7 @@ int GetStringFromDatabase(char *szSettingName, char *szError, char *szResult, si return GetStringFromDatabase(0, MODULENAME, szSettingName, szError, szResult, size); } -int GetStringFromDatabase(char *szSettingName, WCHAR *szError, WCHAR *szResult, size_t count) +int GetStringFromDatabase(char *szSettingName, wchar_t *szError, wchar_t *szResult, size_t count) { return GetStringFromDatabase(0, MODULENAME, szSettingName, szError, szResult, count); } diff --git a/plugins/CmdLine/src/utils.h b/plugins/CmdLine/src/utils.h index f87c8e6a97..8b7b1258c7 100644 --- a/plugins/CmdLine/src/utils.h +++ b/plugins/CmdLine/src/utils.h @@ -39,9 +39,9 @@ void AnchorMoveWindow(HWND window, const WINDOWPOS *parentPos, int anchors); RECT AnchorCalcPos(HWND window, const RECT *rParent, const WINDOWPOS *parentPos, int anchors); int GetStringFromDatabase(MCONTACT hContact, char *szModule, char *szSettingName, char *szError, char *szResult, size_t size); -int GetStringFromDatabase(MCONTACT hContact, char *szModule, char *szSettingName, WCHAR *szError, WCHAR *szResult, size_t count); +int GetStringFromDatabase(MCONTACT hContact, char *szModule, char *szSettingName, wchar_t *szError, wchar_t *szResult, size_t count); int GetStringFromDatabase(char *szSettingName, char *szError, char *szResult, size_t size); -int GetStringFromDatabase(char *szSettingName, WCHAR *szError, WCHAR *szResult, size_t count); +int GetStringFromDatabase(char *szSettingName, wchar_t *szError, wchar_t *szResult, size_t count); wchar_t* GetContactName(MCONTACT hContact, char *szProto); wchar_t* GetContactID(MCONTACT hContact, char *szProto); -- cgit v1.2.3