Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 70562: [CMLIB]: Go from 3-space indentation to 4-space.
by hbelusca＠svn.reactos.org 09 Jan '16

09 Jan '16

Author: hbelusca Date: Sat Jan 9 23:42:45 2016 New Revision: 70562 URL: http://svn.reactos.org/svn/reactos?rev=70562&view=rev Log: [CMLIB]: Go from 3-space indentation to 4-space. Modified: trunk/reactos/lib/cmlib/cmdata.h trunk/reactos/lib/cmlib/cminit.c trunk/reactos/lib/cmlib/cmlib.h trunk/reactos/lib/cmlib/cmtools.c trunk/reactos/lib/cmlib/hivebin.c trunk/reactos/lib/cmlib/hivecell.c trunk/reactos/lib/cmlib/hivedata.h trunk/reactos/lib/cmlib/hiveinit.c trunk/reactos/lib/cmlib/hivesum.c trunk/reactos/lib/cmlib/hivewrt.c Modified: trunk/reactos/lib/cmlib/cmdata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmdata.h?rev=705… ============================================================================== --- trunk/reactos/lib/cmlib/cmdata.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmdata.h [iso-8859-1] Sat Jan 9 23:42:45 2016 @@ -1,5 +1,5 @@ /* - * PROJECT: registry manipulation library + * PROJECT: Registry manipulation library * LICENSE: GPL - See COPYING in the top level directory * COPYRIGHT: Copyright 2005 Filip Navara <navaraf(a)reactos.org> * Copyright 2001 - 2005 Eric Kohl Modified: trunk/reactos/lib/cmlib/cminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cminit.c?rev=705… ============================================================================== --- trunk/reactos/lib/cmlib/cminit.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cminit.c [iso-8859-1] Sat Jan 9 23:42:45 2016 @@ -1,5 +1,5 @@ /* - * PROJECT: registry manipulation library + * PROJECT: Registry manipulation library * LICENSE: GPL - See COPYING in the top level directory * COPYRIGHT: Copyright 2005 Filip Navara <navaraf(a)reactos.org> * Copyright 2001 - 2005 Eric Kohl @@ -13,124 +13,124 @@ BOOLEAN CMAPI CmCreateRootNode( - PHHIVE Hive, - PCWSTR Name) + PHHIVE Hive, + PCWSTR Name) { - PCM_KEY_NODE KeyCell; - HCELL_INDEX RootCellIndex; - ULONG NameSize; + PCM_KEY_NODE KeyCell; + HCELL_INDEX RootCellIndex; + ULONG NameSize; - /* Allocate the cell */ - NameSize = (ULONG)strlenW(Name) * sizeof(WCHAR); - RootCellIndex = HvAllocateCell(Hive, - FIELD_OFFSET(CM_KEY_NODE, Name) + NameSize, - Stable, - HCELL_NIL); - if (RootCellIndex == HCELL_NIL) return FALSE; + /* Allocate the cell */ + NameSize = (ULONG)strlenW(Name) * sizeof(WCHAR); + RootCellIndex = HvAllocateCell(Hive, + FIELD_OFFSET(CM_KEY_NODE, Name) + NameSize, + Stable, + HCELL_NIL); + if (RootCellIndex == HCELL_NIL) return FALSE; - /* Seutp the base block */ - Hive->BaseBlock->RootCell = RootCellIndex; - Hive->BaseBlock->CheckSum = HvpHiveHeaderChecksum(Hive->BaseBlock); + /* Seutp the base block */ + Hive->BaseBlock->RootCell = RootCellIndex; + Hive->BaseBlock->CheckSum = HvpHiveHeaderChecksum(Hive->BaseBlock); - /* Get the key cell */ - KeyCell = (PCM_KEY_NODE)HvGetCell(Hive, RootCellIndex); - if (!KeyCell) return FALSE; + /* Get the key cell */ + KeyCell = (PCM_KEY_NODE)HvGetCell(Hive, RootCellIndex); + if (!KeyCell) return FALSE; - /* Setup the cell */ - KeyCell->Signature = (USHORT)CM_KEY_NODE_SIGNATURE; - KeyCell->Flags = KEY_HIVE_ENTRY | KEY_NO_DELETE; - KeyCell->LastWriteTime.QuadPart = 0; - KeyCell->Parent = HCELL_NIL; - KeyCell->SubKeyCounts[Stable] = 0; - KeyCell->SubKeyCounts[Volatile] = 0; - KeyCell->SubKeyLists[Stable] = HCELL_NIL; - KeyCell->SubKeyLists[Volatile] = HCELL_NIL; - KeyCell->ValueList.Count = 0; - KeyCell->ValueList.List = HCELL_NIL; - KeyCell->Security = HCELL_NIL; - KeyCell->Class = HCELL_NIL; - KeyCell->ClassLength = 0; - KeyCell->MaxNameLen = 0; - KeyCell->MaxClassLen = 0; - KeyCell->MaxValueNameLen = 0; - KeyCell->MaxValueDataLen = 0; + /* Setup the cell */ + KeyCell->Signature = (USHORT)CM_KEY_NODE_SIGNATURE; + KeyCell->Flags = KEY_HIVE_ENTRY | KEY_NO_DELETE; + KeyCell->LastWriteTime.QuadPart = 0; + KeyCell->Parent = HCELL_NIL; + KeyCell->SubKeyCounts[Stable] = 0; + KeyCell->SubKeyCounts[Volatile] = 0; + KeyCell->SubKeyLists[Stable] = HCELL_NIL; + KeyCell->SubKeyLists[Volatile] = HCELL_NIL; + KeyCell->ValueList.Count = 0; + KeyCell->ValueList.List = HCELL_NIL; + KeyCell->Security = HCELL_NIL; + KeyCell->Class = HCELL_NIL; + KeyCell->ClassLength = 0; + KeyCell->MaxNameLen = 0; + KeyCell->MaxClassLen = 0; + KeyCell->MaxValueNameLen = 0; + KeyCell->MaxValueDataLen = 0; - /* Write the name */ - KeyCell->NameLength = (USHORT)NameSize; - RtlCopyMemory(KeyCell->Name, Name, NameSize); + /* Write the name */ + KeyCell->NameLength = (USHORT)NameSize; + RtlCopyMemory(KeyCell->Name, Name, NameSize); - /* Return success */ - HvReleaseCell(Hive, RootCellIndex); - return TRUE; + /* Return success */ + HvReleaseCell(Hive, RootCellIndex); + return TRUE; } static VOID CMAPI CmpPrepareKey( - PHHIVE RegistryHive, - PCM_KEY_NODE KeyCell); + PHHIVE RegistryHive, + PCM_KEY_NODE KeyCell); static VOID CMAPI CmpPrepareIndexOfKeys( - PHHIVE RegistryHive, - PCM_KEY_INDEX IndexCell) + PHHIVE RegistryHive, + PCM_KEY_INDEX IndexCell) { - ULONG i; + ULONG i; - if (IndexCell->Signature == CM_KEY_INDEX_ROOT || - IndexCell->Signature == CM_KEY_INDEX_LEAF) - { - for (i = 0; i < IndexCell->Count; i++) - { - PCM_KEY_INDEX SubIndexCell = HvGetCell(RegistryHive, IndexCell->List[i]); - if (SubIndexCell->Signature == CM_KEY_NODE_SIGNATURE) - CmpPrepareKey(RegistryHive, (PCM_KEY_NODE)SubIndexCell); - else - CmpPrepareIndexOfKeys(RegistryHive, SubIndexCell); - } + if (IndexCell->Signature == CM_KEY_INDEX_ROOT || + IndexCell->Signature == CM_KEY_INDEX_LEAF) + { + for (i = 0; i < IndexCell->Count; i++) + { + PCM_KEY_INDEX SubIndexCell = HvGetCell(RegistryHive, IndexCell->List[i]); + if (SubIndexCell->Signature == CM_KEY_NODE_SIGNATURE) + CmpPrepareKey(RegistryHive, (PCM_KEY_NODE)SubIndexCell); + else + CmpPrepareIndexOfKeys(RegistryHive, SubIndexCell); + } } - else if (IndexCell->Signature == CM_KEY_FAST_LEAF || - IndexCell->Signature == CM_KEY_HASH_LEAF) - { - PCM_KEY_FAST_INDEX HashCell = (PCM_KEY_FAST_INDEX)IndexCell; - for (i = 0; i < HashCell->Count; i++) - { - PCM_KEY_NODE SubKeyCell = HvGetCell(RegistryHive, HashCell->List[i].Cell); - CmpPrepareKey(RegistryHive, SubKeyCell); - } - } - else - { - DPRINT1("IndexCell->Signature %x\n", IndexCell->Signature); - ASSERT(FALSE); - } + else if (IndexCell->Signature == CM_KEY_FAST_LEAF || + IndexCell->Signature == CM_KEY_HASH_LEAF) + { + PCM_KEY_FAST_INDEX HashCell = (PCM_KEY_FAST_INDEX)IndexCell; + for (i = 0; i < HashCell->Count; i++) + { + PCM_KEY_NODE SubKeyCell = HvGetCell(RegistryHive, HashCell->List[i].Cell); + CmpPrepareKey(RegistryHive, SubKeyCell); + } + } + else + { + DPRINT1("IndexCell->Signature %x\n", IndexCell->Signature); + ASSERT(FALSE); + } } static VOID CMAPI CmpPrepareKey( - PHHIVE RegistryHive, - PCM_KEY_NODE KeyCell) + PHHIVE RegistryHive, + PCM_KEY_NODE KeyCell) { - PCM_KEY_INDEX IndexCell; + PCM_KEY_INDEX IndexCell; - ASSERT(KeyCell->Signature == CM_KEY_NODE_SIGNATURE); + ASSERT(KeyCell->Signature == CM_KEY_NODE_SIGNATURE); - KeyCell->SubKeyLists[Volatile] = HCELL_NIL; - KeyCell->SubKeyCounts[Volatile] = 0; + KeyCell->SubKeyLists[Volatile] = HCELL_NIL; + KeyCell->SubKeyCounts[Volatile] = 0; - /* Enumerate and add subkeys */ - if (KeyCell->SubKeyCounts[Stable] > 0) - { - IndexCell = HvGetCell(RegistryHive, KeyCell->SubKeyLists[Stable]); - CmpPrepareIndexOfKeys(RegistryHive, IndexCell); - } + /* Enumerate and add subkeys */ + if (KeyCell->SubKeyCounts[Stable] > 0) + { + IndexCell = HvGetCell(RegistryHive, KeyCell->SubKeyLists[Stable]); + CmpPrepareIndexOfKeys(RegistryHive, IndexCell); + } } VOID CMAPI CmPrepareHive( - PHHIVE RegistryHive) + PHHIVE RegistryHive) { - PCM_KEY_NODE RootCell; + PCM_KEY_NODE RootCell; - RootCell = HvGetCell(RegistryHive, RegistryHive->BaseBlock->RootCell); - CmpPrepareKey(RegistryHive, RootCell); + RootCell = HvGetCell(RegistryHive, RegistryHive->BaseBlock->RootCell); + CmpPrepareKey(RegistryHive, RootCell); } Modified: trunk/reactos/lib/cmlib/cmlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=7056… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] Sat Jan 9 23:42:45 2016 @@ -1,5 +1,5 @@ /* - * PROJECT: registry manipulation library + * PROJECT: Registry manipulation library * LICENSE: GPL - See COPYING in the top level directory * COPYRIGHT: Copyright 2005 Filip Navara <navaraf(a)reactos.org> * Copyright 2001 - 2005 Eric Kohl Modified: trunk/reactos/lib/cmlib/cmtools.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmtools.c?rev=70… ============================================================================== --- trunk/reactos/lib/cmlib/cmtools.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmtools.c [iso-8859-1] Sat Jan 9 23:42:45 2016 @@ -1,5 +1,5 @@ /* - * PROJECT: registry manipulation library + * PROJECT: Registry manipulation library * LICENSE: GPL - See COPYING in the top level directory * COPYRIGHT: Copyright 2005 Filip Navara <navaraf(a)reactos.org> * Copyright 2001 - 2005 Eric Kohl Modified: trunk/reactos/lib/cmlib/hivebin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivebin.c?rev=70… ============================================================================== --- trunk/reactos/lib/cmlib/hivebin.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hivebin.c [iso-8859-1] Sat Jan 9 23:42:45 2016 @@ -1,5 +1,5 @@ /* - * PROJECT: registry manipulation library + * PROJECT: Registry manipulation library * LICENSE: GPL - See COPYING in the top level directory * COPYRIGHT: Copyright 2005 Filip Navara <navaraf(a)reactos.org> * Copyright 2005 Hartmut Birr @@ -10,98 +10,98 @@ PHBIN CMAPI HvpAddBin( - PHHIVE RegistryHive, - ULONG Size, - HSTORAGE_TYPE Storage) + PHHIVE RegistryHive, + ULONG Size, + HSTORAGE_TYPE Storage) { - PHMAP_ENTRY BlockList; - PHBIN Bin; - SIZE_T BinSize; - ULONG i; - ULONG BitmapSize; - ULONG BlockCount; - ULONG OldBlockListSize; - PHCELL Block; + PHMAP_ENTRY BlockList; + PHBIN Bin; + SIZE_T BinSize; + ULONG i; + ULONG BitmapSize; + ULONG BlockCount; + ULONG OldBlockListSize; + PHCELL Block; - BinSize = ROUND_UP(Size + sizeof(HBIN), HBLOCK_SIZE); - BlockCount = (ULONG)(BinSize / HBLOCK_SIZE); + BinSize = ROUND_UP(Size + sizeof(HBIN), HBLOCK_SIZE); + BlockCount = (ULONG)(BinSize / HBLOCK_SIZE); - Bin = RegistryHive->Allocate(BinSize, TRUE, TAG_CM); - if (Bin == NULL) - return NULL; - RtlZeroMemory(Bin, BinSize); + Bin = RegistryHive->Allocate(BinSize, TRUE, TAG_CM); + if (Bin == NULL) + return NULL; + RtlZeroMemory(Bin, BinSize); - Bin->Signature = HV_BIN_SIGNATURE; - Bin->FileOffset = RegistryHive->Storage[Storage].Length * - HBLOCK_SIZE; - Bin->Size = (ULONG)BinSize; + Bin->Signature = HV_BIN_SIGNATURE; + Bin->FileOffset = RegistryHive->Storage[Storage].Length * + HBLOCK_SIZE; + Bin->Size = (ULONG)BinSize; - /* Allocate new block list */ - OldBlockListSize = RegistryHive->Storage[Storage].Length; - BlockList = RegistryHive->Allocate(sizeof(HMAP_ENTRY) * - (OldBlockListSize + BlockCount), - TRUE, - TAG_CM); - if (BlockList == NULL) - { - RegistryHive->Free(Bin, 0); - return NULL; - } + /* Allocate new block list */ + OldBlockListSize = RegistryHive->Storage[Storage].Length; + BlockList = RegistryHive->Allocate(sizeof(HMAP_ENTRY) * + (OldBlockListSize + BlockCount), + TRUE, + TAG_CM); + if (BlockList == NULL) + { + RegistryHive->Free(Bin, 0); + return NULL; + } - if (OldBlockListSize > 0) - { - RtlCopyMemory(BlockList, RegistryHive->Storage[Storage].BlockList, - OldBlockListSize * sizeof(HMAP_ENTRY)); - RegistryHive->Free(RegistryHive->Storage[Storage].BlockList, 0); - } + if (OldBlockListSize > 0) + { + RtlCopyMemory(BlockList, RegistryHive->Storage[Storage].BlockList, + OldBlockListSize * sizeof(HMAP_ENTRY)); + RegistryHive->Free(RegistryHive->Storage[Storage].BlockList, 0); + } - RegistryHive->Storage[Storage].BlockList = BlockList; - RegistryHive->Storage[Storage].Length += BlockCount; + RegistryHive->Storage[Storage].BlockList = BlockList; + RegistryHive->Storage[Storage].Length += BlockCount; - for (i = 0; i < BlockCount; i++) - { - RegistryHive->Storage[Storage].BlockList[OldBlockListSize + i].BlockAddress = - ((ULONG_PTR)Bin + (i * HBLOCK_SIZE)); - RegistryHive->Storage[Storage].BlockList[OldBlockListSize + i].BinAddress = (ULONG_PTR)Bin; - } + for (i = 0; i < BlockCount; i++) + { + RegistryHive->Storage[Storage].BlockList[OldBlockListSize + i].BlockAddress = + ((ULONG_PTR)Bin + (i * HBLOCK_SIZE)); + RegistryHive->Storage[Storage].BlockList[OldBlockListSize + i].BinAddress = (ULONG_PTR)Bin; + } - /* Initialize a free block in this heap. */ - Block = (PHCELL)(Bin + 1); - Block->Size = (LONG)(BinSize - sizeof(HBIN)); + /* Initialize a free block in this heap. */ + Block = (PHCELL)(Bin + 1); + Block->Size = (LONG)(BinSize - sizeof(HBIN)); - if (Storage == Stable) - { - /* Calculate bitmap size in bytes (always a multiple of 32 bits). */ - BitmapSize = ROUND_UP(RegistryHive->Storage[Stable].Length, - sizeof(ULONG) * 8) / 8; + if (Storage == Stable) + { + /* Calculate bitmap size in bytes (always a multiple of 32 bits). */ + BitmapSize = ROUND_UP(RegistryHive->Storage[Stable].Length, + sizeof(ULONG) * 8) / 8; - /* Grow bitmap if necessary. */ - if (BitmapSize > RegistryHive->DirtyVector.SizeOfBitMap / 8) - { - PULONG BitmapBuffer; + /* Grow bitmap if necessary. */ + if (BitmapSize > RegistryHive->DirtyVector.SizeOfBitMap / 8) + { + PULONG BitmapBuffer; - BitmapBuffer = RegistryHive->Allocate(BitmapSize, TRUE, TAG_CM); - RtlZeroMemory(BitmapBuffer, BitmapSize); - if (RegistryHive->DirtyVector.SizeOfBitMap > 0) - { - ASSERT(RegistryHive->DirtyVector.Buffer); - RtlCopyMemory(BitmapBuffer, - RegistryHive->DirtyVector.Buffer, - RegistryHive->DirtyVector.SizeOfBitMap / 8); - RegistryHive->Free(RegistryHive->DirtyVector.Buffer, 0); - } - RtlInitializeBitMap(&RegistryHive->DirtyVector, BitmapBuffer, - BitmapSize * 8); - } + BitmapBuffer = RegistryHive->Allocate(BitmapSize, TRUE, TAG_CM); + RtlZeroMemory(BitmapBuffer, BitmapSize); + if (RegistryHive->DirtyVector.SizeOfBitMap > 0) + { + ASSERT(RegistryHive->DirtyVector.Buffer); + RtlCopyMemory(BitmapBuffer, + RegistryHive->DirtyVector.Buffer, + RegistryHive->DirtyVector.SizeOfBitMap / 8); + RegistryHive->Free(RegistryHive->DirtyVector.Buffer, 0); + } + RtlInitializeBitMap(&RegistryHive->DirtyVector, BitmapBuffer, + BitmapSize * 8); + } - /* Mark new bin dirty. */ - RtlSetBits(&RegistryHive->DirtyVector, - Bin->FileOffset / HBLOCK_SIZE, - BlockCount); + /* Mark new bin dirty. */ + RtlSetBits(&RegistryHive->DirtyVector, + Bin->FileOffset / HBLOCK_SIZE, + BlockCount); - /* Update size in the base block */ - RegistryHive->BaseBlock->Length += BinSize; - } + /* Update size in the base block */ + RegistryHive->BaseBlock->Length += BinSize; + } - return Bin; + return Bin; } Modified: trunk/reactos/lib/cmlib/hivecell.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivecell.c?rev=7… ============================================================================== --- trunk/reactos/lib/cmlib/hivecell.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hivecell.c [iso-8859-1] Sat Jan 9 23:42:45 2016 @@ -1,5 +1,5 @@ /* - * PROJECT: registry manipulation library + * PROJECT: Registry manipulation library * LICENSE: GPL - See COPYING in the top level directory * COPYRIGHT: Copyright 2005 Filip Navara <navaraf(a)reactos.org> * Copyright 2001 - 2005 Eric Kohl @@ -11,514 +11,515 @@ static __inline PHCELL CMAPI HvpGetCellHeader( - PHHIVE RegistryHive, - HCELL_INDEX CellIndex) -{ - PVOID Block; - - CMLTRACE(CMLIB_HCELL_DEBUG, "%s - Hive %p, CellIndex %08lx\n", - __FUNCTION__, RegistryHive, CellIndex); - - ASSERT(CellIndex != HCELL_NIL); - if (!RegistryHive->Flat) - { - ULONG CellType; - ULONG CellBlock; - ULONG CellOffset; - - CellType = (CellIndex & HCELL_TYPE_MASK) >> HCELL_TYPE_SHIFT; - CellBlock = (CellIndex & HCELL_BLOCK_MASK) >> HCELL_BLOCK_SHIFT; - CellOffset = (CellIndex & HCELL_OFFSET_MASK) >> HCELL_OFFSET_SHIFT; - ASSERT(CellBlock < RegistryHive->Storage[CellType].Length); - Block = (PVOID)RegistryHive->Storage[CellType].BlockList[CellBlock].BlockAddress; - ASSERT(Block != NULL); - return (PVOID)((ULONG_PTR)Block + CellOffset); - } - else - { - ASSERT((CellIndex & HCELL_TYPE_MASK) == Stable); - return (PVOID)((ULONG_PTR)RegistryHive->BaseBlock + HBLOCK_SIZE + - CellIndex); - } + PHHIVE RegistryHive, + HCELL_INDEX CellIndex) +{ + PVOID Block; + + CMLTRACE(CMLIB_HCELL_DEBUG, "%s - Hive %p, CellIndex %08lx\n", + __FUNCTION__, RegistryHive, CellIndex); + + ASSERT(CellIndex != HCELL_NIL); + if (!RegistryHive->Flat) + { + ULONG CellType; + ULONG CellBlock; + ULONG CellOffset; + + CellType = (CellIndex & HCELL_TYPE_MASK) >> HCELL_TYPE_SHIFT; + CellBlock = (CellIndex & HCELL_BLOCK_MASK) >> HCELL_BLOCK_SHIFT; + CellOffset = (CellIndex & HCELL_OFFSET_MASK) >> HCELL_OFFSET_SHIFT; + ASSERT(CellBlock < RegistryHive->Storage[CellType].Length); + Block = (PVOID)RegistryHive->Storage[CellType].BlockList[CellBlock].BlockAddress; + ASSERT(Block != NULL); + return (PVOID)((ULONG_PTR)Block + CellOffset); + } + else + { + ASSERT((CellIndex & HCELL_TYPE_MASK) == Stable); + return (PVOID)((ULONG_PTR)RegistryHive->BaseBlock + HBLOCK_SIZE + + CellIndex); + } } BOOLEAN CMAPI HvIsCellAllocated(IN PHHIVE RegistryHive, IN HCELL_INDEX CellIndex) { - ULONG Type, Block; - - /* If it's a flat hive, the cell is always allocated */ - if (RegistryHive->Flat) - return TRUE; - - /* Otherwise, get the type and make sure it's valid */ - Type = HvGetCellType(CellIndex); - Block = HvGetCellBlock(CellIndex); - if (Block >= RegistryHive->Storage[Type].Length) - return FALSE; - - /* Try to get the cell block */ - if (RegistryHive->Storage[Type].BlockList[Block].BlockAddress) - return TRUE; - - /* No valid block, fail */ - return FALSE; + ULONG Type, Block; + + /* If it's a flat hive, the cell is always allocated */ + if (RegistryHive->Flat) + return TRUE; + + /* Otherwise, get the type and make sure it's valid */ + Type = HvGetCellType(CellIndex); + Block = HvGetCellBlock(CellIndex); + if (Block >= RegistryHive->Storage[Type].Length) + return FALSE; + + /* Try to get the cell block */ + if (RegistryHive->Storage[Type].BlockList[Block].BlockAddress) + return TRUE; + + /* No valid block, fail */ + return FALSE; } PVOID CMAPI HvGetCell( - PHHIVE RegistryHive, - HCELL_INDEX CellIndex) -{ - ASSERT(CellIndex != HCELL_NIL); - return (PVOID)(HvpGetCellHeader(RegistryHive, CellIndex) + 1); + PHHIVE RegistryHive, + HCELL_INDEX CellIndex) +{ + ASSERT(CellIndex != HCELL_NIL); + return (PVOID)(HvpGetCellHeader(RegistryHive, CellIndex) + 1); } static __inline LONG CMAPI HvpGetCellFullSize( - PHHIVE RegistryHive, - PVOID Cell) -{ - UNREFERENCED_PARAMETER(RegistryHive); - return ((PHCELL)Cell - 1)->Size; + PHHIVE RegistryHive, + PVOID Cell) +{ + UNREFERENCED_PARAMETER(RegistryHive); + return ((PHCELL)Cell - 1)->Size; } LONG CMAPI HvGetCellSize(IN PHHIVE Hive, IN PVOID Address) { - PHCELL CellHeader; - LONG Size; - - UNREFERENCED_PARAMETER(Hive); - - CellHeader = (PHCELL)Address - 1; - Size = CellHeader->Size * -1; - Size -= sizeof(HCELL); - return Size; + PHCELL CellHeader; + LONG Size; + + UNREFERENCED_PARAMETER(Hive); + + CellHeader = (PHCELL)Address - 1; + Size = CellHeader->Size * -1; + Size -= sizeof(HCELL); + return Size; } BOOLEAN CMAPI HvMarkCellDirty( - PHHIVE RegistryHive, - HCELL_INDEX CellIndex, - BOOLEAN HoldingLock) -{ - ULONG CellBlock; - ULONG CellLastBlock; - - ASSERT(RegistryHive->ReadOnly == FALSE); - - CMLTRACE(CMLIB_HCELL_DEBUG, "%s - Hive %p, CellIndex %08lx, HoldingLock %u\n", - __FUNCTION__, RegistryHive, CellIndex, HoldingLock); - - if ((CellIndex & HCELL_TYPE_MASK) >> HCELL_TYPE_SHIFT != Stable) - return TRUE; - - CellBlock = (CellIndex & HCELL_BLOCK_MASK) >> HCELL_BLOCK_SHIFT; - CellLastBlock = ((CellIndex + HBLOCK_SIZE - 1) & HCELL_BLOCK_MASK) >> HCELL_BLOCK_SHIFT; - - RtlSetBits(&RegistryHive->DirtyVector, - CellBlock, CellLastBlock - CellBlock); - RegistryHive->DirtyCount++; - return TRUE; + PHHIVE RegistryHive, + HCELL_INDEX CellIndex, + BOOLEAN HoldingLock) +{ + ULONG CellBlock; + ULONG CellLastBlock; + + ASSERT(RegistryHive->ReadOnly == FALSE); + + CMLTRACE(CMLIB_HCELL_DEBUG, "%s - Hive %p, CellIndex %08lx, HoldingLock %u\n", + __FUNCTION__, RegistryHive, CellIndex, HoldingLock); + + if ((CellIndex & HCELL_TYPE_MASK) >> HCELL_TYPE_SHIFT != Stable) + return TRUE; + + CellBlock = (CellIndex & HCELL_BLOCK_MASK) >> HCELL_BLOCK_SHIFT; + CellLastBlock = ((CellIndex + HBLOCK_SIZE - 1) & HCELL_BLOCK_MASK) >> HCELL_BLOCK_SHIFT; + + RtlSetBits(&RegistryHive->DirtyVector, + CellBlock, CellLastBlock - CellBlock); + RegistryHive->DirtyCount++; + return TRUE; } BOOLEAN CMAPI HvIsCellDirty(IN PHHIVE Hive, IN HCELL_INDEX Cell) { - BOOLEAN IsDirty = FALSE; - - /* Sanity checks */ - ASSERT(Hive->ReadOnly == FALSE); - - /* Volatile cells are always "dirty" */ - if (HvGetCellType(Cell) == Volatile) - return TRUE; - - /* Check if the dirty bit is set */ - if (RtlCheckBit(&Hive->DirtyVector, Cell / HBLOCK_SIZE)) - IsDirty = TRUE; - - /* Return result as boolean*/ - return IsDirty; + BOOLEAN IsDirty = FALSE; + + /* Sanity checks */ + ASSERT(Hive->ReadOnly == FALSE); + + /* Volatile cells are always "dirty" */ + if (HvGetCellType(Cell) == Volatile) + return TRUE; + + /* Check if the dirty bit is set */ + if (RtlCheckBit(&Hive->DirtyVector, Cell / HBLOCK_SIZE)) + IsDirty = TRUE; + + /* Return result as boolean*/ + return IsDirty; } static __inline ULONG CMAPI HvpComputeFreeListIndex( - ULONG Size) -{ - ULONG Index; - static CCHAR FindFirstSet[128] = { - 0, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, - 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, - 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, - 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6}; - - ASSERT(Size >= (1 << 3)); - Index = (Size >> 3) - 1; - if (Index >= 16) - { - if (Index > 127) - Index = 23; - else - Index = FindFirstSet[Index] + 16; - } - - return Index; + ULONG Size) +{ + ULONG Index; + static CCHAR FindFirstSet[128] = { + 0, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6}; + + ASSERT(Size >= (1 << 3)); + Index = (Size >> 3) - 1; + if (Index >= 16) + { + if (Index > 127) + Index = 23; + else + Index = FindFirstSet[Index] + 16; + } + + return Index; } static NTSTATUS CMAPI HvpAddFree( - PHHIVE RegistryHive, - PHCELL FreeBlock, - HCELL_INDEX FreeIndex) -{ - PHCELL_INDEX FreeBlockData; - HSTORAGE_TYPE Storage; - ULONG Index; - - ASSERT(RegistryHive != NULL); - ASSERT(FreeBlock != NULL); - - Storage = (FreeIndex & HCELL_TYPE_MASK) >> HCELL_TYPE_SHIFT; - Index = HvpComputeFreeListIndex((ULONG)FreeBlock->Size); - - FreeBlockData = (PHCELL_INDEX)(FreeBlock + 1); - *FreeBlockData = RegistryHive->Storage[Storage].FreeDisplay[Index]; - RegistryHive->Storage[Storage].FreeDisplay[Index] = FreeIndex; - - /* FIXME: Eventually get rid of free bins. */ - - return STATUS_SUCCESS; + PHHIVE RegistryHive, + PHCELL FreeBlock, + HCELL_INDEX FreeIndex) +{ + PHCELL_INDEX FreeBlockData; + HSTORAGE_TYPE Storage; + ULONG Index; + + ASSERT(RegistryHive != NULL); + ASSERT(FreeBlock != NULL); + + Storage = (FreeIndex & HCELL_TYPE_MASK) >> HCELL_TYPE_SHIFT; + Index = HvpComputeFreeListIndex((ULONG)FreeBlock->Size); + + FreeBlockData = (PHCELL_INDEX)(FreeBlock + 1); + *FreeBlockData = RegistryHive->Storage[Storage].FreeDisplay[Index]; + RegistryHive->Storage[Storage].FreeDisplay[Index] = FreeIndex; + + /* FIXME: Eventually get rid of free bins. */ + + return STATUS_SUCCESS; } static VOID CMAPI HvpRemoveFree( - PHHIVE RegistryHive, - PHCELL CellBlock, - HCELL_INDEX CellIndex) -{ - PHCELL_INDEX FreeCellData; - PHCELL_INDEX pFreeCellOffset; - HSTORAGE_TYPE Storage; - ULONG Index, FreeListIndex; - - ASSERT(RegistryHive->ReadOnly == FALSE); - - Storage = (CellIndex & HCELL_TYPE_MASK) >> HCELL_TYPE_SHIFT; - Index = HvpComputeFreeListIndex((ULONG)CellBlock->Size); - - pFreeCellOffset = &RegistryHive->Storage[Storage].FreeDisplay[Index]; - while (*pFreeCellOffset != HCELL_NIL) - { - FreeCellData = (PHCELL_INDEX)HvGetCell(RegistryHive, *pFreeCellOffset); - if (*pFreeCellOffset == CellIndex) - { - *pFreeCellOffset = *FreeCellData; - return; - } - pFreeCellOffset = FreeCellData; - } - - /* Something bad happened, print a useful trace info and bugcheck */ - CMLTRACE(CMLIB_HCELL_DEBUG, "-- beginning of HvpRemoveFree trace --\n"); - CMLTRACE(CMLIB_HCELL_DEBUG, "block we are about to free: %08x\n", CellIndex); - CMLTRACE(CMLIB_HCELL_DEBUG, "chosen free list index: %u\n", Index); - for (FreeListIndex = 0; FreeListIndex < 24; FreeListIndex++) - { - CMLTRACE(CMLIB_HCELL_DEBUG, "free list [%u]: ", FreeListIndex); - pFreeCellOffset = &RegistryHive->Storage[Storage].FreeDisplay[FreeListIndex]; - while (*pFreeCellOffset != HCELL_NIL) - { - CMLTRACE(CMLIB_HCELL_DEBUG, "%08x ", *pFreeCellOffset); - FreeCellData = (PHCELL_INDEX)HvGetCell(RegistryHive, *pFreeCellOffset); - pFreeCellOffset = FreeCellData; - } - CMLTRACE(CMLIB_HCELL_DEBUG, "\n"); - } - CMLTRACE(CMLIB_HCELL_DEBUG, "-- end of HvpRemoveFree trace --\n"); - - ASSERT(FALSE); + PHHIVE RegistryHive, + PHCELL CellBlock, + HCELL_INDEX CellIndex) +{ + PHCELL_INDEX FreeCellData; + PHCELL_INDEX pFreeCellOffset; + HSTORAGE_TYPE Storage; + ULONG Index, FreeListIndex; + + ASSERT(RegistryHive->ReadOnly == FALSE); + + Storage = (CellIndex & HCELL_TYPE_MASK) >> HCELL_TYPE_SHIFT; + Index = HvpComputeFreeListIndex((ULONG)CellBlock->Size); + + pFreeCellOffset = &RegistryHive->Storage[Storage].FreeDisplay[Index]; + while (*pFreeCellOffset != HCELL_NIL) + { + FreeCellData = (PHCELL_INDEX)HvGetCell(RegistryHive, *pFreeCellOffset); + if (*pFreeCellOffset == CellIndex) + { + *pFreeCellOffset = *FreeCellData; + return; + } + pFreeCellOffset = FreeCellData; + } + + /* Something bad happened, print a useful trace info and bugcheck */ + CMLTRACE(CMLIB_HCELL_DEBUG, "-- beginning of HvpRemoveFree trace --\n"); + CMLTRACE(CMLIB_HCELL_DEBUG, "block we are about to free: %08x\n", CellIndex); + CMLTRACE(CMLIB_HCELL_DEBUG, "chosen free list index: %u\n", Index); + for (FreeListIndex = 0; FreeListIndex < 24; FreeListIndex++) + { + CMLTRACE(CMLIB_HCELL_DEBUG, "free list [%u]: ", FreeListIndex); + pFreeCellOffset = &RegistryHive->Storage[Storage].FreeDisplay[FreeListIndex]; + while (*pFreeCellOffset != HCELL_NIL) + { + CMLTRACE(CMLIB_HCELL_DEBUG, "%08x ", *pFreeCellOffset); + FreeCellData = (PHCELL_INDEX)HvGetCell(RegistryHive, *pFreeCellOffset); + pFreeCellOffset = FreeCellData; + } + CMLTRACE(CMLIB_HCELL_DEBUG, "\n"); + } + CMLTRACE(CMLIB_HCELL_DEBUG, "-- end of HvpRemoveFree trace --\n"); + + ASSERT(FALSE); } static HCELL_INDEX CMAPI HvpFindFree( - PHHIVE RegistryHive, - ULONG Size, - HSTORAGE_TYPE Storage) -{ - PHCELL_INDEX FreeCellData; - HCELL_INDEX FreeCellOffset; - PHCELL_INDEX pFreeCellOffset; - ULONG Index; - - for (Index = HvpComputeFreeListIndex(Size); Index < 24; Index++) - { - pFreeCellOffset = &RegistryHive->Storage[Storage].FreeDisplay[Index]; - while (*pFreeCellOffset != HCELL_NIL) - { - FreeCellData = (PHCELL_INDEX)HvGetCell(RegistryHive, *pFreeCellOffset); - if ((ULONG)HvpGetCellFullSize(RegistryHive, FreeCellData) >= Size) - { - FreeCellOffset = *pFreeCellOffset; - *pFreeCellOffset = *FreeCellData; - return FreeCellOffset; - } - pFreeCellOffset = FreeCellData; - } - } - - return HCELL_NIL; + PHHIVE RegistryHive, + ULONG Size, + HSTORAGE_TYPE Storage) +{ + PHCELL_INDEX FreeCellData; + HCELL_INDEX FreeCellOffset; + PHCELL_INDEX pFreeCellOffset; + ULONG Index; + + for (Index = HvpComputeFreeListIndex(Size); Index < 24; Index++) + { + pFreeCellOffset = &RegistryHive->Storage[Storage].FreeDisplay[Index]; + while (*pFreeCellOffset != HCELL_NIL) + { + FreeCellData = (PHCELL_INDEX)HvGetCell(RegistryHive, *pFreeCellOffset); + if ((ULONG)HvpGetCellFullSize(RegistryHive, FreeCellData) >= Size) + { + FreeCellOffset = *pFreeCellOffset; + *pFreeCellOffset = *FreeCellData; + return FreeCellOffset; + } + pFreeCellOffset = FreeCellData; + } + } + + return HCELL_NIL; } NTSTATUS CMAPI HvpCreateHiveFreeCellList( - PHHIVE Hive) -{ - HCELL_INDEX BlockOffset; - PHCELL FreeBlock; - ULONG BlockIndex; - ULONG FreeOffset; - PHBIN Bin; - NTSTATUS Status; - ULONG Index; - - /* Initialize the free cell list */ - for (Index = 0; Index < 24; Index++) - { - Hive->Storage[Stable].FreeDisplay[Index] = HCELL_NIL; - Hive->Storage[Volatile].FreeDisplay[Index] = HCELL_NIL; - } - - BlockOffset = 0; - BlockIndex = 0; - while (BlockIndex < Hive->Storage[Stable].Length) - { - Bin = (PHBIN)Hive->Storage[Stable].BlockList[BlockIndex].BinAddress; - - /* Search free blocks and add to list */ - FreeOffset = sizeof(HBIN); - while (FreeOffset < Bin->Size) - { - FreeBlock = (PHCELL)((ULONG_PTR)Bin + FreeOffset); - if (FreeBlock->Size > 0) - { - Status = HvpAddFree(Hive, FreeBlock, Bin->FileOffset + FreeOffset); - if (!NT_SUCCESS(Status)) - return Status; - - FreeOffset += FreeBlock->Size; - } - else - { - FreeOffset -= FreeBlock->Size; - } - } - - BlockIndex += Bin->Size / HBLOCK_SIZE; - BlockOffset += Bin->Size; - } - - return STATUS_SUCCESS; + PHHIVE Hive) +{ + HCELL_INDEX BlockOffset; + PHCELL FreeBlock; + ULONG BlockIndex; + ULONG FreeOffset; + PHBIN Bin; + NTSTATUS Status; + ULONG Index; + + /* Initialize the free cell list */ + for (Index = 0; Index < 24; Index++) + { + Hive->Storage[Stable].FreeDisplay[Index] = HCELL_NIL; + Hive->Storage[Volatile].FreeDisplay[Index] = HCELL_NIL; + } + + BlockOffset = 0; + BlockIndex = 0; + while (BlockIndex < Hive->Storage[Stable].Length) + { + Bin = (PHBIN)Hive->Storage[Stable].BlockList[BlockIndex].BinAddress; + + /* Search free blocks and add to list */ + FreeOffset = sizeof(HBIN); + while (FreeOffset < Bin->Size) + { + FreeBlock = (PHCELL)((ULONG_PTR)Bin + FreeOffset); + if (FreeBlock->Size > 0) + { + Status = HvpAddFree(Hive, FreeBlock, Bin->FileOffset + FreeOffset); + if (!NT_SUCCESS(Status)) + return Status; + + FreeOffset += FreeBlock->Size; + } + else + { + FreeOffset -= FreeBlock->Size; + } + } + + BlockIndex += Bin->Size / HBLOCK_SIZE; + BlockOffset += Bin->Size; + } + + return STATUS_SUCCESS; } HCELL_INDEX CMAPI HvAllocateCell( - PHHIVE RegistryHive, - ULONG Size, - HSTORAGE_TYPE Storage, - HCELL_INDEX Vicinity) -{ - PHCELL FreeCell; - HCELL_INDEX FreeCellOffset; - PHCELL NewCell; - PHBIN Bin; - - ASSERT(RegistryHive->ReadOnly == FALSE); - - CMLTRACE(CMLIB_HCELL_DEBUG, "%s - Hive %p, Size %x, %s, Vicinity %08lx\n", - __FUNCTION__, RegistryHive, Size, (Storage == 0) ? "Stable" : "Volatile", Vicinity); - - /* Round to 16 bytes multiple. */ - Size = ROUND_UP(Size + sizeof(HCELL), 16); - - /* First search in free blocks. */ - FreeCellOffset = HvpFindFree(RegistryHive, Size, Storage); - - /* If no free cell was found we need to extend the hive file. */ - if (FreeCellOffset == HCELL_NIL) - { - Bin = HvpAddBin(RegistryHive, Size, Storage); - if (Bin == NULL) - return HCELL_NIL; - FreeCellOffset = Bin->FileOffset + sizeof(HBIN); - FreeCellOffset |= Storage << HCELL_TYPE_SHIFT; - } - - FreeCell = HvpGetCellHeader(RegistryHive, FreeCellOffset); - - /* Split the block in two parts */ - - /* The free block that is created has to be at least - sizeof(HCELL) + sizeof(HCELL_INDEX) big, so that free - cell list code can work. Moreover we round cell sizes - to 16 bytes, so creating a smaller block would result in - a cell that would never be allocated. */ - if ((ULONG)FreeCell->Size > Size + 16) - { - NewCell = (PHCELL)((ULONG_PTR)FreeCell + Size); - NewCell->Size = FreeCell->Size - Size; - FreeCell->Size = Size; - HvpAddFree(RegistryHive, NewCell, FreeCellOffset + Size); - if (Storage == Stable) - HvMarkCellDirty(RegistryHive, FreeCellOffset + Size, FALSE); - } - - if (Storage == Stable) - HvMarkCellDirty(RegistryHive, FreeCellOffset, FALSE); - FreeCell->Size = -FreeCell->Size; - RtlZeroMemory(FreeCell + 1, Size - sizeof(HCELL)); - - CMLTRACE(CMLIB_HCELL_DEBUG, "%s - CellIndex %08lx\n", - __FUNCTION__, FreeCellOffset); - - return FreeCellOffset; + PHHIVE RegistryHive, + ULONG Size, + HSTORAGE_TYPE Storage, + HCELL_INDEX Vicinity) +{ + PHCELL FreeCell; + HCELL_INDEX FreeCellOffset; + PHCELL NewCell; + PHBIN Bin; + + ASSERT(RegistryHive->ReadOnly == FALSE); + + CMLTRACE(CMLIB_HCELL_DEBUG, "%s - Hive %p, Size %x, %s, Vicinity %08lx\n", + __FUNCTION__, RegistryHive, Size, (Storage == 0) ? "Stable" : "Volatile", Vicinity); + + /* Round to 16 bytes multiple. */ + Size = ROUND_UP(Size + sizeof(HCELL), 16); + + /* First search in free blocks. */ + FreeCellOffset = HvpFindFree(RegistryHive, Size, Storage); + + /* If no free cell was found we need to extend the hive file. */ + if (FreeCellOffset == HCELL_NIL) + { + Bin = HvpAddBin(RegistryHive, Size, Storage); + if (Bin == NULL) + return HCELL_NIL; + FreeCellOffset = Bin->FileOffset + sizeof(HBIN); + FreeCellOffset |= Storage << HCELL_TYPE_SHIFT; + } + + FreeCell = HvpGetCellHeader(RegistryHive, FreeCellOffset); + + /* Split the block in two parts */ + + /* The free block that is created has to be at least + sizeof(HCELL) + sizeof(HCELL_INDEX) big, so that free + cell list code can work. Moreover we round cell sizes + to 16 bytes, so creating a smaller block would result in + a cell that would never be allocated. */ + if ((ULONG)FreeCell->Size > Size + 16) + { + NewCell = (PHCELL)((ULONG_PTR)FreeCell + Size); + NewCell->Size = FreeCell->Size - Size; + FreeCell->Size = Size; + HvpAddFree(RegistryHive, NewCell, FreeCellOffset + Size); + if (Storage == Stable) + HvMarkCellDirty(RegistryHive, FreeCellOffset + Size, FALSE); + } + + if (Storage == Stable) + HvMarkCellDirty(RegistryHive, FreeCellOffset, FALSE); + + FreeCell->Size = -FreeCell->Size; + RtlZeroMemory(FreeCell + 1, Size - sizeof(HCELL)); + + CMLTRACE(CMLIB_HCELL_DEBUG, "%s - CellIndex %08lx\n", + __FUNCTION__, FreeCellOffset); + + return FreeCellOffset; } HCELL_INDEX CMAPI HvReallocateCell( - PHHIVE RegistryHive, - HCELL_INDEX CellIndex, - ULONG Size) -{ - PVOID OldCell; - PVOID NewCell; - LONG OldCellSize; - HCELL_INDEX NewCellIndex; - HSTORAGE_TYPE Storage; - - ASSERT(CellIndex != HCELL_NIL); - - CMLTRACE(CMLIB_HCELL_DEBUG, "%s - Hive %p, CellIndex %08lx, Size %x\n", - __FUNCTION__, RegistryHive, CellIndex, Size); - - Storage = (CellIndex & HCELL_TYPE_MASK) >> HCELL_TYPE_SHIFT; - - OldCell = HvGetCell(RegistryHive, CellIndex); - OldCellSize = HvGetCellSize(RegistryHive, OldCell); - ASSERT(OldCellSize > 0); - - /* - * If new data size is larger than the current, destroy current - * data block and allocate a new one. - * - * FIXME: Merge with adjacent free cell if possible. - * FIXME: Implement shrinking. - */ - if (Size > (ULONG)OldCellSize) - { - NewCellIndex = HvAllocateCell(RegistryHive, Size, Storage, HCELL_NIL); - if (NewCellIndex == HCELL_NIL) - return HCELL_NIL; - - NewCell = HvGetCell(RegistryHive, NewCellIndex); - RtlCopyMemory(NewCell, OldCell, (SIZE_T)OldCellSize); - - HvFreeCell(RegistryHive, CellIndex); - - return NewCellIndex; - } - - return CellIndex; + PHHIVE RegistryHive, + HCELL_INDEX CellIndex, + ULONG Size) +{ + PVOID OldCell; + PVOID NewCell; + LONG OldCellSize; + HCELL_INDEX NewCellIndex; + HSTORAGE_TYPE Storage; + + ASSERT(CellIndex != HCELL_NIL); + + CMLTRACE(CMLIB_HCELL_DEBUG, "%s - Hive %p, CellIndex %08lx, Size %x\n", + __FUNCTION__, RegistryHive, CellIndex, Size); + + Storage = (CellIndex & HCELL_TYPE_MASK) >> HCELL_TYPE_SHIFT; + + OldCell = HvGetCell(RegistryHive, CellIndex); + OldCellSize = HvGetCellSize(RegistryHive, OldCell); + ASSERT(OldCellSize > 0); + + /* + * If new data size is larger than the current, destroy current + * data block and allocate a new one. + * + * FIXME: Merge with adjacent free cell if possible. + * FIXME: Implement shrinking. + */ + if (Size > (ULONG)OldCellSize) + { + NewCellIndex = HvAllocateCell(RegistryHive, Size, Storage, HCELL_NIL); + if (NewCellIndex == HCELL_NIL) + return HCELL_NIL; + + NewCell = HvGetCell(RegistryHive, NewCellIndex); + RtlCopyMemory(NewCell, OldCell, (SIZE_T)OldCellSize); + + HvFreeCell(RegistryHive, CellIndex); + + return NewCellIndex; + } + + return CellIndex; } VOID CMAPI HvFreeCell( - PHHIVE RegistryHive, - HCELL_INDEX CellIndex) -{ - PHCELL Free; - PHCELL Neighbor; - PHBIN Bin; - ULONG CellType; - ULONG CellBlock; - - ASSERT(RegistryHive->ReadOnly == FALSE); - - CMLTRACE(CMLIB_HCELL_DEBUG, "%s - Hive %p, CellIndex %08lx\n", - __FUNCTION__, RegistryHive, CellIndex); - - Free = HvpGetCellHeader(RegistryHive, CellIndex); - - ASSERT(Free->Size < 0); - - Free->Size = -Free->Size; - - CellType = (CellIndex & HCELL_TYPE_MASK) >> HCELL_TYPE_SHIFT; - CellBlock = (CellIndex & HCELL_BLOCK_MASK) >> HCELL_BLOCK_SHIFT; - - /* FIXME: Merge free blocks */ - Bin = (PHBIN)RegistryHive->Storage[CellType].BlockList[CellBlock].BinAddress; - - if ((CellIndex & ~HCELL_TYPE_MASK) + Free->Size < - Bin->FileOffset + Bin->Size) - { - Neighbor = (PHCELL)((ULONG_PTR)Free + Free->Size); - if (Neighbor->Size > 0) - { - HvpRemoveFree(RegistryHive, Neighbor, - ((HCELL_INDEX)((ULONG_PTR)Neighbor - (ULONG_PTR)Bin + - Bin->FileOffset)) | (CellIndex & HCELL_TYPE_MASK)); - Free->Size += Neighbor->Size; - } - } - - Neighbor = (PHCELL)(Bin + 1); - while (Neighbor < Free) - { - if (Neighbor->Size > 0) - { - if ((ULONG_PTR)Neighbor + Neighbor->Size == (ULONG_PTR)Free) - { - HCELL_INDEX NeighborCellIndex = - (HCELL_INDEX)((ULONG_PTR)Neighbor - (ULONG_PTR)Bin + - Bin->FileOffset) | (CellIndex & HCELL_TYPE_MASK); - - if (HvpComputeFreeListIndex(Neighbor->Size) != - HvpComputeFreeListIndex(Neighbor->Size + Free->Size)) + PHHIVE RegistryHive, + HCELL_INDEX CellIndex) +{ + PHCELL Free; + PHCELL Neighbor; + PHBIN Bin; + ULONG CellType; + ULONG CellBlock; + + ASSERT(RegistryHive->ReadOnly == FALSE); + + CMLTRACE(CMLIB_HCELL_DEBUG, "%s - Hive %p, CellIndex %08lx\n", + __FUNCTION__, RegistryHive, CellIndex); + + Free = HvpGetCellHeader(RegistryHive, CellIndex); + + ASSERT(Free->Size < 0); + + Free->Size = -Free->Size; + + CellType = (CellIndex & HCELL_TYPE_MASK) >> HCELL_TYPE_SHIFT; + CellBlock = (CellIndex & HCELL_BLOCK_MASK) >> HCELL_BLOCK_SHIFT; + + /* FIXME: Merge free blocks */ + Bin = (PHBIN)RegistryHive->Storage[CellType].BlockList[CellBlock].BinAddress; + + if ((CellIndex & ~HCELL_TYPE_MASK) + Free->Size < + Bin->FileOffset + Bin->Size) + { + Neighbor = (PHCELL)((ULONG_PTR)Free + Free->Size); + if (Neighbor->Size > 0) + { + HvpRemoveFree(RegistryHive, Neighbor, + ((HCELL_INDEX)((ULONG_PTR)Neighbor - (ULONG_PTR)Bin + + Bin->FileOffset)) | (CellIndex & HCELL_TYPE_MASK)); + Free->Size += Neighbor->Size; + } + } + + Neighbor = (PHCELL)(Bin + 1); + while (Neighbor < Free) + { + if (Neighbor->Size > 0) + { + if ((ULONG_PTR)Neighbor + Neighbor->Size == (ULONG_PTR)Free) { - HvpRemoveFree(RegistryHive, Neighbor, NeighborCellIndex); - Neighbor->Size += Free->Size; - HvpAddFree(RegistryHive, Neighbor, NeighborCellIndex); + HCELL_INDEX NeighborCellIndex = + ((HCELL_INDEX)((ULONG_PTR)Neighbor - (ULONG_PTR)Bin + + Bin->FileOffset)) | (CellIndex & HCELL_TYPE_MASK); + + if (HvpComputeFreeListIndex(Neighbor->Size) != + HvpComputeFreeListIndex(Neighbor->Size + Free->Size)) + { + HvpRemoveFree(RegistryHive, Neighbor, NeighborCellIndex); + Neighbor->Size += Free->Size; + HvpAddFree(RegistryHive, Neighbor, NeighborCellIndex); + } + else + Neighbor->Size += Free->Size; + + if (CellType == Stable) + HvMarkCellDirty(RegistryHive, NeighborCellIndex, FALSE); + + return; } - else - Neighbor->Size += Free->Size; - - if (CellType == Stable) - HvMarkCellDirty(RegistryHive, NeighborCellIndex, FALSE); - - return; - } - Neighbor = (PHCELL)((ULONG_PTR)Neighbor + Neighbor->Size); - } - else - { - Neighbor = (PHCELL)((ULONG_PTR)Neighbor - Neighbor->Size); - } - } - - /* Add block to the list of free blocks */ - HvpAddFree(RegistryHive, Free, CellIndex); - - if (CellType == Stable) - HvMarkCellDirty(RegistryHive, CellIndex, FALSE); + Neighbor = (PHCELL)((ULONG_PTR)Neighbor + Neighbor->Size); + } + else + { + Neighbor = (PHCELL)((ULONG_PTR)Neighbor - Neighbor->Size); + } + } + + /* Add block to the list of free blocks */ + HvpAddFree(RegistryHive, Free, CellIndex); + + if (CellType == Stable) + HvMarkCellDirty(RegistryHive, CellIndex, FALSE); } BOOLEAN Modified: trunk/reactos/lib/cmlib/hivedata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivedata.h?rev=7… ============================================================================== --- trunk/reactos/lib/cmlib/hivedata.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hivedata.h [iso-8859-1] Sat Jan 9 23:42:45 2016 @@ -1,5 +1,5 @@ /* - * PROJECT: registry manipulation library + * PROJECT: Registry manipulation library * LICENSE: GPL - See COPYING in the top level directory * COPYRIGHT: Copyright 2005 Filip Navara <navaraf(a)reactos.org> * Copyright 2001 - 2005 Eric Kohl Modified: trunk/reactos/lib/cmlib/hiveinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hiveinit.c?rev=7… ============================================================================== --- trunk/reactos/lib/cmlib/hiveinit.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hiveinit.c [iso-8859-1] Sat Jan 9 23:42:45 2016 @@ -1,5 +1,5 @@ /* - * PROJECT: registry manipulation library + * PROJECT: Registry manipulation library * LICENSE: GPL - See COPYING in the top level directory * COPYRIGHT: Copyright 2005 Filip Navara <navaraf(a)reactos.org> * Copyright 2001 - 2005 Eric Kohl @@ -17,32 +17,32 @@ BOOLEAN CMAPI HvpVerifyHiveHeader( - PHBASE_BLOCK BaseBlock) -{ - if (BaseBlock->Signature != HV_SIGNATURE || - BaseBlock->Major != HSYS_MAJOR || - BaseBlock->Minor < HSYS_MINOR || - BaseBlock->Type != HFILE_TYPE_PRIMARY || - BaseBlock->Format != HBASE_FORMAT_MEMORY || - BaseBlock->Cluster != 1 || - BaseBlock->Sequence1 != BaseBlock->Sequence2 || - HvpHiveHeaderChecksum(BaseBlock) != BaseBlock->CheckSum) - { - DPRINT1("Verify Hive Header failed: \n"); - DPRINT1(" Signature: 0x%x, expected 0x%x; Major: 0x%x, expected 0x%x\n", - BaseBlock->Signature, HV_SIGNATURE, BaseBlock->Major, HSYS_MAJOR); - DPRINT1(" Minor: 0x%x is not >= 0x%x; Type: 0x%x, expected 0x%x\n", - BaseBlock->Minor, HSYS_MINOR, BaseBlock->Type, HFILE_TYPE_PRIMARY); - DPRINT1(" Format: 0x%x, expected 0x%x; Cluster: 0x%x, expected 1\n", - BaseBlock->Format, HBASE_FORMAT_MEMORY, BaseBlock->Cluster); - DPRINT1(" Sequence: 0x%x, expected 0x%x; Checksum: 0x%x, expected 0x%x\n", - BaseBlock->Sequence1, BaseBlock->Sequence2, - HvpHiveHeaderChecksum(BaseBlock), BaseBlock->CheckSum); - - return FALSE; - } - - return TRUE; + PHBASE_BLOCK BaseBlock) +{ + if (BaseBlock->Signature != HV_SIGNATURE || + BaseBlock->Major != HSYS_MAJOR || + BaseBlock->Minor < HSYS_MINOR || + BaseBlock->Type != HFILE_TYPE_PRIMARY || + BaseBlock->Format != HBASE_FORMAT_MEMORY || + BaseBlock->Cluster != 1 || + BaseBlock->Sequence1 != BaseBlock->Sequence2 || + HvpHiveHeaderChecksum(BaseBlock) != BaseBlock->CheckSum) + { + DPRINT1("Verify Hive Header failed: \n"); + DPRINT1(" Signature: 0x%x, expected 0x%x; Major: 0x%x, expected 0x%x\n", + BaseBlock->Signature, HV_SIGNATURE, BaseBlock->Major, HSYS_MAJOR); + DPRINT1(" Minor: 0x%x is not >= 0x%x; Type: 0x%x, expected 0x%x\n", + BaseBlock->Minor, HSYS_MINOR, BaseBlock->Type, HFILE_TYPE_PRIMARY); + DPRINT1(" Format: 0x%x, expected 0x%x; Cluster: 0x%x, expected 1\n", + BaseBlock->Format, HBASE_FORMAT_MEMORY, BaseBlock->Cluster); + DPRINT1(" Sequence: 0x%x, expected 0x%x; Checksum: 0x%x, expected 0x%x\n", + BaseBlock->Sequence1, BaseBlock->Sequence2, + HvpHiveHeaderChecksum(BaseBlock), BaseBlock->CheckSum); + + return FALSE; + } + + return TRUE; } /** @@ -54,31 +54,31 @@ VOID CMAPI HvpFreeHiveBins( - PHHIVE Hive) -{ - ULONG i; - PHBIN Bin; - ULONG Storage; - - for (Storage = Stable; Storage < HTYPE_COUNT; Storage++) - { - Bin = NULL; - for (i = 0; i < Hive->Storage[Storage].Length; i++) - { - if (Hive->Storage[Storage].BlockList[i].BinAddress == (ULONG_PTR)NULL) - continue; - if (Hive->Storage[Storage].BlockList[i].BinAddress != (ULONG_PTR)Bin) - { - Bin = (PHBIN)Hive->Storage[Storage].BlockList[i].BinAddress; - Hive->Free((PHBIN)Hive->Storage[Storage].BlockList[i].BinAddress, 0); - } - Hive->Storage[Storage].BlockList[i].BinAddress = (ULONG_PTR)NULL; - Hive->Storage[Storage].BlockList[i].BlockAddress = (ULONG_PTR)NULL; - } - - if (Hive->Storage[Storage].Length) - Hive->Free(Hive->Storage[Storage].BlockList, 0); - } + PHHIVE Hive) +{ + ULONG i; + PHBIN Bin; + ULONG Storage; + + for (Storage = Stable; Storage < HTYPE_COUNT; Storage++) + { + Bin = NULL; + for (i = 0; i < Hive->Storage[Storage].Length; i++) + { + if (Hive->Storage[Storage].BlockList[i].BinAddress == (ULONG_PTR)NULL) + continue; + if (Hive->Storage[Storage].BlockList[i].BinAddress != (ULONG_PTR)Bin) + { + Bin = (PHBIN)Hive->Storage[Storage].BlockList[i].BinAddress; + Hive->Free((PHBIN)Hive->Storage[Storage].BlockList[i].BinAddress, 0); + } + Hive->Storage[Storage].BlockList[i].BinAddress = (ULONG_PTR)NULL; + Hive->Storage[Storage].BlockList[i].BlockAddress = (ULONG_PTR)NULL; + } + + if (Hive->Storage[Storage].Length) + Hive->Free(Hive->Storage[Storage].BlockList, 0); + } } /** @@ -92,60 +92,60 @@ NTSTATUS CMAPI HvpCreateHive( - PHHIVE RegistryHive, - PCUNICODE_STRING FileName OPTIONAL) -{ - PHBASE_BLOCK BaseBlock; - ULONG Index; - - BaseBlock = RegistryHive->Allocate(sizeof(HBASE_BLOCK), FALSE, TAG_CM); - if (BaseBlock == NULL) - return STATUS_NO_MEMORY; - - RtlZeroMemory(BaseBlock, sizeof(HBASE_BLOCK)); - - BaseBlock->Signature = HV_SIGNATURE; - BaseBlock->Major = HSYS_MAJOR; - BaseBlock->Minor = HSYS_MINOR; - BaseBlock->Type = HFILE_TYPE_PRIMARY; - BaseBlock->Format = HBASE_FORMAT_MEMORY; - BaseBlock->Cluster = 1; - BaseBlock->RootCell = HCELL_NIL; - BaseBlock->Length = 0; - BaseBlock->Sequence1 = 1; - BaseBlock->Sequence2 = 1; - - /* Copy the 31 last characters of the hive file name if any */ - if (FileName) - { - if (FileName->Length / sizeof(WCHAR) <= HIVE_FILENAME_MAXLEN) - { - RtlCopyMemory(BaseBlock->FileName, - FileName->Buffer, - FileName->Length); - } - else - { - RtlCopyMemory(BaseBlock->FileName, - FileName->Buffer + - FileName->Length / sizeof(WCHAR) - HIVE_FILENAME_MAXLEN, - HIVE_FILENAME_MAXLEN * sizeof(WCHAR)); - } - - /* NULL-terminate */ - BaseBlock->FileName[HIVE_FILENAME_MAXLEN] = L'\0'; - } - - BaseBlock->CheckSum = HvpHiveHeaderChecksum(BaseBlock); - - RegistryHive->BaseBlock = BaseBlock; - for (Index = 0; Index < 24; Index++) - { - RegistryHive->Storage[Stable].FreeDisplay[Index] = HCELL_NIL; - RegistryHive->Storage[Volatile].FreeDisplay[Index] = HCELL_NIL; - } - - return STATUS_SUCCESS; + PHHIVE RegistryHive, + PCUNICODE_STRING FileName OPTIONAL) +{ + PHBASE_BLOCK BaseBlock; + ULONG Index; + + BaseBlock = RegistryHive->Allocate(sizeof(HBASE_BLOCK), FALSE, TAG_CM); + if (BaseBlock == NULL) + return STATUS_NO_MEMORY; + + RtlZeroMemory(BaseBlock, sizeof(HBASE_BLOCK)); + + BaseBlock->Signature = HV_SIGNATURE; + BaseBlock->Major = HSYS_MAJOR; + BaseBlock->Minor = HSYS_MINOR; + BaseBlock->Type = HFILE_TYPE_PRIMARY; + BaseBlock->Format = HBASE_FORMAT_MEMORY; + BaseBlock->Cluster = 1; + BaseBlock->RootCell = HCELL_NIL; + BaseBlock->Length = 0; + BaseBlock->Sequence1 = 1; + BaseBlock->Sequence2 = 1; + + /* Copy the 31 last characters of the hive file name if any */ + if (FileName) + { + if (FileName->Length / sizeof(WCHAR) <= HIVE_FILENAME_MAXLEN) + { + RtlCopyMemory(BaseBlock->FileName, + FileName->Buffer, + FileName->Length); + } + else + { + RtlCopyMemory(BaseBlock->FileName, + FileName->Buffer + + FileName->Length / sizeof(WCHAR) - HIVE_FILENAME_MAXLEN, + HIVE_FILENAME_MAXLEN * sizeof(WCHAR)); + } + + /* NULL-terminate */ + BaseBlock->FileName[HIVE_FILENAME_MAXLEN] = L'\0'; + } + + BaseBlock->CheckSum = HvpHiveHeaderChecksum(BaseBlock); + + RegistryHive->BaseBlock = BaseBlock; + for (Index = 0; Index < 24; Index++) + { + RegistryHive->Storage[Stable].FreeDisplay[Index] = HCELL_NIL; + RegistryHive->Storage[Volatile].FreeDisplay[Index] = HCELL_NIL; + } + + return STATUS_SUCCESS; } /** @@ -160,110 +160,110 @@ NTSTATUS CMAPI HvpInitializeMemoryHive( - PHHIVE Hive, - PVOID ChunkBase) -{ - SIZE_T BlockIndex; - PHBIN Bin, NewBin; - ULONG i; - ULONG BitmapSize; - PULONG BitmapBuffer; - SIZE_T ChunkSize; - - ChunkSize = ((PHBASE_BLOCK)ChunkBase)->Length; - DPRINT("ChunkSize: %lx\n", ChunkSize); - - if (ChunkSize < sizeof(HBASE_BLOCK) || - !HvpVerifyHiveHeader((PHBASE_BLOCK)ChunkBase)) - { - DPRINT1("Registry is corrupt: ChunkSize %lu < sizeof(HBASE_BLOCK) %lu, " - "or HvpVerifyHiveHeader() failed\n", ChunkSize, (SIZE_T)sizeof(HBASE_BLOCK)); - return STATUS_REGISTRY_CORRUPT; - } - - Hive->BaseBlock = Hive->Allocate(sizeof(HBASE_BLOCK), FALSE, TAG_CM); - if (Hive->BaseBlock == NULL) - { - return STATUS_NO_MEMORY; - } - RtlCopyMemory(Hive->BaseBlock, ChunkBase, sizeof(HBASE_BLOCK)); - - /* - * Build a block list from the in-memory chunk and copy the data as - * we go. - */ - - Hive->Storage[Stable].Length = (ULONG)(ChunkSize / HBLOCK_SIZE); - Hive->Storage[Stable].BlockList = - Hive->Allocate(Hive->Storage[Stable].Length * - sizeof(HMAP_ENTRY), FALSE, TAG_CM); - if (Hive->Storage[Stable].BlockList == NULL) - { - DPRINT1("Allocating block list failed\n"); - Hive->Free(Hive->BaseBlock, 0); - return STATUS_NO_MEMORY; - } - - for (BlockIndex = 0; BlockIndex < Hive->Storage[Stable].Length; ) - { - Bin = (PHBIN)((ULONG_PTR)ChunkBase + (BlockIndex + 1) * HBLOCK_SIZE); - if (Bin->Signature != HV_BIN_SIGNATURE || - (Bin->Size % HBLOCK_SIZE) != 0) - { - DPRINT1("Invalid bin at BlockIndex %lu, Signature 0x%x, Size 0x%x\n", - (unsigned long)BlockIndex, (unsigned)Bin->Signature, (unsigned)Bin->Size); - Hive->Free(Hive->BaseBlock, 0); - Hive->Free(Hive->Storage[Stable].BlockList, 0); - return STATUS_REGISTRY_CORRUPT; - } - - NewBin = Hive->Allocate(Bin->Size, TRUE, TAG_CM); - if (NewBin == NULL) - { - Hive->Free(Hive->BaseBlock, 0); - Hive->Free(Hive->Storage[Stable].BlockList, 0); - return STATUS_NO_MEMORY; - } - - Hive->Storage[Stable].BlockList[BlockIndex].BinAddress = (ULONG_PTR)NewBin; - Hive->Storage[Stable].BlockList[BlockIndex].BlockAddress = (ULONG_PTR)NewBin; - - RtlCopyMemory(NewBin, Bin, Bin->Size); - - if (Bin->Size > HBLOCK_SIZE) - { - for (i = 1; i < Bin->Size / HBLOCK_SIZE; i++) - { - Hive->Storage[Stable].BlockList[BlockIndex + i].BinAddress = (ULONG_PTR)NewBin; - Hive->Storage[Stable].BlockList[BlockIndex + i].BlockAddress = - ((ULONG_PTR)NewBin + (i * HBLOCK_SIZE)); - } - } - - BlockIndex += Bin->Size / HBLOCK_SIZE; - } - - if (HvpCreateHiveFreeCellList(Hive)) - { - HvpFreeHiveBins(Hive); - Hive->Free(Hive->BaseBlock, 0); - return STATUS_NO_MEMORY; - } - - BitmapSize = ROUND_UP(Hive->Storage[Stable].Length, - sizeof(ULONG) * 8) / 8; - BitmapBuffer = (PULONG)Hive->Allocate(BitmapSize, TRUE, TAG_CM); - if (BitmapBuffer == NULL) - { - HvpFreeHiveBins(Hive); - Hive->Free(Hive->BaseBlock, 0); - return STATUS_NO_MEMORY; - } - - RtlInitializeBitMap(&Hive->DirtyVector, BitmapBuffer, BitmapSize * 8); - RtlClearAllBits(&Hive->DirtyVector); - - return STATUS_SUCCESS; + PHHIVE Hive, + PVOID ChunkBase) +{ + SIZE_T BlockIndex; + PHBIN Bin, NewBin; + ULONG i; + ULONG BitmapSize; + PULONG BitmapBuffer; + SIZE_T ChunkSize; + + ChunkSize = ((PHBASE_BLOCK)ChunkBase)->Length; + DPRINT("ChunkSize: %lx\n", ChunkSize); + + if (ChunkSize < sizeof(HBASE_BLOCK) || + !HvpVerifyHiveHeader((PHBASE_BLOCK)ChunkBase)) + { + DPRINT1("Registry is corrupt: ChunkSize %lu < sizeof(HBASE_BLOCK) %lu, " + "or HvpVerifyHiveHeader() failed\n", ChunkSize, (SIZE_T)sizeof(HBASE_BLOCK)); + return STATUS_REGISTRY_CORRUPT; + } + + Hive->BaseBlock = Hive->Allocate(sizeof(HBASE_BLOCK), FALSE, TAG_CM); + if (Hive->BaseBlock == NULL) + { + return STATUS_NO_MEMORY; + } + RtlCopyMemory(Hive->BaseBlock, ChunkBase, sizeof(HBASE_BLOCK)); + + /* + * Build a block list from the in-memory chunk and copy the data as + * we go. + */ + + Hive->Storage[Stable].Length = (ULONG)(ChunkSize / HBLOCK_SIZE); + Hive->Storage[Stable].BlockList = + Hive->Allocate(Hive->Storage[Stable].Length * + sizeof(HMAP_ENTRY), FALSE, TAG_CM); + if (Hive->Storage[Stable].BlockList == NULL) + { + DPRINT1("Allocating block list failed\n"); + Hive->Free(Hive->BaseBlock, 0); + return STATUS_NO_MEMORY; + } + + for (BlockIndex = 0; BlockIndex < Hive->Storage[Stable].Length; ) + { + Bin = (PHBIN)((ULONG_PTR)ChunkBase + (BlockIndex + 1) * HBLOCK_SIZE); + if (Bin->Signature != HV_BIN_SIGNATURE || + (Bin->Size % HBLOCK_SIZE) != 0) + { + DPRINT1("Invalid bin at BlockIndex %lu, Signature 0x%x, Size 0x%x\n", + (unsigned long)BlockIndex, (unsigned)Bin->Signature, (unsigned)Bin->Size); + Hive->Free(Hive->BaseBlock, 0); + Hive->Free(Hive->Storage[Stable].BlockList, 0); + return STATUS_REGISTRY_CORRUPT; + } + + NewBin = Hive->Allocate(Bin->Size, TRUE, TAG_CM); + if (NewBin == NULL) + { + Hive->Free(Hive->BaseBlock, 0); + Hive->Free(Hive->Storage[Stable].BlockList, 0); + return STATUS_NO_MEMORY; + } + + Hive->Storage[Stable].BlockList[BlockIndex].BinAddress = (ULONG_PTR)NewBin; + Hive->Storage[Stable].BlockList[BlockIndex].BlockAddress = (ULONG_PTR)NewBin; + + RtlCopyMemory(NewBin, Bin, Bin->Size); + + if (Bin->Size > HBLOCK_SIZE) + { + for (i = 1; i < Bin->Size / HBLOCK_SIZE; i++) + { + Hive->Storage[Stable].BlockList[BlockIndex + i].BinAddress = (ULONG_PTR)NewBin; + Hive->Storage[Stable].BlockList[BlockIndex + i].BlockAddress = + ((ULONG_PTR)NewBin + (i * HBLOCK_SIZE)); + } + } + + BlockIndex += Bin->Size / HBLOCK_SIZE; + } + + if (HvpCreateHiveFreeCellList(Hive)) + { + HvpFreeHiveBins(Hive); + Hive->Free(Hive->BaseBlock, 0); + return STATUS_NO_MEMORY; + } + + BitmapSize = ROUND_UP(Hive->Storage[Stable].Length, + sizeof(ULONG) * 8) / 8; + BitmapBuffer = (PULONG)Hive->Allocate(BitmapSize, TRUE, TAG_CM); + if (BitmapBuffer == NULL) + { + HvpFreeHiveBins(Hive); + Hive->Free(Hive->BaseBlock, 0); + return STATUS_NO_MEMORY; + } + + RtlInitializeBitMap(&Hive->DirtyVector, BitmapBuffer, BitmapSize * 8); + RtlClearAllBits(&Hive->DirtyVector); + + return STATUS_SUCCESS; } /** @@ -278,19 +278,19 @@ NTSTATUS CMAPI HvpInitializeMemoryInplaceHive( - PHHIVE Hive, - PVOID ChunkBase) -{ - if (!HvpVerifyHiveHeader((PHBASE_BLOCK)ChunkBase)) - { - return STATUS_REGISTRY_CORRUPT; - } - - Hive->BaseBlock = (PHBASE_BLOCK)ChunkBase; - Hive->ReadOnly = TRUE; - Hive->Flat = TRUE; - - return STATUS_SUCCESS; + PHHIVE Hive, + PVOID ChunkBase) +{ + if (!HvpVerifyHiveHeader((PHBASE_BLOCK)ChunkBase)) + { + return STATUS_REGISTRY_CORRUPT; + } + + Hive->BaseBlock = (PHBASE_BLOCK)ChunkBase; + Hive->ReadOnly = TRUE; + Hive->Flat = TRUE; + + return STATUS_SUCCESS; } typedef enum _RESULT @@ -446,83 +446,83 @@ NTSTATUS CMAPI HvInitialize( - PHHIVE RegistryHive, - ULONG Operation, - ULONG HiveType, - ULONG HiveFlags, - PVOID HiveData OPTIONAL, - PALLOCATE_ROUTINE Allocate, - PFREE_ROUTINE Free, - PFILE_SET_SIZE_ROUTINE FileSetSize, - PFILE_WRITE_ROUTINE FileWrite, - PFILE_READ_ROUTINE FileRead, - PFILE_FLUSH_ROUTINE FileFlush, - ULONG Cluster OPTIONAL, - PCUNICODE_STRING FileName OPTIONAL) -{ - NTSTATUS Status; - PHHIVE Hive = RegistryHive; - - UNREFERENCED_PARAMETER(HiveType); - - /* - * Create a new hive structure that will hold all the maintenance data. - */ - - RtlZeroMemory(Hive, sizeof(HHIVE)); - - Hive->Allocate = Allocate; - Hive->Free = Free; - Hive->FileRead = FileRead; - Hive->FileWrite = FileWrite; - Hive->FileSetSize = FileSetSize; - Hive->FileFlush = FileFlush; - Hive->StorageTypeCount = HTYPE_COUNT; - Hive->Cluster = 1; - Hive->Version = HSYS_MINOR; - Hive->HiveFlags = HiveFlags &~ HIVE_NOLAZYFLUSH; - - switch (Operation) - { - case HINIT_CREATE: - Status = HvpCreateHive(Hive, FileName); - break; - - case HINIT_MEMORY: - Status = HvpInitializeMemoryHive(Hive, HiveData); - break; - - case HINIT_FLAT: - Status = HvpInitializeMemoryInplaceHive(Hive, HiveData); - break; - - case HINIT_FILE: - { - /* HACK of doom: Cluster is actually the file size. */ - Status = HvLoadHive(Hive, Cluster); - if ((Status != STATUS_SUCCESS) && - (Status != STATUS_REGISTRY_RECOVERED)) - { - /* Unrecoverable failure */ - return Status; - } - - /* Check for previous damage */ - ASSERT(Status != STATUS_REGISTRY_RECOVERED); - break; - } - - default: - /* FIXME: A better return status value is needed */ - Status = STATUS_NOT_IMPLEMENTED; - ASSERT(FALSE); - } - - if (!NT_SUCCESS(Status)) return Status; - - if (Operation != HINIT_CREATE) CmPrepareHive(Hive); - - return Status; + PHHIVE RegistryHive, + ULONG Operation, + ULONG HiveType, + ULONG HiveFlags, + PVOID HiveData OPTIONAL, + PALLOCATE_ROUTINE Allocate, + PFREE_ROUTINE Free, + PFILE_SET_SIZE_ROUTINE FileSetSize, + PFILE_WRITE_ROUTINE FileWrite, + PFILE_READ_ROUTINE FileRead, + PFILE_FLUSH_ROUTINE FileFlush, + ULONG Cluster OPTIONAL, + PCUNICODE_STRING FileName OPTIONAL) +{ + NTSTATUS Status; + PHHIVE Hive = RegistryHive; + + UNREFERENCED_PARAMETER(HiveType); + + /* + * Create a new hive structure that will hold all the maintenance data. + */ + + RtlZeroMemory(Hive, sizeof(HHIVE)); + + Hive->Allocate = Allocate; + Hive->Free = Free; + Hive->FileRead = FileRead; + Hive->FileWrite = FileWrite; + Hive->FileSetSize = FileSetSize; + Hive->FileFlush = FileFlush; + Hive->StorageTypeCount = HTYPE_COUNT; + Hive->Cluster = 1; + Hive->Version = HSYS_MINOR; + Hive->HiveFlags = HiveFlags &~ HIVE_NOLAZYFLUSH; + + switch (Operation) + { + case HINIT_CREATE: + Status = HvpCreateHive(Hive, FileName); + break; + + case HINIT_MEMORY: + Status = HvpInitializeMemoryHive(Hive, HiveData); + break; + + case HINIT_FLAT: + Status = HvpInitializeMemoryInplaceHive(Hive, HiveData); + break; + + case HINIT_FILE: + { + /* HACK of doom: Cluster is actually the file size. */ + Status = HvLoadHive(Hive, Cluster); + if ((Status != STATUS_SUCCESS) && + (Status != STATUS_REGISTRY_RECOVERED)) + { + /* Unrecoverable failure */ + return Status; + } + + /* Check for previous damage */ + ASSERT(Status != STATUS_REGISTRY_RECOVERED); + break; + } + + default: + /* FIXME: A better return status value is needed */ + Status = STATUS_NOT_IMPLEMENTED; + ASSERT(FALSE); + } + + if (!NT_SUCCESS(Status)) return Status; + + if (Operation != HINIT_CREATE) CmPrepareHive(Hive); + + return Status; } /** @@ -534,25 +534,25 @@ VOID CMAPI HvFree( - PHHIVE RegistryHive) -{ - if (!RegistryHive->ReadOnly) - { - /* Release hive bitmap */ - if (RegistryHive->DirtyVector.Buffer) - { - RegistryHive->Free(RegistryHive->DirtyVector.Buffer, 0); - } - - HvpFreeHiveBins(RegistryHive); - - /* Free the BaseBlock */ - if (RegistryHive->BaseBlock) - { - RegistryHive->Free(RegistryHive->BaseBlock, 0); - RegistryHive->BaseBlock = NULL; - } - } + PHHIVE RegistryHive) +{ + if (!RegistryHive->ReadOnly) + { + /* Release hive bitmap */ + if (RegistryHive->DirtyVector.Buffer) + { + RegistryHive->Free(RegistryHive->DirtyVector.Buffer, 0); + } + + HvpFreeHiveBins(RegistryHive); + + /* Free the BaseBlock */ + if (RegistryHive->BaseBlock) + { + RegistryHive->Free(RegistryHive->BaseBlock, 0); + RegistryHive->BaseBlock = NULL; + } + } } /* EOF */ Modified: trunk/reactos/lib/cmlib/hivesum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivesum.c?rev=70… ============================================================================== --- trunk/reactos/lib/cmlib/hivesum.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hivesum.c [iso-8859-1] Sat Jan 9 23:42:45 2016 @@ -1,5 +1,5 @@ /* - * PROJECT: registry manipulation library + * PROJECT: Registry manipulation library * LICENSE: GPL - See COPYING in the top level directory * COPYRIGHT: Copyright 2005 Filip Navara <navaraf(a)reactos.org> * Copyright 2001 - 2005 Eric Kohl @@ -15,18 +15,18 @@ ULONG CMAPI HvpHiveHeaderChecksum( - PHBASE_BLOCK HiveHeader) + PHBASE_BLOCK HiveHeader) { - PULONG Buffer = (PULONG)HiveHeader; - ULONG Sum = 0; - ULONG i; + PULONG Buffer = (PULONG)HiveHeader; + ULONG Sum = 0; + ULONG i; - for (i = 0; i < 127; i++) - Sum ^= Buffer[i]; - if (Sum == (ULONG)-1) - Sum = (ULONG)-2; - if (Sum == 0) - Sum = 1; + for (i = 0; i < 127; i++) + Sum ^= Buffer[i]; + if (Sum == (ULONG)-1) + Sum = (ULONG)-2; + if (Sum == 0) + Sum = 1; - return Sum; + return Sum; } Modified: trunk/reactos/lib/cmlib/hivewrt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivewrt.c?rev=70… ============================================================================== --- trunk/reactos/lib/cmlib/hivewrt.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hivewrt.c [iso-8859-1] Sat Jan 9 23:42:45 2016 @@ -1,5 +1,5 @@ /* - * PROJECT: registry manipulation library + * PROJECT: Registry manipulation library * LICENSE: GPL - See COPYING in the top level directory * COPYRIGHT: Copyright 2005 Filip Navara <navaraf(a)reactos.org> * Copyright 2001 - 2005 Eric Kohl @@ -11,267 +11,265 @@ static BOOLEAN CMAPI HvpWriteLog( - PHHIVE RegistryHive) -{ - ULONG FileOffset; - UINT32 BufferSize; - UINT32 BitmapSize; - PUCHAR Buffer; - PUCHAR Ptr; - ULONG BlockIndex; - ULONG LastIndex; - PVOID BlockPtr; - BOOLEAN Success; - static ULONG PrintCount = 0; - - if (PrintCount++ == 0) - { - UNIMPLEMENTED; - } - return TRUE; - - ASSERT(RegistryHive->ReadOnly == FALSE); - ASSERT(RegistryHive->BaseBlock->Length == - RegistryHive->Storage[Stable].Length * HBLOCK_SIZE); - - DPRINT("HvpWriteLog called\n"); - - if (RegistryHive->BaseBlock->Sequence1 != - RegistryHive->BaseBlock->Sequence2) - { - return FALSE; - } - - BitmapSize = RegistryHive->DirtyVector.SizeOfBitMap; - BufferSize = HV_LOG_HEADER_SIZE + sizeof(ULONG) + BitmapSize; - BufferSize = ROUND_UP(BufferSize, HBLOCK_SIZE); - - DPRINT("Bitmap size %u buffer size: %u\n", BitmapSize, BufferSize); - - Buffer = RegistryHive->Allocate(BufferSize, TRUE, TAG_CM); - if (Buffer == NULL) - { - return FALSE; - } - - /* Update first update counter and CheckSum */ - RegistryHive->BaseBlock->Type = HFILE_TYPE_LOG; - RegistryHive->BaseBlock->Sequence1++; - RegistryHive->BaseBlock->CheckSum = - HvpHiveHeaderChecksum(RegistryHive->BaseBlock); - - /* Copy hive header */ - RtlCopyMemory(Buffer, RegistryHive->BaseBlock, HV_LOG_HEADER_SIZE); - Ptr = Buffer + HV_LOG_HEADER_SIZE; - RtlCopyMemory(Ptr, "DIRT", 4); - Ptr += 4; - RtlCopyMemory(Ptr, RegistryHive->DirtyVector.Buffer, BitmapSize); - - /* Write hive block and block bitmap */ - FileOffset = 0; - Success = RegistryHive->FileWrite(RegistryHive, HFILE_TYPE_LOG, - &FileOffset, Buffer, BufferSize); - RegistryHive->Free(Buffer, 0); - - if (!Success) - { - return FALSE; - } - - /* Write dirty blocks */ - FileOffset = BufferSize; - BlockIndex = 0; - while (BlockIndex < RegistryHive->Storage[Stable].Length) - { - LastIndex = BlockIndex; - BlockIndex = RtlFindSetBits(&RegistryHive->DirtyVector, 1, BlockIndex); - if (BlockIndex == ~0U || BlockIndex < LastIndex) - { - break; - } - - BlockPtr = (PVOID)RegistryHive->Storage[Stable].BlockList[BlockIndex].BlockAddress; - - /* Write hive block */ - Success = RegistryHive->FileWrite(RegistryHive, HFILE_TYPE_LOG, - &FileOffset, BlockPtr, - HBLOCK_SIZE); - if (!Success) - { - return FALSE; - } - - BlockIndex++; - FileOffset += HBLOCK_SIZE; - } - - Success = RegistryHive->FileSetSize(RegistryHive, HFILE_TYPE_LOG, FileOffset, FileOffset); - if (!Success) - { - DPRINT("FileSetSize failed\n"); - return FALSE; - } - - /* Flush the log file */ - Success = RegistryHive->FileFlush(RegistryHive, HFILE_TYPE_LOG, NULL, 0); - if (!Success) - { - DPRINT("FileFlush failed\n"); - } - - /* Update second update counter and CheckSum. */ - RegistryHive->BaseBlock->Sequence2++; - RegistryHive->BaseBlock->CheckSum = - HvpHiveHeaderChecksum(RegistryHive->BaseBlock); - - /* Write hive header again with updated sequence counter. */ - FileOffset = 0; - Success = RegistryHive->FileWrite(RegistryHive, HFILE_TYPE_LOG, - &FileOffset, RegistryHive->BaseBlock, - HV_LOG_HEADER_SIZE); - if (!Success) - { - return FALSE; - } - - /* Flush the log file */ - Success = RegistryHive->FileFlush(RegistryHive, HFILE_TYPE_LOG, NULL, 0); - if (!Success) - { - DPRINT("FileFlush failed\n"); - } - - return TRUE; + PHHIVE RegistryHive) +{ + ULONG FileOffset; + UINT32 BufferSize; + UINT32 BitmapSize; + PUCHAR Buffer; + PUCHAR Ptr; + ULONG BlockIndex; + ULONG LastIndex; + PVOID BlockPtr; + BOOLEAN Success; + static ULONG PrintCount = 0; + + if (PrintCount++ == 0) + { + UNIMPLEMENTED; + } + return TRUE; + + ASSERT(RegistryHive->ReadOnly == FALSE); + ASSERT(RegistryHive->BaseBlock->Length == + RegistryHive->Storage[Stable].Length * HBLOCK_SIZE); + + DPRINT("HvpWriteLog called\n"); + + if (RegistryHive->BaseBlock->Sequence1 != + RegistryHive->BaseBlock->Sequence2) + { + return FALSE; + } + + BitmapSize = RegistryHive->DirtyVector.SizeOfBitMap; + BufferSize = HV_LOG_HEADER_SIZE + sizeof(ULONG) + BitmapSize; + BufferSize = ROUND_UP(BufferSize, HBLOCK_SIZE); + + DPRINT("Bitmap size %u buffer size: %u\n", BitmapSize, BufferSize); + + Buffer = RegistryHive->Allocate(BufferSize, TRUE, TAG_CM); + if (Buffer == NULL) + { + return FALSE; + } + + /* Update first update counter and CheckSum */ + RegistryHive->BaseBlock->Type = HFILE_TYPE_LOG; + RegistryHive->BaseBlock->Sequence1++; + RegistryHive->BaseBlock->CheckSum = + HvpHiveHeaderChecksum(RegistryHive->BaseBlock); + + /* Copy hive header */ + RtlCopyMemory(Buffer, RegistryHive->BaseBlock, HV_LOG_HEADER_SIZE); + Ptr = Buffer + HV_LOG_HEADER_SIZE; + RtlCopyMemory(Ptr, "DIRT", 4); + Ptr += 4; + RtlCopyMemory(Ptr, RegistryHive->DirtyVector.Buffer, BitmapSize); + + /* Write hive block and block bitmap */ + FileOffset = 0; + Success = RegistryHive->FileWrite(RegistryHive, HFILE_TYPE_LOG, + &FileOffset, Buffer, BufferSize); + RegistryHive->Free(Buffer, 0); + + if (!Success) + { + return FALSE; + } + + /* Write dirty blocks */ + FileOffset = BufferSize; + BlockIndex = 0; + while (BlockIndex < RegistryHive->Storage[Stable].Length) + { + LastIndex = BlockIndex; + BlockIndex = RtlFindSetBits(&RegistryHive->DirtyVector, 1, BlockIndex); + if (BlockIndex == ~0U || BlockIndex < LastIndex) + { + break; + } + + BlockPtr = (PVOID)RegistryHive->Storage[Stable].BlockList[BlockIndex].BlockAddress; + + /* Write hive block */ + Success = RegistryHive->FileWrite(RegistryHive, HFILE_TYPE_LOG, + &FileOffset, BlockPtr, HBLOCK_SIZE); + if (!Success) + { + return FALSE; + } + + BlockIndex++; + FileOffset += HBLOCK_SIZE; + } + + Success = RegistryHive->FileSetSize(RegistryHive, HFILE_TYPE_LOG, FileOffset, FileOffset); + if (!Success) + { + DPRINT("FileSetSize failed\n"); + return FALSE; + } + + /* Flush the log file */ + Success = RegistryHive->FileFlush(RegistryHive, HFILE_TYPE_LOG, NULL, 0); + if (!Success) + { + DPRINT("FileFlush failed\n"); + } + + /* Update second update counter and CheckSum. */ + RegistryHive->BaseBlock->Sequence2++; + RegistryHive->BaseBlock->CheckSum = + HvpHiveHeaderChecksum(RegistryHive->BaseBlock); + + /* Write hive header again with updated sequence counter. */ + FileOffset = 0; + Success = RegistryHive->FileWrite(RegistryHive, HFILE_TYPE_LOG, + &FileOffset, RegistryHive->BaseBlock, + HV_LOG_HEADER_SIZE); + if (!Success) + { + return FALSE; + } + + /* Flush the log file */ + Success = RegistryHive->FileFlush(RegistryHive, HFILE_TYPE_LOG, NULL, 0); + if (!Success) + { + DPRINT("FileFlush failed\n"); + } + + return TRUE; } static BOOLEAN CMAPI HvpWriteHive( - PHHIVE RegistryHive, - BOOLEAN OnlyDirty) -{ - ULONG FileOffset; - ULONG BlockIndex; - ULONG LastIndex; - PVOID BlockPtr; - BOOLEAN Success; - - ASSERT(RegistryHive->ReadOnly == FALSE); - ASSERT(RegistryHive->BaseBlock->Length == - RegistryHive->Storage[Stable].Length * HBLOCK_SIZE); - - DPRINT("HvpWriteHive called\n"); - - if (RegistryHive->BaseBlock->Sequence1 != - RegistryHive->BaseBlock->Sequence2) - { - return FALSE; - } - - /* Update first update counter and CheckSum */ - RegistryHive->BaseBlock->Type = HFILE_TYPE_PRIMARY; - RegistryHive->BaseBlock->Sequence1++; - RegistryHive->BaseBlock->CheckSum = - HvpHiveHeaderChecksum(RegistryHive->BaseBlock); - - /* Write hive block */ - FileOffset = 0; - Success = RegistryHive->FileWrite(RegistryHive, HFILE_TYPE_PRIMARY, - &FileOffset, RegistryHive->BaseBlock, - sizeof(HBASE_BLOCK)); - if (!Success) - { - return FALSE; - } - - BlockIndex = 0; - while (BlockIndex < RegistryHive->Storage[Stable].Length) - { - if (OnlyDirty) - { - LastIndex = BlockIndex; - BlockIndex = RtlFindSetBits(&RegistryHive->DirtyVector, 1, BlockIndex); - if (BlockIndex == ~0U || BlockIndex < LastIndex) - { - break; - } - } - - BlockPtr = (PVOID)RegistryHive->Storage[Stable].BlockList[BlockIndex].BlockAddress; - FileOffset = (BlockIndex + 1) * HBLOCK_SIZE; - - /* Write hive block */ - Success = RegistryHive->FileWrite(RegistryHive, HFILE_TYPE_PRIMARY, - &FileOffset, BlockPtr, - HBLOCK_SIZE); - if (!Success) - { - return FALSE; - } - - BlockIndex++; - } - - Success = RegistryHive->FileFlush(RegistryHive, HFILE_TYPE_PRIMARY, NULL, 0); - if (!Success) - { - DPRINT("FileFlush failed\n"); - } - - /* Update second update counter and CheckSum */ - RegistryHive->BaseBlock->Sequence2++; - RegistryHive->BaseBlock->CheckSum = - HvpHiveHeaderChecksum(RegistryHive->BaseBlock); - - /* Write hive block */ - FileOffset = 0; - Success = RegistryHive->FileWrite(RegistryHive, HFILE_TYPE_PRIMARY, - &FileOffset, RegistryHive->BaseBlock, - sizeof(HBASE_BLOCK)); - if (!Success) - { - return FALSE; - } - - Success = RegistryHive->FileFlush(RegistryHive, HFILE_TYPE_PRIMARY, NULL, 0); - if (!Success) - { - DPRINT("FileFlush failed\n"); - } - - return TRUE; + PHHIVE RegistryHive, + BOOLEAN OnlyDirty) +{ + ULONG FileOffset; + ULONG BlockIndex; + ULONG LastIndex; + PVOID BlockPtr; + BOOLEAN Success; + + ASSERT(RegistryHive->ReadOnly == FALSE); + ASSERT(RegistryHive->BaseBlock->Length == + RegistryHive->Storage[Stable].Length * HBLOCK_SIZE); + + DPRINT("HvpWriteHive called\n"); + + if (RegistryHive->BaseBlock->Sequence1 != + RegistryHive->BaseBlock->Sequence2) + { + return FALSE; + } + + /* Update first update counter and CheckSum */ + RegistryHive->BaseBlock->Type = HFILE_TYPE_PRIMARY; + RegistryHive->BaseBlock->Sequence1++; + RegistryHive->BaseBlock->CheckSum = + HvpHiveHeaderChecksum(RegistryHive->BaseBlock); + + /* Write hive block */ + FileOffset = 0; + Success = RegistryHive->FileWrite(RegistryHive, HFILE_TYPE_PRIMARY, + &FileOffset, RegistryHive->BaseBlock, + sizeof(HBASE_BLOCK)); + if (!Success) + { + return FALSE; + } + + BlockIndex = 0; + while (BlockIndex < RegistryHive->Storage[Stable].Length) + { + if (OnlyDirty) + { + LastIndex = BlockIndex; + BlockIndex = RtlFindSetBits(&RegistryHive->DirtyVector, 1, BlockIndex); + if (BlockIndex == ~0U || BlockIndex < LastIndex) + { + break; + } + } + + BlockPtr = (PVOID)RegistryHive->Storage[Stable].BlockList[BlockIndex].BlockAddress; + FileOffset = (BlockIndex + 1) * HBLOCK_SIZE; + + /* Write hive block */ + Success = RegistryHive->FileWrite(RegistryHive, HFILE_TYPE_PRIMARY, + &FileOffset, BlockPtr, HBLOCK_SIZE); + if (!Success) + { + return FALSE; + } + + BlockIndex++; + } + + Success = RegistryHive->FileFlush(RegistryHive, HFILE_TYPE_PRIMARY, NULL, 0); + if (!Success) + { + DPRINT("FileFlush failed\n"); + } + + /* Update second update counter and CheckSum */ + RegistryHive->BaseBlock->Sequence2++; + RegistryHive->BaseBlock->CheckSum = + HvpHiveHeaderChecksum(RegistryHive->BaseBlock); + + /* Write hive block */ + FileOffset = 0; + Success = RegistryHive->FileWrite(RegistryHive, HFILE_TYPE_PRIMARY, + &FileOffset, RegistryHive->BaseBlock, + sizeof(HBASE_BLOCK)); + if (!Success) + { + return FALSE; + } + + Success = RegistryHive->FileFlush(RegistryHive, HFILE_TYPE_PRIMARY, NULL, 0); + if (!Success) + { + DPRINT("FileFlush failed\n"); + } + + return TRUE; } BOOLEAN CMAPI HvSyncHive( - PHHIVE RegistryHive) -{ - ASSERT(RegistryHive->ReadOnly == FALSE); - - if (RtlFindSetBits(&RegistryHive->DirtyVector, 1, 0) == ~0U) - { - return TRUE; - } - - /* Update hive header modification time */ - KeQuerySystemTime(&RegistryHive->BaseBlock->TimeStamp); - - /* Update log file */ - if (!HvpWriteLog(RegistryHive)) - { - return FALSE; - } - - /* Update hive file */ - if (!HvpWriteHive(RegistryHive, TRUE)) - { - return FALSE; - } - - /* Clear dirty bitmap. */ - RtlClearAllBits(&RegistryHive->DirtyVector); - RegistryHive->DirtyCount = 0; - - return TRUE; + PHHIVE RegistryHive) +{ + ASSERT(RegistryHive->ReadOnly == FALSE); + + if (RtlFindSetBits(&RegistryHive->DirtyVector, 1, 0) == ~0U) + { + return TRUE; + } + + /* Update hive header modification time */ + KeQuerySystemTime(&RegistryHive->BaseBlock->TimeStamp); + + /* Update log file */ + if (!HvpWriteLog(RegistryHive)) + { + return FALSE; + } + + /* Update hive file */ + if (!HvpWriteHive(RegistryHive, TRUE)) + { + return FALSE; + } + + /* Clear dirty bitmap. */ + RtlClearAllBits(&RegistryHive->DirtyVector); + RegistryHive->DirtyCount = 0; + + return TRUE; } BOOLEAN @@ -279,23 +277,24 @@ HvHiveWillShrink(IN PHHIVE RegistryHive) { /* No shrinking yet */ + UNIMPLEMENTED; return FALSE; } BOOLEAN CMAPI HvWriteHive( - PHHIVE RegistryHive) -{ - ASSERT(RegistryHive->ReadOnly == FALSE); - - /* Update hive header modification time */ - KeQuerySystemTime(&RegistryHive->BaseBlock->TimeStamp); - - /* Update hive file */ - if (!HvpWriteHive(RegistryHive, FALSE)) - { - return FALSE; - } - - return TRUE; -} + PHHIVE RegistryHive) +{ + ASSERT(RegistryHive->ReadOnly == FALSE); + + /* Update hive header modification time */ + KeQuerySystemTime(&RegistryHive->BaseBlock->TimeStamp); + + /* Update hive file */ + if (!HvpWriteHive(RegistryHive, FALSE)) + { + return FALSE; + } + + return TRUE; +}

1 0

[hbelusca] 70561: [CMLIB] - HV_BLOCK_SIZE and HBLOCK_SIZE are the same thing; prefer the newly introduced HBLOCK_SIZE define. - Improve the HvGetCell* macros. - Add next to the defined hive signatu...
by hbelusca＠svn.reactos.org 09 Jan '16

09 Jan '16

Author: hbelusca Date: Sat Jan 9 23:15:05 2016 New Revision: 70561 URL: http://svn.reactos.org/svn/reactos?rev=70561&view=rev Log: [CMLIB] - HV_BLOCK_SIZE and HBLOCK_SIZE are the same thing; prefer the newly introduced HBLOCK_SIZE define. - Improve the HvGetCell* macros. - Add next to the defined hive signatures what their corresponding strings are (for documentation purpose). - Some whitespace fixes in the headers. Modified: trunk/reactos/lib/cmlib/cmdata.h trunk/reactos/lib/cmlib/hivebin.c trunk/reactos/lib/cmlib/hivecell.c trunk/reactos/lib/cmlib/hivedata.h trunk/reactos/lib/cmlib/hiveinit.c trunk/reactos/lib/cmlib/hivewrt.c Modified: trunk/reactos/lib/cmlib/cmdata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmdata.h?rev=705… ============================================================================== --- trunk/reactos/lib/cmlib/cmdata.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmdata.h [iso-8859-1] Sat Jan 9 23:15:05 2016 @@ -7,53 +7,53 @@ #pragma once -#define REG_INIT_BLOCK_LIST_SIZE 32 -#define REG_INIT_HASH_TABLE_SIZE 3 -#define REG_EXTEND_HASH_TABLE_SIZE 4 -#define REG_VALUE_LIST_CELL_MULTIPLE 4 -#define REG_DATA_SIZE_MASK 0x7FFFFFFF -#define REG_DATA_IN_OFFSET 0x80000000 +#define REG_INIT_BLOCK_LIST_SIZE 32 +#define REG_INIT_HASH_TABLE_SIZE 3 +#define REG_EXTEND_HASH_TABLE_SIZE 4 +#define REG_VALUE_LIST_CELL_MULTIPLE 4 +#define REG_DATA_SIZE_MASK 0x7FFFFFFF +#define REG_DATA_IN_OFFSET 0x80000000 // // Key Types // -#define CM_KEY_INDEX_ROOT 0x6972 -#define CM_KEY_INDEX_LEAF 0x696c -#define CM_KEY_FAST_LEAF 0x666c -#define CM_KEY_HASH_LEAF 0x686c +#define CM_KEY_INDEX_ROOT 0x6972 // "ri" +#define CM_KEY_INDEX_LEAF 0x696c // "li" +#define CM_KEY_FAST_LEAF 0x666c // "lf" +#define CM_KEY_HASH_LEAF 0x686c // "lh" // // Key Signatures // -#define CM_KEY_NODE_SIGNATURE 0x6B6E -#define CM_LINK_NODE_SIGNATURE 0x6B6C -#define CM_KEY_VALUE_SIGNATURE 0x6B76 +#define CM_KEY_NODE_SIGNATURE 0x6B6E // "nk" +#define CM_LINK_NODE_SIGNATURE 0x6B6C // "lk" +#define CM_KEY_VALUE_SIGNATURE 0x6B76 // "vk" // // CM_KEY_NODE Flags // -#define KEY_IS_VOLATILE 0x01 -#define KEY_HIVE_EXIT 0x02 -#define KEY_HIVE_ENTRY 0x04 -#define KEY_NO_DELETE 0x08 -#define KEY_SYM_LINK 0x10 -#define KEY_COMP_NAME 0x20 -#define KEY_PREFEF_HANDLE 0x40 -#define KEY_VIRT_MIRRORED 0x80 -#define KEY_VIRT_TARGET 0x100 -#define KEY_VIRTUAL_STORE 0x200 +#define KEY_IS_VOLATILE 0x01 +#define KEY_HIVE_EXIT 0x02 +#define KEY_HIVE_ENTRY 0x04 +#define KEY_NO_DELETE 0x08 +#define KEY_SYM_LINK 0x10 +#define KEY_COMP_NAME 0x20 +#define KEY_PREFEF_HANDLE 0x40 +#define KEY_VIRT_MIRRORED 0x80 +#define KEY_VIRT_TARGET 0x100 +#define KEY_VIRTUAL_STORE 0x200 // // CM_KEY_VALUE Flags // -#define VALUE_COMP_NAME 0x0001 +#define VALUE_COMP_NAME 0x0001 // // CM_KEY_VALUE Types // -#define CM_KEY_VALUE_SMALL 0x4 -#define CM_KEY_VALUE_BIG 0x3FD8 -#define CM_KEY_VALUE_SPECIAL_SIZE 0x80000000 +#define CM_KEY_VALUE_SMALL 0x4 +#define CM_KEY_VALUE_BIG 0x3FD8 +#define CM_KEY_VALUE_SPECIAL_SIZE 0x80000000 #include <pshpack1.h> Modified: trunk/reactos/lib/cmlib/hivebin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivebin.c?rev=70… ============================================================================== --- trunk/reactos/lib/cmlib/hivebin.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hivebin.c [iso-8859-1] Sat Jan 9 23:15:05 2016 @@ -23,8 +23,8 @@ ULONG OldBlockListSize; PHCELL Block; - BinSize = ROUND_UP(Size + sizeof(HBIN), HV_BLOCK_SIZE); - BlockCount = (ULONG)(BinSize / HV_BLOCK_SIZE); + BinSize = ROUND_UP(Size + sizeof(HBIN), HBLOCK_SIZE); + BlockCount = (ULONG)(BinSize / HBLOCK_SIZE); Bin = RegistryHive->Allocate(BinSize, TRUE, TAG_CM); if (Bin == NULL) @@ -33,7 +33,7 @@ Bin->Signature = HV_BIN_SIGNATURE; Bin->FileOffset = RegistryHive->Storage[Storage].Length * - HV_BLOCK_SIZE; + HBLOCK_SIZE; Bin->Size = (ULONG)BinSize; /* Allocate new block list */ @@ -61,7 +61,7 @@ for (i = 0; i < BlockCount; i++) { RegistryHive->Storage[Storage].BlockList[OldBlockListSize + i].BlockAddress = - ((ULONG_PTR)Bin + (i * HV_BLOCK_SIZE)); + ((ULONG_PTR)Bin + (i * HBLOCK_SIZE)); RegistryHive->Storage[Storage].BlockList[OldBlockListSize + i].BinAddress = (ULONG_PTR)Bin; } @@ -96,7 +96,7 @@ /* Mark new bin dirty. */ RtlSetBits(&RegistryHive->DirtyVector, - Bin->FileOffset / HV_BLOCK_SIZE, + Bin->FileOffset / HBLOCK_SIZE, BlockCount); /* Update size in the base block */ Modified: trunk/reactos/lib/cmlib/hivecell.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivecell.c?rev=7… ============================================================================== --- trunk/reactos/lib/cmlib/hivecell.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hivecell.c [iso-8859-1] Sat Jan 9 23:15:05 2016 @@ -37,7 +37,7 @@ else { ASSERT((CellIndex & HCELL_TYPE_MASK) == Stable); - return (PVOID)((ULONG_PTR)RegistryHive->BaseBlock + HV_BLOCK_SIZE + + return (PVOID)((ULONG_PTR)RegistryHive->BaseBlock + HBLOCK_SIZE + CellIndex); } } @@ -117,7 +117,7 @@ return TRUE; CellBlock = (CellIndex & HCELL_BLOCK_MASK) >> HCELL_BLOCK_SHIFT; - CellLastBlock = ((CellIndex + HV_BLOCK_SIZE - 1) & HCELL_BLOCK_MASK) >> HCELL_BLOCK_SHIFT; + CellLastBlock = ((CellIndex + HBLOCK_SIZE - 1) & HCELL_BLOCK_MASK) >> HCELL_BLOCK_SHIFT; RtlSetBits(&RegistryHive->DirtyVector, CellBlock, CellLastBlock - CellBlock); @@ -139,7 +139,7 @@ return TRUE; /* Check if the dirty bit is set */ - if (RtlCheckBit(&Hive->DirtyVector, Cell / HV_BLOCK_SIZE)) + if (RtlCheckBit(&Hive->DirtyVector, Cell / HBLOCK_SIZE)) IsDirty = TRUE; /* Return result as boolean*/ @@ -322,7 +322,7 @@ } } - BlockIndex += Bin->Size / HV_BLOCK_SIZE; + BlockIndex += Bin->Size / HBLOCK_SIZE; BlockOffset += Bin->Size; } Modified: trunk/reactos/lib/cmlib/hivedata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivedata.h?rev=7… ============================================================================== --- trunk/reactos/lib/cmlib/hivedata.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hivedata.h [iso-8859-1] Sat Jan 9 23:15:05 2016 @@ -10,61 +10,60 @@ // // Hive operations // -#define HINIT_CREATE 0 -#define HINIT_MEMORY 1 -#define HINIT_FILE 2 -#define HINIT_MEMORY_INPLACE 3 -#define HINIT_FLAT 4 -#define HINIT_MAPFILE 5 +#define HINIT_CREATE 0 +#define HINIT_MEMORY 1 +#define HINIT_FILE 2 +#define HINIT_MEMORY_INPLACE 3 +#define HINIT_FLAT 4 +#define HINIT_MAPFILE 5 // // Hive flags // -#define HIVE_VOLATILE 1 -#define HIVE_NOLAZYFLUSH 2 -#define HIVE_HAS_BEEN_REPLACED 4 -#define HIVE_HAS_BEEN_FREED 8 -#define HIVE_UNKNOWN 0x10 -#define HIVE_IS_UNLOADING 0x20 +#define HIVE_VOLATILE 1 +#define HIVE_NOLAZYFLUSH 2 +#define HIVE_HAS_BEEN_REPLACED 4 +#define HIVE_HAS_BEEN_FREED 8 +#define HIVE_UNKNOWN 0x10 +#define HIVE_IS_UNLOADING 0x20 // // Hive types // -#define HFILE_TYPE_PRIMARY 0 -#define HFILE_TYPE_LOG 1 -#define HFILE_TYPE_EXTERNAL 2 -#define HFILE_TYPE_MAX 3 +#define HFILE_TYPE_PRIMARY 0 +#define HFILE_TYPE_LOG 1 +#define HFILE_TYPE_EXTERNAL 2 +#define HFILE_TYPE_MAX 3 // // Hive sizes // -#define HBLOCK_SIZE 0x1000 -#define HSECTOR_SIZE 0x200 -#define HSECTOR_COUNT 8 - -#define HV_BLOCK_SIZE 4096 -#define HV_LOG_HEADER_SIZE FIELD_OFFSET(HBASE_BLOCK, Reserved2) -#define HV_SIGNATURE 0x66676572 -#define HV_BIN_SIGNATURE 0x6e696268 +#define HBLOCK_SIZE 0x1000 +#define HSECTOR_SIZE 0x200 +#define HSECTOR_COUNT 8 + +#define HV_LOG_HEADER_SIZE FIELD_OFFSET(HBASE_BLOCK, Reserved2) +#define HV_SIGNATURE 0x66676572 // "regf" +#define HV_BIN_SIGNATURE 0x6e696268 // "hbin" // // Hive versions // -#define HSYS_MAJOR 1 -#define HSYS_MINOR 3 -#define HSYS_WHISTLER_BETA1 4 -#define HSYS_WHISTLER 5 -#define HSYS_MINOR_SUPPORTED HSYS_WHISTLER +#define HSYS_MAJOR 1 +#define HSYS_MINOR 3 +#define HSYS_WHISTLER_BETA1 4 +#define HSYS_WHISTLER 5 +#define HSYS_MINOR_SUPPORTED HSYS_WHISTLER // // Hive formats // -#define HBASE_FORMAT_MEMORY 1 +#define HBASE_FORMAT_MEMORY 1 // // Hive storage // -#define HTYPE_COUNT 2 +#define HTYPE_COUNT 2 /** * @name HCELL_INDEX @@ -78,24 +77,24 @@ // // Cell Magic Values // -#define HCELL_NIL MAXULONG -#define HCELL_CACHED 1 - -#define HCELL_TYPE_MASK 0x80000000 -#define HCELL_BLOCK_MASK 0x7ffff000 -#define HCELL_OFFSET_MASK 0x00000fff -#define HCELL_TYPE_SHIFT 31 -#define HCELL_BLOCK_SHIFT 12 -#define HCELL_OFFSET_SHIFT 0 +#define HCELL_NIL MAXULONG +#define HCELL_CACHED 1 + +#define HCELL_TYPE_MASK 0x80000000 +#define HCELL_BLOCK_MASK 0x7ffff000 +#define HCELL_OFFSET_MASK 0x00000fff +#define HCELL_TYPE_SHIFT 31 +#define HCELL_BLOCK_SHIFT 12 +#define HCELL_OFFSET_SHIFT 0 #define HvGetCellType(Cell) \ - ((ULONG)((Cell & HCELL_TYPE_MASK) >> HCELL_TYPE_SHIFT)) + ((ULONG)(((Cell) & HCELL_TYPE_MASK) >> HCELL_TYPE_SHIFT)) #define HvGetCellBlock(Cell) \ - ((ULONG)((Cell & HCELL_BLOCK_MASK) >> HCELL_BLOCK_SHIFT)) + ((ULONG)(((Cell) & HCELL_BLOCK_MASK) >> HCELL_BLOCK_SHIFT)) typedef enum { - Stable = 0, + Stable = 0, Volatile = 1 } HSTORAGE_TYPE; @@ -107,127 +106,142 @@ * On-disk header for registry hive file. */ -#define HIVE_FILENAME_MAXLEN 31 +#define HIVE_FILENAME_MAXLEN 31 typedef struct _HBASE_BLOCK { - /* Hive identifier "regf" (0x66676572) */ - ULONG Signature; - - /* Update counter */ - ULONG Sequence1; - - /* Update counter */ - ULONG Sequence2; - - /* When this hive file was last modified */ - LARGE_INTEGER TimeStamp; - - /* Registry format major version (1) */ - ULONG Major; - - /* Registry format minor version (3) - Version 3 added fast indexes, version 5 has large value optimizations */ - ULONG Minor; - - /* Registry file type (0 - Primary, 1 - Log) */ - ULONG Type; - - /* Registry format (1 is the only defined value so far) */ - ULONG Format; - - /* Offset into file from the byte after the end of the base block. - If the hive is volatile, this is the actual pointer to the CM_KEY_NODE */ - HCELL_INDEX RootCell; - - /* Size of each hive block ? */ - ULONG Length; - - /* (1?) */ - ULONG Cluster; - - /* Last 31 UNICODE characters, plus terminating NULL character, - of the full name of the hive file */ - WCHAR FileName[HIVE_FILENAME_MAXLEN + 1]; - - ULONG Reserved1[99]; - - /* Checksum of first 0x200 bytes */ - ULONG CheckSum; - - ULONG Reserved2[0x37E]; - ULONG BootType; - ULONG BootRecover; + /* Hive identifier "regf" (0x66676572) */ + ULONG Signature; + + /* Update counter */ + ULONG Sequence1; + + /* Update counter */ + ULONG Sequence2; + + /* When this hive file was last modified */ + LARGE_INTEGER TimeStamp; + + /* Registry format major version (1) */ + ULONG Major; + + /* Registry format minor version (3) + Version 3 added fast indexes, version 5 has large value optimizations */ + ULONG Minor; + + /* Registry file type (0 - Primary, 1 - Log) */ + ULONG Type; + + /* Registry format (1 is the only defined value so far) */ + ULONG Format; + + /* Offset into file from the byte after the end of the base block. + If the hive is volatile, this is the actual pointer to the CM_KEY_NODE */ + HCELL_INDEX RootCell; + + /* Size of each hive block ? */ + ULONG Length; + + /* (1?) */ + ULONG Cluster; + + /* Last 31 UNICODE characters, plus terminating NULL character, + of the full name of the hive file */ + WCHAR FileName[HIVE_FILENAME_MAXLEN + 1]; + + ULONG Reserved1[99]; + + /* Checksum of first 0x200 bytes */ + ULONG CheckSum; + + ULONG Reserved2[0x37E]; + ULONG BootType; + ULONG BootRecover; } HBASE_BLOCK, *PHBASE_BLOCK; typedef struct _HBIN { - /* Bin identifier "hbin" (0x6E696268) */ - ULONG Signature; - - /* Block offset of this bin */ - HCELL_INDEX FileOffset; - - /* Size in bytes, multiple of the block size (4KB) */ - ULONG Size; - - ULONG Reserved1[2]; - - /* When this bin was last modified */ - LARGE_INTEGER TimeStamp; - - /* ? (In-memory only) */ - ULONG Spare; + /* Bin identifier "hbin" (0x6E696268) */ + ULONG Signature; + + /* Block offset of this bin */ + HCELL_INDEX FileOffset; + + /* Size in bytes, multiple of the block size (4KB) */ + ULONG Size; + + ULONG Reserved1[2]; + + /* When this bin was last modified */ + LARGE_INTEGER TimeStamp; + + /* Unused (In-memory only) */ + ULONG Spare; } HBIN, *PHBIN; typedef struct _HCELL { - /* <0 if used, >0 if free */ - LONG Size; + /* <0 if used, >0 if free */ + LONG Size; } HCELL, *PHCELL; #include <poppack.h> struct _HHIVE; -typedef struct _CELL_DATA* (CMAPI *PGET_CELL_ROUTINE)( - struct _HHIVE *Hive, - HCELL_INDEX Cell); - -typedef VOID (CMAPI *PRELEASE_CELL_ROUTINE)( - struct _HHIVE *Hive, - HCELL_INDEX Cell); - -typedef PVOID (CMAPI *PALLOCATE_ROUTINE)( - SIZE_T Size, - BOOLEAN Paged, - ULONG Tag); - -typedef VOID (CMAPI *PFREE_ROUTINE)( - PVOID Ptr, - ULONG Quota); - -typedef BOOLEAN (CMAPI *PFILE_READ_ROUTINE)( - struct _HHIVE *RegistryHive, - ULONG FileType, - PULONG FileOffset, - PVOID Buffer, - SIZE_T BufferLength); - -typedef BOOLEAN (CMAPI *PFILE_WRITE_ROUTINE)( - struct _HHIVE *RegistryHive, - ULONG FileType, - PULONG FileOffset, - PVOID Buffer, - SIZE_T BufferLength); - -typedef BOOLEAN (CMAPI *PFILE_SET_SIZE_ROUTINE)( - struct _HHIVE *RegistryHive, - ULONG FileType, - ULONG FileSize, - ULONG OldfileSize); - -typedef BOOLEAN (CMAPI *PFILE_FLUSH_ROUTINE)( +typedef struct _CELL_DATA* +(CMAPI *PGET_CELL_ROUTINE)( + struct _HHIVE *Hive, + HCELL_INDEX Cell +); + +typedef VOID +(CMAPI *PRELEASE_CELL_ROUTINE)( + struct _HHIVE *Hive, + HCELL_INDEX Cell +); + +typedef PVOID +(CMAPI *PALLOCATE_ROUTINE)( + SIZE_T Size, + BOOLEAN Paged, + ULONG Tag +); + +typedef VOID +(CMAPI *PFREE_ROUTINE)( + PVOID Ptr, + ULONG Quota +); + +typedef BOOLEAN +(CMAPI *PFILE_READ_ROUTINE)( + struct _HHIVE *RegistryHive, + ULONG FileType, + PULONG FileOffset, + PVOID Buffer, + SIZE_T BufferLength +); + +typedef BOOLEAN +(CMAPI *PFILE_WRITE_ROUTINE)( + struct _HHIVE *RegistryHive, + ULONG FileType, + PULONG FileOffset, + PVOID Buffer, + SIZE_T BufferLength +); + +typedef BOOLEAN +(CMAPI *PFILE_SET_SIZE_ROUTINE)( + struct _HHIVE *RegistryHive, + ULONG FileType, + ULONG FileSize, + ULONG OldfileSize +); + +typedef BOOLEAN +(CMAPI *PFILE_FLUSH_ROUTINE)( struct _HHIVE *RegistryHive, ULONG FileType, PLARGE_INTEGER FileOffset, @@ -258,7 +272,7 @@ PHMAP_DIRECTORY Map; PHMAP_ENTRY BlockList; // PHMAP_TABLE SmallDir; ULONG Guard; - HCELL_INDEX FreeDisplay[24]; //FREE_DISPLAY FreeDisplay[24]; + HCELL_INDEX FreeDisplay[24]; // FREE_DISPLAY FreeDisplay[24]; ULONG FreeSummary; LIST_ENTRY FreeBins; } DUAL, *PDUAL; @@ -296,5 +310,5 @@ DUAL Storage[HTYPE_COUNT]; } HHIVE, *PHHIVE; -#define IsFreeCell(Cell)(Cell->Size >= 0) -#define IsUsedCell(Cell)(Cell->Size < 0) +#define IsFreeCell(Cell) ((Cell)->Size >= 0) +#define IsUsedCell(Cell) ((Cell)->Size < 0) Modified: trunk/reactos/lib/cmlib/hiveinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hiveinit.c?rev=7… ============================================================================== --- trunk/reactos/lib/cmlib/hiveinit.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hiveinit.c [iso-8859-1] Sat Jan 9 23:15:05 2016 @@ -193,7 +193,7 @@ * we go. */ - Hive->Storage[Stable].Length = (ULONG)(ChunkSize / HV_BLOCK_SIZE); + Hive->Storage[Stable].Length = (ULONG)(ChunkSize / HBLOCK_SIZE); Hive->Storage[Stable].BlockList = Hive->Allocate(Hive->Storage[Stable].Length * sizeof(HMAP_ENTRY), FALSE, TAG_CM); @@ -206,9 +206,9 @@ for (BlockIndex = 0; BlockIndex < Hive->Storage[Stable].Length; ) { - Bin = (PHBIN)((ULONG_PTR)ChunkBase + (BlockIndex + 1) * HV_BLOCK_SIZE); + Bin = (PHBIN)((ULONG_PTR)ChunkBase + (BlockIndex + 1) * HBLOCK_SIZE); if (Bin->Signature != HV_BIN_SIGNATURE || - (Bin->Size % HV_BLOCK_SIZE) != 0) + (Bin->Size % HBLOCK_SIZE) != 0) { DPRINT1("Invalid bin at BlockIndex %lu, Signature 0x%x, Size 0x%x\n", (unsigned long)BlockIndex, (unsigned)Bin->Signature, (unsigned)Bin->Size); @@ -230,17 +230,17 @@ RtlCopyMemory(NewBin, Bin, Bin->Size); - if (Bin->Size > HV_BLOCK_SIZE) - { - for (i = 1; i < Bin->Size / HV_BLOCK_SIZE; i++) + if (Bin->Size > HBLOCK_SIZE) + { + for (i = 1; i < Bin->Size / HBLOCK_SIZE; i++) { Hive->Storage[Stable].BlockList[BlockIndex + i].BinAddress = (ULONG_PTR)NewBin; Hive->Storage[Stable].BlockList[BlockIndex + i].BlockAddress = - ((ULONG_PTR)NewBin + (i * HV_BLOCK_SIZE)); + ((ULONG_PTR)NewBin + (i * HBLOCK_SIZE)); } } - BlockIndex += Bin->Size / HV_BLOCK_SIZE; + BlockIndex += Bin->Size / HBLOCK_SIZE; } if (HvpCreateHiveFreeCellList(Hive)) @@ -313,7 +313,7 @@ ULONG Alignment; ULONG Result; ULONG Offset = 0; - ASSERT(sizeof(HBASE_BLOCK) >= (HV_BLOCK_SIZE * Hive->Cluster)); + ASSERT(sizeof(HBASE_BLOCK) >= (HBLOCK_SIZE * Hive->Cluster)); /* Assume failure and allocate the buffer */ *HiveBaseBlock = 0; @@ -321,7 +321,7 @@ if (!BaseBlock) return NoMemory; /* Check for, and enforce, alignment */ - Alignment = Hive->Cluster * HV_BLOCK_SIZE -1; + Alignment = Hive->Cluster * HBLOCK_SIZE -1; if ((ULONG_PTR)BaseBlock & Alignment) { /* Free the old header */ @@ -338,7 +338,7 @@ HFILE_TYPE_PRIMARY, &Offset, BaseBlock, - Hive->Cluster * HV_BLOCK_SIZE); + Hive->Cluster * HBLOCK_SIZE); /* Couldn't read: assume it's not a hive */ if (!Result) return NotHive; Modified: trunk/reactos/lib/cmlib/hivewrt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivewrt.c?rev=70… ============================================================================== --- trunk/reactos/lib/cmlib/hivewrt.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hivewrt.c [iso-8859-1] Sat Jan 9 23:15:05 2016 @@ -32,7 +32,7 @@ ASSERT(RegistryHive->ReadOnly == FALSE); ASSERT(RegistryHive->BaseBlock->Length == - RegistryHive->Storage[Stable].Length * HV_BLOCK_SIZE); + RegistryHive->Storage[Stable].Length * HBLOCK_SIZE); DPRINT("HvpWriteLog called\n"); @@ -44,7 +44,7 @@ BitmapSize = RegistryHive->DirtyVector.SizeOfBitMap; BufferSize = HV_LOG_HEADER_SIZE + sizeof(ULONG) + BitmapSize; - BufferSize = ROUND_UP(BufferSize, HV_BLOCK_SIZE); + BufferSize = ROUND_UP(BufferSize, HBLOCK_SIZE); DPRINT("Bitmap size %u buffer size: %u\n", BitmapSize, BufferSize); @@ -95,14 +95,14 @@ /* Write hive block */ Success = RegistryHive->FileWrite(RegistryHive, HFILE_TYPE_LOG, &FileOffset, BlockPtr, - HV_BLOCK_SIZE); + HBLOCK_SIZE); if (!Success) { return FALSE; } BlockIndex++; - FileOffset += HV_BLOCK_SIZE; + FileOffset += HBLOCK_SIZE; } Success = RegistryHive->FileSetSize(RegistryHive, HFILE_TYPE_LOG, FileOffset, FileOffset); @@ -157,7 +157,7 @@ ASSERT(RegistryHive->ReadOnly == FALSE); ASSERT(RegistryHive->BaseBlock->Length == - RegistryHive->Storage[Stable].Length * HV_BLOCK_SIZE); + RegistryHive->Storage[Stable].Length * HBLOCK_SIZE); DPRINT("HvpWriteHive called\n"); @@ -197,12 +197,12 @@ } BlockPtr = (PVOID)RegistryHive->Storage[Stable].BlockList[BlockIndex].BlockAddress; - FileOffset = (BlockIndex + 1) * HV_BLOCK_SIZE; + FileOffset = (BlockIndex + 1) * HBLOCK_SIZE; /* Write hive block */ Success = RegistryHive->FileWrite(RegistryHive, HFILE_TYPE_PRIMARY, &FileOffset, BlockPtr, - HV_BLOCK_SIZE); + HBLOCK_SIZE); if (!Success) { return FALSE;

1 0

[ekohl] 70560: [DEVMGR] Set the focus to the treeview when the main window recieves a WM_ACTIVATE message. CORE-10769 #resolve #comment Fixed in r70560.
by ekohl＠svn.reactos.org 09 Jan '16

09 Jan '16

Author: ekohl Date: Sat Jan 9 22:22:17 2016 New Revision: 70560 URL: http://svn.reactos.org/svn/reactos?rev=70560&view=rev Log: [DEVMGR] Set the focus to the treeview when the main window recieves a WM_ACTIVATE message. CORE-10769 #resolve #comment Fixed in r70560. Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.h Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/D… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp [iso-8859-1] Sat Jan 9 22:22:17 2016 @@ -291,6 +291,7 @@ void CDeviceView::SetFocus() { + ::SetFocus(m_hTreeView); } bool Modified: trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/M… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp [iso-8859-1] Sat Jan 9 22:22:17 2016 @@ -667,6 +667,12 @@ return RetCode; } +void +CDeviceManager::OnActivate(void) +{ + m_DeviceView->SetFocus(); +} + LRESULT CDeviceManager::OnDestroy(void) { @@ -822,7 +828,11 @@ DestroyWindow(hwnd); break; } - + + case WM_ACTIVATE: + if (LOWORD(hwnd)) + This->OnActivate(); + break; case WM_DESTROY: { Modified: trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/M… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.h [iso-8859-1] Sat Jan 9 22:22:17 2016 @@ -66,6 +66,8 @@ LPARAM lParam ); + void OnActivate(void); + bool CreateToolBar(void); bool CreateStatusBar(void);

1 0

[tkreuzer] 70559: [CREATESPEC] Small utility to auto-create spec files. Uses MS symbol server to evaluate data not available in the export table. Features: - Parse export table for export names and...
by tkreuzer＠svn.reactos.org 09 Jan '16

09 Jan '16

Author: tkreuzer Date: Sat Jan 9 19:05:14 2016 New Revision: 70559 URL: http://svn.reactos.org/svn/reactos?rev=70559&view=rev Log: [CREATESPEC] Small utility to auto-create spec files. Uses MS symbol server to evaluate data not available in the export table. Features: - Parse export table for export names and forwarders - Find function name for nameless exports - Recognize calling convention / data exports - Analyze function parameters Added: trunk/rosapps/applications/devutils/createspec/ trunk/rosapps/applications/devutils/createspec/CMakeLists.txt (with props) trunk/rosapps/applications/devutils/createspec/createspec.c (with props) Added: trunk/rosapps/applications/devutils/createspec/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/crea… ============================================================================== --- trunk/rosapps/applications/devutils/createspec/CMakeLists.txt (added) +++ trunk/rosapps/applications/devutils/createspec/CMakeLists.txt [iso-8859-1] Sat Jan 9 19:05:14 2016 @@ -0,0 +1,6 @@ + +add_executable(createspec createspec.c) +set_module_type(createspec win32cui) +target_link_libraries(createspec wine) +add_importlibs(createspec dbghelp msvcrt kernel32) +add_cd_file(TARGET createspec DESTINATION reactos/system32 FOR all) Propchange: trunk/rosapps/applications/devutils/createspec/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/devutils/createspec/createspec.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/crea… ============================================================================== --- trunk/rosapps/applications/devutils/createspec/createspec.c (added) +++ trunk/rosapps/applications/devutils/createspec/createspec.c [iso-8859-1] Sat Jan 9 19:05:14 2016 @@ -0,0 +1,595 @@ +/* +- Info: + - http://stackoverflow.com/questions/32251638/dbghelp-get-full-symbol-signatu… + - http://www.debuginfo.com/articles/dbghelptypeinfo.html +- TODO: + - Dump usage + - Test for dbghelp + symsrv and warn if not working + - Resolve forwarders + +*/ +#include <stdio.h> +#include <stdlib.h> +#include <windows.h> + +#ifdef _MSC_VER +#pragma warning(disable:4091) +#endif +#define _NO_CVCONST_H +#include <dbghelp.h> + +// doesn't seem to be defined anywhere +enum BasicType { + btNoType = 0, + btVoid = 1, + btChar = 2, + btWChar = 3, + btInt = 6, + btUInt = 7, + btFloat = 8, + btBCD = 9, + btBool = 10, + btLong = 13, + btULong = 14, + btCurrency = 25, + btDate = 26, + btVariant = 27, + btComplex = 28, + btBit = 29, + btBSTR = 30, + btHresult = 31 +}; + +typedef enum CV_call_e { + CV_CALL_NEAR_C = 0x00, + CV_CALL_NEAR_FAST = 0x04, + CV_CALL_NEAR_STD = 0x07, + CV_CALL_NEAR_SYS = 0x09, + CV_CALL_THISCALL = 0x0b, + CV_CALL_CLRCALL = 0x16 +} CV_call_e; + +#define MAX_SYMBOL_NAME 1024 +typedef struct _SYMINFO_EX +{ + SYMBOL_INFO si; + CHAR achName[MAX_SYMBOL_NAME]; +} SYMINFO_EX; + +typedef enum _PARAM_TYPES +{ + TYPE_NONE, + TYPE_LONG, + TYPE_DOUBLE, + TYPE_PTR, + TYPE_STR, + TYPE_WSTR +} PARAM_TYPES, *PPARAM_TYPES; + +const char* +gapszTypeStrings[] = +{ + "???", + "long", + "double", + "ptr", + "str", + "wstr" +}; + +#define MAX_PARAMETERS 64 +typedef struct _EXPORT +{ + PSTR pszName; + PSTR pszSymbol; + PSTR pszForwarder; + ULONG ulRva; + DWORD dwCallingConvention; + ULONG fForwarder : 1; + ULONG fNoName : 1; + ULONG fData : 1; + ULONG cParameters; + PARAM_TYPES aeParameters[MAX_PARAMETERS]; +} EXPORT, *PEXPORT; + +typedef struct _EXPORT_DATA +{ + ULONG cNumberOfExports; + EXPORT aExports[1]; +} EXPORT_DATA, *PEXPORT_DATA; + +HANDLE ghProcess; +CHAR gszModuleFileName[MAX_PATH+1]; + +HRESULT +OpenFileFromName( + _In_ PCSTR pszDllName, + _Out_ PHANDLE phFile) +{ + HANDLE hFile; + + /* Try current directory */ + GetCurrentDirectoryA(MAX_PATH, gszModuleFileName); + strcat_s(gszModuleFileName, sizeof(gszModuleFileName), "\\"); + strcat_s(gszModuleFileName, sizeof(gszModuleFileName), pszDllName); + hFile = CreateFileA(gszModuleFileName, + FILE_READ_DATA, + FILE_SHARE_READ, + NULL, + OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, + NULL); + if (hFile != INVALID_HANDLE_VALUE) + { + *phFile = hFile; + return S_OK; + } + + /* Try system32 directory */ + strcat_s(gszModuleFileName, sizeof(gszModuleFileName), "%systemroot%\\system32\\"); + strcat_s(gszModuleFileName, sizeof(gszModuleFileName), pszDllName); + hFile = CreateFileA(gszModuleFileName, + FILE_READ_DATA, + FILE_SHARE_READ, + NULL, + OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, + NULL); + if (hFile != INVALID_HANDLE_VALUE) + { + *phFile = hFile; + return S_OK; + } + + return HRESULT_FROM_WIN32(GetLastError()); +} + +HRESULT +GetExportsFromFile( + _In_ HANDLE hFile, + _Out_ PEXPORT_DATA* ppExportData) +{ + HANDLE hMap; + PBYTE pjImageBase; + PIMAGE_EXPORT_DIRECTORY pExportDir; + ULONG i, cjExportSize, cFunctions, cjTableSize; + PEXPORT_DATA pExportData; + PULONG pulAddressTable, pulNameTable; + PUSHORT pusOrdinalTable; + + /* Create an image file mapping */ + hMap = CreateFileMappingA(hFile, NULL, PAGE_READONLY | SEC_IMAGE, 0, 0, NULL); + if (!hMap) + { + fprintf(stderr, "CreateFileMapping() failed: %ld\n", GetLastError()); + return HRESULT_FROM_WIN32(GetLastError()); + } + + /* Map the file */ + pjImageBase = MapViewOfFile(hMap, FILE_MAP_READ, 0, 0, 0); + if(pjImageBase == NULL) + { + fprintf(stderr, "MapViewOfFile() failed: %ld\n", GetLastError()); + CloseHandle(hMap); + return HRESULT_FROM_WIN32(GetLastError()); + } + + /* Get the export directory */ + pExportDir = ImageDirectoryEntryToData(pjImageBase, + TRUE, + IMAGE_DIRECTORY_ENTRY_EXPORT, + &cjExportSize); + + cFunctions = pExportDir->NumberOfFunctions; + cjTableSize = FIELD_OFFSET(EXPORT_DATA, aExports[cFunctions]); + + pExportData = malloc(cjTableSize); + if (pExportData == NULL) + { + return E_OUTOFMEMORY; + } + + RtlZeroMemory(pExportData, cjTableSize); + + pulAddressTable = (PULONG)(pjImageBase + pExportDir->AddressOfFunctions); + + pExportData->cNumberOfExports = cFunctions; + + /* Loop through the function table */ + for (i = 0; i < cFunctions; i++) + { + PVOID pvFunction = (pjImageBase + pulAddressTable[i]); + + if ((ULONG_PTR)((PUCHAR)pvFunction - (PUCHAR)pExportDir) < cjExportSize) + { + pExportData->aExports[i].pszForwarder = _strdup(pvFunction); + } + else + { + pExportData->aExports[i].ulRva = pulAddressTable[i]; + } + } + + pulNameTable = (PULONG)(pjImageBase + pExportDir->AddressOfNames); + pusOrdinalTable = (PUSHORT)(pjImageBase + pExportDir->AddressOfNameOrdinals); + + /* Loop through the name table */ + for (i = 0; i < pExportDir->NumberOfNames; i++) + { + ULONG iIndex = pusOrdinalTable[i]; + PSTR pszName = (PSTR)(pjImageBase + pulNameTable[i]); + + pExportData->aExports[iIndex].pszName = _strdup(pszName); + } + + *ppExportData = pExportData; + UnmapViewOfFile(pjImageBase); + CloseHandle(hMap); + return S_OK; +} + +BOOL +CALLBACK +EnumParametersCallback( + _In_ PSYMBOL_INFO pSymInfo, + _In_ ULONG SymbolSize, + _In_opt_ PVOID UserContext) +{ + PEXPORT pExport = (PEXPORT)UserContext; + enum SymTagEnum eSymTag; + enum BasicType eBaseType; + DWORD dwTypeIndex; + ULONG64 ullLength; + + /* If it's not a parameter, skip it */ + if (!(pSymInfo->Flags & SYMFLAG_PARAMETER)) + { + return TRUE; + } + + /* Count this parameter */ + pExport->cParameters++; + + /* Get the type for the parameter */ + if (SymGetTypeInfo(ghProcess, + pSymInfo->ModBase, + pSymInfo->TypeIndex, + TI_GET_SYMTAG, + &eSymTag)) + { + switch (eSymTag) + { + case SymTagUDT: + case SymTagBaseType: + + /* Try to get the size */ + if (SymGetTypeInfo(ghProcess, + pSymInfo->ModBase, + pSymInfo->TypeIndex, + TI_GET_LENGTH, + &ullLength)) + { + if (ullLength > 8) + { + /* That is probably not possible */ + __debugbreak(); + } + + if (ullLength > 4) + { + /* 'double' type */ + pExport->aeParameters[pExport->cParameters - 1] = TYPE_DOUBLE; + break; + } + } + /* 'long' type */ + pExport->aeParameters[pExport->cParameters - 1] = TYPE_LONG; + break; + + case SymTagEnum: + /* 'long' type */ + pExport->aeParameters[pExport->cParameters - 1] = TYPE_LONG; + break; + + case SymTagPointerType: + /* 'ptr' type */ + pExport->aeParameters[pExport->cParameters - 1] = TYPE_PTR; + + /* Try to get the underlying type */ + if (SymGetTypeInfo(ghProcess, + pSymInfo->ModBase, + pSymInfo->TypeIndex, + TI_GET_TYPEID, + &dwTypeIndex)) + { + /* Try to get the base type */ + if (SymGetTypeInfo(ghProcess, + pSymInfo->ModBase, + dwTypeIndex, + TI_GET_BASETYPE, + &eBaseType)) + { + if (eBaseType == btChar) + { + pExport->aeParameters[pExport->cParameters - 1] = TYPE_STR; + } + else if (eBaseType == btWChar) + { + pExport->aeParameters[pExport->cParameters - 1] = TYPE_WSTR; + } + } + } + break; + + default: + printf("Unhandled eSymTag: %u\n", eSymTag); + return FALSE; + } + } + else + { + printf("Could not get type info. Fallig back to ptr\n"); + pExport->aeParameters[pExport->cParameters - 1] = TYPE_PTR; + } + + return TRUE; +} + +HRESULT +ParseExportSymbols( + _In_ HANDLE hFile, + _Inout_ PEXPORT_DATA pExportData) +{ + DWORD Options; + DWORD64 dwModuleBase; + ULONG i; + IMAGEHLP_STACK_FRAME StackFrame; + SYMINFO_EX sym; + + + /* Initialize dbghelp */ + if (!SymInitialize(ghProcess, 0, FALSE)) + return E_FAIL; + + Options = SymGetOptions(); + Options |= SYMOPT_ALLOW_ABSOLUTE_SYMBOLS | SYMOPT_DEBUG;// | SYMOPT_NO_PROMPTS; + Options &= ~SYMOPT_DEFERRED_LOADS; + SymSetOptions(Options); + SymSetSearchPath(ghProcess, "srv**symbols*http://msdl.microsoft.com/download/symbols"); + + printf("Loading symbols, please wait...\n"); + dwModuleBase = SymLoadModule64(ghProcess, 0, gszModuleFileName, 0, 0, 0); + if (dwModuleBase == 0) + { + fprintf(stderr, "SymLoadModule64() failed: %ld\n", GetLastError()); + return E_FAIL; + } + + + for (i = 0; i < pExportData->cNumberOfExports; i++) + { + PEXPORT pExport = &pExportData->aExports[i]; + ULONG64 ullFunction = dwModuleBase + pExportData->aExports[i].ulRva; + ULONG64 ullDisplacement; + + /* Skip forwarder */ + if (pExport->pszForwarder != NULL) + continue; + + RtlZeroMemory(&sym, sizeof(sym)); + sym.si.SizeOfStruct = sizeof(SYMBOL_INFO); + sym.si.MaxNameLen = MAX_SYMBOL_NAME; + + /* Try to find the symbol */ + if (!SymFromAddr(ghProcess, ullFunction, &ullDisplacement, &sym.si)) + { + printf("Error: SymFromAddr() failed. Error code: %u \n", GetLastError()); + continue; + } + + /* Symbol found. Check if it is a function */ + if (sym.si.Tag == SymTagFunction) + { + /* If we don't have a name yet, get one */ + pExport->pszSymbol = _strdup(sym.si.Name); + + /* Get the calling convention */ + if (!SymGetTypeInfo(ghProcess, + dwModuleBase, + sym.si.TypeIndex, + TI_GET_CALLING_CONVENTION, + &pExport->dwCallingConvention)) + { + /* Fall back to __stdcall */ + pExport->dwCallingConvention = 0x07; // CV_CALL_NEAR_STD + } + + /* Set the context to the function address */ + RtlZeroMemory(&StackFrame, sizeof(StackFrame)); + StackFrame.InstructionOffset = ullFunction; + if (!SymSetContext(ghProcess, &StackFrame, NULL)) + { + DWORD dwLastError = GetLastError(); + __debugbreak(); + continue; + } + + /* Enumerate all symbols for this function */ + if (!SymEnumSymbols(ghProcess, + 0, // use SymSetContext + NULL, + EnumParametersCallback, + pExport)) + { + DWORD dwLastError = GetLastError(); + __debugbreak(); + continue; + } + } + else if (sym.si.Tag == SymTagData) + { + pExport->fData = TRUE; + } + } + + return S_OK; +} + +const CHAR* +GetCallingConvention( + _In_ PEXPORT pExport) +{ + if (pExport->fData) + { + return "extern"; + } + +#ifndef _M_AMD64 + switch (pExport->dwCallingConvention) + { + case CV_CALL_NEAR_C: + return "cdecl"; + case CV_CALL_NEAR_FAST: + return "fastcall"; + case CV_CALL_NEAR_STD: + return "stdcall"; + case CV_CALL_NEAR_SYS: + return "syscall"; + case CV_CALL_THISCALL: + return "thiscall"; + case CV_CALL_CLRCALL: + return "clrcall"; + default: + __debugbreak(); + } +#endif + return "stdcall"; +} + +HRESULT +CreateSpecFile( + _In_ PCSTR pszSpecFile, + _In_ PEXPORT_DATA pExportData) +{ + FILE *file; + ULONG i, p; + PEXPORT pExport; + + /* Create the spec file */ + if (fopen_s(&file, pszSpecFile, "w") != 0) + { + fprintf(stderr, "Failed to open spec file: '%s'\n", pszSpecFile); + return E_FAIL; + } + + /* Loop all exports */ + for (i = 0; i < pExportData->cNumberOfExports; i++) + { + pExport = &pExportData->aExports[i]; + + fprintf(file, "%u %s ", i + 1, GetCallingConvention(pExport)); + //if (pExport->fNoName) + if (pExport->pszName == NULL) + { + fprintf(file, "-noname "); + } + + if (pExport->pszName != NULL) + { + fprintf(file, "%s", pExport->pszName); + } + else if (pExport->pszSymbol != NULL) + { + fprintf(file, "%s", pExport->pszSymbol); + } + else + { + fprintf(file, "NamelessExport_%u", i); + } + + if (!pExport->fData) + { + fprintf(file, "("); + for (p = 0; p < pExport->cParameters; p++) + { + fprintf(file, "%s", gapszTypeStrings[pExport->aeParameters[p]]); + if ((p + 1) < pExport->cParameters) + { + fprintf(file, " "); + } + } + fprintf(file, ")"); + } + + if (pExport->pszForwarder != NULL) + { + fprintf(file, " %s", pExport->pszForwarder); + } + + fprintf(file, "\n"); + } + + fclose(file); + + return S_OK; +} + +int main(int argc, char* argv[]) +{ + HRESULT hr; + CHAR szSpecFile[MAX_PATH]; + PSTR pszSpecFile; + HANDLE hFile; + PEXPORT_DATA pExportData; + + // check params + // help + + ghProcess = GetCurrentProcess(); + + /* Open the file */ + hr = OpenFileFromName(argv[1], &hFile); + if (!SUCCEEDED(hr)) + { + fprintf(stderr, "Failed to open file: %lx\n", hr); + return hr; + } + + /* Get the exports */ + hr = GetExportsFromFile(hFile, &pExportData); + if (!SUCCEEDED(hr)) + { + fprintf(stderr, "Failed to get exports: %lx\n", hr); + return hr; + } + + /* Get additional info from symbols */ + hr = ParseExportSymbols(hFile, pExportData); + if (!SUCCEEDED(hr)) + { + fprintf(stderr, "Failed to get symbol information: %lx\n", hr); + } + + if (argc > 2) + { + pszSpecFile = argv[2]; + } + else + { + PSTR pszStart = strrchr(argv[1], '\\'); + if (pszStart == 0) + pszStart = argv[1]; + + strcpy_s(szSpecFile, sizeof(szSpecFile), pszStart); + strcat_s(szSpecFile, sizeof(szSpecFile), ".spec"); + pszSpecFile = szSpecFile; + } + + hr = CreateSpecFile(pszSpecFile, pExportData); + + CloseHandle(hFile); + + printf("Spec file '%s' was successfully written.\n", szSpecFile); + + return hr; +} Propchange: trunk/rosapps/applications/devutils/createspec/createspec.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[hbelusca] 70558: [USETUP]: Do not append an extra NULL-terminator when updating freeldr.ini
by hbelusca＠svn.reactos.org 09 Jan '16

09 Jan '16

Author: hbelusca Date: Sat Jan 9 11:39:56 2016 New Revision: 70558 URL: http://svn.reactos.org/svn/reactos?rev=70558&view=rev Log: [USETUP]: Do not append an extra NULL-terminator when updating freeldr.ini Modified: trunk/reactos/base/setup/usetup/inicache.c Modified: trunk/reactos/base/setup/usetup/inicache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/inicache… ============================================================================== --- trunk/reactos/base/setup/usetup/inicache.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/inicache.c [iso-8859-1] Sat Jan 9 11:39:56 2016 @@ -537,7 +537,7 @@ DPRINT("File size: %lu\n", FileLength); - /* Allocate file buffer */ + /* Allocate file buffer with NULL-terminator */ FileBuffer = (CHAR*)RtlAllocateHeap(ProcessHeap, 0, FileLength + 1); @@ -560,7 +560,7 @@ &FileOffset, NULL); - /* Append string terminator */ + /* Append NULL-terminator */ FileBuffer[FileLength] = 0; NtClose(FileHandle); @@ -971,16 +971,15 @@ Section = Section->Next; if (Section != NULL) - BufferSize += 2; /* extra "\r\n" at end of each section */ - } - BufferSize++; /* Null-terminator */ + BufferSize += 2; /* Extra "\r\n" at end of each section */ + } DPRINT("BufferSize: %lu\n", BufferSize); - /* Allocate file buffer */ + /* Allocate file buffer with NULL-terminator */ Buffer = (CHAR*)RtlAllocateHeap(ProcessHeap, HEAP_ZERO_MEMORY, - BufferSize); + BufferSize + 1); if (Buffer == NULL) { DPRINT1("RtlAllocateHeap() failed\n");

1 0

[hbelusca] 70557: [USETUP]: Since calling RtlAllocateHeap with the HEAP_ZERO_MEMORY flag works as expected, just use it instead of manually zero-out the newly-created buffer just after.
by hbelusca＠svn.reactos.org 09 Jan '16

09 Jan '16

Author: hbelusca Date: Sat Jan 9 11:22:20 2016 New Revision: 70557 URL: http://svn.reactos.org/svn/reactos?rev=70557&view=rev Log: [USETUP]: Since calling RtlAllocateHeap with the HEAP_ZERO_MEMORY flag works as expected, just use it instead of manually zero-out the newly-created buffer just after. Modified: trunk/reactos/base/setup/usetup/inicache.c Modified: trunk/reactos/base/setup/usetup/inicache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/inicache… ============================================================================== --- trunk/reactos/base/setup/usetup/inicache.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/inicache.c [iso-8859-1] Sat Jan 9 11:22:20 2016 @@ -142,16 +142,13 @@ } Key = (PINICACHEKEY)RtlAllocateHeap(ProcessHeap, - 0, + HEAP_ZERO_MEMORY, sizeof(INICACHEKEY)); if (Key == NULL) { DPRINT("RtlAllocateHeap() failed\n"); return NULL; } - - RtlZeroMemory(Key, - sizeof(INICACHEKEY)); Key->Name = (WCHAR*)RtlAllocateHeap(ProcessHeap, 0, @@ -222,15 +219,13 @@ } Section = (PINICACHESECTION)RtlAllocateHeap(ProcessHeap, - 0, + HEAP_ZERO_MEMORY, sizeof(INICACHESECTION)); if (Section == NULL) { DPRINT("RtlAllocateHeap() failed\n"); return NULL; } - - RtlZeroMemory(Section, sizeof(INICACHESECTION)); /* Allocate and initialize section name */ Section->Name = (WCHAR*)RtlAllocateHeap(ProcessHeap, @@ -579,16 +574,13 @@ /* Allocate inicache header */ *Cache = (PINICACHE)RtlAllocateHeap(ProcessHeap, - 0, + HEAP_ZERO_MEMORY, sizeof(INICACHE)); if (*Cache == NULL) { DPRINT("RtlAllocateHeap() failed\n"); return STATUS_INSUFFICIENT_RESOURCES; } - - /* Initialize inicache header */ - RtlZeroMemory(*Cache, sizeof(INICACHE)); /* Parse ini file */ Section = NULL; @@ -842,15 +834,13 @@ /* Allocate key buffer */ Key = (PINICACHEKEY)RtlAllocateHeap(ProcessHeap, - 0, + HEAP_ZERO_MEMORY, sizeof(INICACHEKEY)); if (Key == NULL) { DPRINT("RtlAllocateHeap() failed\n"); return NULL; } - - RtlZeroMemory(Key, sizeof(INICACHEKEY)); /* Allocate name buffer */ Key->Name = (WCHAR*)RtlAllocateHeap(ProcessHeap, @@ -930,16 +920,13 @@ /* Allocate inicache header */ Cache = (PINICACHE)RtlAllocateHeap(ProcessHeap, - 0, + HEAP_ZERO_MEMORY, sizeof(INICACHE)); if (Cache == NULL) { DPRINT("RtlAllocateHeap() failed\n"); return NULL; } - - /* Initialize inicache header */ - RtlZeroMemory(Cache, sizeof(INICACHE)); return Cache; } @@ -992,15 +979,13 @@ /* Allocate file buffer */ Buffer = (CHAR*)RtlAllocateHeap(ProcessHeap, - 0, + HEAP_ZERO_MEMORY, BufferSize); if (Buffer == NULL) { DPRINT1("RtlAllocateHeap() failed\n"); return STATUS_INSUFFICIENT_RESOURCES; } - - RtlZeroMemory(Buffer, BufferSize); /* Fill file buffer */ Ptr = Buffer; @@ -1093,15 +1078,13 @@ } Section = (PINICACHESECTION)RtlAllocateHeap(ProcessHeap, - 0, + HEAP_ZERO_MEMORY, sizeof(INICACHESECTION)); if (Section == NULL) { DPRINT("RtlAllocateHeap() failed\n"); return NULL; } - - RtlZeroMemory(Section, sizeof(INICACHESECTION)); /* Allocate and initialize section name */ Section->Name = (WCHAR*)RtlAllocateHeap(ProcessHeap,

1 0

[ion] 70556: [BOOTMGFW]: Implement the final boot selection & launch loop. [BOOTMLIB]: Implement a few more BCD option functions. Minus a PE loader (BmpLaunchBootEntry) and some more BCD parsing (B...
by ion＠svn.reactos.org 09 Jan '16

09 Jan '16

Author: ion Date: Sat Jan 9 05:39:18 2016 New Revision: 70556 URL: http://svn.reactos.org/svn/reactos?rev=70556&view=rev Log: [BOOTMGFW]: Implement the final boot selection & launch loop. [BOOTMLIB]: Implement a few more BCD option functions. Minus a PE loader (BmpLaunchBootEntry) and some more BCD parsing (BmpGetSelectedBootEntry) with some glue in between, the UEFI Boot Manager is nearly done. Once it is, it will be time to implement the actual loader -- Winload.efi. The good news is that we'll have all of bootlib already good to go (with all its hacks). The bad news is that Winload will turn on paging, so all those unimplemented paths and UEFI mode switches will have to be made to work. Modified: trunk/reactos/boot/environ/app/bootmgr/bootmgr.c trunk/reactos/boot/environ/include/bl.h trunk/reactos/boot/environ/lib/bootlib.c trunk/reactos/boot/environ/lib/misc/bcdopt.c Modified: trunk/reactos/boot/environ/app/bootmgr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/app/bootmgr/b… ============================================================================== --- trunk/reactos/boot/environ/app/bootmgr/bootmgr.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/app/bootmgr/bootmgr.c [iso-8859-1] Sat Jan 9 05:39:18 2016 @@ -1163,6 +1163,66 @@ return STATUS_NOT_IMPLEMENTED; } +NTSTATUS +BmpProcessBadMemory ( + VOID + ) +{ + EfiPrintf(L"Bad page list persistence \r\n"); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +BmPurgeOption ( + _In_ HANDLE BcdHandle, + _In_ PGUID ObjectId, + _In_ ULONG Type + ) +{ + EfiPrintf(L"Key BCD delete not yet implemented\r\n"); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +BmGetBootSequence ( + _In_ HANDLE BcdHandle, + _In_ PGUID SequenceList, + _In_ ULONG SequenceListCount, + _In_ ULONG Flags, + _Out_ PBL_LOADED_APPLICATION_ENTRY** BootSequence, + _Out_ PULONG SequenceCount + ) +{ + EfiPrintf(L"Fixed sequences not yet supported\r\n"); + *SequenceCount = 0; + *BootSequence = NULL; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +BmpGetSelectedBootEntry ( + _In_ HANDLE BcdHandle, + _Out_ PBL_LOADED_APPLICATION_ENTRY *SelectedBootEntry, + _Out_ PULONG EntryIndex, + _Out_ PBOOLEAN ExitBootManager + ) +{ + EfiPrintf(L"Boot selection not yet implemented\r\n"); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +BmpLaunchBootEntry ( + _In_ PBL_LOADED_APPLICATION_ENTRY BootEntry, + _Out_ PULONG EntryIndex, + _In_ ULONG Unknown, + _In_ BOOLEAN LaunchWinRe + ) +{ + EfiPrintf(L"Boot launch not yet implemented\r\n"); + return STATUS_NOT_IMPLEMENTED; +} + /*++ * @name BmMain * @@ -1189,12 +1249,18 @@ PBL_BCD_OPTION EarlyOptions; PWCHAR Stylesheet; BOOLEAN XmlLoaded, DisableIntegrity, TestSigning, PersistBootSequence; - BOOLEAN RebootOnError, CustomActions, ContinueLoop; - ULONG SequenceId, SequenceCount; - PGUID BootSequences; - //PBL_LOADED_APPLICATION_ENTRY* BootEntries; - //PBL_LOADED_APPLICATION_ENTRY BootEntry; - + BOOLEAN RebootOnError, CustomActions; + ULONG SequenceId; + PBL_LOADED_APPLICATION_ENTRY BootEntry; + PGUID SequenceList; + ULONG SequenceListCount; + PBL_LOADED_APPLICATION_ENTRY* BootSequence; + ULONG BootIndex; + BOOLEAN ExitBootManager; + BOOLEAN BootFailed; + BOOLEAN BootOk; + ULONG SequenceCount; + BOOLEAN GetEntry; EfiPrintf(L"ReactOS UEFI Boot Manager Initializing...\r\n"); /* Reading the BCD can change this later on */ @@ -1401,49 +1467,190 @@ /* At last, enter the boot selection stage */ SequenceId = 0; - do - { - ContinueLoop = FALSE; - - /* Get the list of boot sequences */ - SequenceCount = 0; - Status = BlGetBootOptionGuidList(BlpApplicationEntry.BcdData, - BcdBootMgrObjectList_BootSequence, - &BootSequences, - &SequenceCount); - EfiPrintf(L"Count: %d\r\n", SequenceCount); - EfiStall(1000000); + GetEntry = FALSE; + BootFailed = FALSE; + SequenceList = NULL; + BootSequence = NULL; + SequenceCount = 0; + while (1) + { + /* We don't have a boot entry nor a sequence ID */ + BootEntry = NULL; + BootOk = FALSE; + + /* Do we have a hardcoded boot sequence set? */ + if (!(BootSequence) && !(GetEntry)) + { + /* Not yet, read the BCD to see if one is there */ + Status = BlGetBootOptionGuidList(BlpApplicationEntry.BcdData, + BcdBootMgrObjectList_BootSequence, + &SequenceList, + &SequenceListCount); + if (NT_SUCCESS(Status)) + { + /* A GUID list for the boot sequence is set. Extract it */ + Status = BmGetBootSequence(BcdHandle, + SequenceList, + SequenceListCount, + 0x20000000, + &BootSequence, + &SequenceCount); + if (NT_SUCCESS(Status)) + { + /* Don't get stuck in a loop repeating this sequence */ + BlRemoveBootOption(BlpApplicationEntry.BcdData, + BcdBootMgrObjectList_BootSequence); + + /* But do check if we should persist it */ + if (PersistBootSequence) + { + /* Yes -- so go select an entry now */ + GetEntry = TRUE; + } + else + { + /* We shouldn't, so wipe it from the BCD too */ + Status = BmPurgeOption(BcdHandle, + &BmApplicationIdentifier, + BcdBootMgrObjectList_BootSequence); + if (!NT_SUCCESS(Status)) + { + /* Well that failed */ + goto LoopQuickie; + } + } + } + } + else + { + /* No boot entry sequence for us */ + BootSequence = NULL; + } + } + + /* Do we have a sequence active, and are we still processing it? */ + if ((BootSequence) && ((GetEntry) || (SequenceId < SequenceCount))) + { + /* Extract the next entry in the sequence */ + BootEntry = BootSequence[SequenceId]; + BootSequence[SequenceId] = NULL; + + /* Move to the next entry for next time */ + SequenceId++; + + /* Unless there won't be a a next time? */ + if (SequenceId == SequenceCount) + { + /* Clean up, it's the last entry */ + BlMmFreeHeap(BootSequence); + BootSequence = NULL; + } + } + else + { + /* Get the selected boot entry from the user */ + ExitBootManager = FALSE; + Status = BmpGetSelectedBootEntry(BcdHandle, + &BootEntry, + &BootIndex, + &ExitBootManager); + if (!(NT_SUCCESS(Status)) || (ExitBootManager)) + { + /* Selection failed, or user wants to exit */ + goto LoopQuickie; + } + } + + /* Did we have a BCD open? */ + if (BcdHandle) + { + /* Close it, we'll be opening a new one */ + BmCloseDataStore(BcdHandle); + BcdHandle = NULL; + } + + /* Launch the selected entry */ + Status = BmpLaunchBootEntry(BootEntry, &BootIndex, 0, TRUE); + if (NT_SUCCESS(Status)) + { + /* Boot worked, uncache display and process the bad memory list */ + BmDisplayStateCached = FALSE; + BmpProcessBadMemory(); + } + else + { + /* Boot failed -- was it user driven? */ + if (Status != STATUS_CANCELLED) + { + /* Nope, remember that booting failed */ + BootFailed = TRUE; + goto LoopQuickie; + } + + /* Yes -- the display is still valid */ + BmDisplayStateCached = TRUE; + } + + /* Reopen the BCD */ + Status = BmOpenDataStore(&BcdHandle); if (!NT_SUCCESS(Status)) { - //goto GetEntry; - } - + break; + } + + /* Put the BCD options back into our entry */ + BlReplaceBootOptions(&BlpApplicationEntry, EarlyOptions); + + /* Update our options one more time */ + Status = BmpUpdateApplicationOptions(BcdHandle); if (NT_SUCCESS(Status)) { - continue; - } - + /* Boot was 100% OK */ + BootOk = TRUE; + } + +LoopQuickie: + /* Did we have a boot entry? */ + if (BootEntry) + { + /* We can destroy it now */ + BlDestroyBootEntry(BootEntry); + } + + /* Is this the success path? */ + if (NT_SUCCESS(Status)) + { + /* Did we actually boot something? */ + if (!BootOk) + { + /* Bope, fail out */ + break; + } + } + + /* This is the failure path... should we reboot? */ if (RebootOnError) { break; } - - SequenceId++; - } while (ContinueLoop); + }; Failure: - /* Check if we got here due to an internal error */ - if (BmpInternalBootError) - { - /* If XML is available, display the error */ - if (XmlLoaded) - { - //BmDisplayDumpError(0, 0); - //BmErrorPurge(); - } - - /* Don't do a fatal error -- return back to firmware */ - goto Quickie; + if (!BootFailed) + { + /* Check if we got here due to an internal error */ + if (BmpInternalBootError) + { + /* If XML is available, display the error */ + if (XmlLoaded) + { + //BmDisplayDumpError(0, 0); + //BmErrorPurge(); + } + + /* Don't do a fatal error -- return back to firmware */ + goto Quickie; + } } /* Log a general fatal error once we're here */ Modified: trunk/reactos/boot/environ/include/bl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/include/bl.h?… ============================================================================== --- trunk/reactos/boot/environ/include/bl.h [iso-8859-1] (original) +++ trunk/reactos/boot/environ/include/bl.h [iso-8859-1] Sat Jan 9 05:39:18 2016 @@ -1514,6 +1514,29 @@ _In_ ULONG Signature ); +NTSTATUS +BlUtlInitialize ( + VOID + ); + +NTSTATUS +BlUtlRegisterProgressRoutine ( + VOID + ); + +NTSTATUS +BlGetApplicationBaseAndSize ( + _Out_ PVOID* ImageBase, + _Out_ PULONG ImageSize + ); + +VOID +BlDestroyBootEntry ( + _In_ PBL_LOADED_APPLICATION_ENTRY AppEntry + ); + +/* FIRMWARE UTILITY ROUTINES *************************************************/ + EFI_STATUS EfiGetEfiStatusCode( _In_ NTSTATUS Status @@ -1524,16 +1547,6 @@ _In_ EFI_STATUS EfiStatus ); -NTSTATUS -BlUtlInitialize ( - VOID - ); - -NTSTATUS -BlUtlRegisterProgressRoutine ( - VOID - ); - VOID BlFwReboot ( VOID @@ -1559,11 +1572,7 @@ VOID ); -NTSTATUS -BlGetApplicationBaseAndSize ( - _Out_ PVOID* ImageBase, - _Out_ PULONG ImageSize - ); +/* RESOURCE ROUTINES *********************************************************/ PWCHAR BlResourceFindMessage ( @@ -1714,6 +1723,18 @@ BlAppendBootOptions ( _In_ PBL_LOADED_APPLICATION_ENTRY AppEntry, _In_ PBL_BCD_OPTION Options + ); + +VOID +BlRemoveBootOption ( + _In_ PBL_BCD_OPTION List, + _In_ ULONG Type + ); + +NTSTATUS +BlReplaceBootOptions ( + _In_ PBL_LOADED_APPLICATION_ENTRY AppEntry, + _In_ PBL_BCD_OPTION NewOptions ); /* BOOT REGISTRY ROUTINES ****************************************************/ Modified: trunk/reactos/boot/environ/lib/bootlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/bootlib.c… ============================================================================== --- trunk/reactos/boot/environ/lib/bootlib.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/bootlib.c [iso-8859-1] Sat Jan 9 05:39:18 2016 @@ -436,3 +436,18 @@ *ImageSize = BlpApplicationParameters->ImageSize; return STATUS_SUCCESS; } + +VOID +BlDestroyBootEntry ( + _In_ PBL_LOADED_APPLICATION_ENTRY AppEntry + ) +{ + /* Check if we had allocated BCD options */ + if (AppEntry->Flags & BL_APPLICATION_ENTRY_BCD_OPTIONS_INTERNAL) + { + BlMmFreeHeap(AppEntry->BcdData); + } + + /* Free the entry itself */ + BlMmFreeHeap(AppEntry); +} Modified: trunk/reactos/boot/environ/lib/misc/bcdopt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/misc/bcdo… ============================================================================== --- trunk/reactos/boot/environ/lib/misc/bcdopt.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/misc/bcdopt.c [iso-8859-1] Sat Jan 9 05:39:18 2016 @@ -645,3 +645,75 @@ return Status; } +VOID +BlRemoveBootOption ( + _In_ PBL_BCD_OPTION List, + _In_ ULONG Type + ) +{ + PBL_BCD_OPTION Option; + + /* Keep going until the option is gone */ + while (1) + { + /* Get the BCD option */ + Option = MiscGetBootOption(List, Type); + if (!Option) + { + break; + } + + /* Pretend it's empty */ + Option->Empty = TRUE; + } +} + +NTSTATUS +BlReplaceBootOptions ( + _In_ PBL_LOADED_APPLICATION_ENTRY AppEntry, + _In_ PBL_BCD_OPTION NewOptions + ) +{ + NTSTATUS Status; + ULONG Size; + + /* Make sure there's something to replace with */ + if (!NewOptions) + { + return STATUS_INVALID_PARAMETER; + } + + /* Check if we already had allocated internal options */ + if (AppEntry->Flags & BL_APPLICATION_ENTRY_BCD_OPTIONS_INTERNAL) + { + /* Free them */ + BlMmFreeHeap(AppEntry->BcdData); + } + + /* Reset option flags */ + AppEntry->Flags &= ~(BL_APPLICATION_ENTRY_BCD_OPTIONS_INTERNAL | + BL_APPLICATION_ENTRY_BCD_OPTIONS_EXTERNAL); + + /* Reset the options and set success for now */ + Status = STATUS_SUCCESS; + AppEntry->BcdData = NULL; + + /* Get the size of the new list of options */ + Size = BlGetBootOptionListSize(NewOptions); + + /* Allocate a copy of the new list */ + NewOptions = BlMmAllocateHeap(Size); + if (!NewOptions) + { + return STATUS_NO_MEMORY; + } + + /* Copy it in */ + RtlCopyMemory(NewOptions, NewOptions, Size); + + /* Set it as the new set of options and return */ + AppEntry->Flags |= BL_APPLICATION_ENTRY_BCD_OPTIONS_INTERNAL; + AppEntry->BcdData = NewOptions; + return Status; +} +

1 0

[hbelusca] 70555: [DEVMGR]: Keep the computer name as it is, don't lower-case it.
by hbelusca＠svn.reactos.org 08 Jan '16

08 Jan '16

Author: hbelusca Date: Fri Jan 8 21:14:13 2016 New Revision: 70555 URL: http://svn.reactos.org/svn/reactos?rev=70555&view=rev Log: [DEVMGR]: Keep the computer name as it is, don't lower-case it. Modified: trunk/reactos/dll/win32/devmgr/devmgmt/RootNode.cpp Modified: trunk/reactos/dll/win32/devmgr/devmgmt/RootNode.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/R… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/RootNode.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/RootNode.cpp [iso-8859-1] Fri Jan 8 21:14:13 2016 @@ -52,8 +52,7 @@ // The root name is the computer name DWORD Size = DISPLAY_NAME_LEN; - if (GetComputerNameW(m_DisplayName, &Size)) - _wcslwr(m_DisplayName); + GetComputerNameW(m_DisplayName, &Size); return true; }

1 0

[hbelusca] 70554: [CDMAKE]: Improve an error message.
by hbelusca＠svn.reactos.org 08 Jan '16

08 Jan '16

Author: hbelusca Date: Fri Jan 8 20:27:55 2016 New Revision: 70554 URL: http://svn.reactos.org/svn/reactos?rev=70554&view=rev Log: [CDMAKE]: Improve an error message. Modified: trunk/reactos/tools/cdmake/cdmake.c Modified: trunk/reactos/tools/cdmake/cdmake.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/cdmake.c?rev=… ============================================================================== --- trunk/reactos/tools/cdmake/cdmake.c [iso-8859-1] (original) +++ trunk/reactos/tools/cdmake/cdmake.c [iso-8859-1] Fri Jan 8 20:27:55 2016 @@ -2249,7 +2249,7 @@ FILE *f = fopen(source+1, "r"); if (!f) { - error_exit("Cannot open cd description %s\n", source+1); + error_exit("Cannot open CD-ROM file description %s\n", source+1); } while (fgets(lineread, sizeof(lineread), f)) {

1 0

[hbelusca] 70553: [CDMAKE] - #if _WIN32 --> #ifdef _WIN32 - Define the "max" macro only if needed. - Fix a comment. - Plug a memory leak ('case_name' not freed in the "!*case_name" case of the dir_...
by hbelusca＠svn.reactos.org 08 Jan '16

08 Jan '16

Author: hbelusca Date: Fri Jan 8 20:25:30 2016 New Revision: 70553 URL: http://svn.reactos.org/svn/reactos?rev=70553&view=rev Log: [CDMAKE] - #if _WIN32 --> #ifdef _WIN32 - Define the "max" macro only if needed. - Fix a comment. - Plug a memory leak ('case_name' not freed in the "!*case_name" case of the dir_hash_create_dir function). - Return a non-zero value (the file structure pointer) from dir_hash_add_file in case we succeed in creating the file in the ISO structure, and NULL otherwise (i.e. when the filename is empty). In that latter case we fail the hard way. No-named files are completely invalid in ISO archives. Now, the following testcase (e.g. to be added into bootcd.lst): reactos/reactos.exe/=C:/test/reactos.exe fails as expected (before, we were able to create a directory named "reactos/reactos.exe", and inside, a no-named file with the contents of C:/test/reactos.exe). Modified: trunk/reactos/tools/cdmake/cdmake.c trunk/reactos/tools/cdmake/dirhash.c trunk/reactos/tools/cdmake/dirhash.h Modified: trunk/reactos/tools/cdmake/cdmake.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/cdmake.c?rev=… ============================================================================== --- trunk/reactos/tools/cdmake/cdmake.c [iso-8859-1] (original) +++ trunk/reactos/tools/cdmake/cdmake.c [iso-8859-1] Fri Jan 8 20:25:30 2016 @@ -619,7 +619,7 @@ #if defined(_WIN32) && !defined(strcasecmp) #define strcasecmp stricmp -#endif//_WIN32 +#endif // _WIN32 static BOOL cdname_exists(PDIR_RECORD d) { @@ -696,7 +696,7 @@ filename_counter = 1; while (cdname_exists(d)) { - // the file name must be least 8 char long + // the file name must be at least 8 chars long if (strlen(d->name_on_cd)<8) error_exit("'%s' is a duplicate file name, aborting...", filename); @@ -704,7 +704,9 @@ error_exit("'%s' is a duplicate file name, aborting...", filename); // max 255 times for equal short filename - if (filename_counter>255) error_exit("'%s' is a duplicate file name, aborting...", filename); + if (filename_counter>255) + error_exit("'%s' is a duplicate file name, aborting...", filename); + d->name_on_cd[8] = '~'; memset(&d->name_on_cd[9],0,5); sprintf(&d->name_on_cd[9],"%d",filename_counter); @@ -729,7 +731,7 @@ for the specified parent and returns a pointer to the new record. -----------------------------------------------------------------------------*/ -#if _WIN32 +#ifdef _WIN32 /* Win32 version */ PDIR_RECORD @@ -1167,7 +1169,7 @@ return new_d; } -#if _WIN32 +#ifdef _WIN32 static BOOL get_cd_file_time(HANDLE handle, PDATE_AND_TIME cd_time_info) { @@ -1195,7 +1197,7 @@ scan_specified_files(PDIR_RECORD d, struct target_dir_entry *dir) { PDIR_RECORD new_d; -#if _WIN32 +#ifdef _WIN32 HANDLE open_file; LARGE_INTEGER file_size; #else @@ -1210,7 +1212,7 @@ { if (strcmp(file->target_name, DIRECTORY_TIMESTAMP) == 0) { -#if _WIN32 +#ifdef _WIN32 if ((open_file = CreateFileA(file->source_name, GENERIC_READ, FILE_SHARE_READ, @@ -1246,7 +1248,7 @@ } new_d = new_empty_dirrecord(d, FALSE); parse_filename_into_dirrecord(file->target_name, new_d, FALSE); -#if _WIN32 +#ifdef _WIN32 if ((open_file = CreateFileA(file->source_name, GENERIC_READ, FILE_SHARE_READ, @@ -1271,7 +1273,7 @@ #else if (stat(file->source_name, &stbuf) == -1) { - error_exit("Cannot find '%s' (target %s)\n", + error_exit("Cannot find '%s' (target '%s')\n", file->source_name, file->target_name); } @@ -2241,7 +2243,7 @@ } else { - char *trimmedline, *targetname, *srcname, *eq, *normdir; + char *trimmedline, *targetname, *normdir, *srcname, *eq; char lineread[1024]; FILE *f = fopen(source+1, "r"); @@ -2268,17 +2270,17 @@ targetname = strtok(lineread, "="); srcname = strtok(NULL, ""); -#if _WIN32 +#ifdef _WIN32 if (_access(srcname, R_OK) == 0) - dir_hash_add_file(&specified_files, srcname, targetname); - else - error_exit("Cannot access file '%s' (target %s)\n", srcname, targetname); #else if (access(srcname, R_OK) == 0) - dir_hash_add_file(&specified_files, srcname, targetname); +#endif + { + if (!dir_hash_add_file(&specified_files, srcname, targetname)) + error_exit("Target '%s' (file '%s') is invalid\n", targetname, srcname); + } else - error_exit("Cannot access file '%s' (target %s)\n", srcname, targetname); -#endif + error_exit("Cannot access file '%s' (target '%s')\n", srcname, targetname); } } fclose(f); Modified: trunk/reactos/tools/cdmake/dirhash.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/dirhash.c?rev… ============================================================================== --- trunk/reactos/tools/cdmake/dirhash.c [iso-8859-1] (original) +++ trunk/reactos/tools/cdmake/dirhash.c [iso-8859-1] Fri Jan 8 20:25:30 2016 @@ -12,7 +12,9 @@ #include "config.h" #include "dirhash.h" +#ifndef max #define max(a, b) ((a) > (b) ? (a) : (b)) +#endif /* This is the famous DJB hash */ static unsigned int @@ -148,7 +150,11 @@ free(parentcase); /* See the remark above */ - if (!*case_name) return parent_de; + if (!*case_name) + { + free(case_name); + return parent_de; + } /* Now create the directory */ de = calloc(1, sizeof(*de)); @@ -168,7 +174,8 @@ return de; } -void dir_hash_add_file(struct target_dir_hash *dh, const char *source, const char *target) +struct target_file * +dir_hash_add_file(struct target_dir_hash *dh, const char *source, const char *target) { struct target_file *tf; struct target_dir_entry *de; @@ -176,8 +183,14 @@ char *targetfile = NULL; char *targetnorm; - /* Create first the directory */ + /* First create the directory; check whether the file name is valid and bail out if not */ split_path(target, &targetdir, &targetfile); + if (!*targetfile) + { + free(targetdir); + free(targetfile); + return NULL; + } targetnorm = strdup(targetdir); normalize_dirname(targetnorm); de = dir_hash_create_dir(dh, targetdir, targetnorm); @@ -190,6 +203,8 @@ de->head = tf; tf->source_name = strdup(source); tf->target_name = targetfile; + + return tf; } static void Modified: trunk/reactos/tools/cdmake/dirhash.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/dirhash.h?rev… ============================================================================== --- trunk/reactos/tools/cdmake/dirhash.h [iso-8859-1] (original) +++ trunk/reactos/tools/cdmake/dirhash.h [iso-8859-1] Fri Jan 8 20:25:30 2016 @@ -5,6 +5,7 @@ * PURPOSE: CD-ROM Premastering Utility - Directory names hashing * PROGRAMMERS: Art Yerkes */ + #ifndef _DIRHASH_H_ #define _DIRHASH_H_ @@ -37,9 +38,13 @@ }; void normalize_dirname(char *filename); -void dir_hash_add_file(struct target_dir_hash *dh, const char *source, const char *target); + struct target_dir_entry * dir_hash_create_dir(struct target_dir_hash *dh, const char *casename, const char *targetnorm); + +struct target_file * +dir_hash_add_file(struct target_dir_hash *dh, const char *source, const char *target); + void dir_hash_destroy(struct target_dir_hash *dh); #endif // _DIRHASH_H_

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