X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=win32.c;h=ecfb63af23185a1180df18c0d56f2ae72416629d;hp=c7ebcf3c0d6ff6023989ec27d846ce2b0131012d;hb=9b2f19e5b2787e062ca6fe992ce250c5149497f8;hpb=0428133610c525457cb16f7ac6a54203a2743d6c diff --git a/win32.c b/win32.c index c7ebcf3c..ecfb63af 100644 --- a/win32.c +++ b/win32.c @@ -1,4 +1,3 @@ -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 $ @@ -6,7 +5,7 @@ const char win32_rcs[] = "$Id: win32.c,v 1.17 2010/01/11 11:41:07 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 * @@ -60,15 +59,13 @@ const char win32_rcs[] = "$Id: win32.c,v 1.17 2010/01/11 11:41:07 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-2019 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" @@ -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) */ @@ -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;