From aec9ec8b670b3bb9a719377b75a53ff009b07c3d Mon Sep 17 00:00:00 2001 From: sje Date: Wed, 17 Oct 2007 01:15:54 +0000 Subject: changed to use 'event added' instead of 'filter add' git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@371 4f64403b-2f21-0410-a795-97e2b3489a10 --- message_notify/popups.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'message_notify/popups.cpp') diff --git a/message_notify/popups.cpp b/message_notify/popups.cpp index 20a58f0..3bcc7d6 100644 --- a/message_notify/popups.cpp +++ b/message_notify/popups.cpp @@ -41,21 +41,22 @@ void __stdcall sttCloseSRMMWindowProc( ULONG dwParam ) LRESULT CALLBACK NullWindowProc( HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam ) { + HANDLE hContact, lastDbEvent; switch( message ) { case UM_INITPOPUP: - HANDLE hContact = (HANDLE)CallService(MS_POPUP_GETPLUGINDATA, (WPARAM)hWnd, (LPARAM)&hContact); + hContact = (HANDLE)CallService(MS_POPUP_GETPLUGINDATA, (WPARAM)hWnd, (LPARAM)&hContact); if(!InList(hContact, hWnd)) AddToWindowList(hContact, hWnd); return TRUE; case WM_COMMAND: { - HANDLE hContact = (HANDLE)CallService(MS_POPUP_GETPLUGINDATA, (WPARAM)hWnd, (LPARAM)&hContact); + hContact = (HANDLE)CallService(MS_POPUP_GETPLUGINDATA, (WPARAM)hWnd, (LPARAM)&hContact); QueueUserAPC( sttOpenSRMMWindowProc , mainThread, ( ULONG )hContact ); PUDeletePopUp( hWnd ); return TRUE; } case WMU_CLOSEPOPUP: { - HANDLE hContact = (HANDLE)CallService(MS_POPUP_GETPLUGINDATA, (WPARAM)hWnd, (LPARAM)&hContact); + hContact = (HANDLE)CallService(MS_POPUP_GETPLUGINDATA, (WPARAM)hWnd, (LPARAM)&hContact); if((HANDLE)wParam == hContact) PUDeletePopUp( hWnd ); return TRUE; @@ -63,8 +64,8 @@ LRESULT CALLBACK NullWindowProc( HWND hWnd, UINT message, WPARAM wParam, LPARAM case WM_CONTEXTMENU: { // mark most recent event read...FIXME (may not be correct event) - HANDLE hContact = (HANDLE)CallService(MS_POPUP_GETPLUGINDATA, (WPARAM)hWnd, (LPARAM)&hContact); - HANDLE lastDbEvent = (HANDLE)CallService(MS_DB_EVENT_FINDLAST, (WPARAM)hContact, 0); + hContact = (HANDLE)CallService(MS_POPUP_GETPLUGINDATA, (WPARAM)hWnd, (LPARAM)&hContact); + lastDbEvent = (HANDLE)CallService(MS_DB_EVENT_FINDLAST, (WPARAM)hContact, 0); int count = 0; while(lastDbEvent && count++ < 10) { CallService(MS_DB_EVENT_MARKREAD, (WPARAM)hContact, (LPARAM)lastDbEvent); @@ -78,7 +79,7 @@ LRESULT CALLBACK NullWindowProc( HWND hWnd, UINT message, WPARAM wParam, LPARAM } case UM_FREEPLUGINDATA: { - HANDLE hContact = (HANDLE)CallService(MS_POPUP_GETPLUGINDATA, (WPARAM)hWnd, (LPARAM)&hContact); + hContact = (HANDLE)CallService(MS_POPUP_GETPLUGINDATA, (WPARAM)hWnd, (LPARAM)&hContact); RemoveFromWindowList(hContact, hWnd); return TRUE; } -- cgit v1.2.3