Various documentation fixes.

windows/caret.c

@@ -129,7 +129,7 @@ static void CARET_KillTimer(void)
 
 
 /*****************************************************************
- *           CreateCaret16   (USER.163)
+ *		CreateCaret (USER.163)
  */
 void WINAPI CreateCaret16( HWND16 hwnd, HBITMAP16 bitmap,
                            INT16 width, INT16 height )
@@ -138,7 +138,7 @@ void WINAPI CreateCaret16( HWND16 hwnd, HBITMAP16 bitmap,
 }
 
 /*****************************************************************
- *           CreateCaret   (USER32.66)
+ *		CreateCaret (USER32.@)
  */
 BOOL WINAPI CreateCaret( HWND hwnd, HBITMAP bitmap,
                              INT width, INT height )
@@ -180,7 +180,7 @@ BOOL WINAPI CreateCaret( HWND hwnd, HBITMAP bitmap,
    
 
 /*****************************************************************
- *           DestroyCaret16   (USER.164)
+ *		DestroyCaret (USER.164)
  */
 void WINAPI DestroyCaret16(void)
 {
@@ -189,7 +189,7 @@ void WINAPI DestroyCaret16(void)
 
 
 /*****************************************************************
- *           DestroyCaret   (USER32.131)
+ *		DestroyCaret (USER32.@)
  */
 BOOL WINAPI DestroyCaret(void)
 {
@@ -207,7 +207,7 @@ BOOL WINAPI DestroyCaret(void)
 
 
 /*****************************************************************
- *           SetCaretPos16   (USER.165)
+ *		SetCaretPos (USER.165)
  */
 void WINAPI SetCaretPos16( INT16 x, INT16 y )
 {
@@ -216,7 +216,7 @@ void WINAPI SetCaretPos16( INT16 x, INT16 y )
 
 
 /*****************************************************************
- *           SetCaretPos   (USER32.466)
+ *		SetCaretPos (USER32.@)
  */
 BOOL WINAPI SetCaretPos( INT x, INT y)
 {
@@ -239,7 +239,7 @@ BOOL WINAPI SetCaretPos( INT x, INT y)
 
 
 /*****************************************************************
- *           HideCaret16   (USER.166)
+ *		HideCaret (USER.166)
  */
 void WINAPI HideCaret16( HWND16 hwnd )
 {
@@ -248,7 +248,7 @@ void WINAPI HideCaret16( HWND16 hwnd )
 
 
 /*****************************************************************
- *           HideCaret   (USER32.317)
+ *		HideCaret (USER32.@)
  */
 BOOL WINAPI HideCaret( HWND hwnd )
 {
@@ -266,7 +266,7 @@ BOOL WINAPI HideCaret( HWND hwnd )
 
 
 /*****************************************************************
- *           ShowCaret16   (USER.167)
+ *		ShowCaret (USER.167)
  */
 void WINAPI ShowCaret16( HWND16 hwnd )
 {
@@ -275,7 +275,7 @@ void WINAPI ShowCaret16( HWND16 hwnd )
 
 
 /*****************************************************************
- *           ShowCaret   (USER32.529)
+ *		ShowCaret (USER32.@)
  */
 BOOL WINAPI ShowCaret( HWND hwnd )
 {
@@ -299,7 +299,7 @@ BOOL WINAPI ShowCaret( HWND hwnd )
 
 
 /*****************************************************************
- *           SetCaretBlinkTime16   (USER.168)
+ *		SetCaretBlinkTime (USER.168)
  */
 void WINAPI SetCaretBlinkTime16( UINT16 msecs )
 {
@@ -307,7 +307,7 @@ void WINAPI SetCaretBlinkTime16( UINT16 msecs )
 }
 
 /*****************************************************************
- *           SetCaretBlinkTime   (USER32.465)
+ *		SetCaretBlinkTime (USER32.@)
  */
 BOOL WINAPI SetCaretBlinkTime( UINT msecs )
 {
@@ -323,7 +323,7 @@ BOOL WINAPI SetCaretBlinkTime( UINT msecs )
 
 
 /*****************************************************************
- *           GetCaretBlinkTime16   (USER.169)
+ *		GetCaretBlinkTime (USER.169)
  */
 UINT16 WINAPI GetCaretBlinkTime16(void)
 {
@@ -332,7 +332,7 @@ UINT16 WINAPI GetCaretBlinkTime16(void)
 
 
 /*****************************************************************
- *           GetCaretBlinkTime   (USER32.209)
+ *		GetCaretBlinkTime (USER32.@)
  */
 UINT WINAPI GetCaretBlinkTime(void)
 {
@@ -341,7 +341,7 @@ UINT WINAPI GetCaretBlinkTime(void)
 
 
 /*****************************************************************
- *           GetCaretPos16   (USER.183)
+ *		GetCaretPos (USER.183)
  */
 VOID WINAPI GetCaretPos16( LPPOINT16 pt )
 {
@@ -355,7 +355,7 @@ VOID WINAPI GetCaretPos16( LPPOINT16 pt )
 
 
 /*****************************************************************
- *           GetCaretPos   (USER32.210)
+ *		GetCaretPos (USER32.@)
  */
 BOOL WINAPI GetCaretPos( LPPOINT pt )
 {

windows/class.c

@@ -414,7 +414,7 @@ void CLASS_RemoveWindow( CLASS *cls )
 
 
 /***********************************************************************
- *           RegisterClass16    (USER.57)
+ *		RegisterClass (USER.57)
  */
 ATOM WINAPI RegisterClass16( const WNDCLASS16 *wc )
 {
@@ -458,7 +458,7 @@ ATOM WINAPI RegisterClass16( const WNDCLASS16 *wc )
 
 
 /***********************************************************************
- *           RegisterClassA      (USER32.427)
+ *		RegisterClassA (USER32.@)
  * RETURNS
  *	>0: Unique identifier
  *	0: Failure
@@ -502,7 +502,7 @@ ATOM WINAPI RegisterClassA( const WNDCLASSA* wc ) /* [in] Address of structure w
 
 
 /***********************************************************************
- *           RegisterClassW      (USER32.430)
+ *		RegisterClassW (USER32.@)
  */
 ATOM WINAPI RegisterClassW( const WNDCLASSW* wc )
 {
@@ -542,7 +542,7 @@ ATOM WINAPI RegisterClassW( const WNDCLASSW* wc )
 
 
 /***********************************************************************
- *           RegisterClassEx16    (USER.397)
+ *		RegisterClassEx (USER.397)
  */
 ATOM WINAPI RegisterClassEx16( const WNDCLASSEX16 *wc )
 {
@@ -576,7 +576,7 @@ ATOM WINAPI RegisterClassEx16( const WNDCLASSEX16 *wc )
 
 
 /***********************************************************************
- *           RegisterClassExA      (USER32.428)
+ *		RegisterClassExA (USER32.@)
  */
 ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc )
 {
@@ -609,7 +609,7 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc )
 
 
 /***********************************************************************
- *           RegisterClassExW      (USER32.429)
+ *		RegisterClassExW (USER32.@)
  */
 ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc )
 {
@@ -642,7 +642,7 @@ ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc )
 
 
 /***********************************************************************
- *           UnregisterClass16    (USER.403)
+ *		UnregisterClass (USER.403)
  */
 BOOL16 WINAPI UnregisterClass16( LPCSTR className, HINSTANCE16 hInstance )
 {
@@ -651,7 +651,7 @@ BOOL16 WINAPI UnregisterClass16( LPCSTR className, HINSTANCE16 hInstance )
 
 
 /***********************************************************************
- *           UnregisterClassA    (USER32.563)
+ *		UnregisterClassA (USER32.@)
  *
  */
 BOOL WINAPI UnregisterClassA( LPCSTR className, HINSTANCE hInstance )
@@ -676,7 +676,7 @@ BOOL WINAPI UnregisterClassA( LPCSTR className, HINSTANCE hInstance )
 }
 
 /***********************************************************************
- *           UnregisterClassW    (USER32.564)
+ *		UnregisterClassW (USER32.@)
  */
 BOOL WINAPI UnregisterClassW( LPCWSTR className, HINSTANCE hInstance )
 {
@@ -700,7 +700,7 @@ BOOL WINAPI UnregisterClassW( LPCWSTR className, HINSTANCE hInstance )
 }
 
 /***********************************************************************
- *           GetClassWord16    (USER.129)
+ *		GetClassWord (USER.129)
  */
 WORD WINAPI GetClassWord16( HWND16 hwnd, INT16 offset )
 {
@@ -709,7 +709,7 @@ WORD WINAPI GetClassWord16( HWND16 hwnd, INT16 offset )
 
 
 /***********************************************************************
- *           GetClassWord    (USER32.219)
+ *		GetClassWord (USER32.@)
  */
 WORD WINAPI GetClassWord( HWND hwnd, INT offset )
 {
@@ -755,7 +755,7 @@ WORD WINAPI GetClassWord( HWND hwnd, INT offset )
 
 
 /***********************************************************************
- *           GetClassLong16    (USER.131)
+ *		GetClassLong (USER.131)
  */
 LONG WINAPI GetClassLong16( HWND16 hwnd, INT16 offset )
 {
@@ -781,7 +781,7 @@ LONG WINAPI GetClassLong16( HWND16 hwnd, INT16 offset )
 
 
 /***********************************************************************
- *           GetClassLongA    (USER32.215)
+ *		GetClassLongA (USER32.@)
  */
 LONG WINAPI GetClassLongA( HWND hwnd, INT offset )
 {
@@ -833,7 +833,7 @@ END:
 
 
 /***********************************************************************
- *           GetClassLongW    (USER32.216)
+ *		GetClassLongW (USER32.@)
  */
 LONG WINAPI GetClassLongW( HWND hwnd, INT offset )
 {
@@ -861,7 +861,7 @@ LONG WINAPI GetClassLongW( HWND hwnd, INT offset )
 
 
 /***********************************************************************
- *           SetClassWord16    (USER.130)
+ *		SetClassWord (USER.130)
  */
 WORD WINAPI SetClassWord16( HWND16 hwnd, INT16 offset, WORD newval )
 {
@@ -870,7 +870,7 @@ WORD WINAPI SetClassWord16( HWND16 hwnd, INT16 offset, WORD newval )
 
 
 /***********************************************************************
- *           SetClassWord    (USER32.469)
+ *		SetClassWord (USER32.@)
  */
 WORD WINAPI SetClassWord( HWND hwnd, INT offset, WORD newval )
 {
@@ -918,7 +918,7 @@ WORD WINAPI SetClassWord( HWND hwnd, INT offset, WORD newval )
 
 
 /***********************************************************************
- *           SetClassLong16    (USER.132)
+ *		SetClassLong (USER.132)
  */
 LONG WINAPI SetClassLong16( HWND16 hwnd, INT16 offset, LONG newval )
 {
@@ -943,7 +943,7 @@ LONG WINAPI SetClassLong16( HWND16 hwnd, INT16 offset, LONG newval )
 
 
 /***********************************************************************
- *           SetClassLongA    (USER32.467)
+ *		SetClassLongA (USER32.@)
  */
 LONG WINAPI SetClassLongA( HWND hwnd, INT offset, LONG newval )
 {
@@ -998,7 +998,7 @@ END:
 
 
 /***********************************************************************
- *           SetClassLongW    (USER32.468)
+ *		SetClassLongW (USER32.@)
  */
 LONG WINAPI SetClassLongW( HWND hwnd, INT offset, LONG newval )
 {
@@ -1026,7 +1026,7 @@ LONG WINAPI SetClassLongW( HWND hwnd, INT offset, LONG newval )
 
 
 /***********************************************************************
- *           GetClassName16      (USER.58)
+ *		GetClassName (USER.58)
  */
 INT16 WINAPI GetClassName16( HWND16 hwnd, LPSTR buffer, INT16 count )
 {
@@ -1035,7 +1035,7 @@ INT16 WINAPI GetClassName16( HWND16 hwnd, LPSTR buffer, INT16 count )
 
 
 /***********************************************************************
- *           GetClassNameA      (USER32.217)
+ *		GetClassNameA (USER32.@)
  */
 INT WINAPI GetClassNameA( HWND hwnd, LPSTR buffer, INT count )
 {   INT ret;
@@ -1051,7 +1051,7 @@ INT WINAPI GetClassNameA( HWND hwnd, LPSTR buffer, INT count )
 
 
 /***********************************************************************
- *           GetClassNameW      (USER32.218)
+ *		GetClassNameW (USER32.@)
  */
 INT WINAPI GetClassNameW( HWND hwnd, LPWSTR buffer, INT count )
 {   INT ret;
@@ -1067,7 +1067,7 @@ INT WINAPI GetClassNameW( HWND hwnd, LPWSTR buffer, INT count )
 
 
 /***********************************************************************
- *           GetClassInfo16      (USER.404)
+ *		GetClassInfo (USER.404)
  */
 BOOL16 WINAPI GetClassInfo16( HINSTANCE16 hInstance, SEGPTR name, WNDCLASS16 *wc )
 {
@@ -1100,7 +1100,7 @@ BOOL16 WINAPI GetClassInfo16( HINSTANCE16 hInstance, SEGPTR name, WNDCLASS16 *wc
 
 
 /***********************************************************************
- *           GetClassInfoA      (USER32.211)
+ *		GetClassInfoA (USER32.@)
  */
 BOOL WINAPI GetClassInfoA( HINSTANCE hInstance, LPCSTR name,
                                WNDCLASSA *wc )
@@ -1141,7 +1141,7 @@ BOOL WINAPI GetClassInfoA( HINSTANCE hInstance, LPCSTR name,
 
 
 /***********************************************************************
- *           GetClassInfoW      (USER32.214)
+ *		GetClassInfoW (USER32.@)
  */
 BOOL WINAPI GetClassInfoW( HINSTANCE hInstance, LPCWSTR name,
                                WNDCLASSW *wc )
@@ -1178,7 +1178,7 @@ BOOL WINAPI GetClassInfoW( HINSTANCE hInstance, LPCWSTR name,
 
 
 /***********************************************************************
- *           GetClassInfoEx16      (USER.398)
+ *		GetClassInfoEx (USER.398)
  *
  * FIXME: this is just a guess, I have no idea if GetClassInfoEx() is the
  * same in Win16 as in Win32. --AJ
@@ -1215,7 +1215,7 @@ BOOL16 WINAPI GetClassInfoEx16( HINSTANCE16 hInstance, SEGPTR name, WNDCLASSEX16
 
 
 /***********************************************************************
- *           GetClassInfoExA      (USER32.212)
+ *		GetClassInfoExA (USER32.@)
  */
 BOOL WINAPI GetClassInfoExA( HINSTANCE hInstance, LPCSTR name,
                                  WNDCLASSEXA *wc )
@@ -1246,7 +1246,7 @@ BOOL WINAPI GetClassInfoExA( HINSTANCE hInstance, LPCSTR name,
 
 
 /***********************************************************************
- *           GetClassInfoExW      (USER32.213)
+ *		GetClassInfoExW (USER32.@)
  */
 BOOL WINAPI GetClassInfoExW( HINSTANCE hInstance, LPCWSTR name,
                                  WNDCLASSEXW *wc )
@@ -1277,7 +1277,7 @@ BOOL WINAPI GetClassInfoExW( HINSTANCE hInstance, LPCWSTR name,
 
 
 /***********************************************************************
- *           ClassFirst      (TOOLHELP.69)
+ *		ClassFirst (TOOLHELP.69)
  */
 BOOL16 WINAPI ClassFirst16( CLASSENTRY *pClassEntry )
 {
@@ -1288,7 +1288,7 @@ BOOL16 WINAPI ClassFirst16( CLASSENTRY *pClassEntry )
 
 
 /***********************************************************************
- *           ClassNext      (TOOLHELP.70)
+ *		ClassNext (TOOLHELP.70)
  */
 BOOL16 WINAPI ClassNext16( CLASSENTRY *pClassEntry )
 {

windows/dce.c

@@ -641,7 +641,7 @@ INT DCE_ExcludeRgn( HDC hDC, WND* wnd, HRGN hRgn )
 
 
 /***********************************************************************
- *           GetDCEx16    (USER.359)
+ *		GetDCEx (USER.359)
  */
 HDC16 WINAPI GetDCEx16( HWND16 hwnd, HRGN16 hrgnClip, DWORD flags )
 {
@@ -650,7 +650,7 @@ HDC16 WINAPI GetDCEx16( HWND16 hwnd, HRGN16 hrgnClip, DWORD flags )
 
 
 /***********************************************************************
- *           GetDCEx    (USER32.231)
+ *		GetDCEx (USER32.@)
  *
  * Unimplemented flags: DCX_LOCKWINDOWUPDATE
  *
@@ -888,7 +888,7 @@ END:
 
 
 /***********************************************************************
- *           GetDC16    (USER.66)
+ *		GetDC (USER.66)
  */
 HDC16 WINAPI GetDC16( HWND16 hwnd )
 {
@@ -897,7 +897,7 @@ HDC16 WINAPI GetDC16( HWND16 hwnd )
 
 
 /***********************************************************************
- *           GetDC    (USER32.230)
+ *		GetDC (USER32.@)
  * RETURNS
  *	:Handle to DC
  *	NULL: Failure
@@ -912,7 +912,7 @@ HDC WINAPI GetDC(
 
 
 /***********************************************************************
- *           GetWindowDC16    (USER.67)
+ *		GetWindowDC (USER.67)
  */
 HDC16 WINAPI GetWindowDC16( HWND16 hwnd )
 {
@@ -922,7 +922,7 @@ HDC16 WINAPI GetWindowDC16( HWND16 hwnd )
 
 
 /***********************************************************************
- *           GetWindowDC    (USER32.304)
+ *		GetWindowDC (USER32.@)
  */
 HDC WINAPI GetWindowDC( HWND hwnd )
 {
@@ -932,7 +932,7 @@ HDC WINAPI GetWindowDC( HWND hwnd )
 
 
 /***********************************************************************
- *           ReleaseDC16    (USER.68)
+ *		ReleaseDC (USER.68)
  */
 INT16 WINAPI ReleaseDC16( HWND16 hwnd, HDC16 hdc )
 {
@@ -941,7 +941,7 @@ INT16 WINAPI ReleaseDC16( HWND16 hwnd, HDC16 hdc )
 
 
 /***********************************************************************
- *           ReleaseDC    (USER32.440)
+ *		ReleaseDC (USER32.@)
  *
  * RETURNS
  *	1: Success
@@ -971,7 +971,7 @@ INT WINAPI ReleaseDC(
 }
 
 /***********************************************************************
- *           DCHook    (USER.362)
+ *		DCHook (USER.362)
  *
  * See "Undoc. Windows" for hints (DC, SetDCHook, SetHookFlags)..  
  */
@@ -1057,7 +1057,7 @@ BOOL16 WINAPI DCHook16( HDC16 hDC, WORD code, DWORD data, LPARAM lParam )
 
 
 /**********************************************************************
- *          WindowFromDC16   (USER.117)
+ *		WindowFromDC (USER.117)
  */
 HWND16 WINAPI WindowFromDC16( HDC16 hDC )
 {
@@ -1066,7 +1066,7 @@ HWND16 WINAPI WindowFromDC16( HDC16 hDC )
 
 
 /**********************************************************************
- *          WindowFromDC   (USER32.581)
+ *		WindowFromDC (USER32.@)
  */
 HWND WINAPI WindowFromDC( HDC hDC )
 {
@@ -1086,7 +1086,7 @@ HWND WINAPI WindowFromDC( HDC hDC )
 
 
 /***********************************************************************
- *           LockWindowUpdate16   (USER.294)
+ *		LockWindowUpdate (USER.294)
  */
 BOOL16 WINAPI LockWindowUpdate16( HWND16 hwnd )
 {
@@ -1095,7 +1095,7 @@ BOOL16 WINAPI LockWindowUpdate16( HWND16 hwnd )
 
 
 /***********************************************************************
- *           LockWindowUpdate   (USER32.378)
+ *		LockWindowUpdate (USER32.@)
  */
 BOOL WINAPI LockWindowUpdate( HWND hwnd )
 {

windows/defdlg.c

@@ -245,7 +245,7 @@ static LRESULT DEFDLG_Epilog(DIALOGINFO* dlgInfo, UINT msg, BOOL fResult)
 }
 
 /***********************************************************************
- *           DefDlgProc16   (USER.308)
+ *		DefDlgProc (USER.308)
  */
 LRESULT WINAPI DefDlgProc16( HWND16 hwnd, UINT16 msg, WPARAM16 wParam,
                              LPARAM lParam )
@@ -305,7 +305,7 @@ LRESULT WINAPI DefDlgProc16( HWND16 hwnd, UINT16 msg, WPARAM16 wParam,
 
 
 /***********************************************************************
- *           DefDlgProcA   (USER32.120)
+ *		DefDlgProcA (USER32.@)
  */
 LRESULT WINAPI DefDlgProcA( HWND hwnd, UINT msg,
                               WPARAM wParam, LPARAM lParam )
@@ -365,7 +365,7 @@ LRESULT WINAPI DefDlgProcA( HWND hwnd, UINT msg,
 
 
 /***********************************************************************
- *           DefDlgProcW   (USER32.121)
+ *		DefDlgProcW (USER32.@)
  */
 LRESULT WINAPI DefDlgProcW( HWND hwnd, UINT msg, WPARAM wParam,
                               LPARAM lParam )

windows/defwnd.c

@@ -650,7 +650,7 @@ static LRESULT DEFWND_DefWinProc( WND *wndPtr, UINT msg, WPARAM wParam,
 
 
 /***********************************************************************
- *           DefWindowProc16   (USER.107)
+ *		DefWindowProc (USER.107)
  */
 LRESULT WINAPI DefWindowProc16( HWND16 hwnd, UINT16 msg, WPARAM16 wParam,
                                 LPARAM lParam )
@@ -721,7 +721,7 @@ LRESULT WINAPI DefWindowProc16( HWND16 hwnd, UINT16 msg, WPARAM16 wParam,
 
 
 /***********************************************************************
- *  DefWindowProcA [USER32.126] 
+ *		DefWindowProcA (USER32.@)
  *
  */
 LRESULT WINAPI DefWindowProcA( HWND hwnd, UINT msg, WPARAM wParam,
@@ -828,7 +828,7 @@ LRESULT WINAPI DefWindowProcA( HWND hwnd, UINT msg, WPARAM wParam,
 
 
 /***********************************************************************
- * DefWindowProcW [USER32.127] Calls default window message handler
+ *		DefWindowProcW (USER32.@) Calls default window message handler
  * 
  * Calls default window procedure for messages not processed 
  *  by application.

windows/driver.c

@@ -112,7 +112,7 @@ static LRESULT inline DRIVER_SendMessage(LPWINE_DRIVER lpDrv, UINT16 msg,
 }
 
 /**************************************************************************
- *				SendDriverMessage		[USER.251]
+ *		SendDriverMessage (USER.251)
  */
 LRESULT WINAPI SendDriverMessage16(HDRVR16 hDriver, UINT16 msg, LPARAM lParam1,
                                    LPARAM lParam2)
@@ -251,7 +251,7 @@ static	LPWINE_DRIVER	DRIVER_TryOpenDriver16(LPCSTR lpFileName, LPARAM lParam2)
 }
 
 /**************************************************************************
- *				OpenDriver16		        [USER.252]
+ *		OpenDriver16 (USER.252)
  */
 HDRVR16 WINAPI OpenDriver16(LPCSTR lpDriverName, LPCSTR lpSectionName, LPARAM lParam2)
 {
@@ -284,7 +284,7 @@ HDRVR16 WINAPI OpenDriver16(LPCSTR lpDriverName, LPCSTR lpSectionName, LPARAM lP
 }
 
 /**************************************************************************
- *			CloseDriver16				[USER.253]
+ *		CloseDriver (USER.253)
  */
 LRESULT WINAPI CloseDriver16(HDRVR16 hDrvr, LPARAM lParam1, LPARAM lParam2)
 {
@@ -305,7 +305,7 @@ LRESULT WINAPI CloseDriver16(HDRVR16 hDrvr, LPARAM lParam1, LPARAM lParam2)
 }
 
 /**************************************************************************
- *				GetDriverModuleHandle	[USER.254]
+ *		GetDriverModuleHandle (USER.254)
  */
 HMODULE16 WINAPI GetDriverModuleHandle16(HDRVR16 hDrvr)
 {
@@ -322,7 +322,7 @@ HMODULE16 WINAPI GetDriverModuleHandle16(HDRVR16 hDrvr)
 }
 
 /**************************************************************************
- *				DefDriverProc16			[USER.255]
+ *		DefDriverProc (USER.255)
  */
 LRESULT WINAPI DefDriverProc16(DWORD dwDevID, HDRVR16 hDriv, UINT16 wMsg, 
                                LPARAM lParam1, LPARAM lParam2)
@@ -352,7 +352,7 @@ LRESULT WINAPI DefDriverProc16(DWORD dwDevID, HDRVR16 hDriv, UINT16 wMsg,
 }
 
 /**************************************************************************
- *				GetDriverInfo			[USER.256]
+ *		GetDriverInfo (USER.256)
  */
 BOOL16 WINAPI GetDriverInfo16(HDRVR16 hDrvr, LPDRIVERINFOSTRUCT16 lpDrvInfo)
 {
@@ -375,7 +375,7 @@ BOOL16 WINAPI GetDriverInfo16(HDRVR16 hDrvr, LPDRIVERINFOSTRUCT16 lpDrvInfo)
 }
 
 /**************************************************************************
- *				GetNextDriver			[USER.257]
+ *		GetNextDriver (USER.257)
  */
 HDRVR16 WINAPI GetNextDriver16(HDRVR16 hDrvr, DWORD dwFlags)
 {

windows/focus.c

@@ -60,7 +60,7 @@ void FOCUS_SwitchFocus( MESSAGEQUEUE *pMsgQ, HWND hFocusFrom, HWND hFocusTo )
 
 
 /*****************************************************************
- *               SetFocus16   (USER.22)
+ *		SetFocus (USER.22)
  */
 HWND16 WINAPI SetFocus16( HWND16 hwnd )
 {
@@ -69,7 +69,7 @@ HWND16 WINAPI SetFocus16( HWND16 hwnd )
 
 
 /*****************************************************************
- *               SetFocus   (USER32.481)
+ *		SetFocus (USER32.@)
  */
 HWND WINAPI SetFocus( HWND hwnd )
 {
@@ -174,7 +174,7 @@ CLEANUP:
 
 
 /*****************************************************************
- *               GetFocus16   (USER.23)
+ *		GetFocus (USER.23)
  */
 HWND16 WINAPI GetFocus16(void)
 {
@@ -183,7 +183,7 @@ HWND16 WINAPI GetFocus16(void)
 
 
 /*****************************************************************
- *               GetFocus   (USER32.240)
+ *		GetFocus (USER32.@)
  */
 HWND WINAPI GetFocus(void)
 {

windows/hook.c

@@ -1212,7 +1212,7 @@ void HOOK_FreeQueueHooks( HQUEUE16 hQueue )
 
 
 /***********************************************************************
- *           SetWindowsHook16   (USER.121)
+ *		SetWindowsHook16 (USER.121)
  */
 FARPROC16 WINAPI SetWindowsHook16( INT16 id, HOOKPROC16 proc )
 {
@@ -1225,7 +1225,7 @@ FARPROC16 WINAPI SetWindowsHook16( INT16 id, HOOKPROC16 proc )
 }
 
 /***********************************************************************
- *           SetWindowsHookA   (USER32.525)
+ *		SetWindowsHookA (USER32.@)
  */
 HHOOK WINAPI SetWindowsHookA( INT id, HOOKPROC proc )
 {
@@ -1233,7 +1233,7 @@ HHOOK WINAPI SetWindowsHookA( INT id, HOOKPROC proc )
 }
 
 /***********************************************************************
- *           SetWindowsHookW   (USER32.528)
+ *		SetWindowsHookW (USER32.@)
  */
 HHOOK WINAPI SetWindowsHookW( INT id, HOOKPROC proc )
 {
@@ -1242,7 +1242,7 @@ HHOOK WINAPI SetWindowsHookW( INT id, HOOKPROC proc )
 
 
 /***********************************************************************
- *           SetWindowsHookEx16   (USER.291)
+ *		SetWindowsHookEx16 (USER.291) (USER32.@)
  */
 HHOOK WINAPI SetWindowsHookEx16( INT16 id, HOOKPROC16 proc, HINSTANCE16 hInst,
                                  HTASK16 hTask )
@@ -1256,7 +1256,7 @@ HHOOK WINAPI SetWindowsHookEx16( INT16 id, HOOKPROC16 proc, HINSTANCE16 hInst,
 }
 
 /***********************************************************************
- *           SetWindowsHookExA   (USER32.526)
+ *		SetWindowsHookExA (USER32.@)
  */
 HHOOK WINAPI SetWindowsHookExA( INT id, HOOKPROC proc, HINSTANCE hInst,
                                   DWORD dwThreadId )
@@ -1265,7 +1265,7 @@ HHOOK WINAPI SetWindowsHookExA( INT id, HOOKPROC proc, HINSTANCE hInst,
 }
 
 /***********************************************************************
- *           SetWindowsHookExW   (USER32.527)
+ *		SetWindowsHookExW (USER32.@)
  */
 HHOOK WINAPI SetWindowsHookExW( INT id, HOOKPROC proc, HINSTANCE hInst,
                                   DWORD dwThreadId )
@@ -1275,7 +1275,7 @@ HHOOK WINAPI SetWindowsHookExW( INT id, HOOKPROC proc, HINSTANCE hInst,
 
 
 /***********************************************************************
- *           UnhookWindowsHook16   (USER.234)
+ *		UnhookWindowsHook (USER.234)
  */
 BOOL16 WINAPI UnhookWindowsHook16( INT16 id, HOOKPROC16 proc )
 {
@@ -1283,7 +1283,7 @@ BOOL16 WINAPI UnhookWindowsHook16( INT16 id, HOOKPROC16 proc )
 }
 
 /***********************************************************************
- *           UnhookWindowsHook   (USER32.557)
+ *		UnhookWindowsHook (USER32.@)
  */
 BOOL WINAPI UnhookWindowsHook( INT id, HOOKPROC proc )
 {
@@ -1303,7 +1303,7 @@ BOOL WINAPI UnhookWindowsHook( INT id, HOOKPROC proc )
 
 
 /***********************************************************************
- *           UnhookWindowsHookEx16   (USER.292)
+ *		UnhookWindowsHookEx (USER.292)
  */
 BOOL16 WINAPI UnhookWindowsHookEx16( HHOOK hhook )
 {
@@ -1311,7 +1311,7 @@ BOOL16 WINAPI UnhookWindowsHookEx16( HHOOK hhook )
 }
 
 /***********************************************************************
- *           UnhookWindowsHookEx   (USER32.558)
+ *		UnhookWindowsHookEx (USER32.@)
  */
 BOOL WINAPI UnhookWindowsHookEx( HHOOK hhook )
 {
@@ -1321,7 +1321,7 @@ BOOL WINAPI UnhookWindowsHookEx( HHOOK hhook )
 
 
 /***********************************************************************
- *           CallNextHookEx16     (USER.293)
+ *		CallNextHookEx16 (USER.293) (USER32.@)
  *
  * I wouldn't have separated this into 16 and 32 bit versions, but I
  * need a way to figure out if I need to do a mapping or not.
@@ -1339,7 +1339,7 @@ LRESULT WINAPI CallNextHookEx16( HHOOK hhook, INT16 code, WPARAM16 wParam,
 
 
 /***********************************************************************
- *           CallNextHookEx    (USER32.17)
+ *		CallNextHookEx (USER32.@)
  *
  * There aren't ANSI and UNICODE versions of this.
  */
@@ -1364,7 +1364,7 @@ LRESULT WINAPI CallNextHookEx( HHOOK hhook, INT code, WPARAM wParam,
 
 
 /***********************************************************************
- *           DefHookProc16   (USER.235)
+ *		DefHookProc (USER.235)
  */
 LRESULT WINAPI DefHookProc16( INT16 code, WPARAM16 wParam, LPARAM lParam,
                               HHOOK *hhook )
@@ -1382,7 +1382,7 @@ LRESULT WINAPI DefHookProc16( INT16 code, WPARAM16 wParam, LPARAM lParam,
 
 
 /***********************************************************************
- *           CallMsgFilter16   (USER.123)
+ *		CallMsgFilter (USER.123)
  */
 BOOL16 WINAPI CallMsgFilter16( SEGPTR msg, INT16 code )
 {
@@ -1393,7 +1393,7 @@ BOOL16 WINAPI CallMsgFilter16( SEGPTR msg, INT16 code )
 
 
 /***********************************************************************
- *           CallMsgFilter32   (USER.823)
+ *		CallMsgFilter32 (USER.823)
  */
 BOOL16 WINAPI CallMsgFilter32_16( SEGPTR msg16_32, INT16 code, BOOL16 wHaveParamHigh )
 {
@@ -1436,7 +1436,7 @@ BOOL16 WINAPI CallMsgFilter32_16( SEGPTR msg16_32, INT16 code, BOOL16 wHaveParam
 
 
 /***********************************************************************
- *           CallMsgFilterA   (USER32.15)
+ *		CallMsgFilterA (USER32.@)
  *
  * FIXME: There are ANSI and UNICODE versions of this, plus an unspecified
  * version, plus USER (the 16bit one) has a CallMsgFilter32 function.
@@ -1451,7 +1451,7 @@ BOOL WINAPI CallMsgFilterA( LPMSG msg, INT code )
 
 
 /***********************************************************************
- *           CallMsgFilterW   (USER32.16)
+ *		CallMsgFilterW (USER32.@)
  */
 BOOL WINAPI CallMsgFilterW( LPMSG msg, INT code )
 {

windows/keyboard.c

@@ -37,7 +37,7 @@ static LPKEYBD_EVENT_PROC DefKeybEventProc = NULL;
 LPBYTE pKeyStateTable = NULL;
 
 /***********************************************************************
- *           KEYBOARD_Inquire			(KEYBOARD.1)
+ *		Inquire (KEYBOARD.1)
  */
 WORD WINAPI KEYBOARD_Inquire(LPKBINFO kbInfo) 
 {
@@ -51,7 +51,7 @@ WORD WINAPI KEYBOARD_Inquire(LPKBINFO kbInfo)
 }
 
 /***********************************************************************
- *           KEYBOARD_Enable			(KEYBOARD.2)
+ *		Enable (KEYBOARD.2)
  */
 VOID WINAPI KEYBOARD_Enable( LPKEYBD_EVENT_PROC lpKeybEventProc, 
                              LPBYTE lpKeyState )
@@ -100,7 +100,7 @@ VOID WINAPI WIN16_KEYBOARD_Enable( FARPROC16 proc, LPBYTE lpKeyState )
 }
 
 /***********************************************************************
- *           KEYBOARD_Disable			(KEYBOARD.3)
+ *		Disable (KEYBOARD.3)
  */
 VOID WINAPI KEYBOARD_Disable(VOID)
 {
@@ -136,7 +136,7 @@ void KEYBOARD_SendEvent( BYTE bVk, BYTE bScan, DWORD dwFlags,
 }
 
 /**********************************************************************
- *           SetSpeed16      (KEYBOARD.7)
+ *		SetSpeed (KEYBOARD.7)
  */
 WORD WINAPI SetSpeed16(WORD unused)
 {
@@ -145,7 +145,7 @@ WORD WINAPI SetSpeed16(WORD unused)
 }
 
 /**********************************************************************
- *           ScreenSwitchEnable      (KEYBOARD.100)
+ *		ScreenSwitchEnable (KEYBOARD.100)
  */
 VOID WINAPI ScreenSwitchEnable16(WORD unused)
 {
@@ -153,7 +153,7 @@ VOID WINAPI ScreenSwitchEnable16(WORD unused)
 }
 
 /**********************************************************************
- *           OemKeyScan      (KEYBOARD.128)(USER32.401)
+ *		OemKeyScan (KEYBOARD.128) (USER32.@)
  */
 DWORD WINAPI OemKeyScan(WORD wOemChar)
 {
@@ -163,7 +163,7 @@ DWORD WINAPI OemKeyScan(WORD wOemChar)
 }
 
 /**********************************************************************
- *    	VkKeyScan			[KEYBOARD.129]
+ *		VkKeyScan (KEYBOARD.129)
  *
  * VkKeyScan translates an ANSI character to a virtual-key and shift code
  * for the current keyboard.
@@ -186,7 +186,7 @@ WORD WINAPI VkKeyScan16(CHAR cChar)
 }
 
 /******************************************************************************
- *    	GetKeyboardType16      (KEYBOARD.130)
+ *		GetKeyboardType (KEYBOARD.130)
  */
 INT16 WINAPI GetKeyboardType16(INT16 nTypeFlag)
 {
@@ -209,7 +209,7 @@ INT16 WINAPI GetKeyboardType16(INT16 nTypeFlag)
 }
 
 /******************************************************************************
- *    	MapVirtualKey16      (KEYBOARD.131)
+ *		MapVirtualKey (KEYBOARD.131)
  *
  * MapVirtualKey translates keycodes from one format to another
  */
@@ -219,7 +219,7 @@ UINT16 WINAPI MapVirtualKey16(UINT16 wCode, UINT16 wMapType)
 }
 
 /****************************************************************************
- *	GetKBCodePage16   (KEYBOARD.132)
+ *		GetKBCodePage (KEYBOARD.132)
  */
 INT16 WINAPI GetKBCodePage16(void)
 {
@@ -228,7 +228,7 @@ INT16 WINAPI GetKBCodePage16(void)
 }
 
 /****************************************************************************
- *	GetKeyNameText16   (KEYBOARD.133)
+ *		GetKeyNameText (KEYBOARD.133)
  */
 INT16 WINAPI GetKeyNameText16(LONG lParam, LPSTR lpBuffer, INT16 nSize)
 {
@@ -236,7 +236,7 @@ INT16 WINAPI GetKeyNameText16(LONG lParam, LPSTR lpBuffer, INT16 nSize)
 }
 
 /****************************************************************************
- *	ToAscii   (KEYBOARD.4)
+ *		ToAscii (KEYBOARD.4)
  *
  * The ToAscii function translates the specified virtual-key code and keyboard
  * state to the corresponding Windows character or characters.
@@ -276,7 +276,7 @@ void KEYBOARD_SetBeepActive(BOOL bActivate)
 }
 
 /***********************************************************************
- *           MessageBeep16   (USER.104)
+ *		MessageBeep (USER.104)
  */
 void WINAPI MessageBeep16( UINT16 i )
 {
@@ -284,7 +284,7 @@ void WINAPI MessageBeep16( UINT16 i )
 }
 
 /***********************************************************************
- *           MessageBeep   (USER32.390)
+ *		MessageBeep (USER32.@)
  */
 BOOL WINAPI MessageBeep( UINT i )
 {

windows/mdi.c

@@ -1468,7 +1468,7 @@ END:
 
 
 /***********************************************************************
- *           DefFrameProc16   (USER.445)
+ *		DefFrameProc (USER.445)
  */
 LRESULT WINAPI DefFrameProc16( HWND16 hwnd, HWND16 hwndMDIClient,
                                UINT16 message, WPARAM16 wParam, LPARAM lParam )
@@ -1593,7 +1593,7 @@ LRESULT WINAPI DefFrameProc16( HWND16 hwnd, HWND16 hwndMDIClient,
 
 
 /***********************************************************************
- *           DefFrameProcA   (USER32.122)
+ *		DefFrameProcA (USER32.@)
  */
 LRESULT WINAPI DefFrameProcA( HWND hwnd, HWND hwndMDIClient,
                                 UINT message, WPARAM wParam, LPARAM lParam)
@@ -1634,7 +1634,7 @@ LRESULT WINAPI DefFrameProcA( HWND hwnd, HWND hwndMDIClient,
 
 
 /***********************************************************************
- *           DefFrameProcW   (USER32.123)
+ *		DefFrameProcW (USER32.@)
  */
 LRESULT WINAPI DefFrameProcW( HWND hwnd, HWND hwndMDIClient,
                                 UINT message, WPARAM wParam, LPARAM lParam)
@@ -1673,7 +1673,7 @@ LRESULT WINAPI DefFrameProcW( HWND hwnd, HWND hwndMDIClient,
 
 
 /***********************************************************************
- *           DefMDIChildProc16   (USER.447)
+ *		DefMDIChildProc (USER.447)
  */
 LRESULT WINAPI DefMDIChildProc16( HWND16 hwnd, UINT16 message,
                                   WPARAM16 wParam, LPARAM lParam )
@@ -1873,7 +1873,7 @@ END:
 
 
 /***********************************************************************
- *           DefMDIChildProcA   (USER32.124)
+ *		DefMDIChildProcA (USER32.@)
  */
 LRESULT WINAPI DefMDIChildProcA( HWND hwnd, UINT message,
                                    WPARAM wParam, LPARAM lParam )
@@ -1951,7 +1951,7 @@ END:
 
 
 /***********************************************************************
- *           DefMDIChildProcW   (USER32.125)
+ *		DefMDIChildProcW (USER32.@)
  */
 LRESULT WINAPI DefMDIChildProcW( HWND hwnd, UINT message,
                                    WPARAM wParam, LPARAM lParam )
@@ -2016,7 +2016,7 @@ END:
 
 
 /**********************************************************************
- * CreateMDIWindowA [USER32.79] Creates a MDI child in new thread
+ *		CreateMDIWindowA (USER32.@) Creates a MDI child in new thread
  * FIXME: its in the same thread now
  *
  * RETURNS
@@ -2088,7 +2088,7 @@ HWND MDI_CreateMDIWindowA(
 }
 
 /***********************************************************************
- * CreateMDIWindowW [USER32.80] Creates a MDI child in new thread
+ *		CreateMDIWindowW (USER32.@) Creates a MDI child in new thread
  *
  * RETURNS
  *    Success: Handle to created window
@@ -2114,7 +2114,7 @@ HWND WINAPI CreateMDIWindowW(
 
 
 /******************************************************************************
- * CreateMDIWindowW [USER32.80]  Creates a MDI child window
+ *		CreateMDIWindowW (USER32.80) Creates a MDI child window
  * single threaded version of CreateMDIWindow
  * called by CreateWindowExW(). 
  */
@@ -2138,7 +2138,7 @@ HWND MDI_CreateMDIWindowW(
 
 
 /**********************************************************************
- *             TranslateMDISysAccel   (USER32.555)
+ *		TranslateMDISysAccel (USER32.@)
  */
 BOOL WINAPI TranslateMDISysAccel( HWND hwndClient, LPMSG msg )
 {
@@ -2151,7 +2151,7 @@ BOOL WINAPI TranslateMDISysAccel( HWND hwndClient, LPMSG msg )
 
 
 /**********************************************************************
- *             TranslateMDISysAccel16   (USER.451)
+ *		TranslateMDISysAccel (USER.451)
  */
 BOOL16 WINAPI TranslateMDISysAccel16( HWND16 hwndClient, LPMSG16 msg )
 {
@@ -2202,7 +2202,7 @@ BOOL16 WINAPI TranslateMDISysAccel16( HWND16 hwndClient, LPMSG16 msg )
 
 
 /***********************************************************************
- *           CalcChildScroll   (USER.462)
+ *		CalcChildScroll (USER.462)
  */
 void WINAPI CalcChildScroll16( HWND16 hwnd, WORD scroll )
 {
@@ -2254,7 +2254,7 @@ void WINAPI CalcChildScroll16( HWND16 hwnd, WORD scroll )
 
 
 /***********************************************************************
- *           ScrollChildren16   (USER.463)
+ *		ScrollChildren (USER.463)
  */
 void WINAPI ScrollChildren16(HWND16 hWnd, UINT16 uMsg, WPARAM16 wParam, LPARAM lParam)
 {
@@ -2263,7 +2263,7 @@ void WINAPI ScrollChildren16(HWND16 hWnd, UINT16 uMsg, WPARAM16 wParam, LPARAM l
 
 
 /***********************************************************************
- *           ScrollChildren   (USER32.448)
+ *		ScrollChildren (USER32.@)
  */
 void WINAPI ScrollChildren(HWND hWnd, UINT uMsg, WPARAM wParam,
                              LPARAM lParam)
@@ -2346,7 +2346,7 @@ void WINAPI ScrollChildren(HWND hWnd, UINT uMsg, WPARAM wParam,
 
 
 /******************************************************************************
- * CascadeWindows [USER32.21] Cascades MDI child windows
+ *		CascadeWindows (USER32.@) Cascades MDI child windows
  *
  * RETURNS
  *    Success: Number of cascaded windows.
@@ -2364,7 +2364,7 @@ CascadeWindows (HWND hwndParent, UINT wFlags, const LPRECT lpRect,
 
 
 /******************************************************************************
- * TileWindows [USER32.545] Tiles MDI child windows
+ *		TileWindows (USER32.@) Tiles MDI child windows
  *
  * RETURNS
  *    Success: Number of tiled windows.

windows/msgbox.c

@@ -248,7 +248,7 @@ static LRESULT CALLBACK MSGBOX_DlgProc( HWND hwnd, UINT message,
 
 
 /**************************************************************************
- *           MessageBox16   (USER.1)
+ *		MessageBox (USER.1)
  */
 INT16 WINAPI MessageBox16( HWND16 hwnd, LPCSTR text, LPCSTR title, UINT16 type)
 {
@@ -258,7 +258,7 @@ INT16 WINAPI MessageBox16( HWND16 hwnd, LPCSTR text, LPCSTR title, UINT16 type)
 
 
 /**************************************************************************
- *           MessageBoxA   (USER32.391)
+ *		MessageBoxA (USER32.@)
  *
  * NOTES
  *   The WARN is here to help debug erroneous MessageBoxes
@@ -289,7 +289,7 @@ INT WINAPI MessageBoxA(HWND hWnd, LPCSTR text, LPCSTR title, UINT type)
 
 
 /**************************************************************************
- *           MessageBoxW   (USER32.396)
+ *		MessageBoxW (USER32.@)
  */
 INT WINAPI MessageBoxW( HWND hwnd, LPCWSTR text, LPCWSTR title,
                             UINT type )
@@ -308,7 +308,7 @@ INT WINAPI MessageBoxW( HWND hwnd, LPCWSTR text, LPCWSTR title,
 
 
 /**************************************************************************
- *           MessageBoxExA   (USER32.392)
+ *		MessageBoxExA (USER32.@)
  */
 INT WINAPI MessageBoxExA( HWND hWnd, LPCSTR text, LPCSTR title,
                               UINT type, WORD langid )
@@ -319,7 +319,7 @@ INT WINAPI MessageBoxExA( HWND hWnd, LPCSTR text, LPCSTR title,
 }
 
 /**************************************************************************
- *           MessageBoxExW   (USER32.393)
+ *		MessageBoxExW (USER32.@)
  */
 INT WINAPI MessageBoxExW( HWND hWnd, LPCWSTR text, LPCWSTR title,
                               UINT type, WORD langid )
@@ -330,7 +330,7 @@ INT WINAPI MessageBoxExW( HWND hWnd, LPCWSTR text, LPCWSTR title,
 }
 
 /**************************************************************************
- *           MessageBoxIndirect16   (USER.827)
+ *		MessageBoxIndirect (USER.827)
  */
 INT16 WINAPI MessageBoxIndirect16( LPMSGBOXPARAMS16 msgbox )
 {
@@ -362,7 +362,7 @@ INT16 WINAPI MessageBoxIndirect16( LPMSGBOXPARAMS16 msgbox )
 }
 
 /**************************************************************************
- *           MessageBoxIndirectA   (USER32.394)
+ *		MessageBoxIndirectA (USER32.@)
  */
 INT WINAPI MessageBoxIndirectA( LPMSGBOXPARAMSA msgbox )
 {
@@ -382,7 +382,7 @@ INT WINAPI MessageBoxIndirectA( LPMSGBOXPARAMSA msgbox )
 }
 
 /**************************************************************************
- *           MessageBoxIndirectW   (USER32.395)
+ *		MessageBoxIndirectW (USER32.@)
  */
 INT WINAPI MessageBoxIndirectW( LPMSGBOXPARAMSW msgbox )
 {

windows/multimon.c

@@ -15,7 +15,7 @@
 #define xPRIMARY_MONITOR ((HMONITOR)0x12340042)
 
 /***********************************************************************
- *		MonitorFromPoint
+ *		MonitorFromPoint (USER32.@)
  */
 HMONITOR WINAPI MonitorFromPoint(POINT ptScreenCoords, DWORD dwFlags)
 {
@@ -31,7 +31,7 @@ HMONITOR WINAPI MonitorFromPoint(POINT ptScreenCoords, DWORD dwFlags)
 }
 
 /***********************************************************************
- *		MonitorFromRect
+ *		MonitorFromRect (USER32.@)
  */
 HMONITOR WINAPI MonitorFromRect(LPRECT lprcScreenCoords, DWORD dwFlags)
 {
@@ -47,7 +47,7 @@ HMONITOR WINAPI MonitorFromRect(LPRECT lprcScreenCoords, DWORD dwFlags)
 }
 
 /***********************************************************************
- *		MonitorFromWindow
+ *		MonitorFromWindow (USER32.@)
  */
 HMONITOR WINAPI MonitorFromWindow(HWND hWnd, DWORD dwFlags)
 {
@@ -67,7 +67,7 @@ HMONITOR WINAPI MonitorFromWindow(HWND hWnd, DWORD dwFlags)
 }
 
 /***********************************************************************
- *		GetMonitorInfoA
+ *		GetMonitorInfoA (USER32.@)
  */
 BOOL WINAPI GetMonitorInfoA(HMONITOR hMonitor, LPMONITORINFO lpMonitorInfo)
 {
@@ -94,7 +94,7 @@ BOOL WINAPI GetMonitorInfoA(HMONITOR hMonitor, LPMONITORINFO lpMonitorInfo)
 }
 
 /***********************************************************************
- *		GetMonitorInfoW
+ *		GetMonitorInfoW (USER32.@)
  */
 BOOL WINAPI GetMonitorInfoW(HMONITOR hMonitor, LPMONITORINFO lpMonitorInfo)
 {
@@ -121,7 +121,7 @@ BOOL WINAPI GetMonitorInfoW(HMONITOR hMonitor, LPMONITORINFO lpMonitorInfo)
 }
 
 /***********************************************************************
- *		EnumDisplayMonitors
+ *		EnumDisplayMonitors (USER32.@)
  */
 BOOL WINAPI EnumDisplayMonitors(
         HDC             hdcOptionalForPainting,

windows/nonclient.c

@@ -254,7 +254,7 @@ NC_AdjustRectInner95 (LPRECT16 rect, DWORD style, DWORD exStyle)
 
 
 /***********************************************************************
- * DrawCaption16 [USER.660] Draws a caption bar
+ *		DrawCaption (USER.660) Draws a caption bar
  *
  * PARAMS
  *     hwnd   [I]
@@ -281,7 +281,7 @@ DrawCaption16 (HWND16 hwnd, HDC16 hdc, const RECT16 *rect, UINT16 uFlags)
 
 
 /***********************************************************************
- * DrawCaption [USER32.154] Draws a caption bar
+ *		DrawCaption (USER32.@) Draws a caption bar
  *
  * PARAMS
  *     hwnd   [I]
@@ -302,7 +302,7 @@ DrawCaption (HWND hwnd, HDC hdc, const RECT *lpRect, UINT uFlags)
 
 
 /***********************************************************************
- * DrawCaptionTemp16 [USER.657]
+ *		DrawCaptionTemp (USER.657)
  *
  * PARAMS
  *
@@ -326,7 +326,7 @@ DrawCaptionTemp16 (HWND16 hwnd, HDC16 hdc, const RECT16 *rect, HFONT16 hFont,
 
 
 /***********************************************************************
- * DrawCaptionTempA [USER32.599]
+ *		DrawCaptionTempA (USER32.@)
  *
  * PARAMS
  *
@@ -434,7 +434,7 @@ DrawCaptionTempA (HWND hwnd, HDC hdc, const RECT *rect, HFONT hFont,
 
 
 /***********************************************************************
- * DrawCaptionTempW [USER32.602]
+ *		DrawCaptionTempW (USER32.@)
  *
  * PARAMS
  *
@@ -455,7 +455,7 @@ DrawCaptionTempW (HWND hwnd, HDC hdc, const RECT *rect, HFONT hFont,
 
 
 /***********************************************************************
- *           AdjustWindowRect16    (USER.102)
+ *		AdjustWindowRect (USER.102)
  */
 BOOL16 WINAPI AdjustWindowRect16( LPRECT16 rect, DWORD style, BOOL16 menu )
 {
@@ -464,7 +464,7 @@ BOOL16 WINAPI AdjustWindowRect16( LPRECT16 rect, DWORD style, BOOL16 menu )
 
 
 /***********************************************************************
- *           AdjustWindowRect    (USER32.2)
+ *		AdjustWindowRect (USER32.@)
  */
 BOOL WINAPI AdjustWindowRect( LPRECT rect, DWORD style, BOOL menu )
 {
@@ -473,7 +473,7 @@ BOOL WINAPI AdjustWindowRect( LPRECT rect, DWORD style, BOOL menu )
 
 
 /***********************************************************************
- *           AdjustWindowRectEx16    (USER.454)
+ *		AdjustWindowRectEx (USER.454)
  */
 BOOL16 WINAPI AdjustWindowRectEx16( LPRECT16 rect, DWORD style,
                                     BOOL16 menu, DWORD exStyle )
@@ -503,7 +503,7 @@ BOOL16 WINAPI AdjustWindowRectEx16( LPRECT16 rect, DWORD style,
 
 
 /***********************************************************************
- *           AdjustWindowRectEx    (USER32.3)
+ *		AdjustWindowRectEx (USER32.@)
  */
 BOOL WINAPI AdjustWindowRectEx( LPRECT rect, DWORD style,
                                     BOOL menu, DWORD exStyle )

windows/property.c

@@ -66,7 +66,7 @@ END:
 
 
 /***********************************************************************
- *           GetProp16   (USER.25)
+ *		GetProp (USER.25)
  */
 HANDLE16 WINAPI GetProp16( HWND16 hwnd, LPCSTR str )
 {
@@ -75,7 +75,7 @@ HANDLE16 WINAPI GetProp16( HWND16 hwnd, LPCSTR str )
 
 
 /***********************************************************************
- *           GetPropA   (USER32.281)
+ *		GetPropA (USER32.@)
  */
 HANDLE WINAPI GetPropA( HWND hwnd, LPCSTR str )
 {
@@ -93,7 +93,7 @@ HANDLE WINAPI GetPropA( HWND hwnd, LPCSTR str )
 
 
 /***********************************************************************
- *           GetPropW   (USER32.282)
+ *		GetPropW (USER32.@)
  */
 HANDLE WINAPI GetPropW( HWND hwnd, LPCWSTR str )
 {
@@ -109,7 +109,7 @@ HANDLE WINAPI GetPropW( HWND hwnd, LPCWSTR str )
 
 
 /***********************************************************************
- *           SetProp16   (USER.26)
+ *		SetProp (USER.26)
  */
 BOOL16 WINAPI SetProp16( HWND16 hwnd, LPCSTR str, HANDLE16 handle )
 {
@@ -118,7 +118,7 @@ BOOL16 WINAPI SetProp16( HWND16 hwnd, LPCSTR str, HANDLE16 handle )
 
 
 /***********************************************************************
- *           SetPropA   (USER32.497)
+ *		SetPropA (USER32.@)
  */
 BOOL WINAPI SetPropA( HWND hwnd, LPCSTR str, HANDLE handle )
 {
@@ -157,7 +157,7 @@ BOOL WINAPI SetPropA( HWND hwnd, LPCSTR str, HANDLE handle )
 
 
 /***********************************************************************
- *           SetPropW   (USER32.498)
+ *		SetPropW (USER32.@)
  */
 BOOL WINAPI SetPropW( HWND hwnd, LPCWSTR str, HANDLE handle )
 {
@@ -174,7 +174,7 @@ BOOL WINAPI SetPropW( HWND hwnd, LPCWSTR str, HANDLE handle )
 
 
 /***********************************************************************
- *           RemoveProp16   (USER.24)
+ *		RemoveProp (USER.24)
  */
 HANDLE16 WINAPI RemoveProp16( HWND16 hwnd, LPCSTR str )
 {
@@ -183,7 +183,7 @@ HANDLE16 WINAPI RemoveProp16( HWND16 hwnd, LPCSTR str )
 
 
 /***********************************************************************
- *           RemovePropA   (USER32.442)
+ *		RemovePropA (USER32.@)
  */
 HANDLE WINAPI RemovePropA( HWND hwnd, LPCSTR str )
 {
@@ -235,7 +235,7 @@ HANDLE WINAPI RemovePropA( HWND hwnd, LPCSTR str )
 
 
 /***********************************************************************
- *           RemovePropW   (USER32.443)
+ *		RemovePropW (USER32.@)
  */
 HANDLE WINAPI RemovePropW( HWND hwnd, LPCWSTR str )
 {
@@ -271,7 +271,7 @@ void PROPERTY_RemoveWindowProps( WND *pWnd )
 
 
 /***********************************************************************
- *           EnumProps16   (USER.27)
+ *		EnumProps (USER.27)
  */
 INT16 WINAPI EnumProps16( HWND16 hwnd, PROPENUMPROC16 func )
 {
@@ -298,7 +298,7 @@ INT16 WINAPI EnumProps16( HWND16 hwnd, PROPENUMPROC16 func )
 
 
 /***********************************************************************
- *           EnumPropsA   (USER32.186)
+ *		EnumPropsA (USER32.@)
  */
 INT WINAPI EnumPropsA( HWND hwnd, PROPENUMPROCA func )
 {
@@ -307,7 +307,7 @@ INT WINAPI EnumPropsA( HWND hwnd, PROPENUMPROCA func )
 
 
 /***********************************************************************
- *           EnumPropsW   (USER32.189)
+ *		EnumPropsW (USER32.@)
  */
 INT WINAPI EnumPropsW( HWND hwnd, PROPENUMPROCW func )
 {
@@ -316,7 +316,7 @@ INT WINAPI EnumPropsW( HWND hwnd, PROPENUMPROCW func )
 
 
 /***********************************************************************
- *           EnumPropsExA   (USER32.187)
+ *		EnumPropsExA (USER32.@)
  */
 INT WINAPI EnumPropsExA(HWND hwnd, PROPENUMPROCEXA func, LPARAM lParam)
 {
@@ -344,7 +344,7 @@ INT WINAPI EnumPropsExA(HWND hwnd, PROPENUMPROCEXA func, LPARAM lParam)
 
 
 /***********************************************************************
- *           EnumPropsExW   (USER32.188)
+ *		EnumPropsExW (USER32.@)
  */
 INT WINAPI EnumPropsExW(HWND hwnd, PROPENUMPROCEXW func, LPARAM lParam)
 {

windows/queue.c

@@ -1324,7 +1324,7 @@ void QUEUE_DecTimerCount( HQUEUE16 hQueue )
 
 
 /***********************************************************************
- *           PostQuitMessage16   (USER.6)
+ *		PostQuitMessage (USER.6)
  */
 void WINAPI PostQuitMessage16( INT16 exitCode )
 {
@@ -1333,7 +1333,7 @@ void WINAPI PostQuitMessage16( INT16 exitCode )
 
 
 /***********************************************************************
- *           PostQuitMessage   (USER32.421)
+ *		PostQuitMessage (USER32.@)
  *
  * PostQuitMessage() posts a message to the system requesting an
  * application to terminate execution. As a result of this function,
@@ -1358,7 +1358,7 @@ void WINAPI PostQuitMessage( INT exitCode )
 
 
 /***********************************************************************
- *           GetWindowTask16   (USER.224)
+ *		GetWindowTask (USER.224)
  */
 HTASK16 WINAPI GetWindowTask16( HWND16 hwnd )
 {
@@ -1372,7 +1372,7 @@ HTASK16 WINAPI GetWindowTask16( HWND16 hwnd )
 }
 
 /***********************************************************************
- *           GetWindowThreadProcessId   (USER32.313)
+ *		GetWindowThreadProcessId (USER32.@)
  */
 DWORD WINAPI GetWindowThreadProcessId( HWND hwnd, LPDWORD process )
 {
@@ -1396,7 +1396,7 @@ DWORD WINAPI GetWindowThreadProcessId( HWND hwnd, LPDWORD process )
 
 
 /***********************************************************************
- *           SetMessageQueue16   (USER.266)
+ *		SetMessageQueue (USER.266)
  */
 BOOL16 WINAPI SetMessageQueue16( INT16 size )
 {
@@ -1405,7 +1405,7 @@ BOOL16 WINAPI SetMessageQueue16( INT16 size )
 
 
 /***********************************************************************
- *           SetMessageQueue   (USER32.494)
+ *		SetMessageQueue (USER32.@)
  */
 BOOL WINAPI SetMessageQueue( INT size )
 {
@@ -1419,7 +1419,7 @@ BOOL WINAPI SetMessageQueue( INT size )
 }
 
 /***********************************************************************
- *           InitThreadInput16   (USER.409)
+ *		InitThreadInput (USER.409)
  */
 HQUEUE16 WINAPI InitThreadInput16( WORD unknown, WORD flags )
 {
@@ -1461,7 +1461,7 @@ HQUEUE16 WINAPI InitThreadInput16( WORD unknown, WORD flags )
 }
 
 /***********************************************************************
- *           GetQueueStatus16   (USER.334)
+ *		GetQueueStatus (USER.334)
  */
 DWORD WINAPI GetQueueStatus16( UINT16 flags )
 {
@@ -1477,7 +1477,7 @@ DWORD WINAPI GetQueueStatus16( UINT16 flags )
 }
 
 /***********************************************************************
- *           GetQueueStatus   (USER32.283)
+ *		GetQueueStatus (USER32.@)
  */
 DWORD WINAPI GetQueueStatus( UINT flags )
 {
@@ -1494,7 +1494,7 @@ DWORD WINAPI GetQueueStatus( UINT flags )
 
 
 /***********************************************************************
- *           GetInputState16   (USER.335)
+ *		GetInputState (USER.335)
  */
 BOOL16 WINAPI GetInputState16(void)
 {
@@ -1502,7 +1502,7 @@ BOOL16 WINAPI GetInputState16(void)
 }
 
 /***********************************************************************
- *           WaitForInputIdle   (USER32.577)
+ *		WaitForInputIdle (USER32.@)
  */
 DWORD WINAPI WaitForInputIdle (HANDLE hProcess, DWORD dwTimeOut)
 {
@@ -1547,7 +1547,7 @@ DWORD WINAPI WaitForInputIdle (HANDLE hProcess, DWORD dwTimeOut)
 }
 
 /***********************************************************************
- *           GetInputState   (USER32.244)
+ *		GetInputState (USER32.@)
  */
 BOOL WINAPI GetInputState(void)
 {
@@ -1563,7 +1563,7 @@ BOOL WINAPI GetInputState(void)
 }
 
 /***********************************************************************
- *           UserYield  (USER.332)
+ *		UserYield (USER.332)
  */
 void WINAPI UserYield16(void)
 {
@@ -1593,7 +1593,7 @@ void WINAPI UserYield16(void)
 }
 
 /***********************************************************************
- *           GetMessagePos   (USER.119) (USER32.272)
+ *		GetMessagePos (USER.119) (USER32.@)
  * 
  * The GetMessagePos() function returns a long value representing a
  * cursor position, in screen coordinates, when the last message
@@ -1627,7 +1627,7 @@ DWORD WINAPI GetMessagePos(void)
 
 
 /***********************************************************************
- *           GetMessageTime   (USER.120) (USER32.273)
+ *		GetMessageTime (USER.120) (USER32.@)
  *
  * GetMessageTime() returns the message time for the last message
  * retrieved by the function. The time is measured in milliseconds with
@@ -1659,7 +1659,7 @@ LONG WINAPI GetMessageTime(void)
 
 
 /***********************************************************************
- *           GetMessageExtraInfo   (USER.288) (USER32.271)
+ *		GetMessageExtraInfo (USER.288) (USER32.@)
  */
 LONG WINAPI GetMessageExtraInfo(void)
 {
@@ -1675,7 +1675,7 @@ LONG WINAPI GetMessageExtraInfo(void)
 
 
 /**********************************************************************
- * AttachThreadInput [USER32.8]  Attaches input of 1 thread to other
+ *		AttachThreadInput (USER32.@) Attaches input of 1 thread to other
  *
  * Attaches the input processing mechanism of one thread to that of
  * another thread.

windows/rect.c

@@ -11,7 +11,7 @@
 #include "winuser.h"
 
 /***********************************************************************
- *           SetRect16    (USER.72)
+ *		SetRect (USER.72)
  */
 void WINAPI SetRect16( LPRECT16 rect, INT16 left, INT16 top,
                        INT16 right, INT16 bottom )
@@ -24,7 +24,7 @@ void WINAPI SetRect16( LPRECT16 rect, INT16 left, INT16 top,
 
 
 /***********************************************************************
- *           SetRect    (USER32.499)
+ *		SetRect (USER32.@)
  */
 BOOL WINAPI SetRect( LPRECT rect, INT left, INT top,
                        INT right, INT bottom )
@@ -38,7 +38,7 @@ BOOL WINAPI SetRect( LPRECT rect, INT left, INT top,
 
 
 /***********************************************************************
- *           SetRectEmpty16    (USER.73)
+ *		SetRectEmpty (USER.73)
  */
 void WINAPI SetRectEmpty16( LPRECT16 rect )
 {
@@ -47,7 +47,7 @@ void WINAPI SetRectEmpty16( LPRECT16 rect )
 
 
 /***********************************************************************
- *           SetRectEmpty    (USER32.500)
+ *		SetRectEmpty (USER32.@)
  */
 BOOL WINAPI SetRectEmpty( LPRECT rect )
 {
@@ -57,7 +57,7 @@ BOOL WINAPI SetRectEmpty( LPRECT rect )
 
 
 /***********************************************************************
- *           CopyRect16    (USER.74)
+ *		CopyRect (USER.74)
  */
 BOOL16 WINAPI CopyRect16( RECT16 *dest, const RECT16 *src )
 {
@@ -67,7 +67,7 @@ BOOL16 WINAPI CopyRect16( RECT16 *dest, const RECT16 *src )
 
 
 /***********************************************************************
- *           CopyRect    (USER32.62)
+ *		CopyRect (USER32.@)
  */
 BOOL WINAPI CopyRect( RECT *dest, const RECT *src )
 {
@@ -79,7 +79,7 @@ BOOL WINAPI CopyRect( RECT *dest, const RECT *src )
 
 
 /***********************************************************************
- *           IsRectEmpty16    (USER.75)
+ *		IsRectEmpty (USER.75)
  *
  * Bug compat: Windows checks for 0 or negative width/height.
  */
@@ -90,7 +90,7 @@ BOOL16 WINAPI IsRectEmpty16( const RECT16 *rect )
 
 
 /***********************************************************************
- *           IsRectEmpty    (USER32.347)
+ *		IsRectEmpty (USER32.@)
  *
  * Bug compat: Windows checks for 0 or negative width/height.
  */
@@ -101,7 +101,7 @@ BOOL WINAPI IsRectEmpty( const RECT *rect )
 
 
 /***********************************************************************
- *           PtInRect16    (USER.76)
+ *		PtInRect (USER.76)
  */
 BOOL16 WINAPI PtInRect16( const RECT16 *rect, POINT16 pt )
 {
@@ -111,7 +111,7 @@ BOOL16 WINAPI PtInRect16( const RECT16 *rect, POINT16 pt )
 
 
 /***********************************************************************
- *           PtInRect    (USER32.424)
+ *		PtInRect (USER32.@)
  */
 BOOL WINAPI PtInRect( const RECT *rect, POINT pt )
 {
@@ -121,7 +121,7 @@ BOOL WINAPI PtInRect( const RECT *rect, POINT pt )
 
 
 /***********************************************************************
- *           OffsetRect16    (USER.77)
+ *		OffsetRect (USER.77)
  */
 void WINAPI OffsetRect16( LPRECT16 rect, INT16 x, INT16 y )
 {
@@ -133,7 +133,7 @@ void WINAPI OffsetRect16( LPRECT16 rect, INT16 x, INT16 y )
 
 
 /***********************************************************************
- *           OffsetRect    (USER32.406)
+ *		OffsetRect (USER32.@)
  */
 BOOL WINAPI OffsetRect( LPRECT rect, INT x, INT y )
 {
@@ -146,7 +146,7 @@ BOOL WINAPI OffsetRect( LPRECT rect, INT x, INT y )
 
 
 /***********************************************************************
- *           InflateRect16    (USER.78)
+ *		InflateRect (USER.78)
  */
 void WINAPI InflateRect16( LPRECT16 rect, INT16 x, INT16 y )
 {
@@ -158,7 +158,7 @@ void WINAPI InflateRect16( LPRECT16 rect, INT16 x, INT16 y )
 
 
 /***********************************************************************
- *           InflateRect    (USER32.321)
+ *		InflateRect (USER32.@)
  */
 BOOL WINAPI InflateRect( LPRECT rect, INT x, INT y )
 {
@@ -171,7 +171,7 @@ BOOL WINAPI InflateRect( LPRECT rect, INT x, INT y )
 
 
 /***********************************************************************
- *           IntersectRect16    (USER.79)
+ *		IntersectRect (USER.79)
  */
 BOOL16 WINAPI IntersectRect16( LPRECT16 dest, const RECT16 *src1,
                                const RECT16 *src2 )
@@ -192,7 +192,7 @@ BOOL16 WINAPI IntersectRect16( LPRECT16 dest, const RECT16 *src1,
 
 
 /***********************************************************************
- *           IntersectRect    (USER32.327)
+ *		IntersectRect (USER32.@)
  */
 BOOL WINAPI IntersectRect( LPRECT dest, const RECT *src1,
                                const RECT *src2 )
@@ -213,7 +213,7 @@ BOOL WINAPI IntersectRect( LPRECT dest, const RECT *src1,
 
 
 /***********************************************************************
- *           UnionRect16    (USER.80)
+ *		UnionRect (USER.80)
  */
 BOOL16 WINAPI UnionRect16( LPRECT16 dest, const RECT16 *src1,
                            const RECT16 *src2 )
@@ -243,7 +243,7 @@ BOOL16 WINAPI UnionRect16( LPRECT16 dest, const RECT16 *src1,
 
 
 /***********************************************************************
- *           UnionRect    (USER32.559)
+ *		UnionRect (USER32.@)
  */
 BOOL WINAPI UnionRect( LPRECT dest, const RECT *src1,
                            const RECT *src2 )
@@ -273,7 +273,7 @@ BOOL WINAPI UnionRect( LPRECT dest, const RECT *src1,
 
 
 /***********************************************************************
- *           EqualRect16    (USER.244)
+ *		EqualRect (USER.244)
  */
 BOOL16 WINAPI EqualRect16( const RECT16* rect1, const RECT16* rect2 )
 {
@@ -283,7 +283,7 @@ BOOL16 WINAPI EqualRect16( const RECT16* rect1, const RECT16* rect2 )
 
 
 /***********************************************************************
- *           EqualRect    (USER32.194)
+ *		EqualRect (USER32.@)
  */
 BOOL WINAPI EqualRect( const RECT* rect1, const RECT* rect2 )
 {
@@ -293,7 +293,7 @@ BOOL WINAPI EqualRect( const RECT* rect1, const RECT* rect2 )
 
 
 /***********************************************************************
- *           SubtractRect16    (USER.373)
+ *		SubtractRect (USER.373)
  */
 BOOL16 WINAPI SubtractRect16( LPRECT16 dest, const RECT16 *src1,
                               const RECT16 *src2 )
@@ -329,7 +329,7 @@ BOOL16 WINAPI SubtractRect16( LPRECT16 dest, const RECT16 *src1,
 
 
 /***********************************************************************
- *           SubtractRect    (USER32.536)
+ *		SubtractRect (USER32.@)
  */
 BOOL WINAPI SubtractRect( LPRECT dest, const RECT *src1,
                               const RECT *src2 )

windows/scroll.c

@@ -22,7 +22,7 @@
 DEFAULT_DEBUG_CHANNEL(scroll);
 
 /*************************************************************************
- *             ScrollWindow16   (USER.61)
+ *		ScrollWindow16 (USER.61)
  */
 void WINAPI ScrollWindow16(HWND16 hwnd, INT16 dx, INT16 dy, const RECT16 *rect,
                            const RECT16 *clipRect )
@@ -36,7 +36,7 @@ void WINAPI ScrollWindow16(HWND16 hwnd, INT16 dx, INT16 dy, const RECT16 *rect,
 }
 
 /*************************************************************************
- *             ScrollWindow   (USER32.450)
+ *		ScrollWindow (USER32.@)
  *
  */
 BOOL WINAPI ScrollWindow( HWND hwnd, INT dx, INT dy,
@@ -49,7 +49,7 @@ BOOL WINAPI ScrollWindow( HWND hwnd, INT dx, INT dy,
 }
 
 /*************************************************************************
- *             ScrollDC16   (USER.221)
+ *		ScrollDC (USER.221)
  */
 BOOL16 WINAPI ScrollDC16( HDC16 hdc, INT16 dx, INT16 dy, const RECT16 *rect,
                           const RECT16 *cliprc, HRGN16 hrgnUpdate,
@@ -68,7 +68,7 @@ BOOL16 WINAPI ScrollDC16( HDC16 hdc, INT16 dx, INT16 dy, const RECT16 *rect,
 
 
 /*************************************************************************
- *             ScrollDC   (USER32.449)
+ *		ScrollDC (USER32.@)
  * 
  *   Only the hrgnUpdate is return in device coordinate.
  *   rcUpdate must be returned in logical coordinate to comply with win API.
@@ -185,7 +185,7 @@ BOOL WINAPI ScrollDC( HDC hdc, INT dx, INT dy, const RECT *rc,
 
 
 /*************************************************************************
- *             ScrollWindowEx16   (USER.319)
+ *		ScrollWindowEx (USER.319)
  */
 INT16 WINAPI ScrollWindowEx16( HWND16 hwnd, INT16 dx, INT16 dy,
                                const RECT16 *rect, const RECT16 *clipRect,
@@ -234,7 +234,7 @@ static BOOL SCROLL_FixCaret(HWND hWnd, LPRECT lprc, UINT flags)
 }
 
 /*************************************************************************
- *             ScrollWindowEx   (USER32.451)
+ *		ScrollWindowEx (USER32.@)
  *
  * NOTE: Use this function instead of ScrollWindow32
  */

windows/syscolor.c

@@ -208,7 +208,7 @@ void SYSCOLOR_Init(void)
 
 
 /*************************************************************************
- *             GetSysColor16   (USER.180)
+ *		GetSysColor (USER.180)
  */
 COLORREF WINAPI GetSysColor16( INT16 nIndex )
 {
@@ -217,7 +217,7 @@ COLORREF WINAPI GetSysColor16( INT16 nIndex )
 
 
 /*************************************************************************
- *             GetSysColor   (USER32.289)
+ *		GetSysColor (USER32.@)
  */
 COLORREF WINAPI GetSysColor( INT nIndex )
 {
@@ -229,7 +229,7 @@ COLORREF WINAPI GetSysColor( INT nIndex )
 
 
 /*************************************************************************
- *             SetSysColors16   (USER.181)
+ *		SetSysColors (USER.181)
  */
 VOID WINAPI SetSysColors16( INT16 nChanges, const INT16 *lpSysColor,
 			    const COLORREF *lpColorValues )
@@ -253,7 +253,7 @@ VOID WINAPI SetSysColors16( INT16 nChanges, const INT16 *lpSysColor,
 
 
 /*************************************************************************
- *             SetSysColors   (USER32.505)
+ *		SetSysColors (USER32.@)
  */
 BOOL WINAPI SetSysColors( INT nChanges, const INT *lpSysColor,
                               const COLORREF *lpColorValues )
@@ -278,7 +278,7 @@ BOOL WINAPI SetSysColors( INT nChanges, const INT *lpSysColor,
 
 
 /***********************************************************************
- *           GetSysColorBrush16    (USER.281)
+ *		GetSysColorBrush16 (USER.281)
  */
 HBRUSH16 WINAPI GetSysColorBrush16( INT16 index )
 {
@@ -287,7 +287,7 @@ HBRUSH16 WINAPI GetSysColorBrush16( INT16 index )
 
 
 /***********************************************************************
- *           GetSysColorBrush    (USER32.290)
+ *		GetSysColorBrush (USER32.@)
  */
 HBRUSH WINAPI GetSysColorBrush( INT index )
 {
@@ -299,7 +299,7 @@ HBRUSH WINAPI GetSysColorBrush( INT index )
 
 
 /***********************************************************************
- *           GetSysColorPen    (Not a Windows API)
+ *		GetSysColorPen (USER32.@) (Not a Windows API)
  *
  * This function is new to the Wine lib -- it does not exist in 
  * Windows. However, it is a natural complement for GetSysColorBrush

windows/sysmetrics.c

@@ -178,7 +178,7 @@ void SYSMETRICS_Init(void)
 
 
 /***********************************************************************
- *           GetSystemMetrics16    (USER.179)
+ *		GetSystemMetrics (USER.179)
  */
 INT16 WINAPI GetSystemMetrics16( INT16 index )
 {
@@ -187,7 +187,7 @@ INT16 WINAPI GetSystemMetrics16( INT16 index )
 
 
 /***********************************************************************
- *           GetSystemMetrics    (USER32.292)
+ *		GetSystemMetrics (USER32.@)
  */
 INT WINAPI GetSystemMetrics( INT index )
 {

windows/sysparams.c

@@ -24,7 +24,7 @@
 DEFAULT_DEBUG_CHANNEL(system);
 
 /***********************************************************************
- *	GetTimerResolution (USER.14)
+ *		GetTimerResolution (USER.14)
  */
 LONG WINAPI GetTimerResolution16(void)
 {
@@ -32,7 +32,7 @@ LONG WINAPI GetTimerResolution16(void)
 }
 
 /***********************************************************************
- *	ControlPanelInfo16   (USER.273)
+ *		ControlPanelInfo (USER.273)
  */
 void WINAPI ControlPanelInfo16( INT16 nInfoType, WORD wData, LPSTR lpBuffer )
 {
@@ -114,7 +114,7 @@ static void SYSPARAMS_NonClientMetrics32ATo32W( const NONCLIENTMETRICSA* lpnm32A
 }
 
 /***********************************************************************
- *	SystemParametersInfoA   (USER32.540)
+ *		SystemParametersInfoA (USER32.@)
  */
 BOOL WINAPI SystemParametersInfoA( UINT uiAction, UINT uiParam,
 				   PVOID pvParam, UINT fWinIni )
@@ -523,7 +523,7 @@ BOOL WINAPI SystemParametersInfoA( UINT uiAction, UINT uiParam,
 
 
 /***********************************************************************
- *	SystemParametersInfo16   (USER.483)
+ *		SystemParametersInfo (USER.483)
  */
 BOOL16 WINAPI SystemParametersInfo16( UINT16 uAction, UINT16 uParam,
                                       LPVOID lpvParam, UINT16 fuWinIni )
@@ -624,7 +624,7 @@ BOOL16 WINAPI SystemParametersInfo16( UINT16 uAction, UINT16 uParam,
 }
 
 /***********************************************************************
- *	SystemParametersInfoW   (USER32.541)
+ *		SystemParametersInfoW (USER32.@)
  */
 BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam,
 				   PVOID pvParam, UINT fuWinIni )

windows/timer.c

@@ -291,7 +291,7 @@ static BOOL TIMER_KillTimer( HWND hwnd, UINT id, BOOL sys )
 
 
 /***********************************************************************
- *           SetTimer16   (USER.10)
+ *		SetTimer (USER.10)
  */
 UINT16 WINAPI SetTimer16( HWND16 hwnd, UINT16 id, UINT16 timeout,
                           TIMERPROC16 proc )
@@ -304,7 +304,7 @@ UINT16 WINAPI SetTimer16( HWND16 hwnd, UINT16 id, UINT16 timeout,
 
 
 /***********************************************************************
- *           SetTimer   (USER32.511)
+ *		SetTimer (USER32.@)
  */
 UINT WINAPI SetTimer( HWND hwnd, UINT id, UINT timeout,
                           TIMERPROC proc )
@@ -341,7 +341,7 @@ BOOL TIMER_IsTimerValid( HWND hwnd, UINT id, HWINDOWPROC hProc )
 
 
 /***********************************************************************
- *           SetSystemTimer16   (USER.11)
+ *		SetSystemTimer (USER.11)
  */
 UINT16 WINAPI SetSystemTimer16( HWND16 hwnd, UINT16 id, UINT16 timeout,
                                 TIMERPROC16 proc )
@@ -354,7 +354,7 @@ UINT16 WINAPI SetSystemTimer16( HWND16 hwnd, UINT16 id, UINT16 timeout,
 
 
 /***********************************************************************
- *           SetSystemTimer   (USER32.509)
+ *		SetSystemTimer (USER32.@)
  */
 UINT WINAPI SetSystemTimer( HWND hwnd, UINT id, UINT timeout,
                                 TIMERPROC proc )
@@ -367,7 +367,7 @@ UINT WINAPI SetSystemTimer( HWND hwnd, UINT id, UINT timeout,
 
 
 /***********************************************************************
- *           KillTimer16   (USER.12)
+ *		KillTimer (USER.12)
  */
 BOOL16 WINAPI KillTimer16( HWND16 hwnd, UINT16 id )
 {
@@ -377,7 +377,7 @@ BOOL16 WINAPI KillTimer16( HWND16 hwnd, UINT16 id )
 
 
 /***********************************************************************
- *           KillTimer   (USER32.354)
+ *		KillTimer (USER32.@)
  */
 BOOL WINAPI KillTimer( HWND hwnd, UINT id )
 {
@@ -387,7 +387,7 @@ BOOL WINAPI KillTimer( HWND hwnd, UINT id )
 
 
 /***********************************************************************
- *           KillSystemTimer16   (USER.182)
+ *		KillSystemTimer (USER.182)
  */
 BOOL16 WINAPI KillSystemTimer16( HWND16 hwnd, UINT16 id )
 {
@@ -397,7 +397,7 @@ BOOL16 WINAPI KillSystemTimer16( HWND16 hwnd, UINT16 id )
 
 
 /***********************************************************************
- *           KillSystemTimer   (USER32.353)
+ *		KillSystemTimer (USER32.@)
  */
 BOOL WINAPI KillSystemTimer( HWND hwnd, UINT id )
 {

windows/winhelp.c

@@ -28,7 +28,7 @@ typedef struct
 } WINHELP,*LPWINHELP;
 
 /**********************************************************************
- *             WinHelp16   (USER.171)
+ *		WinHelp (USER.171)
  */
 BOOL16 WINAPI WinHelp16( HWND16 hWnd, LPCSTR lpHelpFile, UINT16 wCommand,
                          DWORD dwData )
@@ -55,7 +55,7 @@ BOOL16 WINAPI WinHelp16( HWND16 hWnd, LPCSTR lpHelpFile, UINT16 wCommand,
 
 
 /**********************************************************************
- *             WinHelpA   (USER32.579)
+ *		WinHelpA (USER32.@)
  */
 BOOL WINAPI WinHelpA( HWND hWnd, LPCSTR lpHelpFile, UINT wCommand,
                           DWORD dwData )
@@ -141,7 +141,7 @@ BOOL WINAPI WinHelpA( HWND hWnd, LPCSTR lpHelpFile, UINT wCommand,
 
 
 /**********************************************************************
- *             WinHelpW   (USER32.580)
+ *		WinHelpW (USER32.@)
  */
 BOOL WINAPI WinHelpW( HWND hWnd, LPCWSTR helpFile, UINT command,
                           DWORD dwData )

windows/winproc.c

@@ -2491,7 +2491,8 @@ static LRESULT WINAPI WINPROC_CallProc32WTo16( WNDPROC16 func, HWND hwnd,
 
 
 /**********************************************************************
- *	     CallWindowProc16    (USER.122)
+ *		CallWindowProc (USER.122)
+ *		CallWindowProc16 (USER32.@)
  */
 LRESULT WINAPI CallWindowProc16( WNDPROC16 func, HWND16 hwnd, UINT16 msg,
                                  WPARAM16 wParam, LPARAM lParam )
@@ -2528,7 +2529,7 @@ LRESULT WINAPI CallWindowProc16( WNDPROC16 func, HWND16 hwnd, UINT16 msg,
 
 
 /**********************************************************************
- *	     CallWindowProcA    (USER32.18) 
+ *		CallWindowProcA (USER32.@)
  *
  * The CallWindowProc() function invokes the windows procedure _func_,
  * with _hwnd_ as the target window, the message specified by _msg_, and
@@ -2589,7 +2590,7 @@ LRESULT WINAPI CallWindowProcA(
 
 
 /**********************************************************************
- *	     CallWindowProcW    (USER32.19)
+ *		CallWindowProcW (USER32.@)
  */
 LRESULT WINAPI CallWindowProcW( WNDPROC func, HWND hwnd, UINT msg,
                                   WPARAM wParam, LPARAM lParam )

windows/x11drv/clipboard.c

@@ -777,7 +777,7 @@ void X11DRV_CLIPBOARD_ReleaseSelection(Atom selType, Window w, HWND hwnd)
 }
 
 /**************************************************************************
- *		X11DRV_ReleaseClipboard
+ *		X11DRV_ReleaseClipboard (X11DRV.@)
  *  Voluntarily release all currently owned X selections
  */
 void X11DRV_ReleaseClipboard(void)
@@ -829,7 +829,7 @@ void X11DRV_ReleaseClipboard(void)
 }
 
 /**************************************************************************
- *		X11DRV_AcquireClipboard
+ *		X11DRV_AcquireClipboard (X11DRV.@)
  */
 void X11DRV_AcquireClipboard(void)
 {
@@ -879,7 +879,7 @@ void X11DRV_AcquireClipboard(void)
 }
 
 /**************************************************************************
- *		X11DRV_IsClipboardFormatAvailable
+ *		X11DRV_IsClipboardFormatAvailable (X11DRV.@)
  *
  * Checks if the specified format is available in the current selection
  * Only invoked when WINE is not the selection owner
@@ -932,7 +932,7 @@ BOOL X11DRV_IsClipboardFormatAvailable(UINT wFormat)
 }
 
 /**************************************************************************
- *		X11DRV_RegisterClipboardFormat
+ *		X11DRV_RegisterClipboardFormat (X11DRV.@)
  *
  * Registers a custom X clipboard format
  * Returns: TRUE - success,  FALSE - failure
@@ -958,7 +958,7 @@ BOOL X11DRV_RegisterClipboardFormat( LPCSTR FormatName )
 }
 
 /**************************************************************************
- *		X11DRV_IsSelectionOwner
+ *		X11DRV_IsSelectionOwner (X11DRV.@)
  *
  * Returns: TRUE - We(WINE) own the selection, FALSE - Selection not owned by us
  */
@@ -968,7 +968,7 @@ BOOL X11DRV_IsSelectionOwner(void)
 }
 
 /**************************************************************************
- *		X11DRV_SetClipboardData
+ *		X11DRV_SetClipboardData (X11DRV.@)
  *
  * We don't need to do anything special here since the clipboard code
  * maintains the cache. 
@@ -981,7 +981,7 @@ void X11DRV_SetClipboardData(UINT wFormat)
 }
 
 /**************************************************************************
- *		X11DRV_GetClipboardData
+ *		X11DRV_GetClipboardData (X11DRV.@)
  *
  * This method is invoked only when we DO NOT own the X selection
  *
@@ -1060,7 +1060,7 @@ BOOL X11DRV_GetClipboardData(UINT wFormat)
 }
 
 /**************************************************************************
- *		X11DRV_ResetSelectionOwner
+ *		X11DRV_ResetSelectionOwner (X11DRV.@)
  *
  * Called from DestroyWindow() to prevent X selection from being lost when
  * a top level window is destroyed, by switching ownership to another top

windows/x11drv/event.c

@@ -203,7 +203,7 @@ static void CALLBACK EVENT_ProcessAllEvents( ULONG_PTR arg )
 }
 
 /***********************************************************************
- *           X11DRV_Synchronize
+ *		X11DRV_Synchronize (X11DRV.@)
  *
  * Synchronize with the X server. Should not be used too often.
  */
@@ -214,7 +214,7 @@ void X11DRV_Synchronize( void )
 }
 
 /***********************************************************************
- *           X11DRV_UserRepaintDisable
+ *		X11DRV_UserRepaintDisable (X11DRV.@)
  */
 void X11DRV_UserRepaintDisable( BOOL bDisabled )
 {
@@ -866,7 +866,7 @@ static void EVENT_FocusOut( HWND hWnd, XFocusChangeEvent *event )
 }
 
 /**********************************************************************
- *              X11DRV_CheckFocus
+ *		X11DRV_CheckFocus (X11DRV.@)
  */
 BOOL X11DRV_CheckFocus(void)
 {

windows/x11drv/keyboard.c

@@ -904,7 +904,7 @@ X11DRV_KEYBOARD_DetectLayout (void)
 }
 
 /**********************************************************************
- *		X11DRV_InitKeyboard
+ *		X11DRV_InitKeyboard (X11DRV.@)
  */
 void X11DRV_InitKeyboard(void)
 {
@@ -1120,7 +1120,7 @@ void X11DRV_InitKeyboard(void)
 }
 
 /***********************************************************************
- *		X11DRV_VkKeyScan
+ *		X11DRV_VkKeyScan (X11DRV.@)
  */
 WORD X11DRV_VkKeyScan(CHAR cChar)
 {
@@ -1168,7 +1168,7 @@ WORD X11DRV_VkKeyScan(CHAR cChar)
 }
 
 /***********************************************************************
- *		X11DRV_MapVirtualKey
+ *		X11DRV_MapVirtualKey (X11DRV.@)
  */
 UINT16 X11DRV_MapVirtualKey(UINT16 wCode, UINT16 wMapType)
 {
@@ -1252,7 +1252,7 @@ UINT16 X11DRV_MapVirtualKey(UINT16 wCode, UINT16 wMapType)
 }
 
 /***********************************************************************
- *		X11DRV_GetKeyNameText
+ *		X11DRV_GetKeyNameText (X11DRV.@)
  */
 INT16 X11DRV_GetKeyNameText(LONG lParam, LPSTR lpBuffer, INT16 nSize)
 {
@@ -1424,7 +1424,7 @@ static char KEYBOARD_MapDeadKeysym(KeySym keysym)
 }
 
 /***********************************************************************
- *		X11DRV_ToUnicode
+ *		X11DRV_ToUnicode (X11DRV.@)
  *
  * The ToUnicode function translates the specified virtual-key code and keyboard
  * state to the corresponding Windows character or characters.
@@ -1584,7 +1584,7 @@ INT X11DRV_ToUnicode(UINT virtKey, UINT scanCode, LPBYTE lpKeyState,
 }
 
 /***********************************************************************
- *		X11DRV_GetBeepActive
+ *		X11DRV_GetBeepActive (X11DRV.@)
  */
 BOOL X11DRV_GetBeepActive(void)
 {
@@ -1596,7 +1596,7 @@ BOOL X11DRV_GetBeepActive(void)
 }
 
 /***********************************************************************
- *		X11DRV_SetBeepActive
+ *		X11DRV_SetBeepActive (X11DRV.@)
  */
 void X11DRV_SetBeepActive(BOOL bActivate)
 {
@@ -1611,7 +1611,7 @@ void X11DRV_SetBeepActive(BOOL bActivate)
 }
 
 /***********************************************************************
- *		X11DRV_Beep
+ *		X11DRV_Beep (X11DRV.@)
  */
 void X11DRV_Beep(void)
 {
@@ -1619,7 +1619,7 @@ void X11DRV_Beep(void)
 }
 
 /***********************************************************************
- *		X11DRV_GetDIState
+ *		X11DRV_GetDIState (X11DRV.@)
  */
 BOOL X11DRV_GetDIState(DWORD len, LPVOID ptr)
 {
@@ -1644,7 +1644,7 @@ BOOL X11DRV_GetDIState(DWORD len, LPVOID ptr)
 }
 
 /***********************************************************************
- *		X11DRV_GetDIData
+ *		X11DRV_GetDIData (X11DRV.@)
  */
 BOOL X11DRV_GetDIData(
   BYTE *keystate,
@@ -1688,7 +1688,7 @@ BOOL X11DRV_GetDIData(
 }
 
 /***********************************************************************
- *		X11DRV_GetKeyboardConfig
+ *		X11DRV_GetKeyboardConfig (X11DRV.@)
  */
 void X11DRV_GetKeyboardConfig(KEYBOARD_CONFIG *cfg) {
   XKeyboardState   xks;
@@ -1699,9 +1699,9 @@ void X11DRV_GetKeyboardConfig(KEYBOARD_CONFIG *cfg) {
 }
 
 /***********************************************************************
- *		X11DRV_SetKeyboardConfig
+ *		X11DRV_SetKeyboardConfig (X11DRV.@)
  */
-extern void X11DRV_SetKeyboardConfig(KEYBOARD_CONFIG *cfg, DWORD mask) {
+void X11DRV_SetKeyboardConfig(KEYBOARD_CONFIG *cfg, DWORD mask) {
   XKeyboardControl xkc;
   unsigned long X_mask = 0;
   

windows/x11drv/mouse.c

@@ -161,7 +161,7 @@ static BOOL X11DRV_MOUSE_DoSetCursor( CURSORICONINFO *ptr )
 }
 
 /***********************************************************************
- *		X11DRV_SetCursor
+ *		X11DRV_SetCursor (X11DRV.@)
  */
 void X11DRV_SetCursor( CURSORICONINFO *lpCursor )
 {
@@ -199,7 +199,7 @@ void X11DRV_SetCursor( CURSORICONINFO *lpCursor )
 }
 
 /***********************************************************************
- *		X11DRV_MoveCursor
+ *		X11DRV_MoveCursor (X11DRV.@)
  */
 void X11DRV_MoveCursor(WORD wAbsX, WORD wAbsY)
 {
@@ -241,7 +241,7 @@ void X11DRV_MoveCursor(WORD wAbsX, WORD wAbsY)
 }
 
 /***********************************************************************
- *           X11DRV_InitMouse
+ *		X11DRV_InitMouse (X11DRV.@)
  */
 void X11DRV_InitMouse( LPMOUSE_EVENT_PROC proc )
 {
@@ -268,7 +268,7 @@ void X11DRV_InitMouse( LPMOUSE_EVENT_PROC proc )
 
 
 /***********************************************************************
- *           X11DRV_SendEvent
+ *		X11DRV_SendEvent (internal)
  */
 void X11DRV_SendEvent( DWORD mouseStatus, DWORD posX, DWORD posY, 
                              DWORD keyState, DWORD time, HWND hWnd )