From 85c0b6a96f366bdf0ca334ee7cb1877fb3f2288c Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 16 Jan 2015 17:49:54 +0000 Subject: MEVENT - the strict type for events, they are not HANDLE anymore git-svn-id: http://svn.miranda-ng.org/main/trunk@11866 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/HistoryLinkListPlus/src/linklist.cpp | 2 +- plugins/HistoryLinkListPlus/src/linklist.h | 4 ++-- plugins/HistoryLinkListPlus/src/linklist_fct.cpp | 7 +++---- 3 files changed, 6 insertions(+), 7 deletions(-) (limited to 'plugins/HistoryLinkListPlus/src') diff --git a/plugins/HistoryLinkListPlus/src/linklist.cpp b/plugins/HistoryLinkListPlus/src/linklist.cpp index b41af89a65..6c374a238e 100644 --- a/plugins/HistoryLinkListPlus/src/linklist.cpp +++ b/plugins/HistoryLinkListPlus/src/linklist.cpp @@ -122,7 +122,7 @@ static INT_PTR LinkList_Main(WPARAM hContact, LPARAM) return 0; } - HANDLE hEvent = db_event_first(hContact); + MEVENT hEvent = db_event_first(hContact); if (hEvent == NULL) { MessageBox(NULL, TXT_EMPTYHISTORY, TXT_PLUGINNAME, (MB_OK | MB_ICONINFORMATION)); return 0; diff --git a/plugins/HistoryLinkListPlus/src/linklist.h b/plugins/HistoryLinkListPlus/src/linklist.h index f3e89dd275..6bd8bdde50 100644 --- a/plugins/HistoryLinkListPlus/src/linklist.h +++ b/plugins/HistoryLinkListPlus/src/linklist.h @@ -79,7 +79,7 @@ struct LISTELEMENT { TCHAR date[DATE_SIZE]; TCHAR time[TIME_SIZE]; TCHAR link[LINK_MAX]; - HANDLE hEvent; + MEVENT hEvent; int linePos; struct LISTELEMENT *nextElement; } ; @@ -150,7 +150,7 @@ typedef struct { static INT_PTR LinkList_Main(WPARAM, LPARAM); int InitOptionsDlg(WPARAM, LPARAM); int DBUpdate(WPARAM, LPARAM); -int ExtractURI(DBEVENTINFO*, HANDLE, LISTELEMENT*); +int ExtractURI(DBEVENTINFO*, MEVENT, LISTELEMENT*); int RemoveList(LISTELEMENT*); int ListCount(LISTELEMENT*); diff --git a/plugins/HistoryLinkListPlus/src/linklist_fct.cpp b/plugins/HistoryLinkListPlus/src/linklist_fct.cpp index ff08afccd6..ab280df73b 100644 --- a/plugins/HistoryLinkListPlus/src/linklist_fct.cpp +++ b/plugins/HistoryLinkListPlus/src/linklist_fct.cpp @@ -27,7 +27,7 @@ Miranda core. It looks a bit sophisticated. I'd made a few changes but I didn't really understand what these guys did! Great job! It works! ;-) */ -int ExtractURI(DBEVENTINFO *dbei, HANDLE hEvent, LISTELEMENT *listStart) +int ExtractURI(DBEVENTINFO *dbei, MEVENT hEvent, LISTELEMENT *listStart) { size_t wordStart, i, j, wordlen, iLastAlphaNum; size_t charCount = 0, cpLastAlphaNum = 0, cpWordStart; @@ -618,7 +618,7 @@ void WriteMessage(HWND hDlg, LISTELEMENT *listStart, int actLinePos) LISTELEMENT *actualElement = listStart->nextElement; while (actualElement != NULL) { if (actualElement->linePos == actLinePos) { - HANDLE hEvent = actualElement->hEvent; + MEVENT hEvent = actualElement->hEvent; if (hEvent != NULL ) { DBEVENTINFO dbe = { sizeof(dbe) }; dbe.cbBlob = db_event_getBlobSize(hEvent); @@ -1174,9 +1174,8 @@ BYTE GetUpdateSetting(void) Special thanks to Tobi H.! This function is derived from his Wordlookup Plugin */ -int DBUpdate(WPARAM wParam, LPARAM lParam) +int DBUpdate(WPARAM wParam, LPARAM hEvent) { - HANDLE hEvent=(HANDLE)lParam; HWND hDlg = WindowList_Find(hWindowList, wParam); DIALOGPARAM *DlgParam; HMENU listMenu = GetMenu(hDlg); -- cgit v1.2.3