Ros-diffs May 2007

ros-diffs@reactos.org

17 participants
322 discussions

[arty] 26776: Process all boot drivers as elf. This makes things much easier and more regular in kernel land.
by arty＠svn.reactos.org 14 May '07

14 May '07

Author: arty Date: Mon May 14 10:00:32 2007 New Revision: 26776 URL: http://svn.reactos.org/svn/reactos?rev=26776&view=rev Log: Process all boot drivers as elf. This makes things much easier and more regular in kernel land. Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c branches/powerpc/reactos/boot/freeldr/freeldr/include/reactos.h branches/powerpc/reactos/boot/freeldr/freeldr/reactos/reactos.c Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c Mon May 14 10:00:32 2007 @@ -357,6 +357,12 @@ Elf32_Ehdr ehdr; Elf32_Shdr *shdr; + if(!KernelAddr) + KernelAddr = (ULONG)NextModuleBase - (ULONG)KernelMemory + KernelBase; + if(!MemLoadAddr) + MemLoadAddr = (PCHAR)NextModuleBase; + + ModuleData = &reactos_modules[LoaderBlock.ModsCount]; printf("Loading file (elf at %x)\n", KernelAddr); /* Load the first 1024 bytes of the kernel image so we can read the PE header */ @@ -438,6 +444,8 @@ printf("Section %d (NT Header) is elf section %d\n", i, SWAPD(Section->PointerToRawData)); + Section->PointerToRawData = SWAPD((Section->VirtualAddress - KernelAddr)); + if (shdr->sh_type != SHT_NOBITS) { /* Content area */ @@ -560,7 +568,6 @@ MmFreeMemory(sptr); - ModuleData = &reactos_modules[LoaderBlock.ModsCount]; ModuleData->ModStart = (ULONG)KernelMemory; /* Increase the next Load Base */ NextModuleBase = ROUND_UP((ULONG)KernelMemory + ImageSize, PAGE_SIZE); Modified: branches/powerpc/reactos/boot/freeldr/freeldr/include/reactos.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/include/reactos.h (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/include/reactos.h Mon May 14 10:00:32 2007 @@ -62,6 +62,7 @@ BOOLEAN NTAPI FrLdrMapKernel(FILE *KernelImage); ULONG_PTR NTAPI FrLdrCreateModule(LPCSTR ModuleName); ULONG_PTR NTAPI FrLdrLoadModule(FILE *ModuleImage, LPCSTR ModuleName, PULONG ModuleSize); +BOOLEAN NTAPI FrLdrMapModule(FILE *ModuleImage, PCHAR ModuleName, PCHAR MemLoadAddr, ULONG KernelAddr); BOOLEAN NTAPI FrLdrCloseModule(ULONG_PTR ModuleBase, ULONG dwModuleSize); VOID NTAPI FrLdrStartup(ULONG Magic); typedef VOID (FASTCALL *ASMCODE)(ULONG Magic, PROS_LOADER_PARAMETER_BLOCK LoaderBlock); Modified: branches/powerpc/reactos/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/reactos/reactos.c (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/reactos/reactos.c Mon May 14 10:00:32 2007 @@ -308,6 +308,8 @@ CHAR value[256]; LPSTR p; + printf("Loading driver %s\n", szFileName); + /* Open the Driver */ FilePointer = FsOpenFile(szFileName); @@ -336,7 +338,7 @@ UiDrawStatusText(value); /* Load the driver */ - FrLdrLoadModule(FilePointer, szFileName, NULL); + FrLdrMapModule(FilePointer, szFileName, 0, 0); /* Update status and return */ UiDrawProgressBarCenter(nPos, 100, szLoadingMsg);

1 0

[ion] 26775: - Delete CmiGetPackedNameLength, CmiComparePackedNames, CmiCompareHash, CmiCompareHashI, CmiCompareKeyNames, CmiCompareKeyNamesI; dead code.
by ion＠svn.reactos.org 14 May '07

14 May '07

Author: ion Date: Mon May 14 09:43:27 2007 New Revision: 26775 URL: http://svn.reactos.org/svn/reactos?rev=26775&view=rev Log: - Delete CmiGetPackedNameLength, CmiComparePackedNames, CmiCompareHash, CmiCompareHashI, CmiCompareKeyNames, CmiCompareKeyNamesI; dead code. Modified: trunk/reactos/ntoskrnl/cm/cm.h trunk/reactos/ntoskrnl/cm/regfile.c Modified: trunk/reactos/ntoskrnl/cm/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/cm.h?rev=26775… ============================================================================== --- trunk/reactos/ntoskrnl/cm/cm.h (original) +++ trunk/reactos/ntoskrnl/cm/cm.h Mon May 14 09:43:27 2007 @@ -210,15 +210,9 @@ PKEY_OBJECT* ReturnedObject); NTSTATUS -CmiCreateVolatileHive(PEREGISTRY_HIVE *RegistryHive); - -NTSTATUS CmiLoadHive(POBJECT_ATTRIBUTES KeyObjectAttributes, PUNICODE_STRING FileName, ULONG Flags); - -NTSTATUS -CmiRemoveRegistryHive(PEREGISTRY_HIVE RegistryHive); NTSTATUS CmiFlushRegistryHive(PEREGISTRY_HIVE RegistryHive); @@ -335,16 +329,6 @@ NTSTATUS CmiInitHives(BOOLEAN SetupBoot); -ULONG -CmiGetPackedNameLength(IN PUNICODE_STRING Name, - OUT PBOOLEAN Packable); - -BOOLEAN -CmiComparePackedNames(IN PUNICODE_STRING Name, - IN PUCHAR NameBuffer, - IN USHORT NameBufferSize, - IN BOOLEAN NamePacked); - HCELL_INDEX NTAPI CmpFindValueByName( @@ -365,23 +349,6 @@ CmiCopyPackedName(PWCHAR NameBuffer, PUCHAR PackedNameBuffer, ULONG PackedNameSize); - -BOOLEAN -CmiCompareHash(PUNICODE_STRING KeyName, - PCHAR HashString); - -BOOLEAN -CmiCompareHashI(PUNICODE_STRING KeyName, - PCHAR HashString); - -BOOLEAN -CmiCompareKeyNames(PUNICODE_STRING KeyName, - PCM_KEY_NODE KeyCell); - -BOOLEAN -CmiCompareKeyNamesI(PUNICODE_STRING KeyName, - PCM_KEY_NODE KeyCell); - VOID CmiSyncHives(VOID); 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 Mon May 14 09:43:27 2007 @@ -527,7 +527,6 @@ return(Status); } - NTSTATUS CmiRemoveSubKey(PEREGISTRY_HIVE RegistryHive, PKEY_OBJECT ParentKey, @@ -697,7 +696,6 @@ return Status; } - PCM_KEY_NODE CmiGetKeyFromHashByIndex(PEREGISTRY_HIVE RegistryHive, PHASH_TABLE_CELL HashBlock, @@ -711,7 +709,6 @@ return KeyCell; } - NTSTATUS CmiAddKeyToHashTable(PEREGISTRY_HIVE RegistryHive, @@ -735,7 +732,6 @@ return STATUS_SUCCESS; } - NTSTATUS CmiRemoveKeyFromHashTable(PEREGISTRY_HIVE RegistryHive, PHASH_TABLE_CELL HashBlock, @@ -758,67 +754,6 @@ return STATUS_UNSUCCESSFUL; } -ULONG -CmiGetPackedNameLength(IN PUNICODE_STRING Name, - OUT PBOOLEAN Packable) -{ - ULONG i; - - if (Packable != NULL) - *Packable = TRUE; - - for (i = 0; i < Name->Length / sizeof(WCHAR); i++) - { - if (Name->Buffer[i] & 0xFF00) - { - if (Packable != NULL) - *Packable = FALSE; - return Name->Length; - } - } - - return (Name->Length / sizeof(WCHAR)); -} - - -BOOLEAN -CmiComparePackedNames(IN PUNICODE_STRING Name, - IN PUCHAR NameBuffer, - IN USHORT NameBufferSize, - IN BOOLEAN NamePacked) -{ - PWCHAR UNameBuffer; - ULONG i; - - if (NamePacked == TRUE) - { - if (Name->Length != NameBufferSize * sizeof(WCHAR)) - return(FALSE); - - for (i = 0; i < Name->Length / sizeof(WCHAR); i++) - { - if (RtlUpcaseUnicodeChar(Name->Buffer[i]) != RtlUpcaseUnicodeChar((WCHAR)NameBuffer[i])) - return(FALSE); - } - } - else - { - if (Name->Length != NameBufferSize) - return(FALSE); - - UNameBuffer = (PWCHAR)NameBuffer; - - for (i = 0; i < Name->Length / sizeof(WCHAR); i++) - { - if (RtlUpcaseUnicodeChar(Name->Buffer[i]) != RtlUpcaseUnicodeChar(UNameBuffer[i])) - return(FALSE); - } - } - - return(TRUE); -} - - VOID CmiCopyPackedName(PWCHAR NameBuffer, PUCHAR PackedNameBuffer, @@ -830,113 +765,6 @@ NameBuffer[i] = (WCHAR)PackedNameBuffer[i]; } - -BOOLEAN -CmiCompareHash(PUNICODE_STRING KeyName, - PCHAR HashString) -{ - CHAR Buffer[4]; - - Buffer[0] = (KeyName->Length >= 2) ? (CHAR)KeyName->Buffer[0] : 0; - Buffer[1] = (KeyName->Length >= 4) ? (CHAR)KeyName->Buffer[1] : 0; - Buffer[2] = (KeyName->Length >= 6) ? (CHAR)KeyName->Buffer[2] : 0; - Buffer[3] = (KeyName->Length >= 8) ? (CHAR)KeyName->Buffer[3] : 0; - - return (strncmp(Buffer, HashString, 4) == 0); -} - - -BOOLEAN -CmiCompareHashI(PUNICODE_STRING KeyName, - PCHAR HashString) -{ - CHAR Buffer[4]; - - Buffer[0] = (KeyName->Length >= 2) ? (CHAR)KeyName->Buffer[0] : 0; - Buffer[1] = (KeyName->Length >= 4) ? (CHAR)KeyName->Buffer[1] : 0; - Buffer[2] = (KeyName->Length >= 6) ? (CHAR)KeyName->Buffer[2] : 0; - Buffer[3] = (KeyName->Length >= 8) ? (CHAR)KeyName->Buffer[3] : 0; - - return (_strnicmp(Buffer, HashString, 4) == 0); -} - - -BOOLEAN -CmiCompareKeyNames(PUNICODE_STRING KeyName, - PCM_KEY_NODE KeyCell) -{ - PWCHAR UnicodeName; - USHORT i; - - DPRINT("Flags: %hx\n", KeyCell->Flags); - - if (KeyCell->Flags & REG_KEY_NAME_PACKED) - { - if (KeyName->Length != KeyCell->NameSize * sizeof(WCHAR)) - return FALSE; - - for (i = 0; i < KeyCell->NameSize; i++) - { - if (KeyName->Buffer[i] != (WCHAR)KeyCell->Name[i]) - return FALSE; - } - } - else - { - if (KeyName->Length != KeyCell->NameSize) - return FALSE; - - UnicodeName = (PWCHAR)KeyCell->Name; - for (i = 0; i < KeyCell->NameSize / sizeof(WCHAR); i++) - { - if (KeyName->Buffer[i] != UnicodeName[i]) - return FALSE; - } - } - - return TRUE; -} - - -BOOLEAN -CmiCompareKeyNamesI(PUNICODE_STRING KeyName, - PCM_KEY_NODE KeyCell) -{ - PWCHAR UnicodeName; - USHORT i; - - DPRINT("Flags: %hx\n", KeyCell->Flags); - - if (KeyCell->Flags & REG_KEY_NAME_PACKED) - { - if (KeyName->Length != KeyCell->NameSize * sizeof(WCHAR)) - return FALSE; - - for (i = 0; i < KeyCell->NameSize; i++) - { - if (RtlUpcaseUnicodeChar(KeyName->Buffer[i]) != - RtlUpcaseUnicodeChar((WCHAR)KeyCell->Name[i])) - return FALSE; - } - } - else - { - if (KeyName->Length != KeyCell->NameSize) - return FALSE; - - UnicodeName = (PWCHAR)KeyCell->Name; - for (i = 0; i < KeyCell->NameSize / sizeof(WCHAR); i++) - { - if (RtlUpcaseUnicodeChar(KeyName->Buffer[i]) != - RtlUpcaseUnicodeChar(UnicodeName[i])) - return FALSE; - } - } - - return TRUE; -} - - NTSTATUS CmiSaveTempHive (PEREGISTRY_HIVE Hive, HANDLE FileHandle)

1 0

[ion] 26774: - Implement NtQueryValueKey as a simple wrapper around CmQueryValueKey (same idea as always). - Add cmvalche.c to deal with Value Caches. Cm implements these to quickly look up either the value list and/or the value index and/or the value data itself. The routines fallback on non-cached access, which is what we currently do, since we don't have value caches yet. - Implement CmQueryValueKey and CmpQueryKeyValueData based on previous code, but update to use value caches and new routin
by ion＠svn.reactos.org 14 May '07

14 May '07

Author: ion Date: Mon May 14 09:36:25 2007 New Revision: 26774 URL: http://svn.reactos.org/svn/reactos?rev=26774&view=rev Log: - Implement NtQueryValueKey as a simple wrapper around CmQueryValueKey (same idea as always). - Add cmvalche.c to deal with Value Caches. Cm implements these to quickly look up either the value list and/or the value index and/or the value data itself. The routines fallback on non-cached access, which is what we currently do, since we don't have value caches yet. - Implement CmQueryValueKey and CmpQueryKeyValueData based on previous code, but update to use value caches and new routines. Added: trunk/reactos/ntoskrnl/config/cmvalche.c Modified: trunk/reactos/ntoskrnl/cm/cm.h trunk/reactos/ntoskrnl/cm/ntfunc.c trunk/reactos/ntoskrnl/config/cm.h trunk/reactos/ntoskrnl/config/cmapi.c trunk/reactos/ntoskrnl/config/cmname.c trunk/reactos/ntoskrnl/ntoskrnl.rbuild Modified: trunk/reactos/ntoskrnl/cm/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/cm.h?rev=26774… ============================================================================== --- trunk/reactos/ntoskrnl/cm/cm.h (original) +++ trunk/reactos/ntoskrnl/cm/cm.h Mon May 14 09:36:25 2007 @@ -48,6 +48,20 @@ #define IsNoFileHive(Hive) ((Hive)->Flags & HIVE_NO_FILE) #define IsNoSynchHive(Hive) ((Hive)->Flags & HIVE_NO_SYNCH) +// +// Cached Child List +// +typedef struct _CACHED_CHILD_LIST +{ + ULONG Count; + union + { + ULONG ValueList; + //struct _CM_KEY_CONTROL_BLOCK *RealKcb; + struct _KEY_OBJECT *RealKcb; + }; +} CACHED_CHILD_LIST, *PCACHED_CHILD_LIST; + /* KEY_OBJECT.Flags */ /* When set, the key is scheduled for deletion, and all @@ -96,6 +110,8 @@ /* List entry for connected hives */ LIST_ENTRY HiveList; + + CACHED_CHILD_LIST ValueCache; } KEY_OBJECT, *PKEY_OBJECT; /* Bits 31-22 (top 10 bits) of the cell index is the directory index */ @@ -264,6 +280,15 @@ NTAPI CmDeleteValueKey(IN PKEY_OBJECT KeyControlBlock, IN UNICODE_STRING ValueName); + +NTSTATUS +NTAPI +CmQueryValueKey(IN PKEY_OBJECT KeyObject, + IN UNICODE_STRING ValueName, + IN KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, + IN PVOID KeyValueInformation, + IN ULONG Length, + IN PULONG ResultLength); NTSTATUS CmiAllocateHashTableCell(IN PEREGISTRY_HIVE RegistryHive, Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/ntfunc.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/cm/ntfunc.c (original) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c Mon May 14 09:36:25 2007 @@ -385,6 +385,8 @@ KeyObject->KeyCell->Parent = KeyObject->ParentKey->KeyCellOffset; KeyObject->KeyCell->SecurityKeyOffset = KeyObject->ParentKey->KeyCell->SecurityKeyOffset; + KeyObject->ValueCache.ValueList = KeyObject->KeyCell->ValueList.List; + KeyObject->ValueCache.Count = KeyObject->KeyCell->ValueList.Count; DPRINT("RemainingPath: %wZ\n", &RemainingPath); @@ -1536,267 +1538,57 @@ return(Status); } - -NTSTATUS STDCALL +NTSTATUS +NTAPI NtQueryValueKey(IN HANDLE KeyHandle, - IN PUNICODE_STRING ValueName, - IN KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, - OUT PVOID KeyValueInformation, - IN ULONG Length, - OUT PULONG ResultLength) -{ - NTSTATUS Status; - ULONG NameSize, DataSize; - PKEY_OBJECT KeyObject; - PEREGISTRY_HIVE RegistryHive; - PCM_KEY_NODE KeyCell; - PCM_KEY_VALUE ValueCell; - PVOID DataCell; - PKEY_VALUE_BASIC_INFORMATION ValueBasicInformation; - PKEY_VALUE_PARTIAL_INFORMATION ValuePartialInformation; - PKEY_VALUE_FULL_INFORMATION ValueFullInformation; - REG_QUERY_VALUE_KEY_INFORMATION QueryValueKeyInfo; - REG_POST_OPERATION_INFORMATION PostOperationInfo; - - PAGED_CODE(); - - DPRINT("NtQueryValueKey(KeyHandle 0x%p ValueName %S Length %x)\n", - KeyHandle, ValueName->Buffer, Length); - - /* Verify that the handle is valid and is a registry key */ - Status = ObReferenceObjectByHandle(KeyHandle, - KEY_QUERY_VALUE, - CmpKeyObjectType, - ExGetPreviousMode(), - (PVOID *)&KeyObject, - NULL); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("ObReferenceObjectByHandle() failed with status %x %p\n", Status, KeyHandle); - return Status; - } - - PostOperationInfo.Object = (PVOID)KeyObject; - QueryValueKeyInfo.Object = (PVOID)KeyObject; - QueryValueKeyInfo.ValueName = ValueName; - QueryValueKeyInfo.KeyValueInformationClass = KeyValueInformationClass; - QueryValueKeyInfo.Length = Length; - QueryValueKeyInfo.ResultLength = ResultLength; - - Status = CmiCallRegisteredCallbacks(RegNtPreQueryValueKey, &QueryValueKeyInfo); - if (!NT_SUCCESS(Status)) - { - PostOperationInfo.Status = Status; - CmiCallRegisteredCallbacks(RegNtPostQueryValueKey, &PostOperationInfo); - ObDereferenceObject(KeyObject); - return Status; - } - - /* Acquire hive lock */ - KeEnterCriticalRegion(); - ExAcquireResourceSharedLite(&CmpRegistryLock, TRUE); - - VERIFY_KEY_OBJECT(KeyObject); - - /* Get pointer to KeyCell */ - KeyCell = KeyObject->KeyCell; - RegistryHive = KeyObject->RegistryHive; - - /* Get value cell by name */ - Status = CmiScanKeyForValue(RegistryHive, - KeyCell, - ValueName, - &ValueCell, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT("CmiScanKeyForValue() failed with status %x\n", Status); - goto ByeBye; - } - - Status = STATUS_SUCCESS; - switch (KeyValueInformationClass) - { - case KeyValueBasicInformation: - NameSize = ValueCell->NameSize; - if (ValueCell->Flags & REG_VALUE_NAME_PACKED) - { - NameSize *= sizeof(WCHAR); - } - - *ResultLength = FIELD_OFFSET(KEY_VALUE_BASIC_INFORMATION, Name[0]) + - NameSize; - - if (Length < FIELD_OFFSET(KEY_VALUE_BASIC_INFORMATION, Name[0])) - { - Status = STATUS_BUFFER_TOO_SMALL; - } - else - { - ValueBasicInformation = (PKEY_VALUE_BASIC_INFORMATION) - KeyValueInformation; - ValueBasicInformation->TitleIndex = 0; - ValueBasicInformation->Type = ValueCell->DataType; - ValueBasicInformation->NameLength = NameSize; - - if (Length - FIELD_OFFSET(KEY_VALUE_BASIC_INFORMATION, Name[0]) < - NameSize) - { - NameSize = Length - FIELD_OFFSET(KEY_VALUE_BASIC_INFORMATION, Name[0]); - Status = STATUS_BUFFER_OVERFLOW; - CHECKPOINT; - } - - if (ValueCell->Flags & REG_VALUE_NAME_PACKED) - { - CmiCopyPackedName(ValueBasicInformation->Name, - ValueCell->Name, - NameSize / sizeof(WCHAR)); - } - else - { - RtlCopyMemory(ValueBasicInformation->Name, - ValueCell->Name, - NameSize); - } - } - break; - - case KeyValuePartialInformation: - DataSize = ValueCell->DataSize & REG_DATA_SIZE_MASK; - - *ResultLength = FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[0]) + - DataSize; - - if (Length < FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[0])) - { - Status = STATUS_BUFFER_TOO_SMALL; - } - else - { - ValuePartialInformation = (PKEY_VALUE_PARTIAL_INFORMATION) - KeyValueInformation; - ValuePartialInformation->TitleIndex = 0; - ValuePartialInformation->Type = ValueCell->DataType; - ValuePartialInformation->DataLength = DataSize; - - if (Length - FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[0]) < - DataSize) - { - DataSize = Length - FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[0]); - Status = STATUS_BUFFER_OVERFLOW; - CHECKPOINT; - } - - if (!(ValueCell->DataSize & REG_DATA_IN_OFFSET)) - { - DataCell = HvGetCell (&RegistryHive->Hive, ValueCell->DataOffset); - RtlCopyMemory(ValuePartialInformation->Data, - DataCell, - DataSize); - } - else - { - RtlCopyMemory(ValuePartialInformation->Data, - &ValueCell->DataOffset, - DataSize); - } - } - break; - - case KeyValueFullInformation: - NameSize = ValueCell->NameSize; - if (ValueCell->Flags & REG_VALUE_NAME_PACKED) - { - NameSize *= sizeof(WCHAR); - } - DataSize = ValueCell->DataSize & REG_DATA_SIZE_MASK; - - *ResultLength = ROUND_UP(FIELD_OFFSET(KEY_VALUE_FULL_INFORMATION, - Name[0]) + NameSize, sizeof(PVOID)) + DataSize; - - if (Length < FIELD_OFFSET(KEY_VALUE_FULL_INFORMATION, Name[0])) - { - Status = STATUS_BUFFER_TOO_SMALL; - } - else - { - ValueFullInformation = (PKEY_VALUE_FULL_INFORMATION) - KeyValueInformation; - ValueFullInformation->TitleIndex = 0; - ValueFullInformation->Type = ValueCell->DataType; - ValueFullInformation->NameLength = NameSize; - ValueFullInformation->DataOffset = - (ULONG_PTR)ValueFullInformation->Name - - (ULONG_PTR)ValueFullInformation + - ValueFullInformation->NameLength; - ValueFullInformation->DataOffset = - ROUND_UP(ValueFullInformation->DataOffset, sizeof(PVOID)); - ValueFullInformation->DataLength = ValueCell->DataSize & REG_DATA_SIZE_MASK; - - if (Length - FIELD_OFFSET(KEY_VALUE_FULL_INFORMATION, Name[0]) < - NameSize) - { - NameSize = Length - FIELD_OFFSET(KEY_VALUE_FULL_INFORMATION, Name[0]); - DataSize = 0; - Status = STATUS_BUFFER_OVERFLOW; - CHECKPOINT; - } - else if (ROUND_UP(Length - FIELD_OFFSET(KEY_VALUE_FULL_INFORMATION, - Name[0]) - NameSize, sizeof(PVOID)) < DataSize) - { - DataSize = ROUND_UP(Length - FIELD_OFFSET(KEY_VALUE_FULL_INFORMATION, - Name[0]) - NameSize, sizeof(PVOID)); - Status = STATUS_BUFFER_OVERFLOW; - CHECKPOINT; - } - - if (ValueCell->Flags & REG_VALUE_NAME_PACKED) - { - CmiCopyPackedName(ValueFullInformation->Name, - ValueCell->Name, - NameSize / sizeof(WCHAR)); - } - else - { - RtlCopyMemory(ValueFullInformation->Name, - ValueCell->Name, - NameSize); - } - if (!(ValueCell->DataSize & REG_DATA_IN_OFFSET)) - { - DataCell = HvGetCell (&RegistryHive->Hive, ValueCell->DataOffset); - RtlCopyMemory((PCHAR) ValueFullInformation - + ValueFullInformation->DataOffset, - DataCell, - DataSize); - } - else - { - RtlCopyMemory((PCHAR) ValueFullInformation - + ValueFullInformation->DataOffset, - &ValueCell->DataOffset, - DataSize); - } - } - break; - - default: - DPRINT1("Not handling 0x%x\n", KeyValueInformationClass); - Status = STATUS_INVALID_INFO_CLASS; - break; - } - -ByeBye:; - ExReleaseResourceLite(&CmpRegistryLock); - KeLeaveCriticalRegion(); - - PostOperationInfo.Status = Status; - CmiCallRegisteredCallbacks(RegNtPostQueryValueKey, &PostOperationInfo); - ObDereferenceObject(KeyObject); - - return Status; + IN PUNICODE_STRING ValueName, + IN KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, + OUT PVOID KeyValueInformation, + IN ULONG Length, + OUT PULONG ResultLength) +{ + NTSTATUS Status; + PKEY_OBJECT KeyObject; + REG_QUERY_VALUE_KEY_INFORMATION QueryValueKeyInfo; + REG_POST_OPERATION_INFORMATION PostOperationInfo; + PAGED_CODE(); + + /* Verify that the handle is valid and is a registry key */ + Status = ObReferenceObjectByHandle(KeyHandle, + KEY_QUERY_VALUE, + CmpKeyObjectType, + ExGetPreviousMode(), + (PVOID *)&KeyObject, + NULL); + if (!NT_SUCCESS(Status)) return Status; + + /* Setup the callback */ + PostOperationInfo.Object = (PVOID)KeyObject; + QueryValueKeyInfo.Object = (PVOID)KeyObject; + QueryValueKeyInfo.ValueName = ValueName; + QueryValueKeyInfo.KeyValueInformationClass = KeyValueInformationClass; + QueryValueKeyInfo.Length = Length; + QueryValueKeyInfo.ResultLength = ResultLength; + + /* Do the callback */ + Status = CmiCallRegisteredCallbacks(RegNtPreQueryValueKey, &QueryValueKeyInfo); + if (NT_SUCCESS(Status)) + { + /* Call the internal API */ + Status = CmQueryValueKey(KeyObject, + *ValueName, + KeyValueInformationClass, + KeyValueInformation, + Length, + ResultLength); + + /* Do the post callback */ + PostOperationInfo.Status = Status; + CmiCallRegisteredCallbacks(RegNtPostQueryValueKey, &PostOperationInfo); + } + + ObDereferenceObject(KeyObject); + return Status; } NTSTATUS Modified: trunk/reactos/ntoskrnl/config/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cm.h?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/config/cm.h (original) +++ trunk/reactos/ntoskrnl/config/cm.h Mon May 14 09:36:25 2007 @@ -158,6 +158,11 @@ #define CMP_LOCK_HASHES_FOR_KCB 0x2 // +// Maximum size of Value Cache +// +#define MAXIMUM_CACHED_DATA 2 * PAGE_SIZE + +// // Number of items that can fit inside an Allocation Page // #define CM_KCBS_PER_PAGE \ @@ -166,6 +171,16 @@ PAGE_SIZE / sizeof(CM_DELAYED_CLOSE_ENTRY) #ifndef __INCLUDE_CM_H + +// +// Value Search Results +// +typedef enum _VALUE_SEARCH_RETURN_TYPE +{ + SearchSuccess, + SearchNeedExclusiveLock, + SearchFail +} VALUE_SEARCH_RETURN_TYPE; // // Key Hash @@ -238,7 +253,8 @@ union { ULONG ValueList; - struct _CM_KEY_CONTROL_BLOCK *RealKcb; + //struct _CM_KEY_CONTROL_BLOCK *RealKcb; + struct _KEY_OBJECT *RealKcb; }; } CACHED_CHILD_LIST, *PCACHED_CHILD_LIST; @@ -595,6 +611,7 @@ { USHORT DataCacheType; USHORT ValueKeySize; + ULONG HashKey; CM_KEY_VALUE KeyValue; } CM_CACHED_VALUE, *PCM_CACHED_VALUE; @@ -643,6 +660,20 @@ PULONG BufferLength; PULONG Type; } CM_SYSTEM_CONTROL_VECTOR, *PCM_SYSTEM_CONTROL_VECTOR; + +// +// Structure for CmpQueryValueDataFromCache +// +typedef struct _KEY_VALUE_INFORMATION +{ + union + { + KEY_VALUE_BASIC_INFORMATION KeyValueBasicInformation; + KEY_VALUE_FULL_INFORMATION KeyValueFullInformation; + KEY_VALUE_PARTIAL_INFORMATION KeyValuePartialInformation; + KEY_VALUE_PARTIAL_INFORMATION_ALIGN64 KeyValuePartialInformationAlign64; + }; +} KEY_VALUE_INFORMATION, *PKEY_VALUE_INFORMATION; /////////////////////////////////////////////////////////////////////////////// // @@ -679,6 +710,7 @@ struct _KEY_OBJECT **SubKeys; ULONG TimeStamp; LIST_ENTRY HiveList; + CACHED_CHILD_LIST ValueCache; } KEY_OBJECT, *PKEY_OBJECT; extern PEREGISTRY_HIVE CmiVolatileHive; extern LIST_ENTRY CmiKeyObjectListHead, CmiConnectedHiveList; @@ -706,6 +738,35 @@ NTAPI CmpInitSecurityCache( IN PCMHIVE Hive +); + +// +// Value Cache Functions +// +VALUE_SEARCH_RETURN_TYPE +NTAPI +CmpFindValueByNameFromCache( + IN PKEY_OBJECT KeyObject, + IN PUNICODE_STRING Name, + OUT PCM_CACHED_VALUE **CachedValue, + OUT ULONG *Index, + OUT PCM_KEY_VALUE *Value, + OUT BOOLEAN *ValueIsCached, + OUT PHCELL_INDEX CellToRelease +); + +VALUE_SEARCH_RETURN_TYPE +NTAPI +CmpQueryKeyValueData( + IN PKEY_OBJECT KeyObject, + IN PCM_CACHED_VALUE *CachedValue, + IN PCM_KEY_VALUE ValueKey, + IN BOOLEAN ValueIsCached, + IN KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, + IN PVOID KeyValueInformation, + IN ULONG Length, + OUT PULONG ResultLength, + OUT PNTSTATUS Status ); // @@ -955,6 +1016,22 @@ USHORT NTAPI +CmpCompressedNameSize( + IN PWCHAR Name, + IN ULONG Length +); + +VOID +NTAPI +CmpCopyCompressedName( + IN PWCHAR Destination, + IN ULONG DestinationLength, + IN PWCHAR Source, + IN ULONG SourceLength +); + +USHORT +NTAPI CmpCopyName( IN PHHIVE Hive, IN PWCHAR Destination, @@ -1000,6 +1077,14 @@ IN PHHIVE Hive, IN PCM_KEY_NODE Parent, IN PUNICODE_STRING SearchName +); + +ULONG +NTAPI +CmpComputeHashKey( + IN ULONG Hash, + IN PUNICODE_STRING Name, + IN BOOLEAN AllowSeparators ); // @@ -1070,6 +1155,17 @@ IN PHHIVE Hive, IN ULONG Index, IN OUT PCHILD_LIST ChildList +); + +BOOLEAN +NTAPI +CmpGetValueData( + IN PHHIVE Hive, + IN PCM_KEY_VALUE Value, + IN PULONG Length, + OUT PVOID *Buffer, + OUT PBOOLEAN BufferAllocated, + OUT PHCELL_INDEX CellToRelease ); // Modified: trunk/reactos/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmapi.c (original) +++ trunk/reactos/ntoskrnl/config/cmapi.c Mon May 14 09:36:25 2007 @@ -433,7 +433,7 @@ Parent->MaxValueDataLen = 0; } - /* Change default status to success */ + /* Change default Status to success */ Status = STATUS_SUCCESS; } @@ -454,3 +454,68 @@ KeLeaveCriticalRegion(); return Status; } + +NTSTATUS +NTAPI +CmQueryValueKey(IN PKEY_OBJECT KeyObject, + IN UNICODE_STRING ValueName, + IN KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, + IN PVOID KeyValueInformation, + IN ULONG Length, + IN PULONG ResultLength) +{ + NTSTATUS Status; + PCM_KEY_VALUE ValueData; + ULONG Index; + BOOLEAN ValueCached = FALSE; + PCM_CACHED_VALUE *CachedValue; + HCELL_INDEX CellToRelease; + VALUE_SEARCH_RETURN_TYPE Result; + PHHIVE Hive; + PAGED_CODE(); + + /* Acquire hive lock */ + KeEnterCriticalRegion(); + ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); + + /* Get the hive */ + Hive = &KeyObject->RegistryHive->Hive; + + /* Find the key value */ + Result = CmpFindValueByNameFromCache(KeyObject, + &ValueName, + &CachedValue, + &Index, + &ValueData, + &ValueCached, + &CellToRelease); + if (Result == SearchSuccess) + { + /* Sanity check */ + ASSERT(ValueData != NULL); + + /* Query the information requested */ + Result = CmpQueryKeyValueData(KeyObject, + CachedValue, + ValueData, + ValueCached, + KeyValueInformationClass, + KeyValueInformation, + Length, + ResultLength, + &Status); + } + else + { + /* Failed to find the value */ + Status = STATUS_OBJECT_NAME_NOT_FOUND; + } + + /* If we have a cell to release, do so */ + if (CellToRelease != HCELL_NIL) HvReleaseCell(Hive, CellToRelease); + + /* Release hive lock */ + ExReleaseResourceLite(&CmpRegistryLock); + KeLeaveCriticalRegion(); + return Status; +} Modified: trunk/reactos/ntoskrnl/config/cmname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmname.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmname.c (original) +++ trunk/reactos/ntoskrnl/config/cmname.c Mon May 14 09:36:25 2007 @@ -52,6 +52,24 @@ return Source->Length / sizeof(WCHAR); } +VOID +NTAPI +CmpCopyCompressedName(IN PWCHAR Destination, + IN ULONG DestinationLength, + IN PWCHAR Source, + IN ULONG SourceLength) +{ + ULONG i, Length; + + /* Get the actual length to copy */ + Length = min(DestinationLength / sizeof(WCHAR), SourceLength); + for (i = 0; i < Length; i++) + { + /* Copy each character */ + Destination[i] = (WCHAR)((PCHAR)Source)[i]; + } +} + USHORT NTAPI CmpNameSize(IN PHHIVE Hive, @@ -71,6 +89,20 @@ /* Compressed name, return length */ return Name->Length / sizeof(WCHAR); +} + +USHORT +NTAPI +CmpCompressedNameSize(IN PWCHAR Name, + IN ULONG Length) +{ + /* + * Don't remove this: compressed names are "opaque" and just because + * the current implementation turns them into ansi-names doesn't mean + * that it will remain that way forever, so -never- assume this code + * below internally! + */ + return Length * sizeof(WCHAR); } LONG Added: trunk/reactos/ntoskrnl/config/cmvalche.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmvalche.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmvalche.c (added) +++ trunk/reactos/ntoskrnl/config/cmvalche.c Mon May 14 09:36:25 2007 @@ -1,0 +1,643 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/config/cmvalche.c + * PURPOSE: Configuration Manager - Value Cell Cache + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include "ntoskrnl.h" +#include "cm.h" +#define NDEBUG +#include "debug.h" + +FORCEINLINE +BOOLEAN +CmpIsValueCached(IN HCELL_INDEX CellIndex) +{ + /* Make sure that the cell is valid in the first place */ + if (CellIndex == HCELL_NIL) return FALSE; + + /*Is this cell actually a pointer to the cached value data? */ + if (CellIndex & 1) return TRUE; + + /* This is a regular cell */ + return FALSE; +} + +FORCEINLINE +VOID +CmpSetValueCached(IN PHCELL_INDEX CellIndex) +{ + /* Set the cached bit */ + *CellIndex |= 1; +} + +#define ASSERT_VALUE_CACHE() \ + ASSERTMSG("Cached Values Not Yet Supported!", FALSE); + +/* FUNCTIONS *****************************************************************/ + +VALUE_SEARCH_RETURN_TYPE +NTAPI +CmpGetValueListFromCache(IN PKEY_OBJECT KeyObject, + OUT PCELL_DATA *CellData, + OUT BOOLEAN *IndexIsCached, + OUT PHCELL_INDEX ValueListToRelease) +{ + PHHIVE Hive; + PCACHED_CHILD_LIST ChildList; + HCELL_INDEX CellToRelease; + + /* Set defaults */ + *ValueListToRelease = HCELL_NIL; + *IndexIsCached = FALSE; + + /* Get the hive */ + Hive = &KeyObject->RegistryHive->Hive; + + /* Get the child value cache */ + //ChildList = &KeyObject->ValueCache; + ChildList = (PCACHED_CHILD_LIST)&KeyObject->KeyCell->ValueList; + + /* Check if the value is cached */ + if (CmpIsValueCached(ChildList->ValueList)) + { + /* It is: we don't expect this yet! */ + ASSERT_VALUE_CACHE(); + *IndexIsCached = TRUE; + *CellData = NULL; + } + else + { + /* Select the value list as our cell, and get the actual list array */ + CellToRelease = ChildList->ValueList; + *CellData = (PCELL_DATA)HvGetCell(Hive, CellToRelease); + if (!(*CellData)) return SearchFail; + + /* Return the cell to be released */ + *ValueListToRelease = CellToRelease; + } + + /* If we got here, then the value list was found */ + return SearchSuccess; +} + +VALUE_SEARCH_RETURN_TYPE +NTAPI +CmpGetValueKeyFromCache(IN PKEY_OBJECT KeyObject, + IN PCELL_DATA CellData, + IN ULONG Index, + OUT PCM_CACHED_VALUE **CachedValue, + OUT PCM_KEY_VALUE *Value, + IN BOOLEAN IndexIsCached, + OUT BOOLEAN *ValueIsCached, + OUT PHCELL_INDEX CellToRelease) +{ + PHHIVE Hive; + PCM_KEY_VALUE KeyValue; + HCELL_INDEX Cell; + + /* Set defaults */ + *CellToRelease = HCELL_NIL; + *Value = NULL; + *ValueIsCached = FALSE; + + /* Get the hive */ + Hive = &KeyObject->RegistryHive->Hive; + + /* Check if the index was cached */ + if (IndexIsCached) + { + /* Not expected yet! */ + ASSERT_VALUE_CACHE(); + *ValueIsCached = TRUE; + } + else + { + /* Get the cell index and the key value associated to it */ + Cell = CellData->u.KeyList[Index]; + KeyValue = (PCM_KEY_VALUE)HvGetCell(Hive, Cell); + if (!KeyValue) return SearchFail; + + /* Return the cell and the actual key value */ + *CellToRelease = Cell; + *Value = KeyValue; + } + + /* If we got here, then we found the key value */ + return SearchSuccess; +} + +VALUE_SEARCH_RETURN_TYPE +NTAPI +CmpGetValueDataFromCache(IN PKEY_OBJECT KeyObject, + IN PCM_CACHED_VALUE *CachedValue, + IN PCELL_DATA ValueKey, + IN BOOLEAN ValueIsCached, + OUT PVOID *DataPointer, + OUT PBOOLEAN Allocated, + OUT PHCELL_INDEX CellToRelease) +{ + PHHIVE Hive; + ULONG Length; + + /* Sanity checks */ + ASSERT(MAXIMUM_CACHED_DATA < CM_KEY_VALUE_BIG); + ASSERT((ValueKey->u.KeyValue.DataLength & CM_KEY_VALUE_SPECIAL_SIZE) == 0); + + /* Set defaults */ + *DataPointer = NULL; + *Allocated = FALSE; + *CellToRelease = HCELL_NIL; + + /* Get the hive */ + Hive = &KeyObject->RegistryHive->Hive; + + /* Check it the value is cached */ + if (ValueIsCached) + { + /* This isn't expected! */ + ASSERT_VALUE_CACHE(); + } + else + { + /* It's not, get the value data using the typical routine */ + if (!CmpGetValueData(Hive, + &ValueKey->u.KeyValue, + &Length, + DataPointer, + Allocated, + CellToRelease)) + { + /* Nothing found: make sure no data was allocated */ + ASSERT(*Allocated == FALSE); + ASSERT(*DataPointer == NULL); + return SearchFail; + } + } + + /* We found the actual data, return success */ + return SearchSuccess; +} + +VALUE_SEARCH_RETURN_TYPE +NTAPI +CmpFindValueByNameFromCache(IN PKEY_OBJECT KeyObject, + IN PUNICODE_STRING Name, + OUT PCM_CACHED_VALUE **CachedValue, + OUT ULONG *Index, + OUT PCM_KEY_VALUE *Value, + OUT BOOLEAN *ValueIsCached, + OUT PHCELL_INDEX CellToRelease) +{ + PHHIVE Hive; + VALUE_SEARCH_RETURN_TYPE SearchResult = SearchFail; + LONG Result; + UNICODE_STRING SearchName; + PCELL_DATA CellData; + PCACHED_CHILD_LIST ChildList; + PCM_KEY_VALUE KeyValue; + BOOLEAN IndexIsCached; + ULONG i = 0; + HCELL_INDEX Cell = HCELL_NIL; + + /* Set defaults */ + *CellToRelease = HCELL_NIL; + *Value = NULL; + + /* Get the hive and child list */ + Hive = &KeyObject->RegistryHive->Hive; + //ChildList = &KeyObject->ValueCache; + ChildList = (PCACHED_CHILD_LIST)&KeyObject->KeyCell->ValueList; + + /* Check if the child list has any entries */ + if (ChildList->Count != 0) + { + /* Get the value list associated to this child list */ + SearchResult = CmpGetValueListFromCache(KeyObject, + &CellData, + &IndexIsCached, + &Cell); + if (SearchResult != SearchSuccess) return SearchResult; + + /* The index shouldn't be cached right now */ + if (IndexIsCached) ASSERT_VALUE_CACHE(); + + /* Loop every value */ + while (TRUE) + { + /* Check if there's any cell to release */ + if (*CellToRelease != HCELL_NIL) + { + /* Release it now */ + HvReleaseCell(Hive, *CellToRelease); + *CellToRelease = HCELL_NIL; + } + + /* Get the key value for this index */ + SearchResult = CmpGetValueKeyFromCache(KeyObject, + CellData, + i, + CachedValue, + Value, + IndexIsCached, + ValueIsCached, + CellToRelease); + if (SearchResult != SearchSuccess) return SearchResult; + + /* Check if the both the index and the value are cached */ + if ((IndexIsCached) && (*ValueIsCached)) + { + /* We don't expect this yet */ + ASSERT_VALUE_CACHE(); + Result = -1; + } + else + { + /* No cache, so try to compare the name. Is it compressed? */ + KeyValue = *Value; + if (KeyValue->Flags & VALUE_COMP_NAME) + { + /* It is, do a compressed name comparison */ + Result = CmpCompareCompressedName(Name, + KeyValue->Name, + KeyValue->NameLength); + } + else + { + /* It's not compressed, so do a standard comparison */ + SearchName.Length = KeyValue->NameLength; + SearchName.MaximumLength = SearchName.Length; + SearchName.Buffer = KeyValue->Name; + Result = RtlCompareUnicodeString(Name, &SearchName, TRUE); + } + } + + /* Check if we found the value data */ + if (!Result) + { + /* We have, return the index of the value and success */ + *Index = i; + SearchResult = SearchSuccess; + goto Quickie; + } + + /* We didn't find it, try the next entry */ + if (++i == ChildList->Count) + { + /* The entire list was parsed, fail */ + *Value = NULL; + SearchResult = SearchFail; + goto Quickie; + } + } + } + + /* We should only get here if the child list is empty */ + ASSERT(ChildList->Count == 0); + +Quickie: + /* Release the value list cell if required, and return search result */ + if (Cell != HCELL_NIL) HvReleaseCell(Hive, Cell); + return SearchResult; +} + +VALUE_SEARCH_RETURN_TYPE +NTAPI +CmpQueryKeyValueData(IN PKEY_OBJECT KeyObject, + IN PCM_CACHED_VALUE *CachedValue, + IN PCM_KEY_VALUE ValueKey, + IN BOOLEAN ValueIsCached, + IN KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, + IN PVOID KeyValueInformation, + IN ULONG Length, + OUT PULONG ResultLength, + OUT PNTSTATUS Status) +{ + PHHIVE Hive; + PKEY_VALUE_INFORMATION Info = (PKEY_VALUE_INFORMATION)KeyValueInformation; + PCELL_DATA CellData; + USHORT NameSize; + ULONG Size, MinimumSize, SizeLeft, KeySize, AlignedData = 0, DataOffset; + PVOID Buffer; + BOOLEAN IsSmall, BufferAllocated = FALSE; + HCELL_INDEX CellToRelease = HCELL_NIL; + VALUE_SEARCH_RETURN_TYPE Result = SearchSuccess; + + /* Get the hive and cell data */ + Hive = &KeyObject->RegistryHive->Hive; + CellData = (PCELL_DATA)ValueKey; + + /* Check if the value is compressed */ + if (CellData->u.KeyValue.Flags & VALUE_COMP_NAME) + { + /* Get the compressed name size */ + NameSize = CmpCompressedNameSize(CellData->u.KeyValue.Name, + CellData->u.KeyValue.NameLength); + } + else + { + /* Get the real size */ + NameSize = CellData->u.KeyValue.NameLength; + } + + /* Check what kind of information the caller is requesting */ + switch (KeyValueInformationClass) + { + /* Basic information */ + case KeyValueBasicInformation: + + /* This is how much size we'll need */ + Size = FIELD_OFFSET(KEY_VALUE_BASIC_INFORMATION, Name) + NameSize; + + /* This is the minimum we can work with */ + MinimumSize = FIELD_OFFSET(KEY_VALUE_BASIC_INFORMATION, Name); + + /* Return the size we'd like, and assume success */ + *ResultLength = Size; + *Status = STATUS_SUCCESS; + + /* Check if the caller gave us below our minimum */ + if (Length < MinimumSize) + { + /* Then we must fail */ + *Status = STATUS_BUFFER_TOO_SMALL; + break; + } + + /* Fill out the basic information */ + Info->KeyValueBasicInformation.TitleIndex = 0; + Info->KeyValueBasicInformation.Type = CellData->u.KeyValue.Type; + Info->KeyValueBasicInformation.NameLength = NameSize; + + /* Now only the name is left */ + SizeLeft = Length - MinimumSize; + Size = NameSize; + + /* Check if the remaining buffer is too small for the name */ + if (SizeLeft < Size) + { + /* Copy only as much as can fit, and tell the caller */ + Size = SizeLeft; + *Status = STATUS_BUFFER_OVERFLOW; + } + + /* Check if this is a compressed name */ + if (CellData->u.KeyValue.Flags & VALUE_COMP_NAME) + { + /* Copy as much as we can of the compressed name */ + CmpCopyCompressedName(Info->KeyValueBasicInformation.Name, + Size, + CellData->u.KeyValue.Name, + CellData->u.KeyValue.NameLength); + } + else + { + /* Copy as much as we can of the raw name */ + RtlCopyMemory(Info->KeyValueBasicInformation.Name, + CellData->u.KeyValue.Name, + Size); + } + + /* We're all done */ + break; + + /* Full key information */ + case KeyValueFullInformation: + + /* Check if this is a small key and compute key size */ + IsSmall = CmpIsKeyValueSmall(&KeySize, + CellData->u.KeyValue.DataLength); + + /* Calculate the total size required */ + Size = FIELD_OFFSET(KEY_VALUE_FULL_INFORMATION, Name) + + NameSize + + KeySize; + + /* And this is the least we can work with */ + MinimumSize = FIELD_OFFSET(KEY_VALUE_FULL_INFORMATION, Name); + + /* Check if there's any key data */ + if (KeySize > 0) + { + /* Calculate the data offset */ + DataOffset = Size - KeySize; + + /* Align the offset to 4 bytes */ + AlignedData = ALIGN_UP(DataOffset, ULONG); + + /* If alignment was required, we'll need more space */ + if (AlignedData > DataOffset) Size += (AlignedData-DataOffset); + } + + /* Tell the caller the size we'll finally need, and set success */ + *ResultLength = Size; + *Status = STATUS_SUCCESS; + + /* Check if the caller is giving us too little */ + if (Length < MinimumSize) + { + /* Then fail right now */ + *Status = STATUS_BUFFER_TOO_SMALL; + break; + } + + /* Fill out the basic information */ + Info->KeyValueFullInformation.TitleIndex = 0; + Info->KeyValueFullInformation.Type = CellData->u.KeyValue.Type; + Info->KeyValueFullInformation.DataLength = KeySize; + Info->KeyValueFullInformation.NameLength = NameSize; + + /* Only the name is left now */ + SizeLeft = Length - MinimumSize; + Size = NameSize; + + /* Check if the name fits */ + if (SizeLeft < Size) + { + /* It doesn't, truncate what we'll copy, and tell the caller */ + Size = SizeLeft; + *Status = STATUS_BUFFER_OVERFLOW; + } + + /* Check if this key value is compressed */ + if (CellData->u.KeyValue.Flags & VALUE_COMP_NAME) + { + /* It is, copy the compressed name */ + CmpCopyCompressedName(Info->KeyValueFullInformation.Name, + Size, + CellData->u.KeyValue.Name, + CellData->u.KeyValue.NameLength); + } + else + { + /* It's not, copy the raw name */ + RtlCopyMemory(Info->KeyValueFullInformation.Name, + CellData->u.KeyValue.Name, + Size); + } + + /* Now check if the key had any data */ + if (KeySize > 0) + { + /* Was it a small key? */ + if (IsSmall) + { + /* Then the data is directly into the cell */ + Buffer = &CellData->u.KeyValue.Data; + } + else + { + /* Otherwise, we must retrieve it from the value cache */ + Result = CmpGetValueDataFromCache(KeyObject, + CachedValue, + CellData, + ValueIsCached, + &Buffer, + &BufferAllocated, + &CellToRelease); + if (Result != SearchSuccess) + { + /* We failed, nothing should be allocated */ + ASSERT(Buffer == NULL); + ASSERT(BufferAllocated == FALSE); + *Status = STATUS_INSUFFICIENT_RESOURCES; + } + } + + /* Now that we know we truly have data, set its offset */ + Info->KeyValueFullInformation.DataOffset = AlignedData; + + /* Only the data remains to be copied */ + SizeLeft = max(0, Length - AlignedData); + Size = KeySize; + + /* Check if the caller has no space for it */ + if (SizeLeft < Size) + { + /* Truncate what we'll copy, and tell the caller */ + Size = SizeLeft; + *Status = STATUS_BUFFER_OVERFLOW; + } + + /* Sanity check */ + ASSERT((IsSmall ? (Size <= CM_KEY_VALUE_SMALL) : TRUE)); + + /* Make sure we have a valid buffer */ + if (Buffer) + { + /* Copy the data into the aligned offset */ + RtlCopyMemory((PVOID)((ULONG_PTR)Info + AlignedData), + Buffer, + Size); + } + } + else + { + /* We don't have any data, set the offset to -1, not 0! */ + Info->KeyValueFullInformation.DataOffset = 0xFFFFFFFF; + } + + /* We're done! */ + break; + + /* Partial information requested (no name or alignment!) */ + case KeyValuePartialInformation: + + /* Check if this is a small key and compute key size */ + IsSmall = CmpIsKeyValueSmall(&KeySize, + CellData->u.KeyValue.DataLength); + + /* Calculate the total size required */ + Size = FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data) + KeySize; + + /* And this is the least we can work with */ + MinimumSize = FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data); + + /* Tell the caller the size we'll finally need, and set success */ + *ResultLength = Size; + *Status = STATUS_SUCCESS; + + /* Check if the caller is giving us too little */ + if (Length < MinimumSize) + { + /* Then fail right now */ + *Status = STATUS_BUFFER_TOO_SMALL; + break; + } + + /* Fill out the basic information */ + Info->KeyValuePartialInformation.TitleIndex = 0; + Info->KeyValuePartialInformation.Type = CellData->u.KeyValue.Type; + Info->KeyValuePartialInformation.DataLength = KeySize; + + /* Now check if the key had any data */ + if (KeySize > 0) + { + /* Was it a small key? */ + if (IsSmall) + { + /* Then the data is directly into the cell */ + Buffer = &CellData->u.KeyValue.Data; + } + else + { + /* Otherwise, we must retrieve it from the value cache */ + Result = CmpGetValueDataFromCache(KeyObject, + CachedValue, + CellData, + ValueIsCached, + &Buffer, + &BufferAllocated, + &CellToRelease); + if (Result != SearchSuccess) + { + /* We failed, nothing should be allocated */ + ASSERT(Buffer == NULL); + ASSERT(BufferAllocated == FALSE); + *Status = STATUS_INSUFFICIENT_RESOURCES; + } + } + + /* Only the data remains to be copied */ + SizeLeft = Length - MinimumSize; + Size = KeySize; + + /* Check if the caller has no space for it */ + if (SizeLeft < Size) + { + /* Truncate what we'll copy, and tell the caller */ + Size = SizeLeft; + *Status = STATUS_BUFFER_OVERFLOW; + } + + /* Sanity check */ + ASSERT((IsSmall ? (Size <= CM_KEY_VALUE_SMALL) : TRUE)); + + /* Make sure we have a valid buffer */ + if (Buffer) + { + /* Copy the data into the aligned offset */ + RtlCopyMemory(Info->KeyValuePartialInformation.Data, + Buffer, + Size); + } + } + + /* We're done! */ + break; + + /* Other information class */ + default: + + /* We got some class that we don't support */ + *Status = STATUS_INVALID_PARAMETER; + break; + } + + /* Return the search result as well */ + return Result; +} Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Mon May 14 09:36:25 2007 @@ -106,6 +106,7 @@ <file>cmsecach.c</file> <file>cmsysini.c</file> <file>cmvalue.c</file> + <file>cmvalche.c</file> <file>cmwraprs.c</file> </directory> <directory name="cm">

1 0

[jimtabor] 26773: Implement FLOATOBJ_GetFloat and Long, SetFloat and Long, and Neg.
by jimtabor＠svn.reactos.org 14 May '07

14 May '07

Author: jimtabor Date: Mon May 14 07:55:28 2007 New Revision: 26773 URL: http://svn.reactos.org/svn/reactos?rev=26773&view=rev Log: Implement FLOATOBJ_GetFloat and Long, SetFloat and Long, and Neg. Modified: trunk/reactos/subsystems/win32/win32k/eng/float.c Modified: trunk/reactos/subsystems/win32/win32k/eng/float.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/float.c (original) +++ trunk/reactos/subsystems/win32/win32k/eng/float.c Mon May 14 07:55:28 2007 @@ -26,10 +26,33 @@ * REVISION HISTORY: */ +/* INCLUDES *****************************************************************/ + #include <w32k.h> #define NDEBUG #include <debug.h> + +/* DEFINES *****************************************************************/ + +#ifdef __GNUC__ +#define FLOAT_TO_INT(in,out) \ + __asm__ __volatile__ ("fistpl %0" : "=m" (out) : "t" (in) : "st"); +#else +#define FLOAT_TO_INT(in,out) \ + __asm fld in \ + __asm fistp out +#endif + +/* the following deal with IEEE single-precision numbers */ +#define EXCESS 126L +#define SIGNBIT 0x80000000L +#define SIGN(fp) ((fp) & SIGNBIT) +#define EXP(fp) (((fp) >> 23L) & 0xFF) +#define MANT(fp) ((fp) & 0x7FFFFFL) +#define PACK(s,e,m) ((s) | ((e) << 23L) | (m)) + +/* FUNCTIONS *****************************************************************/ BOOL STDCALL @@ -75,6 +98,59 @@ } VOID +FASTCALL +EF_Negate(EFLOAT_S * efp) +{ +// Do it this way since ReactOS uses real FP. + if (SIGN(efp->lMant)) efp->lMant = efp->lMant & ~SIGNBIT; + else efp->lMant = efp->lMant | SIGNBIT; +} + +LONG +FASTCALL +EFtoF( EFLOAT_S * efp) +{ + long Mant, Exp, Sign = 0; + + if (!efp->lMant) return 0; + + Mant = efp->lMant; + Exp = efp->lExp; + Sign = SIGN(Mant); + +//// M$ storage emulation + Mant = ((Mant & 0x3fffffff)>>7); + Exp += (1 - EXCESS); +//// + Mant = MANT(Mant); + return PACK(Sign, Exp, Mant); +} + +VOID +FASTCALL +FtoEF( EFLOAT_S * efp, FLOATL f) +{ + long Mant, Exp; + gxf_long worker; + +#ifdef _X86_ + worker.l = f; // It's a float stored in a long. +#else + worker.f = f; +#endif + + Exp = EXP(worker.l); + Mant = MANT(worker.l); + +//// M$ storage emulation + Mant = ((Mant << 7) | 0x40000000 | SIGN(worker.l)); + Exp -= (1 - EXCESS); +//// + efp->lMant = Mant; + efp->lExp = Exp; +} + +VOID STDCALL FLOATOBJ_Add ( IN OUT PFLOATOBJ pf, @@ -169,8 +245,8 @@ FLOATOBJ_GetFloat ( IN PFLOATOBJ pf ) { // www.osr.com/ddk/graphics/gdifncs_4d5z.htm - UNIMPLEMENTED; - return 0; + EFLOAT_S * efp = (EFLOAT_S *)pf; + return EFtoF(efp); } LONG @@ -178,8 +254,14 @@ FLOATOBJ_GetLong ( IN PFLOATOBJ pf ) { // www.osr.com/ddk/graphics/gdifncs_0tgn.htm - UNIMPLEMENTED; - return 0; + EFLOAT_S * efp = (EFLOAT_S *)pf; + gxf_long f; + long l; + + f.l = EFtoF( efp ); + FLOAT_TO_INT(f.f, l); // Let FPP handle it the fasty haxy way. + + return l; } BOOL @@ -268,7 +350,8 @@ FLOATOBJ_Neg ( IN OUT PFLOATOBJ pf ) { // www.osr.com/ddk/graphics/gdifncs_14pz.htm - UNIMPLEMENTED; + EFLOAT_S * efp = (EFLOAT_S *)pf; + EF_Negate(efp); } VOID @@ -279,7 +362,8 @@ ) { // www.osr.com/ddk/graphics/gdifncs_1prb.htm - UNIMPLEMENTED; + EFLOAT_S * efp = (EFLOAT_S *)pf; + FtoEF( efp, f); } VOID @@ -290,7 +374,14 @@ ) { // www.osr.com/ddk/graphics/gdifncs_0gpz.htm - UNIMPLEMENTED; + EFLOAT_S * efp = (EFLOAT_S *)pf; + gxf_long f; + f.f = (float) l; // Convert it now. +#ifdef _X86_ + FtoEF( efp, f.l ); +#else + FtoEF( efp, f.f ); +#endif } VOID

1 0

[jimtabor] 26772: Update painting.c with new storage method for floating point operations.
by jimtabor＠svn.reactos.org 14 May '07

14 May '07

Author: jimtabor Date: Mon May 14 07:18:42 2007 New Revision: 26772 URL: http://svn.reactos.org/svn/reactos?rev=26772&view=rev Log: Update painting.c with new storage method for floating point operations. Modified: trunk/reactos/dll/win32/gdi32/objects/painting.c Modified: trunk/reactos/dll/win32/gdi32/objects/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/pa… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/painting.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/painting.c Mon May 14 07:18:42 2007 @@ -1,15 +1,66 @@ #include "precomp.h" - -typedef union -{ - FLOAT f; - ULONG l; -} gxf_long; - -#define XFPMANT(fp) ((fp.l) & 0x7fffff) -#define XFPEXP(fp) ((fp.l) >> 23) & 0xff) -#define XFPBUILD(e, m) (((e << 23) & 0x7f800000) | (m & 0x7fffff)) +/* the following deal with IEEE single-precision numbers */ +#define EXCESS 126L +#define SIGNBIT 0x80000000L +#define SIGN(fp) ((fp) & SIGNBIT) +#define EXP(fp) (((fp) >> 23L) & 0xFF) +#define MANT(fp) ((fp) & 0x7FFFFFL) +#define PACK(s,e,m) ((s) | ((e) << 23L) | (m)) + +// Sames as lrintf. +#ifdef __GNUC__ +#define FLOAT_TO_INT(in,out) \ + __asm__ __volatile__ ("fistpl %0" : "=m" (out) : "t" (in) : "st"); +#else +#define FLOAT_TO_INT(in,out) \ + __asm fld in \ + __asm fistp out +#endif + +LONG +FASTCALL +EFtoF( EFLOAT_S * efp) +{ + long Mant, Exp, Sign = 0; + + if (!efp->lMant) return 0; + + Mant = efp->lMant; + Exp = efp->lExp; + Sign = SIGN(Mant); + +//// M$ storage emulation + Mant = ((Mant & 0x3fffffff) >> 7); + Exp += (1 - EXCESS); +//// + Mant = MANT(Mant); + return PACK(Sign, Exp, Mant); +} + +VOID +FASTCALL +FtoEF( EFLOAT_S * efp, FLOATL f) +{ + long Mant, Exp; + gxf_long worker; + +#ifdef _X86_ + worker.l = f; // It's a float stored in a long. +#else + worker.f = f; +#endif + + Exp = EXP(worker.l); + Mant = MANT(worker.l); + +//// M$ storage emulation + Mant = ((Mant << 7) | 0x40000000 | SIGN(worker.l)); + Exp -= (1 - EXCESS); +//// + efp->lMant = Mant; + efp->lExp = Exp; +} VOID FASTCALL @@ -21,15 +72,16 @@ x = (FLOAT)Point->x; y = (FLOAT)Point->y; - a.l = XFPBUILD( mx->efM11.lExp, mx->efM11.lMant); - b.l = XFPBUILD( mx->efM21.lExp, mx->efM21.lMant); - - Point->x = x * a.f + y * b.f + mx->fxDx; - - a.l = XFPBUILD( mx->efM12.lExp, mx->efM12.lMant); - b.l = XFPBUILD( mx->efM22.lExp, mx->efM22.lMant); - - Point->y = x * a.f + y * b.f + mx->fxDy; + a.l = EFtoF( &mx->efM11 ); + b.l = EFtoF( &mx->efM21 ); + x = x * a.f + y * b.f + mx->fxDx; + + a.l = EFtoF( &mx->efM12 ); + b.l = EFtoF( &mx->efM22 ); + y = x * a.f + y * b.f + mx->fxDy; + + FLOAT_TO_INT(x, Point->x ); + FLOAT_TO_INT(y, Point->y ); }

1 0

[cwittich] 26771: asome extra space for the german text
by cwittich＠svn.reactos.org 14 May '07

14 May '07

Author: cwittich Date: Mon May 14 05:09:50 2007 New Revision: 26771 URL: http://svn.reactos.org/svn/reactos?rev=26771&view=rev Log: asome extra space for the german text Modified: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc Modified: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/de… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/de-DE.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/de-DE.rc Mon May 14 05:09:50 2007 @@ -45,7 +45,7 @@ LBS_NOINTEGRALHEIGHT | WS_VSCROLL LTEXT "ReactOS ist unter der GPL veröffentlicht, wenn Sie also (Teile von) ReactOS wiederverwenden "\ "oder wiederveröffentlichen wollen, müssen Sie die GPL respektieren.", - IDC_STATIC,15,110,227,19 + IDC_STATIC,15,110,227,24 PUSHBUTTON "&GPL &ansehen...",IDC_VIEWGPL,251,110,50,19 LTEXT "Klicken Sie auf Weiter, um mit dem Setup fortzufahren.",IDC_STATIC,15,136, 195,17

1 0

[cwittich] 26770: some extra space for the text (to be displayed completely)
by cwittich＠svn.reactos.org 14 May '07

14 May '07

Author: cwittich Date: Mon May 14 05:05:57 2007 New Revision: 26770 URL: http://svn.reactos.org/svn/reactos?rev=26770&view=rev Log: some extra space for the text (to be displayed completely) Modified: trunk/reactos/base/setup/vmwinst/lang/cs-CZ.rc trunk/reactos/base/setup/vmwinst/lang/da-DK.rc trunk/reactos/base/setup/vmwinst/lang/de-DE.rc trunk/reactos/base/setup/vmwinst/lang/en-US.rc trunk/reactos/base/setup/vmwinst/lang/es-ES.rc Modified: trunk/reactos/base/setup/vmwinst/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/cs… ============================================================================== --- trunk/reactos/base/setup/vmwinst/lang/cs-CZ.rc (original) +++ trunk/reactos/base/setup/vmwinst/lang/cs-CZ.rc Mon May 14 05:05:57 2007 @@ -6,7 +6,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "ReactOS zjistil, e bìí pod VMware(r).", -1, 100, 8, 160, 24 - LTEXT "Pokud chcete nainstalovat VMware(r) SVGA ovladaè klepnìte na 'Dalí', pokud ovladaè instalovat nechcete, klepnìte na 'Storno'.", -1, 100, 140, 160, 17 + LTEXT "Pokud chcete nainstalovat VMware(r) SVGA ovladaè klepnìte na 'Dalí', pokud ovladaè instalovat nechcete, klepnìte na 'Storno'.", -1, 100, 140, 160, 24 END IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT @@ -64,7 +64,7 @@ PUSHBUTTON "Upravit nastavení obrazovky", IDC_CONFIGSETTINGS, 25, 40, 200, 15, BS_AUTORADIOBUTTON PUSHBUTTON "Pouít jiný grafický ovladaè", IDC_USEOTHERDRIVER, 25, 55, 200, 15, BS_AUTORADIOBUTTON PUSHBUTTON "Odebrat ovladaè VMware(r) SVGA", IDC_UNINSTALL, 25, 70, 200, 15, BS_AUTORADIOBUTTON - LTEXT "Klepnìte na 'Dalí' pro pokraèování nebo na 'Storno' pro ukonèení prùvodce.", -1, 25, 93, 225, 12 + LTEXT "Klepnìte na 'Dalí' pro pokraèování nebo na 'Storno' pro ukonèení prùvodce.", -1, 25, 93, 225, 19 END IDD_SELECTDRIVER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT Modified: trunk/reactos/base/setup/vmwinst/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/da… ============================================================================== --- trunk/reactos/base/setup/vmwinst/lang/da-DK.rc (original) +++ trunk/reactos/base/setup/vmwinst/lang/da-DK.rc Mon May 14 05:05:57 2007 @@ -6,7 +6,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "ReactOS Installation har opdaget at du køre ReactOS under VMware(r).", -1, 100, 8, 160, 24 - LTEXT "Hvis du ønsker at installere VMware(r) SVGA driveren Klik 'Næste', Ellers klik på 'Fortryd' for at afbryde.", -1, 100, 140, 160, 17 + LTEXT "Hvis du ønsker at installere VMware(r) SVGA driveren Klik 'Næste', Ellers klik på 'Fortryd' for at afbryde.", -1, 100, 140, 160, 24 END IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT @@ -64,7 +64,7 @@ PUSHBUTTON "Konfigurer Skærm indstillinger", IDC_CONFIGSETTINGS, 25, 40, 200, 15, BS_AUTORADIOBUTTON PUSHBUTTON "Benyt en anden Grafikkort Driver", IDC_USEOTHERDRIVER, 25, 55, 200, 15, BS_AUTORADIOBUTTON PUSHBUTTON "Afinstallere WMware(r) SVGA driver", IDC_UNINSTALL, 25, 70, 200, 15, BS_AUTORADIOBUTTON - LTEXT "Klik på 'Næste' for at forsætte eller klik på 'Fortryd' for at afslutte guiden.", -1, 25, 93, 225, 12 + LTEXT "Klik på 'Næste' for at forsætte eller klik på 'Fortryd' for at afslutte guiden.", -1, 25, 93, 225, 19 END IDD_SELECTDRIVER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT Modified: trunk/reactos/base/setup/vmwinst/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/de… ============================================================================== --- trunk/reactos/base/setup/vmwinst/lang/de-DE.rc (original) +++ trunk/reactos/base/setup/vmwinst/lang/de-DE.rc Mon May 14 05:05:57 2007 @@ -6,7 +6,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Das ReactOS Setup hat festgestellt, dass Sie ReactOS in VMware(r) installieren.", -1, 100, 8, 160, 24 - LTEXT "Wenn Sie den VMware(r) SVGA Treiber installieren möchten, klicken Sie auf 'Weiter', ansonsten auf 'Abbrechen'.", -1, 100, 140, 160, 17 + LTEXT "Wenn Sie den VMware(r) SVGA Treiber installieren möchten, klicken Sie auf 'Weiter', ansonsten auf 'Abbrechen'.", -1, 100, 140, 160, 24 END IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT @@ -64,7 +64,7 @@ PUSHBUTTON "Die Bildeinstellungen ändern", IDC_CONFIGSETTINGS, 25, 40, 200, 15, BS_AUTORADIOBUTTON PUSHBUTTON "Einen anderen Grafiktreiber benutzen", IDC_USEOTHERDRIVER, 25, 55, 200, 15, BS_AUTORADIOBUTTON PUSHBUTTON "Den VMware(r) SVGA Treiber entfernen", IDC_UNINSTALL, 25, 70, 200, 15, BS_AUTORADIOBUTTON - LTEXT "Klicken Sie auf 'Weiter' um fortzufahren oder 'Abbrechen' um den Asssistenten zu beenden.", -1, 25, 93, 225, 12 + LTEXT "Klicken Sie auf 'Weiter' um fortzufahren oder 'Abbrechen' um den Asssistenten zu beenden.", -1, 25, 93, 225, 19 END IDD_SELECTDRIVER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT Modified: trunk/reactos/base/setup/vmwinst/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/en… ============================================================================== --- trunk/reactos/base/setup/vmwinst/lang/en-US.rc (original) +++ trunk/reactos/base/setup/vmwinst/lang/en-US.rc Mon May 14 05:05:57 2007 @@ -6,7 +6,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "The ReactOS setup detected that you run ReactOS inside of VMware(r).", -1, 100, 8, 160, 24 - LTEXT "If you like to install the VMware(r) SVGA driver click 'Next', otherwise click 'Cancel'.", -1, 100, 140, 160, 17 + LTEXT "If you like to install the VMware(r) SVGA driver click 'Next', otherwise click 'Cancel'.", -1, 100, 140, 160, 24 END IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT @@ -64,7 +64,7 @@ PUSHBUTTON "Configure the screen settings", IDC_CONFIGSETTINGS, 25, 40, 200, 15, BS_AUTORADIOBUTTON PUSHBUTTON "Use a different graphics driver", IDC_USEOTHERDRIVER, 25, 55, 200, 15, BS_AUTORADIOBUTTON PUSHBUTTON "Uninstall the VMware(r) SVGA driver", IDC_UNINSTALL, 25, 70, 200, 15, BS_AUTORADIOBUTTON - LTEXT "Click 'Next' to continue or 'Cancel' to exit the wizard.", -1, 25, 93, 225, 12 + LTEXT "Click 'Next' to continue or 'Cancel' to exit the wizard.", -1, 25, 93, 225, 19 END IDD_SELECTDRIVER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT Modified: trunk/reactos/base/setup/vmwinst/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/es… ============================================================================== --- trunk/reactos/base/setup/vmwinst/lang/es-ES.rc (original) +++ trunk/reactos/base/setup/vmwinst/lang/es-ES.rc Mon May 14 05:05:57 2007 @@ -8,7 +8,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "El instalador de ReactOS ha detectado que husted está ejecutando ReactOS sobre el emulador VMware(r).", -1, 100, 8, 160, 24 - LTEXT "Si husted desea instalar el controlador SVGA VMware(r), haga click en 'Siguiente', de lo contrario haga click en 'Cancelar'.", -1, 100, 140, 160, 17 + LTEXT "Si husted desea instalar el controlador SVGA VMware(r), haga click en 'Siguiente', de lo contrario haga click en 'Cancelar'.", -1, 100, 140, 160, 24 END IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT @@ -66,7 +66,7 @@ PUSHBUTTON "Configurar las opciones de pantalla", IDC_CONFIGSETTINGS, 25, 40, 200, 15, BS_AUTORADIOBUTTON PUSHBUTTON "Usar un controlador gráfico distinto", IDC_USEOTHERDRIVER, 25, 55, 200, 15, BS_AUTORADIOBUTTON PUSHBUTTON "Desinstalar el controlador SVGA VMware(r)", IDC_UNINSTALL, 25, 70, 200, 15, BS_AUTORADIOBUTTON - LTEXT "Haga Click en 'Siguiente' para continuar o 'Cancelar' para salir del asistente.", -1, 25, 93, 225, 12 + LTEXT "Haga Click en 'Siguiente' para continuar o 'Cancelar' para salir del asistente.", -1, 25, 93, 225, 19 END IDD_SELECTDRIVER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT

1 0

[jimtabor] 26769: Commit union for float conversion.
by jimtabor＠svn.reactos.org 14 May '07

14 May '07

Author: jimtabor Date: Mon May 14 04:47:29 2007 New Revision: 26769 URL: http://svn.reactos.org/svn/reactos?rev=26769&view=rev Log: Commit union for float conversion. Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdityp.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdityp.h Mon May 14 04:47:29 2007 @@ -143,4 +143,12 @@ FLONG flAccel; } MATRIX_S; +/* Gdi XForm storage union */ +typedef union +{ + FLOAT f; + ULONG l; +} gxf_long; + + #endif

1 0

[ion] 26768: - Implement NtDeleteValueKey as a simple wrapper around CmDeleteValueKey so that handles, callbacks and SEH is abstracted away. - Implement CmpRemoveValueFromList. - Implement CmDeleteValueKey based on the old code, make it use CmpRemoveValueFromList. - Remove CmiDeleteValueFromKey, CmiDestroyValueCell.
by ion＠svn.reactos.org 14 May '07

14 May '07

Author: ion Date: Mon May 14 04:44:26 2007 New Revision: 26768 URL: http://svn.reactos.org/svn/reactos?rev=26768&view=rev Log: - Implement NtDeleteValueKey as a simple wrapper around CmDeleteValueKey so that handles, callbacks and SEH is abstracted away. - Implement CmpRemoveValueFromList. - Implement CmDeleteValueKey based on the old code, make it use CmpRemoveValueFromList. - Remove CmiDeleteValueFromKey, CmiDestroyValueCell. Modified: trunk/reactos/ntoskrnl/cm/cm.h trunk/reactos/ntoskrnl/cm/ntfunc.c trunk/reactos/ntoskrnl/cm/regfile.c trunk/reactos/ntoskrnl/config/cm.h trunk/reactos/ntoskrnl/config/cmapi.c trunk/reactos/ntoskrnl/config/cmvalue.c Modified: trunk/reactos/ntoskrnl/cm/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/cm.h?rev=26768… ============================================================================== --- trunk/reactos/ntoskrnl/cm/cm.h (original) +++ trunk/reactos/ntoskrnl/cm/cm.h Mon May 14 04:44:26 2007 @@ -261,10 +261,9 @@ OUT PCM_KEY_VALUE *ValueCell); NTSTATUS -CmiDeleteValueFromKey(IN PEREGISTRY_HIVE RegistryHive, - IN PCM_KEY_NODE KeyCell, - IN HCELL_INDEX KeyCellOffset, - IN PUNICODE_STRING ValueName); +NTAPI +CmDeleteValueKey(IN PKEY_OBJECT KeyControlBlock, + IN UNICODE_STRING ValueName); NTSTATUS CmiAllocateHashTableCell(IN PEREGISTRY_HIVE RegistryHive, @@ -307,10 +306,6 @@ NTSTATUS CmiConnectHive(POBJECT_ATTRIBUTES KeyObjectAttributes, PEREGISTRY_HIVE RegistryHive); - -NTSTATUS -CmiDisconnectHive (POBJECT_ATTRIBUTES KeyObjectAttributes, - PEREGISTRY_HIVE *RegistryHive); NTSTATUS CmiInitHives(BOOLEAN SetupBoot); Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/ntfunc.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/cm/ntfunc.c (original) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c Mon May 14 04:44:26 2007 @@ -1854,88 +1854,48 @@ return Status; } -NTSTATUS STDCALL -NtDeleteValueKey (IN HANDLE KeyHandle, - IN PUNICODE_STRING ValueName) -{ - PKEY_OBJECT KeyObject; - NTSTATUS Status; - REG_DELETE_VALUE_KEY_INFORMATION DeleteValueKeyInfo; - REG_POST_OPERATION_INFORMATION PostOperationInfo; - KPROCESSOR_MODE PreviousMode; - UNICODE_STRING CapturedValueName; - - PAGED_CODE(); - - PreviousMode = ExGetPreviousMode(); - - /* Verify that the handle is valid and is a registry key */ - Status = ObReferenceObjectByHandle(KeyHandle, - KEY_SET_VALUE, - CmpKeyObjectType, - PreviousMode, - (PVOID *)&KeyObject, - NULL); - if (!NT_SUCCESS(Status)) - { - return Status; - } - - Status = ProbeAndCaptureUnicodeString(&CapturedValueName, - PreviousMode, - ValueName); - if (!NT_SUCCESS(Status)) - { - goto Fail; - } - DeleteValueKeyInfo.Object = (PVOID)KeyObject; - DeleteValueKeyInfo.ValueName = &CapturedValueName; - - /* FIXME - check if value exists before calling the callbacks? */ - Status = CmiCallRegisteredCallbacks(RegNtPreDeleteValueKey, &DeleteValueKeyInfo); - if (!NT_SUCCESS(Status)) - { - PostOperationInfo.Object = (PVOID)KeyObject; - PostOperationInfo.Status = Status; - CmiCallRegisteredCallbacks(RegNtPostDeleteValueKey, &PostOperationInfo); - ReleaseCapturedUnicodeString(&CapturedValueName, - PreviousMode); -Fail: - ObDereferenceObject(KeyObject); - return Status; - } - - /* Acquire hive lock */ - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); - - VERIFY_KEY_OBJECT(KeyObject); - - Status = CmiDeleteValueFromKey(KeyObject->RegistryHive, - KeyObject->KeyCell, - KeyObject->KeyCellOffset, - ValueName); - - KeQuerySystemTime (&KeyObject->KeyCell->LastWriteTime); - HvMarkCellDirty (&KeyObject->RegistryHive->Hive, KeyObject->KeyCellOffset); - - /* Release hive lock */ - ExReleaseResourceLite(&CmpRegistryLock); - KeLeaveCriticalRegion(); - - ReleaseCapturedUnicodeString(&CapturedValueName, - PreviousMode); - - PostOperationInfo.Object = (PVOID)KeyObject; - PostOperationInfo.Status = Status; - - CmiCallRegisteredCallbacks(RegNtPostDeleteValueKey, &PostOperationInfo); - - ObDereferenceObject (KeyObject); - - CmiSyncHives (); - - return Status; +NTSTATUS +NTAPI +NtDeleteValueKey(IN HANDLE KeyHandle, + IN PUNICODE_STRING ValueName) +{ + PKEY_OBJECT KeyObject; + NTSTATUS Status; + REG_DELETE_VALUE_KEY_INFORMATION DeleteValueKeyInfo; + REG_POST_OPERATION_INFORMATION PostOperationInfo; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + PAGED_CODE(); + + /* Verify that the handle is valid and is a registry key */ + Status = ObReferenceObjectByHandle(KeyHandle, + KEY_SET_VALUE, + CmpKeyObjectType, + PreviousMode, + (PVOID *)&KeyObject, + NULL); + if (!NT_SUCCESS(Status)) return Status; + + /* Do the callback */ + DeleteValueKeyInfo.Object = (PVOID)KeyObject; + DeleteValueKeyInfo.ValueName = ValueName; + Status = CmiCallRegisteredCallbacks(RegNtPreDeleteValueKey, + &DeleteValueKeyInfo); + if (NT_SUCCESS(Status)) + { + /* Call the internal API */ + Status = CmDeleteValueKey(KeyObject, *ValueName); + + /* Do the post callback */ + PostOperationInfo.Object = (PVOID)KeyObject; + PostOperationInfo.Status = Status; + CmiCallRegisteredCallbacks(RegNtPostDeleteValueKey, + &PostOperationInfo); + } + + /* Dereference the key body and synchronize the hives */ + ObDereferenceObject(KeyObject); + CmiSyncHives(); + return Status; } /* 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 Mon May 14 04:44:26 2007 @@ -665,79 +665,6 @@ } NTSTATUS -CmiDeleteValueFromKey(IN PEREGISTRY_HIVE RegistryHive, - IN PCM_KEY_NODE KeyCell, - IN HCELL_INDEX KeyCellOffset, - IN PUNICODE_STRING ValueName) -{ - PVALUE_LIST_CELL ValueListCell; - PCM_KEY_VALUE CurValueCell; - ULONG i; - NTSTATUS Status; - - if (KeyCell->ValueList.List == -1) - { - return STATUS_OBJECT_NAME_NOT_FOUND; - } - - ValueListCell = HvGetCell (&RegistryHive->Hive, KeyCell->ValueList.List); - - VERIFY_VALUE_LIST_CELL(ValueListCell); - - for (i = 0; i < KeyCell->ValueList.Count; i++) - { - CurValueCell = HvGetCell (&RegistryHive->Hive, ValueListCell->ValueOffset[i]); - - if (CmiComparePackedNames(ValueName, - CurValueCell->Name, - CurValueCell->NameSize, - (BOOLEAN)((CurValueCell->Flags & REG_VALUE_NAME_PACKED) ? TRUE : FALSE))) - { - Status = CmiDestroyValueCell(RegistryHive, - CurValueCell, - ValueListCell->ValueOffset[i]); - if (CurValueCell == NULL) - { - DPRINT1("CmiDestroyValueCell() failed\n"); - return Status; - } - - if (i < (KeyCell->ValueList.Count - 1)) - { - RtlMoveMemory(&ValueListCell->ValueOffset[i], - &ValueListCell->ValueOffset[i + 1], - sizeof(HCELL_INDEX) * (KeyCell->ValueList.Count - 1 - i)); - } - ValueListCell->ValueOffset[KeyCell->ValueList.Count - 1] = 0; - - - KeyCell->ValueList.Count--; - - if (KeyCell->ValueList.Count == 0) - { - HvFreeCell(&RegistryHive->Hive, KeyCell->ValueList.List); - KeyCell->ValueList.List = -1; - } - else - { - HvMarkCellDirty(&RegistryHive->Hive, - KeyCell->ValueList.List); - } - - HvMarkCellDirty(&RegistryHive->Hive, - KeyCellOffset); - - return STATUS_SUCCESS; - } - } - - DPRINT("Couldn't find the desired value\n"); - - return STATUS_OBJECT_NAME_NOT_FOUND; -} - - -NTSTATUS CmiAllocateHashTableCell (IN PEREGISTRY_HIVE RegistryHive, OUT PHASH_TABLE_CELL *HashBlock, OUT HCELL_INDEX *HBOffset, @@ -831,31 +758,6 @@ return STATUS_UNSUCCESSFUL; } -NTSTATUS -CmiDestroyValueCell(PEREGISTRY_HIVE RegistryHive, - PCM_KEY_VALUE ValueCell, - HCELL_INDEX ValueCellOffset) -{ - DPRINT("CmiDestroyValueCell(Cell %p Offset %lx)\n", - ValueCell, ValueCellOffset); - - VERIFY_VALUE_CELL(ValueCell); - - /* Destroy the data cell */ - if (!(ValueCell->DataSize & REG_DATA_IN_OFFSET) - && ValueCell->DataSize > sizeof(HCELL_INDEX) - && ValueCell->DataOffset != HCELL_NULL) - { - HvFreeCell (&RegistryHive->Hive, ValueCell->DataOffset); - } - - /* Destroy the value cell */ - HvFreeCell (&RegistryHive->Hive, ValueCellOffset); - - return STATUS_SUCCESS; -} - - ULONG CmiGetPackedNameLength(IN PUNICODE_STRING Name, OUT PBOOLEAN Packable) Modified: trunk/reactos/ntoskrnl/config/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cm.h?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/config/cm.h (original) +++ trunk/reactos/ntoskrnl/config/cm.h Mon May 14 04:44:26 2007 @@ -1064,6 +1064,14 @@ IN ULONG DataLength ); +NTSTATUS +NTAPI +CmpRemoveValueFromList( + IN PHHIVE Hive, + IN ULONG Index, + IN OUT PCHILD_LIST ChildList +); + // // Boot Routines // Modified: trunk/reactos/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmapi.c (original) +++ trunk/reactos/ntoskrnl/config/cmapi.c Mon May 14 04:44:26 2007 @@ -86,7 +86,7 @@ /* Otherwise, set the data length, and make sure the data is dirty */ CellData->u.KeyValue.DataLength = DataSize; - ASSERT(HvIsCellDirty(Hive,CellData->u.KeyValue.Data)); + ASSERT(HvIsCellDirty(Hive, CellData->u.KeyValue.Data)); } else { @@ -105,7 +105,7 @@ /* If we failed, free the entire cell, including the data */ if (!NT_SUCCESS(Status)) CmpFreeValue(Hive, ValueCell); - /* Return status */ + /* Return Status */ return Status; } @@ -340,3 +340,117 @@ return Status; } +NTSTATUS +NTAPI +CmDeleteValueKey(IN PKEY_OBJECT KeyObject, + IN UNICODE_STRING ValueName) +{ + NTSTATUS Status = STATUS_OBJECT_NAME_NOT_FOUND; + PHHIVE Hive; + PCM_KEY_NODE Parent; + HCELL_INDEX ChildCell, Cell; + PCHILD_LIST ChildList; + PCM_KEY_VALUE Value = NULL; + ULONG ChildIndex; + BOOLEAN Result; + + /* Acquire hive lock */ + KeEnterCriticalRegion(); + ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); + + /* Get the hive and the cell index */ + Hive = &KeyObject->RegistryHive->Hive; + Cell = KeyObject->KeyCellOffset; + + /* Get the parent key node */ + Parent = (PCM_KEY_NODE)HvGetCell(Hive, Cell); + if (!Parent) + { + /* Fail */ + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Quickie; + } + + /* Get the value list and check if it has any entries */ + ChildList = &Parent->ValueList; + if (ChildList->Count) + { + /* Try to find this value */ + Result = CmpFindNameInList(Hive, + ChildList, + &ValueName, + &ChildIndex, + &ChildCell); + if (!Result) + { + /* Fail */ + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Quickie; + } + + /* Value not found, return error */ + if (ChildCell == HCELL_NIL) goto Quickie; + + /* We found the value, mark all relevant cells dirty */ + HvMarkCellDirty(Hive, Cell); + HvMarkCellDirty(Hive, Parent->ValueList.List); + HvMarkCellDirty(Hive, ChildCell); + + /* Get the key value */ + Value = (PCM_KEY_VALUE)HvGetCell(Hive,ChildCell); + if (!Value) ASSERT(FALSE); + + /* Mark it and all related data as dirty */ + CmpMarkValueDataDirty(Hive, Value); + + /* Ssanity checks */ + ASSERT(HvIsCellDirty(Hive, Parent->ValueList.List)); + ASSERT(HvIsCellDirty(Hive, ChildCell)); + + /* Remove the value from the child list */ + Status = CmpRemoveValueFromList(Hive, ChildIndex, ChildList); + if(!NT_SUCCESS(Status)) goto Quickie; + + /* Remove the value and its data itself */ + if (!CmpFreeValue(Hive, ChildCell)) + { + /* Failed to free the value, fail */ + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Quickie; + } + + /* Set the last write time */ + KeQuerySystemTime(&Parent->LastWriteTime); + + /* Sanity check */ + ASSERT(HvIsCellDirty(Hive, Cell)); + + /* Check if the value list is empty now */ + if (!Parent->ValueList.Count) + { + /* Then clear key node data */ + Parent->MaxValueNameLen = 0; + Parent->MaxValueDataLen = 0; + } + + /* Change default status to success */ + Status = STATUS_SUCCESS; + } + +Quickie: + /* Release the parent cell, if any */ + if (Parent) HvReleaseCell(Hive, Cell); + + /* Check if we had a value */ + if (Value) + { + /* Release the child cell */ + ASSERT(ChildCell != HCELL_NIL); + HvReleaseCell(Hive, ChildCell); + } + + /* Release hive lock */ + ExReleaseResourceLite(&CmpRegistryLock); + KeLeaveCriticalRegion(); + return Status; +} Modified: trunk/reactos/ntoskrnl/config/cmvalue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmvalue.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmvalue.c (original) +++ trunk/reactos/ntoskrnl/config/cmvalue.c Mon May 14 04:44:26 2007 @@ -307,3 +307,58 @@ return STATUS_SUCCESS; } +NTSTATUS +NTAPI +CmpRemoveValueFromList(IN PHHIVE Hive, + IN ULONG Index, + IN OUT PCHILD_LIST ChildList) +{ + ULONG Count; + PCELL_DATA CellData; + HCELL_INDEX NewCell; + PAGED_CODE(); + + /* Sanity check */ + ASSERT((((LONG)Index) >= 0) && (Index <= ChildList->Count)); + + /* Get the new count after removal */ + Count = ChildList->Count - 1; + if (Count > 0) + { + /* Get the actual list array */ + CellData = HvGetCell(Hive, ChildList->List); + if (!CellData) return STATUS_INSUFFICIENT_RESOURCES; + + /* Make sure cells data have been made dirty */ + ASSERT(HvIsCellDirty(Hive, ChildList->List)); + ASSERT(HvIsCellDirty(Hive, CellData->u.KeyList[Index])); + + /* Loop the list */ + while (Index < Count) + { + /* Move everything up */ + CellData->u.KeyList[Index] = CellData->u.KeyList[Index + 1]; + Index++; + } + + /* Re-allocate the cell for the list by decreasing the count */ + NewCell = HvReallocateCell(Hive, + ChildList->List, + Count * sizeof(HCELL_INDEX)); + ASSERT(NewCell != HCELL_NIL); + HvReleaseCell(Hive,ChildList->List); + + /* Update the list cell */ + ChildList->List = NewCell; + } + else + { + /* Otherwise, we were the last entry, so free the list entirely */ + HvFreeCell(Hive, ChildList->List); + ChildList->List = HCELL_NIL; + } + + /* Update the child list with the new count */ + ChildList->Count = Count; + return STATUS_SUCCESS; +}

1 0

[arty] 26767: Fixed relocation.
by arty＠svn.reactos.org 13 May '07

13 May '07

Author: arty Date: Mon May 14 03:57:22 2007 New Revision: 26767 URL: http://svn.reactos.org/svn/reactos?rev=26767&view=rev Log: Fixed relocation. Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c Mon May 14 03:57:22 2007 @@ -505,11 +505,11 @@ memcpy(&symbol, SymbolSection + (ELF32_R_SYM(reloc.r_info) * sizeof(symbol)), sizeof(symbol)); /* Compute addends */ - S = symbol.st_value + KernelAddr; + S = symbol.st_value + ELF_SECTION(symbol.st_shndx)->sh_addr + KernelAddr; A = reloc.r_addend; P = reloc.r_offset + ELF_SECTION(targetSection)->sh_addr; - Target32 = (ULONG*)((PCHAR)KernelMemory) + P; + Target32 = (ULONG*)(((PCHAR)KernelMemory) + P); Target16 = (USHORT *)Target32; x = *Target32; @@ -539,14 +539,19 @@ *Target16 = (S + A + 0x8000) >> 16; break; default: - printf("reloc[%d]: (type %x sym %d val %d) off %x add %x\n", - j, - ELF32_R_TYPE(reloc.r_info), - ELF32_R_SYM(reloc.r_info), - symbol.st_value, - reloc.r_offset, reloc.r_addend); break; } + +#if 0 + printf("reloc[%d:%x]: (type %x sym %d val %d) off %x add %x (old %x new %x)\n", + j, + ((ULONG)Target32) - ((ULONG)KernelMemory), + ELF32_R_TYPE(reloc.r_info), + ELF32_R_SYM(reloc.r_info), + symbol.st_value, + reloc.r_offset, reloc.r_addend, + x, *Target32); +#endif } MmFreeMemory(SymbolSection);

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
33
Older →

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 May 2007