[ros-diffs] [tkreuzer] 60738: [REACTOS] Fix the mess I left... (remove unwanted changes and commit missing change)

Author: tkreuzer
Date: Wed Oct 23 19:38:49 2013
New Revision: 60738

URL: http://svn.reactos.org/svn/reactos?rev=60738&view=rev
Log:
[REACTOS]
Fix the mess I left... (remove unwanted changes and commit missing change)

Modified:
    trunk/reactos/lib/rtl/acl.c
    trunk/reactos/ntoskrnl/ex/sysinfo.c
    trunk/reactos/ntoskrnl/ntoskrnl.spec

Modified: trunk/reactos/lib/rtl/acl.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/acl.c?rev=60738&am…
==============================================================================
--- trunk/reactos/lib/rtl/acl.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/rtl/acl.c	[iso-8859-1] Wed Oct 23 19:38:49 2013
@@ -847,21 +847,21 @@
             (Acl->AclRevision > MAX_ACL_REVISION))
         {
             DPRINT1("Invalid ACL revision\n");
-            return FALSE;
+            _SEH2_YIELD(return FALSE);
         }
 
         /* Next, validate that the ACL is USHORT-aligned */
         if (ROUND_DOWN(Acl->AclSize, sizeof(USHORT)) != Acl->AclSize)
         {
             DPRINT1("Invalid ACL size\n");
-            return FALSE;
+            _SEH2_YIELD(return FALSE);
         }
 
         /* And that it's big enough */
         if (Acl->AclSize < sizeof(ACL))
         {
             DPRINT1("Invalid ACL size\n");
-            return FALSE;
+            _SEH2_YIELD(return FALSE);
         }
 
         /* Loop each ACE */
@@ -872,21 +872,21 @@
             if (((ULONG_PTR)Ace + sizeof(ACE_HEADER)) >= ((ULONG_PTR)Acl +
Acl->AclSize))
             {
                 DPRINT1("Invalid ACE size\n");
-                return FALSE;
+                _SEH2_YIELD(return FALSE);
             }
 
             /* Validate the length of this ACE */
             if (ROUND_DOWN(Ace->AceSize, sizeof(USHORT)) != Ace->AceSize)
             {
                 DPRINT1("Invalid ACE size: %lx\n", Ace->AceSize);
-                return FALSE;
+                _SEH2_YIELD(return FALSE);
             }
 
             /* Validate we have space for the entire ACE */
             if (((ULONG_PTR)Ace + Ace->AceSize) > ((ULONG_PTR)Acl +
Acl->AclSize))
             {
                 DPRINT1("Invalid ACE size %lx %lx\n", Ace->AceSize,
Acl->AclSize);
-                return FALSE;
+                _SEH2_YIELD(return FALSE);
             }
 
             /* Check what kind of ACE this is */
@@ -896,14 +896,14 @@
                 if (ROUND_DOWN(Ace->AceSize, sizeof(ULONG)) != Ace->AceSize)
                 {
                     DPRINT1("Invalid ACE size\n");
-                    return FALSE;
+                    _SEH2_YIELD(return FALSE);
                 }
 
                 /* The ACE size should at least have enough for the header */
                 if (Ace->AceSize < sizeof(ACE_HEADER))
                 {
                     DPRINT1("Invalid ACE size: %lx %lx\n", Ace->AceSize,
sizeof(ACE_HEADER));
-                    return FALSE;
+                    _SEH2_YIELD(return FALSE);
                 }
 
                 /* Check if the SID revision is valid */
@@ -911,21 +911,21 @@
                 if (Sid->Revision != SID_REVISION)
                 {
                     DPRINT1("Invalid SID\n");
-                    return FALSE;
+                    _SEH2_YIELD(return FALSE);
                 }
 
                 /* Check if the SID is out of bounds */
                 if (Sid->SubAuthorityCount > SID_MAX_SUB_AUTHORITIES)
                 {
                     DPRINT1("Invalid SID\n");
-                    return FALSE;
+                    _SEH2_YIELD(return FALSE);
                 }
 
                 /* The ACE size should at least have enough for the header and SID */
                 if (Ace->AceSize < (sizeof(ACE_HEADER) + RtlLengthSid(Sid)))
                 {
                     DPRINT1("Invalid ACE size\n");
-                    return FALSE;
+                    _SEH2_YIELD(return FALSE);
                 }
             }
             else if (Ace->AceType == ACCESS_ALLOWED_COMPOUND_ACE_TYPE)
@@ -943,7 +943,7 @@
                 if (Ace->AceSize < sizeof(ACE_HEADER))
                 {
                     DPRINT1("Unknown ACE\n");
-                    return FALSE;
+                    _SEH2_YIELD(return FALSE);
                 }
             }
 
@@ -954,7 +954,7 @@
     _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
     {
         /* Something was invalid, fail */
-        return FALSE;
+        _SEH2_YIELD(return FALSE);
     }
     _SEH2_END;
 

Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=…
==============================================================================
--- trunk/reactos/ntoskrnl/ex/sysinfo.c	[iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ex/sysinfo.c	[iso-8859-1] Wed Oct 23 19:38:49 2013
@@ -1681,7 +1681,7 @@
     /* Call it */
     Status = (DriverInit)(&Win32k, NULL);
     ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL);
-__debugbreak();__debugbreak();
+
     /* Unload if we failed */
     if (!NT_SUCCESS(Status)) MmUnloadSystemImage(ModuleObject);
     return Status;

Modified: trunk/reactos/ntoskrnl/ntoskrnl.spec
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.spec?rev…
==============================================================================
--- trunk/reactos/ntoskrnl/ntoskrnl.spec	[iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ntoskrnl.spec	[iso-8859-1] Wed Oct 23 19:38:49 2013
@@ -969,7 +969,7 @@
 @ stdcall PsGetCurrentThreadStackLimit()
 @ stdcall PsGetCurrentThreadTeb()
 @ stdcall PsGetCurrentThreadWin32Thread()
-@ stdcall PsGetCurrentThreadWin32ThreadAndEnterCriticalRegion()
+@ stdcall PsGetCurrentThreadWin32ThreadAndEnterCriticalRegion(ptr)
 @ stdcall PsGetJobLock(ptr)
 @ stdcall PsGetJobSessionId(ptr)
 @ stdcall PsGetJobUIRestrictionsClass(ptr)