Ros-diffs January 2005

ros-diffs@reactos.org

28 participants
703 discussions

[weiden] 13314: NtCreatePagingFile() should release the captured unicode string even if probing the other parameters failed

by weiden＠svn.reactos.com

NtCreatePagingFile() should release the captured unicode string even if probing the other parameters failed Modified: trunk/reactos/ntoskrnl/mm/pagefile.c _____ Modified: trunk/reactos/ntoskrnl/mm/pagefile.c --- trunk/reactos/ntoskrnl/mm/pagefile.c 2005-01-26 14:15:38 UTC (rev 13313) +++ trunk/reactos/ntoskrnl/mm/pagefile.c 2005-01-26 14:38:27 UTC (rev 13314) @@ -757,15 +757,7 @@ } PreviousMode = ExGetPreviousMode(); - Status = RtlCaptureUnicodeString(&CapturedFileName, - PreviousMode, - PagedPool, - FALSE, - FileName); - if (!NT_SUCCESS(Status)) - { - return(Status); - } + if (PreviousMode == UserMode) { _SEH_TRY @@ -795,6 +787,16 @@ SafeInitialSize = *InitialSize; SafeMaximumSize = *MaximumSize; } + + Status = RtlCaptureUnicodeString(&CapturedFileName, + PreviousMode, + PagedPool, + FALSE, + FileName); + if (!NT_SUCCESS(Status)) + { + return(Status); + } InitializeObjectAttributes(&ObjectAttributes, &CapturedFileName,

19 years, 7 months

[weiden] 13313: Fixed GetTempPathA/W and GetCurrentDirectoryA/W. Patch by tinus, Eric Kohl and me, fixes bug #482

by weiden＠svn.reactos.com

Fixed GetTempPathA/W and GetCurrentDirectoryA/W. Patch by tinus, Eric Kohl and me, fixes bug #482 Modified: trunk/reactos/lib/kernel32/file/curdir.c _____ Modified: trunk/reactos/lib/kernel32/file/curdir.c --- trunk/reactos/lib/kernel32/file/curdir.c 2005-01-26 14:00:41 UTC (rev 13312) +++ trunk/reactos/lib/kernel32/file/curdir.c 2005-01-26 14:15:38 UTC (rev 13313) @@ -37,6 +37,7 @@ { ANSI_STRING AnsiString; UNICODE_STRING UnicodeString; + ULONG Length; /* allocate buffer for unicode string */ UnicodeString.Length = 0; @@ -56,33 +57,48 @@ { UnicodeString.Buffer = NULL; } + /* get current directory */ UnicodeString.Length = RtlGetCurrentDirectory_U (UnicodeString.MaximumLength, UnicodeString.Buffer); - if (nBufferLength > 0) + DPRINT("UnicodeString.Buffer %wZ\n", &UnicodeString); + + /* convert unicode string to ansi (or oem) */ + if (bIsFileApiAnsi) { - DPRINT("UnicodeString.Buffer %wZ\n", &UnicodeString); - - /* convert unicode string to ansi (or oem) */ - if (bIsFileApiAnsi) - RtlUnicodeStringToAnsiString (&AnsiString, - &UnicodeString, - FALSE); - else - RtlUnicodeStringToOemString (&AnsiString, - &UnicodeString, - FALSE); - DPRINT("AnsiString.Buffer %s\n", AnsiString.Buffer); - - /* free unicode string */ - RtlFreeHeap (RtlGetProcessHeap (), - 0, - UnicodeString.Buffer); + Length = RtlUnicodeStringToAnsiSize (&UnicodeString); + if (Length > nBufferLength) + { + RtlFreeHeap (RtlGetProcessHeap (), + 0, + UnicodeString.Buffer); + return Length-1; + } + RtlUnicodeStringToAnsiString (&AnsiString, + &UnicodeString, + FALSE); } else { - AnsiString.Length = UnicodeString.Length / sizeof(WCHAR); + Length = RtlUnicodeStringToOemSize (&UnicodeString); + if (Length > nBufferLength) + { + RtlFreeHeap (RtlGetProcessHeap (), + 0, + UnicodeString.Buffer); + return Length-1; + } + RtlUnicodeStringToOemString (&AnsiString, + &UnicodeString, + FALSE); } + DPRINT("AnsiString.Buffer %s\n", AnsiString.Buffer); + + /* free unicode string */ + RtlFreeHeap (RtlGetProcessHeap (), + 0, + UnicodeString.Buffer); + return AnsiString.Length; } @@ -184,6 +200,7 @@ { UNICODE_STRING UnicodeString; ANSI_STRING AnsiString; + DWORD Length; AnsiString.Length = 0; AnsiString.MaximumLength = nBufferLength; @@ -191,30 +208,50 @@ /* initialize allocate unicode string */ UnicodeString.Length = 0; - UnicodeString.MaximumLength = nBufferLength * sizeof(WCHAR); - UnicodeString.Buffer = RtlAllocateHeap (RtlGetProcessHeap(), - 0, - UnicodeString.MaximumLength); + if(nBufferLength > 0) + { + UnicodeString.MaximumLength = (nBufferLength + 1) * sizeof(WCHAR); + UnicodeString.Buffer = RtlAllocateHeap (RtlGetProcessHeap (), + 0, + UnicodeString.MaximumLength); + if (UnicodeString.Buffer == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return 0; + } + } + else + { + UnicodeString.MaximumLength = 0; + UnicodeString.Buffer = NULL; + } - UnicodeString.Length = GetTempPathW (nBufferLength, - UnicodeString.Buffer) * sizeof(WCHAR); + Length = GetTempPathW (nBufferLength, + UnicodeString.Buffer); - /* convert unicode string to ansi (or oem) */ - if (bIsFileApiAnsi) - RtlUnicodeStringToAnsiString (&AnsiString, - &UnicodeString, - FALSE); - else - RtlUnicodeStringToOemString (&AnsiString, - &UnicodeString, - FALSE); + if (nBufferLength >= Length) + { + /* only touch the buffer if the supplied buffer length is at least + the length that GetTempPathW returned! */ + UnicodeString.Length = Length * sizeof(WCHAR); + /* convert unicode string to ansi (or oem) */ + if (bIsFileApiAnsi) + RtlUnicodeStringToAnsiString (&AnsiString, + &UnicodeString, + FALSE); + else + RtlUnicodeStringToOemString (&AnsiString, + &UnicodeString, + FALSE); + } + /* free unicode string buffer */ RtlFreeHeap (RtlGetProcessHeap (), 0, UnicodeString.Buffer); - return AnsiString.Length; + return Length; } @@ -229,42 +266,67 @@ ) { UNICODE_STRING Name; - UNICODE_STRING Value; + PUNICODE_STRING Value; + PTEB Teb; + DWORD Length; NTSTATUS Status; - Value.Length = 0; - Value.MaximumLength = (nBufferLength - 1) * sizeof(WCHAR); - Value.Buffer = lpBuffer; + Teb = NtCurrentTeb(); + Teb->StaticUnicodeString.Length = 0; + Teb->StaticUnicodeString.MaximumLength = MAX_PATH * sizeof(WCHAR); + Teb->StaticUnicodeString.Buffer = Teb->StaticUnicodeBuffer; + Value = &Teb->StaticUnicodeString; RtlRosInitUnicodeStringFromLiteral (&Name, - L"TMP"); + L"TMP"); Status = RtlQueryEnvironmentVariable_U (NULL, &Name, - &Value); + Value); if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_TOO_SMALL) { RtlRosInitUnicodeStringFromLiteral (&Name, - L"TEMP"); + L"TEMP"); Status = RtlQueryEnvironmentVariable_U (NULL, &Name, - &Value); - + Value); if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_TOO_SMALL) { - Value.Length = RtlGetCurrentDirectory_U (Value.MaximumLength, - Value.Buffer); + Value->Length = RtlGetCurrentDirectory_U(Value->MaximumLength, + Value->Buffer); } } - if (NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { - lpBuffer[Value.Length / sizeof(WCHAR)] = L'\\'; - lpBuffer[Value.Length / sizeof(WCHAR) + 1] = 0; + SetLastError(RtlNtStatusToDosError(Status)); + return 0; } - return Value.Length / sizeof(WCHAR) + 1; + Length = Value->Length / sizeof(WCHAR) + 1; + if (nBufferLength < Value->Length / sizeof(WCHAR) + 2) + Length++; + + if (lpBuffer != NULL) + { + if (nBufferLength < Value->Length / sizeof(WCHAR) + 2) + { + memcpy (lpBuffer, + Value->Buffer, + nBufferLength * sizeof(WCHAR)); + } + else + { + memcpy (lpBuffer, + Value->Buffer, + Value->Length); + lpBuffer[Value->Length / sizeof(WCHAR)] = L'\\'; + lpBuffer[Value->Length / sizeof(WCHAR) + 1] = 0; + } + } + + return Length; }

19 years, 7 months

[ekohl] 13312: Remove RtlImageNtHeader, RtlImageDirectoryEntryToData, RtlImageRvaToSection and RtlImageRvaToVa because these function have been moved to lib/rtl/image.c.

by ekohl＠svn.reactos.com

Remove RtlImageNtHeader, RtlImageDirectoryEntryToData, RtlImageRvaToSection and RtlImageRvaToVa because these function have been moved to lib/rtl/image.c. Modified: trunk/reactos/ntoskrnl/ldr/rtl.c _____ Modified: trunk/reactos/ntoskrnl/ldr/rtl.c --- trunk/reactos/ntoskrnl/ldr/rtl.c 2005-01-26 13:58:37 UTC (rev 13311) +++ trunk/reactos/ntoskrnl/ldr/rtl.c 2005-01-26 14:00:41 UTC (rev 13312) @@ -17,132 +17,6 @@ /* FUNCTIONS ****************************************************************/ - -/* - * @implemented - */ -PIMAGE_NT_HEADERS STDCALL -RtlImageNtHeader (IN PVOID BaseAddress) -{ - PIMAGE_DOS_HEADER DosHeader; - PIMAGE_NT_HEADERS NTHeaders; - - DosHeader = (PIMAGE_DOS_HEADER)BaseAddress; - NTHeaders = (PIMAGE_NT_HEADERS)((char*)BaseAddress + DosHeader->e_lfanew); - if ((DosHeader->e_magic != IMAGE_DOS_SIGNATURE) - || (DosHeader->e_lfanew == 0L) - || (*(PULONG) NTHeaders != IMAGE_NT_SIGNATURE)) - { - return(NULL); - } - return(NTHeaders); -} - - -/* - * @implemented - */ -PVOID STDCALL -RtlImageDirectoryEntryToData (IN PVOID BaseAddress, - IN BOOLEAN ImageLoaded, - IN ULONG Directory, - OUT PULONG Size) -{ - PIMAGE_NT_HEADERS NtHeader; - PIMAGE_SECTION_HEADER SectionHeader; - ULONG Va; - ULONG Count; - - NtHeader = RtlImageNtHeader (BaseAddress); - if (NtHeader == NULL) - return NULL; - - if (Directory >= NtHeader->OptionalHeader.NumberOfRvaAndSizes) - return NULL; - - Va = NtHeader->OptionalHeader.DataDirectory[Directory].VirtualAddress; - if (Va == 0) - return NULL; - - if (Size) - *Size = NtHeader->OptionalHeader.DataDirectory[Directory].Size; - - if (ImageLoaded) - return (PVOID)((char*)BaseAddress + Va); - - /* image mapped as ordinary file, we must find raw pointer */ - SectionHeader = (PIMAGE_SECTION_HEADER)(NtHeader + 1); - Count = NtHeader->FileHeader.NumberOfSections; - while (Count--) - { - if (SectionHeader->VirtualAddress == Va) - return (PVOID)((char*)BaseAddress + SectionHeader->PointerToRawData); - SectionHeader++; - } - - return NULL; -} - - -PIMAGE_SECTION_HEADER -STDCALL -RtlImageRvaToSection ( - PIMAGE_NT_HEADERS NtHeader, - PVOID BaseAddress, - ULONG Rva - ) -{ - PIMAGE_SECTION_HEADER Section; - ULONG Va; - ULONG Count; - - Count = NtHeader->FileHeader.NumberOfSections; - Section = (PIMAGE_SECTION_HEADER)((ULONG)&NtHeader->OptionalHeader + - NtHeader->FileHeader.SizeOfOptionalHeader); - while (Count) - { - Va = Section->VirtualAddress; - if ((Va <= Rva) && - (Rva < Va + Section->SizeOfRawData)) - return Section; - Section++; - } - return NULL; -} - - -ULONG -STDCALL -RtlImageRvaToVa ( - PIMAGE_NT_HEADERS NtHeader, - PVOID BaseAddress, - ULONG Rva, - PIMAGE_SECTION_HEADER *SectionHeader - ) -{ - PIMAGE_SECTION_HEADER Section = NULL; - - if (SectionHeader) - Section = *SectionHeader; - - if (Section == NULL || - Rva < Section->VirtualAddress || - Rva >= Section->VirtualAddress + Section->SizeOfRawData) - { - Section = RtlImageRvaToSection (NtHeader, BaseAddress, Rva); - if (Section == NULL) - return 0; - - if (SectionHeader) - *SectionHeader = Section; - } - - return (ULONG)((char*)BaseAddress + - Rva + - Section->PointerToRawData - - Section->VirtualAddress); -} - #define RVA(m, b) ((ULONG)b + m) NTSTATUS STDCALL

19 years, 7 months

[ion] 13311: Standardize comment headers. Patch by Trevor McCort

by ion＠svn.reactos.com

Standardize comment headers. Patch by Trevor McCort Modified: trunk/reactos/ntoskrnl/cc/cacheman.c Modified: trunk/reactos/ntoskrnl/cc/copy.c Modified: trunk/reactos/ntoskrnl/cc/fs.c Modified: trunk/reactos/ntoskrnl/cc/mdl.c Modified: trunk/reactos/ntoskrnl/cc/pin.c Modified: trunk/reactos/ntoskrnl/cc/view.c Modified: trunk/reactos/ntoskrnl/cm/import.c Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c Modified: trunk/reactos/ntoskrnl/cm/regfile.c Modified: trunk/reactos/ntoskrnl/cm/registry.c Modified: trunk/reactos/ntoskrnl/cm/regobj.c Modified: trunk/reactos/ntoskrnl/dbg/dbgctrl.c Modified: trunk/reactos/ntoskrnl/dbg/errinfo.c Modified: trunk/reactos/ntoskrnl/dbg/i386/i386-dis.c Modified: trunk/reactos/ntoskrnl/dbg/kdb.c Modified: trunk/reactos/ntoskrnl/dbg/kdb_keyboard.c Modified: trunk/reactos/ntoskrnl/dbg/kdb_serial.c Modified: trunk/reactos/ntoskrnl/dbg/kdb_stabs.c Modified: trunk/reactos/ntoskrnl/dbg/kdb_symbols.c Modified: trunk/reactos/ntoskrnl/dbg/print.c Modified: trunk/reactos/ntoskrnl/dbg/profile.c Modified: trunk/reactos/ntoskrnl/dbg/rdebug.c Modified: trunk/reactos/ntoskrnl/dbg/user.c Modified: trunk/reactos/ntoskrnl/ex/btree.c Modified: trunk/reactos/ntoskrnl/ex/callback.c Modified: trunk/reactos/ntoskrnl/ex/event.c Modified: trunk/reactos/ntoskrnl/ex/evtpair.c Modified: trunk/reactos/ntoskrnl/ex/fmutex.c Modified: trunk/reactos/ntoskrnl/ex/hashtab.c Modified: trunk/reactos/ntoskrnl/ex/i386/interlck.c Modified: trunk/reactos/ntoskrnl/ex/init.c Modified: trunk/reactos/ntoskrnl/ex/interlck.c Modified: trunk/reactos/ntoskrnl/ex/list.c Modified: trunk/reactos/ntoskrnl/ex/lookas.c Modified: trunk/reactos/ntoskrnl/ex/mutant.c Modified: trunk/reactos/ntoskrnl/ex/napi.c Modified: trunk/reactos/ntoskrnl/ex/power.c Modified: trunk/reactos/ntoskrnl/ex/profile.c Modified: trunk/reactos/ntoskrnl/ex/resource.c Modified: trunk/reactos/ntoskrnl/ex/rundown.c Modified: trunk/reactos/ntoskrnl/ex/sem.c Modified: trunk/reactos/ntoskrnl/ex/stree.c Modified: trunk/reactos/ntoskrnl/ex/synch.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/ntoskrnl/ex/time.c Modified: trunk/reactos/ntoskrnl/ex/timer.c Modified: trunk/reactos/ntoskrnl/ex/util.c Modified: trunk/reactos/ntoskrnl/ex/uuid.c Modified: trunk/reactos/ntoskrnl/ex/win32k.c Modified: trunk/reactos/ntoskrnl/ex/work.c Modified: trunk/reactos/ntoskrnl/ex/zone.c Modified: trunk/reactos/ntoskrnl/fs/dbcsname.c Modified: trunk/reactos/ntoskrnl/fs/filelock.c Modified: trunk/reactos/ntoskrnl/fs/mcb.c Modified: trunk/reactos/ntoskrnl/fs/mdl.c Modified: trunk/reactos/ntoskrnl/fs/name.c Modified: trunk/reactos/ntoskrnl/fs/notify.c Modified: trunk/reactos/ntoskrnl/fs/oplock.c Modified: trunk/reactos/ntoskrnl/fs/pool.c Modified: trunk/reactos/ntoskrnl/fs/tunnel.c Modified: trunk/reactos/ntoskrnl/fs/unc.c Modified: trunk/reactos/ntoskrnl/fs/util.c Modified: trunk/reactos/ntoskrnl/inbv/inbv.c Modified: trunk/reactos/ntoskrnl/io/adapter.c Modified: trunk/reactos/ntoskrnl/io/arcname.c Modified: trunk/reactos/ntoskrnl/io/bootlog.c Modified: trunk/reactos/ntoskrnl/io/buildirp.c Modified: trunk/reactos/ntoskrnl/io/cancel.c Modified: trunk/reactos/ntoskrnl/io/cleanup.c Modified: trunk/reactos/ntoskrnl/io/cntrller.c Modified: trunk/reactos/ntoskrnl/io/create.c Modified: trunk/reactos/ntoskrnl/io/device.c Modified: trunk/reactos/ntoskrnl/io/deviface.c Modified: trunk/reactos/ntoskrnl/io/dir.c Modified: trunk/reactos/ntoskrnl/io/driver.c Modified: trunk/reactos/ntoskrnl/io/efi.c Modified: trunk/reactos/ntoskrnl/io/errlog.c Modified: trunk/reactos/ntoskrnl/io/error.c Modified: trunk/reactos/ntoskrnl/io/event.c Modified: trunk/reactos/ntoskrnl/io/file.c Modified: trunk/reactos/ntoskrnl/io/flush.c Modified: trunk/reactos/ntoskrnl/io/fs.c Modified: trunk/reactos/ntoskrnl/io/iocomp.c Modified: trunk/reactos/ntoskrnl/io/ioctrl.c Modified: trunk/reactos/ntoskrnl/io/iomgr.c Modified: trunk/reactos/ntoskrnl/io/iowork.c Modified: trunk/reactos/ntoskrnl/io/irp.c Modified: trunk/reactos/ntoskrnl/io/irq.c Modified: trunk/reactos/ntoskrnl/io/lock.c Modified: trunk/reactos/ntoskrnl/io/mailslot.c Modified: trunk/reactos/ntoskrnl/io/mdl.c Modified: trunk/reactos/ntoskrnl/io/npipe.c Modified: trunk/reactos/ntoskrnl/io/page.c Modified: trunk/reactos/ntoskrnl/io/parttab.c Modified: trunk/reactos/ntoskrnl/io/plugplay.c Modified: trunk/reactos/ntoskrnl/io/pnpdma.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpnotify.c Modified: trunk/reactos/ntoskrnl/io/pnpreport.c Modified: trunk/reactos/ntoskrnl/io/pnproot.c [truncated at 100 lines; 161 more skipped] _____ Modified: trunk/reactos/ntoskrnl/cc/cacheman.c --- trunk/reactos/ntoskrnl/cc/cacheman.c 2005-01-26 13:54:53 UTC (rev 13310) +++ trunk/reactos/ntoskrnl/cc/cacheman.c 2005-01-26 13:58:37 UTC (rev 13311) @@ -1,29 +1,11 @@ -/* - * ReactOS kernel - * Copyright (C) 2000 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* +/* $Id:$ + * + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/cc/cacheman.c * PURPOSE: Cache manager - * PROGRAMMER: David Welch (welch(a)cwcom.net) - * PORTABILITY: Checked - * UPDATE HISTORY: - * Created 22/05/98 + * + * PROGRAMMERS: David Welch (welch(a)cwcom.net) */ /* INCLUDES *****************************************************************/ _____ Modified: trunk/reactos/ntoskrnl/cc/copy.c --- trunk/reactos/ntoskrnl/cc/copy.c 2005-01-26 13:54:53 UTC (rev 13310) +++ trunk/reactos/ntoskrnl/cc/copy.c 2005-01-26 13:58:37 UTC (rev 13311) @@ -4,9 +4,8 @@ * PROJECT: ReactOS kernel * FILE: ntoskrnl/cc/copy.c * PURPOSE: Implements cache managers copy interface - * PROGRAMMER: Hartmut Birr - * UPDATE HISTORY: - * Created 05.10.2001 + * + * PROGRAMMERS: Hartmut Birr */ /* INCLUDES ******************************************************************/ _____ Modified: trunk/reactos/ntoskrnl/cc/fs.c --- trunk/reactos/ntoskrnl/cc/fs.c 2005-01-26 13:54:53 UTC (rev 13310) +++ trunk/reactos/ntoskrnl/cc/fs.c 2005-01-26 13:58:37 UTC (rev 13311) @@ -1,10 +1,11 @@ -/* COPYRIGHT: See COPYING in the top level directory +/* $Id:$ + * + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/cc/fs.c * PURPOSE: Implements cache managers functions useful for File Systems - * PROGRAMMER: Alex Ionescu - * UPDATE HISTORY: - * Created 20/06/04 + * + * PROGRAMMERS: Alex Ionescu */ /* INCLUDES ******************************************************************/ _____ Modified: trunk/reactos/ntoskrnl/cc/mdl.c --- trunk/reactos/ntoskrnl/cc/mdl.c 2005-01-26 13:54:53 UTC (rev 13310) +++ trunk/reactos/ntoskrnl/cc/mdl.c 2005-01-26 13:58:37 UTC (rev 13311) @@ -1,10 +1,11 @@ -/* COPYRIGHT: See COPYING in the top level directory +/* $Id:$ + * + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/cc/fs.c * PURPOSE: Implements MDL Cache Manager Functions - * PROGRAMMER: Alex Ionescu - * UPDATE HISTORY: - * Created 20/06/04 + * + * PROGRAMMERS: Alex Ionescu */ /* INCLUDES ******************************************************************/ _____ Modified: trunk/reactos/ntoskrnl/cc/pin.c --- trunk/reactos/ntoskrnl/cc/pin.c 2005-01-26 13:54:53 UTC (rev 13310) +++ trunk/reactos/ntoskrnl/cc/pin.c 2005-01-26 13:58:37 UTC (rev 13311) @@ -4,9 +4,8 @@ * PROJECT: ReactOS kernel * FILE: ntoskrnl/cc/pin.c * PURPOSE: Implements cache managers pinning interface - * PROGRAMMER: Hartmut Birr - * UPDATE HISTORY: - * Created 05.10.2001 + * + * PROGRAMMERS: Hartmut Birr */ /* INCLUDES ******************************************************************/ _____ Modified: trunk/reactos/ntoskrnl/cc/view.c --- trunk/reactos/ntoskrnl/cc/view.c 2005-01-26 13:54:53 UTC (rev 13310) +++ trunk/reactos/ntoskrnl/cc/view.c 2005-01-26 13:58:37 UTC (rev 13311) @@ -1,30 +1,11 @@ -/* - * ReactOS kernel - * Copyright (C) 1998, 1999, 2000, 2001 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ /* $Id$ * + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/cc/view.c * PURPOSE: Cache manager - * PROGRAMMER: David Welch (welch(a)mcmail.com) - * PORTABILITY: Checked - * UPDATE HISTORY: - * Created 22/05/98 + * + * PROGRAMMERS: David Welch (welch(a)mcmail.com) */ /* NOTES ********************************************************************** _____ Modified: trunk/reactos/ntoskrnl/cm/import.c --- trunk/reactos/ntoskrnl/cm/import.c 2005-01-26 13:54:53 UTC (rev 13310) +++ trunk/reactos/ntoskrnl/cm/import.c 2005-01-26 13:58:37 UTC (rev 13311) @@ -4,6 +4,7 @@ * PROJECT: ReactOS kernel * FILE: ntoskrnl/cm/import.c * PURPOSE: Registry-Hive import functions + * * PROGRAMMERS: Eric Kohl */ _____ Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c --- trunk/reactos/ntoskrnl/cm/ntfunc.c 2005-01-26 13:54:53 UTC (rev 13310) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c 2005-01-26 13:58:37 UTC (rev 13311) @@ -1,10 +1,12 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/cm/ntfunc.c - * PURPOSE: Ntxxx function for registry access - * UPDATE HISTORY: -*/ +/* $Id$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: ntoskrnl/cm/ntfunc.c + * PURPOSE: Ntxxx function for registry access + * + * PROGRAMMERS: No programmer listed. + */ /* INCLUDES *****************************************************************/ _____ Modified: trunk/reactos/ntoskrnl/cm/regfile.c --- trunk/reactos/ntoskrnl/cm/regfile.c 2005-01-26 13:54:53 UTC (rev 13310) +++ trunk/reactos/ntoskrnl/cm/regfile.c 2005-01-26 13:58:37 UTC (rev 13311) @@ -1,10 +1,12 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/cm/regfile.c - * PURPOSE: Registry file manipulation routines - * UPDATE HISTORY: -*/ +/* $Id$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: ntoskrnl/cm/regfile.c + * PURPOSE: Registry file manipulation routines + * + * PROGRAMMERS: No programmer listed. + */ #include <ntoskrnl.h> #define NDEBUG _____ Modified: trunk/reactos/ntoskrnl/cm/registry.c --- trunk/reactos/ntoskrnl/cm/registry.c 2005-01-26 13:54:53 UTC (rev 13310) +++ trunk/reactos/ntoskrnl/cm/registry.c 2005-01-26 13:58:37 UTC (rev 13311) @@ -4,11 +4,10 @@ * PROJECT: ReactOS kernel * FILE: ntoskrnl/cm/registry.c * PURPOSE: Registry functions + * * PROGRAMMERS: Rex Jolliff * Matt Pyne * Jean Michault - * UPDATE HISTORY: - * Created 22/05/98 */ #include <ntoskrnl.h> _____ Modified: trunk/reactos/ntoskrnl/cm/regobj.c --- trunk/reactos/ntoskrnl/cm/regobj.c 2005-01-26 13:54:53 UTC (rev 13310) +++ trunk/reactos/ntoskrnl/cm/regobj.c 2005-01-26 13:58:37 UTC (rev 13311) @@ -1,9 +1,11 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/cm/regobj.c - * PURPOSE: Registry object manipulation routines. - * UPDATE HISTORY: +/* $Id$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: ntoskrnl/cm/regobj.c + * PURPOSE: Registry object manipulation routines. + * + * PROGRAMMERS: No programmer listed. */ #include <ntoskrnl.h> _____ Modified: trunk/reactos/ntoskrnl/dbg/dbgctrl.c --- trunk/reactos/ntoskrnl/dbg/dbgctrl.c 2005-01-26 13:54:53 UTC (rev 13310) +++ trunk/reactos/ntoskrnl/dbg/dbgctrl.c 2005-01-26 13:58:37 UTC (rev 13311) @@ -1,26 +1,11 @@ -/* - * ReactOS kernel - * Copyright (C) 1998, 1999, 2000, 2001 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* +/* $Id:$ + * + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/dbg/dbgctrl.c * PURPOSE: System debug control - * PORTABILITY: Checked + * + * PROGRAMMERS: No programmer listed. */ /* INCLUDES *****************************************************************/ _____ Modified: trunk/reactos/ntoskrnl/dbg/errinfo.c --- trunk/reactos/ntoskrnl/dbg/errinfo.c 2005-01-26 13:54:53 UTC (rev 13310) +++ trunk/reactos/ntoskrnl/dbg/errinfo.c 2005-01-26 13:58:37 UTC (rev 13311) @@ -1,28 +1,11 @@ -/* - * ReactOS kernel - * Copyright (C) 1998, 1999, 2000, 2001 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* +/* $Id:$ + * + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/dbg/errinfo.c * PURPOSE: Print information descriptions of error messages - * PORTABILITY: Checked - * UPDATE HISTORY: - * Created 22/05/98 + * + * PROGRAMMERS: No programmer listed. */ /* INCLUDES ******************************************************************/ _____ Modified: trunk/reactos/ntoskrnl/dbg/i386/i386-dis.c --- trunk/reactos/ntoskrnl/dbg/i386/i386-dis.c 2005-01-26 13:54:53 UTC (rev 13310) +++ trunk/reactos/ntoskrnl/dbg/i386/i386-dis.c 2005-01-26 13:58:37 UTC (rev 13311) @@ -1,3 +1,13 @@ +/* $Id:$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: ntoskrnl/dbg/i386/i386-dis.c + * PURPOSE: No purpose listed. + * + * PROGRAMMERS: No programmer listed. + */ + #include <stdarg.h> /* ReactOS compatibility stuff. */ _____ Modified: trunk/reactos/ntoskrnl/dbg/kdb.c --- trunk/reactos/ntoskrnl/dbg/kdb.c 2005-01-26 13:54:53 UTC (rev 13310) +++ trunk/reactos/ntoskrnl/dbg/kdb.c 2005-01-26 13:58:37 UTC (rev 13311) @@ -1,29 +1,11 @@ -/* - * ReactOS kernel - * Copyright (C) 2001-2004 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ /* $Id$ * + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/dbg/kdb.c * PURPOSE: Kernel debugger - * PROGRAMMER: David Welch (welch(a)mcmail.com) - * UPDATE HISTORY: - * Created 01/03/01 + * + * PROGRAMMERS: David Welch (welch(a)mcmail.com) */ /* INCLUDES ******************************************************************/ _____ Modified: trunk/reactos/ntoskrnl/dbg/kdb_keyboard.c --- trunk/reactos/ntoskrnl/dbg/kdb_keyboard.c 2005-01-26 13:54:53 UTC (rev 13310) +++ trunk/reactos/ntoskrnl/dbg/kdb_keyboard.c 2005-01-26 13:58:37 UTC (rev 13311) @@ -1,28 +1,13 @@ -/* - * ReactOS kernel - * Copyright (C) 1998, 1999, 2000, 2001 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +/* $Id:$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: ntoskrnl/dbg/kdb_keyboard.c + * PURPOSE: Keyboard driver + * + * PROGRAMMERS: Victor Kirhenshtein (sauros(a)iname.com) + * Jason Filby (jasonfilby(a)yahoo.com) */ -/* - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/dbg/kdb_keyboard.c - * PURPOSE: Keyboard driver - * PROGRAMMER: Victor Kirhenshtein (sauros(a)iname.com) - * Jason Filby (jasonfilby(a)yahoo.com) - */ /* INCLUDES ****************************************************************/ _____ Modified: trunk/reactos/ntoskrnl/dbg/kdb_serial.c --- trunk/reactos/ntoskrnl/dbg/kdb_serial.c 2005-01-26 13:54:53 UTC (rev 13310) +++ trunk/reactos/ntoskrnl/dbg/kdb_serial.c 2005-01-26 13:58:37 UTC (rev 13311) @@ -1,31 +1,14 @@ -/* - * ReactOS kernel - * Copyright (C) 1998, 1999, 2000, 2001 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +/* $Id:$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: ntoskrnl/dbg/kdb_serial.c + * PURPOSE: Serial driver + * + * PROGRAMMERS: Victor Kirhenshtein (sauros(a)iname.com) + * Jason Filby (jasonfilby(a)yahoo.com) + * arty */ -/* - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/dbg/kdb_serial.c - * PURPOSE: Serial driver - * PROGRAMMER: Original: - * Victor Kirhenshtein (sauros(a)iname.com) - * Jason Filby (jasonfilby(a)yahoo.com) - * Modified: - * arty - */ /* INCLUDES ****************************************************************/ _____ Modified: trunk/reactos/ntoskrnl/dbg/kdb_stabs.c --- trunk/reactos/ntoskrnl/dbg/kdb_stabs.c 2005-01-26 13:54:53 UTC (rev 13310) +++ trunk/reactos/ntoskrnl/dbg/kdb_stabs.c 2005-01-26 13:58:37 UTC (rev 13311) @@ -1,29 +1,12 @@ -/* - * ReactOS kernel - * Copyright (C) 2004 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +/* $Id:$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: ntoskrnl/dbg/kdb_stabs.c + * PURPOSE: Stabs functions... + * + * PROGRAMMERS: Gregor Anich (blight(a)blight.eu.org) */ -/* - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/dbg/kdb_stabs.c - * PURPOSE: Stabs functions... - * PROGRAMMER: Gregor Anich (blight(a)blight.eu.org) - * REVISION HISTORY: - * 2004/06/27: Created - */ #include <ddk/ntddk.h> #include <roscfg.h> _____ Modified: trunk/reactos/ntoskrnl/dbg/kdb_symbols.c --- trunk/reactos/ntoskrnl/dbg/kdb_symbols.c 2005-01-26 13:54:53 UTC (rev 13310) +++ trunk/reactos/ntoskrnl/dbg/kdb_symbols.c 2005-01-26 13:58:37 UTC (rev 13311) @@ -1,22 +1,4 @@ /* - * ReactOS kernel - * Copyright (C) 1998-2004 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* * Parts of this file based on work Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. * @@ -44,13 +26,15 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -/* - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/dbg/kdb_symbols.c - * PURPOSE: Getting symbol information... - * PROGRAMMER: David Welch (welch(a)cwcom.net), ... - * REVISION HISTORY: - * ??/??/??: Created + +/* $Id:$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: ntoskrnl/dbg/kdb_symbols.c + * PURPOSE: Getting symbol information... + * + * PROGRAMMERS: David Welch (welch(a)cwcom.net) */ /* INCLUDES *****************************************************************/ _____ Modified: trunk/reactos/ntoskrnl/dbg/print.c --- trunk/reactos/ntoskrnl/dbg/print.c 2005-01-26 13:54:53 UTC (rev 13310) +++ trunk/reactos/ntoskrnl/dbg/print.c 2005-01-26 13:58:37 UTC (rev 13311) @@ -1,31 +1,11 @@ -/* - * ReactOS kernel - * Copyright (C) 1998, 1999, 2000, 2001 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ /* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/dbg/print.c - * PURPOSE: Debug output - * PROGRAMMER: Eric Kohl (ekohl(a)abo.rhein-zeitung.de) - * PORTABILITY: Unchecked - * UPDATE HISTORY: - * 14/10/99: Created + * PURPOSE: Debug output + * + * PROGRAMMERS: Eric Kohl (ekohl(a)abo.rhein-zeitung.de) */ /* INCLUDES *****************************************************************/ _____ Modified: trunk/reactos/ntoskrnl/dbg/profile.c --- trunk/reactos/ntoskrnl/dbg/profile.c 2005-01-26 13:54:53 UTC (rev 13310) +++ trunk/reactos/ntoskrnl/dbg/profile.c 2005-01-26 13:58:37 UTC (rev 13311) @@ -1,28 +1,11 @@ -/* - * ReactOS kernel - * Copyright (C) 1998-2003 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* +/* $Id:$ + * + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/dbg/profile.c * PURPOSE: Kernel profiling - * PROGRAMMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) - * UPDATE HISTORY: - * Created 12/01/2003 + * + * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) */ /* INCLUDES *****************************************************************/ _____ Modified: trunk/reactos/ntoskrnl/dbg/rdebug.c --- trunk/reactos/ntoskrnl/dbg/rdebug.c 2005-01-26 13:54:53 UTC (rev 13310) +++ trunk/reactos/ntoskrnl/dbg/rdebug.c 2005-01-26 13:58:37 UTC (rev 13311) @@ -1,30 +1,11 @@ -/* - * ReactOS kernel - * Copyright (C) 1998, 1999, 2000, 2001 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ /* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/dbg/rdebug.c * PURPOSE: Runtime debugging support - * PROGRAMMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) - * UPDATE HISTORY: - * 01-05-2001 CSH Created + * + * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) */ /* INCLUDES *****************************************************************/ _____ Modified: trunk/reactos/ntoskrnl/dbg/user.c --- trunk/reactos/ntoskrnl/dbg/user.c 2005-01-26 13:54:53 UTC (rev 13310) +++ trunk/reactos/ntoskrnl/dbg/user.c 2005-01-26 13:58:37 UTC (rev 13311) @@ -1,27 +1,11 @@ -/* - * ReactOS kernel - * Copyright (C) 1998, 1999, 2000, 2001 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* +/* $Id:$ + * + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/dbg/user.c * PURPOSE: User mode debugging - * PROGRAMMER: David Welch (welch(a)cwcom.net) - * PORTABILITY: Unchecked + * + * PROGRAMMERS: David Welch (welch(a)cwcom.net) */ /* INCLUDES ******************************************************************/ _____ Modified: trunk/reactos/ntoskrnl/ex/btree.c --- trunk/reactos/ntoskrnl/ex/btree.c 2005-01-26 13:54:53 UTC (rev 13310) +++ trunk/reactos/ntoskrnl/ex/btree.c 2005-01-26 13:58:37 UTC (rev 13311) @@ -1,28 +1,11 @@ -/* - * ReactOS kernel - * Copyright (C) 1998-2002 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* +/* $Id:$ + * + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: btree.c + * FILE: ntoskrnl/ex/btree.c * PURPOSE: Binary tree support - * PROGRAMMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) - * UPDATE HISTORY: - * 15-03-2002 CSH Created + * + * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) */ #include <ntoskrnl.h> _____ Modified: trunk/reactos/ntoskrnl/ex/callback.c --- trunk/reactos/ntoskrnl/ex/callback.c 2005-01-26 13:54:53 UTC (rev 13310) +++ trunk/reactos/ntoskrnl/ex/callback.c 2005-01-26 13:58:37 UTC (rev 13311) @@ -1,34 +1,17 @@ -/* - * ReactOS kernel - * Copyright (C) 1998, 1999, 2000, 2001 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ /* $Id$ * + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/ex/callback.c * PURPOSE: Executive callbacks - * PROGRAMMER: David Welch (welch(a)mcmail.com) + * + * PROGRAMMERS: David Welch (welch(a)mcmail.com) * Alex Ionescu (alex(a)relsoft.net) - * PORTABILITY: Checked. - * UPDATE HISTORY: - * Added all functions 30/05/04 - * Created 22/05/98 - * NOTE: - * These funtions are not implemented in NT4, but + */ + + +/* + * NOTE: These funtions are not implemented in NT4, but * they are implemented in Win2k. */ _____ Modified: trunk/reactos/ntoskrnl/ex/event.c --- trunk/reactos/ntoskrnl/ex/event.c 2005-01-26 13:54:53 UTC (rev 13310) +++ trunk/reactos/ntoskrnl/ex/event.c 2005-01-26 13:58:37 UTC (rev 13311) @@ -1,28 +1,11 @@ -/* - * ReactOS kernel - * Copyright (C) 1998, 1999, 2000, 2001 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* +/* $Id:$ + * + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/nt/event.c * PURPOSE: Named event support - * PROGRAMMER: Philip Susi and David Welch - * UPDATE HISTORY: - * Created 22/05/98 + * + * PROGRAMMERS: Philip Susi and David Welch */ /* INCLUDES *****************************************************************/ _____ Modified: trunk/reactos/ntoskrnl/ex/evtpair.c --- trunk/reactos/ntoskrnl/ex/evtpair.c 2005-01-26 13:54:53 UTC (rev 13310) +++ trunk/reactos/ntoskrnl/ex/evtpair.c 2005-01-26 13:58:37 UTC (rev 13311) @@ -4,13 +4,9 @@ * PROJECT: ReactOS kernel * FILE: ntoskrnl/ex/evtpair.c * PURPOSE: Support for event pairs - * PROGRAMMER: David Welch (welch(a)mcmail.com) - * UPDATE HISTORY: - * Created 22/05/98 - * Updated 09/08/2003 by Skywing (skywing(a)valhallalegends.com) - * to correctly maintain ownership of the dispatcher lock - * between KeSetEvent and KeWaitForSingleObject calls. - * Additionally, implemented the thread-eventpair routines. + * + * PROGRAMMERS: David Welch (welch(a)mcmail.com) + * Skywing (skywing(a)valhallalegends.com) */ /* INCLUDES *****************************************************************/ _____ Modified: trunk/reactos/ntoskrnl/ex/fmutex.c --- trunk/reactos/ntoskrnl/ex/fmutex.c 2005-01-26 13:54:53 UTC (rev 13310) +++ trunk/reactos/ntoskrnl/ex/fmutex.c 2005-01-26 13:58:37 UTC (rev 13311) @@ -1,30 +1,11 @@ -/* - * ReactOS kernel - * Copyright (C) 1998, 1999, 2000, 2001 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ /* $Id$ * + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/ex/fmutex.c * PURPOSE: Implements fast mutexes - * PROGRAMMER: David Welch (welch(a)cwcom.net) - * PORTABILITY: Checked. - * UPDATE HISTORY: - * Created 22/05/98 + * + * PROGRAMMERS: David Welch (welch(a)cwcom.net) */ /* INCLUDES *****************************************************************/ _____ Modified: trunk/reactos/ntoskrnl/ex/hashtab.c --- trunk/reactos/ntoskrnl/ex/hashtab.c 2005-01-26 13:54:53 UTC (rev 13310) +++ trunk/reactos/ntoskrnl/ex/hashtab.c 2005-01-26 13:58:37 UTC (rev 13311) @@ -1,32 +1,19 @@ -/* - * ReactOS kernel - * Copyright (C) 1998-2002 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* +/* $Id:$ + * + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: hashtab.c + * FILE: ntoskrnl/ex/hashtab.c * PURPOSE: Hash table support - * PROGRAMMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * + * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) + */ + +/* * NOTES: The hash function is from: * Bob Jenkins <bob_jenkins(a)burtleburtle.net> * http://burtleburtle.net/bob/hash/doobs.html - * UPDATE HISTORY: - * 15-03-2002 CSH Created */ + #include <ntoskrnl.h> #define NDEBUG _____ Modified: trunk/reactos/ntoskrnl/ex/i386/interlck.c --- trunk/reactos/ntoskrnl/ex/i386/interlck.c 2005-01-26 13:54:53 UTC (rev 13310) +++ trunk/reactos/ntoskrnl/ex/i386/interlck.c 2005-01-26 13:58:37 UTC (rev 13311) @@ -1,8 +1,13 @@ /* $Id$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: ntoskrnl/ex/i386/interlck.c + * PURPOSE: No purpose listed. * - * reactos/ntoskrnl/ex/i386/interlck.c - * + * PROGRAMMERS: No programmer listed. */ + #include <ntoskrnl.h> #ifdef LOCK _____ Modified: trunk/reactos/ntoskrnl/ex/init.c --- trunk/reactos/ntoskrnl/ex/init.c 2005-01-26 13:54:53 UTC (rev 13310) +++ trunk/reactos/ntoskrnl/ex/init.c 2005-01-26 13:58:37 UTC (rev 13311) @@ -1,29 +1,11 @@ -/* - * ReactOS kernel - * Copyright (C) 1998, 1999, 2000, 2001 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* +/* $Id:$ + * + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: kernel/ex/init.c - * PURPOSE: executive initalization - * PROGRAMMER: Eric Kohl (ekohl(a)abo.rhein-zeitung.de) - * PORTABILITY: Checked. - * UPDATE HISTORY: - * Created 11/09/99 + * FILE: ntoskrnl/ex/init.c + * PURPOSE: Executive initalization + * + * PROGRAMMERS: Eric Kohl (ekohl(a)abo.rhein-zeitung.de) */ #include <ntoskrnl.h> _____ Modified: trunk/reactos/ntoskrnl/ex/interlck.c [truncated at 1000 lines; 5911 more skipped]

19 years, 7 months

[weiden] 13310: fixed usage of NtQueryDirectoryObject()

by weiden＠svn.reactos.com

fixed usage of NtQueryDirectoryObject() Modified: trunk/reactos/apps/utils/objdir/objdir.c _____ Modified: trunk/reactos/apps/utils/objdir/objdir.c --- trunk/reactos/apps/utils/objdir/objdir.c 2005-01-26 13:54:07 UTC (rev 13309) +++ trunk/reactos/apps/utils/objdir/objdir.c 2005-01-26 13:54:53 UTC (rev 13310) @@ -79,10 +79,14 @@ return "STATUS_PATH_SYNTAX_BAD"; case STATUS_NO_MORE_ENTRIES: return "STATUS_NO_MORE_ENTRIES"; + case STATUS_MORE_ENTRIES: + return "STATUS_MORE_ENTRIES"; case STATUS_ACCESS_DENIED: return "STATUS_ACCESS_DENIED"; case STATUS_UNSUCCESSFUL: return "STATUS_UNSUCCESSFUL"; + case STATUS_INVALID_HANDLE: + return "STATUS_INVALID_HANDLE"; } sprintf (RawValue, "0x%08lx", Status); return (const char *) RawValue; @@ -173,8 +177,9 @@ OBJECT_ATTRIBUTES ObjectAttributes; NTSTATUS Status; HANDLE DirectoryHandle; - BYTE DirectoryEntry [MAX_DIR_ENTRY * sizeof(OBJECT_DIRECTORY_INFORMATION)]; + BYTE DirectoryEntry [512]; POBJECT_DIRECTORY_INFORMATION pDirectoryEntry = (POBJECT_DIRECTORY_INFORMATION) DirectoryEntry; + POBJECT_DIRECTORY_INFORMATION pDirectoryEntries = (POBJECT_DIRECTORY_INFORMATION) DirectoryEntry; ULONG Context = 0; ULONG ReturnLength = 0; ULONG EntryCount = 0; @@ -217,25 +222,23 @@ return (FALSE); } printf ("\n Directory of %s\n\n", DirectoryNameA); + + for(;;) + { /* * Enumerate each item in the directory. */ Status = NtQueryDirectoryObject ( DirectoryHandle, - pDirectoryEntry, + pDirectoryEntries, sizeof DirectoryEntry, FALSE,/* ReturnSingleEntry */ - TRUE, /* RestartScan */ + FALSE, /* RestartScan */ & Context, & ReturnLength ); - if (!NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status) && Status != STATUS_NO_MORE_ENTRIES) { - if (STATUS_NO_MORE_ENTRIES == Status) - { - NtClose (DirectoryHandle); - return TRUE; - } printf ( "Failed to query directory object (Status: %s)\n", StatusToName (Status) @@ -243,12 +246,17 @@ NtClose (DirectoryHandle); return (FALSE); } - while (0 != pDirectoryEntry->ObjectTypeName.Length) + if (Status == STATUS_NO_MORE_ENTRIES) { + break; + } + pDirectoryEntry = pDirectoryEntries; + while (EntryCount < Context) + { CHAR ObjectNameA [MAX_PATH]; CHAR TypeNameA [MAX_PATH]; CHAR TargetNameA [MAX_PATH]; - + if (0 == wcscmp (L"SymbolicLink", pDirectoryEntry->ObjectTypeName.Buffer)) { if (TRUE == ExpandSymbolicLink ( @@ -258,7 +266,7 @@ ) ) { - + printf ( "%-16s %s -> %s\n", RawUszAsz (pDirectoryEntry->ObjectTypeName.Buffer, TypeNameA), @@ -283,9 +291,10 @@ RawUszAsz (pDirectoryEntry->ObjectName.Buffer, ObjectNameA) ); } + ++ pDirectoryEntry; ++ EntryCount; - ++ pDirectoryEntry; } + }; printf ("\n\t%lu object(s)\n", EntryCount); /* * Free any resource.

19 years, 7 months

[weiden] 13309: fixed NtQueryDirectoryObject() to properly handle buffers that are not large enough

by weiden＠svn.reactos.com

fixed NtQueryDirectoryObject() to properly handle buffers that are not large enough Modified: trunk/reactos/ntoskrnl/ob/dirobj.c _____ Modified: trunk/reactos/ntoskrnl/ob/dirobj.c --- trunk/reactos/ntoskrnl/ob/dirobj.c 2005-01-26 13:52:53 UTC (rev 13308) +++ trunk/reactos/ntoskrnl/ob/dirobj.c 2005-01-26 13:54:07 UTC (rev 13309) @@ -231,6 +231,8 @@ ULONG RequiredSize = 0; ULONG nDirectories = 0; POBJECT_DIRECTORY_INFORMATION DirInfo = (POBJECT_DIRECTORY_INFORMATION)TemporaryBuffer; + + Status = STATUS_NO_MORE_ENTRIES; KeAcquireSpinLock(&Directory->Lock, &OldLevel); @@ -269,6 +271,8 @@ nDirectories++; RequiredSize += EntrySize; + + Status = STATUS_SUCCESS; if(ReturnSingleEntry) { @@ -287,11 +291,13 @@ RequiredSize += EntrySize; Status = STATUS_BUFFER_TOO_SMALL; } - else - { - /* just copy the entries that fit into the buffer */ - Status = STATUS_NO_MORE_ENTRIES; - } + + /* we couldn't query this entry, so leave the index that will be stored + in Context to this entry so the caller can query it the next time + he queries (hopefully with a buffer that is large enough then...) */ + NextEntry--; + + /* just copy the entries that fit into the buffer */ break; } } @@ -301,16 +307,18 @@ SkipEntries--; } } + + if(!ReturnSingleEntry && ListEntry != &Directory->head) + { + /* there are more entries to enumerate but the buffer is already full. + only tell this to the user if he queries multiple entries */ + Status = STATUS_MORE_ENTRIES; + } if(NT_SUCCESS(Status)) { - if(SkipEntries > 0 || nDirectories == 0) + if(nDirectories > 0) { - /* we skipped more entries than the directory contains, nothing more to do */ - Status = STATUS_NO_MORE_ENTRIES; - } - else - { _SEH_TRY { POBJECT_DIRECTORY_INFORMATION DestDirInfo = (POBJECT_DIRECTORY_INFORMATION)Buffer;

19 years, 7 months

[ekohl] 13308: Replace hardcoded values by known constants.

by ekohl＠svn.reactos.com

Replace hardcoded values by known constants. Modified: trunk/reactos/ntoskrnl/se/priv.c _____ Modified: trunk/reactos/ntoskrnl/se/priv.c --- trunk/reactos/ntoskrnl/se/priv.c 2005-01-26 13:48:38 UTC (rev 13307) +++ trunk/reactos/ntoskrnl/se/priv.c 2005-01-26 13:52:53 UTC (rev 13308) @@ -252,11 +252,11 @@ Privilege = 0; Status = SeCaptureLuidAndAttributesArray (RequiredPrivileges->Privilege, PrivilegeCount, - 1, + UserMode, + NULL, 0, - 0, + PagedPool, 1, - 1, &Privilege, &Length); if (!NT_SUCCESS(Status))

19 years, 7 months

[ekohl] 13307: - Replace NtQuerySystemTime by KeQuerySystemTime

by ekohl＠svn.reactos.com

- Replace NtQuerySystemTime by KeQuerySystemTime - Nt->Zw Modified: trunk/reactos/ntoskrnl/cm/import.c Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c Modified: trunk/reactos/ntoskrnl/cm/regfile.c Modified: trunk/reactos/ntoskrnl/cm/regobj.c _____ Modified: trunk/reactos/ntoskrnl/cm/import.c --- trunk/reactos/ntoskrnl/cm/import.c 2005-01-26 12:47:38 UTC (rev 13306) +++ trunk/reactos/ntoskrnl/cm/import.c 2005-01-26 13:48:38 UTC (rev 13307) @@ -233,7 +233,7 @@ OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = NtCreateKey (&HardwareKey, + Status = ZwCreateKey (&HardwareKey, KEY_ALL_ACCESS, &ObjectAttributes, 0, @@ -245,7 +245,7 @@ DPRINT1("NtCreateKey() failed, status: 0x%x\n", Status); return FALSE; } - NtClose (HardwareKey); + ZwClose (HardwareKey); /* Create '\Registry\Machine\HARDWARE\DESCRIPTION' key. */ RtlInitUnicodeString(&KeyName, @@ -255,7 +255,7 @@ OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = NtCreateKey (&HardwareKey, + Status = ZwCreateKey (&HardwareKey, KEY_ALL_ACCESS, &ObjectAttributes, 0, @@ -267,7 +267,7 @@ DPRINT1("NtCreateKey() failed, status: 0x%x\n", Status); return FALSE; } - NtClose (HardwareKey); + ZwClose (HardwareKey); /* Create '\Registry\Machine\HARDWARE\DEVICEMAP' key. */ RtlInitUnicodeString (&KeyName, @@ -277,7 +277,7 @@ OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = NtCreateKey (&HardwareKey, + Status = ZwCreateKey (&HardwareKey, KEY_ALL_ACCESS, &ObjectAttributes, 0, @@ -289,7 +289,7 @@ DPRINT1("NtCreateKey() failed, status: 0x%x\n", Status); return FALSE; } - NtClose (HardwareKey); + ZwClose (HardwareKey); /* Create '\Registry\Machine\HARDWARE\RESOURCEMAP' key. */ RtlInitUnicodeString(&KeyName, @@ -299,7 +299,7 @@ OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = NtCreateKey (&HardwareKey, + Status = ZwCreateKey (&HardwareKey, KEY_ALL_ACCESS, &ObjectAttributes, 0, @@ -311,7 +311,7 @@ DPRINT1("NtCreateKey() failed, status: 0x%x\n", Status); return FALSE; } - NtClose (HardwareKey); + ZwClose (HardwareKey); return TRUE; } _____ Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c --- trunk/reactos/ntoskrnl/cm/ntfunc.c 2005-01-26 12:47:38 UTC (rev 13306) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c 2005-01-26 13:48:38 UTC (rev 13307) @@ -30,23 +30,22 @@ */ NTSTATUS STDCALL CmRegisterCallback(IN PEX_CALLBACK_FUNCTION Function, - IN PVOID Context, - IN OUT PLARGE_INTEGER Cookie - ) + IN PVOID Context, + IN OUT PLARGE_INTEGER Cookie) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } + /* * @unimplemented */ - NTSTATUS STDCALL -CmUnRegisterCallback(IN LARGE_INTEGER Cookie) +CmUnRegisterCallback(IN LARGE_INTEGER Cookie) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } @@ -1640,7 +1639,7 @@ KeyCell->Flags |= REG_KEY_LINK_CELL; } - ZwQuerySystemTime (&KeyCell->LastWriteTime); + KeQuerySystemTime (&KeyCell->LastWriteTime); CmiMarkBlockDirty (RegistryHive, KeyObject->KeyCellOffset); ExReleaseResourceLite(&CmiRegistryLock); @@ -1685,7 +1684,7 @@ KeyObject->KeyCellOffset, ValueName); - ZwQuerySystemTime (&KeyObject->KeyCell->LastWriteTime); + KeQuerySystemTime (&KeyObject->KeyCell->LastWriteTime); CmiMarkBlockDirty (KeyObject->RegistryHive, KeyObject->KeyCellOffset); /* Release hive lock */ @@ -1749,7 +1748,7 @@ if (Buffer == NULL) return STATUS_INSUFFICIENT_RESOURCES; - Status = NtQueryObject (FileObjectAttributes->RootDirectory, + Status = ZwQueryObject (FileObjectAttributes->RootDirectory, ObjectNameInformation, Buffer, BufferSize, _____ Modified: trunk/reactos/ntoskrnl/cm/regfile.c --- trunk/reactos/ntoskrnl/cm/regfile.c 2005-01-26 12:47:38 UTC (rev 13306) +++ trunk/reactos/ntoskrnl/cm/regfile.c 2005-01-26 13:48:38 UTC (rev 13307) @@ -71,7 +71,7 @@ RootKeyCell->CellSize = -sizeof(KEY_CELL); RootKeyCell->Id = REG_KEY_CELL_ID; RootKeyCell->Flags = REG_KEY_ROOT_CELL | REG_KEY_NAME_PACKED; - ZwQuerySystemTime(&RootKeyCell->LastWriteTime); + KeQuerySystemTime(&RootKeyCell->LastWriteTime); RootKeyCell->ParentKeyOffset = 0; RootKeyCell->NumberOfSubKeys = 0; RootKeyCell->HashTableOffset = -1; @@ -1939,7 +1939,7 @@ &RegistryHive->LogFileName); /* Update hive header modification time */ - ZwQuerySystemTime(&RegistryHive->HiveHeader->DateModified); + KeQuerySystemTime(&RegistryHive->HiveHeader->DateModified); /* Start log update */ Status = CmiStartLogUpdate(RegistryHive); @@ -2436,7 +2436,7 @@ { NewKeyCell->Id = REG_KEY_CELL_ID; NewKeyCell->Flags = 0; - ZwQuerySystemTime(&NewKeyCell->LastWriteTime); + KeQuerySystemTime(&NewKeyCell->LastWriteTime); NewKeyCell->ParentKeyOffset = -1; NewKeyCell->NumberOfSubKeys = 0; NewKeyCell->HashTableOffset = -1; @@ -2552,7 +2552,7 @@ ParentKeyCell->NumberOfSubKeys++; } - ZwQuerySystemTime (&ParentKeyCell->LastWriteTime); + KeQuerySystemTime (&ParentKeyCell->LastWriteTime); CmiMarkBlockDirty (RegistryHive, ParentKey->KeyCellOffset); return(Status); @@ -2710,7 +2710,7 @@ } } - ZwQuerySystemTime(&ParentKey->KeyCell->LastWriteTime); + KeQuerySystemTime(&ParentKey->KeyCell->LastWriteTime); CmiMarkBlockDirty(ParentKey->RegistryHive, ParentKey->KeyCellOffset); } @@ -3210,7 +3210,7 @@ /* Update time of heap */ if (!IsNoFileHive(RegistryHive)) - ZwQuerySystemTime(&Bin->DateModified); + KeQuerySystemTime(&Bin->DateModified); } /* Destroy the value cell */ @@ -3219,7 +3219,7 @@ /* Update time of heap */ if (!IsNoFileHive(RegistryHive) && CmiGetCell (RegistryHive, ValueCellOffset, &Bin)) { - ZwQuerySystemTime(&Bin->DateModified); + KeQuerySystemTime(&Bin->DateModified); } return Status; @@ -3254,7 +3254,7 @@ RegistryHive->FileSize += BinSize; tmpBin->BinSize = BinSize; tmpBin->Unused1 = 0; - ZwQuerySystemTime(&tmpBin->DateModified); + KeQuerySystemTime(&tmpBin->DateModified); tmpBin->Unused2 = 0; DPRINT (" BinOffset %lx BinSize %lx\n", tmpBin->BinOffset,tmpBin->BinSize); @@ -3382,7 +3382,7 @@ return STATUS_UNSUCCESSFUL; } - ZwQuerySystemTime(&Bin->DateModified); + KeQuerySystemTime(&Bin->DateModified); CmiMarkBlockDirty(RegistryHive, RegistryHive->FreeListOffset[i]); if ((i + 1) < RegistryHive->FreeListSize) @@ -3471,7 +3471,7 @@ /* Update time of heap */ if (!IsNoFileHive(RegistryHive) && CmiGetCell (RegistryHive, CellOffset,&pBin)) - ZwQuerySystemTime(&pBin->DateModified); + KeQuerySystemTime(&pBin->DateModified); CmiMarkBlockDirty(RegistryHive, CellOffset); } _____ Modified: trunk/reactos/ntoskrnl/cm/regobj.c --- trunk/reactos/ntoskrnl/cm/regobj.c 2005-01-26 12:47:38 UTC (rev 13306) +++ trunk/reactos/ntoskrnl/cm/regobj.c 2005-01-26 13:48:38 UTC (rev 13307) @@ -287,7 +287,7 @@ ParentKeyObject, KeyObject); - NtQuerySystemTime (&ParentKeyObject->KeyCell->LastWriteTime); + KeQuerySystemTime (&ParentKeyObject->KeyCell->LastWriteTime); CmiMarkBlockDirty (ParentKeyObject->RegistryHive, ParentKeyObject->KeyCellOffset);

19 years, 7 months

[weiden] 13306: securely access buffers in NtOpenDirectoryObject(), NtQueryDirectoryObject() and NtCreateDirectoryObject()

by weiden＠svn.reactos.com

securely access buffers in NtOpenDirectoryObject(), NtQueryDirectoryObject() and NtCreateDirectoryObject() Modified: trunk/reactos/ntoskrnl/ob/dirobj.c _____ Modified: trunk/reactos/ntoskrnl/ob/dirobj.c --- trunk/reactos/ntoskrnl/ob/dirobj.c 2005-01-26 05:00:08 UTC (rev 13305) +++ trunk/reactos/ntoskrnl/ob/dirobj.c 2005-01-26 12:47:38 UTC (rev 13306) @@ -47,65 +47,57 @@ IN ACCESS_MASK DesiredAccess, IN POBJECT_ATTRIBUTES ObjectAttributes) { - PVOID Object; - NTSTATUS Status; - - *DirectoryHandle = 0; + HANDLE hDirectory; + KPROCESSOR_MODE PreviousMode; + NTSTATUS Status = STATUS_SUCCESS; - Status = ObReferenceObjectByName(ObjectAttributes->ObjectName, - ObjectAttributes->Attributes, - NULL, - DesiredAccess, - ObDirectoryType, - UserMode, - NULL, - &Object); - if (!NT_SUCCESS(Status)) + PreviousMode = ExGetPreviousMode(); + + if(PreviousMode != KernelMode) + { + _SEH_TRY { - return Status; + ProbeForWrite(DirectoryHandle, + sizeof(HANDLE), + sizeof(ULONG)); } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(!NT_SUCCESS(Status)) + { + DPRINT1("NtOpenDirectoryObject failed, Status: 0x%x\n", Status); + return Status; + } + } - Status = ObCreateHandle(PsGetCurrentProcess(), - Object, - DesiredAccess, - FALSE, - DirectoryHandle); - return STATUS_SUCCESS; + Status = ObOpenObjectByName(ObjectAttributes, + ObDirectoryType, + NULL, + PreviousMode, + DesiredAccess, + NULL, + &hDirectory); + if(NT_SUCCESS(Status)) + { + _SEH_TRY + { + *DirectoryHandle = hDirectory; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + + return Status; } -static NTSTATUS -CopyDirectoryString(PUNICODE_STRING UnsafeTarget, PUNICODE_STRING Source, PUCHAR *Buffer) -{ - UNICODE_STRING Target; - NTSTATUS Status; - WCHAR NullWchar; - Target.Length = Source->Length; - Target.MaximumLength = (Source->Length + sizeof (WCHAR)); - Target.Buffer = (PWCHAR) *Buffer; - Status = MmCopyToCaller(UnsafeTarget, &Target, sizeof(UNICODE_STRING)); - if (! NT_SUCCESS(Status)) - { - return Status; - } - Status = MmCopyToCaller(*Buffer, Source->Buffer, Source->Length); - if (! NT_SUCCESS(Status)) - { - return Status; - } - *Buffer += Source->Length; - NullWchar = L'\0'; - Status = MmCopyToCaller(*Buffer, &NullWchar, sizeof(WCHAR)); - if (! NT_SUCCESS(Status)) - { - return Status; - } - *Buffer += sizeof(WCHAR); - - return STATUS_SUCCESS; -} - - /********************************************************************** * NAME EXPORTED * NtQueryDirectoryObject @@ -169,202 +161,229 @@ IN ULONG BufferLength, IN BOOLEAN ReturnSingleEntry, IN BOOLEAN RestartScan, - IN OUT PULONG UnsafeContext, - OUT PULONG UnsafeReturnLength OPTIONAL) + IN OUT PULONG Context, + OUT PULONG ReturnLength OPTIONAL) { - PDIRECTORY_OBJECT dir = NULL; - PLIST_ENTRY current_entry = NULL; - PLIST_ENTRY start_entry; - POBJECT_HEADER current = NULL; - NTSTATUS Status = STATUS_SUCCESS; - ULONG DirectoryCount = 0; - ULONG DirectoryIndex = 0; - POBJECT_DIRECTORY_INFORMATION current_odi = (POBJECT_DIRECTORY_INFORMATION) Buffer; - OBJECT_DIRECTORY_INFORMATION ZeroOdi; - PUCHAR FirstFree = (PUCHAR) Buffer; - ULONG Context; - ULONG RequiredSize; - ULONG NewValue; - KIRQL OldLevel; + PDIRECTORY_OBJECT Directory; + KPROCESSOR_MODE PreviousMode; + ULONG SkipEntries = 0; + ULONG NextEntry = 0; + NTSTATUS Status = STATUS_SUCCESS; + + PreviousMode = ExGetPreviousMode(); - DPRINT("NtQueryDirectoryObject(DirectoryHandle %x)\n", DirectoryHandle); - - /* Check Context is not NULL */ - if (NULL == UnsafeContext) + if(PreviousMode != KernelMode) + { + _SEH_TRY + { + /* a test showed that the Buffer pointer just has to be 16 bit aligned, + propably due to the fact that most information that needs to be copied + is unicode strings */ + ProbeForWrite(Buffer, + BufferLength, + sizeof(WCHAR)); + ProbeForWrite(Context, + sizeof(ULONG), + sizeof(ULONG)); + if(!RestartScan) { - return STATUS_INVALID_PARAMETER; + SkipEntries = *Context; } - - /* Reference the DIRECTORY_OBJECT */ - Status = ObReferenceObjectByHandle(DirectoryHandle, - DIRECTORY_QUERY, - ObDirectoryType, - UserMode, - (PVOID*)&dir, - NULL); - if (!NT_SUCCESS(Status)) + if(ReturnLength != NULL) { - return Status; + ProbeForWrite(ReturnLength, + sizeof(ULONG), + sizeof(ULONG)); } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; - KeAcquireSpinLock(&dir->Lock, &OldLevel); + if(!NT_SUCCESS(Status)) + { + DPRINT1("NtQueryDirectoryObject failed, Status: 0x%x\n", Status); + return Status; + } + } + else if(!RestartScan) + { + SkipEntries = *Context; + } + + Status = ObReferenceObjectByHandle(DirectoryHandle, + DIRECTORY_QUERY, + ObDirectoryType, + PreviousMode, + (PVOID*)&Directory, + NULL); + if(NT_SUCCESS(Status)) + { + PVOID TemporaryBuffer = ExAllocatePool(PagedPool, + BufferLength); + if(TemporaryBuffer != NULL) + { + POBJECT_HEADER EntryHeader; + PLIST_ENTRY ListEntry; + KIRQL OldLevel; + ULONG RequiredSize = 0; + ULONG nDirectories = 0; + POBJECT_DIRECTORY_INFORMATION DirInfo = (POBJECT_DIRECTORY_INFORMATION)TemporaryBuffer; - /* - * Optionally, skip over some entries at the start of the directory - * (use *ObjectIndex value) - */ - start_entry = dir->head.Flink; - if (! RestartScan) + KeAcquireSpinLock(&Directory->Lock, &OldLevel); + + for(ListEntry = Directory->head.Flink; + ListEntry != &Directory->head; + ListEntry = ListEntry->Flink) { - register ULONG EntriesToSkip; + NextEntry++; + if(SkipEntries == 0) + { + PUNICODE_STRING Name, Type; + ULONG EntrySize; - Status = MmCopyFromCaller(&Context, UnsafeContext, sizeof(ULONG)); - if (! NT_SUCCESS(Status)) - { - KeReleaseSpinLock(&dir->Lock, OldLevel); - ObDereferenceObject(dir); - return Status; - } - EntriesToSkip = Context; + EntryHeader = CONTAINING_RECORD(ListEntry, OBJECT_HEADER, Entry); - CHECKPOINT; - - for (; 0 != EntriesToSkip-- && start_entry != &dir->head; - start_entry = start_entry->Flink) - { - ; - } - if ((0 != EntriesToSkip) && (start_entry == &dir->head)) - { - KeReleaseSpinLock(&dir->Lock, OldLevel); - ObDereferenceObject(dir); - return STATUS_NO_MORE_ENTRIES; - } - } + /* calculate the size of the required buffer space for this entry */ + Name = (EntryHeader->Name.Length != 0 ? &EntryHeader->Name : NULL); + Type = &EntryHeader->ObjectType->TypeName; + EntrySize = sizeof(OBJECT_DIRECTORY_INFORMATION) + + ((Name != NULL) ? ((ULONG)Name->Length + sizeof(WCHAR)) : 0) + + (ULONG)EntryHeader->ObjectType->TypeName.Length + sizeof(WCHAR); - /* - * Compute number of entries that we will copy into the buffer and - * the total size of all entries (even if larger than the buffer size) - */ - DirectoryCount = 0; - /* For the end sentenil */ - RequiredSize = sizeof(OBJECT_DIRECTORY_INFORMATION); - for (current_entry = start_entry; - current_entry != &dir->head; - current_entry = current_entry->Flink) - { - current = CONTAINING_RECORD(current_entry, OBJECT_HEADER, Entry); + if(RequiredSize + EntrySize <= BufferLength) + { + /* the buffer is large enough to receive this entry. It would've + been much easier if the strings were directly appended to the + OBJECT_DIRECTORY_INFORMATION structured written into the buffer */ + if(Name != NULL) + DirInfo->ObjectName = *Name; + else + { + DirInfo->ObjectName.Length = DirInfo->ObjectName.MaximumLength = 0; + DirInfo->ObjectName.Buffer = NULL; + } + DirInfo->ObjectTypeName = *Type; - RequiredSize += sizeof(OBJECT_DIRECTORY_INFORMATION) + - current->Name.Length + sizeof(WCHAR) + - current->ObjectType->TypeName.Length + sizeof(WCHAR); - if (RequiredSize <= BufferLength && - (! ReturnSingleEntry || DirectoryCount < 1)) - { - DirectoryCount++; - } - } + nDirectories++; + RequiredSize += EntrySize; - /* - * If there's no room to even copy a single entry then return error - * status. - */ - if (0 == DirectoryCount && - !(IsListEmpty(&dir->head) && BufferLength >= RequiredSize)) - { - KeReleaseSpinLock(&dir->Lock, OldLevel); - ObDereferenceObject(dir); - if (NULL != UnsafeReturnLength) - { - Status = MmCopyToCaller(UnsafeReturnLength, &RequiredSize, sizeof(ULONG)); - } - return NT_SUCCESS(Status) ? STATUS_BUFFER_TOO_SMALL : Status; + if(ReturnSingleEntry) + { + /* we're only supposed to query one entry, so bail and copy the + strings to the buffer */ + break; + } + DirInfo++; + } + else + { + if(ReturnSingleEntry) + { + /* the buffer is too small, so return the number of bytes that + would've been required for this query */ + RequiredSize += EntrySize; + Status = STATUS_BUFFER_TOO_SMALL; + } + else + { + /* just copy the entries that fit into the buffer */ + Status = STATUS_NO_MORE_ENTRIES; + } + break; + } + } + else + { + /* skip the entry */ + SkipEntries--; + } } - /* - * Move FirstFree to point to the Unicode strings area - */ - FirstFree += (DirectoryCount + 1) * sizeof(OBJECT_DIRECTORY_INFORMATION); - - /* Scan the directory */ - current_entry = start_entry; - for (DirectoryIndex = 0; DirectoryIndex < DirectoryCount; DirectoryIndex++) + if(NT_SUCCESS(Status)) { - current = CONTAINING_RECORD(current_entry, OBJECT_HEADER, Entry); + if(SkipEntries > 0 || nDirectories == 0) + { + /* we skipped more entries than the directory contains, nothing more to do */ + Status = STATUS_NO_MORE_ENTRIES; + } + else + { + _SEH_TRY + { + POBJECT_DIRECTORY_INFORMATION DestDirInfo = (POBJECT_DIRECTORY_INFORMATION)Buffer; + PWSTR strbuf = (PWSTR)((POBJECT_DIRECTORY_INFORMATION)Buffer + nDirectories); - /* - * Copy the current directory entry's data into the buffer - * and update the OBJDIR_INFORMATION entry in the array. - */ - /* --- Object's name --- */ - Status = CopyDirectoryString(&current_odi->ObjectName, &current->Name, &FirstFree); - if (! NT_SUCCESS(Status)) - { - KeReleaseSpinLock(&dir->Lock, OldLevel); - ObDereferenceObject(dir); - return Status; - } - /* --- Object type's name --- */ - Status = CopyDirectoryString(&current_odi->ObjectTypeName, &current->ObjectType->TypeName, &FirstFree); - if (! NT_SUCCESS(Status)) - { - KeReleaseSpinLock(&dir->Lock, OldLevel); - ObDereferenceObject(dir); - return Status; - } + /* copy all OBJECT_DIRECTORY_INFORMATION structures to the buffer and + just append all strings (whose pointers are stored in the buffer!) + and replace the pointers */ + for(DirInfo = (POBJECT_DIRECTORY_INFORMATION)TemporaryBuffer; + nDirectories > 0; + nDirectories--, DirInfo++, DestDirInfo++) + { + if(DirInfo->ObjectName.Length > 0) + { + DestDirInfo->ObjectName.Length = DirInfo->ObjectName.Length; + DestDirInfo->ObjectName.MaximumLength = DirInfo->ObjectName.MaximumLength; + DestDirInfo->ObjectName.Buffer = strbuf; + RtlCopyMemory(strbuf, + DirInfo->ObjectName.Buffer, + DirInfo->ObjectName.Length); + /* NULL-terminate the string */ + strbuf[DirInfo->ObjectName.Length / sizeof(WCHAR)] = L'\0'; + strbuf += (DirInfo->ObjectName.Length / sizeof(WCHAR)) + 1; + } + + DestDirInfo->ObjectTypeName.Length = DirInfo->ObjectTypeName.Length; + DestDirInfo->ObjectTypeName.MaximumLength = DirInfo->ObjectTypeName.MaximumLength; + DestDirInfo->ObjectTypeName.Buffer = strbuf; + RtlCopyMemory(strbuf, + DirInfo->ObjectTypeName.Buffer, + DirInfo->ObjectTypeName.Length); + /* NULL-terminate the string */ + strbuf[DirInfo->ObjectTypeName.Length / sizeof(WCHAR)] = L'\0'; + strbuf += (DirInfo->ObjectTypeName.Length / sizeof(WCHAR)) + 1; + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + } - /* Next entry in the array */ - current_odi++; - /* Next object in the directory */ - current_entry = current_entry->Flink; - } + KeReleaseSpinLock(&Directory->Lock, OldLevel); + ObDereferenceObject(Directory); + + ExFreePool(TemporaryBuffer); - /* - * Don't need dir object anymore - */ - KeReleaseSpinLock(&dir->Lock, OldLevel); - ObDereferenceObject(dir); - - /* Terminate with all zero entry */ - memset(&ZeroOdi, '\0', sizeof(OBJECT_DIRECTORY_INFORMATION)); - Status = MmCopyToCaller(current_odi, &ZeroOdi, sizeof(OBJECT_DIRECTORY_INFORMATION)); - if (! NT_SUCCESS(Status)) + if(NT_SUCCESS(Status) || ReturnSingleEntry) { - return Status; + _SEH_TRY + { + *Context = NextEntry; + if(ReturnLength != NULL) + { + *ReturnLength = RequiredSize; + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; } - - /* - * Store current index in Context - */ - if (RestartScan) - { - Context = DirectoryCount; - } + } else - { - Context += DirectoryCount; - } - Status = MmCopyToCaller(UnsafeContext, &Context, sizeof(ULONG)); - if (! NT_SUCCESS(Status)) - { - return Status; - } - - /* - * Report to the caller how much bytes - * we wrote in the user buffer. - */ - if (NULL != UnsafeReturnLength) - { - NewValue = FirstFree - (PUCHAR) Buffer; - Status = MmCopyToCaller(UnsafeReturnLength, &NewValue, sizeof(ULONG)); - if (! NT_SUCCESS(Status)) - { - return Status; - } - } - - return Status; + { + Status = STATUS_INSUFFICIENT_RESOURCES; + } + } + + return Status; } @@ -396,43 +415,69 @@ IN ACCESS_MASK DesiredAccess, IN POBJECT_ATTRIBUTES ObjectAttributes) { - PDIRECTORY_OBJECT DirectoryObject; - NTSTATUS Status; - + PDIRECTORY_OBJECT Directory; + HANDLE hDirectory; + KPROCESSOR_MODE PreviousMode; + NTSTATUS Status = STATUS_SUCCESS; + DPRINT("NtCreateDirectoryObject(DirectoryHandle %x, " - "DesiredAccess %x, ObjectAttributes %x, " - "ObjectAttributes->ObjectName %wZ)\n", - DirectoryHandle, DesiredAccess, ObjectAttributes, - ObjectAttributes->ObjectName); + "DesiredAccess %x, ObjectAttributes %x\n", + DirectoryHandle, DesiredAccess, ObjectAttributes); - Status = NtOpenDirectoryObject (DirectoryHandle, - DesiredAccess, - ObjectAttributes); + PreviousMode = ExGetPreviousMode(); - if (Status == STATUS_OBJECT_NAME_NOT_FOUND) + if(PreviousMode != KernelMode) { - Status = ObCreateObject (ExGetPreviousMode(), - ObDirectoryType, - ObjectAttributes, - ExGetPreviousMode(), - NULL, - sizeof(DIRECTORY_OBJECT), - 0, - 0, - (PVOID*)&DirectoryObject); - if (!NT_SUCCESS(Status)) - { - return Status; - } + _SEH_TRY + { + ProbeForWrite(DirectoryHandle, + sizeof(HANDLE), + sizeof(ULONG)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; - Status = ObInsertObject ((PVOID)DirectoryObject, - NULL, - DesiredAccess, - 0, - NULL, - DirectoryHandle); + if(!NT_SUCCESS(Status)) + { + DPRINT1("NtCreateDirectoryObject failed, Status: 0x%x\n", Status); + return Status; + } + } - ObDereferenceObject(DirectoryObject); + Status = ObCreateObject(PreviousMode, + ObDirectoryType, + ObjectAttributes, + PreviousMode, + NULL, + sizeof(DIRECTORY_OBJECT), + 0, + 0, + (PVOID*)&Directory); + if(NT_SUCCESS(Status)) + { + Status = ObInsertObject((PVOID)Directory, + NULL, + DesiredAccess, + 0, + NULL, + &hDirectory); + ObDereferenceObject(Directory); + + if(NT_SUCCESS(Status)) + { + _SEH_TRY + { + *DirectoryHandle = hDirectory; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } } return Status;

19 years, 7 months

[ion] 13305: Dynamic 3GB support, part 1. Only multiboot.S remains to be changed, all other parts of the Kernel now used KERNEL_BASE based on the command-line (Please don't use /3gb if you don't compile 3GB)

by ion＠svn.reactos.com

Dynamic 3GB support, part 1. Only multiboot.S remains to be changed, all other parts of the Kernel now used KERNEL_BASE based on the command-line (Please don't use /3gb if you don't compile 3GB) Modified: trunk/reactos/config Modified: trunk/reactos/ntoskrnl/include/internal/i386/mm.h Modified: trunk/reactos/ntoskrnl/ke/main.c Modified: trunk/reactos/ntoskrnl/mm/mminit.c _____ Modified: trunk/reactos/config --- trunk/reactos/config 2005-01-26 00:43:49 UTC (rev 13304) +++ trunk/reactos/config 2005-01-26 05:00:08 UTC (rev 13305) @@ -45,7 +45,7 @@ # # whether to use a 3GB User, 1GB Kernel memory map # -3GB := 1 +3GB := 0 # # Which version of NDIS do we support up to? _____ Modified: trunk/reactos/ntoskrnl/include/internal/i386/mm.h --- trunk/reactos/ntoskrnl/include/internal/i386/mm.h 2005-01-26 00:43:49 UTC (rev 13304) +++ trunk/reactos/ntoskrnl/include/internal/i386/mm.h 2005-01-26 05:00:08 UTC (rev 13305) @@ -23,14 +23,10 @@ #endif -#ifdef __3GB__ -#define KERNEL_BASE (0xC0000000) -#else -#define KERNEL_BASE (0x80000000) -#endif - #ifndef __ASM__ +#define KERNEL_BASE (ULONG)MmSystemRangeStart + #if defined(__GNUC__) #define FLUSH_TLB { \ @@ -65,6 +61,14 @@ #define PAGE_MASK(x) ((x)&(~0xfff)) #define PAE_PAGE_MASK(x) ((x)&(~0xfffLL)) +#else + +#ifdef __3GB__ +#define KERNEL_BASE (0xC0000000) +#else +#define KERNEL_BASE (0x80000000) +#endif + #endif /* ASSEMBLER */ #endif /* __NTOSKRNL_INCLUDE_INTERNAL_I386_MM_H */ _____ Modified: trunk/reactos/ntoskrnl/ke/main.c --- trunk/reactos/ntoskrnl/ke/main.c 2005-01-26 00:43:49 UTC (rev 13304) +++ trunk/reactos/ntoskrnl/ke/main.c 2005-01-26 05:00:08 UTC (rev 13305) @@ -691,6 +691,7 @@ /* Create the SystemRoot symbolic link */ CPRINT("CommandLine: %s\n", (PCHAR)KeLoaderBlock.CommandLine); + DPRINT1("MmSystemRangeStart: 0x%x\n", MmSystemRangeStart); Status = IoCreateSystemRootLink((PCHAR)KeLoaderBlock.CommandLine); if (!NT_SUCCESS(Status)) { @@ -953,6 +954,18 @@ } KeLoaderBlock.CommandLine = (ULONG)KeLoaderCommandLine; + /* Gotta check 3GB setting right *here* before we use KERNEL_BASE! */ + if (!_strnicmp(KeLoaderCommandLine, "3GB", 3)) { + + /* Use 3GB */ + MmSystemRangeStart = (PVOID)0xC0000000; + + } else { + + /* Use 2GB */ + MmSystemRangeStart = (PVOID)0x80000000; + } + strcpy(KeLoaderModuleStrings[0], "ntoskrnl.exe"); KeLoaderModules[0].String = (ULONG)KeLoaderModuleStrings[0]; KeLoaderModules[0].ModStart = KERNEL_BASE; _____ Modified: trunk/reactos/ntoskrnl/mm/mminit.c --- trunk/reactos/ntoskrnl/mm/mminit.c 2005-01-26 00:43:49 UTC (rev 13304) +++ trunk/reactos/ntoskrnl/mm/mminit.c 2005-01-26 05:00:08 UTC (rev 13305) @@ -324,10 +324,7 @@ KeLoaderBlock.MemHigher = (MaxMem - 1) * 1024; } - /* - * FIXME: Set this based on the system command line - */ - MmSystemRangeStart = (PVOID)KERNEL_BASE; // 0xC0000000 + /* Set memory limits */ MmUserProbeAddress = 0x7fff0000; MmHighestUserAddress = (PVOID)0x7ffeffff;

19 years, 7 months

← Newer
1
...
4
5
6
7
8
9
10
...
71
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2005