X-Git-Url: http://www.privoxy.org/gitweb/new.html?a=blobdiff_plain;f=win32.c;h=c9d5c4e7f342c5a5c5889f1f8f9013e007d37513;hb=23dcf9be0e91645fe420fdf0c699f99d457d3fc9;hp=b0c5e9aaf5f42c7232ae60104708ad04fff063ce;hpb=7121b80b6a04cdb3bcda5e0866ecf7aad55e02a6;p=privoxy.git
diff --git a/win32.c b/win32.c
index b0c5e9aa..c9d5c4e7 100644
--- a/win32.c
+++ b/win32.c
@@ -1,4 +1,3 @@
-const char win32_rcs[] = "$Id: win32.c,v 1.16 2009/05/16 13:27:20 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/win32.c,v $
@@ -6,12 +5,12 @@ const char win32_rcs[] = "$Id: win32.c,v 1.16 2009/05/16 13:27:20 fabiankeil Exp
* Purpose : Win32 User Interface initialization and message loop
*
* Copyright : Written by and Copyright (C) 2001-2002 members of
- * the Privoxy team. http://www.privoxy.org/
+ * the Privoxy team. https://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
@@ -60,24 +59,22 @@ const char win32_rcs[] = "$Id: win32.c,v 1.16 2009/05/16 13:27:20 fabiankeil Exp
#include "win32.h"
-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[] =
"Privoxy version " VERSION " for Windows\n"
-"Copyright (C) 2000-2010 the Privoxy Team (" HOME_PAGE_URL ")\n"
+"Copyright (C) 2000-2023 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"
+"GNU General Public License, version 2: https://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
+ * 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.
*/
@@ -141,7 +138,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
/* Visual C++ Heap debugging */
/* Get current flag*/
- int tmpFlag = _CrtSetDbgFlag( _CRTDBG_REPORT_FLAG );
+ int tmpFlag = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG);
/* Turn on leak-checking bit */
tmpFlag |= _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF | _CRTDBG_CHECK_ALWAYS_DF;
@@ -150,7 +147,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
tmpFlag &= ~(_CRTDBG_CHECK_CRT_DF | _CRTDBG_DELAY_FREE_MEM_DF);
/* Set flag to the new value */
- _CrtSetDbgFlag( tmpFlag );
+ _CrtSetDbgFlag(tmpFlag);
#endif
#endif /* defined(_WIN32) && defined(_MSC_VER) && defined(_DEBUG) */
@@ -166,7 +163,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
#if 0
/*
* Cheat in parsing the command line. We only ever have at most one
- * paramater, which may optionally be specified inside double quotes.
+ * parameter, which may optionally be specified inside double quotes.
*/
if (lpCmdLine != NULL)
@@ -204,13 +201,13 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
g_nCmdShow = nCmdShow;
_beginthread(UserInterfaceThread, 0, &hInitCompleteEvent);
WaitForSingleObject(hInitCompleteEvent, INFINITE);
- DeleteObject(hInitCompleteEvent);
+ CloseHandle(hInitCompleteEvent);
#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;
@@ -246,8 +243,8 @@ void InitWin32(void)
if (WSAStartup(wVersionRequested, &wsaData) != 0)
{
#ifndef _WIN_CONSOLE
- MessageBox(NULL, "Cannot initialize WinSock library", "Privoxy 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);
}