[CONSRV]: WINAPI -> NTAPI
authorHermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
Sat, 12 Oct 2013 15:44:22 +0000 (15:44 +0000)
committerHermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
Sat, 12 Oct 2013 15:44:22 +0000 (15:44 +0000)
svn path=/trunk/; revision=60630

reactos/win32ss/user/winsrv/consrv/condrv/conoutput.c
reactos/win32ss/user/winsrv/consrv/conoutput.h
reactos/win32ss/user/winsrv/consrv/console.c
reactos/win32ss/user/winsrv/consrv/console.h
reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c
reactos/win32ss/user/winsrv/consrv/frontends/input.c
reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c
reactos/win32ss/user/winsrv/consrv/include/conio.h

index aa73210..8f05b04 100644 (file)
@@ -119,7 +119,7 @@ ConDrvCreateScreenBuffer(OUT PCONSOLE_SCREEN_BUFFER* Buffer,
 static VOID
 ConioSetActiveScreenBuffer(PCONSOLE_SCREEN_BUFFER Buffer);
 
-VOID WINAPI
+VOID NTAPI
 ConioDeleteScreenBuffer(PCONSOLE_SCREEN_BUFFER Buffer)
 {
     PCONSOLE Console = Buffer->Header.Console;
index 420f2b7..c2e59f8 100644 (file)
@@ -37,7 +37,7 @@ NTSTATUS FASTCALL ConDrvCreateScreenBuffer(OUT PCONSOLE_SCREEN_BUFFER* Buffer,
                                            IN OUT PCONSOLE Console,
                                            IN ULONG BufferType,
                                            IN PVOID ScreenBufferInfo);
-VOID WINAPI ConioDeleteScreenBuffer(PCONSOLE_SCREEN_BUFFER Buffer);
+VOID NTAPI ConioDeleteScreenBuffer(PCONSOLE_SCREEN_BUFFER Buffer);
 // VOID FASTCALL ConioSetActiveScreenBuffer(PCONSOLE_SCREEN_BUFFER Buffer);
 
 // PCONSOLE_SCREEN_BUFFER
index 4f95d28..18594d4 100644 (file)
@@ -164,7 +164,7 @@ ConSrvReleaseConsole(PCONSOLE Console,
 }
 
 
-NTSTATUS WINAPI
+NTSTATUS NTAPI
 ConSrvInitConsole(OUT PHANDLE NewConsoleHandle,
                   OUT PCONSOLE* NewConsole,
                   IN OUT PCONSOLE_START_INFO ConsoleStartInfo,
@@ -295,7 +295,7 @@ ConSrvInitConsole(OUT PHANDLE NewConsoleHandle,
     return STATUS_SUCCESS;
 }
 
-VOID WINAPI
+VOID NTAPI
 ConSrvDeleteConsole(PCONSOLE Console)
 {
     DPRINT("ConSrvDeleteConsole\n");
index b617da8..e50b8de 100644 (file)
 // FIXME: Fix compilation
 struct _CONSOLE;
 
-NTSTATUS WINAPI
+NTSTATUS NTAPI
 ConSrvInitConsole(OUT PHANDLE NewConsoleHandle,
                   OUT struct _CONSOLE** /* PCONSOLE* */ NewConsole,
                   IN OUT PCONSOLE_START_INFO ConsoleStartInfo,
                   IN ULONG ConsoleLeaderProcessId);
-VOID WINAPI ConSrvDeleteConsole(struct _CONSOLE* /* PCONSOLE */ Console);
+VOID NTAPI ConSrvDeleteConsole(struct _CONSOLE* /* PCONSOLE */ Console);
 
 NTSTATUS FASTCALL ConSrvGetConsole(PCONSOLE_PROCESS_DATA ProcessData,
                                    struct _CONSOLE** /* PCONSOLE* */ Console,
index 4869f38..fc2a711 100644 (file)
@@ -45,7 +45,7 @@
 
 
 /* Not defined in any header file */
-extern VOID WINAPI PrivateCsrssManualGuiCheck(LONG Check);
+extern VOID NTAPI PrivateCsrssManualGuiCheck(LONG Check);
 // See winsrv/usersrv/init.c line 234
 
 
@@ -248,7 +248,7 @@ static VOID
 GuiConsolePaste(PGUI_CONSOLE_DATA GuiData);
 static VOID
 GuiConsoleUpdateSelection(PCONSOLE Console, PCOORD coord);
-static VOID WINAPI
+static VOID NTAPI
 GuiDrawRegion(IN OUT PFRONTEND This, SMALL_RECT* Region);
 static VOID
 GuiConsoleResizeWindow(PGUI_CONSOLE_DATA GuiData);
@@ -484,7 +484,7 @@ GuiConsoleSwitchFullScreen(PGUI_CONSOLE_DATA GuiData)
     // TODO: Change window appearance.
     // See:
     // http://stackoverflow.com/questions/2382464/win32-full-screen-and-hiding-taskbar
-    // http://stackoverflow.com/questions/3549148/fullscreen-management-with-winapi
+    // http://stackoverflow.com/questions/3549148/fullscreen-management-with-NTAPI
     // http://blogs.msdn.com/b/oldnewthing/archive/2010/04/12/9994016.aspx
     // http://stackoverflow.com/questions/1400654/how-do-i-put-my-opengl-app-into-fullscreen-mode
     // http://nehe.gamedev.net/tutorial/creating_an_opengl_window_win32/13001/
@@ -2117,7 +2117,7 @@ GuiConsoleNotifyWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
     }
 }
 
-static DWORD WINAPI
+static DWORD NTAPI
 GuiConsoleGuiThread(PVOID Data)
 {
     MSG msg;
@@ -2283,7 +2283,7 @@ GuiInit(VOID)
  *                             GUI Console Driver                             *
  ******************************************************************************/
 
-static VOID WINAPI
+static VOID NTAPI
 GuiDeinitFrontEnd(IN OUT PFRONTEND This);
 
 NTSTATUS NTAPI
@@ -2469,7 +2469,7 @@ GuiInitFrontEnd(IN OUT PFRONTEND This,
     return STATUS_SUCCESS;
 }
 
-static VOID WINAPI
+static VOID NTAPI
 GuiDeinitFrontEnd(IN OUT PFRONTEND This)
 {
     PGUI_CONSOLE_DATA GuiData = This->Data;
@@ -2496,7 +2496,7 @@ GuiDeinitFrontEnd(IN OUT PFRONTEND This)
     DPRINT("Quit GuiDeinitFrontEnd\n");
 }
 
-static VOID WINAPI
+static VOID NTAPI
 GuiDrawRegion(IN OUT PFRONTEND This,
               SMALL_RECT* Region)
 {
@@ -2508,7 +2508,7 @@ GuiDrawRegion(IN OUT PFRONTEND This,
     InvalidateRect(GuiData->hWindow, &RegionRect, FALSE);
 }
 
-static VOID WINAPI
+static VOID NTAPI
 GuiWriteStream(IN OUT PFRONTEND This,
                SMALL_RECT* Region,
                SHORT CursorStartX,
@@ -2567,7 +2567,7 @@ GuiWriteStream(IN OUT PFRONTEND This,
     SetTimer(GuiData->hWindow, CONGUI_UPDATE_TIMER, CONGUI_UPDATE_TIME, NULL);
 }
 
-static BOOL WINAPI
+static BOOL NTAPI
 GuiSetCursorInfo(IN OUT PFRONTEND This,
                  PCONSOLE_SCREEN_BUFFER Buff)
 {
@@ -2581,7 +2581,7 @@ GuiSetCursorInfo(IN OUT PFRONTEND This,
     return TRUE;
 }
 
-static BOOL WINAPI
+static BOOL NTAPI
 GuiSetScreenInfo(IN OUT PFRONTEND This,
                  PCONSOLE_SCREEN_BUFFER Buff,
                  SHORT OldCursorX,
@@ -2600,7 +2600,7 @@ GuiSetScreenInfo(IN OUT PFRONTEND This,
     return TRUE;
 }
 
-static VOID WINAPI
+static VOID NTAPI
 GuiResizeTerminal(IN OUT PFRONTEND This)
 {
     PGUI_CONSOLE_DATA GuiData = This->Data;
@@ -2614,7 +2614,7 @@ GuiResizeTerminal(IN OUT PFRONTEND This)
     PostMessageW(GuiData->hWindow, PM_RESIZE_TERMINAL, 0, 0);
 }
 
-static VOID WINAPI
+static VOID NTAPI
 GuiSetActiveScreenBuffer(IN OUT PFRONTEND This)
 {
     PGUI_CONSOLE_DATA GuiData = This->Data;
@@ -2664,7 +2664,7 @@ GuiSetActiveScreenBuffer(IN OUT PFRONTEND This)
     // ConioDrawConsole(Console);
 }
 
-static VOID WINAPI
+static VOID NTAPI
 GuiReleaseScreenBuffer(IN OUT PFRONTEND This,
                        IN PCONSOLE_SCREEN_BUFFER ScreenBuffer)
 {
@@ -2715,7 +2715,7 @@ GuiReleaseScreenBuffer(IN OUT PFRONTEND This,
     }
 }
 
-static BOOL WINAPI
+static BOOL NTAPI
 GuiProcessKeyCallback(IN OUT PFRONTEND This,
                       MSG* msg,
                       BYTE KeyStateMenu,
@@ -2733,11 +2733,11 @@ GuiProcessKeyCallback(IN OUT PFRONTEND This,
     return FALSE;
 }
 
-static BOOL WINAPI
+static BOOL NTAPI
 GuiSetMouseCursor(IN OUT PFRONTEND This,
                   HCURSOR hCursor);
 
-static VOID WINAPI
+static VOID NTAPI
 GuiRefreshInternalInfo(IN OUT PFRONTEND This)
 {
     PGUI_CONSOLE_DATA GuiData = This->Data;
@@ -2759,7 +2759,7 @@ GuiRefreshInternalInfo(IN OUT PFRONTEND This)
     GuiSetMouseCursor(This, NULL);
 }
 
-static VOID WINAPI
+static VOID NTAPI
 GuiChangeTitle(IN OUT PFRONTEND This)
 {
     PGUI_CONSOLE_DATA GuiData = This->Data;
@@ -2767,7 +2767,7 @@ GuiChangeTitle(IN OUT PFRONTEND This)
     SetWindowText(GuiData->hWindow, GuiData->Console->Title.Buffer);
 }
 
-static BOOL WINAPI
+static BOOL NTAPI
 GuiChangeIcon(IN OUT PFRONTEND This,
               HICON hWindowIcon)
 {
@@ -2812,14 +2812,14 @@ GuiChangeIcon(IN OUT PFRONTEND This,
     return TRUE;
 }
 
-static HWND WINAPI
+static HWND NTAPI
 GuiGetConsoleWindowHandle(IN OUT PFRONTEND This)
 {
     PGUI_CONSOLE_DATA GuiData = This->Data;
     return GuiData->hWindow;
 }
 
-static VOID WINAPI
+static VOID NTAPI
 GuiGetLargestConsoleWindowSize(IN OUT PFRONTEND This,
                                PCOORD pSize)
 {
@@ -2863,7 +2863,7 @@ GuiGetLargestConsoleWindowSize(IN OUT PFRONTEND This,
     pSize->Y = (SHORT)(height / (int)HeightUnit) /* HACK */ + 1;
 }
 
-static BOOL WINAPI
+static BOOL NTAPI
 GuiSetPalette(IN OUT PFRONTEND This,
               HPALETTE PaletteHandle,
               UINT PaletteUsage)
@@ -2918,7 +2918,7 @@ Quit:
     return Success;
 }
 
-static ULONG WINAPI
+static ULONG NTAPI
 GuiGetDisplayMode(IN OUT PFRONTEND This)
 {
     PGUI_CONSOLE_DATA GuiData = This->Data;
@@ -2932,7 +2932,7 @@ GuiGetDisplayMode(IN OUT PFRONTEND This)
     return DisplayMode;
 }
 
-static BOOL WINAPI
+static BOOL NTAPI
 GuiSetDisplayMode(IN OUT PFRONTEND This,
                   ULONG NewMode)
 {
@@ -2946,7 +2946,7 @@ GuiSetDisplayMode(IN OUT PFRONTEND This,
     return TRUE;
 }
 
-static INT WINAPI
+static INT NTAPI
 GuiShowMouseCursor(IN OUT PFRONTEND This,
                    BOOL Show)
 {
@@ -2962,7 +2962,7 @@ GuiShowMouseCursor(IN OUT PFRONTEND This,
     return GuiData->MouseCursorRefCount;
 }
 
-static BOOL WINAPI
+static BOOL NTAPI
 GuiSetMouseCursor(IN OUT PFRONTEND This,
                   HCURSOR hCursor)
 {
@@ -2980,7 +2980,7 @@ GuiSetMouseCursor(IN OUT PFRONTEND This,
     return TRUE;
 }
 
-static HMENU WINAPI
+static HMENU NTAPI
 GuiMenuControl(IN OUT PFRONTEND This,
                UINT cmdIdLow,
                UINT cmdIdHigh)
@@ -2993,7 +2993,7 @@ GuiMenuControl(IN OUT PFRONTEND This,
     return GetSystemMenu(GuiData->hWindow, FALSE);
 }
 
-static BOOL WINAPI
+static BOOL NTAPI
 GuiSetMenuClose(IN OUT PFRONTEND This,
                 BOOL Enable)
 {
index 541dfa3..17b7ff3 100644 (file)
@@ -54,7 +54,7 @@ ConioGetShiftState(PBYTE KeyState, LPARAM lParam)
     return ssOut;
 }
 
-VOID WINAPI
+VOID NTAPI
 ConioProcessKey(PCONSOLE Console, MSG* msg)
 {
     static BYTE KeyState[256] = { 0 };
index d27d10e..4586f7d 100644 (file)
@@ -311,7 +311,7 @@ TuiConsoleWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
     return DefWindowProcW(hWnd, msg, wParam, lParam);
 }
 
-static DWORD WINAPI
+static DWORD NTAPI
 TuiConsoleThread(PVOID Data)
 {
     PTUI_CONSOLE_DATA TuiData = (PTUI_CONSOLE_DATA)Data;
@@ -441,7 +441,7 @@ Quit:
  *                             TUI Console Driver                             *
  ******************************************************************************/
 
-static VOID WINAPI
+static VOID NTAPI
 TuiDeinitFrontEnd(IN OUT PFRONTEND This /*,
                   IN PCONSOLE Console */);
 
@@ -521,7 +521,7 @@ TuiInitFrontEnd(IN OUT PFRONTEND This,
     return STATUS_SUCCESS;
 }
 
-static VOID WINAPI
+static VOID NTAPI
 TuiDeinitFrontEnd(IN OUT PFRONTEND This)
 {
     // PCONSOLE Console = This->Console;
@@ -562,7 +562,7 @@ TuiDeinitFrontEnd(IN OUT PFRONTEND This)
     ConsoleFreeHeap(TuiData);
 }
 
-static VOID WINAPI
+static VOID NTAPI
 TuiDrawRegion(IN OUT PFRONTEND This,
               SMALL_RECT* Region)
 {
@@ -601,7 +601,7 @@ TuiDrawRegion(IN OUT PFRONTEND This,
     ConsoleFreeHeap(ConsoleDraw);
 }
 
-static VOID WINAPI
+static VOID NTAPI
 TuiWriteStream(IN OUT PFRONTEND This,
                SMALL_RECT* Region,
                SHORT CursorStartX,
@@ -635,7 +635,7 @@ TuiWriteStream(IN OUT PFRONTEND This,
     RtlFreeHeap(RtlGetProcessHeap(), 0, NewBuffer);
 }
 
-static BOOL WINAPI
+static BOOL NTAPI
 TuiSetCursorInfo(IN OUT PFRONTEND This,
                  PCONSOLE_SCREEN_BUFFER Buff)
 {
@@ -657,7 +657,7 @@ TuiSetCursorInfo(IN OUT PFRONTEND This,
     return TRUE;
 }
 
-static BOOL WINAPI
+static BOOL NTAPI
 TuiSetScreenInfo(IN OUT PFRONTEND This,
                  PCONSOLE_SCREEN_BUFFER Buff,
                  SHORT OldCursorX,
@@ -683,12 +683,12 @@ TuiSetScreenInfo(IN OUT PFRONTEND This,
     return TRUE;
 }
 
-static VOID WINAPI
+static VOID NTAPI
 TuiResizeTerminal(IN OUT PFRONTEND This)
 {
 }
 
-static BOOL WINAPI
+static BOOL NTAPI
 TuiProcessKeyCallback(IN OUT PFRONTEND This,
                       MSG* msg,
                       BYTE KeyStateMenu,
@@ -714,31 +714,31 @@ TuiProcessKeyCallback(IN OUT PFRONTEND This,
     return FALSE;
 }
 
-static VOID WINAPI
+static VOID NTAPI
 TuiRefreshInternalInfo(IN OUT PFRONTEND This)
 {
 }
 
-static VOID WINAPI
+static VOID NTAPI
 TuiChangeTitle(IN OUT PFRONTEND This)
 {
 }
 
-static BOOL WINAPI
+static BOOL NTAPI
 TuiChangeIcon(IN OUT PFRONTEND This,
               HICON hWindowIcon)
 {
     return TRUE;
 }
 
-static HWND WINAPI
+static HWND NTAPI
 TuiGetConsoleWindowHandle(IN OUT PFRONTEND This)
 {
     PTUI_CONSOLE_DATA TuiData = This->Data;
     return TuiData->hWindow;
 }
 
-static VOID WINAPI
+static VOID NTAPI
 TuiGetLargestConsoleWindowSize(IN OUT PFRONTEND This,
                                PCOORD pSize)
 {
@@ -746,7 +746,7 @@ TuiGetLargestConsoleWindowSize(IN OUT PFRONTEND This,
     *pSize = PhysicalConsoleSize;
 }
 
-static BOOL WINAPI
+static BOOL NTAPI
 TuiSetPalette(IN OUT PFRONTEND This,
               HPALETTE PaletteHandle,
               UINT PaletteUsage)
@@ -754,13 +754,13 @@ TuiSetPalette(IN OUT PFRONTEND This,
     return TRUE;
 }
 
-static ULONG WINAPI
+static ULONG NTAPI
 TuiGetDisplayMode(IN OUT PFRONTEND This)
 {
     return CONSOLE_FULLSCREEN_HARDWARE; // CONSOLE_FULLSCREEN;
 }
 
-static BOOL WINAPI
+static BOOL NTAPI
 TuiSetDisplayMode(IN OUT PFRONTEND This,
                   ULONG NewMode)
 {
@@ -769,21 +769,21 @@ TuiSetDisplayMode(IN OUT PFRONTEND This,
     return TRUE;
 }
 
-static INT WINAPI
+static INT NTAPI
 TuiShowMouseCursor(IN OUT PFRONTEND This,
                    BOOL Show)
 {
     return 0;
 }
 
-static BOOL WINAPI
+static BOOL NTAPI
 TuiSetMouseCursor(IN OUT PFRONTEND This,
                   HCURSOR hCursor)
 {
     return TRUE;
 }
 
-static HMENU WINAPI
+static HMENU NTAPI
 TuiMenuControl(IN OUT PFRONTEND This,
                UINT cmdIdLow,
                UINT cmdIdHigh)
@@ -791,7 +791,7 @@ TuiMenuControl(IN OUT PFRONTEND This,
     return NULL;
 }
 
-static BOOL WINAPI
+static BOOL NTAPI
 TuiSetMenuClose(IN OUT PFRONTEND This,
                 BOOL Enable)
 {
index 97a646f..76d4aa2 100644 (file)
@@ -186,73 +186,73 @@ typedef struct _FRONTEND_VTBL
     /*
      * Internal interface (functions called by the console server only)
      */
-    NTSTATUS (WINAPI *InitFrontEnd)(IN OUT PFRONTEND This,
-                                    IN struct _CONSOLE* Console);
-    VOID (WINAPI *DeinitFrontEnd)(IN OUT PFRONTEND This);
+    NTSTATUS (NTAPI *InitFrontEnd)(IN OUT PFRONTEND This,
+                                   IN struct _CONSOLE* Console);
+    VOID (NTAPI *DeinitFrontEnd)(IN OUT PFRONTEND This);
 
     /* Interface used for both text-mode and graphics screen buffers */
-    VOID (WINAPI *DrawRegion)(IN OUT PFRONTEND This,
-                              SMALL_RECT* Region);
+    VOID (NTAPI *DrawRegion)(IN OUT PFRONTEND This,
+                             SMALL_RECT* Region);
     /* Interface used only for text-mode screen buffers */
-    VOID (WINAPI *WriteStream)(IN OUT PFRONTEND This,
-                               SMALL_RECT* Block,
-                               SHORT CursorStartX,
-                               SHORT CursorStartY,
-                               UINT ScrolledLines,
-                               PWCHAR Buffer,
-                               UINT Length);
-    BOOL (WINAPI *SetCursorInfo)(IN OUT PFRONTEND This,
-                                 PCONSOLE_SCREEN_BUFFER ScreenBuffer);
-    BOOL (WINAPI *SetScreenInfo)(IN OUT PFRONTEND This,
-                                 PCONSOLE_SCREEN_BUFFER ScreenBuffer,
-                                 SHORT OldCursorX,
-                                 SHORT OldCursorY);
-    VOID (WINAPI *ResizeTerminal)(IN OUT PFRONTEND This);
-    VOID (WINAPI *SetActiveScreenBuffer)(IN OUT PFRONTEND This);
-    VOID (WINAPI *ReleaseScreenBuffer)(IN OUT PFRONTEND This,
-                                       IN PCONSOLE_SCREEN_BUFFER ScreenBuffer);
-    BOOL (WINAPI *ProcessKeyCallback)(IN OUT PFRONTEND This,
-                                      MSG* msg,
-                                      BYTE KeyStateMenu,
-                                      DWORD ShiftState,
-                                      UINT VirtualKeyCode,
-                                      BOOL Down);
-    VOID (WINAPI *RefreshInternalInfo)(IN OUT PFRONTEND This);
+    VOID (NTAPI *WriteStream)(IN OUT PFRONTEND This,
+                              SMALL_RECT* Block,
+                              SHORT CursorStartX,
+                              SHORT CursorStartY,
+                              UINT ScrolledLines,
+                              PWCHAR Buffer,
+                              UINT Length);
+    BOOL (NTAPI *SetCursorInfo)(IN OUT PFRONTEND This,
+                                PCONSOLE_SCREEN_BUFFER ScreenBuffer);
+    BOOL (NTAPI *SetScreenInfo)(IN OUT PFRONTEND This,
+                                PCONSOLE_SCREEN_BUFFER ScreenBuffer,
+                                SHORT OldCursorX,
+                                SHORT OldCursorY);
+    VOID (NTAPI *ResizeTerminal)(IN OUT PFRONTEND This);
+    VOID (NTAPI *SetActiveScreenBuffer)(IN OUT PFRONTEND This);
+    VOID (NTAPI *ReleaseScreenBuffer)(IN OUT PFRONTEND This,
+                                      IN PCONSOLE_SCREEN_BUFFER ScreenBuffer);
+    BOOL (NTAPI *ProcessKeyCallback)(IN OUT PFRONTEND This,
+                                     MSG* msg,
+                                     BYTE KeyStateMenu,
+                                     DWORD ShiftState,
+                                     UINT VirtualKeyCode,
+                                     BOOL Down);
+    VOID (NTAPI *RefreshInternalInfo)(IN OUT PFRONTEND This);
 
     /*
      * External interface (functions corresponding to the Console API)
      */
-    VOID (WINAPI *ChangeTitle)(IN OUT PFRONTEND This);
-    BOOL (WINAPI *ChangeIcon)(IN OUT PFRONTEND This,
-                              HICON hWindowIcon);
-    HWND (WINAPI *GetConsoleWindowHandle)(IN OUT PFRONTEND This);
-    VOID (WINAPI *GetLargestConsoleWindowSize)(IN OUT PFRONTEND This,
-                                               PCOORD pSize);
-    BOOL (WINAPI *SetPalette)(IN OUT PFRONTEND This,
-                              HPALETTE PaletteHandle,
-                              UINT PaletteUsage);
-    ULONG (WINAPI *GetDisplayMode)(IN OUT PFRONTEND This);
-    BOOL  (WINAPI *SetDisplayMode)(IN OUT PFRONTEND This,
-                                   ULONG NewMode);
-    INT   (WINAPI *ShowMouseCursor)(IN OUT PFRONTEND This,
-                                    BOOL Show);
-    BOOL  (WINAPI *SetMouseCursor)(IN OUT PFRONTEND This,
-                                   HCURSOR hCursor);
-    HMENU (WINAPI *MenuControl)(IN OUT PFRONTEND This,
-                                UINT cmdIdLow,
-                                UINT cmdIdHigh);
-    BOOL  (WINAPI *SetMenuClose)(IN OUT PFRONTEND This,
-                                 BOOL Enable);
+    VOID (NTAPI *ChangeTitle)(IN OUT PFRONTEND This);
+    BOOL (NTAPI *ChangeIcon)(IN OUT PFRONTEND This,
+                             HICON hWindowIcon);
+    HWND (NTAPI *GetConsoleWindowHandle)(IN OUT PFRONTEND This);
+    VOID (NTAPI *GetLargestConsoleWindowSize)(IN OUT PFRONTEND This,
+                                              PCOORD pSize);
+    BOOL (NTAPI *SetPalette)(IN OUT PFRONTEND This,
+                             HPALETTE PaletteHandle,
+                             UINT PaletteUsage);
+    ULONG (NTAPI *GetDisplayMode)(IN OUT PFRONTEND This);
+    BOOL  (NTAPI *SetDisplayMode)(IN OUT PFRONTEND This,
+                                  ULONG NewMode);
+    INT   (NTAPI *ShowMouseCursor)(IN OUT PFRONTEND This,
+                                   BOOL Show);
+    BOOL  (NTAPI *SetMouseCursor)(IN OUT PFRONTEND This,
+                                  HCURSOR hCursor);
+    HMENU (NTAPI *MenuControl)(IN OUT PFRONTEND This,
+                               UINT cmdIdLow,
+                               UINT cmdIdHigh);
+    BOOL  (NTAPI *SetMenuClose)(IN OUT PFRONTEND This,
+                                BOOL Enable);
 
 #if 0 // Possible future front-end interface
-    BOOL (WINAPI *GetFrontEndProperty)(IN OUT PFRONTEND This,
-                                       ULONG Flag,
-                                       PVOID Info,
-                                       ULONG Size);
-    BOOL (WINAPI *SetFrontEndProperty)(IN OUT PFRONTEND This,
-                                       ULONG Flag,
-                                       PVOID Info /*,
-                                       ULONG Size */);
+    BOOL (NTAPI *GetFrontEndProperty)(IN OUT PFRONTEND This,
+                                      ULONG Flag,
+                                      PVOID Info,
+                                      ULONG Size);
+    BOOL (NTAPI *SetFrontEndProperty)(IN OUT PFRONTEND This,
+                                      ULONG Flag,
+                                      PVOID Info /*,
+                                      ULONG Size */);
 #endif
 } FRONTEND_VTBL, *PFRONTEND_VTBL;
 
@@ -347,7 +347,7 @@ ConDrvConsoleProcessCtrlEvent(IN PCONSOLE Console,
                               IN ULONG Event);
 
 /* coninput.c */
-VOID WINAPI ConioProcessKey(PCONSOLE Console, MSG* msg);
+VOID NTAPI ConioProcessKey(PCONSOLE Console, MSG* msg);
 NTSTATUS FASTCALL ConioProcessInputEvent(PCONSOLE Console,
                                          PINPUT_RECORD InputEvent);