From 9cca190bc3022311915eb1e95b3cc3bb89aed328 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 25 Jan 2020 14:24:53 +0300 Subject: massive code cleaning: - GCHOOK structure normalized (i.e. inlined SESSION_INFO fields replaced with a reference to SESSION_INFO); - fake CMsgDialog declaration added to m_srmm_int.h, thus duplicated declarations in plugins aren't needed anymore - other minor changes --- protocols/IRCG/src/scripting.cpp | 13 ------------- protocols/IRCG/src/services.cpp | 4 ++-- 2 files changed, 2 insertions(+), 15 deletions(-) (limited to 'protocols/IRCG/src') diff --git a/protocols/IRCG/src/scripting.cpp b/protocols/IRCG/src/scripting.cpp index 3926b6aefc..620072fa8e 100644 --- a/protocols/IRCG/src/scripting.cpp +++ b/protocols/IRCG/src/scripting.cpp @@ -59,8 +59,6 @@ static void __stdcall OnHook(void * pi) GCHOOK* gch = (GCHOOK*)pi; free(gch->ptszUID); free(gch->ptszText); - free((void*)gch->ptszID); - free((void*)gch->pszModule); delete gch; } @@ -88,17 +86,6 @@ INT_PTR __cdecl CIrcProto::Scripting_InsertGuiOut(WPARAM, LPARAM lParam) else gchook->ptszUID = nullptr; - if (gch->ptszID) { - CMStringW S = MakeWndID(gch->ptszID); - gchook->ptszID = wcsdup(S.c_str()); - } - else gchook->ptszID = nullptr; - - if (gch->pszModule) - gchook->pszModule = _strdup(gch->pszModule); - else - gchook->pszModule = nullptr; - mir_forkThread(GuiOutThread, gchook); return 0; } diff --git a/protocols/IRCG/src/services.cpp b/protocols/IRCG/src/services.cpp index acc55c5654..04a1ea6936 100644 --- a/protocols/IRCG/src/services.cpp +++ b/protocols/IRCG/src/services.cpp @@ -462,8 +462,8 @@ int __cdecl CIrcProto::GCEventHook(WPARAM, LPARAM lParam) // handle the hook if (gch) { - if (!mir_strcmpi(gch->pszModule, m_szModuleName)) { - wchar_t *p1 = mir_wstrdup(gch->ptszID); + if (!mir_strcmpi(gch->si->pszModule, m_szModuleName)) { + wchar_t *p1 = mir_wstrdup(gch->si->ptszID); wchar_t *p2 = wcsstr(p1, L" - "); if (p2) *p2 = 0; -- cgit v1.2.3