summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/m_core.h43
-rw-r--r--include/m_gui.h120
-rw-r--r--include/m_types.h45
-rw-r--r--libs/win32/mir_app.libbin222676 -> 222676 bytes
-rw-r--r--libs/win32/mir_core.libbin479798 -> 479798 bytes
-rw-r--r--libs/win64/mir_app.libbin218378 -> 218378 bytes
-rw-r--r--libs/win64/mir_core.libbin484988 -> 484988 bytes
-rw-r--r--plugins/Db3x_mmap/src/dbcontacts.cpp6
-rw-r--r--plugins/Db3x_mmap/src/dbevents.cpp4
-rw-r--r--plugins/Db3x_mmap/src/dbintf.h10
-rw-r--r--plugins/Dbx_mdbx/src/dbcontacts.cpp6
-rw-r--r--plugins/Dbx_mdbx/src/dbevents.cpp4
-rw-r--r--plugins/Dbx_mdbx/src/dbintf.h10
-rwxr-xr-xplugins/Dbx_sqlite/src/dbcontacts.cpp6
-rwxr-xr-xplugins/Dbx_sqlite/src/dbevents.cpp4
-rwxr-xr-xplugins/Dbx_sqlite/src/dbintf.h10
-rw-r--r--plugins/Import/src/dbrw/dbcontacts.cpp6
-rw-r--r--plugins/Import/src/dbrw/dbevents.cpp4
-rw-r--r--plugins/Import/src/dbrw/dbintf.h10
-rw-r--r--plugins/Import/src/mcontacts.cpp8
-rw-r--r--plugins/Import/src/patterns.cpp12
-rw-r--r--plugins/Import/src/textjson.cpp4
-rw-r--r--src/mir_app/src/MDatabaseReadonly.cpp6
-rw-r--r--src/mir_app/src/mir_app.def6
-rw-r--r--src/mir_app/src/mir_app64.def6
-rw-r--r--src/mir_core/src/Windows/CCtrlListView.cpp6
-rw-r--r--src/mir_core/src/logger.cpp14
-rw-r--r--src/mir_core/src/mir_core.def6
-rw-r--r--src/mir_core/src/mir_core64.def6
-rw-r--r--src/mir_core/src/mstring.cpp2
30 files changed, 205 insertions, 159 deletions
diff --git a/include/m_core.h b/include/m_core.h
index 8726e189a1..db198cfebb 100644
--- a/include/m_core.h
+++ b/include/m_core.h
@@ -513,26 +513,6 @@ __forceinline char* mir_utf8decodeA(const char* src)
}
///////////////////////////////////////////////////////////////////////////////
-// The UUID structure below is used to for plugin UUID's and module type definitions
-
-struct MUUID
-{
- unsigned long a;
- unsigned short b;
- unsigned short c;
- unsigned char d[8];
-};
-
-__forceinline bool operator==(const MUUID &p1, const MUUID &p2)
-{
- return memcmp(&p1, &p2, sizeof(MUUID)) == 0;
-}
-__forceinline bool operator!=(const MUUID &p1, const MUUID &p2)
-{
- return memcmp(&p1, &p2, sizeof(MUUID)) != 0;
-}
-
-///////////////////////////////////////////////////////////////////////////////
// Window subclassing
#ifdef _MSC_VER
@@ -573,6 +553,29 @@ MIR_CORE_DLL(void) UnloadCoreModule(void);
#if defined(__cplusplus)
}
+///////////////////////////////////////////////////////////////////////////////
+// The UUID structure below is used to for plugin UUID's and module type definitions
+
+struct MUUID
+{
+ unsigned long a;
+ unsigned short b;
+ unsigned short c;
+ unsigned char d[8];
+};
+
+__forceinline bool operator==(const MUUID& p1, const MUUID& p2)
+{
+ return memcmp(&p1, &p2, sizeof(MUUID)) == 0;
+}
+__forceinline bool operator!=(const MUUID& p1, const MUUID& p2)
+{
+ return memcmp(&p1, &p2, sizeof(MUUID)) != 0;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// C++ templates
+
template <typename T>
HANDLE mir_forkThread(void(MIR_CDECL *pFunc)(T* param), T *arg)
{
diff --git a/include/m_gui.h b/include/m_gui.h
index 5277d7e05d..b7510ab504 100644
--- a/include/m_gui.h
+++ b/include/m_gui.h
@@ -500,7 +500,7 @@ public:
void NotifyChange();
void SetDraw(bool bEnable);
- INT_PTR SendMsg(UINT Msg, WPARAM wParam, LPARAM lParam) const;
+ LRESULT SendMsg(UINT Msg, WPARAM wParam, LPARAM lParam) const;
void SetText(const wchar_t *text);
void SetTextA(const char *text);
@@ -517,11 +517,11 @@ public:
int GetInt() const;
virtual BOOL OnCommand(HWND /*hwndCtrl*/, WORD /*idCtrl*/, WORD /*idCode*/) { return FALSE; }
- virtual BOOL OnNotify(int /*idCtrl*/, struct NMHDR* /*pnmh*/) { return FALSE; }
+ virtual BOOL OnNotify(int /*idCtrl*/, NMHDR* /*pnmh*/) { return FALSE; }
- virtual BOOL OnMeasureItem(struct MEASUREITEMSTRUCT*) { return FALSE; }
- virtual BOOL OnDrawItem(struct DRAWITEMSTRUCT*) { return FALSE; }
- virtual BOOL OnDeleteItem(struct DELETEITEMSTRUCT*) { return FALSE; }
+ virtual BOOL OnMeasureItem(MEASUREITEMSTRUCT*) { return FALSE; }
+ virtual BOOL OnDrawItem(DRAWITEMSTRUCT*) { return FALSE; }
+ virtual BOOL OnDeleteItem(DELETEITEMSTRUCT*) { return FALSE; }
virtual void OnInit();
virtual void OnDestroy();
@@ -541,13 +541,13 @@ public:
protected:
virtual void GetCaretPos(CContextMenuPos&) const;
- virtual INT_PTR CustomWndProc(UINT msg, WPARAM wParam, LPARAM lParam);
+ virtual LRESULT CustomWndProc(UINT msg, WPARAM wParam, LPARAM lParam);
void Subclass();
void Unsubclass();
private:
- static INT_PTR CALLBACK GlobalSubclassWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
+ static LRESULT CALLBACK GlobalSubclassWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
};
/////////////////////////////////////////////////////////////////////////////////////////
@@ -615,7 +615,7 @@ public:
__forceinline int GetPos() const { return m_iPosition; }
protected:
- INT_PTR CustomWndProc(UINT msg, WPARAM wParam, LPARAM lParam) override;
+ LRESULT CustomWndProc(UINT msg, WPARAM wParam, LPARAM lParam) override;
void OnInit() override;
int m_iPosition;
@@ -715,7 +715,7 @@ public:
struct TEventInfo
{
CCtrlClc *ctrl;
- struct NMCLISTCONTROL *info;
+ NMCLISTCONTROL *info;
};
CCallback<TEventInfo> OnExpanded;
@@ -812,8 +812,8 @@ class MIR_CORE_EXPORT CCtrlDate : public CCtrlData
public:
CCtrlDate(CDlgBase *dlg, int ctrlId);
- void GetTime(struct SYSTEMTIME*);
- void SetTime(struct SYSTEMTIME*);
+ void GetTime(SYSTEMTIME*);
+ void SetTime(SYSTEMTIME*);
};
/////////////////////////////////////////////////////////////////////////////////////////
@@ -1015,12 +1015,12 @@ public:
HWND EditLabel(int iItem);
int EnableGroupView(BOOL fEnable);
BOOL EnsureVisible(int i, BOOL fPartialOK);
- int FindItem(int iStart, const struct LVFINDINFO *plvfi);
+ int FindItem(int iStart, const LVFINDINFO *plvfi);
COLORREF GetBkColor() const;
- void GetBkImage(struct LVBKIMAGE *plvbki) const;
+ void GetBkImage(LVBKIMAGE *plvbki) const;
UINT GetCallbackMask() const;
BOOL GetCheckState(UINT iIndex) const;
- void GetColumn(int iCol, struct LVCOLUMN *pcol) const;
+ void GetColumn(int iCol, LVCOLUMN *pcol) const;
void GetColumnOrderArray(int iCount, int *lpiArray) const;
int GetColumnWidth(int iCol) const;
int GetCountPerPage() const;
@@ -1028,20 +1028,20 @@ public:
DWORD GetExtendedListViewStyle() const;
int GetFocusedGroup() const;
int GetGroupCount() const;
- void GetGroupInfo(int iGroupId, struct LVGROUP *pgrp) const;
- void GetGroupInfoByIndex(int iIndex, struct LVGROUP *pgrp) const;
- void GetGroupMetrics(struct LVGROUPMETRICS *pGroupMetrics) const;
+ void GetGroupInfo(int iGroupId, LVGROUP *pgrp) const;
+ void GetGroupInfoByIndex(int iIndex, LVGROUP *pgrp) const;
+ void GetGroupMetrics(LVGROUPMETRICS *pGroupMetrics) const;
UINT GetGroupState(UINT dwGroupId, UINT dwMask) const;
HWND GetHeader() const;
HCURSOR GetHotCursor() const;
int GetHotItem() const;
DWORD GetHoverTime() const;
HIMAGELIST GetImageList(int iImageList) const;
- BOOL GetInsertMark(struct LVINSERTMARK *plvim) const;
+ BOOL GetInsertMark(LVINSERTMARK *plvim) const;
COLORREF GetInsertMarkColor() const;
int GetInsertMarkRect(RECT *prc) const;
BOOL GetISearchString(LPSTR lpsz) const;
- bool GetItem(struct LVITEM *pitem) const;
+ bool GetItem(LVITEM *pitem) const;
int GetItemCount() const;
void GetItemPosition(int i, POINT *ppt) const;
void GetItemRect(int i, RECT *prc, int code) const;
@@ -1059,8 +1059,8 @@ public:
BOOL GetSubItemRect(int iItem, int iSubItem, int code, RECT *lpRect) const;
COLORREF GetTextBkColor() const;
COLORREF GetTextColor() const;
- void GetTileInfo(struct LVTILEINFO *plvtinfo) const;
- void GetTileViewInfo(struct LVTILEVIEWINFO *plvtvinfo) const;
+ void GetTileInfo(LVTILEINFO *plvtinfo) const;
+ void GetTileViewInfo(LVTILEVIEWINFO *plvtvinfo) const;
HWND GetToolTips() const;
int GetTopIndex() const;
BOOL GetUnicodeFormat() const;
@@ -1068,12 +1068,12 @@ public:
BOOL GetViewRect(RECT *prc) const;
void GetWorkAreas(int nWorkAreas, RECT *lprc) const;
BOOL HasGroup(int dwGroupId);
- int HitTest(struct LVHITTESTINFO *pinfo) const;
- int HitTestEx(struct LVHITTESTINFO *pinfo);
- int InsertColumn(int iCol, const struct LVCOLUMN *pcol);
- int InsertGroup(int index, struct LVGROUP *pgrp);
- void InsertGroupSorted(struct LVINSERTGROUPSORTED *structInsert);
- int InsertItem(const struct LVITEM *pitem);
+ int HitTest(LVHITTESTINFO *pinfo) const;
+ int HitTestEx(LVHITTESTINFO *pinfo);
+ int InsertColumn(int iCol, const LVCOLUMN *pcol);
+ int InsertGroup(int index, LVGROUP *pgrp);
+ void InsertGroupSorted(LVINSERTGROUPSORTED *structInsert);
+ int InsertItem(const LVITEM *pitem);
BOOL InsertMarkHitTest(POINT *point, LVINSERTMARK *plvim);
BOOL IsGroupViewEnabled();
UINT IsItemVisible(UINT index);
@@ -1084,26 +1084,26 @@ public:
int RemoveGroup(int iGroupId);
BOOL Scroll(int dx, int dy);
BOOL SetBkColor(COLORREF clrBk);
- BOOL SetBkImage(struct LVBKIMAGE *plvbki);
+ BOOL SetBkImage(LVBKIMAGE *plvbki);
BOOL SetCallbackMask(UINT mask);
void SetCheckState(UINT iIndex, BOOL fCheck);
- BOOL SetColumn(int iCol, struct LVCOLUMN *pcol);
+ BOOL SetColumn(int iCol, LVCOLUMN *pcol);
BOOL SetColumnOrderArray(int iCount, int *lpiArray);
BOOL SetColumnWidth(int iCol, int cx);
void SetExtendedListViewStyle(DWORD dwExStyle);
void SetExtendedListViewStyleEx(DWORD dwExMask, DWORD dwExStyle);
- int SetGroupInfo(int iGroupId, struct LVGROUP *pgrp);
- void SetGroupMetrics(struct LVGROUPMETRICS *pGroupMetrics);
+ int SetGroupInfo(int iGroupId, LVGROUP *pgrp);
+ void SetGroupMetrics(LVGROUPMETRICS *pGroupMetrics);
void SetGroupState(UINT dwGroupId, UINT dwMask, UINT dwState);
HCURSOR SetHotCursor(HCURSOR hCursor);
int SetHotItem(int iIndex);
void SetHoverTime(DWORD dwHoverTime);
DWORD SetIconSpacing(int cx, int cy);
HIMAGELIST SetImageList(HIMAGELIST himl, int iImageList);
- BOOL SetInfoTip(struct LVSETINFOTIP *plvSetInfoTip);
- BOOL SetInsertMark(struct LVINSERTMARK *plvim);
+ BOOL SetInfoTip(LVSETINFOTIP *plvSetInfoTip);
+ BOOL SetInsertMark(LVINSERTMARK *plvim);
COLORREF SetInsertMarkColor(COLORREF color);
- BOOL SetItem(const struct LVITEM *pitem);
+ BOOL SetItem(const LVITEM *pitem);
void SetItemCount(int cItems);
void SetItemCountEx(int cItems, DWORD dwFlags);
BOOL SetItemPosition(int i, int x, int y);
@@ -1115,14 +1115,14 @@ public:
int SetSelectionMark(int iIndex);
BOOL SetTextBkColor(COLORREF clrText);
BOOL SetTextColor(COLORREF clrText);
- BOOL SetTileInfo(struct LVTILEINFO *plvtinfo);
- BOOL SetTileViewInfo(struct LVTILEVIEWINFO *plvtvinfo);
+ BOOL SetTileInfo(LVTILEINFO *plvtinfo);
+ BOOL SetTileViewInfo(LVTILEVIEWINFO *plvtvinfo);
HWND SetToolTips(HWND ToolTip);
BOOL SetUnicodeFormat(BOOL fUnicode);
int SetView(DWORD iView);
void SetWorkAreas(int nWorkAreas, RECT *lprc);
- int SubItemHitTest(struct LVHITTESTINFO *pInfo) const;
- int SubItemHitTestEx(struct LVHITTESTINFO *plvhti);
+ int SubItemHitTest(LVHITTESTINFO *pInfo) const;
+ int SubItemHitTestEx(LVHITTESTINFO *plvhti);
BOOL Update(int iItem);
#ifdef _MSC_VER
@@ -1143,15 +1143,15 @@ public:
struct TEventInfo {
CCtrlListView *treeviewctrl;
union {
- struct NMHDR *nmhdr;
- struct NMLISTVIEW *nmlv;
- struct NMLVDISPINFO *nmlvdi;
- struct NMLVSCROLL *nmlvscr;
- struct NMLVGETINFOTIP *nmlvit;
- struct NMLVFINDITEM *nmlvfi;
- struct NMITEMACTIVATE *nmlvia;
- struct NMLVKEYDOWN *nmlvkey;
- struct NMLVCUSTOMDRAW *nmcd;
+ NMHDR *nmhdr;
+ NMLISTVIEW *nmlv;
+ NMLVDISPINFO *nmlvdi;
+ NMLVSCROLL *nmlvscr;
+ NMLVGETINFOTIP *nmlvit;
+ NMLVFINDITEM *nmlvfi;
+ NMITEMACTIVATE *nmlvia;
+ NMLVKEYDOWN *nmlvkey;
+ NMLVCUSTOMDRAW *nmcd;
};
};
@@ -1223,7 +1223,7 @@ public:
HIMAGELIST GetImageList(int iImage) const;
int GetIndent() const;
COLORREF GetInsertMarkColor() const;
- bool GetItem(struct TVITEMEX *tvi) const;
+ bool GetItem(TVITEMEX *tvi) const;
int GetItemHeight() const;
void GetItemRect(HTREEITEM hItem, RECT *rcItem, BOOL fItemRect) const;
DWORD GetItemState(HTREEITEM hItem, DWORD stateMask) const;
@@ -1242,8 +1242,8 @@ public:
HWND GetToolTips() const;
BOOL GetUnicodeFormat() const;
unsigned GetVisibleCount() const;
- HTREEITEM HitTest(struct TVHITTESTINFO *hti) const;
- HTREEITEM InsertItem(struct TVINSERTSTRUCT *tvis);
+ HTREEITEM HitTest(TVHITTESTINFO *hti) const;
+ HTREEITEM InsertItem(TVINSERTSTRUCT *tvis);
void Select(HTREEITEM hItem, DWORD flag);
void SelectDropTarget(HTREEITEM hItem);
void SelectItem(HTREEITEM hItem);
@@ -1263,7 +1263,7 @@ public:
HWND SetToolTips(HWND hwndToolTips);
BOOL SetUnicodeFormat(BOOL fUnicode);
void SortChildren(HTREEITEM hItem, BOOL fRecurse);
- void SortChildrenCB(struct TVSORTCB *cb, BOOL fRecurse);
+ void SortChildrenCB(TVSORTCB *cb, BOOL fRecurse);
// Additional stuff
void TranslateItem(HTREEITEM hItem);
@@ -1275,7 +1275,7 @@ public:
bool IsSelected(HTREEITEM hItem);
int GetNumSelected();
- void GetSelected(LIST<struct _TREEITEM> &selected);
+ void GetSelected(LIST<_TREEITEM> &selected);
void Select(HTREEITEM hItem);
void Select(LIST<_TREEITEM> &selected);
@@ -1292,12 +1292,12 @@ public:
struct TEventInfo {
CCtrlTreeView *treeviewctrl;
union {
- struct NMHDR *nmhdr;
- struct NMTREEVIEW *nmtv;
- struct NMTVKEYDOWN *nmtvkey;
- struct NMTVDISPINFO *nmtvdi;
- struct NMTVGETINFOTIP *nmtvit;
- struct NMTVCUSTOMDRAW *nmcd;
+ NMHDR *nmhdr;
+ NMTREEVIEW *nmtv;
+ NMTVKEYDOWN *nmtvkey;
+ NMTVDISPINFO *nmtvdi;
+ NMTVGETINFOTIP *nmtvit;
+ NMTVCUSTOMDRAW *nmcd;
HTREEITEM hItem; // for OnItemChanged
};
};
@@ -1326,7 +1326,7 @@ protected:
BOOL OnNotify(int idCtrl, NMHDR *pnmh) override;
void GetCaretPos(CContextMenuPos&) const override;
- INT_PTR CustomWndProc(UINT msg, WPARAM wParam, LPARAM lParam) override;
+ LRESULT CustomWndProc(UINT msg, WPARAM wParam, LPARAM lParam) override;
union {
uint32_t m_dwFlags;
@@ -1431,7 +1431,7 @@ protected:
bool OnApply() override;
void OnReset() override;
- INT_PTR CustomWndProc(UINT msg, WPARAM wParam, LPARAM lParam) override;
+ LRESULT CustomWndProc(UINT msg, WPARAM wParam, LPARAM lParam) override;
};
/////////////////////////////////////////////////////////////////////////////////////////
diff --git a/include/m_types.h b/include/m_types.h
index 236adfbb1f..1223ff4c7e 100644
--- a/include/m_types.h
+++ b/include/m_types.h
@@ -27,11 +27,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
///////////////////////////////////////////////////////////////////////////////
// Linux
+#ifndef _MSC_VER
+
#include <wchar.h>
#include <netinet/in.h>
-#ifndef _MSC_VER
-
#define CALLBACK
#define EXTERN_C extern "C"
@@ -110,11 +110,52 @@ DECLARE_HANDLE(HINSTANCE);
struct EXCEPTION_POINTERS { int unused; };
struct LOGFONT { int unused; };
+struct SYSTEMTIME;
+struct MEASUREITEMSTRUCT;
+struct DRAWITEMSTRUCT;
+struct DELETEITEMSTRUCT;
+
+struct NMHDR;
+struct NMLISTVIEW;
+struct NMLVDISPINFO;
+struct NMLVSCROLL;
+struct NMLVGETINFOTIP;
+struct NMLVFINDITEM;
+struct NMITEMACTIVATE;
+struct NMLVKEYDOWN;
+struct NMLVCUSTOMDRAW;
+struct NMCLISTCONTROL;
+struct NMTREEVIEW;
+struct NMTVKEYDOWN;
+struct NMTVDISPINFO;
+struct NMTVGETINFOTIP;
+struct NMTVCUSTOMDRAW;
+
+struct LVFINDINFO;
+struct LVBKIMAGE;
+struct LVCOLUMN;
+struct LVGROUP;
+struct LVGROUPMETRICS;
+struct LVINSERTMARK;
+struct LVTILEINFO;
+struct LVTILEVIEWINFO;
+struct LVITEM;
+struct LVHITTESTINFO;
+struct LVINSERTGROUPSORTED;
+struct LVSETINFOTIP;
+
+struct TVITEMEX;
+struct TVHITTESTINFO;
+struct TVINSERTSTRUCT;
+struct TVSORTCB;
+struct _TREEITEM;
#else
///////////////////////////////////////////////////////////////////////////////
// Windows
+#include <tchar.h>
+
#define MIR_EXPORT __declspec(dllexport)
#define MIR_IMPORT __declspec(dllimport)
diff --git a/libs/win32/mir_app.lib b/libs/win32/mir_app.lib
index 6b49ba4a0c..d9b3730b5b 100644
--- a/libs/win32/mir_app.lib
+++ b/libs/win32/mir_app.lib
Binary files differ
diff --git a/libs/win32/mir_core.lib b/libs/win32/mir_core.lib
index 9ffb9f0375..31ba3b610a 100644
--- a/libs/win32/mir_core.lib
+++ b/libs/win32/mir_core.lib
Binary files differ
diff --git a/libs/win64/mir_app.lib b/libs/win64/mir_app.lib
index 65f2a15f86..b8bb5dbb04 100644
--- a/libs/win64/mir_app.lib
+++ b/libs/win64/mir_app.lib
Binary files differ
diff --git a/libs/win64/mir_core.lib b/libs/win64/mir_core.lib
index 6129aa8eee..1f792ea41f 100644
--- a/libs/win64/mir_core.lib
+++ b/libs/win64/mir_core.lib
Binary files differ
diff --git a/plugins/Db3x_mmap/src/dbcontacts.cpp b/plugins/Db3x_mmap/src/dbcontacts.cpp
index 6056f8dc9f..19aebdc779 100644
--- a/plugins/Db3x_mmap/src/dbcontacts.cpp
+++ b/plugins/Db3x_mmap/src/dbcontacts.cpp
@@ -23,18 +23,18 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "stdafx.h"
-STDMETHODIMP_(LONG) CDb3Mmap::GetContactCount(void)
+STDMETHODIMP_(int) CDb3Mmap::GetContactCount(void)
{
mir_cslock lck(m_csDbAccess);
return m_dbHeader.contactCount;
}
-STDMETHODIMP_(LONG) CDb3Mmap::GetContactSize(void)
+STDMETHODIMP_(int) CDb3Mmap::GetContactSize(void)
{
return sizeof(DBCachedContact);
}
-STDMETHODIMP_(LONG) CDb3Mmap::DeleteContact(MCONTACT contactID)
+STDMETHODIMP_(int) CDb3Mmap::DeleteContact(MCONTACT contactID)
{
if (contactID == 0) // global contact cannot be removed
return 1;
diff --git a/plugins/Db3x_mmap/src/dbevents.cpp b/plugins/Db3x_mmap/src/dbevents.cpp
index 68384fa348..0b4aeb4a18 100644
--- a/plugins/Db3x_mmap/src/dbevents.cpp
+++ b/plugins/Db3x_mmap/src/dbevents.cpp
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "stdafx.h"
-LONG CDb3Mmap::GetEventCount(MCONTACT contactID)
+int CDb3Mmap::GetEventCount(MCONTACT contactID)
{
mir_cslock lck(m_csDbAccess);
DBContact *dbc = (DBContact*)DBRead(GetContactOffset(contactID), nullptr);
@@ -268,7 +268,7 @@ BOOL CDb3Mmap::EditEvent(MCONTACT, MEVENT, const DBEVENTINFO*)
return 1;
}
-LONG CDb3Mmap::GetBlobSize(MEVENT hDbEvent)
+int CDb3Mmap::GetBlobSize(MEVENT hDbEvent)
{
mir_cslock lck(m_csDbAccess);
DBEvent *dbe = AdaptEvent((DWORD)hDbEvent, 0);
diff --git a/plugins/Db3x_mmap/src/dbintf.h b/plugins/Db3x_mmap/src/dbintf.h
index 8e09a9ba1c..67dc4b084e 100644
--- a/plugins/Db3x_mmap/src/dbintf.h
+++ b/plugins/Db3x_mmap/src/dbintf.h
@@ -201,17 +201,17 @@ public:
STDMETHODIMP_(BOOL) IsRelational(void) override { return FALSE; }
STDMETHODIMP_(void) SetCacheSafetyMode(BOOL) override;
- STDMETHODIMP_(LONG) GetContactCount(void) override;
- STDMETHODIMP_(LONG) DeleteContact(MCONTACT contactID) override;
+ STDMETHODIMP_(int) GetContactCount(void) override;
+ STDMETHODIMP_(int) DeleteContact(MCONTACT contactID) override;
STDMETHODIMP_(MCONTACT) AddContact(void) override;
STDMETHODIMP_(BOOL) IsDbContact(MCONTACT contactID) override;
- STDMETHODIMP_(LONG) GetContactSize(void) override;
+ STDMETHODIMP_(int) GetContactSize(void) override;
- STDMETHODIMP_(LONG) GetEventCount(MCONTACT contactID) override;
+ STDMETHODIMP_(int) GetEventCount(MCONTACT contactID) override;
STDMETHODIMP_(MEVENT) AddEvent(MCONTACT contactID, const DBEVENTINFO *dbe) override;
STDMETHODIMP_(BOOL) DeleteEvent(MEVENT hDbEvent) override;
STDMETHODIMP_(BOOL) EditEvent(MCONTACT contactID, MEVENT hDbEvent, const DBEVENTINFO *dbe) override;
- STDMETHODIMP_(LONG) GetBlobSize(MEVENT hDbEvent) override;
+ STDMETHODIMP_(int) GetBlobSize(MEVENT hDbEvent) override;
STDMETHODIMP_(BOOL) GetEvent(MEVENT hDbEvent, DBEVENTINFO *dbe) override;
STDMETHODIMP_(BOOL) MarkEventRead(MCONTACT contactID, MEVENT hDbEvent) override;
STDMETHODIMP_(MCONTACT) GetEventContact(MEVENT hDbEvent) override;
diff --git a/plugins/Dbx_mdbx/src/dbcontacts.cpp b/plugins/Dbx_mdbx/src/dbcontacts.cpp
index 2199ff2aa1..5e56410ac0 100644
--- a/plugins/Dbx_mdbx/src/dbcontacts.cpp
+++ b/plugins/Dbx_mdbx/src/dbcontacts.cpp
@@ -23,19 +23,19 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "stdafx.h"
-LONG CDbxMDBX::GetContactCount(void)
+int CDbxMDBX::GetContactCount(void)
{
MDBX_stat st;
mdbx_dbi_stat(StartTran(), m_dbContacts, &st, sizeof(st));
return st.ms_entries;
}
-LONG CDbxMDBX::GetContactSize(void)
+int CDbxMDBX::GetContactSize(void)
{
return sizeof(DBCachedContact);
}
-LONG CDbxMDBX::DeleteContact(MCONTACT contactID)
+int CDbxMDBX::DeleteContact(MCONTACT contactID)
{
if (contactID == 0) // global contact cannot be removed
return 1;
diff --git a/plugins/Dbx_mdbx/src/dbevents.cpp b/plugins/Dbx_mdbx/src/dbevents.cpp
index aa7f634f64..cb0b910abe 100644
--- a/plugins/Dbx_mdbx/src/dbevents.cpp
+++ b/plugins/Dbx_mdbx/src/dbevents.cpp
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "stdafx.h"
-LONG CDbxMDBX::GetEventCount(MCONTACT contactID)
+int CDbxMDBX::GetEventCount(MCONTACT contactID)
{
if (!contactID)
return m_ccDummy.dbc.dwEventCount;
@@ -278,7 +278,7 @@ bool CDbxMDBX::EditEvent(MCONTACT contactID, MEVENT hDbEvent, const DBEVENTINFO
/////////////////////////////////////////////////////////////////////////////////////////
-LONG CDbxMDBX::GetBlobSize(MEVENT hDbEvent)
+int CDbxMDBX::GetBlobSize(MEVENT hDbEvent)
{
MDBX_val key = { &hDbEvent, sizeof(MEVENT) }, data;
if (mdbx_get(StartTran(), m_dbEvents, &key, &data) != MDBX_SUCCESS)
diff --git a/plugins/Dbx_mdbx/src/dbintf.h b/plugins/Dbx_mdbx/src/dbintf.h
index 25469bc606..f847c43730 100644
--- a/plugins/Dbx_mdbx/src/dbintf.h
+++ b/plugins/Dbx_mdbx/src/dbintf.h
@@ -240,17 +240,17 @@ public:
STDMETHODIMP_(BOOL) IsRelational(void) override { return TRUE; }
STDMETHODIMP_(void) SetCacheSafetyMode(BOOL) override;
- STDMETHODIMP_(LONG) GetContactCount(void) override;
- STDMETHODIMP_(LONG) DeleteContact(MCONTACT contactID) override;
+ STDMETHODIMP_(int) GetContactCount(void) override;
+ STDMETHODIMP_(int) DeleteContact(MCONTACT contactID) override;
STDMETHODIMP_(MCONTACT) AddContact(void) override;
STDMETHODIMP_(BOOL) IsDbContact(MCONTACT contactID) override;
- STDMETHODIMP_(LONG) GetContactSize(void) override;
+ STDMETHODIMP_(int) GetContactSize(void) override;
- STDMETHODIMP_(LONG) GetEventCount(MCONTACT contactID) override;
+ STDMETHODIMP_(int) GetEventCount(MCONTACT contactID) override;
STDMETHODIMP_(MEVENT) AddEvent(MCONTACT contactID, const DBEVENTINFO *dbe) override;
STDMETHODIMP_(BOOL) DeleteEvent(MEVENT hDbEvent) override;
STDMETHODIMP_(BOOL) EditEvent(MCONTACT contactID, MEVENT hDbEvent, const DBEVENTINFO *dbe) override;
- STDMETHODIMP_(LONG) GetBlobSize(MEVENT hDbEvent) override;
+ STDMETHODIMP_(int) GetBlobSize(MEVENT hDbEvent) override;
STDMETHODIMP_(BOOL) GetEvent(MEVENT hDbEvent, DBEVENTINFO *dbe) override;
STDMETHODIMP_(BOOL) MarkEventRead(MCONTACT contactID, MEVENT hDbEvent) override;
STDMETHODIMP_(MCONTACT) GetEventContact(MEVENT hDbEvent) override;
diff --git a/plugins/Dbx_sqlite/src/dbcontacts.cpp b/plugins/Dbx_sqlite/src/dbcontacts.cpp
index bd012ee4c8..8ea6d122ae 100755
--- a/plugins/Dbx_sqlite/src/dbcontacts.cpp
+++ b/plugins/Dbx_sqlite/src/dbcontacts.cpp
@@ -14,7 +14,7 @@ void CDbxSQLite::InitContacts()
sqlite3_finalize(stmt);
}
-LONG CDbxSQLite::GetContactCount()
+int CDbxSQLite::GetContactCount()
{
mir_cslock lock(m_csDbAccess);
sqlite3_stmt *stmt = InitQuery("SELECT COUNT(1) FROM contacts LIMIT 1;", qCntCount);
@@ -48,7 +48,7 @@ MCONTACT CDbxSQLite::AddContact()
return hContact;
}
-LONG CDbxSQLite::DeleteContact(MCONTACT hContact)
+int CDbxSQLite::DeleteContact(MCONTACT hContact)
{
// global contact cannot be removed
if (hContact == 0)
@@ -107,7 +107,7 @@ BOOL CDbxSQLite::IsDbContact(MCONTACT hContact)
return (cc != nullptr);
}
-LONG CDbxSQLite::GetContactSize(void)
+int CDbxSQLite::GetContactSize(void)
{
return sizeof(DBCachedContact);
}
diff --git a/plugins/Dbx_sqlite/src/dbevents.cpp b/plugins/Dbx_sqlite/src/dbevents.cpp
index 94249e508f..a4a56eed84 100755
--- a/plugins/Dbx_sqlite/src/dbevents.cpp
+++ b/plugins/Dbx_sqlite/src/dbevents.cpp
@@ -30,7 +30,7 @@ void CDbxSQLite::UninitEvents()
m_modules.destroy();
}
-LONG CDbxSQLite::GetEventCount(MCONTACT hContact)
+int CDbxSQLite::GetEventCount(MCONTACT hContact)
{
DBCachedContact *cc = (hContact) ? m_cache->GetCachedContact(hContact) : &m_system;
if (cc == nullptr)
@@ -257,7 +257,7 @@ BOOL CDbxSQLite::EditEvent(MCONTACT hContact, MEVENT hDbEvent, const DBEVENTINFO
return 0;
}
-LONG CDbxSQLite::GetBlobSize(MEVENT hDbEvent)
+int CDbxSQLite::GetBlobSize(MEVENT hDbEvent)
{
if (hDbEvent == 0)
return -1;
diff --git a/plugins/Dbx_sqlite/src/dbintf.h b/plugins/Dbx_sqlite/src/dbintf.h
index c9425d8c67..e0f74a165e 100755
--- a/plugins/Dbx_sqlite/src/dbintf.h
+++ b/plugins/Dbx_sqlite/src/dbintf.h
@@ -118,17 +118,17 @@ public:
STDMETHODIMP_(BOOL) IsRelational(void) override;
STDMETHODIMP_(void) SetCacheSafetyMode(BOOL) override;
- STDMETHODIMP_(LONG) GetContactCount(void) override;
- STDMETHODIMP_(LONG) DeleteContact(MCONTACT contactID) override;
+ STDMETHODIMP_(int) GetContactCount(void) override;
+ STDMETHODIMP_(int) DeleteContact(MCONTACT contactID) override;
STDMETHODIMP_(MCONTACT) AddContact(void) override;
STDMETHODIMP_(BOOL) IsDbContact(MCONTACT contactID) override;
- STDMETHODIMP_(LONG) GetContactSize(void) override;
+ STDMETHODIMP_(int) GetContactSize(void) override;
- STDMETHODIMP_(LONG) GetEventCount(MCONTACT contactID) override;
+ STDMETHODIMP_(int) GetEventCount(MCONTACT contactID) override;
STDMETHODIMP_(MEVENT) AddEvent(MCONTACT contactID, const DBEVENTINFO *dbe) override;
STDMETHODIMP_(BOOL) DeleteEvent(MEVENT hDbEvent) override;
STDMETHODIMP_(BOOL) EditEvent(MCONTACT contactID, MEVENT hDbEvent, const DBEVENTINFO *dbe) override;
- STDMETHODIMP_(LONG) GetBlobSize(MEVENT hDbEvent) override;
+ STDMETHODIMP_(int) GetBlobSize(MEVENT hDbEvent) override;
STDMETHODIMP_(BOOL) GetEvent(MEVENT hDbEvent, DBEVENTINFO *dbe) override;
STDMETHODIMP_(BOOL) MarkEventRead(MCONTACT contactID, MEVENT hDbEvent) override;
STDMETHODIMP_(MCONTACT) GetEventContact(MEVENT hDbEvent) override;
diff --git a/plugins/Import/src/dbrw/dbcontacts.cpp b/plugins/Import/src/dbrw/dbcontacts.cpp
index 110e5ad322..a100788717 100644
--- a/plugins/Import/src/dbrw/dbcontacts.cpp
+++ b/plugins/Import/src/dbrw/dbcontacts.cpp
@@ -43,7 +43,7 @@ STDMETHODIMP_(BOOL) CDbxSQLite::IsDbContact(MCONTACT contactID)
return (cc != nullptr);
}
-STDMETHODIMP_(LONG) CDbxSQLite::GetContactCount(void)
+STDMETHODIMP_(int) CDbxSQLite::GetContactCount(void)
{
int res = 0;
if (sql_step(ctc_stmts_prep[SQL_CTC_STMT_COUNT]) == SQLITE_ROW)
@@ -52,7 +52,7 @@ STDMETHODIMP_(LONG) CDbxSQLite::GetContactCount(void)
return res;
}
-STDMETHODIMP_(LONG) CDbxSQLite::GetContactSize(void)
+STDMETHODIMP_(int) CDbxSQLite::GetContactSize(void)
{
return sizeof(DBCachedContact);
}
@@ -62,7 +62,7 @@ STDMETHODIMP_(MCONTACT) CDbxSQLite::AddContact(void)
return INVALID_CONTACT_ID;
}
-STDMETHODIMP_(LONG) CDbxSQLite::DeleteContact(MCONTACT)
+STDMETHODIMP_(int) CDbxSQLite::DeleteContact(MCONTACT)
{
return 1;
}
diff --git a/plugins/Import/src/dbrw/dbevents.cpp b/plugins/Import/src/dbrw/dbevents.cpp
index 4fcfa650fe..92e100737d 100644
--- a/plugins/Import/src/dbrw/dbevents.cpp
+++ b/plugins/Import/src/dbrw/dbevents.cpp
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "../stdafx.h"
-STDMETHODIMP_(LONG) CDbxSQLite::GetEventCount(MCONTACT contactID)
+STDMETHODIMP_(int) CDbxSQLite::GetEventCount(MCONTACT contactID)
{
mir_cslock lock(m_csDbAccess);
@@ -49,7 +49,7 @@ BOOL CDbxSQLite::EditEvent(MCONTACT, MEVENT, const DBEVENTINFO*)
return 1;
}
-STDMETHODIMP_(LONG) CDbxSQLite::GetBlobSize(MEVENT hDbEvent)
+STDMETHODIMP_(int) CDbxSQLite::GetBlobSize(MEVENT hDbEvent)
{
mir_cslock lock(m_csDbAccess);
diff --git a/plugins/Import/src/dbrw/dbintf.h b/plugins/Import/src/dbrw/dbintf.h
index 481ff173de..e77842de21 100644
--- a/plugins/Import/src/dbrw/dbintf.h
+++ b/plugins/Import/src/dbrw/dbintf.h
@@ -125,17 +125,17 @@ public:
STDMETHODIMP_(BOOL) IsRelational(void) override { return FALSE; }
STDMETHODIMP_(void) SetCacheSafetyMode(BOOL) override;
- STDMETHODIMP_(LONG) GetContactCount(void) override;
- STDMETHODIMP_(LONG) DeleteContact(MCONTACT contactID) override;
+ STDMETHODIMP_(int) GetContactCount(void) override;
+ STDMETHODIMP_(int) DeleteContact(MCONTACT contactID) override;
STDMETHODIMP_(MCONTACT) AddContact(void) override;
STDMETHODIMP_(BOOL) IsDbContact(MCONTACT contactID) override;
- STDMETHODIMP_(LONG) GetContactSize(void) override;
+ STDMETHODIMP_(int) GetContactSize(void) override;
- STDMETHODIMP_(LONG) GetEventCount(MCONTACT contactID) override;
+ STDMETHODIMP_(int) GetEventCount(MCONTACT contactID) override;
STDMETHODIMP_(MEVENT) AddEvent(MCONTACT contactID, const DBEVENTINFO *dbe) override;
STDMETHODIMP_(BOOL) DeleteEvent(MEVENT hDbEvent) override;
STDMETHODIMP_(BOOL) EditEvent(MCONTACT contactID, MEVENT hDbEvent, const DBEVENTINFO *dbe) override;
- STDMETHODIMP_(LONG) GetBlobSize(MEVENT hDbEvent) override;
+ STDMETHODIMP_(int) GetBlobSize(MEVENT hDbEvent) override;
STDMETHODIMP_(BOOL) GetEvent(MEVENT hDbEvent, DBEVENTINFO *dbe) override;
STDMETHODIMP_(BOOL) MarkEventRead(MCONTACT contactID, MEVENT hDbEvent) override;
STDMETHODIMP_(MCONTACT) GetEventContact(MEVENT hDbEvent) override;
diff --git a/plugins/Import/src/mcontacts.cpp b/plugins/Import/src/mcontacts.cpp
index 6764d9ae66..415f580ca9 100644
--- a/plugins/Import/src/mcontacts.cpp
+++ b/plugins/Import/src/mcontacts.cpp
@@ -151,7 +151,7 @@ public:
}
// mcontacts format always store history for one contact only
- STDMETHODIMP_(LONG) GetBlobSize(MEVENT dwOffset) override
+ STDMETHODIMP_(int) GetBlobSize(MEVENT dwOffset) override
{
if (INVALID_SET_FILE_POINTER == SetFilePointer(m_hFile, dwOffset, 0, FILE_BEGIN))
return 0;
@@ -180,14 +180,14 @@ public:
return 0;
}
- STDMETHODIMP_(LONG) GetContactCount(void) override
+ STDMETHODIMP_(int) GetContactCount(void) override
{
return 1;
}
- STDMETHODIMP_(LONG) GetEventCount(MCONTACT) override
+ STDMETHODIMP_(int) GetEventCount(MCONTACT) override
{
- return (LONG)m_events.size();
+ return (int)m_events.size();
}
STDMETHODIMP_(BOOL) GetEvent(MEVENT dwOffset, DBEVENTINFO *dbei) override
diff --git a/plugins/Import/src/patterns.cpp b/plugins/Import/src/patterns.cpp
index cdd69cdfeb..74fb9620dc 100644
--- a/plugins/Import/src/patterns.cpp
+++ b/plugins/Import/src/patterns.cpp
@@ -422,7 +422,7 @@ public:
}
// patterns file always stores history for the single contact only
- STDMETHODIMP_(LONG) GetBlobSize(MEVENT idx) override
+ STDMETHODIMP_(int) GetBlobSize(MEVENT idx) override
{
if (m_events.size() == 0 || idx < 1 || idx > m_events.size())
return 0;
@@ -440,9 +440,9 @@ public:
return RLWord(&pMsg[m_iMsgHeaderSize - 2]) + 1;
}
- STDMETHODIMP_(LONG) GetContactCount(void) override
+ STDMETHODIMP_(int) GetContactCount(void) override
{
- return (LONG)m_files.size();
+ return (int)m_files.size();
}
STDMETHODIMP_(MCONTACT) FindFirstContact(const char *szProto) override
@@ -463,9 +463,9 @@ public:
return ret;
}
- STDMETHODIMP_(LONG) GetEventCount(MCONTACT) override
+ STDMETHODIMP_(int) GetEventCount(MCONTACT) override
{
- return (LONG)m_events.size();
+ return (int)m_events.size();
}
STDMETHODIMP_(BOOL) GetContactSettingWorker(MCONTACT hContact, LPCSTR szModule, LPCSTR szSetting, DBVARIANT* dbv, int isStatic)
@@ -570,7 +570,7 @@ public:
dbei->pBlob = (PBYTE)mir_alloc(dbei->cbBlob + 1);
memcpy(dbei->pBlob, pMsg + m_iMsgHeaderSize, dbei->cbBlob);
if (m_iFileVersion != 1)
- for (unsigned i = 0; i < dbei->cbBlob; i++) {
+ for (int i = 0; i < dbei->cbBlob; i++) {
dbei->pBlob[i] += i+1;
dbei->pBlob[i] = 255 - dbei->pBlob[i];
}
diff --git a/plugins/Import/src/textjson.cpp b/plugins/Import/src/textjson.cpp
index 1cde97c6ba..06d5cd50ea 100644
--- a/plugins/Import/src/textjson.cpp
+++ b/plugins/Import/src/textjson.cpp
@@ -88,12 +88,12 @@ public:
}
// mcontacts format always store history for one contact only
- STDMETHODIMP_(LONG) GetContactCount(void) override
+ STDMETHODIMP_(int) GetContactCount(void) override
{
return 1;
}
- STDMETHODIMP_(LONG) GetEventCount(MCONTACT) override
+ STDMETHODIMP_(int) GetEventCount(MCONTACT) override
{
return m_events.getCount();
}
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);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 20:41:58 +0000