ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-08-29 04:13:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

- [User32] Fix timer crash when calling proc.

Browse Source 
svn path=/trunk/; revision=46025
This commit is contained in:
James Tabor
2010-03-09 03:48:05 +00:00
parent 7a43a3001f
commit c03ec91188
1 changed files with 56 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/dll/win32/user32/windows/message.c
+56 -13
View File
@@ -1211,7 +1211,14 @@ IntCallWindowProcW(BOOL IsAnsiProc,
if (PreResult) goto Exit;
Result = WndProc(AnsiMsg.hwnd, AnsiMsg.message, AnsiMsg.wParam, AnsiMsg.lParam);
_SEH2_TRY // wine does this.
{
Result = WndProc(AnsiMsg.hwnd, AnsiMsg.message, AnsiMsg.wParam, AnsiMsg.lParam);
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
}
_SEH2_END;
if (Hook && MsgOverride)
{
@@ -1252,7 +1259,14 @@ IntCallWindowProcW(BOOL IsAnsiProc,
if (PreResult) goto Exit;
Result = WndProc(hWnd, Msg, wParam, lParam);
_SEH2_TRY
{
Result = WndProc(hWnd, Msg, wParam, lParam);
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
}
_SEH2_END;
if (Hook && MsgOverride)
{
@@ -1329,7 +1343,14 @@ IntCallWindowProcA(BOOL IsAnsiProc,
if (PreResult) goto Exit;
Result = WndProc(hWnd, Msg, wParam, lParam);
_SEH2_TRY
{
Result = WndProc(hWnd, Msg, wParam, lParam);
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
}
_SEH2_END;
if (Hook && MsgOverride)
{
@@ -1374,8 +1395,15 @@ IntCallWindowProcA(BOOL IsAnsiProc,
if (PreResult) goto Exit;
Result = WndProc(UnicodeMsg.hwnd, UnicodeMsg.message,
UnicodeMsg.wParam, UnicodeMsg.lParam);
_SEH2_TRY
{
Result = WndProc(UnicodeMsg.hwnd, UnicodeMsg.message,
UnicodeMsg.wParam, UnicodeMsg.lParam);
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
}
_SEH2_END;
if (Hook && MsgOverride)
{
@@ -1573,10 +1601,18 @@ DispatchMessageA(CONST MSG *lpmsg)
if ( lpmsg->message == WM_SYSTIMER )
return NtUserDispatchMessage( (PMSG)lpmsg );
Ret = WndProc(lpmsg->hwnd,
lpmsg->message,
lpmsg->wParam,
GetTickCount());
_SEH2_TRY // wine does this.
{
Ret = WndProc(lpmsg->hwnd,
lpmsg->message,
lpmsg->wParam,
GetTickCount());
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
}
_SEH2_END;
}
else if (Wnd != NULL)
{
@@ -1633,10 +1669,17 @@ DispatchMessageW(CONST MSG *lpmsg)
if ( lpmsg->message == WM_SYSTIMER )
return NtUserDispatchMessage( (PMSG) lpmsg );
Ret = WndProc(lpmsg->hwnd,
lpmsg->message,
lpmsg->wParam,
GetTickCount());
_SEH2_TRY
{
Ret = WndProc(lpmsg->hwnd,
lpmsg->message,
lpmsg->wParam,
GetTickCount());
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
}
_SEH2_END;
}
else if (Wnd != NULL)
{