gh-888: Allow to use ConEmu as default console in third-party applica…

…tions.
Maximus5 · Oct 6, 2016 · 74653b3 · 74653b3
1 parent f46880d
commit 74653b3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/src/ConEmuHk/ConEmuHooks.cpp b/src/ConEmuHk/ConEmuHooks.cpp
@@ -1,6 +1,6 @@
 
 /*
-Copyright (c) 2009-2015 Maximus5
+Copyright (c) 2009-2016 Maximus5
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -705,6 +705,12 @@ bool InitHooksDefTerm()
 		HOOK_ITEM_BY_NAME(ShellExecuteExW,		shell32),
 		{0}
 	};
+	HookItem HooksAllocConsole[] =
+	{
+		// gh-888, gh-55: Allow to use ConEmu as default console in third-party applications
+		HOOK_ITEM_BY_NAME(AllocConsole,			kernel32), // Only for "*.vshost.exe"?
+		{0}
+	};
 	HookItem HooksCmdLine[] =
 	{
 		// Issue 1125: "Run as administrator" too. Must be last export
@@ -714,7 +720,7 @@ bool InitHooksDefTerm()
 	HookItem HooksVshost[] =
 	{
 		// Issue 1312: .Net applications runs in "*.vshost.exe" helper GUI application when debugging
-		HOOK_ITEM_BY_NAME(AllocConsole,			kernel32), // Only for "*.vshost.exe"?
+		// AllocConsole moved to HooksCommon
 		HOOK_ITEM_BY_NAME(ShowWindow,			user32),
 		/* ************************ */
 		{0}
@@ -737,6 +743,12 @@ bool InitHooksDefTerm()
 	if (InitHooks(HooksCommon) < 0)
 		goto wrap;
 
+	if (gbIsNetVsHost || gbPrepareDefaultTerminal)
+	{
+		if (InitHooks(HooksAllocConsole) < 0)
+			goto wrap;
+	}
+
 	// Windows 7. There is new undocumented function "ShellExecCmdLine" used by Explorer
 	if (IsWin7())
 	{

diff --git a/src/ConEmuHk/ConEmuHooks.h b/src/ConEmuHk/ConEmuHooks.h
@@ -1,6 +1,6 @@
 
 /*
-Copyright (c) 2009-2015 Maximus5
+Copyright (c) 2009-2016 Maximus5
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without