diff options
| -rw-r--r-- | include/m_database.h | 4 | ||||
| -rw-r--r-- | libs/win32/mir_app.lib | bin | 274496 -> 274776 bytes | |||
| -rw-r--r-- | libs/win64/mir_app.lib | bin | 273760 -> 274046 bytes | |||
| -rw-r--r-- | src/mir_app/src/db_events.cpp | 11 | ||||
| -rw-r--r-- | src/mir_app/src/mir_app.def | 1 | ||||
| -rw-r--r-- | src/mir_app/src/mir_app64.def | 1 |
6 files changed, 13 insertions, 4 deletions
diff --git a/include/m_database.h b/include/m_database.h index 4da69e9c60..d47936bd56 100644 --- a/include/m_database.h +++ b/include/m_database.h @@ -684,9 +684,11 @@ namespace DB public:
explicit EventInfo();
- explicit EventInfo(MEVENT, bool bFetchBlob = true);
+ explicit EventInfo(MEVENT hEvent, bool bFetchBlob = true);
~EventInfo();
+ bool fetch(MEVENT hEvent, bool bFetchBlob = true);
+
__forceinline operator bool() const { return bValid; }
bool isSrmm() const; // could be displayed in a SRMM window
diff --git a/libs/win32/mir_app.lib b/libs/win32/mir_app.lib Binary files differindex 487c790aeb..fc309e0d37 100644 --- a/libs/win32/mir_app.lib +++ b/libs/win32/mir_app.lib diff --git a/libs/win64/mir_app.lib b/libs/win64/mir_app.lib Binary files differindex 22c12ae2f2..a7dee29e14 100644 --- a/libs/win64/mir_app.lib +++ b/libs/win64/mir_app.lib diff --git a/src/mir_app/src/db_events.cpp b/src/mir_app/src/db_events.cpp index 23728e559d..7a60c07e12 100644 --- a/src/mir_app/src/db_events.cpp +++ b/src/mir_app/src/db_events.cpp @@ -257,9 +257,7 @@ MIR_APP_DLL(HICON) DbEvent_GetIcon(DBEVENTINFO *dbei, int flags) DB::EventInfo::EventInfo(MEVENT hEvent, bool bFetchBlob)
{
memset(this, 0, sizeof(*this));
- if (bFetchBlob)
- cbBlob = -1;
- bValid = ::db_event_get(hEvent, this) == 0;
+ fetch(hEvent, bFetchBlob);
}
DB::EventInfo::EventInfo() :
@@ -273,6 +271,13 @@ DB::EventInfo::~EventInfo() mir_free(pBlob);
}
+bool DB::EventInfo::fetch(MEVENT hEvent, bool bFetchBlob)
+{
+ if (bFetchBlob)
+ cbBlob = -1;
+ return bValid = ::db_event_get(hEvent, this) == 0;
+}
+
// could be displayed in a SRMM window
bool DB::EventInfo::isSrmm() const
{
diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def index 36020e3579..0cac4afff0 100644 --- a/src/mir_app/src/mir_app.def +++ b/src/mir_app/src/mir_app.def @@ -914,3 +914,4 @@ 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
diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def index 3ec92dc0dc..3626410d26 100644 --- a/src/mir_app/src/mir_app64.def +++ b/src/mir_app/src/mir_app64.def @@ -914,3 +914,4 @@ 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
|