Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 23333: prepare move for cmdutils more and find for they are necessary cmd command for allot bat files. Fireball agrees to it.
by greatlrd＠svn.reactos.org 28 Jul '06

28 Jul '06

Author: greatlrd Date: Sat Jul 29 00:43:58 2006 New Revision: 23333 URL: http://svn.reactos.org/svn/reactos?rev=23333&view=rev Log: prepare move for cmdutils more and find for they are necessary cmd command for allot bat files. Fireball agrees to it. Added: trunk/reactos/base/applications/cmdutils/

1 0

[fireball] 23332: - Add Filip Navara's cmlib - Use cmlib in Freeldr and Setupldr (patch by Filip Navara) - Fix some HIVE definition and checksum calculation in mkhive and ntoskrnl (so they btoh create a compatible registry) TODO: Apply 2nd half of the patch, which makes ntoskrnl using cmlib. This commit is dedicated to Filip Navara's constant promises to commit cmlib and to recent small Arty vs. Alex debate on irc :)
by fireball＠svn.reactos.org 28 Jul '06

28 Jul '06

Author: fireball Date: Sat Jul 29 00:25:47 2006 New Revision: 23332 URL: http://svn.reactos.org/svn/reactos?rev=23332&view=rev Log: - Add Filip Navara's cmlib - Use cmlib in Freeldr and Setupldr (patch by Filip Navara) - Fix some HIVE definition and checksum calculation in mkhive and ntoskrnl (so they btoh create a compatible registry) TODO: Apply 2nd half of the patch, which makes ntoskrnl using cmlib. This commit is dedicated to Filip Navara's constant promises to commit cmlib and to recent small Arty vs. Alex debate on irc :) Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild trunk/reactos/boot/freeldr/freeldr/include/arch/i386/hardware.h trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild trunk/reactos/lib/lib.mak (contents, props changed) trunk/reactos/lib/lib.rbuild trunk/reactos/ntoskrnl/cm/cm.h trunk/reactos/ntoskrnl/cm/regfile.c trunk/reactos/tools/mkhive/binhive.c Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild Sat Jul 29 00:25:47 2006 @@ -7,5 +7,6 @@ <library>freeldr_main</library> <library>rossym</library> <library>string</library> + <library>cmlib</library> <library>rtl</library> </module> Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild Sat Jul 29 00:25:47 2006 @@ -1,6 +1,7 @@ <module name="freeldr_base" type="objectlibrary"> <include base="freeldr_base">include</include> <include base="freeldr_base">cache</include> + <include base="cmlib">.</include> <include base="ntoskrnl">include</include> <define name="__USE_W32API" /> <!-- Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/hardware.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/i386/hardware.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/i386/hardware.h Sat Jul 29 00:25:47 2006 @@ -43,7 +43,7 @@ /* CM_COMPONENT_INFORMATION.Flags */ #define Failed 0x00000001 -#define ReadOnly 0x00000002 +//#define ReadOnly 0x00000002 #define Removable 0x00000004 #define ConsoleIn 0x00000008 #define ConsoleOut 0x00000010 Modified: trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c Sat Jul 29 00:25:47 2006 @@ -20,855 +20,45 @@ */ #include <freeldr.h> +#include <cmlib.h> #define NDEBUG #include <debug.h> -#define REG_HIVE_ID 0x66676572 /* "regf" */ -#define REG_BIN_ID 0x6e696268 /* "hbin" */ -#define REG_KEY_CELL_ID 0x6b6e -#define REG_HASH_TABLE_BLOCK_ID 0x666c -#define REG_VALUE_CELL_ID 0x6b76 - -#define REG_BLOCK_SIZE 4096 -#define REG_HBIN_DATA_OFFSET 32 -#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 ABS_VALUE(V) (((V) < 0) ? -(V) : (V)) - - -/* BLOCK_OFFSET = offset in file after header block */ -typedef ULONG BLOCK_OFFSET, *PBLOCK_OFFSET; - -/* header for registry hive file : */ -typedef struct _HIVE_HEADER -{ - /* Hive identifier "regf" (0x66676572) */ - ULONG BlockId; - - /* Update counter */ - ULONG UpdateCounter1; - - /* Update counter */ - ULONG UpdateCounter2; - - /* When this hive file was last modified */ - ULONGLONG DateModified; - - /* Registry format major version (1) */ - ULONG MajorVersion; - - /* Registry format minor version (3) - Version 3 added fast indexes, version 5 has large value optimizations */ - ULONG MinorVersion; - - /* 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 KEY_CELL */ - BLOCK_OFFSET RootKeyOffset; - - /* Size of each hive block ? */ - ULONG BlockSize; - - /* (1?) */ - ULONG Unused7; - - /* Name of hive file */ - WCHAR FileName[48]; - - ULONG Reserved[99]; - - /* Checksum of first 0x200 bytes */ - ULONG Checksum; -} __attribute__((packed)) HIVE_HEADER, *PHIVE_HEADER; - - -typedef struct _BIN_HEADER -{ - /* Bin identifier "hbin" (0x6E696268) */ - ULONG HeaderId; - - /* Block offset of this bin */ - BLOCK_OFFSET BinOffset; - - /* Size in bytes, multiple of the block size (4KB) */ - ULONG BinSize; - - ULONG Reserved[2]; - - /* When this bin was last modified */ - ULONGLONG DateModified; - - /* ? (In-memory only) */ - ULONG MemAlloc; -} __attribute__((packed)) HBIN, *PHBIN; - - -typedef struct _CELL_HEADER -{ - /* <0 if used, >0 if free */ - LONG CellSize; -} __attribute__((packed)) CELL_HEADER, *PCELL_HEADER; - - -typedef struct _KEY_CELL -{ - /* Size of this cell */ - LONG CellSize; - - /* Key cell identifier "kn" (0x6b6e) */ - USHORT Id; - - /* Flags */ - USHORT Flags; - - /* Time of last flush */ - ULONGLONG LastWriteTime; /* FILETIME */ - - /* ? */ - ULONG UnUsed1; - - /* Block offset of parent key cell */ - BLOCK_OFFSET ParentKeyOffset; - - /* Count of sub keys for the key in this key cell */ - ULONG NumberOfSubKeys; - - /* ? */ - ULONG UnUsed2; - - /* Block offset of has table for FIXME: subkeys/values? */ - BLOCK_OFFSET HashTableOffset; - - /* ? */ - ULONG UnUsed3; - - /* Count of values contained in this key cell */ - ULONG NumberOfValues; - - /* Block offset of VALUE_LIST_CELL */ - BLOCK_OFFSET ValueListOffset; - - /* Block offset of security cell */ - BLOCK_OFFSET SecurityKeyOffset; - - /* Block offset of registry key class */ - BLOCK_OFFSET ClassNameOffset; - - /* ? */ - ULONG Unused4[5]; - - /* Size in bytes of key name */ - USHORT NameSize; - - /* Size of class name in bytes */ - USHORT ClassSize; - - /* Name of key (not zero terminated) */ - CHAR Name[0]; -} __attribute__((packed)) KEY_CELL, *PKEY_CELL; - - -/* KEY_CELL.Type constants */ -#define REG_LINK_KEY_CELL_TYPE 0x10 -#define REG_KEY_NAME_PACKED 0x20 -#define REG_ROOT_KEY_CELL_TYPE 0x0c - - -// hash record : -// HashValue=four letters of value's name -typedef struct _HASH_RECORD -{ - BLOCK_OFFSET KeyOffset; - ULONG HashValue; -} __attribute__((packed)) HASH_RECORD, *PHASH_RECORD; - - -typedef struct _HASH_TABLE_CELL -{ - LONG CellSize; - USHORT Id; - USHORT HashTableSize; - HASH_RECORD Table[0]; -} __attribute__((packed)) HASH_TABLE_CELL, *PHASH_TABLE_CELL; - - -typedef struct _VALUE_LIST_CELL -{ - LONG CellSize; - BLOCK_OFFSET ValueOffset[0]; -} __attribute__((packed)) VALUE_LIST_CELL, *PVALUE_LIST_CELL; - - -typedef struct _VALUE_CELL -{ - LONG CellSize; - USHORT Id; // "kv" - USHORT NameSize; // length of Name - ULONG DataSize; // length of datas in the cell pointed by DataOffset - BLOCK_OFFSET DataOffset;// datas are here if high bit of DataSize is set - ULONG DataType; - USHORT Flags; - USHORT Unused1; - CHAR Name[0]; /* warning : not zero terminated */ -} __attribute__((packed)) VALUE_CELL, *PVALUE_CELL; - -/* VALUE_CELL.Flags constants */ -#define REG_VALUE_NAME_PACKED 0x0001 - -/* VALUE_CELL.DataSize mask constants */ -#define REG_DATA_SIZE_MASK 0x7FFFFFFF -#define REG_DATA_IN_OFFSET 0x80000000 - - -typedef struct _DATA_CELL -{ - LONG CellSize; - CHAR Data[0]; -} __attribute__((packed)) DATA_CELL, *PDATA_CELL; - - -typedef struct _REGISTRY_HIVE -{ - ULONG FileSize; - PHIVE_HEADER HiveHeader; - ULONG BlockListSize; - PHBIN *BlockList; - ULONG FreeListSize; - ULONG FreeListMax; - PCELL_HEADER *FreeList; - BLOCK_OFFSET *FreeListOffset; -} REGISTRY_HIVE, *PREGISTRY_HIVE; - - -static PVOID MbBase = NULL; -static ULONG MbSize = 0; - /* FUNCTIONS ****************************************************************/ +static PVOID +CmpAllocate (ULONG Size, BOOLEAN Paged) +{ + return MmAllocateMemory(Size); +} + + static VOID -InitMbMemory (PVOID ChunkBase) -{ - MbBase = ChunkBase; - MbSize = 0; -} - - -static PVOID -AllocateMbMemory (ULONG MemSize) -{ - PVOID CurBase; - - CurBase = MbBase; - - MbBase = (PVOID)((ULONG)MbBase + MemSize); - MbSize += MemSize; - - return CurBase; -} - -static VOID -FreeMbMemory (VOID) -{ - MbSize = 0; -} - -static ULONG -GetMbAllocatedSize (VOID) -{ - return MbSize; -} - - -static VOID -CmiCreateDefaultHiveHeader (PHIVE_HEADER Header) -{ - assert(Header); - memset (Header, 0, REG_BLOCK_SIZE); - Header->BlockId = REG_HIVE_ID; - Header->UpdateCounter1 = 0; - Header->UpdateCounter2 = 0; - Header->DateModified = 0; - Header->MajorVersion = 1; - Header->MinorVersion = 3; - Header->Type = 0; - Header->Format = 1; - Header->Unused7 = 1; - Header->RootKeyOffset = -1; - Header->BlockSize = REG_BLOCK_SIZE; - Header->Checksum = 0; -} - - -static VOID -CmiCreateDefaultBinCell (PHBIN BinCell) -{ - assert(BinCell); - memset (BinCell, 0, REG_BLOCK_SIZE); - BinCell->HeaderId = REG_BIN_ID; - BinCell->DateModified = 0ULL; - BinCell->BinSize = REG_BLOCK_SIZE; -} - - -static VOID -CmiCreateDefaultRootKeyCell (PKEY_CELL RootKeyCell, PCWSTR KeyName) -{ - PWCHAR BaseKeyName; - ULONG NameSize; - ULONG CellSize; - ULONG i; - BOOLEAN Packable = TRUE; - - assert (RootKeyCell); - - BaseKeyName = wcsrchr(KeyName, L'\\') + 1; - NameSize = wcslen(BaseKeyName); - for (i = 0; i < NameSize; i++) - { - if (KeyName[i] & 0xFF00) - { - Packable = FALSE; - NameSize *= sizeof(WCHAR); - break; - } - } - - CellSize = ROUND_UP(sizeof(KEY_CELL) + NameSize, 16); - - memset (RootKeyCell, 0, CellSize); - RootKeyCell->CellSize = -CellSize; - RootKeyCell->Id = REG_KEY_CELL_ID; - RootKeyCell->Flags = REG_ROOT_KEY_CELL_TYPE; - RootKeyCell->LastWriteTime = 0ULL; - RootKeyCell->ParentKeyOffset = 0; - RootKeyCell->NumberOfSubKeys = 0; - RootKeyCell->HashTableOffset = -1; - RootKeyCell->NumberOfValues = 0; - RootKeyCell->ValueListOffset = -1; - RootKeyCell->SecurityKeyOffset = 0; - RootKeyCell->ClassNameOffset = -1; - RootKeyCell->NameSize = NameSize; - RootKeyCell->ClassSize = 0; - if (Packable) - { - for(i = 0; i < NameSize; i++) - { - ((PCHAR)RootKeyCell->Name)[i] = BaseKeyName[i]; - } - RootKeyCell->Flags |= REG_KEY_NAME_PACKED; - } - else - { - memcpy (RootKeyCell->Name, BaseKeyName, NameSize); - } -} - - -static PREGISTRY_HIVE -CmiCreateHive (PCWSTR KeyName) -{ - PREGISTRY_HIVE Hive; - PCELL_HEADER FreeCell; - PKEY_CELL RootKeyCell; - PHBIN BinCell; - - Hive = (PREGISTRY_HIVE) MmAllocateMemory (sizeof(REGISTRY_HIVE)); - if (Hive == NULL) - { - return NULL; - } - memset (Hive, 0, sizeof(REGISTRY_HIVE)); - - DbgPrint((DPRINT_REGISTRY, "Hive %x\n", Hive)); - - /* Create hive beader (aka 'base block') */ - Hive->HiveHeader = (PHIVE_HEADER) AllocateMbMemory (REG_BLOCK_SIZE); - if (Hive->HiveHeader == NULL) - { - MmFreeMemory (Hive); - return NULL; - } - CmiCreateDefaultHiveHeader(Hive->HiveHeader); - Hive->FileSize = REG_BLOCK_SIZE; - - /* Allocate block list */ - Hive->BlockListSize = 1; - Hive->BlockList = MmAllocateMemory (sizeof(PHBIN) * Hive->BlockListSize); - if (Hive->BlockList == NULL) - { - MmFreeMemory (Hive); - return NULL; - } - - /* Allocate free cell list */ - Hive->FreeListMax = 32; - Hive->FreeList = MmAllocateMemory(sizeof(PCELL_HEADER) * Hive->FreeListMax); - if (Hive->FreeList == NULL) - { - MmFreeMemory (Hive->BlockList); - MmFreeMemory (Hive); - return NULL; - } - Hive->FreeListOffset = MmAllocateMemory(sizeof(BLOCK_OFFSET) * Hive->FreeListMax); - if (Hive->FreeListOffset == NULL) - { - MmFreeMemory (Hive->FreeList); - MmFreeMemory (Hive->BlockList); - MmFreeMemory (Hive); - return NULL; - } - - /* Allocate first bin */ - Hive->BlockList[0] = (PHBIN) AllocateMbMemory (REG_BLOCK_SIZE); - if (Hive->BlockList[0] == NULL) - { - MmFreeMemory (Hive->FreeListOffset); - MmFreeMemory (Hive->FreeList); - MmFreeMemory (Hive->BlockList); - MmFreeMemory (Hive); - return NULL; - } - Hive->FileSize += REG_BLOCK_SIZE; - - /* Init first bin */ - BinCell = (PHBIN)Hive->BlockList[0]; - CmiCreateDefaultBinCell(BinCell); - BinCell->BinOffset = 0; - - /* Init root key cell */ - RootKeyCell = (PKEY_CELL)((ULONG)BinCell + REG_HBIN_DATA_OFFSET); - CmiCreateDefaultRootKeyCell(RootKeyCell, KeyName); - Hive->HiveHeader->RootKeyOffset = REG_HBIN_DATA_OFFSET; - - /* Init free cell */ - FreeCell = (PCELL_HEADER)((ULONG)RootKeyCell - RootKeyCell->CellSize); - FreeCell->CellSize = REG_BLOCK_SIZE - (REG_HBIN_DATA_OFFSET - RootKeyCell->CellSize); - - Hive->FreeList[0] = FreeCell; - Hive->FreeListOffset[0] = REG_HBIN_DATA_OFFSET - RootKeyCell->CellSize; - Hive->FreeListSize++; - - return Hive; -} - - -static VOID -CmiCleanupHive(PREGISTRY_HIVE Hive, BOOLEAN Release) -{ - MmFreeMemory (Hive->FreeListOffset); - MmFreeMemory (Hive->FreeList); - MmFreeMemory (Hive->BlockList); - MmFreeMemory (Hive); - - if (Release) - { - FreeMbMemory (); - } -} - - -static PHBIN -CmiGetBin (PREGISTRY_HIVE Hive, - BLOCK_OFFSET BlockOffset) -{ - ULONG BlockIndex; - - if (BlockOffset == (ULONG) -1) - return NULL; - - BlockIndex = BlockOffset / REG_BLOCK_SIZE; - if (BlockIndex >= Hive->BlockListSize) - return NULL; - - return Hive->BlockList[BlockIndex]; -} - - -static BOOLEAN -CmiMergeFree(PREGISTRY_HIVE RegistryHive, - PCELL_HEADER FreeBlock, - BLOCK_OFFSET FreeOffset) -{ - BLOCK_OFFSET BlockOffset; - BLOCK_OFFSET BinOffset; - ULONG BlockSize; - ULONG BinSize; - PHBIN Bin; - ULONG i; - - DbgPrint((DPRINT_REGISTRY, "CmiMergeFree(Block %lx Offset %lx Size %lx) called\n", - FreeBlock, FreeOffset, FreeBlock->CellSize)); - - Bin = CmiGetBin (RegistryHive, FreeOffset); - if (Bin == NULL) - return FALSE; - - DbgPrint((DPRINT_REGISTRY, "Bin %p\n", Bin)); - - BinOffset = Bin->BinOffset; - BinSize = Bin->BinSize; - DbgPrint((DPRINT_REGISTRY, "Bin %p Offset %lx Size %lx\n", Bin, BinOffset, BinSize)); - - for (i = 0; i < RegistryHive->FreeListSize; i++) - { - BlockOffset = RegistryHive->FreeListOffset[i]; - BlockSize = RegistryHive->FreeList[i]->CellSize; - if (BlockOffset > BinOffset && - BlockOffset < BinOffset + BinSize) - { - DbgPrint((DPRINT_REGISTRY, "Free block: Offset %lx Size %lx\n", - BlockOffset, BlockSize)); - - if ((i < (RegistryHive->FreeListSize - 1)) && - (BlockOffset + BlockSize == FreeOffset) && - (FreeOffset + FreeBlock->CellSize == RegistryHive->FreeListOffset[i + 1])) - { - DbgPrint((DPRINT_REGISTRY, "Merge current block with previous and next block\n")); - - RegistryHive->FreeList[i]->CellSize += - (FreeBlock->CellSize + RegistryHive->FreeList[i + 1]->CellSize); - - FreeBlock->CellSize = 0; - RegistryHive->FreeList[i + 1]->CellSize = 0; - - - if ((i + 2) < RegistryHive->FreeListSize) - { - memmove (&RegistryHive->FreeList[i + 1], - &RegistryHive->FreeList[i + 2], - sizeof(RegistryHive->FreeList[0]) - * (RegistryHive->FreeListSize - i - 2)); - memmove (&RegistryHive->FreeListOffset[i + 1], - &RegistryHive->FreeListOffset[i + 2], - sizeof(RegistryHive->FreeListOffset[0]) - * (RegistryHive->FreeListSize - i - 2)); - } - RegistryHive->FreeListSize--; - - return TRUE; - } - else if (BlockOffset + BlockSize == FreeOffset) - { - DbgPrint((DPRINT_REGISTRY, "Merge current block with previous block\n")); - - RegistryHive->FreeList[i]->CellSize += FreeBlock->CellSize; - FreeBlock->CellSize = 0; - - return TRUE; - } - else if (FreeOffset + FreeBlock->CellSize == BlockOffset) - { - DbgPrint((DPRINT_REGISTRY, "Merge current block with next block\n")); - - FreeBlock->CellSize += RegistryHive->FreeList[i]->CellSize; - RegistryHive->FreeList[i]->CellSize = 0; - RegistryHive->FreeList[i] = FreeBlock; - RegistryHive->FreeListOffset[i] = FreeOffset; - - return TRUE; - } - } - } - - return FALSE; -} - - -static BOOLEAN -CmiAddFree(PREGISTRY_HIVE RegistryHive, - PCELL_HEADER FreeBlock, - BLOCK_OFFSET FreeOffset, - BOOLEAN MergeFreeBlocks) -{ - PCELL_HEADER *tmpList; - BLOCK_OFFSET *tmpListOffset; - LONG minInd; - LONG maxInd; - LONG medInd; - - assert(RegistryHive); - assert(FreeBlock); - - DbgPrint((DPRINT_REGISTRY, "FreeBlock %.08lx FreeOffset %.08lx\n", - FreeBlock, FreeOffset)); - - /* Merge free blocks */ - if (MergeFreeBlocks == TRUE) - { - if (CmiMergeFree(RegistryHive, FreeBlock, FreeOffset)) - return TRUE; - } - - if ((RegistryHive->FreeListSize + 1) > RegistryHive->FreeListMax) - { - tmpList = MmAllocateMemory (sizeof(PCELL_HEADER) * (RegistryHive->FreeListMax + 32)); - if (tmpList == NULL) - { - return FALSE; - } - - tmpListOffset = MmAllocateMemory (sizeof(BLOCK_OFFSET) * (RegistryHive->FreeListMax + 32)); - if (tmpListOffset == NULL) - { - MmFreeMemory (tmpList); - return FALSE; - } - - if (RegistryHive->FreeListMax) - { - memmove (tmpList, - RegistryHive->FreeList, - sizeof(PCELL_HEADER) * (RegistryHive->FreeListMax)); - memmove (tmpListOffset, - RegistryHive->FreeListOffset, - sizeof(BLOCK_OFFSET) * (RegistryHive->FreeListMax)); - MmFreeMemory (RegistryHive->FreeList); - MmFreeMemory (RegistryHive->FreeListOffset); - } - RegistryHive->FreeList = tmpList; - RegistryHive->FreeListOffset = tmpListOffset; - RegistryHive->FreeListMax += 32; - } - - /* Add new offset to free list, maintaining list in ascending order */ - if ((RegistryHive->FreeListSize == 0) - || (RegistryHive->FreeListOffset[RegistryHive->FreeListSize-1] < FreeOffset)) - { - /* Add to end of list */ - RegistryHive->FreeList[RegistryHive->FreeListSize] = FreeBlock; - RegistryHive->FreeListOffset[RegistryHive->FreeListSize++] = FreeOffset; - } - else if (RegistryHive->FreeListOffset[0] > FreeOffset) - { - /* Add to begin of list */ - memmove (&RegistryHive->FreeList[1], - &RegistryHive->FreeList[0], - sizeof(RegistryHive->FreeList[0]) * RegistryHive->FreeListSize); - memmove (&RegistryHive->FreeListOffset[1], - &RegistryHive->FreeListOffset[0], - sizeof(RegistryHive->FreeListOffset[0]) * RegistryHive->FreeListSize); - RegistryHive->FreeList[0] = FreeBlock; - RegistryHive->FreeListOffset[0] = FreeOffset; - RegistryHive->FreeListSize++; - } - else - { - /* Search where to insert */ - minInd = 0; - maxInd = RegistryHive->FreeListSize - 1; - while ((maxInd - minInd) > 1) - { - medInd = (minInd + maxInd) / 2; - if (RegistryHive->FreeListOffset[medInd] > FreeOffset) - maxInd = medInd; - else - minInd = medInd; - } - - /* Insert before maxInd */ - memmove (&RegistryHive->FreeList[maxInd+1], - &RegistryHive->FreeList[maxInd], - sizeof(RegistryHive->FreeList[0]) * (RegistryHive->FreeListSize - minInd)); - memmove (&RegistryHive->FreeListOffset[maxInd + 1], - &RegistryHive->FreeListOffset[maxInd], - sizeof(RegistryHive->FreeListOffset[0]) * (RegistryHive->FreeListSize-minInd)); - RegistryHive->FreeList[maxInd] = FreeBlock; - RegistryHive->FreeListOffset[maxInd] = FreeOffset; - RegistryHive->FreeListSize++; - } - - return TRUE; -} - - -static BOOLEAN -CmiAddBin(PREGISTRY_HIVE RegistryHive, - ULONG BlockCount, - PVOID *NewBlock, - PBLOCK_OFFSET NewBlockOffset) -{ - PCELL_HEADER tmpBlock; - PHBIN *BlockList; - PHBIN tmpBin; - ULONG BinSize; - ULONG i; - - BinSize = BlockCount * REG_BLOCK_SIZE; - tmpBin = AllocateMbMemory (BinSize); - if (tmpBin == NULL) - { - return FALSE; - } - memset (tmpBin, 0, BinSize); - - tmpBin->HeaderId = REG_BIN_ID; - tmpBin->BinOffset = RegistryHive->FileSize - REG_BLOCK_SIZE; - RegistryHive->FileSize += BinSize; - tmpBin->BinSize = BinSize; - tmpBin->DateModified = 0ULL; - tmpBin->MemAlloc = 0; - - /* Increase size of list of blocks */ - BlockList = MmAllocateMemory (sizeof(PHBIN) * (RegistryHive->BlockListSize + BlockCount)); - if (BlockList == NULL) - { - return FALSE; - } - - if (RegistryHive->BlockListSize > 0) - { - memcpy (BlockList, - RegistryHive->BlockList, - sizeof(PHBIN) * RegistryHive->BlockListSize); - MmFreeMemory (RegistryHive->BlockList); - } - - RegistryHive->BlockList = BlockList; - for (i = 0; i < BlockCount; i++) - RegistryHive->BlockList[RegistryHive->BlockListSize + i] = tmpBin; - RegistryHive->BlockListSize += BlockCount; - - /* Initialize a free block in this heap : */ - tmpBlock = (PCELL_HEADER)((ULONG) tmpBin + REG_HBIN_DATA_OFFSET); - tmpBlock->CellSize = (REG_BLOCK_SIZE - REG_HBIN_DATA_OFFSET); - - *NewBlock = (PVOID) tmpBlock; - - if (NewBlockOffset) - *NewBlockOffset = tmpBin->BinOffset + REG_HBIN_DATA_OFFSET; - - return TRUE; -} - - -static BOOLEAN -CmiAllocateCell (PREGISTRY_HIVE RegistryHive, - LONG CellSize, - PVOID *Block, - PBLOCK_OFFSET pBlockOffset) -{ - PCELL_HEADER NewBlock; - ULONG i; - - *Block = NULL; - - /* Round to 16 bytes multiple */ - CellSize = ROUND_UP(CellSize, 16); - - /* first search in free blocks */ - NewBlock = NULL; - for (i = 0; i < RegistryHive->FreeListSize; i++) - { - if (RegistryHive->FreeList[i]->CellSize >= CellSize) - { - NewBlock = RegistryHive->FreeList[i]; - if (pBlockOffset) - *pBlockOffset = RegistryHive->FreeListOffset[i]; - - if ((i + 1) < RegistryHive->FreeListSize) - { - memmove (&RegistryHive->FreeList[i], - &RegistryHive->FreeList[i + 1], - sizeof(RegistryHive->FreeList[0]) - * (RegistryHive->FreeListSize - i - 1)); - memmove (&RegistryHive->FreeListOffset[i], - &RegistryHive->FreeListOffset[i + 1], - sizeof(RegistryHive->FreeListOffset[0]) - * (RegistryHive->FreeListSize - i - 1)); - } - RegistryHive->FreeListSize--; - break; - } - } - - /* Need to extend hive file */ - if (NewBlock == NULL) - { - /* Add a new block */ - if (!CmiAddBin(RegistryHive, - ((sizeof(HBIN) + CellSize - 1) / REG_BLOCK_SIZE) + 1, - (PVOID *)(PVOID)&NewBlock, - pBlockOffset)) - return FALSE; - } - - *Block = NewBlock; - - /* Split the block in two parts */ - if (NewBlock->CellSize > CellSize) - { - NewBlock = (PCELL_HEADER) ((ULONG)NewBlock + CellSize); - NewBlock->CellSize = ((PCELL_HEADER) (*Block))->CellSize - CellSize; - CmiAddFree (RegistryHive, - NewBlock, - *pBlockOffset + CellSize, - TRUE); - } - else if (NewBlock->CellSize < CellSize) - { - return FALSE; - } - - memset(*Block, 0, CellSize); - ((PCELL_HEADER)(*Block))->CellSize = -CellSize; - - return TRUE; -} - - -static PVOID -CmiGetCell (PREGISTRY_HIVE Hive, - BLOCK_OFFSET BlockOffset) -{ - PHBIN Bin; - ULONG BlockIndex; - - if (BlockOffset == (ULONG) -1) - return NULL; - - BlockIndex = BlockOffset / REG_BLOCK_SIZE; - if (BlockIndex >= Hive->BlockListSize) - return NULL; - - Bin = Hive->BlockList[BlockIndex]; - if (Bin == NULL) - return NULL; - - return (PVOID)((ULONG)Bin + (BlockOffset - Bin->BinOffset)); +CmpFree (PVOID Ptr) +{ + return MmFreeMemory(Ptr); } static BOOLEAN CmiAllocateHashTableCell (PREGISTRY_HIVE Hive, - PBLOCK_OFFSET HBOffset, + PHCELL_INDEX HBOffset, ULONG SubKeyCount) { PHASH_TABLE_CELL HashCell; ULONG NewHashSize; - BOOLEAN Status; NewHashSize = sizeof(HASH_TABLE_CELL) + (SubKeyCount * sizeof(HASH_RECORD)); - Status = CmiAllocateCell (Hive, - NewHashSize, - (PVOID*)(PVOID)&HashCell, - HBOffset); - if ((HashCell == NULL) || (Status == FALSE)) - { - return FALSE; - } - - HashCell->Id = REG_HASH_TABLE_BLOCK_ID; + *HBOffset = HvAllocateCell (Hive, NewHashSize, HvStable); + if (*HBOffset == HCELL_NULL) + { + return FALSE; + } + + HashCell = HvGetCell (Hive, *HBOffset); + HashCell->Id = REG_HASH_TABLE_CELL_ID; HashCell->HashTableSize = SubKeyCount; return TRUE; @@ -877,27 +67,16 @@ static BOOLEAN CmiAddKeyToParentHashTable (PREGISTRY_HIVE Hive, - BLOCK_OFFSET ParentKeyOffset, + HCELL_INDEX ParentKeyOffset, PKEY_CELL NewKeyCell, - BLOCK_OFFSET NKBOffset) + HCELL_INDEX NKBOffset) { PHASH_TABLE_CELL HashBlock; PKEY_CELL ParentKeyCell; ULONG i; - ParentKeyCell = CmiGetCell (Hive, ParentKeyOffset); - if (ParentKeyCell == NULL) - { - DbgPrint((DPRINT_REGISTRY, "CmiGetCell() failed\n")); - return FALSE; - } - - HashBlock =CmiGetCell (Hive, ParentKeyCell->HashTableOffset); - if (HashBlock == NULL) - { - DbgPrint((DPRINT_REGISTRY, "CmiGetCell() failed\n")); - return FALSE; - } + ParentKeyCell = HvGetCell (Hive, ParentKeyOffset); + HashBlock = HvGetCell (Hive, ParentKeyCell->HashTableOffset[HvStable]); for (i = 0; i < HashBlock->HashTableSize; i++) { @@ -907,7 +86,7 @@ memcpy (&HashBlock->Table[i].HashValue, NewKeyCell->Name, min(NewKeyCell->NameSize, sizeof(ULONG))); - ParentKeyCell->NumberOfSubKeys++; + ParentKeyCell->NumberOfSubKeys[HvStable]++; return TRUE; } } @@ -918,22 +97,17 @@ static BOOLEAN CmiAllocateValueListCell (PREGISTRY_HIVE Hive, - PBLOCK_OFFSET ValueListOffset, + PHCELL_INDEX ValueListOffset, ULONG ValueCount) { - PVALUE_LIST_CELL ValueListCell; ULONG ValueListSize; - BOOLEAN Status; ValueListSize = sizeof(VALUE_LIST_CELL) + - (ValueCount * sizeof(BLOCK_OFFSET)); - Status = CmiAllocateCell (Hive, - ValueListSize, - (PVOID)&ValueListCell, - ValueListOffset); - if ((ValueListCell == NULL) || (Status == FALSE)) - { - DbgPrint((DPRINT_REGISTRY, "CmiAllocateCell() failed\n")); + (ValueCount * sizeof(HCELL_INDEX)); + *ValueListOffset = HvAllocateCell (Hive, ValueListSize, HvStable); + if (*ValueListOffset == HCELL_NULL) + { + DbgPrint((DPRINT_REGISTRY, "HvAllocateCell() failed\n")); return FALSE; } @@ -944,12 +118,11 @@ static BOOLEAN CmiAllocateValueCell(PREGISTRY_HIVE Hive, PVALUE_CELL *ValueCell, - BLOCK_OFFSET *ValueCellOffset, + HCELL_INDEX *ValueCellOffset, PWCHAR ValueName) { PVALUE_CELL NewValueCell; ULONG NameSize; - BOOLEAN Status; BOOLEAN Packable = TRUE; ULONG i; @@ -963,16 +136,14 @@ break; } } - Status = CmiAllocateCell (Hive, - sizeof(VALUE_CELL) + NameSize, - (PVOID*)(PVOID)&NewValueCell, - ValueCellOffset); - if ((NewValueCell == NULL) || (Status == FALSE)) + *ValueCellOffset = HvAllocateCell (Hive, sizeof(VALUE_CELL) + NameSize, HvStable); + if (*ValueCellOffset == HCELL_NULL) { DbgPrint((DPRINT_REGISTRY, "CmiAllocateCell() failed\n")); return FALSE; } + NewValueCell = (PVALUE_CELL) HvGetCell (Hive, *ValueCellOffset); NewValueCell->Id = REG_VALUE_CELL_ID; NewValueCell->NameSize = NameSize; NewValueCell->Flags = 0; @@ -1005,23 +176,23 @@ static BOOLEAN CmiAddValueToKeyValueList(PREGISTRY_HIVE Hive, - BLOCK_OFFSET KeyCellOffset, - BLOCK_OFFSET ValueCellOffset) + HCELL_INDEX KeyCellOffset, + HCELL_INDEX ValueCellOffset) { PVALUE_LIST_CELL ValueListCell; PKEY_CELL KeyCell; - KeyCell = CmiGetCell (Hive, KeyCellOffset); + KeyCell = HvGetCell (Hive, KeyCellOffset); if (KeyCell == NULL) { - DbgPrint((DPRINT_REGISTRY, "CmiGetCell() failed\n")); - return FALSE; - } - - ValueListCell = CmiGetCell (Hive, KeyCell->ValueListOffset); + DbgPrint((DPRINT_REGISTRY, "HvGetCell() failed\n")); + return FALSE; + } + + ValueListCell = HvGetCell (Hive, KeyCell->ValueListOffset); if (ValueListCell == NULL) { - DbgPrint((DPRINT_REGISTRY, "CmiGetCell() failed\n")); + DbgPrint((DPRINT_REGISTRY, "HvGetCell() failed\n")); return FALSE; } @@ -1033,14 +204,14 @@ static BOOLEAN CmiExportValue (PREGISTRY_HIVE Hive, - BLOCK_OFFSET KeyCellOffset, + HCELL_INDEX KeyCellOffset, FRLDRHKEY Key, PVALUE Value) { - BLOCK_OFFSET ValueCellOffset; - BLOCK_OFFSET DataCellOffset; + HCELL_INDEX ValueCellOffset; + HCELL_INDEX DataCellOffset; PVALUE_CELL ValueCell; - PDATA_CELL DataCell; + PVOID DataCell; ULONG DataSize; ULONG DataType; PCHAR Data; @@ -1074,7 +245,7 @@ Data = Value->Data; } - if (DataSize <= sizeof(BLOCK_OFFSET)) + if (DataSize <= sizeof(HCELL_INDEX)) { ValueCell->DataSize = DataSize | REG_DATA_IN_OFFSET; ValueCell->DataType = DataType; @@ -1085,10 +256,8 @@ else { /* Allocate data cell */ - if (!CmiAllocateCell (Hive, - sizeof(CELL_HEADER) + DataSize, - (PVOID *)(PVOID)&DataCell, - &DataCellOffset)) + DataCellOffset = HvAllocateCell (Hive, DataSize, HvStable); + if (DataCellOffset == HCELL_NULL) { return FALSE; } @@ -1097,7 +266,8 @@ ValueCell->DataSize = DataSize; ValueCell->DataType = DataType; - memcpy (DataCell->Data, + DataCell = HvGetCell (Hive, DataCellOffset); + memcpy (DataCell, Data, DataSize); } @@ -1108,11 +278,11 @@ static BOOLEAN CmiExportSubKey (PREGISTRY_HIVE Hive, - BLOCK_OFFSET ParentKeyOffset, + HCELL_INDEX ParentKeyOffset, FRLDRHKEY ParentKey, FRLDRHKEY Key) { - BLOCK_OFFSET NKBOffset; + HCELL_INDEX NKBOffset; PKEY_CELL NewKeyCell; ULONG KeyCellSize; ULONG SubKeyCount; @@ -1143,19 +313,21 @@ /* Allocate key cell */ KeyCellSize = sizeof(KEY_CELL) + NameSize; - if (!CmiAllocateCell (Hive, KeyCellSize, (PVOID)&NewKeyCell, &NKBOffset)) - { - DbgPrint((DPRINT_REGISTRY, "CmiAllocateCell() failed\n")); + NKBOffset = HvAllocateCell (Hive, KeyCellSize, HvStable); + if (NKBOffset == HCELL_NULL) + { + DbgPrint((DPRINT_REGISTRY, "HvAllocateCell() failed\n")); return FALSE; } /* Initialize key cell */ + NewKeyCell = (PKEY_CELL) HvGetCell (Hive, NKBOffset); NewKeyCell->Id = REG_KEY_CELL_ID; NewKeyCell->Flags = 0; - NewKeyCell->LastWriteTime = 0ULL; + NewKeyCell->LastWriteTime.QuadPart = 0ULL; NewKeyCell->ParentKeyOffset = ParentKeyOffset; - NewKeyCell->NumberOfSubKeys = 0; - NewKeyCell->HashTableOffset = -1; + NewKeyCell->NumberOfSubKeys[HvStable] = 0; + NewKeyCell->HashTableOffset[HvStable] = -1; NewKeyCell->NumberOfValues = 0; NewKeyCell->ValueListOffset = -1; NewKeyCell->SecurityKeyOffset = -1; @@ -1228,7 +400,7 @@ { /* Allocate hash table cell */ if (!CmiAllocateHashTableCell (Hive, - &NewKeyCell->HashTableOffset, + &NewKeyCell->HashTableOffset[HvStable], SubKeyCount)) { DbgPrint((DPRINT_REGISTRY, "CmiAllocateHashTableCell() failed\n")); @@ -1251,22 +423,6 @@ } return TRUE; -} - - -static VOID -CmiCalcHiveChecksum (PREGISTRY_HIVE Hive) -{ - ULONG *Buffer; - ULONG Sum; - ULONG i; - - Buffer = (ULONG*)Hive->HiveHeader; - Sum = 0; - for (i = 0; i < 127; i++) - Sum += Buffer[i]; - - Hive->HiveHeader->Checksum = Sum; } @@ -1290,10 +446,10 @@ return FALSE; } - KeyCell = CmiGetCell (Hive, Hive->HiveHeader->RootKeyOffset); + KeyCell = HvGetCell (Hive, Hive->HiveHeader->RootCell); if (KeyCell == NULL) { - DbgPrint((DPRINT_REGISTRY, "CmiGetBlock() failed\n")); + DbgPrint((DPRINT_REGISTRY, "HvGetCell() failed\n")); return FALSE; } @@ -1312,7 +468,7 @@ if (Key->DataSize != 0) { - if (!CmiExportValue (Hive, Hive->HiveHeader->RootKeyOffset, Key, NULL)) + if (!CmiExportValue (Hive, Hive->HiveHeader->RootCell, Key, NULL)) return FALSE; } @@ -1324,7 +480,7 @@ VALUE, ValueList); - if (!CmiExportValue (Hive, Hive->HiveHeader->RootKeyOffset, Key, Value)) + if (!CmiExportValue (Hive, Hive->HiveHeader->RootCell, Key, Value)) return FALSE; Entry = Entry->Flink; @@ -1337,7 +493,7 @@ { /* Allocate hash table cell */ if (!CmiAllocateHashTableCell (Hive, - &KeyCell->HashTableOffset, + &KeyCell->HashTableOffset[HvStable], SubKeyCount)) { DbgPrint((DPRINT_REGISTRY, "CmiAllocateHashTableCell() failed\n")); @@ -1352,31 +508,29 @@ KEY, KeyList); - if (!CmiExportSubKey (Hive, Hive->HiveHeader->RootKeyOffset, Key, SubKey)) + if (!CmiExportSubKey (Hive, Hive->HiveHeader->RootCell, Key, SubKey)) return FALSE; Entry = Entry->Flink; } } - CmiCalcHiveChecksum (Hive); - - return TRUE; -} - - -static BOOLEAN -RegImportValue (PHBIN RootBin, + return TRUE; +} + + +static BOOLEAN +RegImportValue (PREGISTRY_HIVE Hive, PVALUE_CELL ValueCell, FRLDRHKEY Key) { - PDATA_CELL DataCell; + PVOID DataCell; PWCHAR wName; LONG Error; ULONG DataSize; ULONG i; - if (ValueCell->CellSize >= 0 || ValueCell->Id != REG_VALUE_CELL_ID) + if (ValueCell->Id != REG_VALUE_CELL_ID) { DbgPrint((DPRINT_REGISTRY, "Invalid key cell!\n")); return FALSE; @@ -1405,7 +559,7 @@ DbgPrint((DPRINT_REGISTRY, "ValueName: '%S'\n", wName)); DbgPrint((DPRINT_REGISTRY, "DataSize: %u\n", DataSize)); - if (DataSize <= sizeof(BLOCK_OFFSET) && (ValueCell->DataSize & REG_DATA_IN_OFFSET)) + if (DataSize <= sizeof(HCELL_INDEX) && (ValueCell->DataSize & REG_DATA_IN_OFFSET)) { Error = RegSetValue(Key, wName, @@ -1421,20 +575,13 @@ } else { - DataCell = (PDATA_CELL)((PUCHAR)RootBin + ValueCell->DataOffset); + DataCell = HvGetCell (Hive, ValueCell->DataOffset); DbgPrint((DPRINT_REGISTRY, "DataCell: %x\n", DataCell)); - - if (DataCell->CellSize >= 0) - { - DbgPrint((DPRINT_REGISTRY, "Invalid data cell size!\n")); - MmFreeMemory (wName); - return FALSE; - } Error = RegSetValue (Key, wName, ValueCell->DataType, - DataCell->Data, + DataCell, DataSize); if (Error != ERROR_SUCCESS) @@ -1452,7 +599,7 @@ static BOOLEAN -RegImportSubKey(PHBIN RootBin, +RegImportSubKey(PREGISTRY_HIVE Hive, PKEY_CELL KeyCell, FRLDRHKEY ParentKey) { @@ -1467,9 +614,8 @@ DbgPrint((DPRINT_REGISTRY, "KeyCell: %x\n", KeyCell)); - DbgPrint((DPRINT_REGISTRY, "KeyCell->CellSize: %x\n", KeyCell->CellSize)); DbgPrint((DPRINT_REGISTRY, "KeyCell->Id: %x\n", KeyCell->Id)); - if (KeyCell->Id != REG_KEY_CELL_ID || KeyCell->CellSize >= 0) + if (KeyCell->Id != REG_KEY_CELL_ID) { DbgPrint((DPRINT_REGISTRY, "Invalid key cell id!\n")); return FALSE; @@ -1511,37 +657,38 @@ /* Enumerate and add values */ if (KeyCell->NumberOfValues > 0) { - ValueListCell = (PVALUE_LIST_CELL)((PUCHAR)RootBin + KeyCell->ValueListOffset); + ValueListCell = (PVALUE_LIST_CELL) HvGetCell (Hive, KeyCell->ValueListOffset); DbgPrint((DPRINT_REGISTRY, "ValueListCell: %x\n", ValueListCell)); for (i = 0; i < KeyCell->NumberOfValues; i++) { DbgPrint((DPRINT_REGISTRY, "ValueOffset[%d]: %x\n", i, ValueListCell->ValueOffset[i])); - ValueCell = (PVALUE_CELL)((PUCHAR)RootBin + ValueListCell->ValueOffset[i]); + ValueCell = (PVALUE_CELL) HvGetCell (Hive, ValueListCell->ValueOffset[i]); DbgPrint((DPRINT_REGISTRY, "ValueCell[%d]: %x\n", i, ValueCell)); - if (!RegImportValue(RootBin, ValueCell, SubKey)) + if (!RegImportValue(Hive, ValueCell, SubKey)) return FALSE; } } /* Enumerate and add subkeys */ - if (KeyCell->NumberOfSubKeys > 0) - { - HashCell = (PHASH_TABLE_CELL)((PUCHAR)RootBin + KeyCell->HashTableOffset); + if (KeyCell->NumberOfSubKeys[HvStable] > 0) + { + HashCell = (PHASH_TABLE_CELL) HvGetCell (Hive, KeyCell->HashTableOffset[HvStable]); DbgPrint((DPRINT_REGISTRY, "HashCell: %x\n", HashCell)); - - for (i = 0; i < KeyCell->NumberOfSubKeys; i++) + DbgPrint((DPRINT_REGISTRY, "NumberOfSubKeys: %x\n", KeyCell->NumberOfSubKeys)); + + for (i = 0; i < KeyCell->NumberOfSubKeys[HvStable]; i++) { DbgPrint((DPRINT_REGISTRY, "KeyOffset[%d]: %x\n", i, HashCell->Table[i].KeyOffset)); - SubKeyCell = (PKEY_CELL)((PUCHAR)RootBin + HashCell->Table[i].KeyOffset); + SubKeyCell = (PKEY_CELL) HvGetCell (Hive, HashCell->Table[i].KeyOffset); DbgPrint((DPRINT_REGISTRY, "SubKeyCell[%d]: %x\n", i, SubKeyCell)); - if (!RegImportSubKey(RootBin, SubKeyCell, SubKey)) + if (!RegImportSubKey(Hive, SubKeyCell, SubKey)) return FALSE; } } @@ -1554,38 +701,31 @@ RegImportBinaryHive(PCHAR ChunkBase, ULONG ChunkSize) { - PHIVE_HEADER HiveHeader; - PHBIN RootBin; PKEY_CELL KeyCell; PHASH_TABLE_CELL HashCell; PKEY_CELL SubKeyCell; FRLDRHKEY SystemKey; ULONG i; LONG Error; + PREGISTRY_HIVE Hive; + NTSTATUS Status; DbgPrint((DPRINT_REGISTRY, "RegImportBinaryHive(%x, %u) called\n",ChunkBase,ChunkSize)); - HiveHeader = (PHIVE_HEADER)ChunkBase; - DbgPrint((DPRINT_REGISTRY, "HiveHeader: %x\n", HiveHeader)); - if (HiveHeader->BlockId != REG_HIVE_ID) + Status = HvInitialize (&Hive, HV_OPERATION_MEMORY_INPLACE, + (ULONG_PTR)ChunkBase, ChunkSize, + CmpAllocate, CmpFree, + NULL, NULL, NULL, NULL, NULL); + if (!NT_SUCCESS(Status)) { DbgPrint((DPRINT_REGISTRY, "Invalid hive id!\n")); return FALSE; } - RootBin = (PHBIN)((ULONG)HiveHeader + REG_BLOCK_SIZE); - DbgPrint((DPRINT_REGISTRY, "RootBin: %x\n", RootBin)); - if (RootBin->HeaderId != REG_BIN_ID || RootBin->BinSize == 0) - { - DbgPrint((DPRINT_REGISTRY, "Invalid bin id!\n")); - return FALSE; - } - - KeyCell = (PKEY_CELL)((ULONG)RootBin + REG_HBIN_DATA_OFFSET); + KeyCell = HvGetCell (Hive, Hive->HiveHeader->RootCell); DbgPrint((DPRINT_REGISTRY, "KeyCell: %x\n", KeyCell)); - DbgPrint((DPRINT_REGISTRY, "KeyCell->CellSize: %x\n", KeyCell->CellSize)); DbgPrint((DPRINT_REGISTRY, "KeyCell->Id: %x\n", KeyCell->Id)); - if (KeyCell->Id != REG_KEY_CELL_ID || KeyCell->CellSize >= 0) + if (KeyCell->Id != REG_KEY_CELL_ID) { DbgPrint((DPRINT_REGISTRY, "Invalid key cell id!\n")); return FALSE; @@ -1605,25 +745,56 @@ } /* Enumerate and add subkeys */ - if (KeyCell->NumberOfSubKeys > 0) - { - HashCell = (PHASH_TABLE_CELL)((ULONG)RootBin + KeyCell->HashTableOffset); + if (KeyCell->NumberOfSubKeys[HvStable] > 0) + { + HashCell = HvGetCell (Hive, KeyCell->HashTableOffset[HvStable]); DbgPrint((DPRINT_REGISTRY, "HashCell: %x\n", HashCell)); - - for (i = 0; i < KeyCell->NumberOfSubKeys; i++) + DbgPrint((DPRINT_REGISTRY, "NumberOfSubKeys: %x\n", KeyCell->NumberOfSubKeys[HvStable])); + + for (i = 0; i < KeyCell->NumberOfSubKeys[HvStable]; i++) { DbgPrint((DPRINT_REGISTRY, "KeyOffset[%d]: %x\n", i, HashCell->Table[i].KeyOffset)); - SubKeyCell = (PKEY_CELL)((ULONG)RootBin + HashCell->Table[i].KeyOffset); + SubKeyCell = HvGetCell (Hive, HashCell->Table[i].KeyOffset); DbgPrint((DPRINT_REGISTRY, "SubKeyCell[%d]: %x\n", i, SubKeyCell)); - if (!RegImportSubKey(RootBin, SubKeyCell, SystemKey)) + if (!RegImportSubKey(Hive, SubKeyCell, SystemKey)) return FALSE; } } return TRUE; +} + + +static VOID +CmiWriteHive(PREGISTRY_HIVE Hive, + PCHAR ChunkBase, + ULONG* ChunkSize) +{ + PHBIN Bin; + ULONG i, Size; + + /* Write hive header */ + memcpy (ChunkBase, Hive->HiveHeader, HV_BLOCK_SIZE); + Size = HV_BLOCK_SIZE; + + Bin = NULL; + for (i = 0; i < Hive->Storage[HvStable].BlockListSize; i++) + { + if (Hive->Storage[HvStable].BlockList[i].Bin != Bin) + { + Bin = Hive->Storage[HvStable].BlockList[i].Bin; + memcpy (ChunkBase + (i + 1) * HV_BLOCK_SIZE, + Bin, Bin->BinSize); + Size += Bin->BinSize; + } + } + + DbgPrint((DPRINT_REGISTRY, "ChunkSize: %x\n", Size)); + + *ChunkSize = Size; } @@ -1633,25 +804,34 @@ ULONG* ChunkSize) { PREGISTRY_HIVE Hive; + NTSTATUS Status; DbgPrint((DPRINT_REGISTRY, "Creating binary hardware hive\n")); - *ChunkSize = 0; - InitMbMemory (ChunkBase); - - Hive = CmiCreateHive (KeyName); - if (Hive == NULL) - return FALSE; + Status = HvInitialize (&Hive, HV_OPERATION_CREATE_HIVE, 0, 0, + CmpAllocate, CmpFree, + NULL, NULL, NULL, NULL, NULL); + if (!NT_SUCCESS(Status)) + { + return FALSE; + } + + /* Init root key cell */ + if (!CmCreateRootNode (Hive, KeyName)) + { + HvFree (Hive); + return FALSE; + } if (!CmiExportHive (Hive, KeyName)) { - CmiCleanupHive (Hive, TRUE); - return FALSE; - } - - CmiCleanupHive (Hive, FALSE); - - *ChunkSize = GetMbAllocatedSize (); + HvFree (Hive); + return FALSE; + } + + CmiWriteHive (Hive, ChunkBase, ChunkSize); + + HvFree (Hive); return TRUE; } Modified: trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/setup… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild (original) +++ trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild Sat Jul 29 00:25:47 2006 @@ -7,5 +7,6 @@ <library>setupldr_main</library> <library>rossym</library> <library>string</library> + <library>cmlib</library> <library>rtl</library> </module> Modified: trunk/reactos/lib/lib.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/lib.mak?rev=23332&r1=2… ============================================================================== --- trunk/reactos/lib/lib.mak (original) +++ trunk/reactos/lib/lib.mak Sat Jul 29 00:25:47 2006 @@ -3,3 +3,4 @@ include lib/inflib/inflib.mak include lib/3rdparty/zlib/zlib.mak +include lib/cmlib/cmlib.mak Propchange: trunk/reactos/lib/lib.mak ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/lib/lib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/lib.rbuild?rev=23332&r… ============================================================================== --- trunk/reactos/lib/lib.rbuild (original) +++ trunk/reactos/lib/lib.rbuild Sat Jul 29 00:25:47 2006 @@ -3,6 +3,9 @@ <group> <directory name="3rdparty"> <xi:include href="3rdparty/3rdparty.rbuild" /> +</directory> +<directory name="cmlib"> + <xi:include href="cmlib/cmlib.rbuild" /> </directory> <directory name="crt"> <xi:include href="crt/crt.rbuild" /> Modified: trunk/reactos/ntoskrnl/cm/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/cm.h?rev=23332… ============================================================================== --- trunk/reactos/ntoskrnl/cm/cm.h (original) +++ trunk/reactos/ntoskrnl/cm/cm.h Sat Jul 29 00:25:47 2006 @@ -94,7 +94,7 @@ ULONG Unused7; /* Name of hive file */ - WCHAR FileName[48]; + WCHAR FileName[32]; ULONG Reserved[99]; Modified: trunk/reactos/ntoskrnl/cm/regfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regfile.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regfile.c (original) +++ trunk/reactos/ntoskrnl/cm/regfile.c Sat Jul 29 00:25:47 2006 @@ -1360,7 +1360,11 @@ ULONG i; for (i = 0; i < 127; i++) - Sum += Buffer[i]; + Sum ^= Buffer[i]; + if (Sum == (ULONG)-1) + Sum = (ULONG)-2; + if (Sum == 0) + Sum = 1; return(Sum); } Modified: trunk/reactos/tools/mkhive/binhive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/binhive.c?rev… ============================================================================== --- trunk/reactos/tools/mkhive/binhive.c (original) +++ trunk/reactos/tools/mkhive/binhive.c Sat Jul 29 00:25:47 2006 @@ -107,7 +107,7 @@ ULONG Unused7; /* Name of hive file */ - WCHAR FileName[48]; + WCHAR FileName[32]; ULONG Reserved[99]; @@ -1248,7 +1248,11 @@ Buffer = (PULONG)Hive->HiveHeader; Sum = 0; for (i = 0; i < 127; i++) - Sum += Buffer[i]; + Sum ^= Buffer[i]; + if (Sum == (ULONG)-1) + Sum = (ULONG)-2; + if (Sum == 0) + Sum = 1; Hive->HiveHeader->Checksum = Sum; }

1 0

[greatlrd] 23331: patch from LMH1 : Bug#: 1684 : Norwegian translation
by greatlrd＠svn.reactos.org 28 Jul '06

28 Jul '06

Author: greatlrd Date: Sat Jul 29 00:03:29 2006 New Revision: 23331 URL: http://svn.reactos.org/svn/reactos?rev=23331&view=rev Log: patch from LMH1 : Bug#: 1684 : Norwegian translation Added: trunk/reactos/base/system/format/No.rc (with props) Modified: trunk/reactos/base/system/format/format.rc Added: trunk/reactos/base/system/format/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/No.rc?r… ============================================================================== --- trunk/reactos/base/system/format/No.rc (added) +++ trunk/reactos/base/system/format/No.rc Sat Jul 29 00:03:29 2006 @@ -1,0 +1,72 @@ +#include "resource.h" +/* + * Moved all hardcoded strings to En.rc. + * By Magnus Olsen 2005 + */ + +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL +STRINGTABLE DISCARDABLE +{ +STRING_HELP, "bruk: %S stasjon: [-FS:fil-system] [-V:merke] [-Q] [-A:størrelse] [-C]\n\n\ + [stasjon:] Spesifisere stasjon til formater.\n\ + -FS:file-system Spesifisere typen av fil system (f.eks. FAT).\n\ + -V:merke Spesifisere volum merke.\n\ + -Q Fullføre en rask formatering.\n\ + -A:størrelse Dominerende standard fordeling enhet størrelse. Standard innstilling\n\ + er sterkt anbefalt for generielt bruk\n\ + NTFS støtter 512, 1024, 2048, 4096, 8192, 16K, 32K, 64K.\n\ + FAT støtter 8192, 16K, 32K, 64K, 128K, 256K.\n\ + NTFS komprimering er ikke støttet for fordeling enhet størrelse\n\ + ovenfor 4096.\n\ + -C Filer opprettet på nytt volum vil bli komprimert etter\n\ + standard.\n\n" + +STRING_COMPLETE "%lu prosent ferdig.\r" + +STRING_FORMAT_FAIL "FormatEx var ikke i stand til fullstendig vellykket.\n\n" + +STRING_NO_SUPPORT "Operasjon ikke støttet" + +STRING_FMIFS_FAIL "Kunne ikke befinne seg FMIFS artikkel momenter.\n\n" + +STRING_UNKNOW_ARG "Ukjent argument: %S\n" + +STRING_DRIVE_PARM "Obligatorisk drive parameter er mistet.\n\n" + +STRING_ERROR_DRIVE_TYPE "Kunne ikke få drive typen" + +STRING_INSERT_DISK "Sett inn en ny diskett i stasjon %C:\nog trykk på Enter når du er klar..." + +STRING_NO_VOLUME "Kunne ikke spørre om volumet" + +STRING_NO_VOLUME_SIZE "Kunne ikke spørre om volumet størrelse" + +STRING_FILESYSTEM "Typen av filsystem er %S.\n" + +STRING_LABEL_NAME_EDIT "Velg aktuell volum merke for stasjon %C: " + +STRING_ERROR_LABEL "Et uriktig volum merke ble innskrivet for denne stasjonen.\n" + +STRING_YN_FORMAT "\nADVARSEL, ALLE DATA PÅ EN DISK SOM IKKE KAN FJERNES \n\ +STASJON %C: VIL BLI BORTE!\nFortsette med Formateringen (J/N)? " + +STRING_YES_NO_FAQ "JN" + +STRING_VERIFYING "kontrollerer" + +STRING_FAST_FMT "Rask Formatering" + +STRING_CREATE_FSYS "Opprett filsystem struktur.\n" + +STRING_FMT_COMPLETE "Formateringen fullført.\n" + +STRING_VOL_COMPRESS "Volumet støtter ikke komprimering.\n" + +STRING_ENTER_LABEL "Volum merke (11 tegn, legge inn for ingen)? " + +STRING_NO_LABEL "Kunne ikke merke volumet" + +STRING_FREE_SPACE "\n%I64d byte total ledig plass.\n%I64d byte tilgjengelig på disken.\n" + +STRING_SERIAL_NUMBER "\nVolumet Serie nummer er %04X-%04X\n" +} Propchange: trunk/reactos/base/system/format/No.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/system/format/format.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/format.… ============================================================================== --- trunk/reactos/base/system/format/format.rc (original) +++ trunk/reactos/base/system/format/format.rc Sat Jul 29 00:03:29 2006 @@ -8,3 +8,4 @@ #include "De.rc" #include "Fr.rc" #include "Hu.rc" +#include "No.rc"

1 0

[fireball] 23330: Add message's spy into user32.dll. In order to enable, just uncomment #define YDEBUG in spy.c file and optionally set the messages you want to include / exclude in the registry (HKCU\ReactOS\Debug). When it's turned off (YDEBUG is not defined), it doesn't provide any slow-down to the system. DefWindowProc() functions are slightly refactored to have one exit point instead of numerous returns in a switch-case statement. FIXME: maybe DPRINTs will be changed to DbgPrint because it'
by fireball＠svn.reactos.org 28 Jul '06

28 Jul '06

Author: fireball Date: Fri Jul 28 17:52:23 2006 New Revision: 23330 URL: http://svn.reactos.org/svn/reactos?rev=23330&view=rev Log: Add message's spy into user32.dll. In order to enable, just uncomment #define YDEBUG in spy.c file and optionally set the messages you want to include / exclude in the registry (HKCU\ReactOS\Debug). When it's turned off (YDEBUG is not defined), it doesn't provide any slow-down to the system. DefWindowProc() functions are slightly refactored to have one exit point instead of numerous returns in a switch-case statement. FIXME: maybe DPRINTs will be changed to DbgPrint because it's pointless to display path to the spy.c file everytime. Added: trunk/reactos/dll/win32/user32/windows/spy.c Modified: trunk/reactos/boot/bootdata/hivedef.inf trunk/reactos/dll/win32/user32/controls/combo.c trunk/reactos/dll/win32/user32/controls/edit.c trunk/reactos/dll/win32/user32/controls/listbox.c trunk/reactos/dll/win32/user32/include/user32p.h trunk/reactos/dll/win32/user32/misc/dllmain.c trunk/reactos/dll/win32/user32/user32.rbuild trunk/reactos/dll/win32/user32/windows/defwnd.c trunk/reactos/dll/win32/user32/windows/mdi.c trunk/reactos/dll/win32/user32/windows/message.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef.inf?… Modified: trunk/reactos/dll/win32/user32/controls/combo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… Modified: trunk/reactos/dll/win32/user32/controls/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… Modified: trunk/reactos/dll/win32/user32/controls/listbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… Modified: trunk/reactos/dll/win32/user32/include/user32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… Modified: trunk/reactos/dll/win32/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/dllm… Modified: trunk/reactos/dll/win32/user32/user32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.rb… Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… Modified: trunk/reactos/dll/win32/user32/windows/mdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… Modified: trunk/reactos/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… Added: trunk/reactos/dll/win32/user32/windows/spy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/s…

1 0

[frik85] 23329: ReactOS Status Report (July 2006) html version
by frik85＠svn.reactos.org 28 Jul '06

28 Jul '06

Author: frik85 Date: Fri Jul 28 12:17:06 2006 New Revision: 23329 URL: http://svn.reactos.org/svn/reactos?rev=23329&view=rev Log: ReactOS Status Report (July 2006) html version Added: trunk/press-media/Status Reports/July 2006/ReactOS status report.html Added: trunk/press-media/Status Reports/July 2006/ReactOS status report.html URL: http://svn.reactos.org/svn/reactos/trunk/press-media/Status%20Reports/July%… ============================================================================== --- trunk/press-media/Status Reports/July 2006/ReactOS status report.html (added) +++ trunk/press-media/Status Reports/July 2006/ReactOS status report.html Fri Jul 28 12:17:06 2006 @@ -1,0 +1,227 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" +"http://www.w3.org/TR/html4/loose.dtd"> +<html> +<head> +<title>ReactOS Status Report for July 2006</title> +<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> +</head> + +<body> +<h1>ReactOS Status Report for July 2006 </h1> +<p> </p> +<h2>Content:</h2> +<ol> + <li><strong><a href="#1">Preface</a></strong></li> + <li><strong><a href="#2">Legal situation</a></strong></li> + <li><strong><a href="#3">General Status + </a> </strong> + <ul> + <li><a href="#31">Networking</a></li> + <li><a href="#32"> Plug and Play</a></li> + <li><a href="#33"> USB</a></li> + <li><a href="#34">Build System Changes</a></li> + <li><a href="#35"> DirectX and OpenGL</a></li> + <li><a href="#36"> Website, Translation and Internationalization Support </a></li> + </ul> + </li> +<li><a href="#4"><strong>ReactOS participation in Google Summer Of Code</strong></a></li> +<li><strong><a href="#5">Developer Status +</a></strong> + <ul> + <li><a href="#51"> Johannes Anderwald</a></li> + <li><a href="#52"> Maarten Bosma</a></li> + <li> <a href="#53">Klemens Friedl</a></li> + <li> <a href="#54">Alex Ionescu</a></li> + <li> <a href="#55">Ged Murphy</a></li> + <li> <a href="#56">Andrew Munger</a></li> + <li> <a href="#57">Magnus Olsen</a></li> + <li><a href="#58">HervÃ© Poussineau</a></li> + <li><a href="#59">James Tabor</a></li> + <li><a href="#510">Brandon Turner</a></li> + <li><a href="#511">Aleksey Bragin</a></li> + </ul> +</li> +</ol> +<p>  </p> +<h2><a name="1"></a>Preface: </h2> +<p>This is the 2 nd issue of the ReactOS Status Report, and this is the first one produced by me, Aleksey Bragin being in a Project Coordinator's position. In this Status Report I tried to provide the most detailed coverage of the various and most interesting aspects of ReactOS project progress since January, 2006 till the current time.</p> +<p>ReactOS team is also thinking for the future of the project, how people could benefit from the project. We do not want to disclose many details now, but there are some very interesting ideas, particularly in area of virtualization and embedded systems. We will release more information as soon as the ideas are ready, so stay tuned!</p> +<p>For information about joining or donating to the ReactOS Project please visit main web-site <a href="http://www.reactos.org/">http://www.reactos.org </a> and ReactOS Wiki <a href="http://www.reactos.org/wiki/index.php/Main_Page">http://www.reactos.org/wiki/index.php/Main_Page </a></p> +<p>  </p> +<h2><a name="2"></a>Legal situation: </h2> +<p>Due to previous internal problems involving some ReactOS developers who were unsure in the cleanness of the ReactOS's code base, it was decided to conduct a full audit of the source code for legal matters. So far, 93% of code is audited already and no suspicious code was found, however many bugs were uncovered and fixed thanks to it. </p> +<p>Maybe the whole issue was triggered by a small flamewar between programmers, who wish other projects (like Wine) to succeed instead ReactOS. </p> +<p>The rules for any patch which enters the repository have been also made to be stricter: </p> +<ol> + <li>Anonymous patches are not accepted </li> + <li>Every code patch must contain either a reference to a publicly available and well-known documentation and/or to a test-case, demonstrating correctness of the patch </li> + <li>Patches whose cleanliness are in doubt will be rejected </li> +</ol> +<p>Upon the finish of the audit and, if code with unknown origin will be found, it will be removed from the repository, and rewritten by a developer who has not seen this code (some 3 rd -party developer) based on the created during auditing process information. </p> +<p>Not only it gives a way to be sure in a good future of the project, without any legal fears, but it also presents a whole new concept of a regression-tested development, which certainly results in better compatibility.</p> +<p>  </p> +<h2><a name="3"></a>General Status: </h2> +<p>By mid of July 2006 the ReactOS Project most recent released version is 0.3-rc1 of the ReactOS System. </p> +<p>The current ReactOS 0.3.0 TODO list is located at: <br> +<a href="http://www.reactos.org/wiki/index.php/0.3.x/0.3.0">http://www.reactos.org/wiki/index.php/0.3.x/0.3.0 </a></p> +<p>The list of planned features for the 0.3.x development line is located at: <br> +<a href="http://www.reactos.org/wiki/index.php/0.3.x">http://www.reactos.org/wiki/index.php/0.3.x </a> </p> +<p>However, the most advanced and âbleeding-edgeâ changes are located in trunk. With all the changes done during this period of time, we reached a level of compatibility we never had before. ReactOS website screenshots and Support Database speak for themselves, but what is not yet included there is, for example, a nice Google Picasa running under ReactOS without any major bugs, and a lot of supported drivers which could not work before due to serious mistakes in Native API implementation.</p> +<p> </p> +<p><strong>Besides of this, it's possible to classify progress by some ongoing subprojects for the overall project: </strong></p> +<p>  </p> +<h3><a name="31"></a>Networking: </h3> +<p>Mainly there are bugfixes and small improvements into the networking, making it working better. Despite the state of networking is still not mature, a lot of applications already work â FireFox, mIRC, Miranda (with some glitches), FTP apps. </p> +<p>Other major achievements are network cards support, and easier installation and setting up: thanks to Herve Poussineau's work it is now possible to install network card drivers, even on a LiveCD without necessary rebooting (however TCP/IP stack and NDIS await improvement to not require a reboot too). This gives a chance for more users to try and test ReactOS on their PCs. </p> +<p>Configuration is made easy by a working Control Panel applet, which removes the need to change registry in order to setup your IP and gateway's addresses, now you can do it in a similar to Windows' dialog. </p> +<p>  </p> +<h3><a name="32"></a>Plug and Play: </h3> +<p>There are really a lot of good changes into Plug and Play, mainly improving 3 rd -party drivers support and ease of installing drivers: no more hacking with copying .sys and .dll files â just point the âNew Hardware Foundâ wizard to the directory where you have your driver, and it will install them for you! </p> +<p>  </p> +<h3><a name="33"></a>USB: </h3> +<p>USB development was put on hold during this period; it's going to be restarted in the second half of 2006. </p> +<p>  </p> +<h3><a name="34"></a>Build System Changes: </h3> +<p>RBuild is further improved, especially its MSVC-backend, allowing to generate project files more and more closer to the point when you can just open the solution in Visual C++ Express and click âBuildâ. </p> +<p>ReactOS also utilizes a BuildBot now (instead of an unmaintained and unfinished CIS) â it greatly reduces trunk breakage problems, and automatically provides per-revision ISOs available for download. And thanks to scalability of a BuildBot, we are able to utilize several PCs for parallel building different revisions. Thanks goes to Christoph and Magnus for hosting the buildslaves and the buildmaster, and to Aleksey for configuring it. </p> +<p>You can see it live at <a href="http://reactos.dyndns.org:8010/">http://reactos.dyndns.org:8010</a> . </p> +<p>  </p> +<h3><a name="35"></a>DirectX and OpenGL: </h3> +<p>Magnus Olsen works on DirectX support in ReactOS, and he provided an interesting plan of work on DX-support, which you can read below. </p> +<p>OpenGL support currently regressed due to changes and fixes in the kernel, it's estimated to be back within the coming months. </p> +<p>  </p> +<h3><a name="36"></a>Website, Translation and Internationalization Support: </h3> +<p>Klemens Friedl expanded and improved a lot of the reactos.org website, and especially the RosCMS system and its interface for translators. The work on translating the website is going on, and the list of supported languages grows. You can read more about the website's changes in Klemens' Developer Status section below. </p> +<p>Also, we are still looking for a good candidate for ReactOS Weekly Newsletter, though Ravelo is already preparing a new issue in the meanwhile. </p> +<p><strong><em>  </em></strong></p> +<h2><a name="4"></a>ReactOS participation in Google Summer Of Code:</h2> +<p>First of all, I would like to thank Google a lot for their effort of supporting FOSS community by providing such a beautiful thing as Summer Of Code. </p> +<p>ReactOS was approved for participation in SoC. We were given 4 project slots, however during midterm evaluation, we had to set unsatisfactory mark to 2 students, because they didn't complete even the initial phase of the project, leaving currently two projects: Remote Desktop client application by Michele Cicciotti, which is the best moving project, it already has current progress in ReactOS SVN repository, and Clipboard Server API implementation, which is progressing slower than Remote Desktop client, however there is progress and student's will to finish the project. </p> +<p>These are very valuable projects not only for ReactOS, but for users too. So we wish our best luck to those students to complete projects in time. </p> +<p><strong>  </strong></p> +<h2><a name="5"></a>Developer Status: </h2> +<p>Individual project developers' todo-lists are presented below. Not all active developers are listed here, because some of them were unable to provide the information on time. For further information as to what projects each developer is working on please watch ros-dev mailing list, visit: <a href="http://www.reactos.org/wiki/index.php/People_of_ReactOS">http://www.reactos.org/wiki/index.php/People_of_ReactOS</a> and come to irc channel #reactos. </p> +<p>  </p> +<h3><a name="51"></a>Johannes Anderwald: </h3> +<p>Some small fixes in user32 and win32k, reducing number of failures in wine regression tests. </p> +<p>  </p> +<h3><a name="52"></a>Maarten Bosma: </h3> +<p>I am planning to start again with syncing cache manager branch to the new NDK. And then try to make my trim function work. After that I will try to make the package manager at least usable as downloader. </p> +<p>  </p> +<h3><a name="53"></a>Klemens Friedl: </h3> +<p>I have been working on the Compatibility Database (11/2005 to 06/2006) and some RosCMS improvements. <br> +I spend a lot of time on RSDB; it it is more than twice as large as RosCMS, circa 250 script files where as RosCMS consists of about 100 script files. </p> +<p>The Compatibility Database is almost finished, I have fixed a lot of small glitches in the beta phase and as soon as ReactOS 0.3 release goes on air, I think we can say that the Compatibility Database is in gold status. </p> +<p>Our website has been translated to 15 different languages from German, French to Chinese, Lithuanian, etc. <br> +About active 50 translators have worked with RosCMS and I got a lot of positive respond and some really good technical criticism/suggestions, which I took as a base for further improvements.<br> +I want to thank all translators for take part and keep the translations up-to-date. </p> +<p>Website Status: <a href="http://www.reactos.org/roscms/?page=webstatus">http://www.reactos.org/roscms/?page=webstatus </a></p> +<p>I want to work on my SearchLight app and hope that it will be useful (in future) for ReactOS (similar to Beagle for Gnome). </p> +<p>I have talked with Magnus about a ReactOS PE first step setup (LiveCD with Ram-Drive). It would be possible to revamp our old Ram-Drive driver code and use it for storing the registry settings, to achieve a Vista like setup feeling: </p> +<p>Boot into LiveCD ReactOS, GUI setup (first+second step combined; and optional old-style first step setup for experts / low end PCs). <br> +Then reboot into ReactOS installed version, so only one reboot required which sounds cool, even Vista needs 2+ reboots with Vista PE setup. </p> +<p>  </p> +<h3><a name="54"></a>Alex Ionescu: </h3> +<p>Mainly the work is concentrated in the kernel. A few interesting changes: </p> +<ul> + <li>Object Manager proper implementation. Provides: great speedup, a compatible implementation of exported functions. Based on: Kernel-mode tests of exported APIs and publicly available books and documentation. Right now Object Manager's rewrite is done, practically all bugs are gone, so this part of kernel is more-or-less solid, and can be counted at. </li> + <li> Project and Thread Manager fix. Provides: Proper implementation, fixes to bugs due to broken Ob model. Based on: Books (Windows Internals), test cases ran on Windows 2003 SP1. </li> + <li>I/O manager improvements: PnP and Io manager are now separated, and there are a bunch of improvements and new features added to Io. The amount of fixed errors and incorrect behavior is so big that it worth looking at Svn server logs. </li> +</ul> +<p>Also, in the meanwhile there were other improvements, like creating a compatible heap manager implementation in Kernel32. Not only it reduces failures of Wine regression tests to zero, but also provides a better implementation leading to speed improvement. </p> +<p>  </p> +<h3><a name="55"></a>Ged Murphy: </h3> +<p>Over the past 6 months, I've mainly been working on the audit, mostly reviewing and unlocking code. </p> +<p>Have worked on: </p> +<ul> + <li>Imagesoft </li> + <li>Rewrote the ReactOS Service Manager </li> + <li>Added a screenshot app </li> + <li>Cleaning up of control panel applets </li> + <li>Wine syncs </li> +</ul> +<p>Future work: </p> +<ul> + <li>Restart work on imagesoft </li> + <li>Continue work on control panel applets </li> + <li>Possibly restart work on the explorer interface design </li> + <li>Wine syncs </li> +</ul> +<p>  </p> +<h3><a name="56"></a>Andrew Munger: </h3> +<ol> + <li>Testing for 0.3.0. Testing on my rosbox and qemu, reading bugs. </li> + <li>Wasting my time working on a win32 console irc client. </li> +</ol> +<p>  </p> +<h3><a name="57"></a>Magnus Olsen: </h3> +<p>What I have been working on is DirectX support and still do time to time and will continue on it: what I am planning is getting a DirectX HAL interface working partly this year. That is basically all what I plan for this year with DirectX support. I plan to fix as much bugs as I can there and there. Not so much new stuff will be implemented from my side. I think current ReactOS need bugfixing before adding new API if we can concentrate on fixing as much bugs as possible this year </p> +<p>ReactOS will come to a real usable state this year.</p> +<p>What I have done the last 6 month is hard to say without looking at svn log: </p> +<ol> + <li> Fixing bugs there and there </li> + <li>Adding some new stuff </li> + <li>Developing dx draw and dx draw/d3d hal interface. </li> + <li>Helping other devs when they need a extra hand </li> +</ol> +<p>Planning for DirectX developer for 6 month </p> +<ol> + <li>DirectDraw hal interface </li> + <li>Getting more work on curent DirectDraw </li> + <li>Fixing devenum and dxdiagn so they emulate right in Windows and make them more like windows version of them, for moment it is raw port from Wine. </li> +</ol> +<p>Planing other stuff for 6 month </p> +<ol> + <li> Fixing CRT and RTL bugs some of them </li> + <li>Fixing some graphic bugs in win32k and some other bugs </li> + <li>Fixing some other bugs in ReactOS, jumping between part as I do and try to figure out how to fix other bugs </li> + <li>Trying to care a bit more about bugzilla bug reports and solve them. </li> +</ol> +<p>  </p> +<h3><a name="58"></a>HervÃ© Poussineau: </h3> +<p>Done between 2006/01/01 and 2006/06/30: </p> +<ul> + <li>USB: allow more than one controller and support hubs </li> + <li>Green: move green driver to a working state </li> + <li>Recyclebin: Add static library to manage it. Still not used yet </li> + <li>Setupapi/newdev: Lots of new functions implemented, select best driver when several matches, can provide a cdrom during installation... main goal was to be able to install drivers from a custom directory </li> + <li>Fix BSOD in IntPrepareDriver </li> + <li>MSVC backend: take care of "If" conditions in rbuild files to include files, define dependancies between projects </li> + <li>services.exe Implement StartService, which now starts pnpmgr during 2 nd stage setup. So serial mouse is usable in 2nd stage setup and USB mouse at 3 rd boot </li> + <li>And finally, very important, fix the calculation of loss packets percentage in ping.exe :) </li> +</ul> +<p>To do during next months: </p> +<ul> + <li>mostly fixes in pnp (kernel part and setupapi/newdev/class installers) </li> + <li>fix installation of vmware drivers (mostly mouse) => work on i8042prt </li> + <li>other unplanned things :) </li> +</ul> +<p>  </p> +<h3><a name="59"></a>James Tabor: </h3> +<p>Improvements to User32 and Win32k, making ReactOS's internal elements to work correctly (like menu, scrolls, etc). </p> +<p>  </p> +<h3><a name="510"></a>Brandon Turner: </h3> +<p>I don't have much on my plate. I don't think I have done anything notable in the last 6 months. I plan implementing multiline 'if' in cmd.exe and anything else needed to allow wineimport.cmd to run in ReactOS. </p> +<p>  </p> +<h3><a name="511"></a>Aleksey Bragin: </h3> +<p>Some of things I did since 1 st of Jan, 2006: </p> +<ul> + <li>Code auditing </li> + <li>Development (with the help and agreement of all developers of our team) and enforcing new coding style rules to the codebase (still in progress, the codebase is huge) </li> + <li>Starting to remove âmagicâ status from Wine syncs </li> + <li>Working on fixing bugs detected by Wine regression tests </li> + <li>Introduced kernel-mode regression tests framework, adapted old tests and created new ones for the kernel, which allows us to test and implement the same behavior for kernel internals </li> + <li>Improving some parts of User32.dll (together with James Tabor) </li> + <li>Headers updating </li> + <li>Small cleanups in kernel32 and win32k </li> + <li>Changing user32 to a FIXME/TRACE/ERR debug messaging system compatible with Wine (provides a lot easier way to tracing problems and finding bugs in different parts of the OS) </li> + <li>Winetests updating </li> + <li>Some improvements to RBuild's MSVC backend </li> + <li>Some work on supporting MSVC compiler </li> + <li>Translations of various ReactOS modules to Russian language </li> + <li>Wine autosyncing (together and mostly thanks to Herve Poussineau's work) </li> +</ul> +<p>  </p> +<p><strong>Non-development related improvements are described in the other sections of this issue of Status Report. </strong></p> +</body> +</html>

1 0

[ion] 23328: - Mega whammy jammy fix commit: - Fix bootcd by fixing some bugs in CDFS (same as in VFAT). - Fix Broken Installers and other I/O programs that couldn't, for example, create temporary directories. - Fix Firefox installers and other apps crashing due to a bug in NtSetInformationFile. - Fix File Objects being referenced twice resulting in IRP_MJ_CLOSE/CLEANUP never being sent and several memory leaks. - Fix File Object Lock being incorrectly created and then misused by mm/section code
by ion＠svn.reactos.org 27 Jul '06

27 Jul '06

Author: ion Date: Fri Jul 28 02:26:40 2006 New Revision: 23328 URL: http://svn.reactos.org/svn/reactos?rev=23328&view=rev Log: - Mega whammy jammy fix commit: - Fix bootcd by fixing some bugs in CDFS (same as in VFAT). - Fix Broken Installers and other I/O programs that couldn't, for example, create temporary directories. - Fix Firefox installers and other apps crashing due to a bug in NtSetInformationFile. - Fix File Objects being referenced twice resulting in IRP_MJ_CLOSE/CLEANUP never being sent and several memory leaks. - Fix File Object Lock being incorrectly created and then misused by mm/section code. - Fix creation of File Object before setting up the IRP, to properly cleanup during failures. - Add failure code if ObCreateObject fails. Modified: trunk/reactos/drivers/filesystems/cdfs/finfo.c trunk/reactos/ntoskrnl/KrnlFun.c trunk/reactos/ntoskrnl/io/iomgr/file.c trunk/reactos/ntoskrnl/io/iomgr/iofunc.c trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/drivers/filesystems/cdfs/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/finfo.c (original) +++ trunk/reactos/drivers/filesystems/cdfs/finfo.c Fri Jul 28 02:26:40 2006 @@ -152,16 +152,16 @@ ASSERT(Fcb != NULL); NameLength = wcslen(Fcb->PathName) * sizeof(WCHAR); - if (*BufferLength < sizeof(FILE_NAME_INFORMATION) + NameLength) + NameInfo->FileNameLength = NameLength; + if (*BufferLength < (FIELD_OFFSET(FILE_NAME_INFORMATION, FileName) + NameLength)) return STATUS_BUFFER_OVERFLOW; - NameInfo->FileNameLength = NameLength; RtlCopyMemory(NameInfo->FileName, Fcb->PathName, NameLength + sizeof(WCHAR)); *BufferLength -= - (sizeof(FILE_NAME_INFORMATION) + NameLength + sizeof(WCHAR)); + (FIELD_OFFSET(FILE_NAME_INFORMATION, FileName) + NameLength); return STATUS_SUCCESS; } Modified: trunk/reactos/ntoskrnl/KrnlFun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/KrnlFun.c?rev=233… ============================================================================== --- trunk/reactos/ntoskrnl/KrnlFun.c (original) +++ trunk/reactos/ntoskrnl/KrnlFun.c Fri Jul 28 02:26:40 2006 @@ -9,10 +9,7 @@ // Failure to respect this will *ACHIEVE NOTHING*. // // Io: -// - Fix double-reference in IopCreateFile. // - See why queueing IRPs and cancelling them causes crashes. -// - Find out why 7zip can't create temporary folders due to deferred I/O -// completion in IopParseDevice when creating a new File Object. // - Add SEH to some places where it's missing (MDLs, etc) (iofunc). // - Add a generic Cleanup/Exception Routine (iofunc). // - Add another parameter to IopCleanupFailedIrp. Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c Fri Jul 28 02:26:40 2006 @@ -69,7 +69,12 @@ /* Reference the DO */ Status = IopReferenceDeviceObject(OriginalDeviceObject); - if (!NT_SUCCESS(Status)) return Status; + if (!NT_SUCCESS(Status)) + { + /* We failed, return status */ + OpenPacket->FinalStatus = Status; + return Status; + } /* Map the generic mask and set the new mapping in the access state */ RtlMapGenericMask(&AccessState->RemainingDesiredAccess, @@ -134,6 +139,85 @@ DeviceObject = IoGetAttachedDevice(DeviceObject); } } + + /* Allocate the IRP */ + Irp = IoAllocateIrp(DeviceObject->StackSize, TRUE); + if (!Irp) + { + /* Dereference the device and VPB, then fail */ + IopDereferenceDeviceObject(DeviceObject, FALSE); + if (Vpb) IopDereferenceVpb(Vpb); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Now set the IRP data */ + Irp->RequestorMode = AccessMode; + Irp->Flags = IRP_CREATE_OPERATION | + IRP_SYNCHRONOUS_API | + IRP_DEFER_IO_COMPLETION; + Irp->Tail.Overlay.Thread = PsGetCurrentThread(); + Irp->UserIosb = &IoStatusBlock; + Irp->MdlAddress = NULL; + Irp->PendingReturned = FALSE; + Irp->UserEvent = NULL; + Irp->Cancel = FALSE; + Irp->CancelRoutine = NULL; + Irp->Tail.Overlay.AuxiliaryBuffer = NULL; + + /* Setup the security context */ + SecurityContext.SecurityQos = SecurityQos; + SecurityContext.AccessState = AccessState; + SecurityContext.DesiredAccess = AccessState->RemainingDesiredAccess; + SecurityContext.FullCreateOptions = OpenPacket->CreateOptions; + + /* Get the I/O Stack location */ + StackLoc = (PEXTENDED_IO_STACK_LOCATION)IoGetNextIrpStackLocation(Irp); + StackLoc->Control = 0; + + /* Check what kind of file this is */ + switch (OpenPacket->CreateFileType) + { + /* Normal file */ + case CreateFileTypeNone: + + /* Set the major function and EA Length */ + StackLoc->MajorFunction = IRP_MJ_CREATE; + StackLoc->Parameters.Create.EaLength = OpenPacket->EaLength; + + /* Set the flags */ + StackLoc->Flags = OpenPacket->Options; + StackLoc->Flags |= !(Attributes & OBJ_CASE_INSENSITIVE) ? + SL_CASE_SENSITIVE: 0; + break; + + /* Named pipe */ + case CreateFileTypeNamedPipe: + + /* Set the named pipe MJ and set the parameters */ + StackLoc->MajorFunction = IRP_MJ_CREATE_NAMED_PIPE; + StackLoc->Parameters.CreatePipe.Parameters = + OpenPacket->MailslotOrPipeParameters; + break; + + /* Mailslot */ + case CreateFileTypeMailslot: + + /* Set the mailslot MJ and set the parameters */ + StackLoc->MajorFunction = IRP_MJ_CREATE_MAILSLOT; + StackLoc->Parameters.CreateMailslot.Parameters = + OpenPacket->MailslotOrPipeParameters; + break; + } + + /* Set the common data */ + Irp->Overlay.AllocationSize = OpenPacket->AllocationSize; + Irp->AssociatedIrp.SystemBuffer = OpenPacket->EaBuffer; + StackLoc->Parameters.Create.Options = (OpenPacket->Disposition << 24) | + (OpenPacket->CreateOptions & + 0xFFFFFF); + StackLoc->Parameters.Create.FileAttributes = OpenPacket->FileAttributes; + StackLoc->Parameters.Create.ShareAccess = OpenPacket->ShareAccess; + StackLoc->Parameters.Create.SecurityContext = &SecurityContext; /* Check if we really need to create an object */ if (!UseDummyFile) @@ -153,6 +237,21 @@ 0, 0, (PVOID*)&FileObject); + if (!NT_SUCCESS(Status)) + { + /* Create failed, free the IRP */ + IoFreeIrp(Irp); + + /* Dereference the device and VPB */ + IopDereferenceDeviceObject(DeviceObject, FALSE); + if (Vpb) IopDereferenceVpb(Vpb); + + /* We failed, return status */ + OpenPacket->FinalStatus = Status; + return Status; + } + + /* Clear the file object */ RtlZeroMemory(FileObject, sizeof(FILE_OBJECT)); /* Check if this is Synch I/O */ @@ -170,6 +269,13 @@ } } + /* Check if this is synch I/O */ + if (FileObject->Flags & FO_SYNCHRONOUS_IO) + { + /* Initialize the event. FIXME: Should be FALSE */ + KeInitializeEvent(&FileObject->Lock, SynchronizationEvent, FALSE); + } + /* Check if the caller requested no intermediate buffering */ if (OpenPacket->CreateOptions & FILE_NO_INTERMEDIATE_BUFFERING) { @@ -226,94 +332,9 @@ FileObject->Flags |= FO_OPENED_CASE_SENSITIVE; } - /* Setup the security context */ - SecurityContext.SecurityQos = SecurityQos; - SecurityContext.AccessState = AccessState; - SecurityContext.DesiredAccess = AccessState->RemainingDesiredAccess; - SecurityContext.FullCreateOptions = OpenPacket->CreateOptions; - - /* Check if this is synch I/O */ - if (FileObject->Flags & FO_SYNCHRONOUS_IO) - { - /* Initialize the event */ - KeInitializeEvent(&FileObject->Lock, SynchronizationEvent, TRUE); - } - - /* Allocate the IRP */ - Irp = IoAllocateIrp(DeviceObject->StackSize, TRUE); - if (!Irp) - { - /* Dereference the device and VPB, then fail */ - IopDereferenceDeviceObject(DeviceObject, FALSE); - if (Vpb) IopDereferenceVpb(Vpb); - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* Now set the IRP data */ + /* Now set the file object */ Irp->Tail.Overlay.OriginalFileObject = FileObject; - Irp->RequestorMode = AccessMode; - Irp->Flags = IRP_CREATE_OPERATION | - IRP_SYNCHRONOUS_API | - IRP_DEFER_IO_COMPLETION; - Irp->Tail.Overlay.Thread = PsGetCurrentThread(); - Irp->UserEvent = &FileObject->Event; - Irp->UserIosb = &IoStatusBlock; - Irp->MdlAddress = NULL; - Irp->PendingReturned = FALSE; - Irp->UserEvent = NULL; - Irp->Cancel = FALSE; - Irp->CancelRoutine = NULL; - Irp->Tail.Overlay.AuxiliaryBuffer = NULL; - - /* Get the I/O Stack location */ - StackLoc = (PEXTENDED_IO_STACK_LOCATION)IoGetNextIrpStackLocation(Irp); - StackLoc->Control = 0; StackLoc->FileObject = FileObject; - - /* Check what kind of file this is */ - switch (OpenPacket->CreateFileType) - { - /* Normal file */ - case CreateFileTypeNone: - - /* Set the major function and EA Length */ - StackLoc->MajorFunction = IRP_MJ_CREATE; - StackLoc->Parameters.Create.EaLength = OpenPacket->EaLength; - - /* Set the flags */ - StackLoc->Flags = OpenPacket->Options; - StackLoc->Flags |= !(Attributes & OBJ_CASE_INSENSITIVE) ? - SL_CASE_SENSITIVE: 0; - break; - - /* Named pipe */ - case CreateFileTypeNamedPipe: - - /* Set the named pipe MJ and set the parameters */ - StackLoc->MajorFunction = IRP_MJ_CREATE_NAMED_PIPE; - StackLoc->Parameters.CreatePipe.Parameters = - OpenPacket->MailslotOrPipeParameters; - break; - - /* Mailslot */ - case CreateFileTypeMailslot: - - /* Set the mailslot MJ and set the parameters */ - StackLoc->MajorFunction = IRP_MJ_CREATE_MAILSLOT; - StackLoc->Parameters.CreateMailslot.Parameters = - OpenPacket->MailslotOrPipeParameters; - break; - } - - /* Set the common data */ - Irp->Overlay.AllocationSize = OpenPacket->AllocationSize; - Irp->AssociatedIrp.SystemBuffer =OpenPacket->EaBuffer; - StackLoc->Parameters.Create.Options = (OpenPacket->Disposition << 24) | - (OpenPacket->CreateOptions & - 0xFFFFFF); - StackLoc->Parameters.Create.FileAttributes = OpenPacket->FileAttributes; - StackLoc->Parameters.Create.ShareAccess = OpenPacket->ShareAccess; - StackLoc->Parameters.Create.SecurityContext = &SecurityContext; /* Check if the file object has a name */ if (RemainingName->Length) @@ -347,9 +368,6 @@ /* Copy the name */ RtlCopyUnicodeString(&FileObject->FileName, RemainingName); - /* Reference the file object */ - ObReferenceObject(FileObject); - /* Initialize the File Object event and set the FO */ KeInitializeEvent(&FileObject->Event, NotificationEvent, FALSE); OpenPacket->FileObject = FileObject; @@ -373,6 +391,7 @@ { /* We'll have to complete it ourselves */ ASSERT(!Irp->PendingReturned); + ASSERT(!Irp->MdlAddress ); /* Completion happens at APC_LEVEL */ KeRaiseIrql(APC_LEVEL, &OldIrql); @@ -385,8 +404,8 @@ FileObject->Event.Header.SignalState = 1; /* Now that we've signaled the events, de-associate the IRP */ - RemoveEntryList(&Irp->ThreadListEntry); - InitializeListHead(&Irp->ThreadListEntry); + //RemoveEntryList(&Irp->ThreadListEntry); + //InitializeListHead(&Irp->ThreadListEntry); /* Check if the IRP had an input buffer */ if ((Irp->Flags & IRP_BUFFERED_IO) && Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Fri Jul 28 02:26:40 2006 @@ -2159,7 +2159,7 @@ if (LocalEvent) { /* Then to a non-alertable wait */ - Status = KeWaitForSingleObject(&Event, + Status = KeWaitForSingleObject(Event, Executive, PreviousMode, FALSE, Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c (original) +++ trunk/reactos/ntoskrnl/mm/section.c Fri Jul 28 02:26:40 2006 @@ -155,7 +155,8 @@ static NTSTATUS MmspWaitForFileLock(PFILE_OBJECT File) { - return KeWaitForSingleObject(&File->Lock, 0, KernelMode, FALSE, NULL); + return STATUS_SUCCESS; + //return KeWaitForSingleObject(&File->Lock, 0, KernelMode, FALSE, NULL); } @@ -2476,7 +2477,7 @@ TAG_MM_SECTION_SEGMENT); if (Segment == NULL) { - KeSetEvent((PVOID)&FileObject->Lock, IO_NO_INCREMENT, FALSE); + //KeSetEvent((PVOID)&FileObject->Lock, IO_NO_INCREMENT, FALSE); ObDereferenceObject(Section); ObDereferenceObject(FileObject); return(STATUS_NO_MEMORY); @@ -2531,7 +2532,7 @@ Section->FileObject = FileObject; Section->MaximumSize = MaximumSize; CcRosReferenceCache(FileObject); - KeSetEvent((PVOID)&FileObject->Lock, IO_NO_INCREMENT, FALSE); + //KeSetEvent((PVOID)&FileObject->Lock, IO_NO_INCREMENT, FALSE); *SectionObject = Section; return(STATUS_SUCCESS); } @@ -3362,7 +3363,7 @@ } Section->FileObject = FileObject; CcRosReferenceCache(FileObject); - KeSetEvent((PVOID)&FileObject->Lock, IO_NO_INCREMENT, FALSE); + //KeSetEvent((PVOID)&FileObject->Lock, IO_NO_INCREMENT, FALSE); *SectionObject = Section; return(Status); }

1 0

[fireball] 23327: Improve a few headers by adding missing definitions and structures (taken from Wine). Versioning might not be correct.
by fireball＠svn.reactos.org 27 Jul '06

27 Jul '06

Author: fireball Date: Fri Jul 28 00:34:04 2006 New Revision: 23327 URL: http://svn.reactos.org/svn/reactos?rev=23327&view=rev Log: Improve a few headers by adding missing definitions and structures (taken from Wine). Versioning might not be correct. Modified: trunk/reactos/include/psdk/commctrl.h trunk/reactos/include/psdk/prsht.h trunk/reactos/include/psdk/richedit.h Modified: trunk/reactos/include/psdk/commctrl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/commctrl.h?re… ============================================================================== --- trunk/reactos/include/psdk/commctrl.h (original) +++ trunk/reactos/include/psdk/commctrl.h Fri Jul 28 00:34:04 2006 @@ -631,6 +631,15 @@ #define TB_MAPACCELERATORW (WM_USER+90) #define TB_GETSTRINGW (WM_USER+91) #define TB_GETSTRINGA (WM_USER+92) + +/* undocumented messages in Toolbar */ +#define TB_UNKWN45D (WM_USER+93) +#define TB_UNKWN45E (WM_USER+94) +#define TB_UNKWN460 (WM_USER+96) +#define TB_UNKWN462 (WM_USER+98) +#define TB_UNKWN463 (WM_USER+99) +#define TB_UNKWN464 (WM_USER+100) + #define TB_SETCOLORSCHEME CCM_SETCOLORSCHEME #define TB_GETCOLORSCHEME CCM_GETCOLORSCHEME #define TB_SETUNICODEFORMAT CCM_SETUNICODEFORMAT @@ -655,6 +664,7 @@ #define TBN_DROPDOWN (TBN_FIRST-10) #endif #if (_WIN32_IE >= 0x0400) +#define TBN_GETOBJECT (TBN_FIRST-12) #define TBN_HOTITEMCHANGE (TBN_FIRST-13) #define TBN_DRAGOUT (TBN_FIRST-14) #define TBN_DELETINGBUTTON (TBN_FIRST-15) @@ -1212,6 +1222,7 @@ #define LVN_SETDISPINFOA (LVN_FIRST-51) #define LVN_SETDISPINFOW (LVN_FIRST-78) #define LVN_KEYDOWN (LVN_FIRST-55) +#define LVN_MARQUEEBEGIN (LVN_FIRST-56) #if (_WIN32_IE >= 0x0400) #define LVN_GETINFOTIPA (LVN_FIRST-57) #define LVN_GETINFOTIPW (LVN_FIRST-58) @@ -1468,6 +1479,7 @@ #define TCN_KEYDOWN TCN_FIRST #define TCN_SELCHANGE (TCN_FIRST-1) #define TCN_SELCHANGING (TCN_FIRST-2) +#define TCN_GETOBJECT (TCN_FIRST-3) #define NM_OUTOFMEMORY (NM_FIRST-1) #define NM_CLICK (NM_FIRST-2) #define NM_DBLCLK (NM_FIRST-3) @@ -1681,6 +1693,7 @@ #define LVN_ODFINDITEMW (LVN_FIRST-79) #define LVN_ITEMACTIVATE (LVN_FIRST-14) #define LVN_ODSTATECHANGED (LVN_FIRST-15) +#define LVN_HOTTRACK (LVN_FIRST-21) #ifdef UNICODE #define LVN_ODFINDITEM LVN_ODFINDITEMW #else @@ -1995,12 +2008,32 @@ char szText[CBEMAXSTRLEN]; int iWhy; } NMCBEENDEDITA, *LPNMCBEENDEDITA,*PNMCBEENDEDITA; +typedef struct tagNMOBJECTNOTIFY +{ + NMHDR hdr; + int iItem; +#ifdef __IID_DEFINED__ + const IID *piid; +#else + const void *piid; +#endif + void *pObject; + HRESULT hResult; + DWORD dwFlags; +} NMOBJECTNOTIFY, *LPNMOBJECTNOTIFY; typedef struct tagNMKEY { NMHDR hdr; UINT nVKey; UINT uFlags; } NMKEY, *LPNMKEY; +typedef struct tagNMCHAR +{ + NMHDR hdr; + UINT ch; + DWORD dwItemPrev; /* Item previously selected */ + DWORD dwItemNext; /* Item to be selected */ +} NMCHAR, *LPNMCHAR; typedef struct _COLORMAP { COLORREF from; COLORREF to; @@ -2572,6 +2605,19 @@ int iTo; } NMLVCACHEHINT, *PNMLVCACHEHINT; #define NM_CACHEHINT NMLVCACHEHINT +typedef struct tagNMLVFINDITEMA +{ + NMHDR hdr; + int iStart; + LVFINDINFOA lvfi; +} NMLVFINDITEMA, *LPNMLVFINDITEMA; +typedef struct tagNMLVFINDITEMW +{ + NMHDR hdr; + int iStart; + LVFINDINFOW lvfi; +} NMLVFINDITEMW, *LPNMLVFINDITEMW; + typedef struct _TREEITEM *HTREEITEM; typedef struct tagTVITEMA { UINT mask; @@ -2726,11 +2772,16 @@ LPARAM lParam; } NMTVGETINFOTIPW, *LPNMTVGETINFOTIPW; #endif -typedef struct _TV_KEYDOWN { +#include <pshpack1.h> +typedef struct tagTVKEYDOWN +{ NMHDR hdr; WORD wVKey; UINT flags; -} TV_KEYDOWN; +} NMTVKEYDOWN, *LPNMTVKEYDOWN; +#include <poppack.h> +#define TV_KEYDOWN NMTVKEYDOWN + typedef struct _TC_ITEMHEADERA { UINT mask; UINT lpReserved1; Modified: trunk/reactos/include/psdk/prsht.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/prsht.h?rev=2… ============================================================================== --- trunk/reactos/include/psdk/prsht.h (original) +++ trunk/reactos/include/psdk/prsht.h Fri Jul 28 00:34:04 2006 @@ -106,6 +106,9 @@ #define PSN_HELP (-205) #define PSN_KILLACTIVE (-201) #define PSN_QUERYCANCEL (-209) +#define PSN_GETOBJECT (PSN_FIRST-10) +#define PSN_TRANSLATEACCELERATOR (PSN_FIRST-12) +#define PSN_QUERYINITIALFOCUS (PSN_FIRST-13) #define PSN_RESET (-203) #define PSN_SETACTIVE (-200) #define PSN_WIZBACK (-206) @@ -306,6 +309,17 @@ #define PropSheet_UnChanged(d,w) SendMessage(d,PSM_UNCHANGED,(WPARAM)w,0) #endif +#define WC_PROPSHEETA "SysPropertySheet" +#if defined(__GNUC__) +# define WC_PROPSHEETW (const WCHAR []){ 'S','y','s', \ + 'P','r','o','p','e','r','t','y','S','h','e','e','t',0 } +#elif defined(_MSC_VER) +# define WC_PROPSHEETW L"SysPropertySheet" +#else +static const WCHAR WC_PROPSHEETW[] = { 'S','y','s', + 'P','r','o','p','e','r','t','y','S','h','e','e','t',0 }; +#endif + #ifdef UNICODE #define LPFNPSPCALLBACK LPFNPSPCALLBACKW #define PROPSHEETPAGE PROPSHEETPAGEW Modified: trunk/reactos/include/psdk/richedit.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/richedit.h?re… ============================================================================== --- trunk/reactos/include/psdk/richedit.h (original) +++ trunk/reactos/include/psdk/richedit.h Fri Jul 28 00:34:04 2006 @@ -11,8 +11,10 @@ #ifdef UNICODE #define RICHEDIT_CLASS L"RichEdit20W" +#define RICHEDIT_CLASS20W L"RichEdit20W" #else #define RICHEDIT_CLASS "RichEdit20A" +#define RICHEDIT_CLASS20A "RichEdit20A" #endif #define RICHEDIT_CLASS10A "RICHEDIT" #define CF_RTF TEXT("Rich Text Format") @@ -222,6 +224,7 @@ #define EM_GETIMECOLOR (WM_USER + 105) #define EM_SETIMEOPTIONS (WM_USER + 106) #define EM_GETIMEOPTIONS (WM_USER + 107) +#define EM_CONVPOSITION (WM_USER + 108) #define EM_SETLANGOPTIONS (WM_USER+120) #define EM_GETLANGOPTIONS (WM_USER+121) #define EM_GETIMECOMPMODE (WM_USER+122) @@ -236,6 +239,7 @@ #define EM_GETTYPOGRAPHYOPTIONS (WM_USER+203) #define EM_SETEDITSTYLE (WM_USER + 204) #define EM_GETEDITSTYLE (WM_USER + 205) +#define EM_OUTLINE (WM_USER + 220) #define EM_GETSCROLLPOS (WM_USER+221) #define EM_SETSCROLLPOS (WM_USER+222) #define EM_SETFONTSIZE (WM_USER+223)

1 0

[ion] 23326: - Add kernel fun entry: - Find out why 7zip can't create temporary folders due to deferred I/O completion in IopParseDevice when creating a new File Object.. Thanks to encoded.
by ion＠svn.reactos.org 27 Jul '06

27 Jul '06

Author: ion Date: Fri Jul 28 00:18:22 2006 New Revision: 23326 URL: http://svn.reactos.org/svn/reactos?rev=23326&view=rev Log: - Add kernel fun entry: - Find out why 7zip can't create temporary folders due to deferred I/O completion in IopParseDevice when creating a new File Object.. Thanks to encoded. Modified: trunk/reactos/ntoskrnl/KrnlFun.c Modified: trunk/reactos/ntoskrnl/KrnlFun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/KrnlFun.c?rev=233… ============================================================================== --- trunk/reactos/ntoskrnl/KrnlFun.c (original) +++ trunk/reactos/ntoskrnl/KrnlFun.c Fri Jul 28 00:18:22 2006 @@ -11,6 +11,8 @@ // Io: // - Fix double-reference in IopCreateFile. // - See why queueing IRPs and cancelling them causes crashes. +// - Find out why 7zip can't create temporary folders due to deferred I/O +// completion in IopParseDevice when creating a new File Object. // - Add SEH to some places where it's missing (MDLs, etc) (iofunc). // - Add a generic Cleanup/Exception Routine (iofunc). // - Add another parameter to IopCleanupFailedIrp.

1 0

[ion] 23325: - Enable IopReferenceDeviceObject in IopParseDevice (not much use for now except OS "Correctness" and identifying broken drivers). DO referencing isn't fully used in the kernel yet. - Fix broken drivers: i8042 and videoprt. NDIS might be broken too, but downloading worked fine for me, so it's not hitting the check in IopParseDevice.
by ion＠svn.reactos.org 27 Jul '06

27 Jul '06

Author: ion Date: Fri Jul 28 00:16:48 2006 New Revision: 23325 URL: http://svn.reactos.org/svn/reactos?rev=23325&view=rev Log: - Enable IopReferenceDeviceObject in IopParseDevice (not much use for now except OS "Correctness" and identifying broken drivers). DO referencing isn't fully used in the kernel yet. - Fix broken drivers: i8042 and videoprt. NDIS might be broken too, but downloading worked fine for me, so it's not hitting the check in IopParseDevice. Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c trunk/reactos/drivers/video/videoprt/videoprt.c trunk/reactos/ntoskrnl/io/iomgr/device.c trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/i80… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/i8042prt.c (original) +++ trunk/reactos/drivers/input/i8042prt/i8042prt.c Fri Jul 28 00:16:48 2006 @@ -741,6 +741,7 @@ KeInitializeTimer(&DevExt->TimerMouseTimeout); Status = I8042Initialize(DevExt); + Fdo->Flags &= ~DO_DEVICE_INITIALIZING; if (!NT_SUCCESS(STATUS_SUCCESS)) { DPRINT1("Initialization failure: %x\n", Status); return Status; @@ -790,6 +791,7 @@ } InsertTailList(&DevExt->BusDevices, &FdoDevExt->BusDevices); + Fdo->Flags &= ~DO_DEVICE_INITIALIZING; } else DevExt->KeyboardExists = FALSE; @@ -838,6 +840,7 @@ } InsertTailList(&DevExt->BusDevices, &FdoDevExt->BusDevices); + Fdo->Flags &= ~DO_DEVICE_INITIALIZING; } else DevExt->MouseExists = FALSE; Modified: trunk/reactos/drivers/video/videoprt/videoprt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/vid… ============================================================================== --- trunk/reactos/drivers/video/videoprt/videoprt.c (original) +++ trunk/reactos/drivers/video/videoprt/videoprt.c Fri Jul 28 00:16:48 2006 @@ -362,6 +362,8 @@ DeviceExtension->NextDeviceObject = IoAttachDeviceToDeviceStack( *DeviceObject, PhysicalDeviceObject); + /* Remove the initailizing flag */ + (*DeviceObject)->Flags &= ~DO_DEVICE_INITIALIZING; return STATUS_SUCCESS; } Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/device.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/device.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/device.c Fri Jul 28 00:16:48 2006 @@ -342,6 +342,9 @@ (DeviceObject->Flags & DO_DEVICE_INITIALIZING)) { /* It's unloading or initializing, so fail */ + DPRINT1("You are seeing this because the following ROS driver: %wZ\n" + " sucks. Please fix it's AddDevice Routine\n", + &DeviceObject->DriverObject->DriverName); return STATUS_NO_SUCH_DEVICE; } else Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Fri Jul 28 00:16:48 2006 @@ -622,8 +622,6 @@ return Status; } - IopReinitializeDrivers(); - /* Set the driver as initialized */ Driver->Flags |= DRVO_INITIALIZED; DeviceObject = Driver->DeviceObject; @@ -633,6 +631,8 @@ DeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; DeviceObject = DeviceObject->NextDevice; } + + IopReinitializeDrivers(); return STATUS_SUCCESS; } Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c Fri Jul 28 00:16:48 2006 @@ -67,9 +67,9 @@ OriginalDeviceObject = OpenPacket->RelatedFileObject->DeviceObject; } - /* Reference the DO FIXME: Don't allow failure */ - //Status = IopReferenceDeviceObject(OriginalDeviceObject); - OriginalDeviceObject->ReferenceCount++; + /* Reference the DO */ + Status = IopReferenceDeviceObject(OriginalDeviceObject); + if (!NT_SUCCESS(Status)) return Status; /* Map the generic mask and set the new mapping in the access state */ RtlMapGenericMask(&AccessState->RemainingDesiredAccess,

1 0

[ion] 23324: - Set DRVO_INITAILIZED flag for intiailized driver objects. - Loop the list of devices created by the driver's DriverEntry and remove the DO_DEVICE_INITIALIZING flag.
by ion＠svn.reactos.org 27 Jul '06

27 Jul '06

Author: ion Date: Thu Jul 27 23:56:38 2006 New Revision: 23324 URL: http://svn.reactos.org/svn/reactos?rev=23324&view=rev Log: - Set DRVO_INITAILIZED flag for intiailized driver objects. - Loop the list of devices created by the driver's DriverEntry and remove the DO_DEVICE_INITIALIZING flag. Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Thu Jul 27 23:56:38 2006 @@ -571,6 +571,8 @@ const WCHAR ServicesKeyName[] = L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\"; UNICODE_STRING RegistryKey; PDRIVER_INITIALIZE DriverEntry; + PDRIVER_OBJECT Driver; + PDEVICE_OBJECT DeviceObject; NTSTATUS Status; DriverEntry = ModuleObject->EntryPoint; @@ -593,13 +595,13 @@ } Status = IopCreateDriverObject( - DriverObject, + &Driver, ServiceName, 0, FileSystemDriver, ModuleObject->DllBase, ModuleObject->SizeOfImage); - + *DriverObject = Driver; if (!NT_SUCCESS(Status)) { DPRINT("IopCreateDriverObject failed (Status %x)\n", Status); @@ -609,18 +611,28 @@ DPRINT("RegistryKey: %wZ\n", &RegistryKey); DPRINT("Calling driver entrypoint at %08lx\n", DriverEntry); - Status = DriverEntry(*DriverObject, &RegistryKey); + Status = DriverEntry(Driver, &RegistryKey); RtlFreeUnicodeString(&RegistryKey); if (!NT_SUCCESS(Status)) { - ObMakeTemporaryObject(*DriverObject); - ObDereferenceObject(*DriverObject); + ObMakeTemporaryObject(Driver); + ObDereferenceObject(Driver); return Status; } IopReinitializeDrivers(); + + /* Set the driver as initialized */ + Driver->Flags |= DRVO_INITIALIZED; + DeviceObject = Driver->DeviceObject; + while (DeviceObject) + { + /* Set every device as initialized too */ + DeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; + DeviceObject = DeviceObject->NextDevice; + } return STATUS_SUCCESS; }

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