diff --git a/PC/WinMain.c b/PC/WinMain.c index 58305d1292e..00dc18d484b 100644 --- a/PC/WinMain.c +++ b/PC/WinMain.c @@ -2,25 +2,9 @@ #define WIN32_LEAN_AND_MEAN #include -#include #include "Python.h" -#ifdef LAUNCHER -/* Q105305 suggests this routine to adjust the handles. */ -static void adjust_file(DWORD handle, FILE* f, char* mode) -{ - int hCrt; - FILE *hf; - hCrt = _open_osfhandle((intptr_t)GetStdHandle(handle), _O_TEXT); - hf = _fdopen(hCrt, mode); - *f = *hf; - setvbuf(f, NULL, _IONBF, 0); - /* Alternatively, we could use __set_app_type and _set_osfhnd, - but that appears to be undocumented. */ -} -#endif - int WINAPI WinMain( HINSTANCE hInstance, /* handle to current instance */ HINSTANCE hPrevInstance, /* handle to previous instance */ @@ -28,19 +12,5 @@ int WINAPI WinMain( int nCmdShow /* show state of window */ ) { -#ifdef LAUNCHER - int i; - if (__argc > 1 && strcmp(__argv[1], "-console") == 0) { - /* Allocate a console, and remove the -console argument. */ - AllocConsole(); - for (i = 2; i < __argc; i++) - __argv[i-1] = __argv[i]; - __argc--; - /* Make stdin, stdout, stderr use the newly allocated OS handles. */ - adjust_file(STD_INPUT_HANDLE, stdin, "r"); - adjust_file(STD_OUTPUT_HANDLE, stdout, "w"); - adjust_file(STD_ERROR_HANDLE, stderr, "w"); - } -#endif return Py_Main(__argc, __argv); } diff --git a/PCbuild/launcher.vcproj b/PCbuild/launcher.vcproj deleted file mode 100644 index f8a1cc5db09..00000000000 --- a/PCbuild/launcher.vcproj +++ /dev/null @@ -1,184 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/PCbuild/pcbuild.sln b/PCbuild/pcbuild.sln index 97376e010da..c09256fd935 100644 --- a/PCbuild/pcbuild.sln +++ b/PCbuild/pcbuild.sln @@ -79,10 +79,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "zlib.vcproj", "{680 {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "launcher", "launcher.vcproj", "{065D53DF-5D8E-4CBD-AE32-B9E29D4FC5C6}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject Global GlobalSection(SolutionConfiguration) = preSolution Debug = Debug @@ -185,12 +181,6 @@ Global {680CDC79-9CCA-4282-9A8D-927CB0DB55B2}.Release.Build.0 = Release|Win32 {680CDC79-9CCA-4282-9A8D-927CB0DB55B2}.ReleaseItanium.ActiveCfg = Release|Win32 {680CDC79-9CCA-4282-9A8D-927CB0DB55B2}.ReleaseItanium.Build.0 = Release|Win32 - {065D53DF-5D8E-4CBD-AE32-B9E29D4FC5C6}.Debug.ActiveCfg = Debug|Win32 - {065D53DF-5D8E-4CBD-AE32-B9E29D4FC5C6}.Debug.Build.0 = Debug|Win32 - {065D53DF-5D8E-4CBD-AE32-B9E29D4FC5C6}.Release.ActiveCfg = Release|Win32 - {065D53DF-5D8E-4CBD-AE32-B9E29D4FC5C6}.Release.Build.0 = Release|Win32 - {065D53DF-5D8E-4CBD-AE32-B9E29D4FC5C6}.ReleaseItanium.ActiveCfg = ReleaseItanium|Win32 - {065D53DF-5D8E-4CBD-AE32-B9E29D4FC5C6}.ReleaseItanium.Build.0 = ReleaseItanium|Win32 EndGlobalSection GlobalSection(SolutionItems) = postSolution readme.txt = readme.txt