Refine

Author: YaSuenag

README.md

@@ -71,7 +71,7 @@ Please see [Applications installed from the web](https://docs.microsoft.com/ja-j
 # Notes
 
 * SimpleCom sends / receives VT100 escape sequences. So the serial device to connect via SimpleCom needs to support VT100 or compatible shell.
-* F1 key is hooked by SimpleCom (in interactive mode (default)), so escase sequence of F1 (`ESC O P`) would not be propagated.
+* F1 key is hooked by SimpleCom (in interactive mode (default)), so escape sequence of F1 (`ESC O P`) would not be propagated.
     * In batch mode, F1 would propergate to peripheral.
 * SimpleCom supports ANSI chars only, so it would not work if multibyte chars (e.g. CJK chars) are given.
 * Run [resize](https://linux.die.net/man/1/resize) provided by xterm if you want to align VT size of Linux box with your console window.

SimpleCom/BatchRedirector.cpp

@@ -21,6 +21,20 @@
 
 static constexpr int buf_sz = 256;
 
+static void RedirectHandle(HANDLE hSource, HANDLE hDest) {
+	char buf[buf_sz];
+	DWORD nBytesRead;
+	while (ReadFile(hSource, buf, sizeof(buf), &nBytesRead, NULL)) {
+		DWORD nBytesWritten;
+		DWORD nBytesRemain = nBytesRead;
+		while (nBytesRemain > 0) {
+			if (WriteFile(hDest, &buf[nBytesRead - nBytesRemain], nBytesRemain, &nBytesWritten, nullptr)) {
+				nBytesRemain -= nBytesWritten;
+			}
+		}
+	}
+}
+
 DWORD WINAPI BatchStdInRedirector(_In_ LPVOID lpParameter) {
 	HANDLE hStdIn = GetStdHandle(STD_INPUT_HANDLE);
 	if (hStdIn == INVALID_HANDLE_VALUE) {
@@ -35,18 +49,7 @@ DWORD WINAPI BatchStdInRedirector(_In_ LPVOID lpParameter) {
 	SetConsoleMode(hStdIn, mode);
 
 	HANDLE hSerial = reinterpret_cast<HANDLE>(lpParameter);
-	char buf[buf_sz];
-	DWORD nBytesRead;
-	while(ReadFile(hStdIn, buf, sizeof(buf), &nBytesRead, NULL)) {
-		DWORD nBytesWritten;
-		DWORD nBytesRemain = nBytesRead;
-		while (nBytesRemain > 0) {
-			if (WriteFile(hSerial, &buf[nBytesRead - nBytesRemain], nBytesRemain, &nBytesWritten, nullptr)) {
-				nBytesRemain -= nBytesWritten;
-			}
-		}
-	}
-
+	RedirectHandle(hStdIn, hSerial);
 	return 0;
 }
 
@@ -58,18 +61,7 @@ DWORD WINAPI BatchStdOutRedirector(_In_ LPVOID lpParameter) {
 	}
 
 	HANDLE hSerial = reinterpret_cast<HANDLE>(lpParameter);
-	char buf[buf_sz];
-	DWORD nBytesRead;
-	while (ReadFile(hSerial, buf, sizeof(buf), &nBytesRead, NULL)) {
-		DWORD nBytesWritten;
-		DWORD nBytesRemain = nBytesRead;
-		while (nBytesRemain > 0) {
-			if (WriteFile(hStdOut, &buf[nBytesRead - nBytesRemain], nBytesRemain, &nBytesWritten, nullptr)) {
-				nBytesRemain -= nBytesWritten;
-			}
-		}
-	}
-
+	RedirectHandle(hSerial, hStdOut);
 	return 0;
 }
 

SimpleCom/BatchRedirector.h

@@ -31,7 +31,7 @@ namespace SimpleCom {
 
     public:
         BatchRedirector(HANDLE hSerial) : TerminalRedirectorBase(hSerial) {};
-		virtual ~BatchRedirector() {};
+        virtual ~BatchRedirector() {};
     };
 
 }

SimpleCom/SimpleCom.cpp

@@ -140,7 +140,6 @@ int _tmain(int argc, LPCTSTR argv[])
 	}
 	catch(std::invalid_argument& e) {
 		// Only ASCII chars should be converted to wchar, so we can ignore deprecation since C++17.
-		// "/D _SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING" has been added to command line option in project properties.
 		std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> conv;
 		MessageBox(parent_hwnd, conv.from_bytes(e.what()).c_str(), _T("Invalid argument"), MB_OK | MB_ICONERROR);
 		return -4;