From: jongfoster Date: Sun, 24 Mar 2002 12:03:47 +0000 (+0000) Subject: Name change X-Git-Tag: v_2_9_13~43 X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=51372679fa2205631ee27c6ac621449bcdd083c3 Name change --- diff --git a/w32.rc b/w32.rc index 2f3a291b..154b2ef8 100644 --- a/w32.rc +++ b/w32.rc @@ -4,8 +4,8 @@ * * Purpose : Windows GUI resource script. * - * 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://privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -31,6 +31,12 @@ * * Revisions : * $Log: w32.rc,v $ + * Revision 1.12 2001/07/30 22:16:07 jongfoster + * Tidying up #defines: + * - All feature #defines are now of the form FEATURE_xxx + * - Permanently turned off WIN_GUI_EDIT + * - Permanently turned on WEBDAV and SPLIT_PROXY_ARGS + * * Revision 1.11 2001/07/21 17:53:41 jongfoster * Adding version information block. * @@ -129,15 +135,15 @@ * Icon with lowest ID value placed first to ensure application icon * remains consistent on all systems. */ -IDI_JUNKBUSTER ICON DISCARDABLE "icons/junkbust.ico" -IDI_JUNKBUSTER1 ICON DISCARDABLE "icons/ico00001.ico" -IDI_JUNKBUSTER2 ICON DISCARDABLE "icons/ico00002.ico" -IDI_JUNKBUSTER3 ICON DISCARDABLE "icons/ico00003.ico" -IDI_JUNKBUSTER4 ICON DISCARDABLE "icons/ico00004.ico" -IDI_JUNKBUSTER5 ICON DISCARDABLE "icons/ico00005.ico" -IDI_JUNKBUSTER6 ICON DISCARDABLE "icons/ico00006.ico" -IDI_JUNKBUSTER7 ICON DISCARDABLE "icons/ico00007.ico" -IDI_JUNKBUSTER8 ICON DISCARDABLE "icons/ico00008.ico" +IDI_MAINICON ICON DISCARDABLE "icons/junkbust.ico" +IDI_ANIMATED1 ICON DISCARDABLE "icons/ico00001.ico" +IDI_ANIMATED2 ICON DISCARDABLE "icons/ico00002.ico" +IDI_ANIMATED3 ICON DISCARDABLE "icons/ico00003.ico" +IDI_ANIMATED4 ICON DISCARDABLE "icons/ico00004.ico" +IDI_ANIMATED5 ICON DISCARDABLE "icons/ico00005.ico" +IDI_ANIMATED6 ICON DISCARDABLE "icons/ico00006.ico" +IDI_ANIMATED7 ICON DISCARDABLE "icons/ico00007.ico" +IDI_ANIMATED8 ICON DISCARDABLE "icons/ico00008.ico" IDI_IDLE ICON DISCARDABLE "icons/idle.ico" #endif /* Neutral resources */ @@ -175,13 +181,13 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "CompanyName", "The ijbswa team - ijbswa.sourceforge.net\0" - VALUE "FileDescription", "JunkBuster\0" + VALUE "CompanyName", "The Privoxy team - www.privoxy.org\0" + VALUE "FileDescription", "Privoxy\0" VALUE "FileVersion", VERSION "\0" - VALUE "InternalName", "JunkBuster\0" + VALUE "InternalName", "Privoxy\0" VALUE "LegalCopyright", "Distributed under the GNU GPL\0" - VALUE "OriginalFilename", "junkbuster.exe\0" - VALUE "ProductName", "JunkBuster\0" + VALUE "OriginalFilename", "privoxy.exe\0" + VALUE "ProductName", "Privoxy\0" VALUE "ProductVersion", VERSION "\0" END END @@ -202,11 +208,11 @@ IDR_TRAYMENU MENU DISCARDABLE BEGIN POPUP "Popup" BEGIN - MENUITEM "E&xit JunkBuster", ID_FILE_EXIT + MENUITEM "E&xit Privoxy", ID_FILE_EXIT MENUITEM SEPARATOR POPUP "&Options" BEGIN - MENUITEM "&Configuration...", ID_TOOLS_EDITJUNKBUSTER + MENUITEM "&Configuration...", ID_TOOLS_EDITCONFIG MENUITEM SEPARATOR MENUITEM "&Actions...", ID_TOOLS_EDITACTIONS MENUITEM "Perl &Regexps...", ID_TOOLS_EDITPERLRE @@ -216,9 +222,9 @@ BEGIN END MENUITEM SEPARATOR #ifdef FEATURE_TOGGLE - MENUITEM "&Enable", ID_TOGGLE_IJB, CHECKED + MENUITEM "&Enable", ID_TOGGLE_ENABLED, CHECKED #endif /* def FEATURE_TOGGLE */ - MENUITEM "Show &JunkBuster Window", ID_SHOWWINDOW + MENUITEM "Show Privoxy &Window", ID_SHOWWINDOW END END @@ -244,10 +250,10 @@ BEGIN POPUP "&Options" BEGIN #ifdef FEATURE_TOGGLE - MENUITEM "&Enable", ID_TOGGLE_IJB, CHECKED + MENUITEM "&Enable", ID_TOGGLE_ENABLED, CHECKED MENUITEM SEPARATOR #endif /* def FEATURE_TOGGLE */ - MENUITEM "&Configuration...", ID_TOOLS_EDITJUNKBUSTER + MENUITEM "&Configuration...", ID_TOOLS_EDITCONFIG MENUITEM SEPARATOR MENUITEM "&Actions...", ID_TOOLS_EDITACTIONS MENUITEM "Perl &Regexps...", ID_TOOLS_EDITPERLRE @@ -257,13 +263,13 @@ BEGIN END POPUP "&Help" BEGIN - MENUITEM "Junkbuster &FAQ", ID_HELP_FAQ - MENUITEM "Junkbuster &Manual", ID_HELP_MANUAL + MENUITEM "Privoxy &FAQ", ID_HELP_FAQ + MENUITEM "Privoxy &Manual", ID_HELP_MANUAL MENUITEM "GNU &General Public Licence", ID_HELP_GPL MENUITEM SEPARATOR - MENUITEM "Junkbuster Status...", ID_HELP_STATUS + MENUITEM "Privoxy Status...", ID_HELP_STATUS MENUITEM SEPARATOR - MENUITEM "About Junkbuster...", ID_HELP_ABOUTJUNKBUSTER + MENUITEM "About Privoxy...", ID_HELP_ABOUT END END diff --git a/w32log.c b/w32log.c index 5a3a69d4..81dce2e7 100644 --- a/w32log.c +++ b/w32log.c @@ -1,4 +1,4 @@ -const char w32log_rcs[] = "$Id: w32log.c,v 1.18 2001/11/30 23:37:24 jongfoster Exp $"; +const char w32log_rcs[] = "$Id: w32log.c,v 1.19 2002/01/17 21:04:17 jongfoster Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/w32log.c,v $ @@ -6,8 +6,8 @@ const char w32log_rcs[] = "$Id: w32log.c,v 1.18 2001/11/30 23:37:24 jongfoster E * Purpose : Functions for creating and destroying the log window, * ouputting strings, processing messages and so on. * - * 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://privoxy.org/ * * Written by and Copyright (C) 1999 Adam Lock * @@ -32,6 +32,10 @@ const char w32log_rcs[] = "$Id: w32log.c,v 1.18 2001/11/30 23:37:24 jongfoster E * * Revisions : * $Log: w32log.c,v $ + * Revision 1.19 2002/01/17 21:04:17 jongfoster + * Replacing hard references to the URL of the config interface + * with #defines from project.h + * * Revision 1.18 2001/11/30 23:37:24 jongfoster * Renaming the Win32 config file to config.txt - this is almost the * same as the corresponding UNIX name "config" @@ -337,14 +341,14 @@ BOOL InitLogWindow(void) g_hiconIdle = LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_IDLE)); for (i = 0; i < ANIM_FRAMES; i++) { - g_hiconAnim[i] = LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_JUNKBUSTER1 + i)); + g_hiconAnim[i] = LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_ANIMATED1 + i)); } - g_hiconApp = LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_JUNKBUSTER)); + g_hiconApp = LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_MAINICON)); /* Create the user interface */ g_hwndLogFrame = CreateLogWindow(g_hInstance, g_nCmdShow); g_hwndTray = CreateTrayWindow(g_hInstance); - TrayAddIcon(g_hwndTray, 1, g_hiconApp, "Junkbuster"); + TrayAddIcon(g_hwndTray, 1, g_hiconApp, "Privoxy"); /* Create pattern matching buffers (for highlighting */ LogCreatePatternMatchingBuffers(); @@ -765,7 +769,7 @@ void LogClipBuffer(void) *********************************************************************/ HWND CreateHiddenLogOwnerWindow(HINSTANCE hInstance) { - static const char *szWndName = "JunkbusterLogLogOwner"; + static const char *szWndName = "PrivoxyLogOwner"; WNDCLASS wc; HWND hwnd; @@ -828,8 +832,8 @@ LRESULT CALLBACK LogOwnerWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM *********************************************************************/ HWND CreateLogWindow(HINSTANCE hInstance, int nCmdShow) { - static const char *szWndName = "JunkbusterLogWindow"; - static const char *szWndTitle = "Junkbuster"; + static const char *szWndName = "PrivoxyLogWindow"; + static const char *szWndTitle = "Privoxy"; HWND hwnd = NULL; HWND hwndOwner = (g_bShowOnTaskBar) ? NULL : CreateHiddenLogOwnerWindow(hInstance); @@ -1084,7 +1088,7 @@ void OnLogCommand(int nCommand) #ifdef FEATURE_TOGGLE /* by haroon - change toggle to its opposite value */ - case ID_TOGGLE_IJB: + case ID_TOGGLE_ENABLED: g_bToggleIJB = !g_bToggleIJB; if (g_bToggleIJB) { @@ -1097,7 +1101,7 @@ void OnLogCommand(int nCommand) break; #endif /* def FEATURE_TOGGLE */ - case ID_TOOLS_EDITJUNKBUSTER: + case ID_TOOLS_EDITCONFIG: EditFile(configfile); break; @@ -1131,8 +1135,8 @@ void OnLogCommand(int nCommand) ShellExecute(g_hwndLogFrame, "open", CGI_PREFIX "show-status", NULL, NULL, SW_SHOWNORMAL); break; - case ID_HELP_ABOUTJUNKBUSTER: - MessageBox(g_hwndLogFrame, win32_blurb, "Junkbuster Information", MB_OK); + case ID_HELP_ABOUT: + MessageBox(g_hwndLogFrame, win32_blurb, "About Privoxy", MB_OK); break; default: @@ -1172,7 +1176,7 @@ void OnLogInitMenu(HMENU hmenu) CheckMenuItem(hmenu, ID_VIEW_ACTIVITYANIMATION, MF_BYCOMMAND | (g_bShowActivityAnimation ? MF_CHECKED : MF_UNCHECKED)); #ifdef FEATURE_TOGGLE /* by haroon - menu item for Enable toggle on/off */ - CheckMenuItem(hmenu, ID_TOGGLE_IJB, MF_BYCOMMAND | (g_bToggleIJB ? MF_CHECKED : MF_UNCHECKED)); + CheckMenuItem(hmenu, ID_TOGGLE_ENABLED, MF_BYCOMMAND | (g_bToggleIJB ? MF_CHECKED : MF_UNCHECKED)); #endif /* def FEATURE_TOGGLE */ } diff --git a/w32log.h b/w32log.h index 9f3f6b79..60314092 100644 --- a/w32log.h +++ b/w32log.h @@ -1,6 +1,6 @@ #ifndef W32LOG_H_INCLUDED #define W32LOG_H_INCLUDED -#define W32LOG_H_VERSION "$Id: w32log.h,v 1.7 2001/07/29 18:43:08 jongfoster Exp $" +#define W32LOG_H_VERSION "$Id: w32log.h,v 1.8 2001/07/30 22:08:36 jongfoster Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/w32log.h,v $ @@ -8,8 +8,8 @@ * Purpose : Functions for creating and destroying the log window, * ouputting strings, processing messages and so on. * - * 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://privoxy.org/ * * Written by and Copyright (C) 1999 Adam Lock * @@ -34,6 +34,12 @@ * * Revisions : * $Log: w32log.h,v $ + * Revision 1.8 2001/07/30 22:08:36 jongfoster + * Tidying up #defines: + * - All feature #defines are now of the form FEATURE_xxx + * - Permanently turned off WIN_GUI_EDIT + * - Permanently turned on WEBDAV and SPLIT_PROXY_ARGS + * * Revision 1.7 2001/07/29 18:43:08 jongfoster * Changing #ifdef _FILENAME_H to FILENAME_H_INCLUDED, to conform to * ANSI C rules. diff --git a/w32res.h b/w32res.h index 2bff9888..269d070f 100644 --- a/w32res.h +++ b/w32res.h @@ -1,14 +1,14 @@ #ifndef W32RES_H_INCLUDED #define W32RES_H_INCLUDED -#define W32RES_H_VERSION "$Id: w32res.h,v 1.9 2001/07/29 18:43:08 jongfoster Exp $" +#define W32RES_H_VERSION "$Id: w32res.h,v 1.10 2001/07/30 22:08:36 jongfoster Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/w32res.h,v $ * * Purpose : Identifiers for Windows GUI resources. * - * 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://privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -34,6 +34,12 @@ * * Revisions : * $Log: w32res.h,v $ + * Revision 1.10 2001/07/30 22:08:36 jongfoster + * Tidying up #defines: + * - All feature #defines are now of the form FEATURE_xxx + * - Permanently turned off WIN_GUI_EDIT + * - Permanently turned on WEBDAV and SPLIT_PROXY_ARGS + * * Revision 1.9 2001/07/29 18:43:08 jongfoster * Changing #ifdef _FILENAME_H to FILENAME_H_INCLUDED, to conform to * ANSI C rules. @@ -108,18 +114,18 @@ #define IDR_POPUP_SELECTION 105 -#define IDI_JUNKBUSTER 200 -#define IDI_JUNKBUSTER1 201 -#define IDI_JUNKBUSTER2 202 -#define IDI_JUNKBUSTER3 203 -#define IDI_JUNKBUSTER4 204 -#define IDI_JUNKBUSTER5 205 -#define IDI_JUNKBUSTER6 206 -#define IDI_JUNKBUSTER7 207 -#define IDI_JUNKBUSTER8 208 +#define IDI_MAINICON 200 +#define IDI_ANIMATED1 201 +#define IDI_ANIMATED2 202 +#define IDI_ANIMATED3 203 +#define IDI_ANIMATED4 204 +#define IDI_ANIMATED5 205 +#define IDI_ANIMATED6 206 +#define IDI_ANIMATED7 207 +#define IDI_ANIMATED8 208 #define ID_SHOWWINDOW 4000 -#define ID_HELP_ABOUTJUNKBUSTER 4001 +#define ID_HELP_ABOUT 4001 #define ID_FILE_EXIT 4002 #define ID_VIEW_CLEARLOG 4003 #define ID_VIEW_LOGMESSAGES 4004 @@ -131,11 +137,11 @@ #define ID_HELP_GPL 4010 #define ID_HELP_STATUS 4011 #ifdef FEATURE_TOGGLE -#define ID_TOGGLE_IJB 4012 +#define ID_TOGGLE_ENABLED 4012 #endif /* def FEATURE_TOGGLE */ /* Break these out so they are easier to extend, but keep consecutive */ -#define ID_TOOLS_EDITJUNKBUSTER 5000 +#define ID_TOOLS_EDITCONFIG 5000 #define ID_TOOLS_EDITACTIONS 5001 #define ID_TOOLS_EDITPERLRE 5002 diff --git a/w32taskbar.c b/w32taskbar.c index 83394ab7..7bf83d94 100644 --- a/w32taskbar.c +++ b/w32taskbar.c @@ -1,4 +1,4 @@ -const char w32taskbar_rcs[] = "$Id: w32taskbar.c,v 1.3 2001/05/22 18:56:28 oes Exp $"; +const char w32taskbar_rcs[] = "$Id: w32taskbar.c,v 1.4 2001/11/16 00:46:31 jongfoster Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/w32taskbar.c,v $ @@ -6,8 +6,8 @@ const char w32taskbar_rcs[] = "$Id: w32taskbar.c,v 1.3 2001/05/22 18:56:28 oes E * Purpose : Functions for creating, setting and destroying the * workspace tray icon * - * 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://privoxy.org/ * * Written by and Copyright (C) 1999 Adam Lock * @@ -32,6 +32,9 @@ const char w32taskbar_rcs[] = "$Id: w32taskbar.c,v 1.3 2001/05/22 18:56:28 oes E * * Revisions : * $Log: w32taskbar.c,v $ + * Revision 1.4 2001/11/16 00:46:31 jongfoster + * Fixing compiler warnings + * * Revision 1.3 2001/05/22 18:56:28 oes * CRLF -> LF * @@ -71,7 +74,8 @@ static LRESULT CALLBACK TrayProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar * * Function : CreateTrayWindow * - * Description : Creates and returns the invisible window responsible for processing tray messages. + * Description : Creates and returns the invisible window responsible + * for processing tray messages. * * Parameters : * 1 : hInstance = instance handle of this application @@ -82,7 +86,7 @@ static LRESULT CALLBACK TrayProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar HWND CreateTrayWindow(HINSTANCE hInstance) { WNDCLASS wc; - static const char *szWndName = "JunkbusterTrayWindow"; + static const char *szWndName = "PrivoxyTrayWindow"; wc.style = 0; wc.lpfnWndProc = TrayProc; diff --git a/w32taskbar.h b/w32taskbar.h index b51d9f30..c89e1329 100644 --- a/w32taskbar.h +++ b/w32taskbar.h @@ -1,6 +1,6 @@ #ifndef W32TASKBAR_H_INCLUDED #define W32TASKBAR_H_INCLUDED -#define W32TASKBAR_H_VERSION "$Id: w32taskbar.h,v 1.1.1.1 2001/05/15 13:59:08 oes Exp $" +#define W32TASKBAR_H_VERSION "$Id: w32taskbar.h,v 1.2 2001/07/29 18:43:08 jongfoster Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/w32taskbar.h,v $ @@ -8,8 +8,8 @@ * Purpose : Functions for creating, setting and destroying the * workspace tray icon * - * 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://privoxy.org/ * * Written by and Copyright (C) 1999 Adam Lock * @@ -34,6 +34,10 @@ * * Revisions : * $Log: w32taskbar.h,v $ + * Revision 1.2 2001/07/29 18:43:08 jongfoster + * Changing #ifdef _FILENAME_H to FILENAME_H_INCLUDED, to conform to + * ANSI C rules. + * * Revision 1.1.1.1 2001/05/15 13:59:08 oes * Initial import of version 2.9.3 source tree * diff --git a/win32.c b/win32.c index 9c0ed68b..8c1eb3f1 100644 --- a/win32.c +++ b/win32.c @@ -1,12 +1,12 @@ -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.6 2002/03/16 21:53:28 jongfoster 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://privoxy.org/ * * Written by and Copyright (C) 1999 Adam Lock * @@ -31,6 +31,9 @@ const char win32_rcs[] = "$Id: win32.c,v 1.5 2002/03/04 23:47:30 jongfoster Exp * * Revisions : * $Log: win32.c,v $ + * Revision 1.6 2002/03/16 21:53:28 jongfoster + * VC++ Heap debug option + * * Revision 1.5 2002/03/04 23:47:30 jongfoster * - Rewritten, simpler command-line pre-parser * - not using raise(SIGINT) any more @@ -79,16 +82,16 @@ 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; 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" +"Privoxy version " VERSION " for Windows\n" +"Copyright (C) 2000-2002 by members of the Privoxy Team\n" +"Copyright (C) 1997-8 by Junkbusters Corp.\n" +"This is free software; it may be used and copied under the\n" +"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" -""; +" " HOME_PAGE_URL "\n" +"\n"; #ifdef _WIN_CONSOLE @@ -111,12 +114,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. @@ -232,7 +235,7 @@ void InitWin32(void) if (WSAStartup(wVersionRequested, &wsaData) != 0) { #ifndef _WIN_CONSOLE - MessageBox(NULL, "Cannot initialize WinSock library", "Internet JunkBuster Error", + MessageBox(NULL, "Cannot initialize WinSock library", "Privoxy Error", MB_OK | MB_ICONERROR | MB_TASKMODAL | MB_SETFOREGROUND | MB_TOPMOST); #endif exit(1); @@ -256,7 +259,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'. diff --git a/win32.h b/win32.h index 99e0e32e..1e08da1a 100644 --- a/win32.h +++ b/win32.h @@ -1,14 +1,14 @@ #ifndef WIN32_H_INCLUDED #define WIN32_H_INCLUDED -#define WIN32_H_VERSION "$Id: win32.h,v 1.2 2001/07/29 18:43:08 jongfoster Exp $" +#define WIN32_H_VERSION "$Id: win32.h,v 1.3 2001/07/30 22:08:36 jongfoster Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/win32.h,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://privoxy.org/ * * Written by and Copyright (C) 1999 Adam Lock * @@ -33,6 +33,12 @@ * * Revisions : * $Log: win32.h,v $ + * Revision 1.3 2001/07/30 22:08:36 jongfoster + * Tidying up #defines: + * - All feature #defines are now of the form FEATURE_xxx + * - Permanently turned off WIN_GUI_EDIT + * - Permanently turned on WEBDAV and SPLIT_PROXY_ARGS + * * Revision 1.2 2001/07/29 18:43:08 jongfoster * Changing #ifdef _FILENAME_H to FILENAME_H_INCLUDED, to conform to * ANSI C rules.