--- mstools/samples/console/size.c	2018/08/09 18:20:36	1.1.1.1
+++ mstools/samples/console/size.c	2018/08/09 18:23:14	1.1.1.3
@@ -1,3 +1,14 @@
+
+/******************************************************************************\
+*       This is a part of the Microsoft Source Code Samples. 
+*       Copyright (C) 1993 Microsoft Corporation.
+*       All rights reserved. 
+*       This source code is only intended as a supplement to 
+*       Microsoft Development Tools and/or WinHelp documentation.
+*       See these sources for detailed information regarding the 
+*       Microsoft samples programs.
+\******************************************************************************/
+
 #include <windows.h>
 #include "console.h"
 
@@ -16,26 +27,28 @@
 *           than the console window.                                 *
 *********************************************************************/
 
-static void resizeConBufAndWindow(HANDLE hConsole, SHORT xSize, SHORT ySize)
+void resizeConBufAndWindow(HANDLE hConsole, SHORT xSize, SHORT ySize)
 {
   CONSOLE_SCREEN_BUFFER_INFO csbi; /* hold current console buffer info */
   BOOL bSuccess;
   SMALL_RECT srWindowRect; /* hold the new console size */
   COORD coordScreen;
 
-  setConTitle(__FILE__);
   bSuccess = GetConsoleScreenBufferInfo(hConsole, &csbi);
   PERR(bSuccess, "GetConsoleScreenBufferInfo");
-  /* define the new console size */
+  /* get the largest size we can size the console window to */
+  coordScreen = GetLargestConsoleWindowSize(hConsole);
+  PERR(coordScreen.X | coordScreen.Y, "GetLargestConsoleWindowSize");
+  /* define the new console window size and scroll position */
+  srWindowRect.Right = (SHORT) (min(xSize, coordScreen.X) - 1);
+  srWindowRect.Bottom = (SHORT) (min(ySize, coordScreen.Y) - 1);
   srWindowRect.Left = srWindowRect.Top = (SHORT) 0;
-  srWindowRect.Right = (SHORT) (xSize - 1);
-  srWindowRect.Bottom = (SHORT) (ySize - 1);
   /* define the new console buffer size */
   coordScreen.X = xSize;
   coordScreen.Y = ySize;
   /* if the current buffer is larger than what we want, resize the */
   /* console window first, then the buffer */
-  if (csbi.dwSize.X * csbi.dwSize.Y > xSize * ySize)
+  if ((DWORD) csbi.dwSize.X * csbi.dwSize.Y > (DWORD) xSize * ySize)
     {
     bSuccess = SetConsoleWindowInfo(hConsole, TRUE, &srWindowRect);
     PERR(bSuccess, "SetConsoleWindowInfo");
@@ -44,13 +57,14 @@ static void resizeConBufAndWindow(HANDLE
     }
   /* if the current buffer is smaller than what we want, resize the */
   /* buffer first, then the console window */
-  if (csbi.dwSize.X * csbi.dwSize.Y < xSize * ySize)
+  if ((DWORD) csbi.dwSize.X * csbi.dwSize.Y < (DWORD) xSize * ySize)
     {
     bSuccess = SetConsoleScreenBufferSize(hConsole, coordScreen);
     PERR(bSuccess, "SetConsoleScreenBufferSize");
     bSuccess = SetConsoleWindowInfo(hConsole, TRUE, &srWindowRect);
     PERR(bSuccess, "SetConsoleWindowInfo");
     }
+  /* if the current buffer *is* the size we want, don't do anything! */
   return;
 }
 
@@ -69,16 +83,23 @@ void demoSizeInfo(HANDLE hConOut)
 {
   SHORT sConX, sConY; /* save the current console dimensions */
 
-  myPuts(hConOut, "Let's resize the console buffer and window to a 40 x 25");
-  myPuts(hConOut, "size screen by using the SetConsoleScreenBufferSize and");
-  myPuts(hConOut, "SetConsoleWindowInfo APIs. Hit enter to continue...");
+  setConTitle(__FILE__);
+  myPuts(hConOut, "Let's resize the console buffer and window to a 40 x 25\n"
+                  "size screen by using the SetConsoleScreenBufferSize and\n"
+                  "SetConsoleWindowInfo APIs. Hit enter to continue...\n");
   myGetchar();
   sConX = getConX(hConOut);
   sConY = getConY(hConOut);
   resizeConBufAndWindow(hConOut, (SHORT) 40, (SHORT) 25);
-  myPuts(hConOut, "Now let's resize back to our original");
-  myPuts(hConOut, "size screen.");
-  myPuts(hConOut, "Hit enter to continue...");
+  myPuts(hConOut, "Now let's resize to a large size of\n"
+                  "200 x 200 - notice that the console\n"
+                  "window size will not grow larger than\n"
+                  "the physical screen size. Hit enter\n"
+                  "to continue...\n");
+  myGetchar();
+  resizeConBufAndWindow(hConOut, (SHORT) 200, (SHORT) 200);
+  myPuts(hConOut, "Now let's resize back to our original size screen.\n"
+                  "Hit enter to continue...\n");
   myGetchar();
   resizeConBufAndWindow(hConOut, sConX, sConY);
   myPuts(hConOut, "Now we're back to our original size. Hit enter to return...");