Revert "MDEV-26713 Windows - improve utf8 support for command line tools"

This reverts commit several commits pushed by mistake.

Author: vaintroub

client/mysql.cc

@@ -88,7 +88,9 @@ extern "C" {
 #endif /* defined(HAVE_CURSES_H) && defined(HAVE_TERM_H) */
 
 #undef bcmp				// Fix problem with new readline
-#if !defined(_WIN32)
+#if defined(_WIN32)
+#include <conio.h>
+#else
 # ifdef __APPLE__
 #  include <editline/readline.h>
 # else
@@ -102,101 +104,6 @@ extern "C" {
 #endif
 }
 
-
-#if defined(_WIN32)
-/*
-  Set console mode for the whole duration of the client session.
-
-  We need for input
-    - line input (i.e read lines from console)
-    - echo typed characters
-    - "cooked" mode, i.e we do not want to handle all keystrokes,
-      like DEL etc ourselves, yet. We might want handle keystrokes
-      in the future, to implement tab completion, and better
-      (multiline) history.
-
- Disable VT escapes for the output.We do not know what kind of escapes SELECT would return.
-*/
-struct Console_mode
-{
-  HANDLE in= GetStdHandle(STD_INPUT_HANDLE);
-  HANDLE out= GetStdHandle(STD_OUTPUT_HANDLE);
-  DWORD mode_in=0;
-  DWORD mode_out=0;
-
-  enum {STDIN_CHANGED = 1, STDOUT_CHANGED = 2};
-  int changes=0;
-
-  Console_mode()
-  {
-    if (in && in != INVALID_HANDLE_VALUE && GetConsoleMode(in, &mode_in))
-    {
-      SetConsoleMode(in, ENABLE_ECHO_INPUT|ENABLE_LINE_INPUT|ENABLE_PROCESSED_INPUT);
-      changes |= STDIN_CHANGED;
-    }
-
-    if (out && out != INVALID_HANDLE_VALUE && GetConsoleMode(out, &mode_out))
-    {
-#ifdef ENABLE_VIRTUAL_TERMINAL_INPUT
-      SetConsoleMode(out, mode_out & ~ENABLE_VIRTUAL_TERMINAL_INPUT);
-      changes |= STDOUT_CHANGED;
-#endif
-    }
-  }
-
-  ~Console_mode()
-  {
-    if (changes & STDIN_CHANGED)
-      SetConsoleMode(in, mode_in);
-
-    if(changes & STDOUT_CHANGED)
-      SetConsoleMode(out, mode_out);
-  }
-};
-
-static Console_mode my_conmode;
-
-#define MAX_CGETS_LINE_LEN 65535
-/** Read line from console in ANSI codepage, chomp EOL*/
-static char *win_readline()
-{
-  static wchar_t wstrbuf[MAX_CGETS_LINE_LEN];
-  static char strbuf[MAX_CGETS_LINE_LEN*2];
-
-  DWORD nchars= 0;
-  SetLastError(0);
-  if (!ReadConsoleW(GetStdHandle(STD_INPUT_HANDLE), wstrbuf, MAX_CGETS_LINE_LEN-1,
-                    &nchars, NULL))
-    goto err;
-  if (nchars == 0 && GetLastError() == ERROR_OPERATION_ABORTED)
-    goto err;
-
-  while (nchars > 0)
-  {
-    if (wstrbuf[nchars - 1] != '\n' && wstrbuf[nchars - 1] != '\r')
-      break;
-    wstrbuf[--nchars]= 0;
-  }
-
-  wstrbuf[nchars]= 0;
-  if (nchars > 0)
-  {
-    int len = WideCharToMultiByte(GetConsoleCP(), 0, wstrbuf, nchars + 1,
-                               strbuf, sizeof(strbuf),NULL, NULL);
-    if (len < 1)
-      strbuf[0]= 0;
-  }
-  else
-  {
-    strbuf[0]= 0;
-  }
-  return strbuf;
-err:
-  return NULL;
-}
-#endif
-
-
 #ifdef HAVE_VIDATTR
 static int have_curses= 0;
 static void my_vidattr(chtype attrs)
@@ -1812,10 +1719,8 @@ static void usage(int version)
 	 my_progname, VER, MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE,
          readline, rl_library_version);
 #else
-  printf("%s  Ver %s Distrib %s, for %s (%s), source revision %s"
-         IF_WIN(", codepage %u",) "\n", my_progname, VER,
-         MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE,SOURCE_REVISION,
-         IF_WIN(GetConsoleCP(),));
+  printf("%s  Ver %s Distrib %s, for %s (%s), source revision %s\n", my_progname, VER,
+	MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE,SOURCE_REVISION);
 #endif
 
   if (version)
@@ -2210,7 +2115,26 @@ static int read_and_execute(bool interactive)
 
 #if defined(_WIN32)
       tee_fputs(prompt, stdout);
-      line= win_readline();
+      if (!tmpbuf.is_alloced())
+        tmpbuf.alloc(65535);
+      tmpbuf.length(0);
+      buffer.length(0);
+      size_t clen;
+      do
+      {
+	line= my_cgets((char*)tmpbuf.ptr(), tmpbuf.alloced_length()-1, &clen);
+        buffer.append(line, clen);
+        /* 
+           if we got buffer fully filled than there is a chance that
+           something else is still in console input buffer
+        */
+      } while (tmpbuf.alloced_length() <= clen);
+      /* 
+        An empty line is returned from my_cgets when there's error reading :
+        Ctrl-c for example
+      */
+      if (line)
+        line= buffer.c_ptr();
 #else
       if (opt_outfile)
 	fputs(prompt, OUTFILE);

cmake/os/Windows.cmake

@@ -60,8 +60,8 @@ ENDIF()
 
 ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE)
 ADD_DEFINITIONS(-D_WIN32_WINNT=0x0A00)
-# We do not want the windows.h , or winsvc.h macros min/max
-ADD_DEFINITIONS(-DNOMINMAX -DNOSERVICE)
+# We do not want the windows.h macros min/max
+ADD_DEFINITIONS(-DNOMINMAX)
 # Speed up build process excluding unused header files
 ADD_DEFINITIONS(-DWIN32_LEAN_AND_MEAN)
 

cmake/win_compatibility.manifest

@@ -19,9 +19,4 @@
 
     </application>
   </compatibility>
-  <application>
-    <windowsSettings>
-      <activeCodePage xmlns="http://schemas.microsoft.com/SMI/2019/WindowsSettings">UTF-8</activeCodePage>
-    </windowsSettings>
-  </application>
 </asmv1:assembly>

include/my_global.h

@@ -29,14 +29,6 @@
 #pragma GCC poison __WIN__
 #endif
 
-#if defined(_MSC_VER)
-/*
-  Following functions have bugs, when used with UTF-8 active codepage.
-  #include <winservice.h> will use the non-buggy wrappers
-*/
-#pragma deprecated("CreateServiceA", "OpenServiceA", "ChangeServiceConfigA")
-#endif
-
 /*
   InnoDB depends on some MySQL internals which other plugins should not
   need.  This is because of InnoDB's foreign key support, "safe" binlog

mysql-test/main/charset_client_win.test

@@ -1,2 +1,2 @@
 --source include/windows.inc
---exec set MARIADB_DISABLE_UTF8_CONSOLE=1 && chcp 1257 > NUL && $MYSQL --default-character-set=auto -e "select @@character_set_client"
+--exec chcp 1257 > NUL && $MYSQL --default-character-set=auto -e "select @@character_set_client"

mysql-test/main/charset_client_win_utf8mb4.result

@@ -1,3 +1,5 @@
+ # UTF8 parameters to mysql client do not work on Windows
+--source include/not_windows.inc
 --source include/not_embedded.inc
 
 #

mysql-test/main/charset_client_win_utf8mb4.test

@@ -87,23 +87,6 @@ sub skip_combinations {
   $skip{'main/ssl_verify_ip.test'} = 'x509v3 support required'
     unless $openssl_ver ge "1.0.2";
 
-  sub utf8_command_line_ok() {
-   if (IS_WINDOWS) {
-     # Can use UTF8 on command line since Windows 10 1903 (10.0.18362)
-     my($os_name, $os_major, $os_minor, $os_build, $os_id) = Win32::GetOSVersion();
-     if($os_major lt 10){
-       return 0;
-     } elsif($os_major gt 10 or $os_minor gt 0 or $os_build ge 18362) {
-       return 1;
-     }
-     return 0;
-   }
-   return 1;
-  }
-
-  $skip{'main/charset_client_win_utf8mb4.test'} =
-  $skip{'main/grant_utf8_cli.test'} = 'No utf8 command line support'
-    unless utf8_command_line_ok();
 
   %skip;
 }