Documentation ordinal fixes.

diff --git a/dlls/comctl32/comctl32undoc.c b/dlls/comctl32/comctl32undoc.c
index cc7f2c1..21d7846 100644
--- a/dlls/comctl32/comctl32undoc.c
+++ b/dlls/comctl32/comctl32undoc.c
@@ -2027,7 +2027,7 @@
 
 
 /**************************************************************************
- * StrChrA [COMCTL32.350]
+ * StrChrA [COMCTL32.@]
  *
  */
 
@@ -2039,7 +2039,7 @@
 
 
 /**************************************************************************
- * StrStrIA [COMCTL32.355]
+ * StrStrIA [COMCTL32.@]
  */
 
 LPSTR WINAPI
@@ -2072,7 +2072,7 @@
 
 
 /**************************************************************************
- * StrToIntA [COMCTL32.357] Converts a string to a signed integer.
+ * StrToIntA [COMCTL32.@] Converts a string to a signed integer.
  */
 
 INT WINAPI
@@ -2082,7 +2082,7 @@
 }
 
 /**************************************************************************
- * StrToIntW [COMCTL32.365] Converts a wide char string to a signed integer.
+ * StrToIntW [COMCTL32.@] Converts a wide char string to a signed integer.
  */
 
 INT WINAPI
@@ -2215,7 +2215,7 @@
 }
 
 /**************************************************************************
- * StrCSpnA [COMCTL32.356]
+ * StrCSpnA [COMCTL32.@]
  *
  */
 INT WINAPI COMCTL32_StrCSpnA( LPCSTR lpStr, LPCSTR lpSet) {
@@ -2223,7 +2223,7 @@
 }
 
 /**************************************************************************
- * StrChrW [COMCTL32.358]
+ * StrChrW [COMCTL32.@]
  *
  */
 LPWSTR WINAPI COMCTL32_StrChrW( LPCWSTR lpStart, WORD wMatch) {
@@ -2231,7 +2231,7 @@
 }
 
 /**************************************************************************
- * StrCmpNA [COMCTL32.352]
+ * StrCmpNA [COMCTL32.@]
  *
  */
 INT WINAPI COMCTL32_StrCmpNA( LPCSTR lpStr1, LPCSTR lpStr2, int nChar) {
@@ -2239,7 +2239,7 @@
 }
 
 /**************************************************************************
- * StrCmpNIA [COMCTL32.353]
+ * StrCmpNIA [COMCTL32.@]
  *
  */
 INT WINAPI COMCTL32_StrCmpNIA( LPCSTR lpStr1, LPCSTR lpStr2, int nChar) {
@@ -2247,7 +2247,7 @@
 }
 
 /**************************************************************************
- * StrCmpNW [COMCTL32.360]
+ * StrCmpNW [COMCTL32.@]
  *
  */
 INT WINAPI COMCTL32_StrCmpNW( LPCWSTR lpStr1, LPCWSTR lpStr2, int nChar) {
@@ -2255,7 +2255,7 @@
 }
 
 /**************************************************************************
- * StrCmpNIW [COMCTL32.361]
+ * StrCmpNIW [COMCTL32.@]
  *
  */
 INT WINAPI COMCTL32_StrCmpNIW( LPCWSTR lpStr1, LPCWSTR lpStr2, int nChar) {
@@ -2264,7 +2264,7 @@
 }
 
 /**************************************************************************
- * StrRChrA [COMCTL32.351]
+ * StrRChrA [COMCTL32.@]
  *
  */
 LPSTR WINAPI COMCTL32_StrRChrA( LPCSTR lpStart, LPCSTR lpEnd, WORD wMatch )
@@ -2287,7 +2287,7 @@
 
 
 /**************************************************************************
- * StrRChrW [COMCTL32.359]
+ * StrRChrW [COMCTL32.@]
  *
  */
 LPWSTR WINAPI COMCTL32_StrRChrW( LPCWSTR lpStart, LPCWSTR lpEnd, WORD wMatch)
@@ -2305,7 +2305,7 @@
 
 
 /**************************************************************************
- * StrStrA [COMCTL32.354]
+ * StrStrA [COMCTL32.@]
  *
  */
 LPSTR WINAPI COMCTL32_StrStrA( LPCSTR lpFirst, LPCSTR lpSrch) {
@@ -2313,7 +2313,7 @@
 }
 
 /**************************************************************************
- * StrStrW [COMCTL32.362]
+ * StrStrW [COMCTL32.@]
  *
  */
 LPWSTR WINAPI COMCTL32_StrStrW( LPCWSTR lpFirst, LPCWSTR lpSrch) {
@@ -2321,7 +2321,7 @@
 }
 
 /**************************************************************************
- * StrSpnW [COMCTL32.364]
+ * StrSpnW [COMCTL32.@]
  *
  */
 INT WINAPI COMCTL32_StrSpnW( LPWSTR lpStr, LPWSTR lpSet) {
diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c
index 2978a80..31be5e5 100644
--- a/dlls/comctl32/commctrl.c
+++ b/dlls/comctl32/commctrl.c
@@ -862,7 +862,7 @@
 
 
 /***********************************************************************
- * DllGetVersion [COMCTL32.25]
+ * DllGetVersion [COMCTL32.@]
  *
  * Retrieves version information of the 'COMCTL32.DLL'
  *
@@ -898,7 +898,7 @@
 }
 
 /***********************************************************************
- *		DllInstall (COMCTL32.26)
+ *		DllInstall (COMCTL32.@)
  */
 HRESULT WINAPI COMCTL32_DllInstall(BOOL bInstall, LPCWSTR cmdline)
 {
diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c
index 8796c74..d9e76ac 100644
--- a/dlls/ddraw/main.c
+++ b/dlls/ddraw/main.c
@@ -166,7 +166,7 @@
 }
 
 /***********************************************************************
- *		DirectDrawCreate
+ *		DirectDrawCreate (DDRAW.@)
  */
 
 const ddraw_driver* DDRAW_FindDriver(const GUID* pGUID)
@@ -244,7 +244,7 @@
 }
 
 /***********************************************************************
- *		DirectDrawCreate
+ *		DirectDrawCreate (DDRAW.@)
  *
  * Only creates legacy IDirectDraw interfaces.
  * Cannot create IDirectDraw7 interfaces.
@@ -257,7 +257,7 @@
 }
 
 /***********************************************************************
- *		DirectDrawCreateEx
+ *		DirectDrawCreateEx (DDRAW.@)
  *
  * Only creates new IDirectDraw7 interfaces.
  * Supposed to fail if legacy interfaces are requested.
diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c
index 09608c2..908771d 100644
--- a/dlls/dinput/dinput_main.c
+++ b/dlls/dinput/dinput_main.c
@@ -62,7 +62,7 @@
 }
 
 /******************************************************************************
- *	DirectInputCreateEx
+ *	DirectInputCreateEx (DINPUT.@)
  */
 HRESULT WINAPI DirectInputCreateEx(
 	HINSTANCE hinst, DWORD dwVersion, REFIID riid, LPVOID *ppDI,
@@ -95,7 +95,7 @@
 }
 
 /******************************************************************************
- *	DirectInputCreateA
+ *	DirectInputCreateA (DINPUT.@)
  */
 HRESULT WINAPI DirectInputCreateA(HINSTANCE hinst, DWORD dwVersion, LPDIRECTINPUTA *ppDI, LPUNKNOWN punkOuter)
 {
diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c
index 7548c52..b741819 100644
--- a/dlls/dplayx/dplay.c
+++ b/dlls/dplayx/dplay.c
@@ -5146,7 +5146,8 @@
 }
 
 /***************************************************************************
- *  DirectPlayEnumerateA [DPLAYX.2][DPLAYX.9][DPLAY.2] 
+ *  DirectPlayEnumerate  [DPLAYX.9]
+ *  DirectPlayEnumerateA [DPLAYX.2]
  *
  *  The pointer to the structure lpContext will be filled with the 
  *  appropriate data for each service offered by the OS. These services are
@@ -5324,7 +5325,8 @@
 
 
 /***************************************************************************
- *  DirectPlayCreate [DPLAYX.1][DPLAY.1]
+ *  DirectPlayCreate [DPLAYX.1]
+ *  DirectPlayCreate [DPLAY.1]
  *
  */
 HRESULT WINAPI DirectPlayCreate
diff --git a/dlls/dplayx/dplayx_main.c b/dlls/dplayx/dplayx_main.c
index 5543b16..cf2a708 100644
--- a/dlls/dplayx/dplayx_main.c
+++ b/dlls/dplayx/dplayx_main.c
@@ -43,7 +43,7 @@
 }
 
 /***********************************************************************
- *              DllCanUnloadNow (DPLAYX.10)
+ *              DllCanUnloadNow (DPLAYX.@)
  */
 HRESULT WINAPI DPLAYX_DllCanUnloadNow(void)
 {
diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c
index b84aef7..cb937b8 100644
--- a/dlls/dsound/dsound_main.c
+++ b/dlls/dsound/dsound_main.c
@@ -3232,7 +3232,7 @@
 }
 
 /*******************************************************************************
- *		DirectSoundCreate
+ *		DirectSoundCreate (DSOUND.1)
  */
 HRESULT WINAPI DirectSoundCreate(REFGUID lpGUID,LPDIRECTSOUND *ppDS,IUnknown *pUnkOuter )
 {
@@ -3853,7 +3853,7 @@
 static IClassFactoryImpl DSOUND_CF = {&DSCF_Vtbl, 1 };
 
 /*******************************************************************************
- * DllGetClassObject [DSOUND.4]
+ * DllGetClassObject [DSOUND.@]
  * Retrieves class object from a DLL object
  *
  * NOTES
@@ -3884,7 +3884,7 @@
 
 
 /*******************************************************************************
- * DllCanUnloadNow [DSOUND.3]  Determines whether the DLL is in use.
+ * DllCanUnloadNow [DSOUND.@]  Determines whether the DLL is in use.
  *
  * RETURNS
  *    Success: S_OK
diff --git a/dlls/icmp/icmp_main.c b/dlls/icmp/icmp_main.c
index a92247b..f8e707f 100644
--- a/dlls/icmp/icmp_main.c
+++ b/dlls/icmp/icmp_main.c
@@ -161,7 +161,7 @@
  */
 
 /***********************************************************************
- *		IcmpCreateFile
+ *		IcmpCreateFile (ICMP.@)
  */
 HANDLE WINAPI IcmpCreateFile(VOID)
 {
@@ -186,7 +186,7 @@
 
 
 /***********************************************************************
- *		IcmpCloseHandle
+ *		IcmpCloseHandle (ICMP.@)
  */
 BOOL WINAPI IcmpCloseHandle(HANDLE  IcmpHandle)
 {
@@ -204,7 +204,7 @@
 
 
 /***********************************************************************
- *		IcmpSendEcho
+ *		IcmpSendEcho (ICMP.@)
  */
 DWORD WINAPI IcmpSendEcho(
     HANDLE                   IcmpHandle,
diff --git a/dlls/kernel/sync.c b/dlls/kernel/sync.c
index 8bf578e..741789c 100644
--- a/dlls/kernel/sync.c
+++ b/dlls/kernel/sync.c
@@ -227,7 +227,7 @@
 }
 
 /***********************************************************************
- *       VWin32_EventSet	(KERNEL.479)
+ *       VWin32_EventSet	(KERNEL.451)
  */
 VOID WINAPI VWin32_EventSet(HANDLE event)
 {
diff --git a/dlls/kernel/thunk.c b/dlls/kernel/thunk.c
index 02b363f..12f4ecb 100644
--- a/dlls/kernel/thunk.c
+++ b/dlls/kernel/thunk.c
@@ -1037,7 +1037,7 @@
 }
 
 /**********************************************************************
- * 		IsPeFormat		(KERNEL.431)
+ * 		IsPeFormat		(KERNEL.2)
  * Checks the passed filename if it is a PE format executeable
  * RETURNS
  *  TRUE, if it is.
diff --git a/dlls/lzexpand/lzexpand_main.c b/dlls/lzexpand/lzexpand_main.c
index bbfd2cb..194fd4c 100644
--- a/dlls/lzexpand/lzexpand_main.c
+++ b/dlls/lzexpand/lzexpand_main.c
@@ -136,7 +136,7 @@
 
 
 /***********************************************************************
- *           LZStart   (LZ32.6)
+ *           LZStart   (LZ32.@)
  */
 INT WINAPI LZStart(void)
 {
@@ -158,7 +158,7 @@
 
 
 /***********************************************************************
- *           LZInit   (LZ32.2)
+ *           LZInit   (LZ32.@)
  *
  * initializes internal decompression buffers, returns lzfiledescriptor.
  * (return value the same as hfSrc, if hfSrc is not compressed)
@@ -211,7 +211,8 @@
 
 
 /***********************************************************************
- *           LZDone   (LZEXPAND.9) (LZ32.8)
+ *           LZDone   (LZEXPAND.9)
+ *           LZDone   (LZ32.@)
  */
 void WINAPI LZDone(void)
 {
@@ -229,7 +230,7 @@
 
 
 /***********************************************************************
- *           GetExpandedNameA   (LZ32.9)
+ *           GetExpandedNameA   (LZ32.@)
  *
  * gets the full filename of the compressed file 'in' by opening it
  * and reading the header
@@ -307,7 +308,7 @@
 
 
 /***********************************************************************
- *           GetExpandedNameW   (LZ32.11)
+ *           GetExpandedNameW   (LZ32.@)
  */
 INT WINAPI GetExpandedNameW( LPCWSTR in, LPWSTR out )
 {
@@ -335,7 +336,7 @@
 
 
 /***********************************************************************
- *           LZRead   (LZ32.4)
+ *           LZRead   (LZ32.@)
  */
 INT WINAPI LZRead( HFILE fd, LPVOID vbuf, UINT toread )
 {
@@ -436,7 +437,7 @@
 
 
 /***********************************************************************
- *           LZSeek   (LZ32.3)
+ *           LZSeek   (LZ32.@)
  */
 LONG WINAPI LZSeek( HFILE fd, LONG off, INT type )
 {
@@ -491,7 +492,7 @@
 
 
 /***********************************************************************
- *           LZCopy   (LZ32.0)
+ *           LZCopy   (LZ32.@)
  *
  * Copies everything from src to dest
  * if src is a LZ compressed file, it will be uncompressed.
@@ -579,7 +580,7 @@
 
 
 /***********************************************************************
- *           LZOpenFileA   (LZ32.1)
+ *           LZOpenFileA   (LZ32.@)
  *
  * Opens a file. If not compressed, open it as a normal file.
  */
@@ -607,7 +608,7 @@
 
 
 /***********************************************************************
- *           LZOpenFileW   (LZ32.10)
+ *           LZOpenFileW   (LZ32.@)
  */
 HFILE WINAPI LZOpenFileW( LPCWSTR fn, LPOFSTRUCT ofs, UINT mode )
 {
@@ -632,7 +633,7 @@
 
 
 /***********************************************************************
- *           LZClose   (LZ32.5)
+ *           LZClose   (LZ32.@)
  */
 void WINAPI LZClose( HFILE fd )
 {
@@ -660,7 +661,7 @@
 
 
 /***********************************************************************
- *           CopyLZFile  (LZ32.7)
+ *           CopyLZFile  (LZ32.@)
  *
  * Copy src to dest (including uncompressing src).
  * NOTE: Yes. This is exactly the same function as LZCopy.
diff --git a/dlls/mpr/auth.c b/dlls/mpr/auth.c
index 54f5b12..e9ff074 100644
--- a/dlls/mpr/auth.c
+++ b/dlls/mpr/auth.c
@@ -10,7 +10,7 @@
 
 
 /*****************************************************************
- *  WNetLogoffA [MPR.89]
+ *  WNetLogoffA [MPR.@]
  */
 DWORD WINAPI WNetLogoffA( LPCSTR lpProvider, HWND hwndOwner )
 {
@@ -21,7 +21,7 @@
 }
 
 /*****************************************************************
- *  WNetLogoffW [MPR.90]
+ *  WNetLogoffW [MPR.@]
  */
 DWORD WINAPI WNetLogoffW( LPCWSTR lpProvider, HWND hwndOwner )
 {
@@ -32,7 +32,7 @@
 }
 
 /*****************************************************************
- *  WNetLogonA [MPR.91]
+ *  WNetLogonA [MPR.@]
  */
 DWORD WINAPI WNetLogonA( LPCSTR lpProvider, HWND hwndOwner )
 {
@@ -43,7 +43,7 @@
 }
 
 /*****************************************************************
- *  WNetLogonW [MPR.91]
+ *  WNetLogonW [MPR.@]
  */
 DWORD WINAPI WNetLogonW( LPCWSTR lpProvider, HWND hwndOwner )
 {
@@ -54,7 +54,7 @@
 }
 
 /*****************************************************************
- *  WNetVerifyPasswordA [MPR.91]
+ *  WNetVerifyPasswordA [MPR.@]
  */
 DWORD WINAPI WNetVerifyPasswordA( LPCSTR lpszPassword, BOOL *pfMatch )
 {
@@ -65,7 +65,7 @@
 }
 
 /*****************************************************************
- *  WNetVerifyPasswordW [MPR.91]
+ *  WNetVerifyPasswordW [MPR.@]
  */
 DWORD WINAPI WNetVerifyPasswordW( LPCWSTR lpszPassword, BOOL *pfMatch )
 {
diff --git a/dlls/mpr/multinet.c b/dlls/mpr/multinet.c
index 95f2869..05e6c01 100644
--- a/dlls/mpr/multinet.c
+++ b/dlls/mpr/multinet.c
@@ -10,7 +10,7 @@
 
 
 /*****************************************************************
- *     MultinetGetConnectionPerformanceA [MPR.25]
+ *     MultinetGetConnectionPerformanceA [MPR.@]
  *
  * RETURNS
  *    Success: NO_ERROR
@@ -30,7 +30,7 @@
 }
 
 /*****************************************************************
- *     MultinetGetConnectionPerformanceW [MPR.26]
+ *     MultinetGetConnectionPerformanceW [MPR.@]
  */
 DWORD WINAPI MultinetGetConnectionPerformanceW(
 	LPNETRESOURCEW lpNetResource,
@@ -43,7 +43,7 @@
 }
 
 /*****************************************************************
- *  MultinetGetErrorTextA [MPR.27]
+ *  MultinetGetErrorTextA [MPR.@]
  */
 DWORD WINAPI MultinetGetErrorTextA( DWORD x, DWORD y, DWORD z )
 {
@@ -52,7 +52,7 @@
 }
 
 /*****************************************************************
- *  MultinetGetErrorTextW [MPR.28]
+ *  MultinetGetErrorTextW [MPR.@]
  */
 DWORD WINAPI MultinetGetErrorTextW( DWORD x, DWORD y, DWORD z )
 {
diff --git a/dlls/mpr/nps.c b/dlls/mpr/nps.c
index eb56611..0623455 100644
--- a/dlls/mpr/nps.c
+++ b/dlls/mpr/nps.c
@@ -11,7 +11,7 @@
 
 
 /*****************************************************************
- *  NPSAuthenticationDialogA [MPR.30]
+ *  NPSAuthenticationDialogA [MPR.@]
  */
 DWORD WINAPI NPSAuthenticationDialogA( LPAUTHDLGSTRUCTA lpAuthDlgStruct )
 {
@@ -20,7 +20,7 @@
 }
 
 /*****************************************************************
- *  NPSGetProviderHandleA [MPR.34]
+ *  NPSGetProviderHandleA [MPR.@]
  */
 DWORD WINAPI NPSGetProviderHandleA( PHPROVIDER phProvider )
 {
@@ -29,7 +29,7 @@
 }
 
 /*****************************************************************
- *  NPSGetProviderNameA [MPR.35]
+ *  NPSGetProviderNameA [MPR.@]
  */
 DWORD WINAPI NPSGetProviderNameA( HPROVIDER hProvider, LPCSTR *lpszProviderName )
 {
@@ -38,7 +38,7 @@
 }
 
 /*****************************************************************
- *  NPSGetSectionNameA [MPR.36]
+ *  NPSGetSectionNameA [MPR.@]
  */
 DWORD WINAPI NPSGetSectionNameA( HPROVIDER hProvider, LPCSTR *lpszSectionName )
 {
@@ -47,7 +47,7 @@
 }
 
 /*****************************************************************
- *  NPSSetExtendedErrorA [MPR.40]
+ *  NPSSetExtendedErrorA [MPR.@]
  */
 DWORD WINAPI NPSSetExtendedErrorA( DWORD NetSpecificError, LPSTR lpExtendedErrorText )
 {
@@ -56,7 +56,7 @@
 }
 
 /*****************************************************************
- *  NPSSetCustomTextA [MPR.39]
+ *  NPSSetCustomTextA [MPR.@]
  */
 VOID WINAPI NPSSetCustomTextA( LPSTR lpCustomErrorText )
 {
@@ -64,7 +64,7 @@
 }
 
 /*****************************************************************
- *  NPSCopyStringA [MPR.31]
+ *  NPSCopyStringA [MPR.@]
  */
 DWORD WINAPI NPSCopyStringA( LPCSTR lpString, LPVOID lpBuffer, LPDWORD lpdwBufferSize )
 {
@@ -73,7 +73,7 @@
 }
 
 /*****************************************************************
- *  NPSDeviceGetNumberA [MPR.32]
+ *  NPSDeviceGetNumberA [MPR.@]
  */
 DWORD WINAPI NPSDeviceGetNumberA( LPSTR lpLocalName, LPDWORD lpdwNumber, LPDWORD lpdwType )
 {
@@ -82,7 +82,7 @@
 }
 
 /*****************************************************************
- *  NPSDeviceGetStringA [MPR.33]
+ *  NPSDeviceGetStringA [MPR.@]
  */
 DWORD WINAPI NPSDeviceGetStringA( DWORD dwNumber, DWORD dwType, LPSTR lpLocalName, LPDWORD lpdwBufferSize )
 {
@@ -91,7 +91,7 @@
 }
 
 /*****************************************************************
- *  NPSNotifyRegisterA [MPR.38]
+ *  NPSNotifyRegisterA [MPR.@]
  */
 DWORD WINAPI NPSNotifyRegisterA( enum NOTIFYTYPE NotifyType, NOTIFYCALLBACK pfNotifyCallBack )
 {
@@ -100,7 +100,7 @@
 }
 
 /*****************************************************************
- *  NPSNotifyGetContextA [MPR.37]
+ *  NPSNotifyGetContextA [MPR.@]
  */
 LPVOID WINAPI NPSNotifyGetContextA( NOTIFYCALLBACK pfNotifyCallBack )
 {
diff --git a/dlls/mpr/pwcache.c b/dlls/mpr/pwcache.c
index 30c674e..0bf8ea1 100644
--- a/dlls/mpr/pwcache.c
+++ b/dlls/mpr/pwcache.c
@@ -9,7 +9,7 @@
 DEFAULT_DEBUG_CHANNEL(mpr);
 
 /**************************************************************************
- * WNetCachePassword [MPR.52]  Saves password in cache
+ * WNetCachePassword [MPR.@]  Saves password in cache
  *
  * NOTES
  *	only the parameter count is verifyed  
@@ -38,7 +38,7 @@
 }
 
 /*****************************************************************
- *  WNetRemoveCachedPassword [MPR.95]
+ *  WNetRemoveCachedPassword [MPR.@]
  */
 UINT WINAPI WNetRemoveCachedPassword( LPSTR pbResource, WORD cbResource, 
                                       BYTE nType )
@@ -50,7 +50,7 @@
 }
 
 /*****************************************************************
- * WNetGetCachedPassword [MPR.69]  Retrieves password from cache
+ * WNetGetCachedPassword [MPR.@]  Retrieves password from cache
  *
  * NOTES
  *  the stub seems to be wrong:
@@ -82,7 +82,7 @@
 }
 
 /*******************************************************************
- * WNetEnumCachedPasswords [MPR.61]
+ * WNetEnumCachedPasswords [MPR.@]
  *
  * NOTES
  *	the parameter count is verifyed  
diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c
index ccc5612..0297c08 100644
--- a/dlls/mpr/wnet.c
+++ b/dlls/mpr/wnet.c
@@ -21,7 +21,7 @@
  */
 
 /*********************************************************************
- * WNetOpenEnumA [MPR.92]
+ * WNetOpenEnumA [MPR.@]
  */
 DWORD WINAPI WNetOpenEnumA( DWORD dwScope, DWORD dwType, DWORD dwUsage,
                             LPNETRESOURCEA lpNet, LPHANDLE lphEnum )
@@ -34,7 +34,7 @@
 }
 
 /*********************************************************************
- * WNetOpenEnumW [MPR.93]
+ * WNetOpenEnumW [MPR.@]
  */
 DWORD WINAPI WNetOpenEnumW( DWORD dwScope, DWORD dwType, DWORD dwUsage,
                             LPNETRESOURCEW lpNet, LPHANDLE lphEnum )
@@ -47,7 +47,7 @@
 }
 
 /*********************************************************************
- * WNetEnumResourceA [MPR.66]
+ * WNetEnumResourceA [MPR.@]
  */
 DWORD WINAPI WNetEnumResourceA( HANDLE hEnum, LPDWORD lpcCount, 
                                 LPVOID lpBuffer, LPDWORD lpBufferSize )
@@ -60,7 +60,7 @@
 }
 
 /*********************************************************************
- * WNetEnumResourceW [MPR.67]
+ * WNetEnumResourceW [MPR.@]
  */
 DWORD WINAPI WNetEnumResourceW( HANDLE hEnum, LPDWORD lpcCount, 
                                 LPVOID lpBuffer, LPDWORD lpBufferSize )
@@ -73,7 +73,7 @@
 }
 
 /*********************************************************************
- * WNetCloseEnum [MPR.58]
+ * WNetCloseEnum [MPR.@]
  */
 DWORD WINAPI WNetCloseEnum( HANDLE hEnum )
 {
@@ -84,7 +84,7 @@
 }
 
 /*********************************************************************
- * WNetGetResourceInformationA [MPR.80]
+ * WNetGetResourceInformationA [MPR.@]
  */
 DWORD WINAPI WNetGetResourceInformationA( LPNETRESOURCEA lpNetResource, 
                                           LPVOID lpBuffer, LPDWORD cbBuffer, 
@@ -98,7 +98,7 @@
 }
 
 /*********************************************************************
- * WNetGetResourceInformationW [MPR.80]
+ * WNetGetResourceInformationW [MPR.@]
  */
 DWORD WINAPI WNetGetResourceInformationW( LPNETRESOURCEW lpNetResource, 
                                           LPVOID lpBuffer, LPDWORD cbBuffer, 
@@ -112,7 +112,7 @@
 }
 
 /*********************************************************************
- * WNetGetResourceParentA [MPR.83]
+ * WNetGetResourceParentA [MPR.@]
  */
 DWORD WINAPI WNetGetResourceParentA( LPNETRESOURCEA lpNetResource,
                                      LPVOID lpBuffer, LPDWORD lpBufferSize )
@@ -125,7 +125,7 @@
 }
 
 /*********************************************************************
- * WNetGetResourceParentW [MPR.84]
+ * WNetGetResourceParentW [MPR.@]
  */
 DWORD WINAPI WNetGetResourceParentW( LPNETRESOURCEW lpNetResource,
                                      LPVOID lpBuffer, LPDWORD lpBufferSize )
@@ -144,7 +144,7 @@
  */
 
 /*********************************************************************
- *  WNetAddConnectionA [MPR.50] 
+ *  WNetAddConnectionA [MPR.@]
  */
 DWORD WINAPI WNetAddConnectionA( LPCSTR lpRemoteName, LPCSTR lpPassword,
                                  LPCSTR lpLocalName )
@@ -157,7 +157,7 @@
 }
 
 /*********************************************************************
- *  WNetAddConnectionW [MPR.51] 
+ *  WNetAddConnectionW [MPR.@]
  */
 DWORD WINAPI WNetAddConnectionW( LPCWSTR lpRemoteName, LPCWSTR lpPassword,
                                  LPCWSTR lpLocalName )
@@ -170,7 +170,7 @@
 }
 
 /*********************************************************************
- *  WNetAddConnection2A [MPR.46] 
+ *  WNetAddConnection2A [MPR.@]
  */
 DWORD WINAPI WNetAddConnection2A( LPNETRESOURCEA lpNetResource,
                                   LPCSTR lpPassword, LPCSTR lpUserID, 
@@ -184,7 +184,7 @@
 }
 
 /*********************************************************************
- * WNetAddConnection2W [MPR.47]
+ * WNetAddConnection2W [MPR.@]
  */
 DWORD WINAPI WNetAddConnection2W( LPNETRESOURCEW lpNetResource,
                                   LPCWSTR lpPassword, LPCWSTR lpUserID, 
@@ -198,7 +198,7 @@
 }
 
 /*********************************************************************
- * WNetAddConnection3A [MPR.48]
+ * WNetAddConnection3A [MPR.@]
  */
 DWORD WINAPI WNetAddConnection3A( HWND hwndOwner, LPNETRESOURCEA lpNetResource,
                                   LPCSTR lpPassword, LPCSTR lpUserID, 
@@ -212,7 +212,7 @@
 }
 
 /*********************************************************************
- * WNetAddConnection3W [MPR.49]
+ * WNetAddConnection3W [MPR.@]
  */
 DWORD WINAPI WNetAddConnection3W( HWND hwndOwner, LPNETRESOURCEW lpNetResource,
                                   LPCWSTR lpPassword, LPCWSTR lpUserID, 
@@ -226,7 +226,7 @@
 } 
 
 /*****************************************************************
- *  WNetUseConnectionA [MPR.100]
+ *  WNetUseConnectionA [MPR.@]
  */
 DWORD WINAPI WNetUseConnectionA( HWND hwndOwner, LPNETRESOURCEA lpNetResource,
                                  LPCSTR lpPassword, LPCSTR lpUserID, DWORD dwFlags,
@@ -242,7 +242,7 @@
 }
 
 /*****************************************************************
- *  WNetUseConnectionW [MPR.101]
+ *  WNetUseConnectionW [MPR.@]
  */
 DWORD WINAPI WNetUseConnectionW( HWND hwndOwner, LPNETRESOURCEW lpNetResource,
                                  LPCWSTR lpPassword, LPCWSTR lpUserID, DWORD dwFlags,
@@ -258,7 +258,7 @@
 }
 
 /*********************************************************************
- *  WNetCancelConnectionA [MPR.55]
+ *  WNetCancelConnectionA [MPR.@]
  */
 DWORD WINAPI WNetCancelConnectionA( LPCSTR lpName, BOOL fForce )
 {
@@ -268,7 +268,7 @@
 }
 
 /*********************************************************************
- *  WNetCancelConnectionW [MPR.56]
+ *  WNetCancelConnectionW [MPR.@]
  */
 DWORD WINAPI WNetCancelConnectionW( LPCWSTR lpName, BOOL fForce ) 
 {
@@ -278,7 +278,7 @@
 }
 
 /*********************************************************************
- *  WNetCancelConnection2A [MPR.53]
+ *  WNetCancelConnection2A [MPR.@]
  */
 DWORD WINAPI WNetCancelConnection2A( LPCSTR lpName, DWORD dwFlags, BOOL fForce ) 
 {
@@ -288,7 +288,7 @@
 }
 
 /*********************************************************************
- *  WNetCancelConnection2W [MPR.54]
+ *  WNetCancelConnection2W [MPR.@]
  */
 DWORD WINAPI WNetCancelConnection2W( LPCWSTR lpName, DWORD dwFlags, BOOL fForce ) 
 {
@@ -298,7 +298,7 @@
 }
 
 /*****************************************************************
- *  WNetRestoreConnectionA [MPR.96]
+ *  WNetRestoreConnectionA [MPR.@]
  */
 DWORD WINAPI WNetRestoreConnectionA( HWND hwndOwner, LPSTR lpszDevice )
 {
@@ -309,7 +309,7 @@
 }
 
 /*****************************************************************
- *  WNetRestoreConnectionW [MPR.97]
+ *  WNetRestoreConnectionW [MPR.@]
  */
 DWORD WINAPI WNetRestoreConnectionW( HWND hwndOwner, LPWSTR lpszDevice )
 {
@@ -320,7 +320,7 @@
 }
 
 /**************************************************************************
- * WNetGetConnectionA [MPR.71]
+ * WNetGetConnectionA [MPR.@]
  *
  * RETURNS
  * - WN_BAD_LOCALNAME     lpLocalName makes no sense
@@ -363,7 +363,7 @@
 }
 
 /**************************************************************************
- * WNetGetConnectionW [MPR.72]
+ * WNetGetConnectionW [MPR.@]
  */
 DWORD WINAPI WNetGetConnectionW( LPCWSTR lpLocalName, 
                                  LPWSTR lpRemoteName, LPDWORD lpBufferSize )
@@ -387,7 +387,7 @@
 }
 
 /**************************************************************************
- * WNetSetConnectionA [MPR.72]
+ * WNetSetConnectionA [MPR.@]
  */
 DWORD WINAPI WNetSetConnectionA( LPCSTR lpName, DWORD dwProperty, 
                                  LPVOID pvValue )
@@ -399,7 +399,7 @@
 }
 
 /**************************************************************************
- * WNetSetConnectionW [MPR.72]
+ * WNetSetConnectionW [MPR.@]
  */
 DWORD WINAPI WNetSetConnectionW( LPCWSTR lpName, DWORD dwProperty, 
                                  LPVOID pvValue )
@@ -411,7 +411,7 @@
 }
 
 /*****************************************************************
- * WNetGetUniversalNameA [MPR.85]
+ * WNetGetUniversalNameA [MPR.@]
  */
 DWORD WINAPI WNetGetUniversalNameA ( LPCSTR lpLocalPath, DWORD dwInfoLevel, 
                                      LPVOID lpBuffer, LPDWORD lpBufferSize )
@@ -424,7 +424,7 @@
 }
 
 /*****************************************************************
- * WNetGetUniversalNameW [MPR.86]
+ * WNetGetUniversalNameW [MPR.@]
  */
 DWORD WINAPI WNetGetUniversalNameW ( LPCWSTR lpLocalPath, DWORD dwInfoLevel, 
                                      LPVOID lpBuffer, LPDWORD lpBufferSize )
@@ -443,7 +443,7 @@
  */
 
 /**************************************************************************
- * WNetGetUserA [MPR.86]
+ * WNetGetUserA [MPR.@]
  *
  * FIXME: we should not return ourselves, but the owner of the drive lpName
  */
@@ -475,7 +475,7 @@
 }
 
 /*****************************************************************
- * WNetGetUserW [MPR.87]
+ * WNetGetUserW [MPR.@]
  */
 DWORD WINAPI WNetGetUserW( LPCWSTR lpName, LPWSTR lpUserID, LPDWORD lpBufferSize ) 
 {
@@ -487,7 +487,7 @@
 }
 
 /*********************************************************************
- * WNetConnectionDialog [MPR.61]
+ * WNetConnectionDialog [MPR.@]
  */ 
 DWORD WINAPI WNetConnectionDialog( HWND hwnd, DWORD dwType )
 { 
@@ -498,7 +498,7 @@
 }
 
 /*********************************************************************
- * WNetConnectionDialog1A [MPR.59]
+ * WNetConnectionDialog1A [MPR.@]
  */
 DWORD WINAPI WNetConnectionDialog1A( LPCONNECTDLGSTRUCTA lpConnDlgStruct )
 { 
@@ -509,7 +509,7 @@
 }
 
 /*********************************************************************
- * WNetConnectionDialog1W [MPR.60]
+ * WNetConnectionDialog1W [MPR.@]
  */ 
 DWORD WINAPI WNetConnectionDialog1W( LPCONNECTDLGSTRUCTW lpConnDlgStruct )
 { 
@@ -520,7 +520,7 @@
 }
 
 /*********************************************************************
- * WNetDisconnectDialog [MPR.64]
+ * WNetDisconnectDialog [MPR.@]
  */ 
 DWORD WINAPI WNetDisconnectDialog( HWND hwnd, DWORD dwType )
 { 
@@ -531,7 +531,7 @@
 }
 
 /*********************************************************************
- * WNetDisconnectDialog1A [MPR.62]
+ * WNetDisconnectDialog1A [MPR.@]
  */ 
 DWORD WINAPI WNetDisconnectDialog1A( LPDISCDLGSTRUCTA lpConnDlgStruct )
 { 
@@ -542,7 +542,7 @@
 }
 
 /*********************************************************************
- * WNetDisconnectDialog1W [MPR.63]
+ * WNetDisconnectDialog1W [MPR.@]
  */ 
 DWORD WINAPI WNetDisconnectDialog1W( LPDISCDLGSTRUCTW lpConnDlgStruct )
 { 
@@ -553,7 +553,7 @@
 }
 
 /*********************************************************************
- * WNetGetLastErrorA [MPR.75]
+ * WNetGetLastErrorA [MPR.@]
  */ 
 DWORD WINAPI WNetGetLastErrorA( LPDWORD lpError,
                                 LPSTR lpErrorBuf, DWORD nErrorBufSize,
@@ -567,7 +567,7 @@
 }
 
 /*********************************************************************
- * WNetGetLastErrorW [MPR.76]
+ * WNetGetLastErrorW [MPR.@]
  */ 
 DWORD WINAPI WNetGetLastErrorW( LPDWORD lpError,
                                 LPWSTR lpErrorBuf, DWORD nErrorBufSize,
@@ -581,7 +581,7 @@
 }
 
 /*********************************************************************
- * WNetGetNetworkInformationA [MPR.77]
+ * WNetGetNetworkInformationA [MPR.@]
  */ 
 DWORD WINAPI WNetGetNetworkInformationA( LPCSTR lpProvider, 
                                          LPNETINFOSTRUCT lpNetInfoStruct )
@@ -593,7 +593,7 @@
 }
 
 /*********************************************************************
- * WNetGetNetworkInformationW [MPR.77]
+ * WNetGetNetworkInformationW [MPR.@]
  */ 
 DWORD WINAPI WNetGetNetworkInformationW( LPCWSTR lpProvider, 
                                          LPNETINFOSTRUCT lpNetInfoStruct )
@@ -605,7 +605,7 @@
 }
 
 /*****************************************************************
- *  WNetGetProviderNameA [MPR.79]
+ *  WNetGetProviderNameA [MPR.@]
  */
 DWORD WINAPI WNetGetProviderNameA( DWORD dwNetType, 
                                    LPSTR lpProvider, LPDWORD lpBufferSize )
@@ -617,7 +617,7 @@
 }
 
 /*****************************************************************
- *  WNetGetProviderNameW [MPR.80]
+ *  WNetGetProviderNameW [MPR.@]
  */
 DWORD WINAPI WNetGetProviderNameW( DWORD dwNetType,
                                    LPWSTR lpProvider, LPDWORD lpBufferSize ) 
diff --git a/dlls/msacm/msacm_main.c b/dlls/msacm/msacm_main.c
index dc4fb60..eaa0dae 100644
--- a/dlls/msacm/msacm_main.c
+++ b/dlls/msacm/msacm_main.c
@@ -15,7 +15,7 @@
 DEFAULT_DEBUG_CHANNEL(msacm);
 
 /**************************************************************************
- *		DllEntryPoint (MSACM.255)
+ *		DllEntryPoint (MSACM.2046)
  *
  * MSACM DLL entry point
  *
diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c
index 34517cb..90dc849 100644
--- a/dlls/msvcrt/mbcs.c
+++ b/dlls/msvcrt/mbcs.c
@@ -155,7 +155,7 @@
 }
 
 /*********************************************************************
- *		_mbslen(MSVCRT.206)
+ *		_mbslen(MSVCRT.@)
  */
 int _mbslen(const unsigned char *str)
 {
diff --git a/dlls/msvideo/drawdib.c b/dlls/msvideo/drawdib.c
index 826a71a..0696ab5 100644
--- a/dlls/msvideo/drawdib.c
+++ b/dlls/msvideo/drawdib.c
@@ -37,7 +37,7 @@
 } WINE_HDD;
 
 /***********************************************************************
- *		DrawDibOpen		[MSVFW32.10]
+ *		DrawDibOpen		[MSVFW32.@]
  */
 HDRAWDIB VFWAPI DrawDibOpen(void) {
 	HDRAWDIB hdd;
@@ -56,7 +56,7 @@
 }
 
 /***********************************************************************
- *		DrawDibClose		[MSVFW32.5]
+ *		DrawDibClose		[MSVFW32.@]
  */
 BOOL VFWAPI DrawDibClose(HDRAWDIB hdd) {
 	WINE_HDD *whdd = GlobalLock16(hdd);
@@ -82,7 +82,7 @@
 }
 
 /***********************************************************************
- *		DrawDibEnd		[MSVFW32.7]
+ *		DrawDibEnd		[MSVFW32.@]
  */
 BOOL VFWAPI DrawDibEnd(HDRAWDIB hdd) {
 	BOOL ret = TRUE;
@@ -133,7 +133,7 @@
 }
 
 /***********************************************************************
- *              DrawDibBegin            [MSVFW32.3]
+ *              DrawDibBegin            [MSVFW32.@]
  */
 BOOL VFWAPI DrawDibBegin(HDRAWDIB hdd,
 						 HDC      hdc,
@@ -258,7 +258,7 @@
 }
 
 /**********************************************************************
- *		DrawDibDraw		[MSVFW32.6]
+ *		DrawDibDraw		[MSVFW32.@]
  */
 BOOL VFWAPI DrawDibDraw(HDRAWDIB hdd, HDC hdc,
 	INT xDst, INT yDst, INT dxDst, INT dyDst,
@@ -348,7 +348,7 @@
 }
 
 /*************************************************************************
- *		DrawDibStart		[MSVFW32.14]
+ *		DrawDibStart		[MSVFW32.@]
  */
 BOOL VFWAPI DrawDibStart(HDRAWDIB hdd, DWORD rate) {
 	FIXME("(0x%08lx,%ld), stub\n",(DWORD)hdd,rate);
@@ -363,7 +363,7 @@
 }
 
 /*************************************************************************
- *		DrawDibStop		[MSVFW32.15]
+ *		DrawDibStop		[MSVFW32.@]
  */
 BOOL VFWAPI DrawDibStop(HDRAWDIB hdd) {
 	FIXME("(0x%08lx), stub\n",(DWORD)hdd);
@@ -378,7 +378,7 @@
 }
 
 /***********************************************************************
- *              DrawDibSetPalette       [MSVFW32.13]   
+ *              DrawDibSetPalette       [MSVFW32.@]
  */
 BOOL VFWAPI DrawDibSetPalette(HDRAWDIB hdd, HPALETTE hpal) {
 	WINE_HDD *whdd;
@@ -404,7 +404,7 @@
 }
 
 /***********************************************************************
- *              DrawDibGetPalette       [MSVFW32.9]   
+ *              DrawDibGetPalette       [MSVFW32.@]
  */
 HPALETTE VFWAPI DrawDibGetPalette(HDRAWDIB hdd) {
 	WINE_HDD *whdd;
@@ -426,7 +426,7 @@
 }
 
 /***********************************************************************
- *              DrawDibRealize          [MSVFW32.12]
+ *              DrawDibRealize          [MSVFW32.@]
  */
 UINT VFWAPI DrawDibRealize(HDRAWDIB hdd, HDC hdc, BOOL fBackground) {
 	WINE_HDD *whdd;
diff --git a/dlls/msvideo/msvideo_main.c b/dlls/msvideo/msvideo_main.c
index 33ea111..29599ca 100644
--- a/dlls/msvideo/msvideo_main.c
+++ b/dlls/msvideo/msvideo_main.c
@@ -34,7 +34,8 @@
 LRESULT MSVIDEO_SendMessage(HIC hic, UINT msg, DWORD lParam1, DWORD lParam2, BOOL bFrom32);
 
 /***********************************************************************
- *		VideoForWindowsVersion		[MSVFW32.2][MSVIDEO.2]
+ *		VideoForWindowsVersion		[MSVFW32.2]
+ *		VideoForWindowsVersion		[MSVIDEO.2]
  * Returns the version in major.minor form.
  * In Windows95 this returns 0x040003b6 (4.950)
  */
@@ -115,7 +116,7 @@
 /* system.ini: [drivers] */
 
 /***********************************************************************
- *		ICInfo				[MSVFW32.33]
+ *		ICInfo				[MSVFW32.@]
  * Get information about an installable compressor. Return TRUE if there
  * is one.
  */
@@ -170,7 +171,7 @@
 }
 
 /***********************************************************************
- *		ICOpen				[MSVFW32.37]
+ *		ICOpen				[MSVFW32.@]
  * Opens an installable compressor. Return special handle.
  */
 HIC VFWAPI ICOpen(DWORD fccType,DWORD fccHandler,UINT wMode) {
@@ -264,7 +265,7 @@
 }
 
 /***********************************************************************
- *		ICOpenFunction			[MSVFW32.38]
+ *		ICOpenFunction			[MSVFW32.@]
  */
 HIC VFWAPI ICOpenFunction(DWORD fccType, DWORD fccHandler, UINT wMode, FARPROC lpfnHandler) {
 	return MSVIDEO_OpenFunc(fccType,fccHandler,wMode,lpfnHandler,TRUE);
@@ -286,7 +287,7 @@
 }
 
 /***********************************************************************
- *		ICGetInfo			[MSVFW32.30]
+ *		ICGetInfo			[MSVFW32.@]
  */
 LRESULT VFWAPI ICGetInfo(HIC hic,ICINFO *picinfo,DWORD cb) {
 	LRESULT		ret;
@@ -310,7 +311,7 @@
 }
 
 /***********************************************************************
- *		ICLocate			[MSVFW32.35]
+ *		ICLocate			[MSVFW32.@]
  */
 HIC VFWAPI ICLocate(
 	DWORD fccType, DWORD fccHandler, LPBITMAPINFOHEADER lpbiIn,
@@ -400,7 +401,7 @@
 }
 
 /***********************************************************************
- *		ICGetDisplayFormat			[MSVFW32.29]
+ *		ICGetDisplayFormat			[MSVFW32.@]
  */
 HIC VFWAPI ICGetDisplayFormat(
 	HIC hic,LPBITMAPINFOHEADER lpbiIn,LPBITMAPINFOHEADER lpbiOut,
@@ -462,7 +463,7 @@
 }
 
 /***********************************************************************
- *		ICCompress			[MSVFW32.23]
+ *		ICCompress			[MSVFW32.@]
  */
 DWORD VFWAPIV
 ICCompress(
@@ -525,7 +526,7 @@
 }
 
 /***********************************************************************
- *		ICDecompress			[MSVFW32.26]
+ *		ICDecompress			[MSVFW32.@]
  */
 DWORD VFWAPIV  ICDecompress(HIC hic,DWORD dwFlags,LPBITMAPINFOHEADER lpbiFormat,
 				LPVOID lpData,LPBITMAPINFOHEADER lpbi,LPVOID lpBits)
@@ -972,7 +973,7 @@
 }
 
 /***********************************************************************
- *		ICSendMessage			[MSVFW32.40]
+ *		ICSendMessage			[MSVFW32.@]
  */
 LRESULT VFWAPI ICSendMessage(HIC hic, UINT msg, DWORD lParam1, DWORD lParam2) {
 	return MSVIDEO_SendMessage(hic,msg,lParam1,lParam2,TRUE);
@@ -1019,7 +1020,7 @@
 }
 
 /***********************************************************************
- *		ICDrawBegin		[MSVFW32.28]
+ *		ICDrawBegin		[MSVFW32.@]
  */
 DWORD VFWAPIV ICDrawBegin(
 	HIC                hic,     /* [in] */
@@ -1114,7 +1115,7 @@
 }
 
 /***********************************************************************
- *		ICDraw			[MSVFW32.27]
+ *		ICDraw			[MSVFW32.@]
  */
 DWORD VFWAPIV ICDraw(HIC hic, DWORD dwFlags, LPVOID lpFormat, LPVOID lpData, DWORD cbData, LONG lTime) {
 	ICDRAW	icd;
@@ -1154,7 +1155,7 @@
 }
 
 /***********************************************************************
- *		ICClose			[MSVFW32.22]
+ *		ICClose			[MSVFW32.@]
  */
 LRESULT WINAPI ICClose(HIC hic) {
 	WINE_HIC *whic = GlobalLock16(hic);
@@ -1180,7 +1181,8 @@
 }
 
 /***********************************************************************
- *		MCIWndCreateA		[MSVFW32.44][MSVFW32.45]
+ *		MCIWndCreate		[MSVFW32.@]
+ *		MCIWndCreateA		[MSVFW32.@]
  */
 HWND VFWAPIV MCIWndCreateA(HWND hwndParent, HINSTANCE hInstance,
                       DWORD dwStyle,LPCSTR szFile)
@@ -1190,7 +1192,7 @@
 }
 
 /***********************************************************************
- *		MCIWndCreateW		[MSVFW32.46]
+ *		MCIWndCreateW		[MSVFW32.@]
  */
 HWND VFWAPIV MCIWndCreateW(HWND hwndParent, HINSTANCE hInstance,
                       DWORD dwStyle,LPCWSTR szFile)
diff --git a/dlls/ntdll/error.c b/dlls/ntdll/error.c
index 6798d62..3dc453c 100644
--- a/dlls/ntdll/error.c
+++ b/dlls/ntdll/error.c
@@ -21,7 +21,7 @@
 static const struct error_table error_table[];
 
 /**************************************************************************
- *           RtlNtStatusToDosError
+ *           RtlNtStatusToDosError (NTDLL.@)
  */
 DWORD WINAPI RtlNtStatusToDosError( DWORD status )
 {
diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c
index 36eb1ed..11d59bf 100644
--- a/dlls/ntdll/exception.c
+++ b/dlls/ntdll/exception.c
@@ -321,7 +321,7 @@
 
 
 /***********************************************************************
- *            RtlRaiseStatus  (NTDLL.465)
+ *            RtlRaiseStatus  (NTDLL.@)
  *
  * Raise an exception with ExceptionCode = status
  */
@@ -338,7 +338,7 @@
 
 
 /*************************************************************
- *            __wine_exception_handler
+ *            __wine_exception_handler (NTDLL.@)
  *
  * Exception handler for exception blocks declared in Wine code.
  */
@@ -378,7 +378,7 @@
 
 
 /*************************************************************
- *            __wine_finally_handler
+ *            __wine_finally_handler (NTDLL.@)
  *
  * Exception handler for try/finally blocks declared in Wine code.
  */
diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
index ef19073..d4e68d6 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -8,7 +8,7 @@
 DEFAULT_DEBUG_CHANNEL(ntdll);
 
 /**************************************************************************
- *                 NtOpenFile				[NTDLL.127]
+ *                 NtOpenFile				[NTDLL.@]
  * FUNCTION: Opens a file
  * ARGUMENTS:
  *  FileHandle		Variable that receives the file handle on return
@@ -34,7 +34,7 @@
 }
 
 /**************************************************************************
- *		NtCreateFile				[NTDLL.73]
+ *		NtCreateFile				[NTDLL.@]
  * FUNCTION: Either causes a new file or directory to be created, or it opens
  *  an existing file, device, directory or volume, giving the caller a handle
  *  for the file object. This handle can be used by subsequent calls to
@@ -105,7 +105,7 @@
 }
 
 /**************************************************************************
- *		NtDeviceIoControlFile			[NTDLL.94]
+ *		NtDeviceIoControlFile			[NTDLL.@]
  */
 NTSTATUS WINAPI NtDeviceIoControlFile(
 	IN HANDLE DeviceHandle,
@@ -126,7 +126,7 @@
 }
 
 /******************************************************************************
- * NtFsControlFile [NTDLL.108]
+ * NtFsControlFile [NTDLL.@]
  */
 NTSTATUS WINAPI NtFsControlFile(
 	IN HANDLE DeviceHandle,
diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c
index d349bb8..e59387c 100644
--- a/dlls/ntdll/nt.c
+++ b/dlls/ntdll/nt.c
@@ -24,7 +24,7 @@
  */
  
 /**************************************************************************
- *		NtCreateTimer				[NTDLL.87]
+ *		NtCreateTimer				[NTDLL.@]
  */
 NTSTATUS WINAPI NtCreateTimer(
 	OUT PHANDLE TimerHandle,
@@ -38,7 +38,7 @@
 	return 0;
 }
 /**************************************************************************
- *		NtSetTimer				[NTDLL.221]
+ *		NtSetTimer				[NTDLL.@]
  */
 NTSTATUS WINAPI NtSetTimer(
 	IN HANDLE TimerHandle,
@@ -55,7 +55,7 @@
 }
 
 /******************************************************************************
- * NtQueryTimerResolution [NTDLL.129]
+ * NtQueryTimerResolution [NTDLL.@]
  */
 NTSTATUS WINAPI NtQueryTimerResolution(DWORD x1,DWORD x2,DWORD x3) 
 {
@@ -111,7 +111,7 @@
 }
 
 /******************************************************************************
- * NtSetInformationProcess [NTDLL.207]
+ * NtSetInformationProcess [NTDLL.@]
  */
 NTSTATUS WINAPI NtSetInformationProcess(
 	IN HANDLE ProcessHandle,
@@ -269,7 +269,7 @@
 }
 
 /******************************************************************************
-*  NtQueryInformationToken		[NTDLL.156] 
+*  NtQueryInformationToken		[NTDLL.@]
 *
 * NOTES
 *  Buffer for TokenUser:
@@ -567,7 +567,7 @@
 }
 
 /******************************************************************************
- * NtQuerySystemInformation [NTDLL.168]
+ * NtQuerySystemInformation [NTDLL.@]
  *
  * ARGUMENTS:
  *  SystemInformationClass	Index to a certain information structure
@@ -630,7 +630,7 @@
 }
 
 /******************************************************************************
- *  NtDisplayString				[NTDLL.95] 
+ *  NtDisplayString				[NTDLL.@]
  * 
  * writes a string to the nt-textmode screen eg. during startup
  */
@@ -658,7 +658,7 @@
 }
 
 /******************************************************************************
- *  NtAllocateLocallyUniqueId
+ *  NtAllocateLocallyUniqueId (NTDLL.@)
  *
  * FIXME: the server should do that
  */
diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c
index e584bcd..8f9bd3f 100644
--- a/dlls/ntdll/om.c
+++ b/dlls/ntdll/om.c
@@ -21,7 +21,7 @@
  */
  
 /******************************************************************************
- * NtQueryObject [NTDLL.161]
+ * NtQueryObject [NTDLL.@]
  */
 NTSTATUS WINAPI NtQueryObject(
 	IN HANDLE ObjectHandle,
@@ -209,7 +209,7 @@
 }
 
 /**************************************************************************
- *                 NtClose				[NTDLL.65]
+ *                 NtClose				[NTDLL.@]
  * FUNCTION: Closes a handle reference to an object
  * ARGUMENTS:
  *	Handle	handle to close
@@ -244,7 +244,7 @@
  */
 
 /**************************************************************************
- * NtOpenDirectoryObject [NTDLL.124]
+ * NtOpenDirectoryObject [NTDLL.@]
  * FUNCTION: Opens a namespace directory object
  * ARGUMENTS:
  *  DirectoryHandle	Variable which receives the directory handle
@@ -278,7 +278,7 @@
 }
 
 /******************************************************************************
- * NtQueryDirectoryObject [NTDLL.149] 
+ * NtQueryDirectoryObject [NTDLL.@]
  * FUNCTION: Reads information from a namespace directory
  * ARGUMENTS:
  *  DirObjInformation	Buffer to hold the data read
diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c
index 52b33ee..d5d683e 100644
--- a/dlls/ntdll/reg.c
+++ b/dlls/ntdll/reg.c
@@ -74,7 +74,7 @@
 
 
 /******************************************************************************
- * NtOpenKey [NTDLL.129]
+ * NtOpenKey [NTDLL.@]
  * ZwOpenKey
  *   OUT	PHANDLE			retkey (returns 0 when failure)
  *   IN		ACCESS_MASK		access
@@ -694,7 +694,7 @@
 }
 
 /******************************************************************************
- *  RtlFormatCurrentUserKeyPath		[NTDLL.371] 
+ *  RtlFormatCurrentUserKeyPath		[NTDLL.@]
  */
 NTSTATUS WINAPI RtlFormatCurrentUserKeyPath(
 	IN OUT PUNICODE_STRING KeyPath)
diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c
index fbf1c89..d0e85c5 100644
--- a/dlls/ntdll/rtl.c
+++ b/dlls/ntdll/rtl.c
@@ -29,7 +29,7 @@
  */
 
 /***********************************************************************
- *           RtlInitializeResource	(NTDLL.409)
+ *           RtlInitializeResource	(NTDLL.@)
  *
  * xxxResource() functions implement multiple-reader-single-writer lock.
  * The code is based on information published in WDJ January 1999 issue.
@@ -51,7 +51,7 @@
 
 
 /***********************************************************************
- *           RtlDeleteResource		(NTDLL.330)
+ *           RtlDeleteResource		(NTDLL.@)
  */
 void WINAPI RtlDeleteResource(LPRTL_RWLOCK rwl)
 {
@@ -72,7 +72,7 @@
 
 
 /***********************************************************************
- *          RtlAcquireResourceExclusive	(NTDLL.256)
+ *          RtlAcquireResourceExclusive	(NTDLL.@)
  */
 BYTE WINAPI RtlAcquireResourceExclusive(LPRTL_RWLOCK rwl, BYTE fWait)
 {
@@ -117,7 +117,7 @@
 }
 
 /***********************************************************************
- *          RtlAcquireResourceShared	(NTDLL.257)
+ *          RtlAcquireResourceShared	(NTDLL.@)
  */
 BYTE WINAPI RtlAcquireResourceShared(LPRTL_RWLOCK rwl, BYTE fWait)
 {
@@ -158,7 +158,7 @@
 
 
 /***********************************************************************
- *           RtlReleaseResource		(NTDLL.471)
+ *           RtlReleaseResource		(NTDLL.@)
  */
 void WINAPI RtlReleaseResource(LPRTL_RWLOCK rwl)
 {
@@ -200,7 +200,7 @@
 
 
 /***********************************************************************
- *           RtlDumpResource		(NTDLL.340)
+ *           RtlDumpResource		(NTDLL.@)
  */
 void WINAPI RtlDumpResource(LPRTL_RWLOCK rwl)
 {
@@ -340,7 +340,7 @@
 }
 
 /**************************************************************************
- *                 RtlNormalizeProcessParams		[NTDLL.441]
+ *                 RtlNormalizeProcessParams		[NTDLL.@]
  */
 LPVOID WINAPI RtlNormalizeProcessParams(LPVOID x)
 {
@@ -349,7 +349,7 @@
 }
 
 /**************************************************************************
- *                 RtlGetNtProductType			[NTDLL.390]
+ *                 RtlGetNtProductType			[NTDLL.@]
  */
 BOOLEAN WINAPI RtlGetNtProductType(LPDWORD type)
 {
@@ -359,8 +359,8 @@
 }
 
 /**************************************************************************
- *                 NTDLL_chkstk				[NTDLL.862]
- *                 NTDLL_alloca_probe				[NTDLL.861]
+ *                 NTDLL_chkstk				[NTDLL.@]
+ *                 NTDLL_alloca_probe				[NTDLL.@]
  * Glorified "enter xxxx".
  */
 void WINAPI NTDLL_chkstk( CONTEXT86 *context )
@@ -373,7 +373,7 @@
 }
 
 /**************************************************************************
- *                 RtlDosPathNameToNtPathName_U		[NTDLL.338]
+ *                 RtlDosPathNameToNtPathName_U		[NTDLL.@]
  *
  * FIXME: convert to UNC or whatever is expected here
  */
diff --git a/dlls/ntdll/rtlstr.c b/dlls/ntdll/rtlstr.c
index dc7c314..18678ec 100644
--- a/dlls/ntdll/rtlstr.c
+++ b/dlls/ntdll/rtlstr.c
@@ -744,7 +744,7 @@
 */
 
 /**************************************************************************
- *	RtlIsTextUnicode
+ *	RtlIsTextUnicode (NTDLL.@)
  *
  *	Apply various feeble heuristics to guess whether
  *	the text buffer contains Unicode.
diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c
index 23be457..fbe65a2 100644
--- a/dlls/ntdll/sec.c
+++ b/dlls/ntdll/sec.c
@@ -40,7 +40,7 @@
  */
 
 /******************************************************************************
- *  RtlAllocateAndInitializeSid		[NTDLL.265] 
+ *  RtlAllocateAndInitializeSid		[NTDLL.@]
  *
  */
 BOOLEAN WINAPI RtlAllocateAndInitializeSid (
@@ -86,7 +86,7 @@
 	return STATUS_SUCCESS;
 }
 /******************************************************************************
- *  RtlEqualSid		[NTDLL.352] 
+ *  RtlEqualSid		[NTDLL.@]
  *
  */
 BOOL WINAPI RtlEqualSid( PSID pSid1, PSID pSid2 )
@@ -122,7 +122,7 @@
 
 
 /******************************************************************************
- *  RtlFreeSid		[NTDLL.376] 
+ *  RtlFreeSid		[NTDLL.@]
  */
 DWORD WINAPI RtlFreeSid(PSID pSid) 
 {
@@ -132,7 +132,7 @@
 }
 
 /**************************************************************************
- * RtlLengthRequiredSid	[NTDLL.427]
+ * RtlLengthRequiredSid	[NTDLL.@]
  *
  * PARAMS
  *   nSubAuthorityCount []
@@ -143,7 +143,7 @@
 }
 
 /**************************************************************************
- *                 RtlLengthSid				[NTDLL.429]
+ *                 RtlLengthSid				[NTDLL.@]
  */
 DWORD WINAPI RtlLengthSid(PSID pSid)
 {
@@ -153,7 +153,7 @@
 }
 
 /**************************************************************************
- *                 RtlInitializeSid			[NTDLL.410]
+ *                 RtlInitializeSid			[NTDLL.@]
  */
 BOOL WINAPI RtlInitializeSid(
 	PSID pSid,
@@ -176,7 +176,7 @@
 }
 
 /**************************************************************************
- *                 RtlSubAuthoritySid			[NTDLL.497]
+ *                 RtlSubAuthoritySid			[NTDLL.@]
  *
  * PARAMS
  *   pSid          []
@@ -188,7 +188,7 @@
 }
 
 /**************************************************************************
- * RtlIdentifierAuthoritySid	[NTDLL.395]
+ * RtlIdentifierAuthoritySid	[NTDLL.@]
  *
  * PARAMS
  *   pSid []
@@ -199,7 +199,7 @@
 }
 
 /**************************************************************************
- *                 RtlSubAuthorityCountSid		[NTDLL.496]
+ *                 RtlSubAuthorityCountSid		[NTDLL.@]
  *
  * PARAMS
  *   pSid          []
@@ -211,7 +211,7 @@
 }
 
 /**************************************************************************
- *                 RtlCopySid				[NTDLL.302]
+ *                 RtlCopySid				[NTDLL.@]
  */
 DWORD WINAPI RtlCopySid( DWORD nDestinationSidLength, PSID pDestinationSid, PSID pSourceSid )
 {
@@ -226,7 +226,7 @@
 	return TRUE;
 }
 /******************************************************************************
- * RtlValidSid [NTDLL.532]
+ * RtlValidSid [NTDLL.@]
  *
  * PARAMS
  *   pSid []
@@ -259,7 +259,7 @@
  */
 
 /**************************************************************************
- * RtlCreateSecurityDescriptor			[NTDLL.313]
+ * RtlCreateSecurityDescriptor			[NTDLL.@]
  *
  * RETURNS:
  *  0 success, 
@@ -277,7 +277,7 @@
 	return STATUS_SUCCESS;
 }
 /**************************************************************************
- * RtlValidSecurityDescriptor			[NTDLL.313]
+ * RtlValidSecurityDescriptor			[NTDLL.@]
  *
  */
 NTSTATUS WINAPI RtlValidSecurityDescriptor(
@@ -348,7 +348,7 @@
 }
 
 /**************************************************************************
- *  RtlSetDaclSecurityDescriptor		[NTDLL.483]
+ *  RtlSetDaclSecurityDescriptor		[NTDLL.@]
  */
 NTSTATUS WINAPI RtlSetDaclSecurityDescriptor (
 	PSECURITY_DESCRIPTOR lpsd,
@@ -409,7 +409,7 @@
 }
 
 /**************************************************************************
- * RtlSetSaclSecurityDescriptor			[NTDLL.488]
+ * RtlSetSaclSecurityDescriptor			[NTDLL.@]
  */
 NTSTATUS WINAPI RtlSetSaclSecurityDescriptor (
 	PSECURITY_DESCRIPTOR lpsd,
@@ -435,7 +435,7 @@
 }
 
 /**************************************************************************
- * RtlGetOwnerSecurityDescriptor		[NTDLL.488]
+ * RtlGetOwnerSecurityDescriptor		[NTDLL.@]
  */
 NTSTATUS WINAPI RtlGetOwnerSecurityDescriptor(
 	PSECURITY_DESCRIPTOR SecurityDescriptor,
@@ -456,7 +456,7 @@
 }
 
 /**************************************************************************
- *                 RtlSetOwnerSecurityDescriptor		[NTDLL.487]
+ *                 RtlSetOwnerSecurityDescriptor		[NTDLL.@]
  */
 NTSTATUS WINAPI RtlSetOwnerSecurityDescriptor(
 	PSECURITY_DESCRIPTOR lpsd,
@@ -477,7 +477,7 @@
 }
 
 /**************************************************************************
- *                 RtlSetGroupSecurityDescriptor		[NTDLL.485]
+ *                 RtlSetGroupSecurityDescriptor		[NTDLL.@]
  */
 NTSTATUS WINAPI RtlSetGroupSecurityDescriptor (
 	PSECURITY_DESCRIPTOR lpsd,
@@ -535,7 +535,7 @@
  */
 
 /**************************************************************************
- *                 RtlCreateAcl				[NTDLL.306]
+ *                 RtlCreateAcl				[NTDLL.@]
  *
  * NOTES
  *    This should return NTSTATUS
@@ -559,7 +559,7 @@
 }
 
 /**************************************************************************
- *                 RtlFirstFreeAce			[NTDLL.370]
+ *                 RtlFirstFreeAce			[NTDLL.@]
  * looks for the AceCount+1 ACE, and if it is still within the alloced
  * ACL, return a pointer to it
  */
@@ -584,7 +584,7 @@
 }
 
 /**************************************************************************
- *                 RtlAddAce				[NTDLL.260]
+ *                 RtlAddAce				[NTDLL.@]
  */
 NTSTATUS WINAPI RtlAddAce(
 	PACL acl,
@@ -693,7 +693,7 @@
 }
 
 /******************************************************************************
- * RtlGetControlSecurityDescriptor
+ * RtlGetControlSecurityDescriptor (NTDLL.@)
  */
 
 NTSTATUS WINAPI RtlGetControlSecurityDescriptor(
@@ -706,7 +706,7 @@
 }		
 
 /******************************************************************************
- * RtlConvertSidToUnicodeString
+ * RtlConvertSidToUnicodeString (NTDLL.@)
  */
 NTSTATUS WINAPI RtlConvertSidToUnicodeString(
        PUNICODE_STRING UnicodeSID,
diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c
index 5b5585d..c1e4818 100644
--- a/dlls/ntdll/sync.c
+++ b/dlls/ntdll/sync.c
@@ -22,7 +22,7 @@
  */
 
 /******************************************************************************
- *  NtCreateSemaphore
+ *  NtCreateSemaphore (NTDLL.@)
  */
 NTSTATUS WINAPI NtCreateSemaphore( OUT PHANDLE SemaphoreHandle,
                                    IN ACCESS_MASK access,
@@ -50,7 +50,7 @@
 }
 
 /******************************************************************************
- *  NtOpenSemaphore
+ *  NtOpenSemaphore (NTDLL.@)
  */
 NTSTATUS WINAPI NtOpenSemaphore( OUT PHANDLE SemaphoreHandle,
                                  IN ACCESS_MASK access,
@@ -72,7 +72,7 @@
 }
 
 /******************************************************************************
- *  NtQuerySemaphore
+ *  NtQuerySemaphore (NTDLL.@)
  */
 NTSTATUS WINAPI NtQuerySemaphore(
 	HANDLE SemaphoreHandle,
@@ -87,7 +87,7 @@
 }
 
 /******************************************************************************
- *  NtReleaseSemaphore
+ *  NtReleaseSemaphore (NTDLL.@)
  */
 NTSTATUS WINAPI NtReleaseSemaphore( HANDLE handle, ULONG count, PULONG previous )
 {
@@ -110,7 +110,7 @@
  */
  
 /**************************************************************************
- * NtCreateEvent
+ * NtCreateEvent (NTDLL.@)
  */
 NTSTATUS WINAPI NtCreateEvent(
 	OUT PHANDLE EventHandle,
@@ -136,7 +136,7 @@
 }
 
 /******************************************************************************
- *  NtOpenEvent
+ *  NtOpenEvent (NTDLL.@)
  */
 NTSTATUS WINAPI NtOpenEvent(
 	OUT PHANDLE EventHandle,
@@ -160,7 +160,7 @@
 
 
 /******************************************************************************
- *  NtSetEvent
+ *  NtSetEvent (NTDLL.@)
  */
 NTSTATUS WINAPI NtSetEvent( HANDLE handle, PULONG NumberOfThreadsReleased )
 {
@@ -179,7 +179,7 @@
 }
 
 /******************************************************************************
- *  NtResetEvent
+ *  NtResetEvent (NTDLL.@)
  */
 NTSTATUS WINAPI NtResetEvent( HANDLE handle, PULONG NumberOfThreadsReleased )
 {
@@ -199,7 +199,7 @@
 }
 
 /******************************************************************************
- *  NtClearEvent
+ *  NtClearEvent (NTDLL.@)
  *
  * FIXME
  *   same as NtResetEvent ???
@@ -210,7 +210,7 @@
 }
 
 /******************************************************************************
- *  NtPulseEvent
+ *  NtPulseEvent (NTDLL.@)
  *
  * FIXME
  *   PulseCount
@@ -230,7 +230,7 @@
 }
 
 /******************************************************************************
- *  NtQueryEvent
+ *  NtQueryEvent (NTDLL.@)
  */
 NTSTATUS WINAPI NtQueryEvent (
 	IN  HANDLE EventHandle,
diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c
index 1f7ad4e..7234d75 100644
--- a/dlls/ntdll/time.c
+++ b/dlls/ntdll/time.c
@@ -56,7 +56,7 @@
 }
 
 /******************************************************************************
- *  RtlTimeToTimeFields		[NTDLL.265] 
+ *  RtlTimeToTimeFields		[NTDLL.@]
  *
  */
 
@@ -127,7 +127,7 @@
 	TimeFields->Day = (CSHORT) (Days + 1);
 }
 /******************************************************************************
- *  RtlTimeFieldsToTime		[NTDLL.265] 
+ *  RtlTimeFieldsToTime		[NTDLL.@]
  *
  */
 BOOLEAN WINAPI RtlTimeFieldsToTime(
@@ -230,7 +230,7 @@
 }
 
 /******************************************************************************
- * RtlTimeToElapsedTimeFields [NTDLL.502]
+ * RtlTimeToElapsedTimeFields [NTDLL.@]
  * FIXME: prototype guessed
  */
 VOID WINAPI RtlTimeToElapsedTimeFields(
diff --git a/dlls/ole32/antimoniker.c b/dlls/ole32/antimoniker.c
index 065385a..3339784 100644
--- a/dlls/ole32/antimoniker.c
+++ b/dlls/ole32/antimoniker.c
@@ -619,7 +619,7 @@
 }
 
 /******************************************************************************
- *        CreateAntiMoniker	[OLE32.55]
+ *        CreateAntiMoniker	[OLE32.51]
  ******************************************************************************/
 HRESULT WINAPI CreateAntiMoniker(LPMONIKER * ppmk)
 {
diff --git a/dlls/ole32/bindctx.c b/dlls/ole32/bindctx.c
index f45303a..a4604b9 100644
--- a/dlls/ole32/bindctx.c
+++ b/dlls/ole32/bindctx.c
@@ -519,7 +519,7 @@
 }
 
 /******************************************************************************
- *        CreateBindCtx
+ *        CreateBindCtx (OLE32.52)
  ******************************************************************************/
 HRESULT WINAPI CreateBindCtx(DWORD reserved, LPBC * ppbc)
 {
diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c
index c4ac82b..4960a4b 100644
--- a/dlls/ole32/compobj.c
+++ b/dlls/ole32/compobj.c
@@ -827,7 +827,7 @@
 
 
 /***********************************************************************
- *		WriteClassStm
+ *		WriteClassStm (OLE32.159)
  *
  * This function write a CLSID on stream
  */
@@ -842,7 +842,7 @@
 }
 
 /***********************************************************************
- *		ReadClassStm
+ *		ReadClassStm (OLE32.135)
  *
  * This function read a CLSID from a stream
  */
@@ -1249,7 +1249,7 @@
 }
 
 /***********************************************************************
- *        CoResumeClassObjects
+ *        CoResumeClassObjects (OLE32.173)
  *
  * Resumes classobjects registered with REGCLS suspended
  */
@@ -1260,7 +1260,7 @@
 }
 
 /***********************************************************************
- *        GetClassFile
+ *        GetClassFile (OLE32.67)
  *
  * This function supplies the CLSID associated with the given filename.
  */
@@ -1739,7 +1739,7 @@
 
 
 /***********************************************************************
- *           DllGetClassObject [OLE32.63]
+ *           DllGetClassObject [OLE32.@]
  */
 HRESULT WINAPI OLE32_DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv)
 {	
diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c
index b7dd697..e6ee03c 100644
--- a/dlls/ole32/compositemoniker.c
+++ b/dlls/ole32/compositemoniker.c
@@ -1644,7 +1644,7 @@
 }
 
 /******************************************************************************
- *        CreateGenericComposite	[OLE32.55]
+ *        CreateGenericComposite	[OLE32.56]
  ******************************************************************************/
 HRESULT WINAPI CreateGenericComposite(LPMONIKER pmkFirst, LPMONIKER pmkRest, LPMONIKER* ppmkComposite)
 {
@@ -1693,7 +1693,7 @@
 }
 
 /******************************************************************************
- *        MonikerCommonPrefixWith	[OLE32.55]
+ *        MonikerCommonPrefixWith	[OLE32.82]
  ******************************************************************************/
 HRESULT WINAPI MonikerCommonPrefixWith(IMoniker* pmkThis,IMoniker* pmkOther,IMoniker** ppmkCommon)
 {
diff --git a/dlls/ole32/errorinfo.c b/dlls/ole32/errorinfo.c
index 4fb4ac1..7a619e5 100644
--- a/dlls/ole32/errorinfo.c
+++ b/dlls/ole32/errorinfo.c
@@ -447,7 +447,7 @@
   ISupportErrorInfoImpl_InterfaceSupportsErrorInfo
 };
 /***********************************************************************
- *		CreateErrorInfo
+ *		CreateErrorInfo (OLE32.192)
  */
 HRESULT WINAPI CreateErrorInfo(ICreateErrorInfo **pperrinfo)
 {
@@ -463,7 +463,7 @@
 }
 
 /***********************************************************************
- *		GetErrorInfo
+ *		GetErrorInfo (OLE32.196)
  */
 HRESULT WINAPI GetErrorInfo(ULONG dwReserved, IErrorInfo **pperrinfo)
 {
@@ -478,7 +478,7 @@
 }
 
 /***********************************************************************
- *		SetErrorInfo
+ *		SetErrorInfo (OLE32.255)
  */
 HRESULT WINAPI SetErrorInfo(ULONG dwReserved, IErrorInfo *perrinfo)
 {
diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c
index 818da5f..e26e8ea 100644
--- a/dlls/ole32/filemoniker.c
+++ b/dlls/ole32/filemoniker.c
@@ -1301,7 +1301,7 @@
 }
 
 /******************************************************************************
- *        CreateFileMoniker16
+ *        CreateFileMoniker16 (OLE2.28)
  ******************************************************************************/
 HRESULT WINAPI CreateFileMoniker16(LPCOLESTR16 lpszPathName,LPMONIKER* ppmk)
 {
@@ -1311,7 +1311,7 @@
 }
 
 /******************************************************************************
- *        CreateFileMoniker
+ *        CreateFileMoniker (OLE32.55)
  ******************************************************************************/
 HRESULT WINAPI CreateFileMoniker(LPCOLESTR lpszPathName, LPMONIKER * ppmk)
 {
diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c
index 04f2d80..7317a54 100644
--- a/dlls/ole32/itemmoniker.c
+++ b/dlls/ole32/itemmoniker.c
@@ -951,7 +951,7 @@
 }
 
 /******************************************************************************
- *        CreateItemMoniker	[OLE32.55]
+ *        CreateItemMoniker	[OLE32.58]
  ******************************************************************************/
 HRESULT WINAPI CreateItemMoniker(LPCOLESTR lpszDelim,LPCOLESTR  lpszItem, LPMONIKER * ppmk)
 {
diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c
index 8a42c82..dd00873 100644
--- a/dlls/ole32/ole2.c
+++ b/dlls/ole32/ole2.c
@@ -2236,7 +2236,7 @@
 }
 
 /******************************************************************************
- * DllDebugObjectRPCHook
+ * DllDebugObjectRPCHook (OLE32.62)
  * turns on and off internal debugging,  pointer is only used on macintosh
  */
 
diff --git a/dlls/ole32/ole2nls.c b/dlls/ole32/ole2nls.c
index 8765cbc..c00c868 100644
--- a/dlls/ole32/ole2nls.c
+++ b/dlls/ole32/ole2nls.c
@@ -55,7 +55,7 @@
 }
 
 /******************************************************************************
- *      RegisterNLSInfoChanged  [OLE2NLS.10]
+ *      RegisterNLSInfoChanged  [OLE2NLS.9]
  */
 BOOL16 WINAPI RegisterNLSInfoChanged16(LPVOID lpNewNLSInfo) /* [???] FIXME */
 {
diff --git a/dlls/ole32/ole2stubs.c b/dlls/ole32/ole2stubs.c
index 9203ecb..8e8efc4 100644
--- a/dlls/ole32/ole2stubs.c
+++ b/dlls/ole32/ole2stubs.c
@@ -76,7 +76,7 @@
 }
 
 /******************************************************************************
- *              OleCreate        [OLE32.80]
+ *              OleCreate        [OLE32.89]
  *
  */
 HRESULT WINAPI OleCreate(
diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c
index a25f6f2..3d9e168 100644
--- a/dlls/ole32/storage32.c
+++ b/dlls/ole32/storage32.c
@@ -5669,7 +5669,7 @@
 }
 
 /***********************************************************************
- *    ReadClassStg
+ *    ReadClassStg (OLE32.134)
  *
  * This method reads the CLSID previously written to a storage object with the WriteClassStg.
  */
@@ -5694,7 +5694,7 @@
 }
 
 /***********************************************************************
- *    OleLoadFromStream
+ *    OleLoadFromStream (OLE32.113)
  *
  * This function loads an object from stream
  */
@@ -5728,7 +5728,7 @@
 }
 
 /***********************************************************************
- *    OleSaveToStream
+ *    OleSaveToStream (OLE32.125)
  *
  * This function saves an object with the IPersistStream interface on it
  * to the specified stream.
diff --git a/dlls/oleaut32/hash.c b/dlls/oleaut32/hash.c
index 30da815..c0adf4e 100644
--- a/dlls/oleaut32/hash.c
+++ b/dlls/oleaut32/hash.c
@@ -170,7 +170,7 @@
 };
 
 /***********************************************************************
- *		LHashValOfNameSysA
+ *		LHashValOfNameSysA (OLEAUT32.166)
  *
  * Produce a two part hash: The high word is based on skind and lcid,
  * the low word is based on a repeated string hash of skind/str.
@@ -227,7 +227,7 @@
 }
 
 /***********************************************************************
- *		LHashValOfNameSys
+ *		LHashValOfNameSys (OLEAUT32.165)
  */
 ULONG WINAPI LHashValOfNameSys( SYSKIND skind, LCID lcid, LPCOLESTR str)
 {
diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c
index ddf6ada..c56fdfd 100644
--- a/dlls/oleaut32/oleaut.c
+++ b/dlls/oleaut32/oleaut.c
@@ -20,7 +20,7 @@
 static WCHAR	*pdelimiter = &_delimiter[0];
 
 /***********************************************************************
- *		RegisterActiveObject
+ *		RegisterActiveObject (OLEAUT32.33)
  */
 HRESULT WINAPI RegisterActiveObject(
 	LPUNKNOWN punk,REFCLSID rcid,DWORD dwFlags,LPDWORD pdwRegister
@@ -46,7 +46,7 @@
 }
 
 /***********************************************************************
- *		RevokeActiveObject
+ *		RevokeActiveObject (OLEAUT32.34)
  */
 HRESULT WINAPI RevokeActiveObject(DWORD xregister,LPVOID reserved)
 {
@@ -62,7 +62,7 @@
 }
 
 /***********************************************************************
- *		GetActiveObject
+ *		GetActiveObject (OLEAUT32.35)
  */
 HRESULT WINAPI GetActiveObject(REFCLSID rcid,LPVOID preserved,LPUNKNOWN *ppunk)
 {
diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c
index 1b931b3..dd189a8 100644
--- a/dlls/oleaut32/olepicture.c
+++ b/dlls/oleaut32/olepicture.c
@@ -695,7 +695,7 @@
 };
 
 /***********************************************************************
- * OleCreatePictureIndirect
+ * OleCreatePictureIndirect (OLEAUT32.419)
  */
 HRESULT WINAPI OleCreatePictureIndirect(LPPICTDESC lpPictDesc, REFIID riid,
 		            BOOL fOwn, LPVOID *ppvObj )
@@ -737,7 +737,7 @@
 
 
 /***********************************************************************
- * OleLoadPicture
+ * OleLoadPicture (OLEAUT32.418)
  */
 HRESULT WINAPI OleLoadPicture( LPSTREAM lpstream, LONG lSize, BOOL fRunmode,
 		            REFIID reed, LPVOID *ppvObj )
@@ -748,7 +748,7 @@
 }
 
 /***********************************************************************
- * OleLoadPictureEx
+ * OleLoadPictureEx (OLEAUT32.425)
  */
 HRESULT WINAPI OleLoadPictureEx( LPSTREAM lpstream, LONG lSize, BOOL fRunmode,
 		            REFIID reed, DWORD xsiz, DWORD ysiz, DWORD flags, LPVOID *ppvObj )
diff --git a/dlls/oleaut32/safearray.c b/dlls/oleaut32/safearray.c
index abb5b3d..16edcaf 100644
--- a/dlls/oleaut32/safearray.c
+++ b/dlls/oleaut32/safearray.c
@@ -103,7 +103,7 @@
 
 
 /*************************************************************************
- *		SafeArrayAllocDescriptor
+ *		SafeArrayAllocDescriptor (OLEAUT32.36)
  * Allocate the appropriate amount of memory for the SafeArray descriptor
  */
 HRESULT WINAPI SafeArrayAllocDescriptor( 
@@ -128,7 +128,7 @@
 }
 
 /*************************************************************************
- *		SafeArrayAllocData
+ *		SafeArrayAllocData (OLEAUT32.37)
  * Allocate the appropriate amount of data for the SafeArray data
  */
 HRESULT WINAPI SafeArrayAllocData(
@@ -153,7 +153,7 @@
 }
 
 /*************************************************************************
- *		SafeArrayCreate
+ *		SafeArrayCreate (OLEAUT32.15)
  * Create a SafeArray object by encapsulating AllocDescriptor and AllocData 
  */
 SAFEARRAY* WINAPI SafeArrayCreate(
@@ -198,7 +198,7 @@
 }
 
 /*************************************************************************
- *		SafeArrayDestroyDescriptor
+ *		SafeArrayDestroyDescriptor (OLEAUT32.38)
  * Frees the memory associated with the descriptor.
  */
 HRESULT WINAPI SafeArrayDestroyDescriptor(
@@ -217,7 +217,7 @@
 
 
 /*************************************************************************
- *		SafeArrayLock
+ *		SafeArrayLock (OLEAUT32.21)
  * Increment the lock counter
  *
  * Doc says (MSDN Library ) that psa->pvData should be made available (!= NULL)
@@ -236,7 +236,7 @@
 }
 
 /*************************************************************************
- *		SafeArrayUnlock
+ *		SafeArrayUnlock (OLEAUT32.22)
  * Decrement the lock counter
  */
 HRESULT WINAPI SafeArrayUnlock(
@@ -253,7 +253,7 @@
 
 
 /*************************************************************************
- *		SafeArrayPutElement
+ *		SafeArrayPutElement (OLEAUT32.26)
  * Set the data at the given coordinate
  */
 HRESULT WINAPI SafeArrayPutElement(
@@ -310,7 +310,7 @@
 
 
 /*************************************************************************
- *		SafeArrayGetElement
+ *		SafeArrayGetElement (OLEAUT32.25)
  * Return the data element corresponding the the given coordinate
  */
 HRESULT WINAPI SafeArrayGetElement(
@@ -359,7 +359,7 @@
 }
 
 /*************************************************************************
- *		SafeArrayGetUBound
+ *		SafeArrayGetUBound (OLEAUT32.19)
  * return the UP bound for a given array dimension
  */
 HRESULT WINAPI SafeArrayGetUBound(
@@ -383,7 +383,7 @@
 }
 
 /*************************************************************************
- *		SafeArrayGetLBound
+ *		SafeArrayGetLBound (OLEAUT32.20)
  * Return the LO bound for a given array dimension 
  */
 HRESULT WINAPI SafeArrayGetLBound(
@@ -405,7 +405,7 @@
 }
 
 /*************************************************************************
- *		SafeArrayGetDim
+ *		SafeArrayGetDim (OLEAUT32.17)
  * returns the number of dimension in the array
  */
 UINT WINAPI SafeArrayGetDim(
@@ -422,7 +422,7 @@
 }
 
 /*************************************************************************
- *		SafeArrayGetElemsize
+ *		SafeArrayGetElemsize (OLEAUT32.18)
  * Return the size of the element in the array
  */
 UINT WINAPI SafeArrayGetElemsize(
@@ -439,7 +439,7 @@
 }
 
 /*************************************************************************
- *		SafeArrayAccessData
+ *		SafeArrayAccessData (OLEAUT32.23)
  * increment the access count and return the data 
  */
 HRESULT WINAPI SafeArrayAccessData(
@@ -467,7 +467,7 @@
 
 
 /*************************************************************************
- *		SafeArrayUnaccessData
+ *		SafeArrayUnaccessData (OLEAUT32.24)
  * Decrement the access count
  */
 HRESULT WINAPI SafeArrayUnaccessData(
@@ -480,7 +480,7 @@
 }
 
 /************************************************************************ 
- *		SafeArrayPtrOfIndex
+ *		SafeArrayPtrOfIndex (OLEAUT32.148)
  * Return a pointer to the element at rgIndices
  */
 HRESULT WINAPI SafeArrayPtrOfIndex(
@@ -506,7 +506,7 @@
 }
 
 /************************************************************************ 
- *		SafeArrayDestroyData
+ *		SafeArrayDestroyData (OLEAUT32.39)
  * Frees the memory data bloc
  */
 HRESULT WINAPI SafeArrayDestroyData(
@@ -561,7 +561,7 @@
 }
 
 /************************************************************************ 
- *		SafeArrayCopyData
+ *		SafeArrayCopyData (OLEAUT32.412)
  * Copy the psaSource's data block into psaTarget if dimension and size
  * permits it.
  */
@@ -614,7 +614,7 @@
 }
 
 /************************************************************************ 
- *		SafeArrayDestroy
+ *		SafeArrayDestroy (OLEAUT32.16)
  * Deallocates all memory reserved for the SafeArray
  */
 HRESULT WINAPI SafeArrayDestroy(
@@ -636,7 +636,7 @@
 }
 
 /************************************************************************ 
- *		SafeArrayCopy
+ *		SafeArrayCopy (OLEAUT32.27)
  * Make a dupplicate of a SafeArray
  */
 HRESULT WINAPI SafeArrayCopy(
@@ -689,7 +689,7 @@
 }
 
 /************************************************************************ 
- *		SafeArrayCreateVector
+ *		SafeArrayCreateVector (OLEAUT32.411)
  * Creates a one dimension safearray where the data is next to the 
  * SAFEARRAY structure.
  */
@@ -726,7 +726,7 @@
 } 
 
 /************************************************************************ 
- *		SafeArrayRedim
+ *		SafeArrayRedim (OLEAUT32.40)
  * Changes the caracteristics of the last dimension of the SafeArray
  */
 HRESULT WINAPI SafeArrayRedim(
@@ -1047,7 +1047,7 @@
 
 
 /************************************************************************ 
- *		SafeArrayGetVarType
+ *		SafeArrayGetVarType (OLEAUT32.77)
  * Returns the VARTYPE stored in the given safearray
  */
 HRESULT WINAPI SafeArrayGetVarType(
diff --git a/dlls/oleaut32/stubs.c b/dlls/oleaut32/stubs.c
index 37191d9..1678178 100644
--- a/dlls/oleaut32/stubs.c
+++ b/dlls/oleaut32/stubs.c
@@ -18,7 +18,7 @@
 DEFAULT_DEBUG_CHANNEL(ole);
 
 /***********************************************************************
- * OleIconToCursor
+ * OleIconToCursor (OLEAUT32.415)
  */
 HCURSOR WINAPI OleIconToCursor( HINSTANCE hinstExe, HICON hicon)
 {
@@ -27,7 +27,7 @@
 }
 
 /***********************************************************************
- * OleCreatePropertyFrameIndirect
+ * OleCreatePropertyFrameIndirect (OLEAUT32.416)
  */
 HRESULT WINAPI OleCreatePropertyFrameIndirect( LPOCPFIPARAMS lpParams)
 {
@@ -36,7 +36,7 @@
 }
  
 /***********************************************************************
- * OleCreatePropertyFrame
+ * OleCreatePropertyFrame (OLEAUT32.417)
  */
 HRESULT WINAPI OleCreatePropertyFrame(
     HWND hwndOwner, UINT x, UINT y, LPCOLESTR lpszCaption,ULONG cObjects,
diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c
index c9754e3..bf3a6bb 100644
--- a/dlls/oleaut32/variant.c
+++ b/dlls/oleaut32/variant.c
@@ -2203,7 +2203,7 @@
 
 
 /******************************************************************************
- *		VarUI1FromStr		[OLEAUT32.54]
+ *		VarUI1FromStr		[OLEAUT32.136]
  */
 HRESULT WINAPI VarUI1FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, BYTE* pbOut)
 {
@@ -2359,7 +2359,7 @@
 }
 
 /******************************************************************************
- *		VarI2FromI1		[OLEAUT32.48]
+ *		VarI2FromI1		[OLEAUT32.205]
  */
 HRESULT WINAPI VarI2FromI1(CHAR cIn, short* psOut)
 {
@@ -2390,7 +2390,7 @@
 }
 
 /******************************************************************************
- *		VarI2FromUI4		[OLEAUT32.49]
+ *		VarI2FromUI4		[OLEAUT32.207]
  */
 HRESULT WINAPI VarI2FromUI4(ULONG ulIn, short* psOut)
 {
@@ -2826,7 +2826,7 @@
 }
 
 /******************************************************************************
- *		VarR8FromUI1		[OLEAUT32.68]
+ *		VarR8FromUI1		[OLEAUT32.78]
  */
 HRESULT WINAPI VarR8FromUI1(BYTE bIn, double* pdblOut)
 {
@@ -2838,7 +2838,7 @@
 }
 
 /******************************************************************************
- *		VarR8FromI2		[OLEAUT32.69]
+ *		VarR8FromI2		[OLEAUT32.79]
  */
 HRESULT WINAPI VarR8FromI2(short sIn, double* pdblOut)
 {
@@ -2850,7 +2850,7 @@
 }
 
 /******************************************************************************
- *		VarR8FromI4		[OLEAUT32.70]
+ *		VarR8FromI4		[OLEAUT32.80]
  */
 HRESULT WINAPI VarR8FromI4(LONG lIn, double* pdblOut)
 {
@@ -2988,7 +2988,7 @@
 }
 
 /******************************************************************************
- *		VarDateFromI2		[OLEAUT32.222]
+ *		VarDateFromI2		[OLEAUT32.89]
  */
 HRESULT WINAPI VarDateFromI2(short sIn, DATE* pdateOut)
 {
diff --git a/dlls/olepro32/olepro32stubs.c b/dlls/olepro32/olepro32stubs.c
index 532589c..60ca0d6 100644
--- a/dlls/olepro32/olepro32stubs.c
+++ b/dlls/olepro32/olepro32stubs.c
@@ -14,7 +14,7 @@
 DEFAULT_DEBUG_CHANNEL(ole);
 
 /***********************************************************************
- *		OLEPRO32_DllUnregisterServer
+ *		OLEPRO32_DllUnregisterServer (OLEPRO32.258)
  */
 HRESULT WINAPI OLEPRO32_DllUnregisterServer()
 {
@@ -23,7 +23,7 @@
 }
 
 /***********************************************************************
- *		OLEPRO32_DllRegisterServer
+ *		OLEPRO32_DllRegisterServer (OLEPRO32.257)
  */
 HRESULT WINAPI OLEPRO32_DllRegisterServer()
 {
@@ -32,7 +32,7 @@
 }
 
 /***********************************************************************
- *		OLEPRO32_DllCanUnloadNow
+ *		OLEPRO32_DllCanUnloadNow (OLEPRO32.255)
  */
 HRESULT WINAPI OLEPRO32_DllCanUnloadNow( )
 {
@@ -41,7 +41,7 @@
 }
 
 /***********************************************************************
- *		OLEPRO32_DllGetClassObject
+ *		OLEPRO32_DllGetClassObject (OLEPRO32.256)
  */
 HRESULT WINAPI OLEPRO32_DllGetClassObject( REFCLSID rclsid, REFIID riid, LPVOID* ppv )
 {
diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c
index c9eb1c8..1f934fc 100644
--- a/dlls/opengl32/wgl.c
+++ b/dlls/opengl32/wgl.c
@@ -71,7 +71,7 @@
 }
 
 /***********************************************************************
- *		wglCreateContext
+ *		wglCreateContext (OPENGL32.@)
  */
 HGLRC WINAPI wglCreateContext(HDC hdc)
 {
@@ -104,7 +104,7 @@
 }
 
 /***********************************************************************
- *		wglCreateLayerContext
+ *		wglCreateLayerContext (OPENGL32.@)
  */
 HGLRC WINAPI wglCreateLayerContext(HDC hdc,
 				   int iLayerPlane) {
@@ -114,7 +114,7 @@
 }
 
 /***********************************************************************
- *		wglCopyContext
+ *		wglCopyContext (OPENGL32.@)
  */
 BOOL WINAPI wglCopyContext(HGLRC hglrcSrc,
 			   HGLRC hglrcDst,
@@ -125,7 +125,7 @@
 }
 
 /***********************************************************************
- *		wglDeleteContext
+ *		wglDeleteContext (OPENGL32.@)
  */
 BOOL WINAPI wglDeleteContext(HGLRC hglrc) {
   int (*WineXHandler)(Display *, XErrorEvent *);
@@ -165,7 +165,7 @@
 }
 
 /***********************************************************************
- *		wglDescribeLayerPlane
+ *		wglDescribeLayerPlane (OPENGL32.@)
  */
 BOOL WINAPI wglDescribeLayerPlane(HDC hdc,
 				  int iPixelFormat,
@@ -178,7 +178,7 @@
 }
 
 /***********************************************************************
- *		wglGetCurrentContext
+ *		wglGetCurrentContext (OPENGL32.@)
  */
 HGLRC WINAPI wglGetCurrentContext(void) {
   GLXContext gl_ctx;
@@ -197,7 +197,7 @@
 }
 
 /***********************************************************************
- *		wglGetCurrentDC
+ *		wglGetCurrentDC (OPENGL32.@)
  */
 HDC WINAPI wglGetCurrentDC(void) {
   GLXContext gl_ctx;
@@ -220,7 +220,7 @@
 }
 
 /***********************************************************************
- *		wglGetLayerPaletteEntries
+ *		wglGetLayerPaletteEntries (OPENGL32.@)
  */
 int WINAPI wglGetLayerPaletteEntries(HDC hdc,
 				     int iLayerPlane,
@@ -238,7 +238,7 @@
 }
 
 /***********************************************************************
- *		wglGetProcAddress
+ *		wglGetProcAddress (OPENGL32.@)
  */
 void* WINAPI wglGetProcAddress(LPCSTR  lpszProc) {
   void *local_func;
@@ -298,7 +298,7 @@
 }
 
 /***********************************************************************
- *		wglMakeCurrent
+ *		wglMakeCurrent (OPENGL32.@)
  */
 BOOL WINAPI wglMakeCurrent(HDC hdc,
 			   HGLRC hglrc) {
@@ -344,7 +344,7 @@
 }
 
 /***********************************************************************
- *		wglRealizeLayerPalette
+ *		wglRealizeLayerPalette (OPENGL32.@)
  */
 BOOL WINAPI wglRealizeLayerPalette(HDC hdc,
 				   int iLayerPlane,
@@ -355,7 +355,7 @@
 }
 
 /***********************************************************************
- *		wglSetLayerPaletteEntries
+ *		wglSetLayerPaletteEntries (OPENGL32.@)
  */
 int WINAPI wglSetLayerPaletteEntries(HDC hdc,
 				     int iLayerPlane,
@@ -368,7 +368,7 @@
 }
 
 /***********************************************************************
- *		wglShareLists
+ *		wglShareLists (OPENGL32.@)
  */
 BOOL WINAPI wglShareLists(HGLRC hglrc1,
 			  HGLRC hglrc2) {
@@ -399,7 +399,7 @@
 }
 
 /***********************************************************************
- *		wglSwapLayerBuffers
+ *		wglSwapLayerBuffers (OPENGL32.@)
  */
 BOOL WINAPI wglSwapLayerBuffers(HDC hdc,
 				UINT fuPlanes) {
@@ -409,7 +409,7 @@
 }
 
 /***********************************************************************
- *		wglUseFontBitmapsA
+ *		wglUseFontBitmapsA (OPENGL32.@)
  */
 BOOL WINAPI wglUseFontBitmapsA(HDC hdc,
 			       DWORD first,
@@ -431,7 +431,7 @@
 }
  
 /***********************************************************************
- *		wglUseFontOutlinesA
+ *		wglUseFontOutlinesA (OPENGL32.@)
  */
 BOOL WINAPI wglUseFontOutlinesA(HDC hdc,
 				DWORD first,
diff --git a/dlls/rpcrt4/rpcrt4_main.c b/dlls/rpcrt4/rpcrt4_main.c
index 7480b5d..1269753 100644
--- a/dlls/rpcrt4/rpcrt4_main.c
+++ b/dlls/rpcrt4/rpcrt4_main.c
@@ -265,7 +265,7 @@
 }
 
 /*************************************************************************
- *           RpcStringFreeA   [RPCRT4.436]
+ *           RpcStringFreeA   [RPCRT4.@]
  *
  * Frees a character string allocated by the RPC run-time library.
  *
@@ -281,7 +281,7 @@
 }
 
 /*************************************************************************
- *           UuidToStringA   [RPCRT4.450]
+ *           UuidToStringA   [RPCRT4.@]
  *
  * Converts a UUID to a string.
  *
diff --git a/dlls/setupapi/infparse.c b/dlls/setupapi/infparse.c
index 2582dff..0e33030 100644
--- a/dlls/setupapi/infparse.c
+++ b/dlls/setupapi/infparse.c
@@ -96,7 +96,7 @@
 }
 
 /***********************************************************************
- *		IpOpen16
+ *		IpOpen16 (SETUPX.2)
  *
  */
 RETERR16 WINAPI IpOpen16(LPCSTR lpInfFileName, HINF16 *lphInf)
@@ -106,7 +106,7 @@
 }
 
 /***********************************************************************
- *		IpClose16
+ *		IpClose16 (SETUPX.4)
  */
 RETERR16 WINAPI IpClose16(HINF16 hInf)
 {
@@ -114,7 +114,7 @@
 }
 
 /***********************************************************************
- *		IpGetProfileString16
+ *		IpGetProfileString16 (SETUPX.210)
  */
 RETERR16 WINAPI IpGetProfileString16(HINF16 hInf, LPCSTR section, LPCSTR entry, LPSTR buffer, WORD buflen) 
 {
diff --git a/dlls/setupapi/setupx_main.c b/dlls/setupapi/setupx_main.c
index dde4101..8398abc 100644
--- a/dlls/setupapi/setupx_main.c
+++ b/dlls/setupapi/setupx_main.c
@@ -55,7 +55,7 @@
 DEFAULT_DEBUG_CHANNEL(setupapi);
 
 /***********************************************************************
- *		SURegOpenKey
+ *		SURegOpenKey (SETUPX.47)
  */
 DWORD WINAPI SURegOpenKey( HKEY hkey, LPCSTR lpszSubKey, LPHKEY retkey )
 {
@@ -64,7 +64,7 @@
 }
 
 /***********************************************************************
- *		SURegQueryValueEx
+ *		SURegQueryValueEx (SETUPX.50)
  */
 DWORD WINAPI SURegQueryValueEx( HKEY hkey, LPSTR lpszValueName,
                                 LPDWORD lpdwReserved, LPDWORD lpdwType,
diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c
index bb7ac5f..2d7131a 100644
--- a/dlls/setupapi/stubs.c
+++ b/dlls/setupapi/stubs.c
@@ -12,7 +12,7 @@
 
 
 /***********************************************************************
- *		SetupCloseFileQueue
+ *		SetupCloseFileQueue (SETUPAPI.56)
  */
 VOID WINAPI SetupCloseFileQueue(HSPFILEQ QueueHandle)
 {
@@ -20,7 +20,7 @@
 }
 
 /***********************************************************************
- *		SetupCommitFileQueueA
+ *		SetupCommitFileQueueA (SETUPAPI.59)
  */
 BOOL WINAPI SetupCommitFileQueueA(HWND Owner, HSPFILEQ QueueHandle,
 				  PSP_FILE_CALLBACK_A MsgHandler,
@@ -31,7 +31,7 @@
 }
 
 /***********************************************************************
- *		SetupIterateCabinetA
+ *		SetupIterateCabinetA (SETUPAPI.205)
  */
 BOOL WINAPI SetupIterateCabinetA(PCSTR CabinetFile, DWORD Reserved,
                                  PSP_FILE_CALLBACK_A MsgHandler, PVOID Context)
@@ -41,7 +41,7 @@
 }
 
 /***********************************************************************
- *		SetupIterateCabinetW
+ *		SetupIterateCabinetW (SETUPAPI.206)
  */
 BOOL WINAPI SetupIterateCabinetW(PWSTR CabinetFile, DWORD Reserved,
                                  PSP_FILE_CALLBACK_W MsgHandler, PVOID Context) 
@@ -52,7 +52,7 @@
 
 
 /***********************************************************************
- *		SetupGetLineTextA
+ *		SetupGetLineTextA (SETUPAPI.177)
  */
 BOOL WINAPI SetupGetLineTextA (PINFCONTEXT Context, HINF InfHandle,
                         PCSTR Section, PCSTR Key, LPSTR ReturnBuffer,
@@ -63,7 +63,7 @@
 }
 
 /***********************************************************************
- *		SetupGetStringFieldA
+ *		SetupGetStringFieldA (SETUPAPI.187)
  */
 BOOL WINAPI SetupGetStringFieldA(PINFCONTEXT Context, DWORD FieldIndex, 
                                  LPSTR ReturnBuffer, DWORD ReturnBufferSize,
@@ -75,7 +75,7 @@
 
 
 /***********************************************************************
- *		SetupFindNextLine
+ *		SetupFindNextLine (SETUPAPI.159)
  */
 BOOL WINAPI SetupFindNextLine (PINFCONTEXT ContextIn, PINFCONTEXT ContextOut)
 {
@@ -85,7 +85,7 @@
 
 
 /***********************************************************************
- *		SetupInitDefaultQueueCallback
+ *		SetupInitDefaultQueueCallback (SETUPAPI.191)
  */
 PVOID WINAPI SetupInitDefaultQueueCallback(HWND OwnerWindow)
 {
@@ -94,7 +94,7 @@
 }
 
 /***********************************************************************
- *		SetupInitDefaultQueueCallbackEx
+ *		SetupInitDefaultQueueCallbackEx (SETUPAPI.192)
  */
 PVOID WINAPI SetupInitDefaultQueueCallbackEx(HWND OwnerWindow,
 					     HWND AlternativeProgressWindow,
@@ -107,7 +107,7 @@
 }
 
 /***********************************************************************
- *		SetupCloseInfFile
+ *		SetupCloseInfFile (SETUPAPI.57)
  */
 VOID WINAPI SetupCloseInfFile (HINF InfHandle)
 {
@@ -116,7 +116,7 @@
 
 
 /***********************************************************************
- *		SetupDefaultQueueCallbackA
+ *		SetupDefaultQueueCallbackA (SETUPAPI.68)
  */
 UINT WINAPI SetupDefaultQueueCallbackA (PVOID Context, UINT Notification,
                                         UINT Param1, UINT Param2)
@@ -127,7 +127,7 @@
 
 
 /***********************************************************************
- *		SetupFindFirstLineA
+ *		SetupFindFirstLineA (SETUPAPI.157)
  */
 BOOL WINAPI SetupFindFirstLineA (HINF InfHandle, PCSTR Section, PCSTR Key,
                                  PINFCONTEXT Context)
@@ -137,7 +137,7 @@
 }
 
 /***********************************************************************
- *		SetupGetLineByIndexA
+ *		SetupGetLineByIndexA (SETUPAPI.173)
  */
 BOOL WINAPI SetupGetLineByIndexA (HINF InfHandle, PCSTR Section, DWORD Index,
                                  PINFCONTEXT Context)
@@ -148,7 +148,7 @@
 
 
 /***********************************************************************
- *		SetupInstallFromInfSectionA
+ *		SetupInstallFromInfSectionA (SETUPAPI.201)
  */
 BOOL WINAPI SetupInstallFromInfSectionA (HWND Owner, HINF InfHandle, PCSTR SectionName,
                                          UINT Flags, HKEY RelativeKeyRoot, PCSTR SourceRootPath,
@@ -161,7 +161,7 @@
 }
 
 /***********************************************************************
- *		SetupOpenAppendInfFileA
+ *		SetupOpenAppendInfFileA (SETUPAPI.209)
  */
 BOOL WINAPI SetupOpenAppendInfFileA (PCSTR FileName, HINF InfHandle,
 				    PUINT ErrorLine)
@@ -171,7 +171,7 @@
 }
 
 /***********************************************************************
- *		SetupOpenFileQueue
+ *		SetupOpenFileQueue (SETUPAPI.211)
  */
 HSPFILEQ WINAPI SetupOpenFileQueue (VOID)
 {
@@ -180,7 +180,7 @@
 }
 
 /***********************************************************************
- *		SetupOpenInfFileA
+ *		SetupOpenInfFileA (SETUPAPI.212)
  */
 HINF WINAPI SetupOpenInfFileA (PCSTR FileName, PCSTR InfClass, DWORD InfStyle,
                                PUINT ErrorLine)
@@ -190,7 +190,7 @@
 }
 
 /***********************************************************************
- *		SetupQueueCopyA
+ *		SetupQueueCopyA (SETUPAPI.230)
  */
 BOOL WINAPI SetupQueueCopyA (HSPFILEQ QueueHandle, PCSTR SourceRootPath, PCSTR SourcePath,
 			     PCSTR SourceFileName, PCSTR SourceDescription, PCSTR SourceTagFile,
@@ -201,7 +201,7 @@
 }
 
 /***********************************************************************
- *		SetupSetDirectoryIdA
+ *		SetupSetDirectoryIdA (SETUPAPI.259)
  */
 BOOL WINAPI SetupSetDirectoryIdA (HINF InfHandle,
 				  DWORD Id,
@@ -213,7 +213,7 @@
 
 
 /***********************************************************************
- *		SetupTermDefaultQueueCallback
+ *		SetupTermDefaultQueueCallback (SETUPAPI.267)
  */
 VOID WINAPI SetupTermDefaultQueueCallback (PVOID Callback)
 {
diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c
index 466d7b6..220eed7 100644
--- a/dlls/shdocvw/shdocvw_main.c
+++ b/dlls/shdocvw/shdocvw_main.c
@@ -15,7 +15,7 @@
 DEFAULT_DEBUG_CHANNEL(shdocvw);
 
 /***********************************************************************
- *              DllCanUnloadNow (SHDOCVW.109) */
+ *              DllCanUnloadNow (SHDOCVW.@) */
 HRESULT WINAPI SHDOCVW_DllCanUnloadNow(void)
 {
     FIXME("(void): stub\n");
@@ -24,7 +24,7 @@
 }
 
 /*************************************************************************
- *              DllGetClassObject (SHDOCVW.312)
+ *              DllGetClassObject (SHDOCVW.@)
  */
 HRESULT WINAPI SHDOCVW_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
 {
@@ -43,7 +43,7 @@
 }
 
 /***********************************************************************
- *              DllGetVersion (SHDOCVW.113)
+ *              DllGetVersion (SHDOCVW.@)
  */
 HRESULT WINAPI SHDOCVW_DllGetVersion (DLLVERSIONINFO *pdvi)
 {
@@ -52,7 +52,7 @@
 }
 
 /*************************************************************************
- *              DllInstall (SHDOCVW.114)
+ *              DllInstall (SHDOCVW.@)
  */
 HRESULT WINAPI SHDOCVW_DllInstall(BOOL bInstall, LPCWSTR cmdline)
 {
@@ -62,7 +62,7 @@
 }
 
 /***********************************************************************
- *		DllRegisterServer (SHDOCVW.124)
+ *		DllRegisterServer (SHDOCVW.@)
  */
 HRESULT WINAPI SHDOCVW_DllRegisterServer()
 {
@@ -71,7 +71,7 @@
 }
 
 /***********************************************************************
- *		DllUnregisterServer (SHDOCVW.127)
+ *		DllUnregisterServer (SHDOCVW.@)
  */
 HRESULT WINAPI SHDOCVW_DllUnregisterServer()
 {
diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c
index 8221fb2..5533a50 100644
--- a/dlls/shell32/brsfolder.c
+++ b/dlls/shell32/brsfolder.c
@@ -308,7 +308,7 @@
 }
 
 /*************************************************************************
- * SHBrowseForFolderA [SHELL32.209]
+ * SHBrowseForFolderA [SHELL32.@]
  *
  */
 LPITEMIDLIST WINAPI SHBrowseForFolderA (LPBROWSEINFOA lpbi)
diff --git a/dlls/shell32/changenotify.c b/dlls/shell32/changenotify.c
index 8169567..18896ea 100644
--- a/dlls/shell32/changenotify.c
+++ b/dlls/shell32/changenotify.c
@@ -269,7 +269,7 @@
 }
 
 /*************************************************************************
- * SHChangeNotifyAW				[SHELL32.239]
+ * SHChangeNotifyAW				[SHELL32.@]
  */
 void WINAPI SHChangeNotifyAW (LONG wEventId, UINT  uFlags, LPCVOID dwItem1, LPCVOID dwItem2)
 {
diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c
index fbcf2f7..df1a113 100644
--- a/dlls/shell32/control.c
+++ b/dlls/shell32/control.c
@@ -346,7 +346,7 @@
 }
 
 /*************************************************************************
- * Control_RunDLL			[SHELL32.12]
+ * Control_RunDLL			[SHELL32.@]
  *
  */
 void WINAPI Control_RunDLL(HWND hWnd, HINSTANCE hInst, LPCSTR cmd, DWORD nCmdShow)
@@ -366,7 +366,7 @@
 }
 
 /*************************************************************************
- * Control_FillCache_RunDLL			[SHELL32.8]
+ * Control_FillCache_RunDLL			[SHELL32.@]
  *
  */
 HRESULT WINAPI Control_FillCache_RunDLL(HWND hWnd, HANDLE hModule, DWORD w, DWORD x)
diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c
index 74ac1ef..5c9df21 100644
--- a/dlls/shell32/pidl.c
+++ b/dlls/shell32/pidl.c
@@ -236,7 +236,7 @@
 }
 
 /*************************************************************************
- * ILLoadFromStream
+ * ILLoadFromStream (SHELL32.26)
  *
  * NOTES
  *   the first two bytes are the len, the pidl is following then
@@ -280,7 +280,7 @@
 }
 
 /*************************************************************************
- * ILSaveToStream
+ * ILSaveToStream (SHELL32.27)
  *
  * NOTES
  *   the first two bytes are the len, the pidl is following then
@@ -383,7 +383,7 @@
 }
 
 /*************************************************************************
- * ILGlobalClone [SHELL32.97]
+ * ILGlobalClone [SHELL32.20]
  *
  */
 LPITEMIDLIST WINAPI ILGlobalClone(LPCITEMIDLIST pidl)
@@ -818,7 +818,7 @@
 }
 
 /*************************************************************************
- * SHGetSpecialFolderLocation		[SHELL32.223]
+ * SHGetSpecialFolderLocation		[SHELL32.@]
  *
  * gets the folder locations from the registry and creates a pidl
  * creates missing reg keys and directorys
@@ -945,7 +945,7 @@
 	return E_INVALIDARG;
 }
 /*************************************************************************
- * SHGetDataFromIDListW [SHELL32.247]
+ * SHGetDataFromIDListW [SHELL32.248]
  *
  */
 HRESULT WINAPI SHGetDataFromIDListW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, int nFormat, LPVOID dest, int len)
@@ -989,7 +989,7 @@
 }
 
 /*************************************************************************
- * SHGetPathFromIDListA		[SHELL32.261][NT 4.0: SHELL32.220]
+ * SHGetPathFromIDListA		[SHELL32.@][NT 4.0: SHELL32.220]
  *
  * PARAMETERS
  *  pidl,   [IN] pidl 
@@ -1039,7 +1039,7 @@
 	return TRUE;
 }
 /*************************************************************************
- * SHGetPathFromIDListW 			[SHELL32.262]
+ * SHGetPathFromIDListW 			[SHELL32.@]
  */
 BOOL WINAPI SHGetPathFromIDListW (LPCITEMIDLIST pidl,LPWSTR pszPath)
 {	char sTemp[MAX_PATH];
@@ -1102,7 +1102,7 @@
 }
 
 /*************************************************************************
- * SHGetPathFromIDListAW		[SHELL32.221][NT 4.0: SHELL32.219]
+ * SHGetPathFromIDListAW		[SHELL32.@][NT 4.0: SHELL32.219]
  */
 BOOL WINAPI SHGetPathFromIDListAW(LPCITEMIDLIST pidl,LPVOID pszPath)
 {
diff --git a/dlls/shell32/shell.c b/dlls/shell32/shell.c
index 4402b1f..e2d2e26 100644
--- a/dlls/shell32/shell.c
+++ b/dlls/shell32/shell.c
@@ -635,7 +635,7 @@
 }
 
 /*************************************************************************
- *				ExtractAssociatedIconA
+ *				ExtractAssociatedIconA (SHELL32.@)
  * 
  * Return icon for given file (either from file itself or from associated
  * executable) and patch parameters if needed.
diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c
index e55db24..20e31cb 100644
--- a/dlls/shell32/shell32_main.c
+++ b/dlls/shell32/shell32_main.c
@@ -31,7 +31,7 @@
 
 #define MORE_DEBUG 1
 /*************************************************************************
- * CommandLineToArgvW			[SHELL32.7]
+ * CommandLineToArgvW			[SHELL32.@]
  */
 LPWSTR* WINAPI CommandLineToArgvW(LPWSTR cmdline,LPDWORD numargs)
 {	LPWSTR  *argv,s,t;
@@ -355,7 +355,7 @@
 }
 
 /*************************************************************************
- * DuplicateIcon			[SHELL32.188]
+ * DuplicateIcon			[SHELL32.@]
  */
 HICON WINAPI DuplicateIcon( HINSTANCE hInstance, HICON hIcon)
 {
@@ -378,7 +378,7 @@
     
 
 /*************************************************************************
- * ExtractIconA				[SHELL32.133]
+ * ExtractIconA				[SHELL32.@]
  *
  * FIXME
  *  if the filename is not a file return 1
@@ -399,7 +399,7 @@
 }
 
 /*************************************************************************
- * ExtractIconW				[SHELL32.180]
+ * ExtractIconW				[SHELL32.@]
  *
  * fixme
  *  is the filename is not a file return 1
@@ -418,7 +418,7 @@
 }
 
 /*************************************************************************
- * FindExecutableA			[SHELL32.184]
+ * FindExecutableA			[SHELL32.@]
  */
 HINSTANCE WINAPI FindExecutableA( LPCSTR lpFile, LPCSTR lpDirectory,
                                       LPSTR lpResult )
@@ -452,7 +452,7 @@
 }
 
 /*************************************************************************
- * FindExecutableW			[SHELL32.219]
+ * FindExecutableW			[SHELL32.@]
  */
 HINSTANCE WINAPI FindExecutableW(LPCWSTR lpFile, LPCWSTR lpDirectory,
                                      LPWSTR lpResult)
@@ -488,7 +488,7 @@
 }
 
 /*************************************************************************
- * SHAppBarMessage			[SHELL32.207]
+ * SHAppBarMessage			[SHELL32.@]
  */
 UINT WINAPI SHAppBarMessage(DWORD msg, PAPPBARDATA data)
 {
@@ -536,7 +536,7 @@
 }
 
 /*************************************************************************
- * SHHelpShortcuts_RunDLL		[SHELL32.224]
+ * SHHelpShortcuts_RunDLL		[SHELL32.@]
  *
  */
 DWORD WINAPI SHHelpShortcuts_RunDLL (DWORD dwArg1, DWORD dwArg2, DWORD dwArg3, DWORD dwArg4)
@@ -547,7 +547,7 @@
 }
 
 /*************************************************************************
- * SHLoadInProc				[SHELL32.225]
+ * SHLoadInProc				[SHELL32.@]
  * Create an instance of specified object class from within 
  * the shell process and release it immediately
  */
@@ -567,7 +567,7 @@
 }
 
 /*************************************************************************
- * ShellExecuteA			[SHELL32.245]
+ * ShellExecuteA			[SHELL32.290]
  */
 HINSTANCE WINAPI ShellExecuteA( HWND hWnd, LPCSTR lpOperation,
                                     LPCSTR lpFile, LPCSTR lpParameters,
@@ -740,7 +740,7 @@
 
 
 /*************************************************************************
- * ShellAboutA				[SHELL32.243]
+ * ShellAboutA				[SHELL32.288]
  */
 BOOL WINAPI ShellAboutA( HWND hWnd, LPCSTR szApp, LPCSTR szOtherStuff,
                              HICON hIcon )
@@ -764,7 +764,7 @@
 
 
 /*************************************************************************
- * ShellAboutW				[SHELL32.244]
+ * ShellAboutW				[SHELL32.289]
  */
 BOOL WINAPI ShellAboutW( HWND hWnd, LPCWSTR szApp, LPCWSTR szOtherStuff,
                              HICON hIcon )
@@ -792,7 +792,7 @@
 }
 
 /*************************************************************************
- * FreeIconList
+ * FreeIconList (SHELL32.@)
  */
 void WINAPI FreeIconList( DWORD dw )
 { FIXME("(%lx): stub\n",dw);
@@ -936,7 +936,7 @@
 }
 
 /*************************************************************************
- * DllInstall         [SHELL32.202]
+ * DllInstall         [SHELL32.@]
  *
  * PARAMETERS
  *   
diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c
index 4e20366..c182653 100644
--- a/dlls/shell32/shellole.c
+++ b/dlls/shell32/shellole.c
@@ -135,7 +135,7 @@
 }
 
 /*************************************************************************
- *			 SHGetMalloc			[SHELL32.220]
+ *			 SHGetMalloc			[SHELL32.@]
  * returns the interface to shell malloc.
  *
  * [SDK header win95/shlobj.h:
@@ -151,7 +151,7 @@
 }
 
 /*************************************************************************
- * SHGetDesktopFolder			[SHELL32.216]
+ * SHGetDesktopFolder			[SHELL32.@]
  */
 LPSHELLFOLDER pdesktopfolder=NULL;
 
@@ -553,7 +553,7 @@
 }
 
 /*************************************************************************
- *  DragQueryFileA		[SHELL32.81] [shell32.82]
+ *  DragQueryFileA		[SHELL32.82] [shell32.82]
  */
 UINT WINAPI DragQueryFileA(
 	HDROP hDrop,
diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c
index 99d87fe..8555b1f 100644
--- a/dlls/shell32/shellord.c
+++ b/dlls/shell32/shellord.c
@@ -434,7 +434,7 @@
 }
 
 /*************************************************************************
- * SHAddToRecentDocs				[SHELL32.234]
+ * SHAddToRecentDocs				[SHELL32.@]
  *
  * PARAMETERS
  *   uFlags  [IN] SHARD_PATH or SHARD_PIDL
@@ -665,7 +665,7 @@
 	return (HRESULT) lpUnknown;
 }
 /*************************************************************************
- * SHGetInstanceExplorer			[SHELL32.256]
+ * SHGetInstanceExplorer			[SHELL32.@]
  *
  * NOTES
  *  gets the interface pointer of the explorer and a reference
@@ -916,7 +916,7 @@
 }
 
 /************************************************************************
- *	DoEnvironmentSubstA			[SHELL32.1222]
+ *	DoEnvironmentSubstA			[SHELL32.@]
  *
  */
 HRESULT WINAPI DoEnvironmentSubstA(LPSTR x, LPSTR y)
@@ -926,7 +926,7 @@
 }
 
 /************************************************************************
- *	DoEnvironmentSubstW			[SHELL32.1223]
+ *	DoEnvironmentSubstW			[SHELL32.@]
  *
  */
 HRESULT WINAPI DoEnvironmentSubstW(LPWSTR x, LPWSTR y)
diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c
index 078ef31..aefb71f 100644
--- a/dlls/shell32/shellpath.c
+++ b/dlls/shell32/shellpath.c
@@ -596,7 +596,7 @@
 }
 
 /*************************************************************************
-*	PathProcessCommandAW
+*	PathProcessCommandAW (SHELL32.653)
 */
 HRESULT WINAPI PathProcessCommandAW (
 	LPCVOID lpszPath,
@@ -614,7 +614,7 @@
 */
 
 /*************************************************************************
- * PathSetDlgItemPathAW
+ * PathSetDlgItemPathAW (SHELL32.48)
  */
 BOOL WINAPI PathSetDlgItemPathAW(HWND hDlg, int id, LPCVOID pszPath) 
 {	if (SHELL_OsIsUnicode())
@@ -624,7 +624,7 @@
 
 
 /*************************************************************************
- * SHGetSpecialFolderPathA [SHELL32.175]
+ * SHGetSpecialFolderPathA [SHELL32.@]
  * 
  * converts csidl to path
  */
@@ -1079,7 +1079,7 @@
 }
 
 /*************************************************************************
- * SHGetSpecialFolderPathAW
+ * SHGetSpecialFolderPathAW (SHELL32.175)
  */
 BOOL WINAPI SHGetSpecialFolderPathAW (
 	HWND hwndOwner,
diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c
index e1e4e53..e02f5b4 100644
--- a/dlls/shell32/shlfileop.c
+++ b/dlls/shell32/shlfileop.c
@@ -148,7 +148,7 @@
 }
 
 /*************************************************************************
- * SHFileOperationA				[SHELL32.243]
+ * SHFileOperationA				[SHELL32.@]
  *
  * NOTES
  *     exported by name
@@ -205,7 +205,7 @@
 }
 
 /*************************************************************************
- * SHFileOperationW				[SHELL32.244]
+ * SHFileOperationW				[SHELL32.@]
  *
  * NOTES
  *     exported by name
@@ -217,7 +217,7 @@
 }
 
 /*************************************************************************
- * SHFileOperation				[SHELL32.242]
+ * SHFileOperation				[SHELL32.@]
  *
  */
 DWORD WINAPI SHFileOperationAW(LPVOID lpFileOp)
diff --git a/dlls/shell32/systray.c b/dlls/shell32/systray.c
index 6549893..cd62f77 100644
--- a/dlls/shell32/systray.c
+++ b/dlls/shell32/systray.c
@@ -335,7 +335,8 @@
 }
 
 /*************************************************************************
- * Shell_NotifyIconA			[SHELL32.297][SHELL32.296]
+ * Shell_NotifyIcon			[SHELL32.296]
+ * Shell_NotifyIconA			[SHELL32.297]
  */
 BOOL WINAPI Shell_NotifyIconA(DWORD dwMessage, PNOTIFYICONDATAA pnid )
 {
diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c
index ba163b0..341595c 100644
--- a/dlls/shlwapi/ordinal.c
+++ b/dlls/shlwapi/ordinal.c
@@ -1041,7 +1041,7 @@
 }
 
 /*************************************************************************
- *	SHGetInverseCMAP
+ *	SHGetInverseCMAP (SHLWAPI.@)
  */
 DWORD WINAPI SHGetInverseCMAP (LPVOID x, DWORD why)
 {
diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c
index 081aef5..bc96a6d 100644
--- a/dlls/shlwapi/path.c
+++ b/dlls/shlwapi/path.c
@@ -1143,7 +1143,7 @@
 }
 
 /*************************************************************************
- * PathIsURLA
+ * PathIsURLA (SHLWAPI.@)
  */
 BOOL WINAPI PathIsURLA(LPCSTR lpstrPath)
 {
@@ -1171,7 +1171,7 @@
 }  
 
 /*************************************************************************
- * PathIsURLW
+ * PathIsURLW (SHLWAPI.@)
  */
 BOOL WINAPI PathIsURLW(LPCWSTR lpstrPath)
 {
diff --git a/dlls/ttydrv/user.c b/dlls/ttydrv/user.c
index 6d65162..806ef7a 100644
--- a/dlls/ttydrv/user.c
+++ b/dlls/ttydrv/user.c
@@ -13,14 +13,14 @@
 
 
 /***********************************************************************
- *		TTYDRV_InitKeyboard
+ *		TTYDRV_InitKeyboard (TTYDRV.@)
  */
 void TTYDRV_InitKeyboard(void)
 {
 }
 
 /***********************************************************************
- *		TTYDRV_VkKeyScan
+ *		TTYDRV_VkKeyScan (TTYDRV.@)
  */
 WORD TTYDRV_VkKeyScan(CHAR cChar)
 {
@@ -28,7 +28,7 @@
 }
 
 /***********************************************************************
- *		TTYDRV_MapVirtualKey
+ *		TTYDRV_MapVirtualKey (TTYDRV.@)
  */
 UINT16 TTYDRV_MapVirtualKey(UINT16 wCode, UINT16 wMapType)
 {
@@ -36,7 +36,7 @@
 }
 
 /***********************************************************************
- *		TTYDRV_GetKeyNameText
+ *		TTYDRV_GetKeyNameText (TTYDRV.@)
  */
 INT16 TTYDRV_GetKeyNameText( LONG lParam, LPSTR lpBuffer, INT16 nSize )
 {  
@@ -48,7 +48,7 @@
 }
 
 /***********************************************************************
- *		TTYDRV_ToUnicode
+ *		TTYDRV_ToUnicode (TTYDRV.@)
  */
 INT TTYDRV_ToUnicode( UINT virtKey, UINT scanCode, LPBYTE lpKeyState,
 		      LPWSTR pwszBuff, int cchBuff, UINT flags )
@@ -57,14 +57,14 @@
 }
 
 /***********************************************************************
- *		TTYDRV_Beep
+ *		TTYDRV_Beep (TTYDRV.@)
  */
 void TTYDRV_Beep(void)
 {
 }
 
 /***********************************************************************
- *		TTYDRV_GetDIState
+ *		TTYDRV_GetDIState (TTYDRV.@)
  */
 BOOL TTYDRV_GetDIState(DWORD len, LPVOID ptr)
 {
@@ -72,7 +72,7 @@
 }
 
 /***********************************************************************
- *		TTYDRV_GetDIData
+ *		TTYDRV_GetDIData (TTYDRV.@)
  */
 BOOL TTYDRV_GetDIData( BYTE *keystate, DWORD dodsize, LPDIDEVICEOBJECTDATA dod,
                        LPDWORD entries, DWORD flags )
@@ -81,28 +81,28 @@
 }
 
 /***********************************************************************
- *           TTYDRV_InitMouse
+ *           TTYDRV_InitMouse (TTYDRV.@)
  */
 void TTYDRV_InitMouse(LPMOUSE_EVENT_PROC proc)
 {
 }
 
 /***********************************************************************
- *		TTYDRV_SetCursor
+ *		TTYDRV_SetCursor (TTYDRV.@)
  */
 void TTYDRV_SetCursor( struct tagCURSORICONINFO *lpCursor )
 {
 }
 
 /***********************************************************************
- *		TTYDRV_MoveCursor
+ *		TTYDRV_MoveCursor (TTYDRV.@)
  */
 void TTYDRV_MoveCursor(WORD wAbsX, WORD wAbsY)
 {
 }
 
 /***********************************************************************
- *              TTYDRV_GetScreenSaveActive
+ *              TTYDRV_GetScreenSaveActive (TTYDRV.@)
  *
  * Returns the active status of the screen saver
  */
@@ -112,7 +112,7 @@
 }
 
 /***********************************************************************
- *              TTYDRV_SetScreenSaveActive
+ *              TTYDRV_SetScreenSaveActive (TTYDRV.@)
  *
  * Activate/Deactivate the screen saver
  */
@@ -122,7 +122,7 @@
 }
 
 /***********************************************************************
- *              TTYDRV_GetScreenSaveTimeout
+ *              TTYDRV_GetScreenSaveTimeout (TTYDRV.@)
  *
  * Return the screen saver timeout
  */
@@ -132,7 +132,7 @@
 }
 
 /***********************************************************************
- *              TTYDRV_SetScreenSaveTimeout
+ *              TTYDRV_SetScreenSaveTimeout (TTYDRV.@)
  *
  * Set the screen saver timeout
  */
@@ -142,7 +142,7 @@
 }
 
 /**********************************************************************
- *		TTYDRV_LoadOEMResource
+ *		TTYDRV_LoadOEMResource (TTYDRV.@)
  */
 HANDLE TTYDRV_LoadOEMResource(WORD resid, WORD type)
 {
@@ -163,28 +163,28 @@
 }
 
 /***********************************************************************
- *		TTYDRV_AcquireClipboard
+ *		TTYDRV_AcquireClipboard (TTYDRV.@)
  */
 void TTYDRV_AcquireClipboard(void)
 {
 }
 
 /***********************************************************************
- *		TTYDRV_ReleaseClipboard
+ *		TTYDRV_ReleaseClipboard (TTYDRV.@)
  */
 void TTYDRV_ReleaseClipboard(void)
 {
 }
 
 /***********************************************************************
- *		TTYDRV_SetClipboardData
+ *		TTYDRV_SetClipboardData (TTYDRV.@)
  */
 void TTYDRV_SetClipboardData(UINT wFormat)
 {
 }
 
 /***********************************************************************
- *		TTYDRV_GetClipboardData
+ *		TTYDRV_GetClipboardData (TTYDRV.@)
  */
 BOOL TTYDRV_GetClipboardData(UINT wFormat)
 {
@@ -192,7 +192,7 @@
 }
 
 /***********************************************************************
- *		TTYDRV_IsClipboardFormatAvailable
+ *		TTYDRV_IsClipboardFormatAvailable (TTYDRV.@)
  */
 BOOL TTYDRV_IsClipboardFormatAvailable(UINT wFormat)
 {
@@ -200,7 +200,7 @@
 }
 
 /**************************************************************************
- *		TTYDRV_RegisterClipboardFormat
+ *		TTYDRV_RegisterClipboardFormat (TTYDRV.@)
  *
  * Registers a custom clipboard format
  * Returns: TRUE - new format registered, FALSE - Format already registered
@@ -211,7 +211,7 @@
 }
 
 /**************************************************************************
- *		TTYDRV_IsSelectionOwner
+ *		TTYDRV_IsSelectionOwner (TTYDRV.@)
  *
  * Returns: TRUE - We(WINE) own the selection, FALSE - Selection not owned by us
  */
@@ -221,7 +221,7 @@
 }
 
 /***********************************************************************
- *		TTYDRV_ResetSelectionOwner
+ *		TTYDRV_ResetSelectionOwner (TTYDRV.@)
  */
 void TTYDRV_ResetSelectionOwner(struct tagWND *pWnd, BOOL bFooBar)
 {
diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c
index 8ba7e4e..1c48b97 100644
--- a/dlls/urlmon/umon.c
+++ b/dlls/urlmon/umon.c
@@ -19,7 +19,7 @@
 static WCHAR BSCBHolder[] = { '_','B','S','C','B','_','H','o','l','d','e','r','_',0 };
 
 /***********************************************************************
- *           CreateURLMoniker (URLMON.22)
+ *           CreateURLMoniker (URLMON.@)
  *
  * Create a url moniker
  *
@@ -40,7 +40,7 @@
 }
 
 /***********************************************************************
- *           RegisterBindStatusCallback (URLMON.52)
+ *           RegisterBindStatusCallback (URLMON.@)
  *
  * Register a bind status callback
  *
@@ -76,7 +76,7 @@
 }
 
 /***********************************************************************
- *           RevokeBindStatusCallback (URLMON.57)
+ *           RevokeBindStatusCallback (URLMON.@)
  *
  * Unregister a bind status callback
  *
diff --git a/dlls/version/info.c b/dlls/version/info.c
index a3644ad..6b3bcbe 100644
--- a/dlls/version/info.c
+++ b/dlls/version/info.c
@@ -422,7 +422,7 @@
 }
 
 /***********************************************************************
- *           GetFileVersionInfoSizeA         [VERSION.2]
+ *           GetFileVersionInfoSizeA         [VERSION.@]
  */
 DWORD WINAPI GetFileVersionInfoSizeA( LPCSTR filename, LPDWORD handle )
 {
@@ -477,7 +477,7 @@
 }
 
 /***********************************************************************
- *           GetFileVersionInfoSizeW         [VERSION.3]
+ *           GetFileVersionInfoSizeW         [VERSION.@]
  */
 DWORD WINAPI GetFileVersionInfoSizeW( LPCWSTR filename, LPDWORD handle )
 {
@@ -490,7 +490,7 @@
 }
 
 /***********************************************************************
- *           GetFileVersionInfoA             [VERSION.1]
+ *           GetFileVersionInfoA             [VERSION.@]
  */
 BOOL WINAPI GetFileVersionInfoA( LPCSTR filename, DWORD handle,
                                     DWORD datasize, LPVOID data )
@@ -529,7 +529,7 @@
 }
 
 /***********************************************************************
- *           GetFileVersionInfoW             [VERSION.4]
+ *           GetFileVersionInfoW             [VERSION.@]
  */
 BOOL WINAPI GetFileVersionInfoW( LPCWSTR filename, DWORD handle,
                                     DWORD datasize, LPVOID data )
@@ -606,7 +606,7 @@
 }
 
 /***********************************************************************
- *           VerQueryValueA              [VERSION.12]
+ *           VerQueryValueA              [VERSION.@]
  */
 DWORD WINAPI VerQueryValueA( LPVOID pBlock, LPCSTR lpSubBlock,
                                LPVOID *lplpBuffer, UINT *puLen )
@@ -663,7 +663,7 @@
 }
 
 /***********************************************************************
- *           VerQueryValueW              [VERSION.13]
+ *           VerQueryValueW              [VERSION.@]
  */
 DWORD WINAPI VerQueryValueW( LPVOID pBlock, LPCWSTR lpSubBlock,
                                LPVOID *lplpBuffer, UINT *puLen )
diff --git a/dlls/version/install.c b/dlls/version/install.c
index 0e2a2f7..bf52a0d 100644
--- a/dlls/version/install.c
+++ b/dlls/version/install.c
@@ -197,7 +197,7 @@
 }
 
 /*****************************************************************************
- * VerFindFileW						[VERSION.6]
+ * VerFindFileW						[VERSION.@]
  */
 DWORD WINAPI VerFindFileW( UINT flags,LPCWSTR lpszFilename,LPCWSTR lpszWinDir,
                            LPCWSTR lpszAppDir, LPWSTR lpszCurDir,UINT *lpuCurDirLen,
@@ -337,7 +337,7 @@
 
 
 /******************************************************************************
- * VerInstallFileA [VERSION.7]
+ * VerInstallFileA [VERSION.@]
  */
 DWORD WINAPI VerInstallFileA(
 	UINT flags,LPCSTR srcfilename,LPCSTR destfilename,LPCSTR srcdir,
@@ -504,7 +504,7 @@
 
 
 /******************************************************************************
- * VerInstallFileW				[VERSION.8]
+ * VerInstallFileW				[VERSION.@]
  */
 DWORD WINAPI VerInstallFileW(
 	UINT flags,LPCWSTR srcfilename,LPCWSTR destfilename,LPCWSTR srcdir,
diff --git a/dlls/win32s/w32skernel.c b/dlls/win32s/w32skernel.c
index 75b0101..a5cfe5d 100644
--- a/dlls/win32s/w32skernel.c
+++ b/dlls/win32s/w32skernel.c
@@ -12,7 +12,7 @@
 #include "thread.h"
 
 /***********************************************************************
- *		GetWin32sDirectory
+ *		GetWin32sDirectory (W32SKRNL.14)
  */
 LPSTR WINAPI GetWin32sDirectory(void)
 {
diff --git a/dlls/win32s/win32s16.c b/dlls/win32s/win32s16.c
index cf59fae..0fe87df 100644
--- a/dlls/win32s/win32s16.c
+++ b/dlls/win32s/win32s16.c
@@ -14,7 +14,7 @@
 DEFAULT_DEBUG_CHANNEL(dll);
 
 /***********************************************************************
- *		BootTask16
+ *		BootTask16 (WIN32S16.2)
  */
 void WINAPI BootTask16()
 {
diff --git a/dlls/winaspi/winaspi32.c b/dlls/winaspi/winaspi32.c
index f8b244a..cd1c7bb 100644
--- a/dlls/winaspi/winaspi32.c
+++ b/dlls/winaspi/winaspi32.c
@@ -462,7 +462,7 @@
 
 
 /*******************************************************************
- *     GetASPI32SupportInfo		[WNASPI32.0]
+ *     GetASPI32SupportInfo		[WNASPI32.1]
  *
  * Checks if the ASPI subsystem is initialized correctly.
  *
@@ -481,7 +481,7 @@
 }
 
 /***********************************************************************
- *             SendASPI32Command (WNASPI32.1)
+ *             SendASPI32Command (WNASPI32.2)
  */
 DWORD __cdecl SendASPI32Command(LPSRB lpSRB)
 {
@@ -559,7 +559,7 @@
 
 
 /***********************************************************************
- *             GetASPI32DLLVersion   (WNASPI32.3)
+ *             GetASPI32DLLVersion   (WNASPI32.4)
  */
 DWORD __cdecl GetASPI32DLLVersion(void)
 {
@@ -573,7 +573,7 @@
 }
 
 /***********************************************************************
- *             GetASPI32Buffer   (WNASPI32.@)
+ *             GetASPI32Buffer   (WNASPI32.8)
  * Supposed to return a DMA capable large SCSI buffer.
  * Our implementation does not use those at all, all buffer stuff is 
  * done in the kernel SG device layer. So we just heapalloc the buffer.
@@ -589,7 +589,7 @@
 }
 
 /***********************************************************************
- *             FreeASPI32Buffer   (WNASPI32.@)
+ *             FreeASPI32Buffer   (WNASPI32.14)
  */
 BOOL __cdecl FreeASPI32Buffer(PASPI32BUFF pab)
 {
@@ -598,7 +598,7 @@
 }
 
 /***********************************************************************
- *             TranslateASPI32Address   (WNASPI32.@)
+ *             TranslateASPI32Address   (WNASPI32.7)
  */
 BOOL __cdecl TranslateASPI32Address(LPDWORD pdwPath, LPDWORD pdwDEVNODE)
 {
diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c
index f9a0f67..66a6819 100644
--- a/dlls/wininet/ftp.c
+++ b/dlls/wininet/ftp.c
@@ -132,7 +132,7 @@
 }
 
 /***********************************************************************
- *           FtpPutFileA (WININET.43)
+ *           FtpPutFileA (WININET.@)
  *
  * Uploads a file to the FTP server
  *
@@ -258,7 +258,7 @@
 
 
 /***********************************************************************
- *           FtpSetCurrentDirectoryA (WININET.49)
+ *           FtpSetCurrentDirectoryA (WININET.@)
  *
  * Change the working directory on the FTP server
  *
@@ -357,7 +357,7 @@
 
 
 /***********************************************************************
- *           FtpCreateDirectoryA (WININET.31)
+ *           FtpCreateDirectoryA (WININET.@)
  *
  * Create new directory on the FTP server
  *
@@ -452,7 +452,7 @@
 
 
 /***********************************************************************
- *           FtpFindFirstFileA (WININET.35)
+ *           FtpFindFirstFileA (WININET.@)
  *
  * Search the specified directory
  *
@@ -591,7 +591,7 @@
 
 
 /***********************************************************************
- *           FtpGetCurrentDirectoryA (WININET.37)
+ *           FtpGetCurrentDirectoryA (WININET.@)
  *
  * Retrieves the current directory
  *
@@ -715,7 +715,7 @@
 }
 
 /***********************************************************************
- *           FtpOpenFileA (WININET.41)
+ *           FtpOpenFileA (WININET.@)
  *
  * Open a remote file for writing or reading
  *
@@ -839,7 +839,7 @@
 
 
 /***********************************************************************
- *           FtpGetFileA (WININET.39)
+ *           FtpGetFileA (WININET.@)
  *
  * Retrieve file from the FTP server
  *
@@ -971,7 +971,7 @@
 
 
 /***********************************************************************
- *           FtpDeleteFileA  (WININET.33)
+ *           FtpDeleteFileA  (WININET.@)
  *
  * Delete a file on the ftp server
  *
@@ -1065,7 +1065,7 @@
 
 
 /***********************************************************************
- *           FtpRemoveDirectoryA  (WININET.45)
+ *           FtpRemoveDirectoryA  (WININET.@)
  *
  * Remove a directory on the ftp server
  *
@@ -1160,7 +1160,7 @@
 
 
 /***********************************************************************
- *           FtpRenameFileA  (WININET.47)
+ *           FtpRenameFileA  (WININET.@)
  *
  * Rename a file on the ftp server
  *
diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c
index bfba5c4..04e3d24 100644
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
@@ -75,7 +75,7 @@
 }
 
 /***********************************************************************
- *           HttpAddRequestHeadersA (WININET.68)
+ *           HttpAddRequestHeadersA (WININET.@)
  *
  * Adds one or more HTTP header to the request handler
  *
@@ -132,7 +132,7 @@
 
 
 /***********************************************************************
- *           HttpOpenRequestA (WININET.72)
+ *           HttpOpenRequestA (WININET.@)
  *
  * Open a HTTP request handle
  *
@@ -291,7 +291,7 @@
 
 
 /***********************************************************************
- *           HttpQueryInfoA (WININET.74)
+ *           HttpQueryInfoA (WININET.@)
  *
  * Queries for information about an HTTP request
  *
@@ -491,7 +491,7 @@
 }
 
 /***********************************************************************
- *           HttpSendRequestA (WININET.76)
+ *           HttpSendRequestA (WININET.@)
  *
  * Sends the specified request to the HTTP server
  *
diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c
index 988ae82..ff60040 100644
--- a/dlls/wininet/internet.c
+++ b/dlls/wininet/internet.c
@@ -131,7 +131,7 @@
 
 
 /***********************************************************************
- *           InternetOpenA   (WININET.113)
+ *           InternetOpenA   (WININET.@)
  *
  * Per-application initialization of wininet
  *
@@ -183,7 +183,7 @@
 
 
 /***********************************************************************
- *           InternetGetLastResponseInfoA (WININET.108)
+ *           InternetGetLastResponseInfoA (WININET.@)
  *
  * Return last wininet error description on the calling thread
  *
@@ -213,7 +213,7 @@
 
 
 /***********************************************************************
- *           InternetGetConnectedState (WININET.103)
+ *           InternetGetConnectedState (WININET.@)
  *
  * Return connected state
  *
@@ -231,7 +231,7 @@
 
 
 /***********************************************************************
- *           InternetConnectA (WININET.93)
+ *           InternetConnectA (WININET.@)
  *
  * Open a ftp, gopher or http session
  *
@@ -273,7 +273,7 @@
 }
 
 /***********************************************************************
- *           InternetFindNextFileA (WININET.102)
+ *           InternetFindNextFileA (WININET.@)
  *
  * Continues a file search from a previous call to FindFirstFile
  *
@@ -407,7 +407,7 @@
 
 
 /***********************************************************************
- *           InternetCloseHandle (WININET.89)
+ *           InternetCloseHandle (WININET.@)
  *
  * Generic close handle function
  *
@@ -496,7 +496,7 @@
 
 
 /***********************************************************************
- *           InternetCrackUrlA (WININET.95)
+ *           InternetCrackUrlA (WININET.@)
  *
  * Break up URL into its components
  *
@@ -696,7 +696,7 @@
 
 
 /***********************************************************************
- *           InternetAttemptConnect (WININET.81)
+ *           InternetAttemptConnect (WININET.@)
  *
  * Attempt to make a connection to the internet
  *
@@ -713,7 +713,7 @@
 
 
 /***********************************************************************
- *           InternetCanonicalizeUrlA (WININET.85)
+ *           InternetCanonicalizeUrlA (WININET.@)
  *
  * Escape unsafe characters and spaces
  *
@@ -740,7 +740,7 @@
 }
 
 /***********************************************************************
- *           InternetSetStatusCallback (WININET.133)
+ *           InternetSetStatusCallback (WININET.@)
  *
  * Sets up a callback function which is called as progress is made
  * during an operation. 
@@ -768,7 +768,7 @@
 
 
 /***********************************************************************
- *           InternetWriteFile (WININET.138)
+ *           InternetWriteFile (WININET.@)
  *
  * Write data to an open internet file 
  *
@@ -816,7 +816,7 @@
 
 
 /***********************************************************************
- *           InternetReadFile (WININET.121)
+ *           InternetReadFile (WININET.@)
  *
  * Read data from an open internet file 
  *
@@ -864,7 +864,7 @@
 
 
 /***********************************************************************
- *           InternetQueryOptionA
+ *           InternetQueryOptionA (WININET.@)
  *
  * Queries an options on the specified handle
  *
@@ -918,7 +918,7 @@
 
 
 /***********************************************************************
- *           InternetGetCookieA
+ *           InternetGetCookieA (WININET.@)
  *
  * Retrieve cookie from the specified url
  *
@@ -969,7 +969,7 @@
 }
 
 /***********************************************************************
- *	InternetCheckConnectionA
+ *	InternetCheckConnectionA (WININET.@)
  *
  * Pings a requested host to check internet connection
  *
diff --git a/dlls/winmm/driver.c b/dlls/winmm/driver.c
index 8c8d1ef..2e07117 100644
--- a/dlls/winmm/driver.c
+++ b/dlls/winmm/driver.c
@@ -214,7 +214,7 @@
 }
 
 /**************************************************************************
- *				SendDriverMessage		[WINMM.19]
+ *				SendDriverMessage		[WINMM.@]
  */
 LRESULT WINAPI SendDriverMessage(HDRVR hDriver, UINT msg, LPARAM lParam1,
 				 LPARAM lParam2)
@@ -394,7 +394,7 @@
 }
 
 /**************************************************************************
- *				OpenDriverA		        [WINMM.15]
+ *				OpenDriverA		        [WINMM.@]
  * (0,1,DRV_LOAD  ,0       ,0)
  * (0,1,DRV_ENABLE,0       ,0)
  * (0,1,DRV_OPEN  ,buf[256],0)
@@ -426,7 +426,7 @@
 }
 
 /**************************************************************************
- *				OpenDriverW		        [WINMM.15]
+ *				OpenDriverW		        [WINMM.@]
  */
 HDRVR WINAPI OpenDriverW(LPCWSTR lpDriverName, LPCWSTR lpSectionName, LPARAM lParam)
 {
@@ -440,7 +440,7 @@
 }
 
 /**************************************************************************
- *			CloseDriver				[WINMM.4]
+ *			CloseDriver				[WINMM.@]
  */
 LRESULT WINAPI CloseDriver(HDRVR hDrvr, LPARAM lParam1, LPARAM lParam2)
 {
@@ -463,7 +463,7 @@
 }
 
 /**************************************************************************
- *				GetDriverFlags		[WINMM.13]
+ *				GetDriverFlags		[WINMM.@]
  * [in] hDrvr handle to the driver
  *
  * Returns:
@@ -489,7 +489,7 @@
 }
 
 /**************************************************************************
- *				GetDriverModuleHandle	[WINMM.14]
+ *				GetDriverModuleHandle	[WINMM.@]
  */
 HMODULE WINAPI GetDriverModuleHandle(HDRVR hDrvr)
 {
@@ -549,7 +549,7 @@
 }
 
 /**************************************************************************
- * 				DefDriverProc			  [WINMM.5]
+ * 				DefDriverProc			  [WINMM.@]
  */
 LRESULT WINAPI DefDriverProc(DWORD dwDriverIdentifier, HDRVR hDrv,
 			     UINT Msg, LPARAM lParam1, LPARAM lParam2)
diff --git a/dlls/winmm/joystick.c b/dlls/winmm/joystick.c
index e1be8cf..aaf3527 100644
--- a/dlls/winmm/joystick.c
+++ b/dlls/winmm/joystick.c
@@ -96,7 +96,7 @@
 }
 
 /**************************************************************************
- * 				joyGetNumDevs		[WINMM.30]
+ * 				joyGetNumDevs		[WINMM.@]
  */
 UINT WINAPI joyGetNumDevs(void)
 {
@@ -120,7 +120,7 @@
 }
 
 /**************************************************************************
- * 				joyGetDevCapsA		[WINMM.27]
+ * 				joyGetDevCapsA		[WINMM.@]
  */
 MMRESULT WINAPI joyGetDevCapsA(UINT wID, LPJOYCAPSA lpCaps, UINT wSize)
 {
@@ -134,7 +134,7 @@
 }   
 
 /**************************************************************************
- * 				joyGetDevCapsW		[WINMM.28]
+ * 				joyGetDevCapsW		[WINMM.@]
  */
 MMRESULT WINAPI joyGetDevCapsW(UINT wID, LPJOYCAPSW lpCaps, UINT wSize)
 {
@@ -217,7 +217,7 @@
 }
 
 /**************************************************************************
- *                              joyGetPosEx             [WINMM.32]
+ *                              joyGetPosEx             [WINMM.@]
  */
 MMRESULT WINAPI joyGetPosEx(UINT wID, LPJOYINFOEX lpInfo)
 {
@@ -250,7 +250,7 @@
 }
 
 /**************************************************************************
- * 				joyGetPos	       	[WINMM.31]
+ * 				joyGetPos	       	[WINMM.@]
  */
 MMRESULT WINAPI joyGetPos(UINT wID, LPJOYINFO lpInfo)
 {
@@ -287,7 +287,7 @@
 }
 
 /**************************************************************************
- * 				joyGetThreshold		[WINMM.36]
+ * 				joyGetThreshold		[WINMM.@]
  */
 MMRESULT WINAPI joyGetThreshold(UINT wID, LPUINT lpThreshold)
 {
@@ -313,7 +313,7 @@
 }
 
 /**************************************************************************
- * 				joyReleaseCapture	[WINMM.34]
+ * 				joyReleaseCapture	[WINMM.@]
  */
 MMRESULT WINAPI joyReleaseCapture(UINT wID)
 {
@@ -339,7 +339,7 @@
 }
 
 /**************************************************************************
- * 				joySetCapture		[WINMM.35]
+ * 				joySetCapture		[WINMM.@]
  */
 MMRESULT WINAPI joySetCapture(HWND hWnd, UINT wID, UINT wPeriod, BOOL bChanged)
 {
@@ -373,7 +373,7 @@
 }
 
 /**************************************************************************
- * 				joySetThreshold		[WINMM.36]
+ * 				joySetThreshold		[WINMM.@]
  */
 MMRESULT WINAPI joySetThreshold(UINT wID, UINT wThreshold)
 {
diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c
index 5e12203..81e7c7b 100644
--- a/dlls/winmm/mci.c
+++ b/dlls/winmm/mci.c
@@ -833,7 +833,8 @@
 }
 
 /**************************************************************************
- * 				mciSendStringA		[MMSYSTEM.702][WINMM.51]
+ * 				mciSendStringA		[MMSYSTEM.702]
+ * 				mciSendStringA		[WINMM.@]
  */
 DWORD WINAPI mciSendStringA(LPCSTR lpstrCommand, LPSTR lpstrRet, 
 			    UINT uRetLen, HWND hwndCallback)
@@ -1018,7 +1019,7 @@
 }
 
 /**************************************************************************
- * 				mciSendStringW			[WINMM.52]
+ * 				mciSendStringW			[WINMM.@]
  */
 DWORD WINAPI mciSendStringW(LPCWSTR lpwstrCommand, LPSTR lpstrRet, 
 			    UINT uRetLen, HWND hwndCallback)
@@ -1043,7 +1044,7 @@
 }
 
 /**************************************************************************
- * 				mciExecute			[WINMM.38]
+ * 				mciExecute			[WINMM.@]
  */
 DWORD WINAPI mciExecute(LPCSTR lpstrCommand)
 {
@@ -1110,7 +1111,7 @@
 }
  
 /**************************************************************************
- *                    	mciLoadCommandResource  		[WINMM.48]
+ *                    	mciLoadCommandResource  		[WINMM.@]
  *
  * Strangely, this function only exists as an UNICODE one.
  */
@@ -1162,7 +1163,7 @@
 #endif
 
 /**************************************************************************
- *                    	mciFreeCommandResource			[WINMM.39]
+ *                    	mciFreeCommandResource			[WINMM.@]
  */
 BOOL WINAPI mciFreeCommandResource(UINT uTable)
 {
diff --git a/dlls/winmm/mmsystem.c b/dlls/winmm/mmsystem.c
index 8e86eca..794c8c8 100644
--- a/dlls/winmm/mmsystem.c
+++ b/dlls/winmm/mmsystem.c
@@ -472,7 +472,7 @@
 }
 
 /**************************************************************************
- * 				PlaySoundA		[WINMM.1]
+ * 				PlaySoundA		[WINMM.@]
  */
 BOOL WINAPI PlaySoundA(LPCSTR pszSound, HMODULE hmod, DWORD fdwSound)
 {
@@ -543,7 +543,7 @@
 }
 
 /**************************************************************************
- * 				PlaySoundW		[WINMM.18]
+ * 				PlaySoundW		[WINMM.@]
  */
 BOOL WINAPI PlaySoundW(LPCWSTR pszSound, HMODULE hmod, DWORD fdwSound)
 {
@@ -586,7 +586,7 @@
 }
 
 /**************************************************************************
- * 				sndPlaySoundW		[WINMM.136]
+ * 				sndPlaySoundW		[WINMM.@]
  */
 BOOL WINAPI sndPlaySoundW(LPCWSTR lpszSoundName, UINT uFlags)
 {
@@ -611,7 +611,7 @@
 
 
 /**************************************************************************
- * 				mmsystemGetVersion	[WINMM.134]
+ * 				mmsystemGetVersion	[WINMM.@]
  */
 UINT WINAPI mmsystemGetVersion(void)
 {
@@ -753,7 +753,7 @@
 }
 
 /**************************************************************************
- * 				mixerGetNumDevs			[WINMM.108]
+ * 				mixerGetNumDevs			[WINMM.@]
  */
 UINT WINAPI mixerGetNumDevs(void) 
 {
@@ -769,7 +769,7 @@
 }
 
 /**************************************************************************
- * 				mixerGetDevCapsA		[WINMM.101]
+ * 				mixerGetDevCapsA		[WINMM.@]
  */
 UINT WINAPI mixerGetDevCapsA(UINT devid, LPMIXERCAPSA mixcaps, UINT size) 
 {
@@ -782,7 +782,7 @@
 }
 
 /**************************************************************************
- * 				mixerGetDevCapsW		[WINMM.102]
+ * 				mixerGetDevCapsW		[WINMM.@]
  */
 UINT WINAPI mixerGetDevCapsW(UINT devid, LPMIXERCAPSW mixcaps, UINT size) 
 {
@@ -853,7 +853,7 @@
 }
 
 /**************************************************************************
- * 				mixerOpen			[WINMM.110]
+ * 				mixerOpen			[WINMM.@]
  */
 UINT WINAPI mixerOpen(LPHMIXER lphMix, UINT uDeviceID, DWORD dwCallback,
 		      DWORD dwInstance, DWORD fdwOpen) 
@@ -863,7 +863,7 @@
 }
 
 /**************************************************************************
- * 				mixerOpen			[MMSYSTEM.803]
+ * 				mixerOpen			[MMSYSTEM.802]
  */
 UINT16 WINAPI mixerOpen16(LPHMIXER16 lphmix, UINT16 uDeviceID, DWORD dwCallback,
 			  DWORD dwInstance, DWORD fdwOpen) 
@@ -878,7 +878,7 @@
 }
 
 /**************************************************************************
- * 				mixerClose			[WINMM.98]
+ * 				mixerClose			[WINMM.@]
  */
 UINT WINAPI mixerClose(HMIXER hMix) 
 {
@@ -904,7 +904,7 @@
 }
 
 /**************************************************************************
- * 				mixerGetID			[WINMM.103]
+ * 				mixerGetID			[WINMM.@]
  */
 UINT WINAPI mixerGetID(HMIXEROBJ hmix, LPUINT lpid, DWORD fdwID) 
 {
@@ -936,7 +936,7 @@
 }
 
 /**************************************************************************
- * 				mixerGetControlDetailsA		[WINMM.99]
+ * 				mixerGetControlDetailsA		[WINMM.@]
  */
 UINT WINAPI mixerGetControlDetailsA(HMIXEROBJ hmix, LPMIXERCONTROLDETAILS lpmcdA,
 				    DWORD fdwDetails) 
@@ -956,7 +956,7 @@
 }
 
 /**************************************************************************
- * 				mixerGetControlDetailsW	[WINMM.100]
+ * 				mixerGetControlDetailsW	[WINMM.@]
  */
 UINT WINAPI mixerGetControlDetailsW(HMIXEROBJ hmix, LPMIXERCONTROLDETAILS lpmcd, DWORD fdwDetails) 
 {
@@ -1019,7 +1019,7 @@
 }
 
 /**************************************************************************
- * 				mixerGetLineControlsA	[WINMM.104]
+ * 				mixerGetLineControlsA	[WINMM.@]
  */
 UINT WINAPI mixerGetLineControlsA(HMIXEROBJ hmix, LPMIXERLINECONTROLSA lpmlcA, 
 				  DWORD fdwControls) 
@@ -1039,7 +1039,7 @@
 }
 
 /**************************************************************************
- * 				mixerGetLineControlsW		[WINMM.105]
+ * 				mixerGetLineControlsW		[WINMM.@]
  */
 UINT WINAPI mixerGetLineControlsW(HMIXEROBJ hmix, LPMIXERLINECONTROLSW lpmlcW, 
 				  DWORD fdwControls) 
@@ -1159,7 +1159,7 @@
 }
 
 /**************************************************************************
- * 				mixerGetLineInfoA		[WINMM.106]
+ * 				mixerGetLineInfoA		[WINMM.@]
  */
 UINT WINAPI mixerGetLineInfoA(HMIXEROBJ hmix, LPMIXERLINEA lpmliW, DWORD fdwInfo)
 {
@@ -1175,7 +1175,7 @@
 }
 
 /**************************************************************************
- * 				mixerGetLineInfoW		[WINMM.107]
+ * 				mixerGetLineInfoW		[WINMM.@]
  */
 UINT WINAPI mixerGetLineInfoW(HMIXEROBJ hmix, LPMIXERLINEW lpmliW, 
 			      DWORD fdwInfo) 
@@ -1304,7 +1304,7 @@
 }
 
 /**************************************************************************
- * 				mixerSetControlDetails	[WINMM.111]
+ * 				mixerSetControlDetails	[WINMM.@]
  */
 UINT WINAPI mixerSetControlDetails(HMIXEROBJ hmix, LPMIXERCONTROLDETAILS lpmcdA, 
 				   DWORD fdwDetails) 
@@ -1332,7 +1332,7 @@
 }
 
 /**************************************************************************
- * 				mixerMessage		[WINMM.109]
+ * 				mixerMessage		[WINMM.@]
  */
 UINT WINAPI mixerMessage(HMIXER hmix, UINT uMsg, DWORD dwParam1, DWORD dwParam2)
 {
@@ -1357,7 +1357,7 @@
 }
 
 /**************************************************************************
- * 				auxGetNumDevs		[WINMM.22]
+ * 				auxGetNumDevs		[WINMM.@]
  */
 UINT WINAPI auxGetNumDevs(void)
 {
@@ -1373,7 +1373,7 @@
 }
 
 /**************************************************************************
- * 				auxGetDevCapsW		[WINMM.20]
+ * 				auxGetDevCapsW		[WINMM.@]
  */
 UINT WINAPI auxGetDevCapsW(UINT uDeviceID, LPAUXCAPSW lpCaps, UINT uSize)
 {
@@ -1391,7 +1391,7 @@
 }
 
 /**************************************************************************
- * 				auxGetDevCapsA		[WINMM.21]
+ * 				auxGetDevCapsA		[WINMM.@]
  */
 UINT WINAPI auxGetDevCapsA(UINT uDeviceID, LPAUXCAPSA lpCaps, UINT uSize)
 {
@@ -1419,7 +1419,7 @@
 }
 
 /**************************************************************************
- * 				auxGetVolume		[WINMM.23]
+ * 				auxGetVolume		[WINMM.@]
  */
 UINT WINAPI auxGetVolume(UINT uDeviceID, DWORD* lpdwVolume)
 {
@@ -1447,7 +1447,7 @@
 }
 
 /**************************************************************************
- * 				auxSetVolume		[WINMM.25]
+ * 				auxSetVolume		[WINMM.@]
  */
 UINT WINAPI auxSetVolume(UINT uDeviceID, DWORD dwVolume)
 {
@@ -1517,7 +1517,7 @@
 }
 
 /**************************************************************************
- * 				mciGetErrorStringW		[WINMM.46]
+ * 				mciGetErrorStringW		[WINMM.@]
  */
 BOOL WINAPI mciGetErrorStringW(DWORD wError, LPWSTR lpstrBuffer, UINT uLength)
 {
@@ -1530,7 +1530,7 @@
 }
 
 /**************************************************************************
- * 				mciGetErrorStringA		[WINMM.45]
+ * 				mciGetErrorStringA		[WINMM.@]
  */
 BOOL WINAPI mciGetErrorStringA(DWORD wError, LPSTR lpstrBuffer, UINT uLength)
 {
@@ -1572,7 +1572,7 @@
 }
 
 /**************************************************************************
- *			mciDriverNotify				[WINMM.36]
+ *			mciDriverNotify				[WINMM.@]
  */
 BOOL WINAPI mciDriverNotify(HWND hWndCallBack, UINT wDevID, UINT wStatus)
 {
@@ -1597,7 +1597,7 @@
 }
 
 /**************************************************************************
- * 			mciGetDriverData			[WINMM.44]
+ * 			mciGetDriverData			[WINMM.@]
  */
 DWORD WINAPI mciGetDriverData(UINT uDeviceID) 
 {
@@ -1624,7 +1624,7 @@
 }
 
 /**************************************************************************
- * 			mciSetDriverData			[WINMM.53]
+ * 			mciSetDriverData			[WINMM.@]
  */
 BOOL WINAPI mciSetDriverData(UINT uDeviceID, DWORD data) 
 {
@@ -1644,7 +1644,7 @@
 }
 
 /**************************************************************************
- * 				mciSendCommandA			[WINMM.49]
+ * 				mciSendCommandA			[WINMM.@]
  */
 DWORD WINAPI mciSendCommandA(UINT wDevID, UINT wMsg, DWORD dwParam1, DWORD dwParam2)
 {
@@ -1660,7 +1660,7 @@
 }
 
 /**************************************************************************
- * 				mciSendCommandW			[WINMM.50]
+ * 				mciSendCommandW			[WINMM.@]
  */
 DWORD WINAPI mciSendCommandW(UINT wDevID, UINT wMsg, DWORD dwParam1, DWORD dwParam2)
 {
@@ -1696,7 +1696,7 @@
 }
 
 /**************************************************************************
- * 				mciGetDeviceIDA    		[WINMM.41]
+ * 				mciGetDeviceIDA    		[WINMM.@]
  */
 UINT WINAPI mciGetDeviceIDA(LPCSTR lpstrName)
 {
@@ -1704,7 +1704,7 @@
 }
 
 /**************************************************************************
- * 				mciGetDeviceIDW		       	[WINMM.43]
+ * 				mciGetDeviceIDW		       	[WINMM.@]
  */
 UINT WINAPI mciGetDeviceIDW(LPCWSTR lpwstrName)
 {
@@ -1762,7 +1762,7 @@
 }
 
 /**************************************************************************
- * 				mciSetYieldProc			[WINMM.54]
+ * 				mciSetYieldProc			[WINMM.@]
  */
 BOOL WINAPI mciSetYieldProc(UINT uDeviceID, YIELDPROC fpYieldProc, DWORD dwYieldData)
 {
@@ -1792,7 +1792,7 @@
 }
 	
 /**************************************************************************
- * 				mciGetDeviceIDFromElementIDW	[WINMM.42]
+ * 				mciGetDeviceIDFromElementIDW	[WINMM.@]
  */
 UINT WINAPI mciGetDeviceIDFromElementIDW(DWORD dwElementID, LPCWSTR lpstrType)
 {
@@ -1828,7 +1828,7 @@
 }
     
 /**************************************************************************
- * 				mciGetYieldProc			[WINMM.47]
+ * 				mciGetYieldProc			[WINMM.@]
  */
 YIELDPROC WINAPI mciGetYieldProc(UINT uDeviceID, DWORD* lpdwYieldData)
 {
@@ -1860,7 +1860,7 @@
 }
 
 /**************************************************************************
- * 				mciGetCreatorTask		[WINMM.40]
+ * 				mciGetCreatorTask		[WINMM.@]
  */
 HTASK WINAPI mciGetCreatorTask(UINT uDeviceID)
 {
@@ -1895,7 +1895,7 @@
 }
 
 /**************************************************************************
- * 			mciDriverYield				[WINMM.37]
+ * 			mciDriverYield				[WINMM.@]
  */
 UINT WINAPI mciDriverYield(UINT uDeviceID) 
 {
@@ -1914,7 +1914,7 @@
 }
 
 /**************************************************************************
- * 				midiOutGetNumDevs	[WINMM.80]
+ * 				midiOutGetNumDevs	[WINMM.@]
  */
 UINT WINAPI midiOutGetNumDevs(void)
 {
@@ -1930,7 +1930,7 @@
 }
 
 /**************************************************************************
- * 				midiOutGetDevCapsW	[WINMM.76]
+ * 				midiOutGetDevCapsW	[WINMM.@]
  */
 UINT WINAPI midiOutGetDevCapsW(UINT uDeviceID, LPMIDIOUTCAPSW lpCaps, 
 			       UINT uSize)
@@ -1953,7 +1953,7 @@
 }
 
 /**************************************************************************
- * 				midiOutGetDevCapsA	[WINMM.75]
+ * 				midiOutGetDevCapsA	[WINMM.@]
  */
 UINT WINAPI midiOutGetDevCapsA(UINT uDeviceID, LPMIDIOUTCAPSA lpCaps, 
 			       UINT uSize)
@@ -2022,7 +2022,7 @@
 }
 
 /**************************************************************************
- * 				midiOutGetErrorTextA 	[WINMM.77]
+ * 				midiOutGetErrorTextA 	[WINMM.@]
  */
 UINT WINAPI midiOutGetErrorTextA(UINT uError, LPSTR lpText, UINT uSize)
 {
@@ -2030,7 +2030,7 @@
 }
 
 /**************************************************************************
- * 				midiOutGetErrorTextW 	[WINMM.78]
+ * 				midiOutGetErrorTextW 	[WINMM.@]
  */
 UINT WINAPI midiOutGetErrorTextW(UINT uError, LPWSTR lpText, UINT uSize)
 {
@@ -2117,7 +2117,7 @@
 }
 
 /**************************************************************************
- * 				midiOutOpen    		[WINMM.84]
+ * 				midiOutOpen    		[WINMM.@]
  */
 UINT WINAPI midiOutOpen(HMIDIOUT* lphMidiOut, UINT uDeviceID,
 			DWORD dwCallback, DWORD dwInstance, DWORD dwFlags)
@@ -2143,7 +2143,7 @@
 }
 
 /**************************************************************************
- * 				midiOutClose		[WINMM.74]
+ * 				midiOutClose		[WINMM.@]
  */
 UINT WINAPI midiOutClose(HMIDIOUT hMidiOut)
 {
@@ -2170,7 +2170,7 @@
 }
 
 /**************************************************************************
- * 				midiOutPrepareHeader	[WINMM.85]
+ * 				midiOutPrepareHeader	[WINMM.@]
  */
 UINT WINAPI midiOutPrepareHeader(HMIDIOUT hMidiOut,
 				 MIDIHDR* lpMidiOutHdr, UINT uSize)
@@ -2203,7 +2203,7 @@
 }
 
 /**************************************************************************
- * 				midiOutUnprepareHeader	[WINMM.89]
+ * 				midiOutUnprepareHeader	[WINMM.@]
  */
 UINT WINAPI midiOutUnprepareHeader(HMIDIOUT hMidiOut,
 				   MIDIHDR* lpMidiOutHdr, UINT uSize)
@@ -2245,7 +2245,7 @@
 }
 
 /**************************************************************************
- * 				midiOutShortMsg		[WINMM.88]
+ * 				midiOutShortMsg		[WINMM.@]
  */
 UINT WINAPI midiOutShortMsg(HMIDIOUT hMidiOut, DWORD dwMsg)
 {
@@ -2268,7 +2268,7 @@
 }
 
 /**************************************************************************
- * 				midiOutLongMsg		[WINMM.82]
+ * 				midiOutLongMsg		[WINMM.@]
  */
 UINT WINAPI midiOutLongMsg(HMIDIOUT hMidiOut,
 			   MIDIHDR* lpMidiOutHdr, UINT uSize)
@@ -2301,7 +2301,7 @@
 }
 
 /**************************************************************************
- * 				midiOutReset		[WINMM.86]
+ * 				midiOutReset		[WINMM.@]
  */
 UINT WINAPI midiOutReset(HMIDIOUT hMidiOut)
 {
@@ -2324,7 +2324,7 @@
 }
 
 /**************************************************************************
- * 				midiOutGetVolume	[WINMM.81]
+ * 				midiOutGetVolume	[WINMM.@]
  */
 UINT WINAPI midiOutGetVolume(UINT uDeviceID, DWORD* lpdwVolume)
 {
@@ -2347,7 +2347,7 @@
 }
 
 /**************************************************************************
- * 				midiOutSetVolume	[WINMM.87]
+ * 				midiOutSetVolume	[WINMM.@]
  */
 UINT WINAPI midiOutSetVolume(UINT uDeviceID, DWORD dwVolume)
 {
@@ -2370,7 +2370,7 @@
 }
 
 /**************************************************************************
- * 				midiOutCachePatches		[WINMM.73]
+ * 				midiOutCachePatches		[WINMM.@]
  */
 UINT WINAPI midiOutCachePatches(HMIDIOUT hMidiOut, UINT uBank,
 				WORD* lpwPatchArray, UINT uFlags)
@@ -2390,7 +2390,7 @@
 }
 
 /**************************************************************************
- * 				midiOutCacheDrumPatches	[WINMM.72]
+ * 				midiOutCacheDrumPatches	[WINMM.@]
  */
 UINT WINAPI midiOutCacheDrumPatches(HMIDIOUT hMidiOut, UINT uPatch,
 				    WORD* lpwKeyArray, UINT uFlags)
@@ -2409,7 +2409,7 @@
 }
 
 /**************************************************************************
- * 				midiOutGetID		[WINMM.79]
+ * 				midiOutGetID		[WINMM.@]
  */
 UINT WINAPI midiOutGetID(HMIDIOUT hMidiOut, UINT* lpuDeviceID)
 {
@@ -2443,7 +2443,7 @@
 }
 
 /**************************************************************************
- * 				midiOutMessage		[WINMM.83]
+ * 				midiOutMessage		[WINMM.@]
  */
 DWORD WINAPI midiOutMessage(HMIDIOUT hMidiOut, UINT uMessage, 
 			    DWORD dwParam1, DWORD dwParam2)
@@ -2497,7 +2497,7 @@
 }
 
 /**************************************************************************
- * 				midiInGetNumDevs	[WINMM.64]
+ * 				midiInGetNumDevs	[WINMM.@]
  */
 UINT WINAPI midiInGetNumDevs(void)
 {
@@ -2513,7 +2513,7 @@
 }
 
 /**************************************************************************
- * 				midiInGetDevCapsW	[WINMM.60]
+ * 				midiInGetDevCapsW	[WINMM.@]
  */
 UINT WINAPI midiInGetDevCapsW(UINT uDeviceID, LPMIDIINCAPSW lpCaps, UINT uSize)
 {
@@ -2532,7 +2532,7 @@
 }
 
 /**************************************************************************
- * 				midiInGetDevCapsA	[WINMM.59]
+ * 				midiInGetDevCapsA	[WINMM.@]
  */
 UINT WINAPI midiInGetDevCapsA(UINT uDeviceID, LPMIDIINCAPSA lpCaps, UINT uSize)
 {
@@ -2567,7 +2567,7 @@
 }
 
 /**************************************************************************
- * 				midiInGetErrorTextW 		[WINMM.62]
+ * 				midiInGetErrorTextW 		[WINMM.@]
  */
 UINT WINAPI midiInGetErrorTextW(UINT uError, LPWSTR lpText, UINT uSize)
 {
@@ -2580,7 +2580,7 @@
 }
 
 /**************************************************************************
- * 				midiInGetErrorTextA 		[WINMM.61]
+ * 				midiInGetErrorTextA 		[WINMM.@]
  */
 UINT WINAPI midiInGetErrorTextA(UINT uError, LPSTR lpText, UINT uSize)
 {
@@ -2631,7 +2631,7 @@
 }
 
 /**************************************************************************
- * 				midiInOpen		[WINMM.66]
+ * 				midiInOpen		[WINMM.@]
  */
 UINT WINAPI midiInOpen(HMIDIIN* lphMidiIn, UINT uDeviceID,
 		       DWORD dwCallback, DWORD dwInstance, DWORD dwFlags)
@@ -2657,7 +2657,7 @@
 }
 
 /**************************************************************************
- * 				midiInClose		[WINMM.58]
+ * 				midiInClose		[WINMM.@]
  */
 UINT WINAPI midiInClose(HMIDIIN hMidiIn)
 {
@@ -2683,7 +2683,7 @@
 }
 
 /**************************************************************************
- * 				midiInPrepareHeader	[WINMM.67]
+ * 				midiInPrepareHeader	[WINMM.@]
  */
 UINT WINAPI midiInPrepareHeader(HMIDIIN hMidiIn, 
 				MIDIHDR* lpMidiInHdr, UINT uSize)
@@ -2716,7 +2716,7 @@
 }
 
 /**************************************************************************
- * 				midiInUnprepareHeader	[WINMM.71]
+ * 				midiInUnprepareHeader	[WINMM.@]
  */
 UINT WINAPI midiInUnprepareHeader(HMIDIIN hMidiIn,
 				  MIDIHDR* lpMidiInHdr, UINT uSize)
@@ -2758,7 +2758,7 @@
 }
 
 /**************************************************************************
- * 				midiInAddBuffer		[WINMM.57]
+ * 				midiInAddBuffer		[WINMM.@]
  */
 UINT WINAPI midiInAddBuffer(HMIDIIN hMidiIn,
 			    MIDIHDR* lpMidiInHdr, UINT uSize)
@@ -2791,7 +2791,7 @@
 }
 
 /**************************************************************************
- * 				midiInStart			[WINMM.69]
+ * 				midiInStart			[WINMM.@]
  */
 UINT WINAPI midiInStart(HMIDIIN hMidiIn)
 {
@@ -2814,7 +2814,7 @@
 }
 
 /**************************************************************************
- * 				midiInStop			[WINMM.70]
+ * 				midiInStop			[WINMM.@]
  */
 UINT WINAPI midiInStop(HMIDIIN hMidiIn)
 {
@@ -2837,7 +2837,7 @@
 }
 
 /**************************************************************************
- * 				midiInReset			[WINMM.68]
+ * 				midiInReset			[WINMM.@]
  */
 UINT WINAPI midiInReset(HMIDIIN hMidiIn)
 {
@@ -2860,7 +2860,7 @@
 }
 
 /**************************************************************************
- * 				midiInGetID			[WINMM.63]
+ * 				midiInGetID			[WINMM.@]
  */
 UINT WINAPI midiInGetID(HMIDIIN hMidiIn, UINT* lpuDeviceID)
 {
@@ -2898,7 +2898,7 @@
 }
 
 /**************************************************************************
- * 				midiInMessage		[WINMM.65]
+ * 				midiInMessage		[WINMM.@]
  */
 DWORD WINAPI midiInMessage(HMIDIIN hMidiIn, UINT uMessage, 
 			   DWORD dwParam1, DWORD dwParam2)
@@ -3266,7 +3266,7 @@
 }
 
 /**************************************************************************
- * 				midiStreamClose			[WINMM.90]
+ * 				midiStreamClose			[WINMM.@]
  */
 MMRESULT WINAPI midiStreamClose(HMIDISTRM hMidiStrm)
 {
@@ -3355,7 +3355,7 @@
 }
 
 /**************************************************************************
- * 				midiStreamOpen			[WINMM.91]
+ * 				midiStreamOpen			[WINMM.@]
  */
 MMRESULT WINAPI midiStreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID, 
 			       DWORD cMidi, DWORD dwCallback, 
@@ -3366,7 +3366,7 @@
 }
 
 /**************************************************************************
- * 				midiStreamOut			[WINMM.92]
+ * 				midiStreamOut			[WINMM.@]
  */
 MMRESULT WINAPI midiStreamOut(HMIDISTRM hMidiStrm, LPMIDIHDR lpMidiHdr, 
 			      UINT cbMidiHdr) 
@@ -3390,7 +3390,7 @@
 }
 
 /**************************************************************************
- * 				midiStreamPause			[WINMM.93]
+ * 				midiStreamPause			[WINMM.@]
  */
 MMRESULT WINAPI midiStreamPause(HMIDISTRM hMidiStrm) 
 {
@@ -3411,7 +3411,7 @@
 }
 
 /**************************************************************************
- * 				midiStreamPosition		[WINMM.94]
+ * 				midiStreamPosition		[WINMM.@]
  */
 MMRESULT WINAPI midiStreamPosition(HMIDISTRM hMidiStrm, LPMMTIME lpMMT, UINT cbmmt) 
 {
@@ -3445,7 +3445,7 @@
 }
 
 /**************************************************************************
- * 				midiStreamProperty		[WINMM.95]
+ * 				midiStreamProperty		[WINMM.@]
  */
 MMRESULT WINAPI midiStreamProperty(HMIDISTRM hMidiStrm, LPBYTE lpPropData, DWORD dwProperty) 
 {
@@ -3490,7 +3490,7 @@
 }
 
 /**************************************************************************
- * 				midiStreamRestart		[WINMM.96]
+ * 				midiStreamRestart		[WINMM.@]
  */
 MMRESULT WINAPI midiStreamRestart(HMIDISTRM hMidiStrm) 
 {
@@ -3521,7 +3521,7 @@
 }
 
 /**************************************************************************
- * 				midiStreamStop			[WINMM.97]
+ * 				midiStreamStop			[WINMM.@]
  */
 MMRESULT WINAPI midiStreamStop(HMIDISTRM hMidiStrm) 
 {
@@ -3718,7 +3718,7 @@
 }
 
 /**************************************************************************
- * 				waveOutGetDevCapsA		[WINMM.162]
+ * 				waveOutGetDevCapsA		[WINMM.@]
  */
 UINT WINAPI waveOutGetDevCapsA(UINT uDeviceID, LPWAVEOUTCAPSA lpCaps,
 			       UINT uSize)
@@ -3737,7 +3737,7 @@
 }
 
 /**************************************************************************
- * 				waveOutGetDevCapsW		[WINMM.163]
+ * 				waveOutGetDevCapsW		[WINMM.@]
  */
 UINT WINAPI waveOutGetDevCapsW(UINT uDeviceID, LPWAVEOUTCAPSW lpCaps,
 			       UINT uSize)
@@ -3796,7 +3796,7 @@
 }
 
 /**************************************************************************
- * 				waveOutGetErrorTextA 	[WINMM.164]
+ * 				waveOutGetErrorTextA 	[WINMM.@]
  */
 UINT WINAPI waveOutGetErrorTextA(UINT uError, LPSTR lpText, UINT uSize)
 {
@@ -3804,7 +3804,7 @@
 }
 
 /**************************************************************************
- * 				waveOutGetErrorTextW 	[WINMM.165]
+ * 				waveOutGetErrorTextW 	[WINMM.@]
  */
 UINT WINAPI waveOutGetErrorTextW(UINT uError, LPWSTR lpText, UINT uSize)
 {
@@ -3817,7 +3817,7 @@
 }
 
 /**************************************************************************
- *			waveOutOpen			[WINMM.173]
+ *			waveOutOpen			[WINMM.@]
  * All the args/structs have the same layout as the win16 equivalents
  */
 UINT WINAPI waveOutOpen(HWAVEOUT* lphWaveOut, UINT uDeviceID,
@@ -3849,7 +3849,7 @@
 }
 
 /**************************************************************************
- * 				waveOutClose		[WINMM.161]
+ * 				waveOutClose		[WINMM.@]
  */
 UINT WINAPI waveOutClose(HWAVEOUT hWaveOut)
 {
@@ -3882,7 +3882,7 @@
 }
 
 /**************************************************************************
- * 				waveOutPrepareHeader	[WINMM.175]
+ * 				waveOutPrepareHeader	[WINMM.@]
  */
 UINT WINAPI waveOutPrepareHeader(HWAVEOUT hWaveOut,
 				 WAVEHDR* lpWaveOutHdr, UINT uSize)
@@ -3920,7 +3920,7 @@
 }
 
 /**************************************************************************
- * 				waveOutUnprepareHeader	[WINMM.181]
+ * 				waveOutUnprepareHeader	[WINMM.@]
  */
 UINT WINAPI waveOutUnprepareHeader(HWAVEOUT hWaveOut,
 				   LPWAVEHDR lpWaveOutHdr, UINT uSize)
@@ -3995,7 +3995,7 @@
 }
 
 /**************************************************************************
- * 				waveOutBreakLoop	[WINMM.160]
+ * 				waveOutBreakLoop	[WINMM.@]
  */
 UINT WINAPI waveOutBreakLoop(HWAVEOUT hWaveOut)
 {
@@ -4023,7 +4023,7 @@
 }
 
 /**************************************************************************
- * 				waveOutPause		[WINMM.174]
+ * 				waveOutPause		[WINMM.@]
  */
 UINT WINAPI waveOutPause(HWAVEOUT hWaveOut)
 {
@@ -4051,7 +4051,7 @@
 }
 
 /**************************************************************************
- * 				waveOutReset		[WINMM.176]
+ * 				waveOutReset		[WINMM.@]
  */
 UINT WINAPI waveOutReset(HWAVEOUT hWaveOut)
 {
@@ -4079,7 +4079,7 @@
 }
 
 /**************************************************************************
- * 				waveOutRestart		[WINMM.177]
+ * 				waveOutRestart		[WINMM.@]
  */
 UINT WINAPI waveOutRestart(HWAVEOUT hWaveOut)
 {
@@ -4107,7 +4107,7 @@
 }
 
 /**************************************************************************
- * 				waveOutGetPosition	[WINMM.170]
+ * 				waveOutGetPosition	[WINMM.@]
  */
 UINT WINAPI waveOutGetPosition(HWAVEOUT hWaveOut, LPMMTIME lpTime,
 			       UINT uSize)
@@ -4138,7 +4138,7 @@
 }
 
 /**************************************************************************
- * 				waveOutGetPitch		[WINMM.168]
+ * 				waveOutGetPitch		[WINMM.@]
  */
 UINT WINAPI waveOutGetPitch(HWAVEOUT hWaveOut, LPDWORD lpdw)
 {
@@ -4160,7 +4160,7 @@
 }
 
 /**************************************************************************
- * 				waveOutSetPitch		[WINMM.178]
+ * 				waveOutSetPitch		[WINMM.@]
  */
 UINT WINAPI waveOutSetPitch(HWAVEOUT hWaveOut, DWORD dw)
 {
@@ -4182,7 +4182,7 @@
 }
 
 /**************************************************************************
- * 				waveOutGetPlaybackRate	[WINMM.169]
+ * 				waveOutGetPlaybackRate	[WINMM.@]
  */
 UINT WINAPI waveOutGetPlaybackRate(HWAVEOUT hWaveOut, LPDWORD lpdw)
 {
@@ -4204,7 +4204,7 @@
 }
 
 /**************************************************************************
- * 				waveOutSetPlaybackRate	[WINMM.179]
+ * 				waveOutSetPlaybackRate	[WINMM.@]
  */
 UINT WINAPI waveOutSetPlaybackRate(HWAVEOUT hWaveOut, DWORD dw)
 {
@@ -4226,7 +4226,7 @@
 }
 
 /**************************************************************************
- * 				waveOutGetVolume	[WINMM.171]
+ * 				waveOutGetVolume	[WINMM.@]
  */
 UINT WINAPI waveOutGetVolume(UINT devid, LPDWORD lpdw)
 {
@@ -4249,7 +4249,7 @@
 }
     
 /**************************************************************************
- * 				waveOutSetVolume	[WINMM.180]
+ * 				waveOutSetVolume	[WINMM.@]
  */
 UINT WINAPI waveOutSetVolume(UINT devid, DWORD dw)
 {
@@ -4308,7 +4308,7 @@
 }
 
 /**************************************************************************
- * 				waveOutMessage 		[WINMM.172]
+ * 				waveOutMessage 		[WINMM.@]
  */
 DWORD WINAPI waveOutMessage(HWAVEOUT hWaveOut, UINT uMessage, 
 			    DWORD dwParam1, DWORD dwParam2)
@@ -4356,7 +4356,7 @@
 }
 
 /**************************************************************************
- * 				waveInGetNumDevs 		[WINMM.151]
+ * 				waveInGetNumDevs 		[WINMM.@]
  */
 UINT WINAPI waveInGetNumDevs(void)
 {
@@ -4372,7 +4372,7 @@
 }
 
 /**************************************************************************
- * 				waveInGetDevCapsW 		[WINMM.147]
+ * 				waveInGetDevCapsW 		[WINMM.@]
  */
 UINT WINAPI waveInGetDevCapsW(UINT uDeviceID, LPWAVEINCAPSW lpCaps, UINT uSize)
 {
@@ -4393,7 +4393,7 @@
 }
 
 /**************************************************************************
- * 				waveInGetDevCapsA 		[WINMM.146]
+ * 				waveInGetDevCapsA 		[WINMM.@]
  */
 UINT WINAPI waveInGetDevCapsA(UINT uDeviceID, LPWAVEINCAPSA lpCaps, UINT uSize)
 {
@@ -4430,7 +4430,7 @@
 }
 
 /**************************************************************************
- * 				waveInGetErrorTextA 	[WINMM.148]
+ * 				waveInGetErrorTextA 	[WINMM.@]
  */
 UINT WINAPI waveInGetErrorTextA(UINT uError, LPSTR lpText, UINT uSize)
 {
@@ -4438,7 +4438,7 @@
 }
 
 /**************************************************************************
- * 				waveInGetErrorTextW 	[WINMM.149]
+ * 				waveInGetErrorTextW 	[WINMM.@]
  */
 UINT WINAPI waveInGetErrorTextW(UINT uError, LPWSTR lpText, UINT uSize)
 {
@@ -4459,7 +4459,7 @@
 }
 
 /**************************************************************************
- * 				waveInOpen			[WINMM.154]
+ * 				waveInOpen			[WINMM.@]
  */
 UINT WINAPI waveInOpen(HWAVEIN* lphWaveIn, UINT uDeviceID,
 		       const LPWAVEFORMATEX lpFormat, DWORD dwCallback,
@@ -4490,7 +4490,7 @@
 }
 
 /**************************************************************************
- * 				waveInClose			[WINMM.145]
+ * 				waveInClose			[WINMM.@]
  */
 UINT WINAPI waveInClose(HWAVEIN hWaveIn)
 {
@@ -4522,7 +4522,7 @@
 }
 
 /**************************************************************************
- * 				waveInPrepareHeader		[WINMM.155]
+ * 				waveInPrepareHeader		[WINMM.@]
  */
 UINT WINAPI waveInPrepareHeader(HWAVEIN hWaveIn, WAVEHDR* lpWaveInHdr, 
 				UINT uSize)
@@ -4564,7 +4564,7 @@
 }
 
 /**************************************************************************
- * 				waveInUnprepareHeader	[WINMM.159]
+ * 				waveInUnprepareHeader	[WINMM.@]
  */
 UINT WINAPI waveInUnprepareHeader(HWAVEIN hWaveIn, WAVEHDR* lpWaveInHdr, 
 				  UINT uSize)
@@ -4609,7 +4609,7 @@
 }
 
 /**************************************************************************
- * 				waveInAddBuffer		[WINMM.144]
+ * 				waveInAddBuffer		[WINMM.@]
  */
 UINT WINAPI waveInAddBuffer(HWAVEIN hWaveIn,
 			    WAVEHDR* lpWaveInHdr, UINT uSize)
@@ -4644,7 +4644,7 @@
 }
 
 /**************************************************************************
- * 				waveInReset		[WINMM.156]
+ * 				waveInReset		[WINMM.@]
  */
 UINT WINAPI waveInReset(HWAVEIN hWaveIn)
 {
@@ -4673,7 +4673,7 @@
 }
 
 /**************************************************************************
- * 				waveInStart		[WINMM.157]
+ * 				waveInStart		[WINMM.@]
  */
 UINT WINAPI waveInStart(HWAVEIN hWaveIn)
 {
@@ -4702,7 +4702,7 @@
 }
 
 /**************************************************************************
- * 				waveInStop		[WINMM.158]
+ * 				waveInStop		[WINMM.@]
  */
 UINT WINAPI waveInStop(HWAVEIN hWaveIn)
 {
@@ -4731,7 +4731,7 @@
 }
 
 /**************************************************************************
- * 				waveInGetPosition	[WINMM.152]
+ * 				waveInGetPosition	[WINMM.@]
  */
 UINT WINAPI waveInGetPosition(HWAVEIN hWaveIn, LPMMTIME lpTime,
 			      UINT uSize)
@@ -4762,7 +4762,7 @@
 }
 
 /**************************************************************************
- * 				waveInGetID			[WINMM.150]
+ * 				waveInGetID			[WINMM.@]
  */
 UINT WINAPI waveInGetID(HWAVEIN hWaveIn, UINT* lpuDeviceID)
 {
@@ -4798,7 +4798,7 @@
 }
 
 /**************************************************************************
- * 				waveInMessage 		[WINMM.153]
+ * 				waveInMessage 		[WINMM.@]
  */
 DWORD WINAPI waveInMessage(HWAVEIN hWaveIn, UINT uMessage,
 			   DWORD dwParam1, DWORD dwParam2)
diff --git a/dlls/winmm/sound16.c b/dlls/winmm/sound16.c
index 746c768..daee652 100644
--- a/dlls/winmm/sound16.c
+++ b/dlls/winmm/sound16.c
@@ -12,7 +12,7 @@
 DEFAULT_DEBUG_CHANNEL(sound);
 
 /***********************************************************************
- *		OpenSound16
+ *		OpenSound16 (SOUND.1)
  */
 INT16 WINAPI OpenSound16(void)
 {
@@ -21,7 +21,7 @@
 }
 
 /***********************************************************************
- *		CloseSound16
+ *		CloseSound16 (SOUND.2)
  */
 void WINAPI CloseSound16(void)
 {
@@ -29,7 +29,7 @@
 }
 
 /***********************************************************************
- *		SetVoiceQueueSize16
+ *		SetVoiceQueueSize16 (SOUND.3)
  */
 INT16 WINAPI SetVoiceQueueSize16(INT16 nVoice, INT16 nBytes)
 {
@@ -38,7 +38,7 @@
 }
 
 /***********************************************************************
- *		SetVoiceNote16
+ *		SetVoiceNote16 (SOUND.4)
  */
 INT16 WINAPI SetVoiceNote16(INT16 nVoice, INT16 nValue, INT16 nLength,
                             INT16 nCdots)
@@ -48,7 +48,7 @@
 }
 
 /***********************************************************************
- *		SetVoiceAccent16
+ *		SetVoiceAccent16 (SOUND.5)
  */
 INT16 WINAPI SetVoiceAccent16(INT16 nVoice, INT16 nTempo, INT16 nVolume,
                               INT16 nMode, INT16 nPitch)
@@ -59,7 +59,7 @@
 }
 
 /***********************************************************************
- *		SetVoiceEnvelope16
+ *		SetVoiceEnvelope16 (SOUND.6)
  */
 INT16 WINAPI SetVoiceEnvelope16(INT16 nVoice, INT16 nShape, INT16 nRepeat)
 {
@@ -68,7 +68,7 @@
 }
 
 /***********************************************************************
- *		SetSoundNoise16
+ *		SetSoundNoise16 (SOUND.7)
  */
 INT16 WINAPI SetSoundNoise16(INT16 nSource, INT16 nDuration)
 {
@@ -77,7 +77,7 @@
 }
 
 /***********************************************************************
- *		SetVoiceSound16
+ *		SetVoiceSound16 (SOUND.8)
  */
 INT16 WINAPI SetVoiceSound16(INT16 nVoice, DWORD lFrequency, INT16 nDuration)
 {
@@ -86,7 +86,7 @@
 }
 
 /***********************************************************************
- *		StartSound16
+ *		StartSound16 (SOUND.9)
  */
 INT16 WINAPI StartSound16(void)
 {
@@ -94,7 +94,7 @@
 }
 
 /***********************************************************************
- *		StopSound16
+ *		StopSound16 (SOUND.10)
  */
 INT16 WINAPI StopSound16(void)
 {
@@ -102,7 +102,7 @@
 }
 
 /***********************************************************************
- *		WaitSoundState16
+ *		WaitSoundState16 (SOUND.11)
  */
 INT16 WINAPI WaitSoundState16(INT16 x)
 {
@@ -111,7 +111,7 @@
 }
 
 /***********************************************************************
- *		SyncAllVoices16
+ *		SyncAllVoices16 (SOUND.12)
  */
 INT16 WINAPI SyncAllVoices16(void)
 {
@@ -120,7 +120,7 @@
 }
 
 /***********************************************************************
- *		CountVoiceNotes16
+ *		CountVoiceNotes16 (SOUND.13)
  */
 INT16 WINAPI CountVoiceNotes16(INT16 x)
 {
@@ -129,7 +129,7 @@
 }
 
 /***********************************************************************
- *		GetThresholdEvent16
+ *		GetThresholdEvent16 (SOUND.14)
  */
 LPINT16 WINAPI GetThresholdEvent16(void)
 {
@@ -138,7 +138,7 @@
 }
 
 /***********************************************************************
- *		GetThresholdStatus16
+ *		GetThresholdStatus16 (SOUND.15)
  */
 INT16 WINAPI GetThresholdStatus16(void)
 {
@@ -147,7 +147,7 @@
 }
 
 /***********************************************************************
- *		SetVoiceThreshold16
+ *		SetVoiceThreshold16 (SOUND.16)
  */
 INT16 WINAPI SetVoiceThreshold16(INT16 a, INT16 b)
 {
@@ -156,7 +156,7 @@
 }
 
 /***********************************************************************
- *		DoBeep16
+ *		DoBeep16 (SOUND.17)
  */
 void WINAPI DoBeep16(void)
 {
diff --git a/dlls/winmm/time.c b/dlls/winmm/time.c
index 0ce0aca..c30b1f0 100644
--- a/dlls/winmm/time.c
+++ b/dlls/winmm/time.c
@@ -196,7 +196,7 @@
 }
 
 /**************************************************************************
- * 				timeGetSystemTime	[WINMM.140]
+ * 				timeGetSystemTime	[WINMM.@]
  */
 MMRESULT WINAPI timeGetSystemTime(LPMMTIME lpTime, UINT wSize)
 {
@@ -302,7 +302,7 @@
 }
 
 /**************************************************************************
- * 				timeKillEvent		[WINMM.142]
+ * 				timeKillEvent		[WINMM.@]
  */
 MMRESULT WINAPI timeKillEvent(UINT wID)
 {
@@ -343,7 +343,7 @@
 }
 
 /**************************************************************************
- * 				timeGetDevCaps		[WINMM.139]
+ * 				timeGetDevCaps		[WINMM.@]
  */
 MMRESULT WINAPI timeGetDevCaps(LPTIMECAPS lpCaps, UINT wSize)
 {
@@ -367,7 +367,7 @@
 }
 
 /**************************************************************************
- * 				timeBeginPeriod		[WINMM.137]
+ * 				timeBeginPeriod		[WINMM.@]
  */
 MMRESULT WINAPI timeBeginPeriod(UINT wPeriod)
 {
@@ -391,7 +391,7 @@
 }
 
 /**************************************************************************
- * 				timeEndPeriod		[WINMM.138]
+ * 				timeEndPeriod		[WINMM.@]
  */
 MMRESULT WINAPI timeEndPeriod(UINT wPeriod)
 {
@@ -415,7 +415,8 @@
 }
 
 /**************************************************************************
- * 				timeGetTime    [MMSYSTEM.607][WINMM.141]
+ * 				timeGetTime    [MMSYSTEM.607]
+ * 				timeGetTime    [WINMM.@]
  */
 DWORD WINAPI timeGetTime(void)
 {
diff --git a/dlls/winsock/socket.c b/dlls/winsock/socket.c
index 36cd048..d388e39 100644
--- a/dlls/winsock/socket.c
+++ b/dlls/winsock/socket.c
@@ -2537,7 +2537,7 @@
  * ------------------------------------------------------------------- */
 
 /***********************************************************************
- *		WSAEnumNetworkEvents
+ *		WSAEnumNetworkEvents (WS2_32.36)
  */
 int WINAPI WSAEnumNetworkEvents(SOCKET s, WSAEVENT hEvent, LPWSANETWORKEVENTS lpEvent)
 {
@@ -2564,7 +2564,7 @@
 }
 
 /***********************************************************************
- *		WSAEventSelect
+ *		WSAEventSelect (WS2_32.39)
  */
 int WINAPI WSAEventSelect(SOCKET s, WSAEVENT hEvent, LONG lEvent)
 {
diff --git a/dlls/winspool/info.c b/dlls/winspool/info.c
index 9c8202e..387170e 100644
--- a/dlls/winspool/info.c
+++ b/dlls/winspool/info.c
@@ -652,7 +652,7 @@
 
 
 /*****************************************************************************
- *          DocumentPropertiesW 
+ *          DocumentPropertiesW (WINSPOOL.@)
  */
 LONG WINAPI DocumentPropertiesW(HWND hWnd, HANDLE hPrinter,
 				LPWSTR pDeviceName,
diff --git a/dlls/x11drv/window.c b/dlls/x11drv/window.c
index a162aad..c40eb7d 100644
--- a/dlls/x11drv/window.c
+++ b/dlls/x11drv/window.c
@@ -1199,7 +1199,7 @@
 
 
 /**********************************************************************
- *		X11DRV_SetWindowIcon
+ *		X11DRV_SetWindowIcon (X11DRV.@)
  *
  * hIcon or hIconSm has changed (or is being initialised for the
  * first time). Complete the X11 driver-specific initialisation
diff --git a/dlls/x11drv/winpos.c b/dlls/x11drv/winpos.c
index de0be2d..44e85c0 100644
--- a/dlls/x11drv/winpos.c
+++ b/dlls/x11drv/winpos.c
@@ -157,7 +157,7 @@
 
 
 /***********************************************************************
- *		X11DRV_GetDC
+ *		X11DRV_GetDC (X11DRV.@)
  *
  * Set the drawable, origin and dimensions for the DC associated to
  * a given window.
diff --git a/dlls/x11drv/x11drv_main.c b/dlls/x11drv/x11drv_main.c
index 50b0ac2..cce1f6b 100644
--- a/dlls/x11drv/x11drv_main.c
+++ b/dlls/x11drv/x11drv_main.c
@@ -466,7 +466,7 @@
 }
 
 /***********************************************************************
- *              X11DRV_GetScreenSaveActive
+ *              X11DRV_GetScreenSaveActive (X11DRV.@)
  *
  * Returns the active status of the screen saver
  */
@@ -478,7 +478,7 @@
 }
 
 /***********************************************************************
- *              X11DRV_SetScreenSaveActive
+ *              X11DRV_SetScreenSaveActive (X11DRV.@)
  *
  * Activate/Deactivate the screen saver
  */
@@ -491,7 +491,7 @@
 }
 
 /***********************************************************************
- *              X11DRV_GetScreenSaveTimeout
+ *              X11DRV_GetScreenSaveTimeout (X11DRV.@)
  *
  * Return the screen saver timeout
  */
@@ -503,7 +503,7 @@
 }
 
 /***********************************************************************
- *              X11DRV_SetScreenSaveTimeout
+ *              X11DRV_SetScreenSaveTimeout (X11DRV.@)
  *
  * Set the screen saver timeout
  */