From 1fb1cf50e18482006dd86f2a1a47d6be2272de61 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 17 Sep 2024 14:28:39 +0300 Subject: =?UTF-8?q?fixes=20#4679=20(NewStory:=20=D0=BA=D0=BD=D0=BE=D0=BF?= =?UTF-8?q?=D0=BA=D0=B0=20"=D0=A6=D0=B8=D1=82=D0=B0=D1=82=D0=B0"=20=D0=BF?= =?UTF-8?q?=D0=BB=D0=B0=D0=B3=D0=B8=D0=BD=D0=B0=20=D1=81=D0=BE=D0=BE=D0=B1?= =?UTF-8?q?=D1=89=D0=B5=D0=BD=D0=B8=D0=B9=20=D1=86=D0=B8=D1=82=D0=B8=D1=80?= =?UTF-8?q?=D1=83=D0=B5=D1=82=20=D0=BD=D0=B5=20=D0=B2=D1=8B=D0=B1=D1=80?= =?UTF-8?q?=D0=B0=D0=BD=D0=BD=D0=BE=D0=B5=20=D1=81=D0=BE=D0=B1=D1=8B=D1=82?= =?UTF-8?q?=D0=B8=D0=B5,=20=D0=B0=20=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=D0=B4?= =?UTF-8?q?=D0=BD=D0=B5=D0=B5)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/m_srmm_int.h | 6 +++--- libs/win32/mir_app.lib | Bin 299036 -> 299050 bytes libs/win64/mir_app.lib | Bin 299058 -> 299072 bytes plugins/IEView/src/ieview_logger.cpp | 2 +- plugins/NewStory/src/history_log.cpp | 4 ++-- plugins/Scriver/src/msgdialog.cpp | 2 +- plugins/TabSRMM/src/msgdialog.cpp | 2 +- src/mir_app/src/mir_app.def | 2 +- src/mir_app/src/mir_app64.def | 2 +- src/mir_app/src/srmm_log_hpp.cpp | 2 +- src/mir_app/src/srmm_log_rtf.cpp | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/m_srmm_int.h b/include/m_srmm_int.h index b33980c301..31f5b38ec0 100644 --- a/include/m_srmm_int.h +++ b/include/m_srmm_int.h @@ -133,14 +133,14 @@ public: virtual void Clear() = 0; virtual int GetType() = 0; virtual HWND GetHwnd() = 0; - virtual wchar_t* GetSelection() = 0; + virtual wchar_t* GetSelectedText() = 0; virtual void LogEvents(MEVENT hDbEventFirst, int count, bool bAppend) = 0; virtual void LogChatEvents(const LOGINFO *lin) = 0; virtual void Resize() = 0; virtual void ScrollToBottom() = 0; virtual void UpdateOptions() {}; - virtual INT_PTR Notify(WPARAM, LPARAM) { return 0; } + virtual INT_PTR Notify(WPARAM, LPARAM) { return 0; } __forceinline CMsgDialog& GetDialog() const { return m_pDlg; @@ -260,7 +260,7 @@ public: bool AtBottom() override; void Clear() override; HWND GetHwnd() override; - wchar_t* GetSelection() override; + wchar_t* GetSelectedText() override; int GetType() override; void Resize() override; void ScrollToBottom() override; diff --git a/libs/win32/mir_app.lib b/libs/win32/mir_app.lib index fc7ac5fc2a..79cb0fda50 100644 Binary files a/libs/win32/mir_app.lib and b/libs/win32/mir_app.lib differ diff --git a/libs/win64/mir_app.lib b/libs/win64/mir_app.lib index 3fd991676e..d6e30a429e 100644 Binary files a/libs/win64/mir_app.lib and b/libs/win64/mir_app.lib differ diff --git a/plugins/IEView/src/ieview_logger.cpp b/plugins/IEView/src/ieview_logger.cpp index 20391f34a3..e70eac0b20 100644 --- a/plugins/IEView/src/ieview_logger.cpp +++ b/plugins/IEView/src/ieview_logger.cpp @@ -78,7 +78,7 @@ public: return m_hwnd; } - wchar_t* GetSelection() override + wchar_t* GetSelectedText() override { auto *view = IEView::get(m_hwnd); return (view != nullptr) ? view->selection() : nullptr; diff --git a/plugins/NewStory/src/history_log.cpp b/plugins/NewStory/src/history_log.cpp index 1cd971f388..7f1b35bb9b 100644 --- a/plugins/NewStory/src/history_log.cpp +++ b/plugins/NewStory/src/history_log.cpp @@ -63,9 +63,9 @@ public: return m_hwnd; } - wchar_t *GetSelection() override + wchar_t* GetSelectedText() override { - return nullptr; + return m_histCtrl->GatherSelected(true).Detach(); } int GetType() override diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp index 69783ba143..ff8c9b9a98 100644 --- a/plugins/Scriver/src/msgdialog.cpp +++ b/plugins/Scriver/src/msgdialog.cpp @@ -371,7 +371,7 @@ void CMsgDialog::onClick_Quote(CCtrlButton*) if (!hDbEventLast) return; - wchar_t *buffer = m_pLog->GetSelection(); + wchar_t *buffer = m_pLog->GetSelectedText(); if (buffer != nullptr) { SetMessageText(Srmm_Quote(buffer)); mir_free(buffer); diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp index 8cd71399bb..d9fd2c3804 100644 --- a/plugins/TabSRMM/src/msgdialog.cpp +++ b/plugins/TabSRMM/src/msgdialog.cpp @@ -904,7 +904,7 @@ void CMsgDialog::onClick_Quote(CCtrlButton*) CMStringW szQuoted; int iOutputWidth = M.GetDword("quoteLineLength", 64); - wchar_t *selected = m_pLog->GetSelection(); + wchar_t *selected = m_pLog->GetSelectedText(); if (selected != nullptr) szQuoted = Srmm_Quote(selected, iOutputWidth); else { diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def index f6235f268c..893a2882d6 100644 --- a/src/mir_app/src/mir_app.def +++ b/src/mir_app/src/mir_app.def @@ -664,7 +664,7 @@ UnregisterHppLogger @786 ?Clear@CRtfLogWindow@@UAEXXZ @795 NONAME ?Detach@CRtfLogWindow@@UAEXXZ @796 NONAME ?GetHwnd@CRtfLogWindow@@UAEPAUHWND__@@XZ @797 NONAME -?GetSelection@CRtfLogWindow@@UAEPA_WXZ @798 NONAME +?GetSelectedText@CRtfLogWindow@@UAEPA_WXZ @798 NONAME ?Notify@CRtfLogWindow@@UAEHIJ@Z @799 NONAME ?Notify@CSrmmLogWindow@@UAEHIJ@Z @800 NONAME ?Resize@CRtfLogWindow@@UAEXXZ @801 NONAME diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def index a09d88051d..cdb622cf2a 100644 --- a/src/mir_app/src/mir_app64.def +++ b/src/mir_app/src/mir_app64.def @@ -664,7 +664,7 @@ UnregisterHppLogger @786 ?Clear@CRtfLogWindow@@UEAAXXZ @795 NONAME ?Detach@CRtfLogWindow@@UEAAXXZ @796 NONAME ?GetHwnd@CRtfLogWindow@@UEAAPEAUHWND__@@XZ @797 NONAME -?GetSelection@CRtfLogWindow@@UEAAPEA_WXZ @798 NONAME +?GetSelectedText@CRtfLogWindow@@UEAAPEA_WXZ @798 NONAME ?Notify@CRtfLogWindow@@UEAA_J_K_J@Z @799 NONAME ?Notify@CSrmmLogWindow@@UEAA_J_K_J@Z @800 NONAME ?Resize@CRtfLogWindow@@UEAAXXZ @801 NONAME diff --git a/src/mir_app/src/srmm_log_hpp.cpp b/src/mir_app/src/srmm_log_hpp.cpp index 6ed8df33d5..8ba597d173 100644 --- a/src/mir_app/src/srmm_log_hpp.cpp +++ b/src/mir_app/src/srmm_log_hpp.cpp @@ -85,7 +85,7 @@ public: return 2; } - wchar_t* GetSelection() override + wchar_t* GetSelectedText() override { IEVIEWEVENT event = {}; event.hwnd = m_hwnd; diff --git a/src/mir_app/src/srmm_log_rtf.cpp b/src/mir_app/src/srmm_log_rtf.cpp index 0531b3e445..96ebee13ab 100644 --- a/src/mir_app/src/srmm_log_rtf.cpp +++ b/src/mir_app/src/srmm_log_rtf.cpp @@ -138,7 +138,7 @@ static DWORD CALLBACK StreamOutCallback(DWORD_PTR dwCookie, LPBYTE pbBuff, LONG return 0; } -wchar_t* CRtfLogWindow::GetSelection() +wchar_t* CRtfLogWindow::GetSelectedText() { CHARRANGE sel; SendMessage(m_rtf.GetHwnd(), EM_EXGETSEL, 0, (LPARAM)&sel); -- cgit v1.2.3