Conflicts in winuser.h

[Francois Gouget]

   winuser.h defines a number of macros with the following comment:

/* FIXME: This does not belong to any libwine interface header */

#define WM_QUERYAFXWNDPROC  0x0360
#define WM_SIZEPARENT       0x0361
#define WM_SETMESSAGESTRING 0x0362
...

   The problem is that not only they should not be there, but they also
cause conflicts (well, warnings at least) when compiling WineLib
applications because applications redefine them.

   I think we could remove them altogether as they are not even used by
Wine (except as strings in spy.c). So I removed them from winuser.h and
added the corresponding information in 'spy.c' (well, it can be argued
that most of it was there already, I just made it more explicit).

   Note that WM_PENWINFIRST and WM_PENWINLAST are the two exceptions:
they are legitimate macros that must be defined by 'winuser.h'.


Changelog:

 * include/winuser.h,
   windows/spy.c

   Remove macros that should not be there (cause conflicts in WineLib)
   Add corresponding comments in spy.c


PS:
   There are some more unused definitions (types and prototypes) in
'windows.h' but at least these are #ifdefed-out.


--
Francois Gouget         fgouget at free.fr        http://fgouget.free.fr/
May your Tongue stick to the Roof of your Mouth with the Force of a Thousand Caramels.
-------------- next part --------------
Index: include/winuser.h
===================================================================
RCS file: /home/wine/wine/include/winuser.h,v
retrieving revision 1.116
diff -u -r1.116 winuser.h
--- include/winuser.h	2001/08/24 00:26:59	1.116
+++ include/winuser.h	2001/09/18 06:13:52
@@ -904,43 +904,9 @@
 #define WM_PRINT             0x0317
 #define WM_PRINTCLIENT       0x0318
 
-  /* FIXME: This does not belong to any libwine interface header */
-  /* MFC messages [360-38f] */
-
-#define WM_QUERYAFXWNDPROC  0x0360
-#define WM_SIZEPARENT       0x0361
-#define WM_SETMESSAGESTRING 0x0362
-#define WM_IDLEUPDATECMDUI  0x0363 
-#define WM_INITIALUPDATE    0x0364
-#define WM_COMMANDHELP      0x0365
-#define WM_HELPHITTEST      0x0366
-#define WM_EXITHELPMODE     0x0367
-#define WM_RECALCPARENT     0x0368
-#define WM_SIZECHILD        0x0369
-#define WM_KICKIDLE         0x036A 
-#define WM_QUERYCENTERWND   0x036B
-#define WM_DISABLEMODAL     0x036C
-#define WM_FLOATSTATUS      0x036D 
-#define WM_ACTIVATETOPLEVEL 0x036E 
-#define WM_QUERY3DCONTROLS  0x036F 
-#define WM_SOCKET_NOTIFY    0x0373
-#define WM_SOCKET_DEAD      0x0374
-#define WM_POPMESSAGESTRING 0x0375
-#define WM_OCC_LOADFROMSTREAM           0x0376
-#define WM_OCC_LOADFROMSTORAGE          0x0377
-#define WM_OCC_INITNEW                  0x0378
-#define WM_OCC_LOADFROMSTREAM_EX        0x037A
-#define WM_OCC_LOADFROMSTORAGE_EX       0x037B
-#define WM_QUEUE_SENTINEL   0x0379
-
 #define WM_PENWINFIRST      0x0380
 #define WM_PENWINLAST       0x038F
 
-/* end of MFC messages */
-
-/* FIXME: The following two lines do not belong to any libwine interface header */
-#define WM_COALESCE_FIRST    0x0390
-#define WM_COALESCE_LAST     0x039F
 
 #define WM_APP               0x8000
 
Index: windows/spy.c
===================================================================
RCS file: /home/wine/wine/windows/spy.c,v
retrieving revision 1.23
diff -u -r1.23 spy.c
--- windows/spy.c	2001/09/07 18:38:58	1.23
+++ windows/spy.c	2001/09/18 06:22:08
@@ -532,20 +532,20 @@
 
     NULL,NULL,NULL,NULL,
 
-    /* 0x0380 */
-    "WM_PENWINFIRST", 
-    "WM_RCRESULT", 
-    "WM_HOOKRCRESULT", 
-    "WM_GLOBALRCCHANGE", 
-    "WM_SKB", 
-    "WM_HEDITCTL", 
-					NULL, NULL,
-    NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+    "WM_PENWINFIRST",           /* 0x0380 */
+    "WM_RCRESULT",              /* 0x0381 */
+    "WM_HOOKRCRESULT",          /* 0x0382 */
+    "WM_GLOBALRCCHANGE",        /* 0x0383 */
+    "WM_SKB",                   /* 0x0384 */
+    "WM_HEDITCTL",              /* 0x0385 */
+    NULL, NULL,
+    NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+    "WM_PENWINLAST",            /* 0x038F */
 
-    "WM_COALESCE_FIRST", 
-          NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-    NULL, NULL, NULL, NULL, NULL, NULL, NULL, 
-    "WM_COALESCE_LAST", 
+    "WM_COALESCE_FIRST",        /* 0x0390 */
+    NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+    NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+    "WM_COALESCE_LAST",         /* 0x039F */
     
     /* 0x03a0 */
     "MM_JOY1MOVE", 
@@ -601,7 +601,7 @@
     NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
     NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
 
-    "WM_USER"
+    "WM_USER"                   /* 0x0400 */
 };