From 2ae4a360da9638ecaaa68bbb683187ef8e1faf35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Sch=C3=BCmann?= Date: Thu, 21 Aug 2014 11:42:31 +0000 Subject: IEHistory: Miranda NG compatibility. - removed mirandaMem * GetWindowLong => GetWindowLongPtr * SetWindowLong => SetWindowLongPtr * DLGPROC returning int/BOOL => INT_PTR * CallService(MS_DB_EVENT_*) => db_event_* * DBGetContactSetting* => db_get_* * DBWriteContactSetting => db_set_* * contact HANDLE => MCONTACT * CallService(MS_CLIST_ADD*MENUITEM,...) => Menu_Add*MenuItem() * improved GetContactName() - removed some #pragma warning's * version bump to 0.0.1.5 git-svn-id: http://svn.miranda-ng.org/main/trunk@10253 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/IEHistory/src/utils.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'plugins/IEHistory/src/utils.h') diff --git a/plugins/IEHistory/src/utils.h b/plugins/IEHistory/src/utils.h index c423b4ede7..7cad1a1116 100644 --- a/plugins/IEHistory/src/utils.h +++ b/plugins/IEHistory/src/utils.h @@ -22,7 +22,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define M_IEHISTORY_UTILS_H #include "stdafx.h" -#include "time.h" +#include +#include #define ANCHOR_LEFT 0x000001 #define ANCHOR_RIGHT 0x000002 @@ -60,27 +61,26 @@ struct SearchResult{ HANDLE hEvent; }; -//#ifdef _DEBUG +#ifdef _DEBUG int LogInit(); int Log(char *format, ...); -//#endif +#else +# define LogInit() +# define Log(fmt,...) +#endif void ScreenToClient(HWND hWnd, LPRECT rect); int Info(char *title, char *format, ...); -TCHAR *GetContactName(HANDLE hContact, char *szProto); +TCHAR *GetContactName(MCONTACT contact); void AnchorMoveWindow(HWND window, const WINDOWPOS *parentPos, int anchors); RECT AnchorCalcPos(HWND window, const RECT *rParent, const WINDOWPOS *parentPos, int anchors); void UnixTimeToFileTime(time_t t, LPFILETIME pft); void UnixTimeToSystemTime(time_t t, LPSYSTEMTIME pst); -HANDLE GetNeededEvent(HANDLE hLastFirstEvent, int index, int direction); -SearchResult SearchHistory(HANDLE hContact, HANDLE hFirstEvent, void *searchData, int direction, int type); - -extern void *(*MirandaMalloc)(size_t size); -extern void *(*MirandaRealloc)(void *data, size_t newSize); -extern void (*MirandaFree) (void *data); +HANDLE GetNeededEvent(HANDLE hLastFirstEvent, int num, int direction); +SearchResult SearchHistory(MCONTACT contact, HANDLE hFirstEvent, void *searchData, int direction, int type); /* static __inline int mir_snprintf(char *buffer, size_t count, const char* fmt, ...) { @@ -94,4 +94,4 @@ static __inline int mir_snprintf(char *buffer, size_t count, const char* fmt, .. return len; } */ -#endif \ No newline at end of file +#endif -- cgit v1.2.3