- Fixed a minor bug in IopLoadServiceModule that caused crashes for disabled drivers.

reactos/ntoskrnl/io

diff -u -r1.40 -r1.41
--- driver.c	28 Mar 2004 09:48:13 -0000	1.40
+++ driver.c	28 Mar 2004 12:03:25 -0000	1.41
@@ -1,4 +1,4 @@

-/* $Id: driver.c,v 1.40 2004/03/28 09:48:13 navaraf Exp $

+/* $Id: driver.c,v 1.41 2004/03/28 12:03:25 navaraf Exp $

  *
  * COPYRIGHT:      See COPYING in the top level directory
  * PROJECT:        ReactOS kernel

@@ -370,6 +370,8 @@

    UNICODE_STRING ServiceImagePath;
    NTSTATUS Status;
 

+   DPRINT("IopLoadServiceModule(%wZ, %x)\n", ServiceName, ModuleObject);
+

    /*
     * Get information about the service.
     */

@@ -417,6 +419,8 @@

 
    if (*ModuleObject == NULL)
    {

+      Status = STATUS_UNSUCCESSFUL;
+

       /*
        * Special case for boot modules that were loaded by boot loader.
        */

@@ -429,8 +433,6 @@

          PLOADER_MODULE KeLoaderModules =
             (PLOADER_MODULE)KeLoaderBlock.ModsAddr;
 

-         Status = STATUS_UNSUCCESSFUL;
-

          /*
           * FIXME:
           * Improve this searching algorithm by using the image name

@@ -444,6 +446,8 @@

             ModuleName = (PCHAR)KeLoaderModules[i].String;
             if (!strcmp(ModuleName, SearchName))
             {

+               DPRINT("Initializing boot module\n");
+

                /* Tell, that the module is already loaded */
                KeLoaderModules[i].Reserved = 1;