Ben Rudiak-Gould points out that we should be using WM_APP as the base for

our app-private window messages, which is considerably higher than the
WM_XUSER we arbitrarily chose. (This isn't known to be causing any actual
problems. The fix seems not to have obviously broken anything.)

git-svn-id: svn://svn.tartarus.org/sgt/putty@6183 cda61777-01e9-0310-a592-d414129be87e

diff --git a/windows/window.c b/windows/window.c
index a37ac48..7133493 100644 (file)
--- a/windows/window.c
+++ b/windows/window.c
@@ -50,9 +50,9 @@
 /* Maximum number of sessions on saved-session submenu */
 #define MENU_SAVED_MAX ((IDM_SAVED_MAX-IDM_SAVED_MIN) / MENU_SAVED_STEP)
 
-#define WM_IGNORE_CLIP (WM_XUSER + 2)
-#define WM_FULLSCR_ON_MAX (WM_XUSER + 3)
-#define WM_AGENT_CALLBACK (WM_XUSER + 4)
+#define WM_IGNORE_CLIP (WM_APP + 2)
+#define WM_FULLSCR_ON_MAX (WM_APP + 3)
+#define WM_AGENT_CALLBACK (WM_APP + 4)
 
 /* Needed for Chinese support and apparently not always defined. */
 #ifndef VK_PROCESSKEY

diff --git a/windows/winpgen.c b/windows/winpgen.c
index e35a8c1..d767b23 100644 (file)
--- a/windows/winpgen.c
+++ b/windows/winpgen.c
@@ -17,7 +17,7 @@
 #define ICON_BIG        1
 #endif
 
-#define WM_DONEKEY (WM_XUSER + 1)
+#define WM_DONEKEY (WM_APP + 1)
 
 #define DEFAULT_KEYSIZE 1024
 

diff --git a/windows/winpgnt.c b/windows/winpgnt.c
index 7f6404b..59a12e2 100644 (file)
--- 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 */
 

diff --git a/windows/winplink.c b/windows/winplink.c
index ae80bf9..a67a237 100644 (file)
--- a/windows/winplink.c
+++ b/windows/winplink.c
@@ -12,7 +12,7 @@
 #include "storage.h"
 #include "tree234.h"
 
-#define WM_AGENT_CALLBACK (WM_XUSER + 4)
+#define WM_AGENT_CALLBACK (WM_APP + 4)
 
 #define MAX_STDIN_BACKLOG 4096
 

diff --git a/windows/winstuff.h b/windows/winstuff.h
index 5febe16..f70b007 100644 (file)
--- a/windows/winstuff.h
+++ b/windows/winstuff.h
@@ -95,13 +95,7 @@ GLOBAL int requested_help;
 GLOBAL Terminal *term;
 GLOBAL void *logctx;
 
-/*
- * I've just looked in the windows standard headr files for WM_USER, there
- * are hundreds of flags defined using the form WM_USER+123 so I've 
- * renumbered this NETEVENT value and the two in window.c
- */
-#define WM_XUSER     (WM_USER + 0x2000)
-#define WM_NETEVENT  (WM_XUSER + 5)
+#define WM_NETEVENT  (WM_APP + 5)
 
 /*
  * On Windows, we send MA_2CLK as the only event marking the second