From e6c6d61d66fff027f8de9e67a59151442282b94d Mon Sep 17 00:00:00 2001
From: "(no author)" <(no author)@4f64403b-2f21-0410-a795-97e2b3489a10>
Date: Sat, 18 Dec 2010 23:28:28 +0000
Subject: Updated to the latest miranda

git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@587 4f64403b-2f21-0410-a795-97e2b3489a10
---
 message_notify/popups.cpp | 40 +++++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 21 deletions(-)

(limited to 'message_notify/popups.cpp')

diff --git a/message_notify/popups.cpp b/message_notify/popups.cpp
index 3bcc7d6..91cc327 100644
--- a/message_notify/popups.cpp
+++ b/message_notify/popups.cpp
@@ -7,7 +7,7 @@
 HICON hPopupIcon;
 bool unicode_enabled, classes_enabled;
 
-void __stdcall sttOpenSRMMWindowProc( ULONG dwParam )
+void __stdcall sttOpenSRMMWindowProc( void* dwParam )
 {
 	//CallService(MS_MSG_SENDMESSAGE, (WPARAM)dwParam, 0);
 	
@@ -15,7 +15,7 @@ void __stdcall sttOpenSRMMWindowProc( ULONG dwParam )
 	CallService(MS_CLIST_CONTACTDOUBLECLICKED, (WPARAM)dwParam, 0);
 }
 
-void __stdcall sttCloseSRMMWindowProc( ULONG dwParam )
+void __stdcall sttCloseSRMMWindowProc( void* dwParam )
 {
 	HANDLE hContact = (HANDLE)dwParam;
 	MessageWindowInputData mwid = {0};
@@ -50,7 +50,7 @@ LRESULT CALLBACK NullWindowProc( HWND hWnd, UINT message, WPARAM wParam, LPARAM
 
 		case WM_COMMAND: {
 			hContact = (HANDLE)CallService(MS_POPUP_GETPLUGINDATA, (WPARAM)hWnd, (LPARAM)&hContact);
-			QueueUserAPC( sttOpenSRMMWindowProc , mainThread, ( ULONG )hContact );
+			CallFunctionAsync( sttOpenSRMMWindowProc, hContact );
 			PUDeletePopUp( hWnd );
 			return TRUE;
 		}
@@ -73,7 +73,7 @@ LRESULT CALLBACK NullWindowProc( HWND hWnd, UINT message, WPARAM wParam, LPARAM
 				lastDbEvent = (HANDLE)CallService(MS_DB_EVENT_FINDPREV, (WPARAM)lastDbEvent, 0);
 			}
 			if(options.close_win)
-				QueueUserAPC( sttCloseSRMMWindowProc , mainThread, ( ULONG )hContact );
+				CallFunctionAsync( sttCloseSRMMWindowProc, hContact );
 			PUDeletePopUp( hWnd );
 			return TRUE;
 		}
@@ -89,7 +89,7 @@ LRESULT CALLBACK NullWindowProc( HWND hWnd, UINT message, WPARAM wParam, LPARAM
 	return DefWindowProc(hWnd, message, wParam, lParam);
 }
 
-void __stdcall sttPopupProc( ULONG param ){
+void __stdcall sttPopupProc( void* param ){
 //unsigned __stdcall sttPopupProc(void *param) {
 	POPUPDATAEX* ppd = ( POPUPDATAEX* )param;
 
@@ -104,7 +104,7 @@ void __stdcall sttPopupProc( ULONG param ){
 	//return 0;
 }
 
-void __stdcall sttPopupProcW( ULONG param ) {
+void __stdcall sttPopupProcW( void* param ) {
 //unsigned __stdcall sttPopupProcW(void *param) {
 	POPUPDATAW* ppd = ( POPUPDATAW* )param;
 
@@ -138,12 +138,12 @@ void ShowPopup( HANDLE hContact, const char* line1, const char* line2, int flags
 	}
 
 	if(classes_enabled) {
-		PopupClassInstance d = {sizeof(d), "messagenotify"};
+		POPUPDATACLASS d = {sizeof(d), "messagenotify"};
 		d.pszTitle = line1;
 		d.pszText = line2;
 		d.hContact = hContact;
-		d.opaque = (void *)hContact;
-		CallService(MS_YAPP_CLASSINSTANCE, 0, (LPARAM)&d);
+		d.PluginData = (void *)hContact;
+		CallService(MS_POPUP_ADDPOPUPCLASS, 0, (LPARAM)&d);
 	} else {
 		POPUPDATAEX* ppd = ( POPUPDATAEX* )malloc( sizeof( POPUPDATAEX ));
 		memset((void *)ppd, 0, sizeof(POPUPDATAEX));
@@ -164,8 +164,7 @@ void ShowPopup( HANDLE hContact, const char* line1, const char* line2, int flags
 
 		ppd->PluginData = (void *)hContact;
 
-		QueueUserAPC( sttPopupProc , mainThread, ( ULONG )ppd );
-		//CloseHandle((void *)_beginthreadex(0, 0, sttPopupProc, (LPVOID)ppd, 0, 0));
+		CallFunctionAsync( sttPopupProc, ppd );
 	}
 }
 
@@ -191,12 +190,12 @@ void ShowPopupW( HANDLE hContact, const wchar_t* line1, const wchar_t* line2, in
 	}
 
 	if(classes_enabled) {
-		PopupClassInstance d = {sizeof(d), "messagenotify"};
+		POPUPDATACLASS d = {sizeof(d), "messagenotify"};
 		d.pwszTitle = line1;
 		d.pwszText = line2;
 		d.hContact = hContact;
-		d.opaque = (void *)hContact;
-		CallService(MS_YAPP_CLASSINSTANCE, 0, (LPARAM)&d);
+		d.PluginData = (void *)hContact;
+		CallService(MS_POPUP_ADDPOPUPCLASS, 0, (LPARAM)&d);
 	} else {
 		POPUPDATAW* ppd = ( POPUPDATAW* )malloc( sizeof( POPUPDATAW ));
 		memset((void *)ppd, 0, sizeof(POPUPDATAW));
@@ -217,8 +216,7 @@ void ShowPopupW( HANDLE hContact, const wchar_t* line1, const wchar_t* line2, in
 
 		ppd->PluginData = (void *)hContact;
 
-		QueueUserAPC( sttPopupProcW , mainThread, ( ULONG )ppd );
-		//CloseHandle((void *)_beginthreadex(0, 0, sttPopupProcW, (LPVOID)ppd, 0, 0));
+		CallFunctionAsync( sttPopupProcW, ppd );
 	}
 }
 
@@ -253,17 +251,17 @@ bool IsUnicodePopupsEnabled() {
 void InitUtils() {
 	hPopupIcon = LoadSkinnedIcon(SKINICON_EVENT_MESSAGE);
 	unicode_enabled = ServiceExists(MS_POPUP_ADDPOPUPW) ? true : false;
-	classes_enabled = ServiceExists(MS_YAPP_REGISTERCLASS) ? true : false;
+	classes_enabled = ServiceExists(MS_POPUP_REGISTERCLASS) ? true : false;
 	if(classes_enabled) {
-		PopupClass test = {0};
+		POPUPCLASS test = {0};
 		test.cbSize = sizeof(test);
 		test.flags = PCF_TCHAR;
 		test.hIcon = hPopupIcon;
-		test.timeout = -1;
+		test.iSeconds = -1;
 		test.ptszDescription = TranslateT("Message Notify");
 		test.pszName = "messagenotify";
-		test.windowProc = NullWindowProc;
-		CallService(MS_YAPP_REGISTERCLASS, 0, (WPARAM)&test);
+		test.PluginWindowProc = NullWindowProc;
+		CallService(MS_POPUP_REGISTERCLASS, 0, (WPARAM)&test);
 	}
 }
 
-- 
cgit v1.2.3