From 33fcc371716d9cf61f5396eaaa1a31fbbd2cbbe8 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sun, 10 Mar 2024 14:39:18 +0300
Subject: NewStory: no need to store hEvent twice, since there's one inside
 DB::EventInfo

---
 src/mir_app/src/db_events.cpp | 16 +++++++++++-----
 src/mir_app/src/mir_app.def   |  5 ++++-
 src/mir_app/src/mir_app64.def |  5 ++++-
 3 files changed, 19 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/mir_app/src/db_events.cpp b/src/mir_app/src/db_events.cpp
index 3b44ee5280..901b48709c 100644
--- a/src/mir_app/src/db_events.cpp
+++ b/src/mir_app/src/db_events.cpp
@@ -250,11 +250,11 @@ MIR_APP_DLL(HICON) DbEvent_GetIcon(DBEVENTINFO *dbei, int flags)
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
-DB::EventInfo::EventInfo(MEVENT hEvent, bool bFetchBlob) :
-	m_hEvent(hEvent)
+DB::EventInfo::EventInfo(MEVENT hEvent, bool bFetchBlob)
 {
 	memset(this, 0, sizeof(*this));
-	fetch(hEvent, bFetchBlob);
+	m_hEvent = hEvent;
+	fetch(bFetchBlob);
 }
 
 DB::EventInfo::EventInfo() :
@@ -263,15 +263,21 @@ DB::EventInfo::EventInfo() :
 	memset(this, 0, sizeof(*this));
 }
 
+DB::EventInfo& DB::EventInfo::operator=(MEVENT hEvent)
+{
+	m_hEvent = hEvent;
+	m_bValid = false;
+	return *this;
+}
+
 DB::EventInfo::~EventInfo()
 {
 	if (m_bValid)
 		mir_free(pBlob);
 }
 
-bool DB::EventInfo::fetch(MEVENT hEvent, bool bFetchBlob)
+bool DB::EventInfo::fetch(bool bFetchBlob)
 {
-	m_hEvent = hEvent;
 	if (bFetchBlob)
 		cbBlob = -1;
 	return m_bValid = ::db_event_get(m_hEvent, this) == 0;
diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def
index bd6d09c773..e76bce77d3 100644
--- a/src/mir_app/src/mir_app.def
+++ b/src/mir_app/src/mir_app.def
@@ -902,7 +902,7 @@ Clist_GroupSaveExpanded @1003 NONAME
 ?addButton@CMPluginBase@@QAEPAXPBUBBButton@@@Z @1032 NONAME
 ?SetQuoteEvent@CSrmmBaseDialog@@QAEXI@Z @1033 NONAME
 ?onClick_CloseQuote@CSrmmBaseDialog@@IAEXPAVCCtrlButton@@@Z @1034 NONAME
-?fetch@EventInfo@DB@@QAE_NI_N@Z @1035 NONAME
+?fetch@EventInfo@DB@@QAE_N_N@Z @1035 NONAME
 ?unload@EventInfo@DB@@QAEXXZ @1036 NONAME
 ?isAlertable@EventInfo@DB@@QBE_NXZ @1037 NONAME
 ?Send@File@@YGPAUHWND__@@IQAPA_W@Z @1038 NONAME
@@ -965,3 +965,6 @@ _Netlib_DownloadFile@20 @1099 NONAME
 ?getUserInfo@FILE_BLOB@DB@@QBEPAXXZ @1101 NONAME
 ?setUserInfo@FILE_BLOB@DB@@QAEXPAX@Z @1102 NONAME
 ?Chat_Find@@YGPAUSESSION_INFO@@IPBD@Z @1103 NONAME
+??4EventInfo@DB@@QAEAAV01@I@Z @1104 NONAME
+?MarkEventRead@CSrmmBaseDialog@@QAEXABVEventInfo@DB@@@Z @1105 NONAME
+?getEvent@EventInfo@DB@@QBEIXZ @1106 NONAME
diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def
index bdb810338c..e2f633c5e8 100644
--- a/src/mir_app/src/mir_app64.def
+++ b/src/mir_app/src/mir_app64.def
@@ -902,7 +902,7 @@ Clist_GroupSaveExpanded @1003 NONAME
 ?addButton@CMPluginBase@@QEAAPEAXPEBUBBButton@@@Z @1032 NONAME
 ?SetQuoteEvent@CSrmmBaseDialog@@QEAAXI@Z @1033 NONAME
 ?onClick_CloseQuote@CSrmmBaseDialog@@IEAAXPEAVCCtrlButton@@@Z @1034 NONAME
-?fetch@EventInfo@DB@@QEAA_NI_N@Z @1035 NONAME
+?fetch@EventInfo@DB@@QEAA_N_N@Z @1035 NONAME
 ?unload@EventInfo@DB@@QEAAXXZ @1036 NONAME
 ?isAlertable@EventInfo@DB@@QEBA_NXZ @1037 NONAME
 ?Send@File@@YAPEAUHWND__@@IQEAPEA_W@Z @1038 NONAME
@@ -965,3 +965,6 @@ Netlib_DownloadFile @1093 NONAME
 ?getUserInfo@FILE_BLOB@DB@@QEBAPEAXXZ @1095 NONAME
 ?setUserInfo@FILE_BLOB@DB@@QEAAXPEAX@Z @1096 NONAME
 ?Chat_Find@@YAPEAUSESSION_INFO@@IPEBD@Z @1097 NONAME
+??4EventInfo@DB@@QEAAAEAV01@I@Z @1098 NONAME
+?MarkEventRead@CSrmmBaseDialog@@QEAAXAEBVEventInfo@DB@@@Z @1099 NONAME
+?getEvent@EventInfo@DB@@QEBAIXZ @1100 NONAME
-- 
cgit v1.2.3