Author: pschweitzer
Date: Wed Sep 2 20:18:42 2015
New Revision: 68918
URL: http://svn.reactos.org/svn/reactos?rev=68918&view=rev
Log:
[RTL]
Finally, use the correct implementation for RtlAssert().
In testbots, the behavior will be the following:
On prompt, sysreg will always issue a 'break once' instruction. In umode, where kdbg isn't instructed to handle breakpoint, this will lead to application being killed. With a lot of noise. This matches previous behavior.
In kmode, where kdbg handles breakpoints, sysreg2 will ask for a bt and will reboot the VM. As it was done previously.
The testbots already have the newest available sysreg2 revision.
This was made possible thanks to the help of Stefan and Thomas.
It was also made possible thanks to the commits:
- in trunk: r68899, r68905, r68917
- in project-tools: r2074, r2232
CORE-10088 #resolve #comment Fixed with r68918
Modified:
trunk/reactos/lib/rtl/assert.c
Modified: trunk/reactos/lib/rtl/assert.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/assert.c?rev=68918…
==============================================================================
--- trunk/reactos/lib/rtl/assert.c [iso-8859-1] (original)
+++ trunk/reactos/lib/rtl/assert.c [iso-8859-1] Wed Sep 2 20:18:42 2015
@@ -25,7 +25,6 @@
IN ULONG LineNumber,
IN PCHAR Message OPTIONAL)
{
-#if 0 // Disabled until sysreg can handle debug prompts
CHAR Action[2];
CONTEXT Context;
@@ -97,23 +96,4 @@
/* Shouldn't get here */
DbgBreakPoint();
ZwTerminateProcess(ZwCurrentProcess(), STATUS_UNSUCCESSFUL);
-#else
- if (NULL != Message)
- {
- DbgPrint("Assertion \'%s\' failed at %s line %u: %s\n",
- (PCHAR)FailedAssertion,
- (PCHAR)FileName,
- LineNumber,
- Message);
- }
- else
- {
- DbgPrint("Assertion \'%s\' failed at %s line %u\n",
- (PCHAR)FailedAssertion,
- (PCHAR)FileName,
- LineNumber);
- }
-
- DbgBreakPoint();
-#endif
}
Author: tfaber
Date: Wed Sep 2 09:19:52 2015
New Revision: 68911
URL: http://svn.reactos.org/svn/reactos?rev=68911&view=rev
Log:
[NTOS:SE]
- Correctly check ACE type in SeFastTraverseCheck. CID 1102005
Modified:
trunk/reactos/ntoskrnl/se/accesschk.c
Modified: trunk/reactos/ntoskrnl/se/accesschk.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/accesschk.c?re…
==============================================================================
--- trunk/reactos/ntoskrnl/se/accesschk.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/se/accesschk.c [iso-8859-1] Wed Sep 2 09:19:52 2015
@@ -493,7 +493,7 @@
continue;
/* If access-allowed ACE */
- if (Ace->Header.AceType & ACCESS_ALLOWED_ACE_TYPE)
+ if (Ace->Header.AceType == ACCESS_ALLOWED_ACE_TYPE)
{
/* Check if all accesses are granted */
if (!(Ace->Mask & DesiredAccess))
@@ -504,9 +504,9 @@
return TRUE;
}
/* If access-denied ACE */
- else if (Ace->Header.AceType & ACCESS_DENIED_ACE_TYPE)
- {
- /* Here, only check if it denies all the access wanted and deny if so */
+ else if (Ace->Header.AceType == ACCESS_DENIED_ACE_TYPE)
+ {
+ /* Here, only check if it denies any access wanted and deny if so */
if (Ace->Mask & DesiredAccess)
return FALSE;
}