mirror of
https://github.com/reactos/reactos.git
synced 2024-12-28 01:55:19 +00:00
Fixed severe bugs in the default value handling of RegSetValue() and RegQueryValue().
Implemented simple registry links. Added creation of the CurrentControlSet link. svn path=/trunk/; revision=3132
This commit is contained in:
Eric Kohl
parent
669dabbc82
commit
27a682e098
3 changed files with 228 additions and 53 deletions
|
|
@ -175,19 +175,21 @@ LoadBootDrivers(PCHAR szSystemRoot, int nPos)
|
|||
rc = RegOpenKey(NULL,
|
||||
"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Control\\ServiceGroupOrder",
|
||||
&hGroupKey);
|
||||
DbgPrint((DPRINT_REACTOS, "RegOpenKey(): rc %d\n", (int)rc));
|
||||
if (rc != ERROR_SUCCESS)
|
||||
{
|
||||
DbgPrint((DPRINT_REACTOS, "Failed to open the 'ServiceGroupOrder key (rc %d)\n", (int)rc));
|
||||
return;
|
||||
}
|
||||
|
||||
/* enumerate drivers */
|
||||
rc = RegOpenKey(NULL,
|
||||
"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Services",
|
||||
&hServiceKey);
|
||||
DbgPrint((DPRINT_REACTOS, "RegOpenKey(): rc %d\n", (int)rc));
|
||||
if (rc != ERROR_SUCCESS)
|
||||
{
|
||||
DbgPrint((DPRINT_REACTOS, "Failed to open the 'Services' key (rc %d)\n", (int)rc));
|
||||
return;
|
||||
|
||||
DbgPrint((DPRINT_REACTOS, "hServiceKey: %x\n", (int)hServiceKey));
|
||||
}
|
||||
|
||||
BufferSize = sizeof(ValueBuffer);
|
||||
rc = RegQueryValue(hGroupKey, "List", NULL, (PUCHAR)ValueBuffer, &BufferSize);
|
||||
|
|
@ -373,6 +375,7 @@ LoadAndBootReactOS(PUCHAR OperatingSystemName)
|
|||
char* Base;
|
||||
ULONG Size;
|
||||
|
||||
|
||||
//
|
||||
// Open the operating system section
|
||||
// specified in the .ini file
|
||||
|
|
@ -454,7 +457,6 @@ LoadAndBootReactOS(PUCHAR OperatingSystemName)
|
|||
DebugPrint(DPRINT_REACTOS,"SystemRoot: '%s'", szBootPath);
|
||||
|
||||
UiDrawBackdrop();
|
||||
|
||||
UiDrawStatusText("Loading...");
|
||||
UiDrawProgressBarCenter(0, 100);
|
||||
|
||||
|
|
@ -584,7 +586,6 @@ LoadAndBootReactOS(PUCHAR OperatingSystemName)
|
|||
RegImportHive(Base, Size);
|
||||
|
||||
UiDrawProgressBarCenter(15, 100);
|
||||
|
||||
DebugPrint(DPRINT_REACTOS, "SystemHive loaded at 0x%x size %u", (unsigned)Base, (unsigned)Size);
|
||||
|
||||
/*
|
||||
|
|
@ -598,6 +599,11 @@ LoadAndBootReactOS(PUCHAR OperatingSystemName)
|
|||
#endif
|
||||
UiDrawProgressBarCenter(20, 100);
|
||||
|
||||
/*
|
||||
* Initialize the 'currentControlSet' link
|
||||
*/
|
||||
RegInitCurrentControlSet(FALSE);
|
||||
|
||||
/*
|
||||
* Load NLS files
|
||||
*/
|
||||
|
|
@ -638,3 +644,4 @@ LoadAndBootReactOS(PUCHAR OperatingSystemName)
|
|||
boot_reactos();
|
||||
}
|
||||
|
||||
/* EOF */
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* FreeLoader
|
||||
*
|
||||
* Copyright (C) 2001 Eric Kohl
|
||||
* Copyright (C) 2001, 2002 Eric Kohl
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
|
@ -31,6 +31,8 @@
|
|||
#include <debug.h>
|
||||
#include "registry.h"
|
||||
|
||||
#include <ui.h>
|
||||
|
||||
static HKEY RootKey;
|
||||
|
||||
|
||||
|
|
@ -47,12 +49,122 @@ RegInitializeRegistry(VOID)
|
|||
RootKey->Name = (PUCHAR)MmAllocateMemory(2);
|
||||
strcpy(RootKey->Name, "\\");
|
||||
|
||||
RootKey->Type = 0;
|
||||
RootKey->DataType = 0;
|
||||
RootKey->DataSize = 0;
|
||||
RootKey->Data = NULL;
|
||||
}
|
||||
|
||||
|
||||
LONG
|
||||
RegInitCurrentControlSet(BOOL LastKnownGood)
|
||||
{
|
||||
CHAR ControlSetKeyName[80];
|
||||
HKEY SelectKey;
|
||||
HKEY SystemKey;
|
||||
HKEY ControlSetKey;
|
||||
HKEY LinkKey;
|
||||
ULONG CurrentSet = 0;
|
||||
ULONG DefaultSet = 0;
|
||||
ULONG LastKnownGoodSet = 0;
|
||||
ULONG DataSize;
|
||||
LONG Error;
|
||||
|
||||
Error = RegOpenKey(NULL,
|
||||
"\\Registry\\Machine\\SYSTEM\\Select",
|
||||
&SelectKey);
|
||||
if (Error != ERROR_SUCCESS)
|
||||
{
|
||||
DbgPrint((DPRINT_REGISTRY, "RegOpenKey() failed (Error %u)\n", (int)Error));
|
||||
return(Error);
|
||||
}
|
||||
|
||||
DataSize = sizeof(ULONG);
|
||||
Error = RegQueryValue(SelectKey,
|
||||
"Default",
|
||||
NULL,
|
||||
(PUCHAR)&DefaultSet,
|
||||
&DataSize);
|
||||
if (Error != ERROR_SUCCESS)
|
||||
{
|
||||
DbgPrint((DPRINT_REGISTRY, "RegQueryValue('Default') failed (Error %u)\n", (int)Error));
|
||||
return(Error);
|
||||
}
|
||||
|
||||
DataSize = sizeof(ULONG);
|
||||
Error = RegQueryValue(SelectKey,
|
||||
"LastKnownGood",
|
||||
NULL,
|
||||
(PUCHAR)&LastKnownGoodSet,
|
||||
&DataSize);
|
||||
if (Error != ERROR_SUCCESS)
|
||||
{
|
||||
DbgPrint((DPRINT_REGISTRY, "RegQueryValue('Default') failed (Error %u)\n", (int)Error));
|
||||
return(Error);
|
||||
}
|
||||
|
||||
CurrentSet = (LastKnownGood == TRUE) ? LastKnownGoodSet : DefaultSet;
|
||||
strcpy(ControlSetKeyName, "ControlSet");
|
||||
switch(CurrentSet)
|
||||
{
|
||||
case 1:
|
||||
strcat(ControlSetKeyName, "001");
|
||||
break;
|
||||
case 2:
|
||||
strcat(ControlSetKeyName, "002");
|
||||
break;
|
||||
case 3:
|
||||
strcat(ControlSetKeyName, "003");
|
||||
break;
|
||||
case 4:
|
||||
strcat(ControlSetKeyName, "004");
|
||||
break;
|
||||
case 5:
|
||||
strcat(ControlSetKeyName, "005");
|
||||
break;
|
||||
}
|
||||
|
||||
Error = RegOpenKey(NULL,
|
||||
"\\Registry\\Machine\\SYSTEM",
|
||||
&SystemKey);
|
||||
if (Error != ERROR_SUCCESS)
|
||||
{
|
||||
DbgPrint((DPRINT_REGISTRY, "RegOpenKey(SystemKey) failed (Error %u)\n", (int)Error));
|
||||
return(Error);
|
||||
}
|
||||
|
||||
Error = RegOpenKey(SystemKey,
|
||||
ControlSetKeyName,
|
||||
&ControlSetKey);
|
||||
if (Error != ERROR_SUCCESS)
|
||||
{
|
||||
DbgPrint((DPRINT_REGISTRY, "RegOpenKey(ControlSetKey) failed (Error %u)\n", (int)Error));
|
||||
return(Error);
|
||||
}
|
||||
|
||||
Error = RegCreateKey(SystemKey,
|
||||
"CurrentControlSet",
|
||||
&LinkKey);
|
||||
if (Error != ERROR_SUCCESS)
|
||||
{
|
||||
DbgPrint((DPRINT_REGISTRY, "RegCreateKey(LinkKey) failed (Error %u)\n", (int)Error));
|
||||
return(Error);
|
||||
}
|
||||
|
||||
Error = RegSetValue(LinkKey,
|
||||
NULL,
|
||||
REG_LINK,
|
||||
(PUCHAR)&ControlSetKey,
|
||||
sizeof(PVOID));
|
||||
if (Error != ERROR_SUCCESS)
|
||||
{
|
||||
DbgPrint((DPRINT_REGISTRY, "RegSetValue(LinkKey) failed (Error %u)\n", (int)Error));
|
||||
return(Error);
|
||||
}
|
||||
|
||||
return(ERROR_SUCCESS);
|
||||
}
|
||||
|
||||
|
||||
LONG
|
||||
RegCreateKey(HKEY ParentKey,
|
||||
PCHAR KeyName,
|
||||
|
|
@ -83,6 +195,11 @@ RegCreateKey(HKEY ParentKey,
|
|||
CurrentKey = ParentKey;
|
||||
}
|
||||
|
||||
/* Check whether current key is a link */
|
||||
if (CurrentKey->DataType == REG_LINK)
|
||||
{
|
||||
CurrentKey = (HKEY)CurrentKey->Data;
|
||||
}
|
||||
|
||||
while (*KeyName != 0)
|
||||
{
|
||||
|
|
@ -130,7 +247,7 @@ RegCreateKey(HKEY ParentKey,
|
|||
InitializeListHead(&NewKey->SubKeyList);
|
||||
InitializeListHead(&NewKey->ValueList);
|
||||
|
||||
NewKey->Type = 0;
|
||||
NewKey->DataType = 0;
|
||||
NewKey->DataSize = 0;
|
||||
NewKey->Data = NULL;
|
||||
|
||||
|
|
@ -150,6 +267,12 @@ RegCreateKey(HKEY ParentKey,
|
|||
else
|
||||
{
|
||||
CurrentKey = SearchKey;
|
||||
|
||||
/* Check whether current key is a link */
|
||||
if (CurrentKey->DataType == REG_LINK)
|
||||
{
|
||||
CurrentKey = (HKEY)CurrentKey->Data;
|
||||
}
|
||||
}
|
||||
|
||||
KeyName = KeyName + stringLength;
|
||||
|
|
@ -246,6 +369,11 @@ RegOpenKey(HKEY ParentKey,
|
|||
CurrentKey = ParentKey;
|
||||
}
|
||||
|
||||
/* Check whether current key is a link */
|
||||
if (CurrentKey->DataType == REG_LINK)
|
||||
{
|
||||
CurrentKey = (HKEY)CurrentKey->Data;
|
||||
}
|
||||
|
||||
while (*KeyName != 0)
|
||||
{
|
||||
|
|
@ -292,6 +420,12 @@ RegOpenKey(HKEY ParentKey,
|
|||
else
|
||||
{
|
||||
CurrentKey = SearchKey;
|
||||
|
||||
/* Check whether current key is a link */
|
||||
if (CurrentKey->DataType == REG_LINK)
|
||||
{
|
||||
CurrentKey = (HKEY)CurrentKey->Data;
|
||||
}
|
||||
}
|
||||
|
||||
KeyName = KeyName + stringLength;
|
||||
|
|
@ -320,13 +454,25 @@ RegSetValue(HKEY Key,
|
|||
if ((ValueName == NULL) || (*ValueName == 0))
|
||||
{
|
||||
/* set default value */
|
||||
if (Key->Data != NULL)
|
||||
if ((Key->Data != NULL) && (Key->DataSize > sizeof(PUCHAR)))
|
||||
{
|
||||
MmFreeMemory(Key->Data);
|
||||
}
|
||||
|
||||
if (DataSize <= sizeof(PUCHAR))
|
||||
{
|
||||
Key->DataSize = DataSize;
|
||||
Key->DataType = Type;
|
||||
memcpy(&Key->Data, Data, DataSize);
|
||||
}
|
||||
else
|
||||
{
|
||||
Key->Data = (PUCHAR)MmAllocateMemory(DataSize);
|
||||
Key->DataSize = DataSize;
|
||||
Key->Type = Type;
|
||||
Key->DataType = Type;
|
||||
memcpy(Key->Data, Data, DataSize);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
/* set non-default value */
|
||||
|
|
@ -359,25 +505,30 @@ RegSetValue(HKEY Key,
|
|||
if (Value->Name == NULL)
|
||||
return(ERROR_OUTOFMEMORY);
|
||||
strcpy(Value->Name, ValueName);
|
||||
Value->DataType = REG_NONE;
|
||||
Value->DataSize = 0;
|
||||
Value->Data = NULL;
|
||||
}
|
||||
|
||||
/* set new value */
|
||||
if ((Value->Data != NULL) && (Value->DataSize > sizeof(PUCHAR)))
|
||||
{
|
||||
MmFreeMemory(Value->Data);
|
||||
}
|
||||
|
||||
if (DataSize <= sizeof(PUCHAR))
|
||||
{
|
||||
Value->DataSize = DataSize;
|
||||
Value->Type = Type;
|
||||
Value->DataType = Type;
|
||||
memcpy(&Value->Data, Data, DataSize);
|
||||
}
|
||||
else
|
||||
{
|
||||
if(Value->Data != NULL)
|
||||
MmFreeMemory(Value->Data);
|
||||
Value->Data = (PUCHAR)MmAllocateMemory(DataSize);
|
||||
if (Value->Data == NULL)
|
||||
return(ERROR_OUTOFMEMORY);
|
||||
Value->DataType = Type;
|
||||
Value->DataSize = DataSize;
|
||||
Value->Type = Type;
|
||||
memcpy(Value->Data, Data, DataSize);
|
||||
}
|
||||
}
|
||||
|
|
@ -403,14 +554,27 @@ RegQueryValue(HKEY Key,
|
|||
return(ERROR_INVALID_PARAMETER);
|
||||
|
||||
if (Type != NULL)
|
||||
*Type = Key->Type;
|
||||
*Type = Key->DataType;
|
||||
if ((Data != NULL) && (DataSize != NULL))
|
||||
{
|
||||
if (Key->DataSize <= sizeof(PUCHAR))
|
||||
{
|
||||
Size = min(Key->DataSize, *DataSize);
|
||||
memcpy(Data, &Key->Data, Size);
|
||||
*DataSize = Size;
|
||||
}
|
||||
else
|
||||
{
|
||||
Size = min(Key->DataSize, *DataSize);
|
||||
memcpy(Data, Key->Data, Size);
|
||||
*DataSize = Size;
|
||||
}
|
||||
}
|
||||
else if ((Data == NULL) && (DataSize != NULL))
|
||||
{
|
||||
*DataSize = Key->DataSize;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
/* query non-default value */
|
||||
|
|
@ -433,7 +597,7 @@ RegQueryValue(HKEY Key,
|
|||
return(ERROR_INVALID_PARAMETER);
|
||||
|
||||
if (Type != NULL)
|
||||
*Type = Value->Type;
|
||||
*Type = Value->DataType;
|
||||
if ((Data != NULL) && (DataSize != NULL))
|
||||
{
|
||||
if (Value->DataSize <= sizeof(PUCHAR))
|
||||
|
|
@ -449,6 +613,10 @@ RegQueryValue(HKEY Key,
|
|||
*DataSize = Size;
|
||||
}
|
||||
}
|
||||
else if ((Data == NULL) && (DataSize != NULL))
|
||||
{
|
||||
*DataSize = Value->DataSize;
|
||||
}
|
||||
}
|
||||
|
||||
return(ERROR_SUCCESS);
|
||||
|
|
@ -469,7 +637,7 @@ RegDeleteValue(HKEY Key,
|
|||
MmFreeMemory(Key->Data);
|
||||
Key->Data = NULL;
|
||||
Key->DataSize = 0;
|
||||
Key->Type = 0;
|
||||
Key->DataType = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -502,7 +670,7 @@ RegDeleteValue(HKEY Key,
|
|||
}
|
||||
Value->Data = NULL;
|
||||
Value->DataSize = 0;
|
||||
Value->Type = 0;
|
||||
Value->DataType = 0;
|
||||
|
||||
RemoveEntryList(&Value->ValueList);
|
||||
MmFreeMemory(Value);
|
||||
|
|
@ -536,7 +704,7 @@ RegEnumValue(HKEY Key,
|
|||
if (ValueName != NULL)
|
||||
*ValueName = 0;
|
||||
if (Type != NULL)
|
||||
*Type = Key->Type;
|
||||
*Type = Key->DataType;
|
||||
if (DataSize != NULL)
|
||||
*DataSize = Key->DataSize;
|
||||
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ typedef struct _REG_KEY
|
|||
PUCHAR Name;
|
||||
|
||||
/* default data */
|
||||
ULONG Type;
|
||||
ULONG DataType;
|
||||
ULONG DataSize;
|
||||
PUCHAR Data;
|
||||
} KEY, *HKEY, **PHKEY;
|
||||
|
|
@ -55,7 +55,7 @@ typedef struct _REG_VALUE
|
|||
PUCHAR Name;
|
||||
|
||||
/* value data */
|
||||
ULONG Type;
|
||||
ULONG DataType;
|
||||
ULONG DataSize;
|
||||
PUCHAR Data;
|
||||
} VALUE, *PVALUE;
|
||||
|
|
@ -207,9 +207,6 @@ typedef struct _REG_VALUE
|
|||
(Type *)(((LONG)Address) - FIELD_OFFSET(Type,Field))
|
||||
|
||||
|
||||
//typedef struct _REG_KEY *HKEY, **PHKEY;
|
||||
|
||||
|
||||
#define REG_NONE 0
|
||||
#define REG_SZ 1
|
||||
#define REG_EXPAND_SZ 2
|
||||
|
|
@ -228,6 +225,9 @@ typedef struct _REG_VALUE
|
|||
VOID
|
||||
RegInitializeRegistry(VOID);
|
||||
|
||||
LONG
|
||||
RegInitCurrentControlSet(BOOL LastKnownGood);
|
||||
|
||||
|
||||
LONG
|
||||
RegCreateKey(HKEY ParentKey,
|
||||
|
|
|
|||
Loading…
Reference in a new issue