--- mstools/samples/console/console.c	2018/08/09 18:20:36	1.1
+++ mstools/samples/console/console.c	2018/08/09 18:21:18	1.1.1.2
@@ -4,6 +4,9 @@
 #include <stdlib.h>
 #include "console.h"
           
+/* Microsoft Developer Support
+   Copyright (c) 1992 Microsoft Corporation */
+
 /* used to set our initial console screen buffer size */
 #define CONX 80
 #define CONY 43
@@ -94,7 +97,7 @@ CHAR myGetchar(void)
   /* get the standard input handle to read from. There is only one */
   /* instance of standard input per process at any given time */
   hStdIn = GetStdHandle(STD_INPUT_HANDLE);
-  PERR((int) hStdIn != -1, "GetStdHandle");
+  PERR(hStdIn != INVALID_HANDLE_VALUE, "GetStdHandle");
   /* save the console mode */
   bSuccess = GetConsoleMode(hStdIn, &dwInputMode);
   PERR(bSuccess, "GetconsoleMode");
@@ -167,7 +170,7 @@ void perr(PCHAR szFileName, int line, PC
   /* create a handle to the current console buffer */
   hCurrentCon = CreateFile("CONOUT$", GENERIC_WRITE, FILE_SHARE_READ |
      FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
-  if ((int) hCurrentCon == -1)
+  if (hCurrentCon == INVALID_HANDLE_VALUE)
     {
     dwLastError = GetLastError();
     /* just in case this works */
@@ -179,7 +182,7 @@ void perr(PCHAR szFileName, int line, PC
   hConTemp = CreateConsoleScreenBuffer(GENERIC_READ | GENERIC_WRITE,
       FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CONSOLE_TEXTMODE_BUFFER,
       NULL);
-  if ((int) hConTemp == -1)
+  if (hConTemp == INVALID_HANDLE_VALUE)
     {
     dwLastError = GetLastError();
     printf("Fatal error in perr() on line %d: %d\n", __LINE__, dwLastError);
@@ -446,7 +449,8 @@ static void demoAPI(HANDLE *phConsole, e
   hConTemp = CreateConsoleScreenBuffer(GENERIC_READ | GENERIC_WRITE,
       FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CONSOLE_TEXTMODE_BUFFER,
       NULL);
-  PERR((int) hConTemp != -1, "CreateConsoleScreenBuffer");
+  PERR(hConTemp != INVALID_HANDLE_VALUE,
+      "CreateConsoleScreenBuffer");
   /* make it the active buffer */
   bSuccess = SetConsoleActiveScreenBuffer(hConTemp);
   PERR(bSuccess, "SetConsoleActiveScreenBuffer");
@@ -658,9 +662,9 @@ int main()
   PERR(bSuccess, "SetConsoleTitle");
   /* get the standard handles */
   hStdOut = GetStdHandle(STD_OUTPUT_HANDLE);
-  PERR((int) hStdOut != -1, "GetStdHandle");
+  PERR(hStdOut != INVALID_HANDLE_VALUE, "GetStdHandle");
   hStdIn = GetStdHandle(STD_INPUT_HANDLE);
-  PERR((int) hStdIn != -1,"GetStdHandle");
+  PERR(hStdIn != INVALID_HANDLE_VALUE, "GetStdHandle");
   /* set up mouse and window input */
   bSuccess = GetConsoleMode(hStdIn, &dwMode);
   PERR(bSuccess, "GetConsoleMode");