strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS presfixes05 (1.4.404); FILE MERGED

Browse source 
2005/04/25 08:38:29 ssa 1.4.404.1: #120661# exception should not be caught in user32 but by the crashreporter, the timer callback was not covered by the same contruct in SalFrameWndProc as it is not message based
This commit is contained in:
Oliver Bolte 2005-05-03 13:10:48 +00:00
parent dd91a7a08c
commit 742fb07c11
1 changed files with 32 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
vcl/win/source/app/saltimer.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: saltimer.cxx,v $
*
* $Revision: 1.4 $
* $Revision: 1.5 $
*
* last change: $Author: vg $ $Date: 2004-01-06 14:53:36 $
* last change: $Author: obo $ $Date: 2005-05-03 14:10:48 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -138,30 +138,38 @@ void WinSalTimer::Stop()
void CALLBACK SalTimerProc( HWND, UINT, UINT, DWORD )
{
SalData* pSalData = GetSalData();
ImplSVData* pSVData = ImplGetSVData();
// Test for MouseLeave
SalTestMouseLeave();
if ( pSVData->mpSalTimer )
__try
{
// Try to aquire the mutex. If we don't get the mutex then we
// try this a short time later again.
if ( ImplSalYieldMutexTryToAcquire() )
{
pSalData->mbInTimerProc = TRUE;
pSVData->mpSalTimer->CallCallback();
pSalData->mbInTimerProc = FALSE;
ImplSalYieldMutexRelease();
SalData* pSalData = GetSalData();
ImplSVData* pSVData = ImplGetSVData();
// Run the timer in the correct time, if we start this
// with a small timeout, because we don't get the mutex
if ( pSalData->mnTimerId &&
(pSalData->mnTimerMS != pSalData->mnTimerOrgMS) )
ImplSalStartTimer( pSalData->mnTimerOrgMS, FALSE );
// Test for MouseLeave
SalTestMouseLeave();
if ( pSVData->mpSalTimer )
{
// Try to aquire the mutex. If we don't get the mutex then we
// try this a short time later again.
if ( ImplSalYieldMutexTryToAcquire() )
{
pSalData->mbInTimerProc = TRUE;
pSVData->mpSalTimer->CallCallback();
pSalData->mbInTimerProc = FALSE;
ImplSalYieldMutexRelease();
// Run the timer in the correct time, if we start this
// with a small timeout, because we don't get the mutex
if ( pSalData->mnTimerId &&
(pSalData->mnTimerMS != pSalData->mnTimerOrgMS) )
ImplSalStartTimer( pSalData->mnTimerOrgMS, FALSE );
}
else
ImplSalStartTimer( 10, TRUE );
}
else
ImplSalStartTimer( 10, TRUE );
}
// #120661# exception should not be caught in user32
// see also SalFrameWndProcW/A
__except(UnhandledExceptionFilter(GetExceptionInformation()))
{
}
}