Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dreimer] 29937: Fix one bug in ssvn. Now it does checkout in %CD% not %CD%/reactos
by dreimer＠svn.reactos.org 28 Oct '07

28 Oct '07

Author: dreimer Date: Sun Oct 28 21:49:01 2007 New Revision: 29937 URL: http://svn.reactos.org/svn/reactos?rev=29937&view=rev Log: Fix one bug in ssvn. Now it does checkout in %CD% not %CD%/reactos Modified: trunk/tools/RosBE-Windows/Root/sSVN.cmd Modified: trunk/tools/RosBE-Windows/Root/sSVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/sSVN.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/sSVN.cmd (original) +++ trunk/tools/RosBE-Windows/Root/sSVN.cmd Sun Oct 28 21:49:01 2007 @@ -44,7 +44,7 @@ ) dir /b 2>nul|findstr "." >nul if errorlevel 1 ( - svn checkout svn://svn.reactos.org/reactos/trunk/reactos + svn checkout svn://svn.reactos.org/reactos/trunk/reactos . ) else ( echo ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED )

1 0

[fireball] 29936: - It seems Alex's code was half-right, the cache tables still have to be zeroed out. - Rename "Ncb" functions to "NameControlBlock" functions. - Finish implementing CmpGetNameControlBlock and fix some bugs in it. - Fix CmpDereferenceNameControlBlockWithLock. - Fix bugs in CmpCreateKeyControlBlock and other style changes. - Add new macros for NCB lock acquire/release (based on the KCB macros). - The code doesn't seem to crash anymore, it just dies in the ASSERTs Alex added for u
by fireball＠svn.reactos.org 28 Oct '07

28 Oct '07

Author: fireball Date: Sun Oct 28 21:46:09 2007 New Revision: 29936 URL: http://svn.reactos.org/svn/reactos?rev=29936&view=rev Log: - It seems Alex's code was half-right, the cache tables still have to be zeroed out. - Rename "Ncb" functions to "NameControlBlock" functions. - Finish implementing CmpGetNameControlBlock and fix some bugs in it. - Fix CmpDereferenceNameControlBlockWithLock. - Fix bugs in CmpCreateKeyControlBlock and other style changes. - Add new macros for NCB lock acquire/release (based on the KCB macros). - The code doesn't seem to crash anymore, it just dies in the ASSERTs Alex added for unimplemented code -- it would seem all the bugs are now fixed (or the code is behaving properly). Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cm_x.h branches/alex-cm-branch/reactos/ntoskrnl/cm/cmkcbncb.c Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cm_x.h URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cm_x.h (original) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cm_x.h Sun Oct 28 21:46:09 2007 @@ -221,6 +221,15 @@ } // +// Exclusively acquires an NCB by key +// +#define CmpAcquireNcbLockExclusiveByKey(k) \ +{ \ + ExAcquirePushLockExclusive(&GET_HASH_ENTRY(CmpNameCacheTable, \ + (k)).Lock); \ +} + +// // Releases an exlusively or shared acquired NCB // #define CmpReleaseNcbLock(k) \ @@ -228,3 +237,12 @@ ExReleasePushLock(&GET_HASH_ENTRY(CmpNameCacheTable, \ (k)->ConvKey).Lock); \ } + +// +// Releases an exlusively or shared acquired NCB by key +// +#define CmpReleaseNcbLockByKey(k) \ +{ \ + ExReleasePushLock(&GET_HASH_ENTRY(CmpNameCacheTable, \ + (k)).Lock); \ +} Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmkcbncb.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cmkcbncb.c (original) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cmkcbncb.c Sun Oct 28 21:46:09 2007 @@ -110,6 +110,9 @@ KeBugCheckEx(CONFIG_INITIALIZATION_FAILED, 3, 1, 0, 0); } + /* Zero out the table */ + RtlZeroMemory(CmpCacheTable, Length); + /* Initialize the locks */ for (i = 0;i < CmpHashTableSize; i++) { @@ -128,6 +131,9 @@ KeBugCheckEx(CONFIG_INITIALIZATION_FAILED, 3, 3, 0, 0); } + /* Zero out the table */ + RtlZeroMemory(CmpNameCacheTable, Length); + /* Initialize the locks */ for (i = 0;i < CmpHashTableSize; i++) { @@ -272,18 +278,17 @@ return NULL; } -// FIXME: NEEDS COMPLETION PCM_NAME_CONTROL_BLOCK NTAPI -CmpGetNcb(IN PUNICODE_STRING NodeName) +CmpGetNameControlBlock(IN PUNICODE_STRING NodeName) { PCM_NAME_CONTROL_BLOCK Ncb = NULL; ULONG ConvKey = 0; PWCHAR p, pp; ULONG i; - BOOLEAN IsCompressed = TRUE, Found; + BOOLEAN IsCompressed = TRUE, Found = FALSE; PCM_NAME_HASH HashEntry; - ULONG Length; + ULONG Length, NcbSize; /* Loop the name */ p = NodeName->Buffer; @@ -312,6 +317,9 @@ IsCompressed = FALSE; } } + + /* Lock the NCB entry */ + CmpAcquireNcbLockExclusiveByKey(ConvKey); /* Get the hash entry */ HashEntry = GET_HASH_ENTRY(CmpNameCacheTable, ConvKey).Entry; @@ -352,21 +360,74 @@ } /* Next chars */ - //*p++; - //*pp++; + p++; + pp++; } } /* Check if we found a name */ if (Found) { - + /* Reference it */ + Ncb->RefCount++; } } /* Go to the next hash */ HashEntry = HashEntry->NextHash; } + + /* Check if we didn't find it */ + if (!Found) + { + /* Allocate one */ + NcbSize = FIELD_OFFSET(CM_NAME_CONTROL_BLOCK, Name) + Length; + Ncb = ExAllocatePoolWithTag(PagedPool, NcbSize, TAG_CM); + if (!Ncb) + { + /* Release the lock and fail */ + CmpReleaseNcbLockByKey(ConvKey); + return NULL; + } + + /* Clear it out */ + RtlZeroMemory(Ncb, NcbSize); + + /* Check if the name was compressed */ + if (IsCompressed) + { + /* Copy the compressed name */ + Ncb->Compressed = TRUE; + for (i = 0; i < Length; i++) + { + /* Copy Unicode to ANSI */ + ((PCHAR)Ncb->Name)[i] = (CHAR)RtlUpcaseUnicodeChar(NodeName->Buffer[i]); + } + } + else + { + /* Copy the name directly */ + Ncb->Compressed = FALSE; + for (i = 0; i < Length; i++) + { + /* Copy each unicode character */ + Ncb->Name[i] = RtlUpcaseUnicodeChar(NodeName->Buffer[i]); + } + } + + /* Setup the rest of the NCB */ + Ncb->ConvKey = ConvKey; + Ncb->RefCount++; + Ncb->NameLength = Length; + + /* Insert the name in the hash table */ + HashEntry = &Ncb->NameHash; + HashEntry->NextHash = GET_HASH_ENTRY(CmpNameCacheTable, ConvKey).Entry; + GET_HASH_ENTRY(CmpNameCacheTable, ConvKey).Entry = HashEntry; + } + + /* Release NCB lock */ + CmpReleaseNcbLockByKey(ConvKey); /* Return the NCB found */ return Ncb; @@ -446,9 +507,9 @@ VOID NTAPI -CmpDereferenceNcbWithLock(IN PCM_NAME_CONTROL_BLOCK Ncb) -{ - PCM_NAME_HASH Current, Next; +CmpDereferenceNameControlBlockWithLock(IN PCM_NAME_CONTROL_BLOCK Ncb) +{ + PCM_NAME_HASH Current, *Next; /* Lock the NCB */ CmpAcquireNcbLockExclusive(Ncb); @@ -457,20 +518,24 @@ if (!(--Ncb->RefCount)) { /* Find the NCB in the table */ - Next = GET_HASH_ENTRY(CmpNameCacheTable, Ncb->ConvKey).Entry; + Next = &GET_HASH_ENTRY(CmpNameCacheTable, Ncb->ConvKey).Entry; while (TRUE) { /* Check the current entry */ - Current = Next; + Current = *Next; ASSERT(Current != NULL); - if (Current == &Ncb->NameHash) break; + if (Current == &Ncb->NameHash) + { + /* Unlink it */ + *Next = Current->NextHash; + break; + } /* Get to the next one */ - Next = Current->NextHash; - } - - /* Found it, now unlink it and free it */ - Current->NextHash = Next->NextHash; + Next = &Current->NextHash; + } + + /* Found it, now free it */ ExFreePool(Ncb); } @@ -705,7 +770,7 @@ CmpCleanUpKcbValueCache(Kcb); /* Reference the NCB */ - CmpDereferenceNcbWithLock(Kcb->NameBlock); + CmpDereferenceNameControlBlockWithLock(Kcb->NameBlock); /* Check if we have an index hint block and free it */ if (Kcb->ExtFlags & CM_KCB_SUBKEY_HINT) ExFreePool(Kcb->IndexHint); @@ -957,12 +1022,16 @@ BOOLEAN IsFake, HashLock; PWCHAR p; - /* Make sure we own this hive */ - ASSERT(FALSE); - if (((PCMHIVE)Hive)->CreatorOwner != KeGetCurrentThread()) return NULL; + /* Make sure we own this hive in case it's being unloaded */ + if ((Hive->HiveFlags & HIVE_IS_UNLOADING) && + (((PCMHIVE)Hive)->CreatorOwner != KeGetCurrentThread())) + { + /* Fail */ + return NULL; + } /* Check if this is a fake KCB */ - IsFake = (BOOLEAN)(Flags & CMP_CREATE_FAKE_KCB); + IsFake = Flags & CMP_CREATE_FAKE_KCB ? TRUE : FALSE; /* If we have a parent, use its ConvKey */ if (Parent) ConvKey = Parent->ConvKey; @@ -986,7 +1055,7 @@ for (i = 0; i < NodeName.Length; i += sizeof(WCHAR)) { /* Make sure it's a valid character */ - if ((*p != OBJ_NAME_PATH_SEPARATOR) && (*p)) + if (*p != OBJ_NAME_PATH_SEPARATOR) { /* Add this key to the hash */ ConvKey = 37 * ConvKey + RtlUpcaseUnicodeChar(*p); @@ -1010,9 +1079,10 @@ Kcb->KeyCell = Index; Kcb->ConvKey = ConvKey; Kcb->DelayedCloseIndex = CmpDelayedCloseSize; + Kcb->InDelayClose = 0; /* Check if we have two hash entires */ - HashLock = (BOOLEAN)(Flags & CMP_LOCK_HASHES_FOR_KCB); + HashLock = Flags & CMP_LOCK_HASHES_FOR_KCB ? TRUE : FALSE; if (HashLock) { /* Not yet implemented */ @@ -1054,8 +1124,8 @@ CM_KCB_SUBKEY_HINT))) { /* Calculate the index hint */ - Kcb->SubKeyCount = Node->SubKeyCounts[0] + - Node->SubKeyCounts[1]; + Kcb->SubKeyCount = Node->SubKeyCounts[Stable] + + Node->SubKeyCounts[Volatile]; /* Cached information is now valid */ Kcb->ExtFlags &= ~CM_KCB_INVALID_CACHED_INFO; @@ -1100,7 +1170,7 @@ if (Kcb) { /* Get the NCB */ - Kcb->NameBlock = CmpGetNcb(&NodeName); + Kcb->NameBlock = CmpGetNameControlBlock(&NodeName); if (Kcb->NameBlock) { /* Fill it out */ @@ -1114,8 +1184,8 @@ if (IsFake) Kcb->ExtFlags |= CM_KCB_KEY_NON_EXIST; /* Setup the other data */ - Kcb->SubKeyCount = Node->SubKeyCounts[0] + - Node->SubKeyCounts[1]; + Kcb->SubKeyCount = Node->SubKeyCounts[Stable] + + Node->SubKeyCounts[Volatile]; Kcb->KcbLastWriteTime = Node->LastWriteTime; Kcb->KcbMaxNameLen = (USHORT)Node->MaxNameLen; Kcb->KcbMaxValueNameLen = (USHORT)Node->MaxValueNameLen; @@ -1133,6 +1203,9 @@ } } } + + /* Sanity check */ + ASSERT((!Kcb) || (Kcb->Delete == FALSE)); /* Check if we had locked the hashes */ if (HashLock)

1 0

[fireball] 29935: - Ugh, a few more leftovers... Hopefully nothing is forgotten now.
by fireball＠svn.reactos.org 28 Oct '07

28 Oct '07

Author: fireball Date: Sun Oct 28 21:36:09 2007 New Revision: 29935 URL: http://svn.reactos.org/svn/reactos?rev=29935&view=rev Log: - Ugh, a few more leftovers... Hopefully nothing is forgotten now. Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmwraprs.c Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmwraprs.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cmwraprs.c (original) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cmwraprs.c Sun Oct 28 21:36:09 2007 @@ -77,8 +77,8 @@ OUT PVOID Buffer, IN SIZE_T BufferLength) { - PEREGISTRY_HIVE CmHive = (PEREGISTRY_HIVE)RegistryHive; - HANDLE HiveHandle = FileType == HFILE_TYPE_PRIMARY ? CmHive->HiveHandle : CmHive->LogHandle; + PCMHIVE CmHive = (PCMHIVE)RegistryHive; + HANDLE HiveHandle = CmHive->FileHandles[FileType]; LARGE_INTEGER _FileOffset; IO_STATUS_BLOCK IoStatusBlock; NTSTATUS Status; @@ -97,8 +97,8 @@ IN PVOID Buffer, IN SIZE_T BufferLength) { - PEREGISTRY_HIVE CmHive = (PEREGISTRY_HIVE)RegistryHive; - HANDLE HiveHandle = FileType == HFILE_TYPE_PRIMARY ? CmHive->HiveHandle : CmHive->LogHandle; + PCMHIVE CmHive = (PCMHIVE)RegistryHive; + HANDLE HiveHandle = CmHive->FileHandles[FileType]; LARGE_INTEGER _FileOffset; IO_STATUS_BLOCK IoStatusBlock; NTSTATUS Status; @@ -116,8 +116,8 @@ IN ULONG FileSize, IN ULONG OldFileSize) { - PEREGISTRY_HIVE CmHive = (PEREGISTRY_HIVE)RegistryHive; - HANDLE HiveHandle = FileType == HFILE_TYPE_PRIMARY ? CmHive->HiveHandle : CmHive->LogHandle; + PCMHIVE CmHive = (PCMHIVE)RegistryHive; + HANDLE HiveHandle = CmHive->FileHandles[FileType]; FILE_END_OF_FILE_INFORMATION EndOfFileInfo; FILE_ALLOCATION_INFORMATION FileAllocationInfo; IO_STATUS_BLOCK IoStatusBlock; @@ -149,8 +149,8 @@ IN OUT PLARGE_INTEGER FileOffset, IN ULONG Length) { - PEREGISTRY_HIVE CmHive = (PEREGISTRY_HIVE)RegistryHive; - HANDLE HiveHandle = FileType == HFILE_TYPE_PRIMARY ? CmHive->HiveHandle : CmHive->LogHandle; + PCMHIVE CmHive = (PCMHIVE)RegistryHive; + HANDLE HiveHandle = CmHive->FileHandles[FileType]; IO_STATUS_BLOCK IoStatusBlock; NTSTATUS Status;

1 0

[fireball] 29934: Forgot one file..
by fireball＠svn.reactos.org 28 Oct '07

28 Oct '07

Author: fireball Date: Sun Oct 28 21:23:40 2007 New Revision: 29934 URL: http://svn.reactos.org/svn/reactos?rev=29934&view=rev Log: Forgot one file.. Added: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmwraprs.c (with props) Added: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmwraprs.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cmwraprs.c (added) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cmwraprs.c Sun Oct 28 21:23:40 2007 @@ -1,0 +1,159 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/config/cmwraprs.c + * PURPOSE: Configuration Manager - Wrappers for Hive Operations + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include "ntoskrnl.h" +#include "cm.h" +#define NDEBUG +#include "debug.h" + +/* FUNCTIONS *****************************************************************/ + +NTSTATUS +NTAPI +CmpCreateEvent(IN EVENT_TYPE EventType, + OUT PHANDLE EventHandle, + OUT PKEVENT *Event) +{ + NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + + /* Create the event */ + InitializeObjectAttributes(&ObjectAttributes, + NULL, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + NULL, + NULL); + Status = ZwCreateEvent(EventHandle, + EVENT_ALL_ACCESS, + &ObjectAttributes, + EventType, + FALSE); + if (!NT_SUCCESS(Status)) return Status; + + /* Get a pointer to the object itself */ + Status = ObReferenceObjectByHandle(*EventHandle, + EVENT_ALL_ACCESS, + NULL, + KernelMode, + (PVOID*)Event, + NULL); + if (!NT_SUCCESS(Status)) ZwClose(*EventHandle); + + /* Return status */ + return Status; +} + +PVOID +NTAPI +CmpAllocate(IN ULONG Size, + IN BOOLEAN Paged, + IN ULONG Tag) +{ + return ExAllocatePoolWithTag(Paged ? PagedPool : NonPagedPool, + Size, + Tag); +} + +VOID +NTAPI +CmpFree(IN PVOID Ptr, + IN ULONG Quota) +{ + ExFreePool(Ptr); +} + +BOOLEAN +NTAPI +CmpFileRead(IN PHHIVE RegistryHive, + IN ULONG FileType, + IN PULONG FileOffset, + OUT PVOID Buffer, + IN SIZE_T BufferLength) +{ + PEREGISTRY_HIVE CmHive = (PEREGISTRY_HIVE)RegistryHive; + HANDLE HiveHandle = FileType == HFILE_TYPE_PRIMARY ? CmHive->HiveHandle : CmHive->LogHandle; + LARGE_INTEGER _FileOffset; + IO_STATUS_BLOCK IoStatusBlock; + NTSTATUS Status; + + _FileOffset.QuadPart = *FileOffset; + Status = ZwReadFile(HiveHandle, 0, 0, 0, &IoStatusBlock, + Buffer, BufferLength, &_FileOffset, 0); + return NT_SUCCESS(Status) ? TRUE : FALSE; +} + +BOOLEAN +NTAPI +CmpFileWrite(IN PHHIVE RegistryHive, + IN ULONG FileType, + IN PULONG FileOffset, + IN PVOID Buffer, + IN SIZE_T BufferLength) +{ + PEREGISTRY_HIVE CmHive = (PEREGISTRY_HIVE)RegistryHive; + HANDLE HiveHandle = FileType == HFILE_TYPE_PRIMARY ? CmHive->HiveHandle : CmHive->LogHandle; + LARGE_INTEGER _FileOffset; + IO_STATUS_BLOCK IoStatusBlock; + NTSTATUS Status; + + _FileOffset.QuadPart = *FileOffset; + Status = ZwWriteFile(HiveHandle, 0, 0, 0, &IoStatusBlock, + Buffer, BufferLength, &_FileOffset, 0); + return NT_SUCCESS(Status) ? TRUE : FALSE; +} + +BOOLEAN +NTAPI +CmpFileSetSize(IN PHHIVE RegistryHive, + IN ULONG FileType, + IN ULONG FileSize, + IN ULONG OldFileSize) +{ + PEREGISTRY_HIVE CmHive = (PEREGISTRY_HIVE)RegistryHive; + HANDLE HiveHandle = FileType == HFILE_TYPE_PRIMARY ? CmHive->HiveHandle : CmHive->LogHandle; + FILE_END_OF_FILE_INFORMATION EndOfFileInfo; + FILE_ALLOCATION_INFORMATION FileAllocationInfo; + IO_STATUS_BLOCK IoStatusBlock; + NTSTATUS Status; + + EndOfFileInfo.EndOfFile.QuadPart = FileSize; + Status = ZwSetInformationFile(HiveHandle, + &IoStatusBlock, + &EndOfFileInfo, + sizeof(FILE_END_OF_FILE_INFORMATION), + FileEndOfFileInformation); + if (!NT_SUCCESS(Status)) return FALSE; + + FileAllocationInfo.AllocationSize.QuadPart = FileSize; + Status = ZwSetInformationFile(HiveHandle, + &IoStatusBlock, + &FileAllocationInfo, + sizeof(FILE_ALLOCATION_INFORMATION), + FileAllocationInformation); + if (!NT_SUCCESS(Status)) return FALSE; + + return TRUE; +} + +BOOLEAN +NTAPI +CmpFileFlush(IN PHHIVE RegistryHive, + IN ULONG FileType, + IN OUT PLARGE_INTEGER FileOffset, + IN ULONG Length) +{ + PEREGISTRY_HIVE CmHive = (PEREGISTRY_HIVE)RegistryHive; + HANDLE HiveHandle = FileType == HFILE_TYPE_PRIMARY ? CmHive->HiveHandle : CmHive->LogHandle; + IO_STATUS_BLOCK IoStatusBlock; + NTSTATUS Status; + + Status = ZwFlushBuffersFile(HiveHandle, &IoStatusBlock); + return NT_SUCCESS(Status) ? TRUE : FALSE; +} Propchange: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmwraprs.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[fireball] 29933: - Fix code that tried to get a KCB from the alloc page. - Fix code that wasn't using CM_DELAY_ALLOC for delay allocation entries, but was using CM_DELAYED_CLOSE_ENTRY instead. - Fix definition of CM_DELAYED_CLOSE_ENTRY. - Fill out the CmpMachineHiveList. - Fix various callers of list-entry functions which were sending inverted parameters (entry instead of head) - Implement CmpInitializeDelayedCloseTable to do some work that CmpInitializeCache used to do. - Implement new locking
by fireball＠svn.reactos.org 28 Oct '07

28 Oct '07

Author: fireball Date: Sun Oct 28 21:20:48 2007 New Revision: 29933 URL: http://svn.reactos.org/svn/reactos?rev=29933&view=rev Log: - Fix code that tried to get a KCB from the alloc page. - Fix code that wasn't using CM_DELAY_ALLOC for delay allocation entries, but was using CM_DELAYED_CLOSE_ENTRY instead. - Fix definition of CM_DELAYED_CLOSE_ENTRY. - Fill out the CmpMachineHiveList. - Fix various callers of list-entry functions which were sending inverted parameters (entry instead of head) - Implement CmpInitializeDelayedCloseTable to do some work that CmpInitializeCache used to do. - Implement new locking macro: CmpConvertKcbSharedToExclusive and use it. - Rename more functions to their real names, expanding "Kcb" to "KeyControlBlock" when necessary. - CmpInitializeCache: Calculate size based on hash table entries, not pointers to key hashes. The locks need to be initialized, not the whole structure zeroed out. - CmpFreeKeyControlBlock: Fix code that gets the KCB and removes it from the list -- it was missing. - CmpReferenceKeyControlBlock: * Use DelayedCloseIndex instead of "Delete". * Do not add + 1 to InterlockedIncrement's result - CmpDelayDerefKeyControlBlock: * Insert the entry at the tail, not the head. * Check if the worker is inactive, not if it's acvice. * Remove the KCB before freeing it. * Use DelayedCloseIndex, not delete. - CmpAllocateKeyControlBlock/CmpAllocateDelayItem: * Simplify and fix list lookup. * Simplify algorithm with a goto. - CmpDereferenceKeyControlBlockWithLock: * Make it actually decrement the reference count. * Use Delete flag instead of PrivateAlloc flag. Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cm.h branches/alex-cm-branch/reactos/ntoskrnl/cm/cm_x.h branches/alex-cm-branch/reactos/ntoskrnl/cm/cmdata.c branches/alex-cm-branch/reactos/ntoskrnl/cm/cminit.c branches/alex-cm-branch/reactos/ntoskrnl/cm/cmkcbncb.c branches/alex-cm-branch/reactos/ntoskrnl/cm/cmutil.c Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cm.h URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cm.h (original) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cm.h Sun Oct 28 21:20:48 2007 @@ -338,6 +338,15 @@ ULONG Reserved; PVOID AllocPage; } CM_ALLOC_PAGE, *PCM_ALLOC_PAGE; + +// +// Allocation Page Entry +// +typedef struct _CM_DELAY_ALLOC +{ + LIST_ENTRY ListEntry; + PCM_KEY_CONTROL_BLOCK Kcb; +} CM_DELAY_ALLOC, *PCM_DELAY_ALLOC; // // Delayed Close Entry @@ -574,7 +583,6 @@ { PWCHAR FileName; PWCHAR BaseName; - PWCHAR RegRootName; PCMHIVE CmHive; ULONG HHiveFlags; ULONG CmHiveFlags; @@ -582,7 +590,6 @@ BOOLEAN ThreadFinished; BOOLEAN ThreadStarted; BOOLEAN Allocate; - BOOLEAN WinPERequired; } HIVE_LIST_ENTRY, *PHIVE_LIST_ENTRY; // @@ -853,8 +860,6 @@ IN PSECURITY_DESCRIPTOR SecurityDescriptor ); -/* NOTE: This function declaration is currently duplicated in both */ -/* cm/cm.h and config/cm.h. TODO: Pick one single place to declare it. */ NTSTATUS NTAPI CmpOpenHiveFiles( @@ -919,7 +924,7 @@ VOID NTAPI -CmpDereferenceKcbWithLock( +CmpDereferenceKeyControlBlockWithLock( IN PCM_KEY_CONTROL_BLOCK Kcb, IN BOOLEAN LockHeldExclusively ); @@ -1285,7 +1290,7 @@ extern ULONG CmpConfigurationAreaSize; extern PCM_FULL_RESOURCE_DESCRIPTOR CmpConfigurationData; extern UNICODE_STRING CmTypeName[]; -extern HIVE_LIST_ENTRY CmpMachineHiveList[5]; +extern HIVE_LIST_ENTRY CmpMachineHiveList[]; extern UNICODE_STRING CmSymbolicLinkValueName; extern UNICODE_STRING CmpSystemStartOptions; extern UNICODE_STRING CmpLoadOptions; Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cm_x.h URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cm_x.h (original) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cm_x.h Sun Oct 28 21:20:48 2007 @@ -200,6 +200,18 @@ } // +// Converts a KCB lock +// +FORCEINLINE +VOID +CmpConvertKcbSharedToExclusive(IN PCM_KEY_CONTROL_BLOCK k) +{ + ASSERT(CmpIsKcbLockedExclusive(k) == FALSE); + CmpReleaseKcbLock(k); + CmpAcquireKcbLockExclusive(k); +} + +// // Exclusively acquires an NCB // #define CmpAcquireNcbLockExclusive(n) \ Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmdata.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cmdata.c (original) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cmdata.c Sun Oct 28 21:20:48 2007 @@ -38,7 +38,30 @@ EX_PUSH_LOCK CmpHiveListHeadLock, CmpLoadHiveLock; -HIVE_LIST_ENTRY CmpMachineHiveList[5]; +HIVE_LIST_ENTRY CmpMachineHiveList[] = +{ + { + L"HARDWARE", L"MACHINE\\", NULL, HIVE_VOLATILE, 0, NULL, FALSE, FALSE, FALSE + }, + { + L"SECURITY", L"MACHINE\\", NULL, 0, 0, NULL, FALSE, FALSE, FALSE + }, + { + L"SOFTWARE", L"MACHINE\\", NULL, 0, 0, NULL, FALSE, FALSE, FALSE + }, + { + L"SYSTEM", L"MACHINE\\", NULL, 0, 0, NULL, FALSE, FALSE, FALSE + }, + { + L"DEFAULT", L"USER\\.DEFAULT", NULL, 0, 1, NULL, FALSE, FALSE, FALSE + }, + { + L"SAM", L"MACHINE\\", NULL, HIVE_NOLAZYFLUSH, 0, NULL, FALSE, FALSE, FALSE + }, + { + NULL, NULL, 0, 0, 0, NULL, FALSE, FALSE, FALSE + } +}; UNICODE_STRING CmSymbolicLinkValueName = RTL_CONSTANT_STRING(L"SymbolicLinkValue"); Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cminit.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cminit.c (original) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cminit.c Sun Oct 28 21:20:48 2007 @@ -31,8 +31,6 @@ BOOLEAN CmSelfHeal, CmpSelfHeal; KGUARDED_MUTEX CmpSelfHealQueueLock; LIST_ENTRY CmpSelfHealQueueListHead; - -HIVE_LIST_ENTRY CmpMachineHiveList[]; EX_PUSH_LOCK CmpLoadHiveLock; @@ -335,8 +333,8 @@ ValueName.Length); Quickie: - /* Free the buffers */ - RtlFreeUnicodeString(&ValueName); + /* Free the buffers */ + RtlFreeUnicodeString(&ValueName); /* Close the key and return */ NtClose(KeyHandle); Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmkcbncb.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cmkcbncb.c (original) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cmkcbncb.c Sun Oct 28 21:20:48 2007 @@ -71,39 +71,72 @@ ASSERT(CmpDelayCloseWorkItemActive); /* FIXME: TODO */ -} - -VOID -NTAPI -CmpInitializeCache(VOID) -{ - ULONG Length; - - /* Calculate length for the table */ - Length = CmpHashTableSize * sizeof(PCM_KEY_HASH); - - /* Allocate it */ - CmpCacheTable = ExAllocatePoolWithTag(PagedPool, Length, TAG_CM); - if (!CmpCacheTable) KeBugCheck(CONFIG_INITIALIZATION_FAILED); - RtlZeroMemory(CmpCacheTable, Length); - - /* Calculate length for the name cache */ - Length = CmpHashTableSize * sizeof(PCM_NAME_HASH); - - /* Now allocate the name cache table */ - CmpNameCacheTable = ExAllocatePoolWithTag(PagedPool, Length, TAG_CM); - if (!CmpCacheTable) KeBugCheck(CONFIG_INITIALIZATION_FAILED); - RtlZeroMemory(CmpNameCacheTable, Length); + ASSERT(FALSE); +} + +VOID +NTAPI +CmpInitializeDelayedCloseTable(VOID) +{ /* Setup the delayed close lock */ KeInitializeGuardedMutex(&CmpDelayedCloseTableLock); /* Setup the work item */ ExInitializeWorkItem(&CmpDelayCloseWorkItem, CmpDelayCloseWorker, NULL); + + /* Setup the list head */ + InitializeListHead(&CmpDelayedLRUListHead); /* Setup the DPC and its timer */ KeInitializeDpc(&CmpDelayCloseDpc, CmpDelayCloseDpcRoutine, NULL); KeInitializeTimer(&CmpDelayCloseTimer); +} + +VOID +NTAPI +CmpInitializeCache(VOID) +{ + ULONG Length, i; + + /* Calculate length for the table */ + Length = CmpHashTableSize * sizeof(CM_KEY_HASH_TABLE_ENTRY); + + /* Allocate it */ + CmpCacheTable = ExAllocatePoolWithTag(PagedPool, Length, TAG_CM); + if (!CmpCacheTable) + { + /* Take the system down */ + KeBugCheckEx(CONFIG_INITIALIZATION_FAILED, 3, 1, 0, 0); + } + + /* Initialize the locks */ + for (i = 0;i < CmpHashTableSize; i++) + { + /* Setup the pushlock */ + ExInitializePushLock((PULONG_PTR)&CmpCacheTable[i].Lock); + } + + /* Calculate length for the name cache */ + Length = CmpHashTableSize * sizeof(CM_NAME_HASH_TABLE_ENTRY); + + /* Now allocate the name cache table */ + CmpNameCacheTable = ExAllocatePoolWithTag(PagedPool, Length, TAG_CM); + if (!CmpNameCacheTable) + { + /* Take the system down */ + KeBugCheckEx(CONFIG_INITIALIZATION_FAILED, 3, 3, 0, 0); + } + + /* Initialize the locks */ + for (i = 0;i < CmpHashTableSize; i++) + { + /* Setup the pushlock */ + ExInitializePushLock((PULONG_PTR)&CmpNameCacheTable[i].Lock); + } + + /* Setup the delayed close table */ + CmpInitializeDelayedCloseTable(); } VOID @@ -153,6 +186,7 @@ ASSERT(CmpDelayDerefKCBWorkItemActive); /* FIXME: TODO */ + ASSERT(FALSE); } VOID @@ -340,7 +374,7 @@ VOID NTAPI -CmpRemoveKcb(IN PCM_KEY_CONTROL_BLOCK Kcb) +CmpRemoveKeyControlBlock(IN PCM_KEY_CONTROL_BLOCK Kcb) { /* Make sure that the registry and KCB are utterly locked */ ASSERT((CmpIsKcbLockedExclusive(Kcb) == TRUE) || @@ -352,7 +386,7 @@ VOID NTAPI -CmpFreeKcb(IN PCM_KEY_CONTROL_BLOCK Kcb) +CmpFreeKeyControlBlock(IN PCM_KEY_CONTROL_BLOCK Kcb) { ULONG i; PCM_ALLOC_PAGE AllocPage; @@ -367,43 +401,47 @@ { /* Free it from the pool */ ExFreePool(Kcb); - } - else - { - /* Acquire the private allocation lock */ - KeAcquireGuardedMutex(&CmpAllocBucketLock); - - /* Sanity check on lock ownership */ - ASSERT((GET_HASH_ENTRY(CmpCacheTable, Kcb->ConvKey).Owner == - KeGetCurrentThread()) || - (CmpTestRegistryLockExclusive() == TRUE)); - - /* Remove us from the list */ - RemoveEntryList(&CmpFreeKCBListHead); - - /* Get the allocation page */ - AllocPage = (PCM_ALLOC_PAGE)((ULONG_PTR)Kcb & 0xFFFFF000); - - /* Sanity check */ - ASSERT(AllocPage->FreeCount != CM_KCBS_PER_PAGE); - - /* Increase free count */ - if (++AllocPage->FreeCount == CM_KCBS_PER_PAGE) - { - /* Loop all the entries */ - for (i = CM_KCBS_PER_PAGE; i; i--) - { - /* Remove the entry - RemoveEntryList(& */ - } - - /* Free the page */ - ExFreePool(AllocPage); - } - - /* Release the lock */ - KeReleaseGuardedMutex(&CmpAllocBucketLock); - } + return; + } + + /* Acquire the private allocation lock */ + KeAcquireGuardedMutex(&CmpAllocBucketLock); + + /* Sanity check on lock ownership */ + ASSERT((GET_HASH_ENTRY(CmpCacheTable, Kcb->ConvKey).Owner == + KeGetCurrentThread()) || + (CmpTestRegistryLockExclusive() == TRUE)); + + /* Add us to the free list */ + InsertTailList(&CmpFreeKCBListHead, &Kcb->FreeListEntry); + + /* Get the allocation page */ + AllocPage = (PCM_ALLOC_PAGE)((ULONG_PTR)Kcb & 0xFFFFF000); + + /* Sanity check */ + ASSERT(AllocPage->FreeCount != CM_KCBS_PER_PAGE); + + /* Increase free count */ + if (++AllocPage->FreeCount == CM_KCBS_PER_PAGE) + { + /* Loop all the entries */ + for (i = CM_KCBS_PER_PAGE; i; i--) + { + /* Get the KCB */ + Kcb = (PVOID)((ULONG_PTR)AllocPage + + FIELD_OFFSET(CM_ALLOC_PAGE, AllocPage) + + i * sizeof(CM_KEY_CONTROL_BLOCK)); + + /* Remove the entry */ + RemoveEntryList(&Kcb->FreeListEntry); + } + + /* Free the page */ + ExFreePool(AllocPage); + } + + /* Release the lock */ + KeReleaseGuardedMutex(&CmpAllocBucketLock); } VOID @@ -455,6 +493,7 @@ /* Get the entry and lock the table */ Entry = Kcb->DelayCloseEntry; + ASSERT(Entry); KeAcquireGuardedMutex(&CmpDelayedCloseTableLock); /* Remove the entry */ @@ -487,12 +526,11 @@ /* Set new delay size and remove the delete flag */ Kcb->DelayedCloseIndex = CmpDelayedCloseSize; - Kcb->Delete = FALSE; } BOOLEAN NTAPI -CmpReferenceKcb(IN PCM_KEY_CONTROL_BLOCK Kcb) +CmpReferenceKeyControlBlock(IN PCM_KEY_CONTROL_BLOCK Kcb) { /* Check if this is the KCB's first reference */ if (Kcb->RefCount == 0) @@ -503,36 +541,36 @@ /* Convert it to exclusive */ if (!CmpTryToConvertKcbSharedToExclusive(Kcb)) { - /* Set the delete flag */ - Kcb->Delete = TRUE; + /* Set the delayed close index so that we can be ignored */ + Kcb->DelayedCloseIndex = 1; /* Increase the reference count while we release the lock */ InterlockedIncrement((PLONG)&Kcb->RefCount); - - /* Sanity check, KCB should still be shared */ - ASSERT(CmpIsKcbLockedExclusive(Kcb) == FALSE); - - /* Release the current lock */ - CmpReleaseKcbLock(Kcb); - - /* Now acquire the lock in exclusive mode */ - CmpAcquireKcbLockExclusive(Kcb); + + /* Go from shared to exclusive */ + CmpConvertKcbSharedToExclusive(Kcb); /* Decrement the reference count; the lock is now held again */ InterlockedDecrement((PLONG)&Kcb->RefCount); - - /* Sanity check */ - ASSERT((Kcb->DelayedCloseIndex == CmpDelayedCloseSize) || - (Kcb->DelayedCloseIndex == 0)); - - /* Remove the delete flag */ - Kcb->Delete = FALSE; + + /* Check if we still control the index */ + if (Kcb->DelayedCloseIndex == 1) + { + /* Reset it */ + Kcb->DelayedCloseIndex = 0; + } + else + { + /* Sanity check */ + ASSERT((Kcb->DelayedCloseIndex == CmpDelayedCloseSize) || + (Kcb->DelayedCloseIndex == 0)); + } } } } /* Increase the reference count */ - if ((InterlockedIncrement((PLONG)&Kcb->RefCount) + 1) == 0) + if (InterlockedIncrement((PLONG)&Kcb->RefCount) == 0) { /* We've overflown to 64K references, bail out */ InterlockedDecrement((PLONG)&Kcb->RefCount); @@ -548,14 +586,8 @@ /* Convert it to exclusive */ if (!CmpTryToConvertKcbSharedToExclusive(Kcb)) { - /* Sanity check, KCB should still be shared */ - ASSERT(CmpIsKcbLockedExclusive(Kcb) == FALSE); - - /* Release the current lock */ - CmpReleaseKcbLock(Kcb); - - /* Now acquire the lock in exclusive mode */ - CmpAcquireKcbLockExclusive(Kcb); + /* Go from shared to exclusive */ + CmpConvertKcbSharedToExclusive(Kcb); } } @@ -569,7 +601,7 @@ VOID NTAPI -CmpDelayDerefKcb(IN PCM_KEY_CONTROL_BLOCK Kcb) +CmpDelayDerefKeyControlBlock(IN PCM_KEY_CONTROL_BLOCK Kcb) { USHORT OldRefCount, NewRefCount; LARGE_INTEGER Timeout; @@ -596,10 +628,10 @@ KeAcquireGuardedMutex(&CmpDelayDerefKCBLock); /* Insert the entry into the list */ - InsertHeadList(&CmpDelayDerefKCBListHead, &Entry->ListEntry); + InsertTailList(&CmpDelayDerefKCBListHead, &Entry->ListEntry); /* Check if we need to enable anything */ - if (CmpDelayDerefKCBWorkItemActive) + if (!CmpDelayDerefKCBWorkItemActive) { /* Yes, we have no work item, setup the interval */ Timeout.QuadPart = CmpDelayDerefKCBIntervalInSeconds * -10000000; @@ -651,7 +683,7 @@ } /* Dereference the KCB */ - CmpDelayDerefKcb(Kcb->ValueCache.RealKcb); + CmpDelayDerefKeyControlBlock(Kcb->ValueCache.RealKcb); Kcb->ExtFlags &= ~ CM_KCB_SYM_LINK_FOUND; } } @@ -680,15 +712,18 @@ /* Check if we were already deleted */ Parent = Kcb->ParentKcb; - if (!Kcb->Delete) CmpFreeKcb(Kcb); + if (!Kcb->Delete) CmpRemoveKeyControlBlock(Kcb); + + /* Free the KCB as well */ + CmpFreeKeyControlBlock(Kcb); /* Check if we have a parent */ if (Parent) { /* Dereference the parent */ - LockHeldExclusively ? CmpDereferenceKcbWithLock(Kcb, - LockHeldExclusively) : - CmpDelayDerefKcb(Kcb); + LockHeldExclusively ? + CmpDereferenceKeyControlBlockWithLock(Kcb,LockHeldExclusively) : + CmpDelayDerefKeyControlBlock(Kcb); } } @@ -748,8 +783,8 @@ OldRefCount); if (NewRefCount != OldRefCount) ASSERT(FALSE); - /* Remove the delete flag */ - Kcb->Delete = FALSE; + /* Reset the delayed close index */ + Kcb->DelayedCloseIndex = 0; /* Set up the close entry */ Kcb->DelayCloseEntry = Entry; @@ -778,9 +813,9 @@ PCM_KEY_CONTROL_BLOCK NTAPI -CmpAllocateKcb(VOID) -{ - PLIST_ENTRY ListHead, NextEntry; +CmpAllocateKeyControlBlock(VOID) +{ + PLIST_ENTRY NextEntry; PCM_KEY_CONTROL_BLOCK CurrentKcb; PCM_ALLOC_PAGE AllocPage; ULONG i; @@ -792,13 +827,12 @@ /* They are, acquire the bucket lock */ KeAcquireGuardedMutex(&CmpAllocBucketLock); - /* Loop the free KCB list */ - ListHead = &CmpFreeKCBListHead; - NextEntry = ListHead->Flink; - while (NextEntry != ListHead) + /* See if there's something on the free KCB list */ +SearchKcbList: + if (!IsListEmpty(&CmpFreeKCBListHead)) { /* Remove the entry */ - RemoveEntryList(NextEntry); + NextEntry = RemoveHeadList(&CmpFreeKCBListHead); /* Get the KCB */ CurrentKcb = CONTAINING_RECORD(NextEntry, @@ -833,39 +867,20 @@ for (i = 0; i < CM_KCBS_PER_PAGE; i++) { /* Get this entry */ - CurrentKcb = (PCM_KEY_CONTROL_BLOCK)(AllocPage + 1); + CurrentKcb = (PVOID)((ULONG_PTR)AllocPage + + FIELD_OFFSET(CM_ALLOC_PAGE, AllocPage) + + i * sizeof(CM_KEY_CONTROL_BLOCK)); /* Set it up */ CurrentKcb->PrivateAlloc = TRUE; CurrentKcb->DelayCloseEntry = NULL; - InsertHeadList(&CurrentKcb->FreeListEntry, - &CmpFreeKCBListHead); - } - - /* Get the KCB */ - CurrentKcb = CONTAINING_RECORD(NextEntry, - CM_KEY_CONTROL_BLOCK, - FreeListEntry); - - /* Get the allocation page */ - AllocPage = (PCM_ALLOC_PAGE)((ULONG_PTR)CurrentKcb & 0xFFFFF000); - - /* Decrease the free count */ - ASSERT(AllocPage->FreeCount != 0); - AllocPage->FreeCount--; - - /* Make sure this KCB is privately allocated */ - ASSERT(CurrentKcb->PrivateAlloc == 1); - - /* Release the allocation lock */ - KeReleaseGuardedMutex(&CmpAllocBucketLock); - - /* Return the KCB */ - return CurrentKcb; - } - - /* Release the lock */ - KeReleaseGuardedMutex(&CmpAllocBucketLock); + InsertHeadList(&CmpFreeKCBListHead, + &CurrentKcb->FreeListEntry); + } + + /* Now go back and search the list */ + goto SearchKcbList; + } } /* Allocate a KCB only */ @@ -885,33 +900,37 @@ VOID NTAPI -CmpDereferenceKcbWithLock(IN PCM_KEY_CONTROL_BLOCK Kcb, - IN BOOLEAN LockHeldExclusively) +CmpDereferenceKeyControlBlockWithLock(IN PCM_KEY_CONTROL_BLOCK Kcb, + IN BOOLEAN LockHeldExclusively) { /* Sanity check */ ASSERT((CmpIsKcbLockedExclusive(Kcb) == TRUE) || (CmpTestRegistryLockExclusive() == TRUE)); - /* Check if we should do a direct delete */ - if (((CmpHoldLazyFlush) && - !(Kcb->ExtFlags & CM_KCB_SYM_LINK_FOUND) && - !(Kcb->Flags & KEY_SYM_LINK)) || - (Kcb->ExtFlags & CM_KCB_NO_DELAY_CLOSE) || - (Kcb->PrivateAlloc)) - { - /* Clean up the KCB*/ - CmpCleanUpKcbCacheWithLock(Kcb, LockHeldExclusively); - } - else - { - /* Otherwise, use delayed close */ - CmpAddToDelayedClose(Kcb, LockHeldExclusively); - } -} - -VOID -NTAPI -CmpInitializeKcbKeyBodyList(IN PCM_KEY_CONTROL_BLOCK Kcb) + /* Check if this is the last reference */ + if (InterlockedDecrement((PLONG)&Kcb->RefCount) == 0) + { + /* Check if we should do a direct delete */ + if (((CmpHoldLazyFlush) && + !(Kcb->ExtFlags & CM_KCB_SYM_LINK_FOUND) && + !(Kcb->Flags & KEY_SYM_LINK)) || + (Kcb->ExtFlags & CM_KCB_NO_DELAY_CLOSE) || + (Kcb->Delete)) + { + /* Clean up the KCB*/ + CmpCleanUpKcbCacheWithLock(Kcb, LockHeldExclusively); + } + else + { + /* Otherwise, use delayed close */ + CmpAddToDelayedClose(Kcb, LockHeldExclusively); + } + } +} + +VOID +NTAPI +InitializeKCBKeyBodyList(IN PCM_KEY_CONTROL_BLOCK Kcb) { /* Initialize the list */ InitializeListHead(&Kcb->KeyBodyListHead); @@ -939,6 +958,7 @@ PWCHAR p; /* Make sure we own this hive */ + ASSERT(FALSE); if (((PCMHIVE)Hive)->CreatorOwner != KeGetCurrentThread()) return NULL; /* Check if this is a fake KCB */ @@ -977,11 +997,11 @@ } /* Allocate the KCB */ - Kcb = CmpAllocateKcb(); + Kcb = CmpAllocateKeyControlBlock(); if (!Kcb) return NULL; /* Initailize the key list */ - CmpInitializeKcbKeyBodyList(Kcb); + InitializeKCBKeyBodyList(Kcb); /* Set it up */ Kcb->Delete = FALSE; @@ -1007,9 +1027,9 @@ ASSERT(!FoundKcb->Delete); /* Free the one we allocated and reference this one */ - CmpFreeKcb(Kcb); + CmpFreeKeyControlBlock(Kcb); Kcb = FoundKcb; - if (!CmpReferenceKcb(Kcb)) + if (!CmpReferenceKeyControlBlock(Kcb)) { /* We got too many handles */ ASSERT(Kcb->RefCount + 1 != 0); @@ -1054,7 +1074,8 @@ if (Parent) { /* Reference the parent */ - if (((Parent->TotalLevels + 1) < 512) && (CmpReferenceKcb(Parent))) + if (((Parent->TotalLevels + 1) < 512) && + (CmpReferenceKeyControlBlock(Parent))) { /* Link it */ Kcb->ParentKcb = Parent; @@ -1063,8 +1084,8 @@ else { /* Remove the KCB and free it */ - CmpRemoveKcb(Kcb); - CmpFreeKcb(Kcb); + CmpRemoveKeyControlBlock(Kcb); + CmpFreeKeyControlBlock(Kcb); Kcb = NULL; } } @@ -1103,11 +1124,11 @@ else { /* Dereference the KCB */ - CmpDereferenceKcbWithLock(Parent, FALSE); + CmpDereferenceKeyControlBlockWithLock(Parent, FALSE); /* Remove the KCB and free it */ - CmpRemoveKcb(Kcb); - CmpFreeKcb(Kcb); + CmpRemoveKeyControlBlock(Kcb); + CmpFreeKeyControlBlock(Kcb); Kcb = NULL; } } Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmutil.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cmutil.c (original) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cmutil.c Sun Oct 28 21:20:48 2007 @@ -55,7 +55,7 @@ NTAPI CmpAllocateDelayItem(VOID) { - PCM_DELAYED_CLOSE_ENTRY Entry; + PCM_DELAY_ALLOC Entry; PCM_ALLOC_PAGE AllocPage; ULONG i; PLIST_ENTRY NextEntry; @@ -63,70 +63,69 @@ /* Lock the allocation buckets */ KeAcquireGuardedMutex(&CmpDelayAllocBucketLock); - while (TRUE) + + /* Look for an item on the free list */ +SearchList: + if (!IsListEmpty(&CmpFreeDelayItemsListHead)) { /* Get the current entry in the list */ - NextEntry = CmpFreeDelayItemsListHead.Flink; - - /* Check if we need to allocate an entry */ - if (((NextEntry) && (CmpFreeDelayItemsListHead.Blink) && - IsListEmpty(&CmpFreeDelayItemsListHead)) || - (!(NextEntry) && !(CmpFreeDelayItemsListHead.Blink))) + NextEntry = RemoveHeadList(&CmpFreeDelayItemsListHead); + + /* Grab the item */ + Entry = CONTAINING_RECORD(NextEntry, CM_DELAY_ALLOC, ListEntry); + + /* Clear the list */ + Entry->ListEntry.Flink = Entry->ListEntry.Blink = NULL; + + /* Grab the alloc page */ + AllocPage = (PCM_ALLOC_PAGE)((ULONG_PTR)Entry & 0xFFFFF000); + + /* Decrease free entries */ + ASSERT(AllocPage->FreeCount != 0); + AllocPage->FreeCount--; + + /* Release the lock */ + KeReleaseGuardedMutex(&CmpDelayAllocBucketLock); + return Entry; + } + + /* Allocate an allocation page */ + AllocPage = ExAllocatePoolWithTag(PagedPool, PAGE_SIZE, TAG_CM); + if (AllocPage) + { + /* Set default entries */ + AllocPage->FreeCount = CM_DELAYS_PER_PAGE; + + /* Loop each entry */ + for (i = 0; i < CM_DELAYS_PER_PAGE; i++) { - /* Allocate an allocation page */ - AllocPage = ExAllocatePoolWithTag(PagedPool, PAGE_SIZE, TAG_CM); - if (AllocPage) - { - /* Set default entries */ - AllocPage->FreeCount = CM_DELAYS_PER_PAGE; - - /* Loop each entry */ - for (i = 0; i < CM_DELAYS_PER_PAGE; i++) - { - /* Get this entry and link it */ - Entry = (PCM_DELAYED_CLOSE_ENTRY)(&AllocPage[i]); - InsertHeadList(&Entry->DelayedLRUList, - &CmpFreeDelayItemsListHead); - - /* Clear the KCB pointer */ - Entry->KeyControlBlock = NULL; - } - } - else - { - /* Release the lock */ - KeReleaseGuardedMutex(&CmpDelayAllocBucketLock); - return NULL; - } + /* Get this entry and link it */ + Entry = (PVOID)((ULONG_PTR)AllocPage + + FIELD_OFFSET(CM_ALLOC_PAGE, AllocPage) + + i * sizeof(CM_DELAY_ALLOC)); + InsertTailList(&CmpFreeDelayItemsListHead, + &Entry->ListEntry); + + /* Clear the KCB pointer */ + Entry->Kcb = NULL; } } - - /* Set the next item in the list */ - CmpFreeDelayItemsListHead.Flink = NextEntry->Flink; - NextEntry->Flink->Blink = &CmpFreeDelayItemsListHead; - NextEntry->Blink = NULL; - - /* Get the entry and the alloc page */ - Entry = CONTAINING_RECORD(NextEntry, - CM_DELAYED_CLOSE_ENTRY, - DelayedLRUList); - AllocPage = (PCM_ALLOC_PAGE)((ULONG_PTR)Entry & 0xFFFFF000); - - /* Decrease free entries */ - ASSERT(AllocPage->FreeCount != 0); - AllocPage->FreeCount--; - - /* Release the lock */ - KeReleaseGuardedMutex(&CmpDelayAllocBucketLock); - return Entry; + else + { + /* Release the lock */ + KeReleaseGuardedMutex(&CmpDelayAllocBucketLock); + return NULL; + } + + /* Do the search again */ + goto SearchList; } VOID NTAPI CmpFreeDelayItem(PVOID Entry) { - PCM_DELAYED_CLOSE_ENTRY AllocEntry = (PCM_DELAYED_CLOSE_ENTRY)Entry; - PCM_DELAYED_CLOSE_ENTRY *AllocTable; + PCM_DELAY_ALLOC AllocEntry = (PCM_DELAY_ALLOC)Entry; PCM_ALLOC_PAGE AllocPage; ULONG i; PAGED_CODE(); @@ -135,7 +134,7 @@ KeAcquireGuardedMutex(&CmpDelayAllocBucketLock); /* Add the entry at the end */ - InsertTailList(&CmpFreeDelayItemsListHead, &AllocEntry->DelayedLRUList); + InsertTailList(&CmpFreeDelayItemsListHead, &AllocEntry->ListEntry); /* Get the alloc page */ AllocPage = (PCM_ALLOC_PAGE)((ULONG_PTR)Entry & 0xFFFFF000); @@ -145,12 +144,13 @@ if (++AllocPage->FreeCount == CM_DELAYS_PER_PAGE) { /* Page is totally free now, loop each entry */ - AllocTable = (PCM_DELAYED_CLOSE_ENTRY*)&AllocPage->AllocPage; - for (i = CM_DELAYS_PER_PAGE; i; i--) + for (i = 0; i < CM_DELAYS_PER_PAGE; i++) { /* Get the entry and unlink it */ - AllocEntry = AllocTable[i]; - RemoveEntryList(&AllocEntry->DelayedLRUList); + AllocEntry = (PVOID)((ULONG_PTR)AllocPage + + FIELD_OFFSET(CM_ALLOC_PAGE, AllocPage) + + i * sizeof(CM_DELAY_ALLOC)); + RemoveEntryList(&AllocEntry->ListEntry); } /* Now free the page */

1 0

[fireball] 29932: - Sync cmname.c, cmboot.c, cmconfig.c, cmindex.c, cmdata.c, cmparse.c, cmcheck.c, cmkcbncb.c with ReactOS Config trunk, and rename some functions to their NT counterparts. - Sync cm.h and cm_x.h with ReactOS Config trunk. - Sync CmpInitializeHive with ReactOS Config trunk. - Add cmsecach.c, cmse.c, cmvalue.c, cmhardwr.c, cmhook.c, cmcontrol.c from ReactOS Config Trunk. - Add cmwraprs.c from ReactOS Config Trunk and remove duplicated functions in cmhive.c. - Fix GCC compilation
by fireball＠svn.reactos.org 28 Oct '07

28 Oct '07

Author: fireball Date: Sun Oct 28 19:54:05 2007 New Revision: 29932 URL: http://svn.reactos.org/svn/reactos?rev=29932&view=rev Log: - Sync cmname.c, cmboot.c, cmconfig.c, cmindex.c, cmdata.c, cmparse.c, cmcheck.c, cmkcbncb.c with ReactOS Config trunk, and rename some functions to their NT counterparts. - Sync cm.h and cm_x.h with ReactOS Config trunk. - Sync CmpInitializeHive with ReactOS Config trunk. - Add cmsecach.c, cmse.c, cmvalue.c, cmhardwr.c, cmhook.c, cmcontrol.c from ReactOS Config Trunk. - Add cmwraprs.c from ReactOS Config Trunk and remove duplicated functions in cmhive.c. - Fix GCC compilation errors (code was written in MSVC without ever attempting to compile in RosBE). Code now builds, but of course does not boot. - Fill ntapi.c with NT API Function Stubs for the registry system calls. - Sync code in cminit.c with ReactOS Config trunk, remove ACPI/Docking station code which is irrelevant to ReactOS, add reactos-specific hardware hive code, fix several missing functions and broken code in CmInitSystem1 (sync most of it from ReactOS config trunk). Added: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmboot.c (with props) branches/alex-cm-branch/reactos/ntoskrnl/cm/cmcheck.c (with props) branches/alex-cm-branch/reactos/ntoskrnl/cm/cmconfig.c (with props) branches/alex-cm-branch/reactos/ntoskrnl/cm/cmcontrl.c (with props) branches/alex-cm-branch/reactos/ntoskrnl/cm/cmdata.c (with props) branches/alex-cm-branch/reactos/ntoskrnl/cm/cmhook.c (with props) branches/alex-cm-branch/reactos/ntoskrnl/cm/cmparse.c (with props) branches/alex-cm-branch/reactos/ntoskrnl/cm/cmse.c (with props) branches/alex-cm-branch/reactos/ntoskrnl/cm/cmsecach.c (with props) branches/alex-cm-branch/reactos/ntoskrnl/cm/cmvalue.c (with props) branches/alex-cm-branch/reactos/ntoskrnl/cm/i386/ branches/alex-cm-branch/reactos/ntoskrnl/cm/i386/cmhardwr.c (with props) Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cm.h branches/alex-cm-branch/reactos/ntoskrnl/cm/cm_x.h (contents, props changed) branches/alex-cm-branch/reactos/ntoskrnl/cm/cmapi.c (contents, props changed) branches/alex-cm-branch/reactos/ntoskrnl/cm/cmhive.c (contents, props changed) branches/alex-cm-branch/reactos/ntoskrnl/cm/cmindex.c (contents, props changed) branches/alex-cm-branch/reactos/ntoskrnl/cm/cminfo.txt (contents, props changed) branches/alex-cm-branch/reactos/ntoskrnl/cm/cminit.c (contents, props changed) branches/alex-cm-branch/reactos/ntoskrnl/cm/cmkcbncb.c (contents, props changed) branches/alex-cm-branch/reactos/ntoskrnl/cm/cmname.c (contents, props changed) branches/alex-cm-branch/reactos/ntoskrnl/cm/cmobject.c (contents, props changed) branches/alex-cm-branch/reactos/ntoskrnl/cm/cmutil.c (contents, props changed) branches/alex-cm-branch/reactos/ntoskrnl/cm/ntapi.c (contents, props changed) [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cm.h URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cm_x.h URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmapi.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… Added: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmboot.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… Added: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmcheck.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… Added: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmconfig.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… Added: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmcontrl.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… Added: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmdata.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmhive.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… Added: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmhook.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmindex.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cminfo.txt URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cminit.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmkcbncb.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmname.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmobject.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… Added: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmparse.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… Added: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmse.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… Added: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmsecach.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmutil.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… Added: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmvalue.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… Added: branches/alex-cm-branch/reactos/ntoskrnl/cm/i386/cmhardwr.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/ntapi.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl…

1 0

[martinf] 29931: disable PHP search in Doxy docu, enable caller graphs and extract all
by martinf＠svn.reactos.org 28 Oct '07

28 Oct '07

Author: martinf Date: Sun Oct 28 19:21:06 2007 New Revision: 29931 URL: http://svn.reactos.org/svn/reactos?rev=29931&view=rev Log: disable PHP search in Doxy docu, enable caller graphs and extract all Modified: trunk/reactos/base/shell/explorer/Doxyfile Modified: trunk/reactos/base/shell/explorer/Doxyfile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/Doxyfi… ============================================================================== --- trunk/reactos/base/shell/explorer/Doxyfile (original) +++ trunk/reactos/base/shell/explorer/Doxyfile Sun Oct 28 19:21:06 2007 @@ -4,7 +4,7 @@ # Project related configuration options #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 -PROJECT_NAME = "ROS Explorer " +PROJECT_NAME = "ROS Explorer" PROJECT_NUMBER = OUTPUT_DIRECTORY = doxy-doc CREATE_SUBDIRS = NO @@ -37,7 +37,7 @@ #--------------------------------------------------------------------------- # Build related configuration options #--------------------------------------------------------------------------- -EXTRACT_ALL = NO +EXTRACT_ALL = YES EXTRACT_PRIVATE = NO EXTRACT_STATIC = NO EXTRACT_LOCAL_CLASSES = YES @@ -72,7 +72,7 @@ WARN_IF_UNDOCUMENTED = NO WARN_IF_DOC_ERROR = YES WARN_NO_PARAMDOC = NO -WARN_FORMAT = "$file:$line: $text " +WARN_FORMAT = "$file:$line: $text" WARN_LOGFILE = #--------------------------------------------------------------------------- # configuration options related to the input files @@ -223,7 +223,7 @@ INCLUDE_GRAPH = YES INCLUDED_BY_GRAPH = YES CALL_GRAPH = YES -CALLER_GRAPH = NO +CALLER_GRAPH = YES GRAPHICAL_HIERARCHY = YES DIRECTORY_GRAPH = YES DOT_IMAGE_FORMAT = png @@ -238,4 +238,4 @@ #--------------------------------------------------------------------------- # Configuration::additions related to the search engine #--------------------------------------------------------------------------- -SEARCHENGINE = YES +SEARCHENGINE = NO

1 0

[martinf] 29930: disable PHP search in Doxy docu
by martinf＠svn.reactos.org 28 Oct '07

28 Oct '07

Author: martinf Date: Sun Oct 28 19:19:37 2007 New Revision: 29930 URL: http://svn.reactos.org/svn/reactos?rev=29930&view=rev Log: disable PHP search in Doxy docu Modified: trunk/rosapps/winefile/Doxyfile Modified: trunk/rosapps/winefile/Doxyfile URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/Doxyfile?rev=2993… ============================================================================== --- trunk/rosapps/winefile/Doxyfile (original) +++ trunk/rosapps/winefile/Doxyfile Sun Oct 28 19:19:37 2007 @@ -72,7 +72,7 @@ WARN_IF_UNDOCUMENTED = NO WARN_IF_DOC_ERROR = YES WARN_NO_PARAMDOC = NO -WARN_FORMAT = "$file:$line: $text " +WARN_FORMAT = "$file:$line: $text " WARN_LOGFILE = #--------------------------------------------------------------------------- # configuration options related to the input files @@ -216,7 +216,7 @@ INCLUDE_GRAPH = YES INCLUDED_BY_GRAPH = YES CALL_GRAPH = YES -CALLER_GRAPH = NO +CALLER_GRAPH = YES GRAPHICAL_HIERARCHY = YES DIRECTORY_GRAPH = YES DOT_IMAGE_FORMAT = png @@ -231,4 +231,4 @@ #--------------------------------------------------------------------------- # Configuration::additions related to the search engine #--------------------------------------------------------------------------- -SEARCHENGINE = YES +SEARCHENGINE = NO

1 0

[gbrunmar] 29929: Made each service have its own pipe name as done in Windows
by gbrunmar＠svn.reactos.org 28 Oct '07

28 Oct '07

Author: gbrunmar Date: Sun Oct 28 17:13:03 2007 New Revision: 29929 URL: http://svn.reactos.org/svn/reactos?rev=29929&view=rev Log: Made each service have its own pipe name as done in Windows Modified: trunk/reactos/base/system/services/database.c trunk/reactos/dll/win32/advapi32/service/sctrl.c Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c (original) +++ trunk/reactos/base/system/services/database.c Sun Oct 28 17:13:03 2007 @@ -6,6 +6,7 @@ * COPYRIGHT: Copyright 2002-2006 Eric Kohl * Copyright 2006 Hervé Poussineau <hpoussin(a)reactos.org> * Copyright 2007 Ged Murphy <gedmurphy(a)reactos.org> + * Gregor Brunmar <gregor.brunmar(a)home.se> * */ @@ -692,9 +693,11 @@ STARTUPINFOW StartupInfo; UNICODE_STRING ImagePath; ULONG Type; + DWORD ServiceCurrent = 0; BOOL Result; NTSTATUS Status; DWORD dwError = ERROR_SUCCESS; + WCHAR NtControlPipeName[MAX_PATH + 1]; RtlInitUnicodeString(&ImagePath, NULL); @@ -723,8 +726,45 @@ DPRINT("ImagePath: '%S'\n", ImagePath.Buffer); DPRINT("Type: %lx\n", Type); - /* Create '\\.\pipe\net\NtControlPipe' instance */ - Service->ControlPipeHandle = CreateNamedPipeW(L"\\\\.\\pipe\\net\\NtControlPipe", + /* Get the service number */ + RtlZeroMemory(&QueryTable, + sizeof(QueryTable)); + + QueryTable[0].Name = L""; + QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_REQUIRED; + QueryTable[0].EntryContext = &ServiceCurrent; + + Status = RtlQueryRegistryValues(RTL_REGISTRY_CONTROL, + L"ServiceCurrent", + QueryTable, + NULL, + NULL); + + if (Status == STATUS_OBJECT_NAME_NOT_FOUND) + { + /* TODO: Create registry entry with correct write access */ + } + else if (!NT_SUCCESS(Status)) + { + DPRINT1("RtlQueryRegistryValues() failed (Status %lx)\n", Status); + return RtlNtStatusToDosError(Status); + } + else + { + ServiceCurrent++; + } + + Status = RtlWriteRegistryValue(RTL_REGISTRY_CONTROL, L"ServiceCurrent", L"", REG_DWORD, &ServiceCurrent, sizeof(ServiceCurrent)); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("RtlWriteRegistryValue() failed (Status %lx)\n", Status); + return RtlNtStatusToDosError(Status); + } + + /* Create '\\.\pipe\net\NtControlPipeXXX' instance */ + swprintf(NtControlPipeName, L"\\\\.\\pipe\\net\\NtControlPipe%u", ServiceCurrent); + Service->ControlPipeHandle = CreateNamedPipeW(NtControlPipeName, PIPE_ACCESS_DUPLEX, PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, 100, @@ -732,7 +772,7 @@ 4, 30000, NULL); - DPRINT("CreateNamedPipeW() done\n"); + DPRINT1("CreateNamedPipeW(%S) done\n", NtControlPipeName); if (Service->ControlPipeHandle == INVALID_HANDLE_VALUE) { DPRINT1("Failed to create control pipe!\n"); Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/sctrl.c (original) +++ trunk/reactos/dll/win32/advapi32/service/sctrl.c Sun Oct 28 17:13:03 2007 @@ -5,6 +5,7 @@ * PURPOSE: Service control manager functions * COPYRIGHT: Copyright 1999 Emanuele Aliberti * Copyright 2007 Ged Murphy <gedmurphy(a)reactos.org> + * Gregor Brunmar <gregor.brunmar(a)home.se> * */ @@ -197,14 +198,40 @@ { DWORD dwBytesWritten; DWORD dwState; - - if (!WaitNamedPipeW(L"\\\\.\\pipe\\net\\NtControlPipe", 15000)) - { - DPRINT1("WaitNamedPipe() failed (Error %lu)\n", GetLastError()); + DWORD dwServiceCurrent = 0; + NTSTATUS Status; + WCHAR NtControlPipeName[MAX_PATH + 1]; + RTL_QUERY_REGISTRY_TABLE QueryTable[2]; + + /* Get the service number and create the named pipe */ + RtlZeroMemory(&QueryTable, + sizeof(QueryTable)); + + QueryTable[0].Name = L""; + QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_REQUIRED; + QueryTable[0].EntryContext = &dwServiceCurrent; + + Status = RtlQueryRegistryValues(RTL_REGISTRY_CONTROL, + L"ServiceCurrent", + QueryTable, + NULL, + NULL); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("RtlQueryRegistryValues() failed (Status %lx)\n", Status); + return RtlNtStatusToDosError(Status); + } + + swprintf(NtControlPipeName, L"\\\\.\\pipe\\net\\NtControlPipe%u", dwServiceCurrent); + + if (!WaitNamedPipeW(NtControlPipeName, 15000)) + { + DPRINT1("WaitNamedPipe(%S) failed (Error %lu)\n", NtControlPipeName, GetLastError()); return ERROR_FAILED_SERVICE_CONTROLLER_CONNECT; } - *hPipe = CreateFileW(L"\\\\.\\pipe\\net\\NtControlPipe", + *hPipe = CreateFileW(NtControlPipeName, GENERIC_READ | GENERIC_WRITE, 0, NULL,

1 0

[arty] 29928: Fix memory map to kernel mode. Allow prep serial in kdcom (and stop clobbering the data miss handler). Clean up boot mapping a bit. Silence some boot time spam. Enable not present page handler (yes, this routing actually works). Scan physical memory on the (virtually 100%) chance that open firmware will somehow have a buggy implementation of the memory object, or we're on prep hardware. Initialize syscall trap early, so we can do DbgPrint.
by arty＠svn.reactos.org 28 Oct '07

28 Oct '07

Author: arty Date: Sun Oct 28 15:31:10 2007 New Revision: 29928 URL: http://svn.reactos.org/svn/reactos?rev=29928&view=rev Log: Fix memory map to kernel mode. Allow prep serial in kdcom (and stop clobbering the data miss handler). Clean up boot mapping a bit. Silence some boot time spam. Enable not present page handler (yes, this routing actually works). Scan physical memory on the (virtually 100%) chance that open firmware will somehow have a buggy implementation of the memory object, or we're on prep hardware. Initialize syscall trap early, so we can do DbgPrint. Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/loader.c trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c trunk/reactos/boot/freeldr/freeldr/include/reactos.h trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c trunk/reactos/drivers/base/kdcom/kdbg.c trunk/reactos/ntoskrnl/ke/freeldr.c trunk/reactos/ntoskrnl/ke/powerpc/kiinit.c trunk/reactos/ntoskrnl/mm/powerpc/pfault.c trunk/reactos/ntoskrnl/ntoskrnl_powerpc.lnk Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/powerpc/loader.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/powerpc/loader.c Sun Oct 28 15:31:10 2007 @@ -22,7 +22,9 @@ #define NDEBUG #include <debug.h> + #undef DbgPrint +#define DbgPrint printf extern PVOID KernelMemory; @@ -96,13 +98,11 @@ BaseAddress = (PVOID)((ULONG_PTR)BaseAddress - KSEG0_BASE + (ULONG)KernelMemory); } - DbgPrint("Exports: RtlImageDirectoryEntryToData\n"); ExportDir = (PIMAGE_EXPORT_DIRECTORY) RtlImageDirectoryEntryToData(BaseAddress, TRUE, IMAGE_DIRECTORY_ENTRY_EXPORT, &ExportDirSize); - DbgPrint("RtlImageDirectoryEntryToData done\n"); if (!ExportDir) { DbgPrint("LdrPEGetExportByName(): no export directory!\n"); @@ -202,7 +202,6 @@ if ((ULONG_PTR)Function >= (ULONG_PTR)ExportDir && (ULONG_PTR)Function < (ULONG_PTR)ExportDir + ExportDirSize) { - DbgPrint("Forward: %s\n", (PCHAR)Function); Function = LdrPEFixupForward((PCHAR)Function); if (Function == NULL) { @@ -323,16 +322,12 @@ PLOADER_MODULE ImportedModule; ULONG Size; - printf("Fixing up %x (%s)\n", DllBase, DllName); - /* Process each import module */ - DbgPrint("FixupImports: RtlImageDirectoryEntryToData\n"); ImportModuleDirectory = (PIMAGE_IMPORT_DESCRIPTOR) RtlImageDirectoryEntryToData(DllBase, TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, &Size); - DbgPrint("RtlImageDirectoryEntryToData done\n"); while (ImportModuleDirectory && ImportModuleDirectory->Name) { /* Check to make sure that import lib is kernel */ Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c Sun Oct 28 15:31:10 2007 @@ -301,6 +301,9 @@ } } +ULONG PpcPrepGetMemoryMap( PBIOS_MEMORY_MAP BiosMemoryMap, + ULONG MaxMemoryMapSize ); + /* * Get memory the proper openfirmware way */ @@ -319,7 +322,7 @@ printf("Returned data: %d\n", returned); if( returned == -1 ) { printf("getprop /memory[@reg] failed\n"); - return 0; + return PpcPrepGetMemoryMap( BiosMemoryMap, MaxMemoryMapSize ); } for( i = 0; i < returned; i++ ) { @@ -328,7 +331,7 @@ printf("\n"); for( i = 0; i < returned / 2; i++ ) { - BiosMemoryMap[slots].Type = 1/*MEMTYPE_USABLE*/; + BiosMemoryMap[slots].Type = BiosMemoryUsable; BiosMemoryMap[slots].BaseAddress = memdata[i*2]; BiosMemoryMap[slots].Length = memdata[i*2+1]; printf("MemoryMap[%d] = (%x:%x)\n", Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c Sun Oct 28 15:31:10 2007 @@ -123,18 +123,59 @@ while(1); } +typedef struct _ppc_map_set_t { + int mapsize; + int usecount; + ppc_map_info_t *info; +} ppc_map_set_t; + VOID NTAPI +FrLdrAddPageMapping(ppc_map_set_t *set, int proc, paddr_t phys, vaddr_t virt) +{ + int j; + paddr_t page = ROUND_DOWN(phys, (1<<PFN_SHIFT)); + if (virt == 0) + virt = page; + else + virt = ROUND_DOWN(virt, (1<<PFN_SHIFT)); + + for( j = 0; j < set->usecount; j++ ) + { + if(set->info[j].addr == page) return; + } + + if (!set->mapsize) + { + set->mapsize = 0x80; + set->info = MmAllocateMemory(0x80 * sizeof(*set->info)); + } + else if (set->mapsize <= set->usecount) + { + ppc_map_info_t *newinfo = MmAllocateMemory(set->mapsize * 2 * sizeof(*set->info)); + memcpy(newinfo, set->info, set->mapsize * sizeof(*set->info)); + MmFreeMemory(set->info); + set->info = newinfo; + set->mapsize *= 2; + } + + set->info[set->usecount].flags = MMU_ALL_RW; + set->info[set->usecount].proc = proc; + set->info[set->usecount].addr = virt; + set->info[set->usecount].phys = page; + set->usecount++; +} + +VOID +NTAPI FrLdrStartup(ULONG Magic) { - ULONG_PTR i, j, page, count; + ULONG_PTR i, tmp; PCHAR ModHeader; boot_infos_t *LocalBootInfo = &BootInfo; LocalBootInfo->dispFont = (font_char *)&LocalBootInfo[1]; LoaderBlock.ArchExtra = (ULONG)LocalBootInfo; - ppc_map_info_t *info = MmAllocateMemory(0x80 * sizeof(*info)); - - printf("FrLdrStartup(KernelEntry = %x)\n", KernelEntryPoint); + ppc_map_set_t memmap = { }; for(i = 0; i < LoaderBlock.ModsCount; i++) { @@ -145,85 +186,52 @@ (PCHAR)reactos_modules[i].String); } - printf("PpcInitializeMmu\n"); + /* We don't use long longs, but longs for the addresses in the + * ADDRESS_RANGE structure. Swap the quad halves of our memory + * map. + */ + for( i = 0; + i < reactos_memory_map_descriptor_size / sizeof(reactos_memory_map[0]); + i++ ) + { + tmp = reactos_memory_map[i].base_addr_high; + reactos_memory_map[i].base_addr_high = reactos_memory_map[i].base_addr_low; + reactos_memory_map[i].base_addr_low = tmp; + tmp = reactos_memory_map[i].length_high; + reactos_memory_map[i].length_high = reactos_memory_map[i].length_low; + reactos_memory_map[i].length_low = tmp; + } + PpcInitializeMmu(0); - printf("PpcInitializeMmu done\n"); /* We'll use vsid 1 for freeldr (expendable) */ MmuAllocVsid(1, 0xff); - printf("(1)\n"); MmuSetVsid(0, 8, 1); - printf("(2)\n"); MmuAllocVsid(0, 0xff00); - printf("(3)\n"); MmuSetVsid(8, 16, 0); - printf("(4)\n"); - - printf("MmuSetTrapHandler\n"); - MmuSetTrapHandler(3, MmuPageMiss); - MmuSetTrapHandler(4, MmuPageMiss); - printf("MmuSetTrapHandler done\n"); - - info = MmAllocateMemory((KernelMemorySize >> PAGE_SHIFT) * sizeof(*info)); - printf("page info at %x\n", info); /* Map kernel space 0x80000000 ... */ - for( i = (ULONG)KernelMemory, page = 0; + for( i = (ULONG)KernelMemory; i < (ULONG)KernelMemory + KernelMemorySize; - i += (1<<PFN_SHIFT), page++ ) { - info[page].proc = 0; - info[page].addr = KernelBase + (page << PAGE_SHIFT); - info[page].phys = i; //PpcVirt2phys(i, 1); - info[page].flags = MMU_ALL_RW; - } - - printf("Adding page info (%d pages)\n", page); - MmuMapPage(info, page); - printf("Adding page info (%d pages) ... done\n", page); + i += (1<<PFN_SHIFT) ) { + + FrLdrAddPageMapping(&memmap, 0, i, KernelBase + i - (ULONG)KernelMemory); + } /* Map module name strings */ - for( count = 0, i = 0; i < LoaderBlock.ModsCount; i++ ) - { - printf("Checking string %s\n", reactos_modules[i].String); - page = ROUND_DOWN(((ULONG)reactos_modules[i].String), (1<<PFN_SHIFT)); - for( j = 0; j < count; j++ ) - { - if(info[j].addr == page) break; - } - if( j != count ) - { - printf("Mapping page %x containing string %s\n", - page, reactos_modules[i].String); - info[count].flags = MMU_ALL_RW; - info[count].proc = 1; - info[count].addr = page; - info[count].phys = page; // PpcVirt2phys(page, 0); - count++; - } - } - - page = ROUND_DOWN((vaddr_t)&LoaderBlock, (1 << PAGE_SHIFT)); - for( j = 0; j < count; j++ ) - { - if(info[j].addr == page) break; - } - - if( j != count ) - { - info[count].flags = MMU_ALL_RW; - info[count].proc = 1; - info[count].addr = page; - info[count].phys = page; // PpcVirt2phys(page, 0); - count++; - } - printf("Mapping module name strings\n"); - MmuMapPage(info, count); - printf("Module name strings mapped\n"); - - printf("MmuTurnOn(KernelEntry = %x)\n", KernelEntryPoint); + for( i = 0; i < LoaderBlock.ModsCount; i++ ) + { + FrLdrAddPageMapping(&memmap, 1, (ULONG)reactos_modules[i].String, 0); + } + + /* Map memory zones */ + FrLdrAddPageMapping(&memmap, 1, (vaddr_t)&reactos_memory_map_descriptor_size, 0); + FrLdrAddPageMapping(&memmap, 1, (vaddr_t)&LoaderBlock, 0); + + MmuMapPage(memmap.info, memmap.usecount); + MmuTurnOn((KernelEntryFn)KernelEntryPoint, (void*)&LoaderBlock); - printf("MAED OF FALE!!1\n"); /* Nothing more */ while(1); @@ -393,7 +401,7 @@ MemLoadAddr = (PCHAR)NextModuleBase; ModuleData = &reactos_modules[LoaderBlock.ModsCount]; - printf("Loading file (elf at %x)\n", KernelAddr); + //printf("Loading file (elf at %x)\n", KernelAddr); /* Load the first 1024 bytes of the kernel image so we can read the PE header */ if (!FsReadFile(KernelImage, sizeof(ehdr), NULL, &ehdr)) { @@ -413,8 +421,6 @@ /* Read section headers */ FsSetFilePointer(KernelImage, ehdr.e_shoff); FsReadFile(KernelImage, shsize * shnum, NULL, sptr); - - printf("Loaded section headers\n"); /* Now we'll get the PE Header */ for( i = 0; i < shnum; i++ ) @@ -429,12 +435,14 @@ FsReadFile(KernelImage, shdr->sh_size, NULL, MemLoadAddr); ImageHeader = (PIMAGE_DOS_HEADER)MemLoadAddr; NtHeader = (PIMAGE_NT_HEADERS)((PCHAR)MemLoadAddr + SWAPD(ImageHeader->e_lfanew)); +#if 0 printf("NtHeader at %x\n", SWAPD(ImageHeader->e_lfanew)); printf("SectionAlignment %x\n", SWAPD(NtHeader->OptionalHeader.SectionAlignment)); SectionAddr = ROUND_UP (shdr->sh_size, SWAPD(NtHeader->OptionalHeader.SectionAlignment)); printf("Header ends at %x\n", SectionAddr); +#endif break; } } @@ -444,10 +452,12 @@ printf("No peheader section encountered :-(\n"); return 0; } +#if 0 else { printf("DOS SIG: %s\n", (PCHAR)MemLoadAddr); } +#endif /* Save the Image Base */ NtHeader->OptionalHeader.ImageBase = SWAPD(KernelAddr); @@ -455,8 +465,6 @@ /* Load the file image */ Section = COFF_FIRST_SECTION(NtHeader); SectionCount = SWAPW(NtHeader->FileHeader.NumberOfSections); - - printf("Section headers at %x\n", Section); /* Walk each section */ for (i=0; i < SectionCount; i++, Section++) @@ -603,11 +611,13 @@ ModuleData->ModEnd = NextModuleBase; ModuleData->String = (ULONG)MmAllocateMemory(strlen(ImageName)+1); strcpy((PCHAR)ModuleData->String, ImageName); +#if 0 printf("Module %s (%x-%x) next at %x\n", ModuleData->String, ModuleData->ModStart, ModuleData->ModEnd, NextModuleBase); +#endif LoaderBlock.ModsCount++; /* Return Success */ @@ -640,7 +650,6 @@ /* Allocate kernel memory */ KernelMemory = MmAllocateMemory(KernelMemorySize); - printf("Kernel Memory @%x\n", (int)KernelMemory); return FrLdrMapModule(KernelImage, "ntoskrnl.exe", KernelMemory, KernelBase); } @@ -679,11 +688,6 @@ ModuleData->ModStart = NextModuleBase; ModuleData->ModEnd = NextModuleBase + LocalModuleSize; - printf("Module size %x len %x name %s\n", - ModuleData->ModStart, - ModuleData->ModEnd - ModuleData->ModStart, - ModuleName); - /* Save name */ strcpy(NameBuffer, ModuleName); ModuleData->String = (ULONG_PTR)NameBuffer; Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c Sun Oct 28 15:31:10 2007 @@ -71,10 +71,36 @@ ULONG PpcPrepGetMemoryMap( PBIOS_MEMORY_MAP BiosMemoryMap, ULONG MaxMemoryMapSize ) { - // xxx fixme - BiosMemoryMap[0].Type = 1; - BiosMemoryMap[0].BaseAddress = 0xe80000; - BiosMemoryMap[0].Length = (64 * 1024 * 1024) - BiosMemoryMap[0].BaseAddress; + // Probe memory + paddr_t physAddr; + register int oldStore = 0, newStore = 0, change = 0, oldmsr; + + __asm__("mfmsr %0\n" : "=r" (oldmsr)); + change = oldmsr & 0x6fff; + __asm__("mtmsr %0\n" : : "r" (change)); + + // Find the last ram address in physical space ... this bypasses mapping + // but could run into non-ram objects right above ram. Usually systems + // aren't designed like that though. + for (physAddr = 0x30000, change = newStore; + (physAddr < 0x80000000) && (change == newStore); + physAddr += 1 << 12) + { + oldStore = GetPhys(physAddr); + newStore = (physAddr & 0x1000) ? 0x55aa55aa : 0xaa55aa55; + SetPhys(physAddr, newStore); + change = GetPhys(physAddr); + SetPhys(physAddr, oldStore); + } + // Back off by one page + physAddr -= 0x1000; + BiosMemoryMap[0].BaseAddress = 0x30000; // End of ppcmmu + BiosMemoryMap[0].Type = BiosMemoryUsable; + BiosMemoryMap[0].Length = physAddr - BiosMemoryMap[0].BaseAddress; + + __asm__("mtmsr %0\n" : : "r" (oldmsr)); + + printf("Actual RAM: %d Mb\n", physAddr >> 20); PpcInitializeMmu(BiosMemoryMap[0].BaseAddress + BiosMemoryMap[0].Length); return 1; } Modified: trunk/reactos/boot/freeldr/freeldr/include/reactos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/reactos.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/reactos.h Sun Oct 28 15:31:10 2007 @@ -84,8 +84,13 @@ extern char reactos_kernel_cmdline[255]; // Command line passed to kernel extern LOADER_MODULE reactos_modules[64]; // Array to hold boot module info loaded for the kernel extern char reactos_module_strings[64][256]; // Array to hold module names -extern unsigned long reactos_memory_map_descriptor_size; -extern memory_map_t reactos_memory_map[32]; // Memory map +typedef struct _reactos_mem_data { + unsigned long memory_map_descriptor_size; + memory_map_t memory_map[32]; // Memory map +} reactos_mem_data_t; +extern reactos_mem_data_t reactos_mem_data; +#define reactos_memory_map_descriptor_size reactos_mem_data.memory_map_descriptor_size +#define reactos_memory_map reactos_mem_data.memory_map VOID FASTCALL FrLdrSetupPae(ULONG Magic); VOID FASTCALL FrLdrSetupPageDirectory(VOID); Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c Sun Oct 28 15:31:10 2007 @@ -29,8 +29,9 @@ char reactos_kernel_cmdline[255]; // Command line passed to kernel LOADER_MODULE reactos_modules[64]; // Array to hold boot module info loaded for the kernel char reactos_module_strings[64][256]; // Array to hold module names -unsigned long reactos_memory_map_descriptor_size; -memory_map_t reactos_memory_map[32]; // Memory map +// Make this a single struct to guarantee that these elements are nearby in +// memory. +reactos_mem_data_t reactos_mem_data; ARC_DISK_SIGNATURE reactos_arc_disk_info[32]; // ARC Disk Information char reactos_arc_strings[32][256]; unsigned long reactos_disk_count = 0; @@ -409,7 +410,7 @@ if (rc != ERROR_SUCCESS) OrderList[0] = 0; /* enumerate all drivers */ - for (TagIndex = 1; TagIndex <= OrderList[0]; TagIndex++) { + for (TagIndex = 1; TagIndex <= SWAPD(OrderList[0]); TagIndex++) { Index = 0; @@ -603,10 +604,13 @@ LoaderBlock.MmapLength = (unsigned long)MachGetMemoryMap((PBIOS_MEMORY_MAP)reactos_memory_map, 32) * sizeof(memory_map_t); if (LoaderBlock.MmapLength) { +#ifdef _M_IX86 ULONG i; +#endif LoaderBlock.Flags |= MB_FLAGS_MEM_INFO | MB_FLAGS_MMAP_INFO; LoaderBlock.MmapAddr = (unsigned long)&reactos_memory_map; reactos_memory_map_descriptor_size = sizeof(memory_map_t); // GetBiosMemoryMap uses a fixed value of 24 +#ifdef _M_IX86 for (i=0; i<(LoaderBlock.MmapLength/sizeof(memory_map_t)); i++) { if (BiosMemoryUsable == reactos_memory_map[i].type && @@ -625,6 +629,7 @@ LoaderBlock.MemHigher = (reactos_memory_map[i].base_addr_low + reactos_memory_map[i].length_low) / 1024 - 1024; } } +#endif } /* @@ -761,10 +766,13 @@ LoadBase = FrLdrLoadImage(szKernelName, 5, 1); if (!LoadBase) return; + printf("Kernel loaded at %x\n", LoadBase); + /* Get the NT header, kernel base and kernel entry */ NtHeader = RtlImageNtHeader(LoadBase); - KernelBase = NtHeader->OptionalHeader.ImageBase; - KernelEntryPoint = KernelBase + NtHeader->OptionalHeader.AddressOfEntryPoint; + KernelBase = SWAPD(NtHeader->OptionalHeader.ImageBase); + KernelEntryPoint = KernelBase + SWAPD(NtHeader->OptionalHeader.AddressOfEntryPoint); + printf("KernelEntryPoint is %x (base %x)\n", KernelEntryPoint, KernelBase); LoaderBlock.KernelBase = KernelBase; /* @@ -836,14 +844,18 @@ /* * Load boot drivers */ + printf("FrLdrLoadBootDrivers\n"); FrLdrLoadBootDrivers(szBootPath, 40); + printf("FrLdrLoadBootDrivers end\n"); //UiUnInitialize("Booting ReactOS..."); /* * Now boot the kernel */ DiskStopFloppyMotor(); + printf("MachVideoPrepareForReactOS\n"); MachVideoPrepareForReactOS(FALSE); + printf("FrLdrStartup\n"); FrLdrStartup(0x2badb002); } Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Sun Oct 28 15:31:10 2007 @@ -29,8 +29,7 @@ char reactos_kernel_cmdline[255]; // Command line passed to kernel LOADER_MODULE reactos_modules[64]; // Array to hold boot module info loaded for the kernel char reactos_module_strings[64][256]; // Array to hold module names -unsigned long reactos_memory_map_descriptor_size; -memory_map_t reactos_memory_map[32]; // Memory map +reactos_mem_data_t reactos_mem_data; char szBootPath[256]; char szHalName[256]; CHAR SystemRoot[255]; Modified: trunk/reactos/drivers/base/kdcom/kdbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kdbg.c?… ============================================================================== --- trunk/reactos/drivers/base/kdcom/kdbg.c (original) +++ trunk/reactos/drivers/base/kdcom/kdbg.c Sun Oct 28 15:31:10 2007 @@ -294,8 +294,12 @@ ULONG Unknown2 ) { +#ifdef _M_IX86 ULONG BaseArray[5] = {0, 0x3F8, 0x2F8, 0x3E8, 0x2E8}; - PUCHAR ComPortBase; +#elif defined(_M_PPC) + ULONG BaseArray[5] = {0, 0x800003f8}; +#endif + PUCHAR ComPortBase; char buffer[80]; ULONG divisor; UCHAR lcr; Modified: trunk/reactos/ntoskrnl/ke/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/freeldr.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/freeldr.c (original) +++ trunk/reactos/ntoskrnl/ke/freeldr.c Sun Oct 28 15:31:10 2007 @@ -1181,6 +1181,10 @@ } VOID +NTAPI +KiSetupSyscallHandler(); + +VOID FASTCALL KiRosPrepareForSystemStartup(IN ULONG Dummy, IN PROS_LOADER_PARAMETER_BLOCK LoaderBlock) @@ -1206,6 +1210,10 @@ TssEntry->HighWord.Bytes.BaseHi = (UCHAR)((ULONG_PTR)Tss >> 24); #endif +#if defined(_M_PPC) + KiSetupSyscallHandler(); +#endif + /* Save pointer to ROS Block */ KeRosLoaderBlock = LoaderBlock; MmFreeLdrLastKernelAddress = PAGE_ROUND_UP(KeRosLoaderBlock-> Modified: trunk/reactos/ntoskrnl/ke/powerpc/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/powerpc/kiinit… ============================================================================== --- trunk/reactos/ntoskrnl/ke/powerpc/kiinit.c (original) +++ trunk/reactos/ntoskrnl/ke/powerpc/kiinit.c Sun Oct 28 15:31:10 2007 @@ -226,7 +226,7 @@ KiSystemStartup(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { ULONG Cpu; - ppc_map_info_t info[3]; + ppc_map_info_t info[4]; PKIPCR Pcr = (PKIPCR)KPCR_BASE; PKPRCB Prcb; @@ -259,7 +259,11 @@ info[2].proc = 2; info[2].addr = (vaddr_t)KI_USER_SHARED_DATA; info[2].flags = MMU_KRW_UR; - MmuMapPage(info, 3); + info[3].phys = 0; + info[3].proc = 2; + info[3].addr = (vaddr_t)KIP0PCRADDRESS; + info[3].flags = MMU_KRW_UR; + MmuMapPage(info, 4); } /* Skip initial setup if this isn't the Boot CPU */ Modified: trunk/reactos/ntoskrnl/mm/powerpc/pfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/powerpc/pfault… ============================================================================== --- trunk/reactos/ntoskrnl/mm/powerpc/pfault.c (original) +++ trunk/reactos/ntoskrnl/mm/powerpc/pfault.c Sun Oct 28 15:31:10 2007 @@ -17,6 +17,11 @@ /* EXTERNS *******************************************************************/ +NTSTATUS +NTAPI +MmNotPresentFault(KPROCESSOR_MODE Mode, + ULONG_PTR Address, + BOOLEAN FromMdl); extern ULONG KiKernelTrapHandler(PKTRAP_FRAME Tf, ULONG ExceptionNr, PVOID Cr2); /* FUNCTIONS *****************************************************************/ @@ -61,8 +66,7 @@ } else { - KeBugCheck(0); - //Status = MmNotPresentFault(Mode, (PVOID)VirtualAddr, FALSE, TrapInfo); + Status = MmNotPresentFault(Mode, VirtualAddr, FALSE); } if (NT_SUCCESS(Status)) Modified: trunk/reactos/ntoskrnl/ntoskrnl_powerpc.lnk URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl_powerpc.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl_powerpc.lnk (original) +++ trunk/reactos/ntoskrnl/ntoskrnl_powerpc.lnk Sun Oct 28 15:31:10 2007 @@ -50,20 +50,8 @@ { *(.rsrc) } - .rela.text : + .rela : { - *(.rela.text) - } - .rela.data : - { - *(.rela.data) - } - .rela.rodata : - { - *(.rela.rodata) - } - .rela.got2 : - { - *(.rela.got2) + *(.rela.*) } }

1 0

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