kinda first working version of database event cursors

6 files changed, 16 insertions, 16 deletions

diff --git a/src/mir_app/src/MDatabaseCommon.cpp b/src/mir_app/src/MDatabaseCommon.cpp
index 1e768ffa5f..db72861928 100644
--- a/src/mir_app/src/MDatabaseCommon.cpp
+++ b/src/mir_app/src/MDatabaseCommon.cpp
@@ -357,12 +357,12 @@ STDMETHODIMP_(BOOL) MDatabaseCommon::SetSettingResident(BOOL bIsResident, const
 /////////////////////////////////////////////////////////////////////////////////////////
 // Event cursors
 
-STDMETHODIMP_(DB::EventCursor *) MDatabaseCommon::EventCursor(MCONTACT, DBEVENTINFO &)
+STDMETHODIMP_(DB::EventCursor *) MDatabaseCommon::EventCursor(MCONTACT, MEVENT)
 {
 	return nullptr;
 }
 
-STDMETHODIMP_(DB::EventCursor *) MDatabaseCommon::EventCursorRev(MCONTACT, DBEVENTINFO &) 
+STDMETHODIMP_(DB::EventCursor *) MDatabaseCommon::EventCursorRev(MCONTACT, MEVENT)
 {
 	return nullptr;
 }
diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def
index 340d145332..c753762538 100644
--- a/src/mir_app/src/mir_app.def
+++ b/src/mir_app/src/mir_app.def
@@ -732,6 +732,6 @@ ProtoBroadcastAsync @814 NONAME
 ?UseGroups@Clist@@3V?$CMOption@_N@@A @819 NONAME

 ?OfflineModes@Clist@@3V?$CMOption@K@@A @820 NONAME

 ?getChat@CSrmmBaseDialog@@QBEPAUSESSION_INFO@@XZ @821 NONAME

-?EventCursor@MDatabaseCommon@@UAGPAV0DB@@IAAUDBEVENTINFO@@@Z @822 NONAME

-?EventCursorRev@MDatabaseCommon@@UAGPAVEventCursor@DB@@IAAUDBEVENTINFO@@@Z @823 NONAME

+?EventCursor@MDatabaseCommon@@UAGPAV0DB@@II@Z @822 NONAME

+?EventCursorRev@MDatabaseCommon@@UAGPAVEventCursor@DB@@II@Z @823 NONAME

 Chat_CreateMenu @824 NONAME

diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def
index 2d9ac3a4b4..4d532688ff 100644
--- a/src/mir_app/src/mir_app64.def
+++ b/src/mir_app/src/mir_app64.def
@@ -732,6 +732,6 @@ ProtoBroadcastAsync @814 NONAME
 ?UseGroups@Clist@@3V?$CMOption@_N@@A @819 NONAME

 ?OfflineModes@Clist@@3V?$CMOption@K@@A @820 NONAME

 ?getChat@CSrmmBaseDialog@@QEBAPEAUSESSION_INFO@@XZ @821 NONAME

-?EventCursor@MDatabaseCommon@@UEAAPEAV0DB@@IAEAUDBEVENTINFO@@@Z @822 NONAME

-?EventCursorRev@MDatabaseCommon@@UEAAPEAVEventCursor@DB@@IAEAUDBEVENTINFO@@@Z @823 NONAME

+?EventCursor@MDatabaseCommon@@UEAAPEAV0DB@@II@Z @822 NONAME

+?EventCursorRev@MDatabaseCommon@@UEAAPEAVEventCursor@DB@@II@Z @823 NONAME

 Chat_CreateMenu @824 NONAME

diff --git a/src/mir_core/src/db.cpp b/src/mir_core/src/db.cpp
index 05d775d598..50df1e3e83 100644
--- a/src/mir_core/src/db.cpp
+++ b/src/mir_core/src/db.cpp
@@ -443,14 +443,14 @@ DB::EventCursor::~EventCursor()
 {

 }

 

-MIR_CORE_DLL(DB::EventCursor*) DB::Events(MCONTACT hContact, DBEVENTINFO &dbei)

+MIR_CORE_DLL(DB::EventCursor*) DB::Events(MCONTACT hContact, MEVENT iStartEvent)

 {

-	return (currDb == nullptr) ? 0 : currDb->EventCursor(hContact, dbei);

+	return (currDb == nullptr) ? 0 : currDb->EventCursor(hContact, iStartEvent);

 }

 

-MIR_CORE_DLL(DB::EventCursor*) DB::EventsRev(MCONTACT hContact, DBEVENTINFO &dbei)

+MIR_CORE_DLL(DB::EventCursor*) DB::EventsRev(MCONTACT hContact, MEVENT iStartEvent)

 {

-	return (currDb == nullptr) ? 0 : currDb->EventCursorRev(hContact, dbei);

+	return (currDb == nullptr) ? 0 : currDb->EventCursorRev(hContact, iStartEvent);

 }

 

 /////////////////////////////////////////////////////////////////////////////////////////

diff --git a/src/mir_core/src/mir_core.def b/src/mir_core/src/mir_core.def
index 36cf775073..a89c1757ff 100644
--- a/src/mir_core/src/mir_core.def
+++ b/src/mir_core/src/mir_core.def
@@ -1459,10 +1459,10 @@ XmlGetChildText @1645
 ?InsertNewUnknown@XMLElement@tinyxml2@@QAEPAVXMLUnknown@2@PBD@Z @1681 NONAME

 ??1EventCursor@DB@@UAE@XZ @1684 NONAME

 ??0EventCursor@DB@@QAE@ABV01@@Z @1685 NONAME

-??0EventCursor@DB@@QAE@IAAUDBEVENTINFO@@@Z @1686 NONAME

+??0EventCursor@DB@@QAE@I@Z @1686 NONAME

 ??_7EventCursor@DB@@6B@ @1687 NONAME

-?Events@DB@@YGPAVEventCursor@1@IAAUDBEVENTINFO@@@Z @1688 NONAME

-?EventsRev@DB@@YGPAVEventCursor@1@IAAUDBEVENTINFO@@@Z @1689 NONAME

+?Events@DB@@YGPAVEventCursor@1@II@Z @1688 NONAME

+?EventsRev@DB@@YGPAVEventCursor@1@II@Z @1689 NONAME

 ?begin@EventCursor@DB@@QAEIXZ @1690 NONAME

 ?end@EventCursor@DB@@QAEIXZ @1691 NONAME

 TimeZone_GetSystemTime @1692

diff --git a/src/mir_core/src/mir_core64.def b/src/mir_core/src/mir_core64.def
index 73a85c2031..e98319e623 100644
--- a/src/mir_core/src/mir_core64.def
+++ b/src/mir_core/src/mir_core64.def
@@ -1459,10 +1459,10 @@ XmlGetChildText @1645
 ?InsertNewUnknown@XMLElement@tinyxml2@@QEAAPEAVXMLUnknown@2@PEBD@Z @1681 NONAME

 ??1EventCursor@DB@@UEAA@XZ @1684 NONAME

 ??0EventCursor@DB@@QEAA@AEBV01@@Z @1685 NONAME

-??0EventCursor@DB@@QEAA@IAEAUDBEVENTINFO@@@Z @1686 NONAME

+??0EventCursor@DB@@QEAA@I@Z @1686 NONAME

 ??_7EventCursor@DB@@6B@ @1687 NONAME

-?Events@DB@@YAPEAVEventCursor@1@IAEAUDBEVENTINFO@@@Z @1688 NONAME

-?EventsRev@DB@@YAPEAVEventCursor@1@IAEAUDBEVENTINFO@@@Z @1689 NONAME

+?Events@DB@@YAPEAVEventCursor@1@II@Z @1688 NONAME

+?EventsRev@DB@@YAPEAVEventCursor@1@II@Z @1689 NONAME

 ?begin@EventCursor@DB@@QEAAIXZ @1690 NONAME

 ?end@EventCursor@DB@@QEAAIXZ @1691 NONAME

 TimeZone_GetSystemTime @1692