Documentation fixes.

diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c
index b741819..59a2536 100644
--- a/dlls/dplayx/dplay.c
+++ b/dlls/dplayx/dplay.c
@@ -5326,7 +5326,6 @@
 
 /***************************************************************************
  *  DirectPlayCreate [DPLAYX.1]
- *  DirectPlayCreate [DPLAY.1]
  *
  */
 HRESULT WINAPI DirectPlayCreate
diff --git a/dlls/kernel/debugger.c b/dlls/kernel/debugger.c
index 328898b..88dff80 100644
--- a/dlls/kernel/debugger.c
+++ b/dlls/kernel/debugger.c
@@ -120,7 +120,6 @@
 
 /**********************************************************************
  *           ContinueDebugEvent   (KERNEL32.@)
- *           ContinueDebugEvent   (WIN32S16.5)
  *
  *  Enables a thread that previously produced a debug event to continue.
  *
diff --git a/dlls/kernel/sync.c b/dlls/kernel/sync.c
index f4fb185..a9878dc 100644
--- a/dlls/kernel/sync.c
+++ b/dlls/kernel/sync.c
@@ -171,7 +171,7 @@
 
 
 /***********************************************************************
- *           SetEvent    (KERNEL.458)
+ *           SetW32Event (KERNEL.458)
  *           SetEvent    (KERNEL32.@)
  */
 BOOL WINAPI SetEvent( HANDLE handle )
@@ -181,7 +181,7 @@
 
 
 /***********************************************************************
- *           ResetEvent    (KERNEL.459)
+ *           ResetW32Event (KERNEL.459)
  *           ResetEvent    (KERNEL32.@)
  */
 BOOL WINAPI ResetEvent( HANDLE handle )
diff --git a/dlls/kernel/thunk.c b/dlls/kernel/thunk.c
index 01805c9..6fcaf54 100644
--- a/dlls/kernel/thunk.c
+++ b/dlls/kernel/thunk.c
@@ -1038,6 +1038,7 @@
 
 /**********************************************************************
  * 		IsPeFormat		(KERNEL.431)
+ * 		IsPeFormat		(W32SYS.2)
  * Checks the passed filename if it is a PE format executeable
  * RETURNS
  *  TRUE, if it is.
diff --git a/dlls/kernel/wowthunk.c b/dlls/kernel/wowthunk.c
index 852df3b..d14bbe3 100644
--- a/dlls/kernel/wowthunk.c
+++ b/dlls/kernel/wowthunk.c
@@ -39,7 +39,6 @@
  */
 
 /**********************************************************************
- *           K32WOWGetDescriptor        (WOW32.1)
  *           K32WOWGetDescriptor        (KERNEL32.70)
  */
 BOOL WINAPI K32WOWGetDescriptor( SEGPTR segptr, LPLDT_ENTRY ldtent )
@@ -49,7 +48,6 @@
 }
 
 /**********************************************************************
- *           K32WOWGetVDMPointer        (WOW32.5)
  *           K32WOWGetVDMPointer        (KERNEL32.56)
  */
 LPVOID WINAPI K32WOWGetVDMPointer( DWORD vp, DWORD dwBytes, BOOL fProtectedMode )
@@ -63,7 +61,6 @@
 }
 
 /**********************************************************************
- *           K32WOWGetVDMPointerFix     (WOW32.6)
  *           K32WOWGetVDMPointerFix     (KERNEL32.68)
  */
 LPVOID WINAPI K32WOWGetVDMPointerFix( DWORD vp, DWORD dwBytes, BOOL fProtectedMode )
@@ -84,7 +81,6 @@
 }
 
 /**********************************************************************
- *           K32WOWGetVDMPointerUnfix   (WOW32.7)
  *           K32WOWGetVDMPointerUnfix   (KERNEL32.69)
  */
 VOID WINAPI K32WOWGetVDMPointerUnfix( DWORD vp )
@@ -98,7 +94,6 @@
 }
 
 /**********************************************************************
- *           K32WOWGlobalAlloc16        (WOW32.8)
  *           K32WOWGlobalAlloc16        (KERNEL32.59)
  */
 WORD WINAPI K32WOWGlobalAlloc16( WORD wFlags, DWORD cb )
@@ -107,7 +102,6 @@
 }
 
 /**********************************************************************
- *           K32WOWGlobalFree16         (WOW32.10)
  *           K32WOWGlobalFree16         (KERNEL32.62)
  */
 WORD WINAPI K32WOWGlobalFree16( WORD hMem )
@@ -116,7 +110,6 @@
 }
 
 /**********************************************************************
- *           K32WOWGlobalUnlock16       (WOW32.13)
  *           K32WOWGlobalUnlock16       (KERNEL32.61)
  */
 BOOL WINAPI K32WOWGlobalUnlock16( WORD hMem )
@@ -125,7 +118,6 @@
 }
 
 /**********************************************************************
- *           K32WOWGlobalAllocLock16    (WOW32.9)
  *           K32WOWGlobalAllocLock16    (KERNEL32.63)
  */
 DWORD WINAPI K32WOWGlobalAllocLock16( WORD wFlags, DWORD cb, WORD *phMem )
@@ -137,7 +129,6 @@
 }
 
 /**********************************************************************
- *           K32WOWGlobalLockSize16     (WOW32.12)
  *           K32WOWGlobalLockSize16     (KERNEL32.65)
  */
 DWORD WINAPI K32WOWGlobalLockSize16( WORD hMem, PDWORD pcb )
@@ -149,7 +140,6 @@
 }
 
 /**********************************************************************
- *           K32WOWGlobalUnlockFree16   (WOW32.14)
  *           K32WOWGlobalUnlockFree16   (KERNEL32.64)
  */
 WORD WINAPI K32WOWGlobalUnlockFree16( DWORD vpMem )
@@ -162,7 +152,6 @@
 
 
 /**********************************************************************
- *           K32WOWYield16              (WOW32.17)
  *           K32WOWYield16              (KERNEL32.66)
  */
 VOID WINAPI K32WOWYield16( void )
@@ -175,7 +164,6 @@
 }
 
 /**********************************************************************
- *           K32WOWDirectedYield16       (WOW32.4)
  *           K32WOWDirectedYield16       (KERNEL32.67)
  */
 VOID WINAPI K32WOWDirectedYield16( WORD htask16 )
@@ -190,7 +178,6 @@
 
 
 /***********************************************************************
- *           K32WOWHandle32              (WOW32.16)
  *           K32WOWHandle32              (KERNEL32.57)
  */
 HANDLE WINAPI K32WOWHandle32( WORD handle, WOW_HANDLE_TYPE type )
@@ -221,7 +208,6 @@
 }
 
 /***********************************************************************
- *           K32WOWHandle16              (WOW32.15)
  *           K32WOWHandle16              (KERNEL32.58)
  */
 WORD WINAPI K32WOWHandle16( HANDLE handle, WOW_HANDLE_TYPE type )
@@ -255,7 +241,6 @@
 }
 
 /**********************************************************************
- *           K32WOWCallback16Ex         (WOW32.3)
  *           K32WOWCallback16Ex         (KERNEL32.55)
  */
 BOOL WINAPI K32WOWCallback16Ex( DWORD vpfn16, DWORD dwFlags,
@@ -287,7 +272,6 @@
 }
 
 /**********************************************************************
- *           K32WOWCallback16            (WOW32.2)
  *           K32WOWCallback16            (KERNEL32.54)
  */
 DWORD WINAPI K32WOWCallback16( DWORD vpfn16, DWORD dwParam )
diff --git a/dlls/msacm/pcmconverter.c b/dlls/msacm/pcmconverter.c
index 68a4a4f..14f99de 100644
--- a/dlls/msacm/pcmconverter.c
+++ b/dlls/msacm/pcmconverter.c
@@ -973,7 +973,7 @@
 }
 
 /**************************************************************************
- * 			DriverProc			[exported]
+ * 			DriverProc (MSACM32.@)
  */
 LRESULT CALLBACK	PCM_DriverProc(DWORD dwDevID, HDRVR hDriv, UINT wMsg, 
 				       LPARAM dwParam1, LPARAM dwParam2)
diff --git a/dlls/msvcrt/main.c b/dlls/msvcrt/main.c
index b912f22..52a4a07 100644
--- a/dlls/msvcrt/main.c
+++ b/dlls/msvcrt/main.c
@@ -151,20 +151,27 @@
 
 
 /*********************************************************************
- *                  Fixup functions
- *
- * Anything not really understood but needed to make the DLL work
+ *		$I10_OUTPUT (MSVCRT.@)
+ * Function not really understood but needed to make the DLL work
  */
 void MSVCRT_I10_OUTPUT(void)
 {
   /* FIXME: This is probably data, not a function */
 }
 
+/*********************************************************************
+ *		__unDName (MSVCRT.@)
+ * Function not really understood but needed to make the DLL work
+ */
 void MSVCRT___unDName(void)
 {
   /* Called by all VC compiled progs on startup. No idea what it does */
 }
 
+/*********************************************************************
+ *		__unDNameEx (MSVCRT.@)
+ * Function not really understood but needed to make the DLL work
+ */
 void MSVCRT___unDNameEx(void)
 {
   /* As above */
diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c
index 8732d9c..8b3b1bf 100644
--- a/dlls/msvcrt/string.c
+++ b/dlls/msvcrt/string.c
@@ -43,6 +43,7 @@
 }
 
 /*********************************************************************
+ *		_mbsdup (MSVCRT.@)
  *		_strdup (MSVCRT.@)
  */
 char* _strdup(const char* str)
diff --git a/dlls/msvideo/msvideo_main.c b/dlls/msvideo/msvideo_main.c
index 0ceff14..f97f298 100644
--- a/dlls/msvideo/msvideo_main.c
+++ b/dlls/msvideo/msvideo_main.c
@@ -148,8 +148,9 @@
 	return FALSE;
 }
 
-/**********************************************************************/
-
+/***********************************************************************
+ *		ICInfo				[MSVIDEO.200]
+ */
 BOOL16 VFWAPI ICInfo16(
 	DWORD     fccType,    /* [in] */
 	DWORD     fccHandler, /* [in] */
@@ -455,8 +456,9 @@
 	return 0;
 }
 
-/**********************************************************************/
-
+/***********************************************************************
+ *		ICGetDisplayFormat			[MSVIDEO.239]
+ */
 HIC16 VFWAPI ICGetDisplayFormat16(HIC16 hic, LPBITMAPINFOHEADER lpbiIn,
 								  LPBITMAPINFOHEADER lpbiOut, INT16 depth, INT16 dx, INT16 dy) {
 	return (HIC16)ICGetDisplayFormat(hic,lpbiIn,lpbiOut,depth,dx,dy);
diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c
index 11d59bf..60dee65 100644
--- a/dlls/ntdll/exception.c
+++ b/dlls/ntdll/exception.c
@@ -163,7 +163,7 @@
 
 
 /***********************************************************************
- *            EXC_RtlRaiseException / RtlRaiseException (NTDLL.464)
+ *		RtlRaiseException (NTDLL.@)
  */
 DEFINE_REGS_ENTRYPOINT_1( RtlRaiseException, EXC_RtlRaiseException, EXCEPTION_RECORD * )
 void WINAPI EXC_RtlRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context )
@@ -231,7 +231,7 @@
 
 
 /*******************************************************************
- *         EXC_RtlUnwind / RtlUnwind  (KERNEL32.590) (NTDLL.518)
+ *		RtlUnwind (NTDLL.@)
  */
 DEFINE_REGS_ENTRYPOINT_4( RtlUnwind, EXC_RtlUnwind, 
                           PEXCEPTION_FRAME, LPVOID, PEXCEPTION_RECORD, DWORD )
@@ -308,7 +308,7 @@
 
 
 /*******************************************************************
- *            EXC_NtRaiseException / NtRaiseException  (NTDLL.175)
+ *		NtRaiseException (NTDLL.@)
  */
 DEFINE_REGS_ENTRYPOINT_3( NtRaiseException, EXC_NtRaiseException,
                           EXCEPTION_RECORD *, CONTEXT *, BOOL )
diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
index 8295f5c..9b9bc8f 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -9,6 +9,7 @@
 
 /**************************************************************************
  *                 NtOpenFile				[NTDLL.@]
+ *                 ZwOpenFile				[NTDLL.@]
  * FUNCTION: Opens a file
  * ARGUMENTS:
  *  FileHandle		Variable that receives the file handle on return
@@ -35,6 +36,7 @@
 
 /**************************************************************************
  *		NtCreateFile				[NTDLL.@]
+ *		ZwCreateFile				[NTDLL.@]
  * FUNCTION: Either causes a new file or directory to be created, or it opens
  *  an existing file, device, directory or volume, giving the caller a handle
  *  for the file object. This handle can be used by subsequent calls to
@@ -75,7 +77,7 @@
 
 /******************************************************************************
  *  NtReadFile					[NTDLL.@]
- *  ZwReadFile
+ *  ZwReadFile					[NTDLL.@]
  *
  * Parameters
  *   HANDLE32 		FileHandle
@@ -106,6 +108,7 @@
 
 /**************************************************************************
  *		NtDeviceIoControlFile			[NTDLL.@]
+ *		ZwDeviceIoControlFile			[NTDLL.@]
  */
 NTSTATUS WINAPI NtDeviceIoControlFile(
 	IN HANDLE DeviceHandle,
@@ -127,6 +130,7 @@
 
 /******************************************************************************
  * NtFsControlFile [NTDLL.@]
+ * ZwFsControlFile [NTDLL.@]
  */
 NTSTATUS WINAPI NtFsControlFile(
 	IN HANDLE DeviceHandle,
@@ -148,6 +152,7 @@
 
 /******************************************************************************
  *  NtSetVolumeInformationFile		[NTDLL.@]
+ *  ZwSetVolumeInformationFile		[NTDLL.@]
  */
 NTSTATUS WINAPI NtSetVolumeInformationFile(
 	IN HANDLE FileHandle,
@@ -163,6 +168,7 @@
 
 /******************************************************************************
  *  NtQueryInformationFile		[NTDLL.@]
+ *  ZwQueryInformationFile		[NTDLL.@]
  */
 NTSTATUS WINAPI NtQueryInformationFile(
 	HANDLE FileHandle,
@@ -178,6 +184,7 @@
 
 /******************************************************************************
  *  NtSetInformationFile		[NTDLL.@]
+ *  ZwSetInformationFile		[NTDLL.@]
  */
 NTSTATUS WINAPI NtSetInformationFile(
 	HANDLE FileHandle,
@@ -193,6 +200,7 @@
 
 /******************************************************************************
  *  NtQueryDirectoryFile	[NTDLL.@]
+ *  ZwQueryDirectoryFile	[NTDLL.@]
  *  ZwQueryDirectoryFile
  */
 NTSTATUS WINAPI NtQueryDirectoryFile(
@@ -217,6 +225,7 @@
 
 /******************************************************************************
  *  NtQueryVolumeInformationFile		[NTDLL.@]
+ *  ZwQueryVolumeInformationFile		[NTDLL.@]
  */
 NTSTATUS WINAPI NtQueryVolumeInformationFile (
 	IN HANDLE FileHandle,
diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c
index eea3c0d..2917d86 100644
--- a/dlls/ntdll/nt.c
+++ b/dlls/ntdll/nt.c
@@ -25,6 +25,7 @@
  
 /**************************************************************************
  *		NtCreateTimer				[NTDLL.@]
+ *		ZwCreateTimer				[NTDLL.@]
  */
 NTSTATUS WINAPI NtCreateTimer(
 	OUT PHANDLE TimerHandle,
@@ -39,6 +40,7 @@
 }
 /**************************************************************************
  *		NtSetTimer				[NTDLL.@]
+ *		ZwSetTimer				[NTDLL.@]
  */
 NTSTATUS WINAPI NtSetTimer(
 	IN HANDLE TimerHandle,
@@ -90,6 +92,7 @@
 
 /******************************************************************************
 *  NtQueryInformationProcess		[NTDLL.@]
+*  ZwQueryInformationProcess		[NTDLL.@]
 *
 */
 NTSTATUS WINAPI NtQueryInformationProcess(
@@ -112,6 +115,7 @@
 
 /******************************************************************************
  * NtSetInformationProcess [NTDLL.@]
+ * ZwSetInformationProcess [NTDLL.@]
  */
 NTSTATUS WINAPI NtSetInformationProcess(
 	IN HANDLE ProcessHandle,
@@ -130,6 +134,7 @@
 
 /******************************************************************************
  *  NtResumeThread	[NTDLL.@]
+ *  ZwResumeThread	[NTDLL.@]
  */
 NTSTATUS WINAPI NtResumeThread(
 	IN HANDLE ThreadHandle,
@@ -143,6 +148,7 @@
 
 /******************************************************************************
  *  NtTerminateThread	[NTDLL.@]
+ *  ZwTerminateThread	[NTDLL.@]
  */
 NTSTATUS WINAPI NtTerminateThread( HANDLE handle, LONG exit_code )
 {
@@ -170,6 +176,7 @@
 
 /******************************************************************************
 *  NtQueryInformationThread		[NTDLL.@]
+*  ZwQueryInformationThread		[NTDLL.@]
 *
 */
 NTSTATUS WINAPI NtQueryInformationThread(
@@ -187,6 +194,7 @@
 
 /******************************************************************************
  *  NtSetInformationThread		[NTDLL.@]
+ *  ZwSetInformationThread		[NTDLL.@]
  */
 NTSTATUS WINAPI NtSetInformationThread(
 	HANDLE ThreadHandle,
@@ -205,6 +213,7 @@
 
 /******************************************************************************
  *  NtDuplicateToken		[NTDLL.@]
+ *  ZwDuplicateToken		[NTDLL.@]
  */
 NTSTATUS WINAPI NtDuplicateToken(
         IN HANDLE ExistingToken,
@@ -223,6 +232,7 @@
 
 /******************************************************************************
  *  NtOpenProcessToken		[NTDLL.@]
+ *  ZwOpenProcessToken		[NTDLL.@]
  */
 NTSTATUS WINAPI NtOpenProcessToken(
 	HANDLE ProcessHandle,
@@ -237,6 +247,7 @@
 
 /******************************************************************************
  *  NtOpenThreadToken		[NTDLL.@]
+ *  ZwOpenThreadToken		[NTDLL.@]
  */
 NTSTATUS WINAPI NtOpenThreadToken(
 	HANDLE ThreadHandle,
@@ -252,6 +263,7 @@
 
 /******************************************************************************
  *  NtAdjustPrivilegesToken		[NTDLL.@]
+ *  ZwAdjustGroupsToken		[NTDLL.@]
  *
  * FIXME: parameters unsafe
  */
@@ -270,6 +282,7 @@
 
 /******************************************************************************
 *  NtQueryInformationToken		[NTDLL.@]
+*  ZwQueryInformationToken		[NTDLL.@]
 *
 * NOTES
 *  Buffer for TokenUser:
@@ -373,6 +386,7 @@
  
 /******************************************************************************
  *  NtCreateSection	[NTDLL.@]
+ *  ZwCreateSection	[NTDLL.@]
  */
 NTSTATUS WINAPI NtCreateSection(
 	OUT PHANDLE SectionHandle,
@@ -392,6 +406,7 @@
 
 /******************************************************************************
  *  NtOpenSection	[NTDLL.@]
+ *  ZwOpenSection	[NTDLL.@]
  */
 NTSTATUS WINAPI NtOpenSection(
 	PHANDLE SectionHandle,
@@ -421,6 +436,7 @@
 
 /******************************************************************************
  * NtMapViewOfSection	[NTDLL.@]
+ * ZwMapViewOfSection	[NTDLL.@]
  * FUNCTION: Maps a view of a section into the virtual address space of a process
  *
  * ARGUMENTS:
@@ -462,6 +478,7 @@
 
 /******************************************************************************
  *  NtCreatePort		[NTDLL.@]
+ *  ZwCreatePort		[NTDLL.@]
  */
 NTSTATUS WINAPI NtCreatePort(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5) 
 {
@@ -471,6 +488,7 @@
 
 /******************************************************************************
  *  NtConnectPort		[NTDLL.@]
+ *  ZwConnectPort		[NTDLL.@]
  */
 NTSTATUS WINAPI NtConnectPort(DWORD x1,PUNICODE_STRING uni,DWORD x3,DWORD x4,DWORD x5,DWORD x6,DWORD x7,DWORD x8) 
 {
@@ -481,6 +499,7 @@
 
 /******************************************************************************
  *  NtListenPort		[NTDLL.@]
+ *  ZwListenPort		[NTDLL.@]
  */
 NTSTATUS WINAPI NtListenPort(DWORD x1,DWORD x2) 
 {
@@ -490,6 +509,7 @@
 
 /******************************************************************************
  *  NtAcceptConnectPort	[NTDLL.@]
+ *  ZwAcceptConnectPort	[NTDLL.@]
  */
 NTSTATUS WINAPI NtAcceptConnectPort(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5,DWORD x6) 
 {
@@ -499,6 +519,7 @@
 
 /******************************************************************************
  *  NtCompleteConnectPort	[NTDLL.@]
+ *  ZwCompleteConnectPort	[NTDLL.@]
  */
 NTSTATUS WINAPI NtCompleteConnectPort(DWORD x1) 
 {
@@ -508,6 +529,7 @@
 
 /******************************************************************************
  *  NtRegisterThreadTerminatePort	[NTDLL.@]
+ *  ZwRegisterThreadTerminatePort	[NTDLL.@]
  */
 NTSTATUS WINAPI NtRegisterThreadTerminatePort(DWORD x1) 
 {
@@ -517,6 +539,7 @@
 
 /******************************************************************************
  *  NtRequestWaitReplyPort		[NTDLL.@]
+ *  ZwRequestWaitReplyPort		[NTDLL.@]
  */
 NTSTATUS WINAPI NtRequestWaitReplyPort(DWORD x1,DWORD x2,DWORD x3) 
 {
@@ -526,6 +549,7 @@
 
 /******************************************************************************
  *  NtReplyWaitReceivePort	[NTDLL.@]
+ *  ZwReplyWaitReceivePort	[NTDLL.@]
  */
 NTSTATUS WINAPI NtReplyWaitReceivePort(DWORD x1,DWORD x2,DWORD x3,DWORD x4) 
 {
@@ -539,6 +563,7 @@
 
  /******************************************************************************
  *  NtSetIntervalProfile	[NTDLL.@]
+ *  ZwSetIntervalProfile	[NTDLL.@]
  */
 NTSTATUS WINAPI NtSetIntervalProfile(DWORD x1,DWORD x2) {
 	FIXME("(0x%08lx,0x%08lx),stub!\n",x1,x2);
@@ -559,6 +584,7 @@
 
 /******************************************************************************
  *  NtCreateMailslotFile	[NTDLL.@]
+ *  ZwCreateMailslotFile	[NTDLL.@]
  */
 NTSTATUS WINAPI NtCreateMailslotFile(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5,DWORD x6,DWORD x7,DWORD x8) 
 {
@@ -568,6 +594,7 @@
 
 /******************************************************************************
  * NtQuerySystemInformation [NTDLL.@]
+ * ZwQuerySystemInformation [NTDLL.@]
  *
  * ARGUMENTS:
  *  SystemInformationClass	Index to a certain information structure
@@ -617,6 +644,7 @@
 
 /******************************************************************************
  *  NtCreatePagingFile		[NTDLL.@]
+ *  ZwCreatePagingFile		[NTDLL.@]
  */
 NTSTATUS WINAPI NtCreatePagingFile(
 	IN PUNICODE_STRING PageFileName,
diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c
index 3947743..9ce9213 100644
--- a/dlls/ntdll/om.c
+++ b/dlls/ntdll/om.c
@@ -22,6 +22,7 @@
  
 /******************************************************************************
  * NtQueryObject [NTDLL.@]
+ * ZwQueryObject [NTDLL.@]
  */
 NTSTATUS WINAPI NtQueryObject(
 	IN HANDLE ObjectHandle,
@@ -191,6 +192,7 @@
 }
 /******************************************************************************
  *  NtDuplicateObject		[NTDLL.@]
+ *  ZwDuplicateObject		[NTDLL.@]
  */
 NTSTATUS WINAPI NtDuplicateObject(
 	IN HANDLE SourceProcessHandle,
@@ -229,6 +231,7 @@
 
 /******************************************************************************
  *  NtWaitForSingleObject		[NTDLL.@]
+ *  ZwWaitForSingleObject		[NTDLL.@]
  */
 NTSTATUS WINAPI NtWaitForSingleObject(
 	IN PHANDLE Object,
@@ -245,6 +248,7 @@
 
 /**************************************************************************
  * NtOpenDirectoryObject [NTDLL.@]
+ * ZwOpenDirectoryObject [NTDLL.@]
  * FUNCTION: Opens a namespace directory object
  * ARGUMENTS:
  *  DirectoryHandle	Variable which receives the directory handle
@@ -265,6 +269,7 @@
 
 /******************************************************************************
  *  NtCreateDirectoryObject	[NTDLL.@]
+ *  ZwCreateDirectoryObject	[NTDLL.@]
  */
 NTSTATUS WINAPI NtCreateDirectoryObject(
 	PHANDLE DirectoryHandle,
@@ -279,6 +284,7 @@
 
 /******************************************************************************
  * NtQueryDirectoryObject [NTDLL.@]
+ * ZwQueryDirectoryObject [NTDLL.@]
  * FUNCTION: Reads information from a namespace directory
  * ARGUMENTS:
  *  DirObjInformation	Buffer to hold the data read
diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c
index 57cba0a..7f2c673 100644
--- a/dlls/ntdll/reg.c
+++ b/dlls/ntdll/reg.c
@@ -28,7 +28,7 @@
 
 /******************************************************************************
  * NtCreateKey [NTDLL.@]
- * ZwCreateKey
+ * ZwCreateKey [NTDLL.@]
  */
 NTSTATUS WINAPI NtCreateKey( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr,
                              ULONG TitleIndex, const UNICODE_STRING *class, ULONG options,
@@ -75,7 +75,8 @@
 
 /******************************************************************************
  * NtOpenKey [NTDLL.@]
- * ZwOpenKey
+ * ZwOpenKey [NTDLL.@]
+ *
  *   OUT	PHANDLE			retkey (returns 0 when failure)
  *   IN		ACCESS_MASK		access
  *   IN		POBJECT_ATTRIBUTES 	attr 
@@ -107,7 +108,7 @@
 
 /******************************************************************************
  * NtDeleteKey [NTDLL.@]
- * ZwDeleteKey
+ * ZwDeleteKey [NTDLL.@]
  */
 NTSTATUS WINAPI NtDeleteKey( HANDLE hkey )
 {
@@ -127,7 +128,7 @@
 
 /******************************************************************************
  * NtDeleteValueKey [NTDLL.@]
- * ZwDeleteValueKey
+ * ZwDeleteValueKey [NTDLL.@]
  */
 NTSTATUS WINAPI NtDeleteValueKey( HANDLE hkey, const UNICODE_STRING *name )
 {
@@ -238,7 +239,7 @@
 
 /******************************************************************************
  * NtEnumerateKey [NTDLL.@]
- * ZwEnumerateKey
+ * ZwEnumerateKey [NTDLL.@]
  *
  * NOTES
  *  the name copied into the buffer is NOT 0-terminated 
@@ -268,7 +269,7 @@
 
 /******************************************************************************
  * NtQueryKey [NTDLL.@]
- * ZwQueryKey
+ * ZwQueryKey [NTDLL.@]
  */
 NTSTATUS WINAPI NtQueryKey( HANDLE handle, KEY_INFORMATION_CLASS info_class,
                             void *info, DWORD length, DWORD *result_len )
@@ -336,7 +337,7 @@
 
 /******************************************************************************
  *  NtEnumerateValueKey	[NTDLL.@]
- *  ZwEnumerateValueKey
+ *  ZwEnumerateValueKey [NTDLL.@]
  */
 NTSTATUS WINAPI NtEnumerateValueKey( HANDLE handle, ULONG index,
                                      KEY_VALUE_INFORMATION_CLASS info_class,
@@ -438,7 +439,7 @@
 
 /******************************************************************************
  * NtQueryValueKey [NTDLL.@]
- * ZwQueryValueKey
+ * ZwQueryValueKey [NTDLL.@]
  *
  * NOTES
  *  the name in the KeyValueInformation is never set
@@ -519,7 +520,7 @@
 
 /******************************************************************************
  *  NtFlushKey	[NTDLL.@]
- *  ZwFlushKey
+ *  ZwFlushKey  [NTDLL.@]
  */
 NTSTATUS WINAPI NtFlushKey(HANDLE KeyHandle)
 {
@@ -530,7 +531,7 @@
 
 /******************************************************************************
  *  NtLoadKey	[NTDLL.@]
- *  ZwLoadKey
+ *  ZwLoadKey   [NTDLL.@]
  */
 NTSTATUS WINAPI NtLoadKey( const OBJECT_ATTRIBUTES *attr, const OBJECT_ATTRIBUTES *file )
 {
@@ -542,7 +543,7 @@
 
 /******************************************************************************
  *  NtNotifyChangeKey	[NTDLL.@]
- *  ZwNotifyChangeKey
+ *  ZwNotifyChangeKey   [NTDLL.@]
  */
 NTSTATUS WINAPI NtNotifyChangeKey(
 	IN HANDLE KeyHandle,
@@ -583,7 +584,7 @@
 
 /******************************************************************************
  * NtReplaceKey [NTDLL.@]
- * ZwReplaceKey
+ * ZwReplaceKey [NTDLL.@]
  */
 NTSTATUS WINAPI NtReplaceKey(
 	IN POBJECT_ATTRIBUTES ObjectAttributes,
@@ -597,7 +598,7 @@
 }
 /******************************************************************************
  * NtRestoreKey [NTDLL.@]
- * ZwRestoreKey
+ * ZwRestoreKey [NTDLL.@]
  */
 NTSTATUS WINAPI NtRestoreKey(
 	HANDLE KeyHandle,
@@ -610,7 +611,7 @@
 }
 /******************************************************************************
  * NtSaveKey [NTDLL.@]
- * ZwSaveKey
+ * ZwSaveKey [NTDLL.@]
  */
 NTSTATUS WINAPI NtSaveKey(
 	IN HANDLE KeyHandle,
@@ -622,7 +623,7 @@
 }
 /******************************************************************************
  * NtSetInformationKey [NTDLL.@]
- * ZwSetInformationKey
+ * ZwSetInformationKey [NTDLL.@]
  */
 NTSTATUS WINAPI NtSetInformationKey(
 	IN HANDLE KeyHandle,
@@ -638,7 +639,7 @@
 
 /******************************************************************************
  * NtSetValueKey [NTDLL.@]
- * ZwSetValueKey
+ * ZwSetValueKey [NTDLL.@]
  *
  * NOTES
  *   win95 does not care about count for REG_SZ and finds out the len by itself (js) 
@@ -683,7 +684,7 @@
 
 /******************************************************************************
  * NtUnloadKey [NTDLL.@]
- * ZwUnloadKey
+ * ZwUnloadKey [NTDLL.@]
  */
 NTSTATUS WINAPI NtUnloadKey(
 	IN HANDLE KeyHandle)
diff --git a/dlls/ntdll/rtlstr.c b/dlls/ntdll/rtlstr.c
index 18678ec..34e90f0 100644
--- a/dlls/ntdll/rtlstr.c
+++ b/dlls/ntdll/rtlstr.c
@@ -599,6 +599,7 @@
 
 /**************************************************************************
  *      RtlOemStringToUnicodeSize   (NTDLL.@)
+ *      RtlxOemStringToUnicodeSize  (NTDLL.@)
  *
  * Return the size in bytes necessary for the Unicode conversion of 'str',
  * including the terminating NULL.
@@ -612,6 +613,7 @@
 
 /**************************************************************************
  *      RtlAnsiStringToUnicodeSize   (NTDLL.@)
+ *      RtlxAnsiStringToUnicodeSize  (NTDLL.@)
  *
  * Return the size in bytes necessary for the Unicode conversion of 'str',
  * including the terminating NULL.
@@ -651,6 +653,7 @@
 
 /**************************************************************************
  *      RtlUnicodeStringToAnsiSize   (NTDLL.@)
+ *      RtlxUnicodeStringToAnsiSize  (NTDLL.@)
  *
  * Return the size in bytes necessary for the Ansi conversion of 'str',
  * including the terminating NULL.
@@ -664,6 +667,7 @@
 
 /**************************************************************************
  *      RtlUnicodeStringToOemSize   (NTDLL.@)
+ *      RtlxUnicodeStringToOemSize  (NTDLL.@)
  *
  * Return the size in bytes necessary for the OEM conversion of 'str',
  * including the terminating NULL.
diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c
index c1e4818..df495e2 100644
--- a/dlls/ntdll/sync.c
+++ b/dlls/ntdll/sync.c
@@ -111,6 +111,7 @@
  
 /**************************************************************************
  * NtCreateEvent (NTDLL.@)
+ * ZwCreateEvent (NTDLL.@)
  */
 NTSTATUS WINAPI NtCreateEvent(
 	OUT PHANDLE EventHandle,
@@ -137,6 +138,7 @@
 
 /******************************************************************************
  *  NtOpenEvent (NTDLL.@)
+ *  ZwOpenEvent (NTDLL.@)
  */
 NTSTATUS WINAPI NtOpenEvent(
 	OUT PHANDLE EventHandle,
@@ -161,6 +163,7 @@
 
 /******************************************************************************
  *  NtSetEvent (NTDLL.@)
+ *  ZwSetEvent (NTDLL.@)
  */
 NTSTATUS WINAPI NtSetEvent( HANDLE handle, PULONG NumberOfThreadsReleased )
 {
diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c
index 3fdaf18..111305c 100644
--- a/dlls/ntdll/time.c
+++ b/dlls/ntdll/time.c
@@ -242,6 +242,7 @@
 
 /***********************************************************************
  *      NtQuerySystemTime   (NTDLL.@)
+ *      ZwQuerySystemTime   (NTDLL.@)
  */
 void WINAPI NtQuerySystemTime( LARGE_INTEGER *time )
 {
diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c
index 894538f..7219472 100644
--- a/dlls/ole32/compobj.c
+++ b/dlls/ole32/compobj.c
@@ -166,6 +166,7 @@
 
 /******************************************************************************
  *           CoBuildVersion [COMPOBJ.1]
+ *           CoBuildVersion [OLE32.4]
  *
  * RETURNS
  *	Current build version, hiword is majornumber, loword is minornumber
@@ -375,6 +376,7 @@
 
 /******************************************************************************
  *		CoDisconnectObject	[COMPOBJ.15]
+ *		CoDisconnectObject	[OLE32.8]
  */
 HRESULT WINAPI CoDisconnectObject( LPUNKNOWN lpUnk, DWORD reserved )
 {
@@ -503,6 +505,7 @@
 
 /******************************************************************************
  *		CLSIDFromString	[OLE32.3]
+ *		IIDFromString   [OLE32.74]
  * Converts a unique identifier from its string representation into 
  * the GUID struct.
  *
@@ -612,6 +615,7 @@
 
 /******************************************************************************
  *		StringFromCLSID	[OLE32.151]
+ *		StringFromIID   [OLE32.153]
  * Converts a GUID into the respective string representation.
  * The target string is allocated using the OLE IMalloc.
  * RETURNS
@@ -1165,6 +1169,7 @@
 
 /***********************************************************************
  *           CoGetClassObject [COMPOBJ.7]
+ *           CoGetClassObject [OLE32.16]
  */
 HRESULT WINAPI CoGetClassObject(
     REFCLSID rclsid, DWORD dwClsContext, COSERVERINFO *pServerInfo,
@@ -1377,7 +1382,8 @@
 }
 
 /***********************************************************************
- *           CoCreateInstance [COMPOBJ.13, OLE32.7]
+ *           CoCreateInstance [COMPOBJ.13]
+ *           CoCreateInstance [OLE32.7]
  */
 HRESULT WINAPI CoCreateInstance(
 	REFCLSID rclsid,
@@ -1497,7 +1503,7 @@
 }
 
 /***********************************************************************
- *           CoFreeLibrary [COMPOBJ.13]
+ *           CoFreeLibrary [OLE32.13]
  */
 void WINAPI CoFreeLibrary(HINSTANCE hLibrary)
 {
@@ -1535,7 +1541,7 @@
 
 
 /***********************************************************************
- *           CoFreeAllLibraries [COMPOBJ.12]
+ *           CoFreeAllLibraries [OLE32.12]
  */
 void WINAPI CoFreeAllLibraries(void)
 {
@@ -1552,6 +1558,7 @@
 
 /***********************************************************************
  *           CoFreeUnusedLibraries [COMPOBJ.17]
+ *           CoFreeUnusedLibraries [OLE32.14]
  */
 void WINAPI CoFreeUnusedLibraries(void)
 {
@@ -1575,7 +1582,9 @@
 }
 
 /***********************************************************************
- *           CoFileTimeNow [COMPOBJ.82, OLE32.10]
+ *           CoFileTimeNow [COMPOBJ.82]
+ *           CoFileTimeNow [OLE32.10]
+ *
  * RETURNS
  *	the current system time in lpFileTime
  */
diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c
index 9c217f8..dc369e3 100644
--- a/dlls/ole32/moniker.c
+++ b/dlls/ole32/moniker.c
@@ -464,7 +464,7 @@
 }
 
 /***********************************************************************
- *           GetRunningObjectTable (OLE2.30)
+ *           GetRunningObjectTable (OLE32.73)
  */
 HRESULT WINAPI GetRunningObjectTable(DWORD reserved, LPRUNNINGOBJECTTABLE *pprot)
 {
diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c
index ea927ce..19b4452 100644
--- a/dlls/ole32/ole2.c
+++ b/dlls/ole32/ole2.c
@@ -145,6 +145,7 @@
 
 /******************************************************************************
  *		OleBuildVersion	[OLE2.1]
+ *		OleBuildVersion [OLE32.84]
  */
 DWORD WINAPI OleBuildVersion(void)
 {
@@ -2195,7 +2196,7 @@
 }
 
 /******************************************************************************
- * OleMetaFilePictFromIconAndLabel
+ * OleMetaFilePictFromIconAndLabel (OLE2.56)
  *
  * Returns a global memory handle to a metafile which contains the icon and
  * label given.
diff --git a/dlls/ole32/ole2impl.c b/dlls/ole32/ole2impl.c
index 1cd283a..c90ad0d 100644
--- a/dlls/ole32/ole2impl.c
+++ b/dlls/ole32/ole2impl.c
@@ -18,7 +18,8 @@
 #define MAX_CLIPFORMAT_NAME   80
 
 /******************************************************************************
- * Function : OleQueryCreateFromData [OLE32.117]
+ *		OleQueryCreateFromData [OLE32.117]
+ *
  * Author   : Abey George
  * Checks whether an object can become an embedded object.
  * the clipboard or OLE drag and drop.
@@ -65,7 +66,8 @@
 }
 
 /******************************************************************************
- * Function : OleCreateFromData        [OLE32.92]
+ *		OleCreateFromData        [OLE32.92]
+ *
  * Author   : Abey George
  * Creates an embedded object from data transfer object retrieved from
  * the clipboard or OLE drag and drop.
diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c
index 3d9e168..461a38b 100644
--- a/dlls/ole32/storage32.c
+++ b/dlls/ole32/storage32.c
@@ -5557,6 +5557,7 @@
 
 /******************************************************************************
  *    StgOpenStorageOnILockBytes    [OLE32.149]
+ *    StgOpenStorageOnILockBytes    [STORAGE.4]
  */
 HRESULT WINAPI StgOpenStorageOnILockBytes(
       ILockBytes *plkbyt,
@@ -5621,6 +5622,8 @@
 
 /******************************************************************************
  *              StgSetTimes [ole32.150]
+ *              StgSetTimes [OLE32.150]
+ *              StgSetTimes [STORAGE.7]
  *
  *
  */
@@ -5633,6 +5636,7 @@
 
 /******************************************************************************
  *              StgIsStorageILockBytes        [OLE32.147]
+ *              StgIsStorageILockBytes        [STORAGE.6]
  *
  * Determines if the ILockBytes contains a storage object.
  */
diff --git a/dlls/oleaut32/ole2disp.c b/dlls/oleaut32/ole2disp.c
index 8e64c03..a90ea57 100644
--- a/dlls/oleaut32/ole2disp.c
+++ b/dlls/oleaut32/ole2disp.c
@@ -339,7 +339,7 @@
 }
 
 /******************************************************************************
- * CreateDispTypeInfo [OLE2DISP.31]
+ * CreateDispTypeInfo [OLEAUT32.31]
  */
 HRESULT WINAPI CreateDispTypeInfo(
 	INTERFACEDATA *pidata,
@@ -365,7 +365,7 @@
 }
 
 /******************************************************************************
- * CreateStdDispatch [OLE2DISP.32]
+ * CreateStdDispatch [OLEAUT32.32]
  */
 HRESULT WINAPI CreateStdDispatch(
         IUnknown* punkOuter,
diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c
index c56fdfd..c70492e 100644
--- a/dlls/oleaut32/oleaut.c
+++ b/dlls/oleaut32/oleaut.c
@@ -121,7 +121,7 @@
 }
 
 /***********************************************************************
- *		DllRegisterServer
+ *		DllRegisterServer (OLEAUT32.320)
  */
 HRESULT WINAPI OLEAUT32_DllRegisterServer() { 
     FIXME("stub!\n");
@@ -129,7 +129,7 @@
 }
 
 /***********************************************************************
- *		DllUnregisterServer
+ *		DllUnregisterServer (OLEAUT32.321)
  */
 HRESULT WINAPI OLEAUT32_DllUnregisterServer() {
     FIXME("stub!\n");
diff --git a/dlls/oledlg/oledlg_main.c b/dlls/oledlg/oledlg_main.c
index 8c76305..00b0523 100644
--- a/dlls/oledlg/oledlg_main.c
+++ b/dlls/oledlg/oledlg_main.c
@@ -12,6 +12,7 @@
 #include "ole2.h"
 
 DEFAULT_DEBUG_CHANNEL(ole);
+
 /***********************************************************************
  *           OleUIAddVerbMenuA (OLEDLG.1)
  */
@@ -196,10 +197,7 @@
 }
 
 /***********************************************************************
- *           OleUIUpdateLinksW (OLEDLG.?)
- * FIXME
- *     I haven't been able to find the ordinal for this function,
- *     This means it can't be called from outside the DLL.
+ *           OleUIUpdateLinksW (OLEDLG.23)
  */
 BOOL WINAPI OleUIUpdateLinksW(
   LPOLEUILINKCONTAINERW lpOleUILinkCntr,
diff --git a/dlls/opengl32/opengl_norm.c b/dlls/opengl32/opengl_norm.c
index c7b4630..ba0ac44 100644
--- a/dlls/opengl32/opengl_norm.c
+++ b/dlls/opengl32/opengl_norm.c
@@ -10,7 +10,7 @@
 DEFAULT_DEBUG_CHANNEL(opengl);
 
 /***********************************************************************
- *              glAccum
+ *              glAccum (OPENGL32.@)
  */
 void WINAPI wine_glAccum( GLenum op, GLfloat value ) {
   TRACE("(%d, %f)\n", op, value );
@@ -20,7 +20,7 @@
 }
 
 /***********************************************************************
- *              glActiveTextureARB
+ *              glActiveTextureARB (OPENGL32.@)
  */
 void WINAPI wine_glActiveTextureARB( GLenum texture ) {
   TRACE("(%d)\n", texture );
@@ -30,7 +30,7 @@
 }
 
 /***********************************************************************
- *              glAlphaFunc
+ *              glAlphaFunc (OPENGL32.@)
  */
 void WINAPI wine_glAlphaFunc( GLenum func, GLclampf ref ) {
   TRACE("(%d, %f)\n", func, ref );
@@ -40,7 +40,7 @@
 }
 
 /***********************************************************************
- *              glAreTexturesResident
+ *              glAreTexturesResident (OPENGL32.@)
  */
 GLboolean WINAPI wine_glAreTexturesResident( GLsizei n, GLuint* textures, GLboolean* residences ) {
   GLboolean ret_value;
@@ -52,7 +52,7 @@
 }
 
 /***********************************************************************
- *              glArrayElement
+ *              glArrayElement (OPENGL32.@)
  */
 void WINAPI wine_glArrayElement( GLint i ) {
   TRACE("(%d)\n", i );
@@ -62,7 +62,7 @@
 }
 
 /***********************************************************************
- *              glBegin
+ *              glBegin (OPENGL32.@)
  */
 void WINAPI wine_glBegin( GLenum mode ) {
   TRACE("(%d)\n", mode );
@@ -72,7 +72,7 @@
 }
 
 /***********************************************************************
- *              glBindTexture
+ *              glBindTexture (OPENGL32.@)
  */
 void WINAPI wine_glBindTexture( GLenum target, GLuint texture ) {
   TRACE("(%d, %d)\n", target, texture );
@@ -82,7 +82,7 @@
 }
 
 /***********************************************************************
- *              glBitmap
+ *              glBitmap (OPENGL32.@)
  */
 void WINAPI wine_glBitmap( GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, GLubyte* bitmap ) {
   TRACE("(%d, %d, %f, %f, %f, %f, %p)\n", width, height, xorig, yorig, xmove, ymove, bitmap );
@@ -92,7 +92,7 @@
 }
 
 /***********************************************************************
- *              glBlendColor
+ *              glBlendColor (OPENGL32.@)
  */
 void WINAPI wine_glBlendColor( GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha ) {
   TRACE("(%f, %f, %f, %f)\n", red, green, blue, alpha );
@@ -102,7 +102,7 @@
 }
 
 /***********************************************************************
- *              glBlendEquation
+ *              glBlendEquation (OPENGL32.@)
  */
 void WINAPI wine_glBlendEquation( GLenum mode ) {
   TRACE("(%d)\n", mode );
@@ -112,7 +112,7 @@
 }
 
 /***********************************************************************
- *              glBlendFunc
+ *              glBlendFunc (OPENGL32.@)
  */
 void WINAPI wine_glBlendFunc( GLenum sfactor, GLenum dfactor ) {
   TRACE("(%d, %d)\n", sfactor, dfactor );
@@ -122,7 +122,7 @@
 }
 
 /***********************************************************************
- *              glCallList
+ *              glCallList (OPENGL32.@)
  */
 void WINAPI wine_glCallList( GLuint list ) {
   TRACE("(%d)\n", list );
@@ -132,7 +132,7 @@
 }
 
 /***********************************************************************
- *              glCallLists
+ *              glCallLists (OPENGL32.@)
  */
 void WINAPI wine_glCallLists( GLsizei n, GLenum type, GLvoid* lists ) {
   TRACE("(%d, %d, %p)\n", n, type, lists );
@@ -142,7 +142,7 @@
 }
 
 /***********************************************************************
- *              glClear
+ *              glClear (OPENGL32.@)
  */
 void WINAPI wine_glClear( GLbitfield mask ) {
   TRACE("(%d)\n", mask );
@@ -152,7 +152,7 @@
 }
 
 /***********************************************************************
- *              glClearAccum
+ *              glClearAccum (OPENGL32.@)
  */
 void WINAPI wine_glClearAccum( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha ) {
   TRACE("(%f, %f, %f, %f)\n", red, green, blue, alpha );
@@ -162,7 +162,7 @@
 }
 
 /***********************************************************************
- *              glClearColor
+ *              glClearColor (OPENGL32.@)
  */
 void WINAPI wine_glClearColor( GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha ) {
   TRACE("(%f, %f, %f, %f)\n", red, green, blue, alpha );
@@ -172,7 +172,7 @@
 }
 
 /***********************************************************************
- *              glClearDepth
+ *              glClearDepth (OPENGL32.@)
  */
 void WINAPI wine_glClearDepth( GLclampd depth ) {
   TRACE("(%f)\n", depth );
@@ -182,7 +182,7 @@
 }
 
 /***********************************************************************
- *              glClearIndex
+ *              glClearIndex (OPENGL32.@)
  */
 void WINAPI wine_glClearIndex( GLfloat c ) {
   TRACE("(%f)\n", c );
@@ -192,7 +192,7 @@
 }
 
 /***********************************************************************
- *              glClearStencil
+ *              glClearStencil (OPENGL32.@)
  */
 void WINAPI wine_glClearStencil( GLint s ) {
   TRACE("(%d)\n", s );
@@ -202,7 +202,7 @@
 }
 
 /***********************************************************************
- *              glClientActiveTextureARB
+ *              glClientActiveTextureARB (OPENGL32.@)
  */
 void WINAPI wine_glClientActiveTextureARB( GLenum texture ) {
   TRACE("(%d)\n", texture );
@@ -212,7 +212,7 @@
 }
 
 /***********************************************************************
- *              glClipPlane
+ *              glClipPlane (OPENGL32.@)
  */
 void WINAPI wine_glClipPlane( GLenum plane, GLdouble* equation ) {
   TRACE("(%d, %p)\n", plane, equation );
@@ -222,7 +222,7 @@
 }
 
 /***********************************************************************
- *              glColor3b
+ *              glColor3b (OPENGL32.@)
  */
 void WINAPI wine_glColor3b( GLbyte red, GLbyte green, GLbyte blue ) {
   TRACE("(%d, %d, %d)\n", red, green, blue );
@@ -232,7 +232,7 @@
 }
 
 /***********************************************************************
- *              glColor3bv
+ *              glColor3bv (OPENGL32.@)
  */
 void WINAPI wine_glColor3bv( GLbyte* v ) {
   TRACE("(%p)\n", v );
@@ -242,7 +242,7 @@
 }
 
 /***********************************************************************
- *              glColor3d
+ *              glColor3d (OPENGL32.@)
  */
 void WINAPI wine_glColor3d( GLdouble red, GLdouble green, GLdouble blue ) {
   TRACE("(%f, %f, %f)\n", red, green, blue );
@@ -252,7 +252,7 @@
 }
 
 /***********************************************************************
- *              glColor3dv
+ *              glColor3dv (OPENGL32.@)
  */
 void WINAPI wine_glColor3dv( GLdouble* v ) {
   TRACE("(%p)\n", v );
@@ -262,7 +262,7 @@
 }
 
 /***********************************************************************
- *              glColor3f
+ *              glColor3f (OPENGL32.@)
  */
 void WINAPI wine_glColor3f( GLfloat red, GLfloat green, GLfloat blue ) {
   TRACE("(%f, %f, %f)\n", red, green, blue );
@@ -272,7 +272,7 @@
 }
 
 /***********************************************************************
- *              glColor3fv
+ *              glColor3fv (OPENGL32.@)
  */
 void WINAPI wine_glColor3fv( GLfloat* v ) {
   TRACE("(%p)\n", v );
@@ -282,7 +282,7 @@
 }
 
 /***********************************************************************
- *              glColor3i
+ *              glColor3i (OPENGL32.@)
  */
 void WINAPI wine_glColor3i( GLint red, GLint green, GLint blue ) {
   TRACE("(%d, %d, %d)\n", red, green, blue );
@@ -292,7 +292,7 @@
 }
 
 /***********************************************************************
- *              glColor3iv
+ *              glColor3iv (OPENGL32.@)
  */
 void WINAPI wine_glColor3iv( GLint* v ) {
   TRACE("(%p)\n", v );
@@ -302,7 +302,7 @@
 }
 
 /***********************************************************************
- *              glColor3s
+ *              glColor3s (OPENGL32.@)
  */
 void WINAPI wine_glColor3s( GLshort red, GLshort green, GLshort blue ) {
   TRACE("(%d, %d, %d)\n", red, green, blue );
@@ -312,7 +312,7 @@
 }
 
 /***********************************************************************
- *              glColor3sv
+ *              glColor3sv (OPENGL32.@)
  */
 void WINAPI wine_glColor3sv( GLshort* v ) {
   TRACE("(%p)\n", v );
@@ -322,7 +322,7 @@
 }
 
 /***********************************************************************
- *              glColor3ub
+ *              glColor3ub (OPENGL32.@)
  */
 void WINAPI wine_glColor3ub( GLubyte red, GLubyte green, GLubyte blue ) {
   TRACE("(%d, %d, %d)\n", red, green, blue );
@@ -332,7 +332,7 @@
 }
 
 /***********************************************************************
- *              glColor3ubv
+ *              glColor3ubv (OPENGL32.@)
  */
 void WINAPI wine_glColor3ubv( GLubyte* v ) {
   TRACE("(%p)\n", v );
@@ -342,7 +342,7 @@
 }
 
 /***********************************************************************
- *              glColor3ui
+ *              glColor3ui (OPENGL32.@)
  */
 void WINAPI wine_glColor3ui( GLuint red, GLuint green, GLuint blue ) {
   TRACE("(%d, %d, %d)\n", red, green, blue );
@@ -352,7 +352,7 @@
 }
 
 /***********************************************************************
- *              glColor3uiv
+ *              glColor3uiv (OPENGL32.@)
  */
 void WINAPI wine_glColor3uiv( GLuint* v ) {
   TRACE("(%p)\n", v );
@@ -362,7 +362,7 @@
 }
 
 /***********************************************************************
- *              glColor3us
+ *              glColor3us (OPENGL32.@)
  */
 void WINAPI wine_glColor3us( GLushort red, GLushort green, GLushort blue ) {
   TRACE("(%d, %d, %d)\n", red, green, blue );
@@ -372,7 +372,7 @@
 }
 
 /***********************************************************************
- *              glColor3usv
+ *              glColor3usv (OPENGL32.@)
  */
 void WINAPI wine_glColor3usv( GLushort* v ) {
   TRACE("(%p)\n", v );
@@ -382,7 +382,7 @@
 }
 
 /***********************************************************************
- *              glColor4b
+ *              glColor4b (OPENGL32.@)
  */
 void WINAPI wine_glColor4b( GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha ) {
   TRACE("(%d, %d, %d, %d)\n", red, green, blue, alpha );
@@ -392,7 +392,7 @@
 }
 
 /***********************************************************************
- *              glColor4bv
+ *              glColor4bv (OPENGL32.@)
  */
 void WINAPI wine_glColor4bv( GLbyte* v ) {
   TRACE("(%p)\n", v );
@@ -402,7 +402,7 @@
 }
 
 /***********************************************************************
- *              glColor4d
+ *              glColor4d (OPENGL32.@)
  */
 void WINAPI wine_glColor4d( GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha ) {
   TRACE("(%f, %f, %f, %f)\n", red, green, blue, alpha );
@@ -412,7 +412,7 @@
 }
 
 /***********************************************************************
- *              glColor4dv
+ *              glColor4dv (OPENGL32.@)
  */
 void WINAPI wine_glColor4dv( GLdouble* v ) {
   TRACE("(%p)\n", v );
@@ -422,7 +422,7 @@
 }
 
 /***********************************************************************
- *              glColor4f
+ *              glColor4f (OPENGL32.@)
  */
 void WINAPI wine_glColor4f( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha ) {
   TRACE("(%f, %f, %f, %f)\n", red, green, blue, alpha );
@@ -432,7 +432,7 @@
 }
 
 /***********************************************************************
- *              glColor4fv
+ *              glColor4fv (OPENGL32.@)
  */
 void WINAPI wine_glColor4fv( GLfloat* v ) {
   TRACE("(%p)\n", v );
@@ -442,7 +442,7 @@
 }
 
 /***********************************************************************
- *              glColor4i
+ *              glColor4i (OPENGL32.@)
  */
 void WINAPI wine_glColor4i( GLint red, GLint green, GLint blue, GLint alpha ) {
   TRACE("(%d, %d, %d, %d)\n", red, green, blue, alpha );
@@ -452,7 +452,7 @@
 }
 
 /***********************************************************************
- *              glColor4iv
+ *              glColor4iv (OPENGL32.@)
  */
 void WINAPI wine_glColor4iv( GLint* v ) {
   TRACE("(%p)\n", v );
@@ -462,7 +462,7 @@
 }
 
 /***********************************************************************
- *              glColor4s
+ *              glColor4s (OPENGL32.@)
  */
 void WINAPI wine_glColor4s( GLshort red, GLshort green, GLshort blue, GLshort alpha ) {
   TRACE("(%d, %d, %d, %d)\n", red, green, blue, alpha );
@@ -472,7 +472,7 @@
 }
 
 /***********************************************************************
- *              glColor4sv
+ *              glColor4sv (OPENGL32.@)
  */
 void WINAPI wine_glColor4sv( GLshort* v ) {
   TRACE("(%p)\n", v );
@@ -482,7 +482,7 @@
 }
 
 /***********************************************************************
- *              glColor4ub
+ *              glColor4ub (OPENGL32.@)
  */
 void WINAPI wine_glColor4ub( GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha ) {
   TRACE("(%d, %d, %d, %d)\n", red, green, blue, alpha );
@@ -492,7 +492,7 @@
 }
 
 /***********************************************************************
- *              glColor4ubv
+ *              glColor4ubv (OPENGL32.@)
  */
 void WINAPI wine_glColor4ubv( GLubyte* v ) {
   TRACE("(%p)\n", v );
@@ -502,7 +502,7 @@
 }
 
 /***********************************************************************
- *              glColor4ui
+ *              glColor4ui (OPENGL32.@)
  */
 void WINAPI wine_glColor4ui( GLuint red, GLuint green, GLuint blue, GLuint alpha ) {
   TRACE("(%d, %d, %d, %d)\n", red, green, blue, alpha );
@@ -512,7 +512,7 @@
 }
 
 /***********************************************************************
- *              glColor4uiv
+ *              glColor4uiv (OPENGL32.@)
  */
 void WINAPI wine_glColor4uiv( GLuint* v ) {
   TRACE("(%p)\n", v );
@@ -522,7 +522,7 @@
 }
 
 /***********************************************************************
- *              glColor4us
+ *              glColor4us (OPENGL32.@)
  */
 void WINAPI wine_glColor4us( GLushort red, GLushort green, GLushort blue, GLushort alpha ) {
   TRACE("(%d, %d, %d, %d)\n", red, green, blue, alpha );
@@ -532,7 +532,7 @@
 }
 
 /***********************************************************************
- *              glColor4usv
+ *              glColor4usv (OPENGL32.@)
  */
 void WINAPI wine_glColor4usv( GLushort* v ) {
   TRACE("(%p)\n", v );
@@ -542,7 +542,7 @@
 }
 
 /***********************************************************************
- *              glColorMask
+ *              glColorMask (OPENGL32.@)
  */
 void WINAPI wine_glColorMask( GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha ) {
   TRACE("(%d, %d, %d, %d)\n", red, green, blue, alpha );
@@ -552,7 +552,7 @@
 }
 
 /***********************************************************************
- *              glColorMaterial
+ *              glColorMaterial (OPENGL32.@)
  */
 void WINAPI wine_glColorMaterial( GLenum face, GLenum mode ) {
   TRACE("(%d, %d)\n", face, mode );
@@ -562,7 +562,7 @@
 }
 
 /***********************************************************************
- *              glColorPointer
+ *              glColorPointer (OPENGL32.@)
  */
 void WINAPI wine_glColorPointer( GLint size, GLenum type, GLsizei stride, GLvoid* pointer ) {
   TRACE("(%d, %d, %d, %p)\n", size, type, stride, pointer );
@@ -572,7 +572,7 @@
 }
 
 /***********************************************************************
- *              glColorSubTable
+ *              glColorSubTable (OPENGL32.@)
  */
 void WINAPI wine_glColorSubTable( GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, GLvoid* data ) {
   TRACE("(%d, %d, %d, %d, %d, %p)\n", target, start, count, format, type, data );
@@ -582,7 +582,7 @@
 }
 
 /***********************************************************************
- *              glColorTable
+ *              glColorTable (OPENGL32.@)
  */
 void WINAPI wine_glColorTable( GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, GLvoid* table ) {
   TRACE("(%d, %d, %d, %d, %d, %p)\n", target, internalformat, width, format, type, table );
@@ -592,7 +592,7 @@
 }
 
 /***********************************************************************
- *              glColorTableParameterfv
+ *              glColorTableParameterfv (OPENGL32.@)
  */
 void WINAPI wine_glColorTableParameterfv( GLenum target, GLenum pname, GLfloat* params ) {
   TRACE("(%d, %d, %p)\n", target, pname, params );
@@ -602,7 +602,7 @@
 }
 
 /***********************************************************************
- *              glColorTableParameteriv
+ *              glColorTableParameteriv (OPENGL32.@)
  */
 void WINAPI wine_glColorTableParameteriv( GLenum target, GLenum pname, GLint* params ) {
   TRACE("(%d, %d, %p)\n", target, pname, params );
@@ -612,7 +612,7 @@
 }
 
 /***********************************************************************
- *              glConvolutionFilter1D
+ *              glConvolutionFilter1D (OPENGL32.@)
  */
 void WINAPI wine_glConvolutionFilter1D( GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, GLvoid* image ) {
   TRACE("(%d, %d, %d, %d, %d, %p)\n", target, internalformat, width, format, type, image );
@@ -622,7 +622,7 @@
 }
 
 /***********************************************************************
- *              glConvolutionFilter2D
+ *              glConvolutionFilter2D (OPENGL32.@)
  */
 void WINAPI wine_glConvolutionFilter2D( GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid* image ) {
   TRACE("(%d, %d, %d, %d, %d, %d, %p)\n", target, internalformat, width, height, format, type, image );
@@ -632,7 +632,7 @@
 }
 
 /***********************************************************************
- *              glConvolutionParameterf
+ *              glConvolutionParameterf (OPENGL32.@)
  */
 void WINAPI wine_glConvolutionParameterf( GLenum target, GLenum pname, GLfloat params ) {
   TRACE("(%d, %d, %f)\n", target, pname, params );
@@ -642,7 +642,7 @@
 }
 
 /***********************************************************************
- *              glConvolutionParameterfv
+ *              glConvolutionParameterfv (OPENGL32.@)
  */
 void WINAPI wine_glConvolutionParameterfv( GLenum target, GLenum pname, GLfloat* params ) {
   TRACE("(%d, %d, %p)\n", target, pname, params );
@@ -652,7 +652,7 @@
 }
 
 /***********************************************************************
- *              glConvolutionParameteri
+ *              glConvolutionParameteri (OPENGL32.@)
  */
 void WINAPI wine_glConvolutionParameteri( GLenum target, GLenum pname, GLint params ) {
   TRACE("(%d, %d, %d)\n", target, pname, params );
@@ -662,7 +662,7 @@
 }
 
 /***********************************************************************
- *              glConvolutionParameteriv
+ *              glConvolutionParameteriv (OPENGL32.@)
  */
 void WINAPI wine_glConvolutionParameteriv( GLenum target, GLenum pname, GLint* params ) {
   TRACE("(%d, %d, %p)\n", target, pname, params );
@@ -672,7 +672,7 @@
 }
 
 /***********************************************************************
- *              glCopyColorSubTable
+ *              glCopyColorSubTable (OPENGL32.@)
  */
 void WINAPI wine_glCopyColorSubTable( GLenum target, GLsizei start, GLint x, GLint y, GLsizei width ) {
   TRACE("(%d, %d, %d, %d, %d)\n", target, start, x, y, width );
@@ -682,7 +682,7 @@
 }
 
 /***********************************************************************
- *              glCopyColorTable
+ *              glCopyColorTable (OPENGL32.@)
  */
 void WINAPI wine_glCopyColorTable( GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width ) {
   TRACE("(%d, %d, %d, %d, %d)\n", target, internalformat, x, y, width );
@@ -692,7 +692,7 @@
 }
 
 /***********************************************************************
- *              glCopyConvolutionFilter1D
+ *              glCopyConvolutionFilter1D (OPENGL32.@)
  */
 void WINAPI wine_glCopyConvolutionFilter1D( GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width ) {
   TRACE("(%d, %d, %d, %d, %d)\n", target, internalformat, x, y, width );
@@ -702,7 +702,7 @@
 }
 
 /***********************************************************************
- *              glCopyConvolutionFilter2D
+ *              glCopyConvolutionFilter2D (OPENGL32.@)
  */
 void WINAPI wine_glCopyConvolutionFilter2D( GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height ) {
   TRACE("(%d, %d, %d, %d, %d, %d)\n", target, internalformat, x, y, width, height );
@@ -712,7 +712,7 @@
 }
 
 /***********************************************************************
- *              glCopyPixels
+ *              glCopyPixels (OPENGL32.@)
  */
 void WINAPI wine_glCopyPixels( GLint x, GLint y, GLsizei width, GLsizei height, GLenum type ) {
   TRACE("(%d, %d, %d, %d, %d)\n", x, y, width, height, type );
@@ -722,7 +722,7 @@
 }
 
 /***********************************************************************
- *              glCopyTexImage1D
+ *              glCopyTexImage1D (OPENGL32.@)
  */
 void WINAPI wine_glCopyTexImage1D( GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border ) {
   TRACE("(%d, %d, %d, %d, %d, %d, %d)\n", target, level, internalformat, x, y, width, border );
@@ -732,7 +732,7 @@
 }
 
 /***********************************************************************
- *              glCopyTexImage2D
+ *              glCopyTexImage2D (OPENGL32.@)
  */
 void WINAPI wine_glCopyTexImage2D( GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border ) {
   TRACE("(%d, %d, %d, %d, %d, %d, %d, %d)\n", target, level, internalformat, x, y, width, height, border );
@@ -742,7 +742,7 @@
 }
 
 /***********************************************************************
- *              glCopyTexSubImage1D
+ *              glCopyTexSubImage1D (OPENGL32.@)
  */
 void WINAPI wine_glCopyTexSubImage1D( GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width ) {
   TRACE("(%d, %d, %d, %d, %d, %d)\n", target, level, xoffset, x, y, width );
@@ -752,7 +752,7 @@
 }
 
 /***********************************************************************
- *              glCopyTexSubImage2D
+ *              glCopyTexSubImage2D (OPENGL32.@)
  */
 void WINAPI wine_glCopyTexSubImage2D( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height ) {
   TRACE("(%d, %d, %d, %d, %d, %d, %d, %d)\n", target, level, xoffset, yoffset, x, y, width, height );
@@ -762,7 +762,7 @@
 }
 
 /***********************************************************************
- *              glCopyTexSubImage3D
+ *              glCopyTexSubImage3D (OPENGL32.@)
  */
 void WINAPI wine_glCopyTexSubImage3D( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height ) {
   TRACE("(%d, %d, %d, %d, %d, %d, %d, %d, %d)\n", target, level, xoffset, yoffset, zoffset, x, y, width, height );
@@ -772,7 +772,7 @@
 }
 
 /***********************************************************************
- *              glCullFace
+ *              glCullFace (OPENGL32.@)
  */
 void WINAPI wine_glCullFace( GLenum mode ) {
   TRACE("(%d)\n", mode );
@@ -782,7 +782,7 @@
 }
 
 /***********************************************************************
- *              glDeleteLists
+ *              glDeleteLists (OPENGL32.@)
  */
 void WINAPI wine_glDeleteLists( GLuint list, GLsizei range ) {
   TRACE("(%d, %d)\n", list, range );
@@ -792,7 +792,7 @@
 }
 
 /***********************************************************************
- *              glDeleteTextures
+ *              glDeleteTextures (OPENGL32.@)
  */
 void WINAPI wine_glDeleteTextures( GLsizei n, GLuint* textures ) {
   TRACE("(%d, %p)\n", n, textures );
@@ -802,7 +802,7 @@
 }
 
 /***********************************************************************
- *              glDepthFunc
+ *              glDepthFunc (OPENGL32.@)
  */
 void WINAPI wine_glDepthFunc( GLenum func ) {
   TRACE("(%d)\n", func );
@@ -812,7 +812,7 @@
 }
 
 /***********************************************************************
- *              glDepthMask
+ *              glDepthMask (OPENGL32.@)
  */
 void WINAPI wine_glDepthMask( GLboolean flag ) {
   TRACE("(%d)\n", flag );
@@ -822,7 +822,7 @@
 }
 
 /***********************************************************************
- *              glDepthRange
+ *              glDepthRange (OPENGL32.@)
  */
 void WINAPI wine_glDepthRange( GLclampd near, GLclampd far ) {
   TRACE("(%f, %f)\n", near, far );
@@ -832,7 +832,7 @@
 }
 
 /***********************************************************************
- *              glDisable
+ *              glDisable (OPENGL32.@)
  */
 void WINAPI wine_glDisable( GLenum cap ) {
   TRACE("(%d)\n", cap );
@@ -842,7 +842,7 @@
 }
 
 /***********************************************************************
- *              glDisableClientState
+ *              glDisableClientState (OPENGL32.@)
  */
 void WINAPI wine_glDisableClientState( GLenum array ) {
   TRACE("(%d)\n", array );
@@ -852,7 +852,7 @@
 }
 
 /***********************************************************************
- *              glDrawArrays
+ *              glDrawArrays (OPENGL32.@)
  */
 void WINAPI wine_glDrawArrays( GLenum mode, GLint first, GLsizei count ) {
   TRACE("(%d, %d, %d)\n", mode, first, count );
@@ -862,7 +862,7 @@
 }
 
 /***********************************************************************
- *              glDrawBuffer
+ *              glDrawBuffer (OPENGL32.@)
  */
 void WINAPI wine_glDrawBuffer( GLenum mode ) {
   TRACE("(%d)\n", mode );
@@ -872,7 +872,7 @@
 }
 
 /***********************************************************************
- *              glDrawElements
+ *              glDrawElements (OPENGL32.@)
  */
 void WINAPI wine_glDrawElements( GLenum mode, GLsizei count, GLenum type, GLvoid* indices ) {
   TRACE("(%d, %d, %d, %p)\n", mode, count, type, indices );
@@ -882,7 +882,7 @@
 }
 
 /***********************************************************************
- *              glDrawPixels
+ *              glDrawPixels (OPENGL32.@)
  */
 void WINAPI wine_glDrawPixels( GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid* pixels ) {
   TRACE("(%d, %d, %d, %d, %p)\n", width, height, format, type, pixels );
@@ -892,7 +892,7 @@
 }
 
 /***********************************************************************
- *              glDrawRangeElements
+ *              glDrawRangeElements (OPENGL32.@)
  */
 void WINAPI wine_glDrawRangeElements( GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, GLvoid* indices ) {
   TRACE("(%d, %d, %d, %d, %d, %p)\n", mode, start, end, count, type, indices );
@@ -902,7 +902,7 @@
 }
 
 /***********************************************************************
- *              glEdgeFlag
+ *              glEdgeFlag (OPENGL32.@)
  */
 void WINAPI wine_glEdgeFlag( GLboolean flag ) {
   TRACE("(%d)\n", flag );
@@ -912,7 +912,7 @@
 }
 
 /***********************************************************************
- *              glEdgeFlagPointer
+ *              glEdgeFlagPointer (OPENGL32.@)
  */
 void WINAPI wine_glEdgeFlagPointer( GLsizei stride, GLvoid* pointer ) {
   TRACE("(%d, %p)\n", stride, pointer );
@@ -922,7 +922,7 @@
 }
 
 /***********************************************************************
- *              glEdgeFlagv
+ *              glEdgeFlagv (OPENGL32.@)
  */
 void WINAPI wine_glEdgeFlagv( GLboolean* flag ) {
   TRACE("(%p)\n", flag );
@@ -932,7 +932,7 @@
 }
 
 /***********************************************************************
- *              glEnable
+ *              glEnable (OPENGL32.@)
  */
 void WINAPI wine_glEnable( GLenum cap ) {
   TRACE("(%d)\n", cap );
@@ -942,7 +942,7 @@
 }
 
 /***********************************************************************
- *              glEnableClientState
+ *              glEnableClientState (OPENGL32.@)
  */
 void WINAPI wine_glEnableClientState( GLenum array ) {
   TRACE("(%d)\n", array );
@@ -952,7 +952,7 @@
 }
 
 /***********************************************************************
- *              glEnd
+ *              glEnd (OPENGL32.@)
  */
 void WINAPI wine_glEnd( ) {
   TRACE("()\n");
@@ -962,7 +962,7 @@
 }
 
 /***********************************************************************
- *              glEndList
+ *              glEndList (OPENGL32.@)
  */
 void WINAPI wine_glEndList( ) {
   TRACE("()\n");
@@ -972,7 +972,7 @@
 }
 
 /***********************************************************************
- *              glEvalCoord1d
+ *              glEvalCoord1d (OPENGL32.@)
  */
 void WINAPI wine_glEvalCoord1d( GLdouble u ) {
   TRACE("(%f)\n", u );
@@ -982,7 +982,7 @@
 }
 
 /***********************************************************************
- *              glEvalCoord1dv
+ *              glEvalCoord1dv (OPENGL32.@)
  */
 void WINAPI wine_glEvalCoord1dv( GLdouble* u ) {
   TRACE("(%p)\n", u );
@@ -992,7 +992,7 @@
 }
 
 /***********************************************************************
- *              glEvalCoord1f
+ *              glEvalCoord1f (OPENGL32.@)
  */
 void WINAPI wine_glEvalCoord1f( GLfloat u ) {
   TRACE("(%f)\n", u );
@@ -1002,7 +1002,7 @@
 }
 
 /***********************************************************************
- *              glEvalCoord1fv
+ *              glEvalCoord1fv (OPENGL32.@)
  */
 void WINAPI wine_glEvalCoord1fv( GLfloat* u ) {
   TRACE("(%p)\n", u );
@@ -1012,7 +1012,7 @@
 }
 
 /***********************************************************************
- *              glEvalCoord2d
+ *              glEvalCoord2d (OPENGL32.@)
  */
 void WINAPI wine_glEvalCoord2d( GLdouble u, GLdouble v ) {
   TRACE("(%f, %f)\n", u, v );
@@ -1022,7 +1022,7 @@
 }
 
 /***********************************************************************
- *              glEvalCoord2dv
+ *              glEvalCoord2dv (OPENGL32.@)
  */
 void WINAPI wine_glEvalCoord2dv( GLdouble* u ) {
   TRACE("(%p)\n", u );
@@ -1032,7 +1032,7 @@
 }
 
 /***********************************************************************
- *              glEvalCoord2f
+ *              glEvalCoord2f (OPENGL32.@)
  */
 void WINAPI wine_glEvalCoord2f( GLfloat u, GLfloat v ) {
   TRACE("(%f, %f)\n", u, v );
@@ -1042,7 +1042,7 @@
 }
 
 /***********************************************************************
- *              glEvalCoord2fv
+ *              glEvalCoord2fv (OPENGL32.@)
  */
 void WINAPI wine_glEvalCoord2fv( GLfloat* u ) {
   TRACE("(%p)\n", u );
@@ -1052,7 +1052,7 @@
 }
 
 /***********************************************************************
- *              glEvalMesh1
+ *              glEvalMesh1 (OPENGL32.@)
  */
 void WINAPI wine_glEvalMesh1( GLenum mode, GLint i1, GLint i2 ) {
   TRACE("(%d, %d, %d)\n", mode, i1, i2 );
@@ -1062,7 +1062,7 @@
 }
 
 /***********************************************************************
- *              glEvalMesh2
+ *              glEvalMesh2 (OPENGL32.@)
  */
 void WINAPI wine_glEvalMesh2( GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2 ) {
   TRACE("(%d, %d, %d, %d, %d)\n", mode, i1, i2, j1, j2 );
@@ -1072,7 +1072,7 @@
 }
 
 /***********************************************************************
- *              glEvalPoint1
+ *              glEvalPoint1 (OPENGL32.@)
  */
 void WINAPI wine_glEvalPoint1( GLint i ) {
   TRACE("(%d)\n", i );
@@ -1082,7 +1082,7 @@
 }
 
 /***********************************************************************
- *              glEvalPoint2
+ *              glEvalPoint2 (OPENGL32.@)
  */
 void WINAPI wine_glEvalPoint2( GLint i, GLint j ) {
   TRACE("(%d, %d)\n", i, j );
@@ -1092,7 +1092,7 @@
 }
 
 /***********************************************************************
- *              glFeedbackBuffer
+ *              glFeedbackBuffer (OPENGL32.@)
  */
 void WINAPI wine_glFeedbackBuffer( GLsizei size, GLenum type, GLfloat* buffer ) {
   TRACE("(%d, %d, %p)\n", size, type, buffer );
@@ -1102,7 +1102,7 @@
 }
 
 /***********************************************************************
- *              glFinish
+ *              glFinish (OPENGL32.@)
  */
 void WINAPI wine_glFinish( ) {
   TRACE("()\n");
@@ -1112,7 +1112,7 @@
 }
 
 /***********************************************************************
- *              glFlush
+ *              glFlush (OPENGL32.@)
  */
 void WINAPI wine_glFlush( ) {
   TRACE("()\n");
@@ -1122,7 +1122,7 @@
 }
 
 /***********************************************************************
- *              glFogf
+ *              glFogf (OPENGL32.@)
  */
 void WINAPI wine_glFogf( GLenum pname, GLfloat param ) {
   TRACE("(%d, %f)\n", pname, param );
@@ -1132,7 +1132,7 @@
 }
 
 /***********************************************************************
- *              glFogfv
+ *              glFogfv (OPENGL32.@)
  */
 void WINAPI wine_glFogfv( GLenum pname, GLfloat* params ) {
   TRACE("(%d, %p)\n", pname, params );
@@ -1142,7 +1142,7 @@
 }
 
 /***********************************************************************
- *              glFogi
+ *              glFogi (OPENGL32.@)
  */
 void WINAPI wine_glFogi( GLenum pname, GLint param ) {
   TRACE("(%d, %d)\n", pname, param );
@@ -1152,7 +1152,7 @@
 }
 
 /***********************************************************************
- *              glFogiv
+ *              glFogiv (OPENGL32.@)
  */
 void WINAPI wine_glFogiv( GLenum pname, GLint* params ) {
   TRACE("(%d, %p)\n", pname, params );
@@ -1162,7 +1162,7 @@
 }
 
 /***********************************************************************
- *              glFrontFace
+ *              glFrontFace (OPENGL32.@)
  */
 void WINAPI wine_glFrontFace( GLenum mode ) {
   TRACE("(%d)\n", mode );
@@ -1172,7 +1172,7 @@
 }
 
 /***********************************************************************
- *              glFrustum
+ *              glFrustum (OPENGL32.@)
  */
 void WINAPI wine_glFrustum( GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar ) {
   TRACE("(%f, %f, %f, %f, %f, %f)\n", left, right, bottom, top, zNear, zFar );
@@ -1182,7 +1182,7 @@
 }
 
 /***********************************************************************
- *              glGenLists
+ *              glGenLists (OPENGL32.@)
  */
 GLuint WINAPI wine_glGenLists( GLsizei range ) {
   GLuint ret_value;
@@ -1194,7 +1194,7 @@
 }
 
 /***********************************************************************
- *              glGenTextures
+ *              glGenTextures (OPENGL32.@)
  */
 void WINAPI wine_glGenTextures( GLsizei n, GLuint* textures ) {
   TRACE("(%d, %p)\n", n, textures );
@@ -1204,7 +1204,7 @@
 }
 
 /***********************************************************************
- *              glGetBooleanv
+ *              glGetBooleanv (OPENGL32.@)
  */
 void WINAPI wine_glGetBooleanv( GLenum pname, GLboolean* params ) {
   TRACE("(%d, %p)\n", pname, params );
@@ -1214,7 +1214,7 @@
 }
 
 /***********************************************************************
- *              glGetClipPlane
+ *              glGetClipPlane (OPENGL32.@)
  */
 void WINAPI wine_glGetClipPlane( GLenum plane, GLdouble* equation ) {
   TRACE("(%d, %p)\n", plane, equation );
@@ -1224,7 +1224,7 @@
 }
 
 /***********************************************************************
- *              glGetColorTable
+ *              glGetColorTable (OPENGL32.@)
  */
 void WINAPI wine_glGetColorTable( GLenum target, GLenum format, GLenum type, GLvoid* table ) {
   TRACE("(%d, %d, %d, %p)\n", target, format, type, table );
@@ -1234,7 +1234,7 @@
 }
 
 /***********************************************************************
- *              glGetColorTableParameterfv
+ *              glGetColorTableParameterfv (OPENGL32.@)
  */
 void WINAPI wine_glGetColorTableParameterfv( GLenum target, GLenum pname, GLfloat* params ) {
   TRACE("(%d, %d, %p)\n", target, pname, params );
@@ -1244,7 +1244,7 @@
 }
 
 /***********************************************************************
- *              glGetColorTableParameteriv
+ *              glGetColorTableParameteriv (OPENGL32.@)
  */
 void WINAPI wine_glGetColorTableParameteriv( GLenum target, GLenum pname, GLint* params ) {
   TRACE("(%d, %d, %p)\n", target, pname, params );
@@ -1254,7 +1254,7 @@
 }
 
 /***********************************************************************
- *              glGetConvolutionFilter
+ *              glGetConvolutionFilter (OPENGL32.@)
  */
 void WINAPI wine_glGetConvolutionFilter( GLenum target, GLenum format, GLenum type, GLvoid* image ) {
   TRACE("(%d, %d, %d, %p)\n", target, format, type, image );
@@ -1264,7 +1264,7 @@
 }
 
 /***********************************************************************
- *              glGetConvolutionParameterfv
+ *              glGetConvolutionParameterfv (OPENGL32.@)
  */
 void WINAPI wine_glGetConvolutionParameterfv( GLenum target, GLenum pname, GLfloat* params ) {
   TRACE("(%d, %d, %p)\n", target, pname, params );
@@ -1274,7 +1274,7 @@
 }
 
 /***********************************************************************
- *              glGetConvolutionParameteriv
+ *              glGetConvolutionParameteriv (OPENGL32.@)
  */
 void WINAPI wine_glGetConvolutionParameteriv( GLenum target, GLenum pname, GLint* params ) {
   TRACE("(%d, %d, %p)\n", target, pname, params );
@@ -1284,7 +1284,7 @@
 }
 
 /***********************************************************************
- *              glGetDoublev
+ *              glGetDoublev (OPENGL32.@)
  */
 void WINAPI wine_glGetDoublev( GLenum pname, GLdouble* params ) {
   TRACE("(%d, %p)\n", pname, params );
@@ -1294,7 +1294,7 @@
 }
 
 /***********************************************************************
- *              glGetError
+ *              glGetError (OPENGL32.@)
  */
 GLenum WINAPI wine_glGetError( ) {
   GLenum ret_value;
@@ -1306,7 +1306,7 @@
 }
 
 /***********************************************************************
- *              glGetFloatv
+ *              glGetFloatv (OPENGL32.@)
  */
 void WINAPI wine_glGetFloatv( GLenum pname, GLfloat* params ) {
   TRACE("(%d, %p)\n", pname, params );
@@ -1316,7 +1316,7 @@
 }
 
 /***********************************************************************
- *              glGetHistogram
+ *              glGetHistogram (OPENGL32.@)
  */
 void WINAPI wine_glGetHistogram( GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid* values ) {
   TRACE("(%d, %d, %d, %d, %p)\n", target, reset, format, type, values );
@@ -1326,7 +1326,7 @@
 }
 
 /***********************************************************************
- *              glGetHistogramParameterfv
+ *              glGetHistogramParameterfv (OPENGL32.@)
  */
 void WINAPI wine_glGetHistogramParameterfv( GLenum target, GLenum pname, GLfloat* params ) {
   TRACE("(%d, %d, %p)\n", target, pname, params );
@@ -1336,7 +1336,7 @@
 }
 
 /***********************************************************************
- *              glGetHistogramParameteriv
+ *              glGetHistogramParameteriv (OPENGL32.@)
  */
 void WINAPI wine_glGetHistogramParameteriv( GLenum target, GLenum pname, GLint* params ) {
   TRACE("(%d, %d, %p)\n", target, pname, params );
@@ -1346,7 +1346,7 @@
 }
 
 /***********************************************************************
- *              glGetIntegerv
+ *              glGetIntegerv (OPENGL32.@)
  */
 void WINAPI wine_glGetIntegerv( GLenum pname, GLint* params ) {
   TRACE("(%d, %p)\n", pname, params );
@@ -1356,7 +1356,7 @@
 }
 
 /***********************************************************************
- *              glGetLightfv
+ *              glGetLightfv (OPENGL32.@)
  */
 void WINAPI wine_glGetLightfv( GLenum light, GLenum pname, GLfloat* params ) {
   TRACE("(%d, %d, %p)\n", light, pname, params );
@@ -1366,7 +1366,7 @@
 }
 
 /***********************************************************************
- *              glGetLightiv
+ *              glGetLightiv (OPENGL32.@)
  */
 void WINAPI wine_glGetLightiv( GLenum light, GLenum pname, GLint* params ) {
   TRACE("(%d, %d, %p)\n", light, pname, params );
@@ -1376,7 +1376,7 @@
 }
 
 /***********************************************************************
- *              glGetMapdv
+ *              glGetMapdv (OPENGL32.@)
  */
 void WINAPI wine_glGetMapdv( GLenum target, GLenum query, GLdouble* v ) {
   TRACE("(%d, %d, %p)\n", target, query, v );
@@ -1386,7 +1386,7 @@
 }
 
 /***********************************************************************
- *              glGetMapfv
+ *              glGetMapfv (OPENGL32.@)
  */
 void WINAPI wine_glGetMapfv( GLenum target, GLenum query, GLfloat* v ) {
   TRACE("(%d, %d, %p)\n", target, query, v );
@@ -1396,7 +1396,7 @@
 }
 
 /***********************************************************************
- *              glGetMapiv
+ *              glGetMapiv (OPENGL32.@)
  */
 void WINAPI wine_glGetMapiv( GLenum target, GLenum query, GLint* v ) {
   TRACE("(%d, %d, %p)\n", target, query, v );
@@ -1406,7 +1406,7 @@
 }
 
 /***********************************************************************
- *              glGetMaterialfv
+ *              glGetMaterialfv (OPENGL32.@)
  */
 void WINAPI wine_glGetMaterialfv( GLenum face, GLenum pname, GLfloat* params ) {
   TRACE("(%d, %d, %p)\n", face, pname, params );
@@ -1416,7 +1416,7 @@
 }
 
 /***********************************************************************
- *              glGetMaterialiv
+ *              glGetMaterialiv (OPENGL32.@)
  */
 void WINAPI wine_glGetMaterialiv( GLenum face, GLenum pname, GLint* params ) {
   TRACE("(%d, %d, %p)\n", face, pname, params );
@@ -1426,7 +1426,7 @@
 }
 
 /***********************************************************************
- *              glGetMinmax
+ *              glGetMinmax (OPENGL32.@)
  */
 void WINAPI wine_glGetMinmax( GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid* values ) {
   TRACE("(%d, %d, %d, %d, %p)\n", target, reset, format, type, values );
@@ -1436,7 +1436,7 @@
 }
 
 /***********************************************************************
- *              glGetMinmaxParameterfv
+ *              glGetMinmaxParameterfv (OPENGL32.@)
  */
 void WINAPI wine_glGetMinmaxParameterfv( GLenum target, GLenum pname, GLfloat* params ) {
   TRACE("(%d, %d, %p)\n", target, pname, params );
@@ -1446,7 +1446,7 @@
 }
 
 /***********************************************************************
- *              glGetMinmaxParameteriv
+ *              glGetMinmaxParameteriv (OPENGL32.@)
  */
 void WINAPI wine_glGetMinmaxParameteriv( GLenum target, GLenum pname, GLint* params ) {
   TRACE("(%d, %d, %p)\n", target, pname, params );
@@ -1456,7 +1456,7 @@
 }
 
 /***********************************************************************
- *              glGetPixelMapfv
+ *              glGetPixelMapfv (OPENGL32.@)
  */
 void WINAPI wine_glGetPixelMapfv( GLenum map, GLfloat* values ) {
   TRACE("(%d, %p)\n", map, values );
@@ -1466,7 +1466,7 @@
 }
 
 /***********************************************************************
- *              glGetPixelMapuiv
+ *              glGetPixelMapuiv (OPENGL32.@)
  */
 void WINAPI wine_glGetPixelMapuiv( GLenum map, GLuint* values ) {
   TRACE("(%d, %p)\n", map, values );
@@ -1476,7 +1476,7 @@
 }
 
 /***********************************************************************
- *              glGetPixelMapusv
+ *              glGetPixelMapusv (OPENGL32.@)
  */
 void WINAPI wine_glGetPixelMapusv( GLenum map, GLushort* values ) {
   TRACE("(%d, %p)\n", map, values );
@@ -1486,7 +1486,7 @@
 }
 
 /***********************************************************************
- *              glGetPointerv
+ *              glGetPointerv (OPENGL32.@)
  */
 void WINAPI wine_glGetPointerv( GLenum pname, GLvoid** params ) {
   TRACE("(%d, %p)\n", pname, params );
@@ -1496,7 +1496,7 @@
 }
 
 /***********************************************************************
- *              glGetPolygonStipple
+ *              glGetPolygonStipple (OPENGL32.@)
  */
 void WINAPI wine_glGetPolygonStipple( GLubyte* mask ) {
   TRACE("(%p)\n", mask );
@@ -1506,7 +1506,7 @@
 }
 
 /***********************************************************************
- *              glGetSeparableFilter
+ *              glGetSeparableFilter (OPENGL32.@)
  */
 void WINAPI wine_glGetSeparableFilter( GLenum target, GLenum format, GLenum type, GLvoid* row, GLvoid* column, GLvoid* span ) {
   TRACE("(%d, %d, %d, %p, %p, %p)\n", target, format, type, row, column, span );
@@ -1516,7 +1516,7 @@
 }
 
 /***********************************************************************
- *              glGetString
+ *              glGetString (OPENGL32.@)
  */
 GLstring WINAPI wine_glGetString( GLenum name ) {
   GLstring ret_value;
@@ -1528,7 +1528,7 @@
 }
 
 /***********************************************************************
- *              glGetTexEnvfv
+ *              glGetTexEnvfv (OPENGL32.@)
  */
 void WINAPI wine_glGetTexEnvfv( GLenum target, GLenum pname, GLfloat* params ) {
   TRACE("(%d, %d, %p)\n", target, pname, params );
@@ -1538,7 +1538,7 @@
 }
 
 /***********************************************************************
- *              glGetTexEnviv
+ *              glGetTexEnviv (OPENGL32.@)
  */
 void WINAPI wine_glGetTexEnviv( GLenum target, GLenum pname, GLint* params ) {
   TRACE("(%d, %d, %p)\n", target, pname, params );
@@ -1548,7 +1548,7 @@
 }
 
 /***********************************************************************
- *              glGetTexGendv
+ *              glGetTexGendv (OPENGL32.@)
  */
 void WINAPI wine_glGetTexGendv( GLenum coord, GLenum pname, GLdouble* params ) {
   TRACE("(%d, %d, %p)\n", coord, pname, params );
@@ -1558,7 +1558,7 @@
 }
 
 /***********************************************************************
- *              glGetTexGenfv
+ *              glGetTexGenfv (OPENGL32.@)
  */
 void WINAPI wine_glGetTexGenfv( GLenum coord, GLenum pname, GLfloat* params ) {
   TRACE("(%d, %d, %p)\n", coord, pname, params );
@@ -1568,7 +1568,7 @@
 }
 
 /***********************************************************************
- *              glGetTexGeniv
+ *              glGetTexGeniv (OPENGL32.@)
  */
 void WINAPI wine_glGetTexGeniv( GLenum coord, GLenum pname, GLint* params ) {
   TRACE("(%d, %d, %p)\n", coord, pname, params );
@@ -1578,7 +1578,7 @@
 }
 
 /***********************************************************************
- *              glGetTexImage
+ *              glGetTexImage (OPENGL32.@)
  */
 void WINAPI wine_glGetTexImage( GLenum target, GLint level, GLenum format, GLenum type, GLvoid* pixels ) {
   TRACE("(%d, %d, %d, %d, %p)\n", target, level, format, type, pixels );
@@ -1588,7 +1588,7 @@
 }
 
 /***********************************************************************
- *              glGetTexLevelParameterfv
+ *              glGetTexLevelParameterfv (OPENGL32.@)
  */
 void WINAPI wine_glGetTexLevelParameterfv( GLenum target, GLint level, GLenum pname, GLfloat* params ) {
   TRACE("(%d, %d, %d, %p)\n", target, level, pname, params );
@@ -1598,7 +1598,7 @@
 }
 
 /***********************************************************************
- *              glGetTexLevelParameteriv
+ *              glGetTexLevelParameteriv (OPENGL32.@)
  */
 void WINAPI wine_glGetTexLevelParameteriv( GLenum target, GLint level, GLenum pname, GLint* params ) {
   TRACE("(%d, %d, %d, %p)\n", target, level, pname, params );
@@ -1608,7 +1608,7 @@
 }
 
 /***********************************************************************
- *              glGetTexParameterfv
+ *              glGetTexParameterfv (OPENGL32.@)
  */
 void WINAPI wine_glGetTexParameterfv( GLenum target, GLenum pname, GLfloat* params ) {
   TRACE("(%d, %d, %p)\n", target, pname, params );
@@ -1618,7 +1618,7 @@
 }
 
 /***********************************************************************
- *              glGetTexParameteriv
+ *              glGetTexParameteriv (OPENGL32.@)
  */
 void WINAPI wine_glGetTexParameteriv( GLenum target, GLenum pname, GLint* params ) {
   TRACE("(%d, %d, %p)\n", target, pname, params );
@@ -1628,7 +1628,7 @@
 }
 
 /***********************************************************************
- *              glHint
+ *              glHint (OPENGL32.@)
  */
 void WINAPI wine_glHint( GLenum target, GLenum mode ) {
   TRACE("(%d, %d)\n", target, mode );
@@ -1638,7 +1638,7 @@
 }
 
 /***********************************************************************
- *              glHistogram
+ *              glHistogram (OPENGL32.@)
  */
 void WINAPI wine_glHistogram( GLenum target, GLsizei width, GLenum internalformat, GLboolean sink ) {
   TRACE("(%d, %d, %d, %d)\n", target, width, internalformat, sink );
@@ -1648,7 +1648,7 @@
 }
 
 /***********************************************************************
- *              glIndexMask
+ *              glIndexMask (OPENGL32.@)
  */
 void WINAPI wine_glIndexMask( GLuint mask ) {
   TRACE("(%d)\n", mask );
@@ -1658,7 +1658,7 @@
 }
 
 /***********************************************************************
- *              glIndexPointer
+ *              glIndexPointer (OPENGL32.@)
  */
 void WINAPI wine_glIndexPointer( GLenum type, GLsizei stride, GLvoid* pointer ) {
   TRACE("(%d, %d, %p)\n", type, stride, pointer );
@@ -1668,7 +1668,7 @@
 }
 
 /***********************************************************************
- *              glIndexd
+ *              glIndexd (OPENGL32.@)
  */
 void WINAPI wine_glIndexd( GLdouble c ) {
   TRACE("(%f)\n", c );
@@ -1678,7 +1678,7 @@
 }
 
 /***********************************************************************
- *              glIndexdv
+ *              glIndexdv (OPENGL32.@)
  */
 void WINAPI wine_glIndexdv( GLdouble* c ) {
   TRACE("(%p)\n", c );
@@ -1688,7 +1688,7 @@
 }
 
 /***********************************************************************
- *              glIndexf
+ *              glIndexf (OPENGL32.@)
  */
 void WINAPI wine_glIndexf( GLfloat c ) {
   TRACE("(%f)\n", c );
@@ -1698,7 +1698,7 @@
 }
 
 /***********************************************************************
- *              glIndexfv
+ *              glIndexfv (OPENGL32.@)
  */
 void WINAPI wine_glIndexfv( GLfloat* c ) {
   TRACE("(%p)\n", c );
@@ -1708,7 +1708,7 @@
 }
 
 /***********************************************************************
- *              glIndexi
+ *              glIndexi (OPENGL32.@)
  */
 void WINAPI wine_glIndexi( GLint c ) {
   TRACE("(%d)\n", c );
@@ -1718,7 +1718,7 @@
 }
 
 /***********************************************************************
- *              glIndexiv
+ *              glIndexiv (OPENGL32.@)
  */
 void WINAPI wine_glIndexiv( GLint* c ) {
   TRACE("(%p)\n", c );
@@ -1728,7 +1728,7 @@
 }
 
 /***********************************************************************
- *              glIndexs
+ *              glIndexs (OPENGL32.@)
  */
 void WINAPI wine_glIndexs( GLshort c ) {
   TRACE("(%d)\n", c );
@@ -1738,7 +1738,7 @@
 }
 
 /***********************************************************************
- *              glIndexsv
+ *              glIndexsv (OPENGL32.@)
  */
 void WINAPI wine_glIndexsv( GLshort* c ) {
   TRACE("(%p)\n", c );
@@ -1748,7 +1748,7 @@
 }
 
 /***********************************************************************
- *              glIndexub
+ *              glIndexub (OPENGL32.@)
  */
 void WINAPI wine_glIndexub( GLubyte c ) {
   TRACE("(%d)\n", c );
@@ -1758,7 +1758,7 @@
 }
 
 /***********************************************************************
- *              glIndexubv
+ *              glIndexubv (OPENGL32.@)
  */
 void WINAPI wine_glIndexubv( GLubyte* c ) {
   TRACE("(%p)\n", c );
@@ -1768,7 +1768,7 @@
 }
 
 /***********************************************************************
- *              glInitNames
+ *              glInitNames (OPENGL32.@)
  */
 void WINAPI wine_glInitNames( ) {
   TRACE("()\n");
@@ -1778,7 +1778,7 @@
 }
 
 /***********************************************************************
- *              glInterleavedArrays
+ *              glInterleavedArrays (OPENGL32.@)
  */
 void WINAPI wine_glInterleavedArrays( GLenum format, GLsizei stride, GLvoid* pointer ) {
   TRACE("(%d, %d, %p)\n", format, stride, pointer );
@@ -1788,7 +1788,7 @@
 }
 
 /***********************************************************************
- *              glIsEnabled
+ *              glIsEnabled (OPENGL32.@)
  */
 GLboolean WINAPI wine_glIsEnabled( GLenum cap ) {
   GLboolean ret_value;
@@ -1800,7 +1800,7 @@
 }
 
 /***********************************************************************
- *              glIsList
+ *              glIsList (OPENGL32.@)
  */
 GLboolean WINAPI wine_glIsList( GLuint list ) {
   GLboolean ret_value;
@@ -1812,7 +1812,7 @@
 }
 
 /***********************************************************************
- *              glIsTexture
+ *              glIsTexture (OPENGL32.@)
  */
 GLboolean WINAPI wine_glIsTexture( GLuint texture ) {
   GLboolean ret_value;
@@ -1824,7 +1824,7 @@
 }
 
 /***********************************************************************
- *              glLightModelf
+ *              glLightModelf (OPENGL32.@)
  */
 void WINAPI wine_glLightModelf( GLenum pname, GLfloat param ) {
   TRACE("(%d, %f)\n", pname, param );
@@ -1834,7 +1834,7 @@
 }
 
 /***********************************************************************
- *              glLightModelfv
+ *              glLightModelfv (OPENGL32.@)
  */
 void WINAPI wine_glLightModelfv( GLenum pname, GLfloat* params ) {
   TRACE("(%d, %p)\n", pname, params );
@@ -1844,7 +1844,7 @@
 }
 
 /***********************************************************************
- *              glLightModeli
+ *              glLightModeli (OPENGL32.@)
  */
 void WINAPI wine_glLightModeli( GLenum pname, GLint param ) {
   TRACE("(%d, %d)\n", pname, param );
@@ -1854,7 +1854,7 @@
 }
 
 /***********************************************************************
- *              glLightModeliv
+ *              glLightModeliv (OPENGL32.@)
  */
 void WINAPI wine_glLightModeliv( GLenum pname, GLint* params ) {
   TRACE("(%d, %p)\n", pname, params );
@@ -1864,7 +1864,7 @@
 }
 
 /***********************************************************************
- *              glLightf
+ *              glLightf (OPENGL32.@)
  */
 void WINAPI wine_glLightf( GLenum light, GLenum pname, GLfloat param ) {
   TRACE("(%d, %d, %f)\n", light, pname, param );
@@ -1874,7 +1874,7 @@
 }
 
 /***********************************************************************
- *              glLightfv
+ *              glLightfv (OPENGL32.@)
  */
 void WINAPI wine_glLightfv( GLenum light, GLenum pname, GLfloat* params ) {
   TRACE("(%d, %d, %p)\n", light, pname, params );
@@ -1884,7 +1884,7 @@
 }
 
 /***********************************************************************
- *              glLighti
+ *              glLighti (OPENGL32.@)
  */
 void WINAPI wine_glLighti( GLenum light, GLenum pname, GLint param ) {
   TRACE("(%d, %d, %d)\n", light, pname, param );
@@ -1894,7 +1894,7 @@
 }
 
 /***********************************************************************
- *              glLightiv
+ *              glLightiv (OPENGL32.@)
  */
 void WINAPI wine_glLightiv( GLenum light, GLenum pname, GLint* params ) {
   TRACE("(%d, %d, %p)\n", light, pname, params );
@@ -1904,7 +1904,7 @@
 }
 
 /***********************************************************************
- *              glLineStipple
+ *              glLineStipple (OPENGL32.@)
  */
 void WINAPI wine_glLineStipple( GLint factor, GLushort pattern ) {
   TRACE("(%d, %d)\n", factor, pattern );
@@ -1914,7 +1914,7 @@
 }
 
 /***********************************************************************
- *              glLineWidth
+ *              glLineWidth (OPENGL32.@)
  */
 void WINAPI wine_glLineWidth( GLfloat width ) {
   TRACE("(%f)\n", width );
@@ -1924,7 +1924,7 @@
 }
 
 /***********************************************************************
- *              glListBase
+ *              glListBase (OPENGL32.@)
  */
 void WINAPI wine_glListBase( GLuint base ) {
   TRACE("(%d)\n", base );
@@ -1934,7 +1934,7 @@
 }
 
 /***********************************************************************
- *              glLoadIdentity
+ *              glLoadIdentity (OPENGL32.@)
  */
 void WINAPI wine_glLoadIdentity( ) {
   TRACE("()\n");
@@ -1944,7 +1944,7 @@
 }
 
 /***********************************************************************
- *              glLoadMatrixd
+ *              glLoadMatrixd (OPENGL32.@)
  */
 void WINAPI wine_glLoadMatrixd( GLdouble* m ) {
   TRACE("(%p)\n", m );
@@ -1954,7 +1954,7 @@
 }
 
 /***********************************************************************
- *              glLoadMatrixf
+ *              glLoadMatrixf (OPENGL32.@)
  */
 void WINAPI wine_glLoadMatrixf( GLfloat* m ) {
   TRACE("(%p)\n", m );
@@ -1964,7 +1964,7 @@
 }
 
 /***********************************************************************
- *              glLoadName
+ *              glLoadName (OPENGL32.@)
  */
 void WINAPI wine_glLoadName( GLuint name ) {
   TRACE("(%d)\n", name );
@@ -1974,7 +1974,7 @@
 }
 
 /***********************************************************************
- *              glLogicOp
+ *              glLogicOp (OPENGL32.@)
  */
 void WINAPI wine_glLogicOp( GLenum opcode ) {
   TRACE("(%d)\n", opcode );
@@ -1984,7 +1984,7 @@
 }
 
 /***********************************************************************
- *              glMap1d
+ *              glMap1d (OPENGL32.@)
  */
 void WINAPI wine_glMap1d( GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, GLdouble* points ) {
   TRACE("(%d, %f, %f, %d, %d, %p)\n", target, u1, u2, stride, order, points );
@@ -1994,7 +1994,7 @@
 }
 
 /***********************************************************************
- *              glMap1f
+ *              glMap1f (OPENGL32.@)
  */
 void WINAPI wine_glMap1f( GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, GLfloat* points ) {
   TRACE("(%d, %f, %f, %d, %d, %p)\n", target, u1, u2, stride, order, points );
@@ -2004,7 +2004,7 @@
 }
 
 /***********************************************************************
- *              glMap2d
+ *              glMap2d (OPENGL32.@)
  */
 void WINAPI wine_glMap2d( GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, GLdouble* points ) {
   TRACE("(%d, %f, %f, %d, %d, %f, %f, %d, %d, %p)\n", target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points );
@@ -2014,7 +2014,7 @@
 }
 
 /***********************************************************************
- *              glMap2f
+ *              glMap2f (OPENGL32.@)
  */
 void WINAPI wine_glMap2f( GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, GLfloat* points ) {
   TRACE("(%d, %f, %f, %d, %d, %f, %f, %d, %d, %p)\n", target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points );
@@ -2024,7 +2024,7 @@
 }
 
 /***********************************************************************
- *              glMapGrid1d
+ *              glMapGrid1d (OPENGL32.@)
  */
 void WINAPI wine_glMapGrid1d( GLint un, GLdouble u1, GLdouble u2 ) {
   TRACE("(%d, %f, %f)\n", un, u1, u2 );
@@ -2034,7 +2034,7 @@
 }
 
 /***********************************************************************
- *              glMapGrid1f
+ *              glMapGrid1f (OPENGL32.@)
  */
 void WINAPI wine_glMapGrid1f( GLint un, GLfloat u1, GLfloat u2 ) {
   TRACE("(%d, %f, %f)\n", un, u1, u2 );
@@ -2044,7 +2044,7 @@
 }
 
 /***********************************************************************
- *              glMapGrid2d
+ *              glMapGrid2d (OPENGL32.@)
  */
 void WINAPI wine_glMapGrid2d( GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2 ) {
   TRACE("(%d, %f, %f, %d, %f, %f)\n", un, u1, u2, vn, v1, v2 );
@@ -2054,7 +2054,7 @@
 }
 
 /***********************************************************************
- *              glMapGrid2f
+ *              glMapGrid2f (OPENGL32.@)
  */
 void WINAPI wine_glMapGrid2f( GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2 ) {
   TRACE("(%d, %f, %f, %d, %f, %f)\n", un, u1, u2, vn, v1, v2 );
@@ -2064,7 +2064,7 @@
 }
 
 /***********************************************************************
- *              glMaterialf
+ *              glMaterialf (OPENGL32.@)
  */
 void WINAPI wine_glMaterialf( GLenum face, GLenum pname, GLfloat param ) {
   TRACE("(%d, %d, %f)\n", face, pname, param );
@@ -2074,7 +2074,7 @@
 }
 
 /***********************************************************************
- *              glMaterialfv
+ *              glMaterialfv (OPENGL32.@)
  */
 void WINAPI wine_glMaterialfv( GLenum face, GLenum pname, GLfloat* params ) {
   TRACE("(%d, %d, %p)\n", face, pname, params );
@@ -2084,7 +2084,7 @@
 }
 
 /***********************************************************************
- *              glMateriali
+ *              glMateriali (OPENGL32.@)
  */
 void WINAPI wine_glMateriali( GLenum face, GLenum pname, GLint param ) {
   TRACE("(%d, %d, %d)\n", face, pname, param );
@@ -2094,7 +2094,7 @@
 }
 
 /***********************************************************************
- *              glMaterialiv
+ *              glMaterialiv (OPENGL32.@)
  */
 void WINAPI wine_glMaterialiv( GLenum face, GLenum pname, GLint* params ) {
   TRACE("(%d, %d, %p)\n", face, pname, params );
@@ -2104,7 +2104,7 @@
 }
 
 /***********************************************************************
- *              glMatrixMode
+ *              glMatrixMode (OPENGL32.@)
  */
 void WINAPI wine_glMatrixMode( GLenum mode ) {
   TRACE("(%d)\n", mode );
@@ -2114,7 +2114,7 @@
 }
 
 /***********************************************************************
- *              glMinmax
+ *              glMinmax (OPENGL32.@)
  */
 void WINAPI wine_glMinmax( GLenum target, GLenum internalformat, GLboolean sink ) {
   TRACE("(%d, %d, %d)\n", target, internalformat, sink );
@@ -2124,7 +2124,7 @@
 }
 
 /***********************************************************************
- *              glMultMatrixd
+ *              glMultMatrixd (OPENGL32.@)
  */
 void WINAPI wine_glMultMatrixd( GLdouble* m ) {
   TRACE("(%p)\n", m );
@@ -2134,7 +2134,7 @@
 }
 
 /***********************************************************************
- *              glMultMatrixf
+ *              glMultMatrixf (OPENGL32.@)
  */
 void WINAPI wine_glMultMatrixf( GLfloat* m ) {
   TRACE("(%p)\n", m );
@@ -2144,7 +2144,7 @@
 }
 
 /***********************************************************************
- *              glMultiTexCoord1dARB
+ *              glMultiTexCoord1dARB (OPENGL32.@)
  */
 void WINAPI wine_glMultiTexCoord1dARB( GLenum target, GLdouble s ) {
   TRACE("(%d, %f)\n", target, s );
@@ -2154,7 +2154,7 @@
 }
 
 /***********************************************************************
- *              glMultiTexCoord1dvARB
+ *              glMultiTexCoord1dvARB (OPENGL32.@)
  */
 void WINAPI wine_glMultiTexCoord1dvARB( GLenum target, GLdouble* v ) {
   TRACE("(%d, %p)\n", target, v );
@@ -2164,7 +2164,7 @@
 }
 
 /***********************************************************************
- *              glMultiTexCoord1fARB
+ *              glMultiTexCoord1fARB (OPENGL32.@)
  */
 void WINAPI wine_glMultiTexCoord1fARB( GLenum target, GLfloat s ) {
   TRACE("(%d, %f)\n", target, s );
@@ -2174,7 +2174,7 @@
 }
 
 /***********************************************************************
- *              glMultiTexCoord1fvARB
+ *              glMultiTexCoord1fvARB (OPENGL32.@)
  */
 void WINAPI wine_glMultiTexCoord1fvARB( GLenum target, GLfloat* v ) {
   TRACE("(%d, %p)\n", target, v );
@@ -2184,7 +2184,7 @@
 }
 
 /***********************************************************************
- *              glMultiTexCoord1iARB
+ *              glMultiTexCoord1iARB (OPENGL32.@)
  */
 void WINAPI wine_glMultiTexCoord1iARB( GLenum target, GLint s ) {
   TRACE("(%d, %d)\n", target, s );
@@ -2194,7 +2194,7 @@
 }
 
 /***********************************************************************
- *              glMultiTexCoord1ivARB
+ *              glMultiTexCoord1ivARB (OPENGL32.@)
  */
 void WINAPI wine_glMultiTexCoord1ivARB( GLenum target, GLint* v ) {
   TRACE("(%d, %p)\n", target, v );
@@ -2204,7 +2204,7 @@
 }
 
 /***********************************************************************
- *              glMultiTexCoord1sARB
+ *              glMultiTexCoord1sARB (OPENGL32.@)
  */
 void WINAPI wine_glMultiTexCoord1sARB( GLenum target, GLshort s ) {
   TRACE("(%d, %d)\n", target, s );
@@ -2214,7 +2214,7 @@
 }
 
 /***********************************************************************
- *              glMultiTexCoord1svARB
+ *              glMultiTexCoord1svARB (OPENGL32.@)
  */
 void WINAPI wine_glMultiTexCoord1svARB( GLenum target, GLshort* v ) {
   TRACE("(%d, %p)\n", target, v );
@@ -2224,7 +2224,7 @@
 }
 
 /***********************************************************************
- *              glMultiTexCoord2dARB
+ *              glMultiTexCoord2dARB (OPENGL32.@)
  */
 void WINAPI wine_glMultiTexCoord2dARB( GLenum target, GLdouble s, GLdouble t ) {
   TRACE("(%d, %f, %f)\n", target, s, t );
@@ -2234,7 +2234,7 @@
 }
 
 /***********************************************************************
- *              glMultiTexCoord2dvARB
+ *              glMultiTexCoord2dvARB (OPENGL32.@)
  */
 void WINAPI wine_glMultiTexCoord2dvARB( GLenum target, GLdouble* v ) {
   TRACE("(%d, %p)\n", target, v );
@@ -2244,7 +2244,7 @@
 }
 
 /***********************************************************************
- *              glMultiTexCoord2fARB
+ *              glMultiTexCoord2fARB (OPENGL32.@)
  */
 void WINAPI wine_glMultiTexCoord2fARB( GLenum target, GLfloat s, GLfloat t ) {
   TRACE("(%d, %f, %f)\n", target, s, t );
@@ -2254,7 +2254,7 @@
 }
 
 /***********************************************************************
- *              glMultiTexCoord2fvARB
+ *              glMultiTexCoord2fvARB (OPENGL32.@)
  */
 void WINAPI wine_glMultiTexCoord2fvARB( GLenum target, GLfloat* v ) {
   TRACE("(%d, %p)\n", target, v );
@@ -2264,7 +2264,7 @@
 }
 
 /***********************************************************************
- *              glMultiTexCoord2iARB
+ *              glMultiTexCoord2iARB (OPENGL32.@)
  */
 void WINAPI wine_glMultiTexCoord2iARB( GLenum target, GLint s, GLint t ) {
   TRACE("(%d, %d, %d)\n", target, s, t );
@@ -2274,7 +2274,7 @@
 }
 
 /***********************************************************************
- *              glMultiTexCoord2ivARB
+ *              glMultiTexCoord2ivARB (OPENGL32.@)
  */
 void WINAPI wine_glMultiTexCoord2ivARB( GLenum target, GLint* v ) {
   TRACE("(%d, %p)\n", target, v );
@@ -2284,7 +2284,7 @@
 }
 
 /***********************************************************************
- *              glMultiTexCoord2sARB
+ *              glMultiTexCoord2sARB (OPENGL32.@)
  */
 void WINAPI wine_glMultiTexCoord2sARB( GLenum target, GLshort s, GLshort t ) {
   TRACE("(%d, %d, %d)\n", target, s, t );
@@ -2294,7 +2294,7 @@
 }
 
 /***********************************************************************
- *              glMultiTexCoord2svARB
+ *              glMultiTexCoord2svARB (OPENGL32.@)
  */
 void WINAPI wine_glMultiTexCoord2svARB( GLenum target, GLshort* v ) {
   TRACE("(%d, %p)\n", target, v );
@@ -2304,7 +2304,7 @@
 }
 
 /***********************************************************************
- *              glMultiTexCoord3dARB
+ *              glMultiTexCoord3dARB (OPENGL32.@)
  */
 void WINAPI wine_glMultiTexCoord3dARB( GLenum target, GLdouble s, GLdouble t, GLdouble r ) {
   TRACE("(%d, %f, %f, %f)\n", target, s, t, r );
@@ -2314,7 +2314,7 @@
 }
 
 /***********************************************************************
- *              glMultiTexCoord3dvARB
+ *              glMultiTexCoord3dvARB (OPENGL32.@)
  */
 void WINAPI wine_glMultiTexCoord3dvARB( GLenum target, GLdouble* v ) {
   TRACE("(%d, %p)\n", target, v );
@@ -2324,7 +2324,7 @@
 }
 
 /***********************************************************************
- *              glMultiTexCoord3fARB
+ *              glMultiTexCoord3fARB (OPENGL32.@)
  */
 void WINAPI wine_glMultiTexCoord3fARB( GLenum target, GLfloat s, GLfloat t, GLfloat r ) {
   TRACE("(%d, %f, %f, %f)\n", target, s, t, r );
@@ -2334,7 +2334,7 @@
 }
 
 /***********************************************************************
- *              glMultiTexCoord3fvARB
+ *              glMultiTexCoord3fvARB (OPENGL32.@)
  */
 void WINAPI wine_glMultiTexCoord3fvARB( GLenum target, GLfloat* v ) {
   TRACE("(%d, %p)\n", target, v );
@@ -2344,7 +2344,7 @@
 }
 
 /***********************************************************************
- *              glMultiTexCoord3iARB
+ *              glMultiTexCoord3iARB (OPENGL32.@)
  */
 void WINAPI wine_glMultiTexCoord3iARB( GLenum target, GLint s, GLint t, GLint r ) {
   TRACE("(%d, %d, %d, %d)\n", target, s, t, r );
@@ -2354,7 +2354,7 @@
 }
 
 /***********************************************************************
- *              glMultiTexCoord3ivARB
+ *              glMultiTexCoord3ivARB (OPENGL32.@)
  */
 void WINAPI wine_glMultiTexCoord3ivARB( GLenum target, GLint* v ) {
   TRACE("(%d, %p)\n", target, v );
@@ -2364,7 +2364,7 @@
 }
 
 /***********************************************************************
- *              glMultiTexCoord3sARB
+ *              glMultiTexCoord3sARB (OPENGL32.@)
  */
 void WINAPI wine_glMultiTexCoord3sARB( GLenum target, GLshort s, GLshort t, GLshort r ) {
   TRACE("(%d, %d, %d, %d)\n", target, s, t, r );
@@ -2374,7 +2374,7 @@
 }
 
 /***********************************************************************
- *              glMultiTexCoord3svARB
+ *              glMultiTexCoord3svARB (OPENGL32.@)
  */
 void WINAPI wine_glMultiTexCoord3svARB( GLenum target, GLshort* v ) {
   TRACE("(%d, %p)\n", target, v );
@@ -2384,7 +2384,7 @@
 }
 
 /***********************************************************************
- *              glMultiTexCoord4dARB
+ *              glMultiTexCoord4dARB (OPENGL32.@)
  */
 void WINAPI wine_glMultiTexCoord4dARB( GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q ) {
   TRACE("(%d, %f, %f, %f, %f)\n", target, s, t, r, q );
@@ -2394,7 +2394,7 @@
 }
 
 /***********************************************************************
- *              glMultiTexCoord4dvARB
+ *              glMultiTexCoord4dvARB (OPENGL32.@)
  */
 void WINAPI wine_glMultiTexCoord4dvARB( GLenum target, GLdouble* v ) {
   TRACE("(%d, %p)\n", target, v );
@@ -2404,7 +2404,7 @@
 }
 
 /***********************************************************************
- *              glMultiTexCoord4fARB
+ *              glMultiTexCoord4fARB (OPENGL32.@)
  */
 void WINAPI wine_glMultiTexCoord4fARB( GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q ) {
   TRACE("(%d, %f, %f, %f, %f)\n", target, s, t, r, q );
@@ -2414,7 +2414,7 @@
 }
 
 /***********************************************************************
- *              glMultiTexCoord4fvARB
+ *              glMultiTexCoord4fvARB (OPENGL32.@)
  */
 void WINAPI wine_glMultiTexCoord4fvARB( GLenum target, GLfloat* v ) {
   TRACE("(%d, %p)\n", target, v );
@@ -2424,7 +2424,7 @@
 }
 
 /***********************************************************************
- *              glMultiTexCoord4iARB
+ *              glMultiTexCoord4iARB (OPENGL32.@)
  */
 void WINAPI wine_glMultiTexCoord4iARB( GLenum target, GLint s, GLint t, GLint r, GLint q ) {
   TRACE("(%d, %d, %d, %d, %d)\n", target, s, t, r, q );
@@ -2434,7 +2434,7 @@
 }
 
 /***********************************************************************
- *              glMultiTexCoord4ivARB
+ *              glMultiTexCoord4ivARB (OPENGL32.@)
  */
 void WINAPI wine_glMultiTexCoord4ivARB( GLenum target, GLint* v ) {
   TRACE("(%d, %p)\n", target, v );
@@ -2444,7 +2444,7 @@
 }
 
 /***********************************************************************
- *              glMultiTexCoord4sARB
+ *              glMultiTexCoord4sARB (OPENGL32.@)
  */
 void WINAPI wine_glMultiTexCoord4sARB( GLenum target, GLshort s, GLshort t, GLshort r, GLshort q ) {
   TRACE("(%d, %d, %d, %d, %d)\n", target, s, t, r, q );
@@ -2454,7 +2454,7 @@
 }
 
 /***********************************************************************
- *              glMultiTexCoord4svARB
+ *              glMultiTexCoord4svARB (OPENGL32.@)
  */
 void WINAPI wine_glMultiTexCoord4svARB( GLenum target, GLshort* v ) {
   TRACE("(%d, %p)\n", target, v );
@@ -2464,7 +2464,7 @@
 }
 
 /***********************************************************************
- *              glNewList
+ *              glNewList (OPENGL32.@)
  */
 void WINAPI wine_glNewList( GLuint list, GLenum mode ) {
   TRACE("(%d, %d)\n", list, mode );
@@ -2474,7 +2474,7 @@
 }
 
 /***********************************************************************
- *              glNormal3b
+ *              glNormal3b (OPENGL32.@)
  */
 void WINAPI wine_glNormal3b( GLbyte nx, GLbyte ny, GLbyte nz ) {
   TRACE("(%d, %d, %d)\n", nx, ny, nz );
@@ -2484,7 +2484,7 @@
 }
 
 /***********************************************************************
- *              glNormal3bv
+ *              glNormal3bv (OPENGL32.@)
  */
 void WINAPI wine_glNormal3bv( GLbyte* v ) {
   TRACE("(%p)\n", v );
@@ -2494,7 +2494,7 @@
 }
 
 /***********************************************************************
- *              glNormal3d
+ *              glNormal3d (OPENGL32.@)
  */
 void WINAPI wine_glNormal3d( GLdouble nx, GLdouble ny, GLdouble nz ) {
   TRACE("(%f, %f, %f)\n", nx, ny, nz );
@@ -2504,7 +2504,7 @@
 }
 
 /***********************************************************************
- *              glNormal3dv
+ *              glNormal3dv (OPENGL32.@)
  */
 void WINAPI wine_glNormal3dv( GLdouble* v ) {
   TRACE("(%p)\n", v );
@@ -2514,7 +2514,7 @@
 }
 
 /***********************************************************************
- *              glNormal3f
+ *              glNormal3f (OPENGL32.@)
  */
 void WINAPI wine_glNormal3f( GLfloat nx, GLfloat ny, GLfloat nz ) {
   TRACE("(%f, %f, %f)\n", nx, ny, nz );
@@ -2524,7 +2524,7 @@
 }
 
 /***********************************************************************
- *              glNormal3fv
+ *              glNormal3fv (OPENGL32.@)
  */
 void WINAPI wine_glNormal3fv( GLfloat* v ) {
   TRACE("(%p)\n", v );
@@ -2534,7 +2534,7 @@
 }
 
 /***********************************************************************
- *              glNormal3i
+ *              glNormal3i (OPENGL32.@)
  */
 void WINAPI wine_glNormal3i( GLint nx, GLint ny, GLint nz ) {
   TRACE("(%d, %d, %d)\n", nx, ny, nz );
@@ -2544,7 +2544,7 @@
 }
 
 /***********************************************************************
- *              glNormal3iv
+ *              glNormal3iv (OPENGL32.@)
  */
 void WINAPI wine_glNormal3iv( GLint* v ) {
   TRACE("(%p)\n", v );
@@ -2554,7 +2554,7 @@
 }
 
 /***********************************************************************
- *              glNormal3s
+ *              glNormal3s (OPENGL32.@)
  */
 void WINAPI wine_glNormal3s( GLshort nx, GLshort ny, GLshort nz ) {
   TRACE("(%d, %d, %d)\n", nx, ny, nz );
@@ -2564,7 +2564,7 @@
 }
 
 /***********************************************************************
- *              glNormal3sv
+ *              glNormal3sv (OPENGL32.@)
  */
 void WINAPI wine_glNormal3sv( GLshort* v ) {
   TRACE("(%p)\n", v );
@@ -2574,7 +2574,7 @@
 }
 
 /***********************************************************************
- *              glNormalPointer
+ *              glNormalPointer (OPENGL32.@)
  */
 void WINAPI wine_glNormalPointer( GLenum type, GLsizei stride, GLvoid* pointer ) {
   TRACE("(%d, %d, %p)\n", type, stride, pointer );
@@ -2584,7 +2584,7 @@
 }
 
 /***********************************************************************
- *              glOrtho
+ *              glOrtho (OPENGL32.@)
  */
 void WINAPI wine_glOrtho( GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar ) {
   TRACE("(%f, %f, %f, %f, %f, %f)\n", left, right, bottom, top, zNear, zFar );
@@ -2594,7 +2594,7 @@
 }
 
 /***********************************************************************
- *              glPassThrough
+ *              glPassThrough (OPENGL32.@)
  */
 void WINAPI wine_glPassThrough( GLfloat token ) {
   TRACE("(%f)\n", token );
@@ -2604,7 +2604,7 @@
 }
 
 /***********************************************************************
- *              glPixelMapfv
+ *              glPixelMapfv (OPENGL32.@)
  */
 void WINAPI wine_glPixelMapfv( GLenum map, GLint mapsize, GLfloat* values ) {
   TRACE("(%d, %d, %p)\n", map, mapsize, values );
@@ -2614,7 +2614,7 @@
 }
 
 /***********************************************************************
- *              glPixelMapuiv
+ *              glPixelMapuiv (OPENGL32.@)
  */
 void WINAPI wine_glPixelMapuiv( GLenum map, GLint mapsize, GLuint* values ) {
   TRACE("(%d, %d, %p)\n", map, mapsize, values );
@@ -2624,7 +2624,7 @@
 }
 
 /***********************************************************************
- *              glPixelMapusv
+ *              glPixelMapusv (OPENGL32.@)
  */
 void WINAPI wine_glPixelMapusv( GLenum map, GLint mapsize, GLushort* values ) {
   TRACE("(%d, %d, %p)\n", map, mapsize, values );
@@ -2634,7 +2634,7 @@
 }
 
 /***********************************************************************
- *              glPixelStoref
+ *              glPixelStoref (OPENGL32.@)
  */
 void WINAPI wine_glPixelStoref( GLenum pname, GLfloat param ) {
   TRACE("(%d, %f)\n", pname, param );
@@ -2644,7 +2644,7 @@
 }
 
 /***********************************************************************
- *              glPixelStorei
+ *              glPixelStorei (OPENGL32.@)
  */
 void WINAPI wine_glPixelStorei( GLenum pname, GLint param ) {
   TRACE("(%d, %d)\n", pname, param );
@@ -2654,7 +2654,7 @@
 }
 
 /***********************************************************************
- *              glPixelTransferf
+ *              glPixelTransferf (OPENGL32.@)
  */
 void WINAPI wine_glPixelTransferf( GLenum pname, GLfloat param ) {
   TRACE("(%d, %f)\n", pname, param );
@@ -2664,7 +2664,7 @@
 }
 
 /***********************************************************************
- *              glPixelTransferi
+ *              glPixelTransferi (OPENGL32.@)
  */
 void WINAPI wine_glPixelTransferi( GLenum pname, GLint param ) {
   TRACE("(%d, %d)\n", pname, param );
@@ -2674,7 +2674,7 @@
 }
 
 /***********************************************************************
- *              glPixelZoom
+ *              glPixelZoom (OPENGL32.@)
  */
 void WINAPI wine_glPixelZoom( GLfloat xfactor, GLfloat yfactor ) {
   TRACE("(%f, %f)\n", xfactor, yfactor );
@@ -2684,7 +2684,7 @@
 }
 
 /***********************************************************************
- *              glPointSize
+ *              glPointSize (OPENGL32.@)
  */
 void WINAPI wine_glPointSize( GLfloat size ) {
   TRACE("(%f)\n", size );
@@ -2694,7 +2694,7 @@
 }
 
 /***********************************************************************
- *              glPolygonMode
+ *              glPolygonMode (OPENGL32.@)
  */
 void WINAPI wine_glPolygonMode( GLenum face, GLenum mode ) {
   TRACE("(%d, %d)\n", face, mode );
@@ -2704,7 +2704,7 @@
 }
 
 /***********************************************************************
- *              glPolygonOffset
+ *              glPolygonOffset (OPENGL32.@)
  */
 void WINAPI wine_glPolygonOffset( GLfloat factor, GLfloat units ) {
   TRACE("(%f, %f)\n", factor, units );
@@ -2714,7 +2714,7 @@
 }
 
 /***********************************************************************
- *              glPolygonStipple
+ *              glPolygonStipple (OPENGL32.@)
  */
 void WINAPI wine_glPolygonStipple( GLubyte* mask ) {
   TRACE("(%p)\n", mask );
@@ -2724,7 +2724,7 @@
 }
 
 /***********************************************************************
- *              glPopAttrib
+ *              glPopAttrib (OPENGL32.@)
  */
 void WINAPI wine_glPopAttrib( ) {
   TRACE("()\n");
@@ -2734,7 +2734,7 @@
 }
 
 /***********************************************************************
- *              glPopClientAttrib
+ *              glPopClientAttrib (OPENGL32.@)
  */
 void WINAPI wine_glPopClientAttrib( ) {
   TRACE("()\n");
@@ -2744,7 +2744,7 @@
 }
 
 /***********************************************************************
- *              glPopMatrix
+ *              glPopMatrix (OPENGL32.@)
  */
 void WINAPI wine_glPopMatrix( ) {
   TRACE("()\n");
@@ -2754,7 +2754,7 @@
 }
 
 /***********************************************************************
- *              glPopName
+ *              glPopName (OPENGL32.@)
  */
 void WINAPI wine_glPopName( ) {
   TRACE("()\n");
@@ -2764,7 +2764,7 @@
 }
 
 /***********************************************************************
- *              glPrioritizeTextures
+ *              glPrioritizeTextures (OPENGL32.@)
  */
 void WINAPI wine_glPrioritizeTextures( GLsizei n, GLuint* textures, GLclampf* priorities ) {
   TRACE("(%d, %p, %p)\n", n, textures, priorities );
@@ -2774,7 +2774,7 @@
 }
 
 /***********************************************************************
- *              glPushAttrib
+ *              glPushAttrib (OPENGL32.@)
  */
 void WINAPI wine_glPushAttrib( GLbitfield mask ) {
   TRACE("(%d)\n", mask );
@@ -2784,7 +2784,7 @@
 }
 
 /***********************************************************************
- *              glPushClientAttrib
+ *              glPushClientAttrib (OPENGL32.@)
  */
 void WINAPI wine_glPushClientAttrib( GLbitfield mask ) {
   TRACE("(%d)\n", mask );
@@ -2794,7 +2794,7 @@
 }
 
 /***********************************************************************
- *              glPushMatrix
+ *              glPushMatrix (OPENGL32.@)
  */
 void WINAPI wine_glPushMatrix( ) {
   TRACE("()\n");
@@ -2804,7 +2804,7 @@
 }
 
 /***********************************************************************
- *              glPushName
+ *              glPushName (OPENGL32.@)
  */
 void WINAPI wine_glPushName( GLuint name ) {
   TRACE("(%d)\n", name );
@@ -2814,7 +2814,7 @@
 }
 
 /***********************************************************************
- *              glRasterPos2d
+ *              glRasterPos2d (OPENGL32.@)
  */
 void WINAPI wine_glRasterPos2d( GLdouble x, GLdouble y ) {
   TRACE("(%f, %f)\n", x, y );
@@ -2824,7 +2824,7 @@
 }
 
 /***********************************************************************
- *              glRasterPos2dv
+ *              glRasterPos2dv (OPENGL32.@)
  */
 void WINAPI wine_glRasterPos2dv( GLdouble* v ) {
   TRACE("(%p)\n", v );
@@ -2834,7 +2834,7 @@
 }
 
 /***********************************************************************
- *              glRasterPos2f
+ *              glRasterPos2f (OPENGL32.@)
  */
 void WINAPI wine_glRasterPos2f( GLfloat x, GLfloat y ) {
   TRACE("(%f, %f)\n", x, y );
@@ -2844,7 +2844,7 @@
 }
 
 /***********************************************************************
- *              glRasterPos2fv
+ *              glRasterPos2fv (OPENGL32.@)
  */
 void WINAPI wine_glRasterPos2fv( GLfloat* v ) {
   TRACE("(%p)\n", v );
@@ -2854,7 +2854,7 @@
 }
 
 /***********************************************************************
- *              glRasterPos2i
+ *              glRasterPos2i (OPENGL32.@)
  */
 void WINAPI wine_glRasterPos2i( GLint x, GLint y ) {
   TRACE("(%d, %d)\n", x, y );
@@ -2864,7 +2864,7 @@
 }
 
 /***********************************************************************
- *              glRasterPos2iv
+ *              glRasterPos2iv (OPENGL32.@)
  */
 void WINAPI wine_glRasterPos2iv( GLint* v ) {
   TRACE("(%p)\n", v );
@@ -2874,7 +2874,7 @@
 }
 
 /***********************************************************************
- *              glRasterPos2s
+ *              glRasterPos2s (OPENGL32.@)
  */
 void WINAPI wine_glRasterPos2s( GLshort x, GLshort y ) {
   TRACE("(%d, %d)\n", x, y );
@@ -2884,7 +2884,7 @@
 }
 
 /***********************************************************************
- *              glRasterPos2sv
+ *              glRasterPos2sv (OPENGL32.@)
  */
 void WINAPI wine_glRasterPos2sv( GLshort* v ) {
   TRACE("(%p)\n", v );
@@ -2894,7 +2894,7 @@
 }
 
 /***********************************************************************
- *              glRasterPos3d
+ *              glRasterPos3d (OPENGL32.@)
  */
 void WINAPI wine_glRasterPos3d( GLdouble x, GLdouble y, GLdouble z ) {
   TRACE("(%f, %f, %f)\n", x, y, z );
@@ -2904,7 +2904,7 @@
 }
 
 /***********************************************************************
- *              glRasterPos3dv
+ *              glRasterPos3dv (OPENGL32.@)
  */
 void WINAPI wine_glRasterPos3dv( GLdouble* v ) {
   TRACE("(%p)\n", v );
@@ -2914,7 +2914,7 @@
 }
 
 /***********************************************************************
- *              glRasterPos3f
+ *              glRasterPos3f (OPENGL32.@)
  */
 void WINAPI wine_glRasterPos3f( GLfloat x, GLfloat y, GLfloat z ) {
   TRACE("(%f, %f, %f)\n", x, y, z );
@@ -2924,7 +2924,7 @@
 }
 
 /***********************************************************************
- *              glRasterPos3fv
+ *              glRasterPos3fv (OPENGL32.@)
  */
 void WINAPI wine_glRasterPos3fv( GLfloat* v ) {
   TRACE("(%p)\n", v );
@@ -2934,7 +2934,7 @@
 }
 
 /***********************************************************************
- *              glRasterPos3i
+ *              glRasterPos3i (OPENGL32.@)
  */
 void WINAPI wine_glRasterPos3i( GLint x, GLint y, GLint z ) {
   TRACE("(%d, %d, %d)\n", x, y, z );
@@ -2944,7 +2944,7 @@
 }
 
 /***********************************************************************
- *              glRasterPos3iv
+ *              glRasterPos3iv (OPENGL32.@)
  */
 void WINAPI wine_glRasterPos3iv( GLint* v ) {
   TRACE("(%p)\n", v );
@@ -2954,7 +2954,7 @@
 }
 
 /***********************************************************************
- *              glRasterPos3s
+ *              glRasterPos3s (OPENGL32.@)
  */
 void WINAPI wine_glRasterPos3s( GLshort x, GLshort y, GLshort z ) {
   TRACE("(%d, %d, %d)\n", x, y, z );
@@ -2964,7 +2964,7 @@
 }
 
 /***********************************************************************
- *              glRasterPos3sv
+ *              glRasterPos3sv (OPENGL32.@)
  */
 void WINAPI wine_glRasterPos3sv( GLshort* v ) {
   TRACE("(%p)\n", v );
@@ -2974,7 +2974,7 @@
 }
 
 /***********************************************************************
- *              glRasterPos4d
+ *              glRasterPos4d (OPENGL32.@)
  */
 void WINAPI wine_glRasterPos4d( GLdouble x, GLdouble y, GLdouble z, GLdouble w ) {
   TRACE("(%f, %f, %f, %f)\n", x, y, z, w );
@@ -2984,7 +2984,7 @@
 }
 
 /***********************************************************************
- *              glRasterPos4dv
+ *              glRasterPos4dv (OPENGL32.@)
  */
 void WINAPI wine_glRasterPos4dv( GLdouble* v ) {
   TRACE("(%p)\n", v );
@@ -2994,7 +2994,7 @@
 }
 
 /***********************************************************************
- *              glRasterPos4f
+ *              glRasterPos4f (OPENGL32.@)
  */
 void WINAPI wine_glRasterPos4f( GLfloat x, GLfloat y, GLfloat z, GLfloat w ) {
   TRACE("(%f, %f, %f, %f)\n", x, y, z, w );
@@ -3004,7 +3004,7 @@
 }
 
 /***********************************************************************
- *              glRasterPos4fv
+ *              glRasterPos4fv (OPENGL32.@)
  */
 void WINAPI wine_glRasterPos4fv( GLfloat* v ) {
   TRACE("(%p)\n", v );
@@ -3014,7 +3014,7 @@
 }
 
 /***********************************************************************
- *              glRasterPos4i
+ *              glRasterPos4i (OPENGL32.@)
  */
 void WINAPI wine_glRasterPos4i( GLint x, GLint y, GLint z, GLint w ) {
   TRACE("(%d, %d, %d, %d)\n", x, y, z, w );
@@ -3024,7 +3024,7 @@
 }
 
 /***********************************************************************
- *              glRasterPos4iv
+ *              glRasterPos4iv (OPENGL32.@)
  */
 void WINAPI wine_glRasterPos4iv( GLint* v ) {
   TRACE("(%p)\n", v );
@@ -3034,7 +3034,7 @@
 }
 
 /***********************************************************************
- *              glRasterPos4s
+ *              glRasterPos4s (OPENGL32.@)
  */
 void WINAPI wine_glRasterPos4s( GLshort x, GLshort y, GLshort z, GLshort w ) {
   TRACE("(%d, %d, %d, %d)\n", x, y, z, w );
@@ -3044,7 +3044,7 @@
 }
 
 /***********************************************************************
- *              glRasterPos4sv
+ *              glRasterPos4sv (OPENGL32.@)
  */
 void WINAPI wine_glRasterPos4sv( GLshort* v ) {
   TRACE("(%p)\n", v );
@@ -3054,7 +3054,7 @@
 }
 
 /***********************************************************************
- *              glReadBuffer
+ *              glReadBuffer (OPENGL32.@)
  */
 void WINAPI wine_glReadBuffer( GLenum mode ) {
   TRACE("(%d)\n", mode );
@@ -3064,7 +3064,7 @@
 }
 
 /***********************************************************************
- *              glReadPixels
+ *              glReadPixels (OPENGL32.@)
  */
 void WINAPI wine_glReadPixels( GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid* pixels ) {
   TRACE("(%d, %d, %d, %d, %d, %d, %p)\n", x, y, width, height, format, type, pixels );
@@ -3074,7 +3074,7 @@
 }
 
 /***********************************************************************
- *              glRectd
+ *              glRectd (OPENGL32.@)
  */
 void WINAPI wine_glRectd( GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2 ) {
   TRACE("(%f, %f, %f, %f)\n", x1, y1, x2, y2 );
@@ -3084,7 +3084,7 @@
 }
 
 /***********************************************************************
- *              glRectdv
+ *              glRectdv (OPENGL32.@)
  */
 void WINAPI wine_glRectdv( GLdouble* v1, GLdouble* v2 ) {
   TRACE("(%p, %p)\n", v1, v2 );
@@ -3094,7 +3094,7 @@
 }
 
 /***********************************************************************
- *              glRectf
+ *              glRectf (OPENGL32.@)
  */
 void WINAPI wine_glRectf( GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2 ) {
   TRACE("(%f, %f, %f, %f)\n", x1, y1, x2, y2 );
@@ -3104,7 +3104,7 @@
 }
 
 /***********************************************************************
- *              glRectfv
+ *              glRectfv (OPENGL32.@)
  */
 void WINAPI wine_glRectfv( GLfloat* v1, GLfloat* v2 ) {
   TRACE("(%p, %p)\n", v1, v2 );
@@ -3114,7 +3114,7 @@
 }
 
 /***********************************************************************
- *              glRecti
+ *              glRecti (OPENGL32.@)
  */
 void WINAPI wine_glRecti( GLint x1, GLint y1, GLint x2, GLint y2 ) {
   TRACE("(%d, %d, %d, %d)\n", x1, y1, x2, y2 );
@@ -3124,7 +3124,7 @@
 }
 
 /***********************************************************************
- *              glRectiv
+ *              glRectiv (OPENGL32.@)
  */
 void WINAPI wine_glRectiv( GLint* v1, GLint* v2 ) {
   TRACE("(%p, %p)\n", v1, v2 );
@@ -3134,7 +3134,7 @@
 }
 
 /***********************************************************************
- *              glRects
+ *              glRects (OPENGL32.@)
  */
 void WINAPI wine_glRects( GLshort x1, GLshort y1, GLshort x2, GLshort y2 ) {
   TRACE("(%d, %d, %d, %d)\n", x1, y1, x2, y2 );
@@ -3144,7 +3144,7 @@
 }
 
 /***********************************************************************
- *              glRectsv
+ *              glRectsv (OPENGL32.@)
  */
 void WINAPI wine_glRectsv( GLshort* v1, GLshort* v2 ) {
   TRACE("(%p, %p)\n", v1, v2 );
@@ -3154,7 +3154,7 @@
 }
 
 /***********************************************************************
- *              glRenderMode
+ *              glRenderMode (OPENGL32.@)
  */
 GLint WINAPI wine_glRenderMode( GLenum mode ) {
   GLint ret_value;
@@ -3166,7 +3166,7 @@
 }
 
 /***********************************************************************
- *              glResetHistogram
+ *              glResetHistogram (OPENGL32.@)
  */
 void WINAPI wine_glResetHistogram( GLenum target ) {
   TRACE("(%d)\n", target );
@@ -3176,7 +3176,7 @@
 }
 
 /***********************************************************************
- *              glResetMinmax
+ *              glResetMinmax (OPENGL32.@)
  */
 void WINAPI wine_glResetMinmax( GLenum target ) {
   TRACE("(%d)\n", target );
@@ -3186,7 +3186,7 @@
 }
 
 /***********************************************************************
- *              glRotated
+ *              glRotated (OPENGL32.@)
  */
 void WINAPI wine_glRotated( GLdouble angle, GLdouble x, GLdouble y, GLdouble z ) {
   TRACE("(%f, %f, %f, %f)\n", angle, x, y, z );
@@ -3196,7 +3196,7 @@
 }
 
 /***********************************************************************
- *              glRotatef
+ *              glRotatef (OPENGL32.@)
  */
 void WINAPI wine_glRotatef( GLfloat angle, GLfloat x, GLfloat y, GLfloat z ) {
   TRACE("(%f, %f, %f, %f)\n", angle, x, y, z );
@@ -3206,7 +3206,7 @@
 }
 
 /***********************************************************************
- *              glScaled
+ *              glScaled (OPENGL32.@)
  */
 void WINAPI wine_glScaled( GLdouble x, GLdouble y, GLdouble z ) {
   TRACE("(%f, %f, %f)\n", x, y, z );
@@ -3216,7 +3216,7 @@
 }
 
 /***********************************************************************
- *              glScalef
+ *              glScalef (OPENGL32.@)
  */
 void WINAPI wine_glScalef( GLfloat x, GLfloat y, GLfloat z ) {
   TRACE("(%f, %f, %f)\n", x, y, z );
@@ -3226,7 +3226,7 @@
 }
 
 /***********************************************************************
- *              glScissor
+ *              glScissor (OPENGL32.@)
  */
 void WINAPI wine_glScissor( GLint x, GLint y, GLsizei width, GLsizei height ) {
   TRACE("(%d, %d, %d, %d)\n", x, y, width, height );
@@ -3236,7 +3236,7 @@
 }
 
 /***********************************************************************
- *              glSelectBuffer
+ *              glSelectBuffer (OPENGL32.@)
  */
 void WINAPI wine_glSelectBuffer( GLsizei size, GLuint* buffer ) {
   TRACE("(%d, %p)\n", size, buffer );
@@ -3246,7 +3246,7 @@
 }
 
 /***********************************************************************
- *              glSeparableFilter2D
+ *              glSeparableFilter2D (OPENGL32.@)
  */
 void WINAPI wine_glSeparableFilter2D( GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid* row, GLvoid* column ) {
   TRACE("(%d, %d, %d, %d, %d, %d, %p, %p)\n", target, internalformat, width, height, format, type, row, column );
@@ -3256,7 +3256,7 @@
 }
 
 /***********************************************************************
- *              glShadeModel
+ *              glShadeModel (OPENGL32.@)
  */
 void WINAPI wine_glShadeModel( GLenum mode ) {
   TRACE("(%d)\n", mode );
@@ -3266,7 +3266,7 @@
 }
 
 /***********************************************************************
- *              glStencilFunc
+ *              glStencilFunc (OPENGL32.@)
  */
 void WINAPI wine_glStencilFunc( GLenum func, GLint ref, GLuint mask ) {
   TRACE("(%d, %d, %d)\n", func, ref, mask );
@@ -3276,7 +3276,7 @@
 }
 
 /***********************************************************************
- *              glStencilMask
+ *              glStencilMask (OPENGL32.@)
  */
 void WINAPI wine_glStencilMask( GLuint mask ) {
   TRACE("(%d)\n", mask );
@@ -3286,7 +3286,7 @@
 }
 
 /***********************************************************************
- *              glStencilOp
+ *              glStencilOp (OPENGL32.@)
  */
 void WINAPI wine_glStencilOp( GLenum fail, GLenum zfail, GLenum zpass ) {
   TRACE("(%d, %d, %d)\n", fail, zfail, zpass );
@@ -3296,7 +3296,7 @@
 }
 
 /***********************************************************************
- *              glTexCoord1d
+ *              glTexCoord1d (OPENGL32.@)
  */
 void WINAPI wine_glTexCoord1d( GLdouble s ) {
   TRACE("(%f)\n", s );
@@ -3306,7 +3306,7 @@
 }
 
 /***********************************************************************
- *              glTexCoord1dv
+ *              glTexCoord1dv (OPENGL32.@)
  */
 void WINAPI wine_glTexCoord1dv( GLdouble* v ) {
   TRACE("(%p)\n", v );
@@ -3316,7 +3316,7 @@
 }
 
 /***********************************************************************
- *              glTexCoord1f
+ *              glTexCoord1f (OPENGL32.@)
  */
 void WINAPI wine_glTexCoord1f( GLfloat s ) {
   TRACE("(%f)\n", s );
@@ -3326,7 +3326,7 @@
 }
 
 /***********************************************************************
- *              glTexCoord1fv
+ *              glTexCoord1fv (OPENGL32.@)
  */
 void WINAPI wine_glTexCoord1fv( GLfloat* v ) {
   TRACE("(%p)\n", v );
@@ -3336,7 +3336,7 @@
 }
 
 /***********************************************************************
- *              glTexCoord1i
+ *              glTexCoord1i (OPENGL32.@)
  */
 void WINAPI wine_glTexCoord1i( GLint s ) {
   TRACE("(%d)\n", s );
@@ -3346,7 +3346,7 @@
 }
 
 /***********************************************************************
- *              glTexCoord1iv
+ *              glTexCoord1iv (OPENGL32.@)
  */
 void WINAPI wine_glTexCoord1iv( GLint* v ) {
   TRACE("(%p)\n", v );
@@ -3356,7 +3356,7 @@
 }
 
 /***********************************************************************
- *              glTexCoord1s
+ *              glTexCoord1s (OPENGL32.@)
  */
 void WINAPI wine_glTexCoord1s( GLshort s ) {
   TRACE("(%d)\n", s );
@@ -3366,7 +3366,7 @@
 }
 
 /***********************************************************************
- *              glTexCoord1sv
+ *              glTexCoord1sv (OPENGL32.@)
  */
 void WINAPI wine_glTexCoord1sv( GLshort* v ) {
   TRACE("(%p)\n", v );
@@ -3376,7 +3376,7 @@
 }
 
 /***********************************************************************
- *              glTexCoord2d
+ *              glTexCoord2d (OPENGL32.@)
  */
 void WINAPI wine_glTexCoord2d( GLdouble s, GLdouble t ) {
   TRACE("(%f, %f)\n", s, t );
@@ -3386,7 +3386,7 @@
 }
 
 /***********************************************************************
- *              glTexCoord2dv
+ *              glTexCoord2dv (OPENGL32.@)
  */
 void WINAPI wine_glTexCoord2dv( GLdouble* v ) {
   TRACE("(%p)\n", v );
@@ -3396,7 +3396,7 @@
 }
 
 /***********************************************************************
- *              glTexCoord2f
+ *              glTexCoord2f (OPENGL32.@)
  */
 void WINAPI wine_glTexCoord2f( GLfloat s, GLfloat t ) {
   TRACE("(%f, %f)\n", s, t );
@@ -3406,7 +3406,7 @@
 }
 
 /***********************************************************************
- *              glTexCoord2fv
+ *              glTexCoord2fv (OPENGL32.@)
  */
 void WINAPI wine_glTexCoord2fv( GLfloat* v ) {
   TRACE("(%p)\n", v );
@@ -3416,7 +3416,7 @@
 }
 
 /***********************************************************************
- *              glTexCoord2i
+ *              glTexCoord2i (OPENGL32.@)
  */
 void WINAPI wine_glTexCoord2i( GLint s, GLint t ) {
   TRACE("(%d, %d)\n", s, t );
@@ -3426,7 +3426,7 @@
 }
 
 /***********************************************************************
- *              glTexCoord2iv
+ *              glTexCoord2iv (OPENGL32.@)
  */
 void WINAPI wine_glTexCoord2iv( GLint* v ) {
   TRACE("(%p)\n", v );
@@ -3436,7 +3436,7 @@
 }
 
 /***********************************************************************
- *              glTexCoord2s
+ *              glTexCoord2s (OPENGL32.@)
  */
 void WINAPI wine_glTexCoord2s( GLshort s, GLshort t ) {
   TRACE("(%d, %d)\n", s, t );
@@ -3446,7 +3446,7 @@
 }
 
 /***********************************************************************
- *              glTexCoord2sv
+ *              glTexCoord2sv (OPENGL32.@)
  */
 void WINAPI wine_glTexCoord2sv( GLshort* v ) {
   TRACE("(%p)\n", v );
@@ -3456,7 +3456,7 @@
 }
 
 /***********************************************************************
- *              glTexCoord3d
+ *              glTexCoord3d (OPENGL32.@)
  */
 void WINAPI wine_glTexCoord3d( GLdouble s, GLdouble t, GLdouble r ) {
   TRACE("(%f, %f, %f)\n", s, t, r );
@@ -3466,7 +3466,7 @@
 }
 
 /***********************************************************************
- *              glTexCoord3dv
+ *              glTexCoord3dv (OPENGL32.@)
  */
 void WINAPI wine_glTexCoord3dv( GLdouble* v ) {
   TRACE("(%p)\n", v );
@@ -3476,7 +3476,7 @@
 }
 
 /***********************************************************************
- *              glTexCoord3f
+ *              glTexCoord3f (OPENGL32.@)
  */
 void WINAPI wine_glTexCoord3f( GLfloat s, GLfloat t, GLfloat r ) {
   TRACE("(%f, %f, %f)\n", s, t, r );
@@ -3486,7 +3486,7 @@
 }
 
 /***********************************************************************
- *              glTexCoord3fv
+ *              glTexCoord3fv (OPENGL32.@)
  */
 void WINAPI wine_glTexCoord3fv( GLfloat* v ) {
   TRACE("(%p)\n", v );
@@ -3496,7 +3496,7 @@
 }
 
 /***********************************************************************
- *              glTexCoord3i
+ *              glTexCoord3i (OPENGL32.@)
  */
 void WINAPI wine_glTexCoord3i( GLint s, GLint t, GLint r ) {
   TRACE("(%d, %d, %d)\n", s, t, r );
@@ -3506,7 +3506,7 @@
 }
 
 /***********************************************************************
- *              glTexCoord3iv
+ *              glTexCoord3iv (OPENGL32.@)
  */
 void WINAPI wine_glTexCoord3iv( GLint* v ) {
   TRACE("(%p)\n", v );
@@ -3516,7 +3516,7 @@
 }
 
 /***********************************************************************
- *              glTexCoord3s
+ *              glTexCoord3s (OPENGL32.@)
  */
 void WINAPI wine_glTexCoord3s( GLshort s, GLshort t, GLshort r ) {
   TRACE("(%d, %d, %d)\n", s, t, r );
@@ -3526,7 +3526,7 @@
 }
 
 /***********************************************************************
- *              glTexCoord3sv
+ *              glTexCoord3sv (OPENGL32.@)
  */
 void WINAPI wine_glTexCoord3sv( GLshort* v ) {
   TRACE("(%p)\n", v );
@@ -3536,7 +3536,7 @@
 }
 
 /***********************************************************************
- *              glTexCoord4d
+ *              glTexCoord4d (OPENGL32.@)
  */
 void WINAPI wine_glTexCoord4d( GLdouble s, GLdouble t, GLdouble r, GLdouble q ) {
   TRACE("(%f, %f, %f, %f)\n", s, t, r, q );
@@ -3546,7 +3546,7 @@
 }
 
 /***********************************************************************
- *              glTexCoord4dv
+ *              glTexCoord4dv (OPENGL32.@)
  */
 void WINAPI wine_glTexCoord4dv( GLdouble* v ) {
   TRACE("(%p)\n", v );
@@ -3556,7 +3556,7 @@
 }
 
 /***********************************************************************
- *              glTexCoord4f
+ *              glTexCoord4f (OPENGL32.@)
  */
 void WINAPI wine_glTexCoord4f( GLfloat s, GLfloat t, GLfloat r, GLfloat q ) {
   TRACE("(%f, %f, %f, %f)\n", s, t, r, q );
@@ -3566,7 +3566,7 @@
 }
 
 /***********************************************************************
- *              glTexCoord4fv
+ *              glTexCoord4fv (OPENGL32.@)
  */
 void WINAPI wine_glTexCoord4fv( GLfloat* v ) {
   TRACE("(%p)\n", v );
@@ -3576,7 +3576,7 @@
 }
 
 /***********************************************************************
- *              glTexCoord4i
+ *              glTexCoord4i (OPENGL32.@)
  */
 void WINAPI wine_glTexCoord4i( GLint s, GLint t, GLint r, GLint q ) {
   TRACE("(%d, %d, %d, %d)\n", s, t, r, q );
@@ -3586,7 +3586,7 @@
 }
 
 /***********************************************************************
- *              glTexCoord4iv
+ *              glTexCoord4iv (OPENGL32.@)
  */
 void WINAPI wine_glTexCoord4iv( GLint* v ) {
   TRACE("(%p)\n", v );
@@ -3596,7 +3596,7 @@
 }
 
 /***********************************************************************
- *              glTexCoord4s
+ *              glTexCoord4s (OPENGL32.@)
  */
 void WINAPI wine_glTexCoord4s( GLshort s, GLshort t, GLshort r, GLshort q ) {
   TRACE("(%d, %d, %d, %d)\n", s, t, r, q );
@@ -3606,7 +3606,7 @@
 }
 
 /***********************************************************************
- *              glTexCoord4sv
+ *              glTexCoord4sv (OPENGL32.@)
  */
 void WINAPI wine_glTexCoord4sv( GLshort* v ) {
   TRACE("(%p)\n", v );
@@ -3616,7 +3616,7 @@
 }
 
 /***********************************************************************
- *              glTexCoordPointer
+ *              glTexCoordPointer (OPENGL32.@)
  */
 void WINAPI wine_glTexCoordPointer( GLint size, GLenum type, GLsizei stride, GLvoid* pointer ) {
   TRACE("(%d, %d, %d, %p)\n", size, type, stride, pointer );
@@ -3626,7 +3626,7 @@
 }
 
 /***********************************************************************
- *              glTexEnvf
+ *              glTexEnvf (OPENGL32.@)
  */
 void WINAPI wine_glTexEnvf( GLenum target, GLenum pname, GLfloat param ) {
   TRACE("(%d, %d, %f)\n", target, pname, param );
@@ -3636,7 +3636,7 @@
 }
 
 /***********************************************************************
- *              glTexEnvfv
+ *              glTexEnvfv (OPENGL32.@)
  */
 void WINAPI wine_glTexEnvfv( GLenum target, GLenum pname, GLfloat* params ) {
   TRACE("(%d, %d, %p)\n", target, pname, params );
@@ -3646,7 +3646,7 @@
 }
 
 /***********************************************************************
- *              glTexEnvi
+ *              glTexEnvi (OPENGL32.@)
  */
 void WINAPI wine_glTexEnvi( GLenum target, GLenum pname, GLint param ) {
   TRACE("(%d, %d, %d)\n", target, pname, param );
@@ -3656,7 +3656,7 @@
 }
 
 /***********************************************************************
- *              glTexEnviv
+ *              glTexEnviv (OPENGL32.@)
  */
 void WINAPI wine_glTexEnviv( GLenum target, GLenum pname, GLint* params ) {
   TRACE("(%d, %d, %p)\n", target, pname, params );
@@ -3666,7 +3666,7 @@
 }
 
 /***********************************************************************
- *              glTexGend
+ *              glTexGend (OPENGL32.@)
  */
 void WINAPI wine_glTexGend( GLenum coord, GLenum pname, GLdouble param ) {
   TRACE("(%d, %d, %f)\n", coord, pname, param );
@@ -3676,7 +3676,7 @@
 }
 
 /***********************************************************************
- *              glTexGendv
+ *              glTexGendv (OPENGL32.@)
  */
 void WINAPI wine_glTexGendv( GLenum coord, GLenum pname, GLdouble* params ) {
   TRACE("(%d, %d, %p)\n", coord, pname, params );
@@ -3686,7 +3686,7 @@
 }
 
 /***********************************************************************
- *              glTexGenf
+ *              glTexGenf (OPENGL32.@)
  */
 void WINAPI wine_glTexGenf( GLenum coord, GLenum pname, GLfloat param ) {
   TRACE("(%d, %d, %f)\n", coord, pname, param );
@@ -3696,7 +3696,7 @@
 }
 
 /***********************************************************************
- *              glTexGenfv
+ *              glTexGenfv (OPENGL32.@)
  */
 void WINAPI wine_glTexGenfv( GLenum coord, GLenum pname, GLfloat* params ) {
   TRACE("(%d, %d, %p)\n", coord, pname, params );
@@ -3706,7 +3706,7 @@
 }
 
 /***********************************************************************
- *              glTexGeni
+ *              glTexGeni (OPENGL32.@)
  */
 void WINAPI wine_glTexGeni( GLenum coord, GLenum pname, GLint param ) {
   TRACE("(%d, %d, %d)\n", coord, pname, param );
@@ -3716,7 +3716,7 @@
 }
 
 /***********************************************************************
- *              glTexGeniv
+ *              glTexGeniv (OPENGL32.@)
  */
 void WINAPI wine_glTexGeniv( GLenum coord, GLenum pname, GLint* params ) {
   TRACE("(%d, %d, %p)\n", coord, pname, params );
@@ -3726,7 +3726,7 @@
 }
 
 /***********************************************************************
- *              glTexImage1D
+ *              glTexImage1D (OPENGL32.@)
  */
 void WINAPI wine_glTexImage1D( GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, GLvoid* pixels ) {
   TRACE("(%d, %d, %d, %d, %d, %d, %d, %p)\n", target, level, internalformat, width, border, format, type, pixels );
@@ -3736,7 +3736,7 @@
 }
 
 /***********************************************************************
- *              glTexImage2D
+ *              glTexImage2D (OPENGL32.@)
  */
 void WINAPI wine_glTexImage2D( GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, GLvoid* pixels ) {
   TRACE("(%d, %d, %d, %d, %d, %d, %d, %d, %p)\n", target, level, internalformat, width, height, border, format, type, pixels );
@@ -3746,7 +3746,7 @@
 }
 
 /***********************************************************************
- *              glTexImage3D
+ *              glTexImage3D (OPENGL32.@)
  */
 void WINAPI wine_glTexImage3D( GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, GLvoid* pixels ) {
   TRACE("(%d, %d, %d, %d, %d, %d, %d, %d, %d, %p)\n", target, level, internalformat, width, height, depth, border, format, type, pixels );
@@ -3756,7 +3756,7 @@
 }
 
 /***********************************************************************
- *              glTexParameterf
+ *              glTexParameterf (OPENGL32.@)
  */
 void WINAPI wine_glTexParameterf( GLenum target, GLenum pname, GLfloat param ) {
   TRACE("(%d, %d, %f)\n", target, pname, param );
@@ -3766,7 +3766,7 @@
 }
 
 /***********************************************************************
- *              glTexParameterfv
+ *              glTexParameterfv (OPENGL32.@)
  */
 void WINAPI wine_glTexParameterfv( GLenum target, GLenum pname, GLfloat* params ) {
   TRACE("(%d, %d, %p)\n", target, pname, params );
@@ -3776,7 +3776,7 @@
 }
 
 /***********************************************************************
- *              glTexParameteri
+ *              glTexParameteri (OPENGL32.@)
  */
 void WINAPI wine_glTexParameteri( GLenum target, GLenum pname, GLint param ) {
   TRACE("(%d, %d, %d)\n", target, pname, param );
@@ -3786,7 +3786,7 @@
 }
 
 /***********************************************************************
- *              glTexParameteriv
+ *              glTexParameteriv (OPENGL32.@)
  */
 void WINAPI wine_glTexParameteriv( GLenum target, GLenum pname, GLint* params ) {
   TRACE("(%d, %d, %p)\n", target, pname, params );
@@ -3796,7 +3796,7 @@
 }
 
 /***********************************************************************
- *              glTexSubImage1D
+ *              glTexSubImage1D (OPENGL32.@)
  */
 void WINAPI wine_glTexSubImage1D( GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, GLvoid* pixels ) {
   TRACE("(%d, %d, %d, %d, %d, %d, %p)\n", target, level, xoffset, width, format, type, pixels );
@@ -3806,7 +3806,7 @@
 }
 
 /***********************************************************************
- *              glTexSubImage2D
+ *              glTexSubImage2D (OPENGL32.@)
  */
 void WINAPI wine_glTexSubImage2D( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid* pixels ) {
   TRACE("(%d, %d, %d, %d, %d, %d, %d, %d, %p)\n", target, level, xoffset, yoffset, width, height, format, type, pixels );
@@ -3816,7 +3816,7 @@
 }
 
 /***********************************************************************
- *              glTexSubImage3D
+ *              glTexSubImage3D (OPENGL32.@)
  */
 void WINAPI wine_glTexSubImage3D( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLvoid* pixels ) {
   TRACE("(%d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %p)\n", target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels );
@@ -3826,7 +3826,7 @@
 }
 
 /***********************************************************************
- *              glTranslated
+ *              glTranslated (OPENGL32.@)
  */
 void WINAPI wine_glTranslated( GLdouble x, GLdouble y, GLdouble z ) {
   TRACE("(%f, %f, %f)\n", x, y, z );
@@ -3836,7 +3836,7 @@
 }
 
 /***********************************************************************
- *              glTranslatef
+ *              glTranslatef (OPENGL32.@)
  */
 void WINAPI wine_glTranslatef( GLfloat x, GLfloat y, GLfloat z ) {
   TRACE("(%f, %f, %f)\n", x, y, z );
@@ -3846,7 +3846,7 @@
 }
 
 /***********************************************************************
- *              glVertex2d
+ *              glVertex2d (OPENGL32.@)
  */
 void WINAPI wine_glVertex2d( GLdouble x, GLdouble y ) {
   TRACE("(%f, %f)\n", x, y );
@@ -3856,7 +3856,7 @@
 }
 
 /***********************************************************************
- *              glVertex2dv
+ *              glVertex2dv (OPENGL32.@)
  */
 void WINAPI wine_glVertex2dv( GLdouble* v ) {
   TRACE("(%p)\n", v );
@@ -3866,7 +3866,7 @@
 }
 
 /***********************************************************************
- *              glVertex2f
+ *              glVertex2f (OPENGL32.@)
  */
 void WINAPI wine_glVertex2f( GLfloat x, GLfloat y ) {
   TRACE("(%f, %f)\n", x, y );
@@ -3876,7 +3876,7 @@
 }
 
 /***********************************************************************
- *              glVertex2fv
+ *              glVertex2fv (OPENGL32.@)
  */
 void WINAPI wine_glVertex2fv( GLfloat* v ) {
   TRACE("(%p)\n", v );
@@ -3886,7 +3886,7 @@
 }
 
 /***********************************************************************
- *              glVertex2i
+ *              glVertex2i (OPENGL32.@)
  */
 void WINAPI wine_glVertex2i( GLint x, GLint y ) {
   TRACE("(%d, %d)\n", x, y );
@@ -3896,7 +3896,7 @@
 }
 
 /***********************************************************************
- *              glVertex2iv
+ *              glVertex2iv (OPENGL32.@)
  */
 void WINAPI wine_glVertex2iv( GLint* v ) {
   TRACE("(%p)\n", v );
@@ -3906,7 +3906,7 @@
 }
 
 /***********************************************************************
- *              glVertex2s
+ *              glVertex2s (OPENGL32.@)
  */
 void WINAPI wine_glVertex2s( GLshort x, GLshort y ) {
   TRACE("(%d, %d)\n", x, y );
@@ -3916,7 +3916,7 @@
 }
 
 /***********************************************************************
- *              glVertex2sv
+ *              glVertex2sv (OPENGL32.@)
  */
 void WINAPI wine_glVertex2sv( GLshort* v ) {
   TRACE("(%p)\n", v );
@@ -3926,7 +3926,7 @@
 }
 
 /***********************************************************************
- *              glVertex3d
+ *              glVertex3d (OPENGL32.@)
  */
 void WINAPI wine_glVertex3d( GLdouble x, GLdouble y, GLdouble z ) {
   TRACE("(%f, %f, %f)\n", x, y, z );
@@ -3936,7 +3936,7 @@
 }
 
 /***********************************************************************
- *              glVertex3dv
+ *              glVertex3dv (OPENGL32.@)
  */
 void WINAPI wine_glVertex3dv( GLdouble* v ) {
   TRACE("(%p)\n", v );
@@ -3946,7 +3946,7 @@
 }
 
 /***********************************************************************
- *              glVertex3f
+ *              glVertex3f (OPENGL32.@)
  */
 void WINAPI wine_glVertex3f( GLfloat x, GLfloat y, GLfloat z ) {
   TRACE("(%f, %f, %f)\n", x, y, z );
@@ -3956,7 +3956,7 @@
 }
 
 /***********************************************************************
- *              glVertex3fv
+ *              glVertex3fv (OPENGL32.@)
  */
 void WINAPI wine_glVertex3fv( GLfloat* v ) {
   TRACE("(%p)\n", v );
@@ -3966,7 +3966,7 @@
 }
 
 /***********************************************************************
- *              glVertex3i
+ *              glVertex3i (OPENGL32.@)
  */
 void WINAPI wine_glVertex3i( GLint x, GLint y, GLint z ) {
   TRACE("(%d, %d, %d)\n", x, y, z );
@@ -3976,7 +3976,7 @@
 }
 
 /***********************************************************************
- *              glVertex3iv
+ *              glVertex3iv (OPENGL32.@)
  */
 void WINAPI wine_glVertex3iv( GLint* v ) {
   TRACE("(%p)\n", v );
@@ -3986,7 +3986,7 @@
 }
 
 /***********************************************************************
- *              glVertex3s
+ *              glVertex3s (OPENGL32.@)
  */
 void WINAPI wine_glVertex3s( GLshort x, GLshort y, GLshort z ) {
   TRACE("(%d, %d, %d)\n", x, y, z );
@@ -3996,7 +3996,7 @@
 }
 
 /***********************************************************************
- *              glVertex3sv
+ *              glVertex3sv (OPENGL32.@)
  */
 void WINAPI wine_glVertex3sv( GLshort* v ) {
   TRACE("(%p)\n", v );
@@ -4006,7 +4006,7 @@
 }
 
 /***********************************************************************
- *              glVertex4d
+ *              glVertex4d (OPENGL32.@)
  */
 void WINAPI wine_glVertex4d( GLdouble x, GLdouble y, GLdouble z, GLdouble w ) {
   TRACE("(%f, %f, %f, %f)\n", x, y, z, w );
@@ -4016,7 +4016,7 @@
 }
 
 /***********************************************************************
- *              glVertex4dv
+ *              glVertex4dv (OPENGL32.@)
  */
 void WINAPI wine_glVertex4dv( GLdouble* v ) {
   TRACE("(%p)\n", v );
@@ -4026,7 +4026,7 @@
 }
 
 /***********************************************************************
- *              glVertex4f
+ *              glVertex4f (OPENGL32.@)
  */
 void WINAPI wine_glVertex4f( GLfloat x, GLfloat y, GLfloat z, GLfloat w ) {
   TRACE("(%f, %f, %f, %f)\n", x, y, z, w );
@@ -4036,7 +4036,7 @@
 }
 
 /***********************************************************************
- *              glVertex4fv
+ *              glVertex4fv (OPENGL32.@)
  */
 void WINAPI wine_glVertex4fv( GLfloat* v ) {
   TRACE("(%p)\n", v );
@@ -4046,7 +4046,7 @@
 }
 
 /***********************************************************************
- *              glVertex4i
+ *              glVertex4i (OPENGL32.@)
  */
 void WINAPI wine_glVertex4i( GLint x, GLint y, GLint z, GLint w ) {
   TRACE("(%d, %d, %d, %d)\n", x, y, z, w );
@@ -4056,7 +4056,7 @@
 }
 
 /***********************************************************************
- *              glVertex4iv
+ *              glVertex4iv (OPENGL32.@)
  */
 void WINAPI wine_glVertex4iv( GLint* v ) {
   TRACE("(%p)\n", v );
@@ -4066,7 +4066,7 @@
 }
 
 /***********************************************************************
- *              glVertex4s
+ *              glVertex4s (OPENGL32.@)
  */
 void WINAPI wine_glVertex4s( GLshort x, GLshort y, GLshort z, GLshort w ) {
   TRACE("(%d, %d, %d, %d)\n", x, y, z, w );
@@ -4076,7 +4076,7 @@
 }
 
 /***********************************************************************
- *              glVertex4sv
+ *              glVertex4sv (OPENGL32.@)
  */
 void WINAPI wine_glVertex4sv( GLshort* v ) {
   TRACE("(%p)\n", v );
@@ -4086,7 +4086,7 @@
 }
 
 /***********************************************************************
- *              glVertexPointer
+ *              glVertexPointer (OPENGL32.@)
  */
 void WINAPI wine_glVertexPointer( GLint size, GLenum type, GLsizei stride, GLvoid* pointer ) {
   TRACE("(%d, %d, %d, %p)\n", size, type, stride, pointer );
@@ -4096,7 +4096,7 @@
 }
 
 /***********************************************************************
- *              glViewport
+ *              glViewport (OPENGL32.@)
  */
 void WINAPI wine_glViewport( GLint x, GLint y, GLsizei width, GLsizei height ) {
   TRACE("(%d, %d, %d, %d)\n", x, y, width, height );
diff --git a/dlls/richedit/richedit.c b/dlls/richedit/richedit.c
index 8e92282..f65b4d5 100644
--- a/dlls/richedit/richedit.c
+++ b/dlls/richedit/richedit.c
@@ -148,9 +148,9 @@
 }
 
 /***********************************************************************
- * DllGetVersion [COMCTL32.25]
+ * DllGetVersion [RICHED32.2]
  *
- * Retrieves version information of the 'COMCTL32.DLL'
+ * Retrieves version information of the 'RICHED32.DLL'
  *
  * PARAMS
  *     pdvi [O] pointer to version information structure.
diff --git a/dlls/setupapi/setupx_main.c b/dlls/setupapi/setupx_main.c
index 8398abc..df95b0d 100644
--- a/dlls/setupapi/setupx_main.c
+++ b/dlls/setupapi/setupx_main.c
@@ -276,7 +276,7 @@
 
 
 /***********************************************************************
- *		InstallHinfSection
+ *		InstallHinfSection (SETUPX.527)
  *
  * hwnd = parent window
  * hinst = instance of SETUPX.DLL
@@ -978,7 +978,7 @@
 }
 
 /***********************************************************************
- *		GenFormStrWithoutPlaceHolders
+ *		GenFormStrWithoutPlaceHolders (SETUPX.103)
  *
  * ought to be pretty much implemented, I guess...
  */
@@ -1154,7 +1154,7 @@
 }
 
 /***********************************************************************
- *		GenInstall
+ *		GenInstall (SETUPX.101)
  *
  * generic installer function for .INF file sections
  *
diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c
index 5533a50..08ce420 100644
--- a/dlls/shell32/brsfolder.c
+++ b/dlls/shell32/brsfolder.c
@@ -309,6 +309,7 @@
 
 /*************************************************************************
  * SHBrowseForFolderA [SHELL32.@]
+ * SHBrowseForFolder  [SHELL32.@]
  *
  */
 LPITEMIDLIST WINAPI SHBrowseForFolderA (LPBROWSEINFOA lpbi)
diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c
index a864343..a14e46d 100644
--- a/dlls/shell32/shellord.c
+++ b/dlls/shell32/shellord.c
@@ -716,7 +716,7 @@
 	return 0;
 }
 /*************************************************************************
- * ReadCabinetState				[NT 4.0:SHELL32.651]
+ * ReadCabinetState				[SHELL32.651] NT 4.0
  *
  */
 HRESULT WINAPI ReadCabinetState(DWORD u, DWORD v)
@@ -724,7 +724,7 @@
 	return 0;
 }
 /*************************************************************************
- * WriteCabinetState				[NT 4.0:SHELL32.652]
+ * WriteCabinetState				[SHELL32.652] NT 4.0
  *
  */
 HRESULT WINAPI WriteCabinetState(DWORD u)
@@ -740,7 +740,7 @@
 	return 0;
 }
 /*************************************************************************
- * IsUserAdmin					[NT 4.0:SHELL32.680]
+ * IsUserAdmin					[SHELL32.680] NT 4.0
  *
  */
 HRESULT WINAPI IsUserAdmin(void)
@@ -987,7 +987,7 @@
 }
 
 /*************************************************************************
- *      SHReplaceFromPropSheetExtArray	[SHELL]
+ *      SHReplaceFromPropSheetExtArray	[SHELL32.170]
  */
 DWORD WINAPI SHReplaceFromPropSheetExtArray(DWORD a, DWORD b, DWORD c, DWORD d)
 {
diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c
index fde512f..c60cc6e 100644
--- a/dlls/shell32/shellpath.c
+++ b/dlls/shell32/shellpath.c
@@ -1094,7 +1094,7 @@
 }
 
 /*************************************************************************
- * SHGetFolderPathA			[SHFOLDER.@]
+ * SHGetFolderPathA			[SHELL32.@]
  */
 HRESULT WINAPI SHGetFolderPathA(
 	HWND hwndOwner,
@@ -1111,7 +1111,7 @@
 }
 
 /*************************************************************************
- * SHGetFolderPathW			[SHFOLDER.@]
+ * SHGetFolderPathW			[SHELL32.@]
  */
 HRESULT WINAPI SHGetFolderPathW(
 	HWND hwndOwner,
diff --git a/dlls/shell32/shellreg.c b/dlls/shell32/shellreg.c
index 63b44cf..a1e46f3 100644
--- a/dlls/shell32/shellreg.c
+++ b/dlls/shell32/shellreg.c
@@ -29,7 +29,7 @@
 }
 
 /*************************************************************************
- * SHRegOpenKeyW				[NT4.0:SHELL32.507]
+ * SHRegOpenKeyW				[SHELL32.507] NT 4.0
  *
  */
 HRESULT WINAPI SHRegOpenKeyW (
@@ -58,7 +58,7 @@
 }
 
 /*************************************************************************
- * SHRegQueryValueW				[NT4.0:SHELL32.510]
+ * SHRegQueryValueW				[SHELL32.510] NT4.0
  *
  */
 HRESULT WINAPI SHRegQueryValueW(
@@ -73,7 +73,7 @@
 }
 
 /*************************************************************************
- * SHRegQueryValueExW	[NT4.0:SHELL32.511]
+ * SHRegQueryValueExW	[SHELL32.511] NT4.0
  *
  * FIXME 
  *  if the datatype REG_EXPAND_SZ then expand the string and change
@@ -95,7 +95,7 @@
 }
 
 /*************************************************************************
- * SHRegDeleteKeyA   [SHELL32]
+ * SHRegDeleteKeyA   [SHELL32.?]
  */
 HRESULT WINAPI SHRegDeleteKeyA(
 	HKEY hkey,
@@ -117,7 +117,7 @@
 }
 
 /*************************************************************************
- * SHRegCloseKey			[NT4.0:SHELL32.505]
+ * SHRegCloseKey			[SHELL32.505] NT 4.0
  *
  */
 HRESULT WINAPI SHRegCloseKey (HKEY hkey)
diff --git a/dlls/shlwapi/regstream.c b/dlls/shlwapi/regstream.c
index 2952ca6..4646054 100644
--- a/dlls/shlwapi/regstream.c
+++ b/dlls/shlwapi/regstream.c
@@ -292,6 +292,7 @@
 
 /*************************************************************************
  * SHOpenRegStreamA				[SHLWAPI.@]
+ * SHOpenRegStream2A				[SHLWAPI.@]
  */
 IStream * WINAPI SHOpenRegStreamA(
 	HKEY hkey,
@@ -307,6 +308,7 @@
 
 /*************************************************************************
  * SHOpenRegStreamW				[SHLWAPI.@]
+ * SHOpenRegStream2W				[SHLWAPI.@]
  */
 IStream * WINAPI SHOpenRegStreamW(
 	HKEY hkey,
diff --git a/dlls/user/lstr.c b/dlls/user/lstr.c
index 95ac585..48c7356 100644
--- a/dlls/user/lstr.c
+++ b/dlls/user/lstr.c
@@ -484,7 +484,7 @@
 
 
 /***********************************************************************
- *           IsCharLowerA   (USER.436)
+ *           IsCharLower    (USER.436)
  *           IsCharLowerA   (USER32.@)
  */
 BOOL WINAPI IsCharLowerA(CHAR x)
@@ -505,7 +505,7 @@
 
 
 /***********************************************************************
- *           IsCharUpperA   (USER.435)
+ *           IsCharUpper    (USER.435)
  *           IsCharUpperA   (USER32.@)
  */
 BOOL WINAPI IsCharUpperA(CHAR x)
diff --git a/dlls/user/mouse.c b/dlls/user/mouse.c
index 124e27d..8ec60ae 100644
--- a/dlls/user/mouse.c
+++ b/dlls/user/mouse.c
@@ -65,6 +65,8 @@
     USER_Driver.pInitMouse( lpMouseEventProc );
 }
 
+/**********************************************************************/
+
 static VOID WINAPI MOUSE_CallMouseEventProc( FARPROC16 proc,
                                              DWORD dwFlags, DWORD dx, DWORD dy,
                                              DWORD cButtons, DWORD dwExtraInfo )
@@ -84,6 +86,8 @@
     wine_call_to_16_regs_short( &context, 0 );
 }
 
+/**********************************************************************/
+
 VOID WINAPI WIN16_MOUSE_Enable( FARPROC16 proc )
 {
     LPMOUSE_EVENT_PROC thunk = 
diff --git a/dlls/version/install.c b/dlls/version/install.c
index 7779088..41554da 100644
--- a/dlls/version/install.c
+++ b/dlls/version/install.c
@@ -93,8 +93,8 @@
 }
 
 /*****************************************************************************
+ *   VerFindFileA [VERSION.@]
  *
- *   VerFindFileA [VER.8]
  *   Determines where to install a file based on whether it locates another
  *   version of the file in the system.  The values VerFindFile returns are
  *   used in a subsequent call to the VerInstallFile function.
diff --git a/dlls/win32s/w32sys.c b/dlls/win32s/w32sys.c
index 72ce582..1065b5e 100644
--- a/dlls/win32s/w32sys.c
+++ b/dlls/win32s/w32sys.c
@@ -59,7 +59,7 @@
 }
 
 /***********************************************************************
- *           LoadPeResource
+ *           LoadPeResource (W32SYS.11)
  */
 DWORD WINAPI LoadPeResource16(WORD x,SEGPTR y) {
 	FIXME("(0x%04x,0x%08lx),stub!\n",x,y);
diff --git a/dlls/wineps/driver.c b/dlls/wineps/driver.c
index d0fbaf5..b33980a 100644
--- a/dlls/wineps/driver.c
+++ b/dlls/wineps/driver.c
@@ -147,8 +147,7 @@
 
 
 /**************************************************************
- *
- *	AdvancedSetupDialog	[WINEPS.93]
+ *	AdvancedSetupDialog	[WINEPS16.93]
  *
  */
 WORD WINAPI PSDRV_AdvancedSetupDialog16(HWND16 hwnd, HANDLE16 hDriver,
@@ -245,8 +244,7 @@
 static int WINAPI (*pPropertySheet) (LPCPROPSHEETHEADERA);
 
 /***************************************************************
- *
- *	ExtDeviceMode	[WINEPS.90]
+ *	ExtDeviceMode	[WINEPS16.90]
  *
  * Just returns default devmode at the moment
  */
@@ -330,8 +328,7 @@
 }
 
 /***********************************************************************
- *
- *	DeviceCapabilities	[WINEPS.91]
+ *	DeviceCapabilities	[WINEPS16.91]
  *
  */
 DWORD WINAPI PSDRV_DeviceCapabilities16(LPCSTR lpszDevice, LPCSTR lpszPort,
@@ -553,8 +550,7 @@
 }
 
 /***************************************************************
- *
- *	DeviceMode	[WINEPS.13]
+ *	DeviceMode	[WINEPS16.13]
  *
  */
 void WINAPI PSDRV_DeviceMode16(HWND16 hwnd, HANDLE16 hDriver,
diff --git a/dlls/winmm/driver.c b/dlls/winmm/driver.c
index 38c22ea..5cbf743 100644
--- a/dlls/winmm/driver.c
+++ b/dlls/winmm/driver.c
@@ -215,6 +215,7 @@
 
 /**************************************************************************
  *				SendDriverMessage		[WINMM.@]
+ *				DrvSendMessage			[WINMM.@]
  */
 LRESULT WINAPI SendDriverMessage(HDRVR hDriver, UINT msg, LPARAM lParam1,
 				 LPARAM lParam2)
@@ -395,6 +396,7 @@
 
 /**************************************************************************
  *				OpenDriverA		        [WINMM.@]
+ *				DrvOpenA			[WINMM.@]
  * (0,1,DRV_LOAD  ,0       ,0)
  * (0,1,DRV_ENABLE,0       ,0)
  * (0,1,DRV_OPEN  ,buf[256],0)
@@ -442,6 +444,7 @@
 
 /**************************************************************************
  *			CloseDriver				[WINMM.@]
+ *			DrvClose				[WINMM.@]
  */
 LRESULT WINAPI CloseDriver(HDRVR hDrvr, LPARAM lParam1, LPARAM lParam2)
 {
@@ -491,6 +494,7 @@
 
 /**************************************************************************
  *				GetDriverModuleHandle	[WINMM.@]
+ *				DrvGetModuleHandle	[WINMM.@]
  */
 HMODULE WINAPI GetDriverModuleHandle(HDRVR hDrvr)
 {
@@ -551,6 +555,7 @@
 
 /**************************************************************************
  * 				DefDriverProc			  [WINMM.@]
+ * 				DrvDefDriverProc		  [WINMM.@]
  */
 LRESULT WINAPI DefDriverProc(DWORD dwDriverIdentifier, HDRVR hDrv,
 			     UINT Msg, LPARAM lParam1, LPARAM lParam2)
diff --git a/dlls/winmm/joystick/joystick.c b/dlls/winmm/joystick/joystick.c
index 3dab2ec..df0d440 100644
--- a/dlls/winmm/joystick/joystick.c
+++ b/dlls/winmm/joystick/joystick.c
@@ -336,7 +336,7 @@
 }
 
 /**************************************************************************
- * 				DriverProc		[internal]
+ * 				DriverProc (JOYSTICK.@)
  */
 LONG CALLBACK	JSTCK_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg, 
 				 DWORD dwParam1, DWORD dwParam2)
@@ -370,7 +370,7 @@
 #else
 
 /**************************************************************************
- * 				DriverProc		[internal]
+ * 				DriverProc (JOYSTICK.@)
  */
 LONG CALLBACK	JSTCK_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg, 
 				 DWORD dwParam1, DWORD dwParam2)
diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c
index f9c6abc..f3aca25 100644
--- a/dlls/winmm/mci.c
+++ b/dlls/winmm/mci.c
@@ -833,7 +833,6 @@
 }
 
 /**************************************************************************
- * 				mciSendStringA		[MMSYSTEM.702]
  * 				mciSendStringA		[WINMM.@]
  */
 DWORD WINAPI mciSendStringA(LPCSTR lpstrCommand, LPSTR lpstrRet, 
@@ -1045,6 +1044,7 @@
 
 /**************************************************************************
  * 				mciExecute			[WINMM.@]
+ * 				mciExecute			[MMSYSTEM.712]
  */
 DWORD WINAPI mciExecute(LPCSTR lpstrCommand)
 {
diff --git a/dlls/winmm/mcianim/mcianim.c b/dlls/winmm/mcianim/mcianim.c
index da8b6bb..b1bb879 100644
--- a/dlls/winmm/mcianim/mcianim.c
+++ b/dlls/winmm/mcianim/mcianim.c
@@ -631,7 +631,7 @@
 }
 
 /**************************************************************************
- * 				MCIANIM_DriverProc	[sample driver]
+ * 				DriverProc (MCIANIM.@)
  */
 LONG WINAPI MCIANIM_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg, 
 			       DWORD dwParam1, DWORD dwParam2)
diff --git a/dlls/winmm/mciavi/mciavi.c b/dlls/winmm/mciavi/mciavi.c
index c8dce65..44b9dce 100644
--- a/dlls/winmm/mciavi/mciavi.c
+++ b/dlls/winmm/mciavi/mciavi.c
@@ -914,7 +914,7 @@
  *======================================================================*/
 
 /**************************************************************************
- * 				MCIAVI_DriverProc	[sample driver]
+ * 				DriverProc (MCIAVI.@)
  */
 LONG CALLBACK	MCIAVI_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg, 
 				  DWORD dwParam1, DWORD dwParam2)
diff --git a/dlls/winmm/mcicda/mcicda.c b/dlls/winmm/mcicda/mcicda.c
index a702e18..9dd9401 100644
--- a/dlls/winmm/mcicda/mcicda.c
+++ b/dlls/winmm/mcicda/mcicda.c
@@ -792,7 +792,7 @@
 }
 
 /**************************************************************************
- * 			DriverProc			[exported]
+ * 			DriverProc (MCICDA.@)
  */
 LONG CALLBACK	MCICDA_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg, 
 				      DWORD dwParam1, DWORD dwParam2)
diff --git a/dlls/winmm/mciseq/mcimidi.c b/dlls/winmm/mciseq/mcimidi.c
index 82270e0..247c93c 100644
--- a/dlls/winmm/mciseq/mcimidi.c
+++ b/dlls/winmm/mciseq/mcimidi.c
@@ -1626,7 +1626,7 @@
  *======================================================================*/
 
 /**************************************************************************
- * 				MCIMIDI_DriverProc	     [sample driver]
+ * 				DriverProc (MCISEQ.@)
  */
 LONG CALLBACK	MCIMIDI_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg, 
 				   DWORD dwParam1, DWORD dwParam2)
diff --git a/dlls/winmm/mciwave/mciwave.c b/dlls/winmm/mciwave/mciwave.c
index 97d0cc4..6ea1197 100644
--- a/dlls/winmm/mciwave/mciwave.c
+++ b/dlls/winmm/mciwave/mciwave.c
@@ -1563,7 +1563,7 @@
 }
 
 /**************************************************************************
- * 				MCIWAVE_DriverProc		[sample driver]
+ * 				DriverProc (MCIWAVE.@)
  */
 LONG CALLBACK	MCIWAVE_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg, 
 				   DWORD dwParam1, DWORD dwParam2)
diff --git a/dlls/winmm/midimap/midimap.c b/dlls/winmm/midimap/midimap.c
index 20f0a96..393c2d7 100644
--- a/dlls/winmm/midimap/midimap.c
+++ b/dlls/winmm/midimap/midimap.c
@@ -424,7 +424,7 @@
 }
 
 /**************************************************************************
- * 				MIDIMAP_modMessage	[sample driver]
+ * 				modMessage (MIDIMAP.@)
  */
 DWORD WINAPI MIDIMAP_modMessage(UINT wDevID, UINT wMsg, DWORD dwUser, 
 				DWORD dwParam1, DWORD dwParam2)
@@ -514,7 +514,7 @@
 }
 
 /**************************************************************************
- * 				DriverProc		[internal]
+ * 				DriverProc (MIDIMAP.@)
  */
 LONG CALLBACK	MIDIMAP_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg, 
 				   DWORD dwParam1, DWORD dwParam2)
diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c
index b030723..53ad279 100644
--- a/dlls/winmm/mmio.c
+++ b/dlls/winmm/mmio.c
@@ -1047,7 +1047,7 @@
 }
 
 /**************************************************************************
- * 				mmioSeek       		[MMSYSTEM.1214]
+ * 				mmioSeek		[WINMM.@]
  */
 LONG WINAPI mmioSeek(HMMIO hmmio, LONG lOffset, INT iOrigin)
 {
@@ -1288,7 +1288,7 @@
 }
 
 /**************************************************************************
- * 				mmioAdvance    		[MMSYSTEM.1219]
+ * 				mmioAdvance      	[WINMM.@]
  */
 UINT WINAPI mmioAdvance(HMMIO hmmio, MMIOINFO* lpmmioinfo, UINT uFlags)
 {
@@ -1464,7 +1464,7 @@
 }
 
 /**************************************************************************
- * 				mmioDescend	       	[MMSYSTEM.1223]
+ * 				mmioDescend         	[WINMM.@]
  */
 UINT WINAPI mmioDescend(HMMIO hmmio, LPMMCKINFO lpck,
 			const MMCKINFO* lpckParent, UINT uFlags)
diff --git a/dlls/winmm/mmsystem.c b/dlls/winmm/mmsystem.c
index b0d87db..88fb28b 100644
--- a/dlls/winmm/mmsystem.c
+++ b/dlls/winmm/mmsystem.c
@@ -103,7 +103,7 @@
 }
 
 /**************************************************************************
- * 			WINMM_LibMain				[EntryPoint]
+ *		DllEntryPoint (WINMM.init)
  *
  * WINMM DLL entry point
  *
@@ -132,7 +132,7 @@
 }
 
 /**************************************************************************
- * 			DllEntryPoint			[EntryPoint]
+ * 			DllEntryPoint (MMSYSTEM.2046)
  *
  * MMSYSTEM DLL entry point
  *
@@ -472,7 +472,8 @@
 }
 
 /**************************************************************************
- * 				PlaySound 		[MMSYSTEM.3]
+ * 				@			[WINMM.1]
+ * 				PlaySound		[WINMM.@]
  * 				PlaySoundA		[WINMM.@]
  */
 BOOL WINAPI PlaySoundA(LPCSTR pszSound, HMODULE hmod, DWORD fdwSound)
@@ -578,7 +579,7 @@
 }
 
 /**************************************************************************
- * 				sndPlaySoundA		[WINMM135]
+ * 				sndPlaySoundA		[WINMM.@]
  */
 BOOL WINAPI sndPlaySoundA(LPCSTR lpszSoundName, UINT uFlags)
 {
@@ -630,7 +631,7 @@
 }
 
 /**************************************************************************
- * 				DriverCallback			[MMSYSTEM.31]
+ * 				DriverCallback			[WINMM.@]
  */
 BOOL WINAPI DriverCallback(DWORD dwCallBack, UINT uFlags, HDRVR hDev, 
 			   UINT wMsg, DWORD dwUser, DWORD dwParam1, 
@@ -924,7 +925,7 @@
 }
 
 /**************************************************************************
- * 				mixerGetID
+ * 				mixerGetID (MMSYSTEM.806)
  */
 UINT16 WINAPI mixerGetID16(HMIXEROBJ16 hmix, LPUINT16 lpid, DWORD fdwID) 
 {
@@ -1476,7 +1477,7 @@
 }
 
 /**************************************************************************
- * 				auxOutMessage		[MMSYSTEM.354]
+ * 				auxOutMessage		[WINMM.@]
  */
 DWORD WINAPI auxOutMessage(UINT uDeviceID, UINT uMessage, DWORD dw1, DWORD dw2)
 {
@@ -3677,7 +3678,7 @@
 }
 
 /**************************************************************************
- * 				waveOutGetNumDevs		[MMSYSTEM.401]
+ * 				waveOutGetNumDevs		[WINMM.@]
  */
 UINT WINAPI waveOutGetNumDevs(void) 
 {
@@ -3685,7 +3686,7 @@
 }
 
 /**************************************************************************
- * 				waveOutGetNumDevs		[WINMM.@]
+ * 				waveOutGetNumDevs		[MMSYSTEM.401]
  */
 UINT16 WINAPI waveOutGetNumDevs16(void)
 {
@@ -3963,7 +3964,7 @@
 }
 
 /**************************************************************************
- * 				waveOutWrite		[MMSYSTEM.408]
+ * 				waveOutWrite		[WINMM.@]
  */
 UINT WINAPI waveOutWrite(HWAVEOUT hWaveOut, LPWAVEHDR lpWaveOutHdr,
 			 UINT uSize)
@@ -4273,7 +4274,7 @@
 }
     
 /**************************************************************************
- * 				waveOutGetID	 	[MMSYSTEM.420]
+ * 				waveOutGetID		[WINMM.@]
  */
 UINT WINAPI waveOutGetID(HWAVEOUT hWaveOut, UINT* lpuDeviceID)
 {
@@ -5231,7 +5232,7 @@
 /* ### stop build ### */
 
 /**************************************************************************
- * 				__wine_mmThreadEntryPoint		[internal]
+ * 				__wine_mmThreadEntryPoint (MMSYSTEM.2047)
  */
 void WINAPI WINE_mmThreadEntryPoint(DWORD _pmt)
 {
diff --git a/dlls/winmm/time.c b/dlls/winmm/time.c
index fddd5d2..40c3fe5 100644
--- a/dlls/winmm/time.c
+++ b/dlls/winmm/time.c
@@ -276,7 +276,7 @@
 }
 
 /**************************************************************************
- * 				timeSetEvent		[MMSYSTEM.602]
+ * 				timeSetEvent		[WINMM.@]
  */
 MMRESULT WINAPI timeSetEvent(UINT wDelay, UINT wResol, LPTIMECALLBACK lpFunc,
 			     DWORD dwUser, UINT wFlags)
diff --git a/dlls/winmm/wavemap/wavemap.c b/dlls/winmm/wavemap/wavemap.c
index 1deda85..33f474a 100644
--- a/dlls/winmm/wavemap/wavemap.c
+++ b/dlls/winmm/wavemap/wavemap.c
@@ -383,7 +383,7 @@
 }
 
 /**************************************************************************
- * 				WAVEMAP_wodMessage	[sample driver]
+ * 				wodMessage (MSACMMAP.@)
  */
 DWORD WINAPI WAVEMAP_wodMessage(UINT wDevID, UINT wMsg, DWORD dwUser, 
 				DWORD dwParam1, DWORD dwParam2)
@@ -736,7 +736,7 @@
 }
 
 /**************************************************************************
- * 				WAVEMAP_widMessage	[sample driver]
+ * 				widMessage (MSACMMAP.@)
  */
 DWORD WINAPI WAVEMAP_widMessage(WORD wDevID, WORD wMsg, DWORD dwUser, 
 				DWORD dwParam1, DWORD dwParam2)
@@ -803,7 +803,7 @@
 }
 
 /**************************************************************************
- * 				DriverProc		[internal]
+ * 				DriverProc (MSACMMAP.@)
  */
 LONG CALLBACK	WAVEMAP_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg, 
 				   DWORD dwParam1, DWORD dwParam2)
diff --git a/dlls/winmm/wineoss/audio.c b/dlls/winmm/wineoss/audio.c
index 82e5c97..9a37e2f 100644
--- a/dlls/winmm/wineoss/audio.c
+++ b/dlls/winmm/wineoss/audio.c
@@ -1243,7 +1243,7 @@
 }
 
 /**************************************************************************
- * 				OSS_wodMessage		[sample driver]
+ * 				wodMessage (WINEOSS.7)
  */
 DWORD WINAPI OSS_wodMessage(UINT wDevID, UINT wMsg, DWORD dwUser, 
 			    DWORD dwParam1, DWORD dwParam2)
@@ -2275,7 +2275,7 @@
 }
 
 /**************************************************************************
- * 				OSS_widMessage			[sample driver]
+ * 				widMessage (WINEOSS.6)
  */
 DWORD WINAPI OSS_widMessage(WORD wDevID, WORD wMsg, DWORD dwUser, 
 			    DWORD dwParam1, DWORD dwParam2)
@@ -2310,7 +2310,7 @@
 #else /* !HAVE_OSS */
 
 /**************************************************************************
- * 				OSS_wodMessage			[sample driver]
+ * 				wodMessage (WINEOSS.7)
  */
 DWORD WINAPI OSS_wodMessage(WORD wDevID, WORD wMsg, DWORD dwUser, 
 			    DWORD dwParam1, DWORD dwParam2)
@@ -2320,7 +2320,7 @@
 }
 
 /**************************************************************************
- * 				OSS_widMessage			[sample driver]
+ * 				widMessage (WINEOSS.6)
  */
 DWORD WINAPI OSS_widMessage(WORD wDevID, WORD wMsg, DWORD dwUser, 
 			    DWORD dwParam1, DWORD dwParam2)
diff --git a/dlls/winmm/wineoss/midi.c b/dlls/winmm/wineoss/midi.c
index 1d0b700..710f6e9 100644
--- a/dlls/winmm/wineoss/midi.c
+++ b/dlls/winmm/wineoss/midi.c
@@ -1535,7 +1535,7 @@
  *======================================================================*/
 
 /**************************************************************************
- * 			OSS_midMessage			[sample driver]
+ * 			midMessage (WINEOSS.4)
  */
 DWORD WINAPI OSS_midMessage(UINT wDevID, UINT wMsg, DWORD dwUser, 
 			    DWORD dwParam1, DWORD dwParam2)
@@ -1577,7 +1577,7 @@
 }
 
 /**************************************************************************
- * 				OSS_modMessage		[sample driver]
+ * 				modMessage (WINEOSS.5)
  */
 DWORD WINAPI OSS_modMessage(UINT wDevID, UINT wMsg, DWORD dwUser, 
 			    DWORD dwParam1, DWORD dwParam2)
diff --git a/dlls/winmm/wineoss/mixer.c b/dlls/winmm/wineoss/mixer.c
index 5e33435..c1491ae 100644
--- a/dlls/winmm/wineoss/mixer.c
+++ b/dlls/winmm/wineoss/mixer.c
@@ -638,7 +638,7 @@
 #endif /* HAVE_OSS */
 
 /**************************************************************************
- * 				OSS_mixMessage		[sample driver]
+ * 				mixMessage (WINEOSS.3)
  */
 DWORD WINAPI OSS_mixMessage(UINT wDevID, UINT wMsg, DWORD dwUser, 
 			    DWORD dwParam1, DWORD dwParam2)
diff --git a/dlls/winmm/wineoss/mmaux.c b/dlls/winmm/wineoss/mmaux.c
index 881016f..ff584a4 100644
--- a/dlls/winmm/wineoss/mmaux.c
+++ b/dlls/winmm/wineoss/mmaux.c
@@ -224,7 +224,7 @@
 #endif
 
 /**************************************************************************
- *		OSS_auxMessage				[sample driver]
+ *		auxMessage (WINEOSS.2)
  */
 DWORD WINAPI OSS_auxMessage(UINT wDevID, UINT wMsg, DWORD dwUser, 
 			    DWORD dwParam1, DWORD dwParam2)
diff --git a/dlls/winmm/wineoss/oss.c b/dlls/winmm/wineoss/oss.c
index ba6bbb7..bf8367e 100644
--- a/dlls/winmm/wineoss/oss.c
+++ b/dlls/winmm/wineoss/oss.c
@@ -47,7 +47,7 @@
 
 
 /**************************************************************************
- * 				DriverProc			[internal]
+ * 				DriverProc (WINEOSS.1)
  */
 LONG CALLBACK	OSS_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg, 
 			       DWORD dwParam1, DWORD dwParam2)
diff --git a/dlls/winsock/socket.c b/dlls/winsock/socket.c
index 2ba9033..0d40124 100644
--- a/dlls/winsock/socket.c
+++ b/dlls/winsock/socket.c
@@ -638,6 +638,7 @@
 
 /***********************************************************************
  *      WSACleanup			(WINSOCK.116)
+ *      WSACleanup			(WS2_32.116)
  */
 INT WINAPI WSACleanup(void)
 {
@@ -1830,7 +1831,7 @@
 }
 
 /***********************************************************************
- *		select			(WINSOCK.18)
+ *		select			(WS2_32.18)
  */
 INT WINAPI WSOCK32_select(INT nfds, ws_fd_set32 *ws_readfds,
                               ws_fd_set32 *ws_writefds, ws_fd_set32 *ws_exceptfds,
@@ -2877,7 +2878,7 @@
 
 
 /***********************************************************************
- *      WSASetBlockingHook()
+ *      WSASetBlockingHook (WS2_32.109)
  */
 FARPROC WINAPI WSASetBlockingHook(FARPROC lpBlockFunc)
 {
@@ -2899,7 +2900,7 @@
 
 
 /***********************************************************************
- *      WSAUnhookBlockingHook()
+ *      WSAUnhookBlockingHook (WS2_32.110)
  */
 INT WINAPI WSAUnhookBlockingHook(void)
 {
diff --git a/dlls/wsock32/protocol.c b/dlls/wsock32/protocol.c
index 7c38319..9ae9058 100644
--- a/dlls/wsock32/protocol.c
+++ b/dlls/wsock32/protocol.c
@@ -253,7 +253,7 @@
 /*****************************************************************************
  *          inet_network       [WSOCK32.1100]
  */
-unsigned int WINAPI WSOCK32_inet_network(const char *cp)
+UINT WINAPI WSOCK32_inet_network(const char *cp)
 {
     return inet_network(cp);
 }
@@ -261,7 +261,7 @@
 /*****************************************************************************
  *          getnetbyname       [WSOCK32.1101]
  */
-struct netent WINAPI *WSOCK32_getnetbyname(const char *name)
+struct netent * WINAPI WSOCK32_getnetbyname(const char *name)
 {
     return getnetbyname(name);
 }
diff --git a/dlls/wsock32/socket.c b/dlls/wsock32/socket.c
index 8a8346c..95b3516 100644
--- a/dlls/wsock32/socket.c
+++ b/dlls/wsock32/socket.c
@@ -57,7 +57,7 @@
 
 
 /***********************************************************************
- *      WsControl()
+ *		WsControl (WSOCK32.1001)
  *
  * WsControl seems to be an undocumented Win95 function. A lot of 
  * discussion about WsControl can be found on the net, e.g.
diff --git a/files/dos_fs.c b/files/dos_fs.c
index a467cbd..c6b11e5 100644
--- a/files/dos_fs.c
+++ b/files/dos_fs.c
@@ -1382,7 +1382,7 @@
 
 
 /***********************************************************************
- *           wine_get_unix_file_name   (Not a Windows API, but exported from KERNEL32)
+ *           wine_get_unix_file_name (KERNEL32.@) Not a Windows API
  *
  * Return the full Unix file name for a given path.
  */
@@ -2118,6 +2118,7 @@
 
 /***********************************************************************
  *           FileTimeToLocalFileTime   (KERNEL32.@)
+ *           FileTimeToLocalFileTime   (KERNEL.432)
  */
 BOOL WINAPI FileTimeToLocalFileTime( const FILETIME *utcft,
                                        LPFILETIME localft )
diff --git a/files/profile.c b/files/profile.c
index 7f91812..5390012 100644
--- a/files/profile.c
+++ b/files/profile.c
@@ -1820,7 +1820,7 @@
 }
 
 /***********************************************************************
- *           CloseProfileUserMapping   (KERNEL.138)
+ *           CloseProfileUserMapping   (KERNEL32.@)
  */
 BOOL WINAPI CloseProfileUserMapping(void) {
     FIXME("(), stub!\n");
diff --git a/graphics/bitblt.c b/graphics/bitblt.c
index f8e2fd7..6c46577 100644
--- a/graphics/bitblt.c
+++ b/graphics/bitblt.c
@@ -163,7 +163,6 @@
 }
   
 /*********************************************************************
- *      PlgBlt [GDI.267]
  *      PlgBlt [GDI32.@]
  *
  */
diff --git a/graphics/metafiledrv/init.c b/graphics/metafiledrv/init.c
index b325f8d..7dbe5a1 100644
--- a/graphics/metafiledrv/init.c
+++ b/graphics/metafiledrv/init.c
@@ -175,7 +175,7 @@
 }
 
 /**********************************************************************
- *	     CreateMetaFile16   (GDI.125)
+ *	     CreateMetaFile     (GDI.125)
  *	     CreateMetaFile16   (GDI32.@)
  *
  *  Create a new DC and associate it with a metafile. Pass a filename
@@ -297,7 +297,7 @@
 }
 
 /******************************************************************
- *	     CloseMetaFile16   (GDI.126)
+ *	     CloseMetaFile     (GDI.126)
  *	     CloseMetaFile16   (GDI32.@)
  */
 HMETAFILE16 WINAPI CloseMetaFile16( 
diff --git a/loader/module.c b/loader/module.c
index 64989b7..a1b6cd8 100644
--- a/loader/module.c
+++ b/loader/module.c
@@ -672,6 +672,7 @@
 
 /***********************************************************************
  *             GetBinaryTypeA                     [KERNEL32.@]
+ *             GetBinaryType                      [KERNEL32.@]
  */
 BOOL WINAPI GetBinaryTypeA( LPCSTR lpApplicationName, LPDWORD lpBinaryType )
 {
@@ -736,7 +737,8 @@
 
 
 /***********************************************************************
- *           WinExec16   (KERNEL.166)
+ *           WinExec     (KERNEL.166)
+ *           WinExec16   (KERNEL32.@)
  */
 HINSTANCE16 WINAPI WinExec16( LPCSTR lpCmdLine, UINT16 nCmdShow )
 {
@@ -1171,6 +1173,7 @@
 
 /***********************************************************************
  *              GetModuleHandleA         (KERNEL32.@)
+ *              GetModuleHandle32        (KERNEL.488)
  */
 HMODULE WINAPI GetModuleHandleA(LPCSTR module)
 {
@@ -1199,6 +1202,7 @@
 
 /***********************************************************************
  *              GetModuleFileNameA      (KERNEL32.@)
+ *              GetModuleFileName32     (KERNEL.487)
  *
  * GetModuleFileNameA seems to *always* return the long path;
  * it's only GetModuleFileName16 that decides between short/long path
@@ -1531,7 +1535,8 @@
 }
 
 /***********************************************************************
- *           FreeLibrary (KERNEL32.@)
+ *           FreeLibrary   (KERNEL32.@)
+ *           FreeLibrary32 (KERNEL.486)
  */
 BOOL WINAPI FreeLibrary(HINSTANCE hLibModule)
 {
diff --git a/loader/ne/convert.c b/loader/ne/convert.c
index 70b7c21..3a27eff 100644
--- a/loader/ne/convert.c
+++ b/loader/ne/convert.c
@@ -16,6 +16,7 @@
 
 /**********************************************************************
  *	    ConvertDialog32To16   (KERNEL.615)
+ *	    ConvertDialog32To16   (KERNEL32.@)
  */
 VOID WINAPI ConvertDialog32To16( LPVOID dialog32, DWORD size, LPVOID dialog16 )
 {
diff --git a/loader/ne/module.c b/loader/ne/module.c
index ffff2ee..e46553a 100644
--- a/loader/ne/module.c
+++ b/loader/ne/module.c
@@ -292,7 +292,7 @@
 
 
 /***********************************************************************
- *           NE_GetEntryPoint / EntryAddrProc16   (KERNEL Wine-specific export)
+ *		EntryAddrProc (KERNEL.667) Wine-specific export
  *
  * Return the entry point for a given ordinal.
  */
@@ -302,10 +302,18 @@
     CURRENT_STACK16->ecx = hModule; /* FIXME: might be incorrect value */
     return ret;
 }
+
+/***********************************************************************
+ *		NE_GetEntryPoint
+ */
 FARPROC16 WINAPI NE_GetEntryPoint( HMODULE16 hModule, WORD ordinal )
 {
     return NE_GetEntryPointEx( hModule, ordinal, TRUE );
 }
+
+/***********************************************************************
+ *		NE_GetEntryPointEx
+ */
 FARPROC16 NE_GetEntryPointEx( HMODULE16 hModule, WORD ordinal, BOOL16 snoop )
 {
     NE_MODULE *pModule;
@@ -1013,7 +1021,8 @@
 
 
 /**********************************************************************
- *          LoadModule16    (KERNEL.45)
+ *          LoadModule      (KERNEL.45)
+ *          LoadModule16    (KERNEL32.@)
  */
 HINSTANCE16 WINAPI LoadModule16( LPCSTR name, LPVOID paramBlock )
 {
@@ -1200,7 +1209,8 @@
 }
 
 /***********************************************************************
- *           LoadLibrary16   (KERNEL.95)
+ *           LoadLibrary     (KERNEL.95)
+ *           LoadLibrary16   (KERNEL32.35)
  */
 HINSTANCE16 WINAPI LoadLibrary16( LPCSTR libname )
 {
@@ -1302,7 +1312,8 @@
 
 
 /***********************************************************************
- *           FreeLibrary16   (KERNEL.96)
+ *           FreeLibrary     (KERNEL.96)
+ *           FreeLibrary16   (KERNEL32.36)
  */
 void WINAPI FreeLibrary16( HINSTANCE16 handle )
 {
@@ -1369,7 +1380,8 @@
 
 
 /**********************************************************************
- *	    GetModuleFileName16    (KERNEL.49)
+ *	    GetModuleFileName      (KERNEL.49)
+ *	    GetModuleFileName16    (KERNEL32.@)
  *
  * Comment: see GetModuleFileNameA
  *
@@ -1419,7 +1431,7 @@
 }
 
 /***********************************************************************
- *		GetModuleHandle16   (KERNEL but also exported from KERNEL32 in Wine)
+ *          GetModuleHandle16 (KERNEL32.@)
  */
 HMODULE16 WINAPI GetModuleHandle16( LPCSTR name )
 {
diff --git a/loader/ne/segment.c b/loader/ne/segment.c
index a3ca8c7..76f1442 100644
--- a/loader/ne/segment.c
+++ b/loader/ne/segment.c
@@ -543,7 +543,7 @@
 
 
 /***********************************************************************
- *           PatchCodeHandle
+ *           PatchCodeHandle (KERNEL.110)
  *
  * Needed for self-loading modules.
  */
@@ -882,7 +882,7 @@
 }
 
 /***********************************************************************
- *           MyAlloc16   (KERNEL Wine-specific export)
+ *           MyAlloc   (KERNEL.668) Wine-specific export
  *
  * MyAlloc() function for self-loading apps.
  */
diff --git a/loader/resource.c b/loader/resource.c
index 036348b..b3d0c1e 100644
--- a/loader/resource.c
+++ b/loader/resource.c
@@ -313,7 +313,8 @@
 }
 
 /**********************************************************************
- *          FindResource16   (KERNEL.60)
+ *          FindResource     (KERNEL.60)
+ *          FindResource16   (KERNEL32.@)
  */
 HRSRC16 WINAPI FindResource16( HMODULE16 hModule, LPCSTR name, LPCSTR type )
 {
@@ -360,7 +361,8 @@
 }
 
 /**********************************************************************
- *          LoadResource16   (KERNEL.61)
+ *          LoadResource     (KERNEL.61)
+ *          LoadResource16   (KERNEL32.@)
  */
 HGLOBAL16 WINAPI LoadResource16( HMODULE16 hModule, HRSRC16 hRsrc )
 {
@@ -386,7 +388,7 @@
 }
 
 /**********************************************************************
- *          LockResource16   (KERNEL but also exported from KERNEL32 in Wine)
+ *          LockResource16 (KERNEL32.@)
  */
 LPVOID WINAPI LockResource16( HGLOBAL16 handle )
 {
@@ -408,7 +410,8 @@
 }
 
 /**********************************************************************
- *          FreeResource16   (KERNEL.63)
+ *          FreeResource     (KERNEL.63)
+ *          FreeResource16   (KERNEL32.@)
  */
 BOOL16 WINAPI FreeResource16( HGLOBAL16 handle )
 {
@@ -444,7 +447,8 @@
 }
 
 /**********************************************************************
- *          SizeofResource16 (KERNEL.65)
+ *          SizeofResource   (KERNEL.65)
+ *          SizeofResource16 (KERNEL32.@)
  */
 DWORD WINAPI SizeofResource16( HMODULE16 hModule, HRSRC16 hRsrc )
 {
diff --git a/loader/task.c b/loader/task.c
index 82b6635..200b9b9 100644
--- a/loader/task.c
+++ b/loader/task.c
@@ -1157,13 +1157,16 @@
 
 
 /***********************************************************************
- *           GetCurrentTask   (KERNEL.36)
+ *           GetCurrentTask   (KERNEL32.@)
  */
 HTASK16 WINAPI GetCurrentTask(void)
 {
     return NtCurrentTeb()->htask16;
 }
 
+/***********************************************************************
+ *           GetCurrentTask   (KERNEL.36)
+ */
 DWORD WINAPI WIN16_GetCurrentTask(void)
 {
     /* This is the version used by relay code; the first task is */
diff --git a/memory/atom.c b/memory/atom.c
index 736b6d3..ad82e22 100644
--- a/memory/atom.c
+++ b/memory/atom.c
@@ -437,7 +437,7 @@
 
 
 /***********************************************************************
- *           GlobalAddAtomA   (USER.268)
+ *           GlobalAddAtom    (USER.268)
  *           GlobalAddAtomA   (KERNEL32.@)
  *
  * Adds a character string to the global atom table and returns a unique
@@ -584,7 +584,7 @@
 
 
 /***********************************************************************
- *           GlobalFindAtomA   (USER.270)
+ *           GlobalFindAtom    (USER.270)
  *           GlobalFindAtomA   (KERNEL32.@)
  *
  * Searches the atom table for the string and returns the atom
@@ -707,7 +707,7 @@
 
 
 /***********************************************************************
- *           GlobalGetAtomNameA   (USER.271)
+ *           GlobalGetAtomName    (USER.271)
  *           GlobalGetAtomNameA   (KERNEL32.@)
  *
  * Retrieves a copy of the string associated with an atom.
diff --git a/memory/codepage.c b/memory/codepage.c
index ce38f34..962ffbc 100644
--- a/memory/codepage.c
+++ b/memory/codepage.c
@@ -131,6 +131,7 @@
 
 /***********************************************************************
  *           IsDBCSLeadByte   (KERNEL32.@)
+ *           IsDBCSLeadByte   (KERNEL.207)
  */
 BOOL WINAPI IsDBCSLeadByte( BYTE testchar )
 {
diff --git a/memory/environ.c b/memory/environ.c
index 82de436..6f47906 100644
--- a/memory/environ.c
+++ b/memory/environ.c
@@ -225,7 +225,7 @@
 
 
 /***********************************************************************
- *           GetEnvironmentStringsA   (KERNEL32.@)
+ *           GetEnvironmentStrings    (KERNEL32.@)
  *           GetEnvironmentStringsA   (KERNEL32.@)
  */
 LPSTR WINAPI GetEnvironmentStringsA(void)
@@ -487,7 +487,8 @@
 
 
 /***********************************************************************
- *           GetDOSEnvironment16   (KERNEL.131)
+ *           GetDOSEnvironment     (KERNEL.131)
+ *           GetDOSEnvironment16   (KERNEL32.@)
  */
 SEGPTR WINAPI GetDOSEnvironment16(void)
 {
diff --git a/memory/global.c b/memory/global.c
index 837a7e2..a861e77 100644
--- a/memory/global.c
+++ b/memory/global.c
@@ -233,7 +233,8 @@
 }
 
 /***********************************************************************
- *           GlobalAlloc16   (KERNEL.15)
+ *           GlobalAlloc     (KERNEL.15)
+ *           GlobalAlloc16   (KERNEL32.24)
  * RETURNS
  *	Handle: Success
  *	NULL: Failure
@@ -251,7 +252,8 @@
 
 
 /***********************************************************************
- *           GlobalReAlloc16   (KERNEL.16)
+ *           GlobalReAlloc     (KERNEL.16)
+ *           GlobalReAlloc16   (KERNEL32.@)
  * RETURNS
  *	Handle: Success
  *	NULL: Failure
@@ -365,7 +367,8 @@
 
 
 /***********************************************************************
- *           GlobalFree16   (KERNEL.17)
+ *           GlobalFree     (KERNEL.17)
+ *           GlobalFree16   (KERNEL32.31)
  * RETURNS
  *	NULL: Success
  *	Handle: Failure
@@ -418,7 +421,6 @@
 
 
 /**********************************************************************
- *           K32WOWGlobalLock16         (WOW32.11)
  *           K32WOWGlobalLock16         (KERNEL32.60)
  */
 SEGPTR WINAPI K32WOWGlobalLock16( HGLOBAL16 hMem )
@@ -428,7 +430,7 @@
 
 
 /***********************************************************************
- *           GlobalLock16   (KERNEL.18)
+ *           GlobalLock16   (KERNEL32.25)
  *
  * This is the GlobalLock16() function used by 32-bit code.
  * 
@@ -448,7 +450,8 @@
 
 
 /***********************************************************************
- *           GlobalUnlock16   (KERNEL.19)
+ *           GlobalUnlock     (KERNEL.19)
+ *           GlobalUnlock16   (KERNEL32.26)
  * NOTES
  *	Should the return values be cast to booleans?
  *
@@ -488,7 +491,8 @@
 }
 
 /***********************************************************************
- *           GlobalSize16   (KERNEL.20)
+ *           GlobalSize     (KERNEL.20)
+ *           GlobalSize16   (KERNEL32.32)
  * RETURNS
  *	Size in bytes of object
  *	0: Failure
@@ -539,7 +543,8 @@
 
 
 /***********************************************************************
- *           GlobalFlags16   (KERNEL.22)
+ *           GlobalFlags     (KERNEL.22)
+ *           GlobalFlags16   (KERNEL32.@)
  * NOTES
  *	Should this return GMEM_INVALID_HANDLE instead of 0 on invalid
  *	handle?
@@ -624,7 +629,8 @@
 
 
 /***********************************************************************
- *           GlobalWire16   (KERNEL.111)
+ *           GlobalWire     (KERNEL.111)
+ *           GlobalWire16   (KERNEL32.29)
  */
 SEGPTR WINAPI GlobalWire16( HGLOBAL16 handle )
 {
@@ -633,7 +639,8 @@
 
 
 /***********************************************************************
- *           GlobalUnWire16   (KERNEL.112)
+ *           GlobalUnWire     (KERNEL.112)
+ *           GlobalUnWire16   (KERNEL32.30)
  */
 BOOL16 WINAPI GlobalUnWire16( HGLOBAL16 handle )
 {
@@ -733,6 +740,7 @@
 
 /***********************************************************************
  *           GlobalPageLock   (KERNEL.191)
+ *           GlobalSmartPageLock(KERNEL.230)
  */
 WORD WINAPI GlobalPageLock16( HGLOBAL16 handle )
 {
@@ -747,6 +755,7 @@
 
 /***********************************************************************
  *           GlobalPageUnlock   (KERNEL.192)
+ *           GlobalSmartPageUnlock(KERNEL.231)
  */
 WORD WINAPI GlobalPageUnlock16( HGLOBAL16 handle )
 {
@@ -760,7 +769,8 @@
 
 
 /***********************************************************************
- *           GlobalFix16   (KERNEL.197)
+ *           GlobalFix     (KERNEL.197)
+ *           GlobalFix16   (KERNEL32.27)
  */
 WORD WINAPI GlobalFix16( HGLOBAL16 handle )
 {
@@ -776,7 +786,8 @@
 
 
 /***********************************************************************
- *           GlobalUnfix16   (KERNEL.198)
+ *           GlobalUnfix     (KERNEL.198)
+ *           GlobalUnfix16   (KERNEL32.28)
  */
 void WINAPI GlobalUnfix16( HGLOBAL16 handle )
 {
@@ -1548,6 +1559,7 @@
 
 /***********************************************************************
  *           A20Proc   (KERNEL.165)
+ *           A20_Proc  (SYSTEM.20)
  */
 void WINAPI A20Proc16( WORD unused )
 {
diff --git a/memory/heap.c b/memory/heap.c
index 2623b35..8e0015a 100644
--- a/memory/heap.c
+++ b/memory/heap.c
@@ -897,6 +897,7 @@
 
 /***********************************************************************
  *           MapLS   (KERNEL32.@)
+ *           MapLS   (KERNEL.358)
  *
  * Maps linear pointer to segmented.
  */
@@ -925,6 +926,7 @@
 
 /***********************************************************************
  *           UnMapLS   (KERNEL32.@)
+ *           UnMapLS   (KERNEL.359)
  *
  * Free mapped selector.
  */
diff --git a/memory/selector.c b/memory/selector.c
index 40d4c7f..144fc14 100644
--- a/memory/selector.c
+++ b/memory/selector.c
@@ -234,6 +234,7 @@
 
 /***********************************************************************
  *           AllocCStoDSAlias   (KERNEL.170)
+ *           AllocAlias         (KERNEL.172)
  */
 WORD WINAPI AllocCStoDSAlias16( WORD sel )
 {
@@ -518,6 +519,7 @@
 
 /***********************************************************************
  *           MapSL   (KERNEL32.@)
+ *           MapSL   (KERNEL.357)
  *
  * Maps fixed segmented pointer to linear.
  */
diff --git a/memory/string.c b/memory/string.c
index af3b614..7f98057 100644
--- a/memory/string.c
+++ b/memory/string.c
@@ -49,6 +49,7 @@
 
 
 /***********************************************************************
+ *           lstrcat    (KERNEL32.@)
  *           lstrcatA   (KERNEL32.@)
  */
 LPSTR WINAPI lstrcatA( LPSTR dst, LPCSTR src )
@@ -102,7 +103,8 @@
 
 
 /***********************************************************************
- *           lstrcmpA   (KERNEL.602)
+ *           lstrcmp    (KERNEL32.@)
+ *           lstrcmpA   (KERNEL32.@)
  */
 INT WINAPI lstrcmpA( LPCSTR str1, LPCSTR str2 )
 {
@@ -111,7 +113,7 @@
 
 
 /***********************************************************************
- *           lstrcmpW   (KERNEL.603)
+ *           lstrcmpW   (KERNEL32.@)
  * FIXME : should call CompareStringW, when it is implemented.
  *    This implementation is not "word sort", as it should.
  */
@@ -162,6 +164,7 @@
 
 
 /***********************************************************************
+ *           lstrcpy    (KERNEL32.@)
  *           lstrcpyA   (KERNEL32.@)
  */
 LPSTR WINAPI lstrcpyA( LPSTR dst, LPCSTR src )
@@ -267,6 +270,7 @@
 
 
 /***********************************************************************
+ *           lstrlen    (KERNEL32.@)
  *           lstrlenA   (KERNEL32.@)
  */
 INT WINAPI lstrlenA( LPCSTR str )
diff --git a/misc/main.c b/misc/main.c
index d4a8812..ef247c7 100644
--- a/misc/main.c
+++ b/misc/main.c
@@ -49,9 +49,10 @@
 }
 
 /***********************************************************************
- *           GetTickCount   (USER.13)
- *           GetCurrentTime (USER.15)
- *           GetTickCount   (KERNEL32.@)
+ *           GetTickCount       (USER.13)
+ *           GetCurrentTime     (USER.15)
+ *           GetTickCount       (KERNEL32.@)
+ *           GetSystemMSecCount (SYSTEM.6)
  *
  * Returns the number of milliseconds, modulo 2^32, since the start
  * of the wineserver.
diff --git a/misc/registry.c b/misc/registry.c
index ff868dc..f39da22 100644
--- a/misc/registry.c
+++ b/misc/registry.c
@@ -1574,7 +1574,6 @@
 /***************************************************************************/
 
 /******************************************************************************
- * RegFlushKey [KERNEL.227]
  * RegFlushKey [ADVAPI32.@]
  * Immediately writes key to registry.
  * Only returns after data has been written to disk.
diff --git a/msdos/int21.c b/msdos/int21.c
index 236f66b..703b015 100644
--- a/msdos/int21.c
+++ b/msdos/int21.c
@@ -1088,7 +1088,8 @@
 }
 
 /***********************************************************************
- *           DOS3Call  (KERNEL.102)
+ *           DOS3Call         (KERNEL.102)
+ *           INT_Int21Handler (WPROCS.133)
  */
 void WINAPI DOS3Call( CONTEXT86 *context )
 {
@@ -2458,7 +2459,7 @@
 }
 
 /***********************************************************************
- *		GetSetKernelDOSProc
+ *		GetSetKernelDOSProc (KERNEL.311)
  */
 FARPROC16 WINAPI GetSetKernelDOSProc16(FARPROC16 DosProc)
 {
diff --git a/msdos/int5c.c b/msdos/int5c.c
index ea4653e..1967272 100644
--- a/msdos/int5c.c
+++ b/msdos/int5c.c
@@ -11,7 +11,8 @@
 
 
 /***********************************************************************
- *           NetBIOSCall  (KERNEL.103)
+ *           NetBIOSCall      (KERNEL.103)
+ *           INT_Int5cHandler (WPROCS.192)
  *
  * Also handler for interrupt 5c. 
  */
diff --git a/objects/bitmap.c b/objects/bitmap.c
index 93ee4ae..7ca2f11 100644
--- a/objects/bitmap.c
+++ b/objects/bitmap.c
@@ -78,7 +78,6 @@
 
 /***********************************************************************
  *           CreateBitmap    (GDI.48)
- *           CreateBitmap    (DISPLAY.48)
  */
 HBITMAP16 WINAPI CreateBitmap16( INT16 width, INT16 height, UINT16 planes,
                                  UINT16 bpp, LPCVOID bits )
diff --git a/objects/clipping.c b/objects/clipping.c
index 97c05f8..6bf47a6 100644
--- a/objects/clipping.c
+++ b/objects/clipping.c
@@ -432,6 +432,7 @@
 
 /***********************************************************************
  *           RectVisible    (GDI.465)
+ *           RectVisibleOld (GDI.104)
  */
 BOOL16 WINAPI RectVisible16( HDC16 hdc, const RECT16* rect16 )
 {
diff --git a/objects/dc.c b/objects/dc.c
index 3bc7259..9895b4d 100644
--- a/objects/dc.c
+++ b/objects/dc.c
@@ -1440,6 +1440,7 @@
 
 /***********************************************************************
  *           GetLayout    (GDI32.@)
+ *           GetLayout    (GDI.1001)
  *
  * 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
diff --git a/objects/dib.c b/objects/dib.c
index 459e943..c588ddf 100644
--- a/objects/dib.c
+++ b/objects/dib.c
@@ -758,7 +758,6 @@
 
 /***********************************************************************
  *           CreateDIBitmap    (GDI.442)
- *           CreateDIBitmap    (DISPLAY.442)
  */
 HBITMAP16 WINAPI CreateDIBitmap16( HDC16 hdc, const BITMAPINFOHEADER * header,
                             DWORD init, LPCVOID bits, const BITMAPINFO * data,
diff --git a/objects/font.c b/objects/font.c
index f791099..203b9ea 100644
--- a/objects/font.c
+++ b/objects/font.c
@@ -1352,7 +1352,6 @@
 
 /***********************************************************************
  *           GetCharWidth    (GDI.350)
- *           GetCharWidth    (DISPLAY.350)
  */
 BOOL16 WINAPI GetCharWidth16( HDC16 hdc, UINT16 firstChar, UINT16 lastChar,
                               LPINT16 buffer )
@@ -1681,6 +1680,7 @@
 
 /*************************************************************************
  * TranslateCharsetInfo [GDI32.@]
+ * TranslateCharsetInfo [USER32.@]
  *
  * Fills a CHARSETINFO structure for a character set, code page, or
  * font. This allows making the correspondance between different labelings
diff --git a/objects/gdiobj.c b/objects/gdiobj.c
index 1bd60ec..ef93f23 100644
--- a/objects/gdiobj.c
+++ b/objects/gdiobj.c
@@ -1278,6 +1278,7 @@
 
 /*******************************************************************
  *      GetMiterLimit [GDI32.@]
+ *      GetMiterLimit [GDI.526]
  *
  *
  */
@@ -1289,6 +1290,7 @@
 
 /*******************************************************************
  *      SetMiterLimit [GDI32.@]
+ *      SetMiterLimit [GDI.527]
  *
  *
  */
diff --git a/objects/palette.c b/objects/palette.c
index f63bb6c..c16514c 100644
--- a/objects/palette.c
+++ b/objects/palette.c
@@ -818,7 +818,6 @@
 
 
 /**********************************************************************
- *            UpdateColors   (DISPLAY.366)
  *            UpdateColors   (GDI.366)
  */
 INT16 WINAPI UpdateColors16( HDC16 hDC )
diff --git a/objects/pen.c b/objects/pen.c
index e64bc68..832620c 100644
--- a/objects/pen.c
+++ b/objects/pen.c
@@ -84,6 +84,7 @@
 
 /***********************************************************************
  *           ExtCreatePen    (GDI32.@)
+ *           ExtCreatePen    (GDI.523)
  *
  * FIXME: PS_USERSTYLE not handled
  */
diff --git a/objects/region.c b/objects/region.c
index 961b0a5..53d4f2e 100644
--- a/objects/region.c
+++ b/objects/region.c
@@ -899,6 +899,7 @@
 
 /***********************************************************************
  *           ExtCreateRegion   (GDI32.@)
+ *           ExtCreateRegion   (GDI.608)
  * 
  */
 HRGN WINAPI ExtCreateRegion( const XFORM* lpXform, DWORD dwCount, const RGNDATA* rgndata)
@@ -976,6 +977,7 @@
 
 /***********************************************************************
  *           RectInRegion    (GDI.466)
+ *           RectInRegionOld (GDI.181)
  */
 BOOL16 WINAPI RectInRegion16( HRGN16 hrgn, const RECT16 *rect )
 {
@@ -2925,6 +2927,7 @@
 
 /***********************************************************************
  * GetRandomRgn [GDI32.@]
+ * GetRandomRgn [GDI.611]
  *
  * NOTES
  *     This function is documented in MSDN online
@@ -3227,7 +3230,6 @@
 }
 
 /***********************************************************************
- *           GetMetaRgn    (GDI.328)
  *           GetMetaRgn    (GDI32.@)
  */
 INT WINAPI GetMetaRgn( HDC hdc, HRGN hRgn )
@@ -3239,7 +3241,6 @@
 
 
 /***********************************************************************
- *           SetMetaRgn    (GDI.506)
  *           SetMetaRgn    (GDI32.@)
  */
 INT WINAPI SetMetaRgn( HDC hdc )
diff --git a/objects/text.c b/objects/text.c
index f95e70c..9be7383 100644
--- a/objects/text.c
+++ b/objects/text.c
@@ -21,7 +21,6 @@
 
 
 /***********************************************************************
- *           ExtTextOut    (DISPLAY.351)
  *           ExtTextOut    (GDI.351)
  */
 BOOL16 WINAPI ExtTextOut16( HDC16 hdc, INT16 x, INT16 y, UINT16 flags,
@@ -204,7 +203,6 @@
 }
 
 /***********************************************************************
- *		PolyTextOutA (GDI.402)
  *		PolyTextOutA (GDI32.@)
  *
  * Draw several Strings
@@ -223,7 +221,6 @@
 
 
 /***********************************************************************
- *		PolyTextOutW (GDI.403)
  *		PolyTextOutW (GDI32.@)
  *
  * Draw several Strings
diff --git a/ole/ole2nls.c b/ole/ole2nls.c
index 92065d7..734c1e6 100644
--- a/ole/ole2nls.c
+++ b/ole/ole2nls.c
@@ -146,7 +146,6 @@
 
 /***********************************************************************
  *		GetUserDefaultLCID (KERNEL32.@)
- *		GetUserDefaultLCID (OLE2NLS.1)
  */
 LCID WINAPI GetUserDefaultLCID(void)
 {
@@ -155,7 +154,6 @@
 
 /***********************************************************************
  *		GetSystemDefaultLCID (KERNEL32.@)
- *		GetSystemDefaultLCID (OLE2NLS.2)
  */
 LCID WINAPI GetSystemDefaultLCID(void)
 {
@@ -333,7 +331,6 @@
 
 /***********************************************************************
  *		GetUserDefaultLangID (KERNEL32.@)
- *		GetUserDefaultLangID (OLE2NLS.3)
  */
 LANGID WINAPI GetUserDefaultLangID(void)
 {
@@ -382,7 +379,6 @@
 
 /***********************************************************************
  *		GetSystemDefaultLangID (KERNEL32.@)
- *		GetSystemDefaultLangID (OLE2NLS.4)
  */
 LANGID WINAPI GetSystemDefaultLangID(void)
 {
@@ -1403,7 +1399,6 @@
 
 /***********************************************************************
  *           VerLanguageNameA              [KERNEL32.@]
- *           VerLanguageNameA              [VERSION.9]
  */
 DWORD WINAPI VerLanguageNameA( UINT wLang, LPSTR szLang, UINT nSize )
 {
@@ -1415,7 +1410,6 @@
 
 /***********************************************************************
  *           VerLanguageNameW              [KERNEL32.@]
- *           VerLanguageNameW              [VERSION.10]
  */
 DWORD WINAPI VerLanguageNameW( UINT wLang, LPWSTR szLang, UINT nSize )
 {
diff --git a/scheduler/handle.c b/scheduler/handle.c
index bbdaed9..c1b9c6a 100644
--- a/scheduler/handle.c
+++ b/scheduler/handle.c
@@ -15,9 +15,8 @@
 DEFAULT_DEBUG_CHANNEL(win32);
 
 /*********************************************************************
- *           CloseHandle   (KERNEL.11)
- *           CloseHandle   (WIN32S16.11)
- *           CloseHandle   (KERNEL32.@)
+ *           CloseW32Handle (KERNEL.474)
+ *           CloseHandle    (KERNEL32.@)
  */
 BOOL WINAPI CloseHandle( HANDLE handle )
 {
diff --git a/scheduler/process.c b/scheduler/process.c
index 9178849..5db30c7 100644
--- a/scheduler/process.c
+++ b/scheduler/process.c
@@ -1237,7 +1237,6 @@
 
 /***********************************************************************
  *		ReadProcessMemory (KERNEL32.@)
- *		ReadProcessMemory (WIN32S16.6)
  */
 BOOL WINAPI ReadProcessMemory( HANDLE process, LPCVOID addr, LPVOID buffer, DWORD size,
                                LPDWORD bytes_read )
diff --git a/scheduler/thread.c b/scheduler/thread.c
index 8bfa25a..6d2a4bd 100644
--- a/scheduler/thread.c
+++ b/scheduler/thread.c
@@ -556,7 +556,6 @@
 
 /**********************************************************************
  *		GetExitCodeThread (KERNEL32.@)
- *		GetExitCodeThread (WIN32S16.13)
  *
  * Gets termination status of thread.
  * 
@@ -798,7 +797,6 @@
 /**********************************************************************
  *		GetLastError (KERNEL.148)
  *              GetLastError (KERNEL32.@)
- *              GetLastError (WIN32S16.10)
  *
  * Returns last-error code.
  */
diff --git a/windows/cursoricon.c b/windows/cursoricon.c
index ced1990..9367042 100644
--- a/windows/cursoricon.c
+++ b/windows/cursoricon.c
@@ -1608,7 +1608,7 @@
 }
 
 /**********************************************************************
- *		LookupIconIdFromDirectory (USER.???)
+ *		LookupIconIdFromDirectory (USER.?)
  */
 INT16 WINAPI LookupIconIdFromDirectory16( LPBYTE dir, BOOL16 bIcon )
 {
diff --git a/windows/input.c b/windows/input.c
index 6710cbf..7dfe75b 100644
--- a/windows/input.c
+++ b/windows/input.c
@@ -832,6 +832,7 @@
 
 /***********************************************************************
  *		GetKeyboardLayout (USER32.@)
+ *		GetKeyboardLayout (USER.651)
  *
  * FIXME: - device handle for keyboard layout defaulted to 
  *          the language id. This is the way Windows default works.
@@ -937,6 +938,7 @@
 
 /**********************************************************************
  *		ActivateKeyboardLayout (USER32.@)
+ *		ActivateKeyboardLayout (USER.650)
  *
  * Call ignored. WINE supports only system default keyboard layout.
  */
@@ -950,6 +952,7 @@
 
 /***********************************************************************
  *		GetKeyboardLayoutList (USER32.@)
+ *		GetKeyboardLayoutList (USER.652)
  *
  * FIXME: Supports only the system default language and layout and 
  *          returns only 1 value.
diff --git a/windows/mdi.c b/windows/mdi.c
index cfad061..bd2b621 100644
--- a/windows/mdi.c
+++ b/windows/mdi.c
@@ -2366,6 +2366,7 @@
 
 /******************************************************************************
  *		CascadeWindows (USER32.@) Cascades MDI child windows
+ *		CascadeWindows (USER.429)
  *
  * RETURNS
  *    Success: Number of cascaded windows.
@@ -2384,6 +2385,7 @@
 
 /******************************************************************************
  *		TileWindows (USER32.@) Tiles MDI child windows
+ *		TileWindows (USER.428)
  *
  * RETURNS
  *    Success: Number of tiled windows.
diff --git a/windows/message.c b/windows/message.c
index 807aaaa..383ed27 100644
--- a/windows/message.c
+++ b/windows/message.c
@@ -2521,6 +2521,7 @@
 
 /***********************************************************************
  *		BroadcastSystemMessage (USER32.@)
+ *		BroadcastSystemMessage (USER.604)
  */
 LONG WINAPI BroadcastSystemMessage(
 	DWORD dwFlags,LPDWORD recipients,UINT uMessage,WPARAM wParam,
diff --git a/windows/syscolor.c b/windows/syscolor.c
index c43a9ce..b0655c7 100644
--- a/windows/syscolor.c
+++ b/windows/syscolor.c
@@ -278,6 +278,7 @@
 
 /*************************************************************************
  *		SetSysColorsTemp (USER32.@)
+ *		SetSysColorsTemp (USER.661)
  */
 BOOL	WINAPI	SetSysColorsTemp( int n, const int* p, const COLORREF* ptr)
 {
diff --git a/windows/winpos.c b/windows/winpos.c
index cb576d7..6c87ecf 100644
--- a/windows/winpos.c
+++ b/windows/winpos.c
@@ -217,6 +217,7 @@
 
 /***********************************************************************
  *		GetWindowRgn (USER32.@)
+ *		GetWindowRgn (USER.669)
  */
 int WINAPI GetWindowRgn ( HWND hwnd, HRGN hrgn )
 {