https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bd193c45347b8f2fa602ce...
commit bd193c45347b8f2fa602ce2802c09b9e91db16a5 Author: Giannis Adamopoulos gadamopoulos@reactos.org AuthorDate: Mon Jan 15 12:36:45 2018 +0200 Commit: Giannis Adamopoulos gadamopoulos@reactos.org CommitDate: Mon Jan 15 12:36:45 2018 +0200
[USER32] Stop hiding exceptions left and right --- win32ss/user/user32/controls/listbox.c | 2 +- win32ss/user/user32/controls/scrollbar.c | 3 +++ win32ss/user/user32/misc/desktop.c | 3 +++ win32ss/user/user32/misc/usrapihk.c | 1 + win32ss/user/user32/windows/class.c | 1 + win32ss/user/user32/windows/defwnd.c | 2 ++ win32ss/user/user32/windows/draw.c | 1 + win32ss/user/user32/windows/message.c | 15 +++++++++------ 8 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/win32ss/user/user32/controls/listbox.c b/win32ss/user/user32/controls/listbox.c index d149688d71..4e1b48a3a7 100644 --- a/win32ss/user/user32/controls/listbox.c +++ b/win32ss/user/user32/controls/listbox.c @@ -806,7 +806,7 @@ static LRESULT LISTBOX_GetText( LB_DESCR *descr, INT index, LPWSTR buffer, BOOL } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - WARN( "got an invalid buffer (Delphi bug?)\n" ); + ERR( "got an invalid buffer (Delphi bug?)\n" ); SetLastError( ERROR_INVALID_PARAMETER ); len = LB_ERR; } diff --git a/win32ss/user/user32/controls/scrollbar.c b/win32ss/user/user32/controls/scrollbar.c index dac106bb70..0a4913353c 100644 --- a/win32ss/user/user32/controls/scrollbar.c +++ b/win32ss/user/user32/controls/scrollbar.c @@ -1459,6 +1459,7 @@ EnableScrollBar( HWND hwnd, UINT nBar, UINT flags ) } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + ERR("Got exception in hooked EnableScrollBar!\n"); } _SEH2_END;
@@ -1533,6 +1534,7 @@ GetScrollInfo(HWND Wnd, INT SBType, LPSCROLLINFO Info) } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + ERR("Got exception in hooked GetScrollInfo!\n"); } _SEH2_END;
@@ -1656,6 +1658,7 @@ SetScrollInfo(HWND Wnd, int SBType, LPCSCROLLINFO Info, BOOL bRedraw) } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + ERR("Got exception in hooked SetScrollInfo!\n"); } _SEH2_END;
diff --git a/win32ss/user/user32/misc/desktop.c b/win32ss/user/user32/misc/desktop.c index 2f78f7b189..edf17e8199 100644 --- a/win32ss/user/user32/misc/desktop.c +++ b/win32ss/user/user32/misc/desktop.c @@ -159,6 +159,7 @@ GetSystemMetrics(int nIndex) } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + ERR("Got exception in hooked GetSystemMetrics!\n"); } _SEH2_END;
@@ -381,6 +382,7 @@ SystemParametersInfoA(UINT uiAction, } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + ERR("Got exception in hooked SystemParametersInfoA!\n"); } _SEH2_END;
@@ -413,6 +415,7 @@ SystemParametersInfoW(UINT uiAction, } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + ERR("Got exception in hooked SystemParametersInfoW!\n"); } _SEH2_END;
diff --git a/win32ss/user/user32/misc/usrapihk.c b/win32ss/user/user32/misc/usrapihk.c index 7e856d4324..8b5d264ee8 100644 --- a/win32ss/user/user32/misc/usrapihk.c +++ b/win32ss/user/user32/misc/usrapihk.c @@ -332,6 +332,7 @@ MDIRedrawFrame(HWND hWnd, DWORD flags) } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + ERR("Got exception in hooked MDIRedrawFrame!\n"); } _SEH2_END;
diff --git a/win32ss/user/user32/windows/class.c b/win32ss/user/user32/windows/class.c index f12788fd22..cf9d88dbbb 100644 --- a/win32ss/user/user32/windows/class.c +++ b/win32ss/user/user32/windows/class.c @@ -234,6 +234,7 @@ VersionRegisterClass( } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + ERR("Got exception while trying to call RegisterClassNameW!\n"); } _SEH2_END
diff --git a/win32ss/user/user32/windows/defwnd.c b/win32ss/user/user32/windows/defwnd.c index 7098c34446..ac9fd93526 100644 --- a/win32ss/user/user32/windows/defwnd.c +++ b/win32ss/user/user32/windows/defwnd.c @@ -1216,6 +1216,7 @@ DefWindowProcA(HWND hWnd, } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + ERR("Got exception in hooked DefWindowProcA!\n"); } _SEH2_END;
@@ -1255,6 +1256,7 @@ DefWindowProcW(HWND hWnd, } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + ERR("Got exception in hooked DefWindowProcW!\n"); } _SEH2_END;
diff --git a/win32ss/user/user32/windows/draw.c b/win32ss/user/user32/windows/draw.c index dd1d6dd752..40e65db6e7 100644 --- a/win32ss/user/user32/windows/draw.c +++ b/win32ss/user/user32/windows/draw.c @@ -1454,6 +1454,7 @@ DrawFrameControl(HDC hDC, LPRECT rc, UINT uType, UINT uState) } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + ERR("Got exception in hooked DrawFrameControl!\n"); } _SEH2_END;
diff --git a/win32ss/user/user32/windows/message.c b/win32ss/user/user32/windows/message.c index 44345e7c54..d9b32d2626 100644 --- a/win32ss/user/user32/windows/message.c +++ b/win32ss/user/user32/windows/message.c @@ -1455,6 +1455,7 @@ IntCallWindowProcW(BOOL IsAnsiProc, } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + ERR("Got exception in hooked PreWndProc, dlg:%d!\n", DlgOverride); } _SEH2_END; } @@ -1487,6 +1488,7 @@ IntCallWindowProcW(BOOL IsAnsiProc, } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + ERR("Got exception in hooked PostWndProc, dlg:%d!\n", DlgOverride); } _SEH2_END; } @@ -1509,6 +1511,7 @@ IntCallWindowProcW(BOOL IsAnsiProc, } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + ERR("Got exception in hooked PreWndProc, dlg:%d!\n", DlgOverride); } _SEH2_END; } @@ -1541,6 +1544,7 @@ IntCallWindowProcW(BOOL IsAnsiProc, } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + ERR("Got exception in hooked PostWndProc, dlg:%d!\n", DlgOverride); } _SEH2_END; } @@ -1601,6 +1605,7 @@ IntCallWindowProcA(BOOL IsAnsiProc, } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + ERR("Got exception in hooked PreWndProc, dlg:%d!\n", DlgOverride); } _SEH2_END; } @@ -1633,6 +1638,7 @@ IntCallWindowProcA(BOOL IsAnsiProc, } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + ERR("Got exception in hooked PostWndProc, dlg:%d!\n", DlgOverride); } _SEH2_END; } @@ -1662,6 +1668,7 @@ IntCallWindowProcA(BOOL IsAnsiProc, } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + ERR("Got exception in hooked PreWndProc, dlg:%d!\n", DlgOverride); } _SEH2_END; } @@ -1694,6 +1701,7 @@ IntCallWindowProcA(BOOL IsAnsiProc, } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + ERR("Got exception in hooked PostWndProc, dlg:%d!\n", DlgOverride); } _SEH2_END; } @@ -1870,7 +1878,6 @@ DispatchMessageA(CONST MSG *lpmsg) LRESULT Ret = 0; MSG UnicodeMsg; PWND Wnd; - BOOL Hit = FALSE;
if ( lpmsg->message & ~WM_MAXIMUM ) { @@ -1914,7 +1921,7 @@ DispatchMessageA(CONST MSG *lpmsg) } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Hit = TRUE; + ERR("Exception in Timer Callback!\n"); } _SEH2_END; } @@ -1945,10 +1952,6 @@ DispatchMessageA(CONST MSG *lpmsg) } }
- if (Hit) - { - WARN("Exception in Timer Callback WndProcA!\n"); - } return Ret; }
-
Giannis Adamopoulos