From d1ef727e95bac24bc97ebe5cb3c3f0ee42271f86 Mon Sep 17 00:00:00 2001
From: "(no author)" <(no author)@4f64403b-2f21-0410-a795-97e2b3489a10>
Date: Sun, 29 Mar 2009 15:58:48 +0000
Subject: x64 portability

git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@439 4f64403b-2f21-0410-a795-97e2b3489a10
---
 yapp/notify_imp.cpp | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

(limited to 'yapp/notify_imp.cpp')

diff --git a/yapp/notify_imp.cpp b/yapp/notify_imp.cpp
index 5b20a19..9dc0b2e 100644
--- a/yapp/notify_imp.cpp
+++ b/yapp/notify_imp.cpp
@@ -20,19 +20,31 @@ int Popup2Show(WPARAM wParam, LPARAM lParam) {
 	return 0;
 }
 
+INT_PTR svcPopup2Show(WPARAM wParam, LPARAM lParam) {
+    return Popup2Show(wParam, lParam);
+}
+
 int Popup2Update(WPARAM wParam, LPARAM lParam) {
 	HANDLE hNotify = (HANDLE)lParam;
 	PostMPMessage(MUM_NMUPDATE, (WPARAM)hNotify, (LPARAM)0);
 	return 0;
 }
 
+INT_PTR svcPopup2Update(WPARAM wParam, LPARAM lParam) {
+    return Popup2Update(wParam, lParam);
+}
+
 int Popup2Remove(WPARAM wParam, LPARAM lParam) {
 	HANDLE hNotify = (HANDLE)lParam;
 	PostMPMessage(MUM_NMREMOVE, (WPARAM)hNotify, (LPARAM)0);
 	return 0;
 }
 
-int svcPopup2DefaultActions(WPARAM wParam, LPARAM lParam)
+INT_PTR svcPopup2Remove(WPARAM wParam, LPARAM lParam) {
+    return Popup2Remove(wParam, lParam);
+}
+
+INT_PTR svcPopup2DefaultActions(WPARAM wParam, LPARAM lParam)
 {
 	//PopupWindow *wnd = (PopupWindow *)MNotifyGetDWord((HANDLE)lParam, "Popup2/data", (DWORD)NULL);
 	//if (!wnd) return 0;
@@ -53,10 +65,10 @@ int svcPopup2DefaultActions(WPARAM wParam, LPARAM lParam)
 	return 0;
 }
 
-BOOL CALLBACK DlgProcPopUps(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK DlgProcPopUps(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
 /* To change options use MNotifySet*(hNotify, ....) Apply/Cancel is implemented in notify.dll */
-	HANDLE hNotify = (HANDLE)GetWindowLong(hwnd, GWL_USERDATA);
+	HANDLE hNotify = (HANDLE)GetWindowLongPtr(hwnd, GWLP_USERDATA);
 	switch (msg)
 	{
 		case WM_USER+100:
@@ -64,7 +76,7 @@ BOOL CALLBACK DlgProcPopUps(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 			// This will be extendet to handle array of handles for multiselect lParam
 			// will be HANDLE * and wParam wil; store amount of handles passed
 			hNotify = (HANDLE)lParam;
-			SetWindowLong(hwnd, GWL_USERDATA, lParam);
+			SetWindowLongPtr(hwnd, GWLP_USERDATA, lParam);
 			return TRUE;
 		}
 
@@ -105,9 +117,9 @@ void InitNotify() {
 
 	hServicesNotify[0] = CreateServiceFunction("Popup2/DefaultActions", svcPopup2DefaultActions);
 
-	hServicesNotify[1] = CreateServiceFunction(MS_POPUP2_SHOW, Popup2Show);
-	hServicesNotify[2] = CreateServiceFunction(MS_POPUP2_UPDATE, Popup2Update);
-	hServicesNotify[3] = CreateServiceFunction(MS_POPUP2_REMOVE, Popup2Remove);
+	hServicesNotify[1] = CreateServiceFunction(MS_POPUP2_SHOW, svcPopup2Show);
+	hServicesNotify[2] = CreateServiceFunction(MS_POPUP2_UPDATE, svcPopup2Update);
+	hServicesNotify[3] = CreateServiceFunction(MS_POPUP2_REMOVE, svcPopup2Remove);
 
 	hEventNotifyModulesLoaded = HookEvent(ME_SYSTEM_MODULESLOADED, NotifyModulesLoaded);
 }
-- 
cgit v1.2.3