[ros-diffs] [tkreuzer] 60829: [WIN32K] - Don't ASSERT the correct ConsoleCtrlInfoLength in NtUserConsoleControl - Move GreSetObjectOwnerEx out of the SEH block.

Author: tkreuzer
Date: Sat Nov  2 12:41:38 2013
New Revision: 60829

URL: http://svn.reactos.org/svn/reactos?rev=60829&view=rev
Log:
[WIN32K]
- Don't ASSERT the correct ConsoleCtrlInfoLength in NtUserConsoleControl
- Move GreSetObjectOwnerEx out of the SEH block.

Modified:
    trunk/reactos/win32ss/user/ntuser/ntstubs.c

Modified: trunk/reactos/win32ss/user/ntuser/ntstubs.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntstubs...
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/ntstubs.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/ntstubs.c	[iso-8859-1] Sat Nov  2 12:41:38 2013
@@ -560,9 +560,14 @@
     {
         case GuiConsoleWndClassAtom:
         {
+            if (ConsoleCtrlInfoLength != sizeof(ATOM))
+            {
+                Status = STATUS_INFO_LENGTH_MISMATCH;
+                break;
+            }
+
             _SEH2_TRY
             {
-                ASSERT(ConsoleCtrlInfoLength == sizeof(ATOM));
                 ProbeForRead(ConsoleCtrlInfo, ConsoleCtrlInfoLength, 1);
                 gaGuiConsoleWndClass = *(ATOM*)ConsoleCtrlInfo;
             }
@@ -577,23 +582,29 @@

case ConsoleMakePalettePublic:
         {
+            HPALETTE hPalette;
+
+            if (ConsoleCtrlInfoLength != sizeof(HPALETTE))
+            {
+                Status = STATUS_INFO_LENGTH_MISMATCH;
+                break;
+            }
+
             _SEH2_TRY
             {
-                ASSERT(ConsoleCtrlInfoLength == sizeof(HPALETTE));
                 ProbeForRead(ConsoleCtrlInfo, ConsoleCtrlInfoLength, 1);
-                /*
-                 * Make the palette handle public - Use the extended
-                 * function introduced by Timo in revision 60725.
-                 */
-                GreSetObjectOwnerEx(*(HPALETTE*)ConsoleCtrlInfo,
-                                    GDI_OBJ_HMGR_PUBLIC,
-                                    GDIOBJFLAG_IGNOREPID);
+                hPalette = *(HPALETTE*)ConsoleCtrlInfo;
             }
             _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
             {
                 Status = _SEH2_GetExceptionCode();
             }
             _SEH2_END;
+
+            /* Make the palette handle public */
+            GreSetObjectOwnerEx(hPalette,
+                                GDI_OBJ_HMGR_PUBLIC,
+                                GDIOBJFLAG_IGNOREPID);

break;
         }