Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-02 12:32:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Process the "DelReg" section in .inf files.

Browse source 
svn path=/trunk/; revision=9613
This commit is contained in:
Filip Navara 2004-06-04 23:47:04 +00:00
parent fe2abd0550
commit b820cca03e
2 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: reginf.c,v 1.6 2003/11/14 17:13:36 weiden Exp $ /* $Id: reginf.c,v 1.7 2004/06/04 23:47:04 navaraf Exp $
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS hive maker * PROJECT: ReactOS hive maker
* FILE: tools/mkhive/reginf.h * FILE: tools/mkhive/reginf.h
@ -379,7 +379,7 @@ registry_callback (HINF hInf, PCHAR Section, BOOL Delete)
Ok = InfFindFirstLine (hInf, Section, NULL, &Context); Ok = InfFindFirstLine (hInf, Section, NULL, &Context);
if (!Ok) if (!Ok)
return FALSE; return TRUE; /* Don't fail if the section isn't present */
for (;Ok; Ok = InfFindNextLine (&Context, &Context)) for (;Ok; Ok = InfFindNextLine (&Context, &Context))
{ {
@ -396,9 +396,16 @@ registry_callback (HINF hInf, PCHAR Section, BOOL Delete)
DPRINT("KeyName: <%s>\n", Buffer); DPRINT("KeyName: <%s>\n", Buffer);
/* get flags */ if (Delete)
if (!InfGetIntField (&Context, 4, (PLONG)&Flags)) {
Flags = 0; Flags = FLG_ADDREG_DELVAL;
}
else
{
/* get flags */
if (!InfGetIntField (&Context, 4, (PLONG)&Flags))
Flags = 0;
}
DPRINT("Flags: %lx\n", Flags); DPRINT("Flags: %lx\n", Flags);
@ -455,6 +462,11 @@ ImportRegistryFile(PCHAR FileName,
return FALSE; return FALSE;
} }
if (!registry_callback (hInf, "DelReg", TRUE))
{
DPRINT1 ("registry_callback() failed\n");
}
if (!registry_callback (hInf, "AddReg", FALSE)) if (!registry_callback (hInf, "AddReg", FALSE))
{ {
DPRINT1 ("registry_callback() failed\n"); DPRINT1 ("registry_callback() failed\n");

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

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: registry.c,v 1.9 2004/05/29 21:15:58 navaraf Exp $ /* $Id: registry.c,v 1.10 2004/06/04 23:47:04 navaraf Exp $
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS hive maker * PROJECT: ReactOS hive maker
* FILE: tools/mkhive/registry.c * FILE: tools/mkhive/registry.c
@ -241,8 +241,7 @@ LONG
RegDeleteKey(HKEY Key, RegDeleteKey(HKEY Key,
PCHAR Name) PCHAR Name)
{ {
if (Name != NULL && strchr(Name, '\\') != NULL)
if (strchr(Name, '\\') != NULL)
return(ERROR_INVALID_PARAMETER); return(ERROR_INVALID_PARAMETER);
DPRINT1("FIXME!\n"); DPRINT1("FIXME!\n");