diff --git a/dlls/user/message.c b/dlls/user/message.c
index 45d13101998..a9768900257 100644
--- a/dlls/user/message.c
+++ b/dlls/user/message.c
@@ -3203,20 +3203,22 @@ void WINAPI UserYield16(void)
  *		RegisterWindowMessage (USER.118)
  *		RegisterWindowMessageA (USER32.@)
  */
-WORD WINAPI RegisterWindowMessageA( LPCSTR str )
+UINT WINAPI RegisterWindowMessageA( LPCSTR str )
 {
-    TRACE("%s\n", str );
-    return GlobalAddAtomA( str );
+    UINT ret = GlobalAddAtomA(str);
+    TRACE("%s, ret=%x\n", str, ret);
+    return ret;
 }
 
 
 /***********************************************************************
  *		RegisterWindowMessageW (USER32.@)
  */
-WORD WINAPI RegisterWindowMessageW( LPCWSTR str )
+UINT WINAPI RegisterWindowMessageW( LPCWSTR str )
 {
-    TRACE("%p\n", str );
-    return GlobalAddAtomW( str );
+    UINT ret = GlobalAddAtomW(str);
+    TRACE("%s ret=%x\n", debugstr_w(str), ret);
+    return ret;
 }
 
 
diff --git a/include/winuser.h b/include/winuser.h
index 0bc54758ebc..13db646d080 100644
--- a/include/winuser.h
+++ b/include/winuser.h
@@ -4531,8 +4531,8 @@ ATOM        WINAPI RegisterClassExW(const WNDCLASSEXW *);
 UINT      WINAPI RegisterClipboardFormatA(LPCSTR);
 UINT      WINAPI RegisterClipboardFormatW(LPCWSTR);
 #define     RegisterClipboardFormat WINELIB_NAME_AW(RegisterClipboardFormat)
-WORD        WINAPI RegisterWindowMessageA(LPCSTR);
-WORD        WINAPI RegisterWindowMessageW(LPCWSTR);
+UINT        WINAPI RegisterWindowMessageA(LPCSTR);
+UINT        WINAPI RegisterWindowMessageW(LPCWSTR);
 #define     RegisterWindowMessage WINELIB_NAME_AW(RegisterWindowMessage)
 INT       WINAPI ReleaseDC(HWND,HDC);
 BOOL      WINAPI RemoveMenu(HMENU,UINT,UINT);