[ros-diffs] [fireball] 56932: [CMLIB] - Remove unused HFILE_TYPE_ALTERNATE. - Reapply changes from r56884: Hermes Belusca: Fix wrong definition of CMHIVE structure. See issue #7162 for more details.

Author: fireball
Date: Sat Jul 21 23:27:30 2012
New Revision: 56932

URL: http://svn.reactos.org/svn/reactos?rev=56932&view=rev
Log:
[CMLIB]
- Remove unused HFILE_TYPE_ALTERNATE.
- Reapply changes from r56884: Hermes Belusca: Fix wrong definition of CMHIVE structure.
See issue #7162 for more details.

Modified:
    trunk/reactos/lib/cmlib/cmlib.h
    trunk/reactos/lib/cmlib/hivedata.h

Modified: trunk/reactos/lib/cmlib/cmlib.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=5693…
==============================================================================
--- trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] (original)
+++ trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] Sat Jul 21 23:27:30 2012
@@ -151,7 +151,7 @@
 typedef struct _CMHIVE
 {
     HHIVE Hive;
-    HANDLE FileHandles[3];
+    HANDLE FileHandles[HFILE_TYPE_MAX];
     LIST_ENTRY NotifyList;
     LIST_ENTRY HiveList;
     EX_PUSH_LOCK HiveLock;

Modified: trunk/reactos/lib/cmlib/hivedata.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivedata.h?rev=5…
==============================================================================
--- trunk/reactos/lib/cmlib/hivedata.h [iso-8859-1] (original)
+++ trunk/reactos/lib/cmlib/hivedata.h [iso-8859-1] Sat Jul 21 23:27:30 2012
@@ -31,10 +31,9 @@
 // Hive types
 //
 #define HFILE_TYPE_PRIMARY                              0
-#define HFILE_TYPE_ALTERNATE                            1
-#define HFILE_TYPE_LOG                                  2
-#define HFILE_TYPE_EXTERNAL                             3
-#define HFILE_TYPE_MAX                                  4
+#define HFILE_TYPE_LOG                                  1
+#define HFILE_TYPE_EXTERNAL                             2
+#define HFILE_TYPE_MAX                                  3
 
 //
 // Hive sizes