RetroSearch Browse

Wed Sep 8 17:56:41 CEST 2004 · http://mail.python.org/pipermail/python-checkins/2004-September/043200.html

Update of /cvsroot/python/python/dist/src/PC
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22557

Modified Files:
	WinMain.c 
Log Message:
Revert creation of launcher.exe

Index: WinMain.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/PC/WinMain.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10

--- WinMain.c	7 Sep 2004 15:40:12 -0000	1.9
+++ WinMain.c	8 Sep 2004 15:56:39 -0000	1.10
@@ -2,25 +2,9 @@
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
-#include <fcntl.h>
 
 #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 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);
 }



Home - News ( United States | United Kingdom | Italy | Germany ) - Football scores

Showing content from http://mail.python.org/pipermail/python-checkins/2004-September/043200.html below:

[Python-checkins] python/dist/src/PC WinMain.c,1.9,1.10