Index: ntoskrnl/io/iomgr/driver.c
===================================================================
--- ntoskrnl/io/iomgr/driver.c	(revision 74742)
+++ ntoskrnl/io/iomgr/driver.c	(working copy)
@@ -317,7 +320,7 @@
 
     ASSERT(ExIsResourceAcquiredExclusiveLite(&IopDriverLoadResource));
     ASSERT(ServiceName->Length);
-    DPRINT("IopLoadServiceModule(%wZ, 0x%p)\n", ServiceName, ModuleObject);
+    DPRINT1("IopLoadServiceModule(%wZ, 0x%p)\n", ServiceName, ModuleObject);
 
     if (ExpInTextModeSetup)
     {
@@ -346,8 +349,8 @@
         Status = IopOpenRegistryKeyEx(&ServiceKey, CCSKey, ServiceName, KEY_READ);
         if (!NT_SUCCESS(Status))
         {
-            DPRINT1("IopOpenRegistryKeyEx() failed for '%wZ' with status 0x%lx\n",
-                    ServiceName, Status);
+            DPRINT1("IopOpenRegistryKeyEx() failed for '%wZ'\\'%wZ' with status 0x%lx\n",
+                    &CCSName, ServiceName, Status);
             ZwClose(CCSKey);
             return Status;
         }
@@ -671,8 +674,8 @@
     ZwClose(EnumRootKey);
     if (!NT_SUCCESS(Status))
     {
-        DPRINT1("IopOpenRegistryKeyEx() failed for '%wZ' with status 0x%lx\n",
-                &DeviceNode->InstancePath, Status);
+        DPRINT1("IopOpenRegistryKeyEx() failed for '%wZ'\\'%wZ' with status 0x%lx\n",
+                &EnumRoot, &DeviceNode->InstancePath, Status);
         return Status;
     }
 
@@ -748,8 +751,8 @@
     if (!NT_SUCCESS(Status))
     {
         /* It's okay if there's no class key */
-        DPRINT1("IopOpenRegistryKeyEx() failed for '%wZ' with status 0x%lx\n",
-                &Class, Status);
+        DPRINT1("IopOpenRegistryKeyEx() failed for '%wZ'\\'%wZ' with status 0x%lx\n",
+                &ControlClass, &Class, Status);
         ZwClose(ControlKey);
         return STATUS_SUCCESS;
     }
@@ -1127,7 +1130,15 @@
                                           NULL,
                                           &BootEntry->RegistryPath,
                                           KEY_READ);
-            if ((NT_SUCCESS(Status)) || /* ReactOS HACK for SETUPLDR */
+            if (KeLoaderBlock->SetupLdrBlock)
+            {
+                DPRINT1("SetupLdrBlock protective measure being enabled ; IopOpenRegistryKeyEx(%wZ) returned 0x%08lx\n", &BootEntry->RegistryPath, Status);
+            }
+            else
+            {
+                DPRINT1("Normal boot ; IopOpenRegistryKeyEx(%wZ) returned 0x%08lx\n", &BootEntry->RegistryPath, Status);
+            }
+            if ((NT_SUCCESS(Status)) || /* ReactOS HACK for SETUPLDR */ // ExpInTextModeSetup
                 ((KeLoaderBlock->SetupLdrBlock) && ((KeyHandle = (PVOID)1)))) // yes, it's an assignment!
             {
                 /* Save the handle */