X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=w32log.c;h=c524ffa246c4e1794d4a334e5aba909b4b994b6b;hp=5b4389f8bd5a99978198b973aa2c8c074f72d6e2;hb=dc80a8219d68d1e25821219e0b3b5bcda5bae21e;hpb=7863f89ed3f4cd637359b03db31f37239c5a98f7 diff --git a/w32log.c b/w32log.c index 5b4389f8..c524ffa2 100644 --- a/w32log.c +++ b/w32log.c @@ -1,4 +1,4 @@ -const char w32log_rcs[] = "$Id: w32log.c,v 1.45 2012/05/24 15:05:17 fabiankeil Exp $"; +const char w32log_rcs[] = "$Id: w32log.c,v 1.48 2012/05/27 15:45:05 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/w32log.c,v $ @@ -550,14 +550,6 @@ int LogPutStringNoMatch(const char *pszText, int style) *********************************************************************/ 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) { @@ -732,8 +724,8 @@ HWND CreateLogWindow(HINSTANCE hInstance, int nCmdShow) /* 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) GetWindowLongPtr(g_hwndLogBox, GWLP_WNDPROC); + SetWindowLongPtr(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 &&