projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
regression-tests.action: Bump copyright
[privoxy.git]
/
w32log.c
diff --git
a/w32log.c
b/w32log.c
index
5b4389f
..
7500eda
100644
(file)
--- a/
w32log.c
+++ b/
w32log.c
@@
-1,13
+1,12
@@
-const char w32log_rcs[] = "$Id: w32log.c,v 1.45 2012/05/24 15:05:17 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/w32log.c,v $
*
* Purpose : Functions for creating and destroying the log window,
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/w32log.c,v $
*
* Purpose : Functions for creating and destroying the log window,
- * ouputting strings, processing messages and so on.
+ * ou
t
putting strings, processing messages and so on.
*
* Copyright : Written by and Copyright (C) 2001-2009 members of
*
* Copyright : Written by and Copyright (C) 2001-2009 members of
- * the Privoxy team. http://www.privoxy.org/
+ * the Privoxy team. http
s
://www.privoxy.org/
*
* Written by and Copyright (C) 1999 Adam Lock
* <locka@iol.ie>
*
* Written by and Copyright (C) 1999 Adam Lock
* <locka@iol.ie>
@@
-41,6
+40,7
@@
const char w32log_rcs[] = "$Id: w32log.c,v 1.45 2012/05/24 15:05:17 fabiankeil E
#ifndef STRICT
#define STRICT
#endif
#ifndef STRICT
#define STRICT
#endif
+#include <winsock2.h>
#include <windows.h>
#include <richedit.h>
#include <windows.h>
#include <richedit.h>
@@
-54,15
+54,6
@@
const char w32log_rcs[] = "$Id: w32log.c,v 1.45 2012/05/24 15:05:17 fabiankeil E
#include "errlog.h"
#include "loadcfg.h"
#include "errlog.h"
#include "loadcfg.h"
-const char w32res_h_rcs[] = W32RES_H_VERSION;
-
-#ifdef __MINGW32__
-#include "cygwin.h"
-const char cygwin_h_rcs[] = CYGWIN_H_VERSION;
-#endif
-
-const char w32log_h_rcs[] = W32LOG_H_VERSION;
-
#ifndef _WIN_CONSOLE /* entire file */
/*
#ifndef _WIN_CONSOLE /* entire file */
/*
@@
-172,6
+163,9
@@
static struct _Pattern
{ "Connect: Reusing server socket", STYLE_HIGHLIGHT },
{ "Connect: Created new connection to", STYLE_HIGHLIGHT },
{ "hung up on us", STYLE_HIGHLIGHT },
{ "Connect: Reusing server socket", STYLE_HIGHLIGHT },
{ "Connect: Created new connection to", STYLE_HIGHLIGHT },
{ "hung up on us", STYLE_HIGHLIGHT },
+ { "Info: Loading actions file:", STYLE_HIGHLIGHT },
+ { "Info: Loading filter file:", STYLE_HIGHLIGHT },
+ { "Info: Now toggled ", STYLE_HIGHLIGHT },
{ "Crunching Referer:", STYLE_HIGHLIGHT },
/* what are all the possible error strings?? */
{ "Error:", STYLE_HIGHLIGHT },
{ "Crunching Referer:", STYLE_HIGHLIGHT },
/* what are all the possible error strings?? */
{ "Error:", STYLE_HIGHLIGHT },
@@
-322,6
+316,9
@@
void TermLogWindow(void)
void LogCreatePatternMatchingBuffers(void)
{
int i;
void LogCreatePatternMatchingBuffers(void)
{
int i;
+#ifdef HAVE_PCRE2
+#warning The win32 build of Privoxy is expected to crash when compiled with pcre2 support.
+#endif
for (i = 0; patterns_to_highlight[i].str != NULL; i++)
{
regcomp(&patterns_to_highlight[i].buffer, patterns_to_highlight[i].str, REG_ICASE);
for (i = 0; patterns_to_highlight[i].str != NULL; i++)
{
regcomp(&patterns_to_highlight[i].buffer, patterns_to_highlight[i].str, REG_ICASE);
@@
-550,14
+547,6
@@
int LogPutStringNoMatch(const char *pszText, int style)
*********************************************************************/
void LogShowActivity(void)
{
*********************************************************************/
void LogShowActivity(void)
{
- int i;
-
- /* Try to figure out if SetIdleIcon() is thread-safe */
- for (i = 0; i < 1000; i++)
- {
- SetIdleIcon();
- }
-
/* Start some activity timers */
if (g_bShowActivityAnimation)
{
/* Start some activity timers */
if (g_bShowActivityAnimation)
{
@@
-732,8
+721,8
@@
HWND CreateLogWindow(HINSTANCE hInstance, int nCmdShow)
/* SendMessage(g_hwndLogBox, EM_SETWORDWRAPMODE, 0, 0); */
/* Subclass the control to catch certain messages */
/* SendMessage(g_hwndLogBox, EM_SETWORDWRAPMODE, 0, 0); */
/* Subclass the control to catch certain messages */
- g_fnLogBox = (WNDPROC) GetWindowLong
(g_hwndLogBox, GWL
_WNDPROC);
- SetWindowLong
(g_hwndLogBox, GWL_WNDPROC, (LONG
) LogRichEditProc);
+ g_fnLogBox = (WNDPROC) GetWindowLong
Ptr(g_hwndLogBox, GWLP
_WNDPROC);
+ SetWindowLong
Ptr(g_hwndLogBox, GWLP_WNDPROC, (LONG_PTR
) LogRichEditProc);
/* Minimizing looks stupid when the log window is not on the task bar, so hide instead */
if (!g_bShowOnTaskBar &&
/* Minimizing looks stupid when the log window is not on the task bar, so hide instead */
if (!g_bShowOnTaskBar &&
@@
-1201,7
+1190,7
@@
LRESULT CALLBACK LogWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPara
case WM_SHOWWINDOW:
g_bShowLogWindow = wParam;
case WM_SHOWWINDOW:
g_bShowLogWindow = wParam;
- case WM_SIZE:
+ case WM_SIZE:
/* note: implicit-fallthrough */
/* Resize the logging window to fit the new frame */
if (g_hwndLogBox)
{
/* Resize the logging window to fit the new frame */
if (g_hwndLogBox)
{