From 33953cc6a0fab6a91af293c6838f8a46dd7922da Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 10 Feb 2014 14:42:51 +0000 Subject: HCONTACT, part 3 git-svn-id: http://svn.miranda-ng.org/main/trunk@8081 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Quotes/src/ImportExport.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'plugins/Quotes/src/ImportExport.cpp') diff --git a/plugins/Quotes/src/ImportExport.cpp b/plugins/Quotes/src/ImportExport.cpp index 282d5aa448..6bf10e2de3 100644 --- a/plugins/Quotes/src/ImportExport.cpp +++ b/plugins/Quotes/src/ImportExport.cpp @@ -128,7 +128,6 @@ namespace int EnumDbModules(const char* szModuleName, DWORD ofsModuleName, LPARAM lp) { -// USES_CONVERSION; CEnumContext* ctx = reinterpret_cast(lp); IXMLNode::TXMLNodePtr pXml = ctx->m_pNode; IXMLNode::TXMLNodePtr pModule = ctx->m_pXmlEngine->CreateNode(g_pszXmlModule,quotes_a2t(szModuleName)/*A2CT(szModuleName)*/); @@ -142,11 +141,10 @@ namespace dbces.szModule = szModuleName; dbces.lParam = reinterpret_cast(ctx); - CallService(MS_DB_CONTACT_ENUMSETTINGS,reinterpret_cast(ctx->m_hContact),reinterpret_cast(&dbces)); + CallService(MS_DB_CONTACT_ENUMSETTINGS, WPARAM(ctx->m_hContact),reinterpret_cast(&dbces)); if(pModule->GetChildCount() > 0) - { pXml->AddChild(pModule); - } + ctx->m_pNode = pXml; } @@ -273,7 +271,7 @@ INT_PTR Quotes_Export(WPARAM wp,LPARAM lp) CModuleInfo::TXMLEnginePtr pXmlEngine = CModuleInfo::GetInstance().GetXMLEnginePtr(); CModuleInfo::TQuotesProvidersPtr pProviders = CModuleInfo::GetInstance().GetQuoteProvidersPtr(); IXMLNode::TXMLNodePtr pRoot = pXmlEngine->CreateNode(g_pszXmlContacts,tstring()); - HCONTACT hContact = reinterpret_cast(wp); + HCONTACT hContact = HCONTACT(wp); if(hContact) { CQuotesProviders::TQuotesProviderPtr pProvider = pProviders->GetContactProviderPtr(hContact); @@ -676,7 +674,7 @@ namespace { if(NULL == cst.m_hContact) { - cst.m_hContact = reinterpret_cast(CallService(MS_DB_CONTACT_ADD,0,0)); + cst.m_hContact = HCONTACT(CallService(MS_DB_CONTACT_ADD,0,0)); cst.m_bNewContact = true; } else if(impctx.m_nFlags"ES_IMPORT_SKIP_EXISTING_CONTACTS) -- cgit v1.2.3