Skip to content

Commit 9274859

Browse files
ThFabbaJoachimHenze
authored andcommitted
[0.4.8] Mask WndProc exceptions to hide all tickets linked to CORE-11915
(cherry picked from commit 04d7a3c) by Joachim Henze
1 parent 429767a commit 9274859

File tree

1 file changed

+4
-24
lines changed

1 file changed

+4
-24
lines changed

win32ss/user/user32/windows/message.c

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1462,20 +1462,15 @@ IntCallWindowProcW(BOOL IsAnsiProc,
14621462

14631463
if (PreResult) goto Exit;
14641464

1465-
if (!Dialog)
1466-
Result = CALL_EXTERN_WNDPROC(WndProc, AnsiMsg.hwnd, AnsiMsg.message, AnsiMsg.wParam, AnsiMsg.lParam);
1467-
else
1468-
{
14691465
_SEH2_TRY
14701466
{
14711467
Result = CALL_EXTERN_WNDPROC(WndProc, AnsiMsg.hwnd, AnsiMsg.message, AnsiMsg.wParam, AnsiMsg.lParam);
14721468
}
14731469
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
14741470
{
1475-
ERR("Exception Dialog Ansi %p Msg %d pti %p Wndpti %p\n",WndProc,Msg,GetW32ThreadInfo(),pWnd->head.pti);
1471+
ERR("Exception when calling Ansi WndProc %p Msg %d pti %p Wndpti %p\n",WndProc,Msg,GetW32ThreadInfo(),pWnd->head.pti);
14761472
}
14771473
_SEH2_END;
1478-
}
14791474

14801475
if (Hook && (MsgOverride || DlgOverride))
14811476
{
@@ -1518,20 +1513,15 @@ IntCallWindowProcW(BOOL IsAnsiProc,
15181513

15191514
if (PreResult) goto Exit;
15201515

1521-
if (!Dialog)
1522-
Result = CALL_EXTERN_WNDPROC(WndProc, hWnd, Msg, wParam, lParam);
1523-
else
1524-
{
15251516
_SEH2_TRY
15261517
{
15271518
Result = CALL_EXTERN_WNDPROC(WndProc, hWnd, Msg, wParam, lParam);
15281519
}
15291520
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
15301521
{
1531-
ERR("Exception Dialog unicode %p Msg %d pti %p Wndpti %p\n",WndProc, Msg,GetW32ThreadInfo(),pWnd->head.pti);
1522+
ERR("Exception when calling unicode WndProc %p Msg %d pti %p Wndpti %p\n",WndProc, Msg,GetW32ThreadInfo(),pWnd->head.pti);
15321523
}
15331524
_SEH2_END;
1534-
}
15351525

15361526
if (Hook && (MsgOverride || DlgOverride))
15371527
{
@@ -1612,20 +1602,15 @@ IntCallWindowProcA(BOOL IsAnsiProc,
16121602

16131603
if (PreResult) goto Exit;
16141604

1615-
if (!Dialog)
1616-
Result = CALL_EXTERN_WNDPROC(WndProc, hWnd, Msg, wParam, lParam);
1617-
else
1618-
{
16191605
_SEH2_TRY
16201606
{
16211607
Result = CALL_EXTERN_WNDPROC(WndProc, hWnd, Msg, wParam, lParam);
16221608
}
16231609
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
16241610
{
1625-
ERR("Exception Dialog Ansi %p Msg %d pti %p Wndpti %p\n",WndProc,Msg,GetW32ThreadInfo(),pWnd->head.pti);
1611+
ERR("Exception when calling Ansi WndProc %p Msg %d pti %p Wndpti %p\n",WndProc,Msg,GetW32ThreadInfo(),pWnd->head.pti);
16261612
}
16271613
_SEH2_END;
1628-
}
16291614

16301615
if (Hook && (MsgOverride || DlgOverride))
16311616
{
@@ -1675,20 +1660,15 @@ IntCallWindowProcA(BOOL IsAnsiProc,
16751660

16761661
if (PreResult) goto Exit;
16771662

1678-
if (!Dialog)
1679-
Result = CALL_EXTERN_WNDPROC(WndProc, UnicodeMsg.hwnd, UnicodeMsg.message, UnicodeMsg.wParam, UnicodeMsg.lParam);
1680-
else
1681-
{
16821663
_SEH2_TRY
16831664
{
16841665
Result = CALL_EXTERN_WNDPROC(WndProc, UnicodeMsg.hwnd, UnicodeMsg.message, UnicodeMsg.wParam, UnicodeMsg.lParam);
16851666
}
16861667
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
16871668
{
1688-
ERR("Exception Dialog unicode %p Msg %d pti %p Wndpti %p\n",WndProc, Msg,GetW32ThreadInfo(),pWnd->head.pti);
1669+
ERR("Exception when calling unicode WndProc %p Msg %d pti %p Wndpti %p\n",WndProc, Msg,GetW32ThreadInfo(),pWnd->head.pti);
16891670
}
16901671
_SEH2_END;
1691-
}
16921672

16931673
if (Hook && (MsgOverride || DlgOverride))
16941674
{

0 commit comments

Comments
 (0)