Documentation ordinal fixes.

diff --git a/objects/bitmap.c b/objects/bitmap.c
index 7b4c4ca..f6734f2 100644
--- a/objects/bitmap.c
+++ b/objects/bitmap.c
@@ -78,6 +78,7 @@
 
 /***********************************************************************
  *           CreateBitmap16    (GDI.48)
+ *           CreateBitmap16    (DISPLAY.48)
  */
 HBITMAP16 WINAPI CreateBitmap16( INT16 width, INT16 height, UINT16 planes,
                                  UINT16 bpp, LPCVOID bits )
@@ -87,7 +88,7 @@
 
 
 /******************************************************************************
- * CreateBitmap [GDI32.25]  Creates a bitmap with the specified info
+ * CreateBitmap [GDI32.@]  Creates a bitmap with the specified info
  *
  * PARAMS
  *    width  [I] bitmap width
@@ -157,7 +158,7 @@
 
 
 /******************************************************************************
- * CreateCompatibleBitmap [GDI32.30]  Creates a bitmap compatible with the DC
+ * CreateCompatibleBitmap [GDI32.@]  Creates a bitmap compatible with the DC
  *
  * PARAMS
  *    hdc    [I] Handle to device context
@@ -204,7 +205,7 @@
 
 
 /******************************************************************************
- * CreateBitmapIndirect [GDI32.26]  Creates a bitmap with the specifies info
+ * CreateBitmapIndirect [GDI32.@]  Creates a bitmap with the specifies info
  *
  * RETURNS
  *    Success: Handle to bitmap
@@ -228,7 +229,7 @@
 
 
 /***********************************************************************
- * GetBitmapBits [GDI32.143]  Copies bitmap bits of bitmap to buffer
+ * GetBitmapBits [GDI32.@]  Copies bitmap bits of bitmap to buffer
  * 
  * RETURNS
  *    Success: Number of bytes copied
@@ -309,7 +310,7 @@
 
 
 /******************************************************************************
- * SetBitmapBits [GDI32.303]  Sets bits of color data for a bitmap
+ * SetBitmapBits [GDI32.@]  Sets bits of color data for a bitmap
  *
  * RETURNS
  *    Success: Number of bytes used in setting the bitmap bits
@@ -495,7 +496,7 @@
 
 
 /******************************************************************************
- * CreateDiscardableBitmap [GDI32.38]  Creates a discardable bitmap
+ * CreateDiscardableBitmap [GDI32.@]  Creates a discardable bitmap
  *
  * RETURNS
  *    Success: Handle to bitmap
@@ -528,7 +529,7 @@
 
 
 /******************************************************************************
- * GetBitmapDimensionEx [GDI32.144]  Retrieves dimensions of a bitmap
+ * GetBitmapDimensionEx [GDI32.@]  Retrieves dimensions of a bitmap
  *
  * RETURNS
  *    Success: TRUE
@@ -578,7 +579,7 @@
 
 
 /******************************************************************************
- * SetBitmapDimensionEx [GDI32.304]  Assignes dimensions to a bitmap
+ * SetBitmapDimensionEx [GDI32.@]  Assignes dimensions to a bitmap
  *
  * RETURNS
  *    Success: TRUE
diff --git a/objects/brush.c b/objects/brush.c
index 41c3a7c..4b02632 100644
--- a/objects/brush.c
+++ b/objects/brush.c
@@ -124,7 +124,7 @@
 
 
 /***********************************************************************
- *           CreateBrushIndirect    (GDI32.27)
+ *           CreateBrushIndirect    (GDI32.@)
  *
  * BUGS
  *      As for Windows 95 and Windows 98:
@@ -163,7 +163,7 @@
 
 
 /***********************************************************************
- *           CreateHatchBrush    (GDI32.48)
+ *           CreateHatchBrush    (GDI32.@)
  */
 HBRUSH WINAPI CreateHatchBrush( INT style, COLORREF color )
 {
@@ -189,7 +189,7 @@
 
 
 /***********************************************************************
- *           CreatePatternBrush    (GDI32.54)
+ *           CreatePatternBrush    (GDI32.@)
  */
 HBRUSH WINAPI CreatePatternBrush( HBITMAP hbitmap )
 {
@@ -219,7 +219,7 @@
 
 
 /***********************************************************************
- *           CreateDIBPatternBrush    (GDI32.34)
+ *           CreateDIBPatternBrush    (GDI32.@)
  *
  *	Create a logical brush which has the pattern specified by the DIB
  *
@@ -251,7 +251,7 @@
 
 
 /***********************************************************************
- *           CreateDIBPatternBrushPt    (GDI32.35)
+ *           CreateDIBPatternBrushPt    (GDI32.@)
  *
  *	Create a logical brush which has the pattern specified by the DIB
  *
@@ -291,7 +291,7 @@
 
 
 /***********************************************************************
- *           CreateSolidBrush    (GDI32.64)
+ *           CreateSolidBrush    (GDI32.@)
  */
 HBRUSH WINAPI CreateSolidBrush( COLORREF color )
 {
@@ -324,7 +324,7 @@
 
 
 /***********************************************************************
- *           SetBrushOrgEx    (GDI32.308)
+ *           SetBrushOrgEx    (GDI32.@)
  */
 BOOL WINAPI SetBrushOrgEx( HDC hdc, INT x, INT y, LPPOINT oldorg )
 {
@@ -343,7 +343,7 @@
 }
 
 /***********************************************************************
- *           FixBrushOrgEx    (GDI32.102)
+ *           FixBrushOrgEx    (GDI32.@)
  * SDK says discontinued, but in Win95 GDI32 this is the same as SetBrushOrgEx
  */
 BOOL WINAPI FixBrushOrgEx( HDC hdc, INT x, INT y, LPPOINT oldorg )
diff --git a/objects/clipping.c b/objects/clipping.c
index f10a2f0..aae8acf 100644
--- a/objects/clipping.c
+++ b/objects/clipping.c
@@ -50,7 +50,7 @@
 
 
 /***********************************************************************
- *           SelectClipRgn    (GDI32.297)
+ *           SelectClipRgn    (GDI32.@)
  */
 INT WINAPI SelectClipRgn( HDC hdc, HRGN hrgn )
 {
@@ -66,7 +66,7 @@
 }
 
 /******************************************************************************
- *		ExtSelectClipRgn	[GDI32.97]
+ *		ExtSelectClipRgn	[GDI32.@]
  */
 INT WINAPI ExtSelectClipRgn( HDC hdc, HRGN hrgn, INT fnMode )
 {
@@ -145,7 +145,7 @@
 
 
 /***********************************************************************
- *           OffsetClipRgn    (GDI32.255)
+ *           OffsetClipRgn    (GDI32.@)
  */
 INT WINAPI OffsetClipRgn( HDC hdc, INT x, INT y )
 {
@@ -241,7 +241,7 @@
 
 
 /***********************************************************************
- *           ExcludeClipRect    (GDI32.92)
+ *           ExcludeClipRect    (GDI32.@)
  */
 INT WINAPI ExcludeClipRect( HDC hdc, INT left, INT top,
                                 INT right, INT bottom )
@@ -278,7 +278,7 @@
 
 
 /***********************************************************************
- *           IntersectClipRect    (GDI32.245)
+ *           IntersectClipRect    (GDI32.@)
  */
 INT WINAPI IntersectClipRect( HDC hdc, INT left, INT top,
                                   INT right, INT bottom )
@@ -411,7 +411,7 @@
 
 
 /***********************************************************************
- *           PtVisible    (GDI32.279)
+ *           PtVisible    (GDI32.@)
  */
 BOOL WINAPI PtVisible( HDC hdc, INT x, INT y )
 {
@@ -431,7 +431,7 @@
 
 
 /***********************************************************************
- *           RectVisible16    (GDI.104)
+ *           RectVisible16    (GDI.465)
  */
 BOOL16 WINAPI RectVisible16( HDC16 hdc, const RECT16* rect )
 {
@@ -458,7 +458,7 @@
 
 
 /***********************************************************************
- *           RectVisible    (GDI32.282)
+ *           RectVisible    (GDI32.@)
  */
 BOOL WINAPI RectVisible( HDC hdc, const RECT* rect )
 {
@@ -489,7 +489,7 @@
 
 
 /***********************************************************************
- *           GetClipBox    (GDI32.162)
+ *           GetClipBox    (GDI32.@)
  */
 INT WINAPI GetClipBox( HDC hdc, LPRECT rect )
 {
@@ -508,7 +508,7 @@
 
 
 /***********************************************************************
- *           GetClipRgn  (GDI32.163)
+ *           GetClipRgn  (GDI32.@)
  */
 INT WINAPI GetClipRgn( HDC hdc, HRGN hRgn )
 {
diff --git a/objects/dc.c b/objects/dc.c
index 1dbf81b..d754316 100644
--- a/objects/dc.c
+++ b/objects/dc.c
@@ -419,7 +419,7 @@
 
 
 /***********************************************************************
- *           SaveDC    (GDI32.292)
+ *           SaveDC    (GDI32.@)
  */
 INT WINAPI SaveDC( HDC hdc )
 {
@@ -478,7 +478,7 @@
 
 
 /***********************************************************************
- *           RestoreDC    (GDI32.290)
+ *           RestoreDC    (GDI32.@)
  */
 BOOL WINAPI RestoreDC( HDC hdc, INT level )
 {
@@ -571,7 +571,7 @@
 
 
 /***********************************************************************
- *           CreateDCA    (GDI32.)
+ *           CreateDCA    (GDI32.@)
  */
 HDC WINAPI CreateDCA( LPCSTR driver, LPCSTR device, LPCSTR output,
                           const DEVMODEA *initData )
@@ -581,7 +581,7 @@
 
 
 /***********************************************************************
- *           CreateDCW    (GDI32.)
+ *           CreateDCW    (GDI32.@)
  */
 HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output,
                           const DEVMODEW *initData )
@@ -610,7 +610,7 @@
 
 
 /***********************************************************************
- *           CreateICA    (GDI32.49)
+ *           CreateICA    (GDI32.@)
  */
 HDC WINAPI CreateICA( LPCSTR driver, LPCSTR device, LPCSTR output,
                           const DEVMODEA* initData )
@@ -621,7 +621,7 @@
 
 
 /***********************************************************************
- *           CreateICW    (GDI32.50)
+ *           CreateICW    (GDI32.@)
  */
 HDC WINAPI CreateICW( LPCWSTR driver, LPCWSTR device, LPCWSTR output,
                           const DEVMODEW* initData )
@@ -641,7 +641,7 @@
 
 
 /***********************************************************************
- *           CreateCompatibleDC   (GDI32.31)
+ *           CreateCompatibleDC   (GDI32.@)
  */
 HDC WINAPI CreateCompatibleDC( HDC hdc )
 {
@@ -696,7 +696,7 @@
 
 
 /***********************************************************************
- *           DeleteDC    (GDI32.67)
+ *           DeleteDC    (GDI32.@)
  */
 BOOL WINAPI DeleteDC( HDC hdc )
 {
@@ -759,7 +759,7 @@
 
 
 /***********************************************************************
- *           ResetDCA    (GDI32.287)
+ *           ResetDCA    (GDI32.@)
  */
 HDC WINAPI ResetDCA( HDC hdc, const DEVMODEA *devmode )
 {
@@ -769,7 +769,7 @@
 
 
 /***********************************************************************
- *           ResetDCW    (GDI32.288)
+ *           ResetDCW    (GDI32.@)
  */
 HDC WINAPI ResetDCW( HDC hdc, const DEVMODEW *devmode )
 {
@@ -791,7 +791,7 @@
 
 
 /***********************************************************************
- *           GetDeviceCaps    (GDI32.171)
+ *           GetDeviceCaps    (GDI32.@)
  */
 INT WINAPI GetDeviceCaps( HDC hdc, INT cap )
 {
@@ -863,7 +863,7 @@
 
 
 /***********************************************************************
- *           SetBkColor    (GDI32.305)
+ *           SetBkColor    (GDI32.@)
  */
 COLORREF WINAPI SetBkColor( HDC hdc, COLORREF color )
 {
@@ -892,7 +892,7 @@
 
 
 /***********************************************************************
- *           SetTextColor    (GDI32.338)
+ *           SetTextColor    (GDI32.@)
  */
 COLORREF WINAPI SetTextColor( HDC hdc, COLORREF color )
 {
@@ -920,7 +920,7 @@
 
 
 /***********************************************************************
- *           SetTextAlign    (GDI32.336)
+ *           SetTextAlign    (GDI32.@)
  */
 UINT WINAPI SetTextAlign( HDC hdc, UINT align )
 {
@@ -938,7 +938,7 @@
 }
 
 /***********************************************************************
- *           GetDCOrgEx  (GDI32.168)
+ *           GetDCOrgEx  (GDI32.@)
  */
 BOOL WINAPI GetDCOrgEx( HDC hDC, LPPOINT lpp )
 {
@@ -985,7 +985,7 @@
 
 
 /***********************************************************************
- *           SetGraphicsMode    (GDI32.317)
+ *           SetGraphicsMode    (GDI32.@)
  */
 INT WINAPI SetGraphicsMode( HDC hdc, INT mode )
 {
@@ -1018,7 +1018,7 @@
 
 
 /***********************************************************************
- *           SetArcDirection    (GDI32.302)
+ *           SetArcDirection    (GDI32.@)
  */
 INT WINAPI SetArcDirection( HDC hdc, INT nDirection )
 {
@@ -1042,7 +1042,7 @@
 
 
 /***********************************************************************
- *           GetWorldTransform    (GDI32.244)
+ *           GetWorldTransform    (GDI32.@)
  */
 BOOL WINAPI GetWorldTransform( HDC hdc, LPXFORM xform )
 {
@@ -1056,7 +1056,7 @@
 
 
 /***********************************************************************
- *           SetWorldTransform    (GDI32.346)
+ *           SetWorldTransform    (GDI32.@)
  */
 BOOL WINAPI SetWorldTransform( HDC hdc, const XFORM *xform )
 {
@@ -1079,7 +1079,7 @@
 
 
 /****************************************************************************
- * ModifyWorldTransform [GDI32.253]
+ * ModifyWorldTransform [GDI32.@]
  * Modifies the world transformation for a device context.
  *
  * PARAMS
@@ -1144,7 +1144,7 @@
 
 
 /****************************************************************************
- * CombineTransform [GDI32.20]
+ * CombineTransform [GDI32.@]
  * Combines two transformation matrices.
  *
  * PARAMS
@@ -1271,7 +1271,7 @@
 }
 
 /***********************************************************************
- *           SetICMMode    (GDI32.318)
+ *           SetICMMode    (GDI32.@)
  */
 INT WINAPI SetICMMode(HDC hdc, INT iEnableICM)
 {
@@ -1283,7 +1283,7 @@
 }
 
 /***********************************************************************
- *           GetDeviceGammaRamp    (GDI32.*)
+ *           GetDeviceGammaRamp    (GDI32.@)
  */
 BOOL WINAPI GetDeviceGammaRamp(HDC hdc,LPVOID ptr) {
     FIXME("(%x,%p), empty stub!\n",hdc,ptr);
@@ -1291,7 +1291,7 @@
 }
 
 /***********************************************************************
- *           GetColorSpace    (GDI32.165)
+ *           GetColorSpace    (GDI32.@)
  */
 HCOLORSPACE WINAPI GetColorSpace(HDC hdc)
 {
@@ -1300,7 +1300,7 @@
 }
 
 /***********************************************************************
- *           CreateColorSpaceA    (GDI32.???)
+ *           CreateColorSpaceA    (GDI32.@)
  */
 HCOLORSPACE WINAPI CreateColorSpaceA( LPLOGCOLORSPACEA lpLogColorSpace )
 {
@@ -1309,7 +1309,7 @@
 }
 
 /***********************************************************************
- *           CreateColorSpaceW    (GDI32.???)
+ *           CreateColorSpaceW    (GDI32.@)
  */
 HCOLORSPACE WINAPI CreateColorSpaceW( LPLOGCOLORSPACEW lpLogColorSpace )
 {
@@ -1318,7 +1318,7 @@
 }
 
 /***********************************************************************
- *           DeleteColorSpace     (GDI32.???)
+ *           DeleteColorSpace     (GDI32.@)
  */
 BOOL WINAPI DeleteColorSpace( HCOLORSPACE hColorSpace )
 {
@@ -1328,7 +1328,7 @@
 }
 
 /***********************************************************************
- *           SetColorSpace     (GDI32.???)
+ *           SetColorSpace     (GDI32.@)
  */
 HCOLORSPACE WINAPI SetColorSpace( HDC hDC, HCOLORSPACE hColorSpace )
 {
@@ -1346,7 +1346,7 @@
 }
 
 /***********************************************************************
- *           GetBoundsRect    (GDI32.147)
+ *           GetBoundsRect    (GDI32.@)
  */
 UINT WINAPI GetBoundsRect(HDC hdc, LPRECT rect, UINT flags)
 {
@@ -1366,7 +1366,7 @@
 }
 
 /***********************************************************************
- *           SetBoundsRect    (GDI32.307)
+ *           SetBoundsRect    (GDI32.@)
  */
 UINT WINAPI SetBoundsRect(HDC hdc, const RECT* rect, UINT flags)
 {
@@ -1376,7 +1376,7 @@
 
 
 /***********************************************************************
- *		GetRelAbs		(GDI32.218)
+ *		GetRelAbs		(GDI32.@)
  */
 INT WINAPI GetRelAbs( HDC hdc, DWORD dwIgnore )
 {
@@ -1411,7 +1411,7 @@
 }
 
 /***********************************************************************
- *           GetLayout    (GDI32.321)
+ *           GetLayout    (GDI32.@)
  *
  * Gets left->right or right->left text layout flags of a dc.
  * win98 just returns 0 and sets ERROR_CALL_NOT_IMPLEMENTED so we do the same
@@ -1425,7 +1425,7 @@
 }
 
 /***********************************************************************
- *           SetLayout    (GDI32.450)
+ *           SetLayout    (GDI32.@)
  *
  * Sets left->right or right->left text layout flags of a dc.
  * win98 just returns 0 and sets ERROR_CALL_NOT_IMPLEMENTED so we do the same
diff --git a/objects/dcvalues.c b/objects/dcvalues.c
index 4a93d3c..76aba4a 100644
--- a/objects/dcvalues.c
+++ b/objects/dcvalues.c
@@ -106,38 +106,38 @@
 }
 
 /***********************************************************************
- *		SetBkMode		(GDI.2) (GDI32.306)
+ *		SetBkMode		(GDI.2) (GDI32.@)
  *
  */
 DC_SET_MODE( SetBkMode, backgroundMode, TRANSPARENT, OPAQUE ) 
 
 /***********************************************************************
- *		SetROP2			(GDI.4) (GDI32.331)
+ *		SetROP2			(GDI.4) (GDI32.@)
  */
 DC_SET_MODE( SetROP2, ROPmode, R2_BLACK, R2_WHITE )
 
 /***********************************************************************
- *		SetRelAbs		(GDI.5) (GDI32.333)
+ *		SetRelAbs		(GDI.5) (GDI32.@)
  */
 DC_SET_MODE( SetRelAbs, relAbsMode, ABSOLUTE, RELATIVE )
 
 /***********************************************************************
- *		SetPolyFillMode		(GDI.6) (GDI32.330)
+ *		SetPolyFillMode		(GDI.6) (GDI32.@)
  */
 DC_SET_MODE( SetPolyFillMode, polyFillMode, ALTERNATE, WINDING )
 
 /***********************************************************************
- *		SetStretchBltMode	(GDI.7) (GDI32.334)
+ *		SetStretchBltMode	(GDI.7) (GDI32.@)
  */
 DC_SET_MODE( SetStretchBltMode, stretchBltMode, BLACKONWHITE, HALFTONE )
 
 /***********************************************************************
- *		GetBkColor		(GDI.75) (GDI32.145)
+ *		GetBkColor		(GDI.75) (GDI32.@)
  */
 DC_GET_VAL( COLORREF, GetBkColor, backgroundColor )
 
 /***********************************************************************
- *		GetBkMode		(GDI.76) (GDI32.146)
+ *		GetBkMode		(GDI.76) (GDI32.@)
  */
 DC_GET_VAL( INT, GetBkMode, backgroundMode )
 
@@ -147,17 +147,17 @@
 DC_GET_X_Y( DWORD, GetCurrentPosition16, CursPosX, CursPosY )
 
 /***********************************************************************
- *		GetMapMode		(GDI.81) (GDI32.196)
+ *		GetMapMode		(GDI.81) (GDI32.@)
  */
 DC_GET_VAL( INT, GetMapMode, MapMode )
 
 /***********************************************************************
- *		GetPolyFillMode		(GDI.84) (GDI32.213)
+ *		GetPolyFillMode		(GDI.84) (GDI32.@)
  */
 DC_GET_VAL( INT, GetPolyFillMode, polyFillMode )
 
 /***********************************************************************
- *		GetROP2			(GDI.85) (GDI32.214)
+ *		GetROP2			(GDI.85) (GDI32.@)
  */
 DC_GET_VAL( INT, GetROP2, ROPmode )
 
@@ -167,12 +167,12 @@
 DC_GET_VAL_16( INT16, GetRelAbs16, relAbsMode )
 
 /***********************************************************************
- *		GetStretchBltMode	(GDI.88) (GDI32.221)
+ *		GetStretchBltMode	(GDI.88) (GDI32.@)
  */
 DC_GET_VAL( INT, GetStretchBltMode, stretchBltMode )
 
 /***********************************************************************
- *		GetTextColor		(GDI.90) (GDI32.227)
+ *		GetTextColor		(GDI.90) (GDI32.@)
  */
 DC_GET_VAL( COLORREF, GetTextColor, textColor )
 
@@ -212,7 +212,7 @@
 DC_GET_X_Y( DWORD, GetBrushOrg16, brushOrgX, brushOrgY )
 
 /***********************************************************************
- *		GetTextAlign	(GDI.345) (GDI32,224)
+ *		GetTextAlign	(GDI.345) (GDI32.@)
  */
 DC_GET_VAL( UINT, GetTextAlign, textAlign )
 
@@ -222,41 +222,41 @@
 DC_GET_VAL_16( HFONT16, GetCurLogFont16, hFont )
 
 /***********************************************************************
- *		GetArcDirection	(GDI.524) (GDI32.141)
+ *		GetArcDirection	(GDI.524) (GDI32.@)
  */
 DC_GET_VAL( INT, GetArcDirection, ArcDirection )
 
 /***********************************************************************
- *		GetGraphicsMode (GDI32.188)
+ *		GetGraphicsMode (GDI32.@)
  */
 DC_GET_VAL( INT, GetGraphicsMode, GraphicsMode)
 
 /***********************************************************************
- *		GetBrushOrgEx	(GDI.469) (GDI32.148)
+ *		GetBrushOrgEx	(GDI.469) (GDI32.@)
  */
 DC_GET_VAL_EX( GetBrushOrgEx, brushOrgX, brushOrgY, POINT ) /*  */
 
 /***********************************************************************
- *		GetCurrentPositionEx	(GDI.470) (GDI32.167)
+ *		GetCurrentPositionEx	(GDI.470) (GDI32.@)
  */
 DC_GET_VAL_EX( GetCurrentPositionEx, CursPosX, CursPosY, POINT )
 
 /***********************************************************************
- *		GetViewportExtEx	(GDI.472 GDI32.239)
+ *		GetViewportExtEx	(GDI.472 GDI32.@)
  */
 DC_GET_VAL_EX( GetViewportExtEx, vportExtX, vportExtY, SIZE )
 
 /***********************************************************************
- *		GetViewportOrgEx	(GDI.473) (GDI32.240)
+ *		GetViewportOrgEx	(GDI.473) (GDI32.@)
  */
 DC_GET_VAL_EX( GetViewportOrgEx, vportOrgX, vportOrgY, POINT )
 
 /***********************************************************************
- *		GetWindowExtEx	(GDI.474) (GDI32.242)
+ *		GetWindowExtEx	(GDI.474) (GDI32.@)
  */
 DC_GET_VAL_EX( GetWindowExtEx, wndExtX, wndExtY, SIZE )
 
 /***********************************************************************
- *		GetWindowOrgEx	(GDI.475) (GDI32.243)
+ *		GetWindowOrgEx	(GDI.475) (GDI32.@)
  */
 DC_GET_VAL_EX( GetWindowOrgEx, wndOrgX, wndOrgY, POINT )
diff --git a/objects/dib.c b/objects/dib.c
index 5dfb6c9..893ce6a 100644
--- a/objects/dib.c
+++ b/objects/dib.c
@@ -129,7 +129,7 @@
 
 
 /***********************************************************************
- *           StretchDIBits   (GDI32.351)
+ *           StretchDIBits   (GDI32.@)
  */
 INT WINAPI StretchDIBits(HDC hdc, INT xDst, INT yDst, INT widthDst,
                        INT heightDst, INT xSrc, INT ySrc, INT widthSrc,
@@ -209,7 +209,7 @@
 
 
 /******************************************************************************
- * SetDIBits [GDI32.312]  Sets pixels in a bitmap using colors from DIB
+ * SetDIBits [GDI32.@]  Sets pixels in a bitmap using colors from DIB
  *
  * PARAMS
  *    hdc       [I] Handle to device context
@@ -266,7 +266,7 @@
 
 
 /***********************************************************************
- *           SetDIBitsToDevice   (GDI32.313)
+ *           SetDIBitsToDevice   (GDI32.@)
  */
 INT WINAPI SetDIBitsToDevice(HDC hdc, INT xDest, INT yDest, DWORD cx,
                            DWORD cy, INT xSrc, INT ySrc, UINT startscan,
@@ -301,7 +301,7 @@
 }
 
 /***********************************************************************
- *           SetDIBColorTable    (GDI32.311)
+ *           SetDIBColorTable    (GDI32.@)
  */
 UINT WINAPI SetDIBColorTable( HDC hdc, UINT startpos, UINT entries,
 				  RGBQUAD *colors )
@@ -335,7 +335,7 @@
 }
 
 /***********************************************************************
- *           GetDIBColorTable    (GDI32.169)
+ *           GetDIBColorTable    (GDI32.@)
  */
 UINT WINAPI GetDIBColorTable( HDC hdc, UINT startpos, UINT entries,
 				  RGBQUAD *colors )
@@ -422,7 +422,7 @@
 
 
 /******************************************************************************
- * GetDIBits [GDI32.170]  Retrieves bits of bitmap and copies to buffer
+ * GetDIBits [GDI32.@]  Retrieves bits of bitmap and copies to buffer
  *
  * RETURNS
  *    Success: Number of scan lines copied from bitmap
@@ -757,6 +757,7 @@
 
 /***********************************************************************
  *           CreateDIBitmap16    (GDI.442)
+ *           CreateDIBitmap16    (DISPLAY.442)
  */
 HBITMAP16 WINAPI CreateDIBitmap16( HDC16 hdc, const BITMAPINFOHEADER * header,
                             DWORD init, LPCVOID bits, const BITMAPINFO * data,
@@ -767,7 +768,7 @@
 
 
 /***********************************************************************
- *           CreateDIBitmap    (GDI32.37)
+ *           CreateDIBitmap    (GDI32.@)
  */
 HBITMAP WINAPI CreateDIBitmap( HDC hdc, const BITMAPINFOHEADER *header,
                             DWORD init, LPCVOID bits, const BITMAPINFO *data,
@@ -909,7 +910,7 @@
 }
 
 /***********************************************************************
- *           CreateDIBSection    (GDI32.36)
+ *           CreateDIBSection    (GDI32.@)
  */
 HBITMAP WINAPI CreateDIBSection(HDC hdc, BITMAPINFO *bmi, UINT usage,
 				LPVOID *bits, HANDLE section,
diff --git a/objects/enhmetafile.c b/objects/enhmetafile.c
index b11df0f..c64eb11 100644
--- a/objects/enhmetafile.c
+++ b/objects/enhmetafile.c
@@ -113,7 +113,7 @@
 
 
 /*****************************************************************************
- *          GetEnhMetaFileA (GDI32.174)
+ *          GetEnhMetaFileA (GDI32.@)
  *
  *
  */
@@ -137,7 +137,7 @@
 }
 
 /*****************************************************************************
- *          GetEnhMetaFileW  (GDI32.180)
+ *          GetEnhMetaFileW  (GDI32.@)
  */
 HENHMETAFILE WINAPI GetEnhMetaFileW(
              LPCWSTR lpszMetaFile)  /* [in] filename of enhanced metafile */ 
@@ -158,7 +158,7 @@
 }
 
 /*****************************************************************************
- *        GetEnhMetaFileHeader  (GDI32.178)
+ *        GetEnhMetaFileHeader  (GDI32.@)
  *
  *  If buf is NULL, returns the size of buffer required.
  *  Otherwise, copy up to bufsize bytes of enhanced metafile header into 
@@ -188,7 +188,7 @@
 
 
 /*****************************************************************************
- *          GetEnhMetaFileDescriptionA  (GDI32.176)
+ *          GetEnhMetaFileDescriptionA  (GDI32.@)
  */
 UINT WINAPI GetEnhMetaFileDescriptionA( 
        HENHMETAFILE hmf, /* [in] enhanced metafile */
@@ -220,7 +220,7 @@
 }
 
 /*****************************************************************************
- *          GetEnhMetaFileDescriptionW  (GDI32.177)
+ *          GetEnhMetaFileDescriptionW  (GDI32.@)
  *
  *  Copies the description string of an enhanced metafile into a buffer 
  *  _buf_.
@@ -253,7 +253,7 @@
 }
 
 /****************************************************************************
- *    SetEnhMetaFileBits (GDI32.315)
+ *    SetEnhMetaFileBits (GDI32.@)
  *
  *  Creates an enhanced metafile by copying _bufsize_ bytes from _buf_.
  */
@@ -265,7 +265,7 @@
 }
 
 /*****************************************************************************
- *  GetEnhMetaFileBits (GDI32.175)
+ *  GetEnhMetaFileBits (GDI32.@)
  *
  */
 UINT WINAPI GetEnhMetaFileBits(
@@ -293,7 +293,7 @@
 }
 
 /*****************************************************************************
- *           PlayEnhMetaFileRecord  (GDI32.264)
+ *           PlayEnhMetaFileRecord  (GDI32.@)
  *
  *  Render a single enhanced metafile record in the device context hdc.
  *
@@ -1517,7 +1517,7 @@
 
 /*****************************************************************************
  *
- *        EnumEnhMetaFile  (GDI32.79)
+ *        EnumEnhMetaFile  (GDI32.@)
  *
  *  Walk an enhanced metafile, calling a user-specified function _EnhMetaFunc_
  *  for each
@@ -1666,7 +1666,7 @@
 }
 						
 /**************************************************************************
- *    PlayEnhMetaFile  (GDI32.263)
+ *    PlayEnhMetaFile  (GDI32.@)
  *
  *    Renders an enhanced metafile into a specified rectangle *lpRect
  *    in device context hdc.
@@ -1683,7 +1683,7 @@
 }
 
 /*****************************************************************************
- *  DeleteEnhMetaFile (GDI32.68)
+ *  DeleteEnhMetaFile (GDI32.@)
  *
  *  Deletes an enhanced metafile and frees the associated storage.
  */
@@ -1693,7 +1693,7 @@
 }
 
 /*****************************************************************************
- *  CopyEnhMetaFileA (GDI32.21)  Duplicate an enhanced metafile
+ *  CopyEnhMetaFileA (GDI32.@)  Duplicate an enhanced metafile
  *
  *   
  */
@@ -1767,7 +1767,7 @@
 }
 
 /*****************************************************************************
- *  GetEnhMetaFilePaletteEntries (GDI32.179)  
+ *  GetEnhMetaFilePaletteEntries (GDI32.@)  
  * 
  *  Copy the palette and report size  
  * 
@@ -1827,7 +1827,7 @@
 }
 
 /******************************************************************
- *         SetWinMetaFileBits   (GDI32.343)
+ *         SetWinMetaFileBits   (GDI32.@)
  *      
  *         Translate from old style to new style.
  *
diff --git a/objects/linedda.c b/objects/linedda.c
index 44615c5..9b7602c 100644
--- a/objects/linedda.c
+++ b/objects/linedda.c
@@ -11,7 +11,7 @@
 
 
 /**********************************************************************
- *           LineDDA   (GDI32.248)
+ *           LineDDA   (GDI32.@)
  */
 BOOL WINAPI LineDDA(INT nXStart, INT nYStart, INT nXEnd, INT nYEnd,
                         LINEDDAPROC callback, LPARAM lParam )
diff --git a/objects/metafile.c b/objects/metafile.c
index ccda9ab..46e5dfa 100644
--- a/objects/metafile.c
+++ b/objects/metafile.c
@@ -158,7 +158,7 @@
 }
 
 /******************************************************************
- *          DeleteMetaFile  (GDI32.69)
+ *          DeleteMetaFile  (GDI32.@)
  *
  *  Delete a memory-based metafile.
  */
@@ -233,7 +233,7 @@
 }
 
 /******************************************************************
- *         GetMetaFileA   (GDI32.197)
+ *         GetMetaFileA   (GDI32.@)
  *
  *  Read a metafile from a file. Returns handle to a memory-based metafile.
  */
@@ -260,7 +260,7 @@
 
 
 /******************************************************************
- *         GetMetaFileW   (GDI32.199)
+ *         GetMetaFileW   (GDI32.@)
  */
 HMETAFILE WINAPI GetMetaFileW( LPCWSTR lpFilename )
 {
@@ -367,7 +367,7 @@
 
 
 /******************************************************************
- *         CopyMetaFileA   (GDI32.23)
+ *         CopyMetaFileA   (GDI32.@)
  *
  *  Copies the metafile corresponding to hSrcMetaFile to either
  *  a disk file, if a filename is given, or to a new memory based
@@ -417,7 +417,7 @@
 
 
 /******************************************************************
- *         CopyMetaFileW   (GDI32.24)
+ *         CopyMetaFileW   (GDI32.@)
  */
 HMETAFILE WINAPI CopyMetaFileW( HMETAFILE hSrcMetaFile,
                                     LPCWSTR lpFilename )
@@ -540,7 +540,7 @@
 }
 
 /******************************************************************
- *         PlayMetaFile   (GDI32.265)
+ *         PlayMetaFile   (GDI32.@)
  *
  *  Renders the metafile specified by hmf in the DC specified by
  *  hdc. Returns FALSE on failure, TRUE on success.
@@ -639,7 +639,7 @@
 }
 
 /******************************************************************
- *            EnumMetaFile   (GDI32.88)
+ *            EnumMetaFile   (GDI32.@)
  *
  *  Loop through the metafile records in hmf, calling the user-specified
  *  function for each one, stopping when the user's function returns FALSE
@@ -1210,7 +1210,7 @@
 }
 
 /******************************************************************
- *         PlayMetaFileRecord   (GDI32.266)
+ *         PlayMetaFileRecord   (GDI32.@)
  */
 BOOL WINAPI PlayMetaFileRecord( HDC hdc,  HANDLETABLE *handletable, 
 				METARECORD *metarecord, UINT handles )
@@ -1281,7 +1281,7 @@
 }
 
 /******************************************************************
- *         SetMetaFileBitsEx    (GDI32.323)
+ *         SetMetaFileBitsEx    (GDI32.@)
  * 
  *  Create a metafile from raw data. No checking of the data is performed.
  *  Use _GetMetaFileBitsEx_ to get raw data from a metafile.
@@ -1298,7 +1298,7 @@
 }
 
 /*****************************************************************
- *  GetMetaFileBitsEx     (GDI32.198)  Get raw metafile data
+ *  GetMetaFileBitsEx     (GDI32.@)  Get raw metafile data
  * 
  *  Copies the data from metafile _hmf_ into the buffer _buf_.
  *  If _buf_ is zero, returns size of buffer required. Otherwise,
@@ -1329,7 +1329,7 @@
 }
 
 /******************************************************************
- *         GetWinMetaFileBits [GDI32.241]
+ *         GetWinMetaFileBits [GDI32.@]
  */
 UINT WINAPI GetWinMetaFileBits(HENHMETAFILE hemf,
                                 UINT cbBuffer, LPBYTE lpbBuffer,
diff --git a/objects/palette.c b/objects/palette.c
index aabcd7c..3187a54 100644
--- a/objects/palette.c
+++ b/objects/palette.c
@@ -99,7 +99,7 @@
 
 
 /***********************************************************************
- * CreatePalette [GDI32.53]  Creates a logical color palette
+ * CreatePalette [GDI32.@]  Creates a logical color palette
  *
  * RETURNS
  *    Success: Handle to logical palette
@@ -131,7 +131,7 @@
 
 
 /***********************************************************************
- * CreateHalftonePalette16 [GDI.?]  Creates a halftone palette
+ * CreateHalftonePalette16 [GDI.529]  Creates a halftone palette
  *
  * RETURNS
  *    Success: Handle to logical halftone palette
@@ -145,7 +145,7 @@
 
 	
 /***********************************************************************
- * CreateHalftonePalette [GDI32.47]  Creates a halftone palette
+ * CreateHalftonePalette [GDI32.@]  Creates a halftone palette
  *
  * RETURNS
  *    Success: Handle to logical halftone palette
@@ -200,7 +200,7 @@
 
 
 /***********************************************************************
- * GetPaletteEntries [GDI32.209]  Retrieves palette entries
+ * GetPaletteEntries [GDI32.@]  Retrieves palette entries
  *
  * RETURNS
  *    Success: Number of entries from logical palette
@@ -252,7 +252,7 @@
 
 
 /***********************************************************************
- * SetPaletteEntries [GDI32.326]  Sets color values for range in palette
+ * SetPaletteEntries [GDI32.@]  Sets color values for range in palette
  *
  * RETURNS
  *    Success: Number of entries that were set
@@ -300,7 +300,7 @@
 
 
 /***********************************************************************
- * ResizePalette [GDI32.289]  Resizes logical palette
+ * ResizePalette [GDI32.@]  Resizes logical palette
  *
  * RETURNS
  *    Success: TRUE
@@ -367,7 +367,7 @@
 
 
 /***********************************************************************
- * AnimatePalette [GDI32.6]  Replaces entries in logical palette
+ * AnimatePalette [GDI32.@]  Replaces entries in logical palette
  *
  * RETURNS
  *    Success: TRUE
@@ -416,7 +416,7 @@
 
 
 /***********************************************************************
- * SetSystemPaletteUse [GDI32.335]
+ * SetSystemPaletteUse [GDI32.@]
  *
  * RETURNS
  *    Success: Previous system palette
@@ -443,7 +443,7 @@
 
 
 /***********************************************************************
- * GetSystemPaletteUse [GDI32.223]  Gets state of system palette
+ * GetSystemPaletteUse [GDI32.@]  Gets state of system palette
  *
  * RETURNS
  *    Current state of system palette
@@ -466,7 +466,7 @@
 
 
 /***********************************************************************
- * GetSystemPaletteEntries [GDI32.222]  Gets range of palette entries
+ * GetSystemPaletteEntries [GDI32.@]  Gets range of palette entries
  *
  * RETURNS
  *    Success: Number of entries retrieved from palette
@@ -522,7 +522,7 @@
 
 
 /***********************************************************************
- * GetNearestPaletteIndex [GDI32.203]  Gets palette index for color
+ * GetNearestPaletteIndex [GDI32.@]  Gets palette index for color
  *
  * NOTES
  *    Should index be initialized to CLR_INVALID instead of 0?
@@ -561,7 +561,7 @@
 
 
 /***********************************************************************
- * GetNearestColor [GDI32.202]  Gets a system color to match
+ * GetNearestColor [GDI32.@]  Gets a system color to match
  *
  * RETURNS
  *    Success: Color from system palette that corresponds to given color
@@ -746,7 +746,7 @@
 
 
 /***********************************************************************
- * SelectPalette [GDI32.300]  Selects logical palette into DC
+ * SelectPalette [GDI32.@]  Selects logical palette into DC
  *
  * RETURNS
  *    Success: Previous logical palette
@@ -762,7 +762,7 @@
 
 
 /***********************************************************************
- * RealizePalette [GDI32.280]  Maps palette entries to system palette
+ * RealizePalette [GDI32.@]  Maps palette entries to system palette
  *
  * RETURNS
  *    Success: Number of entries in logical palette
@@ -776,6 +776,7 @@
 
 
 /**********************************************************************
+ *            UpdateColors16   (DISPLAY.366)
  *            UpdateColors16   (GDI.366)
  */
 INT16 WINAPI UpdateColors16( HDC16 hDC )
@@ -802,7 +803,7 @@
 
 
 /**********************************************************************
- * UpdateColors [GDI32.359]  Remaps current colors to logical palette
+ * UpdateColors [GDI32.@]  Remaps current colors to logical palette
  *
  * RETURNS
  *    Success: TRUE
@@ -826,7 +827,7 @@
 }
 
 /**********************************************************************
- * GetICMProfileA [GDI32.316]
+ * GetICMProfileA [GDI32.@]
  *
  * Returns the filename of the specified device context's color
  * management profile, even if color management is not enabled
diff --git a/objects/pen.c b/objects/pen.c
index 89b00e9..8baad51 100644
--- a/objects/pen.c
+++ b/objects/pen.c
@@ -31,7 +31,7 @@
 
 
 /***********************************************************************
- *           CreatePen    (GDI32.55)
+ *           CreatePen    (GDI32.@)
  */
 HPEN WINAPI CreatePen( INT style, INT width, COLORREF color )
 {
@@ -67,7 +67,7 @@
 
 
 /***********************************************************************
- *           CreatePenIndirect    (GDI32.56)
+ *           CreatePenIndirect    (GDI32.@)
  */
 HPEN WINAPI CreatePenIndirect( const LOGPEN * pen )
 {
@@ -83,7 +83,7 @@
 }
 
 /***********************************************************************
- *           ExtCreatePen    (GDI32.93)
+ *           ExtCreatePen    (GDI32.@)
  *
  * FIXME: PS_USERSTYLE not handled
  */
diff --git a/objects/region.c b/objects/region.c
index 384b834..29a1092 100644
--- a/objects/region.c
+++ b/objects/region.c
@@ -497,7 +497,7 @@
 }
 
 /***********************************************************************
- *           OffsetRgn   (GDI32.256)
+ *           OffsetRgn   (GDI32.@)
  */
 INT WINAPI OffsetRgn( HRGN hrgn, INT x, INT y )
 {
@@ -545,7 +545,7 @@
 }
 
 /***********************************************************************
- *           GetRgnBox    (GDI32.219)
+ *           GetRgnBox    (GDI32.@)
  */
 INT WINAPI GetRgnBox( HRGN hrgn, LPRECT rect )
 {
@@ -584,7 +584,7 @@
 
 
 /***********************************************************************
- *           CreateRectRgn   (GDI32.59)
+ *           CreateRectRgn   (GDI32.@)
  */
 HRGN WINAPI CreateRectRgn(INT left, INT top, INT right, INT bottom)
 {
@@ -609,7 +609,7 @@
 
 
 /***********************************************************************
- *           CreateRectRgnIndirect    (GDI32.60)
+ *           CreateRectRgnIndirect    (GDI32.@)
  */
 HRGN WINAPI CreateRectRgnIndirect( const RECT* rect )
 {
@@ -633,7 +633,7 @@
 
 
 /***********************************************************************
- *           SetRectRgn    (GDI32.332)
+ *           SetRectRgn    (GDI32.@)
  *
  * Allows either or both left and top to be greater than right or bottom.
  */
@@ -687,7 +687,7 @@
 }
 
 /***********************************************************************
- *           CreateRoundRectRgn    (GDI32.61)
+ *           CreateRoundRectRgn    (GDI32.@)
  */
 HRGN WINAPI CreateRoundRectRgn( INT left, INT top,
 				    INT right, INT bottom,
@@ -807,7 +807,7 @@
 
 
 /***********************************************************************
- *           CreateEllipticRgn    (GDI32.39)
+ *           CreateEllipticRgn    (GDI32.@)
  */
 HRGN WINAPI CreateEllipticRgn( INT left, INT top,
 				   INT right, INT bottom )
@@ -829,7 +829,7 @@
 
 
 /***********************************************************************
- *           CreateEllipticRgnIndirect    (GDI32.40)
+ *           CreateEllipticRgnIndirect    (GDI32.@)
  */
 HRGN WINAPI CreateEllipticRgnIndirect( const RECT *rect )
 {
@@ -839,7 +839,7 @@
 }
 
 /***********************************************************************
- *           GetRegionData   (GDI32.217)
+ *           GetRegionData   (GDI32.@)
  * 
  * MSDN: GetRegionData, Return Values:
  *
@@ -895,7 +895,7 @@
 }
 
 /***********************************************************************
- *           ExtCreateRegion   (GDI32.94)
+ *           ExtCreateRegion   (GDI32.@)
  * 
  */
 HRGN WINAPI ExtCreateRegion( const XFORM* lpXform, DWORD dwCount, const RGNDATA* rgndata)
@@ -947,7 +947,7 @@
 
 
 /***********************************************************************
- *           PtInRegion    (GDI32.278)
+ *           PtInRegion    (GDI32.@)
  */
 BOOL WINAPI PtInRegion( HRGN hrgn, INT x, INT y )
 {
@@ -972,7 +972,7 @@
 
 
 /***********************************************************************
- *           RectInRegion16    (GDI.181)
+ *           RectInRegion16    (GDI.466)
  */
 BOOL16 WINAPI RectInRegion16( HRGN16 hrgn, const RECT16 *rect )
 {
@@ -984,7 +984,7 @@
 
 
 /***********************************************************************
- *           RectInRegion    (GDI32.281)
+ *           RectInRegion    (GDI32.@)
  *
  * Returns TRUE if rect is at least partly inside hrgn
  */
@@ -1036,7 +1036,7 @@
 
 
 /***********************************************************************
- *           EqualRgn    (GDI32.90)
+ *           EqualRgn    (GDI32.@)
  */
 BOOL WINAPI EqualRgn( HRGN hrgn1, HRGN hrgn2 )
 {
@@ -1208,7 +1208,7 @@
 }
     
 /***********************************************************************
- *           CombineRgn16    (GDI.451)
+ *           CombineRgn16    (GDI.47)
  */
 INT16 WINAPI CombineRgn16(HRGN16 hDest, HRGN16 hSrc1, HRGN16 hSrc2, INT16 mode)
 {
@@ -1217,7 +1217,7 @@
 
 
 /***********************************************************************
- *           CombineRgn   (GDI32.19)
+ *           CombineRgn   (GDI32.@)
  *
  * Note: The behavior is correct even if src and dest regions are the same.
  */
@@ -2693,7 +2693,7 @@
 }
 
 /***********************************************************************
- *           CreatePolyPolygonRgn    (GDI32.57)
+ *           CreatePolyPolygonRgn    (GDI32.@)
  */
 HRGN WINAPI CreatePolyPolygonRgn(const POINT *Pts, const INT *Count, 
 		      INT nbpolygons, INT mode)
@@ -2911,7 +2911,7 @@
 }
 
 /***********************************************************************
- *           CreatePolygonRgn    (GDI32.58)
+ *           CreatePolygonRgn    (GDI32.@)
  */
 HRGN WINAPI CreatePolygonRgn( const POINT *points, INT count,
                                   INT mode )
@@ -2921,7 +2921,7 @@
 
 
 /***********************************************************************
- * GetRandomRgn [GDI32.215]
+ * GetRandomRgn [GDI32.@]
  *
  * NOTES
  *     This function is documented in MSDN online
@@ -3225,6 +3225,7 @@
 
 /***********************************************************************
  *           GetMetaRgn    (GDI.328)
+ *           GetMetaRgn    (GDI32.@)
  */
 INT WINAPI GetMetaRgn( HDC hdc, HRGN hRgn )
 {
@@ -3236,6 +3237,7 @@
 
 /***********************************************************************
  *           SetMetaRgn    (GDI.455)
+ *           SetMetaRgn    (GDI32.@)
  */
 INT WINAPI SetMetaRgn( HDC hdc )
 {
diff --git a/objects/text.c b/objects/text.c
index 1787deb..12bc71b 100644
--- a/objects/text.c
+++ b/objects/text.c
@@ -21,6 +21,7 @@
 
 
 /***********************************************************************
+ *           ExtTextOut16    (DISPLAY.351)
  *           ExtTextOut16    (GDI.351)
  */
 BOOL16 WINAPI ExtTextOut16( HDC16 hdc, INT16 x, INT16 y, UINT16 flags,
@@ -45,7 +46,7 @@
 
 
 /***********************************************************************
- *           ExtTextOutA    (GDI32.98)
+ *           ExtTextOutA    (GDI32.@)
  */
 BOOL WINAPI ExtTextOutA( HDC hdc, INT x, INT y, UINT flags,
                              const RECT *lprect, LPCSTR str, UINT count,
@@ -95,7 +96,7 @@
 
 
 /***********************************************************************
- *           ExtTextOutW    (GDI32.99)
+ *           ExtTextOutW    (GDI32.@)
  */
 BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags,
                              const RECT *lprect, LPCWSTR str, UINT count,
@@ -123,7 +124,7 @@
 
 
 /***********************************************************************
- *           TextOutA    (GDI32.355)
+ *           TextOutA    (GDI32.@)
  */
 BOOL WINAPI TextOutA( HDC hdc, INT x, INT y, LPCSTR str, INT count )
 {
@@ -132,7 +133,7 @@
 
 
 /***********************************************************************
- *           TextOutW    (GDI32.356)
+ *           TextOutW    (GDI32.@)
  */
 BOOL WINAPI TextOutW(HDC hdc, INT x, INT y, LPCWSTR str, INT count)
 {
@@ -141,7 +142,7 @@
 
 
 /***********************************************************************
- * GetTextCharset [GDI32.226]  Gets character set for font in DC
+ * GetTextCharset [GDI32.@]  Gets character set for font in DC
  *
  * NOTES
  *    Should it return a UINT32 instead of an INT32?
@@ -167,7 +168,7 @@
 }
 
 /***********************************************************************
- * GetTextCharsetInfo [GDI32.381]  Gets character set for font
+ * GetTextCharsetInfo [GDI32.@]  Gets character set for font
  *
  * NOTES
  *    Should csi be an LPFONTSIGNATURE instead of an LPCHARSETINFO?
@@ -203,7 +204,10 @@
 }
 
 /***********************************************************************
- * PolyTextOutA [GDI.402]  Draw several Strings
+ *		PolyTextOutA (GDI.402)
+ *		PolyTextOutA (GDI32.@)
+ *
+ * Draw several Strings
  */
 BOOL WINAPI PolyTextOutA (
 			  HDC hdc,               /* [in] Handle to device context */			  
@@ -219,7 +223,10 @@
 
 
 /***********************************************************************
- * PolyTextOutW [GDI.403] Draw several Strings
+ *		PolyTextOutW (GDI.403)
+ *		PolyTextOutW (GDI32.@)
+ *
+ * Draw several Strings
  */
 BOOL WINAPI PolyTextOutW ( 
 			  HDC hdc,               /* [in] Handle to device context */