diff --git a/include/winuser.h b/include/winuser.h
index 0ade5f7e711..1261967f140 100644
--- a/include/winuser.h
+++ b/include/winuser.h
@@ -27,7 +27,7 @@ typedef BOOL    CALLBACK (*PROPENUMPROCA)(HWND,LPCSTR,HANDLE);
 typedef BOOL    CALLBACK (*PROPENUMPROCW)(HWND,LPCWSTR,HANDLE);
 typedef BOOL    CALLBACK (*PROPENUMPROCEXA)(HWND,LPCSTR,HANDLE,DWORD);
 typedef BOOL    CALLBACK (*PROPENUMPROCEXW)(HWND,LPCWSTR,HANDLE,DWORD);
-typedef VOID    CALLBACK (*SENDASYNCPROC)(HWND,UINT,DWORD,LRESULT);
+typedef VOID    CALLBACK (*SENDASYNCPROC)(HWND,UINT,ULONG_PTR,LRESULT);
 typedef VOID    CALLBACK (*TIMERPROC)(HWND,UINT,UINT,DWORD);
 typedef BOOL    CALLBACK (*WNDENUMPROC)(HWND,LPARAM);
 #else
@@ -3261,11 +3261,11 @@ BOOL        WINAPI RegisterHotKey(HWND,INT,UINT,UINT);
 HDEVNOTIFY  WINAPI RegisterDeviceNotificationA(HANDLE,LPVOID,DWORD);
 HDEVNOTIFY  WINAPI RegisterDeviceNotificationW(HANDLE,LPVOID,DWORD);
 #define     RegisterDeviceNotification WINELIB_NAME_AW(RegisterDeviceNotification)
-BOOL        WINAPI SendMessageCallbackA(HWND,UINT,WPARAM,LPARAM,FARPROC,DWORD);
-BOOL        WINAPI SendMessageCallbackW(HWND,UINT,WPARAM,LPARAM,FARPROC,DWORD);
+BOOL        WINAPI SendMessageCallbackA(HWND,UINT,WPARAM,LPARAM,SENDASYNCPROC,ULONG_PTR);
+BOOL        WINAPI SendMessageCallbackW(HWND,UINT,WPARAM,LPARAM,SENDASYNCPROC,ULONG_PTR);
 #define      SendMessageCallback WINELIB_NAME_AW(SendMessageCallback)
-BOOL      WINAPI SendNotifyMessageA(HWND,UINT,WPARAM,LPARAM);
-BOOL      WINAPI SendNotifyMessageW(HWND,UINT,WPARAM,LPARAM);
+BOOL        WINAPI SendNotifyMessageA(HWND,UINT,WPARAM,LPARAM);
+BOOL        WINAPI SendNotifyMessageW(HWND,UINT,WPARAM,LPARAM);
 #define     SendNotifyMessage WINELIB_NAME_AW(SendNotifyMessage)
 VOID        WINAPI SetDebugErrorLevel(DWORD);
 VOID        WINAPI SetLastErrorEx(DWORD,DWORD);
diff --git a/windows/message.c b/windows/message.c
index 807aaaa889f..eb20f06cb38 100644
--- a/windows/message.c
+++ b/windows/message.c
@@ -1864,6 +1864,74 @@ LRESULT WINAPI SendMessageTimeoutW( HWND hwnd, UINT msg, WPARAM wParam,
 }
 
 
+/***********************************************************************
+ *		SendNotifyMessageA (USER32.@)
+ */
+BOOL WINAPI SendNotifyMessageA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam )
+{
+    return SendNotifyMessageW( hwnd, msg, map_wparam_AtoW( msg, wParam ), lParam );
+}
+
+
+/***********************************************************************
+ *		SendNotifyMessageW (USER32.@)
+ */
+BOOL WINAPI SendNotifyMessageW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam )
+{
+    if (is_pointer_message(msg))
+    {
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return FALSE;
+    }
+    return MSG_SendMessage( hwnd, msg, wParam, lParam, INFINITE, QMSG_WIN32W, NULL );
+}
+
+
+/***********************************************************************
+ *		SendMessageCallbackA (USER32.@)
+ */
+BOOL WINAPI SendMessageCallbackA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam,
+                                  SENDASYNCPROC callback, ULONG_PTR data )
+{
+    return SendMessageCallbackW( hwnd, msg, map_wparam_AtoW( msg, wParam ),
+                                 lParam, callback, data );
+}
+
+
+/***********************************************************************
+ *		SendMessageCallbackW (USER32.@)
+ *
+ * FIXME: It's like PostMessage. The callback gets called when the message
+ * is processed. We have to modify the message processing for an exact
+ * implementation...
+ * The callback is only called when the thread that called us calls one of
+ * Get/Peek/WaitMessage.
+ */
+BOOL WINAPI SendMessageCallbackW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam,
+                                  SENDASYNCPROC callback, ULONG_PTR data )
+{
+    LRESULT result;
+
+    if (is_pointer_message(msg))
+    {
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return FALSE;
+    }
+    FIXME( "(0x%04x,0x%04x,0x%08x,0x%08lx,%p,0x%08x),stub!\n",
+           hwnd, msg, wParam, lParam, callback, data );
+
+    if (hwnd == HWND_BROADCAST)
+    {
+        PostMessageW( hwnd, msg, wParam, lParam );
+        FIXME("Broadcast: Callback will not be called!\n");
+        return TRUE;
+    }
+    result = SendMessageW( hwnd, msg, wParam, lParam );
+    callback( hwnd, msg, data, result );
+    return TRUE;
+}
+
+
 /***********************************************************************
  *		WaitMessage (USER.112) Suspend thread pending messages
  *		WaitMessage (USER32.@) Suspend thread pending messages
@@ -2531,60 +2599,3 @@ LONG WINAPI BroadcastSystemMessage(
 	);
 	return 0;
 }
-
-/***********************************************************************
- *		SendNotifyMessageA (USER32.@)
- */
-BOOL WINAPI SendNotifyMessageA(HWND hwnd,UINT msg,WPARAM wParam,LPARAM lParam)
-{
-   return MSG_SendMessage(hwnd, msg, wParam, lParam, INFINITE, QMSG_WIN32A, NULL);
-}
-
-/***********************************************************************
- *		SendNotifyMessageW (USER32.@)
- */
-BOOL WINAPI SendNotifyMessageW(HWND hwnd,UINT msg,WPARAM wParam,LPARAM lParam)
-{
-   return MSG_SendMessage(hwnd, msg, wParam, lParam, INFINITE, QMSG_WIN32W, NULL);
-}
-
-/***********************************************************************
- *		SendMessageCallbackA (USER32.@)
- * FIXME: It's like PostMessage. The callback gets called when the message
- * is processed. We have to modify the message processing for an exact
- * implementation...
- * The callback is only called when the thread that called us calls one of
- * Get/Peek/WaitMessage.
- */
-BOOL WINAPI SendMessageCallbackA(
-	HWND hWnd,UINT Msg,WPARAM wParam,LPARAM lParam,
-	FARPROC lpResultCallBack,DWORD dwData)
-{	
-	FIXME("(0x%04x,0x%04x,0x%08x,0x%08lx,%p,0x%08lx),stub!\n",
-              hWnd,Msg,wParam,lParam,lpResultCallBack,dwData);
-	if ( hWnd == HWND_BROADCAST)
-	{	PostMessageA( hWnd, Msg, wParam, lParam);
-		FIXME("Broadcast: Callback will not be called!\n");
-		return TRUE;
-	}
-	(lpResultCallBack)( hWnd, Msg, dwData, SendMessageA ( hWnd, Msg, wParam, lParam ));
-		return TRUE;
-}
-/***********************************************************************
- *		SendMessageCallbackW (USER32.@)
- * FIXME: see SendMessageCallbackA.
- */
-BOOL WINAPI SendMessageCallbackW(
-	HWND hWnd,UINT Msg,WPARAM wParam,LPARAM lParam,
-	FARPROC lpResultCallBack,DWORD dwData)
-{	
-	FIXME("(0x%04x,0x%04x,0x%08x,0x%08lx,%p,0x%08lx),stub!\n",
-              hWnd,Msg,wParam,lParam,lpResultCallBack,dwData);
-	if ( hWnd == HWND_BROADCAST)
-	{	PostMessageW( hWnd, Msg, wParam, lParam);
-		FIXME("Broadcast: Callback will not be called!\n");
-		return TRUE;
-	}
-	(lpResultCallBack)( hWnd, Msg, dwData, SendMessageA ( hWnd, Msg, wParam, lParam ));
-		return TRUE;
-}