From 6eca3d4719e9c99622b347a8df84c917c993470c Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 18 Jul 2012 14:40:40 +0000 Subject: mir_core on MIDatabase git-svn-id: http://svn.miranda-ng.org/main/trunk@1015 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/mir_core/db.cpp | 128 +++++++++++++++----------- src/modules/database/dbintf.cpp | 198 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 273 insertions(+), 53 deletions(-) create mode 100644 src/modules/database/dbintf.cpp (limited to 'src') diff --git a/src/mir_core/db.cpp b/src/mir_core/db.cpp index 36902702ff..f18f288d33 100644 --- a/src/mir_core/db.cpp +++ b/src/mir_core/db.cpp @@ -27,71 +27,80 @@ static MIDatabase* currDb = NULL; MIR_CORE_DLL(int) db_get_b(HANDLE hContact, const char *szModule, const char *szSetting, int errorValue) { - DBVARIANT dbv; - DBCONTACTGETSETTING cgs; - cgs.szModule = szModule; - cgs.szSetting = szSetting; - cgs.pValue = &dbv; - if ( !CallService(MS_DB_CONTACT_GETSETTING, (WPARAM)hContact, (LPARAM)&cgs)) - switch(dbv.type) { - case DBVT_BYTE: return dbv.bVal; - case DBVT_WORD: return BYTE(dbv.wVal); - case DBVT_DWORD: return BYTE(dbv.dVal); - } + if (currDb != NULL) { + DBVARIANT dbv; + DBCONTACTGETSETTING cgs; + cgs.szModule = szModule; + cgs.szSetting = szSetting; + cgs.pValue = &dbv; + if ( !currDb->GetContactSetting(hContact, &cgs)) + switch(dbv.type) { + case DBVT_BYTE: return dbv.bVal; + case DBVT_WORD: return BYTE(dbv.wVal); + case DBVT_DWORD: return BYTE(dbv.dVal); + } + } return errorValue; } MIR_CORE_DLL(int) db_get_w(HANDLE hContact, const char *szModule, const char *szSetting, int errorValue) { - DBVARIANT dbv; - DBCONTACTGETSETTING cgs; - cgs.szModule = szModule; - cgs.szSetting = szSetting; - cgs.pValue = &dbv; - if ( !CallService(MS_DB_CONTACT_GETSETTING, (WPARAM)hContact, (LPARAM)&cgs)) - switch(dbv.type) { - case DBVT_BYTE: return dbv.bVal; - case DBVT_WORD: return dbv.wVal; - case DBVT_DWORD: return WORD(dbv.dVal); - } + if (currDb != NULL) { + DBVARIANT dbv; + DBCONTACTGETSETTING cgs; + cgs.szModule = szModule; + cgs.szSetting = szSetting; + cgs.pValue = &dbv; + if ( !currDb->GetContactSetting(hContact, &cgs)) + switch(dbv.type) { + case DBVT_BYTE: return dbv.bVal; + case DBVT_WORD: return dbv.wVal; + case DBVT_DWORD: return WORD(dbv.dVal); + } + } return errorValue; } MIR_CORE_DLL(DWORD) db_get_dw(HANDLE hContact, const char *szModule, const char *szSetting, DWORD errorValue) { - DBVARIANT dbv; - DBCONTACTGETSETTING cgs; - cgs.szModule = szModule; - cgs.szSetting = szSetting; - cgs.pValue = &dbv; - if ( !CallService(MS_DB_CONTACT_GETSETTING, (WPARAM)hContact, (LPARAM)&cgs)) - switch(dbv.type) { - case DBVT_BYTE: return dbv.bVal; - case DBVT_WORD: return dbv.wVal; - case DBVT_DWORD: return dbv.dVal; - } + if (currDb != NULL) { + DBVARIANT dbv; + DBCONTACTGETSETTING cgs; + cgs.szModule = szModule; + cgs.szSetting = szSetting; + cgs.pValue = &dbv; + if ( !currDb->GetContactSetting(hContact, &cgs)) + switch(dbv.type) { + case DBVT_BYTE: return dbv.bVal; + case DBVT_WORD: return dbv.wVal; + case DBVT_DWORD: return dbv.dVal; + } + } return errorValue; } MIR_CORE_DLL(INT_PTR) db_get(HANDLE hContact, const char *szModule, const char *szSetting, DBVARIANT *dbv) { + if (currDb == NULL) return 1; + DBCONTACTGETSETTING cgs; cgs.szModule = szModule; cgs.szSetting = szSetting; cgs.pValue = dbv; - - return CallService(MS_DB_CONTACT_GETSETTING, (WPARAM)hContact, (LPARAM)&cgs); + return currDb->GetContactSetting(hContact, &cgs); } MIR_CORE_DLL(INT_PTR) db_get_s(HANDLE hContact, const char *szModule, const char *szSetting, DBVARIANT *dbv, const int nType) { + if (currDb == NULL) return 1; + DBCONTACTGETSETTING cgs; cgs.szModule = szModule; cgs.szSetting = szSetting; cgs.pValue = dbv; dbv->type = (BYTE)nType; - return CallService(MS_DB_CONTACT_GETSETTING_STR, (WPARAM)hContact, (LPARAM)&cgs); + return currDb->GetContactSettingStr(hContact, &cgs); } MIR_CORE_DLL(char*) db_get_sa(HANDLE hContact, const char *szModule, const char *szSetting) @@ -101,7 +110,7 @@ MIR_CORE_DLL(char*) db_get_sa(HANDLE hContact, const char *szModule, const char db_get_s(hContact, szModule, szSetting, &dbv, DBVT_ASCIIZ); if (dbv.type == DBVT_ASCIIZ) str = mir_strdup(dbv.pszVal); - DBFreeVariant(&dbv); + db_free(&dbv); return str; } @@ -112,97 +121,110 @@ MIR_CORE_DLL(wchar_t*) db_get_wsa(HANDLE hContact, const char *szModule, const c db_get_s(hContact, szModule, szSetting, &dbv, DBVT_WCHAR); if (dbv.type == DBVT_WCHAR) str = mir_wstrdup(dbv.pwszVal); - DBFreeVariant(&dbv); + db_free(&dbv); return str; } MIR_CORE_DLL(INT_PTR) db_free(DBVARIANT *dbv) { - return CallService(MS_DB_CONTACT_FREEVARIANT, 0, (LPARAM)dbv); + if (currDb == NULL) return 1; + + return currDb->FreeVariant(dbv); } MIR_CORE_DLL(INT_PTR) db_unset(HANDLE hContact, const char *szModule, const char *szSetting) { + if (currDb == NULL) return 1; + DBCONTACTGETSETTING cgs; cgs.szModule = szModule; cgs.szSetting = szSetting; - return CallService(MS_DB_CONTACT_DELETESETTING, (WPARAM)hContact, (LPARAM)&cgs); + return currDb->DeleteContactSetting(hContact, &cgs); } MIR_CORE_DLL(INT_PTR) db_set_b(HANDLE hContact, const char *szModule, const char *szSetting, BYTE val) { + if (currDb == NULL) return 1; + DBCONTACTWRITESETTING cws; cws.szModule = szModule; cws.szSetting = szSetting; cws.value.type = DBVT_BYTE; cws.value.bVal = val; - return CallService(MS_DB_CONTACT_WRITESETTING, (WPARAM)hContact, (LPARAM)&cws); + return currDb->WriteContactSetting(hContact, &cws); } MIR_CORE_DLL(INT_PTR) db_set_w(HANDLE hContact, const char *szModule, const char *szSetting, WORD val) { - DBCONTACTWRITESETTING cws; + if (currDb == NULL) return 1; + DBCONTACTWRITESETTING cws; cws.szModule = szModule; cws.szSetting = szSetting; cws.value.type = DBVT_WORD; cws.value.wVal = val; - return CallService(MS_DB_CONTACT_WRITESETTING, (WPARAM)hContact, (LPARAM)&cws); + return currDb->WriteContactSetting(hContact, &cws); } MIR_CORE_DLL(INT_PTR) db_set_dw(HANDLE hContact, const char *szModule, const char *szSetting, DWORD val) { + if (currDb == NULL) return 1; + DBCONTACTWRITESETTING cws; cws.szModule = szModule; cws.szSetting = szSetting; cws.value.type = DBVT_DWORD; cws.value.dVal = val; - return CallService(MS_DB_CONTACT_WRITESETTING, (WPARAM)hContact, (LPARAM)&cws); + return currDb->WriteContactSetting(hContact, &cws); } MIR_CORE_DLL(INT_PTR) db_set_s(HANDLE hContact, const char *szModule, const char *szSetting, const char *val) { - DBCONTACTWRITESETTING cws; + if (currDb == NULL) return 1; + DBCONTACTWRITESETTING cws; cws.szModule = szModule; cws.szSetting = szSetting; cws.value.type = DBVT_ASCIIZ; cws.value.pszVal = (char*)val; - return CallService(MS_DB_CONTACT_WRITESETTING, (WPARAM)hContact, (LPARAM)&cws); + return currDb->WriteContactSetting(hContact, &cws); } MIR_CORE_DLL(INT_PTR) db_set_ws(HANDLE hContact, const char *szModule, const char *szSetting, const WCHAR *val) { - DBCONTACTWRITESETTING cws; + if (currDb == NULL) return 1; + DBCONTACTWRITESETTING cws; cws.szModule = szModule; cws.szSetting = szSetting; cws.value.type = DBVT_WCHAR; cws.value.pwszVal = (WCHAR*)val; - return CallService(MS_DB_CONTACT_WRITESETTING, (WPARAM)hContact, (LPARAM)&cws); + return currDb->WriteContactSetting(hContact, &cws); } MIR_CORE_DLL(INT_PTR) db_set_utf(HANDLE hContact, const char *szModule, const char *szSetting, const char *val) { - DBCONTACTWRITESETTING cws; + if (currDb == NULL) return 1; + DBCONTACTWRITESETTING cws; cws.szModule = szModule; cws.szSetting = szSetting; cws.value.type = DBVT_UTF8; cws.value.pszVal = (char*)val; - return CallService(MS_DB_CONTACT_WRITESETTING, (WPARAM)hContact, (LPARAM)&cws); + return currDb->WriteContactSetting(hContact, &cws); } MIR_CORE_DLL(INT_PTR) db_set_blob(HANDLE hContact, const char *szModule, const char *szSetting, void *val, unsigned len) { - DBCONTACTWRITESETTING cws; + if (currDb == NULL) return 1; + DBCONTACTWRITESETTING cws; cws.szModule = szModule; cws.szSetting = szSetting; cws.value.type = DBVT_BLOB; - cws.value.cpbVal = (WORD)len; + cws.value.cpbVal = (WORD)len; cws.value.pbVal = (unsigned char*)val; - return CallService(MS_DB_CONTACT_WRITESETTING, (WPARAM)hContact, (LPARAM)&cws); + return currDb->WriteContactSetting(hContact, &cws); } MIR_CORE_DLL(void) db_setCurrent(MIDatabase* _db) diff --git a/src/modules/database/dbintf.cpp b/src/modules/database/dbintf.cpp new file mode 100644 index 0000000000..c3bf4f3b5c --- /dev/null +++ b/src/modules/database/dbintf.cpp @@ -0,0 +1,198 @@ +/* + +Miranda NG: the free IM client for Microsoft* Windows* + +Copyright 2012 Miranda NG project, +all portions of this codebase are copyrighted to the people +listed in contributors.txt. + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*/ + +#include "..\..\core\commonheaders.h" + +MIDatabase* currDb = NULL; + +MIR_CORE_DLL(void) db_setCurrent(MIDatabase*); + +static INT_PTR srvSetSafetyMode(WPARAM wParam, LPARAM) +{ + if (!currDb) return 1; + + currDb->SetCacheSafetyMode(wParam != 0); + return 0; +} + +static INT_PTR srvGetContactCount(WPARAM, LPARAM) +{ return (currDb) ? currDb->GetContactCount() : 0; +} + +/////////////////////////////////////////////////////////////////////////////// +// Events + +static INT_PTR srvFindFirstContact(WPARAM, LPARAM lParam) +{ return (currDb) ? (INT_PTR)currDb->FindFirstContact((LPCSTR)lParam) : 0; +} + +static INT_PTR srvFindNextContact(WPARAM wParam, LPARAM lParam) +{ return (currDb) ? (INT_PTR)currDb->FindNextContact((HANDLE)wParam, (LPCSTR)lParam) : 0; +} + +static INT_PTR srvDeleteContact(WPARAM wParam, LPARAM) +{ return (currDb) ? currDb->DeleteContact((HANDLE)wParam) : 0; +} + +static INT_PTR srvAddContact(WPARAM wParam, LPARAM) +{ return (currDb) ? (INT_PTR)currDb->AddContact() : 0; +} + +static INT_PTR srvIsDbContact(WPARAM wParam, LPARAM) +{ return (currDb) ? currDb->IsDbContact((HANDLE)wParam) : 0; +} + +/////////////////////////////////////////////////////////////////////////////// +// Events + +static INT_PTR srvGetEventCount(WPARAM wParam, LPARAM lParam) +{ return (currDb) ? currDb->GetEventCount((HANDLE)wParam) : 0; +} + +static INT_PTR srvAddEvent(WPARAM wParam, LPARAM lParam) +{ return (currDb) ? (INT_PTR)currDb->AddEvent((HANDLE)wParam, (DBEVENTINFO*)lParam) : 0; +} + +static INT_PTR srvDeleteEvent(WPARAM wParam, LPARAM lParam) +{ return (currDb) ? currDb->DeleteEvent((HANDLE)wParam, (HANDLE)lParam) : 0; +} + +static INT_PTR srvGetBlobSize(WPARAM wParam, LPARAM lParam) +{ return (currDb) ? currDb->GetBlobSize((HANDLE)wParam) : 0; +} + +static INT_PTR srvGetEvent(WPARAM wParam, LPARAM lParam) +{ return (currDb) ? (INT_PTR)currDb->GetEvent((HANDLE)wParam, (DBEVENTINFO*)lParam) : 0; +} + +static INT_PTR srvMarkEventRead(WPARAM wParam, LPARAM lParam) +{ return (currDb) ? currDb->MarkEventRead((HANDLE)wParam, (HANDLE)lParam) : 0; +} + +static INT_PTR srvGetEventContact(WPARAM wParam, LPARAM lParam) +{ return (currDb) ? (INT_PTR)currDb->GetEventContact((HANDLE)wParam) : 0; +} + +static INT_PTR srvFindFirstEvent(WPARAM wParam, LPARAM lParam) +{ return (currDb) ? (INT_PTR)currDb->FindFirstEvent((HANDLE)wParam) : 0; +} + +static INT_PTR srvFindFirstUnreadEvent(WPARAM wParam, LPARAM lParam) +{ return (currDb) ? (INT_PTR)currDb->FindFirstUnreadEvent((HANDLE)wParam) : 0; +} + +static INT_PTR srvFindLastEvent(WPARAM wParam, LPARAM lParam) +{ return (currDb) ? (INT_PTR)currDb->FindLastEvent((HANDLE)wParam) : 0; +} + +static INT_PTR srvFindNextEvent(WPARAM wParam, LPARAM lParam) +{ return (currDb) ? (INT_PTR)currDb->FindNextEvent((HANDLE)wParam) : 0; +} + +static INT_PTR srvFindPrevEvent(WPARAM wParam, LPARAM lParam) +{ return (currDb) ? (INT_PTR)currDb->FindPrevEvent((HANDLE)wParam) : 0; +} + +/////////////////////////////////////////////////////////////////////////////// +// Module chain + +static INT_PTR srvEnumModuleNames(WPARAM wParam,LPARAM lParam) +{ return (currDb) ? (INT_PTR)currDb->EnumModuleNames((DBMODULEENUMPROC)lParam, (void*)wParam) : 0; +} + +/////////////////////////////////////////////////////////////////////////////// +// Settings + +static INT_PTR srvGetContactSetting(WPARAM wParam,LPARAM lParam) +{ return (currDb) ? (INT_PTR)currDb->GetContactSetting((HANDLE)wParam, (DBCONTACTGETSETTING*)lParam) : 0; +} + +static INT_PTR srvGetContactSettingStr(WPARAM wParam,LPARAM lParam) +{ return (currDb) ? (INT_PTR)currDb->GetContactSettingStr((HANDLE)wParam, (DBCONTACTGETSETTING*)lParam) : 0; +} + +static INT_PTR srvGetContactSettingStatic(WPARAM wParam,LPARAM lParam) +{ return (currDb) ? (INT_PTR)currDb->GetContactSettingStatic((HANDLE)wParam, (DBCONTACTGETSETTING*)lParam) : 0; +} + +static INT_PTR srvFreeVariant(WPARAM wParam,LPARAM lParam) +{ return (currDb) ? (INT_PTR)currDb->FreeVariant((DBVARIANT*)lParam) : 0; +} + +static INT_PTR srvWriteContactSetting(WPARAM wParam,LPARAM lParam) +{ return (currDb) ? (INT_PTR)currDb->WriteContactSetting((HANDLE)wParam, (DBCONTACTWRITESETTING*)lParam) : 0; +} + +static INT_PTR srvDeleteContactSetting(WPARAM wParam,LPARAM lParam) +{ return (currDb) ? (INT_PTR)currDb->DeleteContactSetting((HANDLE)wParam, (DBCONTACTGETSETTING*)lParam) : 0; +} + +static INT_PTR srvEnumContactSettings(WPARAM wParam,LPARAM lParam) +{ return (currDb) ? (INT_PTR)currDb->EnumContactSettings((HANDLE)wParam, (DBCONTACTENUMSETTINGS*)lParam) : 0; +} + +static INT_PTR srvSetSettingResident(WPARAM wParam,LPARAM lParam) +{ return (currDb) ? (INT_PTR)currDb->SetSettingResident(wParam, (char*)lParam) : 0; +} + +static INT_PTR srvEnumResidentSettings(WPARAM wParam,LPARAM lParam) +{ return (currDb) ? (INT_PTR)currDb->EnumResidentSettings((DBMODULEENUMPROC)wParam, (void*)lParam) : 0; +} + +int LoadDbintfModule() +{ + CreateServiceFunction(MS_DB_SETSAFETYMODE, srvSetSafetyMode); + + CreateServiceFunction(MS_DB_CONTACT_GETCOUNT, srvGetContactCount); + CreateServiceFunction(MS_DB_CONTACT_FINDFIRST, srvFindFirstContact); + CreateServiceFunction(MS_DB_CONTACT_FINDNEXT, srvFindNextContact); + CreateServiceFunction(MS_DB_CONTACT_DELETE, srvDeleteContact); + CreateServiceFunction(MS_DB_CONTACT_ADD, srvAddContact); + CreateServiceFunction(MS_DB_CONTACT_IS, srvIsDbContact); + + CreateServiceFunction(MS_DB_EVENT_GETCOUNT, srvGetEventCount); + CreateServiceFunction(MS_DB_EVENT_ADD, srvAddEvent); + CreateServiceFunction(MS_DB_EVENT_DELETE, srvDeleteEvent); + CreateServiceFunction(MS_DB_EVENT_GETBLOBSIZE, srvGetBlobSize); + CreateServiceFunction(MS_DB_EVENT_GET, srvGetEvent); + CreateServiceFunction(MS_DB_EVENT_MARKREAD, srvMarkEventRead); + CreateServiceFunction(MS_DB_EVENT_GETCONTACT, srvGetEventContact); + CreateServiceFunction(MS_DB_EVENT_FINDFIRST, srvFindFirstEvent); + CreateServiceFunction(MS_DB_EVENT_FINDFIRSTUNREAD, srvFindFirstUnreadEvent); + CreateServiceFunction(MS_DB_EVENT_FINDLAST, srvFindLastEvent); + CreateServiceFunction(MS_DB_EVENT_FINDNEXT, srvFindNextEvent); + CreateServiceFunction(MS_DB_EVENT_FINDPREV, srvFindPrevEvent); + + CreateServiceFunction(MS_DB_MODULES_ENUM, srvEnumModuleNames); + + CreateServiceFunction(MS_DB_CONTACT_GETSETTING, srvGetContactSetting); + CreateServiceFunction(MS_DB_CONTACT_GETSETTING_STR, srvGetContactSettingStr); + CreateServiceFunction(MS_DB_CONTACT_GETSETTINGSTATIC, srvGetContactSettingStatic); + CreateServiceFunction(MS_DB_CONTACT_FREEVARIANT, srvFreeVariant); + CreateServiceFunction(MS_DB_CONTACT_WRITESETTING, srvWriteContactSetting); + CreateServiceFunction(MS_DB_CONTACT_DELETESETTING, srvDeleteContactSetting); + CreateServiceFunction(MS_DB_CONTACT_ENUMSETTINGS, srvEnumContactSettings); + CreateServiceFunction(MS_DB_SETSETTINGRESIDENT, srvSetSettingResident); + CreateServiceFunction("DB/ResidentSettings/Enum", srvEnumResidentSettings); + return 0; +} -- cgit v1.2.3