update for system includes & import libraries

8 files changed, 27 insertions, 25 deletions

diff --git a/src/mir_app/src/MDatabaseReadonly.cpp b/src/mir_app/src/MDatabaseReadonly.cpp
index 51e0d203bd..94dfef07b0 100644
--- a/src/mir_app/src/MDatabaseReadonly.cpp
+++ b/src/mir_app/src/MDatabaseReadonly.cpp
@@ -81,7 +81,7 @@ MCONTACT MDatabaseReadonly::AddContact(void)
 	return 0;
 }
 
-LONG MDatabaseReadonly::DeleteContact(MCONTACT)
+int MDatabaseReadonly::DeleteContact(MCONTACT)
 {
 	return 1;
 }
@@ -91,7 +91,7 @@ BOOL MDatabaseReadonly::IsDbContact(MCONTACT contactID)
 	return contactID == 1;
 }
 
-LONG MDatabaseReadonly::GetContactSize(void)
+int MDatabaseReadonly::GetContactSize(void)
 {
 	return sizeof(DBCachedContact);
 }
@@ -113,7 +113,7 @@ BOOL MDatabaseReadonly::EditEvent(MCONTACT, MEVENT, const DBEVENTINFO*)
 	return 1;
 }
 
-LONG MDatabaseReadonly::GetBlobSize(MEVENT)
+int MDatabaseReadonly::GetBlobSize(MEVENT)
 {
 	return 0;
 }
diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def
index 541ff70dad..cdb53fd277 100644
--- a/src/mir_app/src/mir_app.def
+++ b/src/mir_app/src/mir_app.def
@@ -578,15 +578,15 @@ Miranda_WaitOnHandleEx @663
 ??1MDatabaseReadonly@@UAE@XZ @664 NONAME

 ?AddContact@MDatabaseReadonly@@UAGIXZ @665 NONAME

 ?AddEvent@MDatabaseReadonly@@UAGIIPBUDBEVENTINFO@@@Z @666 NONAME

-?DeleteContact@MDatabaseReadonly@@UAGJI@Z @667 NONAME

+?DeleteContact@MDatabaseReadonly@@UAGHI@Z @667 NONAME

 ?DeleteContactSetting@MDatabaseReadonly@@UAGHIPBD0@Z @668 NONAME

 ?DeleteEvent@MDatabaseReadonly@@UAGHI@Z @669 NONAME

 ?EnumContactSettings@MDatabaseReadonly@@UAGHIP6AHPBDPAX@Z01@Z @670 NONAME

 ?EnumModuleNames@MDatabaseReadonly@@UAGHP6AHPBDPAX@Z1@Z @671 NONAME

 ?FindFirstUnreadEvent@MDatabaseReadonly@@UAGII@Z @672 NONAME

-?GetBlobSize@MDatabaseReadonly@@UAGJI@Z @673 NONAME

+?GetBlobSize@MDatabaseReadonly@@UAGHI@Z @673 NONAME

 ?GetContactSettingWorker@MDatabaseReadonly@@UAGHIPBD0PAUDBVARIANT@@H@Z @674 NONAME

-?GetContactSize@MDatabaseReadonly@@UAGJXZ @675 NONAME

+?GetContactSize@MDatabaseReadonly@@UAGHXZ @675 NONAME

 ?GetEventContact@MDatabaseReadonly@@UAGII@Z @676 NONAME

 ?IsDbContact@MDatabaseReadonly@@UAGHI@Z @677 NONAME

 ?IsRelational@MDatabaseReadonly@@UAGHXZ @678 NONAME

diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def
index 04a989d599..ec9a92f9bb 100644
--- a/src/mir_app/src/mir_app64.def
+++ b/src/mir_app/src/mir_app64.def
@@ -578,15 +578,15 @@ Miranda_WaitOnHandleEx @663
 ??1MDatabaseReadonly@@UEAA@XZ @664 NONAME

 ?AddContact@MDatabaseReadonly@@UEAAIXZ @665 NONAME

 ?AddEvent@MDatabaseReadonly@@UEAAIIPEBUDBEVENTINFO@@@Z @666 NONAME

-?DeleteContact@MDatabaseReadonly@@UEAAJI@Z @667 NONAME

+?DeleteContact@MDatabaseReadonly@@UEAAHI@Z @667 NONAME

 ?DeleteContactSetting@MDatabaseReadonly@@UEAAHIPEBD0@Z @668 NONAME

 ?DeleteEvent@MDatabaseReadonly@@UEAAHI@Z @669 NONAME

 ?EnumContactSettings@MDatabaseReadonly@@UEAAHIP6AHPEBDPEAX@Z01@Z @670 NONAME

 ?EnumModuleNames@MDatabaseReadonly@@UEAAHP6AHPEBDPEAX@Z1@Z @671 NONAME

 ?FindFirstUnreadEvent@MDatabaseReadonly@@UEAAII@Z @672 NONAME

-?GetBlobSize@MDatabaseReadonly@@UEAAJI@Z @673 NONAME

+?GetBlobSize@MDatabaseReadonly@@UEAAHI@Z @673 NONAME

 ?GetContactSettingWorker@MDatabaseReadonly@@UEAAHIPEBD0PEAUDBVARIANT@@H@Z @674 NONAME

-?GetContactSize@MDatabaseReadonly@@UEAAJXZ @675 NONAME

+?GetContactSize@MDatabaseReadonly@@UEAAHXZ @675 NONAME

 ?GetEventContact@MDatabaseReadonly@@UEAAII@Z @676 NONAME

 ?IsDbContact@MDatabaseReadonly@@UEAAHI@Z @677 NONAME

 ?IsRelational@MDatabaseReadonly@@UEAAHXZ @678 NONAME

diff --git a/src/mir_core/src/Windows/CCtrlListView.cpp b/src/mir_core/src/Windows/CCtrlListView.cpp
index 23f780f170..e6ca1276ce 100644
--- a/src/mir_core/src/Windows/CCtrlListView.cpp
+++ b/src/mir_core/src/Windows/CCtrlListView.cpp
@@ -387,7 +387,7 @@ BOOL CCtrlListView::HasGroup(int dwGroupId)
 int CCtrlListView::HitTest(LPLVHITTESTINFO pinfo) const
 {	return ListView_HitTest(m_hwnd, pinfo);
 }
-int CCtrlListView::InsertColumn(int iCol, const LPLVCOLUMN pcol)
+int CCtrlListView::InsertColumn(int iCol, const LVCOLUMN *pcol)
 {	return ListView_InsertColumn(m_hwnd, iCol, pcol);
 }
 int CCtrlListView::InsertGroup(int index, PLVGROUP pgrp)
@@ -396,7 +396,7 @@ int CCtrlListView::InsertGroup(int index, PLVGROUP pgrp)
 void CCtrlListView::InsertGroupSorted(PLVINSERTGROUPSORTED structInsert)
 {	ListView_InsertGroupSorted(m_hwnd, structInsert);
 }
-int CCtrlListView::InsertItem(const LPLVITEM pitem)
+int CCtrlListView::InsertItem(const LVITEM *pitem)
 {	return ListView_InsertItem(m_hwnd, pitem);
 }
 BOOL CCtrlListView::InsertMarkHitTest(LPPOINT point, LVINSERTMARK *plvim)
@@ -480,7 +480,7 @@ BOOL CCtrlListView::SetInsertMark(LVINSERTMARK *plvim)
 COLORREF CCtrlListView::SetInsertMarkColor(COLORREF color)
 {	return ListView_SetInsertMarkColor(m_hwnd, color);
 }
-BOOL CCtrlListView::SetItem(const LPLVITEM pitem)
+BOOL CCtrlListView::SetItem(const LVITEM *pitem)
 {	return ListView_SetItem(m_hwnd, pitem);
 }
 void CCtrlListView::SetItemCount(int cItems)
diff --git a/src/mir_core/src/logger.cpp b/src/mir_core/src/logger.cpp
index 30244e45e4..fd50ba0fa0 100644
--- a/src/mir_core/src/logger.cpp
+++ b/src/mir_core/src/logger.cpp
@@ -45,13 +45,13 @@ struct Logger
 			fclose(m_out);
 	}
 
-	int        m_signature;
-	ptrA       m_name;
-	ptrW       m_fileName, m_descr;
-	FILE      *m_out;
-	__int64_t  m_lastwrite;
-	unsigned   m_options;
-	mir_cs     m_cs;
+	int      m_signature;
+	ptrA     m_name;
+	ptrW     m_fileName, m_descr;
+	FILE    *m_out;
+	time_t   m_lastwrite;
+	unsigned m_options;
+	mir_cs   m_cs;
 };
 
 static int CompareLoggers(const Logger *p1, const Logger *p2)
diff --git a/src/mir_core/src/mir_core.def b/src/mir_core/src/mir_core.def
index 7fadd95afe..15d6529d8e 100644
--- a/src/mir_core/src/mir_core.def
+++ b/src/mir_core/src/mir_core.def
@@ -701,10 +701,10 @@ mir_wstrcmpi                  @280
 ?HitTest@CCtrlClc@@QBEPAXHHPAK@Z @888 NONAME

 ?HitTest@CCtrlListView@@QBEHPAUtagLVHITTESTINFO@@@Z @889 NONAME

 ?HitTest@CCtrlTreeView@@QBEPAU_TREEITEM@@PAUtagTVHITTESTINFO@@@Z @890 NONAME

-?InsertColumn@CCtrlListView@@QAEHHQAUtagLVCOLUMNW@@@Z @891 NONAME

+?InsertColumn@CCtrlListView@@QAEHHPBUtagLVCOLUMNW@@@Z @891 NONAME

 ?InsertGroup@CCtrlListView@@QAEHHPAUtagLVGROUP@@@Z @892 NONAME

 ?InsertGroupSorted@CCtrlListView@@QAEXPAUtagLVINSERTGROUPSORTED@@@Z @893 NONAME

-?InsertItem@CCtrlListView@@QAEHQAUtagLVITEMW@@@Z @894 NONAME

+?InsertItem@CCtrlListView@@QAEHPBUtagLVITEMW@@@Z @894 NONAME

 ?InsertItem@CCtrlTreeView@@QAEPAU_TREEITEM@@PAUtagTVINSERTSTRUCTW@@@Z @895 NONAME

 ?InsertMarkHitTest@CCtrlListView@@QAEHPAUtagPOINT@@PAULVINSERTMARK@@@Z @896 NONAME

 ?InsertString@CCtrlCombo@@QAEHPB_WHJ@Z @897 NONAME

@@ -814,7 +814,7 @@ mir_wstrcmpi                  @280
 ?SetInsertMarkColor@CCtrlListView@@QAEKK@Z @1009 NONAME

 ?SetInsertMarkColor@CCtrlTreeView@@QAEKK@Z @1010 NONAME

 ?SetInt@CCtrlBase@@QAEXH@Z @1011 NONAME

-?SetItem@CCtrlListView@@QAEHQAUtagLVITEMW@@@Z @1012 NONAME

+?SetItem@CCtrlListView@@QAEHPBUtagLVITEMW@@@Z @1012 NONAME

 ?SetItem@CCtrlListView@@QAEXHHPB_WH@Z @1013 NONAME

 ?SetItem@CCtrlTreeView@@QAEXPAUtagTVITEMEXW@@@Z @1014 NONAME

 ?SetItemCount@CCtrlListView@@QAEXH@Z @1015 NONAME

diff --git a/src/mir_core/src/mir_core64.def b/src/mir_core/src/mir_core64.def
index 0996138663..a99babbccb 100644
--- a/src/mir_core/src/mir_core64.def
+++ b/src/mir_core/src/mir_core64.def
@@ -701,10 +701,10 @@ mir_wstrcmpi                  @280
 ?HitTest@CCtrlClc@@QEBAPEAXHHPEAK@Z @888 NONAME

 ?HitTest@CCtrlListView@@QEBAHPEAUtagLVHITTESTINFO@@@Z @889 NONAME

 ?HitTest@CCtrlTreeView@@QEBAPEAU_TREEITEM@@PEAUtagTVHITTESTINFO@@@Z @890 NONAME

-?InsertColumn@CCtrlListView@@QEAAHHQEAUtagLVCOLUMNW@@@Z @891 NONAME

+?InsertColumn@CCtrlListView@@QEAAHHPEBUtagLVCOLUMNW@@@Z @891 NONAME

 ?InsertGroup@CCtrlListView@@QEAAHHPEAUtagLVGROUP@@@Z @892 NONAME

 ?InsertGroupSorted@CCtrlListView@@QEAAXPEAUtagLVINSERTGROUPSORTED@@@Z @893 NONAME

-?InsertItem@CCtrlListView@@QEAAHQEAUtagLVITEMW@@@Z @894 NONAME

+?InsertItem@CCtrlListView@@QEAAHPEBUtagLVITEMW@@@Z @894 NONAME

 ?InsertItem@CCtrlTreeView@@QEAAPEAU_TREEITEM@@PEAUtagTVINSERTSTRUCTW@@@Z @895 NONAME

 ?InsertMarkHitTest@CCtrlListView@@QEAAHPEAUtagPOINT@@PEAULVINSERTMARK@@@Z @896 NONAME

 ?InsertString@CCtrlCombo@@QEAAHPEB_WH_J@Z @897 NONAME

@@ -814,7 +814,7 @@ mir_wstrcmpi                  @280
 ?SetInsertMarkColor@CCtrlListView@@QEAAKK@Z @1009 NONAME

 ?SetInsertMarkColor@CCtrlTreeView@@QEAAKK@Z @1010 NONAME

 ?SetInt@CCtrlBase@@QEAAXH@Z @1011 NONAME

-?SetItem@CCtrlListView@@QEAAHQEAUtagLVITEMW@@@Z @1012 NONAME

+?SetItem@CCtrlListView@@QEAAHPEBUtagLVITEMW@@@Z @1012 NONAME

 ?SetItem@CCtrlListView@@QEAAXHHPEB_WH@Z @1013 NONAME

 ?SetItem@CCtrlTreeView@@QEAAXPEAUtagTVITEMEXW@@@Z @1014 NONAME

 ?SetItemCount@CCtrlListView@@QEAAXH@Z @1015 NONAME

diff --git a/src/mir_core/src/mstring.cpp b/src/mir_core/src/mstring.cpp
index 3982fc8d61..4be44f6e06 100644
--- a/src/mir_core/src/mstring.cpp
+++ b/src/mir_core/src/mstring.cpp
@@ -123,6 +123,7 @@ MIR_CORE_DLL(void) mirstr_unlock(CMStringData* pThis)
 // don't remove it
 // this code just instantiates templates for CMStringW[A/W]
 
+template MIR_CORE_EXPORT CMStringW;
 template MIR_CORE_EXPORT CMStringW CALLBACK operator+(const CMStringW& str1, const CMStringW& str2);
 template MIR_CORE_EXPORT CMStringW CALLBACK operator+(const CMStringW& str1, const wchar_t *psz2);
 template MIR_CORE_EXPORT CMStringW CALLBACK operator+(const wchar_t *psz1, const CMStringW& str2);
@@ -131,6 +132,7 @@ template MIR_CORE_EXPORT CMStringW CALLBACK operator+(const CMStringW& str1, cha
 template MIR_CORE_EXPORT CMStringW CALLBACK operator+(wchar_t ch1, const CMStringW& str2);
 template MIR_CORE_EXPORT CMStringW CALLBACK operator+(char ch1, const CMStringW& str2);
 
+template MIR_CORE_EXPORT CMStringA;
 template MIR_CORE_EXPORT CMStringA CALLBACK operator+(const CMStringA& str1, const CMStringA& str2);
 template MIR_CORE_EXPORT CMStringA CALLBACK operator+(const CMStringA& str1, const char *psz2);
 template MIR_CORE_EXPORT CMStringA CALLBACK operator+(const char *psz1, const CMStringA& str2);