Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-08-04 10:30:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

[CMLIB]

Browse source 
Use a #define instead of the magic 31.

svn path=/trunk/; revision=61923
This commit is contained in:
Hermès Bélusca-Maïto 2014-02-02 16:59:03 +00:00
parent 048856c9cc
commit 8dddaf53b2
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/lib/cmlib/hivedata.h
View file

@ -107,6 +107,8 @@ typedef enum
* On-disk header for registry hive file. * On-disk header for registry hive file.
*/ */
#define HIVE_FILENAME_MAXLEN 31
typedef struct _HBASE_BLOCK typedef struct _HBASE_BLOCK
{ {
/* Hive identifier "regf" (0x66676572) */ /* Hive identifier "regf" (0x66676572) */
@ -146,7 +148,7 @@ typedef struct _HBASE_BLOCK
/* Last 31 UNICODE characters, plus terminating NULL character, /* Last 31 UNICODE characters, plus terminating NULL character,
of the full name of the hive file */ of the full name of the hive file */
WCHAR FileName[32]; WCHAR FileName[HIVE_FILENAME_MAXLEN + 1];
ULONG Reserved1[99]; ULONG Reserved1[99];

9
reactos/lib/cmlib/hiveinit.c
View file

@ -118,7 +118,7 @@ HvpCreateHive(
/* Copy the 31 last characters of the hive file name if any */ /* Copy the 31 last characters of the hive file name if any */
if (FileName) if (FileName)
{ {
if (FileName->Length / sizeof(WCHAR) <= 31) if (FileName->Length / sizeof(WCHAR) <= HIVE_FILENAME_MAXLEN)
{ {
RtlCopyMemory(BaseBlock->FileName, RtlCopyMemory(BaseBlock->FileName,
FileName->Buffer, FileName->Buffer,
@ -127,12 +127,13 @@ HvpCreateHive(
else else
{ {
RtlCopyMemory(BaseBlock->FileName, RtlCopyMemory(BaseBlock->FileName,
FileName->Buffer + FileName->Length / sizeof(WCHAR) - 31, FileName->Buffer +
31 * sizeof(WCHAR)); FileName->Length / sizeof(WCHAR) - HIVE_FILENAME_MAXLEN,
HIVE_FILENAME_MAXLEN * sizeof(WCHAR));
} }
/* NULL-terminate */ /* NULL-terminate */
BaseBlock->FileName[31] = L'\0'; BaseBlock->FileName[HIVE_FILENAME_MAXLEN] = L'\0';
} }
BaseBlock->CheckSum = HvpHiveHeaderChecksum(BaseBlock); BaseBlock->CheckSum = HvpHiveHeaderChecksum(BaseBlock);