From cac58b5ab572889667f6e936a14f53ac6d87273a Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 16 Sep 2016 17:34:21 +0000 Subject: forgotten database function git-svn-id: http://svn.miranda-ng.org/main/trunk@17303 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/mir_app/src/db_intf.cpp | 6 ------ src/mir_core/src/db.cpp | 5 +++++ src/mir_core/src/mir_core.def | 1 + src/mir_core/src/mir_core64.def | 1 + 4 files changed, 7 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/mir_app/src/db_intf.cpp b/src/mir_app/src/db_intf.cpp index eaab4d9e9b..504bc5bb34 100644 --- a/src/mir_app/src/db_intf.cpp +++ b/src/mir_app/src/db_intf.cpp @@ -50,11 +50,6 @@ static INT_PTR srvFindPlugin(WPARAM, LPARAM lParam) return NULL; } -static INT_PTR srvGetCurrentDb(WPARAM, LPARAM) -{ - return (INT_PTR)currDb; -} - static INT_PTR srvInitInstance(WPARAM, LPARAM lParam) { MIDatabase *pDb = (MIDatabase*)lParam; @@ -80,7 +75,6 @@ int LoadDbintfModule() { CreateServiceFunction(MS_DB_REGISTER_PLUGIN, srvRegisterPlugin); CreateServiceFunction(MS_DB_FIND_PLUGIN, srvFindPlugin); - CreateServiceFunction(MS_DB_GET_CURRENT, srvGetCurrentDb); CreateServiceFunction(MS_DB_INIT_INSTANCE, srvInitInstance); CreateServiceFunction(MS_DB_DESTROY_INSTANCE, srvDestroyInstance); diff --git a/src/mir_core/src/db.cpp b/src/mir_core/src/db.cpp index 051ce6a32e..0775226498 100644 --- a/src/mir_core/src/db.cpp +++ b/src/mir_core/src/db.cpp @@ -40,6 +40,11 @@ MIR_CORE_DLL(int) db_get_contact_count(void) return (currDb) ? currDb->GetContactCount() : 0; } +MIR_CORE_DLL(MIDatabase*) db_get_current() +{ + return currDb; +} + static int sttEnumVars(const char *szVarName, LPARAM lParam) { LIST* vars = (LIST*)lParam; diff --git a/src/mir_core/src/mir_core.def b/src/mir_core/src/mir_core.def index b6e57d3b9d..a9bdba9103 100644 --- a/src/mir_core/src/mir_core.def +++ b/src/mir_core/src/mir_core.def @@ -1009,3 +1009,4 @@ db_delete_module @1161 ??_7CCtrlSpin@@6B@ @1166 NONAME ?SetMaxLength@CCtrlEdit@@QAEXI@Z @1167 NONAME ?SetRange@CCtrlSpin@@QAEXFF@Z @1168 NONAME +db_get_current @1169 diff --git a/src/mir_core/src/mir_core64.def b/src/mir_core/src/mir_core64.def index 131140dff2..c7279247af 100644 --- a/src/mir_core/src/mir_core64.def +++ b/src/mir_core/src/mir_core64.def @@ -1009,3 +1009,4 @@ db_delete_module @1161 ??_7CCtrlSpin@@6B@ @1166 NONAME ?SetMaxLength@CCtrlEdit@@QEAAXI@Z @1167 NONAME ?SetRange@CCtrlSpin@@QEAAXFF@Z @1168 NONAME +db_get_current @1169 -- cgit v1.2.3