Merge branch 'master' into pr/757-devtools-deepl-translate-sometimes-the-target-language-is-wrong

.appveyor.yml

@@ -5,21 +5,21 @@ skip_branch_with_pr: false
 
 environment:
   matrix:
-  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
     arch: x64
     platform: x64
-    qtbin: msvc2019_64
-  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+    qtbin: msvc2017_64
+  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
     arch: x86
     platform: Win32
-    qtbin: msvc2019
+    qtbin: msvc2017
 
 before_build:
   - git submodule update --init
   - cd C:\
   - mkdir %arch%
   - cd %arch%
-  - cmake -G "Visual Studio 16 2019" -A "%platform%" -DQt5_DIR="C:\Qt\5.15\%qtbin%\lib\cmake\Qt5" -DCMAKE_BUILD_TYPE="RelWithDebInfo" -DVERSION="" ../Textractor
+  - cmake -G "Visual Studio 15 2017" -A %platform% -DQt5_DIR="C:\Qt\5.13.2\%qtbin%\lib\cmake\Qt5" -DCMAKE_BUILD_TYPE="RelWithDebInfo" -DVERSION="" ../Textractor
 
 build:
   project: C:\%arch%\Textractor.sln

extensions/blockmarkup.h

@@ -49,7 +49,7 @@ private:
 	}
 
 	static constexpr C endImpl[5] = { '|', 'E', 'N', 'D', '|' };
-	static constexpr std::basic_string_view end{ endImpl, 5 };
+	static constexpr std::basic_string_view<C> end{ endImpl, 5 };
 
 	std::basic_streambuf<char>& streambuf;
 	std::basic_string<C> buffer;

extensions/devtools.cpp

@@ -36,11 +36,11 @@ namespace
 		if (process) DevTools::Close();
 
 		auto args = FormatString(
-			L"%s --proxy-server=direct:// --disable-extensions --disable-gpu --user-data-dir=%s\\devtoolscache --remote-debugging-port=9222",
+			L"%s --proxy-server=direct:// --disable-extensions --disable-gpu --no-first-run --user-data-dir=\"%s\\devtoolscache\" --remote-debugging-port=9222",
 			chromePath,
 			std::filesystem::current_path().wstring()
 		);
-		if (headless) args += L" --headless";
+		args += headless ? L" --window-size=1920,1080 --headless" : L" --window-size=850,900";
 		DWORD exitCode = 0;
 		STARTUPINFOW DUMMY = { sizeof(DUMMY) };
 		PROCESS_INFORMATION processInfo = {};

extensions/regexreplacer.cpp

@@ -2,6 +2,7 @@
 #include "module.h"
 #include "blockmarkup.h"
 #include <fstream>
+#include <process.h>
 
 extern const wchar_t* REGEX_REPLACER_INSTRUCTIONS;