[ros-diffs] [gadamopoulos] 57084: [user32] - change error messages in CallWindowProc to make it apparent that we caught an exception with SEH as requested by Caemyr

Author: gadamopoulos
Date: Thu Aug 16 07:54:40 2012
New Revision: 57084

URL: http://svn.reactos.org/svn/reactos?rev=57084&view=rev
Log:
[user32]
- change error messages in CallWindowProc to make it apparent that we caught an exception with SEH as requested by Caemyr

Modified:
    trunk/reactos/win32ss/user/user32/windows/message.c

Modified: trunk/reactos/win32ss/user/user32/windows/message.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/windows...
==============================================================================
--- trunk/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] Thu Aug 16 07:54:40 2012
@@ -1262,7 +1262,7 @@
   ULONG_PTR LowLimit;
   BOOL Hook = FALSE, MsgOverride = FALSE, Dialog;
   LRESULT Result = 0, PreResult = 0;
-  DWORD Hit = 0, Data = 0;
+  DWORD Data = 0;

if (WndProc == NULL)
   {
@@ -1326,7 +1326,7 @@
       }
       _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
       {
-         Hit = 1;
+         ERR("Got exception when calling Ansi WndProc %p Msg %d \n",WndProc,Msg);
       }
       _SEH2_END;

@@ -1375,7 +1375,7 @@
       }
       _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
       {
-         Hit = 2;
+         ERR("Got exception when calling unicode WndProc %p Msg %d \n",WndProc, Msg);
       }
       _SEH2_END;

@@ -1397,18 +1397,6 @@

Exit:
   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;
 }

@@ -1426,7 +1414,7 @@
   ULONG_PTR LowLimit;
   BOOL Hook = FALSE, MsgOverride = FALSE, Dialog;
   LRESULT Result = 0, PreResult = 0;
-  DWORD Hit = 0, Data = 0;
+  DWORD Data = 0;

if (WndProc == NULL)
   {
@@ -1480,7 +1468,7 @@
       }
       _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
       {
-         Hit = 1;
+         ERR("Got exception when calling Ansi WndProc %p Msg %d \n",WndProc,Msg);
       }
       _SEH2_END;

@@ -1534,7 +1522,7 @@
       }
       _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
       {
-         Hit = 2;
+         ERR("Got exception when calling unicode WndProc %p Msg %d \n",WndProc, Msg);
       }
       _SEH2_END;

@@ -1561,18 +1549,6 @@

Exit:
   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;
 }