Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 31153: Partly implement AccRewriteSetEntriesInAcl() See issue #2707 for more details.
by hpoussin＠svn.reactos.org 11 Dec '07

11 Dec '07

Author: hpoussin Date: Tue Dec 11 20:07:56 2007 New Revision: 31153 URL: http://svn.reactos.org/svn/reactos?rev=31153&view=rev Log: Partly implement AccRewriteSetEntriesInAcl() See issue #2707 for more details. Modified: trunk/reactos/dll/win32/ntmarta/ntmarta.c Modified: trunk/reactos/dll/win32/ntmarta/ntmarta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntmarta/ntmarta.… ============================================================================== --- trunk/reactos/dll/win32/ntmarta/ntmarta.c (original) +++ trunk/reactos/dll/win32/ntmarta/ntmarta.c Tue Dec 11 20:07:56 2007 @@ -970,10 +970,59 @@ } +static PSID +GetTrusteeSid(PTRUSTEE Trustee, + BOOL *Allocated) +{ + if (Trustee->pMultipleTrustee || Trustee->MultipleTrusteeOperation != NO_MULTIPLE_TRUSTEE) + { + DPRINT1("Trustee form not supported\n"); + return NULL; + } + + switch (Trustee->TrusteeForm) + { + case TRUSTEE_IS_NAME: + case TRUSTEE_IS_OBJECTS_AND_NAME: + /* FIXME */ + DPRINT1("Case not implemented\n"); + ASSERT(FALSE); + return NULL; + case TRUSTEE_IS_OBJECTS_AND_SID: + *Allocated = FALSE; + return ((POBJECTS_AND_SID)Trustee->ptstrName)->pSid; + case TRUSTEE_IS_SID: + *Allocated = FALSE; + return (PSID)Trustee->ptstrName; + default: + DPRINT1("Wrong Trustee form\n"); + return NULL; + } +} + +static PSID +GetOwner(PACE_HEADER Ace) +{ + switch (Ace->AceType) + { + case ACCESS_ALLOWED_ACE_TYPE: + return (PSID)&((PACCESS_ALLOWED_ACE)Ace)->SidStart; + case ACCESS_DENIED_ACE_TYPE: + return (PSID)&((PACCESS_DENIED_ACE)Ace)->SidStart; + case SYSTEM_AUDIT_ACE_TYPE: + return (PSID)&((PSYSTEM_AUDIT_ACE)Ace)->SidStart; + case SYSTEM_MANDATORY_LABEL_ACE_TYPE: + return (PSID)&((PSYSTEM_MANDATORY_LABEL_ACE)Ace)->SidStart; + default: + DPRINT1("Unknown ACE type 0x%x\n", Ace->AceType); + return NULL; + } +} + /********************************************************************** * AccRewriteSetEntriesInAcl EXPORTED * - * @unimplemented + * @implemented */ DWORD WINAPI AccRewriteSetEntriesInAcl(ULONG cCountOfExplicitEntries, @@ -981,13 +1030,153 @@ PACL OldAcl, PACL* NewAcl) { - UNIMPLEMENTED; - return ERROR_CALL_NOT_IMPLEMENTED; + PACL pNew; + ACL_SIZE_INFORMATION SizeInformation; + PACE_HEADER pAce; + BOOL *pKeepAce = NULL; + BOOL needToClean; + PSID pSid1, pSid2; + ULONG i; + LONG rc; + BOOL ret; + + *NewAcl = NULL; + + /* Get information about previous ACL */ + if (OldAcl) + { + if (!GetAclInformation(OldAcl, &SizeInformation, sizeof(ACL_SIZE_INFORMATION), AclSizeInformation)) + return GetLastError(); + pKeepAce = (BOOL *)LocalAlloc(LMEM_FIXED, SizeInformation.AceCount); + if (!pKeepAce) + return ERROR_NOT_ENOUGH_MEMORY; + memset(pKeepAce, TRUE, SizeInformation.AceCount); + } + else + { + ZeroMemory(&SizeInformation, sizeof(ACL_SIZE_INFORMATION)); + SizeInformation.AclBytesInUse = sizeof(ACL); + } + + /* Get size required for new entries */ + for (i = 0; i < cCountOfExplicitEntries; i++) + { + switch (pListOfExplicitEntries[i].grfAccessMode) + { + case REVOKE_ACCESS: + case SET_ACCESS: + /* Discard all accesses for the trustee... */ + pSid1 = GetTrusteeSid(&pListOfExplicitEntries[i].Trustee, &needToClean); + for (i = 0; i < SizeInformation.AceCount; i++) + { + if (!pKeepAce[i]) + continue; + if (!GetAce(OldAcl, i, (PVOID*)&pAce)) + goto cleanup; + pSid2 = GetOwner(pAce); + if (RtlEqualSid(pSid1, pSid2)) + { + pKeepAce[i] = FALSE; + SizeInformation.AclBytesInUse -= pAce->AceSize; + } + } + if (needToClean) LocalFree((HLOCAL)pSid1); + if (pListOfExplicitEntries[i].grfAccessMode == REVOKE_ACCESS) + break; + /* ...and replace by the current access */ + case GRANT_ACCESS: + /* Add to ACL */ + pSid1 = GetTrusteeSid(&pListOfExplicitEntries[i].Trustee, &needToClean); + SizeInformation.AclBytesInUse += FIELD_OFFSET(ACCESS_ALLOWED_ACE, SidStart) + RtlLengthSid(pSid1); + if (needToClean) LocalFree((HLOCAL)pSid1); + break; + case DENY_ACCESS: + /* Add to ACL */ + pSid1 = GetTrusteeSid(&pListOfExplicitEntries[i].Trustee, &needToClean); + SizeInformation.AclBytesInUse += FIELD_OFFSET(ACCESS_DENIED_ACE, SidStart) + RtlLengthSid(pSid1); + if (needToClean) LocalFree((HLOCAL)pSid1); + break; + case SET_AUDIT_SUCCESS: + case SET_AUDIT_FAILURE: + /* FIXME */ + DPRINT1("Case not implemented!\n"); + break; + default: + DPRINT1("Unknown access mode 0x%x. Ignoring it\n", pListOfExplicitEntries[i].grfAccessMode); + break; + } + } + + /* OK, now create the new ACL */ + DPRINT("Allocating %u bytes for the new ACL\n", SizeInformation.AclBytesInUse); + pNew = (PACL)LocalAlloc(LMEM_FIXED, SizeInformation.AclBytesInUse); + if (!pNew) + { + rc = ERROR_NOT_ENOUGH_MEMORY; + goto done; + } + if (!InitializeAcl(pNew, SizeInformation.AclBytesInUse, ACL_REVISION)) + goto cleanup; + + /* Fill it */ + /* 1a) New audit entries (SET_AUDIT_SUCCESS, SET_AUDIT_FAILURE) */ + /* FIXME */ + + /* 1b) Existing audit entries */ + /* FIXME */ + + /* 2a) New denied entries (DENY_ACCESS) */ + for (i = 0; i < cCountOfExplicitEntries; i++) + { + if (pListOfExplicitEntries[i].grfAccessMode == DENY_ACCESS) + { + /* FIXME: take care of pListOfExplicitEntries[i].grfInheritance */ + pSid1 = GetTrusteeSid(&pListOfExplicitEntries[i].Trustee, &needToClean); + ret = AddAccessDeniedAce(pNew, ACL_REVISION, pListOfExplicitEntries[i].grfAccessPermissions, pSid1); + if (needToClean) LocalFree((HLOCAL)pSid1); + if (!ret) + goto cleanup; + } + } + + /* 2b) Existing denied entries */ + /* FIXME */ + + /* 3a) New allow entries (GRANT_ACCESS, SET_ACCESS) */ + for (i = 0; i < cCountOfExplicitEntries; i++) + { + if (pListOfExplicitEntries[i].grfAccessMode == SET_ACCESS || + pListOfExplicitEntries[i].grfAccessMode == GRANT_ACCESS) + { + /* FIXME: take care of pListOfExplicitEntries[i].grfInheritance */ + pSid1 = GetTrusteeSid(&pListOfExplicitEntries[i].Trustee, &needToClean); + ret = AddAccessAllowedAce(pNew, ACL_REVISION, pListOfExplicitEntries[i].grfAccessPermissions, pSid1); + if (needToClean) LocalFree((HLOCAL)pSid1); + if (!ret) + goto cleanup; + } + } + + /* 3b) Existing allow entries */ + /* FIXME */ + + *NewAcl = pNew; + rc = ERROR_SUCCESS; + goto done; + +cleanup: + rc = GetLastError(); + +done: + if (pKeepAce) + LocalFree((HLOCAL)pKeepAce); + DPRINT("Returning %d\n", rc); + return rc; } /********************************************************************** - * AccRewriteSetEntriesInAcl EXPORTED + * AccGetInheritanceSource EXPORTED * * @unimplemented */

1 0

[peterw] 31152: - Remove unused variable.
by peterw＠svn.reactos.org 11 Dec '07

11 Dec '07

Author: peterw Date: Tue Dec 11 20:04:48 2007 New Revision: 31152 URL: http://svn.reactos.org/svn/reactos?rev=31152&view=rev Log: - Remove unused variable. Modified: trunk/reactos/base/applications/mstsc/win32.c Modified: trunk/reactos/base/applications/mstsc/win32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/wi… ============================================================================== --- trunk/reactos/base/applications/mstsc/win32.c (original) +++ trunk/reactos/base/applications/mstsc/win32.c Tue Dec 11 20:04:48 2007 @@ -975,7 +975,6 @@ WCHAR szSeps[] = L"/"; LPWSTR lpToken; BOOL bRet = TRUE; - INT i; *bSkipDlg = TRUE;

1 0

[fireball] 31151: - Forgot the changelog update.
by fireball＠svn.reactos.org 11 Dec '07

11 Dec '07

Author: fireball Date: Tue Dec 11 19:26:48 2007 New Revision: 31151 URL: http://svn.reactos.org/svn/reactos?rev=31151&view=rev Log: - Forgot the changelog update. Modified: trunk/reactos/boot/freeldr/freeldr/CHANGELOG Modified: trunk/reactos/boot/freeldr/freeldr/CHANGELOG URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CHANG… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CHANGELOG (original) +++ trunk/reactos/boot/freeldr/freeldr/CHANGELOG Tue Dec 11 19:26:48 2007 @@ -1,8 +1,24 @@ -Changes in v2.0.0 (02/07/2005) (alex ionesco) - -- PE loading of ntoskrnl.exe -- Work on 3GB support -- w32api conversion +Changes in v3.0.0 (11/12/2007) (fball) + +- Support for building an ARC Tree. +- Removal of registry write code. +- Removal of HARDWARE registry building code. +- Working WinLDR branch for booting NT4. + +Changes in v2.5.0 (??/??/2007) (ion) + +- Memory layout fixes to support NT boot +- Refactor PTE/PDE setup code +- Identity mapping support +- Set 0x80000000 as kernel base address, and all physical addresses with the high bit off (KSEG0_BASE) so that physical->virtual translation can be done with an OR. + +Changes in v2.1.0 (??/??/2006) (ion) + +- PE loading fixups and full NT-style driver loading + +Changes in v2.0.0 (02/07/2005) (ion) + +- Remove Multi-boot booting of ReactOS Changes in v1.8.26 (10/30/2004) (chorns)

1 0

[fireball] 31150: - Fix a bug in CmpCreateLinkNode when the link node alredy exists. - Add some checks in CmpDoOpen to protect against illegal opens. - Handle symlinks instead of ignoring them (fixes CurrentControlSet problem). - Set disposition if this is an open due to a create.
by fireball＠svn.reactos.org 11 Dec '07

11 Dec '07

Author: fireball Date: Tue Dec 11 19:21:13 2007 New Revision: 31150 URL: http://svn.reactos.org/svn/reactos?rev=31150&view=rev Log: - Fix a bug in CmpCreateLinkNode when the link node alredy exists. - Add some checks in CmpDoOpen to protect against illegal opens. - Handle symlinks instead of ignoring them (fixes CurrentControlSet problem). - Set disposition if this is an open due to a create. Modified: trunk/reactos/ntoskrnl/config/cmparse.c Modified: trunk/reactos/ntoskrnl/config/cmparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmparse.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmparse.c (original) +++ trunk/reactos/ntoskrnl/config/cmparse.c Tue Dec 11 19:21:13 2007 @@ -584,12 +584,55 @@ /* It is, don't touch it */ return STATUS_OBJECT_NAME_NOT_FOUND; } - + + /* Check if we have a context */ + if (Context) + { + /* Check if this is a link create (which shouldn't be an open) */ + if (Context->CreateLink) + { + return STATUS_ACCESS_DENIED; + } + + /* Check if this is symlink create attempt */ + if (Context->CreateOptions & REG_OPTION_CREATE_LINK) + { + /* Key already exists */ + return STATUS_OBJECT_NAME_COLLISION; + } + + /* Set the disposition */ + Context->Disposition = REG_OPENED_EXISTING_KEY; + } + /* Do this in the registry lock */ CmpLockRegistry(); /* If we have a KCB, make sure it's locked */ //ASSERT(CmpIsKcbLockedExclusive(*CachedKcb)); + + /* Check if this is a symlink */ + if ((Node->Flags & KEY_SYM_LINK) && !(Attributes & OBJ_OPENLINK)) + { + /* Create the KCB for the symlink */ + Kcb = CmpCreateKeyControlBlock(Hive, + Cell, + Node, + *CachedKcb, + 0, + KeyName); + if (!Kcb) return STATUS_INSUFFICIENT_RESOURCES; + + /* Make sure it's also locked, and set the pointer */ + //ASSERT(CmpIsKcbLockedExclusive(Kcb)); + *CachedKcb = Kcb; + + /* Release the registry lock */ + CmpUnlockRegistry(); + + /* Return reparse required */ + return STATUS_REPARSE; + } /* Create the KCB. FIXME: Use lock flag */ Kcb = CmpCreateKeyControlBlock(Hive, @@ -735,7 +778,7 @@ AccessState, AccessMode, CreateOptions, - Context, + NULL, 0, &Kcb, &Name,

1 0

[peterw] 31149: - Missed this.
by peterw＠svn.reactos.org 11 Dec '07

11 Dec '07

Author: peterw Date: Tue Dec 11 19:01:42 2007 New Revision: 31149 URL: http://svn.reactos.org/svn/reactos?rev=31149&view=rev Log: - Missed this. Modified: trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cle… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd Tue Dec 11 19:01:42 2007 @@ -65,7 +65,7 @@ ) echo Done cleaning ReactOS source directory. ) else ( - echo ERROR: There is no Compiler Output to clean. + echo ERROR: There is no compiler output to clean. ) goto :EOF

1 0

[fireball] 31148: - Update copyright information. - Bump version to 3.0.
by fireball＠svn.reactos.org 11 Dec '07

11 Dec '07

Author: fireball Date: Tue Dec 11 18:59:58 2007 New Revision: 31148 URL: http://svn.reactos.org/svn/reactos?rev=31148&view=rev Log: - Update copyright information. - Bump version to 3.0. Modified: trunk/reactos/boot/freeldr/freeldr/include/ver.h Modified: trunk/reactos/boot/freeldr/freeldr/include/ver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/ver.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/ver.h Tue Dec 11 18:59:58 2007 @@ -22,10 +22,10 @@ /* just some stuff */ -#define VERSION "FreeLoader v2.1" -#define COPYRIGHT "Copyright (C) 1998-2005 Brian Palmer <brianp(a)sginet.com>" -#define AUTHOR_EMAIL "<brianp(a)sginet.com>" -#define BY_AUTHOR "by Brian Palmer" +#define VERSION "FreeLoader v3.0" +#define COPYRIGHT "Copyright (C) 1998-2007 ReactOS Team" +#define AUTHOR_EMAIL "<www.reactos.org>" +#define BY_AUTHOR "by ReactOS Team" // FreeLoader version defines // @@ -34,8 +34,8 @@ // If you add features then you increment the minor version and zero the patch version // If you add major functionality then you increment the major version and zero the minor & patch versions // -#define FREELOADER_MAJOR_VERSION 2 -#define FREELOADER_MINOR_VERSION 1 +#define FREELOADER_MAJOR_VERSION 3 +#define FREELOADER_MINOR_VERSION 0 #define FREELOADER_PATCH_VERSION 0

1 0

[peterw] 31147: - Remove the yes/no verification added in r31142 and fix a couple typos.
by peterw＠svn.reactos.org 11 Dec '07

11 Dec '07

Author: peterw Date: Tue Dec 11 18:59:44 2007 New Revision: 31147 URL: http://svn.reactos.org/svn/reactos?rev=31147&view=rev Log: - Remove the yes/no verification added in r31142 and fix a couple typos. Modified: trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cle… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd Tue Dec 11 18:59:44 2007 @@ -9,13 +9,6 @@ :: @echo off -echo Do you REALLY want to continue? -set /p YESNO="(yes), (no)" -if /i "%YESNO%"=="yes" goto :CONT -if /i "%YESNO%"=="no" goto :EOC -goto :NOK - -:CONT title Cleaning... if "%1" == "" ( @@ -38,7 +31,7 @@ :LOG :: -: Check if we have any logs to clean, if so, clean them. +:: Check if we have any logs to clean, if so, clean them. :: if exist "%_ROSBE_LOGDIR%\*.txt" ( echo Cleaning build logs... @@ -47,15 +40,14 @@ ) else ( echo ERROR: There are no logs to clean. ) -goto :EOC +goto :EOF :DEL :: -: Check if we have something to clean, if so, clean it. +:: Check if we have something to clean, if so, clean it. :: if exist "obj-i386\." ( echo Cleaning ReactOS source directory... - :: : Remove directories/makefile.auto created by the build. :: @@ -75,7 +67,7 @@ ) else ( echo ERROR: There is no Compiler Output to clean. ) -goto :EOC +goto :EOF :EOC title ReactOS Build Environment %_ROSBE_VERSION% Modified: trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Hel… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd Tue Dec 11 18:59:44 2007 @@ -113,7 +113,7 @@ echo Usage: clean [logs] echo Fully clean the ReactOS source directory. echo. - echo all - Removes build logs and Compiler Output in the RosBE-Logs directory. + echo all - Removes build logs and compiler output in the RosBE-Logs directory. echo logs - Removes all build logs in the RosBE-Logs directory. goto :EOC )

1 0

[fireball] 31146: - Remove all registry-writing code from FreeLDR. - Create an empty volatile HARDWARE hive in the Kernel, and build it based on the ARC tree.
by fireball＠svn.reactos.org 11 Dec '07

11 Dec '07

Author: fireball Date: Tue Dec 11 18:50:30 2007 New Revision: 31146 URL: http://svn.reactos.org/svn/reactos?rev=31146&view=rev Log: - Remove all registry-writing code from FreeLDR. - Create an empty volatile HARDWARE hive in the Kernel, and build it based on the ARC tree. Modified: trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c trunk/reactos/boot/freeldr/freeldr/reactos/registry.c trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c trunk/reactos/ntoskrnl/config/cmconfig.c trunk/reactos/ntoskrnl/config/cmsysini.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c Tue Dec 11 18:50:30 2007 @@ -43,485 +43,6 @@ return MmFreeMemory(Ptr); } - -static BOOLEAN -CmiAllocateHashTableCell (PHHIVE Hive, - PHCELL_INDEX HBOffset, - ULONG SubKeyCount) -{ - PCM_KEY_FAST_INDEX HashCell; - ULONG NewHashSize; - - NewHashSize = sizeof(CM_KEY_FAST_INDEX) + - (SubKeyCount * sizeof(CM_INDEX)); - *HBOffset = HvAllocateCell (Hive, NewHashSize, Stable, HCELL_NIL); - if (*HBOffset == HCELL_NIL) - { - return FALSE; - } - - HashCell = (PCM_KEY_FAST_INDEX)HvGetCell (Hive, *HBOffset); - HashCell->Signature = CM_KEY_FAST_LEAF; - HashCell->Count = SubKeyCount; - - return TRUE; -} - - -static BOOLEAN -CmiAddKeyToParentHashTable (PHHIVE Hive, - HCELL_INDEX Parent, - PCM_KEY_NODE NewKeyCell, - HCELL_INDEX NKBOffset) -{ - PCM_KEY_FAST_INDEX HashBlock; - PCM_KEY_NODE ParentKeyCell; - ULONG i; - - ParentKeyCell = (PVOID)HvGetCell (Hive, Parent); - HashBlock = (PVOID)HvGetCell (Hive, ParentKeyCell->SubKeyLists[Stable]); - - for (i = 0; i < HashBlock->Count; i++) - { - if (HashBlock->List[i].Cell == 0) - { - HashBlock->List[i].Cell = NKBOffset; - memcpy (&HashBlock->List[i].HashKey, - NewKeyCell->Name, - min(NewKeyCell->NameLength, sizeof(ULONG))); - ParentKeyCell->SubKeyCounts[Stable]++; - return TRUE; - } - } - - return FALSE; -} - - -static BOOLEAN -CmiAllocateValueListCell (PHHIVE Hive, - PHCELL_INDEX ValueListOffset, - ULONG ValueCount) -{ - ULONG ValueListSize; - - ValueListSize = sizeof(VALUE_LIST_CELL) + - (ValueCount * sizeof(HCELL_INDEX)); - *ValueListOffset = HvAllocateCell (Hive, ValueListSize, Stable, HCELL_NIL); - if (*ValueListOffset == HCELL_NIL) - { - DbgPrint((DPRINT_REGISTRY, "HvAllocateCell() failed\n")); - return FALSE; - } - - return TRUE; -} - - -static BOOLEAN -CmiAllocateValueCell(PHHIVE Hive, - PCM_KEY_VALUE *ValueCell, - HCELL_INDEX *ValueCellOffset, - PWCHAR ValueName) -{ - PCM_KEY_VALUE NewValueCell; - ULONG NameLength; - BOOLEAN Packable = TRUE; - ULONG i; - - NameLength = (ValueName == NULL) ? 0 : wcslen (ValueName); - for (i = 0; i < NameLength; i++) - { - if (ValueName[i] & 0xFF00) - { - NameLength *= sizeof(WCHAR); - Packable = FALSE; - break; - } - } - *ValueCellOffset = HvAllocateCell (Hive, sizeof(CM_KEY_VALUE) + NameLength, Stable, HCELL_NIL); - if (*ValueCellOffset == HCELL_NIL) - { - DbgPrint((DPRINT_REGISTRY, "CmiAllocateCell() failed\n")); - return FALSE; - } - - NewValueCell = (PCM_KEY_VALUE) HvGetCell (Hive, *ValueCellOffset); - NewValueCell->Signature = CM_KEY_VALUE_SIGNATURE; - NewValueCell->NameLength = NameLength; - NewValueCell->Flags = 0; - if (NameLength > 0) - { - if (Packable) - { - for (i = 0; i < NameLength; i++) - { - ((PCHAR)NewValueCell->Name)[i] = (CHAR)ValueName[i]; - } - NewValueCell->Flags |= VALUE_COMP_NAME; - } - else - { - memcpy (NewValueCell->Name, - ValueName, - NameLength); - } - } - NewValueCell->Type = 0; - NewValueCell->DataLength = 0; - NewValueCell->Data = -1; - - *ValueCell = NewValueCell; - - return TRUE; -} - - -static BOOLEAN -CmiAddValueToKeyValueList(PHHIVE Hive, - HCELL_INDEX KeyCellOffset, - HCELL_INDEX ValueCellOffset) -{ - PVALUE_LIST_CELL ValueListCell; - PCM_KEY_NODE KeyCell; - - KeyCell = (PCM_KEY_NODE)HvGetCell (Hive, KeyCellOffset); - if (KeyCell == NULL) - { - DbgPrint((DPRINT_REGISTRY, "HvGetCell() failed\n")); - return FALSE; - } - - ValueListCell = (PVALUE_LIST_CELL)HvGetCell (Hive, KeyCell->ValueList.List); - if (ValueListCell == NULL) - { - DbgPrint((DPRINT_REGISTRY, "HvGetCell() failed\n")); - return FALSE; - } - - ValueListCell->ValueOffset[KeyCell->ValueList.Count] = ValueCellOffset; - KeyCell->ValueList.Count++; - - return TRUE; -} - -static BOOLEAN -CmiExportValue (PHHIVE Hive, - HCELL_INDEX KeyCellOffset, - FRLDRHKEY Key, - PVALUE Value) -{ - HCELL_INDEX ValueCellOffset; - HCELL_INDEX DataCellOffset; - PCM_KEY_VALUE ValueCell; - PVOID DataCell; - ULONG DataLength; - ULONG Type; - PCHAR Data; - - DbgPrint((DPRINT_REGISTRY, "CmiExportValue('%S') called\n", - (Value == NULL) ? "<default>" : (PCHAR)Value->Name)); - DbgPrint((DPRINT_REGISTRY, "DataLength %lu\n", - (Value == NULL) ? Key->DataSize : Value->DataSize)); - - /* Allocate value cell */ - if (!CmiAllocateValueCell(Hive, &ValueCell, &ValueCellOffset, (Value == NULL) ? NULL : Value->Name)) - { - return FALSE; - } - - if (!CmiAddValueToKeyValueList(Hive, KeyCellOffset, ValueCellOffset)) - { - return FALSE; - } - - if (Value == NULL) - { - Type = Key->DataType; - DataLength = Key->DataSize; - Data = Key->Data; - } - else - { - Type = Value->DataType; - DataLength = Value->DataSize; - Data = Value->Data; - } - - if (DataLength <= sizeof(HCELL_INDEX)) - { - ValueCell->DataLength = DataLength | REG_DATA_IN_OFFSET; - ValueCell->Type = Type; - memcpy (&ValueCell->Data, - &Data, - DataLength); - } - else - { - /* Allocate data cell */ - DataCellOffset = HvAllocateCell (Hive, DataLength, Stable, HCELL_NIL); - if (DataCellOffset == HCELL_NIL) - { - return FALSE; - } - - ValueCell->Data = DataCellOffset; - ValueCell->DataLength = DataLength; - ValueCell->Type = Type; - - DataCell = (PVOID)HvGetCell (Hive, DataCellOffset); - memcpy (DataCell, - Data, - DataLength); - } - - return TRUE; -} - - -static BOOLEAN -CmiExportSubKey (PHHIVE Hive, - HCELL_INDEX Parent, - FRLDRHKEY ParentKey, - FRLDRHKEY Key) -{ - HCELL_INDEX NKBOffset; - PCM_KEY_NODE NewKeyCell; - ULONG KeyCellSize; - ULONG SubKeyCount; - ULONG ValueCount; - PLIST_ENTRY Entry; - FRLDRHKEY SubKey; - PVALUE Value; - BOOLEAN Packable = TRUE; - ULONG i; - ULONG NameLength; - - DbgPrint((DPRINT_REGISTRY, "CmiExportSubKey('%S') called\n", Key->Name)); - - /* Don't export links */ - if (Key->DataType == REG_LINK) - return TRUE; - - NameLength = (Key->NameSize - sizeof(WCHAR)) / sizeof(WCHAR); - for (i = 0; i < NameLength; i++) - { - if (Key->Name[i] & 0xFF00) - { - Packable = FALSE; - NameLength *= sizeof(WCHAR); - break; - } - } - - /* Allocate key cell */ - KeyCellSize = sizeof(CM_KEY_NODE) + NameLength; - NKBOffset = HvAllocateCell (Hive, KeyCellSize, Stable, HCELL_NIL); - if (NKBOffset == HCELL_NIL) - { - DbgPrint((DPRINT_REGISTRY, "HvAllocateCell() failed\n")); - return FALSE; - } - - /* Initialize key cell */ - NewKeyCell = (PCM_KEY_NODE) HvGetCell (Hive, NKBOffset); - NewKeyCell->Signature = CM_KEY_NODE_SIGNATURE; - NewKeyCell->Flags = 0; - NewKeyCell->LastWriteTime.QuadPart = 0ULL; - NewKeyCell->Parent = Parent; - NewKeyCell->SubKeyCounts[Stable] = 0; - NewKeyCell->SubKeyLists[Stable] = -1; - NewKeyCell->ValueList.Count = 0; - NewKeyCell->ValueList.List = -1; - NewKeyCell->Security = -1; - NewKeyCell->Class = -1; - NewKeyCell->NameLength = NameLength; - NewKeyCell->ClassLength = 0; - if (Packable) - { - for (i = 0; i < NameLength; i++) - { - ((PCHAR)NewKeyCell->Name)[i] = (CHAR)Key->Name[i]; - } - NewKeyCell->Flags |= KEY_COMP_NAME; - - } - else - { - memcpy (NewKeyCell->Name, - Key->Name, - NameLength); - } - - /* Add key cell to the parent key's hash table */ - if (!CmiAddKeyToParentHashTable (Hive, - Parent, - NewKeyCell, - NKBOffset)) - { - DbgPrint((DPRINT_REGISTRY, "CmiAddKeyToParentHashTable() failed\n")); - return FALSE; - } - - ValueCount = RegGetValueCount (Key); - DbgPrint((DPRINT_REGISTRY, "ValueCount: %u\n", ValueCount)); - if (ValueCount > 0) - { - /* Allocate value list cell */ - if (!CmiAllocateValueListCell (Hive, - &NewKeyCell->ValueList.List, - ValueCount)) - { - DbgPrint((DPRINT_REGISTRY, "CmiAllocateValueListCell() failed\n")); - return FALSE; - } - - if (Key->DataSize != 0) - { - if (!CmiExportValue (Hive, NKBOffset, Key, NULL)) - return FALSE; - } - - /* Enumerate values */ - Entry = Key->ValueList.Flink; - while (Entry != &Key->ValueList) - { - Value = CONTAINING_RECORD(Entry, - VALUE, - ValueList); - - if (!CmiExportValue (Hive, NKBOffset, Key, Value)) - return FALSE; - - Entry = Entry->Flink; - } - } - - SubKeyCount = RegGetSubKeyCount (Key); - DbgPrint((DPRINT_REGISTRY, "SubKeyCount: %u\n", SubKeyCount)); - if (SubKeyCount > 0) - { - /* Allocate hash table cell */ - if (!CmiAllocateHashTableCell (Hive, - &NewKeyCell->SubKeyLists[Stable], - SubKeyCount)) - { - DbgPrint((DPRINT_REGISTRY, "CmiAllocateHashTableCell() failed\n")); - return FALSE; - } - - /* Enumerate subkeys */ - Entry = Key->SubKeyList.Flink; - while (Entry != &Key->SubKeyList) - { - SubKey = CONTAINING_RECORD(Entry, - KEY, - KeyList); - - if (!CmiExportSubKey (Hive, NKBOffset, Key, SubKey)) - return FALSE; - - Entry = Entry->Flink; - } - } - - return TRUE; -} - - -static BOOLEAN -CmiExportHive (PHHIVE Hive, - PCWSTR KeyName) -{ - PCM_KEY_NODE KeyCell; - FRLDRHKEY Key; - ULONG SubKeyCount; - ULONG ValueCount; - PLIST_ENTRY Entry; - FRLDRHKEY SubKey; - PVALUE Value; - - DbgPrint((DPRINT_REGISTRY, "CmiExportHive(%x, '%S') called\n", Hive, KeyName)); - - if (RegOpenKey (NULL, KeyName, &Key) != ERROR_SUCCESS) - { - DbgPrint((DPRINT_REGISTRY, "RegOpenKey() failed\n")); - return FALSE; - } - - KeyCell = (PCM_KEY_NODE)HvGetCell (Hive, Hive->BaseBlock->RootCell); - if (KeyCell == NULL) - { - DbgPrint((DPRINT_REGISTRY, "HvGetCell() failed\n")); - return FALSE; - } - - ValueCount = RegGetValueCount (Key); - DbgPrint((DPRINT_REGISTRY, "ValueCount: %u\n", ValueCount)); - if (ValueCount > 0) - { - /* Allocate value list cell */ - if (!CmiAllocateValueListCell (Hive, - &KeyCell->ValueList.List, - ValueCount)) - { - DbgPrint((DPRINT_REGISTRY, "CmiAllocateValueListCell() failed\n")); - return FALSE; - } - - if (Key->DataSize != 0) - { - if (!CmiExportValue (Hive, Hive->BaseBlock->RootCell, Key, NULL)) - return FALSE; - } - - /* Enumerate values */ - Entry = Key->ValueList.Flink; - while (Entry != &Key->ValueList) - { - Value = CONTAINING_RECORD(Entry, - VALUE, - ValueList); - - if (!CmiExportValue (Hive, Hive->BaseBlock->RootCell, Key, Value)) - return FALSE; - - Entry = Entry->Flink; - } - } - - SubKeyCount = RegGetSubKeyCount (Key); - DbgPrint((DPRINT_REGISTRY, "SubKeyCount: %u\n", SubKeyCount)); - if (SubKeyCount > 0) - { - /* Allocate hash table cell */ - if (!CmiAllocateHashTableCell (Hive, - &KeyCell->SubKeyLists[Stable], - SubKeyCount)) - { - DbgPrint((DPRINT_REGISTRY, "CmiAllocateHashTableCell() failed\n")); - return FALSE; - } - - /* Enumerate subkeys */ - Entry = Key->SubKeyList.Flink; - while (Entry != &Key->SubKeyList) - { - SubKey = CONTAINING_RECORD(Entry, - KEY, - KeyList); - - if (!CmiExportSubKey (Hive, Hive->BaseBlock->RootCell, Key, SubKey)) - return FALSE; - - Entry = Entry->Flink; - } - } - - return TRUE; -} - - static BOOLEAN RegImportValue (PHHIVE Hive, PCM_KEY_VALUE ValueCell, @@ -782,86 +303,4 @@ return TRUE; } - -static VOID -CmiWriteHive(PHHIVE Hive, - PCHAR ChunkBase, - ULONG* ChunkSize) -{ - PHBIN Bin; - ULONG i, Size; - - /* Write hive header */ - memcpy (ChunkBase, Hive->BaseBlock, HV_BLOCK_SIZE); - Size = HV_BLOCK_SIZE; - - Bin = NULL; - for (i = 0; i < Hive->Storage[Stable].Length; i++) - { - if (Hive->Storage[Stable].BlockList[i].BinAddress != (ULONG_PTR)Bin) - { - Bin = (PHBIN)Hive->Storage[Stable].BlockList[i].BinAddress; - memcpy (ChunkBase + (i + 1) * HV_BLOCK_SIZE, - Bin, Bin->Size); - Size += Bin->Size; - } - } - - DbgPrint((DPRINT_REGISTRY, "ChunkSize: %x\n", Size)); - - *ChunkSize = Size; -} - - -BOOLEAN -RegExportBinaryHive(PCWSTR KeyName, - PCHAR ChunkBase, - ULONG* ChunkSize) -{ - PCMHIVE CmHive; - PHHIVE Hive; - NTSTATUS Status; - - DbgPrint((DPRINT_REGISTRY, "Creating binary hardware hive\n")); - - CmHive = CmpAllocate(sizeof(CMHIVE), TRUE, 0); - Status = HvInitialize (&CmHive->Hive, - HINIT_CREATE, - 0, - 0, - 0, - CmpAllocate, - CmpFree, - NULL, - NULL, - NULL, - NULL, - 0, - NULL); - Hive = &CmHive->Hive; - if (!NT_SUCCESS(Status)) - { - return FALSE; - } - - /* Init root key cell */ - if (!CmCreateRootNode (Hive, KeyName)) - { - HvFree (Hive); - return FALSE; - } - - if (!CmiExportHive (Hive, KeyName)) - { - HvFree (Hive); - return FALSE; - } - - CmiWriteHive (Hive, ChunkBase, ChunkSize); - - HvFree (Hive); - - return TRUE; -} - /* EOF */ 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 Tue Dec 11 18:50:30 2007 @@ -822,13 +822,6 @@ UiDrawProgressBarCenter(15, 100, szLoadingMsg); - /* - * Export the hardware hive - */ - Base = FrLdrCreateModule ("HARDWARE"); - RegExportBinaryHive (L"\\Registry\\Machine\\HARDWARE", (PCHAR)Base, &Size); - FrLdrCloseModule (Base, Size); - UiDrawProgressBarCenter(20, 100, szLoadingMsg); /* Modified: trunk/reactos/boot/freeldr/freeldr/reactos/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/registry.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/registry.c Tue Dec 11 18:50:30 2007 @@ -49,11 +49,6 @@ RegCreateKey (RootKey, L"Registry\\Machine\\SYSTEM", NULL); - - /* Create 'HARDWARE' key */ - RegCreateKey (RootKey, - L"Registry\\Machine\\HARDWARE", - NULL); } 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 Tue Dec 11 18:50:30 2007 @@ -160,8 +160,7 @@ VOID RunLoader(VOID) { - ULONG_PTR Base; - ULONG Size, i; + ULONG i; const char *SourcePath; const char *LoadOptions = "", *DbgLoadOptions = ""; const char *sourcePaths[] = { @@ -306,11 +305,6 @@ /* Load the kernel */ if (!FrLdrLoadKernel(szKernelName, 5)) return; - /* Export the hardware hive */ - Base = FrLdrCreateModule ("HARDWARE"); - RegExportBinaryHive (L"\\Registry\\Machine\\HARDWARE", (PVOID)Base, &Size); - FrLdrCloseModule (Base, Size); - /* Insert boot disk 2 */ if (MachDiskBootingFromFloppy()) { Modified: trunk/reactos/ntoskrnl/config/cmconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmconfig.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmconfig.c (original) +++ trunk/reactos/ntoskrnl/config/cmconfig.c Tue Dec 11 18:50:30 2007 @@ -87,7 +87,7 @@ /* Fail if the key couldn't be created, and make sure it's a new key */ if (!NT_SUCCESS(Status)) return Status; - //ASSERT(Disposition == REG_CREATED_NEW_KEY); + ASSERT(Disposition == REG_CREATED_NEW_KEY); } /* Setup the component information key */ @@ -399,7 +399,7 @@ NtClose(KeyHandle); /* Nobody should've created this key yet! */ - //ASSERT(Disposition == REG_CREATED_NEW_KEY); + ASSERT(Disposition == REG_CREATED_NEW_KEY); /* Setup the key name */ RtlInitUnicodeString(&KeyName, @@ -421,7 +421,7 @@ if (!NT_SUCCESS(Status)) return Status; /* Nobody should've created this key yet! */ - //ASSERT(Disposition == REG_CREATED_NEW_KEY); + ASSERT(Disposition == REG_CREATED_NEW_KEY); /* Allocate the configuration data buffer */ CmpConfigurationData = ExAllocatePoolWithTag(PagedPool, @@ -454,3 +454,4 @@ + Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c Tue Dec 11 18:50:30 2007 @@ -32,45 +32,6 @@ BOOLEAN CmpWasSetupBoot; /* FUNCTIONS *****************************************************************/ - -PVOID -NTAPI -CmpRosGetHardwareHive(OUT PULONG Length) -{ - PLIST_ENTRY ListHead, NextEntry; - PMEMORY_ALLOCATION_DESCRIPTOR MdBlock = NULL; - - /* Loop the memory descriptors */ - ListHead = &KeLoaderBlock->MemoryDescriptorListHead; - NextEntry = ListHead->Flink; - while (NextEntry != ListHead) - { - /* Get the current block */ - MdBlock = CONTAINING_RECORD(NextEntry, - MEMORY_ALLOCATION_DESCRIPTOR, - ListEntry); - - /* Check if this is an registry block */ - if (MdBlock->MemoryType == LoaderRegistryData) - { - /* Check if it's not the SYSTEM hive that we already initialized */ - if ((MdBlock->BasePage) != - (((ULONG_PTR)KeLoaderBlock->RegistryBase &~ KSEG0_BASE) >> PAGE_SHIFT)) - { - /* Hardware hive break out */ - break; - } - } - - /* Go to the next block */ - NextEntry = MdBlock->ListEntry.Flink; - } - - /* We need a hardware hive */ - ASSERT(MdBlock); - *Length = MdBlock->PageCount << PAGE_SHIFT; - return (PVOID)((MdBlock->BasePage << PAGE_SHIFT) | KSEG0_BASE); -} VOID NTAPI @@ -1344,8 +1305,6 @@ HANDLE KeyHandle; NTSTATUS Status; PCMHIVE HardwareHive; - PVOID BaseAddress; - ULONG Length; PSECURITY_DESCRIPTOR SecurityDescriptor; PAGED_CODE(); @@ -1479,20 +1438,17 @@ KEBUGCHECKEX(CONFIG_INITIALIZATION_FAILED, 1, 8, Status, 0); } - /* Import the hardware hive (FIXME: We should create it from scratch) */ - BaseAddress = CmpRosGetHardwareHive(&Length); - ((PHBASE_BLOCK)BaseAddress)->Length = Length; + /* Create the hardware hive */ Status = CmpInitializeHive((PCMHIVE*)&HardwareHive, - HINIT_MEMORY, //HINIT_CREATE, - HIVE_VOLATILE | HIVE_NOLAZYFLUSH, + HINIT_CREATE, + HIVE_VOLATILE, HFILE_TYPE_PRIMARY, - BaseAddress, // NULL, + NULL, NULL, NULL, NULL, NULL, 0); - CmPrepareHive(&HardwareHive->Hive); if (!NT_SUCCESS(Status)) { /* Bugcheck */ @@ -1507,7 +1463,7 @@ Status = CmpLinkHiveToMaster(&KeyName, NULL, (PCMHIVE)HardwareHive, - FALSE, // TRUE + TRUE, SecurityDescriptor); if (!NT_SUCCESS(Status)) {

1 0

[fireball] 31145: - Don't build the HARDWARE hive in FreeLDR anymore.
by fireball＠svn.reactos.org 11 Dec '07

11 Dec '07

Author: fireball Date: Tue Dec 11 18:32:24 2007 New Revision: 31145 URL: http://svn.reactos.org/svn/reactos?rev=31145&view=rev Log: - Don't build the HARDWARE hive in FreeLDR anymore. Modified: trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c trunk/reactos/boot/freeldr/freeldr/reactos/registry.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c Tue Dec 11 18:32:24 2007 @@ -47,27 +47,14 @@ IN ULONG Key, IN ULONG Affinity) { - LONG Error; PCONFIGURATION_COMPONENT Component = &ComponentData->ComponentEntry; /* Set component information */ Component->Flags = Flags; Component->Version = 0; Component->Revision = 0; - //Component->Key = Key; // HACK: We store the registry key here + Component->Key = Key; Component->AffinityMask = Affinity; - - /* Set the value */ - Error = RegSetValue((FRLDRHKEY)Component->Key, - L"Component Information", - REG_BINARY, - (PVOID)&Component->Flags, - FIELD_OFFSET(CONFIGURATION_COMPONENT, ConfigurationDataLength) - - FIELD_OFFSET(CONFIGURATION_COMPONENT, Flags)); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error %u)\n", Error)); - } } VOID @@ -75,7 +62,6 @@ FldrSetIdentifier(IN PCONFIGURATION_COMPONENT_DATA ComponentData, IN PWCHAR IdentifierString) { - LONG Error; ULONG IdentifierLength; PCONFIGURATION_COMPONENT Component = &ComponentData->ComponentEntry; PCHAR Identifier; @@ -92,25 +78,12 @@ /* Set component information */ Component->IdentifierLength = IdentifierLength; Component->Identifier = Identifier; - - /* Set the key */ - Error = RegSetValue((FRLDRHKEY)Component->Key, - L"Identifier", - REG_SZ, - (PCHAR)IdentifierString, - IdentifierLength); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error %u)\n", Error)); - return; - } } VOID NTAPI FldrCreateSystemKey(OUT PCONFIGURATION_COMPONENT_DATA *SystemNode) { - LONG Error; PCONFIGURATION_COMPONENT Component; /* Allocate the root */ @@ -127,16 +100,6 @@ /* Return the node */ *SystemNode = FldrArcHwTreeRoot; - - /* Create the key */ - Error = RegCreateKey(NULL, - L"\\Registry\\Machine\\HARDWARE\\DESCRIPTION\\System", - (FRLDRHKEY*)&Component->Key); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegCreateKey() failed (Error %u)\n", Error)); - return; - } } VOID @@ -178,8 +141,6 @@ IN CONFIGURATION_TYPE Type, OUT PCONFIGURATION_COMPONENT_DATA *ComponentKey) { - LONG Error; - WCHAR Buffer[80]; PCONFIGURATION_COMPONENT_DATA ComponentData; PCONFIGURATION_COMPONENT Component; @@ -199,20 +160,7 @@ Component->Type = Type; /* Return the child */ - *ComponentKey = ComponentData; - - /* Build the key name */ - swprintf(Buffer, L"%s\\%u", BusName, BusNumber); - - /* Create the key */ - Error = RegCreateKey((FRLDRHKEY)SystemNode->ComponentEntry.Key, - Buffer, - (FRLDRHKEY*)&Component->Key); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegCreateKey() failed (Error %u)\n", Error)); - return; - } + *ComponentKey = ComponentData; } VOID @@ -221,7 +169,6 @@ IN PCM_FULL_RESOURCE_DESCRIPTOR Data, IN ULONG Size) { - LONG Error; PCONFIGURATION_COMPONENT Component = &ComponentData->ComponentEntry; PVOID ConfigurationData; @@ -237,17 +184,4 @@ Component->ConfigurationDataLength = Size - FIELD_OFFSET(CM_FULL_RESOURCE_DESCRIPTOR, PartialResourceList); - - /* Set 'Configuration Data' value */ - Error = RegSetValue((FRLDRHKEY)Component->Key, - L"Configuration Data", - REG_FULL_RESOURCE_DESCRIPTOR, - (PVOID)Data, - Size); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, - "RegSetValue(Configuration Data) failed (Error %u)\n", - Error)); - } } Modified: trunk/reactos/boot/freeldr/freeldr/reactos/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/registry.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/registry.c Tue Dec 11 18:32:24 2007 @@ -54,21 +54,6 @@ RegCreateKey (RootKey, L"Registry\\Machine\\HARDWARE", NULL); - - /* Create 'HARDWARE\DESCRIPTION' key */ - RegCreateKey (RootKey, - L"Registry\\Machine\\HARDWARE\\DESCRIPTION", - NULL); - - /* Create 'HARDWARE\DEVICEMAP' key */ - RegCreateKey (RootKey, - L"Registry\\Machine\\HARDWARE\\DEVICEMAP", - NULL); - - /* Create 'HARDWARE\RESOURCEMAP' key */ - RegCreateKey (RootKey, - L"Registry\\Machine\\HARDWARE\\RESOURCEMAP", - NULL); }

1 0

[fireball] 31144: - Add missing types to DDK. - Fix FldrSetconfigurationData: ARC Configuration Data is a CM_PARTIAL_RESOURCE_LIST, not a CM_FULL_RESOURCE_DESCRIPTOR! - The Interface Types for PCI BIOS and PCI IRQ Routing Table are Internal, not PCIBus. - Disk drives are Internal, not Unknown. - Replace CmpDumpHardwareTree by CmpSetupConfigurationTree which now calls CmpInitializeRegistryNode (a function previously used to build the CPU ARC nodes previously in the kernel). We now write the ARC t
by fireball＠svn.reactos.org 11 Dec '07

11 Dec '07

Author: fireball Date: Tue Dec 11 18:12:05 2007 New Revision: 31144 URL: http://svn.reactos.org/svn/reactos?rev=31144&view=rev Log: - Add missing types to DDK. - Fix FldrSetconfigurationData: ARC Configuration Data is a CM_PARTIAL_RESOURCE_LIST, not a CM_FULL_RESOURCE_DESCRIPTOR! - The Interface Types for PCI BIOS and PCI IRQ Routing Table are Internal, not PCIBus. - Disk drives are Internal, not Unknown. - Replace CmpDumpHardwareTree by CmpSetupConfigurationTree which now calls CmpInitializeRegistryNode (a function previously used to build the CPU ARC nodes previously in the kernel). We now write the ARC tree in the HARDWARE\Description\System key. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c trunk/reactos/boot/freeldr/freeldr/include/arch/i386/hardware.h trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c trunk/reactos/include/ddk/winddk.h trunk/reactos/ntoskrnl/config/cmconfig.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c Tue Dec 11 18:12:05 2007 @@ -79,44 +79,6 @@ /* Timeout in ms for sending to keyboard controller. */ #define CONTROLLER_TIMEOUT 250 - -typedef struct _CM_DISK_GEOMETRY_DEVICE_DATA -{ - ULONG BytesPerSector; - ULONG NumberOfCylinders; - ULONG SectorsPerTrack; - ULONG NumberOfHeads; -} CM_DISK_GEOMETRY_DEVICE_DATA, *PCM_DISK_GEOMETRY_DEVICE_DATA; - - -typedef struct _CM_PNP_BIOS_DEVICE_NODE -{ - USHORT Size; - CHAR Node; - ULONG ProductId; - CHAR DeviceType[3]; - USHORT DeviceAttributes; -} __attribute__((packed)) CM_PNP_BIOS_DEVICE_NODE, *PCM_PNP_BIOS_DEVICE_NODE; - - -typedef struct _CM_PNP_BIOS_INSTALLATION_CHECK -{ - UCHAR Signature[4]; - UCHAR Revision; - UCHAR Length; - USHORT ControlField; - UCHAR Checksum; - ULONG EventFlagAddress; - USHORT RealModeEntryOffset; - USHORT RealModeEntrySegment; - USHORT ProtectedModeEntryOffset; - ULONG ProtectedModeCodeBaseAddress; - ULONG OemDeviceId; - USHORT RealModeDataBaseAddress; - ULONG ProtectedModeDataBaseAddress; -} __attribute__((packed)) CM_PNP_BIOS_INSTALLATION_CHECK, *PCM_PNP_BIOS_INSTALLATION_CHECK; - - static WCHAR Hex[] = L"0123456789ABCDEF"; static unsigned int delay_count = 1; @@ -388,7 +350,7 @@ } memset(FullResourceDescriptor, 0, Size); - FullResourceDescriptor->InterfaceType = InterfaceTypeUndefined; + FullResourceDescriptor->InterfaceType = Isa; FullResourceDescriptor->BusNumber = 0; FullResourceDescriptor->PartialResourceList.Version = 1; FullResourceDescriptor->PartialResourceList.Revision = 1; Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c Tue Dec 11 18:12:05 2007 @@ -183,7 +183,7 @@ /* Initialize resource descriptor */ memset(FullResourceDescriptor, 0, Size); - FullResourceDescriptor->InterfaceType = Isa; + FullResourceDescriptor->InterfaceType = Internal; FullResourceDescriptor->BusNumber = 0; FullResourceDescriptor->PartialResourceList.Version = 1; FullResourceDescriptor->PartialResourceList.Revision = 1; @@ -259,7 +259,7 @@ /* Initialize resource descriptor */ memset(FullResourceDescriptor, 0, Size); - FullResourceDescriptor->InterfaceType = PCIBus; + FullResourceDescriptor->InterfaceType = Internal; FullResourceDescriptor->BusNumber = 0; FullResourceDescriptor->PartialResourceList.Version = 0; FullResourceDescriptor->PartialResourceList.Revision = 0; Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/hardware.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/i386/hardware.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/i386/hardware.h Tue Dec 11 18:12:05 2007 @@ -75,7 +75,7 @@ NTAPI FldrSetConfigurationData( IN PCONFIGURATION_COMPONENT_DATA ComponentKey, - IN PVOID ConfigurationData, + IN PCM_FULL_RESOURCE_DESCRIPTOR ConfigurationData, IN ULONG Size ); Modified: trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c Tue Dec 11 18:12:05 2007 @@ -218,7 +218,7 @@ VOID NTAPI FldrSetConfigurationData(IN PCONFIGURATION_COMPONENT_DATA ComponentData, - IN PVOID Data, + IN PCM_FULL_RESOURCE_DESCRIPTOR Data, IN ULONG Size) { LONG Error; @@ -230,17 +230,19 @@ if (!ConfigurationData) return; /* Copy component information */ - RtlCopyMemory(ConfigurationData, Data, Size); + RtlCopyMemory(ConfigurationData, &Data->PartialResourceList.Version, Size); /* Set component information */ ComponentData->ConfigurationData = ConfigurationData; - Component->ConfigurationDataLength = Size; + Component->ConfigurationDataLength = Size - + FIELD_OFFSET(CM_FULL_RESOURCE_DESCRIPTOR, + PartialResourceList); /* Set 'Configuration Data' value */ Error = RegSetValue((FRLDRHKEY)Component->Key, L"Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - Data, + (PVOID)Data, Size); if (Error != ERROR_SUCCESS) { Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/winddk.h (original) +++ trunk/reactos/include/ddk/winddk.h Tue Dec 11 18:12:05 2007 @@ -1775,7 +1775,42 @@ USHORT MaxHeads; USHORT NumberDrives; } CM_INT13_DRIVE_PARAMETER, *PCM_INT13_DRIVE_PARAMETER; + +typedef struct _CM_PNP_BIOS_DEVICE_NODE +{ + USHORT Size; + UCHAR Node; + ULONG ProductId; + UCHAR DeviceType[3]; + USHORT DeviceAttributes; +} CM_PNP_BIOS_DEVICE_NODE,*PCM_PNP_BIOS_DEVICE_NODE; + +typedef struct _CM_PNP_BIOS_INSTALLATION_CHECK +{ + UCHAR Signature[4]; + UCHAR Revision; + UCHAR Length; + USHORT ControlField; + UCHAR Checksum; + ULONG EventFlagAddress; + USHORT RealModeEntryOffset; + USHORT RealModeEntrySegment; + USHORT ProtectedModeEntryOffset; + ULONG ProtectedModeCodeBaseAddress; + ULONG OemDeviceId; + USHORT RealModeDataBaseAddress; + ULONG ProtectedModeDataBaseAddress; +} CM_PNP_BIOS_INSTALLATION_CHECK, *PCM_PNP_BIOS_INSTALLATION_CHECK; + #include <poppack.h> + +typedef struct _CM_DISK_GEOMETRY_DEVICE_DATA +{ + ULONG BytesPerSector; + ULONG NumberOfCylinders; + ULONG SectorsPerTrack; + ULONG NumberOfHeads; +} CM_DISK_GEOMETRY_DEVICE_DATA, *PCM_DISK_GEOMETRY_DEVICE_DATA; typedef struct _CM_KEYBOARD_DEVICE_DATA { USHORT Version; Modified: trunk/reactos/ntoskrnl/config/cmconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmconfig.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmconfig.c (original) +++ trunk/reactos/ntoskrnl/config/cmconfig.c Tue Dec 11 18:12:05 2007 @@ -195,17 +195,19 @@ return Status; } -int t, tabLevel; - -VOID +NTSTATUS NTAPI -CmpDumpHardwareTree(IN PCONFIGURATION_COMPONENT_DATA CurrentEntry, - IN INTERFACE_TYPE InterfaceType, - IN ULONG BusNumber) +CmpSetupConfigurationTree(IN PCONFIGURATION_COMPONENT_DATA CurrentEntry, + IN HANDLE ParentHandle, + IN INTERFACE_TYPE InterfaceType, + IN ULONG BusNumber) { PCONFIGURATION_COMPONENT Component; USHORT DeviceIndexTable[MaximumType + 1] = {0}; ULONG Interface = InterfaceType, Bus = BusNumber, i; + NTSTATUS Status; + HANDLE NewHandle; + static ULONG t, tabLevel; PCHAR InterfaceStrings[MaximumInterfaceType + 1] = { "Internal", @@ -226,7 +228,8 @@ "PNPBus", "Unknown" }; - + + /* Loop each entry */ while (CurrentEntry) { for (t = 0; t < tabLevel; t++) DbgPrint("\t"); @@ -234,7 +237,7 @@ for (t = 0; t < tabLevel; t++) DbgPrint("\t"); DbgPrint("Parent @ 0x%p Sibling @ 0x%p Child @ 0x%p\n", CurrentEntry->Parent, CurrentEntry->Sibling, CurrentEntry->Child); - + /* Check if this is an adapter */ Component = &CurrentEntry->ComponentEntry; if ((Component->Class == AdapterClass) && @@ -250,7 +253,7 @@ Interface = Eisa; Bus = CmpTypeCount[EisaAdapter]++; break; - + /* Turbo-channel */ case TcAdapter: @@ -258,7 +261,7 @@ Interface = TurboChannel; Bus = CmpTypeCount[TurboChannel]++; break; - + /* ISA, PCI, etc busses */ case MultiFunctionAdapter: @@ -282,15 +285,15 @@ Bus = CmpMultifunctionTypes[i].Count++; } break; - + /* SCSI Bus */ case ScsiAdapter: - + /* Fix up */ Interface = Internal; Bus = CmpTypeCount[ScsiAdapter]++; break; - + /* Unknown */ default: Interface = -1; @@ -298,9 +301,6 @@ break; } } - - /* Convert from NT to ARC class */ - if (Component->Class == SystemClass) Component->Type = ArcSystem; /* Dump information on the component */ for (t = 0; t < tabLevel; t++) DbgPrint("\t"); @@ -310,7 +310,7 @@ if (Component->Class != SystemClass) { for (t = 0; t < tabLevel; t++) DbgPrint("\t"); - DbgPrint("Device Index: %lx\n", DeviceIndexTable[Component->Type]++); + DbgPrint("Device Index: %lx\n", DeviceIndexTable[Component->Type]); } for (t = 0; t < tabLevel; t++) DbgPrint("\t"); DbgPrint("Component Information:\n"); @@ -332,18 +332,40 @@ InterfaceStrings[Interface], Bus); + /* Setup the hardware node */ + Status = CmpInitializeRegistryNode(CurrentEntry, + ParentHandle, + &NewHandle, + Interface, + Bus, + DeviceIndexTable); + if (!NT_SUCCESS(Status)) return Status; + /* Check for children */ if (CurrentEntry->Child) { /* Recurse child */ tabLevel++; - CmpDumpHardwareTree(CurrentEntry->Child, Interface, Bus); + Status = CmpSetupConfigurationTree(CurrentEntry->Child, + NewHandle, + Interface, + Bus); tabLevel--; + if (!NT_SUCCESS(Status)) + { + /* Fail */ + NtClose(NewHandle); + return Status; + } } /* Get to the next entry */ + NtClose(NewHandle); CurrentEntry = CurrentEntry->Sibling; } + + /* We're done */ + return STATUS_SUCCESS; } NTSTATUS @@ -410,10 +432,13 @@ /* Check if we got anything from NTLDR */ if (LoaderBlock->ConfigurationRoot) { - /* Dump the hardware tree */ + /* Setup the configuration tree */ DPRINT1("ARC Hardware Tree Received @ 0x%p. Dumping HW Info:\n\n", LoaderBlock->ConfigurationRoot); - CmpDumpHardwareTree(LoaderBlock->ConfigurationRoot, -1, -1); + Status = CmpSetupConfigurationTree(LoaderBlock->ConfigurationRoot, + KeyHandle, + -1, + -1); } else { @@ -428,3 +453,4 @@ } +

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