Ros-diffs October 2006

ros-diffs@reactos.org

17 participants
357 discussions

[hpoussin] 24533: Correctly return FALSE in SeAccessCheck if access is not granted Don't always check the first ace in the DACL
by hpoussin＠svn.reactos.org 15 Oct '06

15 Oct '06

Author: hpoussin Date: Mon Oct 16 03:31:16 2006 New Revision: 24533 URL: http://svn.reactos.org/svn/reactos?rev=24533&view=rev Log: Correctly return FALSE in SeAccessCheck if access is not granted Don't always check the first ace in the DACL Modified: trunk/reactos/ntoskrnl/se/semgr.c Modified: trunk/reactos/ntoskrnl/se/semgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/semgr.c?rev=24… ============================================================================== --- trunk/reactos/ntoskrnl/se/semgr.c (original) +++ trunk/reactos/ntoskrnl/se/semgr.c Mon Oct 16 03:31:16 2006 @@ -997,7 +997,7 @@ *GrantedAccess = 0; *AccessStatus = STATUS_ACCESS_DENIED; - return TRUE; + return FALSE; } /* RULE 4: Grant rights according to the DACL */ @@ -1016,17 +1016,20 @@ *GrantedAccess = 0; *AccessStatus = STATUS_ACCESS_DENIED; - return TRUE; + return FALSE; } } - if (CurrentAce->Header.AceType == ACCESS_ALLOWED_ACE_TYPE) + else if (CurrentAce->Header.AceType == ACCESS_ALLOWED_ACE_TYPE) { if (SepSidInToken(Token, Sid)) { CurrentAccess |= CurrentAce->AccessMask; } } + else + DPRINT1("Unknown Ace type 0x%lx\n", CurrentAce->Header.AceType); + CurrentAce = (PACE)((ULONG_PTR)CurrentAce + CurrentAce->Header.AceSize); } if (SubjectContextLocked == FALSE) @@ -1039,10 +1042,18 @@ *GrantedAccess = CurrentAccess & DesiredAccess; - *AccessStatus = - (*GrantedAccess == DesiredAccess) ? STATUS_SUCCESS : STATUS_ACCESS_DENIED; - - return TRUE; + if (*GrantedAccess == DesiredAccess) + { + *AccessStatus = STATUS_SUCCESS; + return TRUE; + } + else + { + *AccessStatus = STATUS_ACCESS_DENIED; + DPRINT1("FIX caller rights (granted 0x%lx, desired 0x%lx)!\n", + *GrantedAccess, DesiredAccess); + return TRUE; /* FIXME: should be FALSE */ + } }

1 0

[hpoussin] 24532: Don't force a security descriptor to have an owner
by hpoussin＠svn.reactos.org 15 Oct '06

15 Oct '06

Author: hpoussin Date: Mon Oct 16 01:24:21 2006 New Revision: 24532 URL: http://svn.reactos.org/svn/reactos?rev=24532&view=rev Log: Don't force a security descriptor to have an owner Modified: trunk/reactos/ntoskrnl/se/semgr.c Modified: trunk/reactos/ntoskrnl/se/semgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/semgr.c?rev=24… ============================================================================== --- trunk/reactos/ntoskrnl/se/semgr.c (original) +++ trunk/reactos/ntoskrnl/se/semgr.c Mon Oct 16 01:24:21 2006 @@ -971,7 +971,7 @@ return FALSE; } - if (SepSidInToken(Token, Sid)) + if (Sid && SepSidInToken(Token, Sid)) { CurrentAccess |= (READ_CONTROL | WRITE_DAC); if (DesiredAccess == CurrentAccess)

1 0

[hpoussin] 24531: Include intrin.h only if compiler is GCC.
by hpoussin＠svn.reactos.org 15 Oct '06

15 Oct '06

Author: hpoussin Date: Mon Oct 16 00:09:04 2006 New Revision: 24531 URL: http://svn.reactos.org/svn/reactos?rev=24531&view=rev Log: Include intrin.h only if compiler is GCC. Modified: trunk/reactos/include/ddk/winddk.h Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=2… ============================================================================== --- trunk/reactos/include/ddk/winddk.h (original) +++ trunk/reactos/include/ddk/winddk.h Mon Oct 16 00:09:04 2006 @@ -31,7 +31,9 @@ extern "C" { #endif +#ifdef __GNUC__ #include "intrin.h" +#endif /* ** Definitions specific to this Device Driver Kit

1 0

[jimtabor] 24530: Fixed definition for NtUserLoadKeyboardLayoutEx.
by jimtabor＠svn.reactos.org 15 Oct '06

15 Oct '06

Author: jimtabor Date: Mon Oct 16 00:07:45 2006 New Revision: 24530 URL: http://svn.reactos.org/svn/reactos?rev=24530&view=rev Log: Fixed definition for NtUserLoadKeyboardLayoutEx. Modified: trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Mon Oct 16 00:07:45 2006 @@ -1216,15 +1216,15 @@ UINT_PTR uIDEvent ); -DWORD +HKL NTAPI NtUserLoadKeyboardLayoutEx( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4, - DWORD Unknown5); + HANDLE Handle, + DWORD offTable, + HKL hKL, + PUNICODE_STRING puszKLID, + UINT KLayoutLangID, + UINT Flags); BOOL NTAPI Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c Mon Oct 16 00:07:45 2006 @@ -1332,15 +1332,15 @@ } -DWORD +HKL STDCALL -NtUserLoadKeyboardLayoutEx( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4, - DWORD Unknown5) +NtUserLoadKeyboardLayoutEx( + IN HANDLE Handle, + IN DWORD offTable, + IN HKL hKL, + IN PUNICODE_STRING puszKLID, + IN UINT KLayoutLangID, + IN UINT Flags) { UNIMPLEMENTED

1 0

[weiden] 24529: Implement the advapi32 part of ImpersonateAnonymousToken
by weiden＠svn.reactos.org 15 Oct '06

15 Oct '06

Author: weiden Date: Sun Oct 15 23:58:57 2006 New Revision: 24529 URL: http://svn.reactos.org/svn/reactos?rev=24529&view=rev Log: Implement the advapi32 part of ImpersonateAnonymousToken Modified: trunk/reactos/dll/win32/advapi32/advapi32.def trunk/reactos/dll/win32/advapi32/sec/misc.c trunk/reactos/include/psdk/winbase.h Modified: trunk/reactos/dll/win32/advapi32/advapi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.def (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.def Sun Oct 15 23:58:57 2006 @@ -309,7 +309,7 @@ ;I_ScSetServiceBitsA@20 ;I_ScSetServiceBitsW@20 ;IdentifyCodeAuthzLevelW -;ImpersonateAnonymousToken +ImpersonateAnonymousToken@4 ImpersonateLoggedOnUser@4 ImpersonateNamedPipeClient@4 ImpersonateSelf@4 Modified: trunk/reactos/dll/win32/advapi32/sec/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/mis… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/misc.c (original) +++ trunk/reactos/dll/win32/advapi32/sec/misc.c Sun Oct 15 23:58:57 2006 @@ -437,6 +437,27 @@ return FALSE; } return TRUE; +} + + +/* + * @implemented + */ +BOOL +WINAPI +ImpersonateAnonymousToken(IN HANDLE ThreadHandle) +{ + NTSTATUS Status; + + Status = NtImpersonateAnonymousToken(ThreadHandle); + + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + return TRUE; } Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winbase.h (original) +++ trunk/reactos/include/psdk/winbase.h Sun Oct 15 23:58:57 2006 @@ -1663,6 +1663,7 @@ BOOL WINAPI HeapUnlock(HANDLE); BOOL WINAPI HeapValidate(HANDLE,DWORD,PCVOID); BOOL WINAPI HeapWalk(HANDLE,LPPROCESS_HEAP_ENTRY); +BOOL WINAPI ImpersonateAnonymousToken(HANDLE); BOOL WINAPI ImpersonateLoggedOnUser(HANDLE); BOOL WINAPI ImpersonateNamedPipeClient(HANDLE); BOOL WINAPI ImpersonateSelf(SECURITY_IMPERSONATION_LEVEL);

1 0

[weiden] 24528: Add a stub for NtCompareTokens
by weiden＠svn.reactos.org 15 Oct '06

15 Oct '06

Author: weiden Date: Sun Oct 15 23:12:41 2006 New Revision: 24528 URL: http://svn.reactos.org/svn/reactos?rev=24528&view=rev Log: Add a stub for NtCompareTokens Modified: trunk/reactos/dll/ntdll/def/ntdll.def trunk/reactos/include/ndk/sefuncs.h trunk/reactos/ntoskrnl/se/token.c trunk/reactos/tools/nci/sysfuncs.lst Modified: trunk/reactos/dll/ntdll/def/ntdll.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.def?re… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.def (original) +++ trunk/reactos/dll/ntdll/def/ntdll.def Sun Oct 15 23:12:41 2006 @@ -79,6 +79,7 @@ NtClearEvent@4 NtClose@4 NtCloseObjectAuditAlarm@12 +NtCompareTokens@12 NtCompleteConnectPort@4 NtConnectPort@32 NtContinue@8 @@ -747,6 +748,7 @@ ZwClearEvent@4 ZwClose@4 ZwCloseObjectAuditAlarm@12 +ZwCompareTokens@12 ZwCompleteConnectPort@4 ZwConnectPort@32 ZwContinue@8 Modified: trunk/reactos/include/ndk/sefuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/sefuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/sefuncs.h (original) +++ trunk/reactos/include/ndk/sefuncs.h Sun Oct 15 23:12:41 2006 @@ -155,6 +155,14 @@ PULONG Sequence, PUCHAR Seed ); + +NTSYSCALLAPI +NTSTATUS +NTAPI +NtCompareTokens( + IN HANDLE FirstTokenHandle, + IN HANDLE SecondTokenHandle, + OUT PBOOLEAN Equal); NTSYSCALLAPI NTSTATUS Modified: trunk/reactos/ntoskrnl/se/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/token.c?rev=24… ============================================================================== --- trunk/reactos/ntoskrnl/se/token.c (original) +++ trunk/reactos/ntoskrnl/se/token.c Sun Oct 15 23:12:41 2006 @@ -2406,7 +2406,7 @@ /* - * @unimplemented + * @implemented */ BOOLEAN STDCALL @@ -2414,12 +2414,12 @@ IN PACCESS_TOKEN Token ) { - UNIMPLEMENTED; - return FALSE; + PAGED_CODE(); + return (((PTOKEN)Token)->TokenFlags & TOKEN_HAS_ADMIN_GROUP) != 0; } /* - * @unimplemented + * @implemented */ BOOLEAN STDCALL @@ -2427,12 +2427,12 @@ IN PACCESS_TOKEN Token ) { - UNIMPLEMENTED; - return FALSE; + PAGED_CODE(); + return (((PTOKEN)Token)->TokenFlags & TOKEN_IS_RESTRICTED) != 0; } /* - * @unimplemented + * @implemented */ BOOLEAN STDCALL @@ -2440,8 +2440,8 @@ IN PACCESS_TOKEN Token ) { - UNIMPLEMENTED; - return FALSE; + PAGED_CODE(); + return (((PTOKEN)Token)->TokenFlags & TOKEN_HAS_RESTORE_PRIVILEGE) != 0; } @@ -2641,4 +2641,113 @@ TokenHandle); } +static NTSTATUS +SepCompareTokens(IN PTOKEN FirstToken, + IN PTOKEN SecondToken, + OUT PBOOLEAN Equal) +{ + BOOLEAN Restricted, IsEqual = FALSE; + + ASSERT(FirstToken != SecondToken); + + /* FIXME: Check if every SID that is present in either token is also present in the other one */ + + Restricted = SeTokenIsRestricted(FirstToken); + if (Restricted == SeTokenIsRestricted(SecondToken)) + { + if (Restricted) + { + /* FIXME: Check if every SID that is restricted in either token is also restricted in the other one */ + } + + /* FIXME: Check if every privilege that is present in either token is also present in the other one */ + } + + *Equal = IsEqual; + return STATUS_SUCCESS; +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +NtCompareTokens(IN HANDLE FirstTokenHandle, + IN HANDLE SecondTokenHandle, + OUT PBOOLEAN Equal) +{ + KPROCESSOR_MODE PreviousMode; + PTOKEN FirstToken, SecondToken; + BOOLEAN IsEqual; + NTSTATUS Status = STATUS_SUCCESS; + + PAGED_CODE(); + + PreviousMode = ExGetPreviousMode(); + + if (PreviousMode != KernelMode) + { + _SEH_TRY + { + ProbeForWriteBoolean(Equal); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) + return Status; + } + + Status = ObReferenceObjectByHandle(FirstTokenHandle, + TOKEN_QUERY, + SepTokenObjectType, + PreviousMode, + (PVOID*)&FirstToken, + NULL); + if (!NT_SUCCESS(Status)) + return Status; + + Status = ObReferenceObjectByHandle(SecondTokenHandle, + TOKEN_QUERY, + SepTokenObjectType, + PreviousMode, + (PVOID*)&SecondToken, + NULL); + if (!NT_SUCCESS(Status)) + { + ObDereferenceObject(FirstToken); + return Status; + } + + if (FirstToken != SecondToken) + { + Status = SepCompareTokens(FirstToken, + SecondToken, + &IsEqual); + } + else + IsEqual = TRUE; + + ObDereferenceObject(FirstToken); + ObDereferenceObject(SecondToken); + + if (NT_SUCCESS(Status)) + { + _SEH_TRY + { + *Equal = IsEqual; + } + _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + + return Status; +} + /* EOF */ Modified: trunk/reactos/tools/nci/sysfuncs.lst URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/sysfuncs.lst?rev… ============================================================================== --- trunk/reactos/tools/nci/sysfuncs.lst (original) +++ trunk/reactos/tools/nci/sysfuncs.lst Sun Oct 15 23:12:41 2006 @@ -17,6 +17,7 @@ NtClearEvent 1 NtClose 1 NtCloseObjectAuditAlarm 3 +NtCompareTokens 3 NtCompleteConnectPort 1 NtConnectPort 8 NtContinue 2

1 0

[greatlrd] 24527: adding ansi to utf-8 converting support follow code pages oem437, oem850, windows28591 ( iso-2859-1 Latin 1)
by greatlrd＠svn.reactos.org 15 Oct '06

15 Oct '06

Author: greatlrd Date: Sun Oct 15 23:07:19 2006 New Revision: 24527 URL: http://svn.reactos.org/svn/reactos?rev=24527&view=rev Log: adding ansi to utf-8 converting support follow code pages oem437, oem850, windows28591 ( iso-2859-1 Latin 1) Added: trunk/rosapps/devutils/roswebparser/Windows28591.h (with props) trunk/rosapps/devutils/roswebparser/oem437.h (with props) trunk/rosapps/devutils/roswebparser/oem850.h (with props) trunk/rosapps/devutils/roswebparser/utf8.c (with props) Modified: trunk/rosapps/devutils/roswebparser/roswebparser.c trunk/rosapps/devutils/roswebparser/roswebparser.rbuild Added: trunk/rosapps/devutils/roswebparser/Windows28591.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/roswebparser/Wind… ============================================================================== --- trunk/rosapps/devutils/roswebparser/Windows28591.h (added) +++ trunk/rosapps/devutils/roswebparser/Windows28591.h Sun Oct 15 23:07:19 2006 @@ -1,0 +1,32 @@ +/* + * Windows OEM 457 code page table. need by english rc files, area 0x80 to 0x9f should be blank + */ + +unsigned short table_Windows28591[256] = +{ + 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, + 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, 0x0010, 0x0011, 0x0012, 0x0013, + 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, + 0x001E, 0x001F, 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, + 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, 0x0030, 0x0031, + 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, + 0x003C, 0x003D, 0x003E, 0x003F, 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, + 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, + 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, + 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, 0x0060, 0x0061, 0x0062, 0x0063, + 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, + 0x006E, 0x006F, 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, + 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, 0x0080, 0x0081, + 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088, 0x0089, 0x008A, 0x008B, + 0x008C, 0x008D, 0x008E, 0x008F, 0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, + 0x0096, 0x0097, 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F, + 0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7, 0x00A8, 0x00A9, + 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF, 0x00B0, 0x00B1, 0x00B2, 0x00B3, + 0x00B4, 0x00B5, 0x00B6, 0x00B7, 0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, + 0x00BE, 0x00BF, 0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7, + 0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF, 0x00D0, 0x00D1, + 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7, 0x00D8, 0x00D9, 0x00DA, 0x00DB, + 0x00DC, 0x00DD, 0x00DE, 0x00DF, 0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, + 0x00E6, 0x00E7, 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF, + 0x00F0, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7, 0x00F8, 0x00F9, + 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x00FE, 0x00FF}; Propchange: trunk/rosapps/devutils/roswebparser/Windows28591.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/devutils/roswebparser/oem437.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/roswebparser/oem4… ============================================================================== --- trunk/rosapps/devutils/roswebparser/oem437.h (added) +++ trunk/rosapps/devutils/roswebparser/oem437.h Sun Oct 15 23:07:19 2006 @@ -1,0 +1,35 @@ +/* + * Windows OEM 457 code page table. need by english rc files + */ + +unsigned short table_OEM437[256] = +{ + 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, + 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, 0x0010, 0x0011, 0x0012, 0x0013, + 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, + 0x001E, 0x001F, 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, + 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, 0x0030, 0x0031, + 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, + 0x003C, 0x003D, 0x003E, 0x003F, 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, + 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, + 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, + 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, 0x0060, 0x0061, 0x0062, 0x0063, + 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, + 0x006E, 0x006F, 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, + 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, 0x00C7, 0x00FC, + 0x00E9, 0x00E2, 0x00E4, 0x00E0, 0x00E5, 0x00E7, 0x00EA, 0x00EB, 0x00E8, 0x00EF, + 0x00EE, 0x00EC, 0x00C4, 0x00C5, 0x00C9, 0x00E6, 0x00C6, 0x00F4, 0x00F6, 0x00F2, + 0x00FB, 0x00F9, 0x00FF, 0x00D6, 0x00DC, 0x00A2, 0x00A3, 0x00A5, 0x20A7, 0x0192, + 0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00F1, 0x00D1, 0x00AA, 0x00BA, 0x00BF, 0x2310, + 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00BB, 0x2591, 0x2592, 0x2593, 0x2502, + 0x2524, 0x2561, 0x2562, 0x2556, 0x2555, 0x2563, 0x2551, 0x2557, 0x255D, 0x255C, + 0x255B, 0x2510, 0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x255E, 0x255F, + 0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x2567, 0x2568, 0x2564, + 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256B, 0x256A, 0x2518, 0x250C, 0x2588, + 0x2584, 0x258C, 0x2590, 0x2580, 0x03B1, 0x00DF, 0x0393, 0x03C0, 0x03A3, 0x03C3, + 0x00B5, 0x03C4, 0x03A6, 0x0398, 0x03A9, 0x03B4, 0x221E, 0x03C6, 0x03B5, 0x2229, + 0x2261, 0x00B1, 0x2265, 0x2264, 0x2320, 0x2321, 0x00F7, 0x2248, 0x00B0, 0x2219, + 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0}; + + + Propchange: trunk/rosapps/devutils/roswebparser/oem437.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/devutils/roswebparser/oem850.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/roswebparser/oem8… ============================================================================== --- trunk/rosapps/devutils/roswebparser/oem850.h (added) +++ trunk/rosapps/devutils/roswebparser/oem850.h Sun Oct 15 23:07:19 2006 @@ -1,0 +1,32 @@ +/* + * Windows OEM 850 code page table. need by english rc files + */ + +unsigned short table_OEM850[256] = +{ + 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, + 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, 0x0010, 0x0011, 0x0012, 0x0013, + 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, + 0x001E, 0x001F, 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, + 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, 0x0030, 0x0031, + 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, + 0x003C, 0x003D, 0x003E, 0x003F, 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, + 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, + 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, + 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, 0x0060, 0x0061, 0x0062, 0x0063, + 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, + 0x006E, 0x006F, 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, + 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, 0x00C7, 0x00FC, + 0x00E9, 0x00E2, 0x00E4, 0x00E0, 0x00E5, 0x00E7, 0x00EA, 0x00EB, 0x00E8, 0x00EF, + 0x00EE, 0x00EC, 0x00C4, 0x00C5, 0x00C9, 0x00E6, 0x00C6, 0x00F4, 0x00F6, 0x00F2, + 0x00FB, 0x00F9, 0x00FF, 0x00D6, 0x00DC, 0x00F8, 0x00A3, 0x00D8, 0x00D7, 0x0192, + 0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00F1, 0x00D1, 0x00AA, 0x00BA, 0x00BF, 0x00AE, + 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00BB, 0x2591, 0x2592, 0x2593, 0x2502, + 0x2524, 0x00C1, 0x00C2, 0x00C0, 0x00A9, 0x2563, 0x2551, 0x2557, 0x255D, 0x00A2, + 0x00A5, 0x2510, 0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x00E3, 0x00C3, + 0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x00A4, 0x00F0, 0x00D0, + 0x00CA, 0x00CB, 0x00C8, 0x0131, 0x00CD, 0x00CE, 0x00CF, 0x2518, 0x250C, 0x2588, + 0x2584, 0x00A6, 0x00CC, 0x2580, 0x00D3, 0x00DF, 0x00D4, 0x00D2, 0x00F5, 0x00D5, + 0x00B5, 0x00FE, 0x00DE, 0x00DA, 0x00DB, 0x00D9, 0x00FD, 0x00DD, 0x00AF, 0x00B4, + 0x00AD, 0x00B1, 0x2017, 0x00BE, 0x00B6, 0x00A7, 0x00F7, 0x00B8, 0x00B0, 0x00A8, + 0x00B7, 0x00B9, 0x00B3, 0x00B2, 0x25A0, 0x00A0}; Propchange: trunk/rosapps/devutils/roswebparser/oem850.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/devutils/roswebparser/roswebparser.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/roswebparser/rosw… ============================================================================== --- trunk/rosapps/devutils/roswebparser/roswebparser.c (original) +++ trunk/rosapps/devutils/roswebparser/roswebparser.c Sun Oct 15 23:07:19 2006 @@ -18,27 +18,27 @@ #define false 0 -int paraser1(char *buf, long buf_size, char * output_text, char * output_resid, char * output_format, char *iso_type); - -void find_str(char asc,char *buf, long *foundPos); -void find_str2(char *asc,char *buf, long *foundPos, char * output_resid, char *output_text ); -void trim(char* buf); -void stringbugs(char *buf, int shift2); -void stringbugs2(char *buf, int shift2); - -void ParserCMD1(char *text, char *output_resid, char *output_text, char *output_format); -void ParserCMD2(char *text, char *output_resid, char *output_text, char *output_format); -void ParserCMD3(char *text, char *output_resid, char *output_text, char *output_format); - -void ParserComment(long *pos, char *buf, long buf_size, char * output_text, char * output_resid, char * output_format); -void ParserLang(char *text, char *output_resid, char *output_text, char *output_format); -void ParserString(long *pos, char *buf, long buf_size, char * output_text, char * output_resid, char * output_format); -void ParserDialog(char *text, long *pos, char *buf, long buf_size, char * output_text, char * output_resid, char * output_format); -void DialogCMDBuild1(char *output_resid, char *output_format, long pos, char * text); -void DialogCMDBuild2(char *output_resid, char *output_format, long pos, char * text); -void DialogCMDBuild3(char *output_resid, char *output_format, long pos, char * text); -void ParserAccelerators(long *pos, char *buf, long buf_size, char * output_text, char * output_resid, char * output_format); -void ParserMenu(char *text, long *pos, char *buf, long buf_size, char * output_text, char * output_resid, char * output_format); +int paraser1(unsigned char *buf, long buf_size, unsigned char * output_text, unsigned char * output_resid, unsigned char * output_format, unsigned char *iso_type); + +void find_str(unsigned char asc, unsigned char *buf, long *foundPos); +void find_str2(unsigned char *asc, unsigned char *buf, long *foundPos, unsigned char * output_resid, unsigned char *output_text ); +void trim(unsigned char* buf); +void stringbugs(unsigned char *buf, int shift2); +void stringbugs2(unsigned char *buf, int shift2); + +void ParserCMD1(unsigned char *text, unsigned char *output_resid, unsigned char *output_text, unsigned char *output_format); +void ParserCMD2(unsigned char *text, unsigned char *output_resid, unsigned char *output_text, unsigned char *output_format); +void ParserCMD3(unsigned char *text, unsigned char *output_resid, unsigned char *output_text, unsigned char *output_format); + +void ParserComment(long *pos, unsigned char *buf, long buf_size, unsigned char * output_text, unsigned char * output_resid, unsigned char * output_format); +void ParserLang(unsigned char *text, unsigned char *output_resid, unsigned char *output_text, unsigned char *output_format); +void ParserString(long *pos, unsigned char *buf, long buf_size, unsigned char * output_text, unsigned char * output_resid, unsigned char * output_format); +void ParserDialog(unsigned char *text, long *pos, unsigned char *buf, long buf_size, unsigned char * output_text, unsigned char * output_resid, unsigned char * output_format); +void DialogCMDBuild1(unsigned char *output_resid, unsigned char *output_format, long pos, unsigned char * text); +void DialogCMDBuild2(unsigned char *output_resid, unsigned char *output_format, long pos, unsigned char * text); +void DialogCMDBuild3(unsigned char *output_resid, unsigned char *output_format, long pos, unsigned char * text); +void ParserAccelerators(long *pos, unsigned char *buf, long buf_size, unsigned char * output_text, unsigned char * output_resid, unsigned char * output_format); +void ParserMenu(unsigned char *text, long *pos, unsigned char *buf, long buf_size, unsigned char * output_text, unsigned char * output_resid, unsigned char * output_format); /* return -1 : No file found @@ -47,29 +47,31 @@ return -4 : Fail get size return -5 : Fail size of the file is 0 bytes return -6 : Fail malloc memory - return -7 : Fail to read the file + return -7 : Fail to read the file + return -8 : Fail to write to the file + return -9 : Fail to open write file */ int main(int argc, char * argv[]) { FILE * fp; - char * buffer; - char * output_text; - char * output_resid; - char * output_format; + FILE * Outfp; + unsigned char * buffer; + unsigned char * output_text; + unsigned char * output_resid; + unsigned char * output_format; long buf_size; long buf_size_calc = 0; - if (argc!=3) + if (argc!=4) { printf("Help\n"); printf("%s inputfile iso-type\n\n",argv[0]); - printf("example %s en.rc UTF-8\n\n",argv[0]); - printf("Contry table\n"); - printf("en (English = \n"); - printf("se (Swedish = \n"); - printf("jp (Japanice = \n"); + printf("example %s sv.rc 28591 sv.xml\n\n",argv[0]); + printf("Contry table\n"); + printf("se (Swedish = Windows-28591 (Latin1 ISO-8859-1)\n"); + return -1; } @@ -97,6 +99,7 @@ return -4; } + /* We make sure it is least 4 times + 2K biger for we can grow around 2-3 times biger @@ -171,10 +174,22 @@ /* Now we can write our parser */ - paraser1(buffer, buf_size, output_text, output_resid, output_format,argv[2]); - printf ("%s",output_format); - + paraser1(buffer, buf_size, output_text, output_resid, output_format,"UTF-8"); + // printf ("%s",output_format); + + /* Now we convert to utf-8 */ + memset(output_resid,0,buf_size_calc); + buf_size_calc = ansiCodePage(atoi(argv[2]), output_format, output_resid, strlen(output_format)); + + if ((Outfp = fopen(argv[3],"wb")) != NULL ) + { + fwrite(output_resid,1,buf_size_calc,Outfp); + fclose(Outfp); + } + + + if(buffer!=NULL) free(buffer); if(output_text!=NULL) @@ -188,9 +203,9 @@ return 0; } -int paraser1(char *buf, long buf_size, char * output_text, char * output_resid, char * output_format, char *iso_type) +int paraser1(unsigned char *buf, long buf_size, unsigned char * output_text, unsigned char * output_resid, unsigned char * output_format, unsigned char *iso_type) { - char *row; + unsigned char *row; long foundPos=0; long foundNextPos=0; long row_size=0; @@ -353,7 +368,7 @@ param : output_format = xml data store buffer */ -void ParserCMD1(char *text, char *output_resid, char *output_text, char *output_format) +void ParserCMD1(unsigned char *text, unsigned char *output_resid, unsigned char *output_text, unsigned char *output_format) { long le; @@ -395,7 +410,7 @@ */ -void ParserCMD2(char *text, char *output_resid, char *output_text, char *output_format) +void ParserCMD2(unsigned char *text, unsigned char *output_resid, unsigned char *output_text, unsigned char *output_format) { long le; long flag = 0; @@ -476,7 +491,7 @@ param : output_format = xml data store buffer */ -void ParserCMD3(char *text, char *output_resid, char *output_text, char *output_format) +void ParserCMD3(unsigned char *text, unsigned char *output_resid, unsigned char *output_text, unsigned char *output_format) { long foundPos=0; @@ -507,7 +522,7 @@ param : output_format = xml data store buffer */ -void ParserLang(char *text, char *output_resid, char *output_text, char *output_format) +void ParserLang(unsigned char *text, unsigned char *output_resid, unsigned char *output_text, unsigned char *output_format) { long foundPos=0; @@ -547,12 +562,12 @@ param : output_format = xml data store buffer */ -void ParserComment(long *pos, char *buf, long buf_size, char * output_text, char * output_resid, char * output_format) +void ParserComment(long *pos, unsigned char *buf, long buf_size, unsigned char * output_text, unsigned char * output_resid, unsigned char * output_format) { - long foundPos=0; + long foundPos=0; long foundNextPos=0; long row_size=0; - char *row = output_text; + unsigned char *row = output_text; row_size = strlen(row); @@ -648,7 +663,7 @@ param : output_resid = using internal instead alloc more memory param : output_format = xml data store buffer */ -void ParserAccelerators(long *pos, char *buf, long buf_size, char * output_text, char * output_resid, char * output_format) +void ParserAccelerators(long *pos, unsigned char *buf, long buf_size, unsigned char * output_text, unsigned char * output_resid, unsigned char * output_format) { long foundPos=0; long foundNextPos=0; @@ -751,11 +766,11 @@ param : output_resid = using internal instead alloc more memory param : output_format = xml data store buffer */ -void ParserString(long *pos, char *buf, long buf_size, char * output_text, char * output_resid, char * output_format) +void ParserString(long *pos, unsigned char *buf, long buf_size, unsigned char * output_text, unsigned char * output_resid, unsigned char * output_format) { long foundPos=0; long row_size=0; - char *row = output_text; + unsigned char *row = output_text; int start=false; while(*pos < buf_size) @@ -891,12 +906,12 @@ param : output_resid = using internal instead alloc more memory param : output_format = xml data store buffer */ -void ParserDialog(char *text, long *pos, char *buf, long buf_size, char * output_text, char * output_resid, char * output_format) +void ParserDialog(unsigned char *text, long *pos, unsigned char *buf, long buf_size, unsigned char * output_text, unsigned char * output_resid, unsigned char * output_format) { long foundPos=0; long foundNextPos=0; long row_size=0; - char *row = output_text; + unsigned char *row = output_text; long commandfound=0; long le; @@ -1078,12 +1093,12 @@ param : output_resid = using internal instead alloc more memory param : output_format = xml data store buffer */ -void ParserMenu(char *text, long *pos, char *buf, long buf_size, char * output_text, char * output_resid, char * output_format) +void ParserMenu(unsigned char *text, long *pos, unsigned char *buf, long buf_size, unsigned char * output_text, unsigned char * output_resid, unsigned char * output_format) { long foundPos=0; long foundNextPos=0; long row_size=0; - char *row = output_text; + unsigned char *row = output_text; long commandfound=0; long le; long count=0; @@ -1220,7 +1235,7 @@ } -void stringbugs(char *buf, int shift2) +void stringbugs(unsigned char *buf, int shift2) { long foundPos=0; long foundNextPos=0; @@ -1319,7 +1334,7 @@ /* have remove all wrong syntax */ } -void stringbugs2(char *buf, int shift2) +void stringbugs2(unsigned char *buf, int shift2) { long foundPos=0; long foundNextPos=0; @@ -1412,7 +1427,7 @@ -void trim(char* buf) +void trim(unsigned char* buf) { size_t le; @@ -1453,7 +1468,7 @@ } } } -void find_str(char asc,char *buf, long *foundPos) +void find_str(unsigned char asc,unsigned char *buf, long *foundPos) { int t; size_t le; @@ -1479,8 +1494,8 @@ } -void find_str2(char *asc,char *buf, long *foundPos, - char * output_resid, char *output_text) +void find_str2(unsigned char *asc, unsigned char *buf, long *foundPos, + unsigned char * output_resid, unsigned char *output_text) { int t=0; size_t le; @@ -1515,11 +1530,11 @@ } -void DialogCMDBuild1(char *output_resid, char *output_format, long pos, char * text) +void DialogCMDBuild1(unsigned char *output_resid, unsigned char *output_format, long pos, unsigned char * text) { - char extra[1000]; + unsigned char extra[1000]; long foundPos=0; long foundNextPos=0; long le; @@ -1614,7 +1629,7 @@ } -void DialogCMDBuild2(char *output_resid, char *output_format, long pos, char * text) +void DialogCMDBuild2(unsigned char *output_resid, unsigned char *output_format, long pos, unsigned char * text) { long le; @@ -1634,7 +1649,7 @@ } // input : CONTROL "",101,"Static",SS_SIMPLE | SS_NOPREFIX,3,6,150,10 -void DialogCMDBuild3(char *output_resid, char *output_format, long pos, char * text) +void DialogCMDBuild3(unsigned char *output_resid, unsigned char *output_format, long pos, unsigned char * text) { long foundPos=0; long foundNextPos=0; Modified: trunk/rosapps/devutils/roswebparser/roswebparser.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/roswebparser/rosw… ============================================================================== --- trunk/rosapps/devutils/roswebparser/roswebparser.rbuild (original) +++ trunk/rosapps/devutils/roswebparser/roswebparser.rbuild Sun Oct 15 23:07:19 2006 @@ -5,4 +5,6 @@ <define name="__USE_W32API" /> <library>kernel32</library> <file>roswebparser.c</file> + <file>utf8.c</file> + </module> Added: trunk/rosapps/devutils/roswebparser/utf8.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/roswebparser/utf8… ============================================================================== --- trunk/rosapps/devutils/roswebparser/utf8.c (added) +++ trunk/rosapps/devutils/roswebparser/utf8.c Sun Oct 15 23:07:19 2006 @@ -1,0 +1,70 @@ + +/* + * Convert ansi to utf-8 + * it does not support more that utf-16 + * the table we are using is base on utf-16 then we convert the table to utf-8 + * + * All table lookup the ansi char to utf-16 then we calc the utf-8 format. + */ + +#include "oem437.h" +#include "oem850.h" +#include "Windows28591.h" + +int ansiCodePage(int codepage, unsigned char *inBuffer, unsigned char *outBuffer, int Lenght) +{ + int t; + int ch; + int pos=0; + + for (t=0;t<Lenght;t++) + { + ch=-1; + if (codepage == 437) + { + ch = (int) table_OEM437[ ((unsigned char)inBuffer[t])]; + } + + if (codepage == 850) + { + ch = (int) table_OEM850[ ((unsigned char)inBuffer[t])]; + } + + if (codepage == 28591) + { + ch = (int) table_Windows28591[ ((unsigned char)inBuffer[t])]; + } + + + + + if (ch == -1) + { + break; + } + + if (ch <= 0x7F) + { + outBuffer[pos]=ch; + pos++; + } + else if (ch <=0x07FF) // 1 1111 11 1111 + { + outBuffer[pos]= 0xC0 | (0x1F & (ch >> 6)); // 110x xxxx + outBuffer[pos+1]= 0x80 | (0x3f & ch); // 11xx xxxx + pos+=2; + } + + else if (ch <=0xFFFF) // 11 11 11 11 11 11 11 11 + { + outBuffer[pos]= 0xC2 | (0xf & (ch >> 12)); // 1110xxxx + outBuffer[pos+1]= 0x80 | (0x3f & (ch >> 6)); // 10xxxxxx + outBuffer[pos+1]= 0x80 | (0x3f & ch); // 10xxxxxx + pos+=3; + } + + } + + return pos; +} + Propchange: trunk/rosapps/devutils/roswebparser/utf8.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[weiden] 24526: Implemented AddMandatoryAce
by weiden＠svn.reactos.org 15 Oct '06

15 Oct '06

Author: weiden Date: Sun Oct 15 20:52:25 2006 New Revision: 24526 URL: http://svn.reactos.org/svn/reactos?rev=24526&view=rev Log: Implemented AddMandatoryAce Modified: trunk/reactos/dll/ntdll/def/ntdll.def trunk/reactos/dll/win32/advapi32/advapi32.def trunk/reactos/dll/win32/advapi32/sec/ac.c trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/include/psdk/winnt.h trunk/reactos/lib/rtl/acl.c Modified: trunk/reactos/dll/ntdll/def/ntdll.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.def?re… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.def (original) +++ trunk/reactos/dll/ntdll/def/ntdll.def Sun Oct 15 20:52:25 2006 @@ -314,6 +314,7 @@ RtlAddAuditAccessAceEx@28 RtlAddAuditAccessObjectAce@36 ;RtlAddCompoundAce +RtlAddMandatoryAce@24 RtlAddRange@36 RtlAddVectoredExceptionHandler@8 RtlAdjustPrivilege@16 Modified: trunk/reactos/dll/win32/advapi32/advapi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.def (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.def Sun Oct 15 20:52:25 2006 @@ -32,6 +32,7 @@ AddAuditAccessAce@24 AddAuditAccessAceEx@28 AddAuditAccessObjectAce@36 +AddMandatoryAce@20 AddUsersToEncryptedFile@8 AdjustTokenGroups@24 AdjustTokenPrivileges@24 Modified: trunk/reactos/dll/win32/advapi32/sec/ac.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/ac.… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/ac.c (original) +++ trunk/reactos/dll/win32/advapi32/sec/ac.c Sun Oct 15 20:52:25 2006 @@ -413,6 +413,35 @@ } return TRUE; +} + + +/* + * @implemented + */ +BOOL +WINAPI +AddMandatoryAce(IN OUT PACL pAcl, + IN DWORD dwAceRevision, + IN DWORD AceFlags, + IN DWORD MandatoryPolicy, + IN PSID pLabelSid) +{ + NTSTATUS Status; + + Status = RtlAddMandatoryAce(pAcl, + dwAceRevision, + AceFlags, + MandatoryPolicy, + SYSTEM_MANDATORY_LABEL_ACE_TYPE, + pLabelSid); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + return TRUE; } Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h (original) +++ trunk/reactos/include/ndk/rtlfuncs.h Sun Oct 15 20:52:25 2006 @@ -762,6 +762,17 @@ NTSYSAPI NTSTATUS NTAPI +RtlAddMandatoryAce( + IN OUT PACL Acl, + IN ULONG Revision, + IN ULONG Flags, + IN ULONG MandatoryFlags, + IN ULONG AceType, + IN PSID LabelSid); + +NTSYSAPI +NTSTATUS +NTAPI RtlAdjustPrivilege( IN ULONG Privilege, IN BOOLEAN NewValue, Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=2… ============================================================================== --- trunk/reactos/include/psdk/winnt.h (original) +++ trunk/reactos/include/psdk/winnt.h Sun Oct 15 20:52:25 2006 @@ -571,6 +571,8 @@ #define DOMAIN_ALIAS_RID_AUTHORIZATIONACCESS 0x00000230L #define DOMAIN_ALIAS_RID_TS_LICENSE_SERVERS 0x00000231L #define DOMAIN_ALIAS_RID_DCOM_USERS 0x00000232L + +#define SECURITY_MANDATORY_LABEL_AUTHORITY {0,0,0,0,0,16} typedef enum { @@ -1622,7 +1624,8 @@ #define SYSTEM_ALARM_CALLBACK_ACE_TYPE (0xE) #define SYSTEM_AUDIT_CALLBACK_OBJECT_ACE_TYPE (0xF) #define SYSTEM_ALARM_CALLBACK_OBJECT_ACE_TYPE (0x10) -#define ACCESS_MAX_MS_V5_ACE_TYPE (0x10) +#define SYSTEM_MANDATORY_LABEL_ACE_TYPE (0x11) +#define ACCESS_MAX_MS_V5_ACE_TYPE (0x11) /* end ntifs.h */ typedef struct _GENERIC_MAPPING { ACCESS_MASK GenericRead; @@ -1659,6 +1662,15 @@ ACCESS_MASK Mask; DWORD SidStart; } SYSTEM_ALARM_ACE,*PSYSTEM_ALARM_ACE; +typedef struct _SYSTEM_MANDATORY_LABEL_ACE { + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD SidStart; +} SYSTEM_MANDATORY_LABEL_ACE, *PSYSTEM_MANDATORY_LABEL_ACE; +#define SYSTEM_MANDATORY_LABEL_NO_WRITE_UP 0x1 +#define SYSTEM_MANDATORY_LABEL_NO_READ_UP 0x2 +#define SYSTEM_MANDATORY_LABEL_NO_EXECUTE_UP 0x4 +#define SYSTEM_MANDATORY_LABEL_VALID_MASK (SYSTEM_MANDATORY_LABEL_NO_WRITE_UP | SYSTEM_MANDATORY_LABEL_NO_READ_UP | SYSTEM_MANDATORY_LABEL_NO_EXECUTE_UP) typedef struct _ACCESS_ALLOWED_OBJECT_ACE { ACE_HEADER Header; ACCESS_MASK Mask; Modified: trunk/reactos/lib/rtl/acl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/acl.c?rev=24526&r1… ============================================================================== --- trunk/reactos/lib/rtl/acl.c (original) +++ trunk/reactos/lib/rtl/acl.c Sun Oct 15 20:52:25 2006 @@ -141,6 +141,20 @@ { return(STATUS_INVALID_SID); } + + if (Type == SYSTEM_MANDATORY_LABEL_ACE_TYPE) + { + static const SID_IDENTIFIER_AUTHORITY MandatoryLabelAuthority = {SECURITY_MANDATORY_LABEL_AUTHORITY}; + + /* The SID's identifier authority must be SECURITY_MANDATORY_LABEL_AUTHORITY! */ + if (RtlCompareMemory(&((PISID)Sid)->IdentifierAuthority, + &MandatoryLabelAuthority, + sizeof(MandatoryLabelAuthority)) != sizeof(MandatoryLabelAuthority)) + { + return STATUS_INVALID_PARAMETER; + } + } + if (Acl->AclRevision > MAX_ACL_REVISION || Revision > MAX_ACL_REVISION) { @@ -602,6 +616,34 @@ InheritedObjectTypeGuid, Sid, Type); +} + + +/* + * @implemented + */ +NTSTATUS NTAPI +RtlAddMandatoryAce(IN OUT PACL Acl, + IN ULONG Revision, + IN ULONG Flags, + IN ULONG MandatoryFlags, + IN ULONG AceType, + IN PSID LabelSid) +{ + if (MandatoryFlags & ~SYSTEM_MANDATORY_LABEL_VALID_MASK) + return STATUS_INVALID_PARAMETER; + + if (AceType != SYSTEM_MANDATORY_LABEL_ACE_TYPE) + return STATUS_INVALID_PARAMETER; + + return RtlpAddKnownAce (Acl, + Revision, + Flags, + (ACCESS_MASK)MandatoryFlags, + NULL, + NULL, + LabelSid, + AceType); }

1 0

[frik85] 24525: ReactOS Blogs: * update main menu to reflect website changes
by frik85＠svn.reactos.org 15 Oct '06

15 Oct '06

Author: frik85 Date: Sun Oct 15 17:11:34 2006 New Revision: 24525 URL: http://svn.reactos.org/svn/reactos?rev=24525&view=rev Log: ReactOS Blogs: * update main menu to reflect website changes Modified: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/index.tpl Modified: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/index.tpl URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/serendipity… ============================================================================== --- trunk/web/reactos.org/htdocs/serendipity/templates/roscms/index.tpl (original) +++ trunk/web/reactos.org/htdocs/serendipity/templates/roscms/index.tpl Sun Oct 15 17:11:34 2006 @@ -1,117 +1,117 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" - "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" > - -<head> - <title>ReactOS Homepage - Blogs</title> - - <meta http-equiv="Content-Type" content="application/xml"; charset="utf-8" /> - <meta http-equiv="pics-label" content='(pics-1.1 "http://www.icra.org/ratingsv02.html" l gen true for "http://www.reactos.com/" r (cz 1 lz 1 nz 1 oz 1 vz 1))' /> - <meta http-equiv="Pragma" content="no-cache" /> - <meta name="Publisher" content="ReactOS Web Team" /> - <meta name="Copyright" content="ReactOS Foundation" /> - <meta name="generator" content="RosCMS" /> - <meta name="Keywords" content="reactos, ros, ros32, win32 ros64, roscms, operating system, wiki, forum, download, information, support database, compatibility database, compatibility, package database, reactos package manager, reactos content management system, reactos 0.1, reactos 0.2, reactos 0.3, ros 0.1, ros 0.2, ros 0.3" /> - <meta name="Description" content="ReactOS Homepage - ..." /> - <meta name="Page-topic" content="Operating System, Computer, Software, downloads" /> - <meta name="Audience" content="all" /> - <meta name="Content-language" content="en" /> - <meta name="Page-type" content="Operating System/Information/News" /> - <meta name="Robots" content="index,follow" /> - - <link rel="SHORTCUT ICON" href="http://www.reactos.org/favicon.ico" /> - <link rel="stylesheet" type="text/css" href="http://www.reactos.org/style.css" /> - <link rel="stylesheet" type="text/css" href="{$head_link_stylesheet}" /> - <link rel="alternate" type="application/rss+xml" title="{$blogTitle} RSS feed" href="{$serendipityBaseURL}{$serendipityRewritePrefix}feeds/index.rss2" /> - <link rel="alternate" type="application/x.atom+xml" title="{$blogTitle} Atom feed" href="{$serendipityBaseURL}{$serendipityRewritePrefix}feeds/atom.xml" -{if $entry_id} - <link rel="pingback" href="{$serendipityBaseURL}comment.php?type=pingback&entry_id={$entry_id}" /> -{/if} - -{serendipity_hookPlugin hook="frontend_header"} - -</head> -<body> -<div id="top"> - <div id="topMenu"> -  - <p style="text-align:left;"> - <a href="http://www.reactos.org/xhtml/en/index.html">Home</a> <span style="color: #ffffff">|</span> - <a href="http://www.reactos.org/xhtml/en/community.html">Community</a> <span style="color: #ffffff">|</span> - <a href="http://www.reactos.org/xhtml/en/support.html">Support</a> <span style="color: #ffffff">|</span> - <a href="http://www.reactos.org/xhtml/en/dev.html">Development</a> <span style="color: #ffffff">|</span> - <a href="http://www.reactos.org/roscms/?page=user">myReactOS</a> </p> - </div> - </div> -<table style="border:0" width="100%" cellpadding="0" cellspacing="0"> - <tr valign="top"> - <td style="width:147px" id="leftNav"> - <div class="navTitle">Navigation</div> - <ol> - <li><a href="http://www.reactos.org/xhtml/en/index.html">Home</a></li> - <li><a href="http://www.reactos.org/xhtml/en/community.html">Community</a></li> - <li><a href="http://www.reactos.org/xhtml/en/support.html">Support</a></li> - <li><a href="http://www.reactos.org/xhtml/en/dev.html">Development</a></li> - <li><a href="http://www.reactos.org/roscms/?page=user">myReactOS</a></li> - </ol> - <p></p> - - <div class="navTitle">Search</div> - <div class="navBox"><form method="get" action="/serendipity/index.php" style="padding:0;margin:0"> - <div style="text-align:center;"> - - <input type="hidden" name="serendipity[action]" value="search" /> - <input name="serendipity[searchTerm]" value="" size="12" maxlength="80" class="searchInput" type="text" /> - <input name="btnG" value="Go" type="submit" class="button" /> - - </div></form> - </div> -<p></p> -{if $rightSidebarElements > 0} - {serendipity_printSidebar side="right"} - {serendipity_printSidebar side="left"} -{/if} - </td> - - <td id="content"><div class="contentSmall"> - -<h1><a href="/xhtml/en/community.html">ReactOS Community</a> > -<a href="/serendipity/">ReactOS Blogs</a></h1> - -<table width='100' border='0' align='right'> - <tr> - <td><div align='right'><a href="/serendipity/index.php?/feeds/index.rss2"><img src='http://www.reactos.org/images/rss_200.png' width='80' height='15' border='0' alt='RSS 2.0 News Feed'></a></div></td> - - </tr> - <tr> - <td><div align='right'><a href="/serendipity/index.php?/feeds/atom10.xml"><img src='http://www.reactos.org/images/atom_100.png' width='80' height='15' border='0' alt='Atom 1.0 News Feed'></a></div></td> - </tr> -</table> -{$CONTENT} -</div></td> - </tr> -</table> - - -<table border='0' align='right'> - <tr> - <td valign='center'><address>Powered by</address></td> - <td><a title="Powered by Serendipity" href="http://www.s9y.org/"><img src="/serendipity/templates/default/img/s9y_banner_small.png" alt="Serendipity PHP Weblog" style="border: 0px" /></a></td> - <tr> -</table> -<br /> -<br /> -<br /> -<hr style="height: 1px;"/> - -<address style="text-align:center;"> - ReactOS is a registered trademark or a trademark of ReactOS Foundation in the United States and other countries.</address> -</body> -</html> +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" + "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" > + +<head> + <title>ReactOS Homepage - Blogs</title> + + <meta http-equiv="Content-Type" content="application/xml"; charset="utf-8" /> + <meta http-equiv="pics-label" content='(pics-1.1 "http://www.icra.org/ratingsv02.html" l gen true for "http://www.reactos.com/" r (cz 1 lz 1 nz 1 oz 1 vz 1))' /> + <meta http-equiv="Pragma" content="no-cache" /> + <meta name="Publisher" content="ReactOS Web Team" /> + <meta name="Copyright" content="ReactOS Foundation" /> + <meta name="generator" content="RosCMS" /> + <meta name="Keywords" content="reactos, ros, ros32, win32 ros64, roscms, operating system, wiki, forum, download, information, support database, compatibility database, compatibility, package database, reactos package manager, reactos content management system, reactos 0.1, reactos 0.2, reactos 0.3, ros 0.1, ros 0.2, ros 0.3" /> + <meta name="Description" content="ReactOS Homepage - ..." /> + <meta name="Page-topic" content="Operating System, Computer, Software, downloads" /> + <meta name="Audience" content="all" /> + <meta name="Content-language" content="en" /> + <meta name="Page-type" content="Operating System/Information/News" /> + <meta name="Robots" content="index,follow" /> + + <link rel="SHORTCUT ICON" href="http://www.reactos.org/favicon.ico" /> + <link rel="stylesheet" type="text/css" href="http://www.reactos.org/style.css" /> + <link rel="stylesheet" type="text/css" href="{$head_link_stylesheet}" /> + <link rel="alternate" type="application/rss+xml" title="{$blogTitle} RSS feed" href="{$serendipityBaseURL}{$serendipityRewritePrefix}feeds/index.rss2" /> + <link rel="alternate" type="application/x.atom+xml" title="{$blogTitle} Atom feed" href="{$serendipityBaseURL}{$serendipityRewritePrefix}feeds/atom.xml" +{if $entry_id} + <link rel="pingback" href="{$serendipityBaseURL}comment.php?type=pingback&entry_id={$entry_id}" /> +{/if} + +{serendipity_hookPlugin hook="frontend_header"} + +</head> +<body> +<div id="top"> + <div id="topMenu"> +  + <p style="text-align:left;"> + <a href="http://www.reactos.org/">Home</a> <span style="color: #ffffff">|</span> + <a href="http://www.reactos.org/?page=about">Info</a> <span style="color: #ffffff">|</span> + <a href="http://www.reactos.org/?page=community">Community</a> <span style="color: #ffffff">|</span> + <a href="http://www.reactos.org/?page=dev">Development</a> <span style="color: #ffffff">|</span> + <a href="http://www.reactos.org/roscms/?page=user">myReactOS</a> </p> + </div> + </div> +<table style="border:0" width="100%" cellpadding="0" cellspacing="0"> + <tr valign="top"> + <td style="width:147px" id="leftNav"> + <div class="navTitle">Navigation</div> + <ol> + <li><a href="http://www.reactos.org/">Home</a></li> + <li><a href="http://www.reactos.org/?page=about">Info</a></li> + <li><a href="http://www.reactos.org/?page=community">Community</a></li> + <li><a href="http://www.reactos.org/?page=dev">Development</a></li> + <li><a href="http://www.reactos.org/roscms/?page=user">myReactOS</a></li> + </ol> + <p></p> + + <div class="navTitle">Search</div> + <div class="navBox"><form method="get" action="/serendipity/index.php" style="padding:0;margin:0"> + <div style="text-align:center;"> + + <input type="hidden" name="serendipity[action]" value="search" /> + <input name="serendipity[searchTerm]" value="" size="12" maxlength="80" class="searchInput" type="text" /> + <input name="btnG" value="Go" type="submit" class="button" /> + + </div></form> + </div> +<p></p> +{if $rightSidebarElements > 0} + {serendipity_printSidebar side="right"} + {serendipity_printSidebar side="left"} +{/if} + </td> + + <td id="content"><div class="contentSmall"> + +<h1><a href="/xhtml/en/community.html">ReactOS Community</a> > +<a href="/serendipity/">ReactOS Blogs</a></h1> + +<table width='100' border='0' align='right'> + <tr> + <td><div align='right'><a href="/serendipity/index.php?/feeds/index.rss2"><img src='http://www.reactos.org/images/rss_200.png' width='80' height='15' border='0' alt='RSS 2.0 News Feed'></a></div></td> + + </tr> + <tr> + <td><div align='right'><a href="/serendipity/index.php?/feeds/atom10.xml"><img src='http://www.reactos.org/images/atom_100.png' width='80' height='15' border='0' alt='Atom 1.0 News Feed'></a></div></td> + </tr> +</table> +{$CONTENT} +</div></td> + </tr> +</table> + + +<table border='0' align='right'> + <tr> + <td valign='center'><address>Powered by</address></td> + <td><a title="Powered by Serendipity" href="http://www.s9y.org/"><img src="/serendipity/templates/default/img/s9y_banner_small.png" alt="Serendipity PHP Weblog" style="border: 0px" /></a></td> + <tr> +</table> +<br /> +<br /> +<br /> +<hr style="height: 1px;"/> + +<address style="text-align:center;"> + ReactOS is a registered trademark or a trademark of ReactOS Foundation in the United States and other countries.</address> +</body> +</html>

1 0

[weiden] 24524: Make some strings const
by weiden＠svn.reactos.org 15 Oct '06

15 Oct '06

Author: weiden Date: Sun Oct 15 17:07:03 2006 New Revision: 24524 URL: http://svn.reactos.org/svn/reactos?rev=24524&view=rev Log: Make some strings const Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c Sun Oct 15 17:07:03 2006 @@ -75,18 +75,18 @@ BOOLEAN KiSMTProcessorsPresent; /* CPU Signatures */ -CHAR CmpIntelID[] = "GenuineIntel"; -CHAR CmpAmdID[] = "AuthenticAMD"; -CHAR CmpCyrixID[] = "CyrixInstead"; -CHAR CmpTransmetaID[] = "GenuineTMx86"; -CHAR CmpCentaurID[] = "CentaurHauls"; -CHAR CmpRiseID[] = "RiseRiseRise"; +static const CHAR CmpIntelID[] = "GenuineIntel"; +static const CHAR CmpAmdID[] = "AuthenticAMD"; +static const CHAR CmpCyrixID[] = "CyrixInstead"; +static const CHAR CmpTransmetaID[] = "GenuineTMx86"; +static const CHAR CmpCentaurID[] = "CentaurHauls"; +static const CHAR CmpRiseID[] = "RiseRiseRise"; /* SUPPORT ROUTINES FOR MSVC COMPATIBILITY ***********************************/ VOID NTAPI -CPUID(IN ULONG CpuInfo[4], +CPUID(OUT ULONG CpuInfo[4], IN ULONG InfoType) { Ki386Cpuid(InfoType, &CpuInfo[0], &CpuInfo[1], &CpuInfo[2], &CpuInfo[3]);

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
36
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2006