Documentation ordinal fixes.

diff --git a/dlls/advapi32/advapi.c b/dlls/advapi32/advapi.c
index 12ab139..26f9a1c 100644
--- a/dlls/advapi32/advapi.c
+++ b/dlls/advapi32/advapi.c
@@ -18,7 +18,7 @@
 
 
 /******************************************************************************
- * GetUserNameA [ADVAPI32.67]
+ * GetUserNameA [ADVAPI32.@]
  */
 BOOL WINAPI
 GetUserNameA( LPSTR lpszName, LPDWORD lpSize )
@@ -40,7 +40,7 @@
 }
 
 /******************************************************************************
- * GetUserNameW [ADVAPI32.68]
+ * GetUserNameW [ADVAPI32.@]
  *
  * PARAMS
  *   lpszName []
diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c
index 7438f2e..5b99481 100644
--- a/dlls/advapi32/crypt.c
+++ b/dlls/advapi32/crypt.c
@@ -12,7 +12,7 @@
 DEFAULT_DEBUG_CHANNEL(advapi);
 
 /******************************************************************************
- * CryptAcquireContextA
+ * CryptAcquireContextA (ADVAPI32.@)
  * Acquire a crypto provider context handle.
  * 
  * PARAMS
@@ -35,7 +35,7 @@
 }
 
 /******************************************************************************
- * CryptSetKeyParam
+ * CryptSetKeyParam (ADVAPI32.@)
  */
 BOOL WINAPI
 CryptSetKeyParam( HCRYPTKEY hKey, DWORD dwParam, BYTE *pbData, DWORD dwFlags)
@@ -46,7 +46,7 @@
 
 
 /******************************************************************************
- * CryptGenRandom
+ * CryptGenRandom (ADVAPI32.@)
  */
 BOOL WINAPI
 CryptGenRandom (HCRYPTPROV hProv, DWORD dwLen, BYTE *pbBuffer)
@@ -84,7 +84,7 @@
 
 
 /******************************************************************************
- * CryptReleaseContext
+ * CryptReleaseContext (ADVAPI32.@)
  */
 BOOL WINAPI
 CryptReleaseContext (HCRYPTPROV hProv, DWORD dwFlags)
diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c
index 85ea566..fa74943 100644
--- a/dlls/advapi32/eventlog.c
+++ b/dlls/advapi32/eventlog.c
@@ -14,7 +14,7 @@
 DEFAULT_DEBUG_CHANNEL(advapi);
 
 /******************************************************************************
- * BackupEventLogA [ADVAPI32.15]
+ * BackupEventLogA [ADVAPI32.@]
  */
 BOOL WINAPI BackupEventLogA( HANDLE hEventLog, LPCSTR lpBackupFileName )
 {
@@ -23,7 +23,7 @@
 }
 
 /******************************************************************************
- * BackupEventLogW [ADVAPI32.16]
+ * BackupEventLogW [ADVAPI32.@]
  *
  * PARAMS
  *   hEventLog        []
@@ -37,7 +37,7 @@
 }
 
 /******************************************************************************
- * ClearEventLogA [ADVAPI32.19]
+ * ClearEventLogA [ADVAPI32.@]
  */
 BOOL WINAPI ClearEventLogA ( HANDLE hEventLog, LPCSTR lpBackupFileName )
 {
@@ -46,7 +46,7 @@
 }
 
 /******************************************************************************
- * ClearEventLogW [ADVAPI32.20]
+ * ClearEventLogW [ADVAPI32.@]
  */
 BOOL WINAPI ClearEventLogW ( HANDLE hEventLog, LPCWSTR lpBackupFileName )
 {
@@ -55,7 +55,7 @@
 }
 
 /******************************************************************************
- * CloseEventLog [ADVAPI32.21]
+ * CloseEventLog [ADVAPI32.@]
  */
 BOOL WINAPI CloseEventLog ( HANDLE hEventLog )
 {
@@ -64,7 +64,7 @@
 }
 
 /******************************************************************************
- * DeregisterEventSource [ADVAPI32.32]
+ * DeregisterEventSource [ADVAPI32.@]
  * Closes a handle to the specified event log
  *
  * PARAMS
@@ -79,7 +79,7 @@
 }
 
 /******************************************************************************
- * GetNumberOfEventLogRecords [ADVAPI32.49]
+ * GetNumberOfEventLogRecords [ADVAPI32.@]
  *
  * PARAMS
  *   hEventLog       []
@@ -93,7 +93,7 @@
 }
 
 /******************************************************************************
- * GetOldestEventLogRecord [ADVAPI32.50]
+ * GetOldestEventLogRecord [ADVAPI32.@]
  *
  * PARAMS
  *   hEventLog    []
@@ -107,7 +107,7 @@
 }
 
 /******************************************************************************
- * NotifyChangeEventLog [ADVAPI32.98]
+ * NotifyChangeEventLog [ADVAPI32.@]
  *
  * PARAMS
  *   hEventLog []
@@ -120,7 +120,7 @@
 }
 
 /******************************************************************************
- * OpenBackupEventLogA [ADVAPI32.105]
+ * OpenBackupEventLogA [ADVAPI32.@]
  */
 HANDLE WINAPI
 OpenBackupEventLogA( LPCSTR lpUNCServerName, LPCSTR lpFileName )
@@ -130,7 +130,7 @@
 }
 
 /******************************************************************************
- * OpenBackupEventLogW [ADVAPI32.106]
+ * OpenBackupEventLogW [ADVAPI32.@]
  *
  * PARAMS
  *   lpUNCServerName []
@@ -144,7 +144,7 @@
 }
 
 /******************************************************************************
- * OpenEventLogA [ADVAPI32.107]
+ * OpenEventLogA [ADVAPI32.@]
  */
 HANDLE WINAPI OpenEventLogA(LPCSTR uncname,LPCSTR source) 
 {
@@ -153,7 +153,7 @@
 }
 
 /******************************************************************************
- * OpenEventLogW [ADVAPI32.108]
+ * OpenEventLogW [ADVAPI32.@]
  *
  * PARAMS
  *   uncname []
@@ -167,7 +167,7 @@
 }
 
 /******************************************************************************
- * ReadEventLogA [ADVAPI32.124]
+ * ReadEventLogA [ADVAPI32.@]
  */
 BOOL WINAPI ReadEventLogA( HANDLE hEventLog, DWORD dwReadFlags, DWORD dwRecordOffset,
     LPVOID lpBuffer, DWORD nNumberOfBytesToRead, DWORD *pnBytesRead, DWORD *pnMinNumberOfBytesNeeded )
@@ -177,7 +177,7 @@
 }
 
 /******************************************************************************
- * ReadEventLogW [ADVAPI32.125]
+ * ReadEventLogW [ADVAPI32.@]
  *
  * PARAMS
  *   hEventLog                []
@@ -198,7 +198,7 @@
 }
 
 /******************************************************************************
- * RegisterEventSourceA [ADVAPI32.174]
+ * RegisterEventSourceA [ADVAPI32.@]
  */
 HANDLE WINAPI RegisterEventSourceA( LPCSTR lpUNCServerName, LPCSTR lpSourceName )
 {
@@ -211,7 +211,7 @@
 }
 
 /******************************************************************************
- * RegisterEventSourceW [ADVAPI32.175]
+ * RegisterEventSourceW [ADVAPI32.@]
  * Returns a registered handle to an event log
  *
  * PARAMS
@@ -231,7 +231,7 @@
 }
 
 /******************************************************************************
- * ReportEventA [ADVAPI32.178]
+ * ReportEventA [ADVAPI32.@]
  */
 BOOL WINAPI ReportEventA ( HANDLE hEventLog, WORD wType, WORD wCategory, DWORD dwEventID,
     PSID lpUserSid, WORD wNumStrings, DWORD dwDataSize, LPCSTR *lpStrings, LPVOID lpRawData)
@@ -241,7 +241,7 @@
 }
 
 /******************************************************************************
- * ReportEventW [ADVAPI32.179]
+ * ReportEventW [ADVAPI32.@]
  *
  * PARAMS
  *   hEventLog   []
diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c
index 8878166..bfb764d 100644
--- a/dlls/advapi32/registry.c
+++ b/dlls/advapi32/registry.c
@@ -42,7 +42,7 @@
 }
 
 /******************************************************************************
- *           RegCreateKeyExW   [ADVAPI32.131]
+ *           RegCreateKeyExW   [ADVAPI32.@]
  *
  * PARAMS
  *    hkey       [I] Handle of an open key
@@ -83,7 +83,7 @@
 
 
 /******************************************************************************
- *           RegCreateKeyExA   [ADVAPI32.130]
+ *           RegCreateKeyExA   [ADVAPI32.@]
  */
 DWORD WINAPI RegCreateKeyExA( HKEY hkey, LPCSTR name, DWORD reserved, LPSTR class,
                               DWORD options, REGSAM access, SECURITY_ATTRIBUTES *sa, 
@@ -121,7 +121,7 @@
 
 
 /******************************************************************************
- *           RegCreateKeyW   [ADVAPI32.132]
+ *           RegCreateKeyW   [ADVAPI32.@]
  */
 DWORD WINAPI RegCreateKeyW( HKEY hkey, LPCWSTR name, LPHKEY retkey )
 {
@@ -133,7 +133,7 @@
 
 
 /******************************************************************************
- *           RegCreateKeyA   [ADVAPI32.129]
+ *           RegCreateKeyA   [ADVAPI32.@]
  */
 DWORD WINAPI RegCreateKeyA( HKEY hkey, LPCSTR name, LPHKEY retkey )
 {
@@ -144,7 +144,7 @@
 
 
 /******************************************************************************
- *           RegOpenKeyExW   [ADVAPI32.150]
+ *           RegOpenKeyExW   [ADVAPI32.@]
  *
  * Opens the specified key
  *
@@ -181,7 +181,7 @@
 
 
 /******************************************************************************
- *           RegOpenKeyExA   [ADVAPI32.149]
+ *           RegOpenKeyExA   [ADVAPI32.@]
  */
 DWORD WINAPI RegOpenKeyExA( HKEY hkey, LPCSTR name, DWORD reserved, REGSAM access, LPHKEY retkey )
 {
@@ -209,7 +209,7 @@
 
 
 /******************************************************************************
- *           RegOpenKeyW   [ADVAPI32.151]
+ *           RegOpenKeyW   [ADVAPI32.@]
  *
  * PARAMS
  *    hkey    [I] Handle of open key
@@ -230,7 +230,7 @@
 
 
 /******************************************************************************
- *           RegOpenKeyA   [ADVAPI32.148]
+ *           RegOpenKeyA   [ADVAPI32.@]
  */
 DWORD WINAPI RegOpenKeyA( HKEY hkey, LPCSTR name, LPHKEY retkey )
 {
@@ -239,7 +239,7 @@
 
 
 /******************************************************************************
- *           RegOpenCurrentUser   [ADVAPI32]
+ *           RegOpenCurrentUser   [ADVAPI32.@]
  * FIXME: This function is supposed to retrieve a handle to the
  * HKEY_CURRENT_USER for the user the current thread is impersonating.
  * Since Wine does not currently allow threads to impersonate other users,
@@ -253,7 +253,7 @@
 
 
 /******************************************************************************
- *           RegEnumKeyExW   [ADVAPI32.139]
+ *           RegEnumKeyExW   [ADVAPI32.@]
  *
  * PARAMS
  *    hkey         [I] Handle to key to enumerate
@@ -324,7 +324,7 @@
 
 
 /******************************************************************************
- *           RegEnumKeyExA   [ADVAPI32.138]
+ *           RegEnumKeyExA   [ADVAPI32.@]
  */
 DWORD WINAPI RegEnumKeyExA( HKEY hkey, DWORD index, LPSTR name, LPDWORD name_len,
                             LPDWORD reserved, LPSTR class, LPDWORD class_len, FILETIME *ft )
@@ -391,7 +391,7 @@
 
 
 /******************************************************************************
- *           RegEnumKeyW   [ADVAPI32.140]
+ *           RegEnumKeyW   [ADVAPI32.@]
  */
 DWORD WINAPI RegEnumKeyW( HKEY hkey, DWORD index, LPWSTR name, DWORD name_len )
 {
@@ -400,7 +400,7 @@
 
 
 /******************************************************************************
- *           RegEnumKeyA   [ADVAPI32.137]
+ *           RegEnumKeyA   [ADVAPI32.@]
  */
 DWORD WINAPI RegEnumKeyA( HKEY hkey, DWORD index, LPSTR name, DWORD name_len )
 {
@@ -409,7 +409,7 @@
 
 
 /******************************************************************************
- *           RegQueryInfoKeyW   [ADVAPI32.153]
+ *           RegQueryInfoKeyW   [ADVAPI32.@]
  *
  * PARAMS
  *    hkey       [I] Handle to key to query
@@ -491,7 +491,7 @@
 
 
 /******************************************************************************
- *           RegQueryInfoKeyA   [ADVAPI32.152]
+ *           RegQueryInfoKeyA   [ADVAPI32.@]
  */
 DWORD WINAPI RegQueryInfoKeyA( HKEY hkey, LPSTR class, LPDWORD class_len, LPDWORD reserved,
                                LPDWORD subkeys, LPDWORD max_subkey, LPDWORD max_class,
@@ -561,7 +561,7 @@
 
 
 /******************************************************************************
- *           RegCloseKey   [ADVAPI32.126]
+ *           RegCloseKey   [ADVAPI32.@]
  *
  * Releases the handle of the specified key
  *
@@ -580,7 +580,7 @@
 
 
 /******************************************************************************
- *           RegDeleteKeyW   [ADVAPI32.134]
+ *           RegDeleteKeyW   [ADVAPI32.@]
  *
  * PARAMS
  *    hkey   [I] Handle to open key
@@ -606,7 +606,7 @@
 
 
 /******************************************************************************
- *           RegDeleteKeyA   [ADVAPI32.133]
+ *           RegDeleteKeyA   [ADVAPI32.@]
  */
 DWORD WINAPI RegDeleteKeyA( HKEY hkey, LPCSTR name )
 {
@@ -625,7 +625,7 @@
 
 
 /******************************************************************************
- *           RegSetValueExW   [ADVAPI32.170]
+ *           RegSetValueExW   [ADVAPI32.@]
  *
  * Sets the data and type of a value under a register key
  *
@@ -664,7 +664,7 @@
 
 
 /******************************************************************************
- *           RegSetValueExA   [ADVAPI32.169]
+ *           RegSetValueExA   [ADVAPI32.@]
  */
 DWORD WINAPI RegSetValueExA( HKEY hkey, LPCSTR name, DWORD reserved, DWORD type,
                              CONST BYTE *data, DWORD count )
@@ -703,7 +703,7 @@
 
 
 /******************************************************************************
- *           RegSetValueW   [ADVAPI32.171]
+ *           RegSetValueW   [ADVAPI32.@]
  */
 DWORD WINAPI RegSetValueW( HKEY hkey, LPCWSTR name, DWORD type, LPCWSTR data, DWORD count )
 {
@@ -727,7 +727,7 @@
 
 
 /******************************************************************************
- *           RegSetValueA   [ADVAPI32.168]
+ *           RegSetValueA   [ADVAPI32.@]
  */
 DWORD WINAPI RegSetValueA( HKEY hkey, LPCSTR name, DWORD type, LPCSTR data, DWORD count )
 {
@@ -750,7 +750,7 @@
 
 
 /******************************************************************************
- *           RegQueryValueExW   [ADVAPI32.158]
+ *           RegQueryValueExW   [ADVAPI32.@]
  *
  * Retrieves type and data for a specified name associated with an open key
  *
@@ -831,7 +831,7 @@
 
 
 /******************************************************************************
- *           RegQueryValueExA   [ADVAPI32.157]
+ *           RegQueryValueExA   [ADVAPI32.@]
  *
  * NOTES:
  * the documentation is wrong: if the buffer is too small it remains untouched 
@@ -920,7 +920,7 @@
 
 
 /******************************************************************************
- *           RegQueryValueW   [ADVAPI32.159]
+ *           RegQueryValueW   [ADVAPI32.@]
  */
 DWORD WINAPI RegQueryValueW( HKEY hkey, LPCWSTR name, LPWSTR data, LPLONG count )
 {
@@ -947,7 +947,7 @@
 
 
 /******************************************************************************
- *           RegQueryValueA   [ADVAPI32.156]
+ *           RegQueryValueA   [ADVAPI32.@]
  */
 DWORD WINAPI RegQueryValueA( HKEY hkey, LPCSTR name, LPSTR data, LPLONG count )
 {
@@ -974,7 +974,7 @@
 
 
 /******************************************************************************
- *           RegEnumValueW   [ADVAPI32.142]
+ *           RegEnumValueW   [ADVAPI32.@]
  *
  * PARAMS
  *    hkey       [I] Handle to key to query
@@ -1066,7 +1066,7 @@
 
 
 /******************************************************************************
- *           RegEnumValueA   [ADVAPI32.141]
+ *           RegEnumValueA   [ADVAPI32.@]
  */
 DWORD WINAPI RegEnumValueA( HKEY hkey, DWORD index, LPSTR value, LPDWORD val_count,
                             LPDWORD reserved, LPDWORD type, LPBYTE data, LPDWORD count )
@@ -1163,7 +1163,7 @@
 
 
 /******************************************************************************
- *           RegDeleteValueW   [ADVAPI32.136]
+ *           RegDeleteValueW   [ADVAPI32.@]
  *
  * PARAMS
  *    hkey   [I] handle to key
@@ -1181,7 +1181,7 @@
 
 
 /******************************************************************************
- *           RegDeleteValueA   [ADVAPI32.135]
+ *           RegDeleteValueA   [ADVAPI32.@]
  */
 DWORD WINAPI RegDeleteValueA( HKEY hkey, LPCSTR name )
 {
@@ -1201,7 +1201,7 @@
 
 
 /******************************************************************************
- *           RegLoadKeyW   [ADVAPI32.185]
+ *           RegLoadKeyW   [ADVAPI32.@]
  *
  * PARAMS
  *    hkey      [I] Handle of open key
@@ -1246,7 +1246,7 @@
 
 
 /******************************************************************************
- *           RegLoadKeyA   [ADVAPI32.184]
+ *           RegLoadKeyA   [ADVAPI32.@]
  */
 LONG WINAPI RegLoadKeyA( HKEY hkey, LPCSTR subkey, LPCSTR filename )
 {
@@ -1287,7 +1287,7 @@
 
 
 /******************************************************************************
- *           RegSaveKeyA   [ADVAPI32.165]
+ *           RegSaveKeyA   [ADVAPI32.@]
  *
  * PARAMS
  *    hkey   [I] Handle of key where save begins
@@ -1348,7 +1348,7 @@
 
 
 /******************************************************************************
- *           RegSaveKeyW   [ADVAPI32.166]
+ *           RegSaveKeyW   [ADVAPI32.@]
  */
 LONG WINAPI RegSaveKeyW( HKEY hkey, LPCWSTR file, LPSECURITY_ATTRIBUTES sa )
 {
@@ -1360,7 +1360,7 @@
 
 
 /******************************************************************************
- * RegRestoreKeyW [ADVAPI32.164]
+ * RegRestoreKeyW [ADVAPI32.@]
  *
  * PARAMS
  *    hkey    [I] Handle of key where restore begins
@@ -1384,7 +1384,7 @@
 
 
 /******************************************************************************
- * RegRestoreKeyA [ADVAPI32.163]
+ * RegRestoreKeyA [ADVAPI32.@]
  */
 LONG WINAPI RegRestoreKeyA( HKEY hkey, LPCSTR lpFile, DWORD dwFlags )
 {
@@ -1396,7 +1396,7 @@
 
 
 /******************************************************************************
- * RegUnLoadKeyW [ADVAPI32.173]
+ * RegUnLoadKeyW [ADVAPI32.@]
  *
  * PARAMS
  *    hkey     [I] Handle of open key
@@ -1410,7 +1410,7 @@
 
 
 /******************************************************************************
- * RegUnLoadKeyA [ADVAPI32.172]
+ * RegUnLoadKeyA [ADVAPI32.@]
  */
 LONG WINAPI RegUnLoadKeyA( HKEY hkey, LPCSTR lpSubKey )
 {
@@ -1422,7 +1422,7 @@
 
 
 /******************************************************************************
- * RegReplaceKeyW [ADVAPI32.162]
+ * RegReplaceKeyW [ADVAPI32.@]
  *
  * PARAMS
  *    hkey      [I] Handle of open key
@@ -1440,7 +1440,7 @@
 
 
 /******************************************************************************
- * RegReplaceKeyA [ADVAPI32.161]
+ * RegReplaceKeyA [ADVAPI32.@]
  */
 LONG WINAPI RegReplaceKeyA( HKEY hkey, LPCSTR lpSubKey, LPCSTR lpNewFile,
                               LPCSTR lpOldFile )
@@ -1457,7 +1457,7 @@
 
 
 /******************************************************************************
- * RegSetKeySecurity [ADVAPI32.167]
+ * RegSetKeySecurity [ADVAPI32.@]
  *
  * PARAMS
  *    hkey          [I] Open handle of key to set
@@ -1488,7 +1488,7 @@
 
 
 /******************************************************************************
- * RegGetKeySecurity [ADVAPI32.144]
+ * RegGetKeySecurity [ADVAPI32.@]
  * Retrieves a copy of security descriptor protecting the registry key
  *
  * PARAMS
@@ -1521,7 +1521,7 @@
 
 
 /******************************************************************************
- * RegFlushKey [ADVAPI32.143]
+ * RegFlushKey [ADVAPI32.@]
  * Immediately writes key to registry.
  * Only returns after data has been written to disk.
  *
@@ -1542,7 +1542,7 @@
 
 
 /******************************************************************************
- * RegConnectRegistryW [ADVAPI32.128]
+ * RegConnectRegistryW [ADVAPI32.@]
  *
  * PARAMS
  *    lpMachineName [I] Address of name of remote computer
@@ -1565,7 +1565,7 @@
 
 
 /******************************************************************************
- * RegConnectRegistryA [ADVAPI32.127]
+ * RegConnectRegistryA [ADVAPI32.@]
  */
 LONG WINAPI RegConnectRegistryA( LPCSTR machine, HKEY hkey, LPHKEY reskey )
 {
@@ -1577,7 +1577,7 @@
 
 
 /******************************************************************************
- * RegNotifyChangeKeyValue [ADVAPI32.???]
+ * RegNotifyChangeKeyValue [ADVAPI32.@]
  *
  * PARAMS
  *    hkey            [I] Handle of key to watch
diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c
index 4086f8c..f582738 100644
--- a/dlls/advapi32/security.c
+++ b/dlls/advapi32/security.c
@@ -38,7 +38,7 @@
 */
 
 /******************************************************************************
- * OpenProcessToken			[ADVAPI32.109]
+ * OpenProcessToken			[ADVAPI32.@]
  * Opens the access token associated with a process
  *
  * PARAMS
@@ -56,7 +56,7 @@
 }
 
 /******************************************************************************
- * OpenThreadToken [ADVAPI32.114]
+ * OpenThreadToken [ADVAPI32.@]
  *
  * PARAMS
  *   thread        []
@@ -72,7 +72,7 @@
 }
 
 /******************************************************************************
- * AdjustTokenPrivileges [ADVAPI32.10]
+ * AdjustTokenPrivileges [ADVAPI32.@]
  *
  * PARAMS
  *   TokenHandle          []
@@ -91,7 +91,7 @@
 }
 
 /******************************************************************************
- * GetTokenInformation [ADVAPI32.66]
+ * GetTokenInformation [ADVAPI32.@]
  *
  * PARAMS
  *   token           []
@@ -109,7 +109,7 @@
 }
 
 /*************************************************************************
- * SetThreadToken [ADVAPI32.231]
+ * SetThreadToken [ADVAPI32.@]
  *
  * Assigns an "impersonation token" to a thread so it can assume the
  * security privledges of another thread or process.  Can also remove
@@ -133,7 +133,7 @@
 */
 
 /******************************************************************************
- * AllocateAndInitializeSid [ADVAPI32.11]
+ * AllocateAndInitializeSid [ADVAPI32.@]
  *
  * PARAMS
  *   pIdentifierAuthority []
@@ -165,7 +165,7 @@
 }
 
 /******************************************************************************
- * FreeSid [ADVAPI32.42]
+ * FreeSid [ADVAPI32.@]
  *
  * PARAMS
  *   pSid []
@@ -178,7 +178,7 @@
 }
 
 /******************************************************************************
- * CopySid [ADVAPI32.24]
+ * CopySid [ADVAPI32.@]
  *
  * PARAMS
  *   nDestinationSidLength []
@@ -192,7 +192,7 @@
 }
 
 /******************************************************************************
- * IsValidSid [ADVAPI32.80]
+ * IsValidSid [ADVAPI32.@]
  *
  * PARAMS
  *   pSid []
@@ -204,7 +204,7 @@
 }
 
 /******************************************************************************
- * EqualSid [ADVAPI32.40]
+ * EqualSid [ADVAPI32.@]
  *
  * PARAMS
  *   pSid1 []
@@ -217,7 +217,7 @@
 }
 
 /******************************************************************************
- * EqualPrefixSid [ADVAPI32.39]
+ * EqualPrefixSid [ADVAPI32.@]
  */
 BOOL WINAPI EqualPrefixSid (PSID pSid1, PSID pSid2) 
 {
@@ -225,7 +225,7 @@
 }
 
 /******************************************************************************
- * GetSidLengthRequired [ADVAPI32.63]
+ * GetSidLengthRequired [ADVAPI32.@]
  *
  * PARAMS
  *   nSubAuthorityCount []
@@ -237,7 +237,7 @@
 }
 
 /******************************************************************************
- * InitializeSid [ADVAPI32.74]
+ * InitializeSid [ADVAPI32.@]
  *
  * PARAMS
  *   pIdentifierAuthority []
@@ -252,7 +252,7 @@
 }
 
 /******************************************************************************
- * GetSidIdentifierAuthority [ADVAPI32.62]
+ * GetSidIdentifierAuthority [ADVAPI32.@]
  *
  * PARAMS
  *   pSid []
@@ -264,7 +264,7 @@
 }
 
 /******************************************************************************
- * GetSidSubAuthority [ADVAPI32.64]
+ * GetSidSubAuthority [ADVAPI32.@]
  *
  * PARAMS
  *   pSid          []
@@ -277,7 +277,7 @@
 }
 
 /******************************************************************************
- * GetSidSubAuthorityCount [ADVAPI32.65]
+ * GetSidSubAuthorityCount [ADVAPI32.@]
  *
  * PARAMS
  *   pSid []
@@ -289,7 +289,7 @@
 }
 
 /******************************************************************************
- * GetLengthSid [ADVAPI32.48]
+ * GetLengthSid [ADVAPI32.@]
  *
  * PARAMS
  *   pSid []
@@ -306,7 +306,7 @@
 */
 	
 /******************************************************************************
- * InitializeSecurityDescriptor [ADVAPI32.73]
+ * InitializeSecurityDescriptor [ADVAPI32.@]
  *
  * PARAMS
  *   pDescr   []
@@ -319,7 +319,7 @@
 }
 
 /******************************************************************************
- * GetSecurityDescriptorLength [ADVAPI32.55]
+ * GetSecurityDescriptorLength [ADVAPI32.@]
  */
 DWORD WINAPI GetSecurityDescriptorLength( SECURITY_DESCRIPTOR *pDescr)
 {
@@ -327,7 +327,7 @@
 }
 
 /******************************************************************************
- * GetSecurityDescriptorOwner [ADVAPI32.56]
+ * GetSecurityDescriptorOwner [ADVAPI32.@]
  *
  * PARAMS
  *   pOwner            []
@@ -341,7 +341,7 @@
 }
 
 /******************************************************************************
- * SetSecurityDescriptorOwner [ADVAPI32]
+ * SetSecurityDescriptorOwner [ADVAPI32.@]
  *
  * PARAMS
  */
@@ -351,7 +351,7 @@
 	CallWin32ToNt (RtlSetOwnerSecurityDescriptor(pSecurityDescriptor, pOwner, bOwnerDefaulted));
 }
 /******************************************************************************
- * GetSecurityDescriptorGroup			[ADVAPI32.54]
+ * GetSecurityDescriptorGroup			[ADVAPI32.@]
  */
 BOOL WINAPI GetSecurityDescriptorGroup(
 	PSECURITY_DESCRIPTOR SecurityDescriptor,
@@ -361,7 +361,7 @@
 	CallWin32ToNt (RtlGetGroupSecurityDescriptor(SecurityDescriptor, Group, (PBOOLEAN)GroupDefaulted));
 }	
 /******************************************************************************
- * SetSecurityDescriptorGroup
+ * SetSecurityDescriptorGroup [ADVAPI32.@]
  */
 BOOL WINAPI SetSecurityDescriptorGroup ( PSECURITY_DESCRIPTOR SecurityDescriptor,
 					   PSID Group, BOOL GroupDefaulted)
@@ -370,7 +370,7 @@
 }
 
 /******************************************************************************
- * IsValidSecurityDescriptor [ADVAPI32.79]
+ * IsValidSecurityDescriptor [ADVAPI32.@]
  *
  * PARAMS
  *   lpsecdesc []
@@ -382,7 +382,7 @@
 }
 
 /******************************************************************************
- *  GetSecurityDescriptorDacl			[ADVAPI.91]
+ *  GetSecurityDescriptorDacl			[ADVAPI32.@]
  */
 BOOL WINAPI GetSecurityDescriptorDacl(
 	IN PSECURITY_DESCRIPTOR pSecurityDescriptor,
@@ -395,7 +395,7 @@
 }	
 
 /******************************************************************************
- *  SetSecurityDescriptorDacl			[ADVAPI.224]
+ *  SetSecurityDescriptorDacl			[ADVAPI32.@]
  */
 BOOL WINAPI 
 SetSecurityDescriptorDacl (
@@ -407,7 +407,7 @@
 	CallWin32ToNt (RtlSetDaclSecurityDescriptor (lpsd, daclpresent, dacl, dacldefaulted ));
 }
 /******************************************************************************
- *  GetSecurityDescriptorSacl			[ADVAPI.]
+ *  GetSecurityDescriptorSacl			[ADVAPI32.@]
  */
 BOOL WINAPI GetSecurityDescriptorSacl(
 	IN PSECURITY_DESCRIPTOR lpsd,
@@ -420,7 +420,7 @@
 }	
 
 /**************************************************************************
- * SetSecurityDescriptorSacl			[NTDLL.488]
+ * SetSecurityDescriptorSacl			[ADVAPI32.@]
  */
 BOOL WINAPI SetSecurityDescriptorSacl (
 	PSECURITY_DESCRIPTOR lpsd,
@@ -431,7 +431,7 @@
 	CallWin32ToNt (RtlSetSaclSecurityDescriptor(lpsd, saclpresent, lpsacl, sacldefaulted));
 }
 /******************************************************************************
- * MakeSelfRelativeSD [ADVAPI32.95]
+ * MakeSelfRelativeSD [ADVAPI32.@]
  *
  * PARAMS
  *   lpabssecdesc  []
@@ -448,7 +448,7 @@
 }
 
 /******************************************************************************
- * GetSecurityDescriptorControl			[ADVAPI32]
+ * GetSecurityDescriptorControl			[ADVAPI32.@]
  */
 
 BOOL WINAPI GetSecurityDescriptorControl ( PSECURITY_DESCRIPTOR  pSecurityDescriptor,
@@ -463,7 +463,7 @@
 */
 
 /*************************************************************************
- * InitializeAcl [ADVAPI32.111]
+ * InitializeAcl [ADVAPI32.@]
  */
 DWORD WINAPI InitializeAcl(PACL acl, DWORD size, DWORD rev)
 {
@@ -476,7 +476,7 @@
 */
 
 /******************************************************************************
- * LookupPrivilegeValueW			[ADVAPI32.93]
+ * LookupPrivilegeValueW			[ADVAPI32.@]
  * Retrieves LUID used on a system to represent the privilege name.
  *
  * NOTES
@@ -498,7 +498,7 @@
 }
 
 /******************************************************************************
- * LookupPrivilegeValueA			[ADVAPI32.92]
+ * LookupPrivilegeValueA			[ADVAPI32.@]
  */
 BOOL WINAPI
 LookupPrivilegeValueA( LPCSTR lpSystemName, LPCSTR lpName, LPVOID lpLuid )
@@ -514,7 +514,7 @@
 }
 
 /******************************************************************************
- * GetFileSecurityA [ADVAPI32.45]
+ * GetFileSecurityA [ADVAPI32.@]
  *
  * Obtains Specified information about the security of a file or directory
  * The information obtained is constrained by the callers access rights and
@@ -531,7 +531,7 @@
 }
 
 /******************************************************************************
- * GetFileSecurityW [ADVAPI32.46]
+ * GetFileSecurityW [ADVAPI32.@]
  *
  * Obtains Specified information about the security of a file or directory
  * The information obtained is constrained by the callers access rights and
@@ -556,7 +556,7 @@
 
 
 /******************************************************************************
- * LookupAccountSidA [ADVAPI32.86]
+ * LookupAccountSidA [ADVAPI32.@]
  */
 BOOL WINAPI
 LookupAccountSidA(
@@ -589,7 +589,7 @@
 }
 
 /******************************************************************************
- * LookupAccountSidW [ADVAPI32.87]
+ * LookupAccountSidW [ADVAPI32.@]
  *
  * PARAMS
  *   system      []
@@ -631,7 +631,7 @@
 }
 
 /******************************************************************************
- * SetFileSecurityA [ADVAPI32.182]
+ * SetFileSecurityA [ADVAPI32.@]
  * Sets the security of a file or directory
  */
 BOOL WINAPI SetFileSecurityA( LPCSTR lpFileName,
@@ -643,7 +643,7 @@
 }
 
 /******************************************************************************
- * SetFileSecurityW [ADVAPI32.183]
+ * SetFileSecurityW [ADVAPI32.@]
  * Sets the security of a file or directory
  *
  * PARAMS
@@ -661,7 +661,7 @@
 }
 
 /******************************************************************************
- * QueryWindows31FilesMigration [ADVAPI32.266]
+ * QueryWindows31FilesMigration [ADVAPI32.@]
  *
  * PARAMS
  *   x1 []
@@ -674,7 +674,7 @@
 }
 
 /******************************************************************************
- * SynchronizeWindows31FilesAndWindowsNTRegistry [ADVAPI32.265]
+ * SynchronizeWindows31FilesAndWindowsNTRegistry [ADVAPI32.@]
  *
  * PARAMS
  *   x1 []
@@ -691,7 +691,7 @@
 }
 
 /******************************************************************************
- * LsaOpenPolicy [ADVAPI32.200]
+ * LsaOpenPolicy [ADVAPI32.@]
  *
  * PARAMS
  *   x1 []
@@ -715,7 +715,7 @@
 }
 
 /******************************************************************************
- * LsaQueryInformationPolicy [ADVAPI32.242]
+ * LsaQueryInformationPolicy [ADVAPI32.@]
  */
 NTSTATUS WINAPI
 LsaQueryInformationPolicy( 
@@ -773,7 +773,7 @@
 }			  
 
 /******************************************************************************
- * LsaLookupSids [ADVAPI32.240]
+ * LsaLookupSids [ADVAPI32.@]
  */
 typedef struct
 {
@@ -808,7 +808,7 @@
 }
 
 /******************************************************************************
- * LsaFreeMemory [ADVAPI32.241]
+ * LsaFreeMemory [ADVAPI32.@]
  */
 NTSTATUS WINAPI
 LsaFreeMemory(IN PVOID Buffer)
@@ -817,7 +817,7 @@
 	return HeapFree(GetProcessHeap(), 0, Buffer);
 }
 /******************************************************************************
- * LsaClose [ADVAPI32.243]
+ * LsaClose [ADVAPI32.@]
  */
 NTSTATUS WINAPI
 LsaClose(IN LSA_HANDLE ObjectHandle)
@@ -826,7 +826,7 @@
 	return 0xc0000000;
 }
 /******************************************************************************
- * NotifyBootConfigStatus [ADVAPI32.97]
+ * NotifyBootConfigStatus [ADVAPI32.@]
  *
  * PARAMS
  *   x1 []
@@ -839,7 +839,7 @@
 }
 
 /******************************************************************************
- * RevertToSelf [ADVAPI32.180]
+ * RevertToSelf [ADVAPI32.@]
  *
  * PARAMS
  *   void []
@@ -852,7 +852,7 @@
 }
 
 /******************************************************************************
- * ImpersonateSelf [ADVAPI32.71]
+ * ImpersonateSelf [ADVAPI32.@]
  */
 BOOL WINAPI
 ImpersonateSelf(SECURITY_IMPERSONATION_LEVEL ImpersonationLevel)
@@ -861,7 +861,7 @@
 }
 
 /******************************************************************************
- * AccessCheck [ADVAPI32.71]
+ * AccessCheck [ADVAPI32.@]
  *
  * FIXME check cast LPBOOL to PBOOLEAN
  */
@@ -881,7 +881,7 @@
 }
 
 /*************************************************************************
- * SetKernelObjectSecurity [ADVAPI32.223]
+ * SetKernelObjectSecurity [ADVAPI32.@]
  */
 BOOL WINAPI SetKernelObjectSecurity (
 	IN HANDLE Handle,
@@ -892,7 +892,7 @@
 }
 
 /******************************************************************************
- *  AddAccessAllowedAce
+ *  AddAccessAllowedAce [ADVAPI32.@]
  */
 BOOL WINAPI AddAccessAllowedAce(
         IN OUT PACL pAcl,
diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c
index f0aa5e0..bac3aea 100644
--- a/dlls/advapi32/service.c
+++ b/dlls/advapi32/service.c
@@ -51,7 +51,7 @@
 }
 
 /******************************************************************************
- * StartServiceCtrlDispatcherA [ADVAPI32.196]
+ * StartServiceCtrlDispatcherA [ADVAPI32.@]
  */
 BOOL WINAPI
 StartServiceCtrlDispatcherA( LPSERVICE_TABLE_ENTRYA servent )
@@ -110,7 +110,7 @@
 }
 
 /******************************************************************************
- * StartServiceCtrlDispatcherW [ADVAPI32.197]
+ * StartServiceCtrlDispatcherW [ADVAPI32.@]
  *
  * PARAMS
  *   servent []
@@ -152,7 +152,7 @@
 }
 
 /******************************************************************************
- * RegisterServiceCtrlHandlerA [ADVAPI32.176]
+ * RegisterServiceCtrlHandlerA [ADVAPI32.@]
  */
 SERVICE_STATUS_HANDLE WINAPI
 RegisterServiceCtrlHandlerA( LPCSTR lpServiceName,
@@ -162,7 +162,7 @@
 }
 
 /******************************************************************************
- * RegisterServiceCtrlHandlerW [ADVAPI32.177]
+ * RegisterServiceCtrlHandlerW [ADVAPI32.@]
  *
  * PARAMS
  *   lpServiceName []
@@ -176,7 +176,7 @@
 }
 
 /******************************************************************************
- * SetServiceStatus [ADVAPI32.192]
+ * SetServiceStatus [ADVAPI32.@]
  *
  * PARAMS
  *   hService []
@@ -196,7 +196,7 @@
 }
 
 /******************************************************************************
- * OpenSCManagerA [ADVAPI32.110]
+ * OpenSCManagerA [ADVAPI32.@]
  */
 SC_HANDLE WINAPI
 OpenSCManagerA( LPCSTR lpMachineName, LPCSTR lpDatabaseName,
@@ -212,7 +212,7 @@
 }
 
 /******************************************************************************
- * OpenSCManagerW [ADVAPI32.111]
+ * OpenSCManagerW [ADVAPI32.@]
  * Establishes a connection to the service control manager and opens database
  *
  * NOTES
@@ -254,7 +254,7 @@
 
 
 /******************************************************************************
- * AllocateLocallyUniqueId [ADVAPI32.12]
+ * AllocateLocallyUniqueId [ADVAPI32.@]
  *
  * PARAMS
  *   lpluid []
@@ -269,7 +269,7 @@
 
 
 /******************************************************************************
- * ControlService [ADVAPI32.23]
+ * ControlService [ADVAPI32.@]
  * Sends a control code to a Win32-based service.
  *
  * PARAMS
@@ -289,7 +289,7 @@
 
 
 /******************************************************************************
- * CloseServiceHandle [ADVAPI32.22]
+ * CloseServiceHandle [ADVAPI32.@]
  * Close handle to service or service control manager
  *
  * PARAMS
@@ -309,7 +309,7 @@
 
 
 /******************************************************************************
- * OpenServiceA [ADVAPI32.112]
+ * OpenServiceA [ADVAPI32.@]
  */
 SC_HANDLE WINAPI
 OpenServiceA( SC_HANDLE hSCManager, LPCSTR lpServiceName, 
@@ -329,7 +329,7 @@
 
 
 /******************************************************************************
- * OpenServiceW [ADVAPI32.113]
+ * OpenServiceW [ADVAPI32.@]
  * Opens a handle to an existing service
  *
  * PARAMS
@@ -369,7 +369,7 @@
 }
 
 /******************************************************************************
- * CreateServiceW [ADVAPI32.29]
+ * CreateServiceW [ADVAPI32.@]
  */
 SC_HANDLE WINAPI
 CreateServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName,
@@ -386,7 +386,7 @@
 
 
 /******************************************************************************
- * CreateServiceA [ADVAPI32.28]
+ * CreateServiceA [ADVAPI32.@]
  */
 SC_HANDLE WINAPI
 CreateServiceA( SC_HANDLE hSCManager, LPCSTR lpServiceName,
@@ -482,7 +482,7 @@
 
 
 /******************************************************************************
- * DeleteService [ADVAPI32.31]
+ * DeleteService [ADVAPI32.@]
  *
  * PARAMS
  *    hService [I] Handle to service
@@ -499,7 +499,7 @@
 
 
 /******************************************************************************
- * StartServiceA [ADVAPI32.195]
+ * StartServiceA [ADVAPI32.@]
  *
  */
 BOOL WINAPI
@@ -534,7 +534,7 @@
 
 
 /******************************************************************************
- * StartServiceW [ADVAPI32.198]
+ * StartServiceW [ADVAPI32.@]
  * Starts a service
  *
  * PARAMS
@@ -651,7 +651,7 @@
 }
 
 /******************************************************************************
- * QueryServiceStatus [ADVAPI32.123]
+ * QueryServiceStatus [ADVAPI32.@]
  *
  * PARAMS
  *   hService        []
diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c
index f38334e..9642df7 100644
--- a/dlls/avifil32/avifile.c
+++ b/dlls/avifil32/avifile.c
@@ -99,7 +99,8 @@
 } IAVIStreamImpl;
 
 /***********************************************************************
- *		AVIFileInit
+ *		AVIFileInit (AVIFIL32.@)
+ *		AVIFileInit (AVIFILE.100)
  */
 void WINAPI
 AVIFileInit(void) {
@@ -205,7 +206,8 @@
 }
 
 /***********************************************************************
- *		AVIFileOpenA
+ *		AVIFileOpenA (AVIFIL32.@)
+ *		AVIFileOpenA (AVIFILE.102)
  */
 HRESULT WINAPI AVIFileOpenA(
 	PAVIFILE * ppfile,LPCSTR szFile,UINT uMode,LPCLSID lpHandler
@@ -363,7 +365,7 @@
 }
 
 /***********************************************************************
- *		AVIFileCreateStreamA
+ *		AVIFileCreateStreamA (AVIFIL32.@)
  */
 HRESULT WINAPI AVIFileCreateStreamA(PAVIFILE iface,PAVISTREAM *ppavi,AVISTREAMINFOA * psi) {
 	AVISTREAMINFOW	psiw;
@@ -376,7 +378,7 @@
 }
 
 /***********************************************************************
- *		AVIFileCreateStreamW
+ *		AVIFileCreateStreamW (AVIFIL32.@)
  */
 HRESULT WINAPI AVIFileCreateStreamW(IAVIFile*iface,PAVISTREAM*avis,AVISTREAMINFOW*asi) {
 	return IAVIFile_CreateStream(iface,avis,asi);
@@ -384,14 +386,15 @@
 
 
 /***********************************************************************
- *		AVIFileGetStream
+ *		AVIFileGetStream (AVIFIL32.@)
+ *		AVIFileGetStream (AVIFILE.143)
  */
 HRESULT WINAPI AVIFileGetStream(IAVIFile*iface,PAVISTREAM*avis,DWORD fccType,LONG lParam) {
 	return IAVIFile_GetStream(iface,avis,fccType,lParam);
 }
 
 /***********************************************************************
- *		AVIFileInfoA
+ *		AVIFileInfoA (AVIFIL32.@)
  */
 HRESULT WINAPI AVIFileInfoA(PAVIFILE iface,LPAVIFILEINFOA afi,LONG size) {
 	AVIFILEINFOW	afiw;
@@ -408,7 +411,7 @@
 }
 
 /***********************************************************************
- *		AVIStreamInfoW
+ *		AVIStreamInfoW (AVIFIL32.@)
  */
 HRESULT WINAPI AVIStreamInfoW(PAVISTREAM iface,AVISTREAMINFOW *asi,LONG
  size) {
@@ -416,7 +419,7 @@
 }
 
 /***********************************************************************
- *		AVIStreamInfoA
+ *		AVIStreamInfoA (AVIFIL32.@)
  */
 HRESULT WINAPI AVIStreamInfoA(PAVISTREAM iface,AVISTREAMINFOA *asi,LONG
  size) {
@@ -434,14 +437,14 @@
 }
 
 /***********************************************************************
- *		AVIFileInfoW
+ *		AVIFileInfoW (AVIFIL32.@)
  */
 HRESULT WINAPI AVIFileInfoW(PAVIFILE iface,LPAVIFILEINFOW afi,LONG size) {
 	return IAVIFile_Info(iface,afi,size);
 }
 
 /***********************************************************************
- *		AVIMakeCompressedStream
+ *		AVIMakeCompressedStream (AVIFIL32.@)
  */
 HRESULT WINAPI AVIMakeCompressedStream(PAVISTREAM *ppsCompressed,PAVISTREAM ppsSource,AVICOMPRESSOPTIONS *aco,CLSID *pclsidHandler) {
 	char			fcc[5];
@@ -487,49 +490,49 @@
 }
 
 /***********************************************************************
- *		AVIStreamSetFormat
+ *		AVIStreamSetFormat (AVIFIL32.@)
  */
 HRESULT WINAPI AVIStreamSetFormat(PAVISTREAM iface,LONG pos,LPVOID format,LONG formatsize) {
 	return IAVIStream_SetFormat(iface,pos,format,formatsize);
 }
 
 /***********************************************************************
- *		AVIStreamReadFormat
+ *		AVIStreamReadFormat (AVIFIL32.@)
  */
 HRESULT WINAPI AVIStreamReadFormat(PAVISTREAM iface,LONG pos,LPVOID format,LONG *formatsize) {
 	return IAVIStream_ReadFormat(iface,pos,format,formatsize);
 }
 
 /***********************************************************************
- *		AVIStreamWrite(
+ *		AVIStreamWrite (AVIFIL32.@)
  */
 HRESULT WINAPI AVIStreamWrite(PAVISTREAM iface,LONG start,LONG samples,LPVOID buffer,LONG buffersize,DWORD flags,LONG *sampwritten,LONG *byteswritten) {
 	return IAVIStream_Write(iface,start,samples,buffer,buffersize,flags,sampwritten,byteswritten);
 }
 
 /***********************************************************************
- *		AVIStreamRead
+ *		AVIStreamRead (AVIFIL32.@)
  */
 HRESULT WINAPI AVIStreamRead(PAVISTREAM iface,LONG start,LONG samples,LPVOID buffer,LONG buffersize,LONG *bytesread,LONG *samplesread) {
 	return IAVIStream_Read(iface,start,samples,buffer,buffersize,bytesread,samplesread);
 }
 
 /***********************************************************************
- *		AVIStreamWriteData
+ *		AVIStreamWriteData (AVIFIL32.@)
  */
 HRESULT WINAPI AVIStreamWriteData(PAVISTREAM iface,DWORD fcc,LPVOID lp,LONG size) {
 	return IAVIStream_WriteData(iface,fcc,lp,size);
 }
 
 /***********************************************************************
- *		AVIStreamReadData
+ *		AVIStreamReadData (AVIFIL32.@)
  */
 HRESULT WINAPI AVIStreamReadData(PAVISTREAM iface,DWORD fcc,LPVOID lp,LONG *lpread) {
 	return IAVIStream_ReadData(iface,fcc,lp,lpread);
 }
 
 /***********************************************************************
- *		AVIStreamStart
+ *		AVIStreamStart (AVIFIL32.@)
  */
 LONG WINAPI AVIStreamStart(PAVISTREAM iface) {
 	AVISTREAMINFOW	si;
@@ -539,7 +542,7 @@
 }
 
 /***********************************************************************
- *		AVIStreamLength
+ *		AVIStreamLength (AVIFIL32.@)
  */
 LONG WINAPI AVIStreamLength(PAVISTREAM iface) {
 	AVISTREAMINFOW	si;
@@ -552,14 +555,14 @@
 }
 
 /***********************************************************************
- *		AVIStreamRelease
+ *		AVIStreamRelease (AVIFIL32.@)
  */
 ULONG WINAPI AVIStreamRelease(PAVISTREAM iface) {
 	return IAVIStream_Release(iface);
 }
 
 /***********************************************************************
- *		AVIStreamGetFrameOpen
+ *		AVIStreamGetFrameOpen (AVIFIL32.@)
  */
 PGETFRAME WINAPI AVIStreamGetFrameOpen(PAVISTREAM iface,LPBITMAPINFOHEADER bmi) {
 	FIXME("(%p)->(%p),stub!\n",iface,bmi);
@@ -567,14 +570,14 @@
 }
 
 /***********************************************************************
- *		AVIStreamGetFrame
+ *		AVIStreamGetFrame (AVIFIL32.@)
  */
 LPVOID WINAPI AVIStreamGetFrame(PGETFRAME pg,LONG pos) {
 	return IGetFrame_GetFrame(pg,pos);
 }
 
 /***********************************************************************
- *		AVIStreamGetFrameClose
+ *		AVIStreamGetFrameClose (AVIFIL32.@)
  */
 HRESULT WINAPI AVIStreamGetFrameClose(PGETFRAME pg) {
 	if (pg) IGetFrame_Release(pg);
@@ -582,14 +585,16 @@
 }
 
 /***********************************************************************
- *		AVIFileRelease
+ *		AVIFileRelease (AVIFIL32.@)
+ *		AVIFileRelease (AVIFILE.141)
  */
 ULONG WINAPI AVIFileRelease(PAVIFILE iface) {
 	return IAVIFile_Release(iface);
 }
 
 /***********************************************************************
- *		AVIFileExit
+ *		AVIFileExit (AVIFIL32.@)
+ *		AVIFileExit (AVIFILE.101)
  */
 void WINAPI AVIFileExit(void) {
 	FIXME("(), stub.\n");
diff --git a/graphics/bitblt.c b/graphics/bitblt.c
index 3c20565..38595f8 100644
--- a/graphics/bitblt.c
+++ b/graphics/bitblt.c
@@ -21,7 +21,7 @@
 
 
 /***********************************************************************
- *           PatBlt    (GDI32.260)
+ *           PatBlt    (GDI32.@)
  */
 BOOL WINAPI PatBlt( HDC hdc, INT left, INT top,
                         INT width, INT height, DWORD rop)
@@ -53,7 +53,7 @@
 
 
 /***********************************************************************
- *           BitBlt    (GDI32.10)
+ *           BitBlt    (GDI32.@)
  */
 BOOL WINAPI BitBlt( HDC hdcDst, INT xDst, INT yDst, INT width,
                     INT height, HDC hdcSrc, INT xSrc, INT ySrc, DWORD rop )
@@ -93,7 +93,7 @@
 
 
 /***********************************************************************
- *           StretchBlt    (GDI32.350)
+ *           StretchBlt    (GDI32.@)
  */
 BOOL WINAPI StretchBlt( HDC hdcDst, INT xDst, INT yDst,
                             INT widthDst, INT heightDst,
@@ -149,7 +149,7 @@
 
 
 /***********************************************************************
- *           MaskBlt [GDI32.252]
+ *           MaskBlt [GDI32.@]
  */
 BOOL WINAPI MaskBlt(HDC hdcDest, INT nXDest, INT nYDest,
                         INT nWidth, INT nHeight, HDC hdcSource,
@@ -164,6 +164,7 @@
   
 /*********************************************************************
  *      PlgBlt [GDI.267]
+ *      PlgBlt [GDI32.@]
  *
  */
 BOOL WINAPI PlgBlt( HDC hdcDest, const POINT *lpPoint,
diff --git a/graphics/enhmetafiledrv/init.c b/graphics/enhmetafiledrv/init.c
index bc5777c..0bd69ad 100644
--- a/graphics/enhmetafiledrv/init.c
+++ b/graphics/enhmetafiledrv/init.c
@@ -197,7 +197,7 @@
 
 
 /**********************************************************************
- *          CreateEnhMetaFileA   (GDI32.41)
+ *          CreateEnhMetaFileA   (GDI32.@)
  */
 HDC WINAPI CreateEnhMetaFileA( 
     HDC hdc,           /* [in] optional reference DC */
@@ -233,7 +233,7 @@
 }
 
 /**********************************************************************
- *          CreateEnhMetaFileW   (GDI32.42)
+ *          CreateEnhMetaFileW   (GDI32.@)
  */
 HDC WINAPI CreateEnhMetaFileW(
     HDC           hdc,        /* [in] optional reference DC */
@@ -341,7 +341,7 @@
 }
 
 /******************************************************************
- *             CloseEnhMetaFile
+ *             CloseEnhMetaFile (GDI32.@)
  */
 HENHMETAFILE WINAPI CloseEnhMetaFile(HDC hdc) /* [in] metafile DC */
 {
diff --git a/graphics/env.c b/graphics/env.c
index e21c385..85ab775 100644
--- a/graphics/env.c
+++ b/graphics/env.c
@@ -73,7 +73,7 @@
 
 
 /***********************************************************************
- *           GetEnvironment   (GDI.134)
+ *           GetEnvironment   (GDI.133)
  */
 INT16 WINAPI GetEnvironment16(LPCSTR lpPortName, LPDEVMODEA lpdev, UINT16 nMaxSize)
 {
diff --git a/graphics/escape.c b/graphics/escape.c
index a9828a5..d53f923 100644
--- a/graphics/escape.c
+++ b/graphics/escape.c
@@ -34,7 +34,7 @@
 }
 
 /************************************************************************
- *             Escape  [GDI32.200]
+ *             Escape  [GDI32.@]
  */
 INT WINAPI Escape( HDC hdc, INT nEscape, INT cbInput,
 		   LPCSTR lpszInData, LPVOID lpvOutData )
@@ -240,7 +240,7 @@
 }
 
 /******************************************************************************
- *		ExtEscape	[GDI32.95]
+ *		ExtEscape	[GDI32.@]
  *
  * PARAMS
  *    hdc         [I] Handle to device context
@@ -275,7 +275,7 @@
 }
 
 /*******************************************************************
- *      DrawEscape [GDI32.74]
+ *      DrawEscape [GDI32.@]
  *
  *
  */
diff --git a/graphics/mapping.c b/graphics/mapping.c
index 4bf4815..df674d2 100644
--- a/graphics/mapping.c
+++ b/graphics/mapping.c
@@ -54,7 +54,7 @@
 
 
 /***********************************************************************
- *           DPtoLP    (GDI32.65)
+ *           DPtoLP    (GDI32.@)
  */
 BOOL WINAPI DPtoLP( HDC hdc, LPPOINT points, INT count )
 {
@@ -92,7 +92,7 @@
 
 
 /***********************************************************************
- *           LPtoDP    (GDI32.247)
+ *           LPtoDP    (GDI32.@)
  */
 BOOL WINAPI LPtoDP( HDC hdc, LPPOINT points, INT count )
 {
@@ -119,7 +119,7 @@
 
 
 /***********************************************************************
- *           SetMapMode    (GDI32.321)
+ *           SetMapMode    (GDI32.@)
  */
 INT WINAPI SetMapMode( HDC hdc, INT mode )
 {
@@ -218,7 +218,7 @@
 
 
 /***********************************************************************
- *           SetViewportExtEx    (GDI32.340)
+ *           SetViewportExtEx    (GDI32.@)
  */
 BOOL WINAPI SetViewportExtEx( HDC hdc, INT x, INT y, LPSIZE size )
 {
@@ -276,7 +276,7 @@
 
 
 /***********************************************************************
- *           SetViewportOrgEx    (GDI32.341)
+ *           SetViewportOrgEx    (GDI32.@)
  */
 BOOL WINAPI SetViewportOrgEx( HDC hdc, INT x, INT y, LPPOINT pt )
 {
@@ -325,7 +325,7 @@
 
 
 /***********************************************************************
- *           SetWindowExtEx    (GDI32.344)
+ *           SetWindowExtEx    (GDI32.@)
  */
 BOOL WINAPI SetWindowExtEx( HDC hdc, INT x, INT y, LPSIZE size )
 {
@@ -383,7 +383,7 @@
 
 
 /***********************************************************************
- *           SetWindowOrgEx    (GDI32.345)
+ *           SetWindowOrgEx    (GDI32.@)
  */
 BOOL WINAPI SetWindowOrgEx( HDC hdc, INT x, INT y, LPPOINT pt )
 {
@@ -431,7 +431,7 @@
 
 
 /***********************************************************************
- *           OffsetViewportOrgEx    (GDI32.257)
+ *           OffsetViewportOrgEx    (GDI32.@)
  */
 BOOL WINAPI OffsetViewportOrgEx( HDC hdc, INT x, INT y, LPPOINT pt)
 {
@@ -480,7 +480,7 @@
 
 
 /***********************************************************************
- *           OffsetWindowOrgEx    (GDI32.258)
+ *           OffsetWindowOrgEx    (GDI32.@)
  */
 BOOL WINAPI OffsetWindowOrgEx( HDC hdc, INT x, INT y, LPPOINT pt )
 {
@@ -533,7 +533,7 @@
 
 
 /***********************************************************************
- *           ScaleViewportExtEx    (GDI32.293)
+ *           ScaleViewportExtEx    (GDI32.@)
  */
 BOOL WINAPI ScaleViewportExtEx( HDC hdc, INT xNum, INT xDenom,
                                     INT yNum, INT yDenom, LPSIZE size )
@@ -598,7 +598,7 @@
 
 
 /***********************************************************************
- *           ScaleWindowExtEx    (GDI32.294)
+ *           ScaleWindowExtEx    (GDI32.@)
  */
 BOOL WINAPI ScaleWindowExtEx( HDC hdc, INT xNum, INT xDenom,
                                   INT yNum, INT yDenom, LPSIZE size )
diff --git a/graphics/metafiledrv/init.c b/graphics/metafiledrv/init.c
index 49e1159..9f80747 100644
--- a/graphics/metafiledrv/init.c
+++ b/graphics/metafiledrv/init.c
@@ -174,6 +174,7 @@
 
 /**********************************************************************
  *	     CreateMetaFile16   (GDI.125)
+ *	     CreateMetaFile16   (GDI32.@)
  *
  *  Create a new DC and associate it with a metafile. Pass a filename
  *  to create a disk-based metafile, NULL to create a memory metafile.
@@ -223,7 +224,7 @@
 }
 
 /**********************************************************************
- *	     CreateMetaFileA   (GDI32.51)
+ *	     CreateMetaFileA   (GDI32.@)
  */
 HDC WINAPI CreateMetaFileA( 
 			      LPCSTR filename /* [in] Filename of disk metafile */
@@ -233,7 +234,7 @@
 }
 
 /**********************************************************************
- *          CreateMetaFileW   (GDI32.52)
+ *          CreateMetaFileW   (GDI32.@)
  */
 HDC WINAPI CreateMetaFileW(LPCWSTR filename)
 {
@@ -295,6 +296,7 @@
 
 /******************************************************************
  *	     CloseMetaFile16   (GDI.126)
+ *	     CloseMetaFile16   (GDI32.@)
  */
 HMETAFILE16 WINAPI CloseMetaFile16( 
 				   HDC16 hdc /* [in] Metafile DC to close */
@@ -316,7 +318,7 @@
 }
 
 /******************************************************************
- *	     CloseMetaFile   (GDI32.17)
+ *	     CloseMetaFile   (GDI32.@)
  *
  *  Stop recording graphics operations in metafile associated with
  *  hdc and retrieve metafile.
diff --git a/graphics/painting.c b/graphics/painting.c
index ea3c256..682e376 100644
--- a/graphics/painting.c
+++ b/graphics/painting.c
@@ -32,7 +32,7 @@
 
 
 /***********************************************************************
- *           LineTo    (GDI32.249)
+ *           LineTo    (GDI32.@)
  */
 BOOL WINAPI LineTo( HDC hdc, INT x, INT y )
 {
@@ -80,7 +80,7 @@
 
 
 /***********************************************************************
- *           MoveToEx    (GDI32.254)
+ *           MoveToEx    (GDI32.@)
  */
 BOOL WINAPI MoveToEx( HDC hdc, INT x, INT y, LPPOINT pt )
 {
@@ -117,7 +117,7 @@
 
 
 /***********************************************************************
- *           Arc    (GDI32.7)
+ *           Arc    (GDI32.@)
  */
 BOOL WINAPI Arc( HDC hdc, INT left, INT top, INT right,
                      INT bottom, INT xstart, INT ystart,
@@ -137,7 +137,7 @@
 }
 
 /***********************************************************************
- *           ArcTo    (GDI32.8)
+ *           ArcTo    (GDI32.@)
  */
 BOOL WINAPI ArcTo( HDC hdc, 
                      INT left,   INT top, 
@@ -189,7 +189,7 @@
 
 
 /***********************************************************************
- *           Pie   (GDI32.262)
+ *           Pie   (GDI32.@)
  */
 BOOL WINAPI Pie( HDC hdc, INT left, INT top,
                      INT right, INT bottom, INT xstart, INT ystart,
@@ -221,7 +221,7 @@
 
 
 /***********************************************************************
- *           Chord    (GDI32.14)
+ *           Chord    (GDI32.@)
  */
 BOOL WINAPI Chord( HDC hdc, INT left, INT top,
                        INT right, INT bottom, INT xstart, INT ystart,
@@ -252,7 +252,7 @@
 
 
 /***********************************************************************
- *           Ellipse    (GDI32.75)
+ *           Ellipse    (GDI32.@)
  */
 BOOL WINAPI Ellipse( HDC hdc, INT left, INT top,
                          INT right, INT bottom )
@@ -282,7 +282,7 @@
 
 
 /***********************************************************************
- *           Rectangle    (GDI32.283)
+ *           Rectangle    (GDI32.@)
  */
 BOOL WINAPI Rectangle( HDC hdc, INT left, INT top,
                            INT right, INT bottom )
@@ -312,7 +312,7 @@
 
 
 /***********************************************************************
- *           RoundRect    (GDI32.291)
+ *           RoundRect    (GDI32.@)
  */
 BOOL WINAPI RoundRect( HDC hdc, INT left, INT top, INT right,
                            INT bottom, INT ell_width, INT ell_height )
@@ -341,7 +341,7 @@
 
 
 /***********************************************************************
- *           SetPixel    (GDI32.327)
+ *           SetPixel    (GDI32.@)
  */
 COLORREF WINAPI SetPixel( HDC hdc, INT x, INT y, COLORREF color )
 {
@@ -356,7 +356,7 @@
 }
 
 /***********************************************************************
- *           SetPixelV    (GDI32.329)
+ *           SetPixelV    (GDI32.@)
  */
 BOOL WINAPI SetPixelV( HDC hdc, INT x, INT y, COLORREF color )
 {
@@ -384,7 +384,7 @@
 
 
 /***********************************************************************
- *           GetPixel    (GDI32.211)
+ *           GetPixel    (GDI32.@)
  */
 COLORREF WINAPI GetPixel( HDC hdc, INT x, INT y )
 {
@@ -405,7 +405,7 @@
 
 
 /******************************************************************************
- * ChoosePixelFormat [GDI32.13]
+ * ChoosePixelFormat [GDI32.@]
  * Matches a pixel format to given format
  *
  * PARAMS
@@ -434,7 +434,7 @@
 
 
 /******************************************************************************
- * SetPixelFormat [GDI32.328]
+ * SetPixelFormat [GDI32.@]
  * Sets pixel format of device context
  *
  * PARAMS
@@ -463,7 +463,7 @@
 
 
 /******************************************************************************
- * GetPixelFormat [GDI32.212]
+ * GetPixelFormat [GDI32.@]
  * Gets index of pixel format of DC
  *
  * PARAMETERS
@@ -491,7 +491,7 @@
 
 
 /******************************************************************************
- * DescribePixelFormat [GDI32.71]
+ * DescribePixelFormat [GDI32.@]
  * Gets info about pixel format from DC
  *
  * PARAMS
@@ -529,7 +529,7 @@
 
 
 /******************************************************************************
- * SwapBuffers [GDI32.354]
+ * SwapBuffers [GDI32.@]
  * Exchanges front and back buffers of window
  *
  * PARAMS
@@ -568,7 +568,7 @@
 
 
 /***********************************************************************
- *           PaintRgn    (GDI32.259)
+ *           PaintRgn    (GDI32.@)
  */
 BOOL WINAPI PaintRgn( HDC hdc, HRGN hrgn )
 {
@@ -593,7 +593,7 @@
 
     
 /***********************************************************************
- *           FillRgn    (GDI32.101)
+ *           FillRgn    (GDI32.@)
  */
 BOOL WINAPI FillRgn( HDC hdc, HRGN hrgn, HBRUSH hbrush )
 {
@@ -625,7 +625,7 @@
 
 
 /***********************************************************************
- *           FrameRgn     (GDI32.105)
+ *           FrameRgn     (GDI32.@)
  */
 BOOL WINAPI FrameRgn( HDC hdc, HRGN hrgn, HBRUSH hbrush,
                           INT nWidth, INT nHeight )
@@ -664,7 +664,7 @@
 
 
 /***********************************************************************
- *           InvertRgn    (GDI32.246)
+ *           InvertRgn    (GDI32.@)
  */
 BOOL WINAPI InvertRgn( HDC hdc, HRGN hrgn )
 {
@@ -707,7 +707,7 @@
 
 
 /**********************************************************************
- *          Polyline   (GDI32.276)
+ *          Polyline   (GDI32.@)
  */
 BOOL WINAPI Polyline( HDC hdc, const POINT* pt, INT count )
 {
@@ -723,7 +723,7 @@
 }
 
 /**********************************************************************
- *          PolylineTo   (GDI32.277)
+ *          PolylineTo   (GDI32.@)
  */
 BOOL WINAPI PolylineTo( HDC hdc, const POINT* pt, DWORD cCount )
 {
@@ -777,7 +777,7 @@
 
 
 /**********************************************************************
- *          Polygon  (GDI32.275)
+ *          Polygon  (GDI32.@)
  */
 BOOL WINAPI Polygon( HDC hdc, const POINT* pt, INT count )
 {
@@ -794,7 +794,7 @@
 
 
 /**********************************************************************
- *          PolyPolygon16  (GDI.450)
+ *          PolyPolygon (GDI.450)
  */
 BOOL16 WINAPI PolyPolygon16( HDC16 hdc, const POINT16* pt, const INT16* counts,
                              UINT16 polygons )
@@ -825,7 +825,7 @@
 }
 
 /**********************************************************************
- *          PolyPolygon  (GDI.450)
+ *          PolyPolygon  (GDI32.@)
  */
 BOOL WINAPI PolyPolygon( HDC hdc, const POINT* pt, const INT* counts,
                              UINT polygons )
@@ -842,7 +842,7 @@
 }
 
 /**********************************************************************
- *          PolyPolyline  (GDI32.272)
+ *          PolyPolyline  (GDI32.@)
  */
 BOOL WINAPI PolyPolyline( HDC hdc, const POINT* pt, const DWORD* counts,
                             DWORD polylines )
@@ -869,7 +869,7 @@
 
 
 /**********************************************************************
- *          ExtFloodFill   (GDI32.96)
+ *          ExtFloodFill   (GDI32.@)
  */
 BOOL WINAPI ExtFloodFill( HDC hdc, INT x, INT y, COLORREF color,
                               UINT fillType )
@@ -895,7 +895,7 @@
 
 
 /**********************************************************************
- *          FloodFill   (GDI32.104)
+ *          FloodFill   (GDI32.@)
  */
 BOOL WINAPI FloodFill( HDC hdc, INT x, INT y, COLORREF color )
 {
@@ -936,7 +936,7 @@
 }
 
 /******************************************************************************
- * PolyBezier [GDI32.268]
+ * PolyBezier [GDI32.@]
  * Draws one or more Bezier curves
  *
  * PARAMS
@@ -975,7 +975,7 @@
 }
 
 /******************************************************************************
- * PolyBezierTo [GDI32.269]
+ * PolyBezierTo [GDI32.@]
  * Draws one or more Bezier curves
  *
  * PARAMS
@@ -1015,7 +1015,7 @@
 }
 
 /***********************************************************************
- *      AngleArc (GDI32.5)
+ *      AngleArc (GDI32.@)
  */
 BOOL WINAPI AngleArc(HDC hdc, INT x, INT y, DWORD dwRadius, FLOAT eStartAngle, FLOAT eSweepAngle)
 {
@@ -1061,7 +1061,7 @@
 }
 
 /***********************************************************************
- *      PolyDraw (GDI32.270)
+ *      PolyDraw (GDI32.@)
  */
 BOOL WINAPI PolyDraw(HDC hdc, const POINT *lppt, const BYTE *lpbTypes,
                        DWORD cCount)
diff --git a/graphics/path.c b/graphics/path.c
index 69f4b26..37ebe72 100644
--- a/graphics/path.c
+++ b/graphics/path.c
@@ -90,7 +90,7 @@
 
 
 /***********************************************************************
- *           BeginPath    (GDI32.9)
+ *           BeginPath    (GDI32.@)
  */
 BOOL WINAPI BeginPath(HDC hdc)
 {
@@ -129,7 +129,7 @@
 
 
 /***********************************************************************
- *           EndPath    (GDI32.78)
+ *           EndPath    (GDI32.@)
  */
 BOOL WINAPI EndPath(HDC hdc)
 {
@@ -166,7 +166,7 @@
 
 
 /******************************************************************************
- * AbortPath [GDI32.1]
+ * AbortPath [GDI32.@]
  * Closes and discards paths from device context
  *
  * NOTES
@@ -203,7 +203,7 @@
 
 
 /***********************************************************************
- *           CloseFigure    (GDI32.16)
+ *           CloseFigure    (GDI32.@)
  *
  * FIXME: Check that SetLastError is being called correctly 
  */
@@ -254,7 +254,7 @@
 
 
 /***********************************************************************
- *           GetPath    (GDI32.210)
+ *           GetPath    (GDI32.@)
  */
 INT WINAPI GetPath(HDC hdc, LPPOINT pPoints, LPBYTE pTypes,
    INT nSize)
@@ -309,7 +309,7 @@
 }
 
 /***********************************************************************
- *           PathToRegion    (GDI32.261)
+ *           PathToRegion    (GDI32.@)
  *
  * FIXME 
  *   Check that SetLastError is being called correctly 
@@ -420,7 +420,7 @@
 }
 
 /***********************************************************************
- *           FillPath    (GDI32.100)
+ *           FillPath    (GDI32.@)
  *
  * FIXME
  *    Check that SetLastError is being called correctly 
@@ -457,7 +457,7 @@
 }
 
 /***********************************************************************
- *           SelectClipPath    (GDI32.296)
+ *           SelectClipPath    (GDI32.@)
  * FIXME 
  *  Check that SetLastError is being called correctly 
  */
@@ -1438,7 +1438,7 @@
 }
 
 /*******************************************************************
- *      FlattenPath [GDI32.103]
+ *      FlattenPath [GDI32.@]
  *
  *
  */
@@ -1523,7 +1523,7 @@
 }
 
 /*******************************************************************
- *      StrokeAndFillPath [GDI32.352]
+ *      StrokeAndFillPath [GDI32.@]
  *
  *
  */
@@ -1557,7 +1557,7 @@
 }
 
 /*******************************************************************
- *      StrokePath [GDI32.353]
+ *      StrokePath [GDI32.@]
  *
  *
  */
@@ -1593,7 +1593,7 @@
 }
 
 /*******************************************************************
- *      WidenPath [GDI32.360]
+ *      WidenPath [GDI32.@]
  *
  *
  */
diff --git a/graphics/win16drv/prtdrv.c b/graphics/win16drv/prtdrv.c
index b48b4c6..d416717 100644
--- a/graphics/win16drv/prtdrv.c
+++ b/graphics/win16drv/prtdrv.c
@@ -700,7 +700,7 @@
 }
 
 /***********************************************************************
- *		dmEnumDFonts16
+ *		dmEnumDFonts16 (GDI.206)
  */
 int WINAPI dmEnumDFonts16(LPPDEVICE lpDestDev, LPSTR lpFaceName, FARPROC16 lpCallbackFunc, LPVOID lpClientData)
 {
@@ -709,7 +709,7 @@
 }
 
 /***********************************************************************
- *		dmRealizeObject16
+ *		dmRealizeObject16 (GDI.210)
  */
 int WINAPI dmRealizeObject16(LPPDEVICE lpDestDev, INT16 wStyle, LPSTR lpInObj, LPSTR lpOutObj, SEGPTR lpTextXForm)
 {
diff --git a/graphics/x11drv/oembitmap.c b/graphics/x11drv/oembitmap.c
index 96b3035..3daf0d1 100644
--- a/graphics/x11drv/oembitmap.c
+++ b/graphics/x11drv/oembitmap.c
@@ -331,7 +331,7 @@
 
 
 /***********************************************************************
- *           X11DRV_LoadOEMResource
+ *           X11DRV_LoadOEMResource (X11DRV.@)
  *
  */
 HANDLE X11DRV_LoadOEMResource(WORD resid, WORD type)
diff --git a/if1632/builtin.c b/if1632/builtin.c
index 76aa17d..374593b 100644
--- a/if1632/builtin.c
+++ b/if1632/builtin.c
@@ -208,7 +208,7 @@
 
 
 /***********************************************************************
- *           __wine_register_dll_16
+ *           __wine_register_dll_16 (KERNEL32.@)
  *
  * Register a built-in DLL descriptor.
  */
diff --git a/if1632/relay.c b/if1632/relay.c
index b780465..c4f27af 100644
--- a/if1632/relay.c
+++ b/if1632/relay.c
@@ -62,7 +62,7 @@
  */
 #ifndef __i386__
 /***********************************************************************
- *		wine_call_to_16_word
+ *		wine_call_to_16_word (KERNEL32.@)
  */
 WORD WINAPI wine_call_to_16_word( FARPROC16 target, INT nArgs )
 {
@@ -70,7 +70,7 @@
 }
 
 /***********************************************************************
- *		wine_call_to_16_long
+ *		wine_call_to_16_long (KERNEL32.@)
  */
 LONG WINAPI wine_call_to_16_long( FARPROC16 target, INT nArgs )
 {
@@ -78,7 +78,7 @@
 }
 
 /***********************************************************************
- *		wine_call_to_16_regs_short
+ *		wine_call_to_16_regs_short (KERNEL32.@)
  */
 void WINAPI wine_call_to_16_regs_short( CONTEXT86 *context, INT nArgs )
 {
@@ -86,7 +86,7 @@
 }
 
 /***********************************************************************
- *		wine_call_to_16_regs_long
+ *		wine_call_to_16_regs_long (KERNEL32.@)
  */
 void WINAPI wine_call_to_16_regs_long ( CONTEXT86 *context, INT nArgs )
 {
@@ -94,7 +94,7 @@
 }
 
 /***********************************************************************
- *		__wine_call_from_16_word
+ *		__wine_call_from_16_word (KERNEL32.@)
  */
 WORD __cdecl __wine_call_from_16_word(void)
 {
@@ -102,7 +102,7 @@
 }
 
 /***********************************************************************
- *		__wine_call_from_16_long
+ *		__wine_call_from_16_long (KERNEL32.@)
  */
 LONG __cdecl __wine_call_from_16_long(void)
 {
@@ -110,7 +110,7 @@
 }
 
 /***********************************************************************
- *		__wine_call_from_16_regs
+ *		__wine_call_from_16_regs (KERNEL32.@)
  */
 void __cdecl __wine_call_from_16_regs(void)
 {
@@ -118,7 +118,7 @@
 }
 
 /***********************************************************************
- *		__wine_call_from_16_thunk
+ *		__wine_call_from_16_thunk (KERNEL32.@)
  */
 void __cdecl __wine_call_from_16_thunk(void)
 {
diff --git a/misc/registry.c b/misc/registry.c
index 0afd6d0..ef71dd6 100644
--- a/misc/registry.c
+++ b/misc/registry.c
@@ -1578,7 +1578,7 @@
 /***************************************************************************/
 
 /******************************************************************************
- * RegFlushKey [KERNEL.227] [ADVAPI32.143]
+ * RegFlushKey [KERNEL.227] [ADVAPI32.@]
  * Immediately writes key to registry.
  * Only returns after data has been written to disk.
  *
@@ -1599,7 +1599,7 @@
 
 
 /******************************************************************************
- * RegUnLoadKeyA [ADVAPI32.172]
+ * RegUnLoadKeyA [ADVAPI32.@]
  */
 LONG WINAPI RegUnLoadKeyA( HKEY hkey, LPCSTR lpSubKey )
 {
@@ -1609,7 +1609,7 @@
 
 
 /******************************************************************************
- * RegRestoreKeyW [ADVAPI32.164]
+ * RegRestoreKeyW [ADVAPI32.@]
  *
  * PARAMS
  *    hkey    [I] Handle of key where restore begins
@@ -1633,7 +1633,7 @@
 
 
 /******************************************************************************
- * RegRestoreKeyA [ADVAPI32.163]
+ * RegRestoreKeyA [ADVAPI32.@]
  */
 LONG WINAPI RegRestoreKeyA( HKEY hkey, LPCSTR lpFile, DWORD dwFlags )
 {
@@ -1645,7 +1645,7 @@
 
 
 /******************************************************************************
- * RegReplaceKeyA [ADVAPI32.161]
+ * RegReplaceKeyA [ADVAPI32.@]
  */
 LONG WINAPI RegReplaceKeyA( HKEY hkey, LPCSTR lpSubKey, LPCSTR lpNewFile,
                               LPCSTR lpOldFile )
diff --git a/objects/bitmap.c b/objects/bitmap.c
index 7b4c4ca..f6734f2 100644
--- a/objects/bitmap.c
+++ b/objects/bitmap.c
@@ -78,6 +78,7 @@
 
 /***********************************************************************
  *           CreateBitmap16    (GDI.48)
+ *           CreateBitmap16    (DISPLAY.48)
  */
 HBITMAP16 WINAPI CreateBitmap16( INT16 width, INT16 height, UINT16 planes,
                                  UINT16 bpp, LPCVOID bits )
@@ -87,7 +88,7 @@
 
 
 /******************************************************************************
- * CreateBitmap [GDI32.25]  Creates a bitmap with the specified info
+ * CreateBitmap [GDI32.@]  Creates a bitmap with the specified info
  *
  * PARAMS
  *    width  [I] bitmap width
@@ -157,7 +158,7 @@
 
 
 /******************************************************************************
- * CreateCompatibleBitmap [GDI32.30]  Creates a bitmap compatible with the DC
+ * CreateCompatibleBitmap [GDI32.@]  Creates a bitmap compatible with the DC
  *
  * PARAMS
  *    hdc    [I] Handle to device context
@@ -204,7 +205,7 @@
 
 
 /******************************************************************************
- * CreateBitmapIndirect [GDI32.26]  Creates a bitmap with the specifies info
+ * CreateBitmapIndirect [GDI32.@]  Creates a bitmap with the specifies info
  *
  * RETURNS
  *    Success: Handle to bitmap
@@ -228,7 +229,7 @@
 
 
 /***********************************************************************
- * GetBitmapBits [GDI32.143]  Copies bitmap bits of bitmap to buffer
+ * GetBitmapBits [GDI32.@]  Copies bitmap bits of bitmap to buffer
  * 
  * RETURNS
  *    Success: Number of bytes copied
@@ -309,7 +310,7 @@
 
 
 /******************************************************************************
- * SetBitmapBits [GDI32.303]  Sets bits of color data for a bitmap
+ * SetBitmapBits [GDI32.@]  Sets bits of color data for a bitmap
  *
  * RETURNS
  *    Success: Number of bytes used in setting the bitmap bits
@@ -495,7 +496,7 @@
 
 
 /******************************************************************************
- * CreateDiscardableBitmap [GDI32.38]  Creates a discardable bitmap
+ * CreateDiscardableBitmap [GDI32.@]  Creates a discardable bitmap
  *
  * RETURNS
  *    Success: Handle to bitmap
@@ -528,7 +529,7 @@
 
 
 /******************************************************************************
- * GetBitmapDimensionEx [GDI32.144]  Retrieves dimensions of a bitmap
+ * GetBitmapDimensionEx [GDI32.@]  Retrieves dimensions of a bitmap
  *
  * RETURNS
  *    Success: TRUE
@@ -578,7 +579,7 @@
 
 
 /******************************************************************************
- * SetBitmapDimensionEx [GDI32.304]  Assignes dimensions to a bitmap
+ * SetBitmapDimensionEx [GDI32.@]  Assignes dimensions to a bitmap
  *
  * RETURNS
  *    Success: TRUE
diff --git a/objects/brush.c b/objects/brush.c
index 41c3a7c..4b02632 100644
--- a/objects/brush.c
+++ b/objects/brush.c
@@ -124,7 +124,7 @@
 
 
 /***********************************************************************
- *           CreateBrushIndirect    (GDI32.27)
+ *           CreateBrushIndirect    (GDI32.@)
  *
  * BUGS
  *      As for Windows 95 and Windows 98:
@@ -163,7 +163,7 @@
 
 
 /***********************************************************************
- *           CreateHatchBrush    (GDI32.48)
+ *           CreateHatchBrush    (GDI32.@)
  */
 HBRUSH WINAPI CreateHatchBrush( INT style, COLORREF color )
 {
@@ -189,7 +189,7 @@
 
 
 /***********************************************************************
- *           CreatePatternBrush    (GDI32.54)
+ *           CreatePatternBrush    (GDI32.@)
  */
 HBRUSH WINAPI CreatePatternBrush( HBITMAP hbitmap )
 {
@@ -219,7 +219,7 @@
 
 
 /***********************************************************************
- *           CreateDIBPatternBrush    (GDI32.34)
+ *           CreateDIBPatternBrush    (GDI32.@)
  *
  *	Create a logical brush which has the pattern specified by the DIB
  *
@@ -251,7 +251,7 @@
 
 
 /***********************************************************************
- *           CreateDIBPatternBrushPt    (GDI32.35)
+ *           CreateDIBPatternBrushPt    (GDI32.@)
  *
  *	Create a logical brush which has the pattern specified by the DIB
  *
@@ -291,7 +291,7 @@
 
 
 /***********************************************************************
- *           CreateSolidBrush    (GDI32.64)
+ *           CreateSolidBrush    (GDI32.@)
  */
 HBRUSH WINAPI CreateSolidBrush( COLORREF color )
 {
@@ -324,7 +324,7 @@
 
 
 /***********************************************************************
- *           SetBrushOrgEx    (GDI32.308)
+ *           SetBrushOrgEx    (GDI32.@)
  */
 BOOL WINAPI SetBrushOrgEx( HDC hdc, INT x, INT y, LPPOINT oldorg )
 {
@@ -343,7 +343,7 @@
 }
 
 /***********************************************************************
- *           FixBrushOrgEx    (GDI32.102)
+ *           FixBrushOrgEx    (GDI32.@)
  * SDK says discontinued, but in Win95 GDI32 this is the same as SetBrushOrgEx
  */
 BOOL WINAPI FixBrushOrgEx( HDC hdc, INT x, INT y, LPPOINT oldorg )
diff --git a/objects/clipping.c b/objects/clipping.c
index f10a2f0..aae8acf 100644
--- a/objects/clipping.c
+++ b/objects/clipping.c
@@ -50,7 +50,7 @@
 
 
 /***********************************************************************
- *           SelectClipRgn    (GDI32.297)
+ *           SelectClipRgn    (GDI32.@)
  */
 INT WINAPI SelectClipRgn( HDC hdc, HRGN hrgn )
 {
@@ -66,7 +66,7 @@
 }
 
 /******************************************************************************
- *		ExtSelectClipRgn	[GDI32.97]
+ *		ExtSelectClipRgn	[GDI32.@]
  */
 INT WINAPI ExtSelectClipRgn( HDC hdc, HRGN hrgn, INT fnMode )
 {
@@ -145,7 +145,7 @@
 
 
 /***********************************************************************
- *           OffsetClipRgn    (GDI32.255)
+ *           OffsetClipRgn    (GDI32.@)
  */
 INT WINAPI OffsetClipRgn( HDC hdc, INT x, INT y )
 {
@@ -241,7 +241,7 @@
 
 
 /***********************************************************************
- *           ExcludeClipRect    (GDI32.92)
+ *           ExcludeClipRect    (GDI32.@)
  */
 INT WINAPI ExcludeClipRect( HDC hdc, INT left, INT top,
                                 INT right, INT bottom )
@@ -278,7 +278,7 @@
 
 
 /***********************************************************************
- *           IntersectClipRect    (GDI32.245)
+ *           IntersectClipRect    (GDI32.@)
  */
 INT WINAPI IntersectClipRect( HDC hdc, INT left, INT top,
                                   INT right, INT bottom )
@@ -411,7 +411,7 @@
 
 
 /***********************************************************************
- *           PtVisible    (GDI32.279)
+ *           PtVisible    (GDI32.@)
  */
 BOOL WINAPI PtVisible( HDC hdc, INT x, INT y )
 {
@@ -431,7 +431,7 @@
 
 
 /***********************************************************************
- *           RectVisible16    (GDI.104)
+ *           RectVisible16    (GDI.465)
  */
 BOOL16 WINAPI RectVisible16( HDC16 hdc, const RECT16* rect )
 {
@@ -458,7 +458,7 @@
 
 
 /***********************************************************************
- *           RectVisible    (GDI32.282)
+ *           RectVisible    (GDI32.@)
  */
 BOOL WINAPI RectVisible( HDC hdc, const RECT* rect )
 {
@@ -489,7 +489,7 @@
 
 
 /***********************************************************************
- *           GetClipBox    (GDI32.162)
+ *           GetClipBox    (GDI32.@)
  */
 INT WINAPI GetClipBox( HDC hdc, LPRECT rect )
 {
@@ -508,7 +508,7 @@
 
 
 /***********************************************************************
- *           GetClipRgn  (GDI32.163)
+ *           GetClipRgn  (GDI32.@)
  */
 INT WINAPI GetClipRgn( HDC hdc, HRGN hRgn )
 {
diff --git a/objects/dc.c b/objects/dc.c
index 1dbf81b..d754316 100644
--- a/objects/dc.c
+++ b/objects/dc.c
@@ -419,7 +419,7 @@
 
 
 /***********************************************************************
- *           SaveDC    (GDI32.292)
+ *           SaveDC    (GDI32.@)
  */
 INT WINAPI SaveDC( HDC hdc )
 {
@@ -478,7 +478,7 @@
 
 
 /***********************************************************************
- *           RestoreDC    (GDI32.290)
+ *           RestoreDC    (GDI32.@)
  */
 BOOL WINAPI RestoreDC( HDC hdc, INT level )
 {
@@ -571,7 +571,7 @@
 
 
 /***********************************************************************
- *           CreateDCA    (GDI32.)
+ *           CreateDCA    (GDI32.@)
  */
 HDC WINAPI CreateDCA( LPCSTR driver, LPCSTR device, LPCSTR output,
                           const DEVMODEA *initData )
@@ -581,7 +581,7 @@
 
 
 /***********************************************************************
- *           CreateDCW    (GDI32.)
+ *           CreateDCW    (GDI32.@)
  */
 HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output,
                           const DEVMODEW *initData )
@@ -610,7 +610,7 @@
 
 
 /***********************************************************************
- *           CreateICA    (GDI32.49)
+ *           CreateICA    (GDI32.@)
  */
 HDC WINAPI CreateICA( LPCSTR driver, LPCSTR device, LPCSTR output,
                           const DEVMODEA* initData )
@@ -621,7 +621,7 @@
 
 
 /***********************************************************************
- *           CreateICW    (GDI32.50)
+ *           CreateICW    (GDI32.@)
  */
 HDC WINAPI CreateICW( LPCWSTR driver, LPCWSTR device, LPCWSTR output,
                           const DEVMODEW* initData )
@@ -641,7 +641,7 @@
 
 
 /***********************************************************************
- *           CreateCompatibleDC   (GDI32.31)
+ *           CreateCompatibleDC   (GDI32.@)
  */
 HDC WINAPI CreateCompatibleDC( HDC hdc )
 {
@@ -696,7 +696,7 @@
 
 
 /***********************************************************************
- *           DeleteDC    (GDI32.67)
+ *           DeleteDC    (GDI32.@)
  */
 BOOL WINAPI DeleteDC( HDC hdc )
 {
@@ -759,7 +759,7 @@
 
 
 /***********************************************************************
- *           ResetDCA    (GDI32.287)
+ *           ResetDCA    (GDI32.@)
  */
 HDC WINAPI ResetDCA( HDC hdc, const DEVMODEA *devmode )
 {
@@ -769,7 +769,7 @@
 
 
 /***********************************************************************
- *           ResetDCW    (GDI32.288)
+ *           ResetDCW    (GDI32.@)
  */
 HDC WINAPI ResetDCW( HDC hdc, const DEVMODEW *devmode )
 {
@@ -791,7 +791,7 @@
 
 
 /***********************************************************************
- *           GetDeviceCaps    (GDI32.171)
+ *           GetDeviceCaps    (GDI32.@)
  */
 INT WINAPI GetDeviceCaps( HDC hdc, INT cap )
 {
@@ -863,7 +863,7 @@
 
 
 /***********************************************************************
- *           SetBkColor    (GDI32.305)
+ *           SetBkColor    (GDI32.@)
  */
 COLORREF WINAPI SetBkColor( HDC hdc, COLORREF color )
 {
@@ -892,7 +892,7 @@
 
 
 /***********************************************************************
- *           SetTextColor    (GDI32.338)
+ *           SetTextColor    (GDI32.@)
  */
 COLORREF WINAPI SetTextColor( HDC hdc, COLORREF color )
 {
@@ -920,7 +920,7 @@
 
 
 /***********************************************************************
- *           SetTextAlign    (GDI32.336)
+ *           SetTextAlign    (GDI32.@)
  */
 UINT WINAPI SetTextAlign( HDC hdc, UINT align )
 {
@@ -938,7 +938,7 @@
 }
 
 /***********************************************************************
- *           GetDCOrgEx  (GDI32.168)
+ *           GetDCOrgEx  (GDI32.@)
  */
 BOOL WINAPI GetDCOrgEx( HDC hDC, LPPOINT lpp )
 {
@@ -985,7 +985,7 @@
 
 
 /***********************************************************************
- *           SetGraphicsMode    (GDI32.317)
+ *           SetGraphicsMode    (GDI32.@)
  */
 INT WINAPI SetGraphicsMode( HDC hdc, INT mode )
 {
@@ -1018,7 +1018,7 @@
 
 
 /***********************************************************************
- *           SetArcDirection    (GDI32.302)
+ *           SetArcDirection    (GDI32.@)
  */
 INT WINAPI SetArcDirection( HDC hdc, INT nDirection )
 {
@@ -1042,7 +1042,7 @@
 
 
 /***********************************************************************
- *           GetWorldTransform    (GDI32.244)
+ *           GetWorldTransform    (GDI32.@)
  */
 BOOL WINAPI GetWorldTransform( HDC hdc, LPXFORM xform )
 {
@@ -1056,7 +1056,7 @@
 
 
 /***********************************************************************
- *           SetWorldTransform    (GDI32.346)
+ *           SetWorldTransform    (GDI32.@)
  */
 BOOL WINAPI SetWorldTransform( HDC hdc, const XFORM *xform )
 {
@@ -1079,7 +1079,7 @@
 
 
 /****************************************************************************
- * ModifyWorldTransform [GDI32.253]
+ * ModifyWorldTransform [GDI32.@]
  * Modifies the world transformation for a device context.
  *
  * PARAMS
@@ -1144,7 +1144,7 @@
 
 
 /****************************************************************************
- * CombineTransform [GDI32.20]
+ * CombineTransform [GDI32.@]
  * Combines two transformation matrices.
  *
  * PARAMS
@@ -1271,7 +1271,7 @@
 }
 
 /***********************************************************************
- *           SetICMMode    (GDI32.318)
+ *           SetICMMode    (GDI32.@)
  */
 INT WINAPI SetICMMode(HDC hdc, INT iEnableICM)
 {
@@ -1283,7 +1283,7 @@
 }
 
 /***********************************************************************
- *           GetDeviceGammaRamp    (GDI32.*)
+ *           GetDeviceGammaRamp    (GDI32.@)
  */
 BOOL WINAPI GetDeviceGammaRamp(HDC hdc,LPVOID ptr) {
     FIXME("(%x,%p), empty stub!\n",hdc,ptr);
@@ -1291,7 +1291,7 @@
 }
 
 /***********************************************************************
- *           GetColorSpace    (GDI32.165)
+ *           GetColorSpace    (GDI32.@)
  */
 HCOLORSPACE WINAPI GetColorSpace(HDC hdc)
 {
@@ -1300,7 +1300,7 @@
 }
 
 /***********************************************************************
- *           CreateColorSpaceA    (GDI32.???)
+ *           CreateColorSpaceA    (GDI32.@)
  */
 HCOLORSPACE WINAPI CreateColorSpaceA( LPLOGCOLORSPACEA lpLogColorSpace )
 {
@@ -1309,7 +1309,7 @@
 }
 
 /***********************************************************************
- *           CreateColorSpaceW    (GDI32.???)
+ *           CreateColorSpaceW    (GDI32.@)
  */
 HCOLORSPACE WINAPI CreateColorSpaceW( LPLOGCOLORSPACEW lpLogColorSpace )
 {
@@ -1318,7 +1318,7 @@
 }
 
 /***********************************************************************
- *           DeleteColorSpace     (GDI32.???)
+ *           DeleteColorSpace     (GDI32.@)
  */
 BOOL WINAPI DeleteColorSpace( HCOLORSPACE hColorSpace )
 {
@@ -1328,7 +1328,7 @@
 }
 
 /***********************************************************************
- *           SetColorSpace     (GDI32.???)
+ *           SetColorSpace     (GDI32.@)
  */
 HCOLORSPACE WINAPI SetColorSpace( HDC hDC, HCOLORSPACE hColorSpace )
 {
@@ -1346,7 +1346,7 @@
 }
 
 /***********************************************************************
- *           GetBoundsRect    (GDI32.147)
+ *           GetBoundsRect    (GDI32.@)
  */
 UINT WINAPI GetBoundsRect(HDC hdc, LPRECT rect, UINT flags)
 {
@@ -1366,7 +1366,7 @@
 }
 
 /***********************************************************************
- *           SetBoundsRect    (GDI32.307)
+ *           SetBoundsRect    (GDI32.@)
  */
 UINT WINAPI SetBoundsRect(HDC hdc, const RECT* rect, UINT flags)
 {
@@ -1376,7 +1376,7 @@
 
 
 /***********************************************************************
- *		GetRelAbs		(GDI32.218)
+ *		GetRelAbs		(GDI32.@)
  */
 INT WINAPI GetRelAbs( HDC hdc, DWORD dwIgnore )
 {
@@ -1411,7 +1411,7 @@
 }
 
 /***********************************************************************
- *           GetLayout    (GDI32.321)
+ *           GetLayout    (GDI32.@)
  *
  * Gets left->right or right->left text layout flags of a dc.
  * win98 just returns 0 and sets ERROR_CALL_NOT_IMPLEMENTED so we do the same
@@ -1425,7 +1425,7 @@
 }
 
 /***********************************************************************
- *           SetLayout    (GDI32.450)
+ *           SetLayout    (GDI32.@)
  *
  * Sets left->right or right->left text layout flags of a dc.
  * win98 just returns 0 and sets ERROR_CALL_NOT_IMPLEMENTED so we do the same
diff --git a/objects/dcvalues.c b/objects/dcvalues.c
index 4a93d3c..76aba4a 100644
--- a/objects/dcvalues.c
+++ b/objects/dcvalues.c
@@ -106,38 +106,38 @@
 }
 
 /***********************************************************************
- *		SetBkMode		(GDI.2) (GDI32.306)
+ *		SetBkMode		(GDI.2) (GDI32.@)
  *
  */
 DC_SET_MODE( SetBkMode, backgroundMode, TRANSPARENT, OPAQUE ) 
 
 /***********************************************************************
- *		SetROP2			(GDI.4) (GDI32.331)
+ *		SetROP2			(GDI.4) (GDI32.@)
  */
 DC_SET_MODE( SetROP2, ROPmode, R2_BLACK, R2_WHITE )
 
 /***********************************************************************
- *		SetRelAbs		(GDI.5) (GDI32.333)
+ *		SetRelAbs		(GDI.5) (GDI32.@)
  */
 DC_SET_MODE( SetRelAbs, relAbsMode, ABSOLUTE, RELATIVE )
 
 /***********************************************************************
- *		SetPolyFillMode		(GDI.6) (GDI32.330)
+ *		SetPolyFillMode		(GDI.6) (GDI32.@)
  */
 DC_SET_MODE( SetPolyFillMode, polyFillMode, ALTERNATE, WINDING )
 
 /***********************************************************************
- *		SetStretchBltMode	(GDI.7) (GDI32.334)
+ *		SetStretchBltMode	(GDI.7) (GDI32.@)
  */
 DC_SET_MODE( SetStretchBltMode, stretchBltMode, BLACKONWHITE, HALFTONE )
 
 /***********************************************************************
- *		GetBkColor		(GDI.75) (GDI32.145)
+ *		GetBkColor		(GDI.75) (GDI32.@)
  */
 DC_GET_VAL( COLORREF, GetBkColor, backgroundColor )
 
 /***********************************************************************
- *		GetBkMode		(GDI.76) (GDI32.146)
+ *		GetBkMode		(GDI.76) (GDI32.@)
  */
 DC_GET_VAL( INT, GetBkMode, backgroundMode )
 
@@ -147,17 +147,17 @@
 DC_GET_X_Y( DWORD, GetCurrentPosition16, CursPosX, CursPosY )
 
 /***********************************************************************
- *		GetMapMode		(GDI.81) (GDI32.196)
+ *		GetMapMode		(GDI.81) (GDI32.@)
  */
 DC_GET_VAL( INT, GetMapMode, MapMode )
 
 /***********************************************************************
- *		GetPolyFillMode		(GDI.84) (GDI32.213)
+ *		GetPolyFillMode		(GDI.84) (GDI32.@)
  */
 DC_GET_VAL( INT, GetPolyFillMode, polyFillMode )
 
 /***********************************************************************
- *		GetROP2			(GDI.85) (GDI32.214)
+ *		GetROP2			(GDI.85) (GDI32.@)
  */
 DC_GET_VAL( INT, GetROP2, ROPmode )
 
@@ -167,12 +167,12 @@
 DC_GET_VAL_16( INT16, GetRelAbs16, relAbsMode )
 
 /***********************************************************************
- *		GetStretchBltMode	(GDI.88) (GDI32.221)
+ *		GetStretchBltMode	(GDI.88) (GDI32.@)
  */
 DC_GET_VAL( INT, GetStretchBltMode, stretchBltMode )
 
 /***********************************************************************
- *		GetTextColor		(GDI.90) (GDI32.227)
+ *		GetTextColor		(GDI.90) (GDI32.@)
  */
 DC_GET_VAL( COLORREF, GetTextColor, textColor )
 
@@ -212,7 +212,7 @@
 DC_GET_X_Y( DWORD, GetBrushOrg16, brushOrgX, brushOrgY )
 
 /***********************************************************************
- *		GetTextAlign	(GDI.345) (GDI32,224)
+ *		GetTextAlign	(GDI.345) (GDI32.@)
  */
 DC_GET_VAL( UINT, GetTextAlign, textAlign )
 
@@ -222,41 +222,41 @@
 DC_GET_VAL_16( HFONT16, GetCurLogFont16, hFont )
 
 /***********************************************************************
- *		GetArcDirection	(GDI.524) (GDI32.141)
+ *		GetArcDirection	(GDI.524) (GDI32.@)
  */
 DC_GET_VAL( INT, GetArcDirection, ArcDirection )
 
 /***********************************************************************
- *		GetGraphicsMode (GDI32.188)
+ *		GetGraphicsMode (GDI32.@)
  */
 DC_GET_VAL( INT, GetGraphicsMode, GraphicsMode)
 
 /***********************************************************************
- *		GetBrushOrgEx	(GDI.469) (GDI32.148)
+ *		GetBrushOrgEx	(GDI.469) (GDI32.@)
  */
 DC_GET_VAL_EX( GetBrushOrgEx, brushOrgX, brushOrgY, POINT ) /*  */
 
 /***********************************************************************
- *		GetCurrentPositionEx	(GDI.470) (GDI32.167)
+ *		GetCurrentPositionEx	(GDI.470) (GDI32.@)
  */
 DC_GET_VAL_EX( GetCurrentPositionEx, CursPosX, CursPosY, POINT )
 
 /***********************************************************************
- *		GetViewportExtEx	(GDI.472 GDI32.239)
+ *		GetViewportExtEx	(GDI.472 GDI32.@)
  */
 DC_GET_VAL_EX( GetViewportExtEx, vportExtX, vportExtY, SIZE )
 
 /***********************************************************************
- *		GetViewportOrgEx	(GDI.473) (GDI32.240)
+ *		GetViewportOrgEx	(GDI.473) (GDI32.@)
  */
 DC_GET_VAL_EX( GetViewportOrgEx, vportOrgX, vportOrgY, POINT )
 
 /***********************************************************************
- *		GetWindowExtEx	(GDI.474) (GDI32.242)
+ *		GetWindowExtEx	(GDI.474) (GDI32.@)
  */
 DC_GET_VAL_EX( GetWindowExtEx, wndExtX, wndExtY, SIZE )
 
 /***********************************************************************
- *		GetWindowOrgEx	(GDI.475) (GDI32.243)
+ *		GetWindowOrgEx	(GDI.475) (GDI32.@)
  */
 DC_GET_VAL_EX( GetWindowOrgEx, wndOrgX, wndOrgY, POINT )
diff --git a/objects/dib.c b/objects/dib.c
index 5dfb6c9..893ce6a 100644
--- a/objects/dib.c
+++ b/objects/dib.c
@@ -129,7 +129,7 @@
 
 
 /***********************************************************************
- *           StretchDIBits   (GDI32.351)
+ *           StretchDIBits   (GDI32.@)
  */
 INT WINAPI StretchDIBits(HDC hdc, INT xDst, INT yDst, INT widthDst,
                        INT heightDst, INT xSrc, INT ySrc, INT widthSrc,
@@ -209,7 +209,7 @@
 
 
 /******************************************************************************
- * SetDIBits [GDI32.312]  Sets pixels in a bitmap using colors from DIB
+ * SetDIBits [GDI32.@]  Sets pixels in a bitmap using colors from DIB
  *
  * PARAMS
  *    hdc       [I] Handle to device context
@@ -266,7 +266,7 @@
 
 
 /***********************************************************************
- *           SetDIBitsToDevice   (GDI32.313)
+ *           SetDIBitsToDevice   (GDI32.@)
  */
 INT WINAPI SetDIBitsToDevice(HDC hdc, INT xDest, INT yDest, DWORD cx,
                            DWORD cy, INT xSrc, INT ySrc, UINT startscan,
@@ -301,7 +301,7 @@
 }
 
 /***********************************************************************
- *           SetDIBColorTable    (GDI32.311)
+ *           SetDIBColorTable    (GDI32.@)
  */
 UINT WINAPI SetDIBColorTable( HDC hdc, UINT startpos, UINT entries,
 				  RGBQUAD *colors )
@@ -335,7 +335,7 @@
 }
 
 /***********************************************************************
- *           GetDIBColorTable    (GDI32.169)
+ *           GetDIBColorTable    (GDI32.@)
  */
 UINT WINAPI GetDIBColorTable( HDC hdc, UINT startpos, UINT entries,
 				  RGBQUAD *colors )
@@ -422,7 +422,7 @@
 
 
 /******************************************************************************
- * GetDIBits [GDI32.170]  Retrieves bits of bitmap and copies to buffer
+ * GetDIBits [GDI32.@]  Retrieves bits of bitmap and copies to buffer
  *
  * RETURNS
  *    Success: Number of scan lines copied from bitmap
@@ -757,6 +757,7 @@
 
 /***********************************************************************
  *           CreateDIBitmap16    (GDI.442)
+ *           CreateDIBitmap16    (DISPLAY.442)
  */
 HBITMAP16 WINAPI CreateDIBitmap16( HDC16 hdc, const BITMAPINFOHEADER * header,
                             DWORD init, LPCVOID bits, const BITMAPINFO * data,
@@ -767,7 +768,7 @@
 
 
 /***********************************************************************
- *           CreateDIBitmap    (GDI32.37)
+ *           CreateDIBitmap    (GDI32.@)
  */
 HBITMAP WINAPI CreateDIBitmap( HDC hdc, const BITMAPINFOHEADER *header,
                             DWORD init, LPCVOID bits, const BITMAPINFO *data,
@@ -909,7 +910,7 @@
 }
 
 /***********************************************************************
- *           CreateDIBSection    (GDI32.36)
+ *           CreateDIBSection    (GDI32.@)
  */
 HBITMAP WINAPI CreateDIBSection(HDC hdc, BITMAPINFO *bmi, UINT usage,
 				LPVOID *bits, HANDLE section,
diff --git a/objects/enhmetafile.c b/objects/enhmetafile.c
index b11df0f..c64eb11 100644
--- a/objects/enhmetafile.c
+++ b/objects/enhmetafile.c
@@ -113,7 +113,7 @@
 
 
 /*****************************************************************************
- *          GetEnhMetaFileA (GDI32.174)
+ *          GetEnhMetaFileA (GDI32.@)
  *
  *
  */
@@ -137,7 +137,7 @@
 }
 
 /*****************************************************************************
- *          GetEnhMetaFileW  (GDI32.180)
+ *          GetEnhMetaFileW  (GDI32.@)
  */
 HENHMETAFILE WINAPI GetEnhMetaFileW(
              LPCWSTR lpszMetaFile)  /* [in] filename of enhanced metafile */ 
@@ -158,7 +158,7 @@
 }
 
 /*****************************************************************************
- *        GetEnhMetaFileHeader  (GDI32.178)
+ *        GetEnhMetaFileHeader  (GDI32.@)
  *
  *  If buf is NULL, returns the size of buffer required.
  *  Otherwise, copy up to bufsize bytes of enhanced metafile header into 
@@ -188,7 +188,7 @@
 
 
 /*****************************************************************************
- *          GetEnhMetaFileDescriptionA  (GDI32.176)
+ *          GetEnhMetaFileDescriptionA  (GDI32.@)
  */
 UINT WINAPI GetEnhMetaFileDescriptionA( 
        HENHMETAFILE hmf, /* [in] enhanced metafile */
@@ -220,7 +220,7 @@
 }
 
 /*****************************************************************************
- *          GetEnhMetaFileDescriptionW  (GDI32.177)
+ *          GetEnhMetaFileDescriptionW  (GDI32.@)
  *
  *  Copies the description string of an enhanced metafile into a buffer 
  *  _buf_.
@@ -253,7 +253,7 @@
 }
 
 /****************************************************************************
- *    SetEnhMetaFileBits (GDI32.315)
+ *    SetEnhMetaFileBits (GDI32.@)
  *
  *  Creates an enhanced metafile by copying _bufsize_ bytes from _buf_.
  */
@@ -265,7 +265,7 @@
 }
 
 /*****************************************************************************
- *  GetEnhMetaFileBits (GDI32.175)
+ *  GetEnhMetaFileBits (GDI32.@)
  *
  */
 UINT WINAPI GetEnhMetaFileBits(
@@ -293,7 +293,7 @@
 }
 
 /*****************************************************************************
- *           PlayEnhMetaFileRecord  (GDI32.264)
+ *           PlayEnhMetaFileRecord  (GDI32.@)
  *
  *  Render a single enhanced metafile record in the device context hdc.
  *
@@ -1517,7 +1517,7 @@
 
 /*****************************************************************************
  *
- *        EnumEnhMetaFile  (GDI32.79)
+ *        EnumEnhMetaFile  (GDI32.@)
  *
  *  Walk an enhanced metafile, calling a user-specified function _EnhMetaFunc_
  *  for each
@@ -1666,7 +1666,7 @@
 }
 						
 /**************************************************************************
- *    PlayEnhMetaFile  (GDI32.263)
+ *    PlayEnhMetaFile  (GDI32.@)
  *
  *    Renders an enhanced metafile into a specified rectangle *lpRect
  *    in device context hdc.
@@ -1683,7 +1683,7 @@
 }
 
 /*****************************************************************************
- *  DeleteEnhMetaFile (GDI32.68)
+ *  DeleteEnhMetaFile (GDI32.@)
  *
  *  Deletes an enhanced metafile and frees the associated storage.
  */
@@ -1693,7 +1693,7 @@
 }
 
 /*****************************************************************************
- *  CopyEnhMetaFileA (GDI32.21)  Duplicate an enhanced metafile
+ *  CopyEnhMetaFileA (GDI32.@)  Duplicate an enhanced metafile
  *
  *   
  */
@@ -1767,7 +1767,7 @@
 }
 
 /*****************************************************************************
- *  GetEnhMetaFilePaletteEntries (GDI32.179)  
+ *  GetEnhMetaFilePaletteEntries (GDI32.@)  
  * 
  *  Copy the palette and report size  
  * 
@@ -1827,7 +1827,7 @@
 }
 
 /******************************************************************
- *         SetWinMetaFileBits   (GDI32.343)
+ *         SetWinMetaFileBits   (GDI32.@)
  *      
  *         Translate from old style to new style.
  *
diff --git a/objects/linedda.c b/objects/linedda.c
index 44615c5..9b7602c 100644
--- a/objects/linedda.c
+++ b/objects/linedda.c
@@ -11,7 +11,7 @@
 
 
 /**********************************************************************
- *           LineDDA   (GDI32.248)
+ *           LineDDA   (GDI32.@)
  */
 BOOL WINAPI LineDDA(INT nXStart, INT nYStart, INT nXEnd, INT nYEnd,
                         LINEDDAPROC callback, LPARAM lParam )
diff --git a/objects/metafile.c b/objects/metafile.c
index ccda9ab..46e5dfa 100644
--- a/objects/metafile.c
+++ b/objects/metafile.c
@@ -158,7 +158,7 @@
 }
 
 /******************************************************************
- *          DeleteMetaFile  (GDI32.69)
+ *          DeleteMetaFile  (GDI32.@)
  *
  *  Delete a memory-based metafile.
  */
@@ -233,7 +233,7 @@
 }
 
 /******************************************************************
- *         GetMetaFileA   (GDI32.197)
+ *         GetMetaFileA   (GDI32.@)
  *
  *  Read a metafile from a file. Returns handle to a memory-based metafile.
  */
@@ -260,7 +260,7 @@
 
 
 /******************************************************************
- *         GetMetaFileW   (GDI32.199)
+ *         GetMetaFileW   (GDI32.@)
  */
 HMETAFILE WINAPI GetMetaFileW( LPCWSTR lpFilename )
 {
@@ -367,7 +367,7 @@
 
 
 /******************************************************************
- *         CopyMetaFileA   (GDI32.23)
+ *         CopyMetaFileA   (GDI32.@)
  *
  *  Copies the metafile corresponding to hSrcMetaFile to either
  *  a disk file, if a filename is given, or to a new memory based
@@ -417,7 +417,7 @@
 
 
 /******************************************************************
- *         CopyMetaFileW   (GDI32.24)
+ *         CopyMetaFileW   (GDI32.@)
  */
 HMETAFILE WINAPI CopyMetaFileW( HMETAFILE hSrcMetaFile,
                                     LPCWSTR lpFilename )
@@ -540,7 +540,7 @@
 }
 
 /******************************************************************
- *         PlayMetaFile   (GDI32.265)
+ *         PlayMetaFile   (GDI32.@)
  *
  *  Renders the metafile specified by hmf in the DC specified by
  *  hdc. Returns FALSE on failure, TRUE on success.
@@ -639,7 +639,7 @@
 }
 
 /******************************************************************
- *            EnumMetaFile   (GDI32.88)
+ *            EnumMetaFile   (GDI32.@)
  *
  *  Loop through the metafile records in hmf, calling the user-specified
  *  function for each one, stopping when the user's function returns FALSE
@@ -1210,7 +1210,7 @@
 }
 
 /******************************************************************
- *         PlayMetaFileRecord   (GDI32.266)
+ *         PlayMetaFileRecord   (GDI32.@)
  */
 BOOL WINAPI PlayMetaFileRecord( HDC hdc,  HANDLETABLE *handletable, 
 				METARECORD *metarecord, UINT handles )
@@ -1281,7 +1281,7 @@
 }
 
 /******************************************************************
- *         SetMetaFileBitsEx    (GDI32.323)
+ *         SetMetaFileBitsEx    (GDI32.@)
  * 
  *  Create a metafile from raw data. No checking of the data is performed.
  *  Use _GetMetaFileBitsEx_ to get raw data from a metafile.
@@ -1298,7 +1298,7 @@
 }
 
 /*****************************************************************
- *  GetMetaFileBitsEx     (GDI32.198)  Get raw metafile data
+ *  GetMetaFileBitsEx     (GDI32.@)  Get raw metafile data
  * 
  *  Copies the data from metafile _hmf_ into the buffer _buf_.
  *  If _buf_ is zero, returns size of buffer required. Otherwise,
@@ -1329,7 +1329,7 @@
 }
 
 /******************************************************************
- *         GetWinMetaFileBits [GDI32.241]
+ *         GetWinMetaFileBits [GDI32.@]
  */
 UINT WINAPI GetWinMetaFileBits(HENHMETAFILE hemf,
                                 UINT cbBuffer, LPBYTE lpbBuffer,
diff --git a/objects/palette.c b/objects/palette.c
index aabcd7c..3187a54 100644
--- a/objects/palette.c
+++ b/objects/palette.c
@@ -99,7 +99,7 @@
 
 
 /***********************************************************************
- * CreatePalette [GDI32.53]  Creates a logical color palette
+ * CreatePalette [GDI32.@]  Creates a logical color palette
  *
  * RETURNS
  *    Success: Handle to logical palette
@@ -131,7 +131,7 @@
 
 
 /***********************************************************************
- * CreateHalftonePalette16 [GDI.?]  Creates a halftone palette
+ * CreateHalftonePalette16 [GDI.529]  Creates a halftone palette
  *
  * RETURNS
  *    Success: Handle to logical halftone palette
@@ -145,7 +145,7 @@
 
 	
 /***********************************************************************
- * CreateHalftonePalette [GDI32.47]  Creates a halftone palette
+ * CreateHalftonePalette [GDI32.@]  Creates a halftone palette
  *
  * RETURNS
  *    Success: Handle to logical halftone palette
@@ -200,7 +200,7 @@
 
 
 /***********************************************************************
- * GetPaletteEntries [GDI32.209]  Retrieves palette entries
+ * GetPaletteEntries [GDI32.@]  Retrieves palette entries
  *
  * RETURNS
  *    Success: Number of entries from logical palette
@@ -252,7 +252,7 @@
 
 
 /***********************************************************************
- * SetPaletteEntries [GDI32.326]  Sets color values for range in palette
+ * SetPaletteEntries [GDI32.@]  Sets color values for range in palette
  *
  * RETURNS
  *    Success: Number of entries that were set
@@ -300,7 +300,7 @@
 
 
 /***********************************************************************
- * ResizePalette [GDI32.289]  Resizes logical palette
+ * ResizePalette [GDI32.@]  Resizes logical palette
  *
  * RETURNS
  *    Success: TRUE
@@ -367,7 +367,7 @@
 
 
 /***********************************************************************
- * AnimatePalette [GDI32.6]  Replaces entries in logical palette
+ * AnimatePalette [GDI32.@]  Replaces entries in logical palette
  *
  * RETURNS
  *    Success: TRUE
@@ -416,7 +416,7 @@
 
 
 /***********************************************************************
- * SetSystemPaletteUse [GDI32.335]
+ * SetSystemPaletteUse [GDI32.@]
  *
  * RETURNS
  *    Success: Previous system palette
@@ -443,7 +443,7 @@
 
 
 /***********************************************************************
- * GetSystemPaletteUse [GDI32.223]  Gets state of system palette
+ * GetSystemPaletteUse [GDI32.@]  Gets state of system palette
  *
  * RETURNS
  *    Current state of system palette
@@ -466,7 +466,7 @@
 
 
 /***********************************************************************
- * GetSystemPaletteEntries [GDI32.222]  Gets range of palette entries
+ * GetSystemPaletteEntries [GDI32.@]  Gets range of palette entries
  *
  * RETURNS
  *    Success: Number of entries retrieved from palette
@@ -522,7 +522,7 @@
 
 
 /***********************************************************************
- * GetNearestPaletteIndex [GDI32.203]  Gets palette index for color
+ * GetNearestPaletteIndex [GDI32.@]  Gets palette index for color
  *
  * NOTES
  *    Should index be initialized to CLR_INVALID instead of 0?
@@ -561,7 +561,7 @@
 
 
 /***********************************************************************
- * GetNearestColor [GDI32.202]  Gets a system color to match
+ * GetNearestColor [GDI32.@]  Gets a system color to match
  *
  * RETURNS
  *    Success: Color from system palette that corresponds to given color
@@ -746,7 +746,7 @@
 
 
 /***********************************************************************
- * SelectPalette [GDI32.300]  Selects logical palette into DC
+ * SelectPalette [GDI32.@]  Selects logical palette into DC
  *
  * RETURNS
  *    Success: Previous logical palette
@@ -762,7 +762,7 @@
 
 
 /***********************************************************************
- * RealizePalette [GDI32.280]  Maps palette entries to system palette
+ * RealizePalette [GDI32.@]  Maps palette entries to system palette
  *
  * RETURNS
  *    Success: Number of entries in logical palette
@@ -776,6 +776,7 @@
 
 
 /**********************************************************************
+ *            UpdateColors16   (DISPLAY.366)
  *            UpdateColors16   (GDI.366)
  */
 INT16 WINAPI UpdateColors16( HDC16 hDC )
@@ -802,7 +803,7 @@
 
 
 /**********************************************************************
- * UpdateColors [GDI32.359]  Remaps current colors to logical palette
+ * UpdateColors [GDI32.@]  Remaps current colors to logical palette
  *
  * RETURNS
  *    Success: TRUE
@@ -826,7 +827,7 @@
 }
 
 /**********************************************************************
- * GetICMProfileA [GDI32.316]
+ * GetICMProfileA [GDI32.@]
  *
  * Returns the filename of the specified device context's color
  * management profile, even if color management is not enabled
diff --git a/objects/pen.c b/objects/pen.c
index 89b00e9..8baad51 100644
--- a/objects/pen.c
+++ b/objects/pen.c
@@ -31,7 +31,7 @@
 
 
 /***********************************************************************
- *           CreatePen    (GDI32.55)
+ *           CreatePen    (GDI32.@)
  */
 HPEN WINAPI CreatePen( INT style, INT width, COLORREF color )
 {
@@ -67,7 +67,7 @@
 
 
 /***********************************************************************
- *           CreatePenIndirect    (GDI32.56)
+ *           CreatePenIndirect    (GDI32.@)
  */
 HPEN WINAPI CreatePenIndirect( const LOGPEN * pen )
 {
@@ -83,7 +83,7 @@
 }
 
 /***********************************************************************
- *           ExtCreatePen    (GDI32.93)
+ *           ExtCreatePen    (GDI32.@)
  *
  * FIXME: PS_USERSTYLE not handled
  */
diff --git a/objects/region.c b/objects/region.c
index 384b834..29a1092 100644
--- a/objects/region.c
+++ b/objects/region.c
@@ -497,7 +497,7 @@
 }
 
 /***********************************************************************
- *           OffsetRgn   (GDI32.256)
+ *           OffsetRgn   (GDI32.@)
  */
 INT WINAPI OffsetRgn( HRGN hrgn, INT x, INT y )
 {
@@ -545,7 +545,7 @@
 }
 
 /***********************************************************************
- *           GetRgnBox    (GDI32.219)
+ *           GetRgnBox    (GDI32.@)
  */
 INT WINAPI GetRgnBox( HRGN hrgn, LPRECT rect )
 {
@@ -584,7 +584,7 @@
 
 
 /***********************************************************************
- *           CreateRectRgn   (GDI32.59)
+ *           CreateRectRgn   (GDI32.@)
  */
 HRGN WINAPI CreateRectRgn(INT left, INT top, INT right, INT bottom)
 {
@@ -609,7 +609,7 @@
 
 
 /***********************************************************************
- *           CreateRectRgnIndirect    (GDI32.60)
+ *           CreateRectRgnIndirect    (GDI32.@)
  */
 HRGN WINAPI CreateRectRgnIndirect( const RECT* rect )
 {
@@ -633,7 +633,7 @@
 
 
 /***********************************************************************
- *           SetRectRgn    (GDI32.332)
+ *           SetRectRgn    (GDI32.@)
  *
  * Allows either or both left and top to be greater than right or bottom.
  */
@@ -687,7 +687,7 @@
 }
 
 /***********************************************************************
- *           CreateRoundRectRgn    (GDI32.61)
+ *           CreateRoundRectRgn    (GDI32.@)
  */
 HRGN WINAPI CreateRoundRectRgn( INT left, INT top,
 				    INT right, INT bottom,
@@ -807,7 +807,7 @@
 
 
 /***********************************************************************
- *           CreateEllipticRgn    (GDI32.39)
+ *           CreateEllipticRgn    (GDI32.@)
  */
 HRGN WINAPI CreateEllipticRgn( INT left, INT top,
 				   INT right, INT bottom )
@@ -829,7 +829,7 @@
 
 
 /***********************************************************************
- *           CreateEllipticRgnIndirect    (GDI32.40)
+ *           CreateEllipticRgnIndirect    (GDI32.@)
  */
 HRGN WINAPI CreateEllipticRgnIndirect( const RECT *rect )
 {
@@ -839,7 +839,7 @@
 }
 
 /***********************************************************************
- *           GetRegionData   (GDI32.217)
+ *           GetRegionData   (GDI32.@)
  * 
  * MSDN: GetRegionData, Return Values:
  *
@@ -895,7 +895,7 @@
 }
 
 /***********************************************************************
- *           ExtCreateRegion   (GDI32.94)
+ *           ExtCreateRegion   (GDI32.@)
  * 
  */
 HRGN WINAPI ExtCreateRegion( const XFORM* lpXform, DWORD dwCount, const RGNDATA* rgndata)
@@ -947,7 +947,7 @@
 
 
 /***********************************************************************
- *           PtInRegion    (GDI32.278)
+ *           PtInRegion    (GDI32.@)
  */
 BOOL WINAPI PtInRegion( HRGN hrgn, INT x, INT y )
 {
@@ -972,7 +972,7 @@
 
 
 /***********************************************************************
- *           RectInRegion16    (GDI.181)
+ *           RectInRegion16    (GDI.466)
  */
 BOOL16 WINAPI RectInRegion16( HRGN16 hrgn, const RECT16 *rect )
 {
@@ -984,7 +984,7 @@
 
 
 /***********************************************************************
- *           RectInRegion    (GDI32.281)
+ *           RectInRegion    (GDI32.@)
  *
  * Returns TRUE if rect is at least partly inside hrgn
  */
@@ -1036,7 +1036,7 @@
 
 
 /***********************************************************************
- *           EqualRgn    (GDI32.90)
+ *           EqualRgn    (GDI32.@)
  */
 BOOL WINAPI EqualRgn( HRGN hrgn1, HRGN hrgn2 )
 {
@@ -1208,7 +1208,7 @@
 }
     
 /***********************************************************************
- *           CombineRgn16    (GDI.451)
+ *           CombineRgn16    (GDI.47)
  */
 INT16 WINAPI CombineRgn16(HRGN16 hDest, HRGN16 hSrc1, HRGN16 hSrc2, INT16 mode)
 {
@@ -1217,7 +1217,7 @@
 
 
 /***********************************************************************
- *           CombineRgn   (GDI32.19)
+ *           CombineRgn   (GDI32.@)
  *
  * Note: The behavior is correct even if src and dest regions are the same.
  */
@@ -2693,7 +2693,7 @@
 }
 
 /***********************************************************************
- *           CreatePolyPolygonRgn    (GDI32.57)
+ *           CreatePolyPolygonRgn    (GDI32.@)
  */
 HRGN WINAPI CreatePolyPolygonRgn(const POINT *Pts, const INT *Count, 
 		      INT nbpolygons, INT mode)
@@ -2911,7 +2911,7 @@
 }
 
 /***********************************************************************
- *           CreatePolygonRgn    (GDI32.58)
+ *           CreatePolygonRgn    (GDI32.@)
  */
 HRGN WINAPI CreatePolygonRgn( const POINT *points, INT count,
                                   INT mode )
@@ -2921,7 +2921,7 @@
 
 
 /***********************************************************************
- * GetRandomRgn [GDI32.215]
+ * GetRandomRgn [GDI32.@]
  *
  * NOTES
  *     This function is documented in MSDN online
@@ -3225,6 +3225,7 @@
 
 /***********************************************************************
  *           GetMetaRgn    (GDI.328)
+ *           GetMetaRgn    (GDI32.@)
  */
 INT WINAPI GetMetaRgn( HDC hdc, HRGN hRgn )
 {
@@ -3236,6 +3237,7 @@
 
 /***********************************************************************
  *           SetMetaRgn    (GDI.455)
+ *           SetMetaRgn    (GDI32.@)
  */
 INT WINAPI SetMetaRgn( HDC hdc )
 {
diff --git a/objects/text.c b/objects/text.c
index 1787deb..12bc71b 100644
--- a/objects/text.c
+++ b/objects/text.c
@@ -21,6 +21,7 @@
 
 
 /***********************************************************************
+ *           ExtTextOut16    (DISPLAY.351)
  *           ExtTextOut16    (GDI.351)
  */
 BOOL16 WINAPI ExtTextOut16( HDC16 hdc, INT16 x, INT16 y, UINT16 flags,
@@ -45,7 +46,7 @@
 
 
 /***********************************************************************
- *           ExtTextOutA    (GDI32.98)
+ *           ExtTextOutA    (GDI32.@)
  */
 BOOL WINAPI ExtTextOutA( HDC hdc, INT x, INT y, UINT flags,
                              const RECT *lprect, LPCSTR str, UINT count,
@@ -95,7 +96,7 @@
 
 
 /***********************************************************************
- *           ExtTextOutW    (GDI32.99)
+ *           ExtTextOutW    (GDI32.@)
  */
 BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags,
                              const RECT *lprect, LPCWSTR str, UINT count,
@@ -123,7 +124,7 @@
 
 
 /***********************************************************************
- *           TextOutA    (GDI32.355)
+ *           TextOutA    (GDI32.@)
  */
 BOOL WINAPI TextOutA( HDC hdc, INT x, INT y, LPCSTR str, INT count )
 {
@@ -132,7 +133,7 @@
 
 
 /***********************************************************************
- *           TextOutW    (GDI32.356)
+ *           TextOutW    (GDI32.@)
  */
 BOOL WINAPI TextOutW(HDC hdc, INT x, INT y, LPCWSTR str, INT count)
 {
@@ -141,7 +142,7 @@
 
 
 /***********************************************************************
- * GetTextCharset [GDI32.226]  Gets character set for font in DC
+ * GetTextCharset [GDI32.@]  Gets character set for font in DC
  *
  * NOTES
  *    Should it return a UINT32 instead of an INT32?
@@ -167,7 +168,7 @@
 }
 
 /***********************************************************************
- * GetTextCharsetInfo [GDI32.381]  Gets character set for font
+ * GetTextCharsetInfo [GDI32.@]  Gets character set for font
  *
  * NOTES
  *    Should csi be an LPFONTSIGNATURE instead of an LPCHARSETINFO?
@@ -203,7 +204,10 @@
 }
 
 /***********************************************************************
- * PolyTextOutA [GDI.402]  Draw several Strings
+ *		PolyTextOutA (GDI.402)
+ *		PolyTextOutA (GDI32.@)
+ *
+ * Draw several Strings
  */
 BOOL WINAPI PolyTextOutA (
 			  HDC hdc,               /* [in] Handle to device context */			  
@@ -219,7 +223,10 @@
 
 
 /***********************************************************************
- * PolyTextOutW [GDI.403] Draw several Strings
+ *		PolyTextOutW (GDI.403)
+ *		PolyTextOutW (GDI32.@)
+ *
+ * Draw several Strings
  */
 BOOL WINAPI PolyTextOutW ( 
 			  HDC hdc,               /* [in] Handle to device context */			  
diff --git a/ole/ole2nls.c b/ole/ole2nls.c
index d23ba3e..1dbc062 100644
--- a/ole/ole2nls.c
+++ b/ole/ole2nls.c
@@ -145,7 +145,8 @@
 static char *GetLocaleSubkeyName( DWORD lctype );
 
 /***********************************************************************
- *           GetUserDefaultLCID       [KERNEL32.425]
+ *		GetUserDefaultLCID (KERNEL32.@)
+ *		GetUserDefaultLCID (OLE2NLS.1)
  */
 LCID WINAPI GetUserDefaultLCID(void)
 {
@@ -153,7 +154,8 @@
 }
 
 /***********************************************************************
- *         GetSystemDefaultLCID       [KERNEL32.400]
+ *		GetSystemDefaultLCID (KERNEL32.@)
+ *		GetSystemDefaultLCID (OLE2NLS.2)
  */
 LCID WINAPI GetSystemDefaultLCID(void)
 {
@@ -330,7 +332,8 @@
 }
 
 /***********************************************************************
- *         GetUserDefaultLangID       [KERNEL32.426]
+ *		GetUserDefaultLangID (KERNEL32.@)
+ *		GetUserDefaultLangID (OLE2NLS.3)
  */
 LANGID WINAPI GetUserDefaultLangID(void)
 {
@@ -378,7 +381,8 @@
 }
 
 /***********************************************************************
- *         GetSystemDefaultLangID     [KERNEL32.401]
+ *		GetSystemDefaultLangID (KERNEL32.@)
+ *		GetSystemDefaultLangID (OLE2NLS.4)
  */
 LANGID WINAPI GetSystemDefaultLangID(void)
 {
@@ -386,7 +390,7 @@
 }
 
 /******************************************************************************
- * ConvertDefaultLocale [KERNEL32.147]
+ *		ConvertDefaultLocale (KERNEL32.@)
  */
 LCID WINAPI ConvertDefaultLocale (LCID lcid)
 {	switch (lcid)
@@ -443,7 +447,7 @@
 }
 
 /******************************************************************************
- * GetLocaleInfoA [KERNEL32.342]
+ *		GetLocaleInfoA (KERNEL32.@)
  *
  * NOTES 
  *  LANG_NEUTRAL is equal to LOCALE_SYSTEM_DEFAULT
@@ -561,7 +565,7 @@
 }
 
 /******************************************************************************
- *		GetLocaleInfoW	[KERNEL32.343]
+ *		GetLocaleInfoW (KERNEL32.@)
  *
  * NOTES
  *  MS documentation states that len "specifies the size, in bytes (ANSI version)
@@ -3848,7 +3852,7 @@
 }
 
 /**************************************************************************
- *              GetNumberFormatW	(KERNEL32.xxx)
+ *              GetNumberFormatW	(KERNEL32.@)
  */
 INT WINAPI GetNumberFormatW(LCID locale, DWORD dwflags,
 			       LPCWSTR lpvalue,  const NUMBERFMTW * lpFormat,
diff --git a/scheduler/client.c b/scheduler/client.c
index a3f79a0..ce9171f 100644
--- a/scheduler/client.c
+++ b/scheduler/client.c
@@ -113,7 +113,7 @@
 
 
 /***********************************************************************
- *           __wine_server_exception_handler
+ *           __wine_server_exception_handler (NTDLL.@)
  */
 DWORD __wine_server_exception_handler( PEXCEPTION_RECORD record, EXCEPTION_FRAME *frame,
                                        CONTEXT *context, EXCEPTION_FRAME **pdispatcher )
@@ -126,7 +126,7 @@
 
 
 /***********************************************************************
- *           wine_server_alloc_req
+ *           wine_server_alloc_req (NTDLL.@)
  */
 void *wine_server_alloc_req( size_t fixed_size, size_t var_size )
 {
@@ -232,7 +232,7 @@
 
 
 /***********************************************************************
- *           wine_server_call
+ *           wine_server_call (NTDLL.@)
  *
  * Perform a server call.
  */
diff --git a/scheduler/handle.c b/scheduler/handle.c
index 0497c64..4b1a71c 100644
--- a/scheduler/handle.c
+++ b/scheduler/handle.c
@@ -15,7 +15,9 @@
 DEFAULT_DEBUG_CHANNEL(win32);
 
 /*********************************************************************
- *           CloseHandle   (KERNEL32.23)
+ *           CloseHandle   (KERNEL.11)
+ *           CloseHandle   (WIN32S16.11)
+ *           CloseHandle   (KERNEL32.@)
  */
 BOOL WINAPI CloseHandle( HANDLE handle )
 {
@@ -106,7 +108,8 @@
 
 
 /***********************************************************************
- *           ConvertToGlobalHandle    		(KERNEL32)
+ *           ConvertToGlobalHandle    		(KERNEL.476)
+ *           ConvertToGlobalHandle    		(KERNEL32.@)
  */
 HANDLE WINAPI ConvertToGlobalHandle(HANDLE hSrc)
 {
@@ -117,7 +120,7 @@
 }
 
 /***********************************************************************
- *           SetHandleContext    		(KERNEL32)
+ *           SetHandleContext    		(KERNEL32.@)
  */
 BOOL WINAPI SetHandleContext(HANDLE hnd,DWORD context) {
     FIXME("(%d,%ld), stub. In case this got called by WSOCK32/WS2_32: the external WINSOCK DLLs won't work with WINE, don't use them.\n",hnd,context);
@@ -126,7 +129,7 @@
 }
 
 /***********************************************************************
- *           GetHandleContext    		(KERNEL32)
+ *           GetHandleContext    		(KERNEL32.@)
  */
 DWORD WINAPI GetHandleContext(HANDLE hnd) {
     FIXME("(%d), stub. In case this got called by WSOCK32/WS2_32: the external WINSOCK DLLs won't work with WINE, don't use them.\n",hnd);
@@ -135,7 +138,7 @@
 }
 
 /***********************************************************************
- *           CreateSocketHandle    		(KERNEL32)
+ *           CreateSocketHandle    		(KERNEL32.@)
  */
 HANDLE WINAPI CreateSocketHandle(void) {
     FIXME("(), stub. In case this got called by WSOCK32/WS2_32: the external WINSOCK DLLs won't work with WINE, don't use them.\n");
diff --git a/scheduler/process.c b/scheduler/process.c
index efb9848..f09aec7 100644
--- a/scheduler/process.c
+++ b/scheduler/process.c
@@ -863,7 +863,7 @@
 
 
 /***********************************************************************
- *           ExitProcess   (KERNEL32.100)
+ *           ExitProcess   (KERNEL32.@)
  */
 void WINAPI ExitProcess( DWORD status )
 {
@@ -1058,7 +1058,7 @@
 }
 
 /***********************************************************************
- *           SetPriorityClass   (KERNEL32.503)
+ *           SetPriorityClass   (KERNEL32.@)
  */
 BOOL WINAPI SetPriorityClass( HANDLE hprocess, DWORD priorityclass )
 {
@@ -1077,7 +1077,7 @@
 
 
 /***********************************************************************
- *           GetPriorityClass   (KERNEL32.250)
+ *           GetPriorityClass   (KERNEL32.@)
  */
 DWORD WINAPI GetPriorityClass(HANDLE hprocess)
 {
@@ -1094,7 +1094,7 @@
 
 
 /***********************************************************************
- *          SetProcessAffinityMask   (KERNEL32.662)
+ *          SetProcessAffinityMask   (KERNEL32.@)
  */
 BOOL WINAPI SetProcessAffinityMask( HANDLE hProcess, DWORD affmask )
 {
@@ -1136,7 +1136,7 @@
 
 
 /***********************************************************************
- *           GetProcessVersion    (KERNEL32)
+ *           GetProcessVersion    (KERNEL32.@)
  */
 DWORD WINAPI GetProcessVersion( DWORD processid )
 {
@@ -1154,7 +1154,7 @@
 }
 
 /***********************************************************************
- *           GetProcessFlags    (KERNEL32)
+ *           GetProcessFlags    (KERNEL32.@)
  */
 DWORD WINAPI GetProcessFlags( DWORD processid )
 {
@@ -1186,7 +1186,7 @@
 }
 
 /***********************************************************************
- *           GetProcessWorkingSetSize    (KERNEL32)
+ *           GetProcessWorkingSetSize    (KERNEL32.@)
  */
 BOOL WINAPI GetProcessWorkingSetSize(HANDLE hProcess,LPDWORD minset,
                                        LPDWORD maxset)
@@ -1199,7 +1199,7 @@
 }
 
 /***********************************************************************
- *           SetProcessShutdownParameters    (KERNEL32)
+ *           SetProcessShutdownParameters    (KERNEL32.@)
  *
  * CHANGED - James Sutherland (JamesSutherland@gmx.de)
  * Now tracks changes made (but does not act on these changes)
@@ -1217,7 +1217,7 @@
 
 
 /***********************************************************************
- * GetProcessShutdownParameters                 (KERNEL32)
+ * GetProcessShutdownParameters                 (KERNEL32.@)
  *
  */
 BOOL WINAPI GetProcessShutdownParameters( LPDWORD lpdwLevel, LPDWORD lpdwFlags )
@@ -1229,7 +1229,7 @@
 
 
 /***********************************************************************
- *           SetProcessPriorityBoost    (KERNEL32)
+ *           SetProcessPriorityBoost    (KERNEL32.@)
  */
 BOOL WINAPI SetProcessPriorityBoost(HANDLE hprocess,BOOL disableboost)
 {
@@ -1240,7 +1240,8 @@
 
 
 /***********************************************************************
- *           ReadProcessMemory    		(KERNEL32)
+ *		ReadProcessMemory (KERNEL32.@)
+ *		ReadProcessMemory (WIN32S16.6)
  */
 BOOL WINAPI ReadProcessMemory( HANDLE process, LPCVOID addr, LPVOID buffer, DWORD size,
                                LPDWORD bytes_read )
@@ -1287,7 +1288,7 @@
 
 
 /***********************************************************************
- *           WriteProcessMemory    		(KERNEL32)
+ *           WriteProcessMemory    		(KERNEL32.@)
  */
 BOOL WINAPI WriteProcessMemory( HANDLE process, LPVOID addr, LPVOID buffer, DWORD size,
                                 LPDWORD bytes_written )
@@ -1356,7 +1357,8 @@
 
 
 /***********************************************************************
- *           RegisterServiceProcess             (KERNEL, KERNEL32)
+ *		RegisterServiceProcess (KERNEL.491)
+ *		RegisterServiceProcess (KERNEL32.@)
  *
  * A service process calls this function to ensure that it continues to run
  * even after a user logged off.
@@ -1394,7 +1396,7 @@
 
 
 /***********************************************************************
- *           SetErrorMode   (KERNEL32.486)
+ *           SetErrorMode   (KERNEL32.@)
  */
 UINT WINAPI SetErrorMode( UINT mode )
 {
@@ -1405,7 +1407,7 @@
 
 
 /**********************************************************************
- * TlsAlloc [KERNEL32.530]  Allocates a TLS index.
+ * TlsAlloc [KERNEL32.@]  Allocates a TLS index.
  *
  * Allocates a thread local storage index
  *
@@ -1437,7 +1439,7 @@
 
 
 /**********************************************************************
- * TlsFree [KERNEL32.531]  Releases a TLS index.
+ * TlsFree [KERNEL32.@]  Releases a TLS index.
  *
  * Releases a thread local storage index, making it available for reuse
  * 
@@ -1472,7 +1474,7 @@
 
 
 /**********************************************************************
- * TlsGetValue [KERNEL32.532]  Gets value in a thread's TLS slot
+ * TlsGetValue [KERNEL32.@]  Gets value in a thread's TLS slot
  *
  * RETURNS
  *    Success: Value stored in calling thread's TLS slot for index
@@ -1492,7 +1494,7 @@
 
 
 /**********************************************************************
- * TlsSetValue [KERNEL32.533]  Stores a value in the thread's TLS slot.
+ * TlsSetValue [KERNEL32.@]  Stores a value in the thread's TLS slot.
  *
  * RETURNS
  *    Success: TRUE
@@ -1513,7 +1515,7 @@
 
 
 /***********************************************************************
- *           GetCurrentProcess   (KERNEL32.198)
+ *           GetCurrentProcess   (KERNEL32.@)
  */
 #undef GetCurrentProcess
 HANDLE WINAPI GetCurrentProcess(void)
diff --git a/scheduler/sysdeps.c b/scheduler/sysdeps.c
index 43680f5..1a1a104 100644
--- a/scheduler/sysdeps.c
+++ b/scheduler/sysdeps.c
@@ -238,7 +238,7 @@
 }
 
 /**********************************************************************
- *           NtCurrentTeb   (NTDLL.89)
+ *           NtCurrentTeb   (NTDLL.@)
  *
  * This will crash and burn if called before threading is initialized
  */
diff --git a/scheduler/thread.c b/scheduler/thread.c
index fdd5a1d..12bbff6 100644
--- a/scheduler/thread.c
+++ b/scheduler/thread.c
@@ -300,7 +300,7 @@
 
 
 /***********************************************************************
- *           CreateThread   (KERNEL32.63)
+ *           CreateThread   (KERNEL32.@)
  */
 HANDLE WINAPI CreateThread( SECURITY_ATTRIBUTES *sa, DWORD stack,
                             LPTHREAD_START_ROUTINE start, LPVOID param,
@@ -432,7 +432,7 @@
 
 
 /***********************************************************************
- * GetThreadContext [KERNEL32.294]  Retrieves context of thread.
+ * GetThreadContext [KERNEL32.@]  Retrieves context of thread.
  *
  * RETURNS
  *    Success: TRUE
@@ -458,7 +458,7 @@
 
 
 /**********************************************************************
- * GetThreadPriority [KERNEL32.296]  Returns priority for thread.
+ * GetThreadPriority [KERNEL32.@]  Returns priority for thread.
  *
  * RETURNS
  *    Success: Thread's priority level.
@@ -481,7 +481,7 @@
 
 
 /**********************************************************************
- * SetThreadPriority [KERNEL32.514]  Sets priority for thread.
+ * SetThreadPriority [KERNEL32.@]  Sets priority for thread.
  *
  * RETURNS
  *    Success: TRUE
@@ -578,7 +578,10 @@
 
 
 /**********************************************************************
- * GetExitCodeThread [KERNEL32.???]  Gets termination status of thread.
+ *		GetExitCodeThread (KERNEL32.@)
+ *		GetExitCodeThread (WIN32S16.13)
+ *
+ * Gets termination status of thread.
  * 
  * RETURNS
  *    Success: TRUE
@@ -671,7 +674,7 @@
 
 
 /**********************************************************************
- * GetThreadTimes [KERNEL32.???]  Obtains timing information.
+ * GetThreadTimes [KERNEL32.@]  Obtains timing information.
  *
  * NOTES
  *    What are the fields where these values are stored?
@@ -711,7 +714,7 @@
 
 
 /***********************************************************************
- *           GetThreadLocale    (KERNEL32.295)
+ *           GetThreadLocale    (KERNEL32.@)
  */
 LCID WINAPI GetThreadLocale(void)
 {
@@ -750,7 +753,7 @@
 
 
 /***********************************************************************
- * GetCurrentThread [KERNEL32.200]  Gets pseudohandle for current thread
+ * GetCurrentThread [KERNEL32.@]  Gets pseudohandle for current thread
  *
  * RETURNS
  *    Pseudohandle for the current thread
@@ -763,7 +766,7 @@
 
 
 /***********************************************************************
- * ProcessIdToSessionId   (KERNEL32)
+ * ProcessIdToSessionId   (KERNEL32.@)
  * This function is available on Terminal Server 4SP4 and Windows 2000
  */
 BOOL WINAPI ProcessIdToSessionId( DWORD procid, DWORD *sessionid_ptr )
@@ -797,7 +800,10 @@
 #else  /* __i386__ */
 
 /**********************************************************************
- * SetLastError [KERNEL.147] [KERNEL32.497]  Sets the last-error code.
+ *		SetLastError (KERNEL.147)
+ *		SetLastError (KERNEL32.@)
+ *
+ * Sets the last-error code.
  */
 void WINAPI SetLastError( DWORD error ) /* [in] Per-thread error code */
 {
@@ -805,7 +811,11 @@
 }
 
 /**********************************************************************
- * GetLastError [KERNEL.148] [KERNEL32.227]  Returns last-error code.
+ *		GetLastError (KERNEL.10)
+ *              GetLastError (KERNEL32.@)
+ *              GetLastError (WIN32S16.10)
+ *
+ * Returns last-error code.
  */
 DWORD WINAPI GetLastError(void)
 {
@@ -813,7 +823,10 @@
 }
 
 /***********************************************************************
- * GetCurrentProcessId [KERNEL32.199]  Returns process identifier.
+ *		GetCurrentProcessId (KERNEL.471)
+ *		GetCurrentProcessId (KERNEL32.@)
+ *
+ * Returns process identifier.
  */
 DWORD WINAPI GetCurrentProcessId(void)
 {
@@ -821,7 +834,10 @@
 }
 
 /***********************************************************************
- * GetCurrentThreadId [KERNEL32.201]  Returns thread identifier.
+ *		GetCurrentThreadId (KERNEL.462)
+ *		GetCurrentThreadId (KERNEL32.@)
+ *
+ * Returns thread identifier.
  */
 DWORD WINAPI GetCurrentThreadId(void)
 {
diff --git a/win32/console.c b/win32/console.c
index f545e08..1bf40e9 100644
--- a/win32/console.c
+++ b/win32/console.c
@@ -351,7 +351,7 @@
 
 
 /******************************************************************************
- * SetConsoleCtrlHandler [KERNEL32.459]  Adds function to calling process list
+ * SetConsoleCtrlHandler [KERNEL32.@]  Adds function to calling process list
  *
  * PARAMS
  *    func [I] Address of handler function
@@ -472,7 +472,7 @@
 
 
 /***********************************************************************
- *           GetConsoleScreenBufferInfo   (KERNEL32.190)
+ *           GetConsoleScreenBufferInfo   (KERNEL32.@)
  */
 BOOL WINAPI GetConsoleScreenBufferInfo( HANDLE hConsoleOutput,
                                           LPCONSOLE_SCREEN_BUFFER_INFO csbi )
@@ -508,7 +508,7 @@
 
 
 /***********************************************************************
- *            GetLargestConsoleWindowSize   (KERNEL32.226)
+ *            GetLargestConsoleWindowSize   (KERNEL32.@)
  *
  * NOTE
  *	This should return a COORD, but calling convention for returning
@@ -529,7 +529,7 @@
 
 
 /***********************************************************************
- *            GetLargestConsoleWindowSize   (KERNEL32.226)
+ *            GetLargestConsoleWindowSize   (KERNEL32.@)
  *
  * NOTE
  *	This should return a COORD, but calling convention for returning
@@ -714,7 +714,7 @@
 
 
 /***********************************************************************
- *            GetConsoleOutputCP   (KERNEL32.189)
+ *            GetConsoleOutputCP   (KERNEL32.@)
  */
 UINT WINAPI GetConsoleOutputCP(VOID)
 {
@@ -722,7 +722,7 @@
 }
 
 /***********************************************************************
- *            GetConsoleMode   (KERNEL32.188)
+ *            GetConsoleMode   (KERNEL32.@)
  */
 BOOL WINAPI GetConsoleMode(HANDLE hcon,LPDWORD mode)
 {
@@ -783,7 +783,7 @@
 
 
 /***********************************************************************
- *            GetConsoleTitleA   (KERNEL32.191)
+ *            GetConsoleTitleA   (KERNEL32.@)
  */
 DWORD WINAPI GetConsoleTitleA(LPSTR title,DWORD size)
 {
@@ -813,7 +813,7 @@
 
 
 /******************************************************************************
- * GetConsoleTitleW [KERNEL32.192]  Retrieves title string for console
+ * GetConsoleTitleW [KERNEL32.@]  Retrieves title string for console
  *
  * PARAMS
  *    title [O] Address of buffer for title
@@ -973,7 +973,7 @@
 }
 
 /***********************************************************************
- *            WriteConsoleOutputW   (KERNEL32.734)
+ *            WriteConsoleOutputW   (KERNEL32.@)
  */
 BOOL WINAPI WriteConsoleOutputW( HANDLE hConsoleOutput,
                                      LPCHAR_INFO lpBuffer,
@@ -989,7 +989,7 @@
 }
 
 /***********************************************************************
- *            WriteConsoleW   (KERNEL32.577)
+ *            WriteConsoleW   (KERNEL32.@)
  */
 BOOL WINAPI WriteConsoleW( HANDLE hConsoleOutput,
                                LPCVOID lpBuffer,
@@ -1016,7 +1016,7 @@
 
 
 /***********************************************************************
- *            ReadConsoleA   (KERNEL32.419)
+ *            ReadConsoleA   (KERNEL32.@)
  */
 BOOL WINAPI ReadConsoleA( HANDLE hConsoleInput,
                               LPVOID lpBuffer,
@@ -1052,7 +1052,7 @@
 }
 
 /***********************************************************************
- *            ReadConsoleW   (KERNEL32.427)
+ *            ReadConsoleW   (KERNEL32.@)
  */
 BOOL WINAPI ReadConsoleW( HANDLE hConsoleInput,
                               LPVOID lpBuffer,
@@ -1130,7 +1130,7 @@
 
 
 /***********************************************************************
- *            FlushConsoleInputBuffer   (KERNEL32.132)
+ *            FlushConsoleInputBuffer   (KERNEL32.@)
  */
 BOOL WINAPI FlushConsoleInputBuffer( HANDLE handle )
 {
@@ -1216,7 +1216,7 @@
 
 
 /***********************************************************************
- *            SetConsoleTitleA   (KERNEL32.476)
+ *            SetConsoleTitleA   (KERNEL32.@)
  *
  * Sets the console title.
  *
@@ -1259,7 +1259,7 @@
 
 
 /******************************************************************************
- * SetConsoleTitleW [KERNEL32.477]  Sets title bar string for console
+ * SetConsoleTitleW [KERNEL32.@]  Sets title bar string for console
  *
  * PARAMS
  *    title [I] Address of new title
@@ -1314,7 +1314,7 @@
 }
 
 /***********************************************************************
- *            GetNumberOfConsoleInputEvents   (KERNEL32.246)
+ *            GetNumberOfConsoleInputEvents   (KERNEL32.@)
  */
 BOOL WINAPI GetNumberOfConsoleInputEvents(HANDLE hcon,LPDWORD nrofevents)
 {
@@ -1677,7 +1677,7 @@
 }
 
 /******************************************************************************
- *  SetConsoleCP	 [KERNEL32.572]
+ *  SetConsoleCP	 [KERNEL32.@]
  * 
  * BUGS
  *   Unimplemented
diff --git a/win32/device.c b/win32/device.c
index bea41b4..02a1940 100644
--- a/win32/device.c
+++ b/win32/device.c
@@ -477,12 +477,16 @@
     return retv;
 }
 
-
-
-
-
 /***********************************************************************
- *           VxDCall                   (KERNEL32.[1-9])
+ *		VxDCall0 (KERNEL32.1)
+ *		VxDCall1 (KERNEL32.2)
+ *		VxDCall2 (KERNEL32.3)
+ *		VxDCall3 (KERNEL32.4)
+ *		VxDCall4 (KERNEL32.5)
+ *		VxDCall5 (KERNEL32.6)
+ *		VxDCall6 (KERNEL32.7)
+ *		VxDCall7 (KERNEL32.8)
+ *		VxDCall8 (KERNEL32.9)
  */
 void VxDCall( DWORD service, CONTEXT86 *context )
 {
@@ -1221,7 +1225,7 @@
 }
 
 /***********************************************************************
- *		OpenVxDHandle
+ *		OpenVxDHandle (KERNEL32.@)
  */
 DWORD	WINAPI	OpenVxDHandle(DWORD pmt)
 {
diff --git a/win32/except.c b/win32/except.c
index 07e87e5..120afd5 100644
--- a/win32/except.c
+++ b/win32/except.c
@@ -39,7 +39,7 @@
 
 
 /*******************************************************************
- *         RaiseException  (KERNEL32.418)
+ *         RaiseException  (KERNEL32.@)
  */
 void WINAPI RaiseException( DWORD code, DWORD flags, DWORD nbargs, const LPDWORD args )
 {
@@ -181,7 +181,7 @@
 
 
 /*******************************************************************
- *         UnhandledExceptionFilter   (KERNEL32.537)
+ *         UnhandledExceptionFilter   (KERNEL32.@)
  */
 DWORD WINAPI UnhandledExceptionFilter(PEXCEPTION_POINTERS epointers)
 {
@@ -288,7 +288,7 @@
 
 
 /***********************************************************************
- *            SetUnhandledExceptionFilter   (KERNEL32.516)
+ *            SetUnhandledExceptionFilter   (KERNEL32.@)
  */
 LPTOP_LEVEL_EXCEPTION_FILTER WINAPI SetUnhandledExceptionFilter(
                                           LPTOP_LEVEL_EXCEPTION_FILTER filter )
@@ -300,7 +300,7 @@
 
 
 /**************************************************************************
- *           FatalAppExitA   (KERNEL32.108)
+ *           FatalAppExitA   (KERNEL32.@)
  */
 void WINAPI FatalAppExitA( UINT action, LPCSTR str )
 {
@@ -314,7 +314,7 @@
 
 
 /**************************************************************************
- *           FatalAppExitW   (KERNEL32.109)
+ *           FatalAppExitW   (KERNEL32.@)
  */
 void WINAPI FatalAppExitW( UINT action, LPCWSTR str )
 {
diff --git a/win32/file.c b/win32/file.c
index 5966899..07907c5 100644
--- a/win32/file.c
+++ b/win32/file.c
@@ -29,7 +29,7 @@
 DEFAULT_DEBUG_CHANNEL(file);
 
 /***********************************************************************
- *              ReadFileEx                (KERNEL32.)
+ *              ReadFileEx                (KERNEL32.@)
  */
 BOOL WINAPI ReadFileEx(HFILE hFile, LPVOID lpBuffer, DWORD numtoread,
 			 LPOVERLAPPED lpOverlapped, 
@@ -52,7 +52,7 @@
 
 
 /**************************************************************************
- *              SetFileAttributesA	(KERNEL32.490)
+ *              SetFileAttributesA	(KERNEL32.@)
  */
 BOOL WINAPI SetFileAttributesA(LPCSTR lpFileName, DWORD attributes)
 {
@@ -110,7 +110,7 @@
 
 
 /**************************************************************************
- *              SetFileAttributesW	(KERNEL32.491)
+ *              SetFileAttributesW	(KERNEL32.@)
  */
 BOOL WINAPI SetFileAttributesW(LPCWSTR lpFileName, DWORD attributes)
 {
@@ -140,7 +140,7 @@
 
 
 /******************************************************************************
- * AreFileApisANSI [KERNEL32.105]  Determines if file functions are using ANSI
+ * AreFileApisANSI [KERNEL32.@]  Determines if file functions are using ANSI
  *
  * RETURNS
  *    TRUE:  Set of file functions is using ANSI code page
diff --git a/win32/init.c b/win32/init.c
index 08a0d3c..3bc1abb 100644
--- a/win32/init.c
+++ b/win32/init.c
@@ -25,7 +25,7 @@
 }
 
 /***********************************************************************
- *              GetComputerNameA         (KERNEL32.165)
+ *              GetComputerNameA         (KERNEL32.@)
  */
 BOOL WINAPI GetComputerNameA(LPSTR name,LPDWORD size)
 {
@@ -48,7 +48,7 @@
 }
 
 /***********************************************************************
- *              GetComputerNameW         (KERNEL32.166)
+ *              GetComputerNameW         (KERNEL32.@)
  */
 BOOL WINAPI GetComputerNameW(LPWSTR name,LPDWORD size)
 {
diff --git a/win32/newfns.c b/win32/newfns.c
index 3af7cb3..3d5a991 100644
--- a/win32/newfns.c
+++ b/win32/newfns.c
@@ -140,7 +140,7 @@
 }
 
 /***********************************************************************
- *           GetSystemPowerStatus      (KERNEL32.621)
+ *           GetSystemPowerStatus      (KERNEL32.@)
  */
 BOOL WINAPI GetSystemPowerStatus(LPSYSTEM_POWER_STATUS sps_ptr)
 {
@@ -149,7 +149,7 @@
 
 
 /***********************************************************************
- *           SetSystemPowerState      (KERNEL32.630)
+ *           SetSystemPowerState      (KERNEL32.@)
  */
 BOOL WINAPI SetSystemPowerState(BOOL suspend_or_hibernate,
                                   BOOL force_flag)
@@ -289,7 +289,7 @@
 }
 
 /******************************************************************************
- *		CreateIoCompletionPort
+ *		CreateIoCompletionPort (KERNEL32.@)
  */
 HANDLE WINAPI CreateIoCompletionPort(HANDLE hFileHandle,
 HANDLE hExistingCompletionPort, DWORD dwCompletionKey,
diff --git a/win32/time.c b/win32/time.c
index 7dbeba4..15df955 100644
--- a/win32/time.c
+++ b/win32/time.c
@@ -15,7 +15,7 @@
 DEFAULT_DEBUG_CHANNEL(win32);
 
 /***********************************************************************
- *              GetLocalTime            (KERNEL32.228)
+ *              GetLocalTime            (KERNEL32.@)
  */
 VOID WINAPI GetLocalTime(LPSYSTEMTIME systime)
 {
@@ -38,7 +38,7 @@
 }
 
 /***********************************************************************
- *              GetSystemTime            (KERNEL32.285)
+ *              GetSystemTime            (KERNEL32.@)
  */
 VOID WINAPI GetSystemTime(LPSYSTEMTIME systime)
 {