[ros-diffs] [fireball] 42431: - Fix a typo (missing braces), spotted in bug 4764. - Wrap returns from SEH into _SEH2_YIELD. Probably exceptions need to just be fully converted to ReactOS PSEH2 syntax.

fireball at svn.reactos.org fireball at svn.reactos.org
Thu Aug 6 18:37:13 CEST 2009


Author: fireball
Date: Thu Aug  6 18:37:12 2009
New Revision: 42431

URL: http://svn.reactos.org/svn/reactos?rev=42431&view=rev
Log:
- Fix a typo (missing braces), spotted in bug 4764.
- Wrap returns from SEH into _SEH2_YIELD. Probably exceptions need to just be fully converted to ReactOS PSEH2 syntax.

Modified:
    branches/arwinss/reactos/dll/win32/user32/defwnd.c
    branches/arwinss/reactos/dll/win32/user32/listbox.c
    branches/arwinss/reactos/dll/win32/user32/lstr.c

Modified: branches/arwinss/reactos/dll/win32/user32/defwnd.c
URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user32/defwnd.c?rev=42431&r1=42430&r2=42431&view=diff
==============================================================================
--- branches/arwinss/reactos/dll/win32/user32/defwnd.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/user32/defwnd.c [iso-8859-1] Thu Aug  6 18:37:12 2009
@@ -791,7 +791,7 @@
     }
     __EXCEPT_PAGE_FAULT
     {
-        return 0;
+        _SEH2_YIELD(return 0;)
     }
     __ENDTRY
     return result;
@@ -930,7 +930,7 @@
     }
     __EXCEPT_PAGE_FAULT
     {
-        return 0;
+        _SEH2_YIELD(return 0;)
     }
     __ENDTRY
 

Modified: branches/arwinss/reactos/dll/win32/user32/listbox.c
URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user32/listbox.c?rev=42431&r1=42430&r2=42431&view=diff
==============================================================================
--- branches/arwinss/reactos/dll/win32/user32/listbox.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/user32/listbox.c [iso-8859-1] Thu Aug  6 18:37:12 2009
@@ -837,7 +837,7 @@
         {
             WARN( "got an invalid buffer (Delphi bug?)\n" );
             SetLastError( ERROR_INVALID_PARAMETER );
-            return LB_ERR;
+            _SEH2_YIELD(return LB_ERR;)
         }
         __ENDTRY
     } else {
@@ -1027,7 +1027,7 @@
     return count;
 }
 
-
+#if 0
 /***********************************************************************
  *           LISTBOX_GetSelItems16
  */
@@ -1041,7 +1041,7 @@
         if (item->selected) array[count++] = (INT16)i;
     return count;
 }
-
+#endif
 
 /***********************************************************************
  *           LISTBOX_GetSelItems

Modified: branches/arwinss/reactos/dll/win32/user32/lstr.c
URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user32/lstr.c?rev=42431&r1=42430&r2=42431&view=diff
==============================================================================
--- branches/arwinss/reactos/dll/win32/user32/lstr.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/user32/lstr.c [iso-8859-1] Thu Aug  6 18:37:12 2009
@@ -244,7 +244,7 @@
     __EXCEPT_PAGE_FAULT
     {
         SetLastError( ERROR_INVALID_PARAMETER );
-        return NULL;
+        _SEH2_YIELD(return NULL;)
     }
     __ENDTRY
     return str;
@@ -270,7 +270,7 @@
     __EXCEPT_PAGE_FAULT
     {
         SetLastError( ERROR_INVALID_PARAMETER );
-        return NULL;
+        _SEH2_YIELD(return NULL;)
     }
     __ENDTRY
     return str;
@@ -455,5 +455,5 @@
 BOOL WINAPI IsCharAlphaW(WCHAR x)
 {
     //return (get_char_typeW(x) & C1_ALPHA) != 0;
-    return iswalpha;
-}
+    return iswalpha(x);
+}




More information about the Ros-diffs mailing list