From 68d3fd47bb9b75e65859d14199ffee01f16ac9a7 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 10 Feb 2014 20:47:51 +0000 Subject: HCONTACT is not needed anymore git-svn-id: http://svn.miranda-ng.org/main/trunk@8086 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- .../src/ex_import/classExImContactBase.cpp | 24 ++++++++++---------- .../src/ex_import/classExImContactBase.h | 14 ++++++------ .../src/ex_import/classExImContactXML.cpp | 24 ++++++++++---------- .../UserInfoEx/src/ex_import/dlg_ExImModules.cpp | 2 +- plugins/UserInfoEx/src/ex_import/svc_ExImINI.cpp | 26 +++++++++++----------- plugins/UserInfoEx/src/ex_import/svc_ExImINI.h | 2 +- plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp | 14 ++++++------ plugins/UserInfoEx/src/ex_import/svc_ExImVCF.h | 10 ++++----- plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp | 12 +++++----- plugins/UserInfoEx/src/ex_import/svc_ExImXML.h | 8 +++---- plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp | 8 +++---- plugins/UserInfoEx/src/ex_import/svc_ExImport.h | 2 +- 12 files changed, 73 insertions(+), 73 deletions(-) (limited to 'plugins/UserInfoEx/src/ex_import') diff --git a/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp b/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp index 023f551096..67681553b8 100644 --- a/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp +++ b/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp @@ -39,7 +39,7 @@ CExImContactBase::CExImContactBase() _pszUIDKey = NULL; _dbvUIDHash = NULL; ZeroMemory(&_dbvUID, sizeof(DBVARIANT)); - _hContact = (HCONTACT)INVALID_HANDLE_VALUE; + _hContact = INVALID_CONTACT_ID; _isNewContact = FALSE; } @@ -69,7 +69,7 @@ CExImContactBase::~CExImContactBase() * param: hContact - handle to contact whose information to read * return: TRUE if successful or FALSE otherwise **/ -BYTE CExImContactBase::fromDB(HCONTACT hContact) +BYTE CExImContactBase::fromDB(MCONTACT hContact) { BYTE ret = FALSE; BYTE isChatRoom = FALSE; @@ -224,14 +224,14 @@ BYTE CExImContactBase::fromIni(LPSTR& row) * param: hMetaContact - a meta contact to add this contact to * return: handle of the contact if successful **/ -HCONTACT CExImContactBase::toDB() +MCONTACT CExImContactBase::toDB() { // create new contact if none exists - if (_hContact == (HCONTACT)INVALID_HANDLE_VALUE && _pszProto && _pszUIDKey && _dbvUID.type != DBVT_DELETED) { + if (_hContact == INVALID_CONTACT_ID && _pszProto && _pszUIDKey && _dbvUID.type != DBVT_DELETED) { PROTOACCOUNT* pszAccount = 0; if (NULL == (pszAccount = ProtoGetAccount( _pszProto ))) { //account does not exist - return _hContact = (HCONTACT)INVALID_HANDLE_VALUE; + return _hContact = INVALID_CONTACT_ID; } if (!IsAccountEnabled(pszAccount)) { ; @@ -239,17 +239,17 @@ HCONTACT CExImContactBase::toDB() // create new contact _hContact = DB::Contact::Add(); if (!_hContact) { - return _hContact = (HCONTACT)INVALID_HANDLE_VALUE; + return _hContact = INVALID_CONTACT_ID; } // Add the protocol to the new contact if (CallService(MS_PROTO_ADDTOCONTACT, (WPARAM)_hContact, (LPARAM)_pszProto)) { DB::Contact::Delete(_hContact); - return _hContact = (HCONTACT)INVALID_HANDLE_VALUE; + return _hContact = INVALID_CONTACT_ID; } // write uid to protocol module if (db_set(_hContact, _pszProto, _pszUIDKey, &_dbvUID)) { DB::Contact::Delete(_hContact); - return _hContact = (HCONTACT)INVALID_HANDLE_VALUE; + return _hContact = INVALID_CONTACT_ID; } // write nick and display name if (_pszNick) db_set_utf(_hContact, _pszProto, SET_CONTACT_NICK, _pszNick); @@ -473,7 +473,7 @@ BYTE CExImContactBase::isMeta() const return DB::Module::IsMeta(_pszProto); } -BYTE CExImContactBase::isHandle(HCONTACT hContact) +BYTE CExImContactBase::isHandle(MCONTACT hContact) { LPCSTR pszProto; DBVARIANT dbv; @@ -521,9 +521,9 @@ BYTE CExImContactBase::isHandle(HCONTACT hContact) * param: none * return: handle if successful, INVALID_HANDLE_VALUE otherwise **/ -HCONTACT CExImContactBase::findHandle() +MCONTACT CExImContactBase::findHandle() { - for (HCONTACT hContact = db_find_first(); hContact != NULL; hContact = db_find_next(hContact)) { + for (MCONTACT hContact = db_find_first(); hContact != NULL; hContact = db_find_next(hContact)) { if (isHandle(hContact)) { _hContact = hContact; _isNewContact = FALSE; @@ -531,5 +531,5 @@ HCONTACT CExImContactBase::findHandle() } } _isNewContact = TRUE; - return _hContact = (HCONTACT)INVALID_HANDLE_VALUE; + return _hContact = INVALID_CONTACT_ID; } diff --git a/plugins/UserInfoEx/src/ex_import/classExImContactBase.h b/plugins/UserInfoEx/src/ex_import/classExImContactBase.h index e248c1d2a7..90e080b34e 100644 --- a/plugins/UserInfoEx/src/ex_import/classExImContactBase.h +++ b/plugins/UserInfoEx/src/ex_import/classExImContactBase.h @@ -37,17 +37,17 @@ protected: LPSTR _pszUIDKey; DWORD _dbvUIDHash; DBVARIANT _dbvUID; - HCONTACT _hContact; + MCONTACT _hContact; BYTE _isNewContact; // is this contact a new one? - HCONTACT findHandle(); + MCONTACT findHandle(); public: CExImContactBase(); ~CExImContactBase(); __inline DBVARIANT& uid() { return _dbvUID; } - __inline HCONTACT handle() const { return _hContact; } + __inline MCONTACT handle() const { return _hContact; } __inline void disp(LPCSTR val) { _pszDisp = val ? mir_strdup(val): NULL; } __inline void group(LPCSTR val) { _pszGroup = val ? mir_strdup(val): NULL; } @@ -72,16 +72,16 @@ public: mir_free(temp); } - BYTE isHandle(HCONTACT hContact); + BYTE isHandle(MCONTACT hContact); BYTE isMeta() const; LPSTR uid2String(BYTE bPrependType); - BYTE fromDB(HCONTACT hContact); + BYTE fromDB(MCONTACT hContact); BYTE fromIni(LPSTR& row); - HCONTACT toDB(); + MCONTACT toDB(); void toIni(FILE* file, int modCount); - BYTE operator = (HCONTACT hContact) { return fromDB(hContact); } + BYTE operator = (MCONTACT hContact) { return fromDB(hContact); } }; diff --git a/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp b/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp index 1bef0889b8..de9db38883 100644 --- a/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp +++ b/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp @@ -207,7 +207,7 @@ int CExImContactXML::Export(FILE *xmlfile, DB::CEnumList* pModules) if (!xmlfile) return ERROR_INVALID_PARAMS; - if (_hContact == (HCONTACT)INVALID_HANDLE_VALUE) + if (_hContact == INVALID_CONTACT_ID) return ERROR_INVALID_CONTACT; if (!CreateXmlElement()) @@ -219,7 +219,7 @@ int CExImContactXML::Export(FILE *xmlfile, DB::CEnumList* pModules) const int cnt = DB::MetaContact::SubCount(_hContact); const int def = DB::MetaContact::SubDefNum(_hContact); - HCONTACT hSubContact = DB::MetaContact::Sub(_hContact, def); + MCONTACT hSubContact = DB::MetaContact::Sub(_hContact, def); // export default subcontact if (hSubContact && vContact.fromDB(hSubContact)) @@ -488,7 +488,7 @@ int CExImContactXML::LoadXmlElemnt(TiXmlElement *xContact) // delete last contact db_free(&_dbvUID); - _hContact = (HCONTACT)INVALID_HANDLE_VALUE; + _hContact = INVALID_CONTACT_ID; _xmlNode = xContact; MIR_FREE(_pszAMPro); ampro(xContact->Attribute("ampro")); @@ -510,8 +510,8 @@ int CExImContactXML::LoadXmlElemnt(TiXmlElement *xContact) CExImContactXML vSub(_pXmlFile); if (vSub = xSub) { // identify metacontact by the first valid subcontact in xmlfile - if (_hContact == (HCONTACT)INVALID_HANDLE_VALUE && vSub.handle() != (HCONTACT)INVALID_HANDLE_VALUE) { - HCONTACT hMeta = (HCONTACT)CallService(MS_MC_GETMETACONTACT, (WPARAM)vSub.handle(), NULL); + if (_hContact == INVALID_CONTACT_ID && vSub.handle() != INVALID_CONTACT_ID) { + MCONTACT hMeta = (MCONTACT)CallService(MS_MC_GETMETACONTACT, (WPARAM)vSub.handle(), NULL); if (hMeta != NULL) { _hContact = hMeta; break; @@ -520,7 +520,7 @@ int CExImContactXML::LoadXmlElemnt(TiXmlElement *xContact) } } // if no handle was found, this is a new meta contact - _isNewContact = _hContact == (HCONTACT)INVALID_HANDLE_VALUE; + _isNewContact = _hContact == INVALID_CONTACT_ID; } // entry is a default contact else { @@ -588,7 +588,7 @@ int CExImContactXML::LoadXmlElemnt(TiXmlElement *xContact) int CExImContactXML::ImportContact() { // create the contact if not yet exists - if (toDB() != (HCONTACT)INVALID_HANDLE_VALUE) { + if (toDB() != INVALID_CONTACT_ID) { _hEvent = NULL; // count settings and events and init progress dialog @@ -610,7 +610,7 @@ int CExImContactXML::ImportContact() LPGENT("You aborted import of a new contact.\nSome information may be missing for this contact.\n\nDo you want to delete the incomplete contact?")); if (result == IDYES) { DB::Contact::Delete(_hContact); - _hContact = (HCONTACT)INVALID_HANDLE_VALUE; + _hContact = INVALID_CONTACT_ID; } } return ERROR_ABORTED; @@ -674,9 +674,9 @@ int CExImContactXML::Import(BYTE keepMetaSubContact) return result; // convert default subcontact to metacontact - _hContact = (HCONTACT)CallService(MS_MC_CONVERTTOMETA, (WPARAM)vContact.handle(), NULL); + _hContact = (MCONTACT)CallService(MS_MC_CONVERTTOMETA, (WPARAM)vContact.handle(), NULL); if (_hContact == NULL) { - _hContact = (HCONTACT)INVALID_HANDLE_VALUE; + _hContact = INVALID_CONTACT_ID; return ERROR_CONVERT_METACONTACT; } @@ -736,7 +736,7 @@ int CExImContactXML::ImportMetaSubContact(CExImContactXML * pMetaContact) return err; // check if contact is subcontact of the desired meta contact - if ((HCONTACT)CallService(MS_MC_GETMETACONTACT, (WPARAM)_hContact, NULL) != pMetaContact->handle()) { + if ((MCONTACT)CallService(MS_MC_GETMETACONTACT, (WPARAM)_hContact, NULL) != pMetaContact->handle()) { // add contact to the metacontact (this service returns TRUE if successful) err = CallService(MS_MC_ADDTOMETA, (WPARAM)_hContact, (LPARAM)pMetaContact->handle()); if (err == FALSE) { @@ -753,7 +753,7 @@ int CExImContactXML::ImportMetaSubContact(CExImContactXML * pMetaContact) MIR_FREE(ptszMetaNick); if (result == IDYES) { DB::Contact::Delete(_hContact); - _hContact = (HCONTACT)INVALID_HANDLE_VALUE; + _hContact = INVALID_CONTACT_ID; } } return ERROR_ADDTO_METACONTACT; diff --git a/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp b/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp index 1c552187e2..f6b36c931f 100644 --- a/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp +++ b/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp @@ -292,7 +292,7 @@ INT_PTR CALLBACK SelectModulesToExport_DlgProc(HWND hDlg, UINT uMsg, WPARAM wPar // module must exist in at least one contact if (pDat->ExImContact->Typ != EXIM_CONTACT) // TRUE = All Contacts { - HCONTACT hContact; + MCONTACT hContact; for (hContact = db_find_first(); hContact != NULL; hContact = db_find_next(hContact)) { diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImINI.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImINI.cpp index acd8410463..458e41d901 100644 --- a/plugins/UserInfoEx/src/ex_import/svc_ExImINI.cpp +++ b/plugins/UserInfoEx/src/ex_import/svc_ExImINI.cpp @@ -37,7 +37,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * file - file to write the settings to * return nothing **/ -static void ExportModule(HCONTACT hContact, LPCSTR pszModule, FILE* file) +static void ExportModule(MCONTACT hContact, LPCSTR pszModule, FILE* file) { DB::CEnumList Settings; @@ -126,7 +126,7 @@ static void ExportModule(HCONTACT hContact, LPCSTR pszModule, FILE* file) * pModules - module to export, NULL to export all modules of a contact * file - ini file to write the contact to **/ -static BYTE ExportContact(HCONTACT hContact, DB::CEnumList* pModules, FILE* file) +static BYTE ExportContact(MCONTACT hContact, DB::CEnumList* pModules, FILE* file) { CExImContactBase vcc; @@ -167,7 +167,7 @@ int SvcExImINI_Export(lpExImParam ExImContact, LPCSTR pszFileName) errno_t err; DB::CEnumList Modules; SYSTEMTIME now; - HCONTACT hContact; + MCONTACT hContact; if (!DlgExImModules_SelectModulesToExport(ExImContact, &Modules, NULL)) { @@ -298,12 +298,12 @@ static DWORD ImportreadLine(FILE* file, LPSTR &str) * cchBuf - character count of the buffer * return: handle to the contact that matches the information or NULL if no match **/ -static HCONTACT ImportFindContact(HCONTACT hContact, LPSTR &strBuf, BYTE bCanCreate) +static MCONTACT ImportFindContact(MCONTACT hContact, LPSTR &strBuf, BYTE bCanCreate) { CExImContactBase vcc; vcc.fromIni(strBuf); - if (vcc.handle() != (HCONTACT)INVALID_HANDLE_VALUE) { + if (vcc.handle() != INVALID_CONTACT_ID) { //if (vcc.isHandle(hContact)) // return hContact; return vcc.handle(); @@ -322,7 +322,7 @@ static HCONTACT ImportFindContact(HCONTACT hContact, LPSTR &strBuf, BYTE bCanCre * strLine - string with the setting and its value to write to db * return: 0 if writing was ok, 1 otherwise **/ -int ImportSetting(HCONTACT hContact, LPCSTR pszModule, LPSTR &strLine) +int ImportSetting(MCONTACT hContact, LPCSTR pszModule, LPSTR &strLine) { DBVARIANT dbv; LPSTR end, value; @@ -433,10 +433,10 @@ int ImportSetting(HCONTACT hContact, LPCSTR pszModule, LPSTR &strLine) * strLine - string with the setting and its value to write to db * return: 0 if writing was ok, 1 otherwise **/ -int SvcExImINI_Import(HCONTACT hContact, LPCSTR pszFileName) +int SvcExImINI_Import(MCONTACT hContact, LPCSTR pszFileName) { FILE *file; - HCONTACT hNewContact = (HCONTACT)INVALID_HANDLE_VALUE; + MCONTACT hNewContact = INVALID_CONTACT_ID; DWORD end, numLines = 0; CHAR szModule[MAXSETTING] = {0}; @@ -452,11 +452,11 @@ int SvcExImINI_Import(HCONTACT hContact, LPCSTR pszFileName) numLines++; // contact was found and imported - if (hContact != (HCONTACT)INVALID_HANDLE_VALUE && hNewContact != (HCONTACT)INVALID_HANDLE_VALUE) + if (hContact != INVALID_CONTACT_ID && hNewContact != INVALID_CONTACT_ID) break; // importing settings is only valid vor the main menu item - if (hContact == (HCONTACT)INVALID_HANDLE_VALUE) { + if (hContact == INVALID_CONTACT_ID) { if (!strncmp(strBuf, "SETTINGS:", 9)) { *szModule = 0; hNewContact = NULL; @@ -471,7 +471,7 @@ int SvcExImINI_Import(HCONTACT hContact, LPCSTR pszFileName) strBuf = mir_strnerase(strBuf, 0, 1); numContactsInFile++; - if ((hNewContact = ImportFindContact(hContact, strBuf, FALSE)) != (HCONTACT)INVALID_HANDLE_VALUE) + if ((hNewContact = ImportFindContact(hContact, strBuf, FALSE)) != INVALID_CONTACT_ID) numContactsAdded++; continue; } @@ -484,13 +484,13 @@ int SvcExImINI_Import(HCONTACT hContact, LPCSTR pszFileName) *szModule = 0; numContactsInFile++; - if ((hNewContact = ImportFindContact(hContact, strBuf, TRUE)) != (HCONTACT)INVALID_HANDLE_VALUE) + if ((hNewContact = ImportFindContact(hContact, strBuf, TRUE)) != INVALID_CONTACT_ID) numContactsAdded++; continue; } // read modules and settings only for valid contacts - if (hNewContact != (HCONTACT)INVALID_HANDLE_VALUE) { + if (hNewContact != INVALID_CONTACT_ID) { // found a module line if (strBuf[0] == '[' && (end = (strchr(strBuf, ']') - strBuf)) > 0) { mir_strncpy(szModule, &strBuf[1], end); diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImINI.h b/plugins/UserInfoEx/src/ex_import/svc_ExImINI.h index 9d737fcdb8..250df73991 100644 --- a/plugins/UserInfoEx/src/ex_import/svc_ExImINI.h +++ b/plugins/UserInfoEx/src/ex_import/svc_ExImINI.h @@ -25,6 +25,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #pragma once int SvcExImINI_Export(lpExImParam ExImContact, LPCSTR pszFileName); - int SvcExImINI_Import(HCONTACT hContact, LPCSTR pszFileName); + int SvcExImINI_Import(MCONTACT hContact, LPCSTR pszFileName); #endif /* _SVC_EXIMINI_H_ */ diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp index 0cea3cff25..0f27390c84 100644 --- a/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp +++ b/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp @@ -557,7 +557,7 @@ size_t CLineBuffer::GetTokenNext(const CHAR delim, CLineBuffer * pBuf) * * return: 0 if successful, 1 otherwise **/ -int CLineBuffer::DBWriteTokenFirst(HCONTACT hContact, const CHAR* pszModule, const CHAR* pszSetting, const CHAR delim) +int CLineBuffer::DBWriteTokenFirst(MCONTACT hContact, const CHAR* pszModule, const CHAR* pszSetting, const CHAR delim) { PBYTE here; int iRet = 1; @@ -594,7 +594,7 @@ int CLineBuffer::DBWriteTokenFirst(HCONTACT hContact, const CHAR* pszModule, con * * return: 0 if successful, 1 otherwise **/ -int CLineBuffer::DBWriteTokenNext(HCONTACT hContact, const CHAR* pszModule, const CHAR* pszSetting, const CHAR delim) +int CLineBuffer::DBWriteTokenNext(MCONTACT hContact, const CHAR* pszModule, const CHAR* pszSetting, const CHAR delim) { PBYTE here; int iRet = 1; @@ -628,7 +628,7 @@ int CLineBuffer::DBWriteTokenNext(HCONTACT hContact, const CHAR* pszModule, cons * * return: 0 if successful, 1 otherwise **/ -int CLineBuffer::DBWriteSettingString(HCONTACT hContact, const CHAR* pszModule, const CHAR* pszSetting) +int CLineBuffer::DBWriteSettingString(MCONTACT hContact, const CHAR* pszModule, const CHAR* pszSetting) { if (_pVal && _cbUsed > 0) return db_set_s(hContact, pszModule, pszSetting, (LPSTR)_pVal); @@ -650,7 +650,7 @@ int CLineBuffer::DBWriteSettingString(HCONTACT hContact, const CHAR* pszModule, CVCardFileVCF::CVCardFileVCF() { _pFile = NULL; - _hContact = (HCONTACT)INVALID_HANDLE_VALUE; + _hContact = INVALID_CONTACT_ID; _pszBaseProto = NULL; _hasUtf8 = 0; _useUtf8 = FALSE; @@ -850,11 +850,11 @@ void CVCardFileVCF::writeLineEncoded(const CHAR *szSet, size_t *cbRew) * pszMode - the mode the file should be opened with * return TRUE or FALSE **/ -BYTE CVCardFileVCF::Open(HCONTACT hContact, LPCSTR pszFileName, LPCSTR pszMode) +BYTE CVCardFileVCF::Open(MCONTACT hContact, LPCSTR pszFileName, LPCSTR pszMode) { if (!(_pFile = fopen(pszFileName, pszMode))) return FALSE; - if ((_hContact = hContact) == (HCONTACT)INVALID_HANDLE_VALUE) + if ((_hContact = hContact) == INVALID_CONTACT_ID) return FALSE; if (!(_pszBaseProto = DB::Contact::Proto(_hContact))) return FALSE; @@ -874,7 +874,7 @@ void CVCardFileVCF::Close(void) if (_pFile) fclose(_pFile); _pFile = NULL; - _hContact = (HCONTACT)INVALID_HANDLE_VALUE; + _hContact = INVALID_CONTACT_ID; _pszBaseProto = NULL; } diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.h b/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.h index 2507d83b61..cb1e70b4ec 100644 --- a/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.h +++ b/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.h @@ -59,9 +59,9 @@ public: size_t GetTokenFirst(const CHAR delim, CLineBuffer * pBuf); size_t GetTokenNext(const CHAR delim, CLineBuffer * pBuf); - int DBWriteTokenFirst(HCONTACT hContact, const CHAR* pszModule, const CHAR* pszSetting, const CHAR delim); - int DBWriteTokenNext(HCONTACT hContact, const CHAR* pszModule, const CHAR* pszSetting, const CHAR delim); - int DBWriteSettingString(HCONTACT hContact, const CHAR* pszModule, const CHAR* pszSetting); + int DBWriteTokenFirst(MCONTACT hContact, const CHAR* pszModule, const CHAR* pszSetting, const CHAR delim); + int DBWriteTokenNext(MCONTACT hContact, const CHAR* pszModule, const CHAR* pszSetting, const CHAR delim); + int DBWriteSettingString(MCONTACT hContact, const CHAR* pszModule, const CHAR* pszSetting); }; class CVCardFileVCF @@ -69,7 +69,7 @@ class CVCardFileVCF private: CLineBuffer _clVal; FILE *_pFile; - HCONTACT _hContact; + MCONTACT _hContact; const CHAR *_pszBaseProto; WORD _cbRew; BYTE _useUtf8; @@ -87,7 +87,7 @@ private: public: CVCardFileVCF(); - BYTE Open(HCONTACT hContact, LPCSTR pszFileName, LPCSTR pszMode); + BYTE Open(MCONTACT hContact, LPCSTR pszFileName, LPCSTR pszMode); void Close(void); BYTE Export(BYTE bExportUtf); BYTE Import(); diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp index 245c28e016..6a5f9154dc 100644 --- a/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp +++ b/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp @@ -93,7 +93,7 @@ int CFileXml::Export(lpExImParam ExImContact, LPCSTR pszFileName) LONG cbHeader; SYSTEMTIME now; DWORD result; - HCONTACT hContact; + MCONTACT hContact; result = (DWORD)DialogBox(ghInst, MAKEINTRESOURCE(IDD_EXPORT_DATAHISTORY), @@ -139,7 +139,7 @@ int CFileXml::Export(lpExImParam ExImContact, LPCSTR pszFileName) } else { // other export mode - _hContactToWorkOn = (HCONTACT)INVALID_HANDLE_VALUE; + _hContactToWorkOn = INVALID_CONTACT_ID; #ifdef _DEBUG LARGE_INTEGER freq, t1, t2; @@ -265,8 +265,8 @@ int CFileXml::ImportContacts(TiXmlElement* xmlParent) switch (result) { case ERROR_OK: // init contact class and import if matches the user desires - if (_hContactToWorkOn == (HCONTACT)INVALID_HANDLE_VALUE || vContact.handle() == _hContactToWorkOn) { - result = vContact.Import(_hContactToWorkOn != (HCONTACT)INVALID_HANDLE_VALUE); + if (_hContactToWorkOn == INVALID_CONTACT_ID || vContact.handle() == _hContactToWorkOn) { + result = vContact.Import(_hContactToWorkOn != INVALID_CONTACT_ID); switch (result) { case ERROR_OK: _numContactsDone++; @@ -295,7 +295,7 @@ int CFileXml::ImportContacts(TiXmlElement* xmlParent) if (pszNick) mir_free(pszNick); } // import owner contact - else if (_hContactToWorkOn == (HCONTACT)INVALID_HANDLE_VALUE && !mir_stricmp(xContact->Value(), XKEY_OWNER) && (vContact = xContact)) { + else if (_hContactToWorkOn == INVALID_CONTACT_ID && !mir_stricmp(xContact->Value(), XKEY_OWNER) && (vContact = xContact)) { result = vContact.Import(); switch (result) { case ERROR_OK: @@ -346,7 +346,7 @@ DWORD CFileXml::CountContacts(TiXmlElement* xmlParent) * pszFileName - full qualified path to the xml file which is to import * return: ERROR_OK on success or one other element of ImportError to tell the type of failure **/ -int CFileXml::Import(HCONTACT hContact, LPCSTR pszFileName) +int CFileXml::Import(MCONTACT hContact, LPCSTR pszFileName) { TiXmlDocument doc; TiXmlElement *xmlCard = NULL; diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImXML.h b/plugins/UserInfoEx/src/ex_import/svc_ExImXML.h index cbc64d761d..b7e6fe50ee 100644 --- a/plugins/UserInfoEx/src/ex_import/svc_ExImXML.h +++ b/plugins/UserInfoEx/src/ex_import/svc_ExImXML.h @@ -37,7 +37,7 @@ class CFileXml { DWORD _numEventsDone; DWORD _numEventsDuplicated; - HCONTACT _hContactToWorkOn; // contact to ex/import (NULL=owner|INVALID_HANDLE_VALUE=all|HADNLE=one user) + MCONTACT _hContactToWorkOn; // contact to ex/import (NULL=owner|INVALID_HANDLE_VALUE=all|HADNLE=one user) WORD _wExport; @@ -50,13 +50,13 @@ class CFileXml { /* int ExportOwner(FILE *xmlfile, BYTE bExportEvents); - int ExportContact(FILE *xmlfile, HCONTACT hContact, BYTE bExportEvents, LPENUMLIST pModules); - int ExportSubContact(TiXmlElement *xContact, HCONTACT hContact, BYTE bExportEvents); + int ExportContact(FILE *xmlfile, MCONTACT hContact, BYTE bExportEvents, LPENUMLIST pModules); + int ExportSubContact(TiXmlElement *xContact, MCONTACT hContact, BYTE bExportEvents); */ public: CFileXml(); - int Import(HCONTACT hContact, LPCSTR pszFileName); + int Import(MCONTACT hContact, LPCSTR pszFileName); int Export(lpExImParam ExImContact, LPCSTR pszFileName); }; diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp index 0632d96f32..50f0aba261 100644 --- a/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp +++ b/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp @@ -211,7 +211,7 @@ INT_PTR svcExIm_MainExport_Service(WPARAM wParam, LPARAM lParam) { ExImParam ExIm; ZeroMemory(&ExIm, sizeof(ExIm)); - ExIm.hContact = (HCONTACT)INVALID_HANDLE_VALUE; + ExIm.hContact = INVALID_CONTACT_ID; ExIm.Typ = EXIM_ALL; return SvcExImport_Export(&ExIm, (HWND)lParam); } @@ -220,7 +220,7 @@ INT_PTR svcExIm_MainImport_Service(WPARAM wParam, LPARAM lParam) { ExImParam ExIm; ZeroMemory(&ExIm, sizeof(ExIm)); - ExIm.hContact = (HCONTACT)INVALID_HANDLE_VALUE; + ExIm.hContact = INVALID_CONTACT_ID; ExIm.Typ = EXIM_ALL; return SvcExImport_Import(&ExIm, (HWND)lParam); } @@ -233,7 +233,7 @@ INT_PTR svcExIm_ContactExport_Service(WPARAM wParam, LPARAM lParam) { ExImParam ExIm; ZeroMemory(&ExIm, sizeof(ExIm)); - ExIm.hContact = (HCONTACT)wParam; + ExIm.hContact = (MCONTACT)wParam; ExIm.Typ = EXIM_CONTACT; return SvcExImport_Export(&ExIm, (HWND)lParam); } @@ -242,7 +242,7 @@ INT_PTR svcExIm_ContactImport_Service(WPARAM wParam, LPARAM lParam) { ExImParam ExIm; ZeroMemory(&ExIm, sizeof(ExIm)); - ExIm.hContact = (HCONTACT)wParam; + ExIm.hContact = (MCONTACT)wParam; ExIm.Typ = EXIM_CONTACT; return SvcExImport_Import(&ExIm, (HWND)lParam); } diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImport.h b/plugins/UserInfoEx/src/ex_import/svc_ExImport.h index 484c266535..5a6f684139 100644 --- a/plugins/UserInfoEx/src/ex_import/svc_ExImport.h +++ b/plugins/UserInfoEx/src/ex_import/svc_ExImport.h @@ -26,7 +26,7 @@ typedef struct { BYTE Typ; union { - HCONTACT hContact; + MCONTACT hContact; LPSTR pszName; LPTSTR ptszName; }; -- cgit v1.2.3