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 --- src/core/stdmsg/src/globals.cpp | 8 ++++---- src/core/stdmsg/src/msgdialog.cpp | 10 +++++----- src/core/stdmsg/src/msglog.cpp | 6 +++--- src/core/stdmsg/src/msgs.cpp | 8 ++++---- src/core/stdmsg/src/msgs.h | 28 ++++++++++++++-------------- 5 files changed, 30 insertions(+), 30 deletions(-) (limited to 'src/core/stdmsg') diff --git a/src/core/stdmsg/src/globals.cpp b/src/core/stdmsg/src/globals.cpp index f2033c6e00..62fe7fa5e8 100644 --- a/src/core/stdmsg/src/globals.cpp +++ b/src/core/stdmsg/src/globals.cpp @@ -58,17 +58,17 @@ static int OnMetaChanged(WPARAM hMeta, LPARAM) return 0; } -static int dbaddedevent(WPARAM hContact, LPARAM lParam) +static int dbaddedevent(WPARAM hContact, LPARAM hDbEvent) { if (hContact) { HWND h = WindowList_Find(g_dat.hMessageWindowList, hContact); if (h) - SendMessage(h, HM_DBEVENTADDED, hContact, lParam); + SendMessage(h, HM_DBEVENTADDED, hContact, hDbEvent); - MCONTACT hEventContact = db_event_getContact((HANDLE)lParam); + MCONTACT hEventContact = db_event_getContact(hDbEvent); if (hEventContact != hContact) if ((h = WindowList_Find(g_dat.hMessageWindowList, hEventContact)) != NULL) - SendMessage(h, HM_DBEVENTADDED, hEventContact, lParam); + SendMessage(h, HM_DBEVENTADDED, hEventContact, hDbEvent); } return 0; } diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp index f0bf138396..ee401f03f4 100644 --- a/src/core/stdmsg/src/msgdialog.cpp +++ b/src/core/stdmsg/src/msgdialog.cpp @@ -757,7 +757,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP switch (historyMode) { case LOADHISTORY_COUNT: for (int i = db_get_w(NULL, SRMMMOD, SRMSGSET_LOADCOUNT, SRMSGDEFSET_LOADCOUNT); i--;) { - HANDLE hPrevEvent; + MEVENT hPrevEvent; if (dat->hDbEventFirst == NULL) hPrevEvent = db_event_last(dat->hContact); else @@ -782,7 +782,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP DWORD firstTime = dbei.timestamp - 60 * db_get_w(NULL, SRMMMOD, SRMSGSET_LOADTIME, SRMSGDEFSET_LOADTIME); for (;;) { - HANDLE hPrevEvent; + MEVENT hPrevEvent; if (dat->hDbEventFirst == NULL) hPrevEvent = db_event_last(dat->hContact); else @@ -800,7 +800,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP } } - HANDLE hdbEvent = db_event_last(dat->hContact); + MEVENT hdbEvent = db_event_last(dat->hContact); if (hdbEvent) { do { DBEVENTINFO dbei = { sizeof(dbei) }; @@ -1260,7 +1260,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP break; case DM_APPENDTOLOG: //takes wParam=hDbEvent - StreamInEvents(hwndDlg, (HANDLE)wParam, 1, 1); + StreamInEvents(hwndDlg, wParam, 1, 1); break; case DM_SCROLLLOGTOBOTTOM: @@ -1281,7 +1281,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP case HM_DBEVENTADDED: if (wParam == dat->hContact) { - HANDLE hDbEvent = (HANDLE)lParam; + MEVENT hDbEvent = lParam; if (dat->hDbEventFirst == NULL) dat->hDbEventFirst = hDbEvent; diff --git a/src/core/stdmsg/src/msglog.cpp b/src/core/stdmsg/src/msglog.cpp index 8a604a72a0..c25f1bdd2d 100644 --- a/src/core/stdmsg/src/msglog.cpp +++ b/src/core/stdmsg/src/msglog.cpp @@ -39,7 +39,7 @@ struct LogStreamData { int stage; MCONTACT hContact; - HANDLE hDbEvent, hDbEventLast; + MEVENT hDbEvent, hDbEventLast; char *buffer; int bufferOffset, bufferLen; int eventsToInsert; @@ -228,7 +228,7 @@ int DbEventIsShown(DBEVENTINFO *dbei) } //mir_free() the return value -static char *CreateRTFFromDbEvent(SrmmWindowData *dat, MCONTACT hContact, HANDLE hDbEvent, struct LogStreamData *streamData) +static char *CreateRTFFromDbEvent(SrmmWindowData *dat, MCONTACT hContact, MEVENT hDbEvent, struct LogStreamData *streamData) { int showColon = 0; @@ -444,7 +444,7 @@ static DWORD CALLBACK LogStreamInEvents(DWORD_PTR dwCookie, LPBYTE pbBuff, LONG return 0; } -void StreamInEvents(HWND hwndDlg, HANDLE hDbEventFirst, int count, int fAppend) +void StreamInEvents(HWND hwndDlg, MEVENT hDbEventFirst, int count, int fAppend) { EDITSTREAM stream = { 0 }; struct LogStreamData streamData = { 0 }; diff --git a/src/core/stdmsg/src/msgs.cpp b/src/core/stdmsg/src/msgs.cpp index 2a846769ec..0f3e5e5eb2 100644 --- a/src/core/stdmsg/src/msgs.cpp +++ b/src/core/stdmsg/src/msgs.cpp @@ -52,7 +52,7 @@ static int SRMMStatusToPf2(int status) static int MessageEventAdded(WPARAM hContact, LPARAM lParam) { DBEVENTINFO dbei = { sizeof(dbei) }; - db_event_get((HANDLE)lParam, &dbei); + db_event_get(lParam, &dbei); if (dbei.flags & (DBEF_SENT | DBEF_READ) || !(dbei.eventType == EVENTTYPE_MESSAGE || DbEventIsForMsgWindow(&dbei))) return 0; @@ -89,7 +89,7 @@ static int MessageEventAdded(WPARAM hContact, LPARAM lParam) CLISTEVENT cle = { sizeof(cle) }; cle.hContact = hContact; - cle.hDbEvent = (HANDLE)lParam; + cle.hDbEvent = lParam; cle.flags = CLEF_TCHAR; cle.hIcon = LoadSkinnedIcon(SKINICON_EVENT_MESSAGE); cle.pszService = "SRMsg/ReadMessage"; @@ -179,7 +179,7 @@ static int TypingMessage(WPARAM hContact, LPARAM lParam) else { CLISTEVENT cle = { sizeof(cle) }; cle.hContact = hContact; - cle.hDbEvent = (HANDLE)1; + cle.hDbEvent = 1; cle.flags = CLEF_ONLYAFEW | CLEF_TCHAR; cle.hIcon = LoadSkinnedIcon(SKINICON_OTHER_TYPING); cle.pszService = "SRMsg/ReadMessage"; @@ -235,7 +235,7 @@ static void RestoreUnreadMessageAlerts(void) DBEVENTINFO dbei = { sizeof(dbei) }; for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) { - for (HANDLE hDbEvent = db_event_firstUnread(hContact); hDbEvent; hDbEvent = db_event_next(hContact, hDbEvent)) { + for (MEVENT hDbEvent = db_event_firstUnread(hContact); hDbEvent; hDbEvent = db_event_next(hContact, hDbEvent)) { bool autoPopup = false; dbei.cbBlob = 0; db_event_get(hDbEvent, &dbei); diff --git a/src/core/stdmsg/src/msgs.h b/src/core/stdmsg/src/msgs.h index 0ce9aea114..45d040d7dc 100644 --- a/src/core/stdmsg/src/msgs.h +++ b/src/core/stdmsg/src/msgs.h @@ -40,7 +40,7 @@ struct SrmmWindowData : public MZeroedObject {} MCONTACT hContact; - HANDLE hDbEventFirst, hDbEventLast; + MEVENT hDbEventFirst, hDbEventLast; HBRUSH hBkgBrush; int splitterPos, originalSplitterPos; SIZE minEditBoxSize; @@ -105,26 +105,26 @@ struct CREOleCallback : public IRichEditOleCallback int nextStgId; STDMETHOD(QueryInterface)(REFIID riid, LPVOID FAR * lplpObj); - STDMETHOD_(ULONG,AddRef) (THIS); - STDMETHOD_(ULONG,Release) (THIS); + STDMETHOD_(ULONG,AddRef)(THIS); + STDMETHOD_(ULONG,Release)(THIS); STDMETHOD(ContextSensitiveHelp)(BOOL fEnterMode); - STDMETHOD(GetNewStorage) (LPSTORAGE FAR * lplpstg); - STDMETHOD(GetInPlaceContext) (LPOLEINPLACEFRAME FAR * lplpFrame, LPOLEINPLACEUIWINDOW FAR * lplpDoc, LPOLEINPLACEFRAMEINFO lpFrameInfo); - STDMETHOD(ShowContainerUI) (BOOL fShow); - STDMETHOD(QueryInsertObject) (LPCLSID lpclsid, LPSTORAGE lpstg, LONG cp); - STDMETHOD(DeleteObject) (LPOLEOBJECT lpoleobj); - STDMETHOD(QueryAcceptData) (LPDATAOBJECT lpdataobj, CLIPFORMAT FAR * lpcfFormat, DWORD reco, BOOL fReally, HGLOBAL hMetaPict); - STDMETHOD(GetClipboardData) (CHARRANGE FAR * lpchrg, DWORD reco, LPDATAOBJECT FAR * lplpdataobj); - STDMETHOD(GetDragDropEffect) (BOOL fDrag, DWORD grfKeyState, LPDWORD pdwEffect); - STDMETHOD(GetContextMenu) (WORD seltype, LPOLEOBJECT lpoleobj, CHARRANGE FAR * lpchrg, HMENU FAR * lphmenu) ; + STDMETHOD(GetNewStorage)(LPSTORAGE FAR * lplpstg); + STDMETHOD(GetInPlaceContext)(LPOLEINPLACEFRAME FAR * lplpFrame, LPOLEINPLACEUIWINDOW FAR * lplpDoc, LPOLEINPLACEFRAMEINFO lpFrameInfo); + STDMETHOD(ShowContainerUI)(BOOL fShow); + STDMETHOD(QueryInsertObject)(LPCLSID lpclsid, LPSTORAGE lpstg, LONG cp); + STDMETHOD(DeleteObject)(LPOLEOBJECT lpoleobj); + STDMETHOD(QueryAcceptData)(LPDATAOBJECT lpdataobj, CLIPFORMAT FAR * lpcfFormat, DWORD reco, BOOL fReally, HGLOBAL hMetaPict); + STDMETHOD(GetClipboardData)(CHARRANGE FAR *lpchrg, DWORD reco, LPDATAOBJECT FAR * lplpdataobj); + STDMETHOD(GetDragDropEffect)(BOOL fDrag, DWORD grfKeyState, LPDWORD pdwEffect); + STDMETHOD(GetContextMenu)(WORD seltype, LPOLEOBJECT lpoleobj, CHARRANGE FAR * lpchrg, HMENU FAR * lphmenu) ; }; INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK ErrorDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam); int DbEventIsForMsgWindow(DBEVENTINFO *dbei); -int DbEventIsShown(DBEVENTINFO * dbei); -void StreamInEvents(HWND hwndDlg, HANDLE hDbEventFirst, int count, int fAppend); +int DbEventIsShown(DBEVENTINFO *dbei); +void StreamInEvents(HWND hwndDlg, MEVENT hDbEventFirst, int count, int fAppend); int SendMessageDirect(const TCHAR *szMsg, MCONTACT hContact, char *szProto); void LoadMsgLogIcons(void); -- cgit v1.2.3