[reactos] 01/01: [WIN32SS][WINSRV] Add CSR API_NUMBER info comments (#2192)

[Katayama Hirofumi MZ]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f84963b0d5668a2779b34…

commit f84963b0d5668a2779b34f49dee20ac88bf9d275
Author:     Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
AuthorDate: Tue Dec 31 09:21:42 2019 +0900
Commit:     GitHub <noreply(a)github.com>
CommitDate: Tue Dec 31 09:21:42 2019 +0900

    [WIN32SS][WINSRV] Add CSR API_NUMBER info comments (#2192)
    
    Add comments to improve human-readability and referencing of CSR API. CORE-12451
---
 win32ss/user/winsrv/consrv/alias.c           |  6 ++++++
 win32ss/user/winsrv/consrv/coninput.c        |  6 ++++++
 win32ss/user/winsrv/consrv/conoutput.c       | 18 ++++++++++++++++++
 win32ss/user/winsrv/consrv/console.c         | 24 ++++++++++++++++++++++--
 win32ss/user/winsrv/consrv/frontendctl.c     | 19 +++++++++++++++++--
 win32ss/user/winsrv/consrv/handle.c          |  5 +++++
 win32ss/user/winsrv/consrv/history.c         |  7 +++++++
 win32ss/user/winsrv/consrv/subsysreg.c       |  6 ++++++
 win32ss/user/winsrv/consrv_new/alias.c       |  6 ++++++
 win32ss/user/winsrv/consrv_new/coninput.c    |  3 +++
 win32ss/user/winsrv/consrv_new/conoutput.c   | 17 +++++++++++++++++
 win32ss/user/winsrv/consrv_new/console.c     | 11 +++++++++++
 win32ss/user/winsrv/consrv_new/frontendctl.c | 12 ++++++++++++
 win32ss/user/winsrv/consrv_new/handle.c      |  4 ++++
 win32ss/user/winsrv/consrv_new/lineinput.c   |  6 ++++++
 15 files changed, 146 insertions(+), 4 deletions(-)

diff --git a/win32ss/user/winsrv/consrv/alias.c b/win32ss/user/winsrv/consrv/alias.c
index 9a0957ba3ac..cd2f7547086 100644
--- a/win32ss/user/winsrv/consrv/alias.c
+++ b/win32ss/user/winsrv/consrv/alias.c
@@ -445,6 +445,7 @@ IntDeleteAllAliases(PCONSRV_CONSOLE Console)
 
 /* PUBLIC SERVER APIS *********************************************************/
 
+/* API_NUMBER: ConsolepAddAlias */
 CSR_API(SrvAddConsoleAlias)
 {
     NTSTATUS Status;
@@ -535,6 +536,7 @@ Quit:
     return Status;
 }
 
+/* API_NUMBER: ConsolepGetAlias */
 CSR_API(SrvGetConsoleAlias)
 {
     NTSTATUS Status;
@@ -627,6 +629,7 @@ Quit:
     return Status;
 }
 
+/* API_NUMBER: ConsolepGetAliases */
 CSR_API(SrvGetConsoleAliases)
 {
     NTSTATUS Status;
@@ -733,6 +736,7 @@ Quit:
     return Status;
 }
 
+/* API_NUMBER: ConsolepGetAliasesLength */
 CSR_API(SrvGetConsoleAliasesLength)
 {
     NTSTATUS Status;
@@ -774,6 +778,7 @@ CSR_API(SrvGetConsoleAliasesLength)
     return Status;
 }
 
+/* API_NUMBER: ConsolepGetAliasExes */
 CSR_API(SrvGetConsoleAliasExes)
 {
     NTSTATUS Status;
@@ -861,6 +866,7 @@ Quit:
     return Status;
 }
 
+/* API_NUMBER: ConsolepGetAliasExesLength */
 CSR_API(SrvGetConsoleAliasExesLength)
 {
     NTSTATUS Status;
diff --git a/win32ss/user/winsrv/consrv/coninput.c
b/win32ss/user/winsrv/consrv/coninput.c
index e7ee44d5ee2..9c441577a07 100644
--- a/win32ss/user/winsrv/consrv/coninput.c
+++ b/win32ss/user/winsrv/consrv/coninput.c
@@ -548,6 +548,7 @@ ReadInputBuffer(IN PGET_INPUT_INFO InputInfo,
 
 /* PUBLIC SERVER APIS *********************************************************/
 
+/* API_NUMBER: ConsolepReadConsole */
 CSR_API(SrvReadConsole)
 {
     NTSTATUS Status;
@@ -605,6 +606,7 @@ CSR_API(SrvReadConsole)
     return Status;
 }
 
+/* API_NUMBER: ConsolepGetConsoleInput */
 CSR_API(SrvGetConsoleInput)
 {
     NTSTATUS Status;
@@ -669,6 +671,8 @@ ConDrvWriteConsoleInput(IN PCONSOLE Console,
                         IN ULONG NumEventsToWrite,
                         OUT PULONG NumEventsWritten OPTIONAL);
 #endif
+
+/* API_NUMBER: ConsolepWriteConsoleInput */
 CSR_API(SrvWriteConsoleInput)
 {
     NTSTATUS Status;
@@ -752,6 +756,7 @@ CSR_API(SrvWriteConsoleInput)
 NTSTATUS NTAPI
 ConDrvFlushConsoleInputBuffer(IN PCONSOLE Console,
                               IN PCONSOLE_INPUT_BUFFER InputBuffer);
+/* API_NUMBER: ConsolepFlushInputBuffer */
 CSR_API(SrvFlushConsoleInputBuffer)
 {
     NTSTATUS Status;
@@ -776,6 +781,7 @@ NTSTATUS NTAPI
 ConDrvGetConsoleNumberOfInputEvents(IN PCONSOLE Console,
                                     IN PCONSOLE_INPUT_BUFFER InputBuffer,
                                     OUT PULONG NumberOfEvents);
+/* API_NUMBER: ConsolepGetNumberOfInputEvents */
 CSR_API(SrvGetConsoleNumberOfInputEvents)
 {
     NTSTATUS Status;
diff --git a/win32ss/user/winsrv/consrv/conoutput.c
b/win32ss/user/winsrv/consrv/conoutput.c
index 1a547696892..b09e7012bdc 100644
--- a/win32ss/user/winsrv/consrv/conoutput.c
+++ b/win32ss/user/winsrv/consrv/conoutput.c
@@ -30,6 +30,7 @@ NTSTATUS NTAPI
 ConDrvInvalidateBitMapRect(IN PCONSOLE Console,
                            IN PCONSOLE_SCREEN_BUFFER Buffer,
                            IN PSMALL_RECT Region);
+/* API_NUMBER: ConsolepInvalidateBitMapRect */
 CSR_API(SrvInvalidateBitMapRect)
 {
     NTSTATUS Status;
@@ -69,6 +70,7 @@ ConDrvSetConsolePalette(IN PCONSOLE Console,
                         IN PCONSOLE_SCREEN_BUFFER Buffer,
                         IN HPALETTE PaletteHandle,
                         IN UINT PaletteUsage);
+/* API_NUMBER: ConsolepSetPalette */
 CSR_API(SrvSetConsolePalette)
 {
     NTSTATUS Status;
@@ -116,6 +118,7 @@ NTSTATUS NTAPI
 ConDrvGetConsoleCursorInfo(IN PCONSOLE Console,
                            IN PTEXTMODE_SCREEN_BUFFER Buffer,
                            OUT PCONSOLE_CURSOR_INFO CursorInfo);
+/* API_NUMBER: ConsolepGetCursorInfo */
 CSR_API(SrvGetConsoleCursorInfo)
 {
     NTSTATUS Status;
@@ -141,6 +144,7 @@ NTSTATUS NTAPI
 ConDrvSetConsoleCursorInfo(IN PCONSOLE Console,
                            IN PTEXTMODE_SCREEN_BUFFER Buffer,
                            IN PCONSOLE_CURSOR_INFO CursorInfo);
+/* API_NUMBER: ConsolepSetCursorInfo */
 CSR_API(SrvSetConsoleCursorInfo)
 {
     NTSTATUS Status;
@@ -166,6 +170,7 @@ NTSTATUS NTAPI
 ConDrvSetConsoleCursorPosition(IN PCONSOLE Console,
                                IN PTEXTMODE_SCREEN_BUFFER Buffer,
                                IN PCOORD Position);
+/* API_NUMBER: ConsolepSetCursorPosition */
 CSR_API(SrvSetConsoleCursorPosition)
 {
     NTSTATUS Status;
@@ -187,6 +192,7 @@ CSR_API(SrvSetConsoleCursorPosition)
     return Status;
 }
 
+/* API_NUMBER: ConsolepCreateScreenBuffer */
 CSR_API(SrvCreateConsoleScreenBuffer)
 {
     NTSTATUS Status = STATUS_INVALID_PARAMETER;
@@ -316,6 +322,7 @@ Quit:
 NTSTATUS NTAPI
 ConDrvSetConsoleActiveScreenBuffer(IN PCONSOLE Console,
                                    IN PCONSOLE_SCREEN_BUFFER Buffer);
+/* API_NUMBER: ConsolepSetActiveScreenBuffer */
 CSR_API(SrvSetConsoleActiveScreenBuffer)
 {
     NTSTATUS Status;
@@ -478,6 +485,7 @@ ConDrvReadConsoleOutput(IN PCONSOLE Console,
                         IN BOOLEAN Unicode,
                         OUT PCHAR_INFO CharInfo/*Buffer*/,
                         IN OUT PSMALL_RECT ReadRegion);
+/* API_NUMBER: ConsolepReadConsoleOutput */
 CSR_API(SrvReadConsoleOutput)
 {
     NTSTATUS Status;
@@ -541,6 +549,7 @@ ConDrvWriteConsoleOutput(IN PCONSOLE Console,
                          IN BOOLEAN Unicode,
                          IN PCHAR_INFO CharInfo/*Buffer*/,
                          IN OUT PSMALL_RECT WriteRegion);
+/* API_NUMBER: ConsolepWriteConsoleOutput */
 CSR_API(SrvWriteConsoleOutput)
 {
     NTSTATUS Status;
@@ -639,6 +648,7 @@ Quit:
     return Status;
 }
 
+/* API_NUMBER: ConsolepWriteConsole */
 CSR_API(SrvWriteConsole)
 {
     NTSTATUS Status;
@@ -688,6 +698,7 @@ ConDrvReadConsoleOutputString(IN PCONSOLE Console,
                               IN PCOORD ReadCoord,
                               // OUT PCOORD EndCoord,
                               OUT PULONG NumCodesRead OPTIONAL);
+/* API_NUMBER: ConsolepReadConsoleOutputString */
 CSR_API(SrvReadConsoleOutputString)
 {
     NTSTATUS Status;
@@ -776,6 +787,7 @@ ConDrvWriteConsoleOutputString(IN PCONSOLE Console,
                                IN PCOORD WriteCoord,
                                // OUT PCOORD EndCoord,
                                OUT PULONG NumCodesWritten OPTIONAL);
+/* API_NUMBER: ConsolepWriteConsoleOutputString */
 CSR_API(SrvWriteConsoleOutputString)
 {
     NTSTATUS Status;
@@ -863,6 +875,7 @@ ConDrvFillConsoleOutput(IN PCONSOLE Console,
                         IN ULONG NumCodesToWrite,
                         IN PCOORD WriteCoord,
                         OUT PULONG NumCodesWritten OPTIONAL);
+/* API_NUMBER: ConsolepFillConsoleOutput */
 CSR_API(SrvFillConsoleOutput)
 {
     NTSTATUS Status;
@@ -909,6 +922,7 @@ ConDrvGetConsoleScreenBufferInfo(IN  PCONSOLE Console,
                                  OUT PCOORD ViewSize,
                                  OUT PCOORD MaximumViewSize,
                                  OUT PWORD  Attributes);
+/* API_NUMBER: ConsolepGetScreenBufferInfo */
 CSR_API(SrvGetConsoleScreenBufferInfo)
 {
     NTSTATUS Status;
@@ -939,6 +953,7 @@ NTSTATUS NTAPI
 ConDrvSetConsoleTextAttribute(IN PCONSOLE Console,
                               IN PTEXTMODE_SCREEN_BUFFER Buffer,
                               IN WORD Attributes);
+/* API_NUMBER: ConsolepSetTextAttribute */
 CSR_API(SrvSetConsoleTextAttribute)
 {
     NTSTATUS Status;
@@ -964,6 +979,7 @@ NTSTATUS NTAPI
 ConDrvSetConsoleScreenBufferSize(IN PCONSOLE Console,
                                  IN PTEXTMODE_SCREEN_BUFFER Buffer,
                                  IN PCOORD Size);
+/* API_NUMBER: ConsolepSetScreenBufferSize */
 CSR_API(SrvSetConsoleScreenBufferSize)
 {
     NTSTATUS Status;
@@ -994,6 +1010,7 @@ ConDrvScrollConsoleScreenBuffer(IN PCONSOLE Console,
                                 IN PSMALL_RECT ClipRectangle OPTIONAL,
                                 IN PCOORD DestinationOrigin,
                                 IN CHAR_INFO FillChar);
+/* API_NUMBER: ConsolepScrollScreenBuffer */
 CSR_API(SrvScrollConsoleScreenBuffer)
 {
     NTSTATUS Status;
@@ -1025,6 +1042,7 @@ ConDrvSetConsoleWindowInfo(IN PCONSOLE Console,
                            IN PTEXTMODE_SCREEN_BUFFER Buffer,
                            IN BOOLEAN Absolute,
                            IN PSMALL_RECT WindowRect);
+/* API_NUMBER: ConsolepSetWindowInfo */
 CSR_API(SrvSetConsoleWindowInfo)
 {
     NTSTATUS Status;
diff --git a/win32ss/user/winsrv/consrv/console.c b/win32ss/user/winsrv/consrv/console.c
index e28c8a2a52d..80a2f4c0f23 100644
--- a/win32ss/user/winsrv/consrv/console.c
+++ b/win32ss/user/winsrv/consrv/console.c
@@ -983,6 +983,7 @@ ConSrvSetConsoleProcessFocus(IN PCONSRV_CONSOLE Console,
 
 /* PUBLIC SERVER APIS *********************************************************/
 
+/* API_NUMBER: ConsolepAlloc */
 CSR_API(SrvAllocConsole)
 {
     NTSTATUS Status = STATUS_SUCCESS;
@@ -1052,6 +1053,7 @@ CSR_API(SrvAllocConsole)
     return STATUS_SUCCESS;
 }
 
+/* API_NUMBER: ConsolepAttach */
 CSR_API(SrvAttachConsole)
 {
     NTSTATUS Status = STATUS_SUCCESS;
@@ -1139,6 +1141,7 @@ Quit:
     return Status;
 }
 
+/* API_NUMBER: ConsolepFree */
 CSR_API(SrvFreeConsole)
 {
     return
ConSrvRemoveConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process));
@@ -1148,6 +1151,7 @@ NTSTATUS NTAPI
 ConDrvGetConsoleMode(IN PCONSOLE Console,
                      IN PCONSOLE_IO_OBJECT Object,
                      OUT PULONG ConsoleMode);
+/* API_NUMBER: ConsolepGetMode */
 CSR_API(SrvGetConsoleMode)
 {
     NTSTATUS Status;
@@ -1191,6 +1195,7 @@ NTSTATUS NTAPI
 ConDrvSetConsoleMode(IN PCONSOLE Console,
                      IN PCONSOLE_IO_OBJECT Object,
                      IN ULONG ConsoleMode);
+/* API_NUMBER: ConsolepSetMode */
 CSR_API(SrvSetConsoleMode)
 {
 #define CONSOLE_VALID_CONTROL_MODES ( ENABLE_EXTENDED_FLAGS | \
@@ -1244,6 +1249,7 @@ CSR_API(SrvSetConsoleMode)
     return Status;
 }
 
+/* API_NUMBER: ConsolepGetTitle */
 CSR_API(SrvGetConsoleTitle)
 {
     NTSTATUS Status;
@@ -1303,6 +1309,7 @@ CSR_API(SrvGetConsoleTitle)
     return Status;
 }
 
+/* API_NUMBER: ConsolepSetTitle */
 CSR_API(SrvSetConsoleTitle)
 {
     NTSTATUS Status;
@@ -1385,6 +1392,7 @@ NTSTATUS NTAPI
 ConDrvGetConsoleCP(IN PCONSOLE Console,
                    OUT PUINT CodePage,
                    IN BOOLEAN OutputCP);
+/* API_NUMBER: ConsolepGetCP */
 CSR_API(SrvGetConsoleCP)
 {
     NTSTATUS Status;
@@ -1409,6 +1417,7 @@ NTSTATUS NTAPI
 ConDrvSetConsoleCP(IN PCONSOLE Console,
                    IN UINT CodePage,
                    IN BOOLEAN OutputCP);
+/* API_NUMBER: ConsolepSetCP */
 CSR_API(SrvSetConsoleCP)
 {
     NTSTATUS Status = STATUS_INVALID_PARAMETER;
@@ -1429,6 +1438,7 @@ CSR_API(SrvSetConsoleCP)
     return Status;
 }
 
+/* API_NUMBER: ConsolepGetProcessList */
 CSR_API(SrvGetConsoleProcessList)
 {
     NTSTATUS Status;
@@ -1455,6 +1465,7 @@ CSR_API(SrvGetConsoleProcessList)
     return Status;
 }
 
+/* API_NUMBER: ConsolepGenerateCtrlEvent */
 CSR_API(SrvGenerateConsoleCtrlEvent)
 {
     NTSTATUS Status;
@@ -1472,6 +1483,7 @@ CSR_API(SrvGenerateConsoleCtrlEvent)
     return Status;
 }
 
+/* API_NUMBER: ConsolepNotifyLastClose */
 CSR_API(SrvConsoleNotifyLastClose)
 {
     NTSTATUS Status;
@@ -1497,8 +1509,7 @@ CSR_API(SrvConsoleNotifyLastClose)
     return Status;
 }
 
-
-
+/* API_NUMBER: ConsolepGetMouseInfo */
 CSR_API(SrvGetConsoleMouseInfo)
 {
     NTSTATUS Status;
@@ -1515,12 +1526,14 @@ CSR_API(SrvGetConsoleMouseInfo)
     return STATUS_SUCCESS;
 }
 
+/* API_NUMBER: ConsolepSetKeyShortcuts */
 CSR_API(SrvSetConsoleKeyShortcuts)
 {
     DPRINT1("%s not yet implemented\n", __FUNCTION__);
     return STATUS_NOT_IMPLEMENTED;
 }
 
+/* API_NUMBER: ConsolepGetKeyboardLayoutName */
 CSR_API(SrvGetConsoleKeyboardLayoutName)
 {
     NTSTATUS Status;
@@ -1540,42 +1553,49 @@ CSR_API(SrvGetConsoleKeyboardLayoutName)
     return STATUS_SUCCESS;
 }
 
+/* API_NUMBER: ConsolepCharType */
 CSR_API(SrvGetConsoleCharType)
 {
     DPRINT1("%s not yet implemented\n", __FUNCTION__);
     return STATUS_NOT_IMPLEMENTED;
 }
 
+/* API_NUMBER: ConsolepSetLocalEUDC */
 CSR_API(SrvSetConsoleLocalEUDC)
 {
     DPRINT1("%s not yet implemented\n", __FUNCTION__);
     return STATUS_NOT_IMPLEMENTED;
 }
 
+/* API_NUMBER: ConsolepSetCursorMode */
 CSR_API(SrvSetConsoleCursorMode)
 {
     DPRINT1("%s not yet implemented\n", __FUNCTION__);
     return STATUS_NOT_IMPLEMENTED;
 }
 
+/* API_NUMBER: ConsolepGetCursorMode */
 CSR_API(SrvGetConsoleCursorMode)
 {
     DPRINT1("%s not yet implemented\n", __FUNCTION__);
     return STATUS_NOT_IMPLEMENTED;
 }
 
+/* API_NUMBER: ConsolepGetNlsMode */
 CSR_API(SrvGetConsoleNlsMode)
 {
     DPRINT1("%s not yet implemented\n", __FUNCTION__);
     return STATUS_NOT_IMPLEMENTED;
 }
 
+/* API_NUMBER: ConsolepSetNlsMode */
 CSR_API(SrvSetConsoleNlsMode)
 {
     DPRINT1("%s not yet implemented\n", __FUNCTION__);
     return STATUS_NOT_IMPLEMENTED;
 }
 
+/* API_NUMBER: ConsolepGetLangId */
 CSR_API(SrvGetConsoleLangId)
 {
     DPRINT1("%s not yet implemented\n", __FUNCTION__);
diff --git a/win32ss/user/winsrv/consrv/frontendctl.c
b/win32ss/user/winsrv/consrv/frontendctl.c
index 18ef2edd518..b0a47961857 100644
--- a/win32ss/user/winsrv/consrv/frontendctl.c
+++ b/win32ss/user/winsrv/consrv/frontendctl.c
@@ -52,6 +52,7 @@ SetConsoleHardwareState(PCONSRV_CONSOLE Console, ULONG ConsoleHwState)
 }
 #endif
 
+/* API_NUMBER: ConsolepGetHardwareState */
 CSR_API(SrvGetConsoleHardwareState)
 {
 #if 0
@@ -82,6 +83,7 @@ CSR_API(SrvGetConsoleHardwareState)
 #endif
 }
 
+/* API_NUMBER: ConsolepSetHardwareState */
 CSR_API(SrvSetConsoleHardwareState)
 {
 #if 0
@@ -113,6 +115,7 @@ CSR_API(SrvSetConsoleHardwareState)
 #endif
 }
 
+/* API_NUMBER: ConsolepGetDisplayMode */
 CSR_API(SrvGetConsoleDisplayMode)
 {
     NTSTATUS Status;
@@ -129,6 +132,7 @@ CSR_API(SrvGetConsoleDisplayMode)
     return STATUS_SUCCESS;
 }
 
+/* API_NUMBER: ConsolepSetDisplayMode */
 CSR_API(SrvSetConsoleDisplayMode)
 {
     NTSTATUS Status;
@@ -159,6 +163,7 @@ CSR_API(SrvSetConsoleDisplayMode)
     return Status;
 }
 
+/* API_NUMBER: ConsolepGetLargestWindowSize */
 CSR_API(SrvGetLargestConsoleWindowSize)
 {
     NTSTATUS Status;
@@ -186,6 +191,7 @@ CSR_API(SrvGetLargestConsoleWindowSize)
     return STATUS_SUCCESS;
 }
 
+/* API_NUMBER: ConsolepShowCursor */
 CSR_API(SrvShowConsoleCursor)
 {
     NTSTATUS Status;
@@ -208,6 +214,7 @@ CSR_API(SrvShowConsoleCursor)
     return STATUS_SUCCESS;
 }
 
+/* API_NUMBER: ConsolepSetCursor */
 CSR_API(SrvSetConsoleCursor)
 {
     NTSTATUS Status;
@@ -234,6 +241,7 @@ CSR_API(SrvSetConsoleCursor)
     return (Success ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL);
 }
 
+/* API_NUMBER: ConsolepMenuControl */
 CSR_API(SrvConsoleMenuControl)
 {
     NTSTATUS Status;
@@ -258,6 +266,7 @@ CSR_API(SrvConsoleMenuControl)
     return STATUS_SUCCESS;
 }
 
+/* API_NUMBER: ConsolepSetMenuClose */
 CSR_API(SrvSetConsoleMenuClose)
 {
     NTSTATUS Status;
@@ -311,6 +320,7 @@ GetThreadConsoleDesktop(
     return STATUS_SUCCESS;
 }
 
+/* API_NUMBER: ConsolepGetConsoleWindow */
 CSR_API(SrvGetConsoleWindow)
 {
     NTSTATUS Status;
@@ -327,6 +337,7 @@ CSR_API(SrvGetConsoleWindow)
     return STATUS_SUCCESS;
 }
 
+/* API_NUMBER: ConsolepSetIcon */
 CSR_API(SrvSetConsoleIcon)
 {
     NTSTATUS Status;
@@ -345,6 +356,7 @@ CSR_API(SrvSetConsoleIcon)
     return Status;
 }
 
+/* API_NUMBER: ConsolepGetSelectionInfo */
 CSR_API(SrvGetConsoleSelectionInfo)
 {
     NTSTATUS Status;
@@ -363,8 +375,7 @@ CSR_API(SrvGetConsoleSelectionInfo)
     return Status;
 }
 
-
-
+/* API_NUMBER: ConsolepGetNumberOfFonts */
 CSR_API(SrvGetConsoleNumberOfFonts)
 {
     NTSTATUS Status;
@@ -384,6 +395,7 @@ CSR_API(SrvGetConsoleNumberOfFonts)
     return STATUS_SUCCESS;
 }
 
+/* API_NUMBER: ConsolepGetFontInfo */
 CSR_API(SrvGetConsoleFontInfo)
 {
     NTSTATUS Status;
@@ -408,6 +420,7 @@ CSR_API(SrvGetConsoleFontInfo)
     return STATUS_SUCCESS;
 }
 
+/* API_NUMBER: ConsolepGetFontSize */
 CSR_API(SrvGetConsoleFontSize)
 {
     NTSTATUS Status;
@@ -431,6 +444,7 @@ CSR_API(SrvGetConsoleFontSize)
     return STATUS_SUCCESS;
 }
 
+/* API_NUMBER: ConsolepGetCurrentFont */
 CSR_API(SrvGetConsoleCurrentFont)
 {
     NTSTATUS Status;
@@ -455,6 +469,7 @@ CSR_API(SrvGetConsoleCurrentFont)
     return STATUS_SUCCESS;
 }
 
+/* API_NUMBER: ConsolepSetFont */
 CSR_API(SrvSetConsoleFont)
 {
     NTSTATUS Status;
diff --git a/win32ss/user/winsrv/consrv/handle.c b/win32ss/user/winsrv/consrv/handle.c
index 125dfab6753..a9552af7f13 100644
--- a/win32ss/user/winsrv/consrv/handle.c
+++ b/win32ss/user/winsrv/consrv/handle.c
@@ -871,6 +871,7 @@ CSR_API(SrvOpenConsole)
     return Status;
 }
 
+/* API_NUMBER: ConsolepDuplicateHandle */
 CSR_API(SrvDuplicateHandle)
 {
     NTSTATUS Status;
@@ -944,6 +945,7 @@ Quit:
     return Status;
 }
 
+/* API_NUMBER: ConsolepGetHandleInformation */
 CSR_API(SrvGetHandleInformation)
 {
     NTSTATUS Status;
@@ -992,6 +994,7 @@ Quit:
     return Status;
 }
 
+/* API_NUMBER: ConsolepSetHandleInformation */
 CSR_API(SrvSetHandleInformation)
 {
     NTSTATUS Status;
@@ -1042,6 +1045,7 @@ Quit:
     return Status;
 }
 
+/* API_NUMBER: ConsolepCloseHandle */
 CSR_API(SrvCloseHandle)
 {
     NTSTATUS Status;
@@ -1062,6 +1066,7 @@ CSR_API(SrvCloseHandle)
     return Status;
 }
 
+/* API_NUMBER: ConsolepVerifyIoHandle */
 CSR_API(SrvVerifyConsoleIoHandle)
 {
     NTSTATUS Status;
diff --git a/win32ss/user/winsrv/consrv/history.c b/win32ss/user/winsrv/consrv/history.c
index 6d2049f08ba..7e28aa83247 100644
--- a/win32ss/user/winsrv/consrv/history.c
+++ b/win32ss/user/winsrv/consrv/history.c
@@ -326,6 +326,7 @@ HistoryDeleteBuffers(PCONSRV_CONSOLE Console)
 
 /* PUBLIC SERVER APIS *********************************************************/
 
+/* API_NUMBER: ConsolepGetCommandHistory */
 CSR_API(SrvGetConsoleCommandHistory)
 {
     NTSTATUS Status;
@@ -415,6 +416,7 @@ CSR_API(SrvGetConsoleCommandHistory)
     return Status;
 }
 
+/* API_NUMBER: ConsolepGetCommandHistoryLength */
 CSR_API(SrvGetConsoleCommandHistoryLength)
 {
     NTSTATUS Status;
@@ -458,6 +460,7 @@ CSR_API(SrvGetConsoleCommandHistoryLength)
     return Status;
 }
 
+/* API_NUMBER: ConsolepExpungeCommandHistory */
 CSR_API(SrvExpungeConsoleCommandHistory)
 {
     NTSTATUS Status;
@@ -487,6 +490,7 @@ CSR_API(SrvExpungeConsoleCommandHistory)
     return Status;
 }
 
+/* API_NUMBER: ConsolepSetNumberOfCommands */
 CSR_API(SrvSetConsoleNumberOfCommands)
 {
     NTSTATUS Status;
@@ -539,6 +543,7 @@ CSR_API(SrvSetConsoleNumberOfCommands)
     return Status;
 }
 
+/* API_NUMBER: ConsolepGetHistory */
 CSR_API(SrvGetConsoleHistory)
 {
 #if 0 // Vista+
@@ -560,6 +565,7 @@ CSR_API(SrvGetConsoleHistory)
 #endif
 }
 
+/* API_NUMBER: ConsolepSetHistory */
 CSR_API(SrvSetConsoleHistory)
 {
 #if 0 // Vista+
@@ -581,6 +587,7 @@ CSR_API(SrvSetConsoleHistory)
 #endif
 }
 
+/* API_NUMBER: ConsolepSetCommandHistoryMode */
 CSR_API(SrvSetConsoleCommandHistoryMode)
 {
     NTSTATUS Status;
diff --git a/win32ss/user/winsrv/consrv/subsysreg.c
b/win32ss/user/winsrv/consrv/subsysreg.c
index 9dd14a25ddc..18e54ef19a5 100644
--- a/win32ss/user/winsrv/consrv/subsysreg.c
+++ b/win32ss/user/winsrv/consrv/subsysreg.c
@@ -19,6 +19,7 @@
  * VDM Subsystem
  */
 
+/* API_NUMBER: ConsolepRegisterVDM */
 CSR_API(SrvRegisterConsoleVDM)
 {
     NTSTATUS Status;
@@ -149,6 +150,7 @@ Quit:
     return Status;
 }
 
+/* API_NUMBER: ConsolepVDMOperation */
 CSR_API(SrvVDMConsoleOperation)
 {
     DPRINT1("%s not yet implemented\n", __FUNCTION__);
@@ -160,12 +162,14 @@ CSR_API(SrvVDMConsoleOperation)
  * OS/2 Subsystem
  */
 
+/* API_NUMBER: ConsolepRegisterOS2 */
 CSR_API(SrvRegisterConsoleOS2)
 {
     DPRINT1("%s not yet implemented\n", __FUNCTION__);
     return STATUS_NOT_IMPLEMENTED;
 }
 
+/* API_NUMBER: ConsolepSetOS2OemFormat */
 CSR_API(SrvSetConsoleOS2OemFormat)
 {
     DPRINT1("%s not yet implemented\n", __FUNCTION__);
@@ -177,12 +181,14 @@ CSR_API(SrvSetConsoleOS2OemFormat)
  * IME Subsystem
  */
 
+/* API_NUMBER: ConsolepRegisterConsoleIME */
 CSR_API(SrvRegisterConsoleIME)
 {
     DPRINT1("%s not yet implemented\n", __FUNCTION__);
     return STATUS_NOT_IMPLEMENTED;
 }
 
+/* API_NUMBER: ConsolepUnregisterConsoleIME */
 CSR_API(SrvUnregisterConsoleIME)
 {
     DPRINT1("%s not yet implemented\n", __FUNCTION__);
diff --git a/win32ss/user/winsrv/consrv_new/alias.c
b/win32ss/user/winsrv/consrv_new/alias.c
index c705b67b382..d435bcce50f 100644
--- a/win32ss/user/winsrv/consrv_new/alias.c
+++ b/win32ss/user/winsrv/consrv_new/alias.c
@@ -275,6 +275,7 @@ IntDeleteAllAliases(PCONSOLE Console)
 
 /* PUBLIC SERVER APIS *********************************************************/
 
+/* API_NUMBER: ConsolepAddAlias */
 CSR_API(SrvAddConsoleAlias)
 {
     PCONSOLE_ADDGETALIAS ConsoleAliasRequest =
&((PCONSOLE_API_MESSAGE)ApiMessage)->Data.ConsoleAliasRequest;
@@ -359,6 +360,7 @@ CSR_API(SrvAddConsoleAlias)
     return STATUS_SUCCESS;
 }
 
+/* API_NUMBER: ConsolepGetAlias */
 CSR_API(SrvGetConsoleAlias)
 {
     PCONSOLE_ADDGETALIAS ConsoleAliasRequest =
&((PCONSOLE_API_MESSAGE)ApiMessage)->Data.ConsoleAliasRequest;
@@ -432,6 +434,7 @@ CSR_API(SrvGetConsoleAlias)
     return STATUS_SUCCESS;
 }
 
+/* API_NUMBER: ConsolepGetAliases */
 CSR_API(SrvGetConsoleAliases)
 {
     PCONSOLE_GETALLALIASES GetAllAliasesRequest =
&((PCONSOLE_API_MESSAGE)ApiMessage)->Data.GetAllAliasesRequest;
@@ -484,6 +487,7 @@ CSR_API(SrvGetConsoleAliases)
     return STATUS_SUCCESS;
 }
 
+/* API_NUMBER: ConsolepGetAliasesLength */
 CSR_API(SrvGetConsoleAliasesLength)
 {
     PCONSOLE_GETALLALIASESLENGTH GetAllAliasesLengthRequest =
&((PCONSOLE_API_MESSAGE)ApiMessage)->Data.GetAllAliasesLengthRequest;
@@ -523,6 +527,7 @@ CSR_API(SrvGetConsoleAliasesLength)
     return STATUS_SUCCESS;
 }
 
+/* API_NUMBER: ConsolepGetAliasExes */
 CSR_API(SrvGetConsoleAliasExes)
 {
     PCONSOLE_GETALIASESEXES GetAliasesExesRequest =
&((PCONSOLE_API_MESSAGE)ApiMessage)->Data.GetAliasesExesRequest;
@@ -569,6 +574,7 @@ CSR_API(SrvGetConsoleAliasExes)
     return STATUS_SUCCESS;
 }
 
+/* API_NUMBER: ConsolepGetAliasExesLength */
 CSR_API(SrvGetConsoleAliasExesLength)
 {
     PCONSOLE_GETALIASESEXESLENGTH GetAliasesExesLengthRequest =
&((PCONSOLE_API_MESSAGE)ApiMessage)->Data.GetAliasesExesLengthRequest;
diff --git a/win32ss/user/winsrv/consrv_new/coninput.c
b/win32ss/user/winsrv/consrv_new/coninput.c
index 1208ef58149..2516df2e047 100644
--- a/win32ss/user/winsrv/consrv_new/coninput.c
+++ b/win32ss/user/winsrv/consrv_new/coninput.c
@@ -301,6 +301,7 @@ ReadInputBuffer(IN PGET_INPUT_INFO InputInfo,
 
 /* PUBLIC SERVER APIS *********************************************************/
 
+/* API_NUMBER: ConsolepReadConsole */
 CSR_API(SrvReadConsole)
 {
     NTSTATUS Status;
@@ -431,6 +432,7 @@ CSR_API(SrvWriteConsoleInput)
 NTSTATUS NTAPI
 ConDrvFlushConsoleInputBuffer(IN PCONSOLE Console,
                               IN PCONSOLE_INPUT_BUFFER InputBuffer);
+/* API_NUMBER: ConsolepFlushInputBuffer */
 CSR_API(SrvFlushConsoleInputBuffer)
 {
     NTSTATUS Status;
@@ -455,6 +457,7 @@ NTSTATUS NTAPI
 ConDrvGetConsoleNumberOfInputEvents(IN PCONSOLE Console,
                                     IN PCONSOLE_INPUT_BUFFER InputBuffer,
                                     OUT PULONG NumEvents);
+/* API_NUMBER: ConsolepGetNumberOfInputEvents */
 CSR_API(SrvGetConsoleNumberOfInputEvents)
 {
     NTSTATUS Status;
diff --git a/win32ss/user/winsrv/consrv_new/conoutput.c
b/win32ss/user/winsrv/consrv_new/conoutput.c
index e12f3828e91..c79dc682005 100644
--- a/win32ss/user/winsrv/consrv_new/conoutput.c
+++ b/win32ss/user/winsrv/consrv_new/conoutput.c
@@ -29,6 +29,7 @@ NTSTATUS NTAPI
 ConDrvInvalidateBitMapRect(IN PCONSOLE Console,
                            IN PCONSOLE_SCREEN_BUFFER Buffer,
                            IN PSMALL_RECT Region);
+/* API_NUMBER: ConsolepInvalidateBitMapRect */
 CSR_API(SrvInvalidateBitMapRect)
 {
     NTSTATUS Status;
@@ -54,6 +55,7 @@ NTSTATUS NTAPI
 ConDrvGetConsoleCursorInfo(IN PCONSOLE Console,
                            IN PTEXTMODE_SCREEN_BUFFER Buffer,
                            OUT PCONSOLE_CURSOR_INFO CursorInfo);
+/* API_NUMBER: ConsolepGetCursorInfo */
 CSR_API(SrvGetConsoleCursorInfo)
 {
     NTSTATUS Status;
@@ -79,6 +81,7 @@ NTSTATUS NTAPI
 ConDrvSetConsoleCursorInfo(IN PCONSOLE Console,
                            IN PTEXTMODE_SCREEN_BUFFER Buffer,
                            IN PCONSOLE_CURSOR_INFO CursorInfo);
+/* API_NUMBER: ConsolepSetCursorInfo */
 CSR_API(SrvSetConsoleCursorInfo)
 {
     NTSTATUS Status;
@@ -104,6 +107,7 @@ NTSTATUS NTAPI
 ConDrvSetConsoleCursorPosition(IN PCONSOLE Console,
                                IN PTEXTMODE_SCREEN_BUFFER Buffer,
                                IN PCOORD Position);
+/* API_NUMBER: ConsolepSetCursorPosition */
 CSR_API(SrvSetConsoleCursorPosition)
 {
     NTSTATUS Status;
@@ -125,6 +129,7 @@ CSR_API(SrvSetConsoleCursorPosition)
     return Status;
 }
 
+/* API_NUMBER: ConsolepCreateScreenBuffer */
 CSR_API(SrvCreateConsoleScreenBuffer)
 {
     NTSTATUS Status = STATUS_INVALID_PARAMETER;
@@ -248,6 +253,7 @@ Quit:
 NTSTATUS NTAPI
 ConDrvSetConsoleActiveScreenBuffer(IN PCONSOLE Console,
                                    IN PCONSOLE_SCREEN_BUFFER Buffer);
+/* API_NUMBER: ConsolepSetActiveScreenBuffer */
 CSR_API(SrvSetConsoleActiveScreenBuffer)
 {
     NTSTATUS Status;
@@ -379,6 +385,7 @@ ConDrvReadConsoleOutput(IN PCONSOLE Console,
                         IN PCOORD BufferSize,
                         IN PCOORD BufferCoord,
                         IN OUT PSMALL_RECT ReadRegion);
+/* API_NUMBER: ConsolepReadConsoleOutput */
 CSR_API(SrvReadConsoleOutput)
 {
     NTSTATUS Status;
@@ -420,6 +427,7 @@ ConDrvWriteConsoleOutput(IN PCONSOLE Console,
                          IN PCOORD BufferSize,
                          IN PCOORD BufferCoord,
                          IN OUT PSMALL_RECT WriteRegion);
+/* API_NUMBER: ConsolepWriteConsoleOutput */
 CSR_API(SrvWriteConsoleOutput)
 {
     NTSTATUS Status;
@@ -453,6 +461,7 @@ CSR_API(SrvWriteConsoleOutput)
     return Status;
 }
 
+/* API_NUMBER: ConsolepWriteConsole */
 CSR_API(SrvWriteConsole)
 {
     NTSTATUS Status;
@@ -486,6 +495,7 @@ ConDrvReadConsoleOutputString(IN PCONSOLE Console,
                               IN PCOORD ReadCoord,
                               OUT PCOORD EndCoord,
                               OUT PULONG CodesRead);
+/* API_NUMBER: ConsolepReadConsoleOutputString */
 CSR_API(SrvReadConsoleOutputString)
 {
     NTSTATUS Status;
@@ -548,6 +558,7 @@ ConDrvWriteConsoleOutputString(IN PCONSOLE Console,
                                IN PCOORD WriteCoord /*,
                                OUT PCOORD EndCoord,
                                OUT PULONG CodesWritten */);
+/* API_NUMBER: ConsolepWriteConsoleOutputString */
 CSR_API(SrvWriteConsoleOutputString)
 {
     NTSTATUS Status;
@@ -611,6 +622,7 @@ ConDrvFillConsoleOutput(IN PCONSOLE Console,
                         IN ULONG NumCodesToWrite,
                         IN PCOORD WriteCoord /*,
                         OUT PULONG CodesWritten */);
+/* API_NUMBER: ConsolepFillConsoleOutput */
 CSR_API(SrvFillConsoleOutput)
 {
     NTSTATUS Status;
@@ -650,6 +662,7 @@ NTSTATUS NTAPI
 ConDrvGetConsoleScreenBufferInfo(IN PCONSOLE Console,
                                  IN PTEXTMODE_SCREEN_BUFFER Buffer,
                                  OUT PCONSOLE_SCREEN_BUFFER_INFO ScreenBufferInfo);
+/* API_NUMBER: ConsolepGetScreenBufferInfo */
 CSR_API(SrvGetConsoleScreenBufferInfo)
 {
     NTSTATUS Status;
@@ -675,6 +688,7 @@ NTSTATUS NTAPI
 ConDrvSetConsoleTextAttribute(IN PCONSOLE Console,
                               IN PTEXTMODE_SCREEN_BUFFER Buffer,
                               IN WORD Attribute);
+/* API_NUMBER: ConsolepSetTextAttribute */
 CSR_API(SrvSetConsoleTextAttribute)
 {
     NTSTATUS Status;
@@ -700,6 +714,7 @@ NTSTATUS NTAPI
 ConDrvSetConsoleScreenBufferSize(IN PCONSOLE Console,
                                  IN PTEXTMODE_SCREEN_BUFFER Buffer,
                                  IN PCOORD Size);
+/* API_NUMBER: ConsolepSetScreenBufferSize */
 CSR_API(SrvSetConsoleScreenBufferSize)
 {
     NTSTATUS Status;
@@ -730,6 +745,7 @@ ConDrvScrollConsoleScreenBuffer(IN PCONSOLE Console,
                                 IN PSMALL_RECT ClipRectangle OPTIONAL,
                                 IN PCOORD DestinationOrigin,
                                 IN CHAR_INFO FillChar);
+/* API_NUMBER: ConsolepScrollScreenBuffer */
 CSR_API(SrvScrollConsoleScreenBuffer)
 {
     NTSTATUS Status;
@@ -761,6 +777,7 @@ ConDrvSetConsoleWindowInfo(IN PCONSOLE Console,
                            IN PTEXTMODE_SCREEN_BUFFER Buffer,
                            IN BOOLEAN Absolute,
                            IN PSMALL_RECT WindowRect);
+/* API_NUMBER: ConsolepSetWindowInfo */
 CSR_API(SrvSetConsoleWindowInfo)
 {
     NTSTATUS Status;
diff --git a/win32ss/user/winsrv/consrv_new/console.c
b/win32ss/user/winsrv/consrv_new/console.c
index da1cc4a5e96..55177b55d8e 100644
--- a/win32ss/user/winsrv/consrv_new/console.c
+++ b/win32ss/user/winsrv/consrv_new/console.c
@@ -309,6 +309,7 @@ ConSrvDeleteConsole(PCONSOLE Console)
 
 /* PUBLIC SERVER APIS *********************************************************/
 
+/* API_NUMBER: ConsolepAlloc */
 CSR_API(SrvAllocConsole)
 {
     NTSTATUS Status = STATUS_SUCCESS;
@@ -353,6 +354,7 @@ CSR_API(SrvAllocConsole)
     return STATUS_SUCCESS;
 }
 
+/* API_NUMBER: ConsolepAttach */
 CSR_API(SrvAttachConsole)
 {
     NTSTATUS Status = STATUS_SUCCESS;
@@ -435,6 +437,7 @@ Quit:
     return Status;
 }
 
+/* API_NUMBER: ConsolepFree */
 CSR_API(SrvFreeConsole)
 {
     ConSrvRemoveConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process));
@@ -445,6 +448,7 @@ NTSTATUS NTAPI
 ConDrvGetConsoleMode(IN PCONSOLE Console,
                      IN PCONSOLE_IO_OBJECT Object,
                      OUT PULONG ConsoleMode);
+/* API_NUMBER: ConsolepGetMode */
 CSR_API(SrvGetConsoleMode)
 {
     NTSTATUS Status;
@@ -467,6 +471,7 @@ NTSTATUS NTAPI
 ConDrvSetConsoleMode(IN PCONSOLE Console,
                      IN PCONSOLE_IO_OBJECT Object,
                      IN ULONG ConsoleMode);
+/* API_NUMBER: ConsolepSetMode */
 CSR_API(SrvSetConsoleMode)
 {
     NTSTATUS Status;
@@ -489,6 +494,7 @@ NTSTATUS NTAPI
 ConDrvGetConsoleTitle(IN PCONSOLE Console,
                       IN OUT PWCHAR Title,
                       IN OUT PULONG BufLength);
+/* API_NUMBER: ConsolepGetTitle */
 CSR_API(SrvGetConsoleTitle)
 {
     NTSTATUS Status;
@@ -522,6 +528,7 @@ NTSTATUS NTAPI
 ConDrvSetConsoleTitle(IN PCONSOLE Console,
                       IN PWCHAR Title,
                       IN ULONG BufLength);
+/* API_NUMBER: ConsolepSetTitle */
 CSR_API(SrvSetConsoleTitle)
 {
     NTSTATUS Status;
@@ -557,6 +564,7 @@ NTSTATUS NTAPI
 ConDrvGetConsoleCP(IN PCONSOLE Console,
                    OUT PUINT CodePage,
                    IN BOOLEAN InputCP);
+/* API_NUMBER: ConsolepGetCP */
 CSR_API(SrvGetConsoleCP)
 {
     NTSTATUS Status;
@@ -581,6 +589,7 @@ NTSTATUS NTAPI
 ConDrvSetConsoleCP(IN PCONSOLE Console,
                    IN UINT CodePage,
                    IN BOOLEAN InputCP);
+/* API_NUMBER: ConsolepSetCP */
 CSR_API(SrvSetConsoleCP)
 {
     NTSTATUS Status = STATUS_INVALID_PARAMETER;
@@ -606,6 +615,7 @@ ConDrvGetConsoleProcessList(IN PCONSOLE Console,
                             IN OUT PULONG ProcessIdsList,
                             IN ULONG MaxIdListItems,
                             OUT PULONG ProcessIdsTotal);
+/* API_NUMBER: ConsolepGetProcessList */
 CSR_API(SrvGetConsoleProcessList)
 {
     NTSTATUS Status;
@@ -632,6 +642,7 @@ CSR_API(SrvGetConsoleProcessList)
     return Status;
 }
 
+/* API_NUMBER: ConsolepGenerateCtrlEvent */
 CSR_API(SrvGenerateConsoleCtrlEvent)
 {
     NTSTATUS Status;
diff --git a/win32ss/user/winsrv/consrv_new/frontendctl.c
b/win32ss/user/winsrv/consrv_new/frontendctl.c
index dbab7c37012..dfc9b159036 100644
--- a/win32ss/user/winsrv/consrv_new/frontendctl.c
+++ b/win32ss/user/winsrv/consrv_new/frontendctl.c
@@ -61,6 +61,7 @@ SetConsoleHardwareState(PCONSOLE Console, ULONG ConsoleHwState)
 }
 #endif
 
+/* API_NUMBER: ConsolepGetHardwareState */
 CSR_API(SrvGetConsoleHardwareState)
 {
 #if 0
@@ -91,6 +92,7 @@ CSR_API(SrvGetConsoleHardwareState)
 #endif
 }
 
+/* API_NUMBER: ConsolepSetHardwareState */
 CSR_API(SrvSetConsoleHardwareState)
 {
 #if 0
@@ -122,6 +124,7 @@ CSR_API(SrvSetConsoleHardwareState)
 #endif
 }
 
+/* API_NUMBER: ConsolepGetDisplayMode */
 CSR_API(SrvGetConsoleDisplayMode)
 {
     NTSTATUS Status;
@@ -138,6 +141,7 @@ CSR_API(SrvGetConsoleDisplayMode)
     return STATUS_SUCCESS;
 }
 
+/* API_NUMBER: ConsolepSetDisplayMode */
 CSR_API(SrvSetConsoleDisplayMode)
 {
     NTSTATUS Status;
@@ -168,6 +172,7 @@ CSR_API(SrvSetConsoleDisplayMode)
     return Status;
 }
 
+/* API_NUMBER: ConsolepGetLargestWindowSize */
 CSR_API(SrvGetLargestConsoleWindowSize)
 {
     NTSTATUS Status;
@@ -189,6 +194,7 @@ CSR_API(SrvGetLargestConsoleWindowSize)
     return STATUS_SUCCESS;
 }
 
+/* API_NUMBER: ConsolepShowCursor */
 CSR_API(SrvShowConsoleCursor)
 {
     NTSTATUS Status;
@@ -211,6 +217,7 @@ CSR_API(SrvShowConsoleCursor)
     return STATUS_SUCCESS;
 }
 
+/* API_NUMBER: ConsolepSetCursor */
 CSR_API(SrvSetConsoleCursor)
 {
     NTSTATUS Status;
@@ -237,6 +244,7 @@ CSR_API(SrvSetConsoleCursor)
     return (Success ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL);
 }
 
+/* API_NUMBER: ConsolepMenuControl */
 CSR_API(SrvConsoleMenuControl)
 {
     NTSTATUS Status;
@@ -261,6 +269,7 @@ CSR_API(SrvConsoleMenuControl)
     return STATUS_SUCCESS;
 }
 
+/* API_NUMBER: ConsolepSetMenuClose */
 CSR_API(SrvSetConsoleMenuClose)
 {
     NTSTATUS Status;
@@ -278,6 +287,7 @@ CSR_API(SrvSetConsoleMenuClose)
     return (Success ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL);
 }
 
+/* API_NUMBER: ConsolepGetConsoleWindow */
 CSR_API(SrvGetConsoleWindow)
 {
     NTSTATUS Status;
@@ -293,6 +303,7 @@ CSR_API(SrvGetConsoleWindow)
     return STATUS_SUCCESS;
 }
 
+/* API_NUMBER: ConsolepSetIcon */
 CSR_API(SrvSetConsoleIcon)
 {
     NTSTATUS Status;
@@ -310,6 +321,7 @@ CSR_API(SrvSetConsoleIcon)
     return Status;
 }
 
+/* API_NUMBER: ConsolepGetSelectionInfo */
 CSR_API(SrvGetConsoleSelectionInfo)
 {
     NTSTATUS Status;
diff --git a/win32ss/user/winsrv/consrv_new/handle.c
b/win32ss/user/winsrv/consrv_new/handle.c
index 8599f8f4c3e..ef627708c0f 100644
--- a/win32ss/user/winsrv/consrv_new/handle.c
+++ b/win32ss/user/winsrv/consrv_new/handle.c
@@ -679,6 +679,7 @@ ConSrvRemoveConsole(PCONSOLE_PROCESS_DATA ProcessData)
 
 /* PUBLIC SERVER APIS *********************************************************/
 
+/* API_NUMBER: ConsolepOpenConsole */
 CSR_API(SrvOpenConsole)
 {
     /*
@@ -742,6 +743,7 @@ CSR_API(SrvOpenConsole)
     return Status;
 }
 
+/* API_NUMBER: ConsolepCloseHandle */
 CSR_API(SrvCloseHandle)
 {
     NTSTATUS Status;
@@ -762,6 +764,7 @@ CSR_API(SrvCloseHandle)
     return Status;
 }
 
+/* API_NUMBER: ConsolepVerifyIoHandle */
 CSR_API(SrvVerifyConsoleIoHandle)
 {
     NTSTATUS Status;
@@ -795,6 +798,7 @@ CSR_API(SrvVerifyConsoleIoHandle)
     return Status;
 }
 
+/* API_NUMBER: ConsolepDuplicateHandle */
 CSR_API(SrvDuplicateHandle)
 {
     NTSTATUS Status;
diff --git a/win32ss/user/winsrv/consrv_new/lineinput.c
b/win32ss/user/winsrv/consrv_new/lineinput.c
index 652d4e87908..d809f957616 100644
--- a/win32ss/user/winsrv/consrv_new/lineinput.c
+++ b/win32ss/user/winsrv/consrv_new/lineinput.c
@@ -454,6 +454,7 @@ LineInputKeyDown(PCONSOLE Console, KEY_EVENT_RECORD *KeyEvent)
 
 /* PUBLIC SERVER APIS *********************************************************/
 
+/* API_NUMBER: ConsolepGetCommandHistory */
 CSR_API(SrvGetConsoleCommandHistory)
 {
     PCONSOLE_GETCOMMANDHISTORY GetCommandHistoryRequest =
&((PCONSOLE_API_MESSAGE)ApiMessage)->Data.GetCommandHistoryRequest;
@@ -502,6 +503,7 @@ CSR_API(SrvGetConsoleCommandHistory)
     return Status;
 }
 
+/* API_NUMBER: ConsolepGetCommandHistoryLength */
 CSR_API(SrvGetConsoleCommandHistoryLength)
 {
     PCONSOLE_GETCOMMANDHISTORYLENGTH GetCommandHistoryLengthRequest =
&((PCONSOLE_API_MESSAGE)ApiMessage)->Data.GetCommandHistoryLengthRequest;
@@ -535,6 +537,7 @@ CSR_API(SrvGetConsoleCommandHistoryLength)
     return Status;
 }
 
+/* API_NUMBER: ConsolepExpungeCommandHistory */
 CSR_API(SrvExpungeConsoleCommandHistory)
 {
     PCONSOLE_EXPUNGECOMMANDHISTORY ExpungeCommandHistoryRequest =
&((PCONSOLE_API_MESSAGE)ApiMessage)->Data.ExpungeCommandHistoryRequest;
@@ -561,6 +564,7 @@ CSR_API(SrvExpungeConsoleCommandHistory)
     return Status;
 }
 
+/* API_NUMBER: ConsolepSetNumberOfCommands */
 CSR_API(SrvSetConsoleNumberOfCommands)
 {
     PCONSOLE_SETHISTORYNUMBERCOMMANDS SetHistoryNumberCommandsRequest =
&((PCONSOLE_API_MESSAGE)ApiMessage)->Data.SetHistoryNumberCommandsRequest;
@@ -611,6 +615,7 @@ CSR_API(SrvSetConsoleNumberOfCommands)
     return Status;
 }
 
+/* API_NUMBER: ConsolepGetHistory */
 CSR_API(SrvGetConsoleHistory)
 {
     PCONSOLE_GETSETHISTORYINFO HistoryInfoRequest =
&((PCONSOLE_API_MESSAGE)ApiMessage)->Data.HistoryInfoRequest;
@@ -626,6 +631,7 @@ CSR_API(SrvGetConsoleHistory)
     return Status;
 }
 
+/* API_NUMBER: ConsolepSetHistory */
 CSR_API(SrvSetConsoleHistory)
 {
     PCONSOLE_GETSETHISTORYINFO HistoryInfoRequest =
&((PCONSOLE_API_MESSAGE)ApiMessage)->Data.HistoryInfoRequest;