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)