Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-24 13:43:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

[user32]

Browse source 
- change error messages in CallWindowProc to make it apparent that we caught an exception with SEH as requested by Caemyr

svn path=/trunk/; revision=57084
This commit is contained in:
Giannis Adamopoulos 2012-08-16 07:54:40 +00:00
parent 1158d2cfed
commit f648a1683f
1 changed files with 6 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

36
reactos/win32ss/user/user32/windows/message.c
View file

@ -1262,7 +1262,7 @@ IntCallWindowProcW(BOOL IsAnsiProc,
ULONG_PTR LowLimit; ULONG_PTR LowLimit;
BOOL Hook = FALSE, MsgOverride = FALSE, Dialog; BOOL Hook = FALSE, MsgOverride = FALSE, Dialog;
LRESULT Result = 0, PreResult = 0; LRESULT Result = 0, PreResult = 0;
DWORD Hit = 0, Data = 0; DWORD Data = 0;
if (WndProc == NULL) if (WndProc == NULL)
{ {
@ -1326,7 +1326,7 @@ IntCallWindowProcW(BOOL IsAnsiProc,
} }
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{ {
Hit = 1; ERR("Got exception when calling Ansi WndProc %p Msg %d \n",WndProc,Msg);
} }
_SEH2_END; _SEH2_END;
@ -1375,7 +1375,7 @@ IntCallWindowProcW(BOOL IsAnsiProc,
} }
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{ {
Hit = 2; ERR("Got exception when calling unicode WndProc %p Msg %d \n",WndProc, Msg);
} }
_SEH2_END; _SEH2_END;
@ -1397,18 +1397,6 @@ IntCallWindowProcW(BOOL IsAnsiProc,
Exit: Exit:
if (Hook) EndUserApiHook(); if (Hook) EndUserApiHook();
if (Hit)
{
switch(Hit)
{
case 1:
ERR("CallWindowProcW Ansi Failed! Msg %d WndProc %p\n",Msg,WndProc);
break;
case 2:
ERR("CallWindowProcW Unicode Failed! Msg %d WndProc %p\n",Msg,WndProc);
break;
}
}
return Result; return Result;
} }
@ -1426,7 +1414,7 @@ IntCallWindowProcA(BOOL IsAnsiProc,
ULONG_PTR LowLimit; ULONG_PTR LowLimit;
BOOL Hook = FALSE, MsgOverride = FALSE, Dialog; BOOL Hook = FALSE, MsgOverride = FALSE, Dialog;
LRESULT Result = 0, PreResult = 0; LRESULT Result = 0, PreResult = 0;
DWORD Hit = 0, Data = 0; DWORD Data = 0;
if (WndProc == NULL) if (WndProc == NULL)
{ {
@ -1480,7 +1468,7 @@ IntCallWindowProcA(BOOL IsAnsiProc,
} }
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{ {
Hit = 1; ERR("Got exception when calling Ansi WndProc %p Msg %d \n",WndProc,Msg);
} }
_SEH2_END; _SEH2_END;
@ -1534,7 +1522,7 @@ IntCallWindowProcA(BOOL IsAnsiProc,
} }
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{ {
Hit = 2; ERR("Got exception when calling unicode WndProc %p Msg %d \n",WndProc, Msg);
} }
_SEH2_END; _SEH2_END;
@ -1561,18 +1549,6 @@ IntCallWindowProcA(BOOL IsAnsiProc,
Exit: Exit:
if (Hook) EndUserApiHook(); if (Hook) EndUserApiHook();
if (Hit)
{
switch(Hit)
{
case 1:
ERR("CallWindowProcA Ansi Failed! Msg %d WndProc %p\n",Msg,WndProc);
break;
case 2:
ERR("CallWindowProcA Unicode Failed! Msg %d WndProc %p\n",Msg,WndProc);
break;
}
}
return Result; return Result;
} }