Author: ion Date: Mon Oct 16 06:04:09 2006 New Revision: 24538
URL: http://svn.reactos.org/svn/reactos?rev=24538&view=rev Log: - Fix a bug in FreeLdr key creation (patch by Filip Navara). - Make cmlib use the StorageTypeCount value since my new Cm code needs it.
Modified: trunk/reactos/boot/freeldr/freeldr/reactos/registry.c trunk/reactos/lib/cmlib/hivedata.h trunk/reactos/lib/cmlib/hiveinit.c
Modified: trunk/reactos/boot/freeldr/freeldr/reactos/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/reacto... ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/registry.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/registry.c Mon Oct 16 06:04:09 2006 @@ -275,7 +275,7 @@ CmpResult = _wcsnicmp(SearchKey->Name, name, subkeyLength); if (CmpResult == 0 && SearchKey->NameSize == NameSize) break; - else if (CmpResult == 1) + else if (CmpResult == -1) break;
Ptr = Ptr->Flink;
Modified: trunk/reactos/lib/cmlib/hivedata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivedata.h?rev=24... ============================================================================== --- trunk/reactos/lib/cmlib/hivedata.h (original) +++ trunk/reactos/lib/cmlib/hivedata.h Mon Oct 16 06:04:09 2006 @@ -30,7 +30,6 @@ * the other bits specify index into the hive file. The value HCELL_NULL * (-1) is reserved for marking invalid cells. */ - typedef ULONG HCELL_INDEX, *PHCELL_INDEX;
#define HCELL_NULL ((HCELL_INDEX)-1)
Modified: trunk/reactos/lib/cmlib/hiveinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hiveinit.c?rev=24... ============================================================================== --- trunk/reactos/lib/cmlib/hiveinit.c (original) +++ trunk/reactos/lib/cmlib/hiveinit.c Mon Oct 16 06:04:09 2006 @@ -333,6 +333,7 @@ Hive->FileWrite = FileWrite; Hive->FileSetSize = FileSetSize; Hive->FileFlush = FileFlush; + Hive->StorageTypeCount = 2;
switch (Operation) {