FEAT: Visual Studio project using Windows console subsystem by default

Author: Oldes

make/msvc/Make-vs-project.r3

@@ -436,8 +436,8 @@ vs/Sources: compose/only [
 ]
 vs/IncludePath-x86:
 vs/IncludePath-x64: "..\..\..\src\include;"
-vs/PreprocessorDefinitions-x86: {TO_WIN32;REB_CORE;REB_EXE;ENDIAN_LITTLE;_FILE_OFFSET_BITS=64;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;}
-vs/PreprocessorDefinitions-x64: {TO_WIN32_X64;__LLP64__;REB_CORE;REB_EXE;ENDIAN_LITTLE;_FILE_OFFSET_BITS=64;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;}
+vs/PreprocessorDefinitions-x86: {WINDOWS_CONSOLE;TO_WIN32;REB_CORE;REB_EXE;ENDIAN_LITTLE;_FILE_OFFSET_BITS=64;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;}
+vs/PreprocessorDefinitions-x64: {WINDOWS_CONSOLE;TO_WIN32_X64;__LLP64__;REB_CORE;REB_EXE;ENDIAN_LITTLE;_FILE_OFFSET_BITS=64;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;}
 vs/Prebuild-x86: {
 set REBOL=..\..\prebuild\r3-make-win.exe
 set T=../../../src/tools
@@ -464,6 +464,6 @@ set OS_ID=0.3.40
 %REBOL% %T%/make-reb-lib.r
 }
 
-vs/make-project "Rebol3" %./
+vs/make-project/type "Rebol3" %./ "Console"
 
 ask "^/Press ENTER to end."

src/os/host-main.c

@@ -112,23 +112,28 @@ void Host_Crash(REBYTE *reason) {
 ***********************************************************************/
 
 #ifdef TO_WINDOWS
-int WINAPI WinMain(HINSTANCE inst, HINSTANCE prior, LPSTR cmd, int show)
+#ifdef WINDOWS_CONSOLE
+int main(int argc, char **argv) {
+	// Retrieves the window handle used by the console associated with the calling process
+	HWND hwndC = GetConsoleWindow();
+	// Then we could just get the HINSTANCE:
+	App_Instance = GetModuleHandle(0); // HMODULE=HINSTANCE
 #else
-int main(int argc, char **argv)
-#endif
-{
-	REBYTE vers[8];
-	REBYTE *line;
-	REBINT n;
-
-#ifdef TO_WINDOWS  // In Win32 get args manually:
+int APIENTRY WinMain(HINSTANCE inst, HINSTANCE prior, LPSTR cmd, int show) {
 	int argc;
 	REBCHR **argv;
 	// Fetch the win32 unicoded program arguments:
 	argv = CommandLineToArgvW(GetCommandLineW(), &argc);
 	App_Instance = inst;
 #endif
 
+#else //non Windows platforms
+int main(int argc, char **argv) {
+#endif
+	REBYTE vers[8];
+	REBYTE *line;
+	REBINT n;
+
 	Host_Lib = &Host_Lib_Init;
 
 	Parse_Args(argc, (REBCHR **)argv, &Main_Args);