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

- Add Filip Navara's cmlib

Browse source 
- Use cmlib in Freeldr and Setupldr (patch by Filip Navara)
- Fix some HIVE definition and checksum calculation in mkhive and ntoskrnl (so they btoh create a compatible registry)

TODO: Apply 2nd half of the patch, which makes ntoskrnl using cmlib.

This commit is dedicated to Filip Navara's constant promises to commit cmlib and to recent small Arty vs. Alex debate on irc :)

svn path=/trunk/; revision=23332
This commit is contained in:
Aleksey Bragin 2006-07-28 20:25:47 +00:00
parent 02f0e4b7ac
commit b6fc604db0
10 changed files with 157 additions and 962 deletions
Download patch file Download diff file Expand all files Collapse all files

1
reactos/boot/freeldr/freeldr/freeldr.rbuild
View file

@ -7,5 +7,6 @@
<library>freeldr_main</library> <library>freeldr_main</library>
<library>rossym</library> <library>rossym</library>
<library>string</library> <library>string</library>
<library>cmlib</library>
<library>rtl</library> <library>rtl</library>
</module> </module>

1
reactos/boot/freeldr/freeldr/freeldr_base.rbuild
View file

@ -1,6 +1,7 @@
<module name="freeldr_base" type="objectlibrary"> <module name="freeldr_base" type="objectlibrary">
<include base="freeldr_base">include</include> <include base="freeldr_base">include</include>
<include base="freeldr_base">cache</include> <include base="freeldr_base">cache</include>
<include base="cmlib">.</include>
<include base="ntoskrnl">include</include> <include base="ntoskrnl">include</include>
<define name="__USE_W32API" /> <define name="__USE_W32API" />
<!-- <!--

2
reactos/boot/freeldr/freeldr/include/arch/i386/hardware.h
View file

@ -43,7 +43,7 @@ typedef struct _CM_COMPONENT_INFORMATION
/* CM_COMPONENT_INFORMATION.Flags */ /* CM_COMPONENT_INFORMATION.Flags */
#define Failed 0x00000001 #define Failed 0x00000001
#define ReadOnly 0x00000002 //#define ReadOnly 0x00000002
#define Removable 0x00000004 #define Removable 0x00000004
#define ConsoleIn 0x00000008 #define ConsoleIn 0x00000008
#define ConsoleOut 0x00000010 #define ConsoleOut 0x00000010

1094
reactos/boot/freeldr/freeldr/reactos/binhive.c
View file

File diff suppressed because it is too large Load diff

1
reactos/boot/freeldr/freeldr/setupldr.rbuild
View file

@ -7,5 +7,6 @@
<library>setupldr_main</library> <library>setupldr_main</library>
<library>rossym</library> <library>rossym</library>
<library>string</library> <library>string</library>
<library>cmlib</library>
<library>rtl</library> <library>rtl</library>
</module> </module>

1
reactos/lib/lib.mak
View file

@ -3,3 +3,4 @@ LIB_BASE_ = $(LIB_BASE)$(SEP)
include lib/inflib/inflib.mak include lib/inflib/inflib.mak
include lib/3rdparty/zlib/zlib.mak include lib/3rdparty/zlib/zlib.mak
include lib/cmlib/cmlib.mak

3
reactos/lib/lib.rbuild
View file

@ -4,6 +4,9 @@
<directory name="3rdparty"> <directory name="3rdparty">
<xi:include href="3rdparty/3rdparty.rbuild" /> <xi:include href="3rdparty/3rdparty.rbuild" />
</directory> </directory>
<directory name="cmlib">
<xi:include href="cmlib/cmlib.rbuild" />
</directory>
<directory name="crt"> <directory name="crt">
<xi:include href="crt/crt.rbuild" /> <xi:include href="crt/crt.rbuild" />
</directory> </directory>

2
reactos/ntoskrnl/cm/cm.h
View file

@ -94,7 +94,7 @@ typedef struct _HIVE_HEADER
ULONG Unused7; ULONG Unused7;
/* Name of hive file */ /* Name of hive file */
WCHAR FileName[48]; WCHAR FileName[32];
ULONG Reserved[99]; ULONG Reserved[99];

6
reactos/ntoskrnl/cm/regfile.c
View file

@ -1360,7 +1360,11 @@ CmiCalcChecksum(PULONG Buffer)
ULONG i; ULONG i;
for (i = 0; i < 127; i++) for (i = 0; i < 127; i++)
Sum += Buffer[i]; Sum ^= Buffer[i];
if (Sum == (ULONG)-1)
Sum = (ULONG)-2;
if (Sum == 0)
Sum = 1;
return(Sum); return(Sum);
} }

8
reactos/tools/mkhive/binhive.c
View file

@ -107,7 +107,7 @@ typedef struct _HIVE_HEADER
ULONG Unused7; ULONG Unused7;
/* Name of hive file */ /* Name of hive file */
WCHAR FileName[48]; WCHAR FileName[32];
ULONG Reserved[99]; ULONG Reserved[99];
@ -1248,7 +1248,11 @@ CmiCalcHiveChecksum (PREGISTRY_HIVE Hive)
Buffer = (PULONG)Hive->HiveHeader; Buffer = (PULONG)Hive->HiveHeader;
Sum = 0; Sum = 0;
for (i = 0; i < 127; i++) for (i = 0; i < 127; i++)
Sum += Buffer[i]; Sum ^= Buffer[i];
if (Sum == (ULONG)-1)
Sum = (ULONG)-2;
if (Sum == 0)
Sum = 1;
Hive->HiveHeader->Checksum = Sum; Hive->HiveHeader->Checksum = Sum;
} }