patch 8.1.0250: MS-Windows using VTP: windows size change incorrect
Problem: MS-Windows using VTP: windows size change incorrect.
Solution: Call SetConsoleScreenBufferSize() first. (Nobuhiro Takasaki,
closes #3164)
diff --git a/src/os_win32.c b/src/os_win32.c
index f8884e4..6357235 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -3967,6 +3967,48 @@
}
/*
+ * Resize console buffer to 'COORD'
+ */
+ static void
+ResizeConBuf(
+ HANDLE hConsole,
+ COORD coordScreen)
+{
+ if (!SetConsoleScreenBufferSize(hConsole, coordScreen))
+ {
+#ifdef MCH_WRITE_DUMP
+ if (fdDump)
+ {
+ fprintf(fdDump, "SetConsoleScreenBufferSize failed: %lx\n",
+ GetLastError());
+ fflush(fdDump);
+ }
+#endif
+ }
+}
+
+/*
+ * Resize console window size to 'srWindowRect'
+ */
+ static void
+ResizeWindow(
+ HANDLE hConsole,
+ SMALL_RECT srWindowRect)
+{
+ if (!SetConsoleWindowInfo(hConsole, TRUE, &srWindowRect))
+ {
+#ifdef MCH_WRITE_DUMP
+ if (fdDump)
+ {
+ fprintf(fdDump, "SetConsoleWindowInfo failed: %lx\n",
+ GetLastError());
+ fflush(fdDump);
+ }
+#endif
+ }
+}
+
+/*
* Set a console window to `xSize' * `ySize'
*/
static void
@@ -4019,32 +4061,20 @@
}
}
- if (!SetConsoleWindowInfo(g_hConOut, TRUE, &srWindowRect))
- {
-#ifdef MCH_WRITE_DUMP
- if (fdDump)
- {
- fprintf(fdDump, "SetConsoleWindowInfo failed: %lx\n",
- GetLastError());
- fflush(fdDump);
- }
-#endif
- }
-
- /* define the new console buffer size */
+ // define the new console buffer size
coordScreen.X = xSize;
coordScreen.Y = ySize;
- if (!SetConsoleScreenBufferSize(hConsole, coordScreen))
+ // In the new console call API in reverse order
+ if (!vtp_working)
{
-#ifdef MCH_WRITE_DUMP
- if (fdDump)
- {
- fprintf(fdDump, "SetConsoleScreenBufferSize failed: %lx\n",
- GetLastError());
- fflush(fdDump);
- }
-#endif
+ ResizeWindow(hConsole, srWindowRect);
+ ResizeConBuf(hConsole, coordScreen);
+ }
+ else
+ {
+ ResizeConBuf(hConsole, coordScreen);
+ ResizeWindow(hConsole, srWindowRect);
}
}
diff --git a/src/version.c b/src/version.c
index bb730f4..c9b0ec4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -795,6 +795,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 250,
+/**/
249,
/**/
248,