Ros-diffs February 2007

ros-diffs@reactos.org

16 participants
265 discussions

[ion] 25862: - Properly implement SystemLoadGdiDriverInformation. - Properly implement SystemExtendServiceTableInformation, except that the SE_LOAD_DRIVER_PRIVILEGE check is currently disabled since our smss doesn't acquire it (and we should therefore ban it from loading win32k.sys...). - Delete LdrpLoadImage, LdrpUnlaodImage, LdrpLoadAndCallImage.

by ion＠svn.reactos.org

Author: ion Date: Wed Feb 21 05:46:30 2007 New Revision: 25862 URL: http://svn.reactos.org/svn/reactos?rev=25862&view=rev Log: - Properly implement SystemLoadGdiDriverInformation. - Properly implement SystemExtendServiceTableInformation, except that the SE_LOAD_DRIVER_PRIVILEGE check is currently disabled since our smss doesn't acquire it (and we should therefore ban it from loading win32k.sys...). - Delete LdrpLoadImage, LdrpUnlaodImage, LdrpLoadAndCallImage. Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/ldr/loader.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c Wed Feb 21 05:46:30 2007 @@ -1137,33 +1137,62 @@ } /* Class 26 - Load Image */ -SSI_DEF(SystemLoadImage) -{ - PSYSTEM_GDI_DRIVER_INFORMATION Sli = (PSYSTEM_GDI_DRIVER_INFORMATION)Buffer; - - if (sizeof(SYSTEM_GDI_DRIVER_INFORMATION) != Size) - { - return(STATUS_INFO_LENGTH_MISMATCH); - } - - return(LdrpLoadImage(&Sli->DriverName, - &Sli->ImageAddress, - &Sli->SectionPointer, - &Sli->EntryPoint, - (PVOID)&Sli->ExportSectionPointer)); +SSI_DEF(SystemLoadGdiDriverInformation) +{ + PSYSTEM_GDI_DRIVER_INFORMATION DriverInfo = (PVOID)Buffer; + KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); + UNICODE_STRING ImageName; + PVOID ImageBase; + ULONG_PTR EntryPoint; + NTSTATUS Status; + PLDR_DATA_TABLE_ENTRY ModuleObject; + ULONG DirSize; + PIMAGE_NT_HEADERS NtHeader; + + /* Validate size */ + if (Size != sizeof(SYSTEM_GDI_DRIVER_INFORMATION)) + { + /* Incorrect buffer length, fail */ + return STATUS_INFO_LENGTH_MISMATCH; + } + + /* Only kernel-mode can call this function */ + if (PreviousMode != KernelMode) return STATUS_PRIVILEGE_NOT_HELD; + + /* Load the driver */ + ImageName = DriverInfo->DriverName; + Status = LdrLoadModule(&ImageName, &ModuleObject); + if (!NT_SUCCESS(Status)) return Status; + + /* Return the export pointer */ + ImageBase = ModuleObject->DllBase; + DriverInfo->ExportSectionPointer = + RtlImageDirectoryEntryToData(ImageBase, + TRUE, + IMAGE_DIRECTORY_ENTRY_EXPORT, + &DirSize); + + /* Get the entrypoint */ + NtHeader = RtlImageNtHeader(ImageBase); + EntryPoint = NtHeader->OptionalHeader.AddressOfEntryPoint; + EntryPoint += (ULONG_PTR)ImageBase; + + /* Save other data */ + DriverInfo->ImageAddress = ImageBase; + DriverInfo->SectionPointer = NULL; + DriverInfo->EntryPoint = (PVOID)EntryPoint; + DriverInfo->ImageLength = NtHeader->OptionalHeader.SizeOfImage; + + /* All is good */ + return STATUS_SUCCESS; } /* Class 27 - Unload Image */ -SSI_DEF(SystemUnloadImage) -{ - PVOID Sui = (PVOID)Buffer; - - if (sizeof(PVOID) != Size) - { - return(STATUS_INFO_LENGTH_MISMATCH); - } - - return(LdrpUnloadImage(Sui)); +SSI_DEF(SystemUnloadGdiDriverInformation) +{ + /* FIXME: TODO */ + if (Size != sizeof(PVOID)) return STATUS_INFO_LENGTH_MISMATCH; + return STATUS_NOT_IMPLEMENTED; } /* Class 28 - Time Adjustment Information */ @@ -1290,16 +1319,74 @@ } /* Class 38 - Load And Call Image */ -SSI_DEF(SystemLoadAndCallImage) -{ - PUNICODE_STRING Slci = (PUNICODE_STRING)Buffer; - - if (sizeof(UNICODE_STRING) != Size) - { - return(STATUS_INFO_LENGTH_MISMATCH); - } - - return(LdrpLoadAndCallImage(Slci)); +SSI_DEF(SystemExtendServiceTableInformation) +{ + UNICODE_STRING ImageName; + KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); + PLDR_DATA_TABLE_ENTRY ModuleObject; + NTSTATUS Status; + PIMAGE_NT_HEADERS NtHeader; + DRIVER_OBJECT Win32k; + PDRIVER_INITIALIZE DriverInit; + PVOID ImageBase; + ULONG_PTR EntryPoint; + + /* Validate the size */ + if (Size != sizeof(UNICODE_STRING)) return STATUS_INFO_LENGTH_MISMATCH; + + /* Check who is calling */ + if (PreviousMode != KernelMode) + { + /* Make sure we can load drivers */ + if (!SeSinglePrivilegeCheck(SeLoadDriverPrivilege, UserMode)) + { + /* FIXME: We can't, fail */ + //return STATUS_PRIVILEGE_NOT_HELD; + } + + /* Probe and capture the driver name */ + ProbeAndCaptureUnicodeString(&ImageName, UserMode, Buffer); + + /* Force kernel as previous mode */ + return ZwSetSystemInformation(SystemExtendServiceTableInformation, + &ImageName, + sizeof(ImageName)); + } + + /* Just copy the string */ + ImageName = *(PUNICODE_STRING)Buffer; + + /* Load the image */ + Status = LdrLoadModule(&ImageName, &ModuleObject); + if (!NT_SUCCESS(Status)) return Status; + + /* Get the headers */ + ImageBase = ModuleObject->DllBase; + NtHeader = RtlImageNtHeader(ImageBase); + if (!NtHeader) + { + /* Fail */ + LdrUnloadModule(ModuleObject); + return STATUS_INVALID_IMAGE_FORMAT; + } + + /* Get the entrypoint */ + EntryPoint = NtHeader->OptionalHeader.AddressOfEntryPoint; + EntryPoint += (ULONG_PTR)ImageBase; + DriverInit = (PDRIVER_INITIALIZE)EntryPoint; + + /* Create a dummy device */ + RtlZeroMemory(&Win32k, sizeof(Win32k)); + ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL); + Win32k.DriverStart = ImageBase; + + /* Call it */ + Status = (DriverInit)(&Win32k, NULL); + ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL); + + /* Unload if we failed */ + if (!NT_SUCCESS(Status)) LdrUnloadModule(ModuleObject); + return Status; } /* Class 39 - Priority Separation */ @@ -1511,8 +1598,8 @@ SI_QX(SystemInterruptInformation), SI_QS(SystemDpcBehaviourInformation), SI_QX(SystemFullMemoryInformation), /* it should be SI_XX */ - SI_XS(SystemLoadImage), - SI_XS(SystemUnloadImage), + SI_XS(SystemLoadGdiDriverInformation), + SI_XS(SystemUnloadGdiDriverInformation), SI_QS(SystemTimeAdjustmentInformation), SI_QX(SystemSummaryMemoryInformation), /* it should be SI_XX */ SI_QX(SystemNextEventIdInformation), /* it should be SI_XX */ @@ -1523,7 +1610,7 @@ SI_QX(SystemKernelDebuggerInformation), SI_QX(SystemContextSwitchInformation), SI_QS(SystemRegistryQuotaInformation), - SI_XS(SystemLoadAndCallImage), + SI_XS(SystemExtendServiceTableInformation), SI_XS(SystemPrioritySeperation), SI_QX(SystemPlugPlayBusInformation), /* it should be SI_XX */ SI_QX(SystemDockInformation), /* it should be SI_XX */ Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Wed Feb 21 05:46:30 2007 @@ -78,7 +78,7 @@ if (DriverObject->DriverSection) { /* Unload it */ - LdrpUnloadImage(DriverObject->DriverSection); + //LdrpUnloadImage(DriverObject->DriverSection); } /* Check if it has a name */ Modified: trunk/reactos/ntoskrnl/ldr/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ldr/loader.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ldr/loader.c (original) +++ trunk/reactos/ntoskrnl/ldr/loader.c Wed Feb 21 05:46:30 2007 @@ -556,7 +556,7 @@ DPRINT("Failed to allocate a virtual section for driver\n"); return STATUS_UNSUCCESSFUL; } - DPRINT1("DriverBase for %wZ: %x\n", FileName, DriverBase); + DPRINT("DriverBase for %wZ: %x\n", FileName, DriverBase); /* Copy headers over */ memcpy(DriverBase, ModuleLoadBase, PENtHeaders->OptionalHeader.SizeOfHeaders); @@ -738,94 +738,6 @@ DPRINT("Could not find module '%wZ'\n", ModuleName); return(NULL); -} - -// -// Used by NtSetSystemInformation -// -NTSTATUS -NTAPI -LdrpLoadImage ( - PUNICODE_STRING DriverName, - PVOID *ModuleBase, - PVOID *SectionPointer, - PVOID *EntryPoint, - PVOID *ExportSectionPointer ) -{ - PLDR_DATA_TABLE_ENTRY ModuleObject; - NTSTATUS Status; - - ModuleObject = LdrGetModuleObject(DriverName); - if (ModuleObject == NULL) - { - Status = LdrLoadModule(DriverName, &ModuleObject); - if (!NT_SUCCESS(Status)) - { - return(Status); - } - } - - if (ModuleBase) - *ModuleBase = ModuleObject->DllBase; - - if (SectionPointer) - *SectionPointer = ModuleObject; - - if (EntryPoint) - *EntryPoint = ModuleObject->EntryPoint; - - //if (ExportSectionPointer) - // *ExportSectionPointer = ModuleObject-> - - return(STATUS_SUCCESS); -} - -// -// Used by NtSetSystemInformation -// -NTSTATUS -NTAPI -LdrpUnloadImage ( PVOID ModuleBase ) -{ - return(STATUS_NOT_IMPLEMENTED); -} - -// -// Used by NtSetSystemInformation -// -NTSTATUS -NTAPI -LdrpLoadAndCallImage ( PUNICODE_STRING ModuleName ) -{ - PDRIVER_INITIALIZE DriverEntry; - PLDR_DATA_TABLE_ENTRY ModuleObject; - DRIVER_OBJECT DriverObject; - NTSTATUS Status; - - ModuleObject = LdrGetModuleObject(ModuleName); - if (ModuleObject != NULL) - { - return(STATUS_IMAGE_ALREADY_LOADED); - } - - Status = LdrLoadModule(ModuleName, &ModuleObject); - if (!NT_SUCCESS(Status)) - { - return(Status); - } - - DriverEntry = (PDRIVER_INITIALIZE)ModuleObject->EntryPoint; - - RtlZeroMemory(&DriverObject, sizeof(DriverObject)); -// DriverObject.DriverStart = ModuleObject->DllBase; - - Status = DriverEntry(&DriverObject, NULL); - if (!NT_SUCCESS(Status)) - { - LdrUnloadModule(ModuleObject); - } - - return(Status); } //

17 years, 8 months

[ion] 25861: - Cleanup loader.c and comment some public routines (no code change). - Temporarily remove routines to set per-page protection (this doesn't really break anything, just makes the OS less secure).

by ion＠svn.reactos.org

Author: ion Date: Wed Feb 21 04:57:02 2007 New Revision: 25861 URL: http://svn.reactos.org/svn/reactos?rev=25861&view=rev Log: - Cleanup loader.c and comment some public routines (no code change). - Temporarily remove routines to set per-page protection (this doesn't really break anything, just makes the OS less secure). Modified: trunk/reactos/ntoskrnl/ldr/loader.c Modified: trunk/reactos/ntoskrnl/ldr/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ldr/loader.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ldr/loader.c (original) +++ trunk/reactos/ntoskrnl/ldr/loader.c Wed Feb 21 04:57:02 2007 @@ -15,30 +15,8 @@ /* INCLUDES *****************************************************************/ #include <ntoskrnl.h> - -#ifdef HALDBG -#include <internal/ntosdbg.h> -#else -#ifdef __GNUC__ -#define ps(args...) -#else -#define ps -#endif /* __GNUC__ */ -#endif - -#if 0 -#undef ps -#define ps(args...) DPRINT1(args) -#endif - #define NDEBUG -#include <internal/debug.h> - -#if defined (ALLOC_PRAGMA) -#pragma alloc_text(INIT, LdrInit1) -#pragma alloc_text(INIT, LdrInitModuleManagement) -#pragma alloc_text(INIT, LdrSafePEProcessModule) -#endif +#include <debug.h> /* GLOBALS *******************************************************************/ @@ -47,467 +25,44 @@ LDR_DATA_TABLE_ENTRY NtoskrnlModuleObject; LDR_DATA_TABLE_ENTRY HalModuleObject; -/* FORWARD DECLARATIONS ******************************************************/ - -NTSTATUS -LdrProcessModule ( - PVOID ModuleLoadBase, - PUNICODE_STRING ModuleName, - PLDR_DATA_TABLE_ENTRY *ModuleObject ); +/* FUNCTIONS *****************************************************************/ + +static PVOID +LdrPEGetExportByName ( + PVOID BaseAddress, + PUCHAR SymbolName, + USHORT Hint ); static VOID LdrpBuildModuleBaseName ( - PUNICODE_STRING BaseName, - PUNICODE_STRING FullName ); + PUNICODE_STRING BaseName, + PUNICODE_STRING FullName ) +{ + PWCHAR p; + + DPRINT("LdrpBuildModuleBaseName()\n"); + DPRINT("FullName %wZ\n", FullName); + + p = wcsrchr(FullName->Buffer, L'\\'); + if (p == NULL) + { + p = FullName->Buffer; + } + else + { + p++; + } + + DPRINT("p %S\n", p); + + RtlInitUnicodeString(BaseName, p); +} + static LONG LdrpCompareModuleNames ( - IN PUNICODE_STRING String1, - IN PUNICODE_STRING String2 ); - - -/* PE Driver load support */ -static NTSTATUS -LdrPEProcessModule ( - PVOID ModuleLoadBase, - PUNICODE_STRING FileName, - PLDR_DATA_TABLE_ENTRY *ModuleObject ); - -static PVOID -LdrPEGetExportByName ( - PVOID BaseAddress, - PUCHAR SymbolName, - USHORT Hint ); - -static PVOID -LdrPEFixupForward ( PCHAR ForwardName ); - -static NTSTATUS -LdrPEFixupImports ( IN PVOID DllBase, IN PWCHAR DllName); - -/* FUNCTIONS *****************************************************************/ - -VOID -NTAPI -LdrInitDebug ( PLOADER_MODULE Module, PWCH Name ) -{ -} - -VOID -INIT_FUNCTION -NTAPI -LdrInit1(VOID) -{ - PLDR_DATA_TABLE_ENTRY HalModuleObject, NtoskrnlModuleObject, LdrEntry; - - /* Initialize the module list and spinlock */ - InitializeListHead(&ModuleListHead); - KeInitializeSpinLock(&ModuleListLock); - - /* Get the NTOSKRNL Entry from the loader */ - LdrEntry = CONTAINING_RECORD(KeLoaderBlock->LoadOrderListHead.Flink, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); - - /* Initialize ModuleObject for NTOSKRNL */ - NtoskrnlModuleObject = ExAllocatePoolWithTag(PagedPool, - sizeof(LDR_DATA_TABLE_ENTRY), - TAG('M', 'm', 'L', 'd')); - NtoskrnlModuleObject->DllBase = LdrEntry->DllBase; - RtlInitUnicodeString(&NtoskrnlModuleObject->FullDllName, KERNEL_MODULE_NAME); - LdrpBuildModuleBaseName(&NtoskrnlModuleObject->BaseDllName, &NtoskrnlModuleObject->FullDllName); - NtoskrnlModuleObject->EntryPoint = LdrEntry->EntryPoint; - NtoskrnlModuleObject->SizeOfImage = LdrEntry->SizeOfImage; - - /* Insert it into the list */ - InsertTailList(&ModuleListHead, &NtoskrnlModuleObject->InLoadOrderLinks); - - /* Get the HAL Entry from the loader */ - LdrEntry = CONTAINING_RECORD(KeLoaderBlock->LoadOrderListHead.Flink->Flink, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); - - /* Initialize ModuleObject for HAL */ - HalModuleObject = ExAllocatePoolWithTag(PagedPool, - sizeof(LDR_DATA_TABLE_ENTRY), - TAG('M', 'm', 'L', 'd')); - HalModuleObject->DllBase = LdrEntry->DllBase; - RtlInitUnicodeString(&HalModuleObject->FullDllName, HAL_MODULE_NAME); - LdrpBuildModuleBaseName(&HalModuleObject->BaseDllName, &HalModuleObject->FullDllName); - HalModuleObject->EntryPoint = LdrEntry->EntryPoint; - HalModuleObject->SizeOfImage = LdrEntry->SizeOfImage; - - /* Insert it into the list */ - InsertTailList(&ModuleListHead, &HalModuleObject->InLoadOrderLinks); - - /* Hook for KDB on initialization of the loader. */ - KDB_LOADERINIT_HOOK(NtoskrnlModuleObject, HalModuleObject); -} - -NTSTATUS -NTAPI -LdrpLoadImage ( - PUNICODE_STRING DriverName, - PVOID *ModuleBase, - PVOID *SectionPointer, - PVOID *EntryPoint, - PVOID *ExportSectionPointer ) -{ - PLDR_DATA_TABLE_ENTRY ModuleObject; - NTSTATUS Status; - - ModuleObject = LdrGetModuleObject(DriverName); - if (ModuleObject == NULL) - { - Status = LdrLoadModule(DriverName, &ModuleObject); - if (!NT_SUCCESS(Status)) - { - return(Status); - } - } - - if (ModuleBase) - *ModuleBase = ModuleObject->DllBase; - - if (SectionPointer) - *SectionPointer = ModuleObject; - - if (EntryPoint) - *EntryPoint = ModuleObject->EntryPoint; - - //if (ExportSectionPointer) - // *ExportSectionPointer = ModuleObject-> - - return(STATUS_SUCCESS); -} - - -NTSTATUS -NTAPI -LdrpUnloadImage ( PVOID ModuleBase ) -{ - return(STATUS_NOT_IMPLEMENTED); -} - - -NTSTATUS -NTAPI -LdrpLoadAndCallImage ( PUNICODE_STRING ModuleName ) -{ - PDRIVER_INITIALIZE DriverEntry; - PLDR_DATA_TABLE_ENTRY ModuleObject; - DRIVER_OBJECT DriverObject; - NTSTATUS Status; - - ModuleObject = LdrGetModuleObject(ModuleName); - if (ModuleObject != NULL) - { - return(STATUS_IMAGE_ALREADY_LOADED); - } - - Status = LdrLoadModule(ModuleName, &ModuleObject); - if (!NT_SUCCESS(Status)) - { - return(Status); - } - - DriverEntry = (PDRIVER_INITIALIZE)ModuleObject->EntryPoint; - - RtlZeroMemory(&DriverObject, sizeof(DriverObject)); -// DriverObject.DriverStart = ModuleObject->DllBase; - - Status = DriverEntry(&DriverObject, NULL); - if (!NT_SUCCESS(Status)) - { - LdrUnloadModule(ModuleObject); - } - - return(Status); -} - - -NTSTATUS -NTAPI -LdrLoadModule( - PUNICODE_STRING Filename, - PLDR_DATA_TABLE_ENTRY *ModuleObject ) -{ - PVOID ModuleLoadBase; - NTSTATUS Status; - HANDLE FileHandle; - OBJECT_ATTRIBUTES ObjectAttributes; - PLDR_DATA_TABLE_ENTRY Module; - FILE_STANDARD_INFORMATION FileStdInfo; - IO_STATUS_BLOCK IoStatusBlock; - - *ModuleObject = NULL; - - DPRINT("Loading Module %wZ...\n", Filename); - - /* Open the Module */ - InitializeObjectAttributes(&ObjectAttributes, - Filename, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - CHECKPOINT; - Status = ZwOpenFile(&FileHandle, - GENERIC_READ, - &ObjectAttributes, - &IoStatusBlock, - FILE_SHARE_READ, - FILE_SYNCHRONOUS_IO_NONALERT); - CHECKPOINT; - if (!NT_SUCCESS(Status)) - { - CPRINT("Could not open module file: %wZ (Status 0x%08lx)\n", Filename, Status); - return(Status); - } - CHECKPOINT; - - /* Get the size of the file */ - Status = ZwQueryInformationFile(FileHandle, - &IoStatusBlock, - &FileStdInfo, - sizeof(FileStdInfo), - FileStandardInformation); - if (!NT_SUCCESS(Status)) - { - CPRINT("Could not get file size\n"); - NtClose(FileHandle); - return(Status); - } - CHECKPOINT; - - /* Allocate nonpageable memory for driver */ - ModuleLoadBase = ExAllocatePoolWithTag(NonPagedPool, - FileStdInfo.EndOfFile.u.LowPart, - TAG_DRIVER_MEM); - if (ModuleLoadBase == NULL) - { - CPRINT("Could not allocate memory for module"); - NtClose(FileHandle); - return(STATUS_INSUFFICIENT_RESOURCES); - } - CHECKPOINT; - - /* Load driver into memory chunk */ - Status = ZwReadFile(FileHandle, - 0, 0, 0, - &IoStatusBlock, - ModuleLoadBase, - FileStdInfo.EndOfFile.u.LowPart, - 0, 0); - if (!NT_SUCCESS(Status)) - { - CPRINT("Could not read module file into memory"); - ExFreePool(ModuleLoadBase); - NtClose(FileHandle); - return(Status); - } - CHECKPOINT; - - ZwClose(FileHandle); - - Status = LdrProcessModule(ModuleLoadBase, - Filename, - &Module); - if (!NT_SUCCESS(Status)) - { - CPRINT("Could not process module\n"); - ExFreePool(ModuleLoadBase); - return(Status); - } - - /* Cleanup */ - ExFreePool(ModuleLoadBase); - - *ModuleObject = Module; - - /* Hook for KDB on loading a driver. */ - KDB_LOADDRIVER_HOOK(Filename, Module); - - return(STATUS_SUCCESS); -} - - -NTSTATUS -NTAPI -LdrUnloadModule ( PLDR_DATA_TABLE_ENTRY ModuleObject ) -{ - KIRQL Irql; - - /* Remove the module from the module list */ - KeAcquireSpinLock(&ModuleListLock,&Irql); - RemoveEntryList(&ModuleObject->InLoadOrderLinks); - KeReleaseSpinLock(&ModuleListLock, Irql); - - /* Hook for KDB on unloading a driver. */ - KDB_UNLOADDRIVER_HOOK(ModuleObject); - - /* Free module section */ - // MmFreeSection(ModuleObject->DllBase); - - ExFreePool(ModuleObject->FullDllName.Buffer); - ExFreePool(ModuleObject); - - return(STATUS_SUCCESS); -} - - -NTSTATUS -LdrProcessModule( - PVOID ModuleLoadBase, - PUNICODE_STRING ModuleName, - PLDR_DATA_TABLE_ENTRY *ModuleObject ) -{ - PIMAGE_DOS_HEADER PEDosHeader; - - /* If MZ header exists */ - PEDosHeader = (PIMAGE_DOS_HEADER) ModuleLoadBase; - if (PEDosHeader->e_magic == IMAGE_DOS_SIGNATURE && PEDosHeader->e_lfanew != 0L) - { - return LdrPEProcessModule(ModuleLoadBase, - ModuleName, - ModuleObject); - } - - CPRINT("Module wasn't PE\n"); - return STATUS_UNSUCCESSFUL; -} - -NTSTATUS -NTAPI -LdrpQueryModuleInformation ( - PVOID Buffer, - ULONG Size, - PULONG ReqSize ) -{ - PLIST_ENTRY current_entry; - PLDR_DATA_TABLE_ENTRY current; - ULONG ModuleCount = 0; - PRTL_PROCESS_MODULES Smi; - ANSI_STRING AnsiName; - PCHAR p; - KIRQL Irql; - PUNICODE_STRING UnicodeName; - ULONG tmpBufferSize = 0; - PWCHAR tmpNameBuffer; - - KeAcquireSpinLock(&ModuleListLock,&Irql); - - /* calculate required size */ - current_entry = ModuleListHead.Flink; - while (current_entry != (&ModuleListHead)) - { - ModuleCount++; - current = CONTAINING_RECORD(current_entry,LDR_DATA_TABLE_ENTRY,InLoadOrderLinks); - tmpBufferSize += current->FullDllName.Length + sizeof(WCHAR) + sizeof(UNICODE_STRING); - current_entry = current_entry->Flink; - } - - *ReqSize = sizeof(RTL_PROCESS_MODULES)+ - (ModuleCount - 1) * sizeof(RTL_PROCESS_MODULE_INFORMATION); - - if (Size < *ReqSize) - { - KeReleaseSpinLock(&ModuleListLock, Irql); - return(STATUS_INFO_LENGTH_MISMATCH); - } - - /* allocate a temp buffer to store the module names */ - UnicodeName = ExAllocatePool(NonPagedPool, tmpBufferSize); - if (UnicodeName == NULL) - { - KeReleaseSpinLock(&ModuleListLock, Irql); - return STATUS_INSUFFICIENT_RESOURCES; - } - tmpNameBuffer = (PWCHAR)((ULONG_PTR)UnicodeName + ModuleCount * sizeof(UNICODE_STRING)); - - /* fill the buffer */ - memset(Buffer, '=', Size); - - Smi = (PRTL_PROCESS_MODULES)Buffer; - Smi->NumberOfModules = ModuleCount; - - ModuleCount = 0; - current_entry = ModuleListHead.Flink; - while (current_entry != (&ModuleListHead)) - { - current = CONTAINING_RECORD(current_entry,LDR_DATA_TABLE_ENTRY,InLoadOrderLinks); - - Smi->Modules[ModuleCount].Section = 0; /* Always 0 */ - Smi->Modules[ModuleCount].MappedBase = 0; /* Always 0 */ - Smi->Modules[ModuleCount].ImageBase = current->DllBase; - Smi->Modules[ModuleCount].ImageSize = current->SizeOfImage; - Smi->Modules[ModuleCount].Flags = 0; /* Flags ??? (GN) */ - Smi->Modules[ModuleCount].LoadOrderIndex = (USHORT)ModuleCount; - Smi->Modules[ModuleCount].InitOrderIndex = 0; - Smi->Modules[ModuleCount].LoadCount = 0; /* FIXME */ - UnicodeName[ModuleCount].Buffer = tmpNameBuffer; - UnicodeName[ModuleCount].MaximumLength = current->FullDllName.Length + sizeof(WCHAR); - tmpNameBuffer += UnicodeName[ModuleCount].MaximumLength / sizeof(WCHAR); - RtlCopyUnicodeString(&UnicodeName[ModuleCount], &current->FullDllName); - - ModuleCount++; - current_entry = current_entry->Flink; - } - - KeReleaseSpinLock(&ModuleListLock, Irql); - - for (ModuleCount = 0; ModuleCount < Smi->NumberOfModules; ModuleCount++) - { - AnsiName.Length = 0; - AnsiName.MaximumLength = 255; - AnsiName.Buffer = Smi->Modules[ModuleCount].FullPathName; - RtlUnicodeStringToAnsiString(&AnsiName, &UnicodeName[ModuleCount], FALSE); - AnsiName.Buffer[AnsiName.Length] = 0; - Smi->Modules[ModuleCount].InitOrderIndex = AnsiName.Length; - - p = strrchr(AnsiName.Buffer, '\\'); - if (p == NULL) - { - Smi->Modules[ModuleCount].OffsetToFileName = 0; - } - else - { - p++; - Smi->Modules[ModuleCount].OffsetToFileName = p - AnsiName.Buffer; - } - } - - ExFreePool(UnicodeName); - - return(STATUS_SUCCESS); -} - - -static VOID -LdrpBuildModuleBaseName ( - PUNICODE_STRING BaseName, - PUNICODE_STRING FullName ) -{ - PWCHAR p; - - DPRINT("LdrpBuildModuleBaseName()\n"); - DPRINT("FullName %wZ\n", FullName); - - p = wcsrchr(FullName->Buffer, L'\\'); - if (p == NULL) - { - p = FullName->Buffer; - } - else - { - p++; - } - - DPRINT("p %S\n", p); - - RtlInitUnicodeString(BaseName, p); -} - - -static LONG -LdrpCompareModuleNames ( - IN PUNICODE_STRING String1, - IN PUNICODE_STRING String2 ) + IN PUNICODE_STRING String1, + IN PUNICODE_STRING String2 ) { ULONG len1, len2, i; PWCHAR s1, s2, p; @@ -573,372 +128,15 @@ return(0); } -PLDR_DATA_TABLE_ENTRY -NTAPI -LdrGetModuleObject ( PUNICODE_STRING ModuleName ) -{ - PLDR_DATA_TABLE_ENTRY Module; - PLIST_ENTRY Entry; - KIRQL Irql; - - DPRINT("LdrGetModuleObject(%wZ) called\n", ModuleName); - - KeAcquireSpinLock(&ModuleListLock,&Irql); - - Entry = ModuleListHead.Flink; - while (Entry != &ModuleListHead) - { - Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); - - DPRINT("Comparing %wZ and %wZ\n", - &Module->BaseDllName, - ModuleName); - - if (!LdrpCompareModuleNames(&Module->BaseDllName, ModuleName)) - { - DPRINT("Module %wZ\n", &Module->BaseDllName); - KeReleaseSpinLock(&ModuleListLock, Irql); - return(Module); - } - - Entry = Entry->Flink; - } - - KeReleaseSpinLock(&ModuleListLock, Irql); - - DPRINT("Could not find module '%wZ'\n", ModuleName); - - return(NULL); -} - - -/* ---------------------------------------------- PE Module support */ - -static ULONG -LdrLookupPageProtection ( - PVOID PageStart, - PVOID DriverBase, - PIMAGE_FILE_HEADER PEFileHeader, - PIMAGE_SECTION_HEADER PESectionHeaders ) -{ - BOOLEAN Write = FALSE; - BOOLEAN Execute = FALSE; - ULONG Characteristics; - ULONG Idx; - ULONG Length; - PVOID BaseAddress; - - for (Idx = 0; Idx < PEFileHeader->NumberOfSections && (!Write || !Execute); Idx++) - { - Characteristics = PESectionHeaders[Idx].Characteristics; - if (!(Characteristics & IMAGE_SCN_TYPE_NOLOAD)) - { - Length = max(PESectionHeaders[Idx].Misc.VirtualSize, PESectionHeaders[Idx].SizeOfRawData); - BaseAddress = PESectionHeaders[Idx].VirtualAddress + (char*)DriverBase; - if (BaseAddress < (PVOID)((ULONG_PTR)PageStart + PAGE_SIZE) && - PageStart < (PVOID)((ULONG_PTR)BaseAddress + Length)) - { - if (Characteristics & IMAGE_SCN_CNT_CODE) - { - Execute = TRUE; - } - if (Characteristics & (IMAGE_SCN_MEM_WRITE|IMAGE_SCN_CNT_UNINITIALIZED_DATA)) - { - Write = TRUE; - } - } - } - } - if (Write && Execute) - { - return PAGE_EXECUTE_READWRITE; - } - else if (Execute) - { - return PAGE_EXECUTE_READ; - } - else if (Write) - { - return PAGE_READWRITE; - } - else - { - return PAGE_READONLY; - } -} - -static NTSTATUS -LdrPEProcessModule( - PVOID ModuleLoadBase, - PUNICODE_STRING FileName, - PLDR_DATA_TABLE_ENTRY *ModuleObject ) -{ - unsigned int DriverSize, Idx; - ULONG CurrentSize; - PVOID DriverBase; - PIMAGE_DOS_HEADER PEDosHeader; - PIMAGE_NT_HEADERS PENtHeaders; - PIMAGE_SECTION_HEADER PESectionHeaders; - PLDR_DATA_TABLE_ENTRY CreatedModuleObject; - NTSTATUS Status; - KIRQL Irql; - - DPRINT("Processing PE Module at module base:%08lx\n", ModuleLoadBase); - - /* Get header pointers */ - PEDosHeader = (PIMAGE_DOS_HEADER) ModuleLoadBase; - PENtHeaders = RtlImageNtHeader(ModuleLoadBase); - PESectionHeaders = IMAGE_FIRST_SECTION(PENtHeaders); - CHECKPOINT; - - /* Check file magic numbers */ - if (PEDosHeader->e_magic != IMAGE_DOS_SIGNATURE) - { - CPRINT("Incorrect MZ magic: %04x\n", PEDosHeader->e_magic); - return STATUS_UNSUCCESSFUL; - } - if (PEDosHeader->e_lfanew == 0) - { - CPRINT("Invalid lfanew offset: %08x\n", PEDosHeader->e_lfanew); - return STATUS_UNSUCCESSFUL; - } - if (PENtHeaders->Signature != IMAGE_NT_SIGNATURE) - { - CPRINT("Incorrect PE magic: %08x\n", PENtHeaders->Signature); - return STATUS_UNSUCCESSFUL; - } - if (PENtHeaders->FileHeader.Machine != IMAGE_FILE_MACHINE_I386) - { - CPRINT("Incorrect Architechture: %04x\n", PENtHeaders->FileHeader.Machine); - return STATUS_UNSUCCESSFUL; - } - CHECKPOINT; - - /* FIXME: if image is fixed-address load, then fail */ - - /* FIXME: check/verify OS version number */ - - DPRINT("OptionalHdrMagic:%04x LinkVersion:%d.%d\n", - PENtHeaders->OptionalHeader.Magic, - PENtHeaders->OptionalHeader.MajorLinkerVersion, - PENtHeaders->OptionalHeader.MinorLinkerVersion); - DPRINT("Entry Point:%08lx\n", PENtHeaders->OptionalHeader.AddressOfEntryPoint); - - /* Determine the size of the module */ - DriverSize = 0; - for (Idx = 0; Idx < PENtHeaders->FileHeader.NumberOfSections; Idx++) - { - if (!(PESectionHeaders[Idx].Characteristics & IMAGE_SCN_TYPE_NOLOAD)) - { - CurrentSize = PESectionHeaders[Idx].VirtualAddress + PESectionHeaders[Idx].Misc.VirtualSize; - DriverSize = max(DriverSize, CurrentSize); - } - } - DriverSize = ROUND_UP(DriverSize, PENtHeaders->OptionalHeader.SectionAlignment); - DPRINT("DriverSize %x, SizeOfImage %x\n",DriverSize, PENtHeaders->OptionalHeader.SizeOfImage); - - /* Allocate a virtual section for the module */ - DriverBase = NULL; - DriverBase = MmAllocateSection(DriverSize, DriverBase); - if (DriverBase == 0) - { - CPRINT("Failed to allocate a virtual section for driver\n"); - return STATUS_UNSUCCESSFUL; - } - DPRINT("DriverBase for %wZ: %x\n", FileName, DriverBase); - - /* Copy headers over */ - memcpy(DriverBase, ModuleLoadBase, PENtHeaders->OptionalHeader.SizeOfHeaders); - - /* Copy image sections into virtual section */ - for (Idx = 0; Idx < PENtHeaders->FileHeader.NumberOfSections; Idx++) - { - CurrentSize = PESectionHeaders[Idx].VirtualAddress + PESectionHeaders[Idx].Misc.VirtualSize; - /* Copy current section into current offset of virtual section */ - if (CurrentSize <= DriverSize && - PESectionHeaders[Idx].SizeOfRawData) - { - DPRINT("PESectionHeaders[Idx].VirtualAddress + DriverBase %x\n", - PESectionHeaders[Idx].VirtualAddress + (ULONG_PTR)DriverBase); - memcpy((PVOID)((ULONG_PTR)DriverBase + PESectionHeaders[Idx].VirtualAddress), - (PVOID)((ULONG_PTR)ModuleLoadBase + PESectionHeaders[Idx].PointerToRawData), - PESectionHeaders[Idx].Misc.VirtualSize > PESectionHeaders[Idx].SizeOfRawData - ? PESectionHeaders[Idx].SizeOfRawData : PESectionHeaders[Idx].Misc.VirtualSize ); - } - } - - /* Perform relocation fixups */ - Status = LdrRelocateImageWithBias(DriverBase, 0, "", STATUS_SUCCESS, - STATUS_CONFLICTING_ADDRESSES, STATUS_INVALID_IMAGE_FORMAT); - if (!NT_SUCCESS(Status)) - { - // MmFreeSection(DriverBase); - return Status; - } - - /* Create the module */ - CreatedModuleObject = ExAllocatePoolWithTag ( - NonPagedPool, sizeof(LDR_DATA_TABLE_ENTRY), TAG_MODULE_OBJECT ); - if (CreatedModuleObject == NULL) - { - // MmFreeSection(DriverBase); - return STATUS_INSUFFICIENT_RESOURCES; - } - - RtlZeroMemory(CreatedModuleObject, sizeof(LDR_DATA_TABLE_ENTRY)); - - /* Initialize ModuleObject data */ - CreatedModuleObject->DllBase = DriverBase; - - CreatedModuleObject->FullDllName.Length = 0; - CreatedModuleObject->FullDllName.MaximumLength = FileName->Length + sizeof(UNICODE_NULL); - CreatedModuleObject->FullDllName.Buffer = - ExAllocatePoolWithTag(PagedPool, CreatedModuleObject->FullDllName.MaximumLength, TAG_LDR_WSTR); - if (CreatedModuleObject->FullDllName.Buffer == NULL) - { - ExFreePool(CreatedModuleObject); - // MmFreeSection(DriverBase); - return STATUS_INSUFFICIENT_RESOURCES; - } - - RtlCopyUnicodeString(&CreatedModuleObject->FullDllName, FileName); - CreatedModuleObject->FullDllName.Buffer[FileName->Length / sizeof(WCHAR)] = 0; - LdrpBuildModuleBaseName(&CreatedModuleObject->BaseDllName, - &CreatedModuleObject->FullDllName); - - CreatedModuleObject->EntryPoint = - (PVOID)((ULONG_PTR)DriverBase + - PENtHeaders->OptionalHeader.AddressOfEntryPoint); - CreatedModuleObject->SizeOfImage = DriverSize; - DPRINT("EntryPoint at %x\n", CreatedModuleObject->EntryPoint); - - /* Perform import fixups */ - Status = LdrPEFixupImports(CreatedModuleObject->DllBase, - CreatedModuleObject->FullDllName.Buffer); - if (!NT_SUCCESS(Status)) - { - // MmFreeSection(DriverBase); - ExFreePool(CreatedModuleObject->FullDllName.Buffer); - ExFreePool(CreatedModuleObject); - return Status; - } - - MmSetPageProtect(NULL, DriverBase, PAGE_READONLY); - /* Set the protections for the various parts of the driver */ - for (Idx = 0; Idx < PENtHeaders->FileHeader.NumberOfSections; Idx++) - { - ULONG Characteristics = PESectionHeaders[Idx].Characteristics; - ULONG Length; - PVOID BaseAddress; - PVOID PageAddress; - ULONG Protect; - Length = PESectionHeaders[Idx].Misc.VirtualSize; - BaseAddress = PESectionHeaders[Idx].VirtualAddress + (char*)DriverBase; - PageAddress = (PVOID)PAGE_ROUND_DOWN(BaseAddress); - - Protect = LdrLookupPageProtection(PageAddress, DriverBase, &PENtHeaders->FileHeader, PESectionHeaders); - if (PageAddress < RVA(DriverBase, DriverSize)) - { - MmSetPageProtect(NULL, PageAddress, Protect); - } - - if (Characteristics & IMAGE_SCN_CNT_CODE) - { - if (Characteristics & IMAGE_SCN_MEM_WRITE) - { - Protect = PAGE_EXECUTE_READWRITE; - } - else - { - Protect = PAGE_EXECUTE_READ; - } - } - else if (Characteristics & (IMAGE_SCN_MEM_WRITE|IMAGE_SCN_CNT_UNINITIALIZED_DATA)) - { - Protect = PAGE_READWRITE; - } - else - { - Protect = PAGE_READONLY; - } - PageAddress = (PVOID)((ULONG_PTR)PageAddress + PAGE_SIZE); - while ((ULONG_PTR)PageAddress + PAGE_SIZE < (ULONG_PTR)BaseAddress + Length) - { - if (PageAddress < RVA(DriverBase, DriverSize)) - { - MmSetPageProtect(NULL, PageAddress, Protect); - } - PageAddress = (PVOID)((ULONG_PTR)PageAddress + PAGE_SIZE); - } - if (PageAddress < (PVOID)((ULONG_PTR)BaseAddress + Length) && - PageAddress < RVA(DriverBase, DriverSize)) - { - Protect = LdrLookupPageProtection(PageAddress, DriverBase, &PENtHeaders->FileHeader, PESectionHeaders); - MmSetPageProtect(NULL, PageAddress, Protect); - } - } - - /* Insert module */ - KeAcquireSpinLock(&ModuleListLock, &Irql); - InsertTailList(&ModuleListHead, - &CreatedModuleObject->InLoadOrderLinks); - KeReleaseSpinLock(&ModuleListLock, Irql); - - *ModuleObject = CreatedModuleObject; - - DPRINT("Loading Module %wZ...\n", FileName); - - DPRINT("Module %wZ loaded at 0x%.08x.\n", - FileName, CreatedModuleObject->DllBase); - - return STATUS_SUCCESS; -} - -static PVOID -LdrPEFixupForward ( PCHAR ForwardName ) -{ - CHAR NameBuffer[128]; - UNICODE_STRING ModuleName; - PCHAR p; - PLDR_DATA_TABLE_ENTRY ModuleObject; - - DPRINT("LdrPEFixupForward (%s)\n", ForwardName); - - strcpy(NameBuffer, ForwardName); - p = strchr(NameBuffer, '.'); - if (p == NULL) - { - return NULL; - } - - *p = 0; - - DPRINT("Driver: %s Function: %s\n", NameBuffer, p+1); - - RtlCreateUnicodeStringFromAsciiz(&ModuleName, - NameBuffer); - ModuleObject = LdrGetModuleObject(&ModuleName); - RtlFreeUnicodeString(&ModuleName); - - DPRINT("ModuleObject: %p\n", ModuleObject); - - if (ModuleObject == NULL) - { - CPRINT("LdrPEFixupForward: failed to find module %s\n", NameBuffer); - return NULL; - } - return LdrPEGetExportByName(ModuleObject->DllBase, (PUCHAR)(p+1), 0xffff); -} - #ifndef PATH_MAX #define PATH_MAX 260 #endif static NTSTATUS LdrPEGetOrLoadModule ( - PWCHAR ModuleName, - PCHAR ImportedName, - PLDR_DATA_TABLE_ENTRY* ImportedModule) + PWCHAR ModuleName, + PCHAR ImportedName, + PLDR_DATA_TABLE_ENTRY* ImportedModule) { UNICODE_STRING DriverName; UNICODE_STRING NameString; @@ -994,10 +192,82 @@ } static PVOID +LdrPEFixupForward ( PCHAR ForwardName ) +{ + CHAR NameBuffer[128]; + UNICODE_STRING ModuleName; + PCHAR p; + PLDR_DATA_TABLE_ENTRY ModuleObject; + + DPRINT("LdrPEFixupForward (%s)\n", ForwardName); + + strcpy(NameBuffer, ForwardName); + p = strchr(NameBuffer, '.'); + if (p == NULL) + { + return NULL; + } + + *p = 0; + + DPRINT("Driver: %s Function: %s\n", NameBuffer, p+1); + + RtlCreateUnicodeStringFromAsciiz(&ModuleName, + NameBuffer); + ModuleObject = LdrGetModuleObject(&ModuleName); + RtlFreeUnicodeString(&ModuleName); + + DPRINT("ModuleObject: %p\n", ModuleObject); + + if (ModuleObject == NULL) + { + DPRINT("LdrPEFixupForward: failed to find module %s\n", NameBuffer); + return NULL; + } + return LdrPEGetExportByName(ModuleObject->DllBase, (PUCHAR)(p+1), 0xffff); +} + +static PVOID +LdrPEGetExportByOrdinal ( + PVOID BaseAddress, + ULONG Ordinal ) +{ + PIMAGE_EXPORT_DIRECTORY ExportDir; + ULONG ExportDirSize; + PULONG * ExFunctions; + PVOID Function; + + ExportDir = (PIMAGE_EXPORT_DIRECTORY)RtlImageDirectoryEntryToData ( + BaseAddress, + TRUE, + IMAGE_DIRECTORY_ENTRY_EXPORT, + &ExportDirSize); + + ExFunctions = (PULONG *)RVA(BaseAddress, + ExportDir->AddressOfFunctions); + DPRINT("LdrPEGetExportByOrdinal(Ordinal %d) = %x\n", + Ordinal, + RVA(BaseAddress, ExFunctions[Ordinal - ExportDir->Base])); + + Function = 0 != ExFunctions[Ordinal - ExportDir->Base] + ? RVA(BaseAddress, ExFunctions[Ordinal - ExportDir->Base] ) + : NULL; + + if (((ULONG_PTR)Function >= (ULONG_PTR)ExportDir) && + ((ULONG_PTR)Function < (ULONG_PTR)ExportDir + ExportDirSize)) + { + DPRINT("Forward: %s\n", (PCHAR)Function); + Function = LdrPEFixupForward((PCHAR)Function); + } + + return Function; +} + +static PVOID LdrPEGetExportByName ( - PVOID BaseAddress, - PUCHAR SymbolName, - USHORT Hint ) + PVOID BaseAddress, + PUCHAR SymbolName, + USHORT Hint ) { PIMAGE_EXPORT_DIRECTORY ExportDir; PULONG * ExFunctions; @@ -1110,47 +380,11 @@ return (PVOID)NULL; } -static PVOID -LdrPEGetExportByOrdinal ( - PVOID BaseAddress, - ULONG Ordinal ) -{ - PIMAGE_EXPORT_DIRECTORY ExportDir; - ULONG ExportDirSize; - PULONG * ExFunctions; - PVOID Function; - - ExportDir = (PIMAGE_EXPORT_DIRECTORY)RtlImageDirectoryEntryToData ( - BaseAddress, - TRUE, - IMAGE_DIRECTORY_ENTRY_EXPORT, - &ExportDirSize); - - ExFunctions = (PULONG *)RVA(BaseAddress, - ExportDir->AddressOfFunctions); - DPRINT("LdrPEGetExportByOrdinal(Ordinal %d) = %x\n", - Ordinal, - RVA(BaseAddress, ExFunctions[Ordinal - ExportDir->Base])); - - Function = 0 != ExFunctions[Ordinal - ExportDir->Base] - ? RVA(BaseAddress, ExFunctions[Ordinal - ExportDir->Base] ) - : NULL; - - if (((ULONG_PTR)Function >= (ULONG_PTR)ExportDir) && - ((ULONG_PTR)Function < (ULONG_PTR)ExportDir + ExportDirSize)) - { - DPRINT("Forward: %s\n", (PCHAR)Function); - Function = LdrPEFixupForward((PCHAR)Function); - } - - return Function; -} - static NTSTATUS LdrPEProcessImportDirectoryEntry( - PVOID DriverBase, - PLDR_DATA_TABLE_ENTRY ImportedModule, - PIMAGE_IMPORT_DESCRIPTOR ImportModuleDirectory ) + PVOID DriverBase, + PLDR_DATA_TABLE_ENTRY ImportedModule, + PIMAGE_IMPORT_DESCRIPTOR ImportModuleDirectory ) { PVOID* ImportAddressList; PULONG FunctionNameList; @@ -1244,4 +478,621 @@ return STATUS_SUCCESS; } +static NTSTATUS +LdrPEProcessModule( + PVOID ModuleLoadBase, + PUNICODE_STRING FileName, + PLDR_DATA_TABLE_ENTRY *ModuleObject ) +{ + unsigned int DriverSize, Idx; + ULONG CurrentSize; + PVOID DriverBase; + PIMAGE_DOS_HEADER PEDosHeader; + PIMAGE_NT_HEADERS PENtHeaders; + PIMAGE_SECTION_HEADER PESectionHeaders; + PLDR_DATA_TABLE_ENTRY CreatedModuleObject; + NTSTATUS Status; + KIRQL Irql; + + DPRINT("Processing PE Module at module base:%08lx\n", ModuleLoadBase); + + /* Get header pointers */ + PEDosHeader = (PIMAGE_DOS_HEADER) ModuleLoadBase; + PENtHeaders = RtlImageNtHeader(ModuleLoadBase); + PESectionHeaders = IMAGE_FIRST_SECTION(PENtHeaders); + + + /* Check file magic numbers */ + if (PEDosHeader->e_magic != IMAGE_DOS_SIGNATURE) + { + DPRINT("Incorrect MZ magic: %04x\n", PEDosHeader->e_magic); + return STATUS_UNSUCCESSFUL; + } + if (PEDosHeader->e_lfanew == 0) + { + DPRINT("Invalid lfanew offset: %08x\n", PEDosHeader->e_lfanew); + return STATUS_UNSUCCESSFUL; + } + if (PENtHeaders->Signature != IMAGE_NT_SIGNATURE) + { + DPRINT("Incorrect PE magic: %08x\n", PENtHeaders->Signature); + return STATUS_UNSUCCESSFUL; + } + if (PENtHeaders->FileHeader.Machine != IMAGE_FILE_MACHINE_I386) + { + DPRINT("Incorrect Architechture: %04x\n", PENtHeaders->FileHeader.Machine); + return STATUS_UNSUCCESSFUL; + } + + + /* FIXME: if image is fixed-address load, then fail */ + + /* FIXME: check/verify OS version number */ + + DPRINT("OptionalHdrMagic:%04x LinkVersion:%d.%d\n", + PENtHeaders->OptionalHeader.Magic, + PENtHeaders->OptionalHeader.MajorLinkerVersion, + PENtHeaders->OptionalHeader.MinorLinkerVersion); + DPRINT("Entry Point:%08lx\n", PENtHeaders->OptionalHeader.AddressOfEntryPoint); + + /* Determine the size of the module */ + DriverSize = 0; + for (Idx = 0; Idx < PENtHeaders->FileHeader.NumberOfSections; Idx++) + { + if (!(PESectionHeaders[Idx].Characteristics & IMAGE_SCN_TYPE_NOLOAD)) + { + CurrentSize = PESectionHeaders[Idx].VirtualAddress + PESectionHeaders[Idx].Misc.VirtualSize; + DriverSize = max(DriverSize, CurrentSize); + } + } + DriverSize = ROUND_UP(DriverSize, PENtHeaders->OptionalHeader.SectionAlignment); + DPRINT("DriverSize %x, SizeOfImage %x\n",DriverSize, PENtHeaders->OptionalHeader.SizeOfImage); + + /* Allocate a virtual section for the module */ + DriverBase = NULL; + DriverBase = MmAllocateSection(DriverSize, DriverBase); + if (DriverBase == 0) + { + DPRINT("Failed to allocate a virtual section for driver\n"); + return STATUS_UNSUCCESSFUL; + } + DPRINT1("DriverBase for %wZ: %x\n", FileName, DriverBase); + + /* Copy headers over */ + memcpy(DriverBase, ModuleLoadBase, PENtHeaders->OptionalHeader.SizeOfHeaders); + + /* Copy image sections into virtual section */ + for (Idx = 0; Idx < PENtHeaders->FileHeader.NumberOfSections; Idx++) + { + CurrentSize = PESectionHeaders[Idx].VirtualAddress + PESectionHeaders[Idx].Misc.VirtualSize; + /* Copy current section into current offset of virtual section */ + if (CurrentSize <= DriverSize && + PESectionHeaders[Idx].SizeOfRawData) + { + DPRINT("PESectionHeaders[Idx].VirtualAddress + DriverBase %x\n", + PESectionHeaders[Idx].VirtualAddress + (ULONG_PTR)DriverBase); + memcpy((PVOID)((ULONG_PTR)DriverBase + PESectionHeaders[Idx].VirtualAddress), + (PVOID)((ULONG_PTR)ModuleLoadBase + PESectionHeaders[Idx].PointerToRawData), + PESectionHeaders[Idx].Misc.VirtualSize > PESectionHeaders[Idx].SizeOfRawData + ? PESectionHeaders[Idx].SizeOfRawData : PESectionHeaders[Idx].Misc.VirtualSize ); + } + } + + /* Perform relocation fixups */ + Status = LdrRelocateImageWithBias(DriverBase, 0, "", STATUS_SUCCESS, + STATUS_CONFLICTING_ADDRESSES, STATUS_INVALID_IMAGE_FORMAT); + if (!NT_SUCCESS(Status)) + { + // MmFreeSection(DriverBase); + return Status; + } + + /* Create the module */ + CreatedModuleObject = ExAllocatePoolWithTag ( + NonPagedPool, sizeof(LDR_DATA_TABLE_ENTRY), TAG_MODULE_OBJECT ); + if (CreatedModuleObject == NULL) + { + // MmFreeSection(DriverBase); + return STATUS_INSUFFICIENT_RESOURCES; + } + + RtlZeroMemory(CreatedModuleObject, sizeof(LDR_DATA_TABLE_ENTRY)); + + /* Initialize ModuleObject data */ + CreatedModuleObject->DllBase = DriverBase; + + CreatedModuleObject->FullDllName.Length = 0; + CreatedModuleObject->FullDllName.MaximumLength = FileName->Length + sizeof(UNICODE_NULL); + CreatedModuleObject->FullDllName.Buffer = + ExAllocatePoolWithTag(PagedPool, CreatedModuleObject->FullDllName.MaximumLength, TAG_LDR_WSTR); + if (CreatedModuleObject->FullDllName.Buffer == NULL) + { + ExFreePool(CreatedModuleObject); + // MmFreeSection(DriverBase); + return STATUS_INSUFFICIENT_RESOURCES; + } + + RtlCopyUnicodeString(&CreatedModuleObject->FullDllName, FileName); + CreatedModuleObject->FullDllName.Buffer[FileName->Length / sizeof(WCHAR)] = 0; + LdrpBuildModuleBaseName(&CreatedModuleObject->BaseDllName, + &CreatedModuleObject->FullDllName); + + CreatedModuleObject->EntryPoint = + (PVOID)((ULONG_PTR)DriverBase + + PENtHeaders->OptionalHeader.AddressOfEntryPoint); + CreatedModuleObject->SizeOfImage = DriverSize; + DPRINT("EntryPoint at %x\n", CreatedModuleObject->EntryPoint); + + /* Perform import fixups */ + Status = LdrPEFixupImports(CreatedModuleObject->DllBase, + CreatedModuleObject->FullDllName.Buffer); + if (!NT_SUCCESS(Status)) + { + // MmFreeSection(DriverBase); + ExFreePool(CreatedModuleObject->FullDllName.Buffer); + ExFreePool(CreatedModuleObject); + return Status; + } + + /* Insert module */ + KeAcquireSpinLock(&ModuleListLock, &Irql); + InsertTailList(&ModuleListHead, + &CreatedModuleObject->InLoadOrderLinks); + KeReleaseSpinLock(&ModuleListLock, Irql); + + *ModuleObject = CreatedModuleObject; + + DPRINT("Loading Module %wZ...\n", FileName); + + DPRINT("Module %wZ loaded at 0x%.08x.\n", + FileName, CreatedModuleObject->DllBase); + + return STATUS_SUCCESS; +} + + +VOID +INIT_FUNCTION +NTAPI +LdrInit1(VOID) +{ + PLDR_DATA_TABLE_ENTRY HalModuleObject, NtoskrnlModuleObject, LdrEntry; + + /* Initialize the module list and spinlock */ + InitializeListHead(&ModuleListHead); + KeInitializeSpinLock(&ModuleListLock); + + /* Get the NTOSKRNL Entry from the loader */ + LdrEntry = CONTAINING_RECORD(KeLoaderBlock->LoadOrderListHead.Flink, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); + + /* Initialize ModuleObject for NTOSKRNL */ + NtoskrnlModuleObject = ExAllocatePoolWithTag(PagedPool, + sizeof(LDR_DATA_TABLE_ENTRY), + TAG('M', 'm', 'L', 'd')); + NtoskrnlModuleObject->DllBase = LdrEntry->DllBase; + RtlInitUnicodeString(&NtoskrnlModuleObject->FullDllName, KERNEL_MODULE_NAME); + LdrpBuildModuleBaseName(&NtoskrnlModuleObject->BaseDllName, &NtoskrnlModuleObject->FullDllName); + NtoskrnlModuleObject->EntryPoint = LdrEntry->EntryPoint; + NtoskrnlModuleObject->SizeOfImage = LdrEntry->SizeOfImage; + + /* Insert it into the list */ + InsertTailList(&ModuleListHead, &NtoskrnlModuleObject->InLoadOrderLinks); + + /* Get the HAL Entry from the loader */ + LdrEntry = CONTAINING_RECORD(KeLoaderBlock->LoadOrderListHead.Flink->Flink, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); + + /* Initialize ModuleObject for HAL */ + HalModuleObject = ExAllocatePoolWithTag(PagedPool, + sizeof(LDR_DATA_TABLE_ENTRY), + TAG('M', 'm', 'L', 'd')); + HalModuleObject->DllBase = LdrEntry->DllBase; + RtlInitUnicodeString(&HalModuleObject->FullDllName, HAL_MODULE_NAME); + LdrpBuildModuleBaseName(&HalModuleObject->BaseDllName, &HalModuleObject->FullDllName); + HalModuleObject->EntryPoint = LdrEntry->EntryPoint; + HalModuleObject->SizeOfImage = LdrEntry->SizeOfImage; + + /* Insert it into the list */ + InsertTailList(&ModuleListHead, &HalModuleObject->InLoadOrderLinks); + + /* Hook for KDB on initialization of the loader. */ + KDB_LOADERINIT_HOOK(NtoskrnlModuleObject, HalModuleObject); +} + +// +// Used for checking if a module is already in the module list. +// Used during loading/unloading drivers. +// +PLDR_DATA_TABLE_ENTRY +NTAPI +LdrGetModuleObject ( PUNICODE_STRING ModuleName ) +{ + PLDR_DATA_TABLE_ENTRY Module; + PLIST_ENTRY Entry; + KIRQL Irql; + + DPRINT("LdrGetModuleObject(%wZ) called\n", ModuleName); + + KeAcquireSpinLock(&ModuleListLock,&Irql); + + Entry = ModuleListHead.Flink; + while (Entry != &ModuleListHead) + { + Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); + + DPRINT("Comparing %wZ and %wZ\n", + &Module->BaseDllName, + ModuleName); + + if (!LdrpCompareModuleNames(&Module->BaseDllName, ModuleName)) + { + DPRINT("Module %wZ\n", &Module->BaseDllName); + KeReleaseSpinLock(&ModuleListLock, Irql); + return(Module); + } + + Entry = Entry->Flink; + } + + KeReleaseSpinLock(&ModuleListLock, Irql); + + DPRINT("Could not find module '%wZ'\n", ModuleName); + + return(NULL); +} + +// +// Used by NtSetSystemInformation +// +NTSTATUS +NTAPI +LdrpLoadImage ( + PUNICODE_STRING DriverName, + PVOID *ModuleBase, + PVOID *SectionPointer, + PVOID *EntryPoint, + PVOID *ExportSectionPointer ) +{ + PLDR_DATA_TABLE_ENTRY ModuleObject; + NTSTATUS Status; + + ModuleObject = LdrGetModuleObject(DriverName); + if (ModuleObject == NULL) + { + Status = LdrLoadModule(DriverName, &ModuleObject); + if (!NT_SUCCESS(Status)) + { + return(Status); + } + } + + if (ModuleBase) + *ModuleBase = ModuleObject->DllBase; + + if (SectionPointer) + *SectionPointer = ModuleObject; + + if (EntryPoint) + *EntryPoint = ModuleObject->EntryPoint; + + //if (ExportSectionPointer) + // *ExportSectionPointer = ModuleObject-> + + return(STATUS_SUCCESS); +} + +// +// Used by NtSetSystemInformation +// +NTSTATUS +NTAPI +LdrpUnloadImage ( PVOID ModuleBase ) +{ + return(STATUS_NOT_IMPLEMENTED); +} + +// +// Used by NtSetSystemInformation +// +NTSTATUS +NTAPI +LdrpLoadAndCallImage ( PUNICODE_STRING ModuleName ) +{ + PDRIVER_INITIALIZE DriverEntry; + PLDR_DATA_TABLE_ENTRY ModuleObject; + DRIVER_OBJECT DriverObject; + NTSTATUS Status; + + ModuleObject = LdrGetModuleObject(ModuleName); + if (ModuleObject != NULL) + { + return(STATUS_IMAGE_ALREADY_LOADED); + } + + Status = LdrLoadModule(ModuleName, &ModuleObject); + if (!NT_SUCCESS(Status)) + { + return(Status); + } + + DriverEntry = (PDRIVER_INITIALIZE)ModuleObject->EntryPoint; + + RtlZeroMemory(&DriverObject, sizeof(DriverObject)); +// DriverObject.DriverStart = ModuleObject->DllBase; + + Status = DriverEntry(&DriverObject, NULL); + if (!NT_SUCCESS(Status)) + { + LdrUnloadModule(ModuleObject); + } + + return(Status); +} + +// +// Used when unloading drivers +// +NTSTATUS +NTAPI +LdrUnloadModule ( PLDR_DATA_TABLE_ENTRY ModuleObject ) +{ + KIRQL Irql; + + /* Remove the module from the module list */ + KeAcquireSpinLock(&ModuleListLock,&Irql); + RemoveEntryList(&ModuleObject->InLoadOrderLinks); + KeReleaseSpinLock(&ModuleListLock, Irql); + + /* Hook for KDB on unloading a driver. */ + KDB_UNLOADDRIVER_HOOK(ModuleObject); + + /* Free module section */ + // MmFreeSection(ModuleObject->DllBase); + + ExFreePool(ModuleObject->FullDllName.Buffer); + ExFreePool(ModuleObject); + + return(STATUS_SUCCESS); +} + +// +// Used for images already loaded (boot drivers) +// +NTSTATUS +LdrProcessModule( + PVOID ModuleLoadBase, + PUNICODE_STRING ModuleName, + PLDR_DATA_TABLE_ENTRY *ModuleObject ) +{ + PIMAGE_DOS_HEADER PEDosHeader; + + /* If MZ header exists */ + PEDosHeader = (PIMAGE_DOS_HEADER) ModuleLoadBase; + if (PEDosHeader->e_magic == IMAGE_DOS_SIGNATURE && PEDosHeader->e_lfanew != 0L) + { + return LdrPEProcessModule(ModuleLoadBase, + ModuleName, + ModuleObject); + } + + DPRINT("Module wasn't PE\n"); + return STATUS_UNSUCCESSFUL; +} + +// +// Used by NtLoadDriver/IoMgr +// +NTSTATUS +NTAPI +LdrLoadModule( + PUNICODE_STRING Filename, + PLDR_DATA_TABLE_ENTRY *ModuleObject ) +{ + PVOID ModuleLoadBase; + NTSTATUS Status; + HANDLE FileHandle; + OBJECT_ATTRIBUTES ObjectAttributes; + PLDR_DATA_TABLE_ENTRY Module; + FILE_STANDARD_INFORMATION FileStdInfo; + IO_STATUS_BLOCK IoStatusBlock; + + *ModuleObject = NULL; + + DPRINT("Loading Module %wZ...\n", Filename); + + /* Open the Module */ + InitializeObjectAttributes(&ObjectAttributes, + Filename, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = ZwOpenFile(&FileHandle, + GENERIC_READ, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ, + FILE_SYNCHRONOUS_IO_NONALERT); + + if (!NT_SUCCESS(Status)) + { + DPRINT("Could not open module file: %wZ (Status 0x%08lx)\n", Filename, Status); + return(Status); + } + + + /* Get the size of the file */ + Status = ZwQueryInformationFile(FileHandle, + &IoStatusBlock, + &FileStdInfo, + sizeof(FileStdInfo), + FileStandardInformation); + if (!NT_SUCCESS(Status)) + { + DPRINT("Could not get file size\n"); + NtClose(FileHandle); + return(Status); + } + + + /* Allocate nonpageable memory for driver */ + ModuleLoadBase = ExAllocatePoolWithTag(NonPagedPool, + FileStdInfo.EndOfFile.u.LowPart, + TAG_DRIVER_MEM); + if (ModuleLoadBase == NULL) + { + DPRINT("Could not allocate memory for module"); + NtClose(FileHandle); + return(STATUS_INSUFFICIENT_RESOURCES); + } + + + /* Load driver into memory chunk */ + Status = ZwReadFile(FileHandle, + 0, 0, 0, + &IoStatusBlock, + ModuleLoadBase, + FileStdInfo.EndOfFile.u.LowPart, + 0, 0); + if (!NT_SUCCESS(Status)) + { + DPRINT("Could not read module file into memory"); + ExFreePool(ModuleLoadBase); + NtClose(FileHandle); + return(Status); + } + + + ZwClose(FileHandle); + + Status = LdrProcessModule(ModuleLoadBase, + Filename, + &Module); + if (!NT_SUCCESS(Status)) + { + DPRINT("Could not process module\n"); + ExFreePool(ModuleLoadBase); + return(Status); + } + + /* Cleanup */ + ExFreePool(ModuleLoadBase); + + *ModuleObject = Module; + + /* Hook for KDB on loading a driver. */ + KDB_LOADDRIVER_HOOK(Filename, Module); + + return(STATUS_SUCCESS); +} + +// +// Used by NtSetSystemInformation +// +NTSTATUS +NTAPI +LdrpQueryModuleInformation ( + PVOID Buffer, + ULONG Size, + PULONG ReqSize ) +{ + PLIST_ENTRY current_entry; + PLDR_DATA_TABLE_ENTRY current; + ULONG ModuleCount = 0; + PRTL_PROCESS_MODULES Smi; + ANSI_STRING AnsiName; + PCHAR p; + KIRQL Irql; + PUNICODE_STRING UnicodeName; + ULONG tmpBufferSize = 0; + PWCHAR tmpNameBuffer; + + KeAcquireSpinLock(&ModuleListLock,&Irql); + + /* calculate required size */ + current_entry = ModuleListHead.Flink; + while (current_entry != (&ModuleListHead)) + { + ModuleCount++; + current = CONTAINING_RECORD(current_entry,LDR_DATA_TABLE_ENTRY,InLoadOrderLinks); + tmpBufferSize += current->FullDllName.Length + sizeof(WCHAR) + sizeof(UNICODE_STRING); + current_entry = current_entry->Flink; + } + + *ReqSize = sizeof(RTL_PROCESS_MODULES)+ + (ModuleCount - 1) * sizeof(RTL_PROCESS_MODULE_INFORMATION); + + if (Size < *ReqSize) + { + KeReleaseSpinLock(&ModuleListLock, Irql); + return(STATUS_INFO_LENGTH_MISMATCH); + } + + /* allocate a temp buffer to store the module names */ + UnicodeName = ExAllocatePool(NonPagedPool, tmpBufferSize); + if (UnicodeName == NULL) + { + KeReleaseSpinLock(&ModuleListLock, Irql); + return STATUS_INSUFFICIENT_RESOURCES; + } + tmpNameBuffer = (PWCHAR)((ULONG_PTR)UnicodeName + ModuleCount * sizeof(UNICODE_STRING)); + + /* fill the buffer */ + memset(Buffer, '=', Size); + + Smi = (PRTL_PROCESS_MODULES)Buffer; + Smi->NumberOfModules = ModuleCount; + + ModuleCount = 0; + current_entry = ModuleListHead.Flink; + while (current_entry != (&ModuleListHead)) + { + current = CONTAINING_RECORD(current_entry,LDR_DATA_TABLE_ENTRY,InLoadOrderLinks); + + Smi->Modules[ModuleCount].Section = 0; /* Always 0 */ + Smi->Modules[ModuleCount].MappedBase = 0; /* Always 0 */ + Smi->Modules[ModuleCount].ImageBase = current->DllBase; + Smi->Modules[ModuleCount].ImageSize = current->SizeOfImage; + Smi->Modules[ModuleCount].Flags = 0; /* Flags ??? (GN) */ + Smi->Modules[ModuleCount].LoadOrderIndex = (USHORT)ModuleCount; + Smi->Modules[ModuleCount].InitOrderIndex = 0; + Smi->Modules[ModuleCount].LoadCount = 0; /* FIXME */ + UnicodeName[ModuleCount].Buffer = tmpNameBuffer; + UnicodeName[ModuleCount].MaximumLength = current->FullDllName.Length + sizeof(WCHAR); + tmpNameBuffer += UnicodeName[ModuleCount].MaximumLength / sizeof(WCHAR); + RtlCopyUnicodeString(&UnicodeName[ModuleCount], &current->FullDllName); + + ModuleCount++; + current_entry = current_entry->Flink; + } + + KeReleaseSpinLock(&ModuleListLock, Irql); + + for (ModuleCount = 0; ModuleCount < Smi->NumberOfModules; ModuleCount++) + { + AnsiName.Length = 0; + AnsiName.MaximumLength = 255; + AnsiName.Buffer = Smi->Modules[ModuleCount].FullPathName; + RtlUnicodeStringToAnsiString(&AnsiName, &UnicodeName[ModuleCount], FALSE); + AnsiName.Buffer[AnsiName.Length] = 0; + Smi->Modules[ModuleCount].InitOrderIndex = AnsiName.Length; + + p = strrchr(AnsiName.Buffer, '\\'); + if (p == NULL) + { + Smi->Modules[ModuleCount].OffsetToFileName = 0; + } + else + { + p++; + Smi->Modules[ModuleCount].OffsetToFileName = p - AnsiName.Buffer; + } + } + + ExFreePool(UnicodeName); + + return(STATUS_SUCCESS); +} + + + /* EOF */

17 years, 8 months

[ion] 25860: - Get rid of a bunch of multiboot crap FreeLDR was still doing for ReactOS. - Remove some of the sixtuplicated routines to load a PE file. We're now down to a single function which takes an ImageType parameter for DLL/EXE/SYS, but even this is still temporary as the parameter will soon go away. - We now load drivers in the same nice way that we load the kernel and DLLs, but we don't yet process their imports and relocate them in FreeLDR, because FreeLDR doesn't handle forwarders yet

by ion＠svn.reactos.org

Author: ion Date: Tue Feb 20 23:02:52 2007 New Revision: 25860 URL: http://svn.reactos.org/svn/reactos?rev=25860&view=rev Log: - Get rid of a bunch of multiboot crap FreeLDR was still doing for ReactOS. - Remove some of the sixtuplicated routines to load a PE file. We're now down to a single function which takes an ImageType parameter for DLL/EXE/SYS, but even this is still temporary as the parameter will soon go away. - We now load drivers in the same nice way that we load the kernel and DLLs, but we don't yet process their imports and relocate them in FreeLDR, because FreeLDR doesn't handle forwarders yet. - We don't need a large hack in KiRosPrepareForSystemStartup anymore since the driver base addresses are now proper. - Don't free boot-drivers anymore, since we'll load them in place soon. - Don't load bootvid twice. - Remove PAE stuff in FreeLDR since we don't support PAE anyway in the kernel and when we do, might as well implement it cleanly instead of relying on the broken FreeLDR stuff. Modified: trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/ke/freeldr.c trunk/reactos/ntoskrnl/mm/mminit.c Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf (original) +++ trunk/reactos/boot/bootdata/hivesys.inf Tue Feb 20 23:02:52 2007 @@ -492,13 +492,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Blue","Start",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Blue","Type",0x00010001,0x00000001 -; Boot Video Driver -HKLM,"SYSTEM\CurrentControlSet\Services\BootVideo","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\BootVideo","Group",0x00000000,"Base" -HKLM,"SYSTEM\CurrentControlSet\Services\BootVideo","ImagePath",0x00020000,"system32\drivers\bootvid.dll" -HKLM,"SYSTEM\CurrentControlSet\Services\BootVideo","Start",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\BootVideo","Type",0x00010001,0x00000002 - ; Cdfs (ISO96660) filesystem driver HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","ErrorControl",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Group",0x00000000,"File System" Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c Tue Feb 20 23:02:52 2007 @@ -34,7 +34,6 @@ #define PDE_SHIFT 22 #define PDE_SHIFT_PAE 18 - /* Converts a Relative Address read from the Kernel into a Physical Address */ #define RaToPa(p) \ (ULONG_PTR)((ULONG_PTR)p + KERNEL_BASE_PHYS) @@ -59,26 +58,16 @@ #define KpcrPageTableIndex (KPCR_BASE >> 22) #define ApicPageTableIndex (APIC_BASE >> 22) -#define LowMemPageTableIndexPae 0 -#define StartupPageTableIndexPae (STARTUP_BASE >> 21) -#define HyperspacePageTableIndexPae (HYPERSPACE_PAE_BASE >> 21) -#define KpcrPageTableIndexPae (KPCR_BASE >> 21) -#define ApicPageTableIndexPae (APIC_BASE >> 21) - - #define KernelEntryPoint (KernelEntry - KERNEL_BASE_PHYS) + KernelBase /* Load Address of Next Module */ -ULONG_PTR NextModuleBase = 0; +ULONG_PTR NextModuleBase = KERNEL_BASE_PHYS; /* Currently Opened Module */ PLOADER_MODULE CurrentModule = NULL; /* Unrelocated Kernel Base in Virtual Memory */ ULONG_PTR KernelBase; - -/* Whether PAE is to be used or not */ -BOOLEAN PaeModeEnabled; /* Kernel Entrypoint in Physical Memory */ ULONG_PTR KernelEntry; @@ -135,7 +124,8 @@ BOOLEAN NTAPI FrLdrLoadImage(IN PCHAR szFileName, - IN INT nPos); + IN INT nPos, + IN BOOLEAN IsKernel); /* FUNCTIONS *****************************************************************/ @@ -164,9 +154,6 @@ /* Re-initalize EFLAGS */ Ke386EraseFlags(); - - /* Get the PAE Mode */ - FrLdrGetPaeMode(); /* Initialize the page directory */ FrLdrSetupPageDirectory(); @@ -199,14 +186,6 @@ ULONG_PTR PageDirectoryBaseAddress = (ULONG_PTR)&startup_pagedirectory; ASMCODE PagedJump; - if (PaeModeEnabled) - { - PageDirectoryBaseAddress = (ULONG_PTR)&startup_pagedirectorytable_pae; - - /* Enable PAE */ - __writecr4(__readcr4() | X86_CR4_PAE); - } - /* Set the PDBR */ __writecr3(PageDirectoryBaseAddress); @@ -216,110 +195,6 @@ /* Jump to Kernel */ PagedJump = (ASMCODE)(PVOID)(KernelEntryPoint); PagedJump(Magic, &LoaderBlock); -} - -/*++ - * FrLdrGetKernelBase - * INTERNAL - * - * Gets the Kernel Base to use. - * - * Params: - * - * Returns: - * None. - * - * Remarks: - * Sets both the FreeLdr internal variable as well as the one which - * will be used by the Kernel. - * - *--*/ -static VOID -FASTCALL -FrLdrGetKernelBase(VOID) -{ - PCHAR p; - - /* Set KernelBase */ - LoaderBlock.KernelBase = KernelBase; - - /* Read Command Line */ - p = (PCHAR)LoaderBlock.CommandLine; - while ((p = strchr(p, '/')) != NULL) { - - /* Find "/3GB" */ - if (!_strnicmp(p + 1, "3GB", 3)) { - - /* Make sure there's nothing following it */ - if (p[4] == ' ' || p[4] == 0) { - - /* Use 3GB */ - KernelBase = 0xE0000000; - LoaderBlock.KernelBase = 0xC0000000; - } - } - - p++; - } -} - -/*++ - * FrLdrGetPaeMode - * INTERNAL - * - * Determines whether PAE mode should be enabled or not. - * - * Params: - * None. - * - * Returns: - * None. - * - * Remarks: - * None. - * - *--*/ -VOID -FASTCALL -FrLdrGetPaeMode(VOID) -{ - BOOLEAN PaeModeSupported; - - PaeModeSupported = FALSE; - PaeModeEnabled = FALSE; - - if (CpuidSupported() & 1) - { - ULONG eax, ebx, ecx, FeatureBits; - GetCpuid(1, &eax, &ebx, &ecx, &FeatureBits); - if (FeatureBits & X86_FEATURE_PAE) - { - PaeModeSupported = TRUE; - } - } - - if (PaeModeSupported) - { - PCHAR p; - - /* Read Command Line */ - p = (PCHAR)LoaderBlock.CommandLine; - while ((p = strchr(p, '/')) != NULL) { - - p++; - /* Find "PAE" */ - if (!_strnicmp(p, "PAE", 3)) { - - /* Make sure there's nothing following it */ - if (p[3] == ' ' || p[3] == 0) { - - /* Use Pae */ - PaeModeEnabled = TRUE; - break; - } - } - } - } } /*++ @@ -344,192 +219,85 @@ FrLdrSetupPageDirectory(VOID) { PPAGE_DIRECTORY_X86 PageDir; - PPAGE_DIRECTORY_TABLE_X64 PageDirTablePae; - PPAGE_DIRECTORY_X64 PageDirPae; ULONG KernelPageTableIndex; ULONG i; - if (PaeModeEnabled) { - - /* Get the Kernel Table Index */ - KernelPageTableIndex = (KernelBase >> 21); - - /* Get the Startup Page Directory Table */ - PageDirTablePae = (PPAGE_DIRECTORY_TABLE_X64)&startup_pagedirectorytable_pae; - - /* Get the Startup Page Directory */ - PageDirPae = (PPAGE_DIRECTORY_X64)&startup_pagedirectory_pae; - - /* Set the Startup page directory table */ - for (i = 0; i < 4; i++) - { - PageDirTablePae->Pde[i].Valid = 1; - PageDirTablePae->Pde[i].PageFrameNumber = PaPtrToPfn(startup_pagedirectory_pae) + i; - } - - /* Set up the Low Memory PDE */ - for (i = 0; i < 2; i++) - { - PageDirPae->Pde[LowMemPageTableIndexPae + i].Valid = 1; - PageDirPae->Pde[LowMemPageTableIndexPae + i].Write = 1; - PageDirPae->Pde[LowMemPageTableIndexPae + i].PageFrameNumber = PaPtrToPfn(lowmem_pagetable_pae) + i; - } - - /* Set up the Kernel PDEs */ - for (i = 0; i < 3; i++) - { - PageDirPae->Pde[KernelPageTableIndex + i].Valid = 1; - PageDirPae->Pde[KernelPageTableIndex + i].Write = 1; - PageDirPae->Pde[KernelPageTableIndex + i].PageFrameNumber = PaPtrToPfn(kernel_pagetable_pae) + i; - } - - /* Set up the Startup PDE */ - for (i = 0; i < 4; i++) - { - PageDirPae->Pde[StartupPageTableIndexPae + i].Valid = 1; - PageDirPae->Pde[StartupPageTableIndexPae + i].Write = 1; - PageDirPae->Pde[StartupPageTableIndexPae + i].PageFrameNumber = PaPtrToPfn(startup_pagedirectory_pae) + i; - } - - /* Set up the Hyperspace PDE */ - for (i = 0; i < 2; i++) - { - PageDirPae->Pde[HyperspacePageTableIndexPae + i].Valid = 1; - PageDirPae->Pde[HyperspacePageTableIndexPae + i].Write = 1; - PageDirPae->Pde[HyperspacePageTableIndexPae + i].PageFrameNumber = PaPtrToPfn(hyperspace_pagetable_pae) + i; - } - - /* Set up the Apic PDE */ - for (i = 0; i < 2; i++) - { - PageDirPae->Pde[ApicPageTableIndexPae + i].Valid = 1; - PageDirPae->Pde[ApicPageTableIndexPae + i].Write = 1; - PageDirPae->Pde[ApicPageTableIndexPae + i].PageFrameNumber = PaPtrToPfn(apic_pagetable_pae) + i; - } - - /* Set up the KPCR PDE */ - PageDirPae->Pde[KpcrPageTableIndexPae].Valid = 1; - PageDirPae->Pde[KpcrPageTableIndexPae].Write = 1; - PageDirPae->Pde[KpcrPageTableIndexPae].PageFrameNumber = PaPtrToPfn(kpcr_pagetable_pae); - - /* Set up Low Memory PTEs */ - PageDirPae = (PPAGE_DIRECTORY_X64)&lowmem_pagetable_pae; - for (i=0; i<1024; i++) { - - PageDirPae->Pde[i].Valid = 1; - PageDirPae->Pde[i].Write = 1; - PageDirPae->Pde[i].Owner = 1; - PageDirPae->Pde[i].PageFrameNumber = i; - } - - /* Set up Kernel PTEs */ - PageDirPae = (PPAGE_DIRECTORY_X64)&kernel_pagetable_pae; - for (i=0; i<1536; i++) { - - PageDirPae->Pde[i].Valid = 1; - PageDirPae->Pde[i].Write = 1; - PageDirPae->Pde[i].PageFrameNumber = PaToPfn(KERNEL_BASE_PHYS) + i; - } - - /* Set up APIC PTEs */ - PageDirPae = (PPAGE_DIRECTORY_X64)&apic_pagetable_pae; - PageDirPae->Pde[0].Valid = 1; - PageDirPae->Pde[0].Write = 1; - PageDirPae->Pde[0].CacheDisable = 1; - PageDirPae->Pde[0].WriteThrough = 1; - PageDirPae->Pde[0].PageFrameNumber = PaToPfn(APIC_BASE); - PageDirPae->Pde[0x200].Valid = 1; - PageDirPae->Pde[0x200].Write = 1; - PageDirPae->Pde[0x200].CacheDisable = 1; - PageDirPae->Pde[0x200].WriteThrough = 1; - PageDirPae->Pde[0x200].PageFrameNumber = PaToPfn(APIC_BASE + KERNEL_BASE_PHYS); - - /* Set up KPCR PTEs */ - PageDirPae = (PPAGE_DIRECTORY_X64)&kpcr_pagetable_pae; - PageDirPae->Pde[0].Valid = 1; - PageDirPae->Pde[0].Write = 1; - PageDirPae->Pde[0].PageFrameNumber = 1; - - } else { - - /* Get the Kernel Table Index */ - KernelPageTableIndex = KernelBase >> PDE_SHIFT; - - /* Get the Startup Page Directory */ - PageDir = (PPAGE_DIRECTORY_X86)&startup_pagedirectory; - - /* Set up the Low Memory PDE */ - PageDir->Pde[LowMemPageTableIndex].Valid = 1; - PageDir->Pde[LowMemPageTableIndex].Write = 1; - PageDir->Pde[LowMemPageTableIndex].PageFrameNumber = PaPtrToPfn(lowmem_pagetable); - - /* Set up the Kernel PDEs */ - PageDir->Pde[KernelPageTableIndex].Valid = 1; - PageDir->Pde[KernelPageTableIndex].Write = 1; - PageDir->Pde[KernelPageTableIndex].PageFrameNumber = PaPtrToPfn(kernel_pagetable); - PageDir->Pde[KernelPageTableIndex + 1].Valid = 1; - PageDir->Pde[KernelPageTableIndex + 1].Write = 1; - PageDir->Pde[KernelPageTableIndex + 1].PageFrameNumber = PaPtrToPfn(kernel_pagetable + 4096); - - /* Set up the Startup PDE */ - PageDir->Pde[StartupPageTableIndex].Valid = 1; - PageDir->Pde[StartupPageTableIndex].Write = 1; - PageDir->Pde[StartupPageTableIndex].PageFrameNumber = PaPtrToPfn(startup_pagedirectory); - - /* Set up the Hyperspace PDE */ - PageDir->Pde[HyperspacePageTableIndex].Valid = 1; - PageDir->Pde[HyperspacePageTableIndex].Write = 1; - PageDir->Pde[HyperspacePageTableIndex].PageFrameNumber = PaPtrToPfn(hyperspace_pagetable); - - /* Set up the Apic PDE */ - PageDir->Pde[ApicPageTableIndex].Valid = 1; - PageDir->Pde[ApicPageTableIndex].Write = 1; - PageDir->Pde[ApicPageTableIndex].PageFrameNumber = PaPtrToPfn(apic_pagetable); - - /* Set up the KPCR PDE */ - PageDir->Pde[KpcrPageTableIndex].Valid = 1; - PageDir->Pde[KpcrPageTableIndex].Write = 1; - PageDir->Pde[KpcrPageTableIndex].PageFrameNumber = PaPtrToPfn(kpcr_pagetable); - - /* Set up Low Memory PTEs */ - PageDir = (PPAGE_DIRECTORY_X86)&lowmem_pagetable; - for (i=0; i<1024; i++) { - - PageDir->Pde[i].Valid = 1; - PageDir->Pde[i].Write = 1; - PageDir->Pde[i].Owner = 1; - PageDir->Pde[i].PageFrameNumber = PaToPfn(i * PAGE_SIZE); - } - - /* Set up Kernel PTEs */ - PageDir = (PPAGE_DIRECTORY_X86)&kernel_pagetable; - for (i=0; i<1536; i++) { - - PageDir->Pde[i].Valid = 1; - PageDir->Pde[i].Write = 1; - PageDir->Pde[i].PageFrameNumber = PaToPfn(KERNEL_BASE_PHYS + i * PAGE_SIZE); - } - - /* Set up APIC PTEs */ - PageDir = (PPAGE_DIRECTORY_X86)&apic_pagetable; - PageDir->Pde[0].Valid = 1; - PageDir->Pde[0].Write = 1; - PageDir->Pde[0].CacheDisable = 1; - PageDir->Pde[0].WriteThrough = 1; - PageDir->Pde[0].PageFrameNumber = PaToPfn(APIC_BASE); - PageDir->Pde[0x200].Valid = 1; - PageDir->Pde[0x200].Write = 1; - PageDir->Pde[0x200].CacheDisable = 1; - PageDir->Pde[0x200].WriteThrough = 1; - PageDir->Pde[0x200].PageFrameNumber = PaToPfn(APIC_BASE + KERNEL_BASE_PHYS); - - /* Set up KPCR PTEs */ - PageDir = (PPAGE_DIRECTORY_X86)&kpcr_pagetable; - PageDir->Pde[0].Valid = 1; - PageDir->Pde[0].Write = 1; - PageDir->Pde[0].PageFrameNumber = 1; - } - return; + /* Get the Kernel Table Index */ + KernelPageTableIndex = KernelBase >> PDE_SHIFT; + + /* Get the Startup Page Directory */ + PageDir = (PPAGE_DIRECTORY_X86)&startup_pagedirectory; + + /* Set up the Low Memory PDE */ + PageDir->Pde[LowMemPageTableIndex].Valid = 1; + PageDir->Pde[LowMemPageTableIndex].Write = 1; + PageDir->Pde[LowMemPageTableIndex].PageFrameNumber = PaPtrToPfn(lowmem_pagetable); + + /* Set up the Kernel PDEs */ + PageDir->Pde[KernelPageTableIndex].Valid = 1; + PageDir->Pde[KernelPageTableIndex].Write = 1; + PageDir->Pde[KernelPageTableIndex].PageFrameNumber = PaPtrToPfn(kernel_pagetable); + PageDir->Pde[KernelPageTableIndex + 1].Valid = 1; + PageDir->Pde[KernelPageTableIndex + 1].Write = 1; + PageDir->Pde[KernelPageTableIndex + 1].PageFrameNumber = PaPtrToPfn(kernel_pagetable + 4096); + + /* Set up the Startup PDE */ + PageDir->Pde[StartupPageTableIndex].Valid = 1; + PageDir->Pde[StartupPageTableIndex].Write = 1; + PageDir->Pde[StartupPageTableIndex].PageFrameNumber = PaPtrToPfn(startup_pagedirectory); + + /* Set up the Hyperspace PDE */ + PageDir->Pde[HyperspacePageTableIndex].Valid = 1; + PageDir->Pde[HyperspacePageTableIndex].Write = 1; + PageDir->Pde[HyperspacePageTableIndex].PageFrameNumber = PaPtrToPfn(hyperspace_pagetable); + + /* Set up the Apic PDE */ + PageDir->Pde[ApicPageTableIndex].Valid = 1; + PageDir->Pde[ApicPageTableIndex].Write = 1; + PageDir->Pde[ApicPageTableIndex].PageFrameNumber = PaPtrToPfn(apic_pagetable); + + /* Set up the KPCR PDE */ + PageDir->Pde[KpcrPageTableIndex].Valid = 1; + PageDir->Pde[KpcrPageTableIndex].Write = 1; + PageDir->Pde[KpcrPageTableIndex].PageFrameNumber = PaPtrToPfn(kpcr_pagetable); + + /* Set up Low Memory PTEs */ + PageDir = (PPAGE_DIRECTORY_X86)&lowmem_pagetable; + for (i=0; i<1024; i++) { + + PageDir->Pde[i].Valid = 1; + PageDir->Pde[i].Write = 1; + PageDir->Pde[i].Owner = 1; + PageDir->Pde[i].PageFrameNumber = PaToPfn(i * PAGE_SIZE); + } + + /* Set up Kernel PTEs */ + PageDir = (PPAGE_DIRECTORY_X86)&kernel_pagetable; + for (i=0; i<1536; i++) { + + PageDir->Pde[i].Valid = 1; + PageDir->Pde[i].Write = 1; + PageDir->Pde[i].PageFrameNumber = PaToPfn(KERNEL_BASE_PHYS + i * PAGE_SIZE); + } + + /* Set up APIC PTEs */ + PageDir = (PPAGE_DIRECTORY_X86)&apic_pagetable; + PageDir->Pde[0].Valid = 1; + PageDir->Pde[0].Write = 1; + PageDir->Pde[0].CacheDisable = 1; + PageDir->Pde[0].WriteThrough = 1; + PageDir->Pde[0].PageFrameNumber = PaToPfn(APIC_BASE); + PageDir->Pde[0x200].Valid = 1; + PageDir->Pde[0x200].Write = 1; + PageDir->Pde[0x200].CacheDisable = 1; + PageDir->Pde[0x200].WriteThrough = 1; + PageDir->Pde[0x200].PageFrameNumber = PaToPfn(APIC_BASE + KERNEL_BASE_PHYS); + + /* Set up KPCR PTEs */ + PageDir = (PPAGE_DIRECTORY_X86)&kpcr_pagetable; + PageDir->Pde[0].Valid = 1; + PageDir->Pde[0].Write = 1; + PageDir->Pde[0].PageFrameNumber = 1; } PVOID @@ -723,10 +491,6 @@ return NULL; } -BOOLEAN -NTAPI -FrLdrLoadHal(PCHAR szFileName, INT nPos); - NTSTATUS NTAPI LdrPEGetOrLoadModule(IN PCHAR ModuleName, @@ -748,7 +512,7 @@ !_stricmp(ImportedName, "bootvid.dll")) { /* Load the HAL */ - FrLdrLoadImage(ImportedName, 10); + FrLdrLoadImage(ImportedName, 10, FALSE); /* Return the new module */ *ImportedModule = LdrGetModuleObject(ImportedName); @@ -847,91 +611,11 @@ } } -/*++ - * FrLdrMapKernel - * INTERNAL - * - * Maps the Kernel into memory, does PE Section Mapping, initalizes the - * uninitialized data sections, and relocates the image. - * - * Params: - * KernelImage - FILE Structure representing the ntoskrnl image file. - * - * Returns: - * TRUE if the Kernel was mapped. - * - * Remarks: - * None. - * - *--*/ BOOLEAN NTAPI -FrLdrMapKernel(FILE *KernelImage) -{ - PIMAGE_NT_HEADERS NtHeader; - ULONG ImageSize; - PVOID LoadBase; - - /* Set the virtual (image) and physical (load) addresses */ - LoadBase = (PVOID)KERNEL_BASE_PHYS; - - /* Load the first 1024 bytes of the kernel image so we can read the PE header */ - if (!FsReadFile(KernelImage, 1024, NULL, LoadBase)) return FALSE; - - /* Now read the MZ header to get the offset to the PE Header */ - NtHeader = RtlImageNtHeader(LoadBase); - - /* Get Kernel Base */ - KernelBase = NtHeader->OptionalHeader.ImageBase; - FrLdrGetKernelBase(); - - /* Save Entrypoint */ - KernelEntry = RaToPa(NtHeader->OptionalHeader.AddressOfEntryPoint); - - /* Save the Image Size */ - ImageSize = NtHeader->OptionalHeader.SizeOfImage; - - /* Set the file pointer to zero */ - FsSetFilePointer(KernelImage, 0); - - /* Load the file image */ - FsReadFile(KernelImage, ImageSize, NULL, LoadBase); - - /* Map it */ - FrLdrReMapImage(NtHeader, LoadBase); - - /* Calculate Difference between Real Base and Compiled Base*/ - LdrRelocateImageWithBias(LoadBase, - KernelBase - (ULONG_PTR)LoadBase, - "FreeLdr", - STATUS_SUCCESS, - STATUS_UNSUCCESSFUL, - STATUS_UNSUCCESSFUL); - - /* Fill out Module Data Structure */ - reactos_modules[0].ModStart = KernelBase; - reactos_modules[0].ModEnd = KernelBase + ImageSize; - strcpy(reactos_module_strings[0], "ntoskrnl.exe"); - reactos_modules[0].String = (ULONG_PTR)reactos_module_strings[0]; - LoaderBlock.ModsCount++; - - /* Increase the next Load Base */ - NextModuleBase = ROUND_UP(LoadBase + ImageSize, PAGE_SIZE); - - /* Load the HAL now (name will be changed internally if needed) */ - FrLdrLoadImage("hal.dll", 10); - - /* Perform import fixups */ - LdrPEFixupImports(LoadBase, "ntoskrnl.exe"); - - /* Return Success */ - return TRUE; -} - -BOOLEAN -NTAPI -FrLdrMapImage(IN FILE *HalImage, - IN PCHAR Name) +FrLdrMapImage(IN FILE *Image, + IN PCHAR Name, + IN ULONG ImageType) { PIMAGE_NT_HEADERS NtHeader; PVOID ImageBase, LoadBase; @@ -940,10 +624,10 @@ /* Set the virtual (image) and physical (load) addresses */ LoadBase = (PVOID)NextModuleBase; - ImageBase = RVA(LoadBase , -KERNEL_BASE_PHYS + KSEG0_BASE); + ImageBase = RVA(LoadBase , -KERNEL_BASE_PHYS + KSEG0_BASE); /* Load the first 1024 bytes of the HAL image so we can read the PE header */ - if (!FsReadFile(HalImage, 1024, NULL, LoadBase)) return FALSE; + if (!FsReadFile(Image, 1024, NULL, LoadBase)) return FALSE; /* Now read the MZ header to get the offset to the PE Header */ NtHeader = RtlImageNtHeader(LoadBase); @@ -952,21 +636,22 @@ ImageSize = NtHeader->OptionalHeader.SizeOfImage; /* Set the file pointer to zero */ - FsSetFilePointer(HalImage, 0); + FsSetFilePointer(Image, 0); /* Load the file image */ - FsReadFile(HalImage, ImageSize, NULL, LoadBase); + FsReadFile(Image, ImageSize, NULL, LoadBase); /* Map it into virtual memory */ - FrLdrReMapImage(NtHeader, LoadBase); + if (ImageType != 2) FrLdrReMapImage(NtHeader, LoadBase); /* Calculate Difference between Real Base and Compiled Base*/ - LdrRelocateImageWithBias(LoadBase, - (ULONG_PTR)ImageBase - (ULONG_PTR)LoadBase, - "FreeLdr", - STATUS_SUCCESS, - STATUS_UNSUCCESSFUL, - STATUS_UNSUCCESSFUL); + if (ImageType != 2) LdrRelocateImageWithBias(LoadBase, + (ULONG_PTR)ImageBase - + (ULONG_PTR)LoadBase, + "FreeLdr", + STATUS_SUCCESS, + STATUS_UNSUCCESSFUL, + STATUS_UNSUCCESSFUL); /* Fill out Module Data Structure */ reactos_modules[ImageId].ModStart = (ULONG_PTR)ImageBase; @@ -978,9 +663,20 @@ /* Increase the next Load Base */ NextModuleBase = ROUND_UP(NextModuleBase + ImageSize, PAGE_SIZE); - /* Perform import fixups */ - //DbgPrint("Fixing up: %s loaded at: %p\n", Name, ImageBase); - LdrPEFixupImports(LoadBase, Name); + /* Successful load! */ + //DbgPrint("Image: %s loaded at: %p\n", Name, ImageBase); + + /* Load HAL if this is the kernel */ + if (ImageType == 1) + { + KernelBase = NtHeader->OptionalHeader.ImageBase; + KernelEntry = RaToPa(NtHeader->OptionalHeader.AddressOfEntryPoint); + FrLdrLoadImage("hal.dll", 10, FALSE); + LoaderBlock.KernelBase = KernelBase; + } + + /* Perform import fixups */ + if (ImageType != 2) LdrPEFixupImports(LoadBase, Name); /* Return Success */ return TRUE; Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c Tue Feb 20 23:02:52 2007 @@ -38,65 +38,19 @@ static CHAR szLoadingMsg[] = "Loading ReactOS..."; BOOLEAN FrLdrBootType; -static BOOLEAN -NTAPI -FrLdrLoadKernel(PCHAR szFileName, - INT nPos) -{ - PFILE FilePointer; - PCHAR szShortName; - CHAR szBuffer[256]; - - /* Extract Kernel filename without path */ - szShortName = strrchr(szFileName, '\\'); - if (szShortName == NULL) { - - /* No path, leave it alone */ - szShortName = szFileName; - - } else { - - /* Skip the path */ - szShortName = szShortName + 1; - } - - /* Open the Kernel */ - FilePointer = FsOpenFile(szFileName); - - /* Make sure it worked */ - if (FilePointer == NULL) { - - /* Return failure on the short name */ - strcpy(szBuffer, szShortName); - strcat(szBuffer, " not found."); - UiMessageBox(szBuffer); - return(FALSE); - } - - /* Update the status bar with the current file */ - strcpy(szBuffer, "Reading "); - strcat(szBuffer, szShortName); - UiDrawStatusText(szBuffer); - - /* Do the actual loading */ - FrLdrMapKernel(FilePointer); - - /* Update Processbar and return success */ - UiDrawProgressBarCenter(nPos, 100, szLoadingMsg); - return(TRUE); -} - BOOLEAN NTAPI FrLdrMapImage( IN FILE *Image, - IN PCHAR ShortName + IN PCHAR ShortName, + IN ULONG ImageType ); BOOLEAN NTAPI FrLdrLoadImage(IN PCHAR szFileName, - IN INT nPos) + IN INT nPos, + IN ULONG ImageType) { PFILE FilePointer; PCHAR szShortName; @@ -153,74 +107,11 @@ UiDrawStatusText(szBuffer); /* Do the actual loading */ - FrLdrMapImage(FilePointer, szShortName); + FrLdrMapImage(FilePointer, szShortName, ImageType); /* Update Processbar and return success */ if (!FrLdrBootType) UiDrawProgressBarCenter(nPos, 100, szLoadingMsg); return TRUE; -} - -static VOID -FreeldrFreeMem(PVOID Area) -{ - MmFreeMemory(Area); -} - -static PVOID -FreeldrAllocMem(ULONG_PTR Size) -{ - return MmAllocateMemory((ULONG) Size); -} - -static BOOLEAN -FreeldrReadFile(PVOID FileContext, PVOID Buffer, ULONG Size) -{ - ULONG BytesRead; - - return FsReadFile((PFILE) FileContext, (ULONG) Size, &BytesRead, Buffer) - && Size == BytesRead; -} - -static BOOLEAN -FreeldrSeekFile(PVOID FileContext, ULONG_PTR Position) -{ - FsSetFilePointer((PFILE) FileContext, (ULONG) Position); - return TRUE; -} - -static BOOLEAN -LoadKernelSymbols(PCHAR szKernelName, int nPos) -{ - static ROSSYM_CALLBACKS FreeldrCallbacks = - { - FreeldrAllocMem, - FreeldrFreeMem, - FreeldrReadFile, - FreeldrSeekFile - }; - PFILE FilePointer; - PROSSYM_INFO RosSymInfo; - ULONG Size; - ULONG_PTR Base; - //return TRUE; - - RosSymInit(&FreeldrCallbacks); - - FilePointer = FsOpenFile(szKernelName); - if (FilePointer == NULL) - { - return FALSE; - } - if (! RosSymCreateFromFile(FilePointer, &RosSymInfo)) - { - return FALSE; - } - Base = FrLdrCreateModule("NTOSKRNL.SYM"); - Size = RosSymGetRawDataLength(RosSymInfo); - RosSymGetRawData(RosSymInfo, (PVOID)Base); - FrLdrCloseModule(Base, Size); - RosSymDelete(RosSymInfo); - return TRUE; } static BOOLEAN @@ -371,49 +262,6 @@ return(FALSE); } - return(TRUE); -} - -static BOOLEAN -FrLdrLoadDriver(PCHAR szFileName, - INT nPos) -{ - PFILE FilePointer; - CHAR value[256]; - LPSTR p; - - /* Open the Driver */ - FilePointer = FsOpenFile(szFileName); - - /* Make sure we did */ - if (FilePointer == NULL) { - - /* Fail if file wasn't opened */ - strcpy(value, szFileName); - strcat(value, " not found."); - UiMessageBox(value); - return(FALSE); - } - - /* Update the status bar with the current file */ - strcpy(value, "Reading "); - p = strrchr(szFileName, '\\'); - if (p == NULL) { - - strcat(value, szFileName); - - } else { - - strcat(value, p + 1); - - } - UiDrawStatusText(value); - - /* Load the driver */ - FrLdrLoadModule(FilePointer, szFileName, NULL); - - /* Update status and return */ - UiDrawProgressBarCenter(nPos, 100, szLoadingMsg); return(TRUE); } @@ -552,7 +400,7 @@ /* Update the position if needed */ if (nPos < 100) nPos += 5; - FrLdrLoadDriver(ImagePath, nPos); + FrLdrLoadImage(ImagePath, nPos, 2); } else { @@ -621,7 +469,7 @@ if (nPos < 100) nPos += 5; - FrLdrLoadDriver(ImagePath, nPos); + FrLdrLoadImage(ImagePath, nPos, 2); } else { @@ -647,15 +495,12 @@ CHAR SystemPath[255]; CHAR szKernelName[255]; CHAR szFileName[255]; - UINT i; CHAR MsgBuffer[256]; ULONG SectionId; ULONG_PTR Base; ULONG Size; - extern ULONG PageDirectoryStart; - extern ULONG PageDirectoryEnd; extern BOOLEAN AcpiPresent; // @@ -676,47 +521,36 @@ /* * Setup multiboot information structure */ - LoaderBlock.Flags = MB_FLAGS_BOOT_DEVICE | MB_FLAGS_COMMAND_LINE | MB_FLAGS_MODULE_INFO; - LoaderBlock.PageDirectoryStart = (ULONG)&PageDirectoryStart; - LoaderBlock.PageDirectoryEnd = (ULONG)&PageDirectoryEnd; - LoaderBlock.BootDevice = 0xffffffff; LoaderBlock.CommandLine = reactos_kernel_cmdline; LoaderBlock.ModsCount = 0; LoaderBlock.ModsAddr = reactos_modules; LoaderBlock.DrivesAddr = reactos_arc_disk_info; - LoaderBlock.MmapLength = (unsigned long)MachGetMemoryMap((PBIOS_MEMORY_MAP)(PVOID)&reactos_memory_map, 32) * sizeof(memory_map_t); - if (LoaderBlock.MmapLength) - { - LoaderBlock.MmapAddr = (unsigned long)&reactos_memory_map; - LoaderBlock.Flags |= MB_FLAGS_MEM_INFO | MB_FLAGS_MMAP_INFO; - reactos_memory_map_descriptor_size = sizeof(memory_map_t); // GetBiosMemoryMap uses a fixed value of 24 - DbgPrint((DPRINT_REACTOS, "memory map length: %d\n", LoaderBlock.MmapLength)); - DbgPrint((DPRINT_REACTOS, "dumping memory map:\n")); - for (i=0; i<(LoaderBlock.MmapLength/sizeof(memory_map_t)); i++) - { - if (BiosMemoryUsable == reactos_memory_map[i].type && - 0 == reactos_memory_map[i].base_addr_low) - { - LoaderBlock.MemLower = (reactos_memory_map[i].base_addr_low + reactos_memory_map[i].length_low) / 1024; - if (640 < LoaderBlock.MemLower) - { - LoaderBlock.MemLower = 640; - } - } - if (BiosMemoryUsable == reactos_memory_map[i].type && - reactos_memory_map[i].base_addr_low <= 1024 * 1024 && - 1024 * 1024 <= reactos_memory_map[i].base_addr_low + reactos_memory_map[i].length_low) - { - LoaderBlock.MemHigher = (reactos_memory_map[i].base_addr_low + reactos_memory_map[i].length_low) / 1024 - 1024; - } - DbgPrint((DPRINT_REACTOS, "start: %x\t size: %x\t type %d\n", - reactos_memory_map[i].base_addr_low, - reactos_memory_map[i].length_low, - reactos_memory_map[i].type)); - } - } - DbgPrint((DPRINT_REACTOS, "low_mem = %d\n", LoaderBlock.MemLower)); - DbgPrint((DPRINT_REACTOS, "high_mem = %d\n", LoaderBlock.MemHigher)); + LoaderBlock.MmapLength = (unsigned long)MachGetMemoryMap((PBIOS_MEMORY_MAP)(PVOID)&reactos_memory_map, 32) * sizeof(memory_map_t); + if (LoaderBlock.MmapLength) + { + ULONG i; + + LoaderBlock.MmapAddr = (unsigned long)&reactos_memory_map; + reactos_memory_map_descriptor_size = sizeof(memory_map_t); // GetBiosMemoryMap uses a fixed value of 24 + for (i=0; i<(LoaderBlock.MmapLength/sizeof(memory_map_t)); i++) + { + if (BiosMemoryUsable == reactos_memory_map[i].type && + 0 == reactos_memory_map[i].base_addr_low) + { + LoaderBlock.MemLower = (reactos_memory_map[i].base_addr_low + reactos_memory_map[i].length_low) / 1024; + if (640 < LoaderBlock.MemLower) + { + LoaderBlock.MemLower = 640; + } + } + if (BiosMemoryUsable == reactos_memory_map[i].type && + reactos_memory_map[i].base_addr_low <= 1024 * 1024 && + 1024 * 1024 <= reactos_memory_map[i].base_addr_low + reactos_memory_map[i].length_low) + { + LoaderBlock.MemHigher = (reactos_memory_map[i].base_addr_low + reactos_memory_map[i].length_low) / 1024 - 1024; + } + } + } /* * Initialize the registry @@ -848,7 +682,7 @@ } /* Load the kernel */ - if (!FrLdrLoadKernel(szKernelName, 5)) return; + if (!FrLdrLoadImage(szKernelName, 5, 1)) return; /* * Load the System hive from disk @@ -915,12 +749,6 @@ return; } UiDrawProgressBarCenter(30, 100, szLoadingMsg); - - /* - * Load kernel symbols - */ - LoadKernelSymbols(szKernelName, 30); - UiDrawProgressBarCenter(40, 100, szLoadingMsg); /* * Load boot drivers Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Tue Feb 20 23:02:52 2007 @@ -31,21 +31,13 @@ #define USE_UI -static BOOLEAN -FreeldrReadFile(PVOID FileContext, PVOID Buffer, ULONG Size) -{ - ULONG BytesRead; - - return FsReadFile((PFILE) FileContext, (ULONG) Size, &BytesRead, Buffer) - && Size == BytesRead; -} - -static BOOLEAN -FreeldrSeekFile(PVOID FileContext, ULONG_PTR Position) -{ - FsSetFilePointer((PFILE) FileContext, (ULONG) Position); - return TRUE; -} +BOOLEAN +NTAPI +FrLdrMapImage( + IN FILE *Image, + IN PCHAR ShortName, + IN ULONG ImageType +); BOOLEAN NTAPI @@ -86,65 +78,10 @@ UiDrawStatusText(szBuffer); /* Do the actual loading */ - FrLdrMapKernel(FilePointer); + FrLdrMapImage(FilePointer, szShortName, 1); /* Update Processbar and return success */ return TRUE; -} - -static BOOLEAN -LoadKernelSymbols(PCSTR szSourcePath, PCSTR szFileName) -{ - static ROSSYM_CALLBACKS FreeldrCallbacks = - { - MmAllocateMemory, - MmFreeMemory, - FreeldrReadFile, - FreeldrSeekFile - }; - CHAR szFullName[256]; - PFILE FilePointer; - PROSSYM_INFO RosSymInfo; - ULONG Size; - ULONG_PTR Base; - - if (szSourcePath[0] != '\\') - { - strcpy(szFullName, "\\"); - strcat(szFullName, szSourcePath); - } - else - { - strcpy(szFullName, szSourcePath); - } - - if (szFullName[strlen(szFullName)] != '\\') - { - strcat(szFullName, "\\"); - } - - if (szFileName[0] != '\\') - { - strcat(szFullName, szFileName); - } - else - { - strcat(szFullName, szFileName + 1); - } - - RosSymInit(&FreeldrCallbacks); - - FilePointer = FsOpenFile(szFullName); - if (FilePointer && RosSymCreateFromFile(FilePointer, &RosSymInfo)) - { - Base = FrLdrCreateModule("NTOSKRNL.SYM"); - Size = RosSymGetRawDataLength(RosSymInfo); - RosSymGetRawData(RosSymInfo, (PVOID)Base); - FrLdrCloseModule(Base, Size); - RosSymDelete(RosSymInfo); - return TRUE; - } - return FALSE; } static BOOLEAN @@ -206,7 +143,7 @@ #endif /* Load the driver */ - FrLdrLoadModule(FilePointer, szFileName, NULL); + FrLdrMapImage(FilePointer, (LPSTR)szFileName, 2); return(TRUE); } @@ -282,60 +219,42 @@ ULONG Size; const char *SourcePath; const char *LoadOptions; - UINT i; char szKernelName[256]; HINF InfHandle; ULONG ErrorLine; INFCONTEXT InfContext; - extern ULONG PageDirectoryStart; - extern ULONG PageDirectoryEnd; - /* Setup multiboot information structure */ - LoaderBlock.Flags = MB_FLAGS_BOOT_DEVICE | MB_FLAGS_COMMAND_LINE | MB_FLAGS_MODULE_INFO; - LoaderBlock.PageDirectoryStart = (ULONG)&PageDirectoryStart; - LoaderBlock.PageDirectoryEnd = (ULONG)&PageDirectoryEnd; - LoaderBlock.BootDevice = 0xffffffff; LoaderBlock.CommandLine = reactos_kernel_cmdline; LoaderBlock.ModsCount = 0; LoaderBlock.ModsAddr = reactos_modules; LoaderBlock.MmapLength = (unsigned long)MachGetMemoryMap((PBIOS_MEMORY_MAP)(PVOID)&reactos_memory_map, 32) * sizeof(memory_map_t); if (LoaderBlock.MmapLength) - { + { + ULONG i; + LoaderBlock.MmapAddr = (unsigned long)&reactos_memory_map; - LoaderBlock.Flags |= MB_FLAGS_MEM_INFO | MB_FLAGS_MMAP_INFO; reactos_memory_map_descriptor_size = sizeof(memory_map_t); // GetBiosMemoryMap uses a fixed value of 24 - for (i = 0; i < (LoaderBlock.MmapLength / sizeof(memory_map_t)); i++) - { + for (i=0; i<(LoaderBlock.MmapLength/sizeof(memory_map_t)); i++) + { if (BiosMemoryUsable == reactos_memory_map[i].type && 0 == reactos_memory_map[i].base_addr_low) - { + { LoaderBlock.MemLower = (reactos_memory_map[i].base_addr_low + reactos_memory_map[i].length_low) / 1024; if (640 < LoaderBlock.MemLower) - { + { LoaderBlock.MemLower = 640; - } - } + } + } if (BiosMemoryUsable == reactos_memory_map[i].type && reactos_memory_map[i].base_addr_low <= 1024 * 1024 && 1024 * 1024 <= reactos_memory_map[i].base_addr_low + reactos_memory_map[i].length_low) - { + { LoaderBlock.MemHigher = (reactos_memory_map[i].base_addr_low + reactos_memory_map[i].length_low) / 1024 - 1024; - } -#if 0 - printf("start: %x\t size: %x\t type %d\n", - reactos_memory_map[i].base_addr_low, - reactos_memory_map[i].length_low, - reactos_memory_map[i].type); -#endif - } - } -#if 0 - printf("low_mem = %d\n", LoaderBlock.MemLower); - printf("high_mem = %d\n", LoaderBlock.MemHigher); - MachConsGetCh(); -#endif + } + } + } #ifdef USE_UI SetupUiInitialize(); @@ -431,9 +350,6 @@ /* Load the kernel */ if (!FrLdrLoadKernel(szKernelName, 5)) return; - /* Create ntoskrnl.sym */ - LoadKernelSymbols(SourcePath, "ntoskrnl.exe"); - /* Export the hardware hive */ Base = FrLdrCreateModule ("HARDWARE"); RegExportBinaryHive (L"\\Registry\\Machine\\HARDWARE", (PVOID)Base, &Size); Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Tue Feb 20 23:02:52 2007 @@ -803,17 +803,6 @@ } return STATUS_SUCCESS; -} - -static VOID INIT_FUNCTION -MiFreeBootDriverMemory(PVOID StartAddress, ULONG Length) -{ - ULONG i; - - for (i = 0; i < PAGE_ROUND_UP(Length) / PAGE_SIZE; i++) - { - MmDeleteVirtualMapping(NULL, (char*)StartAddress + i * PAGE_SIZE, TRUE, NULL, NULL); - } } /* @@ -1028,7 +1017,7 @@ } /* Loop modules again */ - NextEntry = ListHead->Flink->Flink->Flink->Flink; + NextEntry = ListHead->Flink; while (ListHead != NextEntry) { /* Get the entry */ @@ -1037,11 +1026,10 @@ InLoadOrderLinks); /* Free memory */ - DPRINT("Freeing memory at: %p of size: %lx for module: %wZ\n", + DPRINT("Driver at: %p ending at: %p for module: %wZ\n", LdrEntry->DllBase, - LdrEntry->SizeOfImage, + (ULONG_PTR)LdrEntry->DllBase+ LdrEntry->SizeOfImage, &LdrEntry->FullDllName); - MiFreeBootDriverMemory(LdrEntry->DllBase, LdrEntry->SizeOfImage); /* Go to the next driver */ NextEntry = NextEntry->Flink; Modified: trunk/reactos/ntoskrnl/ke/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/freeldr.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/freeldr.c (original) +++ trunk/reactos/ntoskrnl/ke/freeldr.c Tue Feb 20 23:02:52 2007 @@ -98,6 +98,7 @@ if (!_stricmp(DriverName, "ansi.nls")) { /* ANSI Code page */ + ModStart = (PVOID)((ULONG_PTR)ModStart + (KSEG0_BASE - 0x200000)); LoaderBlock->NlsData->AnsiCodePageData = ModStart; /* Create an MD for it */ @@ -112,6 +113,7 @@ else if (!_stricmp(DriverName, "oem.nls")) { /* OEM Code page */ + ModStart = (PVOID)((ULONG_PTR)ModStart + (KSEG0_BASE - 0x200000)); LoaderBlock->NlsData->OemCodePageData = ModStart; /* Create an MD for it */ @@ -126,6 +128,7 @@ else if (!_stricmp(DriverName, "casemap.nls")) { /* Unicode Code page */ + ModStart = (PVOID)((ULONG_PTR)ModStart + (KSEG0_BASE - 0x200000)); LoaderBlock->NlsData->UnicodeCodePageData = ModStart; /* Create an MD for it */ @@ -143,6 +146,7 @@ !(_stricmp(DriverName, "system.hiv"))) { /* Save registry data */ + ModStart = (PVOID)((ULONG_PTR)ModStart + (KSEG0_BASE - 0x200000)); LoaderBlock->RegistryBase = ModStart; LoaderBlock->RegistryLength = ModSize; @@ -164,6 +168,7 @@ !(_stricmp(DriverName, "hardware.hiv"))) { /* Create an MD for it */ + ModStart = (PVOID)((ULONG_PTR)ModStart + (KSEG0_BASE - 0x200000)); MdEntry = &BldrMemoryDescriptors[i]; MdEntry->MemoryType = LoaderRegistryData; MdEntry->BasePage = (ULONG_PTR)ModStart >> PAGE_SHIFT; @@ -315,7 +320,6 @@ KiRosPrepareForSystemStartup(IN ULONG Dummy, IN PROS_LOADER_PARAMETER_BLOCK LoaderBlock) { - ULONG i; PLOADER_PARAMETER_BLOCK NtLoaderBlock; PKTSS Tss; PKGDTENTRY TssEntry; @@ -337,25 +341,6 @@ /* Save pointer to ROS Block */ KeRosLoaderBlock = LoaderBlock; - /* Save the Base Address */ - MmSystemRangeStart = (PVOID)KeRosLoaderBlock->KernelBase; - - /* Convert every driver address to virtual memory */ - for (i = 3; i < KeRosLoaderBlock->ModsCount; i++) - { - /* Subtract the base Address in Physical Memory */ - KeRosLoaderBlock->ModsAddr[i].ModStart -= 0x200000; - - /* Add the Kernel Base Address in Virtual Memory */ - KeRosLoaderBlock->ModsAddr[i].ModStart += KSEG0_BASE; - - /* Subtract the base Address in Physical Memory */ - KeRosLoaderBlock->ModsAddr[i].ModEnd -= 0x200000; - - /* Add the Kernel Base Address in Virtual Memory */ - KeRosLoaderBlock->ModsAddr[i].ModEnd += KSEG0_BASE; - } - /* Save memory manager data */ MmFreeLdrLastKernelAddress = PAGE_ROUND_UP(KeRosLoaderBlock-> ModsAddr[KeRosLoaderBlock-> Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c Tue Feb 20 23:02:52 2007 @@ -350,6 +350,7 @@ } /* Set memory limits */ + MmSystemRangeStart = (PVOID)KSEG0_BASE; MmUserProbeAddress = (ULONG_PTR)MmSystemRangeStart - 0x10000; MmHighestUserAddress = (PVOID)(MmUserProbeAddress - 1);

17 years, 8 months

[ion] 25859: - Don't load .SYM in freeldr anymore. - Fix generation of driver name for symbol load.

by ion＠svn.reactos.org

Author: ion Date: Tue Feb 20 19:39:31 2007 New Revision: 25859 URL: http://svn.reactos.org/svn/reactos?rev=25859&view=rev Log: - Don't load .SYM in freeldr anymore. - Fix generation of driver name for symbol load. Modified: branches/alex-kd-branch/reactos/boot/freeldr/freeldr/reactos/reactos.c branches/alex-kd-branch/reactos/ntoskrnl/ex/init.c Modified: branches/alex-kd-branch/reactos/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/boot/fre… ============================================================================== --- branches/alex-kd-branch/reactos/boot/freeldr/freeldr/reactos/reactos.c (original) +++ branches/alex-kd-branch/reactos/boot/freeldr/freeldr/reactos/reactos.c Tue Feb 20 19:39:31 2007 @@ -158,69 +158,6 @@ /* Update Processbar and return success */ if (!FrLdrBootType) UiDrawProgressBarCenter(nPos, 100, szLoadingMsg); return TRUE; -} - -static VOID -FreeldrFreeMem(PVOID Area) -{ - MmFreeMemory(Area); -} - -static PVOID -FreeldrAllocMem(ULONG_PTR Size) -{ - return MmAllocateMemory((ULONG) Size); -} - -static BOOLEAN -FreeldrReadFile(PVOID FileContext, PVOID Buffer, ULONG Size) -{ - ULONG BytesRead; - - return FsReadFile((PFILE) FileContext, (ULONG) Size, &BytesRead, Buffer) - && Size == BytesRead; -} - -static BOOLEAN -FreeldrSeekFile(PVOID FileContext, ULONG_PTR Position) -{ - FsSetFilePointer((PFILE) FileContext, (ULONG) Position); - return TRUE; -} - -static BOOLEAN -LoadKernelSymbols(PCHAR szKernelName, int nPos) -{ - static ROSSYM_CALLBACKS FreeldrCallbacks = - { - FreeldrAllocMem, - FreeldrFreeMem, - FreeldrReadFile, - FreeldrSeekFile - }; - PFILE FilePointer; - PROSSYM_INFO RosSymInfo; - ULONG Size; - ULONG_PTR Base; - //return TRUE; - - RosSymInit(&FreeldrCallbacks); - - FilePointer = FsOpenFile(szKernelName); - if (FilePointer == NULL) - { - return FALSE; - } - if (! RosSymCreateFromFile(FilePointer, &RosSymInfo)) - { - return FALSE; - } - Base = FrLdrCreateModule("NTOSKRNL.SYM"); - Size = RosSymGetRawDataLength(RosSymInfo); - RosSymGetRawData(RosSymInfo, (PVOID)Base); - FrLdrCloseModule(Base, Size); - RosSymDelete(RosSymInfo); - return TRUE; } static BOOLEAN @@ -917,12 +854,6 @@ UiDrawProgressBarCenter(30, 100, szLoadingMsg); /* - * Load kernel symbols - */ - LoadKernelSymbols(szKernelName, 30); - UiDrawProgressBarCenter(40, 100, szLoadingMsg); - - /* * Load boot drivers */ FrLdrLoadBootDrivers(szBootPath, 40); Modified: branches/alex-kd-branch/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/ex/init.c (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/ex/init.c Tue Feb 20 19:39:31 2007 @@ -683,11 +683,12 @@ else { /* Copy the name */ - for (Count = 0; Count < Length; Count++, Name++) + Count = 0; + do { /* Copy the character */ - NameBuffer[Count] = (CHAR)*Name; - } + NameBuffer[Count++] = (CHAR)*Name++; + } while (Count < Length); /* Null-terminate */ NameBuffer[Count] = ANSI_NULL; @@ -704,13 +705,14 @@ { /* Buffer too small */ OverFlow = TRUE; + while (TRUE); } else { /* Otherwise build the name. HACKED for GCC :( */ sprintf(NameBuffer, - "%c\\System32\\Drivers\\%S", - SharedUserData->NtSystemRoot[2], + "%S\\System32\\Drivers\\%S", + &SharedUserData->NtSystemRoot[2], LdrEntry->BaseDllName.Buffer); } }

17 years, 8 months

[ion] 25858: - Fix loading of boot symbols. - Fix bug in KdpLoadSymbolsStateChange, we were never actually copying the pathname. - Output of lm: kd> lm start end module name 80000000 80283000 nt (export symbols) ntoskrnl.exe 80283000 8029d000 hal (export symbols) halup.dll

by ion＠svn.reactos.org

Author: ion Date: Tue Feb 20 09:51:16 2007 New Revision: 25858 URL: http://svn.reactos.org/svn/reactos?rev=25858&view=rev Log: - Fix loading of boot symbols. - Fix bug in KdpLoadSymbolsStateChange, we were never actually copying the pathname. - Output of lm: kd> lm start end module name 80000000 80283000 nt (export symbols) ntoskrnl.exe 80283000 8029d000 hal (export symbols) halup.dll Modified: branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdapi.c branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdinit.c Modified: branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdapi.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdapi.c (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdapi.c Tue Feb 20 09:51:16 2007 @@ -845,6 +845,7 @@ { /* Setup the information */ WaitStateChange.u.LoadSymbols.PathNameLength = PathName->Length; + RtlCopyMemory(KdpPathBuffer, PathName->Buffer, PathName->Length); Data.Buffer = KdpPathBuffer; Data.Length = WaitStateChange.u.LoadSymbols.PathNameLength; ExtraData = &Data; Modified: branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdinit.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdinit.c (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdinit.c Tue Feb 20 09:51:16 2007 @@ -68,8 +68,9 @@ ANSI_STRING ImageName; PLDR_DATA_TABLE_ENTRY LdrEntry; PLIST_ENTRY NextEntry; - ULONG i, j; + ULONG i, j, Length; CHAR NameBuffer[256]; + PWCHAR Name; /* Check if this is Phase 1 */ if (BootPhase) @@ -230,11 +231,17 @@ InLoadOrderLinks); /* Generate the image name */ - for (j = 0; j < LdrEntry->BaseDllName.Length / 2; j++) + Name = LdrEntry->FullDllName.Buffer; + Length = LdrEntry->FullDllName.Length / sizeof(WCHAR); + j = 0; + do { /* Do cheap Unicode to ANSI conversion */ - NameBuffer[j] = (CHAR)LdrEntry->BaseDllName.Buffer[j]; - } + NameBuffer[j++] = (CHAR)*Name++; + } while (j < Length); + + /* Null-terminate */ + NameBuffer[j] = ANSI_NULL; /* Load symbols for image */ RtlInitAnsiString(&ImageName, NameBuffer);

17 years, 8 months

[ion] 25857: - Add ExceptionRecord32To64. - Implement KdpReportExceptionStateChange and fully support KdpReport. - We now properly break inside HAL (with /BREAK) and WinDBG shows a nice stack trace, and disassembly, and I can step through the HAL initialization code!

by ion＠svn.reactos.org

Author: ion Date: Tue Feb 20 09:25:58 2007 New Revision: 25857 URL: http://svn.reactos.org/svn/reactos?rev=25857&view=rev Log: - Add ExceptionRecord32To64. - Implement KdpReportExceptionStateChange and fully support KdpReport. - We now properly break inside HAL (with /BREAK) and WinDBG shows a nice stack trace, and disassembly, and I can step through the HAL initialization code! Modified: branches/alex-kd-branch/reactos/include/ddk/winddk.h branches/alex-kd-branch/reactos/include/reactos/windbgkd.h branches/alex-kd-branch/reactos/ntoskrnl/include/internal/kd.h branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdapi.c branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdtrap.c Modified: branches/alex-kd-branch/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/include/… ============================================================================== --- branches/alex-kd-branch/reactos/include/ddk/winddk.h (original) +++ branches/alex-kd-branch/reactos/include/ddk/winddk.h Tue Feb 20 09:25:58 2007 @@ -634,6 +634,17 @@ IN struct _IRP *Irp, IN PVOID MapRegisterBase, IN PVOID Context); + + +typedef struct _EXCEPTION_RECORD32 +{ + NTSTATUS ExceptionCode; + ULONG ExceptionFlags; + ULONG ExceptionRecord; + ULONG ExceptionAddress; + ULONG NumberParameters; + ULONG ExceptionInformation[EXCEPTION_MAXIMUM_PARAMETERS]; +} EXCEPTION_RECORD32, *PEXCEPTION_RECORD32; typedef struct _EXCEPTION_RECORD64 { Modified: branches/alex-kd-branch/reactos/include/reactos/windbgkd.h URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/include/… ============================================================================== --- branches/alex-kd-branch/reactos/include/reactos/windbgkd.h (original) +++ branches/alex-kd-branch/reactos/include/reactos/windbgkd.h Tue Feb 20 09:25:58 2007 @@ -5,6 +5,12 @@ // Dependencies // #include "wdbgexts.h" + +// +// Conversion Macros +// +#define COPYSE(p64, p32, f) \ + p64->f = (ULONG64)(LONG64)(LONG)p32->f // // Packet Size and Control Stream Size @@ -460,4 +466,23 @@ } u; } DBGKD_MANIPULATE_STATE64, *PDBGKD_MANIPULATE_STATE64; +FORCEINLINE +VOID +ExceptionRecord32To64(IN PEXCEPTION_RECORD32 Ex32, + OUT PEXCEPTION_RECORD64 Ex64) +{ + ULONG i; + + Ex64->ExceptionCode = Ex32->ExceptionCode; + Ex64->ExceptionFlags = Ex32->ExceptionFlags; + Ex64->ExceptionRecord = Ex32->ExceptionRecord; + COPYSE(Ex64,Ex32,ExceptionAddress); + Ex64->NumberParameters = Ex32->NumberParameters; + + for (i = 0; i < EXCEPTION_MAXIMUM_PARAMETERS; i++) + { + COPYSE(Ex64,Ex32,ExceptionInformation[i]); + } +} + #endif Modified: branches/alex-kd-branch/reactos/ntoskrnl/include/internal/kd.h URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/include/internal/kd.h (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/include/internal/kd.h Tue Feb 20 09:25:58 2007 @@ -158,6 +158,14 @@ IN PKD_SYMBOLS_INFO SymbolInfo, IN BOOLEAN Unload, IN OUT PCONTEXT Context +); + +BOOLEAN +NTAPI +KdpReportExceptionStateChange( + IN PEXCEPTION_RECORD ExceptionRecord, + IN OUT PCONTEXT Context, + IN BOOLEAN SecondChanceException ); VOID Modified: branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdapi.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdapi.c (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdapi.c Tue Feb 20 09:25:58 2007 @@ -871,6 +871,45 @@ return Status; } +BOOLEAN +NTAPI +KdpReportExceptionStateChange(IN PEXCEPTION_RECORD ExceptionRecord, + IN OUT PCONTEXT Context, + IN BOOLEAN SecondChanceException) +{ + STRING Header, Data; + DBGKD_WAIT_STATE_CHANGE64 WaitStateChange; + BOOLEAN Status; + + /* Start report loop */ + do + { + /* Build the architecture common parts of the message */ + KdpSetCommonState(DbgKdExceptionStateChange, Context, &WaitStateChange); + + /* Convert the exception record to 64-bits and set First Chance flag */ + ExceptionRecord32To64((PEXCEPTION_RECORD32)ExceptionRecord, + &WaitStateChange.u.Exception.ExceptionRecord); + WaitStateChange.u.Exception.FirstChance = !SecondChanceException; + + /* Now finish creating the structure */ + KdpSetContextState(&WaitStateChange, Context); + + /* Setup the actual header to send to KD */ + Header.Length = sizeof(DBGKD_WAIT_STATE_CHANGE64); + Header.Buffer = (PCHAR)&WaitStateChange; + + /* Send State Change packet and wait for a reply */ + Status = KdpSendWaitContinue(PACKET_TYPE_KD_STATE_CHANGE64, + &Header, + &Data, + Context); + } while (Status == KdPacketNeedsResend); + + /* Return */ + return Status; +} + VOID NTAPI KdpTimeSlipDpcRoutine(IN PKDPC Dpc, Modified: branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdtrap.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdtrap.c (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdtrap.c Tue Feb 20 09:25:58 2007 @@ -62,22 +62,16 @@ sizeof(CONTEXT)); /* Report the new state */ - Ke386SetCr2(TrapFrame->HardwareEsp); -#if 0 Status = KdpReportExceptionStateChange(ExceptionRecord, &Prcb->ProcessorState. ContextFrame, SecondChanceException); -#else - while (TRUE); - Status = FALSE; -#endif /* Now restore the processor state, manually again. */ RtlCopyMemory(ContextRecord, &Prcb->ProcessorState.ContextFrame, sizeof(CONTEXT)); - KiRestoreProcessorControlState(&Prcb->ProcessorState); + //KiRestoreProcessorControlState(&Prcb->ProcessorState); /* Exit the debugger and clear the CTRL-C state */ KdExitDebugger(Entered);

17 years, 8 months

[ion] 25856: - Properly sign-extend a couple more pointers. WinDBG is still complaining about two of them though.

by ion＠svn.reactos.org

Author: ion Date: Tue Feb 20 08:02:52 2007 New Revision: 25856 URL: http://svn.reactos.org/svn/reactos?rev=25856&view=rev Log: - Properly sign-extend a couple more pointers. WinDBG is still complaining about two of them though. Modified: branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdapi.c Modified: branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdapi.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdapi.c (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdapi.c Tue Feb 20 08:02:52 2007 @@ -72,8 +72,8 @@ WaitStateChange->ProcessorLevel = KeProcessorLevel; WaitStateChange->Processor = (USHORT)KeGetCurrentPrcb()->Number; WaitStateChange->NumberProcessors = (ULONG)KeNumberProcessors; - WaitStateChange->Thread = (ULONG)KeGetCurrentThread(); - WaitStateChange->ProgramCounter = (ULONG64)Context->Eip; + WaitStateChange->Thread = (ULONG)(LONG_PTR)KeGetCurrentThread(); + WaitStateChange->ProgramCounter = (ULONG)(LONG_PTR)Context->Eip; /* Zero out the Control Report */ RtlZeroMemory(&WaitStateChange->ControlReport, @@ -835,7 +835,7 @@ /* Fill out load data */ WaitStateChange.u.LoadSymbols.UnloadSymbols = Unload; - WaitStateChange.u.LoadSymbols.BaseOfDll = (ULONG)SymbolInfo->BaseOfDll; + WaitStateChange.u.LoadSymbols.BaseOfDll = (ULONGLONG)(LONG_PTR)SymbolInfo->BaseOfDll; WaitStateChange.u.LoadSymbols.ProcessId = SymbolInfo->ProcessId; WaitStateChange.u.LoadSymbols.CheckSum = SymbolInfo->CheckSum; WaitStateChange.u.LoadSymbols.SizeOfImage = SymbolInfo->SizeOfImage;

17 years, 8 months

[ion] 25855: - Implement KdpGetStateChange. - Implement DbgKdContinueApi and DbgKdContinueApi2 cases. - Remove several while (TRUE); s which started being hit since our code is working fine. - WinDBG gets notifications for all the drivers/symbols being loaded and ROS now boots to bootvid logo, but we don't yet break-in.

by ion＠svn.reactos.org

Author: ion Date: Tue Feb 20 07:57:43 2007 New Revision: 25855 URL: http://svn.reactos.org/svn/reactos?rev=25855&view=rev Log: - Implement KdpGetStateChange. - Implement DbgKdContinueApi and DbgKdContinueApi2 cases. - Remove several while (TRUE);s which started being hit since our code is working fine. - WinDBG gets notifications for all the drivers/symbols being loaded and ROS now boots to bootvid logo, but we don't yet break-in. Modified: branches/alex-kd-branch/reactos/ntoskrnl/include/internal/kd.h branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdapi.c branches/alex-kd-branch/reactos/ntoskrnl/kd64/kddata.c branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdinit.c branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdprint.c Modified: branches/alex-kd-branch/reactos/ntoskrnl/include/internal/kd.h URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/include/internal/kd.h (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/include/internal/kd.h Tue Feb 20 07:57:43 2007 @@ -210,3 +210,4 @@ extern BOOLEAN KdpOweBreakpoint; extern BOOLEAN BreakpointsSuspended; extern ULONG KdpNumInternalBreakpoints; +extern ULONG KdpCurrentSymbolStart, KdpCurrentSymbolEnd; Modified: branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdapi.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdapi.c (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdapi.c Tue Feb 20 07:57:43 2007 @@ -13,6 +13,50 @@ #include <debug.h> /* PRIVATE FUNCTIONS *********************************************************/ + +VOID +NTAPI +KdpGetStateChange(IN PDBGKD_MANIPULATE_STATE64 State, + IN PCONTEXT Context) +{ + PKPRCB Prcb; + ULONG i; + + /* Check for success */ + if (NT_SUCCESS(State->u.Continue2.ContinueStatus)) + { + /* Check if we're tracing */ + if (State->u.Continue2.ControlSet.TraceFlag) + { + /* Enable TF */ + Context->EFlags |= EFLAGS_TF; + } + else + { + /* Remove it */ + Context->EFlags &= ~EFLAGS_TF; + } + + /* Loop all processors */ + for (i = 0; i < KeNumberProcessors; i++) + { + /* Get the PRCB and update DR7 and DR6 */ + Prcb = KiProcessorBlock[i]; + Prcb->ProcessorState.SpecialRegisters.KernelDr7 = + State->u.Continue2.ControlSet.Dr7; + Prcb->ProcessorState.SpecialRegisters.KernelDr6 = 0; + } + + /* Check if we have new symbol information */ + if (State->u.Continue2.ControlSet.CurrentSymbolStart != 1) + { + /* Update it */ + KdpCurrentSymbolStart = + State->u.Continue2.ControlSet.CurrentSymbolStart; + KdpCurrentSymbolEnd= State->u.Continue2.ControlSet.CurrentSymbolEnd; + } + } +} VOID NTAPI @@ -507,10 +551,8 @@ case DbgKdContinueApi: - /* FIXME: TODO */ - Ke386SetCr2(DbgKdContinueApi); - while (TRUE); - break; + /* Simply continue */ + return NT_SUCCESS(ManipulateState.u.Continue.ContinueStatus); case DbgKdReadControlSpaceApi: @@ -547,9 +589,18 @@ case DbgKdContinueApi2: - /* FIXME: TODO */ - Ke386SetCr2(DbgKdContinueApi2); - while (TRUE); + /* Check if caller reports success */ + if (NT_SUCCESS(ManipulateState.u.Continue2.ContinueStatus)) + { + /* Update the state */ + KdpGetStateChange(&ManipulateState, Context); + return ContinueSuccess; + } + else + { + /* Return an error */ + return ContinueError; + } break; case DbgKdReadPhysicalMemoryApi: @@ -817,7 +868,6 @@ } while(Status == ContinueProcessorReselected); /* Return status */ - while (TRUE); return Status; } Modified: branches/alex-kd-branch/reactos/ntoskrnl/kd64/kddata.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/kd64/kddata.c (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/kd64/kddata.c Tue Feb 20 07:57:43 2007 @@ -53,6 +53,8 @@ BOOLEAN KdpOweBreakpoint; BOOLEAN BreakpointsSuspended; ULONG KdpNumInternalBreakpoints; + +ULONG KdpCurrentSymbolStart, KdpCurrentSymbolEnd; // // Time Slip Support Modified: branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdinit.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdinit.c (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdinit.c Tue Feb 20 07:57:43 2007 @@ -248,7 +248,6 @@ /* Check for incoming breakin and break on symbol load if we have it*/ KdBreakAfterSymbolLoad = KdPollBreakIn(); - while (TRUE); } else { Modified: branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdprint.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdprint.c (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdprint.c Tue Feb 20 07:57:43 2007 @@ -101,7 +101,7 @@ RtlCopyMemory(ContextRecord, &Prcb->ProcessorState.ContextFrame, sizeof(CONTEXT)); - KiRestoreProcessorControlState(&Prcb->ProcessorState); + //KiRestoreProcessorControlState(&Prcb->ProcessorState); /* Exit the debugger and clear the CTRL-C state */ KdExitDebugger(Entered);

17 years, 8 months

[ion] 25854: - Implement KdpWriteControlSpace. - Fix a bug in KdpSetContext. - Use DR_MASK and DR7_OVERRIDE_V in KiUpdateDr7, KiRecordDr7 instead of DR_ACTIVE_MASK. - We now get DbgKdContinueApi2 from WinDBG meaning that the first phase of KD communication is almost over!

by ion＠svn.reactos.org

Author: ion Date: Tue Feb 20 07:38:01 2007 New Revision: 25854 URL: http://svn.reactos.org/svn/reactos?rev=25854&view=rev Log: - Implement KdpWriteControlSpace. - Fix a bug in KdpSetContext. - Use DR_MASK and DR7_OVERRIDE_V in KiUpdateDr7, KiRecordDr7 instead of DR_ACTIVE_MASK. - We now get DbgKdContinueApi2 from WinDBG meaning that the first phase of KD communication is almost over! Modified: branches/alex-kd-branch/reactos/include/ndk/asm.h branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdapi.c branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdtrap.c branches/alex-kd-branch/reactos/ntoskrnl/ke/i386/exp.c Modified: branches/alex-kd-branch/reactos/include/ndk/asm.h URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/include/… ============================================================================== --- branches/alex-kd-branch/reactos/include/ndk/asm.h (original) +++ branches/alex-kd-branch/reactos/include/ndk/asm.h Tue Feb 20 07:38:01 2007 @@ -494,6 +494,7 @@ #define DR6_LEGAL 0xE00F #define DR7_LEGAL 0xFFFF0155 #define DR7_ACTIVE 0x55 +#define DR7_OVERRIDE_V 0x04 #define DR7_RESERVED_MASK 0xDC00 #define DR7_OVERRIDE_MASK 0xF0000 Modified: branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdapi.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdapi.c (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdapi.c Tue Feb 20 07:38:01 2007 @@ -231,6 +231,55 @@ Data->Length = 0; State->ReturnStatus = STATUS_UNSUCCESSFUL; ReadMemory->ActualBytesRead = 0; + } + + /* Send the reply */ + KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE, + &Header, + Data, + &KdpContext); +} + +VOID +NTAPI +KdpWriteControlSpace(IN PDBGKD_MANIPULATE_STATE64 State, + IN PSTRING Data, + IN PCONTEXT Context) +{ + PDBGKD_WRITE_MEMORY64 WriteMemory = &State->u.WriteMemory; + STRING Header; + ULONG Length; + PVOID ControlStart; + + /* Setup the header */ + Header.Length = sizeof(DBGKD_MANIPULATE_STATE64); + Header.Buffer = (PCHAR)State; + + /* Make sure that this is a valid request */ + Length = WriteMemory->TransferCount; + if ((((ULONG)WriteMemory->TargetBaseAddress + Length) <= + sizeof(KPROCESSOR_STATE)) && + (State->Processor < KeNumberProcessors)) + { + /* Set the proper address */ + ControlStart = (PVOID)((ULONG_PTR)WriteMemory->TargetBaseAddress + + (ULONG_PTR)&KiProcessorBlock[State->Processor]-> + ProcessorState); + + /* Copy the memory */ + RtlCopyMemory(ControlStart, Data->Buffer, Data->Length); + Length = Data->Length; + + /* Finish up */ + State->ReturnStatus = STATUS_SUCCESS; + WriteMemory->ActualBytesWritten = Length; + } + else + { + /* Invalid request */ + Data->Length = 0; + State->ReturnStatus = STATUS_UNSUCCESSFUL; + WriteMemory->ActualBytesWritten = 0; } /* Send the reply */ @@ -335,7 +384,7 @@ /* Setup the header */ Header.Length = sizeof(DBGKD_MANIPULATE_STATE64); Header.Buffer = (PCHAR)State; - ASSERT(Data->Length == 0); + ASSERT(Data->Length == sizeof(CONTEXT)); /* Make sure that this is a valid request */ if (State->Processor < KeNumberProcessors) @@ -472,8 +521,7 @@ case DbgKdWriteControlSpaceApi: /* FIXME: TODO */ - Ke386SetCr2(DbgKdWriteControlSpaceApi); - while (TRUE); + KdpWriteControlSpace(&ManipulateState, &Data, Context); break; case DbgKdReadIoSpaceApi: Modified: branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdtrap.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdtrap.c (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdtrap.c Tue Feb 20 07:38:01 2007 @@ -49,7 +49,6 @@ } /* Enter the debugger */ - while (TRUE); Entered = KdEnterDebugger(TrapFrame, ExceptionFrame); /* @@ -63,6 +62,7 @@ sizeof(CONTEXT)); /* Report the new state */ + Ke386SetCr2(TrapFrame->HardwareEsp); #if 0 Status = KdpReportExceptionStateChange(ExceptionRecord, &Prcb->ProcessorState. Modified: branches/alex-kd-branch/reactos/ntoskrnl/ke/i386/exp.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/ke/i386/exp.c (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/ke/i386/exp.c Tue Feb 20 07:38:01 2007 @@ -90,7 +90,7 @@ ULONG DebugMask = KeGetCurrentThread()->DispatcherHeader.DebugActive; /* Check if debugging is enabled */ - if (DebugMask & DR_ACTIVE_MASK) + if (DebugMask & DR_MASK(DR7_OVERRIDE_V)) { /* Sanity checks */ ASSERT((DebugMask & DR_REG_MASK) != 0); @@ -133,11 +133,11 @@ Result = FALSE; /* Check the DR mask */ - NewMask &= 0x7F; + NewMask &= ~(DR_MASK(7)); if (NewMask & DR_REG_MASK) { /* Set the active mask */ - NewMask |= DR_ACTIVE_MASK; + NewMask |= DR_MASK(DR7_OVERRIDE_V); /* Set DR7 override */ *DrMask = DR7_OVERRIDE_MASK; @@ -154,8 +154,8 @@ Result = NewMask ? TRUE: FALSE; /* Update the mask to disable debugging */ - NewMask &= ~DR_ACTIVE_MASK; - NewMask |= 0x80; + NewMask &= ~(DR_MASK(DR7_OVERRIDE_V)); + NewMask |= DR_MASK(7); } /* Check if caller wants the new mask */

17 years, 8 months

[ion] 25853: - Implement KdpSetContext. - Fix KdpReport, it was totally out of whack.

by ion＠svn.reactos.org

Author: ion Date: Tue Feb 20 06:45:11 2007 New Revision: 25853 URL: http://svn.reactos.org/svn/reactos?rev=25853&view=rev Log: - Implement KdpSetContext. - Fix KdpReport, it was totally out of whack. Modified: branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdapi.c branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdinit.c branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdtrap.c Modified: branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdapi.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdapi.c (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdapi.c Tue Feb 20 06:45:11 2007 @@ -120,9 +120,6 @@ NULL, &KdpContext); } - - -BOOLEAN VirtCalled = FALSE; VOID NTAPI @@ -326,6 +323,54 @@ &KdpContext); } +VOID +NTAPI +KdpSetContext(IN PDBGKD_MANIPULATE_STATE64 State, + IN PSTRING Data, + IN PCONTEXT Context) +{ + STRING Header; + PVOID ControlStart; + + /* Setup the header */ + Header.Length = sizeof(DBGKD_MANIPULATE_STATE64); + Header.Buffer = (PCHAR)State; + ASSERT(Data->Length == 0); + + /* Make sure that this is a valid request */ + if (State->Processor < KeNumberProcessors) + { + /* Check if the request is for this CPU */ + if (State->Processor == KeGetCurrentPrcb()->Number) + { + /* We're just copying our own context */ + ControlStart = Context; + } + else + { + /* SMP not yet handled */ + ControlStart = NULL; + while (TRUE); + } + + /* Copy the memory */ + RtlCopyMemory(ControlStart, Data->Buffer, sizeof(CONTEXT)); + + /* Finish up */ + State->ReturnStatus = STATUS_SUCCESS; + } + else + { + /* Invalid request */ + State->ReturnStatus = STATUS_UNSUCCESSFUL; + } + + /* Send the reply */ + KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE, + &Header, + Data, + &KdpContext); +} KCONTINUE_STATUS NTAPI @@ -377,7 +422,6 @@ /* Read virtual memory */ KdpReadVirtualMemory(&ManipulateState, &Data, Context); - VirtCalled = TRUE; break; case DbgKdWriteVirtualMemoryApi: @@ -389,15 +433,14 @@ case DbgKdGetContextApi: - /* FIXME: TODO */ + /* Get the current context */ KdpGetContext(&ManipulateState, &Data, Context); break; case DbgKdSetContextApi: - /* FIXME: TODO */ - Ke386SetCr2(DbgKdSetContextApi); - while (TRUE); + /* Set a new context */ + KdpSetContext(&ManipulateState, &Data, Context); break; case DbgKdWriteBreakPointApi: Modified: branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdinit.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdinit.c (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdinit.c Tue Feb 20 06:45:11 2007 @@ -248,6 +248,7 @@ /* Check for incoming breakin and break on symbol load if we have it*/ KdBreakAfterSymbolLoad = KdPollBreakIn(); + while (TRUE); } else { Modified: branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdtrap.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdtrap.c (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdtrap.c Tue Feb 20 06:45:11 2007 @@ -25,68 +25,64 @@ { BOOLEAN Entered, Status; PKPRCB Prcb; - while (TRUE); - - /* - * Only go ahead with this if this is an INT3 or an INT1, or if the global - * flag forces us to call up the debugger on exception, or if this is a - * second chance exception which means it hasn't been handled by now. - */ - if ((ExceptionRecord->ExceptionCode == STATUS_BREAKPOINT) || - (ExceptionRecord->ExceptionCode == STATUS_SINGLE_STEP) || - (NtGlobalFlag & FLG_STOP_ON_EXCEPTION) || - (SecondChanceException)) - { - /* - * Also, unless this is a second chance exception, then do not call up - * the debugger if the debug port is disconnected or the exception code - * indicates success. - */ - if (!(SecondChanceException) && - ((ExceptionRecord->ExceptionCode == STATUS_PORT_DISCONNECTED) || - (NT_SUCCESS(ExceptionRecord->ExceptionCode)))) + NTSTATUS ExceptionCode = ExceptionRecord->ExceptionCode; + + /* Check if this is INT1 or 3, or if we're forced to handle it */ + if ((ExceptionCode == STATUS_BREAKPOINT) || + (ExceptionCode == STATUS_SINGLE_STEP) || + //(ExceptionCode == STATUS_ASSERTION_FAILURE) || + (NtGlobalFlag & FLG_STOP_ON_EXCEPTION)) + { + /* Check if we can't really handle this */ + if ((SecondChanceException) || + (ExceptionCode == STATUS_PORT_DISCONNECTED) || + (NT_SUCCESS(ExceptionCode))) { - /* Return false to hide the exception */ + /* Return false to have someone else take care of the exception */ return FALSE; } - - /* Enter the debugger */ - Entered = KdEnterDebugger(TrapFrame, ExceptionFrame); - - /* - * Get the KPRCB and save the CPU Control State manually instead of - * using KiSaveProcessorState, since we already have a valid CONTEXT. - */ - Prcb = KeGetCurrentPrcb(); - KiSaveProcessorControlState(&Prcb->ProcessorState); - RtlCopyMemory(&Prcb->ProcessorState.ContextFrame, - ContextRecord, - sizeof(CONTEXT)); - - /* Report the new state */ + } + else if (SecondChanceException) + { + /* We won't bother unless this is second chance */ + return FALSE; + } + + /* Enter the debugger */ + while (TRUE); + Entered = KdEnterDebugger(TrapFrame, ExceptionFrame); + + /* + * Get the KPRCB and save the CPU Control State manually instead of + * using KiSaveProcessorState, since we already have a valid CONTEXT. + */ + Prcb = KeGetCurrentPrcb(); + KiSaveProcessorControlState(&Prcb->ProcessorState); + RtlCopyMemory(&Prcb->ProcessorState.ContextFrame, + ContextRecord, + sizeof(CONTEXT)); + + /* Report the new state */ #if 0 - Status = KdpReportExceptionStateChange(ExceptionRecord, - &Prcb->ProcessorState. - ContextFrame, - SecondChanceException); + Status = KdpReportExceptionStateChange(ExceptionRecord, + &Prcb->ProcessorState. + ContextFrame, + SecondChanceException); #else - Status = FALSE; + while (TRUE); + Status = FALSE; #endif - /* Now restore the processor state, manually again. */ - RtlCopyMemory(ContextRecord, - &Prcb->ProcessorState.ContextFrame, - sizeof(CONTEXT)); - KiRestoreProcessorControlState(&Prcb->ProcessorState); - - /* Exit the debugger and clear the CTRL-C state */ - KdExitDebugger(Entered); - KdpControlCPressed = FALSE; - return Status; - } - - /* Fail if we got here */ - return FALSE; + /* Now restore the processor state, manually again. */ + RtlCopyMemory(ContextRecord, + &Prcb->ProcessorState.ContextFrame, + sizeof(CONTEXT)); + KiRestoreProcessorControlState(&Prcb->ProcessorState); + + /* Exit the debugger and clear the CTRL-C state */ + KdExitDebugger(Entered); + KdpControlCPressed = FALSE; + return Status; } BOOLEAN

17 years, 8 months

← Newer
1
...
5
6
7
8
9
10
11
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2007