fix console readin

Author: steve02081504

shioricaller.vcxproj

@@ -112,6 +112,7 @@
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
       <StringPooling>true</StringPooling>
+      <BuildStlModules>false</BuildStlModules>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -151,6 +152,7 @@
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
       <StringPooling>true</StringPooling>
+      <BuildStlModules>false</BuildStlModules>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>

shioricaller.vcxproj.user

@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LocalDebuggerCommandArguments>E:\ssp\ghost\Taromati2\ghost\master\shiori\aya.dll</LocalDebuggerCommandArguments>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LocalDebuggerCommandArguments>E:\ssp\ghost\Taromati2\ghost\master\shiori\aya.dll</LocalDebuggerCommandArguments>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LocalDebuggerCommandArguments>E:\ssp\ghost\Taromati2\ghost\master\shiori\aya.dll</LocalDebuggerCommandArguments>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LocalDebuggerCommandArguments>E:\ssp\ghost\Taromati2\ghost\master\shiori\aya.dll</LocalDebuggerCommandArguments>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
 </Project>

src/_gists.cpp

@@ -1,4 +1,4 @@
 #include "my-gists/ukagaka/shiori_loader.cpp"
 #include "my-gists/ukagaka/protocol_message.cpp"
-#include "my-gists/windows/GenerateDump.cpp"
 #include "my-gists/windows/EnableVirtualTerminal.cpp"
+#include "my-gists/windows/small_io.cpp"

src/my-gists

@@ -3,29 +3,28 @@
 
 #include "my-gists/ukagaka/shiori_loader.hpp"
 #include "my-gists/ukagaka/protocol_message.hpp"
-#include "my-gists/windows/GenerateDump.hpp"
 #include "my-gists/windows/EnableVirtualTerminal.hpp"
+#include "my-gists/windows/small_io.hpp"
 #include "my-gists/ansi_color.hpp"
-#include <iostream>
+
 #include <string>
 
 int wmain(int argc, wchar_t* argv[]){
-	InstallExceptionFilter();
 	EnableVirtualTerminal();//for color output
 
 	if(argc != 2) {
-		std::cout << "Usage 1: \t" GREEN_TEXT("shioricaller shiori.dll < request.txt > response.txt") << std::endl
-				  << "Usage 2: \t" GREEN_TEXT("shioricaller shiori.dll") << std::endl
-				  << "(In Usage 2, you need to:" << std::endl
-				  << "\t1. input request manually" << std::endl
-				  << "\t2. press Enter*2 to send request" << std::endl
-				  << "\t3. when you want to quit, press Ctrl+Z or something to send EOF" << std::endl
-				  << ")" << std::endl;
+		out << "Usage 1: \t" GREEN_TEXT("shioricaller shiori.dll < request.txt > response.txt") "\n"
+			   "Usage 2: \t" GREEN_TEXT("shioricaller shiori.dll") "\n"
+			   "(In Usage 2, you need to:" "\n"
+			   "\t1. input request manually" "\n"
+			   "\t2. press Enter*2 to send request" "\n"
+			   "\t3. when you want to quit, press Ctrl+Z or something to send EOF" "\n"
+			   ")" "\n";
 		return 0;
 	}
 
-	auto error_handler = [](Cshiori::Error err) {
-		std::cerr << RED_OUTPUT("Error: " << to_ansi_colored_string(err)) << std::endl;
+	auto error_handler = [](Cshiori::Error aerr) {
+		err << RED_OUTPUT("Error: " << to_ansi_colored_string(aerr)) << endline;
 	};
 
 	Cshiori shiori{
@@ -37,16 +36,34 @@ int wmain(int argc, wchar_t* argv[]){
 
 	if(not shiori.All_OK())
 		return 1;
-
-	std::string req_buf,req_line;
-	while(1) {
-		std::getline(std::cin, req_line);
-		if(std::cin.eof())break;
-		req_buf += req_line + "\r\n";
-		if(req_line.empty()) {
-			const auto ret = ukagaka::protocol_message{shiori(req_buf)};
-			std::cout << to_ansi_colored_string(ret);
-			req_buf.clear();
+	if(in.is_console()) {
+		std::wstring req_buf, req_line;
+		while(1) {
+			getline(in, req_line);
+			if(!in)
+				break;
+			req_buf += req_line + L"\r\n";
+			if(req_line.empty()) {
+				const auto request			  = ukagaka::protocol_message{req_buf};
+				const auto code_cvted_request = std::string(request);
+				const auto ret				  = ukagaka::protocol_message{shiori(code_cvted_request)};
+				out << to_ansi_colored_wstring(ret);
+				req_buf.clear();
+			}
+		}
+	}
+	else {
+		std::string req_buf, req_line;
+		while(1) {
+			getline(in, req_line);
+			if(!in)
+				break;
+			req_buf += req_line + "\r\n";
+			if(req_line.empty()) {
+				const auto ret = ukagaka::protocol_message{shiori(req_buf)};
+				out << to_ansi_colored_string(ret);
+				req_buf.clear();
+			}
 		}
 	}
 }