Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-01 23:14:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Modified LdrLoadModule() to return NTSTATUS.

Browse source 
Added missing definitions.

svn path=/trunk/; revision=2955
This commit is contained in:
Eric Kohl 2002-05-16 06:41:30 +00:00
parent 2d27974602
commit cca52d053b
4 changed files with 81 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
reactos/ntoskrnl/include/internal/kd.h
View file

@ -1,4 +1,4 @@
/* $Id: kd.h,v 1.8 2002/05/14 21:19:17 dwelch Exp $
/* $Id: kd.h,v 1.9 2002/05/16 06:39:30 ekohl Exp $
*
* kernel debugger prototypes
*/
@ -8,18 +8,18 @@
#include <internal/ke.h>
typedef enum
{
NoDebug = 0,
GdbDebug,
PiceDebug,
ScreenDebug,
SerialDebug,
BochsDebug,
FileLogDebug
} DEBUG_TYPE;
#define KD_DEBUG_DISABLED 0x00
#define KD_DEBUG_GDB 0x01
#define KD_DEBUG_PICE 0x02
#define KD_DEBUG_SCREEN 0x04
#define KD_DEBUG_SERIAL 0x08
#define KD_DEBUG_BOCHS 0x10
#define KD_DEBUG_FILELOG 0x20
extern DEBUG_TYPE KdDebugType;
extern ULONG KdDebugState;
KD_PORT_INFORMATION GdbPortInfo;
KD_PORT_INFORMATION LogPortInfo;
typedef enum _KD_CONTINUE_TYPE
{

18
reactos/ntoskrnl/include/internal/ldr.h
View file

@ -13,6 +13,11 @@
#include <ntdll/ldr.h>
#include <internal/module.h>
#define KERNEL_MODULE_NAME L"ntoskrnl.exe"
#define HAL_MODULE_NAME L"hal.dll"
#define MODULE_ROOT_NAME L"\\Modules\\"
#define FILESYSTEM_ROOT_NAME L"\\FileSystem\\"
NTSTATUS
LdrLoadDriver (
PUNICODE_STRING Filename,
@ -52,7 +57,7 @@ PVOID
LdrpGetSystemDllCallbackDispatcher(VOID);
NTSTATUS
LdrpMapImage (
HANDLE ProcessHandle,
HANDLE ProcessHandle,
HANDLE SectionHandle,
PVOID * ImageBase
);
@ -93,12 +98,13 @@ PVOID LdrSafePEProcessModule(
PVOID ImportModuleBase,
PULONG DriverSize);
PMODULE_OBJECT
LdrLoadModule(PUNICODE_STRING Filename);
NTSTATUS
LdrLoadModule(PUNICODE_STRING Filename,
PMODULE_OBJECT *ModuleObject);
NTSTATUS LdrFindModuleObject(
PUNICODE_STRING ModuleName,
PMODULE_OBJECT *ModuleObject);
NTSTATUS
LdrFindModuleObject(PUNICODE_STRING ModuleName,
PMODULE_OBJECT *ModuleObject);
NTSTATUS LdrpOpenModuleDirectory(PHANDLE Handle);

16
reactos/ntoskrnl/io/device.c
View file

@ -1,4 +1,4 @@
/* $Id: device.c,v 1.40 2002/05/05 14:57:43 chorns Exp $
/* $Id: device.c,v 1.41 2002/05/16 06:40:29 ekohl Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@ -432,20 +432,20 @@ IopInitializeService(
{
/* The module is currently not loaded, so load it now */
ModuleObject = LdrLoadModule(ImagePath);
if (!ModuleObject)
Status = LdrLoadModule(ImagePath, &ModuleObject);
if (!NT_SUCCESS(Status))
{
/* FIXME: Log the error */
CPRINT("Driver load failed\n");
return STATUS_UNSUCCESSFUL;
CPRINT("Driver load failed\n");
return(Status);
}
Status = IopInitializeDriver(ModuleObject->EntryPoint, DeviceNode);
if (!NT_SUCCESS(Status))
{
/* FIXME: Log the error */
CPRINT("A driver failed to initialize\n");
return Status;
CPRINT("A driver failed to initialize\n");
return(Status);
}
}
@ -453,7 +453,7 @@ IopInitializeService(
Status = IopInitializeDevice(DeviceNode, TRUE);
return Status;
return(Status);
}
NTSTATUS

85
reactos/ntoskrnl/ldr/loader.c
View file

@ -1,4 +1,4 @@
/* $Id: loader.c,v 1.103 2002/05/08 17:05:32 chorns Exp $
/* $Id: loader.c,v 1.104 2002/05/16 06:41:30 ekohl Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@ -58,7 +58,6 @@ ULONG_PTR LdrHalBase;
/* FORWARD DECLARATIONS ******************************************************/
PMODULE_OBJECT LdrLoadModule(PUNICODE_STRING Filename);
NTSTATUS LdrProcessModule(PVOID ModuleLoadBase,
PUNICODE_STRING ModuleName,
PMODULE_OBJECT *ModuleObject);
@ -1020,9 +1019,10 @@ LdrCreateModule(PVOID ObjectBody,
* RETURNS: Status
*/
NTSTATUS LdrLoadDriver(PUNICODE_STRING Filename,
PDEVICE_NODE DeviceNode,
BOOLEAN BootDriversOnly)
NTSTATUS
LdrLoadDriver(PUNICODE_STRING Filename,
PDEVICE_NODE DeviceNode,
BOOLEAN BootDriversOnly)
{
PMODULE_OBJECT ModuleObject;
WCHAR Buffer[MAX_PATH];
@ -1031,10 +1031,11 @@ NTSTATUS LdrLoadDriver(PUNICODE_STRING Filename,
LPWSTR Start;
LPWSTR Ext;
ModuleObject = LdrLoadModule(Filename);
if (!ModuleObject)
Status = LdrLoadModule(Filename, &ModuleObject);
if (!NT_SUCCESS(Status))
{
return STATUS_UNSUCCESSFUL;
DPRINT1("LdrLoadModule() failed\n");
return(Status);
}
/* Set a service name for the device node */
@ -1062,21 +1063,23 @@ NTSTATUS LdrLoadDriver(PUNICODE_STRING Filename,
ObDereferenceObject(ModuleObject);
}
return Status;
return(Status);
}
NTSTATUS LdrLoadGdiDriver (PUNICODE_STRING DriverName,
PVOID *ImageAddress,
PVOID *SectionPointer,
PVOID *EntryPoint,
PVOID *ExportSectionPointer)
NTSTATUS
LdrLoadGdiDriver(PUNICODE_STRING DriverName,
PVOID *ImageAddress,
PVOID *SectionPointer,
PVOID *EntryPoint,
PVOID *ExportSectionPointer)
{
PMODULE_OBJECT ModuleObject;
PMODULE_OBJECT ModuleObject;
NTSTATUS Status;
ModuleObject = LdrLoadModule(DriverName);
if (ModuleObject == 0)
Status = LdrLoadModule(DriverName, &ModuleObject);
if (!NT_SUCCESS(Status))
{
return STATUS_UNSUCCESSFUL;
return(Status);
}
if (ImageAddress)
@ -1091,25 +1094,30 @@ NTSTATUS LdrLoadGdiDriver (PUNICODE_STRING DriverName,
// if (ExportSectionPointer)
// *ExportSectionPointer = ModuleObject->
return STATUS_SUCCESS;
return(STATUS_SUCCESS);
}
PMODULE_OBJECT
LdrLoadModule(PUNICODE_STRING Filename)
NTSTATUS
LdrLoadModule(PUNICODE_STRING Filename,
PMODULE_OBJECT *ModuleObject)
{
PVOID ModuleLoadBase;
NTSTATUS Status;
HANDLE FileHandle;
OBJECT_ATTRIBUTES ObjectAttributes;
PMODULE_OBJECT ModuleObject;
PMODULE_OBJECT Module;
FILE_STANDARD_INFORMATION FileStdInfo;
IO_STATUS_BLOCK IoStatusBlock;
*ModuleObject = NULL;
/* Check for module already loaded */
if ((ModuleObject = LdrOpenModule(Filename)) != NULL)
Module = LdrOpenModule(Filename);
if (Module != NULL)
{
return ModuleObject;
*ModuleObject = Module;
return(STATUS_SUCCESS);
}
DPRINT("Loading Module %wZ...\n", Filename);
@ -1131,7 +1139,7 @@ LdrLoadModule(PUNICODE_STRING Filename)
if (!NT_SUCCESS(Status))
{
CPRINT("Could not open module file: %wZ\n", Filename);
return NULL;
return(Status);
}
CHECKPOINT;
@ -1144,7 +1152,8 @@ LdrLoadModule(PUNICODE_STRING Filename)
if (!NT_SUCCESS(Status))
{
CPRINT("Could not get file size\n");
return NULL;
NtClose(FileHandle);
return(Status);
}
CHECKPOINT;
@ -1156,7 +1165,8 @@ LdrLoadModule(PUNICODE_STRING Filename)
if (ModuleLoadBase == NULL)
{
CPRINT("Could not allocate memory for module");
return NULL;
NtClose(FileHandle);
return(Status);
}
CHECKPOINT;
@ -1171,7 +1181,8 @@ LdrLoadModule(PUNICODE_STRING Filename)
{
CPRINT("Could not read module file into memory");
ExFreePool(ModuleLoadBase);
return NULL;
NtClose(FileHandle);
return(Status);
}
CHECKPOINT;
@ -1179,12 +1190,12 @@ LdrLoadModule(PUNICODE_STRING Filename)
Status = LdrProcessModule(ModuleLoadBase,
Filename,
&ModuleObject);
&Module);
if (!NT_SUCCESS(Status))
{
CPRINT("Could not process module");
ExFreePool(ModuleLoadBase);
return NULL;
return(Status);
}
/* Cleanup */
@ -1192,12 +1203,14 @@ LdrLoadModule(PUNICODE_STRING Filename)
#ifdef KDBG
/* Load symbols for module if available */
LdrpLoadModuleSymbols(ModuleObject);
/* Load symbols for module if available */
LdrpLoadModuleSymbols(Module);
#endif /* KDBG */
return ModuleObject;
*ModuleObject = Module;
return(STATUS_SUCCESS);
}
NTSTATUS
@ -1720,10 +1733,10 @@ LdrPEProcessModule(PVOID ModuleLoadBase,
RtlInitUnicodeString (&ModuleName, NameBuffer);
DPRINT("Import module: %wZ\n", &ModuleName);
LibraryModuleObject = LdrLoadModule(&ModuleName);
if (LibraryModuleObject == 0)
Status = LdrLoadModule(&ModuleName, &LibraryModuleObject);
if (!NT_SUCCESS(Status))
{
CPRINT("Unknown import module: %wZ\n", &ModuleName);
CPRINT("Unknown import module: %wZ (Status %lx)\n", &ModuleName, Status);
}
/* Get the import address list */
ImportAddressList = (PVOID *) ((DWORD)DriverBase +