Merge branch 'elfmz:master' into master

deep-soft · Jan 27, 2024 · b0c7849 · b0c7849
2 parents 5ef763c + d079cfe
commit b0c7849
Show file tree

Hide file tree

Showing 42 changed files with 1,745 additions and 1,325 deletions.
diff --git a/FARStdlib/src/fstd_FUtils.cpp b/FARStdlib/src/fstd_FUtils.cpp
@@ -8,7 +8,7 @@ SaveConsoleTitle::SaveConsoleTitle(BOOL rest /*= TRUE*/)
 	Usage = rest;
 	NeedToRestore = rest;
 	GET_TIME(LastChange);
-	WINPORT(GetConsoleTitle)(SaveTitle, ARRAYSIZE(SaveTitle));
+	WINPORT(GetConsoleTitle)(NULL, SaveTitle, ARRAYSIZE(SaveTitle));
 	Log(("TITLE: Save"));
 }
 SaveConsoleTitle::~SaveConsoleTitle()
@@ -35,7 +35,7 @@ void SaveConsoleTitle::Text(LPCSTR buff)
 			buff = _buff;
 		}
 	*/
-	WINPORT(SetConsoleTitle)(MB2Wide(buff).c_str());
+	WINPORT(SetConsoleTitle)(NULL, MB2Wide(buff).c_str());
 }
 
 void SaveConsoleTitle::Restore(void) {}

diff --git a/FARStdlib/src/fstd_scr.cpp b/FARStdlib/src/fstd_scr.cpp
@@ -21,7 +21,7 @@ void WINAPI FP_Screen::Save(void)
 
 	if (nSaveCount == 0) {
 		hScreen = FP_Info->SaveScreen(0, 0, -1, -1);
-		WINPORT(GetConsoleTitle)(SaveTitle, ARRAYSIZE(SaveTitle));
+		WINPORT(GetConsoleTitle)(NULL, SaveTitle, ARRAYSIZE(SaveTitle));
 	}
 
 	nSaveCount++;
@@ -52,7 +52,7 @@ void WINAPI FP_Screen::Restore(void)
 
 	if (nSaveCount == 0) {
 		Log(("SCREEN: RESTORE"));
-		WINPORT(SetConsoleTitle)(SaveTitle);
+		WINPORT(SetConsoleTitle)(NULL, SaveTitle);
 		FP_Info->RestoreScreen(hScreen);
 		FP_Info->Text(0, 0, 0, NULL);
 		hScreen = NULL;

diff --git a/WinPort/WinPort.h b/WinPort/WinPort.h
@@ -22,10 +22,13 @@ extern "C" {
 	const wchar_t *WinPortBackend();
 
 	///console API
+	WINPORT_DECL(ForkConsole,HANDLE,(VOID));
+	WINPORT_DECL(JoinConsole,VOID,(HANDLE hConsole));
+
 	WINPORT_DECL(GetLargestConsoleWindowSize,COORD,(HANDLE hConsoleOutput));
 	WINPORT_DECL(SetConsoleWindowInfo,BOOL,(HANDLE hConsoleOutput, BOOL bAbsolute, const SMALL_RECT *lpConsoleWindow));
-	WINPORT_DECL(SetConsoleTitle,BOOL,(const WCHAR *title));
-	WINPORT_DECL(GetConsoleTitle,DWORD,(WCHAR *title, DWORD max_size));
+	WINPORT_DECL(SetConsoleTitle,BOOL,(HANDLE hConsoleOutput, const WCHAR *title));
+	WINPORT_DECL(GetConsoleTitle,DWORD,(HANDLE hConsoleOutput, WCHAR *title, DWORD max_size));
 	WINPORT_DECL(SetConsoleScreenBufferSize,BOOL,(HANDLE hConsoleOutput,COORD dwSize));
 	WINPORT_DECL(GetConsoleScreenBufferInfo,BOOL,(HANDLE hConsoleOutput,CONSOLE_SCREEN_BUFFER_INFO *lpConsoleScreenBufferInfo));
 	WINPORT_DECL(SetConsoleCursorPosition,BOOL,(HANDLE hConsoleOutput,COORD dwCursorPosition));
@@ -40,7 +43,7 @@ extern "C" {
 	WINPORT_DECL(WriteConsole,BOOL,(HANDLE hConsoleOutput, const WCHAR *lpBuffer, DWORD nNumberOfCharsToWrite, LPDWORD lpNumberOfCharsWritten, LPVOID lpReserved));
 	WINPORT_DECL(WriteConsoleOutput,BOOL,(HANDLE hConsoleOutput,const CHAR_INFO *lpBuffer,COORD dwBufferSize,COORD dwBufferCoord,PSMALL_RECT lpScreenRegion));
 	WINPORT_DECL(WriteConsoleOutputCharacter,BOOL,(HANDLE hConsoleOutput, const WCHAR *lpCharacter, DWORD nLength, COORD dwWriteCoord, LPDWORD lpNumberOfCharsWritten));
-	WINPORT_DECL(WaitConsoleInput, BOOL,(DWORD dwTimeout));
+	WINPORT_DECL(WaitConsoleInput, BOOL,(HANDLE hConsoleInput, DWORD dwTimeout));
 	WINPORT_DECL(ReadConsoleOutput, BOOL, (HANDLE hConsoleOutput, CHAR_INFO *lpBuffer, COORD dwBufferSize, COORD dwBufferCoord, PSMALL_RECT lpScreenRegion));
 	WINPORT_DECL(FillConsoleOutputAttribute, BOOL, (HANDLE hConsoleOutput, DWORD64 qAttributes, DWORD nLength, COORD dwWriteCoord, LPDWORD lpNumberOfAttrsWritten));
 	WINPORT_DECL(FillConsoleOutputCharacter, BOOL, (HANDLE hConsoleOutput, WCHAR cCharacter, DWORD nLength, COORD dwWriteCoord, LPDWORD lpNumberOfCharsWritten));
@@ -64,7 +67,7 @@ extern "C" {
 	WINPORT_DECL(SetConsoleDisplayMode,BOOL,(DWORD ModeFlags));
 	WINPORT_DECL(GetConsoleDisplayMode,BOOL,(LPDWORD lpModeFlags));
 	WINPORT_DECL(SetConsoleWindowMaximized,VOID,(BOOL Maximized));
-	WINPORT_DECL(GetConsoleColorPalette,BYTE,()); // Returns current color resolution: 4, 8, 24
+	WINPORT_DECL(GetConsoleColorPalette,BYTE,(HANDLE hConsoleOutput)); // Returns current color resolution: 4, 8, 24
 
 	WINPORT_DECL(GenerateConsoleCtrlEvent, BOOL, (DWORD dwCtrlEvent, DWORD dwProcessGroupId ));
 	WINPORT_DECL(SetConsoleCtrlHandler, BOOL, (PHANDLER_ROUTINE HandlerRoutine, BOOL Add ));
@@ -98,9 +101,9 @@ extern "C" {
 	WINPORT_DECL(IsConsoleActive, BOOL, ());
 	WINPORT_DECL(ConsoleDisplayNotification, VOID, (const WCHAR *title, const WCHAR *text));
 	WINPORT_DECL(ConsoleBackgroundMode, BOOL, (BOOL TryEnterBackgroundMode));
-	WINPORT_DECL(SetConsoleFKeyTitles, BOOL, (const CHAR **titles));
-	WINPORT_DECL(OverrideConsoleColor, VOID, (DWORD Index, DWORD *ColorFG, DWORD *ColorBK)); // 0xffffffff - to apply default color
-	WINPORT_DECL(SetConsoleRepaintsDefer, VOID, (BOOL Deferring));
+	WINPORT_DECL(SetConsoleFKeyTitles, BOOL, (HANDLE hConsoleOutput, const CHAR **titles));
+	WINPORT_DECL(OverrideConsoleColor, VOID, (HANDLE hConsoleOutput, DWORD Index, DWORD *ColorFG, DWORD *ColorBK)); // 0xffffffff - to apply default color
+	WINPORT_DECL(SetConsoleRepaintsDefer, VOID, (HANDLE hConsoleOutput, BOOL Deferring));
 
 #ifdef WINPORT_REGISTRY
 	///registry API
@@ -322,13 +325,15 @@ template <class CHAR_T>
 
 struct ConsoleRepaintsDeferScope
 {
-	ConsoleRepaintsDeferScope()
+	HANDLE _con_out;
+
+	ConsoleRepaintsDeferScope(HANDLE hConOut) : _con_out(hConOut)
 	{
-		WINPORT(SetConsoleRepaintsDefer)(TRUE);
+		WINPORT(SetConsoleRepaintsDefer)(_con_out, TRUE);
 	}
 	~ConsoleRepaintsDeferScope()
 	{
-		WINPORT(SetConsoleRepaintsDefer)(FALSE);
+		WINPORT(SetConsoleRepaintsDefer)(_con_out, FALSE);
 	}
 };