--- old/src/java.base/windows/native/libjava/Console_md.c	2018-08-24 15:15:43.734279700 +0200
+++ new/src/java.base/windows/native/libjava/Console_md.c	2018-08-24 15:15:42.683548700 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,12 +27,40 @@
 #include "jni_util.h"
 #include "jvm.h"
 #include "java_io_Console.h"
-
 #include <stdlib.h>
 #include <Wincon.h>
 
 static HANDLE hStdOut = INVALID_HANDLE_VALUE;
 static HANDLE hStdIn = INVALID_HANDLE_VALUE;
+
+JNIEXPORT jint JNICALL
+Java_java_io_Console_width(JNIEnv *env, jobject this)
+{
+    CONSOLE_SCREEN_BUFFER_INFO csbi;
+
+    if (!GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &csbi)) {
+        if (!GetConsoleScreenBufferInfo(GetStdHandle(STD_ERROR_HANDLE), &csbi)) {
+            return -1;
+        }
+    }
+
+    return csbi.dwSize.X;
+}
+
+JNIEXPORT jint JNICALL
+Java_java_io_Console_height(JNIEnv *env, jobject this)
+{
+    CONSOLE_SCREEN_BUFFER_INFO csbi;
+
+    if (!GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &csbi)) {
+        if (!GetConsoleScreenBufferInfo(GetStdHandle(STD_ERROR_HANDLE), &csbi)) {
+            return -1;
+        }
+    }
+
+    return csbi.dwSize.Y;
+}
+
 JNIEXPORT jboolean JNICALL
 Java_java_io_Console_istty(JNIEnv *env, jclass cls)
 {