X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=windows%2Fwinpgnt.c;h=59a12e20e095ece87ba6a1cfa45c3b84289a7830;hb=69ac38c1a847348de4c05fd4e19abf17a10de8b3;hp=b0cd08bbd16c72e451236be73e01d11a341d864d;hpb=6eec320f0b3606f17f06a290acdbb8f84afdff00;p=PuTTY.git

diff --git a/windows/winpgnt.c b/windows/winpgnt.c
index b0cd08bb..59a12e20 100644
--- a/windows/winpgnt.c
+++ b/windows/winpgnt.c
@@ -24,9 +24,8 @@
 #define IDI_MAINICON 200
 #define IDI_TRAYICON 201
 
-#define WM_XUSER     (WM_USER + 0x2000)
-#define WM_SYSTRAY   (WM_XUSER + 6)
-#define WM_SYSTRAY2  (WM_XUSER + 7)
+#define WM_SYSTRAY   (WM_APP + 6)
+#define WM_SYSTRAY2  (WM_APP + 7)
 
 #define AGENT_COPYDATA_ID 0x804e50ba   /* random goop */
 
@@ -1471,8 +1470,9 @@ static int CALLBACK KeyListProc(HWND hwnd, UINT msg,
 	}
 
         if (help_path)
-            SetWindowLong(hwnd, GWL_EXSTYLE,
-                          GetWindowLong(hwnd, GWL_EXSTYLE) | WS_EX_CONTEXTHELP);
+            SetWindowLongPtr(hwnd, GWL_EXSTYLE,
+			     GetWindowLongPtr(hwnd, GWL_EXSTYLE) |
+			     WS_EX_CONTEXTHELP);
         else {
             HWND item = GetDlgItem(hwnd, 103);   /* the Help button */
             if (item)