Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 13:45:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTOS:CONFIG] Add missing HvGetCell casts. Addendum to a4cad7be6.

Browse source
This commit is contained in:
Hermès Bélusca-Maïto 2022-03-27 19:09:34 +02:00
parent 8ccd435eb0
commit ce641de1e0
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
1 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

44
ntoskrnl/config/cmboot.c
View file

@ -146,19 +146,19 @@ CmpFindTagIndex(IN PHHIVE Hive,
ASSERT(Hive->ReleaseCellRoutine == NULL); ASSERT(Hive->ReleaseCellRoutine == NULL);
/* Get the tag */ /* Get the tag */
Value = HvGetCell(Hive, TagCell); Value = (PCM_KEY_VALUE)HvGetCell(Hive, TagCell);
ASSERT(Value); ASSERT(Value);
DriverTag = (PULONG)CmpValueToData(Hive, Value, &Length); DriverTag = (PULONG)CmpValueToData(Hive, Value, &Length);
ASSERT(DriverTag); ASSERT(DriverTag);
/* Get the order array */ /* Get the order array */
Node = HvGetCell(Hive, GroupOrderCell); Node = (PCM_KEY_NODE)HvGetCell(Hive, GroupOrderCell);
ASSERT(Node); ASSERT(Node);
OrderCell = CmpFindValueByName(Hive, Node, GroupName); OrderCell = CmpFindValueByName(Hive, Node, GroupName);
if (OrderCell == HCELL_NIL) return -2; if (OrderCell == HCELL_NIL) return -2;
/* And read it */ /* And read it */
TagValue = HvGetCell(Hive, OrderCell); TagValue = (PCM_KEY_VALUE)HvGetCell(Hive, OrderCell);
CmpGetValueData(Hive, TagValue, &Length, (PVOID*)&TagOrder, &BufferAllocated, &OrderCell); CmpGetValueData(Hive, TagValue, &Length, (PVOID*)&TagOrder, &BufferAllocated, &OrderCell);
ASSERT(TagOrder); ASSERT(TagOrder);
@ -208,7 +208,7 @@ CmpAddDriverToList(IN PHHIVE Hive,
DriverEntry->FilePath.Buffer = NULL; DriverEntry->FilePath.Buffer = NULL;
/* Get the driver cell */ /* Get the driver cell */
Node = HvGetCell(Hive, DriverCell); Node = (PCM_KEY_NODE)HvGetCell(Hive, DriverCell);
ASSERT(Node); ASSERT(Node);
/* Get the name from the cell */ /* Get the name from the cell */
@ -258,7 +258,7 @@ CmpAddDriverToList(IN PHHIVE Hive,
else else
{ {
/* Path name exists, so grab it */ /* Path name exists, so grab it */
Value = HvGetCell(Hive, ValueCell); Value = (PCM_KEY_VALUE)HvGetCell(Hive, ValueCell);
ASSERT(Value); ASSERT(Value);
/* Allocate and setup the path name */ /* Allocate and setup the path name */
@ -297,7 +297,7 @@ CmpAddDriverToList(IN PHHIVE Hive,
else else
{ {
/* Otherwise, read whatever the data says */ /* Otherwise, read whatever the data says */
Value = HvGetCell(Hive, ValueCell); Value = (PCM_KEY_VALUE)HvGetCell(Hive, ValueCell);
ASSERT(Value); ASSERT(Value);
ErrorControl = (PULONG)CmpValueToData(Hive, Value, &Length); ErrorControl = (PULONG)CmpValueToData(Hive, Value, &Length);
ASSERT(ErrorControl); ASSERT(ErrorControl);
@ -315,7 +315,7 @@ CmpAddDriverToList(IN PHHIVE Hive,
else else
{ {
/* Found it, read the group value */ /* Found it, read the group value */
Value = HvGetCell(Hive, ValueCell); Value = (PCM_KEY_VALUE)HvGetCell(Hive, ValueCell);
ASSERT(Value); ASSERT(Value);
/* Copy it into the node */ /* Copy it into the node */
@ -362,13 +362,13 @@ CmpIsLoadType(IN PHHIVE Hive,
ASSERT(Hive->ReleaseCellRoutine == NULL); ASSERT(Hive->ReleaseCellRoutine == NULL);
/* Open the start cell */ /* Open the start cell */
Node = HvGetCell(Hive, Cell); Node = (PCM_KEY_NODE)HvGetCell(Hive, Cell);
ASSERT(Node); ASSERT(Node);
ValueCell = CmpFindValueByName(Hive, Node, &ValueString); ValueCell = CmpFindValueByName(Hive, Node, &ValueString);
if (ValueCell == HCELL_NIL) return FALSE; if (ValueCell == HCELL_NIL) return FALSE;
/* Read the start value */ /* Read the start value */
Value = HvGetCell(Hive, ValueCell); Value = (PCM_KEY_VALUE)HvGetCell(Hive, ValueCell);
ASSERT(Value); ASSERT(Value);
Data = (PLONG)CmpValueToData(Hive, Value, &Length); Data = (PLONG)CmpValueToData(Hive, Value, &Length);
ASSERT(Data); ASSERT(Data);
@ -397,7 +397,7 @@ CmpFindDrivers(IN PHHIVE Hive,
ASSERT(Hive->ReleaseCellRoutine == NULL); ASSERT(Hive->ReleaseCellRoutine == NULL);
/* Open the control set key */ /* Open the control set key */
ControlNode = HvGetCell(Hive, ControlSet); ControlNode = (PCM_KEY_NODE)HvGetCell(Hive, ControlSet);
ASSERT(ControlNode); ASSERT(ControlNode);
/* Get services cell */ /* Get services cell */
@ -406,7 +406,7 @@ CmpFindDrivers(IN PHHIVE Hive,
if (ServicesCell == HCELL_NIL) return FALSE; if (ServicesCell == HCELL_NIL) return FALSE;
/* Open services key */ /* Open services key */
ServicesNode = HvGetCell(Hive, ServicesCell); ServicesNode = (PCM_KEY_NODE)HvGetCell(Hive, ServicesCell);
ASSERT(ServicesNode); ASSERT(ServicesNode);
/* Get control cell */ /* Get control cell */
@ -416,7 +416,7 @@ CmpFindDrivers(IN PHHIVE Hive,
/* Get the group order cell and read it */ /* Get the group order cell and read it */
RtlInitUnicodeString(&Name, L"GroupOrderList"); RtlInitUnicodeString(&Name, L"GroupOrderList");
Node = HvGetCell(Hive, ControlCell); Node = (PCM_KEY_NODE)HvGetCell(Hive, ControlCell);
ASSERT(Node); ASSERT(Node);
GroupOrderCell = CmpFindSubKeyByName(Hive, Node, &Name); GroupOrderCell = CmpFindSubKeyByName(Hive, Node, &Name);
if (GroupOrderCell == HCELL_NIL) return FALSE; if (GroupOrderCell == HCELL_NIL) return FALSE;
@ -426,13 +426,13 @@ CmpFindDrivers(IN PHHIVE Hive,
{ {
/* Open the Safe Boot key */ /* Open the Safe Boot key */
RtlInitUnicodeString(&Name, L"SafeBoot"); RtlInitUnicodeString(&Name, L"SafeBoot");
Node = HvGetCell(Hive, ControlCell); Node = (PCM_KEY_NODE)HvGetCell(Hive, ControlCell);
ASSERT(Node); ASSERT(Node);
SafeBootCell = CmpFindSubKeyByName(Hive, Node, &Name); SafeBootCell = CmpFindSubKeyByName(Hive, Node, &Name);
if (SafeBootCell == HCELL_NIL) return FALSE; if (SafeBootCell == HCELL_NIL) return FALSE;
/* Open the correct start key (depending on the mode) */ /* Open the correct start key (depending on the mode) */
Node = HvGetCell(Hive, SafeBootCell); Node = (PCM_KEY_NODE)HvGetCell(Hive, SafeBootCell);
ASSERT(Node); ASSERT(Node);
switch(InitSafeBootMode) switch(InitSafeBootMode)
{ {
@ -571,28 +571,28 @@ CmpSortDriverList(IN PHHIVE Hive,
ASSERT(Hive->ReleaseCellRoutine == NULL); ASSERT(Hive->ReleaseCellRoutine == NULL);
/* Open the control key */ /* Open the control key */
Node = HvGetCell(Hive, ControlSet); Node = (PCM_KEY_NODE)HvGetCell(Hive, ControlSet);
ASSERT(Node); ASSERT(Node);
RtlInitUnicodeString(&Name, L"Control"); RtlInitUnicodeString(&Name, L"Control");
Controls = CmpFindSubKeyByName(Hive, Node, &Name); Controls = CmpFindSubKeyByName(Hive, Node, &Name);
if (Controls == HCELL_NIL) return FALSE; if (Controls == HCELL_NIL) return FALSE;
/* Open the service group order */ /* Open the service group order */
Node = HvGetCell(Hive, Controls); Node = (PCM_KEY_NODE)HvGetCell(Hive, Controls);
ASSERT(Node); ASSERT(Node);
RtlInitUnicodeString(&Name, L"ServiceGroupOrder"); RtlInitUnicodeString(&Name, L"ServiceGroupOrder");
GroupOrder = CmpFindSubKeyByName(Hive, Node, &Name); GroupOrder = CmpFindSubKeyByName(Hive, Node, &Name);
if (GroupOrder == HCELL_NIL) return FALSE; if (GroupOrder == HCELL_NIL) return FALSE;
/* Open the list key */ /* Open the list key */
Node = HvGetCell(Hive, GroupOrder); Node = (PCM_KEY_NODE)HvGetCell(Hive, GroupOrder);
ASSERT(Node); ASSERT(Node);
RtlInitUnicodeString(&Name, L"list"); RtlInitUnicodeString(&Name, L"list");
ListCell = CmpFindValueByName(Hive, Node, &Name); ListCell = CmpFindValueByName(Hive, Node, &Name);
if (ListCell == HCELL_NIL) return FALSE; if (ListCell == HCELL_NIL) return FALSE;
/* Now read the actual list */ /* Now read the actual list */
ListNode = HvGetCell(Hive, ListCell); ListNode = (PCM_KEY_VALUE)HvGetCell(Hive, ListCell);
ASSERT(ListNode); ASSERT(ListNode);
if (ListNode->Type != REG_MULTI_SZ) return FALSE; if (ListNode->Type != REG_MULTI_SZ) return FALSE;
@ -736,12 +736,12 @@ CmpIsSafe(IN PHHIVE Hive,
/* Driver key node (mandatory) */ /* Driver key node (mandatory) */
ASSERT(DriverCell != HCELL_NIL); ASSERT(DriverCell != HCELL_NIL);
DriverNode = HvGetCell(Hive, DriverCell); DriverNode = (PCM_KEY_NODE)HvGetCell(Hive, DriverCell);
ASSERT(DriverNode); ASSERT(DriverNode);
/* Safe boot key node (optional but return TRUE if not present) */ /* Safe boot key node (optional but return TRUE if not present) */
if(SafeBootCell == HCELL_NIL) return TRUE; if(SafeBootCell == HCELL_NIL) return TRUE;
SafeBootNode = HvGetCell(Hive, SafeBootCell); SafeBootNode = (PCM_KEY_NODE)HvGetCell(Hive, SafeBootCell);
if(!SafeBootNode) return FALSE; if(!SafeBootNode) return FALSE;
/* Search by the name from the group */ /* Search by the name from the group */
@ -749,7 +749,7 @@ CmpIsSafe(IN PHHIVE Hive,
CellIndex = CmpFindValueByName(Hive, DriverNode, &Name); CellIndex = CmpFindValueByName(Hive, DriverNode, &Name);
if(CellIndex != HCELL_NIL) if(CellIndex != HCELL_NIL)
{ {
KeyValue = HvGetCell(Hive, CellIndex); KeyValue = (PCM_KEY_VALUE)HvGetCell(Hive, CellIndex);
ASSERT(KeyValue); ASSERT(KeyValue);
if (KeyValue->Type == REG_SZ || KeyValue->Type == REG_EXPAND_SZ) if (KeyValue->Type == REG_SZ || KeyValue->Type == REG_EXPAND_SZ)
{ {
@ -795,7 +795,7 @@ CmpIsSafe(IN PHHIVE Hive,
CellIndex = CmpFindValueByName(Hive, DriverNode, &Name); CellIndex = CmpFindValueByName(Hive, DriverNode, &Name);
if(CellIndex != HCELL_NIL) if(CellIndex != HCELL_NIL)
{ {
KeyValue = HvGetCell(Hive, CellIndex); KeyValue = (PCM_KEY_VALUE)HvGetCell(Hive, CellIndex);
ASSERT(KeyValue); ASSERT(KeyValue);
if (KeyValue->Type == REG_SZ || KeyValue->Type == REG_EXPAND_SZ) if (KeyValue->Type == REG_SZ || KeyValue->Type == REG_EXPAND_SZ)
{ {