From 6b11c1df57c7e293df98fb4af0f8a7ed05cb850a Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 10 Nov 2023 16:31:37 +0300 Subject: =?UTF-8?q?fixes=20#3906=20(UInfoEx:=20=D0=BD=D0=B5=20=D0=BF=D0=B5?= =?UTF-8?q?=D1=80=D0=B5=D0=B2=D0=BE=D0=B4=D1=8F=D1=82=D1=81=D1=8F=20=D0=B8?= =?UTF-8?q?=D0=BD=D1=82=D0=B5=D1=80=D0=B5=D1=81=D1=8B=20=D0=B2=20=D0=BF?= =?UTF-8?q?=D1=80=D0=BE=D1=84=D0=B8=D0=BB=D0=B5=20=D0=BA=D0=BE=D0=BD=D1=82?= =?UTF-8?q?=D0=B0=D0=BA=D1=82=D0=B0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mir_app/src/button.cpp | 2 +- src/mir_core/src/Windows/langpack.cpp | 12 ------------ src/mir_core/src/mir_core.def | 1 - src/mir_core/src/mir_core64.def | 1 - 4 files changed, 1 insertion(+), 15 deletions(-) (limited to 'src') diff --git a/src/mir_app/src/button.cpp b/src/mir_app/src/button.cpp index b97685716e..14bb5bb04f 100644 --- a/src/mir_app/src/button.cpp +++ b/src/mir_app/src/button.cpp @@ -467,7 +467,7 @@ static LRESULT CALLBACK MButtonWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR if (lParam & BATF_UNICODE) ti.lpszText = mir_wstrdup(TranslateW((wchar_t*)wParam)); else - ti.lpszText = Langpack_PcharToTchar((char*)wParam); + ti.lpszText = mir_wstrdup(TranslateW(_A2T((char*)wParam))); SendMessage(bct->hwndToolTips, TTM_ADDTOOL, 0, (LPARAM)&ti); SendMessage(bct->hwndToolTips, TTM_SETMAXTIPWIDTH, 0, 300); mir_free(ti.lpszText); diff --git a/src/mir_core/src/Windows/langpack.cpp b/src/mir_core/src/Windows/langpack.cpp index 9a9a96fde8..412020ac44 100644 --- a/src/mir_core/src/Windows/langpack.cpp +++ b/src/mir_core/src/Windows/langpack.cpp @@ -520,18 +520,6 @@ MIR_CORE_DLL(int) Langpack_GetDefaultLocale() return (langPack.Locale == 0) ? LOCALE_USER_DEFAULT : langPack.Locale; } -MIR_CORE_DLL(wchar_t*) Langpack_PcharToTchar(const char *pszStr) -{ - if (pszStr == nullptr) - return nullptr; - - int len = (int)strlen(pszStr); - wchar_t *result = (wchar_t*)alloca((len + 1)*sizeof(wchar_t)); - MultiByteToWideChar(Langpack_GetDefaultCodePage(), 0, pszStr, -1, result, len); - result[len] = 0; - return mir_wstrdup(TranslateW_LP(result)); -} - ///////////////////////////////////////////////////////////////////////////////////////// MIR_CORE_DLL(char*) TranslateA_LP(const char *str, HPLUGIN pPlugin) diff --git a/src/mir_core/src/mir_core.def b/src/mir_core/src/mir_core.def index 062c0d01f0..c26da39e57 100644 --- a/src/mir_core/src/mir_core.def +++ b/src/mir_core/src/mir_core.def @@ -35,7 +35,6 @@ KillObjectServices @31 KillObjectThreads @32 Langpack_GetDefaultCodePage @34 Langpack_GetDefaultLocale @35 -Langpack_PcharToTchar @36 List_Copy @37 List_Create @38 List_Destroy @39 diff --git a/src/mir_core/src/mir_core64.def b/src/mir_core/src/mir_core64.def index 7e99275966..267d2af5c9 100644 --- a/src/mir_core/src/mir_core64.def +++ b/src/mir_core/src/mir_core64.def @@ -35,7 +35,6 @@ KillObjectServices @31 KillObjectThreads @32 Langpack_GetDefaultCodePage @34 Langpack_GetDefaultLocale @35 -Langpack_PcharToTchar @36 List_Copy @37 List_Create @38 List_Destroy @39 -- cgit v1.2.3