Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-24 04:23:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fix most of the warnings in mkhive.

Browse source 
svn path=/trunk/; revision=37613
This commit is contained in:
Aleksey Bragin 2008-11-24 13:01:56 +00:00
parent cfeeca424d
commit 7da3ae674b
3 changed files with 14 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/tools/mkhive/cmi.c
View file

@ -622,7 +622,7 @@ CmiAllocateValueCell(
NameLength = CmiGetPackedNameLength(ValueName, &Packable); NameLength = CmiGetPackedNameLength(ValueName, &Packable);
DPRINT("ValueName->Length %lu NameLength %lu\n", ValueName->Length, NameLength); DPRINT("ValueName->Length %u NameLength %u\n", ValueName->Length, NameLength);
*VBOffset = HvAllocateCell(&RegistryHive->Hive, sizeof(CM_KEY_VALUE) + NameLength, Storage, HCELL_NIL); *VBOffset = HvAllocateCell(&RegistryHive->Hive, sizeof(CM_KEY_VALUE) + NameLength, Storage, HCELL_NIL);
if (*VBOffset == HCELL_NIL) if (*VBOffset == HCELL_NIL)

14
reactos/tools/mkhive/reginf.c
View file

@ -158,7 +158,7 @@ AppendMultiSzValue (
ValueName, ValueName,
0, 0,
REG_MULTI_SZ, REG_MULTI_SZ,
(PCHAR)Buffer, (PUCHAR)Buffer,
(ULONG)Total); (ULONG)Total);
} }
@ -304,7 +304,7 @@ do_reg_operation(
{ {
ULONG dw = Str ? strtoul (Str, NULL, 0) : 0; ULONG dw = Str ? strtoul (Str, NULL, 0) : 0;
DPRINT("setting dword %s to %lx\n", ValueName, dw); DPRINT("setting dword %s to %x\n", ValueName, dw);
RegSetValueExA ( RegSetValueExA (
KeyHandle, KeyHandle,
@ -343,7 +343,7 @@ do_reg_operation(
} }
else /* get the binary data */ else /* get the binary data */
{ {
PCHAR Data = NULL; PUCHAR Data = NULL;
if (InfHostGetBinaryField (Context, 5, NULL, 0, &Size) != 0) if (InfHostGetBinaryField (Context, 5, NULL, 0, &Size) != 0)
Size = 0; Size = 0;
@ -354,8 +354,8 @@ do_reg_operation(
if (Data == NULL) if (Data == NULL)
return FALSE; return FALSE;
DPRINT("setting binary data %s len %lu\n", ValueName, Size); DPRINT("setting binary data %s len %d\n", ValueName, Size);
InfHostGetBinaryField (Context, 5, Data, (ULONG)Size, NULL); InfHostGetBinaryField (Context, 5, Data, Size, NULL);
} }
RegSetValueExA ( RegSetValueExA (
@ -416,11 +416,11 @@ registry_callback (HINF hInf, PCHAR Section, BOOL Delete)
else else
{ {
/* get flags */ /* get flags */
if (InfHostGetIntField (Context, 4, (PLONG)&Flags) != 0) if (InfHostGetIntField (Context, 4, &Flags) != 0)
Flags = 0; Flags = 0;
} }
DPRINT("Flags: %lx\n", Flags); DPRINT("Flags: 0x%x\n", Flags);
if (Delete || (Flags & FLG_ADDREG_OVERWRITEONLY)) if (Delete || (Flags & FLG_ADDREG_OVERWRITEONLY))
{ {

35
reactos/tools/mkhive/registry.c
View file

@ -384,7 +384,7 @@ RegSetValueExW(
if (cbData <= sizeof(HCELL_INDEX)) if (cbData <= sizeof(HCELL_INDEX))
{ {
/* If data size <= sizeof(HCELL_INDEX) then store data in the data offset */ /* If data size <= sizeof(HCELL_INDEX) then store data in the data offset */
DPRINT("ValueCell->DataLength %lu\n", ValueCell->DataLength); DPRINT("ValueCell->DataLength %u\n", ValueCell->DataLength);
if (DataCell) if (DataCell)
HvFreeCell(&Key->RegistryHive->Hive, ValueCell->Data); HvFreeCell(&Key->RegistryHive->Hive, ValueCell->Data);
@ -401,12 +401,12 @@ RegSetValueExW(
* data block and allocate a new one. */ * data block and allocate a new one. */
HCELL_INDEX NewOffset; HCELL_INDEX NewOffset;
DPRINT("ValueCell->DataLength %lu\n", ValueCell->DataLength); DPRINT("ValueCell->DataLength %u\n", ValueCell->DataLength);
NewOffset = HvAllocateCell(&Key->RegistryHive->Hive, cbData, Stable, HCELL_NIL); NewOffset = HvAllocateCell(&Key->RegistryHive->Hive, cbData, Stable, HCELL_NIL);
if (NewOffset == HCELL_NIL) if (NewOffset == HCELL_NIL)
{ {
DPRINT("HvAllocateCell() failed with status 0x%08lx\n", Status); DPRINT("HvAllocateCell() failed with status 0x%08x\n", Status);
return ERROR_UNSUCCESSFUL; return ERROR_UNSUCCESSFUL;
} }
@ -427,7 +427,7 @@ RegSetValueExW(
HvMarkCellDirty(&Key->RegistryHive->Hive, Key->KeyCellOffset, FALSE); HvMarkCellDirty(&Key->RegistryHive->Hive, Key->KeyCellOffset, FALSE);
DPRINT("Return status 0x%08lx\n", Status); DPRINT("Return status 0x%08x\n", Status);
return Status; return Status;
} }
@ -581,7 +581,7 @@ ConnectRegistry(
Status = CmiInitializeTempHive(HiveToConnect); Status = CmiInitializeTempHive(HiveToConnect);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
DPRINT1("CmiInitializeTempHive() failed with status 0x%08lx\n", Status); DPRINT1("CmiInitializeTempHive() failed with status 0x%08x\n", Status);
return FALSE; return FALSE;
} }
@ -599,29 +599,6 @@ ConnectRegistry(
return TRUE; return TRUE;
} }
static BOOL
MyExportBinaryHive (PCHAR FileName,
PCMHIVE RootHive)
{
FILE *File;
BOOL ret;
/* Create new hive file */
File = fopen (FileName, "w+b");
if (File == NULL)
{
printf(" Error creating/opening file\n");
return FALSE;
}
fseek (File, 0, SEEK_SET);
RootHive->FileHandles[HFILE_TYPE_PRIMARY] = (HANDLE)File;
ret = HvWriteHive(&RootHive->Hive);
fclose (File);
return ret;
}
LIST_ENTRY CmiHiveListHead; LIST_ENTRY CmiHiveListHead;
VOID VOID
@ -636,7 +613,7 @@ RegInitializeRegistry(VOID)
Status = CmiInitializeTempHive(&RootHive); Status = CmiInitializeTempHive(&RootHive);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
DPRINT1("CmiInitializeTempHive() failed with status 0x%08lx\n", Status); DPRINT1("CmiInitializeTempHive() failed with status 0x%08x\n", Status);
return; return;
} }