- Do CmpShutdownWorkers only when the registry was actually initialized.

- Guard HvSyncHive with a flusher lock in CmpDoFlushAll.
- Misc typo fixes / spaces cleanup in cmlazy.c.

svn path=/trunk/; revision=31430

reactos/ntoskrnl/config/cmapi.c

@@ -38,9 +38,15 @@ CmpDoFlushAll(IN BOOLEAN ForceFlush)
         Hive = CONTAINING_RECORD(NextEntry, CMHIVE, HiveList);
         if (!(Hive->Hive.HiveFlags & HIVE_NOLAZYFLUSH))
         {
+            /* Acquire the flusher lock */
+            ExAcquirePushLockExclusive((PVOID)&Hive->FlusherLock);
+
             /* Do the sync */
             Status = HvSyncHive(&Hive->Hive);
             if (!NT_SUCCESS(Status)) Result = FALSE;
+
+            /* Release the flusher lock */
+            ExReleasePushLock((PVOID)&Hive->FlusherLock);
         }
 
         /* Try the next entry */

reactos/ntoskrnl/config/cmlazy.c

@@ -187,7 +187,7 @@ CmpLazyFlushWorker(IN PVOID Parameter)
     }
     
     /* Flush the next hive */
-    MoreWork = CmpDoFlushNextHive(ForceFlush, &Result, &DirtyCount);     
+    MoreWork = CmpDoFlushNextHive(ForceFlush, &Result, &DirtyCount);
     if (!MoreWork)
     {
         /* We're done */
@@ -232,7 +232,7 @@ CmpCmdInit(IN BOOLEAN SetupBoot)
     KeSetTimer(&CmpEnableLazyFlushTimer, DueTime, &CmpEnableLazyFlushDpc);
 
     /* Setup flush variables */
-    CmpNoWrite = CmpMiniNTBoot;    
+    CmpNoWrite = CmpMiniNTBoot;
     CmpWasSetupBoot = SetupBoot;
     
     /* Testing: Force Lazy Flushing */
@@ -260,7 +260,7 @@ CmpCmdHiveOpen(IN POBJECT_ATTRIBUTES FileAttributes,
                                  0,
                                  NewHive,
                                  Allocate,
-								 CheckFlags);
+                                 CheckFlags);
     if (((Status == STATUS_ACCESS_DENIED) ||
          (Status == STATUS_NO_SUCH_USER) ||
          (Status == STATUS_WRONG_PASSWORD) ||
@@ -278,8 +278,8 @@ CmpCmdHiveOpen(IN POBJECT_ATTRIBUTES FileAttributes,
                                          0,
                                          NewHive,
                                          Allocate,
-										 CheckFlags);
-            
+                                         CheckFlags);
+
             /* Restore impersonation token */
             PsRevertToSelf();
         }

reactos/ntoskrnl/config/cmsysini.c

@@ -30,6 +30,8 @@ BOOLEAN CmpNoWrite;
 BOOLEAN CmpForceForceFlush;
 BOOLEAN CmpWasSetupBoot;
 
+extern BOOLEAN CmFirstTime;
+
 /* FUNCTIONS *****************************************************************/
 
 VOID
@@ -1637,7 +1639,7 @@ CmpReleaseTwoKcbLockByKey(IN ULONG ConvKey1,
         {
             ASSERT((GET_HASH_ENTRY(CmpCacheTable, ConvKey1).Owner == KeGetCurrentThread()) ||
                    (CmpTestRegistryLockExclusive()));
-            CmpReleaseKcbLockByKey(ConvKey1);        
+            CmpReleaseKcbLockByKey(ConvKey1);
         }
         CmpReleaseKcbLockByKey(ConvKey2);
     }
@@ -1647,7 +1649,7 @@ VOID
 NTAPI
 CmShutdownSystem(VOID)
 {
-    /* Kill the workers and fush all hives */
-    CmpShutdownWorkers();
+    /* Kill the workers and flush all hives */
+    if (!CmFirstTime) CmpShutdownWorkers();
     CmpDoFlushAll(TRUE);
 }