X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=win32.c;h=c7ebcf3c0d6ff6023989ec27d846ce2b0131012d;hp=9c0ed68b5809f958a830717aa2f73a9abce87a16;hb=ea4c4776a6816a05cdad45bd9b6b65a5641c703a;hpb=5c50b6cd2ec21ee3b58b4a6afa7c628bb9ed4c1b diff --git a/win32.c b/win32.c index 9c0ed68b..c7ebcf3c 100644 --- a/win32.c +++ b/win32.c @@ -1,17 +1,17 @@ -const char win32_rcs[] = "$Id: win32.c,v 1.5 2002/03/04 23:47:30 jongfoster Exp $"; +const char win32_rcs[] = "$Id: win32.c,v 1.17 2010/01/11 11:41:07 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/win32.c,v $ * * Purpose : Win32 User Interface initialization and message loop * - * Copyright : Written by and Copyright (C) 2001 the SourceForge - * IJBSWA team. http://ijbswa.sourceforge.net + * Copyright : Written by and Copyright (C) 2001-2002 members of + * the Privoxy team. http://www.privoxy.org/ * * Written by and Copyright (C) 1999 Adam Lock * * - * This program is free software; you can redistribute it + * This program is free software; you can redistribute it * and/or modify it under the terms of the GNU General * Public License as published by the Free Software * Foundation; either version 2 of the License, or (at @@ -29,27 +29,8 @@ const char win32_rcs[] = "$Id: win32.c,v 1.5 2002/03/04 23:47:30 jongfoster Exp * or write to the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * Revisions : - * $Log: win32.c,v $ - * Revision 1.5 2002/03/04 23:47:30 jongfoster - * - Rewritten, simpler command-line pre-parser - * - not using raise(SIGINT) any more - * - * Revision 1.4 2001/11/30 21:29:33 jongfoster - * Fixing a warning - * - * Revision 1.3 2001/11/16 00:46:31 jongfoster - * Fixing compiler warnings - * - * Revision 1.2 2001/07/29 19:32:00 jongfoster - * Renaming _main() [mingw32 only] to real_main(), for ANSI compliance. - * - * Revision 1.1.1.1 2001/05/15 13:59:08 oes - * Initial import of version 2.9.3 source tree - * - * *********************************************************************/ - + #include "config.h" @@ -64,6 +45,9 @@ const char win32_rcs[] = "$Id: win32.c,v 1.5 2002/03/04 23:47:30 jongfoster Exp /* Uncomment this if you want to build Win32 as a console app */ /* #define _WIN_CONSOLE */ +#ifndef STRICT +#define STRICT +#endif #include #include @@ -78,31 +62,46 @@ const char win32_rcs[] = "$Id: win32.c,v 1.5 2002/03/04 23:47:30 jongfoster Exp const char win32_h_rcs[] = WIN32_H_VERSION; +/** + * A short introductory text about Privoxy. Used for the "About" box + * or the console startup message. + */ const char win32_blurb[] = -"Internet Junkbuster Proxy(TM) Version " VERSION " for Windows is Copyright (C) 1997-8\n" -"by Junkbusters Corp. This is free software; it may be used and copied under\n" -"the GNU General Public License: http://www.gnu.org/copyleft/gpl.html .\n" -"This program comes with ABSOLUTELY NO WARRANTY OF ANY KIND.\n" -"\n" -"For information about how to to configure the proxy and your browser, see\n" -" " REDIRECT_URL "win\n" -"\n" -"The Internet Junkbuster Proxy(TM) is running and ready to serve!\n" -""; +"Privoxy version " VERSION " for Windows\n" +"Copyright (C) 2000-2010 the Privoxy Team (" HOME_PAGE_URL ")\n" +"Based on the Internet Junkbuster by Junkbusters Corp.\n" +"This is free software; it may be used and copied under the\n" +"GNU General Public License, version 2: http://www.gnu.org/licenses/old-licenses/gpl-2.0.html\n" +"This program comes with ABSOLUTELY NO WARRANTY OF ANY KIND.\n"; #ifdef _WIN_CONSOLE +/** + * Hide the console. If set, the program will disconnect from the + * console and run in the background. This allows the command-prompt + * window to close. + */ int hideConsole = 0; -#else +#else /* ndef _WIN_CONSOLE */ + + +/** + * The application instance handle. + */ HINSTANCE g_hInstance; + + +/** + * The command to show the window that was specified at startup. + */ int g_nCmdShow; static void __cdecl UserInterfaceThread(void *); -#endif +#endif /* ndef _WIN_CONSOLE */ /********************************************************************* * @@ -111,12 +110,12 @@ static void __cdecl UserInterfaceThread(void *); * Description : M$ Windows "main" routine: * parse the `lpCmdLine' param into main's argc and argv variables, * start the user interface thread (for the systray window), and - * call main (i.e. patch execution into normal IJB startup). + * call main (i.e. patch execution into normal startup). * * Parameters : - * 1 : hInstance = instance handle of this IJB execution - * 2 : hPrevInstance = instance handle of previous IJB execution - * 3 : lpCmdLine = command line string which started IJB + * 1 : hInstance = instance handle of this execution + * 2 : hPrevInstance = instance handle of previous execution + * 3 : lpCmdLine = command line string which started us * 4 : nCmdShow = window show value (MIN, MAX, NORMAL, etc...) * * Returns : `main' never returns, so WinMain will also never return. @@ -124,11 +123,14 @@ static void __cdecl UserInterfaceThread(void *); *********************************************************************/ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) { +#if 0 /* See comment about __argc & __argv below */ int i; - int res; int argc = 1; const char *argv[3]; char szModule[MAX_PATH+1]; +#endif + + int res; #ifndef _WIN_CONSOLE HANDLE hInitCompleteEvent = NULL; #endif @@ -152,6 +154,16 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine #endif #endif /* defined(_WIN32) && defined(_MSC_VER) && defined(_DEBUG) */ + +/************ + * I couldn't figure out why the command line was being sorta parsed here + * instead of using the __argc & __argv globals usually defined in stdlib.h + * + * From what I can tell by looking at the MinWG source, it supports these + * globals, so i'd hope that the other compilers do so as well. + * Obviously, if i'm wrong i'll find out soon enough! :) + ************/ +#if 0 /* * Cheat in parsing the command line. We only ever have at most one * paramater, which may optionally be specified inside double quotes. @@ -182,6 +194,8 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine argv[1] = lpCmdLine; argv[2] = NULL; argc = ((lpCmdLine != NULL) ? 2 : 1); +#endif /* -END- 0 */ + #ifndef _WIN_CONSOLE /* Create a user-interface thread and wait for it to initialise */ @@ -194,9 +208,9 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine #endif #ifdef __MINGW32__ - res = real_main( argc, argv ); + res = real_main( __argc, __argv ); #else - res = main( argc, argv ); + res = main( __argc, __argv ); #endif return res; @@ -232,8 +246,8 @@ void InitWin32(void) if (WSAStartup(wVersionRequested, &wsaData) != 0) { #ifndef _WIN_CONSOLE - MessageBox(NULL, "Cannot initialize WinSock library", "Internet JunkBuster Error", - MB_OK | MB_ICONERROR | MB_TASKMODAL | MB_SETFOREGROUND | MB_TOPMOST); + MessageBox(NULL, "Cannot initialize WinSock library", "Privoxy Error", + MB_OK | MB_ICONERROR | MB_TASKMODAL | MB_SETFOREGROUND | MB_TOPMOST); #endif exit(1); } @@ -256,7 +270,7 @@ void InitWin32(void) * Description : User interface thread. WinMain will wait for us to set * the hInitCompleteEvent before patching over to `main'. * This ensures the systray window is active before beginning - * IJB operations. + * operations. * * Parameters : * 1 : pData = pointer to `hInitCompleteEvent'. @@ -289,7 +303,7 @@ static void __cdecl UserInterfaceThread(void *pData) } -#endif +#endif /* ndef _WIN_CONSOLE */ /*