[ros-dev] [ros-diffs] [tkreuzer] 58434: [WIN32K] - Fix a bug in EngLoadModuleEx - Fix a bug in co_IntLoadSysMenuTemplate - Fix / improve a number of annotations - Improve code in NtGdiExtGetObjectW - Check return value ...

[Hermès BÉLUSCA - MAÏTO]

Hi Timo !!

----------------------------------------------------------------------------
----------------------------------------------------------------------------
-----------------------------

New Revision: 58434
URL: http://svn.reactos.org/svn/reactos?rev=58434&view=rev

Modified: trunk/reactos/win32ss/gdi/ntgdi/text.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/text.c?re
v=58434&r1=58433&r2=58434&view=diff
============================================================================
==
--- trunk/reactos/win32ss/gdi/ntgdi/text.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/ntgdi/text.c [iso-8859-1] Tue Mar  5 08:47:51
2013

@@ -540,15 +538,11 @@
             }
             _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
             {
-                Status = _SEH2_GetExceptionCode();
+                SetLastNtError(_SEH2_GetExceptionCode());
+                return FALSE;
             }
             _SEH2_END
 
-            if (!NT_SUCCESS(Status))
-            {
-                SetLastNtError(Status);
-                return FALSE;
-            }
             return TRUE;
         }
     }

----------------------------------------------------------------------------
----------------------------------------------------------------------------
-----------------------------

Are you sure you want to return "directly" from the _SEH2_EXCEPT block,
instead of doing :

             _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
             {
-                Status = _SEH2_GetExceptionCode();
+                SetLastNtError(_SEH2_GetExceptionCode());
+               _SEH2_YIELD(return FALSE);
             }

Instead ??

Hermès