diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c
index 458d73a9b004ef1c8c8c994c7731eced81dea995..a29ffb7161319f14cdc4afd95c6d3f44aa4952e8 100644
--- a/dlls/advapi32/crypt.c
+++ b/dlls/advapi32/crypt.c
@@ -31,6 +31,9 @@ CryptAcquireContextA( HCRYPTPROV *phProv, LPCSTR pszContainer,
     return FALSE;
 }
 
+/******************************************************************************
+ * CryptSetKeyParam
+ */
 BOOL WINAPI
 CryptSetKeyParam( HCRYPTKEY hKey, DWORD dwParam, BYTE *pbData, DWORD dwFlags)
 {
diff --git a/dlls/crtdll/crtdll_main.c b/dlls/crtdll/crtdll_main.c
index 99efa78bdeaea1ac9a7bb0a03ac260d16cdbeb9b..cc4d3e0c155a02c4de78356b79ab636f91f33d45 100644
--- a/dlls/crtdll/crtdll_main.c
+++ b/dlls/crtdll/crtdll_main.c
@@ -249,10 +249,14 @@ DWORD __cdecl CRTDLL__initterm(_INITTERMFUN *start,_INITTERMFUN *end)
 	return 0;
 }
 
+/*********************************************************************
+ *                  _fsopen     (CRTDLL.110)
+ */
 CRTDLL_FILE * __cdecl CRTDLL__fsopen(LPCSTR x, LPCSTR y, INT z) {
 	FIXME("(%s,%s,%d),stub!\n",x,y,z);
 	return NULL;
 }
+
 /*********************************************************************
  *                  _fdopen     (CRTDLL.91)
  */
@@ -581,7 +585,7 @@ time_t __cdecl CRTDLL_time(time_t *timeptr)
 }
 
 /*********************************************************************
- *                            (CRTDLL.350)
+ *                  clock         (CRTDLL.350)
  */
 clock_t __cdecl CRTDLL_clock(void)
 {
@@ -1812,7 +1816,7 @@ INT __cdecl CRTDLL_wcstol(LPWSTR s,LPWSTR *end,INT base) {
 	return ret;
 }
 /*********************************************************************
- *                  strdate           (CRTDLL.283)
+ *                  _strdate          (CRTDLL.283)
  */
 LPSTR __cdecl CRTDLL__strdate (LPSTR date)
 {	FIXME("%p stub\n", date);
@@ -1820,7 +1824,7 @@ LPSTR __cdecl CRTDLL__strdate (LPSTR date)
 }
 
 /*********************************************************************
- *                  strtime           (CRTDLL.299)
+ *                  _strtime          (CRTDLL.299)
  */
 LPSTR __cdecl CRTDLL__strtime (LPSTR date)
 {	FIXME("%p stub\n", date);
diff --git a/files/dos_fs.c b/files/dos_fs.c
index 13b65fc39547373035e1556ce16464e6f5c216a2..734c5eaaa06f4f0fd8a30361e9a182675bceda97 100644
--- a/files/dos_fs.c
+++ b/files/dos_fs.c
@@ -1937,6 +1937,9 @@ BOOL WINAPI SystemTimeToFileTime( const SYSTEMTIME *syst, LPFILETIME ft )
     return TRUE; 
 }
 
+/***********************************************************************
+ *           DefineDosDeviceA       (KERNEL32.182)
+ */
 BOOL WINAPI DefineDosDeviceA(DWORD flags,LPCSTR devname,LPCSTR targetpath) {
 	FIXME_(dosfs)("(0x%08lx,%s,%s),stub!\n",flags,devname,targetpath);
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
diff --git a/objects/dcvalues.c b/objects/dcvalues.c
index 9965f8a025eb3b5de58a274ff018b66c27bd7ba3..9bbe693c14d0cf2acf315f3accd587a72dd65ef7 100644
--- a/objects/dcvalues.c
+++ b/objects/dcvalues.c
@@ -77,54 +77,193 @@ INT WINAPI func_name( HDC hdc, INT mode ) \
     return prevMode; \
 }
 
-
-
-/* GDI.2 GDI32.306 */
+/***********************************************************************
+ *		SetBkMode		(GDI.2) (GDI32.306)
+ *
+ */
 DC_SET_MODE( SetBkMode, w.backgroundMode, TRANSPARENT, OPAQUE ) 
 
-/* GDI.4 GDI32.331 */
+/***********************************************************************
+ *		SetROP2			(GDI.4) (GDI32.331)
+ */
 DC_SET_MODE( SetROP2, w.ROPmode, R2_BLACK, R2_WHITE )
 
-/* GDI.5 GDI32.333 */
+/***********************************************************************
+ *		SetRelAbs		(GDI.5) (GDI32.333)
+ */
 DC_SET_MODE( SetRelAbs, w.relAbsMode, ABSOLUTE, RELATIVE )
 
-/* GDI.6 GDI32.330 */
+/***********************************************************************
+ *		SetPolyFillMode		(GDI.6) (GDI32.330)
+ */
 DC_SET_MODE( SetPolyFillMode, w.polyFillMode, ALTERNATE, WINDING )
 
-/* GDI.7 GDI32.334 */
+/***********************************************************************
+ *		SetStretchBltMode	(GDI.7) (GDI32.334)
+ */
 DC_SET_MODE( SetStretchBltMode, w.stretchBltMode, BLACKONWHITE, HALFTONE )
 
-DC_GET_VAL_16( COLORREF, GetBkColor16, w.backgroundColor )      /* GDI.75    */
-DC_GET_VAL_32( COLORREF, GetBkColor, w.backgroundColor )      /* GDI32.145 */
-DC_GET_VAL_16( INT16, GetBkMode16, w.backgroundMode )           /* GDI.76    */
-DC_GET_VAL_32( INT, GetBkMode, w.backgroundMode )           /* GDI32.146 */
-DC_GET_X_Y( DWORD, GetCurrentPosition16, w.CursPosX, w.CursPosY ) /* GDI.78    */
-DC_GET_VAL_16( INT16, GetMapMode16, w.MapMode )                 /* GDI.81    */
-DC_GET_VAL_32( INT, GetMapMode, w.MapMode )                 /* GDI32.196 */
-DC_GET_VAL_16( INT16, GetPolyFillMode16, w.polyFillMode )       /* GDI.84    */
-DC_GET_VAL_32( INT, GetPolyFillMode, w.polyFillMode )       /* GDI32.213 */
-DC_GET_VAL_16( INT16, GetROP216, w.ROPmode )                    /* GDI.85    */
-DC_GET_VAL_32( INT, GetROP2, w.ROPmode )                    /* GDI32.214 */
-DC_GET_VAL_16( INT16, GetRelAbs16, w.relAbsMode )               /* GDI.86    */
-DC_GET_VAL_32( INT, GetRelAbs, w.relAbsMode )               /* GDI32.218 */
-DC_GET_VAL_16( INT16, GetStretchBltMode16, w.stretchBltMode )   /* GDI.88    */
-DC_GET_VAL_32( INT, GetStretchBltMode, w.stretchBltMode )   /* GDI32.221 */
-DC_GET_VAL_16( COLORREF, GetTextColor16, w.textColor )          /* GDI.90    */
-DC_GET_VAL_32( COLORREF, GetTextColor, w.textColor )          /* GDI32.227 */
-DC_GET_X_Y( DWORD, GetViewportExt16, vportExtX, vportExtY )       /* GDI.94    */
-DC_GET_X_Y( DWORD, GetViewportOrg16, vportOrgX, vportOrgY )       /* GDI.95    */
-DC_GET_X_Y( DWORD, GetWindowExt16, wndExtX, wndExtY )             /* GDI.96    */
-DC_GET_X_Y( DWORD, GetWindowOrg16, wndOrgX, wndOrgY )             /* GDI.97    */
-DC_GET_VAL_16( HRGN16, InquireVisRgn16, w.hVisRgn )               /* GDI.131   */
-DC_GET_VAL_16( HRGN16, GetClipRgn16, w.hClipRgn )               /* GDI.173   */
-DC_GET_X_Y( DWORD, GetBrushOrg16, w.brushOrgX, w.brushOrgY )      /* GDI.149   */
-DC_GET_VAL_16( UINT16, GetTextAlign16, w.textAlign )            /* GDI.345   */
-DC_GET_VAL_32( UINT, GetTextAlign, w.textAlign )            /* GDI32.224 */
-DC_GET_VAL_16( HFONT16, GetCurLogFont16, w.hFont )                /* GDI.411   */
-DC_GET_VAL_EX( GetBrushOrgEx, w.brushOrgX, w.brushOrgY, POINT ) /* GDI.469 GDI32.148 */
-DC_GET_VAL_EX( GetCurrentPositionEx, w.CursPosX, w.CursPosY,    /* GDI.470 GDI32.167 */
-               POINT )
-DC_GET_VAL_EX( GetViewportExtEx, vportExtX, vportExtY, SIZE )   /* GDI.472 GDI32.239 */
-DC_GET_VAL_EX( GetViewportOrgEx, vportOrgX, vportOrgY, POINT )  /* GDI.473 GDI32.240 */
-DC_GET_VAL_EX( GetWindowExtEx, wndExtX, wndExtY, SIZE )         /* GDI.474 GDI32.242 */
-DC_GET_VAL_EX( GetWindowOrgEx, wndOrgX, wndOrgY, POINT )        /* GDI.475 GDI32.243 */
+/***********************************************************************
+ *		GetBkColor16		(GDI.75)
+ */
+DC_GET_VAL_16( COLORREF, GetBkColor16, w.backgroundColor )
+
+/***********************************************************************
+ *		GetBkColor		(GDI32.145)
+ */
+DC_GET_VAL_32( COLORREF, GetBkColor, w.backgroundColor )
+
+/***********************************************************************
+ *		GetBkMode16		(GDI.76)
+ */
+DC_GET_VAL_16( INT16, GetBkMode16, w.backgroundMode )
+
+/***********************************************************************
+ *		GetBkMode		(GDI32.146)
+ */
+DC_GET_VAL_32( INT, GetBkMode, w.backgroundMode )
+
+/***********************************************************************
+ *		GetCurrentPosition16	(GDI.78)
+ */
+DC_GET_X_Y( DWORD, GetCurrentPosition16, w.CursPosX, w.CursPosY )
+
+/***********************************************************************
+ *		GetMapMode16		(GDI.81)
+ */
+DC_GET_VAL_16( INT16, GetMapMode16, w.MapMode )
+
+/***********************************************************************
+ *		GetMapMode		(GDI32.196)
+ */
+DC_GET_VAL_32( INT, GetMapMode, w.MapMode )
+
+/***********************************************************************
+ *		GetPolyFillMode16	(GDI.84)
+ */
+DC_GET_VAL_16( INT16, GetPolyFillMode16, w.polyFillMode )
+
+/***********************************************************************
+ *		GetPolyFillMode		(GDI32.213)
+ */
+DC_GET_VAL_32( INT, GetPolyFillMode, w.polyFillMode )
+
+/***********************************************************************
+ *		GetROP216		(GDI.85)
+ */
+DC_GET_VAL_16( INT16, GetROP216, w.ROPmode )
+
+/***********************************************************************
+ *		GetROP2			(GDI32.214)
+ */
+DC_GET_VAL_32( INT, GetROP2, w.ROPmode )
+
+/***********************************************************************
+ *		GetRelAbs16		(GDI.86)
+ */
+DC_GET_VAL_16( INT16, GetRelAbs16, w.relAbsMode )
+
+/***********************************************************************
+ *		GetRelAbs		(GDI32.218)
+ */
+DC_GET_VAL_32( INT, GetRelAbs, w.relAbsMode )
+
+/***********************************************************************
+ *		GetStretchBltMode16	(GDI.88)
+ */
+DC_GET_VAL_16( INT16, GetStretchBltMode16, w.stretchBltMode )
+
+/***********************************************************************
+ *		GetStretchBltMode	(GDI32.221)
+ */
+DC_GET_VAL_32( INT, GetStretchBltMode, w.stretchBltMode )
+
+/***********************************************************************
+ *		GetTextColor16		(GDI.90)
+ */
+DC_GET_VAL_16( COLORREF, GetTextColor16, w.textColor )
+
+/***********************************************************************
+ *		GetTextColor		(GDI32.227)
+ */
+DC_GET_VAL_32( COLORREF, GetTextColor, w.textColor )
+
+/***********************************************************************
+ *		GetViewportExt16	(GDI.94)
+ */
+DC_GET_X_Y( DWORD, GetViewportExt16, vportExtX, vportExtY )
+
+/***********************************************************************
+ *		GetViewportOrg16	(GDI.95)
+ */
+DC_GET_X_Y( DWORD, GetViewportOrg16, vportOrgX, vportOrgY )
+
+/***********************************************************************
+ *		GetWindowExt16		(GDI.96)
+ */
+DC_GET_X_Y( DWORD, GetWindowExt16, wndExtX, wndExtY )
+
+/***********************************************************************
+ *		GetWindowOrg16	(GDI.97)
+ */
+DC_GET_X_Y( DWORD, GetWindowOrg16, wndOrgX, wndOrgY )
+
+/***********************************************************************
+ *		InquireVisRgn16	(GDI.131)
+ */
+DC_GET_VAL_16( HRGN16, InquireVisRgn16, w.hVisRgn )
+
+/***********************************************************************
+ *		GetClipRgn16	(GDI.173)
+ */
+DC_GET_VAL_16( HRGN16, GetClipRgn16, w.hClipRgn )
+
+/***********************************************************************
+ *		GetBrushOrg16	(GDI.149)
+ */
+DC_GET_X_Y( DWORD, GetBrushOrg16, w.brushOrgX, w.brushOrgY )
+
+/***********************************************************************
+ *		GetTextAlign16	(GDI.345)
+ */
+DC_GET_VAL_16( UINT16, GetTextAlign16, w.textAlign )
+
+/***********************************************************************
+ *		GetTextAlign	(GDI32.224)
+ */
+DC_GET_VAL_32( UINT, GetTextAlign, w.textAlign )
+
+/***********************************************************************
+ *		GetCurLogFont16	(GDI.411)
+ */
+DC_GET_VAL_16( HFONT16, GetCurLogFont16, w.hFont )
+
+/***********************************************************************
+ *		GetBrushOrgEx	(GDI.469) (GDI32.148)
+ */
+DC_GET_VAL_EX( GetBrushOrgEx, w.brushOrgX, w.brushOrgY, POINT ) /*  */
+
+/***********************************************************************
+ *		GetCurrentPositionEx	(GDI.470) (GDI32.167)
+ */
+DC_GET_VAL_EX( GetCurrentPositionEx, w.CursPosX, w.CursPosY, POINT )
+
+/***********************************************************************
+ *		GetViewportExtEx	(GDI.472 GDI32.239)
+ */
+DC_GET_VAL_EX( GetViewportExtEx, vportExtX, vportExtY, SIZE )
+
+/***********************************************************************
+ *		GetViewportOrgEx	(GDI.473) (GDI32.240)
+ */
+DC_GET_VAL_EX( GetViewportOrgEx, vportOrgX, vportOrgY, POINT )
+
+/***********************************************************************
+ *		GetWindowExtEx	(GDI.474) (GDI32.242)
+ */
+DC_GET_VAL_EX( GetWindowExtEx, wndExtX, wndExtY, SIZE )
+
+/***********************************************************************
+ *		GetWindowOrgEx	(GDI.475) (GDI32.243)
+ */
+DC_GET_VAL_EX( GetWindowOrgEx, wndOrgX, wndOrgY, POINT )