From ae3cee537d478fba0f32e561a12d62213a85a4d5 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 28 Jul 2013 11:55:00 +0000 Subject: - stubs for PROTO get* & set* functions removed from mir_core; - helpers themselves made inline; - added missing helpers for getWStringA - removed completely obsolete DB header for ICQ git-svn-id: http://svn.miranda-ng.org/main/trunk@5507 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/mir_core/mir_core.def | 24 ------------ src/mir_core/protos.cpp | 98 ----------------------------------------------- 2 files changed, 122 deletions(-) (limited to 'src') diff --git a/src/mir_core/mir_core.def b/src/mir_core/mir_core.def index 1423a8a086..12960b2e08 100644 --- a/src/mir_core/mir_core.def +++ b/src/mir_core/mir_core.def @@ -174,27 +174,3 @@ ProtoHookEvent @171 ProtoCreateHookableEvent @172 ProtoForkThread @173 ProtoForkThreadEx @174 -ProtoGetBool0 @175 -ProtoGetBool @176 -ProtoGetByte0 @177 -ProtoGetByte @178 -ProtoGetDword0 @179 -ProtoGetDword @180 -ProtoGetString0 @181 -ProtoGetString @182 -ProtoGetTString0 @183 -ProtoGetTString @184 -ProtoGetWord0 @185 -ProtoGetWord @186 -ProtoGetStringA0 @187 -ProtoGetStringA @188 -ProtoSetByte0 @189 -ProtoSetByte @190 -ProtoSetWord0 @191 -ProtoSetWord @192 -ProtoSetDword0 @193 -ProtoSetDword @194 -ProtoSetString0 @195 -ProtoSetString @196 -ProtoSetTString0 @197 -ProtoSetTString @198 diff --git a/src/mir_core/protos.cpp b/src/mir_core/protos.cpp index 8646deb338..098bf280d4 100644 --- a/src/mir_core/protos.cpp +++ b/src/mir_core/protos.cpp @@ -141,101 +141,3 @@ MIR_CORE_DLL(HANDLE) ProtoForkThreadEx(PROTO_INTERFACE *pThis, ProtoThreadFunc p UINT lthreadID; return (HANDLE)::mir_forkthreadowner((pThreadFuncOwner) *(void**)&pFunc, pThis, param, threadID ? threadID : <hreadID); } - -///////////////////////////////////////////////////////////////////////////////////////// - -MIR_CORE_DLL(bool) ProtoGetBool0(PROTO_INTERFACE *pThis, const char* name, bool defaultValue) -{ return db_get_b(NULL, pThis->m_szModuleName, name, defaultValue) != 0; -} - -MIR_CORE_DLL(bool) ProtoGetBool(PROTO_INTERFACE *pThis, HANDLE hContact, const char* name, bool defaultValue) -{ return db_get_b(hContact, pThis->m_szModuleName, name, defaultValue) != 0; -} - -MIR_CORE_DLL(int) ProtoGetByte0(PROTO_INTERFACE *pThis, const char* name, BYTE defaultValue) -{ return db_get_b(NULL, pThis->m_szModuleName, name, defaultValue); -} - -MIR_CORE_DLL(int) ProtoGetByte(PROTO_INTERFACE *pThis, HANDLE hContact, const char* name, BYTE defaultValue) -{ return db_get_b(hContact, pThis->m_szModuleName, name, defaultValue); -} - -MIR_CORE_DLL(DWORD) ProtoGetDword0(PROTO_INTERFACE *pThis, const char* name, DWORD defaultValue) -{ return db_get_dw(NULL, pThis->m_szModuleName, name, defaultValue); -} - -MIR_CORE_DLL(DWORD) ProtoGetDword(PROTO_INTERFACE *pThis, HANDLE hContact, const char* name, DWORD defaultValue) -{ return db_get_dw(hContact, pThis->m_szModuleName, name, defaultValue); -} - -MIR_CORE_DLL(int) ProtoGetString0(PROTO_INTERFACE *pThis, const char* name, DBVARIANT* result) -{ return db_get_s(NULL, pThis->m_szModuleName, name, result); -} - -MIR_CORE_DLL(int) ProtoGetString(PROTO_INTERFACE *pThis, HANDLE hContact, const char* name, DBVARIANT* result) -{ return db_get_s(hContact, pThis->m_szModuleName, name, result); -} - -MIR_CORE_DLL(int) ProtoGetTString0(PROTO_INTERFACE *pThis, const char* name, DBVARIANT* result) -{ return db_get_ts(NULL, pThis->m_szModuleName, name, result); -} - -MIR_CORE_DLL(int) ProtoGetTString(PROTO_INTERFACE *pThis, HANDLE hContact, const char* name, DBVARIANT* result) -{ return db_get_ts(hContact, pThis->m_szModuleName, name, result); -} - -MIR_CORE_DLL(WORD) ProtoGetWord0(PROTO_INTERFACE *pThis, const char* name, WORD defaultValue) -{ return (WORD)db_get_w(NULL, pThis->m_szModuleName, name, defaultValue); -} - -MIR_CORE_DLL(WORD) ProtoGetWord(PROTO_INTERFACE *pThis, HANDLE hContact, const char* name, WORD defaultValue) -{ return (WORD)db_get_w(hContact, pThis->m_szModuleName, name, defaultValue); -} - -MIR_CORE_DLL(char*) ProtoGetStringA0(PROTO_INTERFACE *pThis, const char* setting) -{ return db_get_sa(NULL, pThis->m_szModuleName, setting); -} - -MIR_CORE_DLL(char*) ProtoGetStringA(PROTO_INTERFACE *pThis, HANDLE hContact, const char* setting) -{ return db_get_sa(hContact, pThis->m_szModuleName, setting); -} - -MIR_CORE_DLL(void) ProtoSetByte0(PROTO_INTERFACE *pThis, const char* name, BYTE value) -{ db_set_b(NULL, pThis->m_szModuleName, name, value); -} - -MIR_CORE_DLL(void) ProtoSetByte(PROTO_INTERFACE *pThis, HANDLE hContact, const char* name, BYTE value) -{ db_set_b(hContact, pThis->m_szModuleName, name, value); -} - -MIR_CORE_DLL(void) ProtoSetWord0(PROTO_INTERFACE *pThis, const char* name, WORD value) -{ db_set_w(NULL, pThis->m_szModuleName, name, value); -} - -MIR_CORE_DLL(void) ProtoSetWord(PROTO_INTERFACE *pThis, HANDLE hContact, const char* name, WORD value) -{ db_set_w(hContact, pThis->m_szModuleName, name, value); -} - -MIR_CORE_DLL(void) ProtoSetDword0(PROTO_INTERFACE *pThis, const char* name, DWORD value) -{ db_set_dw(NULL, pThis->m_szModuleName, name, value); -} - -MIR_CORE_DLL(void) ProtoSetDword(PROTO_INTERFACE *pThis, HANDLE hContact, const char* name, DWORD value) -{ db_set_dw(hContact, pThis->m_szModuleName, name, value); -} - -MIR_CORE_DLL(void) ProtoSetString0(PROTO_INTERFACE *pThis, const char* name, const char* value) -{ db_set_s(NULL, pThis->m_szModuleName, name, value); -} - -MIR_CORE_DLL(void) ProtoSetString(PROTO_INTERFACE *pThis, HANDLE hContact, const char* name, const char* value) -{ db_set_s(hContact, pThis->m_szModuleName, name, value); -} - -MIR_CORE_DLL(void) ProtoSetTString0(PROTO_INTERFACE *pThis, const char* name, const TCHAR* value) -{ db_set_ts(NULL, pThis->m_szModuleName, name, value); -} - -MIR_CORE_DLL(void) ProtoSetTString(PROTO_INTERFACE *pThis, HANDLE hContact, const char* name, const TCHAR* value) -{ db_set_ts(hContact, pThis->m_szModuleName, name, value); -} -- cgit v1.2.3