From 811039b40796ba732b12b5d2dfb52111980569ac Mon Sep 17 00:00:00 2001
From: "(no author)" <(no author)@4f64403b-2f21-0410-a795-97e2b3489a10>
Date: Sun, 29 Mar 2009 19:22:32 +0000
Subject: x64 port

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

(limited to 'updater/popups.cpp')

diff --git a/updater/popups.cpp b/updater/popups.cpp
index 4dbc7c0..7e29a80 100644
--- a/updater/popups.cpp
+++ b/updater/popups.cpp
@@ -62,7 +62,7 @@ LRESULT CALLBACK NullWindowProc( HWND hWnd, UINT message, WPARAM wParam, LPARAM
 	return DefWindowProc(hWnd, message, wParam, lParam);
 }
 
-void __stdcall sttPopupProcA( ULONG dwParam )
+void __stdcall sttPopupProcA( ULONG_PTR dwParam )
 {
 	POPUPDATAEX* ppd = ( POPUPDATAEX* )dwParam;
 
@@ -75,7 +75,7 @@ void __stdcall sttPopupProcA( ULONG dwParam )
 	free( ppd );
 }
 
-void __stdcall sttPopupProcW( ULONG dwParam )
+void __stdcall sttPopupProcW( ULONG_PTR dwParam )
 {
 	POPUPDATAW* ppd = ( POPUPDATAW* )dwParam;
 
@@ -109,14 +109,14 @@ void ShowPopupA( HANDLE hContact, const char* line1, const char* line2, int flag
 	SetEvent(hEventPop);
 	ResetEvent(hEventPop);
 
-	if(ServiceExists(MS_YAPP_CLASSINSTANCE)) {
-		PopupClassInstance d = {sizeof(d), "updaterpopups"};
+	if(ServiceExists(MS_POPUP_ADDPOPUPCLASS)) {
+		POPUPDATACLASS d = {sizeof(d), "updaterpopups"};
 		d.pszTitle = (char *)line1;
 		d.pszText = (char *)line2;
-		d.opaque = malloc(sizeof(PopupDataType));
-		((PopupDataType*)d.opaque)->flags = flags;
-		((PopupDataType*)d.opaque)->hIcon = 0;
-		CallService(MS_YAPP_CLASSINSTANCE, 0, (LPARAM)&d);
+		d.PluginData = malloc(sizeof(PopupDataType));
+		((PopupDataType*)d.PluginData)->flags = flags;
+		((PopupDataType*)d.PluginData)->hIcon = 0;
+		CallService(MS_POPUP_ADDPOPUPCLASS, 0, (LPARAM)&d);
 	} else {
 
 		POPUPDATAEX* ppd = ( POPUPDATAEX* )malloc( sizeof( POPUPDATAEX ));
@@ -154,7 +154,7 @@ void ShowPopupA( HANDLE hContact, const char* line1, const char* line2, int flag
 		((PopupDataType*)ppd->PluginData)->flags = flags;
 		((PopupDataType*)ppd->PluginData)->hIcon = ppd->lchIcon;
 
-		QueueUserAPC( sttPopupProcA , mainThread, ( ULONG )ppd );
+		QueueUserAPC( sttPopupProcA , mainThread, ( ULONG_PTR )ppd );
 	}
 }
 
@@ -182,14 +182,14 @@ void ShowPopupW( HANDLE hContact, const wchar_t* line1, const wchar_t* line2, in
 	SetEvent(hEventPop);
 	ResetEvent(hEventPop);
 
-	if(ServiceExists(MS_YAPP_CLASSINSTANCE)) {
-		PopupClassInstance d = {sizeof(d), "updaterpopups"};
+	if(ServiceExists(MS_POPUP_ADDPOPUPCLASS)) {
+		POPUPDATACLASS d = {sizeof(d), "updaterpopups"};
 		d.pwszTitle = (wchar_t *)line1;
 		d.pwszText = (wchar_t *)line2;
-		d.opaque = malloc(sizeof(PopupDataType));
-		((PopupDataType*)d.opaque)->flags = flags;
-		((PopupDataType*)d.opaque)->hIcon = 0;
-		CallService(MS_YAPP_CLASSINSTANCE, 0, (LPARAM)&d);
+		d.PluginData = malloc(sizeof(PopupDataType));
+		((PopupDataType*)d.PluginData)->flags = flags;
+		((PopupDataType*)d.PluginData)->hIcon = 0;
+		CallService(MS_POPUP_ADDPOPUPCLASS, 0, (LPARAM)&d);
 	} else {
 		POPUPDATAW* ppd = ( POPUPDATAW* )malloc( sizeof( POPUPDATAW ));
 		memset((void *)ppd, 0, sizeof(POPUPDATAW));
@@ -226,7 +226,7 @@ void ShowPopupW( HANDLE hContact, const wchar_t* line1, const wchar_t* line2, in
 		((PopupDataType*)ppd->PluginData)->flags = flags;
 		((PopupDataType*)ppd->PluginData)->hIcon = ppd->lchIcon;
 
-		QueueUserAPC( sttPopupProcW , mainThread, ( ULONG )ppd );
+		QueueUserAPC( sttPopupProcW , mainThread, ( ULONG_PTR )ppd );
 	}
 }
 
@@ -311,17 +311,17 @@ void InitPopups() {
 
 	hEventPop = CreateEvent( NULL, TRUE, FALSE, NULL );
 
-	if(ServiceExists(MS_YAPP_REGISTERCLASS)) {
+	if(ServiceExists(MS_POPUP_REGISTERCLASS)) {
 		hPopupIcon = LoadIconEx(I_CHKUPD);
-		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("Updater");
 		test.pszName = "updaterpopups";
-		test.windowProc = NullWindowProc;
-		CallService(MS_YAPP_REGISTERCLASS, 0, (WPARAM)&test);
+		test.PluginWindowProc = NullWindowProc;
+		CallService(MS_POPUP_REGISTERCLASS, 0, (WPARAM)&test);
 	}
 }
 
-- 
cgit v1.2.3