From 34639a5b858de61226f1f63fac6b9858cfc32498 Mon Sep 17 00:00:00 2001
From: Hartmut Birr <osexpert@googlemail.com>
Date: Wed, 23 Nov 2005 21:59:34 +0000
Subject: [PATCH] Don't return from inside an exception handler.

svn path=/trunk/; revision=19504
---
 reactos/subsys/win32k/ntuser/message.c | 42 ++++++++++++++------------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/reactos/subsys/win32k/ntuser/message.c b/reactos/subsys/win32k/ntuser/message.c
index 7e904087bdd..8be6d2be46b 100644
--- a/reactos/subsys/win32k/ntuser/message.c
+++ b/reactos/subsys/win32k/ntuser/message.c
@@ -113,24 +113,25 @@ MsgMemorySize(PMSGMEMORY MsgMemoryEntry, WPARAM wParam, LPARAM lParam)
    CREATESTRUCTW *Cs;
    PUNICODE_STRING WindowName;
    PUNICODE_STRING ClassName;
-   UINT Size;
+   UINT Size = 0;
 
-   _SEH_TRY {
-      if (MMS_SIZE_WPARAM == MsgMemoryEntry->Size)
+   _SEH_TRY 
    {
-      return (UINT) wParam;
+      if (MMS_SIZE_WPARAM == MsgMemoryEntry->Size)
+      {
+         Size = (UINT)wParam;
       }
       else if (MMS_SIZE_WPARAMWCHAR == MsgMemoryEntry->Size)
-   {
-      return (UINT) (wParam * sizeof(WCHAR));
+      {
+         Size = (UINT) (wParam * sizeof(WCHAR));
       }
       else if (MMS_SIZE_LPARAMSZ == MsgMemoryEntry->Size)
-   {
-      return (UINT) ((wcslen((PWSTR) lParam) + 1) * sizeof(WCHAR));
+      {
+         Size = (UINT) ((wcslen((PWSTR) lParam) + 1) * sizeof(WCHAR));
       }
       else if (MMS_SIZE_SPECIAL == MsgMemoryEntry->Size)
-   {
-      switch(MsgMemoryEntry->Message)
+      {
+         switch(MsgMemoryEntry->Message)
          {
             case WM_CREATE:
             case WM_NCCREATE:
@@ -146,31 +147,34 @@ MsgMemorySize(PMSGMEMORY MsgMemoryEntry, WPARAM wParam, LPARAM lParam)
                {
                   Size += sizeof(WCHAR) + ClassName->Length + sizeof(WCHAR);
                }
-               return Size;
                break;
 
             case WM_NCCALCSIZE:
-               return wParam ? sizeof(NCCALCSIZE_PARAMS) + sizeof(WINDOWPOS) : sizeof(RECT);
+               Size = wParam ? sizeof(NCCALCSIZE_PARAMS) + sizeof(WINDOWPOS) : sizeof(RECT);
                break;
 
             case WM_COPYDATA:
-               return sizeof(COPYDATASTRUCT) + ((PCOPYDATASTRUCT)lParam)->cbData;
+               Size = sizeof(COPYDATASTRUCT) + ((PCOPYDATASTRUCT)lParam)->cbData;
+               break;
 
             default:
                assert(FALSE);
-               return 0;
+               Size = 0;
                break;
          }
       }
       else
       {
-         return MsgMemoryEntry->Size;
+         Size = MsgMemoryEntry->Size;
       }
-   } _SEH_HANDLE {
-
+   } 
+   _SEH_HANDLE 
+   {
       DPRINT1("Exception caught in MsgMemorySize()! Status: 0x%x\n", _SEH_GetExceptionCode());
-   } _SEH_END;
-   return 0;
+      Size = 0;
+   } 
+   _SEH_END;
+   return Size;
 }
 
 static FASTCALL NTSTATUS