From 48e20e975ee04e6e84cf920d590c94f82306527e Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 7 Jan 2024 13:08:54 +0300 Subject: =?UTF-8?q?fixes=20#4103=20(DbChecker=20=D0=BD=D0=B5=20=D1=80?= =?UTF-8?q?=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=D0=B5=D1=82=20=D0=B2=20=D1=81?= =?UTF-8?q?=D0=B5=D1=80=D0=B2=D0=B8=D1=81=D0=BD=D0=BE=D0=BC=20=D1=80=D0=B5?= =?UTF-8?q?=D0=B6=D0=B8=D0=BC=D0=B5)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mir_core/src/Windows/miranda.cpp | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/mir_core/src/Windows/miranda.cpp b/src/mir_core/src/Windows/miranda.cpp index 5649a69e4c..caae854b7a 100644 --- a/src/mir_core/src/Windows/miranda.cpp +++ b/src/mir_core/src/Windows/miranda.cpp @@ -390,17 +390,27 @@ MIR_CORE_DLL(void) LeaveMessageLoop() ///////////////////////////////////////////////////////////////////////////////////////// // entry point +HMODULE hMsfteditDll = nullptr; + BOOL WINAPI DllMain(HINSTANCE hinstDLL, uint32_t fdwReason, LPVOID) { - if (fdwReason == DLL_PROCESS_ATTACH) { + switch (fdwReason) { + case DLL_PROCESS_ATTACH: g_hInst = hinstDLL; + hMsfteditDll = LoadLibrary(L"msftedit.dll"); mir_tls = TlsAlloc(); LoadCoreModule(); - } - else if (fdwReason == DLL_THREAD_DETACH) { + break; + + case DLL_PROCESS_DETACH: + FreeLibrary(hMsfteditDll); + break; + + case DLL_THREAD_DETACH: HANDLE hEvent = TlsGetValue(mir_tls); if (hEvent) CloseHandle(hEvent); + break; } return TRUE; } -- cgit v1.2.3