Moved MAKEINTATOM to winbase.h and added Unicode version.

dlls/user/controls.h

@@ -11,11 +11,11 @@
 #include "winproc.h"
 
 /* Built-in class names (see _Undocumented_Windows_ p.418) */
-#define POPUPMENU_CLASS_ATOM MAKEINTATOM(32768)  /* PopupMenu */
-#define DESKTOP_CLASS_ATOM   MAKEINTATOM(32769)  /* Desktop */
-#define DIALOG_CLASS_ATOM    MAKEINTATOM(32770)  /* Dialog */
-#define WINSWITCH_CLASS_ATOM MAKEINTATOM(32771)  /* WinSwitch */
-#define ICONTITLE_CLASS_ATOM MAKEINTATOM(32772)  /* IconTitle */
+#define POPUPMENU_CLASS_ATOM MAKEINTATOMA(32768)  /* PopupMenu */
+#define DESKTOP_CLASS_ATOM   MAKEINTATOMA(32769)  /* Desktop */
+#define DIALOG_CLASS_ATOM    MAKEINTATOMA(32770)  /* Dialog */
+#define WINSWITCH_CLASS_ATOM MAKEINTATOMA(32771)  /* WinSwitch */
+#define ICONTITLE_CLASS_ATOM MAKEINTATOMA(32772)  /* IconTitle */
 
 /* Built-in class descriptor */
 struct builtin_class_descr

include/winbase.h

@@ -409,6 +409,9 @@ typedef struct
 #define GHND                (GMEM_MOVEABLE | GMEM_ZEROINIT)
 #define GPTR                (GMEM_FIXED | GMEM_ZEROINIT)
 
+#define MAKEINTATOMA(atom)  ((LPCSTR)((ULONG_PTR)((WORD)(atom))))
+#define MAKEINTATOMW(atom)  ((LPCWSTR)((ULONG_PTR)((WORD)(atom))))
+#define MAKEINTATOM  WINELIB_NAME_AW(MAKEINTATOM)
 
 typedef struct tagMEMORYSTATUS
 {

include/windef.h

@@ -113,7 +113,6 @@ typedef INT     CALLBACK (*PROC)();
 #define MAKELPARAM(low,high)   ((LPARAM)MAKELONG(low,high))
 #define MAKEWPARAM(low,high)   ((WPARAM)MAKELONG(low,high))
 #define MAKELRESULT(low,high)  ((LRESULT)MAKELONG(low,high))
-#define MAKEINTATOM(atom)      ((LPCSTR)MAKELONG((atom),0))
 
 #define SELECTOROF(ptr)     (HIWORD(ptr))
 #define OFFSETOF(ptr)       (LOWORD(ptr))

include/winuser.h

@@ -1107,6 +1107,10 @@ typedef struct {
     DWORD   styleNew;
 } STYLESTRUCT, *LPSTYLESTRUCT;
 
+#define WC_DIALOGA MAKEINTATOMA(0x8002)
+#define WC_DIALOGW MAKEINTATOMW(0x8002)
+#define WC_DIALOG  WINELIB_NAME_AW(WC_DIALOG)
+
   /* Offsets for GetWindowLong() and GetWindowWord() */
 #define GWL_USERDATA        (-21)
 #define GWL_EXSTYLE         (-20)
@@ -3979,8 +3983,6 @@ INT         WINAPI wvsnprintfA(LPSTR,UINT,LPCSTR,va_list);
 INT         WINAPI wvsnprintfW(LPWSTR,UINT,LPCWSTR,va_list);
 #define     wvsnprintf WINELIB_NAME_AW(wvsnprintf)
 
-#define WC_DIALOG    (LPSTR)((DWORD)((WORD)( 0x8002)))
-
 #ifdef __cplusplus
 }
 #endif