Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 70692: [FREELDR] Start splitting FreeLdr in the same spirit as our new UEFI boot manager/loader: split into a boot library, the boot manager code, and the NT loader. - The boot library p...
by hbelusca＠svn.reactos.org 05 Feb '16

05 Feb '16

Author: hbelusca Date: Fri Feb 5 00:17:33 2016 New Revision: 70692 URL: http://svn.reactos.org/svn/reactos?rev=70692&view=rev Log: [FREELDR] Start splitting FreeLdr in the same spirit as our new UEFI boot manager/loader: split into a boot library, the boot manager code, and the NT loader. - The boot library provides the basic support (read INI/INF files, memory management, debugging, ARC compatibility/emulation, ...). - The boot manager code is FreeLdr proper. - The NT loader is used for loading Windows or ReactOS. Because of that fact I rename its directory "windows" into "NTLDR" to underline the fact it can load NT-type OSes (more exactly version 5.x), to which both Windows 2k/XP/2k3 and ReactOS belong. The APIs will certainly be renamed "NtLdrXXX" instead of "WinLdrXXX". - The general PE loader is put into the boot library since it is needed also by FreeLdr proper to be able to load SCSI drivers (on x86/64/... architectures; on ARC systems SCSI support is automatically provided). Added: trunk/reactos/boot/freeldr/freeldr/arch/i386/halstub.c - copied, changed from r70690, trunk/reactos/boot/freeldr/freeldr/windows/arch/i386/halstub.c trunk/reactos/boot/freeldr/freeldr/arch/i386/ntoskrnl.c - copied, changed from r70690, trunk/reactos/boot/freeldr/freeldr/windows/arch/i386/ntoskrnl.c trunk/reactos/boot/freeldr/freeldr/include/conversion.h (with props) trunk/reactos/boot/freeldr/freeldr/include/ntoskrnl.h - copied unchanged from r70690, trunk/reactos/boot/freeldr/freeldr/windows/arch/i386/ntoskrnl.h trunk/reactos/boot/freeldr/freeldr/lib/comm/ - copied from r70691, trunk/reactos/boot/freeldr/freeldr/comm/ trunk/reactos/boot/freeldr/freeldr/lib/debug.c - copied unchanged from r70691, trunk/reactos/boot/freeldr/freeldr/debug.c trunk/reactos/boot/freeldr/freeldr/lib/fs/ - copied from r70691, trunk/reactos/boot/freeldr/freeldr/fs/ trunk/reactos/boot/freeldr/freeldr/lib/mm/ - copied from r70691, trunk/reactos/boot/freeldr/freeldr/mm/ trunk/reactos/boot/freeldr/freeldr/lib/peloader.c - copied, changed from r70690, trunk/reactos/boot/freeldr/freeldr/windows/peloader.c trunk/reactos/boot/freeldr/freeldr/ntldr/ - copied from r70691, trunk/reactos/boot/freeldr/freeldr/windows/ Removed: trunk/reactos/boot/freeldr/freeldr/comm/ trunk/reactos/boot/freeldr/freeldr/debug.c trunk/reactos/boot/freeldr/freeldr/fs/ trunk/reactos/boot/freeldr/freeldr/mm/ trunk/reactos/boot/freeldr/freeldr/ntldr/arch/i386/halstub.c trunk/reactos/boot/freeldr/freeldr/ntldr/arch/i386/ntoskrnl.c trunk/reactos/boot/freeldr/freeldr/ntldr/arch/i386/ntoskrnl.h trunk/reactos/boot/freeldr/freeldr/ntldr/peloader.c trunk/reactos/boot/freeldr/freeldr/windows/ Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt trunk/reactos/boot/freeldr/freeldr/include/freeldr.h trunk/reactos/boot/freeldr/freeldr/ntldr/conversion.c Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Fri Feb 5 00:17:33 2016 @@ -32,37 +32,55 @@ add_definitions(-D_NTHAL_ -D_BLDR_ -D_NTSYSTEM_) -list(APPEND FREELDR_COMMON_SOURCE - include/freeldr.h + +list(APPEND FREELDR_BOOTLIB_COMMON_SOURCE + lib/debug.c + lib/peloader.c + + lib/comm/rs232.c + ## add KD support + lib/fs/ext2.c + lib/fs/fat.c + lib/fs/fs.c + lib/fs/iso.c + lib/fs/ntfs.c + lib/inifile/ini_init.c + lib/inifile/inifile.c + lib/inifile/parse.c + lib/mm/meminit.c + lib/mm/mm.c + lib/mm/heap.c + ) + +list(APPEND FREELDR_NTLDR_COMMON_SOURCE + ntldr/conversion.c + ntldr/registry.c + ntldr/winldr.c + ntldr/wlmemory.c + ntldr/wlregistry.c + ) + +list(APPEND FREELDR_ARC_COMMON_SOURCE arcname.c - cmdline.c - custom.c - debug.c - linuxboot.c - miscboot.c machine.c - options.c - oslist.c - version.c arch/archwsup.c cache/blocklist.c cache/cache.c - comm/rs232.c disk/disk.c disk/partition.c disk/ramdisk.c #disk/scsiport.c - fs/ext2.c - fs/fat.c - fs/fs.c - fs/iso.c - fs/ntfs.c - lib/inifile/ini_init.c - lib/inifile/inifile.c - lib/inifile/parse.c - mm/meminit.c - mm/mm.c - mm/heap.c + ) + +list(APPEND FREELDR_COMMON_SOURCE + include/freeldr.h + cmdline.c + custom.c + linuxboot.c + miscboot.c + options.c + oslist.c + version.c ui/directui.c ui/gui.c ui/minitui.c @@ -73,12 +91,7 @@ video/fade.c video/palette.c video/video.c - windows/conversion.c - windows/peloader.c - windows/registry.c - windows/winldr.c - windows/wlmemory.c - windows/wlregistry.c) + ) if(ARCH STREQUAL "i386") list(APPEND FREELDR_COMMON_ASM_SOURCE @@ -86,9 +99,21 @@ arch/i386/i386pnp.S arch/i386/i386trap.S arch/i386/linux.S - arch/i386/mb.S) - list(APPEND FREELDR_COMMON_SOURCE - fs/pxe.c + arch/i386/mb.S + ) + + list(APPEND FREELDR_NTLDR_COMMON_SOURCE + ntldr/arch/i386/winldr.c + ntldr/headless.c + ) + + ## list(APPEND FREELDR_COMMON_SOURCE + list(APPEND FREELDR_ARC_COMMON_SOURCE + lib/fs/pxe.c + + arch/i386/halstub.c + arch/i386/ntoskrnl.c + arch/i386/archmach.c arch/i386/drivemap.c arch/i386/hardware.c @@ -116,10 +141,6 @@ arch/i386/xboxmem.c arch/i386/xboxrtc.c arch/i386/xboxvideo.c - windows/arch/i386/halstub.c - windows/arch/i386/ntoskrnl.c - windows/arch/i386/winldr.c - windows/headless.c disk/scsiport.c) if(NOT MSVC) list(APPEND FREELDR_COMMON_ASM_SOURCE arch/i386/drvmap.S) @@ -129,8 +150,17 @@ arch/amd64/entry.S arch/amd64/int386.S arch/amd64/pnpbios.S) - list(APPEND FREELDR_COMMON_SOURCE - fs/pxe.c + + list(APPEND FREELDR_NTLDR_COMMON_SOURCE + ntldr/arch/amd64/winldr.c + ) + + ## list(APPEND FREELDR_COMMON_SOURCE + list(APPEND FREELDR_ARC_COMMON_SOURCE + lib/fs/pxe.c + + arch/i386/ntoskrnl.c + arch/i386/drivemap.c arch/i386/hardware.c arch/i386/hwacpi.c @@ -146,22 +176,27 @@ arch/i386/pcdisk.c arch/i386/pcmem.c arch/i386/pcrtc.c - arch/i386/pcvideo.c - windows/arch/i386/ntoskrnl.c - windows/arch/amd64/winldr.c) + arch/i386/pcvideo.c) elseif(ARCH STREQUAL "arm") list(APPEND FREELDR_COMMON_ASM_SOURCE arch/arm/boot.S) - list(APPEND FREELDR_COMMON_SOURCE + + list(APPEND FREELDR_NTLDR_COMMON_SOURCE + ntldr/arch/arm/winldr.c + ) + + ## list(APPEND FREELDR_COMMON_SOURCE + list(APPEND FREELDR_ARC_COMMON_SOURCE arch/arm/entry.c - arch/arm/macharm.c - windows/arch/arm/winldr.c) + arch/arm/macharm.c) else() #TBD endif() add_asm_files(freeldr_common_asm ${FREELDR_COMMON_ASM_SOURCE}) -add_library(freeldr_common ${FREELDR_COMMON_SOURCE} ${freeldr_common_asm}) +add_library(freeldr_common ${FREELDR_BOOTLIB_COMMON_SOURCE} ${FREELDR_ARC_COMMON_SOURCE} + ${FREELDR_NTLDR_COMMON_SOURCE} + ${FREELDR_COMMON_SOURCE} ${freeldr_common_asm}) add_pch(freeldr_common include/freeldr.h FREELDR_COMMON_SOURCE) add_dependencies(freeldr_common bugcodes asm xdk) @@ -173,7 +208,10 @@ list(APPEND FREELDR_BASE_SOURCE bootmgr.c # This file is compiled with custom definitions freeldr.c - windows/setupldr.c + ntldr/setupldr.c ## Strangely enough this file is needed in GCC builds + ## even if ${FREELDR_NTLDR_COMMON_SOURCE} is not added, + ## otherwise we get linking errors with Rtl**Bitmap** APIs. + ## Do not happen on MSVC builds however... lib/inffile/inffile.c lib/rtl/libsupp.c) Copied: trunk/reactos/boot/freeldr/freeldr/arch/i386/halstub.c (from r70690, trunk/reactos/boot/freeldr/freeldr/windows/arch/i386/halstub.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/arch/i386/halstub.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/halstub.c [iso-8859-1] Fri Feb 5 00:17:33 2016 @@ -8,7 +8,7 @@ /* INCLUDES ******************************************************************/ -#include "ntoskrnl.h" +#include <ntoskrnl.h> #define NDEBUG #include <debug.h> Copied: trunk/reactos/boot/freeldr/freeldr/arch/i386/ntoskrnl.c (from r70690, trunk/reactos/boot/freeldr/freeldr/windows/arch/i386/ntoskrnl.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/arch/i386/ntoskrnl.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/ntoskrnl.c [iso-8859-1] Fri Feb 5 00:17:33 2016 @@ -8,7 +8,7 @@ /* INCLUDES ******************************************************************/ -#include "ntoskrnl.h" +#include <ntoskrnl.h> /* For KeStallExecutionProcessor */ #if defined(_M_IX86) || defined(_M_AMD64) Removed: trunk/reactos/boot/freeldr/freeldr/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/debug… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/debug.c (removed) @@ -1,540 +0,0 @@ -/* - * FreeLoader - * Copyright (C) 1998-2003 Brian Palmer <brianp(a)sginet.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include <freeldr.h> -#include <debug.h> - -#if DBG && !defined(_M_ARM) - -// #define DEBUG_ALL -// #define DEBUG_WARN -// #define DEBUG_ERR -// #define DEBUG_INIFILE -// #define DEBUG_REACTOS -// #define DEBUG_CUSTOM -#define DEBUG_NONE - -#define DBG_DEFAULT_LEVELS (ERR_LEVEL|FIXME_LEVEL) - -static UCHAR DbgChannels[DBG_CHANNELS_COUNT]; - -#define SCREEN 1 -#define RS232 2 -#define BOCHS 4 - -#define BOCHS_OUTPUT_PORT 0xE9 - -ULONG DebugPort = RS232; - -/* Serial debug connection */ -ULONG ComPort = 0; // The COM port initializer chooses the first available port starting from COM4 down to COM1. -ULONG BaudRate = 115200; -ULONG PortIrq = 0; // Not used at the moment. - -BOOLEAN DebugStartOfLine = TRUE; - -VOID DebugInit(BOOLEAN MainInit) -{ - PCHAR CommandLine, PortString, BaudString, IrqString; - ULONG Value; - CHAR DebugString[256]; - - /* Always reset the debugging channels */ - -#if defined (DEBUG_ALL) - memset(DbgChannels, MAX_LEVEL, DBG_CHANNELS_COUNT); -#elif defined (DEBUG_WARN) - memset(DbgChannels, WARN_LEVEL|FIXME_LEVEL|ERR_LEVEL, DBG_CHANNELS_COUNT); -#elif defined (DEBUG_ERR) - memset(DbgChannels, ERR_LEVEL, DBG_CHANNELS_COUNT); -#else - memset(DbgChannels, 0, DBG_CHANNELS_COUNT); -#endif - -#if defined (DEBUG_INIFILE) - DbgChannels[DPRINT_INIFILE] = MAX_LEVEL; -#elif defined (DEBUG_REACTOS) - DbgChannels[DPRINT_REACTOS] = MAX_LEVEL; - DbgChannels[DPRINT_REGISTRY] = MAX_LEVEL; -#elif defined (DEBUG_CUSTOM) - DbgChannels[DPRINT_WARNING] = MAX_LEVEL; - DbgChannels[DPRINT_WINDOWS] = MAX_LEVEL; -#endif - - /* Check for pre- or main initialization phase */ - if (!MainInit) - { - /* Pre-initialization phase: use the FreeLdr command-line debugging string */ - CommandLine = (PCHAR)CmdLineGetDebugString(); - - /* If no command-line is provided, initialize the debug port with default settings */ - if (CommandLine == NULL) - goto Done; - - strcpy(DebugString, CommandLine); - } - else - { - /* Main initialization phase: use the FreeLdr INI debugging string */ - - ULONG_PTR SectionId; - - if (!IniOpenSection("FreeLoader", &SectionId)) - return; - - if (!IniReadSettingByName(SectionId, "Debug", DebugString, sizeof(DebugString))) - return; - } - - /* Get the Command Line */ - CommandLine = DebugString; - - /* Upcase it */ - _strupr(CommandLine); - - /* Get the port and baud rate */ - PortString = strstr(CommandLine, "DEBUGPORT"); - BaudString = strstr(CommandLine, "BAUDRATE"); - IrqString = strstr(CommandLine, "IRQ"); - - /* - * Check if we got /DEBUGPORT parameters. - * NOTE: Inspired by reactos/ntoskrnl/kd/kdinit.c, KdInitSystem(...) - */ - while (PortString) - { - /* Move past the actual string, to reach the port*/ - PortString += strlen("DEBUGPORT"); - - /* Now get past any spaces and skip the equal sign */ - while (*PortString == ' ') PortString++; - PortString++; - - /* Check for possible ports and set the port to use */ - if (strncmp(PortString, "SCREEN", 6) == 0) - { - PortString += 6; - DebugPort |= SCREEN; - } - else if (strncmp(PortString, "BOCHS", 5) == 0) - { - PortString += 5; - DebugPort |= BOCHS; - } - else if (strncmp(PortString, "COM", 3) == 0) - { - PortString += 3; - DebugPort |= RS232; - - /* Set the port to use */ - Value = atol(PortString); - if (Value) ComPort = Value; - } - - PortString = strstr(PortString, "DEBUGPORT"); - } - - /* Check if we got a baud rate */ - if (BaudString) - { - /* Move past the actual string, to reach the rate */ - BaudString += strlen("BAUDRATE"); - - /* Now get past any spaces */ - while (*BaudString == ' ') BaudString++; - - /* And make sure we have a rate */ - if (*BaudString) - { - /* Read and set it */ - Value = atol(BaudString + 1); - if (Value) BaudRate = Value; - } - } - - /* Check Serial Port Settings [IRQ] */ - if (IrqString) - { - /* Move past the actual string, to reach the rate */ - IrqString += strlen("IRQ"); - - /* Now get past any spaces */ - while (*IrqString == ' ') IrqString++; - - /* And make sure we have an IRQ */ - if (*IrqString) - { - /* Read and set it */ - Value = atol(IrqString + 1); - if (Value) PortIrq = Value; - } - } - -Done: - /* Try to initialize the port; if it fails, remove the corresponding flag */ - if (DebugPort & RS232) - { - if (!Rs232PortInitialize(ComPort, BaudRate)) - DebugPort &= ~RS232; - } -} - -VOID DebugPrintChar(UCHAR Character) -{ - if (Character == '\n') - DebugStartOfLine = TRUE; - - if (DebugPort & RS232) - { - if (Character == '\n') - Rs232PortPutByte('\r'); - - Rs232PortPutByte(Character); - } - if (DebugPort & BOCHS) - { - WRITE_PORT_UCHAR((PUCHAR)BOCHS_OUTPUT_PORT, Character); - } - if (DebugPort & SCREEN) - { - MachConsPutChar(Character); - } -} - -ULONG -DbgPrint(const char *Format, ...) -{ - va_list ap; - int Length; - char* ptr; - CHAR Buffer[512]; - - va_start(ap, Format); - Length = _vsnprintf(Buffer, sizeof(Buffer), Format, ap); - va_end(ap); - - /* Check if we went past the buffer */ - if (Length == -1) - { - /* Terminate it if we went over-board */ - Buffer[sizeof(Buffer) - 1] = '\n'; - - /* Put maximum */ - Length = sizeof(Buffer); - } - - ptr = Buffer; - while (Length--) - DebugPrintChar(*ptr++); - - return 0; -} - -VOID -DbgPrint2(ULONG Mask, ULONG Level, const char *File, ULONG Line, char *Format, ...) -{ - va_list ap; - char Buffer[2096]; - char *ptr = Buffer; - - /* Mask out unwanted debug messages */ - if (!(DbgChannels[Mask] & Level) && !(Level & DBG_DEFAULT_LEVELS)) - { - return; - } - - /* Print the header if we have started a new line */ - if (DebugStartOfLine) - { - DbgPrint("(%s:%lu) ", File, Line); - - switch (Level) - { - case ERR_LEVEL: - DbgPrint("err: "); - break; - case FIXME_LEVEL: - DbgPrint("fixme: "); - break; - case WARN_LEVEL: - DbgPrint("warn: "); - break; - case TRACE_LEVEL: - DbgPrint("trace: "); - break; - } - - DebugStartOfLine = FALSE; - } - - va_start(ap, Format); - vsprintf(Buffer, Format, ap); - va_end(ap); - - while (*ptr) - { - DebugPrintChar(*ptr++); - } -} - -VOID -DebugDumpBuffer(ULONG Mask, PVOID Buffer, ULONG Length) -{ - PUCHAR BufPtr = (PUCHAR)Buffer; - ULONG Idx, Idx2; - - /* Mask out unwanted debug messages */ - if (!(DbgChannels[Mask] & TRACE_LEVEL)) - return; - - DebugStartOfLine = FALSE; // We don't want line headers - DbgPrint("Dumping buffer at %p with length of %lu bytes:\n", Buffer, Length); - - for (Idx = 0; Idx < Length; ) - { - DebugStartOfLine = FALSE; // We don't want line headers - - if (Idx < 0x0010) - DbgPrint("000%x:\t", Idx); - else if (Idx < 0x0100) - DbgPrint("00%x:\t", Idx); - else if (Idx < 0x1000) - DbgPrint("0%x:\t", Idx); - else - DbgPrint("%x:\t", Idx); - - for (Idx2 = 0; Idx2 < 16; Idx2++, Idx++) - { - if (BufPtr[Idx] < 0x10) - { - DbgPrint("0"); - } - DbgPrint("%x", BufPtr[Idx]); - - if (Idx2 == 7) - { - DbgPrint("-"); - } - else - { - DbgPrint(" "); - } - } - - Idx -= 16; - DbgPrint(" "); - - for (Idx2 = 0; Idx2 < 16; Idx2++, Idx++) - { - if ((BufPtr[Idx] > 20) && (BufPtr[Idx] < 0x80)) - { - DbgPrint("%c", BufPtr[Idx]); - } - else - { - DbgPrint("."); - } - } - - DbgPrint("\n"); - } -} - -static BOOLEAN -DbgAddDebugChannel(CHAR* channel, CHAR* level, CHAR op) -{ - int iLevel, iChannel; - - if (channel == NULL || *channel == '\0' || strlen(channel) == 0) - return FALSE; - - if (level == NULL || *level == '\0' || strlen(level) == 0) - iLevel = MAX_LEVEL; - else if (strcmp(level, "err") == 0) - iLevel = ERR_LEVEL; - else if (strcmp(level, "fixme") == 0) - iLevel = FIXME_LEVEL; - else if (strcmp(level, "warn") == 0) - iLevel = WARN_LEVEL; - else if (strcmp(level, "trace") == 0) - iLevel = TRACE_LEVEL; - else - return FALSE; - - if (strcmp(channel, "memory" ) == 0) iChannel = DPRINT_MEMORY; - else if (strcmp(channel, "filesystem") == 0) iChannel = DPRINT_FILESYSTEM; - else if (strcmp(channel, "inifile" ) == 0) iChannel = DPRINT_INIFILE; - else if (strcmp(channel, "ui" ) == 0) iChannel = DPRINT_UI; - else if (strcmp(channel, "disk" ) == 0) iChannel = DPRINT_DISK; - else if (strcmp(channel, "cache" ) == 0) iChannel = DPRINT_CACHE; - else if (strcmp(channel, "registry" ) == 0) iChannel = DPRINT_REGISTRY; - else if (strcmp(channel, "linux" ) == 0) iChannel = DPRINT_LINUX; - else if (strcmp(channel, "hwdetect" ) == 0) iChannel = DPRINT_HWDETECT; - else if (strcmp(channel, "windows" ) == 0) iChannel = DPRINT_WINDOWS; - else if (strcmp(channel, "peloader" ) == 0) iChannel = DPRINT_PELOADER; - else if (strcmp(channel, "scsiport" ) == 0) iChannel = DPRINT_SCSIPORT; - else if (strcmp(channel, "heap" ) == 0) iChannel = DPRINT_HEAP; - else if (strcmp(channel, "all" ) == 0) - { - int i; - - for (i = 0; i < DBG_CHANNELS_COUNT; i++) - { - if (op == '+') - DbgChannels[i] |= iLevel; - else - DbgChannels[i] &= ~iLevel; - } - - return TRUE; - } - else return FALSE; - - if (op == '+') - DbgChannels[iChannel] |= iLevel; - else - DbgChannels[iChannel] &= ~iLevel; - - return TRUE; -} - -VOID -DbgParseDebugChannels(PCHAR Value) -{ - CHAR *str, *separator, *c, op; - - str = Value; - - do - { - separator = strchr(str, ','); - if (separator != NULL) - *separator = '\0'; - - c = strchr(str, '+'); - if (c == NULL) - c = strchr(str, '-'); - - if (c != NULL) - { - op = *c; - *c = '\0'; - c++; - - DbgAddDebugChannel(c, str, op); - } - - str = separator + 1; - } while (separator != NULL); -} - -#else - -ULONG -DbgPrint(PCCH Format, ...) -{ - return 0; -} - -#endif // DBG - -ULONG -MsgBoxPrint(const char *Format, ...) -{ - va_list ap; - CHAR Buffer[512]; - ULONG Length; - - va_start(ap, Format); - - /* Construct a string */ - Length = _vsnprintf(Buffer, 512, Format, ap); - - /* Check if we went past the buffer */ - if (Length == MAXULONG) - { - /* Terminate it if we went over-board */ - Buffer[sizeof(Buffer) - 1] = '\n'; - - /* Put maximum */ - Length = sizeof(Buffer); - } - - /* Show it as a message box */ - UiMessageBox(Buffer); - - /* Cleanup and exit */ - va_end(ap); - return 0; -} - -// DECLSPEC_NORETURN -VOID -NTAPI -KeBugCheckEx( - IN ULONG BugCheckCode, - IN ULONG_PTR BugCheckParameter1, - IN ULONG_PTR BugCheckParameter2, - IN ULONG_PTR BugCheckParameter3, - IN ULONG_PTR BugCheckParameter4) -{ - char Buffer[70]; - sprintf(Buffer, "*** STOP: 0x%08lX (0x%08lX, 0x%08lX, 0x%08lX, 0x%08lX)", - BugCheckCode, BugCheckParameter1, BugCheckParameter2, - BugCheckParameter3, BugCheckParameter4); - UiMessageBoxCritical(Buffer); - ASSERT(FALSE); - for (;;); -} - -VOID -NTAPI -RtlAssert(IN PVOID FailedAssertion, - IN PVOID FileName, - IN ULONG LineNumber, - IN PCHAR Message OPTIONAL) -{ - if (Message) - { - DbgPrint("Assertion \'%s\' failed at %s line %u: %s\n", - (PCHAR)FailedAssertion, - (PCHAR)FileName, - LineNumber, - Message); - } - else - { - DbgPrint("Assertion \'%s\' failed at %s line %u\n", - (PCHAR)FailedAssertion, - (PCHAR)FileName, - LineNumber); - } - - DbgBreakPoint(); -} - -char *BugCodeStrings[] = -{ - "TEST_BUGCHECK", - "MISSING_HARDWARE_REQUIREMENTS", - "FREELDR_IMAGE_CORRUPTION", - "MEMORY_INIT_FAILURE", -}; - -ULONG_PTR BugCheckInfo[5]; Added: trunk/reactos/boot/freeldr/freeldr/include/conversion.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/conversion.h (added) +++ trunk/reactos/boot/freeldr/freeldr/include/conversion.h [iso-8859-1] Fri Feb 5 00:17:33 2016 @@ -0,0 +1,40 @@ +/* + * PROJECT: EFI Windows Loader + * LICENSE: GPL - See COPYING in the top level directory + * FILE: boot/freeldr/freeldr/windows/conversion.c + * PURPOSE: Physical <-> Virtual addressing mode conversions (arch-specific) + * PROGRAMMERS: Aleksey Bragin (aleksey(a)reactos.org) + */ + +#pragma once + +#ifndef _ZOOM2_ +/* Arch-specific addresses translation implementation */ +FORCEINLINE +PVOID +VaToPa(PVOID Va) +{ + return (PVOID)((ULONG_PTR)Va & ~KSEG0_BASE); +} + +FORCEINLINE +PVOID +PaToVa(PVOID Pa) +{ + return (PVOID)((ULONG_PTR)Pa | KSEG0_BASE); +} +#else +FORCEINLINE +PVOID +VaToPa(PVOID Va) +{ + return Va; +} + +FORCEINLINE +PVOID +PaToVa(PVOID Pa) +{ + return Pa; +} +#endif Propchange: trunk/reactos/boot/freeldr/freeldr/include/conversion.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] Fri Feb 5 00:17:33 2016 @@ -81,6 +81,7 @@ /* NTOS loader */ #include <winldr.h> +#include <conversion.h> // More-or-less related to MM also... /* File system headers */ #include <fs/ext2.h> Copied: trunk/reactos/boot/freeldr/freeldr/lib/peloader.c (from r70690, trunk/reactos/boot/freeldr/freeldr/windows/peloader.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/lib/p… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/peloader.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/lib/peloader.c [iso-8859-1] Fri Feb 5 00:17:33 2016 @@ -2,15 +2,18 @@ * PROJECT: FreeLoader * LICENSE: GPL - See COPYING in the top level directory * FILE: boot/freeldr/freeldr/windows/peloader.c - * PURPOSE: Provides routines for loading PE files. To be merged with - * arch/i386/loader.c in future - * This article was very handy during development: - * http://msdn.microsoft.com/msdnmag/issues/02/03/PE2/ + * PURPOSE: Provides routines for loading PE files. + * (Deprecated remark) To be merged with arch/i386/loader.c in future. + * * PROGRAMMERS: Aleksey Bragin (aleksey(a)reactos.org) + * * The source code in this file is based on the work of respective * authors of PE loading code in ReactOS and Brian Palmer and * Alex Ionescu's arch/i386/loader.c, and my research project - * (creating a native EFI loader for Windows) + * (creating a native EFI loader for Windows). + * + * NOTE: This article was very handy during development: + * http://msdn.microsoft.com/msdnmag/issues/02/03/PE2/ */ /* INCLUDES ***************************************************************/ Removed: trunk/reactos/boot/freeldr/freeldr/ntldr/arch/i386/halstub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ntldr/arch/i386/halstub.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ntldr/arch/i386/halstub.c (removed) @@ -1,99 +0,0 @@ -/* - * PROJECT: ReactOS Kernel - * LICENSE: GPL - See COPYING in the top level directory - * FILE: boot/freeldr/freeldr/arch/i386/halstub.c - * PURPOSE: I/O Stub HAL Routines - * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) - */ - -/* INCLUDES ******************************************************************/ - -#include "ntoskrnl.h" -#define NDEBUG -#include <debug.h> - -/* FUNCTIONS *****************************************************************/ - -NTSTATUS -FASTCALL -xHalIoReadPartitionTable( - IN PDEVICE_OBJECT DeviceObject, - IN ULONG SectorSize, - IN BOOLEAN ReturnRecognizedPartitions, - OUT PDRIVE_LAYOUT_INFORMATION *PartitionBuffer) -{ - return IoReadPartitionTable(DeviceObject, - SectorSize, - ReturnRecognizedPartitions, - PartitionBuffer); -} - -UCHAR -NTAPI -xHalVectorToIDTEntry(IN ULONG Vector) -{ - /* Return the vector */ - return (UCHAR)Vector; -} - -VOID -NTAPI -xHalHaltSystem(VOID) -{ - /* Halt execution */ - while (TRUE); -} - -/* GLOBALS *******************************************************************/ - -HAL_DISPATCH HalDispatchTable = -{ - HAL_DISPATCH_VERSION, - (pHalQuerySystemInformation)NULL, - (pHalSetSystemInformation)NULL, - (pHalQueryBusSlots)NULL, - 0, - (pHalExamineMBR)NULL, - (pHalIoAssignDriveLetters)NULL, - (pHalIoReadPartitionTable)xHalIoReadPartitionTable, - (pHalIoSetPartitionInformation)NULL, - (pHalIoWritePartitionTable)NULL, - (pHalHandlerForBus)NULL, - (pHalReferenceBusHandler)NULL, - (pHalReferenceBusHandler)NULL, - (pHalInitPnpDriver)NULL, - (pHalInitPowerManagement)NULL, - (pHalGetDmaAdapter)NULL, - (pHalGetInterruptTranslator)NULL, - (pHalStartMirroring)NULL, - (pHalEndMirroring)NULL, - (pHalMirrorPhysicalMemory)NULL, - (pHalEndOfBoot)NULL, - (pHalMirrorVerify)NULL, - (pHalGetAcpiTable)NULL, - (pHalSetPciErrorHandlerCallback)NULL -}; - -HAL_PRIVATE_DISPATCH HalPrivateDispatchTable = -{ - HAL_PRIVATE_DISPATCH_VERSION, - (pHalHandlerForBus)NULL, - (pHalHandlerForConfigSpace)NULL, - (pHalLocateHiberRanges)NULL, - (pHalRegisterBusHandler)NULL, - (pHalSetWakeEnable)NULL, - (pHalSetWakeAlarm)NULL, - (pHalTranslateBusAddress)NULL, - (pHalAssignSlotResources)NULL, - (pHalHaltSystem)xHalHaltSystem, - (pHalFindBusAddressTranslation)NULL, - (pHalResetDisplay)NULL, - (pHalAllocateMapRegisters)NULL, - (pKdSetupPciDeviceForDebugging)NULL, - (pKdReleasePciDeviceForDebugging)NULL, - (pKdGetAcpiTablePhase0)NULL, - (pKdCheckPowerButton)NULL, - (pHalVectorToIDTEntry)xHalVectorToIDTEntry, - (pKdMapPhysicalMemory64)NULL, - (pKdUnmapVirtualAddress)NULL -}; Removed: trunk/reactos/boot/freeldr/freeldr/ntldr/arch/i386/ntoskrnl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ntldr/arch/i386/ntoskrnl.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ntldr/arch/i386/ntoskrnl.c (removed) @@ -1,142 +0,0 @@ -/* - * PROJECT: ReactOS Kernel - * LICENSE: GPL - See COPYING in the top level directory - * FILE: boot/freeldr/freeldr/arch/i386/ntoskrnl.c - * PURPOSE: NTOS glue routines for the MINIHAL library - * PROGRAMMERS: Hervé Poussineau <hpoussin(a)reactos.org> - */ - -/* INCLUDES ******************************************************************/ - -#include "ntoskrnl.h" - -/* For KeStallExecutionProcessor */ -#if defined(_M_IX86) || defined(_M_AMD64) -#include <arch/pc/pcbios.h> -#endif - -/* FUNCTIONS *****************************************************************/ - -VOID -NTAPI -KeInitializeEvent( - IN PRKEVENT Event, - IN EVENT_TYPE Type, - IN BOOLEAN State) -{ - memset(Event, 0, sizeof(*Event)); -} - -VOID -FASTCALL -KiAcquireSpinLock( - IN PKSPIN_LOCK SpinLock) -{ -} - -VOID -FASTCALL -KiReleaseSpinLock( - IN PKSPIN_LOCK SpinLock) -{ -} - -VOID -NTAPI -KeSetTimeIncrement( - IN ULONG MaxIncrement, - IN ULONG MinIncrement) -{ -} - -VOID -FASTCALL -IoAssignDriveLetters( - IN struct _LOADER_PARAMETER_BLOCK *LoaderBlock, - IN PSTRING NtDeviceName, - OUT PUCHAR NtSystemPath, - OUT PSTRING NtSystemPathString) -{ -} - -NTSTATUS -FASTCALL -IoSetPartitionInformation( - IN PDEVICE_OBJECT DeviceObject, - IN ULONG SectorSize, - IN ULONG PartitionNumber, - IN ULONG PartitionType) -{ - return STATUS_NOT_IMPLEMENTED; -} - -/* - * NTSTATUS - * FASTCALL - * IoReadPartitionTable( - * IN PDEVICE_OBJECT DeviceObject, - * IN ULONG SectorSize, - * IN BOOLEAN ReturnRecognizedPartitions, - * OUT PDRIVE_LAYOUT_INFORMATION *PartitionBuffer); - * - * See boot/freeldr/freeldr/disk/partition.c - */ - -NTSTATUS -FASTCALL -IoWritePartitionTable( - IN PDEVICE_OBJECT DeviceObject, - IN ULONG SectorSize, - IN ULONG SectorsPerTrack, - IN ULONG NumberOfHeads, - IN PDRIVE_LAYOUT_INFORMATION PartitionBuffer) -{ - return STATUS_NOT_IMPLEMENTED; -} - -VOID -NTAPI -KeStallExecutionProcessor( - IN ULONG MicroSeconds) -{ -#if defined(_M_IX86) || defined(_M_AMD64) - REGS Regs; - ULONG usec_this; - - // Int 15h AH=86h - // BIOS - WAIT (AT,PS) - // - // AH = 86h - // CX:DX = interval in microseconds - // Return: - // CF clear if successful (wait interval elapsed) - // CF set on error or AH=83h wait already in progress - // AH = status (see #00496) - - // Note: The resolution of the wait period is 977 microseconds on - // many systems because many BIOSes use the 1/1024 second fast - // interrupt from the AT real-time clock chip which is available on INT 70; - // because newer BIOSes may have much more precise timers available, it is - // not possible to use this function accurately for very short delays unless - // the precise behavior of the BIOS is known (or found through testing) - - while (MicroSeconds) - { - usec_this = MicroSeconds; - - if (usec_this > 4000000) - { - usec_this = 4000000; - } - - Regs.b.ah = 0x86; - Regs.w.cx = usec_this >> 16; - Regs.w.dx = usec_this & 0xffff; - Int386(0x15, &Regs, &Regs); - - MicroSeconds -= usec_this; - } -#else - #error unimplemented -#endif -} Removed: trunk/reactos/boot/freeldr/freeldr/ntldr/arch/i386/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ntldr/arch/i386/ntoskrnl.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ntldr/arch/i386/ntoskrnl.h (removed) @@ -1,25 +0,0 @@ -/* - * PROJECT: ReactOS Kernel - * LICENSE: GPL - See COPYING in the top level directory - * FILE: boot/freeldr/freeldr/include/ntoskrnl.h - * PURPOSE: NTOS glue routines for the MINIHAL library - * PROGRAMMERS: Hervé Poussineau <hpoussin(a)reactos.org> - */ - -#include <ntdef.h> -#undef _NTHAL_ -//#undef DECLSPEC_IMPORT -//#define DECLSPEC_IMPORT -#undef NTSYSAPI -#define NTSYSAPI - -/* Windows Device Driver Kit */ -#include <ntddk.h> -#include <ndk/haltypes.h> - -//typedef GUID UUID; - -/* Disk stuff */ -#include <arc/arc.h> -#include <ntdddisk.h> -#include <internal/hal.h> Modified: trunk/reactos/boot/freeldr/freeldr/ntldr/conversion.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ntldr… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ntldr/conversion.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ntldr/conversion.c [iso-8859-1] Fri Feb 5 00:17:33 2016 @@ -16,33 +16,6 @@ DBG_DEFAULT_CHANNEL(WINDOWS); /* FUNCTIONS **************************************************************/ - -#ifndef _ZOOM2_ -/* Arch-specific addresses translation implementation */ -PVOID -VaToPa(PVOID Va) -{ - return (PVOID)((ULONG_PTR)Va & ~KSEG0_BASE); -} - -PVOID -PaToVa(PVOID Pa) -{ - return (PVOID)((ULONG_PTR)Pa | KSEG0_BASE); -} -#else -PVOID -VaToPa(PVOID Va) -{ - return Va; -} - -PVOID -PaToVa(PVOID Pa) -{ - return Pa; -} -#endif VOID List_PaToVa(_In_ PLIST_ENTRY ListHeadPa) Removed: trunk/reactos/boot/freeldr/freeldr/ntldr/peloader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ntldr/peloader.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ntldr/peloader.c (removed) @@ -1,858 +0,0 @@ -/* - * PROJECT: FreeLoader - * LICENSE: GPL - See COPYING in the top level directory - * FILE: boot/freeldr/freeldr/windows/peloader.c - * PURPOSE: Provides routines for loading PE files. To be merged with - * arch/i386/loader.c in future - * This article was very handy during development: - * http://msdn.microsoft.com/msdnmag/issues/02/03/PE2/ - * PROGRAMMERS: Aleksey Bragin (aleksey(a)reactos.org) - * The source code in this file is based on the work of respective - * authors of PE loading code in ReactOS and Brian Palmer and - * Alex Ionescu's arch/i386/loader.c, and my research project - * (creating a native EFI loader for Windows) - */ - -/* INCLUDES ***************************************************************/ -#include <freeldr.h> -#include <debug.h> - -DBG_DEFAULT_CHANNEL(PELOADER); - -static BOOLEAN -WinLdrpCompareDllName(IN PCH DllName, - IN PUNICODE_STRING UnicodeName); - -static BOOLEAN -WinLdrpBindImportName(IN OUT PLIST_ENTRY ModuleListHead, - IN PVOID DllBase, - IN PVOID ImageBase, - IN PIMAGE_THUNK_DATA ThunkData, - IN PIMAGE_EXPORT_DIRECTORY ExportDirectory, - IN ULONG ExportSize, - IN BOOLEAN ProcessForwards, - IN PCSTR DirectoryPath); - -static BOOLEAN -WinLdrpLoadAndScanReferencedDll(PLIST_ENTRY ModuleListHead, - PCCH DirectoryPath, - PCH ImportName, - PLDR_DATA_TABLE_ENTRY *DataTableEntry); - -static BOOLEAN -WinLdrpScanImportAddressTable(IN OUT PLIST_ENTRY ModuleListHead, - IN PVOID DllBase, - IN PVOID ImageBase, - IN PIMAGE_THUNK_DATA ThunkData, - IN PCSTR DirectoryPath); - - - -/* FUNCTIONS **************************************************************/ - -/* Returns TRUE if DLL has already been loaded - looks in LoadOrderList in LPB */ -BOOLEAN -WinLdrCheckForLoadedDll(IN OUT PLIST_ENTRY ModuleListHead, - IN PCH DllName, - OUT PLDR_DATA_TABLE_ENTRY *LoadedEntry) -{ - PLDR_DATA_TABLE_ENTRY DataTableEntry; - LIST_ENTRY *ModuleEntry; - - TRACE("WinLdrCheckForLoadedDll: DllName %s\n", DllName); - - /* Just go through each entry in the LoadOrderList and compare loaded module's - name with a given name */ - ModuleEntry = ModuleListHead->Flink; - while (ModuleEntry != ModuleListHead) - { - /* Get pointer to the current DTE */ - DataTableEntry = CONTAINING_RECORD(ModuleEntry, - LDR_DATA_TABLE_ENTRY, - InLoadOrderLinks); - - TRACE("WinLdrCheckForLoadedDll: DTE %p, EP %p, base %p name '%.*ws'\n", - DataTableEntry, DataTableEntry->EntryPoint, DataTableEntry->DllBase, - DataTableEntry->BaseDllName.Length / 2, VaToPa(DataTableEntry->BaseDllName.Buffer)); - - /* Compare names */ - if (WinLdrpCompareDllName(DllName, &DataTableEntry->BaseDllName)) - { - /* Yes, found it, report pointer to the loaded module's DTE - to the caller and increase load count for it */ - *LoadedEntry = DataTableEntry; - DataTableEntry->LoadCount++; - TRACE("WinLdrCheckForLoadedDll: LoadedEntry %X\n", DataTableEntry); - return TRUE; - } - - /* Go to the next entry */ - ModuleEntry = ModuleEntry->Flink; - } - - /* Nothing found */ - return FALSE; -} - -BOOLEAN -WinLdrScanImportDescriptorTable(IN OUT PLIST_ENTRY ModuleListHead, - IN PCCH DirectoryPath, - IN PLDR_DATA_TABLE_ENTRY ScanDTE) -{ - PLDR_DATA_TABLE_ENTRY DataTableEntry; - PIMAGE_IMPORT_DESCRIPTOR ImportTable; - ULONG ImportTableSize; - PCH ImportName; - BOOLEAN Success; - - /* Get a pointer to the import table of this image */ - ImportTable = (PIMAGE_IMPORT_DESCRIPTOR)RtlImageDirectoryEntryToData(VaToPa(ScanDTE->DllBase), - TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, &ImportTableSize); - - { - UNICODE_STRING BaseName; - BaseName.Buffer = VaToPa(ScanDTE->BaseDllName.Buffer); - BaseName.MaximumLength = ScanDTE->BaseDllName.MaximumLength; - BaseName.Length = ScanDTE->BaseDllName.Length; - TRACE("WinLdrScanImportDescriptorTable(): %wZ ImportTable = 0x%X\n", - &BaseName, ImportTable); - } - - /* If image doesn't have any import directory - just return success */ - if (ImportTable == NULL) - return TRUE; - - /* Loop through all entries */ - for (;(ImportTable->Name != 0) && (ImportTable->FirstThunk != 0);ImportTable++) - { - /* Get pointer to the name */ - ImportName = (PCH)VaToPa(RVA(ScanDTE->DllBase, ImportTable->Name)); - TRACE("WinLdrScanImportDescriptorTable(): Looking at %s\n", ImportName); - - /* In case we get a reference to ourselves - just skip it */ - if (WinLdrpCompareDllName(ImportName, &ScanDTE->BaseDllName)) - continue; - - /* Load the DLL if it is not already loaded */ - if (!WinLdrCheckForLoadedDll(ModuleListHead, ImportName, &DataTableEntry)) - { - Success = WinLdrpLoadAndScanReferencedDll(ModuleListHead, - DirectoryPath, - ImportName, - &DataTableEntry); - if (!Success) - { - ERR("WinLdrpLoadAndScanReferencedDll() failed\n"); - return Success; - } - } - - /* Scan its import address table */ - Success = WinLdrpScanImportAddressTable(ModuleListHead, - DataTableEntry->DllBase, - ScanDTE->DllBase, - (PIMAGE_THUNK_DATA)RVA(ScanDTE->DllBase, ImportTable->FirstThunk), - DirectoryPath); - - if (!Success) - { - ERR("WinLdrpScanImportAddressTable() failed: ImportName = '%s', DirectoryPath = '%s'\n", - ImportName, DirectoryPath); - return Success; - } - } - - return TRUE; -} - -BOOLEAN -WinLdrAllocateDataTableEntry(IN OUT PLIST_ENTRY ModuleListHead, - IN PCCH BaseDllName, - IN PCCH FullDllName, - IN PVOID BasePA, - OUT PLDR_DATA_TABLE_ENTRY *NewEntry) -{ - PVOID BaseVA = PaToVa(BasePA); - PWSTR Buffer; - PLDR_DATA_TABLE_ENTRY DataTableEntry; - PIMAGE_NT_HEADERS NtHeaders; - USHORT Length; - TRACE("WinLdrAllocateDataTableEntry(, '%s', '%s', %p)\n", - BaseDllName, FullDllName, BasePA); - - /* Allocate memory for a data table entry, zero-initialize it */ - DataTableEntry = (PLDR_DATA_TABLE_ENTRY)FrLdrHeapAlloc(sizeof(LDR_DATA_TABLE_ENTRY), - TAG_WLDR_DTE); - if (DataTableEntry == NULL) - return FALSE; - RtlZeroMemory(DataTableEntry, sizeof(LDR_DATA_TABLE_ENTRY)); - - /* Get NT headers from the image */ - NtHeaders = RtlImageNtHeader(BasePA); - - /* Initialize corresponding fields of DTE based on NT headers value */ - DataTableEntry->DllBase = BaseVA; - DataTableEntry->SizeOfImage = NtHeaders->OptionalHeader.SizeOfImage; - DataTableEntry->EntryPoint = RVA(BaseVA, NtHeaders->OptionalHeader.AddressOfEntryPoint); - DataTableEntry->SectionPointer = 0; - DataTableEntry->CheckSum = NtHeaders->OptionalHeader.CheckSum; - - /* Initialize BaseDllName field (UNICODE_STRING) from the Ansi BaseDllName - by simple conversion - copying each character */ - Length = (USHORT)(strlen(BaseDllName) * sizeof(WCHAR)); - Buffer = (PWSTR)FrLdrHeapAlloc(Length, TAG_WLDR_NAME); - if (Buffer == NULL) - { - FrLdrHeapFree(DataTableEntry, TAG_WLDR_DTE); - return FALSE; - } - RtlZeroMemory(Buffer, Length); - - DataTableEntry->BaseDllName.Length = Length; - DataTableEntry->BaseDllName.MaximumLength = Length; - DataTableEntry->BaseDllName.Buffer = PaToVa(Buffer); - while (*BaseDllName != 0) - { - *Buffer++ = *BaseDllName++; - } - - /* Initialize FullDllName field (UNICODE_STRING) from the Ansi FullDllName - using the same method */ - Length = (USHORT)(strlen(FullDllName) * sizeof(WCHAR)); - Buffer = (PWSTR)FrLdrHeapAlloc(Length, TAG_WLDR_NAME); - if (Buffer == NULL) - { - FrLdrHeapFree(DataTableEntry, TAG_WLDR_DTE); - return FALSE; - } - RtlZeroMemory(Buffer, Length); - - DataTableEntry->FullDllName.Length = Length; - DataTableEntry->FullDllName.MaximumLength = Length; - DataTableEntry->FullDllName.Buffer = PaToVa(Buffer); - while (*FullDllName != 0) - { - *Buffer++ = *FullDllName++; - } - - /* Initialize what's left - LoadCount which is 1, and set Flags so that - we know this entry is processed */ - DataTableEntry->Flags = LDRP_ENTRY_PROCESSED; - DataTableEntry->LoadCount = 1; - - /* Insert this DTE to a list in the LPB */ - InsertTailList(ModuleListHead, &DataTableEntry->InLoadOrderLinks); - TRACE("Inserting DTE %p, name='%.*S' DllBase=%p \n", DataTableEntry, - DataTableEntry->BaseDllName.Length / 2, - VaToPa(DataTableEntry->BaseDllName.Buffer), - DataTableEntry->DllBase); - - /* Save pointer to a newly allocated and initialized entry */ - *NewEntry = DataTableEntry; - - /* Return success */ - return TRUE; -} - -/* - * WinLdrLoadImage loads the specified image from the file (it doesn't - * perform any additional operations on the filename, just directly - * calls the file I/O routines), and relocates it so that it's ready - * to be used when paging is enabled. - * Addressing mode: physical - */ -BOOLEAN -WinLdrLoadImage(IN PCHAR FileName, - TYPE_OF_MEMORY MemoryType, - OUT PVOID *ImageBasePA) -{ - ULONG FileId; - PVOID PhysicalBase; - PVOID VirtualBase = NULL; - UCHAR HeadersBuffer[SECTOR_SIZE * 2]; - PIMAGE_NT_HEADERS NtHeaders; - PIMAGE_SECTION_HEADER SectionHeader; - ULONG VirtualSize, SizeOfRawData, NumberOfSections; - ARC_STATUS Status; - LARGE_INTEGER Position; - ULONG i, BytesRead; - TRACE("WinLdrLoadImage(%s, %ld, *)\n", FileName, MemoryType); - - /* Open the image file */ - Status = ArcOpen(FileName, OpenReadOnly, &FileId); - if (Status != ESUCCESS) - { - // UiMessageBox("Can not open the file."); - return FALSE; - } - - /* Load the first 2 sectors of the image so we can read the PE header */ - Status = ArcRead(FileId, HeadersBuffer, SECTOR_SIZE * 2, &BytesRead); - if (Status != ESUCCESS) - { - UiMessageBox("Error reading from file."); - ArcClose(FileId); - return FALSE; - } - - /* Now read the MZ header to get the offset to the PE Header */ - NtHeaders = RtlImageNtHeader(HeadersBuffer); - if (!NtHeaders) - { - // Print(L"Error - no NT header found in %s\n", FileName); - UiMessageBox("Error - no NT header found."); - ArcClose(FileId); - return FALSE; - } - - /* Ensure this is executable image */ - if (((NtHeaders->FileHeader.Characteristics & IMAGE_FILE_EXECUTABLE_IMAGE) == 0)) - { - // Print(L"Not an executable image %s\n", FileName); - UiMessageBox("Not an executable image."); - ArcClose(FileId); - return FALSE; - } - - /* Store number of sections to read and a pointer to the first section */ - NumberOfSections = NtHeaders->FileHeader.NumberOfSections; - SectionHeader = IMAGE_FIRST_SECTION(NtHeaders); - - /* Try to allocate this memory, if fails - allocate somewhere else */ - PhysicalBase = MmAllocateMemoryAtAddress(NtHeaders->OptionalHeader.SizeOfImage, - (PVOID)((ULONG)NtHeaders->OptionalHeader.ImageBase & (KSEG0_BASE - 1)), - MemoryType); - - if (PhysicalBase == NULL) - { - /* It's ok, we don't panic - let's allocate again at any other "low" place */ - PhysicalBase = MmAllocateMemoryWithType(NtHeaders->OptionalHeader.SizeOfImage, MemoryType); - - if (PhysicalBase == NULL) - { - // Print(L"Failed to alloc pages for image %s\n", FileName); - UiMessageBox("Failed to alloc pages for image."); - ArcClose(FileId); - return FALSE; - } - } - - /* This is the real image base - in form of a virtual address */ - VirtualBase = PaToVa(PhysicalBase); - - TRACE("Base PA: 0x%X, VA: 0x%X\n", PhysicalBase, VirtualBase); - - /* Set to 0 position and fully load the file image */ - Position.HighPart = Position.LowPart = 0; - Status = ArcSeek(FileId, &Position, SeekAbsolute); - if (Status != ESUCCESS) - { - UiMessageBox("Error seeking to start of file."); - ArcClose(FileId); - return FALSE; - } - - Status = ArcRead(FileId, PhysicalBase, NtHeaders->OptionalHeader.SizeOfHeaders, &BytesRead); - if (Status != ESUCCESS) - { - // Print(L"Error reading headers %s\n", FileName); - UiMessageBox("Error reading headers."); - ArcClose(FileId); - return FALSE; - } - - /* Reload the NT Header */ - NtHeaders = RtlImageNtHeader(PhysicalBase); - - /* Load the first section */ - SectionHeader = IMAGE_FIRST_SECTION(NtHeaders); - - /* Fill output parameters */ - *ImageBasePA = PhysicalBase; - - /* Walk through each section and read it (check/fix any possible - bad situations, if they arise) */ - for (i = 0; i < NumberOfSections; i++) - { - VirtualSize = SectionHeader->Misc.VirtualSize; - SizeOfRawData = SectionHeader->SizeOfRawData; - - /* Handle a case when VirtualSize equals 0 */ - if (VirtualSize == 0) - VirtualSize = SizeOfRawData; - - /* If PointerToRawData is 0, then force its size to be also 0 */ - if (SectionHeader->PointerToRawData == 0) - { - SizeOfRawData = 0; - } - else - { - /* Cut the loaded size to the VirtualSize extents */ - if (SizeOfRawData > VirtualSize) - SizeOfRawData = VirtualSize; - } - - /* Actually read the section (if its size is not 0) */ - if (SizeOfRawData != 0) - { - /* Seek to the correct position */ - Position.LowPart = SectionHeader->PointerToRawData; - Status = ArcSeek(FileId, &Position, SeekAbsolute); - - TRACE("SH->VA: 0x%X\n", SectionHeader->VirtualAddress); - - /* Read this section from the file, size = SizeOfRawData */ - Status = ArcRead(FileId, (PUCHAR)PhysicalBase + SectionHeader->VirtualAddress, SizeOfRawData, &BytesRead); - if (Status != ESUCCESS) - { - ERR("WinLdrLoadImage(): Error reading section from file!\n"); - break; - } - } - - /* Size of data is less than the virtual size - fill up the remainder with zeroes */ - if (SizeOfRawData < VirtualSize) - { - TRACE("WinLdrLoadImage(): SORD %d < VS %d\n", SizeOfRawData, VirtualSize); - RtlZeroMemory((PVOID)(SectionHeader->VirtualAddress + (ULONG_PTR)PhysicalBase + SizeOfRawData), VirtualSize - SizeOfRawData); - } - - SectionHeader++; - } - - /* We are done with the file - close it */ - ArcClose(FileId); - - /* If loading failed - return right now */ - if (Status != ESUCCESS) - return FALSE; - - /* Relocate the image, if it needs it */ - if (NtHeaders->OptionalHeader.ImageBase != (ULONG_PTR)VirtualBase) - { - WARN("Relocating %p -> %p\n", NtHeaders->OptionalHeader.ImageBase, - VirtualBase); - return (BOOLEAN)LdrRelocateImageWithBias(PhysicalBase, - (ULONG_PTR)VirtualBase - (ULONG_PTR)PhysicalBase, - "FreeLdr", - TRUE, - TRUE, /* in case of conflict still return success */ - FALSE); - } - - TRACE("WinLdrLoadImage() done, PA = %p\n", *ImageBasePA); - return TRUE; -} - -/* PRIVATE FUNCTIONS *******************************************************/ - -/* DllName - physical, UnicodeString->Buffer - virtual */ -static BOOLEAN -WinLdrpCompareDllName(IN PCH DllName, - IN PUNICODE_STRING UnicodeName) -{ - PWSTR Buffer; - UNICODE_STRING UnicodeNamePA; - SIZE_T i, Length; - - /* First obvious check: for length of two names */ - Length = strlen(DllName); - - UnicodeNamePA.Length = UnicodeName->Length; - UnicodeNamePA.MaximumLength = UnicodeName->MaximumLength; - UnicodeNamePA.Buffer = VaToPa(UnicodeName->Buffer); - TRACE("WinLdrpCompareDllName: %s and %wZ, Length = %d " - "UN->Length %d\n", DllName, &UnicodeNamePA, Length, UnicodeName->Length); - - if ((Length * sizeof(WCHAR)) > UnicodeName->Length) - return FALSE; - - /* Store pointer to unicode string's buffer */ - Buffer = VaToPa(UnicodeName->Buffer); - - /* Loop character by character */ - for (i = 0; i < Length; i++) - { - /* Compare two characters, uppercasing them */ - if (toupper(*DllName) != toupper((CHAR)*Buffer)) - return FALSE; - - /* Move to the next character */ - DllName++; - Buffer++; - } - - /* Check, if strings either fully match, or match till the "." (w/o extension) */ - if ((UnicodeName->Length == Length * sizeof(WCHAR)) || (*Buffer == L'.')) - { - /* Yes they do */ - return TRUE; - } - - /* Strings don't match, return FALSE */ - return FALSE; -} - -static BOOLEAN -WinLdrpBindImportName(IN OUT PLIST_ENTRY ModuleListHead, - IN PVOID DllBase, - IN PVOID ImageBase, - IN PIMAGE_THUNK_DATA ThunkData, - IN PIMAGE_EXPORT_DIRECTORY ExportDirectory, - IN ULONG ExportSize, - IN BOOLEAN ProcessForwards, - IN PCSTR DirectoryPath) -{ - ULONG Ordinal; - PULONG NameTable, FunctionTable; - PUSHORT OrdinalTable; - LONG High, Low, Middle, Result; - ULONG Hint; - PIMAGE_IMPORT_BY_NAME ImportData; - PCHAR ExportName, ForwarderName; - BOOLEAN Success; - - //TRACE("WinLdrpBindImportName(): DllBase 0x%X, ImageBase 0x%X, ThunkData 0x%X, ExportDirectory 0x%X, ExportSize %d, ProcessForwards 0x%X\n", - // DllBase, ImageBase, ThunkData, ExportDirectory, ExportSize, ProcessForwards); - - /* Check passed DllBase param */ - if(DllBase == NULL) - { - WARN("DllBase == NULL!\n"); - return FALSE; - } - - /* Convert all non-critical pointers to PA from VA */ - ThunkData = VaToPa(ThunkData); - - /* Is the reference by ordinal? */ - if (IMAGE_SNAP_BY_ORDINAL(ThunkData->u1.Ordinal) && !ProcessForwards) - { - /* Yes, calculate the ordinal */ - Ordinal = (ULONG)(IMAGE_ORDINAL(ThunkData->u1.Ordinal) - (UINT32)ExportDirectory->Base); - //TRACE("WinLdrpBindImportName(): Ordinal %d\n", Ordinal); - } - else - { - /* It's reference by name, we have to look it up in the export directory */ - if (!ProcessForwards) - { - /* AddressOfData in thunk entry will become a virtual address (from relative) */ - //TRACE("WinLdrpBindImportName(): ThunkData->u1.AOD was %p\n", ThunkData->u1.AddressOfData); - ThunkData->u1.AddressOfData = - (ULONG_PTR)RVA(ImageBase, ThunkData->u1.AddressOfData); - //TRACE("WinLdrpBindImportName(): ThunkData->u1.AOD became %p\n", ThunkData->u1.AddressOfData); - } - - /* Get the import name */ - ImportData = VaToPa((PVOID)ThunkData->u1.AddressOfData); - - /* Get pointers to Name and Ordinal tables (RVA -> VA) */ - NameTable = VaToPa(RVA(DllBase, ExportDirectory->AddressOfNames)); - OrdinalTable = VaToPa(RVA(DllBase, ExportDirectory->AddressOfNameOrdinals)); - - //TRACE("NameTable 0x%X, OrdinalTable 0x%X, ED->AddressOfNames 0x%X, ED->AOFO 0x%X\n", - // NameTable, OrdinalTable, ExportDirectory->AddressOfNames, ExportDirectory->AddressOfNameOrdinals); - - /* Get the hint, convert it to a physical pointer */ - Hint = ((PIMAGE_IMPORT_BY_NAME)VaToPa((PVOID)ThunkData->u1.AddressOfData))->Hint; - //TRACE("HintIndex %d\n", Hint); - - /* Get the export name from the hint */ - ExportName = VaToPa(RVA(DllBase, NameTable[Hint])); - - /* If Hint is less than total number of entries in the export directory, - and import name == export name, then we can just get it from the OrdinalTable */ - if ((Hint < ExportDirectory->NumberOfNames) && - (strcmp(ExportName, (PCHAR)ImportData->Name) == 0)) - { - Ordinal = OrdinalTable[Hint]; - //TRACE("WinLdrpBindImportName(): Ordinal %d\n", Ordinal); - } - else - { - /* It's not the easy way, we have to lookup import name in the name table. - Let's use a binary search for this task. */ - - //TRACE("WinLdrpBindImportName() looking up the import name using binary search...\n"); - - /* Low boundary is set to 0, and high boundary to the maximum index */ - Low = 0; - High = ExportDirectory->NumberOfNames - 1; - - /* Perform a binary-search loop */ - while (High >= Low) - { - /* Divide by 2 by shifting to the right once */ - Middle = (Low + High) / 2; - - /* Get the name from the name table */ - ExportName = VaToPa(RVA(DllBase, NameTable[Middle])); - - /* Compare the names */ - Result = strcmp(ExportName, (PCHAR)ImportData->Name); - - /*TRACE("Binary search: comparing Import '__', Export '%s'\n",*/ - /*VaToPa(&((PIMAGE_IMPORT_BY_NAME)VaToPa(ThunkData->u1.AddressOfData))->Name[0]),*/ - /*(PCHAR)VaToPa(RVA(DllBase, NameTable[Middle])));*/ - - /*TRACE("TE->u1.AOD %p, fulladdr %p\n", - ThunkData->u1.AddressOfData, - ((PIMAGE_IMPORT_BY_NAME)VaToPa(ThunkData->u1.AddressOfData))->Name );*/ - - - /* Depending on result of strcmp, perform different actions */ - if (Result > 0) - { - /* Adjust top boundary */ - High = Middle - 1; - } - else if (Result < 0) - { - /* Adjust bottom boundary */ - Low = Middle + 1; - } - else - { - /* Yay, found it! */ - break; - } - } - - /* If high boundary is less than low boundary, then no result found */ - if (High < Low) - { - //Print(L"Error in binary search\n"); - ERR("Did not find export '%s'!\n", (PCHAR)ImportData->Name); - return FALSE; - } - - /* Everything allright, get the ordinal */ - Ordinal = OrdinalTable[Middle]; - - //TRACE("WinLdrpBindImportName() found Ordinal %d\n", Ordinal); - } - } - - /* Check ordinal number for validity! */ - if (Ordinal >= ExportDirectory->NumberOfFunctions) - { - ERR("Ordinal number is invalid!\n"); - return FALSE; - } - - /* Get a pointer to the function table */ - FunctionTable = (PULONG)VaToPa(RVA(DllBase, ExportDirectory->AddressOfFunctions)); - - /* Save a pointer to the function */ - ThunkData->u1.Function = (ULONG_PTR)RVA(DllBase, FunctionTable[Ordinal]); - - /* Is it a forwarder? (function pointer is within the export directory) */ - ForwarderName = (PCHAR)VaToPa((PVOID)ThunkData->u1.Function); - if (((ULONG_PTR)ForwarderName > (ULONG_PTR)ExportDirectory) && - ((ULONG_PTR)ForwarderName < ((ULONG_PTR)ExportDirectory + ExportSize))) - { - PLDR_DATA_TABLE_ENTRY DataTableEntry; - CHAR ForwardDllName[255]; - PIMAGE_EXPORT_DIRECTORY RefExportDirectory; - ULONG RefExportSize; - TRACE("WinLdrpBindImportName(): ForwarderName %s\n", ForwarderName); - - /* Save the name of the forward dll */ - RtlCopyMemory(ForwardDllName, ForwarderName, sizeof(ForwardDllName)); - - /* Strip out the symbol name */ - *strrchr(ForwardDllName,'.') = '\0'; - - /* Check if the target image is already loaded */ - if (!WinLdrCheckForLoadedDll(ModuleListHead, ForwardDllName, &DataTableEntry)) - { - /* Check if the forward dll name has an extension */ - if (strchr(ForwardDllName, '.') == NULL) - { - /* Name does not have an extension, append '.dll' */ - strcat(ForwardDllName, ".dll"); - } - - /* Now let's try to load it! */ - Success = WinLdrpLoadAndScanReferencedDll(ModuleListHead, - DirectoryPath, - ForwardDllName, - &DataTableEntry); - if (!Success) - { - ERR("WinLdrpLoadAndScanReferencedDll() failed to load forwarder dll.\n"); - return Success; - } - } - - /* Get pointer to the export directory of loaded DLL */ - RefExportDirectory = (PIMAGE_EXPORT_DIRECTORY) - RtlImageDirectoryEntryToData(VaToPa(DataTableEntry->DllBase), - TRUE, - IMAGE_DIRECTORY_ENTRY_EXPORT, - &RefExportSize); - - /* Fail if it's NULL */ - if (RefExportDirectory) - { - UCHAR Buffer[128]; - IMAGE_THUNK_DATA RefThunkData; - PIMAGE_IMPORT_BY_NAME ImportByName; - PCHAR ImportName; - - /* Get pointer to the import name */ - ImportName = strrchr(ForwarderName, '.') + 1; - - /* Create a IMAGE_IMPORT_BY_NAME structure, pointing to the local Buffer */ - ImportByName = (PIMAGE_IMPORT_BY_NAME)Buffer; - - /* Fill the name with the import name */ - RtlCopyMemory(ImportByName->Name, ImportName, strlen(ImportName)+1); - - /* Set Hint to 0 */ - ImportByName->Hint = 0; - - /* And finally point ThunkData's AddressOfData to that structure */ - RefThunkData.u1.AddressOfData = (ULONG_PTR)ImportByName; - - /* And recursively call ourselves */ - Success = WinLdrpBindImportName(ModuleListHead, - DataTableEntry->DllBase, - ImageBase, - &RefThunkData, - RefExportDirectory, - RefExportSize, - TRUE, - DirectoryPath); - - /* Fill out the ThunkData with data from RefThunkData */ - ThunkData->u1 = RefThunkData.u1; - - /* Return what we got from the recursive call */ - return Success; - } - else - { - /* Fail if ExportDirectory is NULL */ - return FALSE; - } - } - - /* Success! */ - return TRUE; -} - -static BOOLEAN -WinLdrpLoadAndScanReferencedDll(PLIST_ENTRY ModuleListHead, - PCCH DirectoryPath, - PCH ImportName, - PLDR_DATA_TABLE_ENTRY *DataTableEntry) -{ - CHAR FullDllName[256]; - BOOLEAN Success; - PVOID BasePA = NULL; - - /* Prepare the full path to the file to be loaded */ - strcpy(FullDllName, DirectoryPath); - strcat(FullDllName, ImportName); - - TRACE("Loading referenced DLL: %s\n", FullDllName); - //Print(L"Loading referenced DLL: %s\n", FullDllName); - - /* Load the image */ - Success = WinLdrLoadImage(FullDllName, LoaderBootDriver, &BasePA); - if (!Success) - { - ERR("WinLdrLoadImage() failed\n"); - return Success; - } - - /* Allocate DTE for newly loaded DLL */ - Success = WinLdrAllocateDataTableEntry(ModuleListHead, - ImportName, - FullDllName, - BasePA, - DataTableEntry); - if (!Success) - { - ERR("WinLdrAllocateDataTableEntry() failed\n"); - return Success; - } - - /* Scan its dependencies too */ - TRACE("WinLdrScanImportDescriptorTable() calling ourselves for %S\n", - VaToPa((*DataTableEntry)->BaseDllName.Buffer)); - Success = WinLdrScanImportDescriptorTable(ModuleListHead, DirectoryPath, *DataTableEntry); - if (!Success) - { - ERR("WinLdrScanImportDescriptorTable() failed\n"); - return Success; - } - - return TRUE; -} - -static BOOLEAN -WinLdrpScanImportAddressTable(IN OUT PLIST_ENTRY ModuleListHead, - IN PVOID DllBase, - IN PVOID ImageBase, - IN PIMAGE_THUNK_DATA ThunkData, - IN PCSTR DirectoryPath) -{ - PIMAGE_EXPORT_DIRECTORY ExportDirectory = NULL; - BOOLEAN Success; - ULONG ExportSize; - - TRACE("WinLdrpScanImportAddressTable(): DllBase 0x%X, " - "ImageBase 0x%X, ThunkData 0x%X\n", DllBase, ImageBase, ThunkData); - - /* Obtain the export table from the DLL's base */ - if (DllBase == NULL) - { - ERR("Error, DllBase == NULL!\n"); - return FALSE; - } - else - { - ExportDirectory = - (PIMAGE_EXPORT_DIRECTORY)RtlImageDirectoryEntryToData(VaToPa(DllBase), - TRUE, - IMAGE_DIRECTORY_ENTRY_EXPORT, - &ExportSize); - } - - TRACE("WinLdrpScanImportAddressTable(): ExportDirectory 0x%X\n", ExportDirectory); - - /* If pointer to Export Directory is */ - if (ExportDirectory == NULL) - { - ERR("DllBase=%p(%p)\n", DllBase, VaToPa(DllBase)); - return FALSE; - } - - /* Go through each entry in the thunk table and bind it */ - while (((PIMAGE_THUNK_DATA)VaToPa(ThunkData))->u1.AddressOfData != 0) - { - /* Bind it */ - Success = WinLdrpBindImportName(ModuleListHead, - DllBase, - ImageBase, - ThunkData, - ExportDirectory, - ExportSize, - FALSE, - DirectoryPath); - - /* Move to the next entry */ - ThunkData++; - - /* Return error if binding was unsuccessful */ - if (!Success) - return Success; - } - - /* Return success */ - return TRUE; -}

1 0

[ekohl] 70691: Used a better check for the root item of the treeview. The listview, status bar and address bar should only get wiped when the user selects the root item of the treeview. CORE-10803 ...
by ekohl＠svn.reactos.org 04 Feb '16

04 Feb '16

Author: ekohl Date: Thu Feb 4 23:50:36 2016 New Revision: 70691 URL: http://svn.reactos.org/svn/reactos?rev=70691&view=rev Log: Used a better check for the root item of the treeview. The listview, status bar and address bar should only get wiped when the user selects the root item of the treeview. CORE-10803 #comment Retest please! Modified: trunk/reactos/base/applications/regedit/childwnd.c Modified: trunk/reactos/base/applications/regedit/childwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/childwnd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/childwnd.c [iso-8859-1] Thu Feb 4 23:50:36 2016 @@ -308,6 +308,15 @@ { LPCWSTR keyPath, rootName; LPWSTR fullPath; + + /* Wipe the listview, the status bar and the address bar if the root key was selected */ + if (TreeView_GetParent(g_pChildWnd->hTreeWnd, hItem) == NULL) + { + (void)ListView_DeleteAllItems(g_pChildWnd->hListWnd); + SendMessageW(hStatusBar, SB_SETTEXTW, 0, (LPARAM)NULL); + SendMessageW(g_pChildWnd->hAddressBarWnd, WM_SETTEXT, 0, (LPARAM)NULL); + return; + } if (pszPath == NULL) keyPath = GetItemPath(g_pChildWnd->hTreeWnd, hItem, &hRootKey); @@ -347,12 +356,6 @@ EnableMenuItem(GetSubMenu(hMenuFrame,0), ID_REGISTRY_UNLOADHIVE, MF_BYCOMMAND | MF_ENABLED); } } - } - else - { - (void)ListView_DeleteAllItems(g_pChildWnd->hListWnd); - SendMessageW(hStatusBar, SB_SETTEXTW, 0, (LPARAM)NULL); - SendMessageW(g_pChildWnd->hAddressBarWnd, WM_SETTEXT, 0, (LPARAM)NULL); } }

1 0

[hbelusca] 70690: Remove redundant extra terminating '; ' in all of our C code.
by hbelusca＠svn.reactos.org 04 Feb '16

04 Feb '16

Author: hbelusca Date: Thu Feb 4 20:42:07 2016 New Revision: 70690 URL: http://svn.reactos.org/svn/reactos?rev=70690&view=rev Log: Remove redundant extra terminating ';' in all of our C code. Modified: trunk/reactos/boot/environ/include/bcd.h trunk/reactos/boot/environ/lib/io/device.c trunk/reactos/dll/shellext/ntobjshex/ntobjenum.cpp trunk/reactos/dll/win32/msv1_0/msv1_0.c trunk/reactos/dll/win32/ws2_32/misc/dllmain.c trunk/reactos/dll/win32/ws2_32_new/src/startup.c trunk/reactos/drivers/base/kdgdb/gdb_receive.c trunk/reactos/drivers/bus/pcix/utils.c trunk/reactos/drivers/crypto/ksecdd/ksecdd.h trunk/reactos/drivers/filesystems/cdfs_new/deviosup.c trunk/reactos/drivers/sac/driver/util.c trunk/reactos/drivers/storage/class/cdrom/cdrom.c trunk/reactos/drivers/storage/class/disk_new/disk.c trunk/reactos/drivers/storage/classpnp/obsolete.c trunk/reactos/hal/halx86/amd64/x86bios.c trunk/reactos/hal/halx86/apic/rtctimer.c trunk/reactos/hal/halx86/apic/tsc.c trunk/reactos/include/psdk/ksproxy.h trunk/reactos/include/xdk/cmtypes.h trunk/reactos/include/xdk/ketypes.h trunk/reactos/include/xdk/ntbasedef.h trunk/reactos/lib/cryptlib/mvAesAlg.c trunk/reactos/lib/rossym_new/dwarfinfo.c trunk/reactos/lib/rtl/slist.c trunk/reactos/ntoskrnl/io/iomgr/irp.c trunk/reactos/ntoskrnl/mm/amd64/page.c trunk/reactos/win32ss/gdi/gdi32/wine/rosglue.c trunk/reactos/win32ss/gdi/ntgdi/dcutil.c trunk/reactos/win32ss/gdi/ntgdi/dibobj.c trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c trunk/reactos/win32ss/user/ntuser/kbdlayout.c trunk/reactos/win32ss/user/ntuser/msgqueue.c trunk/reactos/win32ss/user/user32/misc/imm.c Modified: trunk/reactos/boot/environ/include/bcd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/include/bcd.h… ============================================================================== --- trunk/reactos/boot/environ/include/bcd.h [iso-8859-1] (original) +++ trunk/reactos/boot/environ/include/bcd.h [iso-8859-1] Thu Feb 4 20:42:07 2016 @@ -288,7 +288,7 @@ { ULONG Valid; ULONG Type; -} BCD_OBJECT_DESCRIPTION, *PBCD_OBJECT_DESCRIPTION;; +} BCD_OBJECT_DESCRIPTION, *PBCD_OBJECT_DESCRIPTION; /* FUNCTIONS ******************************************************************/ Modified: trunk/reactos/boot/environ/lib/io/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/io/device… ============================================================================== --- trunk/reactos/boot/environ/lib/io/device.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/io/device.c [iso-8859-1] Thu Feb 4 20:42:07 2016 @@ -1070,7 +1070,7 @@ /* Otherwise, this is a raw disk */ BlockDevice->PartitionType = RawPartition; Device->Local.HardDisk.PartitionType = RawPartition; - Device->Local.HardDisk.Raw.DiskNumber = BlockIoFirmwareRawDiskCount++;; + Device->Local.HardDisk.Raw.DiskNumber = BlockIoFirmwareRawDiskCount++; } else if (LeafNode->SubType == MEDIA_CDROM_DP) { Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjenum.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/ntobjenum.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/ntobjenum.cpp [iso-8859-1] Thu Feb 4 20:42:07 2016 @@ -138,7 +138,7 @@ if (*valueLength > 0) { - PBYTE data = (PBYTE) CoTaskMemAlloc(*valueLength);; + PBYTE data = (PBYTE) CoTaskMemAlloc(*valueLength); *valueData = data; res = RegQueryValueExW(hkey, valueName, NULL, NULL, data, valueLength); Modified: trunk/reactos/dll/win32/msv1_0/msv1_0.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msv1_0/msv1_0.c?… ============================================================================== --- trunk/reactos/dll/win32/msv1_0/msv1_0.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msv1_0/msv1_0.c [iso-8859-1] Thu Feb 4 20:42:07 2016 @@ -185,7 +185,7 @@ LocalBuffer->LogonServer.Length = LogonServer->Length; LocalBuffer->LogonServer.MaximumLength = LogonServer->Length + sizeof(WCHAR); - LocalBuffer->LogonServer.Buffer = (LPWSTR)((ULONG_PTR)ClientBaseAddress + (ULONG_PTR)Ptr - (ULONG_PTR)LocalBuffer);; + LocalBuffer->LogonServer.Buffer = (LPWSTR)((ULONG_PTR)ClientBaseAddress + (ULONG_PTR)Ptr - (ULONG_PTR)LocalBuffer); memcpy(Ptr, LogonServer->Buffer, LogonServer->Length); Modified: trunk/reactos/dll/win32/ws2_32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/dllm… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/dllmain.c [iso-8859-1] Thu Feb 4 20:42:07 2016 @@ -106,7 +106,7 @@ default: /* Return 2.2 */ - VersionReturned = MAKEWORD(2, 2);; + VersionReturned = MAKEWORD(2, 2); break; } Modified: trunk/reactos/dll/win32/ws2_32_new/src/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/s… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/startup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/startup.c [iso-8859-1] Thu Feb 4 20:42:07 2016 @@ -156,7 +156,7 @@ default: /* Return 2.2 */ - VersionReturned = MAKEWORD(2, 2);; + VersionReturned = MAKEWORD(2, 2); break; } Modified: trunk/reactos/drivers/base/kdgdb/gdb_receive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdgdb/gdb_rec… ============================================================================== --- trunk/reactos/drivers/base/kdgdb/gdb_receive.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdgdb/gdb_receive.c [iso-8859-1] Thu Feb 4 20:42:07 2016 @@ -68,7 +68,7 @@ Status = KdpReceiveByte(&Byte); if (Status != KdPacketReceived) goto end; - ReceivedCheckSum = hex_value(Byte) << 4;; + ReceivedCheckSum = hex_value(Byte) << 4; Status = KdpReceiveByte(&Byte); if (Status != KdPacketReceived) Modified: trunk/reactos/drivers/bus/pcix/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/utils.c?r… ============================================================================== --- trunk/reactos/drivers/bus/pcix/utils.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/utils.c [iso-8859-1] Thu Feb 4 20:42:07 2016 @@ -33,7 +33,7 @@ /* Build a partial string with the smaller substring */ PartialString.Length = EqualString->Length; - PartialString.MaximumLength = InputString->MaximumLength;; + PartialString.MaximumLength = InputString->MaximumLength; PartialString.Buffer = InputString->Buffer; /* Check how many characters that need comparing */ Modified: trunk/reactos/drivers/crypto/ksecdd/ksecdd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/crypto/ksecdd/ksec… ============================================================================== --- trunk/reactos/drivers/crypto/ksecdd/ksecdd.h [iso-8859-1] (original) +++ trunk/reactos/drivers/crypto/ksecdd/ksecdd.h [iso-8859-1] Thu Feb 4 20:42:07 2016 @@ -71,7 +71,7 @@ SYSTEM_PROCESS_INFORMATION SystemProcessInformation; } KSEC_ENTROPY_DATA, *PKSEC_ENTROPY_DATA; -extern PEPROCESS KsecLsaProcess;; +extern PEPROCESS KsecLsaProcess; extern HANDLE KsecLsaProcessHandle; NTSTATUS Modified: trunk/reactos/drivers/filesystems/cdfs_new/deviosup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs_new/deviosup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs_new/deviosup.c [iso-8859-1] Thu Feb 4 20:42:07 2016 @@ -2085,7 +2085,7 @@ RawSectorAlign( CurrentRawByteCount), PVOID ); - ScratchUserBufferOffset += RawSectorAlign( CurrentRawByteCount);; + ScratchUserBufferOffset += RawSectorAlign( CurrentRawByteCount); // // Set the flag indicating we want to round the scratch buffer Modified: trunk/reactos/drivers/sac/driver/util.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/util.c?… ============================================================================== --- trunk/reactos/drivers/sac/driver/util.c [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/util.c [iso-8859-1] Thu Feb 4 20:42:07 2016 @@ -621,7 +621,7 @@ if (!p) return STATUS_NO_MEMORY; wcscpy(p, L"<machine-info>\r\n"); - p += wcslen(L"<machine-info>\r\n");; + p += wcslen(L"<machine-info>\r\n"); if (MachineInformation->MachineName) { Modified: trunk/reactos/drivers/storage/class/cdrom/cdrom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro… ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom/cdrom.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/cdrom/cdrom.c [iso-8859-1] Thu Feb 4 20:42:07 2016 @@ -3294,7 +3294,7 @@ // update information field. // - realIrp->IoStatus.Information = FIELD_OFFSET(DISK_GEOMETRY_EX, Data);; + realIrp->IoStatus.Information = FIELD_OFFSET(DISK_GEOMETRY_EX, Data); break; } Modified: trunk/reactos/drivers/storage/class/disk_new/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk… ============================================================================== --- trunk/reactos/drivers/storage/class/disk_new/disk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/disk_new/disk.c [iso-8859-1] Thu Feb 4 20:42:07 2016 @@ -1632,7 +1632,7 @@ break; } - length += (sizeof(SENDCMDOUTPARAMS) > sizeof(SENDCMDINPARAMS)) ? sizeof(SENDCMDOUTPARAMS) : sizeof(SENDCMDINPARAMS);; + length += (sizeof(SENDCMDOUTPARAMS) > sizeof(SENDCMDINPARAMS)) ? sizeof(SENDCMDOUTPARAMS) : sizeof(SENDCMDINPARAMS); srbControl = ExAllocatePoolWithTag(NonPagedPool, sizeof(SRB_IO_CONTROL) + length, DISK_TAG_SMART); Modified: trunk/reactos/drivers/storage/classpnp/obsolete.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/o… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/obsolete.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/obsolete.c [iso-8859-1] Thu Feb 4 20:42:07 2016 @@ -870,7 +870,7 @@ ClasspFreeSrb(FdoExtension, Srb); } else { - DBGERR(("ClassFreeOrReuseSrb: someone is trying to use an uninitialized SrbLookasideList !!!"));; + DBGERR(("ClassFreeOrReuseSrb: someone is trying to use an uninitialized SrbLookasideList !!!")); ExFreePool(Srb); } } Modified: trunk/reactos/hal/halx86/amd64/x86bios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/amd64/x86bios.c… ============================================================================== --- trunk/reactos/hal/halx86/amd64/x86bios.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/amd64/x86bios.c [iso-8859-1] Thu Feb 4 20:42:07 2016 @@ -135,7 +135,7 @@ *Segment = 0x2000; *Offset = 0; - return STATUS_SUCCESS;; + return STATUS_SUCCESS; } NTSTATUS @@ -159,7 +159,7 @@ } /* Buffer is freed, nothing more to do */ - return STATUS_SUCCESS;; + return STATUS_SUCCESS; } NTSTATUS Modified: trunk/reactos/hal/halx86/apic/rtctimer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/apic/rtctimer.c… ============================================================================== --- trunk/reactos/hal/halx86/apic/rtctimer.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/apic/rtctimer.c [iso-8859-1] Thu Feb 4 20:42:07 2016 @@ -124,7 +124,7 @@ } /* Read register C, so that the next interrupt can happen */ - HalpReadCmos(RTC_REGISTER_C);; + HalpReadCmos(RTC_REGISTER_C); /* Save increment */ LastIncrement = HalpCurrentTimeIncrement; Modified: trunk/reactos/hal/halx86/apic/tsc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/apic/tsc.c?rev=… ============================================================================== --- trunk/reactos/hal/halx86/apic/tsc.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/apic/tsc.c [iso-8859-1] Thu Feb 4 20:42:07 2016 @@ -93,7 +93,7 @@ HalEnableSystemInterrupt(HalpRtcClockVector, CLOCK_LEVEL, Latched); /* Read register C, so that the next interrupt can happen */ - HalpReadCmos(RTC_REGISTER_C);; + HalpReadCmos(RTC_REGISTER_C); /* Wait for completion */ _enable(); Modified: trunk/reactos/include/psdk/ksproxy.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ksproxy.h?rev… ============================================================================== --- trunk/reactos/include/psdk/ksproxy.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ksproxy.h [iso-8859-1] Thu Feb 4 20:42:07 2016 @@ -166,7 +166,7 @@ Pipe_Allocator_FirstPin, Pipe_Allocator_LastPin, Pipe_Allocator_MiddlePin -}PIPE_ALLOCATOR_PLACE, *PPIPE_ALLOCATOR_PLACE;; +}PIPE_ALLOCATOR_PLACE, *PPIPE_ALLOCATOR_PLACE; typedef enum { @@ -177,7 +177,7 @@ KS_MemoryTypeDeviceSpecific, KS_MemoryTypeUser, KS_MemoryTypeAnyHost -}KS_LogicalMemoryType, *PKS_LogicalMemoryType;; +}KS_LogicalMemoryType, *PKS_LogicalMemoryType; typedef struct _PIPE_TERMINATION { ULONG Flags; Modified: trunk/reactos/include/xdk/cmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/cmtypes.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/cmtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/cmtypes.h [iso-8859-1] Thu Feb 4 20:42:07 2016 @@ -845,7 +845,7 @@ typedef struct _REG_PRE_CREATE_KEY_INFORMATION { PUNICODE_STRING CompleteName; -} REG_PRE_CREATE_KEY_INFORMATION, REG_PRE_OPEN_KEY_INFORMATION,*PREG_PRE_CREATE_KEY_INFORMATION, *PREG_PRE_OPEN_KEY_INFORMATION;; +} REG_PRE_CREATE_KEY_INFORMATION, REG_PRE_OPEN_KEY_INFORMATION,*PREG_PRE_CREATE_KEY_INFORMATION, *PREG_PRE_OPEN_KEY_INFORMATION; typedef struct _REG_POST_CREATE_KEY_INFORMATION { PUNICODE_STRING CompleteName; Modified: trunk/reactos/include/xdk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/ketypes.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/ketypes.h [iso-8859-1] Thu Feb 4 20:42:07 2016 @@ -115,7 +115,7 @@ CACHE_RELATIONSHIP Cache; GROUP_RELATIONSHIP Group; } DUMMYUNIONNAME; -} SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX, *PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX;; +} SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX, *PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX; /* Processor features */ #define PF_FLOATING_POINT_PRECISION_ERRATA 0 Modified: trunk/reactos/include/xdk/ntbasedef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/ntbasedef.h?re… ============================================================================== --- trunk/reactos/include/xdk/ntbasedef.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/ntbasedef.h [iso-8859-1] Thu Feb 4 20:42:07 2016 @@ -322,7 +322,7 @@ typedef void * POINTER_64 PVOID64; /* Handle Type */ -typedef void *HANDLE, **PHANDLE;; +typedef void *HANDLE, **PHANDLE; #ifdef STRICT #define DECLARE_HANDLE(n) typedef struct n##__{int unused;} *n #else @@ -367,7 +367,7 @@ typedef unsigned char BOOLEAN, *PBOOLEAN; $if(_NTDEF_) typedef ULONG LOGICAL, *PLOGICAL; -typedef _Return_type_success_(return >= 0) LONG NTSTATUS, *PNTSTATUS;; +typedef _Return_type_success_(return >= 0) LONG NTSTATUS, *PNTSTATUS; typedef signed char SCHAR, *PSCHAR; $endif(_NTDEF_) Modified: trunk/reactos/lib/cryptlib/mvAesAlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cryptlib/mvAesAlg.c?re… ============================================================================== --- trunk/reactos/lib/cryptlib/mvAesAlg.c [iso-8859-1] (original) +++ trunk/reactos/lib/cryptlib/mvAesAlg.c [iso-8859-1] Thu Feb 4 20:42:07 2016 @@ -155,7 +155,7 @@ } for(i = 0; i < 4; i++) /*for(j = 0; j < BC; j++) a[i][j] = b[i][j];*/ - ((MV_U32*)(&(a[i][0])))[0] = ((MV_U32*)(&(b[i][0])))[0] ^ ((MV_U32*)(&(rk[i][0])))[0];; + ((MV_U32*)(&(a[i][0])))[0] = ((MV_U32*)(&(b[i][0])))[0] ^ ((MV_U32*)(&(rk[i][0])))[0]; } void InvMixColumn(MV_U8 a[4][MAXBC]) { Modified: trunk/reactos/lib/rossym_new/dwarfinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym_new/dwarfinfo.c… ============================================================================== --- trunk/reactos/lib/rossym_new/dwarfinfo.c [iso-8859-1] (original) +++ trunk/reactos/lib/rossym_new/dwarfinfo.c [iso-8859-1] Thu Feb 4 20:42:07 2016 @@ -852,7 +852,7 @@ stackpush(&stack, val); } break; case OpFbreg: { - ulong val, offset = dwarfget128s(buf);; + ulong val, offset = dwarfget128s(buf); void* addr = (void*)cfa; werrstr("FBREG cfa %x offset %x", cfa, offset); if (!RosSymCallbacks.MemGetProc Modified: trunk/reactos/lib/rtl/slist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/slist.c?rev=70690&… ============================================================================== --- trunk/reactos/lib/rtl/slist.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/slist.c [iso-8859-1] Thu Feb 4 20:42:07 2016 @@ -70,7 +70,7 @@ #if defined(_IA64_) /* On Itanium we stored the region in the list head */ - Pointer.Region = SListHead->Region;; + Pointer.Region = SListHead->Region; #else /* On amd64 we just use the list head itself */ Pointer.Region = (ULONG64)SListHead; Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irp.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] Thu Feb 4 20:42:07 2016 @@ -665,7 +665,7 @@ i--; /* First, sleep for 10ms */ - Sleep.QuadPart = -10 * 1000 * 10;; + Sleep.QuadPart = -10 * 1000 * 10; KeDelayExecutionThread(KernelMode, FALSE, &Sleep); /* Then, retry allocation */ Modified: trunk/reactos/ntoskrnl/mm/amd64/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/amd64/page.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/amd64/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/amd64/page.c [iso-8859-1] Thu Feb 4 20:42:07 2016 @@ -480,7 +480,7 @@ /* Return information to the caller */ if (WasDirty) - *WasDirty = (BOOLEAN)OldPte.u.Hard.Dirty;; + *WasDirty = (BOOLEAN)OldPte.u.Hard.Dirty; if (Page) *Page = Pfn; Modified: trunk/reactos/win32ss/gdi/gdi32/wine/rosglue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/wine/ros… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/wine/rosglue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/wine/rosglue.c [iso-8859-1] Thu Feb 4 20:42:07 2016 @@ -854,7 +854,7 @@ _va_arg_n(argptr, const POINT*, 0), _va_arg_n(argptr, DWORD, 1)); case DCFUNC_PolyDraw: - DPRINT1("DCFUNC_PolyDraw not implemented\n");; + DPRINT1("DCFUNC_PolyDraw not implemented\n"); return FALSE; return physdev->funcs->pPolyDraw(physdev, _va_arg_n(argptr, const POINT*, 1), @@ -869,7 +869,7 @@ _va_arg_n(argptr, const POINT*, 0), _va_arg_n(argptr, INT, 1)); case DCFUNC_PolylineTo: - DPRINT1("DCFUNC_PolylineTo not implemented\n");; + DPRINT1("DCFUNC_PolylineTo not implemented\n"); return FALSE; return physdev->funcs->pPolylineTo(physdev, _va_arg_n(argptr, const POINT*, 0), Modified: trunk/reactos/win32ss/gdi/ntgdi/dcutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dcutil.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dcutil.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dcutil.c [iso-8859-1] Thu Feb 4 20:42:07 2016 @@ -272,7 +272,7 @@ EngSetLastError(ERROR_INVALID_HANDLE); return CLR_INVALID; } - GraphicsMode = dc->pdcattr->iGraphicsMode;; + GraphicsMode = dc->pdcattr->iGraphicsMode; DC_UnlockDc(dc); return GraphicsMode; } Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dibobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] Thu Feb 4 20:42:07 2016 @@ -766,7 +766,7 @@ Info->bmiHeader.biWidth = psurf->SurfObj.sizlBitmap.cx; Info->bmiHeader.biHeight = (psurf->SurfObj.fjBitmap & BMF_TOPDOWN) ? -psurf->SurfObj.sizlBitmap.cy : - psurf->SurfObj.sizlBitmap.cy;; + psurf->SurfObj.sizlBitmap.cy; Info->bmiHeader.biPlanes = 1; Info->bmiHeader.biBitCount = BitsPerFormat(psurf->SurfObj.iBitmapFormat); Info->bmiHeader.biSizeImage = DIB_GetDIBImageBytes( Info->bmiHeader.biWidth, Modified: trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c [iso-8859-1] Thu Feb 4 20:42:07 2016 @@ -15,7 +15,7 @@ extern ULONG gulFirstFree; extern ULONG gulFirstUnused; -extern PENTRY gpentHmgr;; +extern PENTRY gpentHmgr; ULONG gulLogUnique = 0; Modified: trunk/reactos/win32ss/user/ntuser/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/kbdlay… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/kbdlayout.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/kbdlayout.c [iso-8859-1] Thu Feb 4 20:42:07 2016 @@ -466,7 +466,7 @@ pti = PsGetThreadWin32Thread(pThread); pKl = pti->KeyboardLayout; - hKl = pKl ? pKl->hkl : NULL;; + hKl = pKl ? pKl->hkl : NULL; ObDereferenceObject(pThread); return hKl; } Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Thu Feb 4 20:42:07 2016 @@ -773,7 +773,7 @@ if (KEvent) { - Message->pkCompletionEvent = &Message->CompletionEvent;; + Message->pkCompletionEvent = &Message->CompletionEvent; KeInitializeEvent(Message->pkCompletionEvent, NotificationEvent, FALSE); } Modified: trunk/reactos/win32ss/user/user32/misc/imm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/i… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/imm.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/imm.c [iso-8859-1] Thu Feb 4 20:42:07 2016 @@ -65,7 +65,7 @@ BOOL WINAPI IntInitializeImmEntryTable(VOID) { WCHAR ImmFile[MAX_PATH]; - HMODULE imm32 = ghImm32;; + HMODULE imm32 = ghImm32; if (gImmApiEntries.pImmIsIME != 0) {

1 0

[hbelusca] 70689: [CODE]: s/interupt/interrupt/
by hbelusca＠svn.reactos.org 04 Feb '16

04 Feb '16

Author: hbelusca Date: Thu Feb 4 20:27:44 2016 New Revision: 70689 URL: http://svn.reactos.org/svn/reactos?rev=70689&view=rev Log: [CODE]: s/interupt/interrupt/ Modified: trunk/reactos/boot/freeldr/freeldr/arch/realmode/int386.inc trunk/reactos/drivers/usb/usbohci/hardware.h trunk/reactos/hal/halx86/apic/tsc.c trunk/reactos/ntoskrnl/ex/interlocked.c trunk/reactos/ntoskrnl/ke/amd64/stubs.c trunk/reactos/ntoskrnl/ke/arm/thrdini.c trunk/reactos/ntoskrnl/ke/i386/thrdini.c trunk/reactos/ntoskrnl/ke/i386/traphdlr.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/realmode/int386.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/realmode/int386.inc [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/realmode/int386.inc [iso-8859-1] Thu Feb 4 20:27:44 2016 @@ -13,7 +13,7 @@ push gs pushad - /* Get the interupt vector and patch the opcode */ + /* Get the interrupt vector and patch the opcode */ mov al, byte ptr ds:[BSS_IntVector] mov byte ptr ds:[Int386_vector_opcode], al Modified: trunk/reactos/drivers/usb/usbohci/hardware.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbohci/hardware.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbohci/hardware.h [iso-8859-1] Thu Feb 4 20:27:44 2016 @@ -151,7 +151,7 @@ | OHCI_BULK_LIST_ENABLE) // -// All interupts +// All interrupts // #define OHCI_ALL_INTERRUPTS (OHCI_SCHEDULING_OVERRUN \ | OHCI_WRITEBACK_DONE_HEAD \ @@ -163,7 +163,7 @@ | OHCI_OWNERSHIP_CHANGE) // -// All normal interupts +// All normal interrupts // #define OHCI_NORMAL_INTERRUPTS (OHCI_SCHEDULING_OVERRUN \ | OHCI_WRITEBACK_DONE_HEAD \ Modified: trunk/reactos/hal/halx86/apic/tsc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/apic/tsc.c?rev=… ============================================================================== --- trunk/reactos/hal/halx86/apic/tsc.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/apic/tsc.c [iso-8859-1] Thu Feb 4 20:27:44 2016 @@ -89,7 +89,7 @@ /* Reset TSC value to 0 */ __writemsr(MSR_RDTSC, 0); - /* Enable the timer interupt */ + /* Enable the timer interrupt */ HalEnableSystemInterrupt(HalpRtcClockVector, CLOCK_LEVEL, Latched); /* Read register C, so that the next interrupt can happen */ @@ -103,7 +103,7 @@ /* Disable the periodic interrupt in the CMOS */ HalpWriteCmos(RTC_REGISTER_B, RegisterB & ~RTC_REG_B_PI); - /* Disable the timer interupt */ + /* Disable the timer interrupt */ HalDisableSystemInterrupt(HalpRtcClockVector, CLOCK_LEVEL); /* Restore old IDT entry */ Modified: trunk/reactos/ntoskrnl/ex/interlocked.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/interlocked.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ex/interlocked.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/interlocked.c [iso-8859-1] Thu Feb 4 20:27:44 2016 @@ -29,7 +29,7 @@ FORCEINLINE BOOLEAN -_ExiDisableInteruptsAndAcquireSpinlock( +_ExiDisableInterruptsAndAcquireSpinlock( IN OUT PKSPIN_LOCK Lock) { BOOLEAN Enabled; @@ -45,7 +45,7 @@ FORCEINLINE VOID -_ExiReleaseSpinLockAndRestoreInterupts( +_ExiReleaseSpinLockAndRestoreInterrupts( IN OUT PKSPIN_LOCK Lock, BOOLEAN Enable) { @@ -68,7 +68,7 @@ BOOLEAN Enable; /* Disable interrupts and acquire the spinlock */ - Enable = _ExiDisableInteruptsAndAcquireSpinlock(Lock); + Enable = _ExiDisableInterruptsAndAcquireSpinlock(Lock); /* Save the old value */ OldValue.QuadPart = Addend->QuadPart; @@ -77,7 +77,7 @@ Addend->QuadPart += Increment.QuadPart; /* Release the spinlock and restore interrupts */ - _ExiReleaseSpinLockAndRestoreInterupts(Lock, Enable); + _ExiReleaseSpinLockAndRestoreInterrupts(Lock, Enable); /* Return the old value */ return OldValue; @@ -94,7 +94,7 @@ ULONG OldValue; /* Disable interrupts and acquire the spinlock */ - Enable = _ExiDisableInteruptsAndAcquireSpinlock(Lock); + Enable = _ExiDisableInterruptsAndAcquireSpinlock(Lock); /* Save the old value */ OldValue = *Addend; @@ -103,7 +103,7 @@ *Addend += Increment; /* Release the spinlock and restore interrupts */ - _ExiReleaseSpinLockAndRestoreInterupts(Lock, Enable); + _ExiReleaseSpinLockAndRestoreInterrupts(Lock, Enable); /* Return the old value */ return OldValue; @@ -120,7 +120,7 @@ PLIST_ENTRY FirstEntry; /* Disable interrupts and acquire the spinlock */ - Enable = _ExiDisableInteruptsAndAcquireSpinlock(Lock); + Enable = _ExiDisableInterruptsAndAcquireSpinlock(Lock); /* Save the first entry */ FirstEntry = ListHead->Flink; @@ -129,7 +129,7 @@ InsertHeadList(ListHead, ListEntry); /* Release the spinlock and restore interrupts */ - _ExiReleaseSpinLockAndRestoreInterupts(Lock, Enable); + _ExiReleaseSpinLockAndRestoreInterrupts(Lock, Enable); /* Return the old first entry or NULL for empty list */ return (FirstEntry == ListHead) ? NULL : FirstEntry; @@ -146,7 +146,7 @@ PLIST_ENTRY LastEntry; /* Disable interrupts and acquire the spinlock */ - Enable = _ExiDisableInteruptsAndAcquireSpinlock(Lock); + Enable = _ExiDisableInterruptsAndAcquireSpinlock(Lock); /* Save the last entry */ LastEntry = ListHead->Blink; @@ -155,7 +155,7 @@ InsertTailList(ListHead, ListEntry); /* Release the spinlock and restore interrupts */ - _ExiReleaseSpinLockAndRestoreInterupts(Lock, Enable); + _ExiReleaseSpinLockAndRestoreInterrupts(Lock, Enable); /* Return the old last entry or NULL for empty list */ return (LastEntry == ListHead) ? NULL : LastEntry; @@ -171,7 +171,7 @@ PLIST_ENTRY ListEntry; /* Disable interrupts and acquire the spinlock */ - Enable = _ExiDisableInteruptsAndAcquireSpinlock(Lock); + Enable = _ExiDisableInterruptsAndAcquireSpinlock(Lock); /* Check if the list is empty */ if (IsListEmpty(ListHead)) @@ -190,7 +190,7 @@ } /* Release the spinlock and restore interrupts */ - _ExiReleaseSpinLockAndRestoreInterupts(Lock, Enable); + _ExiReleaseSpinLockAndRestoreInterrupts(Lock, Enable); /* Return the entry */ return ListEntry; @@ -206,7 +206,7 @@ PSINGLE_LIST_ENTRY ListEntry; /* Disable interrupts and acquire the spinlock */ - Enable = _ExiDisableInteruptsAndAcquireSpinlock(Lock); + Enable = _ExiDisableInterruptsAndAcquireSpinlock(Lock); /* Pop the first entry from the list */ ListEntry = PopEntryList(ListHead); @@ -216,7 +216,7 @@ #endif /* Release the spinlock and restore interrupts */ - _ExiReleaseSpinLockAndRestoreInterupts(Lock, Enable); + _ExiReleaseSpinLockAndRestoreInterrupts(Lock, Enable); /* Return the entry */ return ListEntry; @@ -233,7 +233,7 @@ PSINGLE_LIST_ENTRY OldListEntry; /* Disable interrupts and acquire the spinlock */ - Enable = _ExiDisableInteruptsAndAcquireSpinlock(Lock); + Enable = _ExiDisableInterruptsAndAcquireSpinlock(Lock); /* Save the old top entry */ OldListEntry = ListHead->Next; @@ -242,7 +242,7 @@ PushEntryList(ListHead, ListEntry); /* Release the spinlock and restore interrupts */ - _ExiReleaseSpinLockAndRestoreInterupts(Lock, Enable); + _ExiReleaseSpinLockAndRestoreInterrupts(Lock, Enable); /* Return the entry */ return OldListEntry; @@ -299,7 +299,7 @@ ULONG OldValue; /* Disable interrupts and acquire the spinlock */ - Enable = _ExiDisableInteruptsAndAcquireSpinlock(Lock); + Enable = _ExiDisableInterruptsAndAcquireSpinlock(Lock); /* Save the old value */ OldValue = *Addend; @@ -308,7 +308,7 @@ *Addend += Increment; /* Release the spinlock and restore interrupts */ - _ExiReleaseSpinLockAndRestoreInterupts(Lock, Enable); + _ExiReleaseSpinLockAndRestoreInterrupts(Lock, Enable); /* Return the old value */ return OldValue; @@ -325,7 +325,7 @@ PLIST_ENTRY FirstEntry; /* Disable interrupts and acquire the spinlock */ - Enable = _ExiDisableInteruptsAndAcquireSpinlock(Lock); + Enable = _ExiDisableInterruptsAndAcquireSpinlock(Lock); /* Save the first entry */ FirstEntry = ListHead->Flink; @@ -334,7 +334,7 @@ InsertHeadList(ListHead, ListEntry); /* Release the spinlock and restore interrupts */ - _ExiReleaseSpinLockAndRestoreInterupts(Lock, Enable); + _ExiReleaseSpinLockAndRestoreInterrupts(Lock, Enable); /* Return the old first entry or NULL for empty list */ return (FirstEntry == ListHead) ? NULL : FirstEntry; @@ -351,7 +351,7 @@ PLIST_ENTRY LastEntry; /* Disable interrupts and acquire the spinlock */ - Enable = _ExiDisableInteruptsAndAcquireSpinlock(Lock); + Enable = _ExiDisableInterruptsAndAcquireSpinlock(Lock); /* Save the last entry */ LastEntry = ListHead->Blink; @@ -360,7 +360,7 @@ InsertTailList(ListHead, ListEntry); /* Release the spinlock and restore interrupts */ - _ExiReleaseSpinLockAndRestoreInterupts(Lock, Enable); + _ExiReleaseSpinLockAndRestoreInterrupts(Lock, Enable); /* Return the old last entry or NULL for empty list */ return (LastEntry == ListHead) ? NULL : LastEntry; @@ -377,7 +377,7 @@ PLIST_ENTRY ListEntry; /* Disable interrupts and acquire the spinlock */ - Enable = _ExiDisableInteruptsAndAcquireSpinlock(Lock); + Enable = _ExiDisableInterruptsAndAcquireSpinlock(Lock); /* Check if the list is empty */ if (IsListEmpty(ListHead)) @@ -396,7 +396,7 @@ } /* Release the spinlock and restore interrupts */ - _ExiReleaseSpinLockAndRestoreInterupts(Lock, Enable); + _ExiReleaseSpinLockAndRestoreInterrupts(Lock, Enable); /* return the entry */ return ListEntry; @@ -412,7 +412,7 @@ PSINGLE_LIST_ENTRY ListEntry; /* Disable interrupts and acquire the spinlock */ - Enable = _ExiDisableInteruptsAndAcquireSpinlock(Lock); + Enable = _ExiDisableInterruptsAndAcquireSpinlock(Lock); /* Pop the first entry from the list */ ListEntry = PopEntryList(ListHead); @@ -422,7 +422,7 @@ #endif /* Release the spinlock and restore interrupts */ - _ExiReleaseSpinLockAndRestoreInterupts(Lock, Enable); + _ExiReleaseSpinLockAndRestoreInterrupts(Lock, Enable); /* return the entry */ return ListEntry; @@ -439,7 +439,7 @@ PSINGLE_LIST_ENTRY OldListEntry; /* Disable interrupts and acquire the spinlock */ - Enable = _ExiDisableInteruptsAndAcquireSpinlock(Lock); + Enable = _ExiDisableInterruptsAndAcquireSpinlock(Lock); /* Save the old top entry */ OldListEntry = ListHead->Next; @@ -448,7 +448,7 @@ PushEntryList(ListHead, ListEntry); /* Release the spinlock and restore interrupts */ - _ExiReleaseSpinLockAndRestoreInterupts(Lock, Enable); + _ExiReleaseSpinLockAndRestoreInterrupts(Lock, Enable); /* return the entry */ return OldListEntry; Modified: trunk/reactos/ntoskrnl/ke/amd64/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/amd64/stubs.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/amd64/stubs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/amd64/stubs.c [iso-8859-1] Thu Feb 4 20:27:44 2016 @@ -139,7 +139,7 @@ /* Check if a new thread is scheduled for execution */ if (Prcb->NextThread) { - /* Enable interupts */ + /* Enable interrupts */ _enable(); /* Capture current thread data */ Modified: trunk/reactos/ntoskrnl/ke/arm/thrdini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/thrdini.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/thrdini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/thrdini.c [iso-8859-1] Thu Feb 4 20:27:44 2016 @@ -179,7 +179,7 @@ /* Check if a new thread is scheduled for execution */ if (Prcb->NextThread) { - /* Enable interupts */ + /* Enable interrupts */ _enable(); /* Capture current thread data */ Modified: trunk/reactos/ntoskrnl/ke/i386/thrdini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/thrdini.c… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/thrdini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/thrdini.c [iso-8859-1] Thu Feb 4 20:27:44 2016 @@ -294,7 +294,7 @@ /* Check if a new thread is scheduled for execution */ if (Prcb->NextThread) { - /* Enable interupts */ + /* Enable interrupts */ _enable(); /* Capture current thread data */ Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Thu Feb 4 20:27:44 2016 @@ -1219,7 +1219,7 @@ /* Save CR2 */ Cr2 = __readcr2(); - /* Enable interupts */ + /* Enable interrupts */ _enable(); /* Check if we came in with interrupts disabled */

1 0

[hbelusca] 70688: [FREELDR]: Export RtlAssert.
by hbelusca＠svn.reactos.org 03 Feb '16

03 Feb '16

Author: hbelusca Date: Wed Feb 3 22:56:17 2016 New Revision: 70688 URL: http://svn.reactos.org/svn/reactos?rev=70688&view=rev Log: [FREELDR]: Export RtlAssert. Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.spec Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr.spec [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr.spec [iso-8859-1] Wed Feb 3 22:56:17 2016 @@ -1,3 +1,4 @@ +@ stdcall RtlAssert(ptr ptr long ptr) @ cdecl ScsiDebugPrint() @ stdcall ScsiPortCompleteRequest(ptr long long long long) @ stdcall ScsiPortConvertPhysicalAddressToUlong(long long)

1 0

[hbelusca] 70687: [FREELDR] - The PE code can be built as an executable, it works as expected and nothing changes (the size of the generated code doesn't change). - Export the Scsi functions also o...
by hbelusca＠svn.reactos.org 03 Feb '16

03 Feb '16

Author: hbelusca Date: Wed Feb 3 22:18:05 2016 New Revision: 70687 URL: http://svn.reactos.org/svn/reactos?rev=70687&view=rev Log: [FREELDR] - The PE code can be built as an executable, it works as expected and nothing changes (the size of the generated code doesn't change). - Export the Scsi functions also on x86 MSVC builds. Because of that, increase the number of expected PE sections in the FreeLdr image check function. Note that x64 MSVC build do not have the Scsi code ready yet, hence it doesn't export the corresponding functions. - The spec2def command should have the name of the generated PE file. - Remove one hardcoded value. During my investigations I noticed that using a section alignment of 0x400 for freeldr MSVC builds (instead of the default 0x1000) made the MSVC builds *bigger*. Furthermore, using the default alignment of 0x1000 makes the freeldr MSVC builds unbootable. I don't understand why. Maybe a freeldr guru knows that? Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt trunk/reactos/boot/freeldr/freeldr/include/mm.h trunk/reactos/boot/freeldr/freeldr/mm/meminit.c Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Wed Feb 3 22:18:05 2016 @@ -10,7 +10,7 @@ replace_compile_flags("/hotpatch" " ") endif() -spec2def(freeldr.sys freeldr.spec) +spec2def(freeldr_pe.exe freeldr.spec) if(ARCH STREQUAL "i386") CreateBootSectorTarget(frldr16 @@ -177,12 +177,14 @@ lib/inffile/inffile.c lib/rtl/libsupp.c) -if(NOT MSVC) - list(APPEND FREELDR_BASE_SOURCE ${CMAKE_CURRENT_BINARY_DIR}/freeldr.def) -endif() - -add_library(freeldr_pe SHARED ${FREELDR_BASE_SOURCE}) -add_library(freeldr_pe_dbg SHARED EXCLUDE_FROM_ALL ${FREELDR_BASE_SOURCE}) +if(ARCH STREQUAL "i386") + # Must be included together with disk/scsiport.c + list(APPEND FREELDR_BASE_SOURCE + ${CMAKE_CURRENT_BINARY_DIR}/freeldr_pe.def) +endif() + +add_executable(freeldr_pe ${FREELDR_BASE_SOURCE}) +add_executable(freeldr_pe_dbg EXCLUDE_FROM_ALL ${FREELDR_BASE_SOURCE}) if(NOT MSVC AND SEPARATE_DBG) set_target_properties(freeldr_pe PROPERTIES LINKER_LANGUAGE LDR_PE_HELPER) @@ -234,12 +236,10 @@ get_target_property(_freeldr_pe_output_file freeldr_pe LOCATION) if(NOT ARCH STREQUAL "arm") - concatenate_files( ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys ${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin ${_freeldr_pe_output_file}) - add_custom_target(freeldr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys) else() add_custom_target(freeldr ALL DEPENDS ${_freeldr_pe_output_file}) @@ -250,16 +250,13 @@ add_cd_file(TARGET freeldr FILE ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys DESTINATION loader NO_CAB NOT_IN_HYBRIDCD FOR livecd hybridcd NAME_ON_CD setupldr.sys) if(NOT ARCH STREQUAL "arm") - concatenate_files( ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys ${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin ${_freeldr_pe_output_file}) - add_custom_target(setupldr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys) else() add_custom_target(setupldr ALL DEPENDS ${_freeldr_pe_output_file}) endif() add_cd_file(TARGET setupldr FILE ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys DESTINATION loader NO_CAB FOR bootcd regtest) - Modified: trunk/reactos/boot/freeldr/freeldr/include/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/mm.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/mm.h [iso-8859-1] Wed Feb 3 22:18:05 2016 @@ -21,13 +21,15 @@ extern char __ImageBase; #ifdef __GNUC__ +/* .text, .edata and .bss */ #define FREELDR_SECTION_COUNT 3 #else #ifdef _M_AMD64 /* .text and .pdata */ #define FREELDR_SECTION_COUNT 2 #else -#define FREELDR_SECTION_COUNT 1 +/* .text and .edata */ +#define FREELDR_SECTION_COUNT 2 #endif #endif Modified: trunk/reactos/boot/freeldr/freeldr/mm/meminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/me… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/meminit.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/meminit.c [iso-8859-1] Wed Feb 3 22:18:05 2016 @@ -258,8 +258,8 @@ FileHeader = &NtHeaders->FileHeader; if ((FileHeader->Machine != IMAGE_FILE_MACHINE_NATIVE) || (FileHeader->NumberOfSections != FREELDR_SECTION_COUNT) || - (FileHeader->PointerToSymbolTable != 0) || - (FileHeader->NumberOfSymbols != 0) || + (FileHeader->PointerToSymbolTable != 0) || // Symbols stripped + (FileHeader->NumberOfSymbols != 0) || // "" "" (FileHeader->SizeOfOptionalHeader != sizeof(IMAGE_OPTIONAL_HEADER))) { ERR("FreeLdr FileHeader is invalid.\n"); @@ -283,7 +283,7 @@ /* Check the optional header */ OptionalHeader = &NtHeaders->OptionalHeader; if ((OptionalHeader->Magic != IMAGE_NT_OPTIONAL_HDR_MAGIC) || - (OptionalHeader->Subsystem != 1) || // native + (OptionalHeader->Subsystem != IMAGE_SUBSYSTEM_NATIVE) || (OptionalHeader->ImageBase != FREELDR_PE_BASE) || (OptionalHeader->SizeOfImage > MAX_FREELDR_PE_SIZE) || (OptionalHeader->SectionAlignment != OptionalHeader->FileAlignment))

1 0

[hbelusca] 70686: [BOOTMGR] - Make BmMain stdcall as it's an entry point, the same way as ROSLOAD's OslMain. [ROSLOAD] - Fix a comment. - Fix compilation on x64 and on GCC by specifying the entrypo...
by hbelusca＠svn.reactos.org 03 Feb '16

03 Feb '16

Author: hbelusca Date: Wed Feb 3 19:12:34 2016 New Revision: 70686 URL: http://svn.reactos.org/svn/reactos?rev=70686&view=rev Log: [BOOTMGR] - Make BmMain stdcall as it's an entry point, the same way as ROSLOAD's OslMain. [ROSLOAD] - Fix a comment. - Fix compilation on x64 and on GCC by specifying the entrypoint stack, exactly as what we do for KiSystemStartup in the kernel. Modified: trunk/reactos/boot/environ/CMakeLists.txt trunk/reactos/boot/environ/app/bootmgr/bootmgr.c trunk/reactos/boot/environ/app/bootmgr/bootmgr.h trunk/reactos/boot/environ/app/rosload/rosload.c Modified: trunk/reactos/boot/environ/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/CMakeLists.tx… ============================================================================== --- trunk/reactos/boot/environ/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/environ/CMakeLists.txt [iso-8859-1] Wed Feb 3 19:12:34 2016 @@ -126,7 +126,11 @@ set_subsystem(rosload 16) endif() -set_entrypoint(rosload OslMain@4) +if(ARCH STREQUAL "i386") + set_entrypoint(rosload OslMain 4) +else() + set_entrypoint(rosload OslMain) +endif() target_link_libraries(rosload bootlib cportlib cmlib rtl libcntpr) Modified: trunk/reactos/boot/environ/app/bootmgr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/app/bootmgr/b… ============================================================================== --- trunk/reactos/boot/environ/app/bootmgr/bootmgr.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/app/bootmgr/bootmgr.c [iso-8859-1] Wed Feb 3 19:12:34 2016 @@ -2724,6 +2724,7 @@ * *--*/ NTSTATUS +NTAPI BmMain ( _In_ PBOOT_APPLICATION_PARAMETER_BLOCK BootParameters ) Modified: trunk/reactos/boot/environ/app/bootmgr/bootmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/app/bootmgr/b… ============================================================================== --- trunk/reactos/boot/environ/app/bootmgr/bootmgr.h [iso-8859-1] (original) +++ trunk/reactos/boot/environ/app/bootmgr/bootmgr.h [iso-8859-1] Wed Feb 3 19:12:34 2016 @@ -62,6 +62,7 @@ /* FUNCTIONS *****************************************************************/ NTSTATUS +NTAPI BmMain ( _In_ PBOOT_APPLICATION_PARAMETER_BLOCK BootParameters ); Modified: trunk/reactos/boot/environ/app/rosload/rosload.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/app/rosload/r… ============================================================================== --- trunk/reactos/boot/environ/app/rosload/rosload.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/app/rosload/rosload.c [iso-8859-1] Wed Feb 3 19:12:34 2016 @@ -17,7 +17,7 @@ /*++ * @name OslMain * - * The BmMain function implements the Windows Boot Application entrypoint for + * The OslMain function implements the Windows Boot Application entrypoint for * the OS Loader. * * @param BootParameters

1 0

[jimtabor] 70685: [User32] - Patch by Manuel : Explorer not draw (16 bits) icons. See CORE-10789.
by jimtabor＠svn.reactos.org 03 Feb '16

03 Feb '16

Author: jimtabor Date: Wed Feb 3 16:39:28 2016 New Revision: 70685 URL: http://svn.reactos.org/svn/reactos?rev=70685&view=rev Log: [User32] - Patch by Manuel : Explorer not draw (16 bits) icons. See CORE-10789. Modified: trunk/reactos/win32ss/user/user32/misc/exticon.c Modified: trunk/reactos/win32ss/user/user32/misc/exticon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/e… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/exticon.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/exticon.c [iso-8859-1] Wed Feb 3 16:39:28 2016 @@ -29,6 +29,50 @@ /* Start of Hack section */ WINE_DEFAULT_DEBUG_CHANNEL(icon); + +#include <pshpack1.h> + +typedef struct +{ + BYTE bWidth; /* Width, in pixels, of the image */ + BYTE bHeight; /* Height, in pixels, of the image */ + BYTE bColorCount; /* Number of colors in image (0 if >=8bpp) */ + BYTE bReserved; /* Reserved ( must be 0) */ + WORD wPlanes; /* Color Planes */ + WORD wBitCount; /* Bits per pixel */ + DWORD dwBytesInRes; /* How many bytes in this resource? */ + DWORD dwImageOffset; /* Where in the file is this image? */ +} icoICONDIRENTRY, *LPicoICONDIRENTRY; + +typedef struct +{ + WORD idReserved; /* Reserved (must be 0) */ + WORD idType; /* Resource Type (RES_ICON or RES_CURSOR) */ + WORD idCount; /* How many images */ + icoICONDIRENTRY idEntries[1]; /* An entry for each image (idCount of 'em) */ +} icoICONDIR, *LPicoICONDIR; + +typedef struct +{ + WORD offset; + WORD length; + WORD flags; + WORD id; + WORD handle; + WORD usage; +} NE_NAMEINFO; + +typedef struct +{ + WORD type_id; + WORD count; + DWORD resloader; +} NE_TYPEINFO; + +#define NE_RSCTYPE_ICON 0x8003 +#define NE_RSCTYPE_GROUP_ICON 0x800e + +#include <poppack.h> #if 0 static void dumpIcoDirEnty ( LPicoICONDIRENTRY entry ) @@ -122,7 +166,7 @@ } if (*((DWORD*)(peimage + mz_header->e_lfanew)) == IMAGE_NT_SIGNATURE ) return IMAGE_NT_SIGNATURE; -#ifdef WINE + if (*((WORD*)(peimage + mz_header->e_lfanew)) == IMAGE_OS2_SIGNATURE ) { IMAGE_OS2_HEADER * ne_header; @@ -139,10 +183,8 @@ return IMAGE_OS2_SIGNATURE; } -#endif return 0; /* failed */ } -#ifdef WINE /************************************************************************* * USER32_LoadResource */ @@ -204,7 +246,7 @@ } return 0; } -#endif + /************************************************************************* * ICO_ExtractIconExW [internal] * @@ -281,9 +323,8 @@ sig = USER32_GetResourceTable(peimage, fsizel, &pData); -#ifdef WINE -/* ico file or NE exe/dll*/ - if (sig==IMAGE_OS2_SIGNATURE || sig==1) /* .ICO file */ +/* NE exe/dll */ + if (sig==IMAGE_OS2_SIGNATURE) { BYTE *pCIDir = 0; NE_TYPEINFO *pTInfo = (NE_TYPEINFO*)(pData + 2); @@ -370,7 +411,7 @@ } } } -#else + else if (sig == 1 || sig == 2) /* .ICO or .CUR file */ { TRACE("-- icon Signature (0x%08x)\n", sig); @@ -429,7 +470,6 @@ } ret = iconCount; /* return number of retrieved icons */ } -#endif /* end ico file */ /* exe/dll */

1 0

[hbelusca] 70684: [FREELDR]: Move the (private) HAL Pci bus initialization calls to where they are needed: for SCSI initialization (see r46017).
by hbelusca＠svn.reactos.org 03 Feb '16

03 Feb '16

Author: hbelusca Date: Wed Feb 3 16:30:39 2016 New Revision: 70684 URL: http://svn.reactos.org/svn/reactos?rev=70684&view=rev Log: [FREELDR]: Move the (private) HAL Pci bus initialization calls to where they are needed: for SCSI initialization (see r46017). Removed: trunk/reactos/boot/freeldr/freeldr/include/hal.h Modified: trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c trunk/reactos/boot/freeldr/freeldr/freeldr.c trunk/reactos/boot/freeldr/freeldr/include/freeldr.h Modified: trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c [iso-8859-1] Wed Feb 3 16:30:39 2016 @@ -48,6 +48,11 @@ DBG_DEFAULT_CHANNEL(SCSIPORT); +#ifdef _M_IX86 +VOID NTAPI HalpInitializePciStubs(VOID); +VOID NTAPI HalpInitBusHandler(VOID); +#endif + typedef struct { PVOID NonCachedExtension; @@ -93,6 +98,7 @@ return Dest.AsULong; } +static BOOLEAN SpiSendSynchronousSrb( IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, @@ -366,6 +372,7 @@ DiskSeek, }; +static NTSTATUS SpiCreatePortConfig( IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, @@ -608,6 +615,7 @@ return NULL; } +static NTSTATUS SpiAllocateCommonBuffer( IN OUT PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, @@ -767,6 +775,7 @@ return NULL; } +static VOID SpiScanDevice( IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, @@ -807,6 +816,7 @@ } } +static VOID SpiScanAdapter( IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, @@ -881,6 +891,7 @@ } } +static VOID SpiResourceToConfig( IN PHW_INITIALIZATION_DATA HwInitializationData, @@ -961,9 +972,10 @@ } } +static BOOLEAN SpiGetPciConfigData( - IN struct _HW_INITIALIZATION_DATA *HwInitializationData, + IN PHW_INITIALIZATION_DATA HwInitializationData, IN OUT PPORT_CONFIGURATION_INFORMATION PortConfig, IN ULONG BusNumber, IN OUT PPCI_SLOT_NUMBER NextSlotNumber) @@ -1065,7 +1077,7 @@ ScsiPortInitialize( IN PVOID Argument1, IN PVOID Argument2, - IN struct _HW_INITIALIZATION_DATA *HwInitializationData, + IN PHW_INITIALIZATION_DATA HwInitializationData, IN PVOID HwContext OPTIONAL) { PSCSI_PORT_DEVICE_EXTENSION DeviceExtension; @@ -1575,6 +1587,12 @@ PVOID ImageBase = NULL; ULONG (NTAPI *EntryPoint)(IN PVOID DriverObject, IN PVOID RegistryPath); BOOLEAN Success; + + // FIXME: Must be done *INSIDE* the HAL! +#ifdef _M_IX86 + HalpInitializePciStubs(); + HalpInitBusHandler(); +#endif /* Initialize the loaded module list */ InitializeListHead(&ModuleListHead); Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr.c [iso-8859-1] Wed Feb 3 16:30:39 2016 @@ -53,11 +53,6 @@ goto Quit; } -#ifdef _M_IX86 - HalpInitializePciStubs(); - HalpInitBusHandler(); -#endif - RunLoader(); Quit: Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] Wed Feb 3 16:30:39 2016 @@ -63,7 +63,6 @@ #include <comm.h> #include <disk.h> #include <fs.h> -#include <hal.h> #include <inffile.h> #include <inifile.h> #include <keycodes.h> Removed: trunk/reactos/boot/freeldr/freeldr/include/hal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/hal.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/hal.h (removed) @@ -1,9 +0,0 @@ - -#pragma once - -#ifdef _M_IX86 - -VOID NTAPI HalpInitializePciStubs(VOID); -VOID NTAPI HalpInitBusHandler(VOID); - -#endif

1 0

[hbelusca] 70683: [FREELDR] - Move the NTOS loader files that were scattered in many places into their own directory (now all that stuff is inside freeldr/windows). - Split arch/arm/winldr.c into t...
by hbelusca＠svn.reactos.org 03 Feb '16

03 Feb '16

Author: hbelusca Date: Wed Feb 3 15:20:37 2016 New Revision: 70683 URL: http://svn.reactos.org/svn/reactos?rev=70683&view=rev Log: [FREELDR] - Move the NTOS loader files that were scattered in many places into their own directory (now all that stuff is inside freeldr/windows). - Split arch/arm/winldr.c into the real winldr code (going into freeldr/windows) and entry point code (going into arch/arm/entry.c). Added: trunk/reactos/boot/freeldr/freeldr/arch/arm/entry.c - copied, changed from r70682, trunk/reactos/boot/freeldr/freeldr/arch/arm/winldr.c trunk/reactos/boot/freeldr/freeldr/windows/arch/ trunk/reactos/boot/freeldr/freeldr/windows/arch/amd64/ trunk/reactos/boot/freeldr/freeldr/windows/arch/amd64/winldr.c - copied, changed from r70682, trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c trunk/reactos/boot/freeldr/freeldr/windows/arch/arm/ trunk/reactos/boot/freeldr/freeldr/windows/arch/arm/winldr.c - copied, changed from r70676, trunk/reactos/boot/freeldr/freeldr/arch/arm/winldr.c trunk/reactos/boot/freeldr/freeldr/windows/arch/i386/ trunk/reactos/boot/freeldr/freeldr/windows/arch/i386/halstub.c - copied, changed from r70682, trunk/reactos/boot/freeldr/freeldr/arch/i386/halstub.c trunk/reactos/boot/freeldr/freeldr/windows/arch/i386/ntoskrnl.c - copied, changed from r70682, trunk/reactos/boot/freeldr/freeldr/arch/i386/ntoskrnl.c trunk/reactos/boot/freeldr/freeldr/windows/arch/i386/ntoskrnl.h - copied unchanged from r70682, trunk/reactos/boot/freeldr/freeldr/include/ntoskrnl.h trunk/reactos/boot/freeldr/freeldr/windows/arch/i386/winldr.c - copied, changed from r70682, trunk/reactos/boot/freeldr/freeldr/arch/i386/winldr.c Removed: trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c trunk/reactos/boot/freeldr/freeldr/arch/arm/winldr.c trunk/reactos/boot/freeldr/freeldr/arch/i386/halstub.c trunk/reactos/boot/freeldr/freeldr/arch/i386/ntoskrnl.c trunk/reactos/boot/freeldr/freeldr/arch/i386/winldr.c trunk/reactos/boot/freeldr/freeldr/include/ntoskrnl.h Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c trunk/reactos/boot/freeldr/freeldr/include/freeldr.h trunk/reactos/boot/freeldr/freeldr/include/winldr.h Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Wed Feb 3 15:20:37 2016 @@ -91,7 +91,6 @@ fs/pxe.c arch/i386/archmach.c arch/i386/drivemap.c - arch/i386/halstub.c arch/i386/hardware.c arch/i386/hwacpi.c arch/i386/hwapm.c @@ -103,7 +102,6 @@ arch/i386/i386rtl.c arch/i386/i386vid.c arch/i386/machpc.c - arch/i386/ntoskrnl.c arch/i386/pccons.c arch/i386/pcdisk.c arch/i386/pcmem.c @@ -118,7 +116,9 @@ arch/i386/xboxmem.c arch/i386/xboxrtc.c arch/i386/xboxvideo.c - arch/i386/winldr.c + windows/arch/i386/halstub.c + windows/arch/i386/ntoskrnl.c + windows/arch/i386/winldr.c windows/headless.c disk/scsiport.c) if(NOT MSVC) @@ -142,19 +142,20 @@ arch/i386/i386disk.c arch/i386/i386vid.c arch/i386/machpc.c - arch/i386/ntoskrnl.c arch/i386/pccons.c arch/i386/pcdisk.c arch/i386/pcmem.c arch/i386/pcrtc.c arch/i386/pcvideo.c - arch/amd64/winldr.c) + windows/arch/i386/ntoskrnl.c + windows/arch/amd64/winldr.c) elseif(ARCH STREQUAL "arm") list(APPEND FREELDR_COMMON_ASM_SOURCE arch/arm/boot.S) list(APPEND FREELDR_COMMON_SOURCE + arch/arm/entry.c arch/arm/macharm.c - arch/arm/winldr.c) + windows/arch/arm/winldr.c) else() #TBD endif() @@ -193,7 +194,7 @@ add_target_link_flags(freeldr_pe "/ignore:4078 /ignore:4254 /DRIVER") add_target_link_flags(freeldr_pe_dbg "/ignore:4078 /ignore:4254 /DRIVER") else() - add_target_link_flags(freeldr_pe "/ignore:4078 /ignore:4254 /DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text ") + add_target_link_flags(freeldr_pe "/ignore:4078 /ignore:4254 /DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text") add_target_link_flags(freeldr_pe_dbg "/ignore:4078 /ignore:4254 /DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text") endif() else() Removed: trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c (removed) @@ -1,424 +0,0 @@ -/* - * PROJECT: EFI Windows Loader - * LICENSE: GPL - See COPYING in the top level directory - * FILE: boot/freeldr/freeldr/arch/amd64/winldr.c - * PURPOSE: Memory related routines - * PROGRAMMERS: Timo Kreuzer (timo.kreuzer(a)reactos.org) - */ - -/* INCLUDES ***************************************************************/ - -#include <freeldr.h> - -#include <ndk/asm.h> -#include <debug.h> - -//extern ULONG LoaderPagesSpanned; - -DBG_DEFAULT_CHANNEL(WINDOWS); - -/* GLOBALS ***************************************************************/ - -PHARDWARE_PTE PxeBase; -//PHARDWARE_PTE HalPageTable; - -PVOID GdtIdt; -ULONG_PTR PcrBasePage; -ULONG_PTR TssBasePage; - -/* FUNCTIONS **************************************************************/ - -BOOLEAN -MempAllocatePageTables(VOID) -{ - TRACE(">>> MempAllocatePageTables\n"); - - /* Allocate a page for the PML4 */ - PxeBase = MmAllocateMemoryWithType(PAGE_SIZE, LoaderMemoryData); - if (!PxeBase) - { - ERR("failed to allocate PML4\n"); - return FALSE; - } - - // FIXME: Physical PTEs = FirmwareTemporary ? - - /* Zero the PML4 */ - RtlZeroMemory(PxeBase, PAGE_SIZE); - - /* The page tables are located at 0xfffff68000000000 - * We create a recursive self mapping through all 4 levels at - * virtual address 0xfffff6fb7dbedf68 */ - PxeBase[VAtoPXI(PXE_BASE)].Valid = 1; - PxeBase[VAtoPXI(PXE_BASE)].Write = 1; - PxeBase[VAtoPXI(PXE_BASE)].PageFrameNumber = PtrToPfn(PxeBase); - - // FIXME: map PDE's for hals memory mapping - - TRACE(">>> leave MempAllocatePageTables\n"); - - return TRUE; -} - -PHARDWARE_PTE -MempGetOrCreatePageDir(PHARDWARE_PTE PdeBase, ULONG Index) -{ - PHARDWARE_PTE SubDir; - - if (!PdeBase) - return NULL; - - if (!PdeBase[Index].Valid) - { - SubDir = MmAllocateMemoryWithType(PAGE_SIZE, LoaderMemoryData); - if (!SubDir) - return NULL; - RtlZeroMemory(SubDir, PAGE_SIZE); - PdeBase[Index].PageFrameNumber = PtrToPfn(SubDir); - PdeBase[Index].Valid = 1; - PdeBase[Index].Write = 1; - } - else - { - SubDir = (PVOID)((ULONG64)(PdeBase[Index].PageFrameNumber) * PAGE_SIZE); - } - return SubDir; -} - -BOOLEAN -MempMapSinglePage(ULONG64 VirtualAddress, ULONG64 PhysicalAddress) -{ - PHARDWARE_PTE PpeBase, PdeBase, PteBase; - ULONG Index; - - PpeBase = MempGetOrCreatePageDir(PxeBase, VAtoPXI(VirtualAddress)); - PdeBase = MempGetOrCreatePageDir(PpeBase, VAtoPPI(VirtualAddress)); - PteBase = MempGetOrCreatePageDir(PdeBase, VAtoPDI(VirtualAddress)); - - if (!PteBase) - { - ERR("!!!No Dir %p, %p, %p, %p\n", PxeBase, PpeBase, PdeBase, PteBase); - return FALSE; - } - - Index = VAtoPTI(VirtualAddress); - if (PteBase[Index].Valid) - { - ERR("!!!Already mapped %ld\n", Index); - return FALSE; - } - - PteBase[Index].Valid = 1; - PteBase[Index].Write = 1; - PteBase[Index].PageFrameNumber = PhysicalAddress / PAGE_SIZE; - - return TRUE; -} - -BOOLEAN -MempIsPageMapped(PVOID VirtualAddress) -{ - PHARDWARE_PTE PpeBase, PdeBase, PteBase; - ULONG Index; - - Index = VAtoPXI(VirtualAddress); - if (!PxeBase[Index].Valid) - return FALSE; - - PpeBase = (PVOID)((ULONG64)(PxeBase[Index].PageFrameNumber) * PAGE_SIZE); - Index = VAtoPPI(VirtualAddress); - if (!PpeBase[Index].Valid) - return FALSE; - - PdeBase = (PVOID)((ULONG64)(PpeBase[Index].PageFrameNumber) * PAGE_SIZE); - Index = VAtoPDI(VirtualAddress); - if (!PdeBase[Index].Valid) - return FALSE; - - PteBase = (PVOID)((ULONG64)(PdeBase[Index].PageFrameNumber) * PAGE_SIZE); - Index = VAtoPTI(VirtualAddress); - if (!PteBase[Index].Valid) - return FALSE; - - return TRUE; -} - -PFN_NUMBER -MempMapRangeOfPages(ULONG64 VirtualAddress, ULONG64 PhysicalAddress, PFN_NUMBER cPages) -{ - PFN_NUMBER i; - - for (i = 0; i < cPages; i++) - { - if (!MempMapSinglePage(VirtualAddress, PhysicalAddress)) - { - ERR("Failed to map page %ld from %p to %p\n", - i, (PVOID)VirtualAddress, (PVOID)PhysicalAddress); - return i; - } - VirtualAddress += PAGE_SIZE; - PhysicalAddress += PAGE_SIZE; - } - return i; -} - -BOOLEAN -MempSetupPaging(IN PFN_NUMBER StartPage, - IN PFN_NUMBER NumberOfPages, - IN BOOLEAN KernelMapping) -{ - TRACE(">>> MempSetupPaging(0x%lx, %ld, %p)\n", - StartPage, NumberOfPages, StartPage * PAGE_SIZE + KSEG0_BASE); - - /* Identity mapping */ - if (MempMapRangeOfPages(StartPage * PAGE_SIZE, - StartPage * PAGE_SIZE, - NumberOfPages) != NumberOfPages) - { - ERR("Failed to map pages %ld, %ld\n", - StartPage, NumberOfPages); - return FALSE; - } - - /* Kernel mapping */ - if (KernelMapping) - { - if (MempMapRangeOfPages(StartPage * PAGE_SIZE + KSEG0_BASE, - StartPage * PAGE_SIZE, - NumberOfPages) != NumberOfPages) - { - ERR("Failed to map pages %ld, %ld\n", - StartPage, NumberOfPages); - return FALSE; - } - } - - return TRUE; -} - -VOID -MempUnmapPage(PFN_NUMBER Page) -{ - // TRACE(">>> MempUnmapPage\n"); -} - -VOID -WinLdrpMapApic(VOID) -{ - BOOLEAN LocalAPIC; - LARGE_INTEGER MsrValue; - ULONG CpuInfo[4]; - ULONG64 APICAddress; - - TRACE(">>> WinLdrpMapApic\n"); - - /* Check if we have a local APIC */ - __cpuid((int*)CpuInfo, 1); - LocalAPIC = (((CpuInfo[3] >> 9) & 1) != 0); - - /* If there is no APIC, just return */ - if (!LocalAPIC) - { - WARN("No APIC found.\n"); - return; - } - - /* Read the APIC Address */ - MsrValue.QuadPart = __readmsr(0x1B); - APICAddress = (MsrValue.LowPart & 0xFFFFF000); - - TRACE("Local APIC detected at address 0x%x\n", - APICAddress); - - /* Map it */ - MempMapSinglePage(APIC_BASE, APICAddress); -} - -BOOLEAN -WinLdrMapSpecialPages(VOID) -{ - PHARDWARE_PTE PpeBase, PdeBase; - - /* Map the PCR page */ - if (!MempMapSinglePage(KIP0PCRADDRESS, PcrBasePage * PAGE_SIZE)) - { - ERR("Could not map PCR @ %lx\n", PcrBasePage); - return FALSE; - } - - /* Map KI_USER_SHARED_DATA */ - if (!MempMapSinglePage(KI_USER_SHARED_DATA, (PcrBasePage+1) * PAGE_SIZE)) - { - ERR("Could not map KI_USER_SHARED_DATA\n"); - return FALSE; - } - - /* Map the APIC page */ - WinLdrpMapApic(); - - /* Map the page tables for 4 MB HAL address space. */ - PpeBase = MempGetOrCreatePageDir(PxeBase, VAtoPXI(MM_HAL_VA_START)); - PdeBase = MempGetOrCreatePageDir(PpeBase, VAtoPPI(MM_HAL_VA_START)); - MempGetOrCreatePageDir(PdeBase, VAtoPDI(MM_HAL_VA_START)); - MempGetOrCreatePageDir(PdeBase, VAtoPDI(MM_HAL_VA_START + 2 * 1024 * 1024)); - - return TRUE; -} - -VOID -Amd64SetupGdt(PVOID GdtBase, ULONG64 TssBase) -{ - PKGDTENTRY64 Entry; - KDESCRIPTOR GdtDesc; - TRACE("Amd64SetupGdt(GdtBase = %p, TssBase = %p)\n", GdtBase, TssBase); - - /* Setup KGDT64_NULL */ - Entry = KiGetGdtEntry(GdtBase, KGDT64_NULL); - *(PULONG64)Entry = 0x0000000000000000ULL; - - /* Setup KGDT64_R0_CODE */ - Entry = KiGetGdtEntry(GdtBase, KGDT64_R0_CODE); - *(PULONG64)Entry = 0x00209b0000000000ULL; - - /* Setup KGDT64_R0_DATA */ - Entry = KiGetGdtEntry(GdtBase, KGDT64_R0_DATA); - *(PULONG64)Entry = 0x00cf93000000ffffULL; - - /* Setup KGDT64_R3_CMCODE */ - Entry = KiGetGdtEntry(GdtBase, KGDT64_R3_CMCODE); - *(PULONG64)Entry = 0x00cffb000000ffffULL; - - /* Setup KGDT64_R3_DATA */ - Entry = KiGetGdtEntry(GdtBase, KGDT64_R3_DATA); - *(PULONG64)Entry = 0x00cff3000000ffffULL; - - /* Setup KGDT64_R3_CODE */ - Entry = KiGetGdtEntry(GdtBase, KGDT64_R3_CODE); - *(PULONG64)Entry = 0x0020fb0000000000ULL; - - /* Setup KGDT64_R3_CMTEB */ - Entry = KiGetGdtEntry(GdtBase, KGDT64_R3_CMTEB); - *(PULONG64)Entry = 0xff40f3fd50003c00ULL; - - /* Setup TSS entry */ - Entry = KiGetGdtEntry(GdtBase, KGDT64_SYS_TSS); - KiInitGdtEntry(Entry, TssBase, sizeof(KTSS), I386_TSS, 0); - - /* Setup GDT descriptor */ - GdtDesc.Base = GdtBase; - GdtDesc.Limit = NUM_GDT * sizeof(KGDTENTRY) - 1; - - /* Set the new Gdt */ - __lgdt(&GdtDesc.Limit); - TRACE("Leave Amd64SetupGdt()\n"); -} - -VOID -Amd64SetupIdt(PVOID IdtBase) -{ - KDESCRIPTOR IdtDesc, OldIdt; - ULONG Size; - TRACE("Amd64SetupIdt(IdtBase = %p)\n", IdtBase); - - /* Get old IDT */ - __sidt(&OldIdt.Limit); - - /* Copy the old IDT */ - Size = min(OldIdt.Limit + 1, NUM_IDT * sizeof(KIDTENTRY)); - //RtlCopyMemory(IdtBase, (PVOID)OldIdt.Base, Size); - - /* Setup the new IDT descriptor */ - IdtDesc.Base = IdtBase; - IdtDesc.Limit = NUM_IDT * sizeof(KIDTENTRY) - 1; - - /* Set the new IDT */ - __lidt(&IdtDesc.Limit); - TRACE("Leave Amd64SetupIdt()\n"); -} - -VOID -WinLdrSetProcessorContext(void) -{ - TRACE("WinLdrSetProcessorContext\n"); - - /* Disable Interrupts */ - _disable(); - - /* Re-initialize EFLAGS */ - __writeeflags(0); - - /* Set the new PML4 */ - __writecr3((ULONG64)PxeBase); - - /* Get kernel mode address of gdt / idt */ - GdtIdt = (PVOID)((ULONG64)GdtIdt + KSEG0_BASE); - - /* Create gdt entries and load gdtr */ - Amd64SetupGdt(GdtIdt, KSEG0_BASE | (TssBasePage << MM_PAGE_SHIFT)); - - /* Copy old Idt and set idtr */ - Amd64SetupIdt((PVOID)((ULONG64)GdtIdt + NUM_GDT * sizeof(KGDTENTRY))); - - /* LDT is unused */ -// __lldt(0); - - /* Load TSR */ - __ltr(KGDT64_SYS_TSS); - - TRACE("leave WinLdrSetProcessorContext\n"); -} - -void WinLdrSetupMachineDependent(PLOADER_PARAMETER_BLOCK LoaderBlock) -{ - ULONG_PTR Pcr = 0; - ULONG_PTR Tss = 0; - ULONG BlockSize, NumPages; - - LoaderBlock->u.I386.CommonDataArea = (PVOID)DbgPrint; // HACK - LoaderBlock->u.I386.MachineType = MACHINE_TYPE_ISA; - - /* Allocate 2 pages for PCR */ - Pcr = (ULONG_PTR)MmAllocateMemoryWithType(2 * MM_PAGE_SIZE, LoaderStartupPcrPage); - PcrBasePage = Pcr >> MM_PAGE_SHIFT; - if (Pcr == 0) - { - UiMessageBox("Can't allocate PCR."); - return; - } - RtlZeroMemory((PVOID)Pcr, 2 * MM_PAGE_SIZE); - - /* Allocate TSS */ - BlockSize = (sizeof(KTSS) + MM_PAGE_SIZE) & ~(MM_PAGE_SIZE - 1); - Tss = (ULONG_PTR)MmAllocateMemoryWithType(BlockSize, LoaderMemoryData); - TssBasePage = Tss >> MM_PAGE_SHIFT; - - /* Allocate space for new GDT + IDT */ - BlockSize = NUM_GDT * sizeof(KGDTENTRY) + NUM_IDT * sizeof(KIDTENTRY); - NumPages = (BlockSize + MM_PAGE_SIZE - 1) >> MM_PAGE_SHIFT; - GdtIdt = (PKGDTENTRY)MmAllocateMemoryWithType(NumPages * MM_PAGE_SIZE, LoaderMemoryData); - if (GdtIdt == NULL) - { - UiMessageBox("Can't allocate pages for GDT+IDT!"); - return; - } - - /* Zero newly prepared GDT+IDT */ - RtlZeroMemory(GdtIdt, NumPages << MM_PAGE_SHIFT); - - // Before we start mapping pages, create a block of memory, which will contain - // PDE and PTEs - if (MempAllocatePageTables() == FALSE) - { - // FIXME: bugcheck - } - - /* Map stuff like PCR, KI_USER_SHARED_DATA and Apic */ - WinLdrMapSpecialPages(); -} - - -VOID -MempDump(VOID) -{ -} - Copied: trunk/reactos/boot/freeldr/freeldr/arch/arm/entry.c (from r70682, trunk/reactos/boot/freeldr/freeldr/arch/arm/winldr.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/entry.c [iso-8859-1] Wed Feb 3 15:20:37 2016 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Boot Loader * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: boot/freeldr/freeldr/arch/arm/winldr.c - * PURPOSE: ARM Kernel Loader + * FILE: boot/freeldr/freeldr/arch/arm/entry.c + * PURPOSE: Implements the entry point for ARM machines (see also boot.S) * PROGRAMMERS: ReactOS Portable Systems Group */ @@ -10,277 +10,8 @@ #include <freeldr.h> #include <debug.h> -#include <internal/arm/mm.h> -#include <internal/arm/intrin_i.h> - -#define PFN_SHIFT 12 -#define LARGE_PFN_SHIFT 20 - -#define PTE_BASE 0xC0000000 -#define PDE_BASE 0xC0400000 -#define PDR_BASE 0xFFD00000 -#define VECTOR_BASE 0xFFFF0000 - -#ifdef _ZOOM2_ -#define IDMAP_BASE 0x81000000 -#define MMIO_BASE 0x10000000 -#else -#define IDMAP_BASE 0x00000000 -#define MMIO_BASE 0x10000000 -#endif - -#define LowMemPageTableIndex (IDMAP_BASE >> PDE_SHIFT) -#define MmioPageTableIndex (MMIO_BASE >> PDE_SHIFT) -#define KernelPageTableIndex (KSEG0_BASE >> PDE_SHIFT) -#define StartupPtePageTableIndex (PTE_BASE >> PDE_SHIFT) -#define StartupPdePageTableIndex (PDE_BASE >> PDE_SHIFT) -#define PdrPageTableIndex (PDR_BASE >> PDE_SHIFT) -#define VectorPageTableIndex (VECTOR_BASE >> PDE_SHIFT) - -#ifndef _ZOOM2_ -PVOID MempPdrBaseAddress = (PVOID)0x70000; -PVOID MempKernelBaseAddress = (PVOID)0; -#else -PVOID MempPdrBaseAddress = (PVOID)0x81100000; -PVOID MempKernelBaseAddress = (PVOID)0x80000000; -#endif - -/* Converts a Physical Address into a Page Frame Number */ -#define PaToPfn(p) ((p) >> PFN_SHIFT) -#define PaToLargePfn(p) ((p) >> LARGE_PFN_SHIFT) -#define PaPtrToPfn(p) (((ULONG_PTR)(p)) >> PFN_SHIFT) - -/* Converts a Physical Address into a Coarse Page Table PFN */ -#define PaPtrToPdePfn(p) (((ULONG_PTR)(p)) >> CPT_SHIFT) - -typedef struct _KPDR_PAGE -{ - PAGE_DIRECTORY_ARM PageDir; // 0xC0400000 [0xFFD00000] - CHAR HyperSpace[233 * PAGE_SIZE]; // 0xC0404000 [0xFFD04000] - PAGE_TABLE_ARM KernelPageTable[3]; // 0xC04ED000 [0xFFDED000] - CHAR SharedData[PAGE_SIZE]; // 0xC04F0000 [0xFFDF0000] - CHAR KernelStack[KERNEL_STACK_SIZE]; // 0xC04F1000 [0xFFDF1000] - CHAR PanicStack[KERNEL_STACK_SIZE]; // 0xC04F4000 [0xFFDF4000] - CHAR InterruptStack[KERNEL_STACK_SIZE]; // 0xC04F7000 [0xFFDF7000] - CHAR InitialProcess[PAGE_SIZE]; // 0xC04FA000 [0xFFDFA000] - CHAR InitialThread[PAGE_SIZE]; // 0xC04FB000 [0xFFDFB000] - CHAR Prcb[PAGE_SIZE]; // 0xC04FC000 [0xFFDFC000] - PAGE_TABLE_ARM PageDirPageTable; // 0xC04FD000 [0xFFDFD000] - PAGE_TABLE_ARM VectorPageTable; // 0xC04FE000 [0xFFDFE000] - CHAR Pcr[PAGE_SIZE]; // 0xC04FF000 [0xFFDFF000] -} KPDR_PAGE, *PKPDR_PAGE; - -C_ASSERT(sizeof(KPDR_PAGE) == (1 * 1024 * 1024)); - -HARDWARE_PTE_ARMV6 TempPte; -HARDWARE_LARGE_PTE_ARMV6 TempLargePte; -HARDWARE_PDE_ARMV6 TempPde; -PKPDR_PAGE PdrPage; /* FUNCTIONS **************************************************************/ - -BOOLEAN -MempSetupPaging(IN PFN_NUMBER StartPage, - IN PFN_NUMBER NumberOfPages, - IN BOOLEAN KernelMapping) -{ - return TRUE; -} - -VOID -MempUnmapPage(IN PFN_NUMBER Page) -{ - return; -} - -VOID -MempDump(VOID) -{ - return; -} - -BOOLEAN -WinLdrMapSpecialPages(ULONG PcrBasePage) -{ - ULONG i; - PHARDWARE_PTE_ARMV6 PointerPte; - PHARDWARE_PDE_ARMV6 PointerPde; - PHARDWARE_LARGE_PTE_ARMV6 LargePte; - PFN_NUMBER Pfn; - - /* Setup the Startup PDE */ - LargePte = &PdrPage->PageDir.Pte[StartupPdePageTableIndex]; - TempLargePte.PageFrameNumber = PaToLargePfn((ULONG_PTR)&PdrPage->PageDir); - *LargePte = TempLargePte; - - /* Map-in the PDR */ - LargePte = &PdrPage->PageDir.Pte[PdrPageTableIndex]; - *LargePte = TempLargePte; - - /* After this point, any MiAddressToPde is guaranteed not to fault */ - - /* - * Link them in the Startup PDE. - * Note these are the entries in the PD at (MiAddressToPde(PTE_BASE)). - */ - PointerPde = &PdrPage->PageDir.Pde[StartupPtePageTableIndex]; - Pfn = PaPtrToPdePfn(&PdrPage->PageDirPageTable); - for (i = 0; i < 4; i++) - { - TempPde.PageFrameNumber = Pfn++; - *PointerPde++ = TempPde; - } - - /* - * Now map these page tables in PTE space (MiAddressToPte(PTE_BASE)). - * Note that they all live on a single page, since each is 1KB. - */ - PointerPte = &PdrPage->PageDirPageTable.Pte[0x300]; - TempPte.PageFrameNumber = PaPtrToPfn(&PdrPage->PageDirPageTable); - *PointerPte = TempPte; - - /* - * After this point, MiAddressToPte((PDE_BASE) to MiAddressToPte(PDE_TOP)) - * is guaranteed not to fault. - * Any subsequent page allocation will first need its page table created - * and mapped in the PTE_BASE first, then the page table itself will be - * editable through its flat PTE address. - */ - - /* Setup the Vector PDE */ - PointerPde = &PdrPage->PageDir.Pde[VectorPageTableIndex]; - TempPde.PageFrameNumber = PaPtrToPdePfn(&PdrPage->VectorPageTable); - *PointerPde = TempPde; - - /* Setup the Vector PTEs */ - PointerPte = &PdrPage->VectorPageTable.Pte[0xF0]; - TempPte.PageFrameNumber = 0; - *PointerPte = TempPte; - - /* TODO: Map in the kernel CPTs */ - return TRUE; -} - -VOID -WinLdrSetupForNt(IN PLOADER_PARAMETER_BLOCK LoaderBlock, - IN PVOID *GdtIdt, - IN ULONG *PcrBasePage, - IN ULONG *TssBasePage) -{ - PKPDR_PAGE PdrPage = (PVOID)0xFFD00000; - - /* Load cache information */ - LoaderBlock->u.Arm.FirstLevelDcacheSize = FirstLevelDcacheSize; - LoaderBlock->u.Arm.FirstLevelDcacheFillSize = FirstLevelDcacheFillSize; - LoaderBlock->u.Arm.FirstLevelIcacheSize = FirstLevelIcacheSize; - LoaderBlock->u.Arm.FirstLevelIcacheFillSize = FirstLevelIcacheFillSize; - LoaderBlock->u.Arm.SecondLevelDcacheSize = SecondLevelDcacheSize; - LoaderBlock->u.Arm.SecondLevelDcacheFillSize = SecondLevelDcacheFillSize; - LoaderBlock->u.Arm.SecondLevelIcacheSize = SecondLevelIcacheSize; - LoaderBlock->u.Arm.SecondLevelIcacheFillSize = SecondLevelIcacheSize; - - /* Write initial context information */ - LoaderBlock->KernelStack = (ULONG_PTR)PdrPage->KernelStack; - LoaderBlock->KernelStack += KERNEL_STACK_SIZE; - LoaderBlock->u.Arm.PanicStack = (ULONG_PTR)PdrPage->PanicStack; - LoaderBlock->u.Arm.PanicStack += KERNEL_STACK_SIZE; - LoaderBlock->u.Arm.InterruptStack = (ULONG_PTR)PdrPage->InterruptStack; - LoaderBlock->u.Arm.InterruptStack += KERNEL_STACK_SIZE; - LoaderBlock->Prcb = (ULONG_PTR)PdrPage->Prcb; - LoaderBlock->Process = (ULONG_PTR)PdrPage->InitialProcess; - LoaderBlock->Thread = (ULONG_PTR)PdrPage->InitialThread; -} - -BOOLEAN -MempAllocatePageTables(VOID) -{ - ULONG i; - PHARDWARE_PTE_ARMV6 PointerPte; - PHARDWARE_PDE_ARMV6 PointerPde; - PHARDWARE_LARGE_PTE_ARMV6 LargePte; - PFN_NUMBER Pfn; - - /* Setup templates */ - TempPte.Sbo = TempPte.Valid = TempLargePte.LargePage = TempLargePte.Sbo = TempPde.Valid = 1; - - /* Allocate the 1MB "PDR" (Processor Data Region). Must be 1MB aligned */ - PdrPage = MmAllocateMemoryAtAddress(sizeof(KPDR_PAGE), - MempPdrBaseAddress, - LoaderMemoryData); - - /* Setup the Low Memory PDE as an identity-mapped Large Page (1MB) */ - LargePte = &PdrPage->PageDir.Pte[LowMemPageTableIndex]; - TempLargePte.PageFrameNumber = PaToLargePfn(IDMAP_BASE); - *LargePte = TempLargePte; - - /* Setup the MMIO PDE as two identity mapped large pages -- the kernel will blow these away later */ - LargePte = &PdrPage->PageDir.Pte[MmioPageTableIndex]; - Pfn = PaToLargePfn(MMIO_BASE); - for (i = 0; i < 2; i++) - { - TempLargePte.PageFrameNumber = Pfn++; - *LargePte++ = TempLargePte; - } - - /* Setup the Kernel PDEs */ - PointerPde = &PdrPage->PageDir.Pde[KernelPageTableIndex]; - Pfn = PaPtrToPdePfn(PdrPage->KernelPageTable); - for (i = 0; i < 12; i++) - { - TempPde.PageFrameNumber = Pfn; - *PointerPde++ = TempPde; - Pfn++; - } - - /* Setup the Kernel PTEs */ - PointerPte = PdrPage->KernelPageTable[0].Pte; - Pfn = PaPtrToPfn(MempKernelBaseAddress); - for (i = 0; i < 3072; i++) - { - TempPte.PageFrameNumber = Pfn++; - *PointerPte++ = TempPte; - } - - /* Done */ - return TRUE; -} - -VOID -WinLdrSetProcessorContext(VOID) -{ - ARM_CONTROL_REGISTER ControlRegister; - ARM_TTB_REGISTER TtbRegister; - ARM_DOMAIN_REGISTER DomainRegister; - - /* Set the TTBR */ - TtbRegister.AsUlong = (ULONG_PTR)&PdrPage->PageDir; - ASSERT(TtbRegister.Reserved == 0); - KeArmTranslationTableRegisterSet(TtbRegister); - - /* Disable domains and simply use access bits on PTEs */ - DomainRegister.AsUlong = 0; - DomainRegister.Domain0 = ClientDomain; - KeArmDomainRegisterSet(DomainRegister); - - /* Enable ARMv6+ paging (MMU), caches and the access bit */ - ControlRegister = KeArmControlRegisterGet(); - ControlRegister.MmuEnabled = TRUE; - ControlRegister.ICacheEnabled = TRUE; - ControlRegister.DCacheEnabled = TRUE; - ControlRegister.ForceAp = TRUE; - ControlRegister.ExtendedPageTables = TRUE; - KeArmControlRegisterSet(ControlRegister); -} - -VOID -WinLdrSetupMachineDependent( - PLOADER_PARAMETER_BLOCK LoaderBlock) -{ -} - -VOID DiskStopFloppyMotor(VOID) -{ -} VOID RealEntryPoint(VOID) Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c [iso-8859-1] Wed Feb 3 15:20:37 2016 @@ -60,6 +60,10 @@ }; /* FUNCTIONS ******************************************************************/ + +VOID DiskStopFloppyMotor(VOID) +{ +} VOID FrLdrCheckCpuCompatiblity(VOID) Removed: trunk/reactos/boot/freeldr/freeldr/arch/arm/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/winldr.c (removed) @@ -1,300 +0,0 @@ -/* - * PROJECT: ReactOS Boot Loader - * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: boot/freeldr/freeldr/arch/arm/winldr.c - * PURPOSE: ARM Kernel Loader - * PROGRAMMERS: ReactOS Portable Systems Group - */ - -/* INCLUDES ***************************************************************/ - -#include <freeldr.h> -#include <debug.h> -#include <internal/arm/mm.h> -#include <internal/arm/intrin_i.h> - -#define PFN_SHIFT 12 -#define LARGE_PFN_SHIFT 20 - -#define PTE_BASE 0xC0000000 -#define PDE_BASE 0xC0400000 -#define PDR_BASE 0xFFD00000 -#define VECTOR_BASE 0xFFFF0000 - -#ifdef _ZOOM2_ -#define IDMAP_BASE 0x81000000 -#define MMIO_BASE 0x10000000 -#else -#define IDMAP_BASE 0x00000000 -#define MMIO_BASE 0x10000000 -#endif - -#define LowMemPageTableIndex (IDMAP_BASE >> PDE_SHIFT) -#define MmioPageTableIndex (MMIO_BASE >> PDE_SHIFT) -#define KernelPageTableIndex (KSEG0_BASE >> PDE_SHIFT) -#define StartupPtePageTableIndex (PTE_BASE >> PDE_SHIFT) -#define StartupPdePageTableIndex (PDE_BASE >> PDE_SHIFT) -#define PdrPageTableIndex (PDR_BASE >> PDE_SHIFT) -#define VectorPageTableIndex (VECTOR_BASE >> PDE_SHIFT) - -#ifndef _ZOOM2_ -PVOID MempPdrBaseAddress = (PVOID)0x70000; -PVOID MempKernelBaseAddress = (PVOID)0; -#else -PVOID MempPdrBaseAddress = (PVOID)0x81100000; -PVOID MempKernelBaseAddress = (PVOID)0x80000000; -#endif - -/* Converts a Physical Address into a Page Frame Number */ -#define PaToPfn(p) ((p) >> PFN_SHIFT) -#define PaToLargePfn(p) ((p) >> LARGE_PFN_SHIFT) -#define PaPtrToPfn(p) (((ULONG_PTR)(p)) >> PFN_SHIFT) - -/* Converts a Physical Address into a Coarse Page Table PFN */ -#define PaPtrToPdePfn(p) (((ULONG_PTR)(p)) >> CPT_SHIFT) - -typedef struct _KPDR_PAGE -{ - PAGE_DIRECTORY_ARM PageDir; // 0xC0400000 [0xFFD00000] - CHAR HyperSpace[233 * PAGE_SIZE]; // 0xC0404000 [0xFFD04000] - PAGE_TABLE_ARM KernelPageTable[3]; // 0xC04ED000 [0xFFDED000] - CHAR SharedData[PAGE_SIZE]; // 0xC04F0000 [0xFFDF0000] - CHAR KernelStack[KERNEL_STACK_SIZE]; // 0xC04F1000 [0xFFDF1000] - CHAR PanicStack[KERNEL_STACK_SIZE]; // 0xC04F4000 [0xFFDF4000] - CHAR InterruptStack[KERNEL_STACK_SIZE]; // 0xC04F7000 [0xFFDF7000] - CHAR InitialProcess[PAGE_SIZE]; // 0xC04FA000 [0xFFDFA000] - CHAR InitialThread[PAGE_SIZE]; // 0xC04FB000 [0xFFDFB000] - CHAR Prcb[PAGE_SIZE]; // 0xC04FC000 [0xFFDFC000] - PAGE_TABLE_ARM PageDirPageTable; // 0xC04FD000 [0xFFDFD000] - PAGE_TABLE_ARM VectorPageTable; // 0xC04FE000 [0xFFDFE000] - CHAR Pcr[PAGE_SIZE]; // 0xC04FF000 [0xFFDFF000] -} KPDR_PAGE, *PKPDR_PAGE; - -C_ASSERT(sizeof(KPDR_PAGE) == (1 * 1024 * 1024)); - -HARDWARE_PTE_ARMV6 TempPte; -HARDWARE_LARGE_PTE_ARMV6 TempLargePte; -HARDWARE_PDE_ARMV6 TempPde; -PKPDR_PAGE PdrPage; - -/* FUNCTIONS **************************************************************/ - -BOOLEAN -MempSetupPaging(IN PFN_NUMBER StartPage, - IN PFN_NUMBER NumberOfPages, - IN BOOLEAN KernelMapping) -{ - return TRUE; -} - -VOID -MempUnmapPage(IN PFN_NUMBER Page) -{ - return; -} - -VOID -MempDump(VOID) -{ - return; -} - -BOOLEAN -WinLdrMapSpecialPages(ULONG PcrBasePage) -{ - ULONG i; - PHARDWARE_PTE_ARMV6 PointerPte; - PHARDWARE_PDE_ARMV6 PointerPde; - PHARDWARE_LARGE_PTE_ARMV6 LargePte; - PFN_NUMBER Pfn; - - /* Setup the Startup PDE */ - LargePte = &PdrPage->PageDir.Pte[StartupPdePageTableIndex]; - TempLargePte.PageFrameNumber = PaToLargePfn((ULONG_PTR)&PdrPage->PageDir); - *LargePte = TempLargePte; - - /* Map-in the PDR */ - LargePte = &PdrPage->PageDir.Pte[PdrPageTableIndex]; - *LargePte = TempLargePte; - - /* After this point, any MiAddressToPde is guaranteed not to fault */ - - /* - * Link them in the Startup PDE. - * Note these are the entries in the PD at (MiAddressToPde(PTE_BASE)). - */ - PointerPde = &PdrPage->PageDir.Pde[StartupPtePageTableIndex]; - Pfn = PaPtrToPdePfn(&PdrPage->PageDirPageTable); - for (i = 0; i < 4; i++) - { - TempPde.PageFrameNumber = Pfn++; - *PointerPde++ = TempPde; - } - - /* - * Now map these page tables in PTE space (MiAddressToPte(PTE_BASE)). - * Note that they all live on a single page, since each is 1KB. - */ - PointerPte = &PdrPage->PageDirPageTable.Pte[0x300]; - TempPte.PageFrameNumber = PaPtrToPfn(&PdrPage->PageDirPageTable); - *PointerPte = TempPte; - - /* - * After this point, MiAddressToPte((PDE_BASE) to MiAddressToPte(PDE_TOP)) - * is guaranteed not to fault. - * Any subsequent page allocation will first need its page table created - * and mapped in the PTE_BASE first, then the page table itself will be - * editable through its flat PTE address. - */ - - /* Setup the Vector PDE */ - PointerPde = &PdrPage->PageDir.Pde[VectorPageTableIndex]; - TempPde.PageFrameNumber = PaPtrToPdePfn(&PdrPage->VectorPageTable); - *PointerPde = TempPde; - - /* Setup the Vector PTEs */ - PointerPte = &PdrPage->VectorPageTable.Pte[0xF0]; - TempPte.PageFrameNumber = 0; - *PointerPte = TempPte; - - /* TODO: Map in the kernel CPTs */ - return TRUE; -} - -VOID -WinLdrSetupForNt(IN PLOADER_PARAMETER_BLOCK LoaderBlock, - IN PVOID *GdtIdt, - IN ULONG *PcrBasePage, - IN ULONG *TssBasePage) -{ - PKPDR_PAGE PdrPage = (PVOID)0xFFD00000; - - /* Load cache information */ - LoaderBlock->u.Arm.FirstLevelDcacheSize = FirstLevelDcacheSize; - LoaderBlock->u.Arm.FirstLevelDcacheFillSize = FirstLevelDcacheFillSize; - LoaderBlock->u.Arm.FirstLevelIcacheSize = FirstLevelIcacheSize; - LoaderBlock->u.Arm.FirstLevelIcacheFillSize = FirstLevelIcacheFillSize; - LoaderBlock->u.Arm.SecondLevelDcacheSize = SecondLevelDcacheSize; - LoaderBlock->u.Arm.SecondLevelDcacheFillSize = SecondLevelDcacheFillSize; - LoaderBlock->u.Arm.SecondLevelIcacheSize = SecondLevelIcacheSize; - LoaderBlock->u.Arm.SecondLevelIcacheFillSize = SecondLevelIcacheSize; - - /* Write initial context information */ - LoaderBlock->KernelStack = (ULONG_PTR)PdrPage->KernelStack; - LoaderBlock->KernelStack += KERNEL_STACK_SIZE; - LoaderBlock->u.Arm.PanicStack = (ULONG_PTR)PdrPage->PanicStack; - LoaderBlock->u.Arm.PanicStack += KERNEL_STACK_SIZE; - LoaderBlock->u.Arm.InterruptStack = (ULONG_PTR)PdrPage->InterruptStack; - LoaderBlock->u.Arm.InterruptStack += KERNEL_STACK_SIZE; - LoaderBlock->Prcb = (ULONG_PTR)PdrPage->Prcb; - LoaderBlock->Process = (ULONG_PTR)PdrPage->InitialProcess; - LoaderBlock->Thread = (ULONG_PTR)PdrPage->InitialThread; -} - -BOOLEAN -MempAllocatePageTables(VOID) -{ - ULONG i; - PHARDWARE_PTE_ARMV6 PointerPte; - PHARDWARE_PDE_ARMV6 PointerPde; - PHARDWARE_LARGE_PTE_ARMV6 LargePte; - PFN_NUMBER Pfn; - - /* Setup templates */ - TempPte.Sbo = TempPte.Valid = TempLargePte.LargePage = TempLargePte.Sbo = TempPde.Valid = 1; - - /* Allocate the 1MB "PDR" (Processor Data Region). Must be 1MB aligned */ - PdrPage = MmAllocateMemoryAtAddress(sizeof(KPDR_PAGE), - MempPdrBaseAddress, - LoaderMemoryData); - - /* Setup the Low Memory PDE as an identity-mapped Large Page (1MB) */ - LargePte = &PdrPage->PageDir.Pte[LowMemPageTableIndex]; - TempLargePte.PageFrameNumber = PaToLargePfn(IDMAP_BASE); - *LargePte = TempLargePte; - - /* Setup the MMIO PDE as two identity mapped large pages -- the kernel will blow these away later */ - LargePte = &PdrPage->PageDir.Pte[MmioPageTableIndex]; - Pfn = PaToLargePfn(MMIO_BASE); - for (i = 0; i < 2; i++) - { - TempLargePte.PageFrameNumber = Pfn++; - *LargePte++ = TempLargePte; - } - - /* Setup the Kernel PDEs */ - PointerPde = &PdrPage->PageDir.Pde[KernelPageTableIndex]; - Pfn = PaPtrToPdePfn(PdrPage->KernelPageTable); - for (i = 0; i < 12; i++) - { - TempPde.PageFrameNumber = Pfn; - *PointerPde++ = TempPde; - Pfn++; - } - - /* Setup the Kernel PTEs */ - PointerPte = PdrPage->KernelPageTable[0].Pte; - Pfn = PaPtrToPfn(MempKernelBaseAddress); - for (i = 0; i < 3072; i++) - { - TempPte.PageFrameNumber = Pfn++; - *PointerPte++ = TempPte; - } - - /* Done */ - return TRUE; -} - -VOID -WinLdrSetProcessorContext(VOID) -{ - ARM_CONTROL_REGISTER ControlRegister; - ARM_TTB_REGISTER TtbRegister; - ARM_DOMAIN_REGISTER DomainRegister; - - /* Set the TTBR */ - TtbRegister.AsUlong = (ULONG_PTR)&PdrPage->PageDir; - ASSERT(TtbRegister.Reserved == 0); - KeArmTranslationTableRegisterSet(TtbRegister); - - /* Disable domains and simply use access bits on PTEs */ - DomainRegister.AsUlong = 0; - DomainRegister.Domain0 = ClientDomain; - KeArmDomainRegisterSet(DomainRegister); - - /* Enable ARMv6+ paging (MMU), caches and the access bit */ - ControlRegister = KeArmControlRegisterGet(); - ControlRegister.MmuEnabled = TRUE; - ControlRegister.ICacheEnabled = TRUE; - ControlRegister.DCacheEnabled = TRUE; - ControlRegister.ForceAp = TRUE; - ControlRegister.ExtendedPageTables = TRUE; - KeArmControlRegisterSet(ControlRegister); -} - -VOID -WinLdrSetupMachineDependent( - PLOADER_PARAMETER_BLOCK LoaderBlock) -{ -} - -VOID DiskStopFloppyMotor(VOID) -{ -} - -VOID -RealEntryPoint(VOID) -{ - BootMain(""); -} - -VOID -FrLdrBugCheckWithMessage( - ULONG BugCode, - PCHAR File, - ULONG Line, - PSTR Format, - ...) -{ - -} Removed: trunk/reactos/boot/freeldr/freeldr/arch/i386/halstub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/halstub.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/halstub.c (removed) @@ -1,99 +0,0 @@ -/* - * PROJECT: ReactOS Kernel - * LICENSE: GPL - See COPYING in the top level directory - * FILE: boot/freeldr/freeldr/arch/i386/halstub.c - * PURPOSE: I/O Stub HAL Routines - * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) - */ - -/* INCLUDES ******************************************************************/ - -#include <ntoskrnl.h> -#define NDEBUG -#include <debug.h> - -/* FUNCTIONS *****************************************************************/ - -NTSTATUS -FASTCALL -xHalIoReadPartitionTable( - IN PDEVICE_OBJECT DeviceObject, - IN ULONG SectorSize, - IN BOOLEAN ReturnRecognizedPartitions, - OUT PDRIVE_LAYOUT_INFORMATION *PartitionBuffer) -{ - return IoReadPartitionTable(DeviceObject, - SectorSize, - ReturnRecognizedPartitions, - PartitionBuffer); -} - -UCHAR -NTAPI -xHalVectorToIDTEntry(IN ULONG Vector) -{ - /* Return the vector */ - return (UCHAR)Vector; -} - -VOID -NTAPI -xHalHaltSystem(VOID) -{ - /* Halt execution */ - while (TRUE); -} - -/* GLOBALS *******************************************************************/ - -HAL_DISPATCH HalDispatchTable = -{ - HAL_DISPATCH_VERSION, - (pHalQuerySystemInformation)NULL, - (pHalSetSystemInformation)NULL, - (pHalQueryBusSlots)NULL, - 0, - (pHalExamineMBR)NULL, - (pHalIoAssignDriveLetters)NULL, - (pHalIoReadPartitionTable)xHalIoReadPartitionTable, - (pHalIoSetPartitionInformation)NULL, - (pHalIoWritePartitionTable)NULL, - (pHalHandlerForBus)NULL, - (pHalReferenceBusHandler)NULL, - (pHalReferenceBusHandler)NULL, - (pHalInitPnpDriver)NULL, - (pHalInitPowerManagement)NULL, - (pHalGetDmaAdapter)NULL, - (pHalGetInterruptTranslator)NULL, - (pHalStartMirroring)NULL, - (pHalEndMirroring)NULL, - (pHalMirrorPhysicalMemory)NULL, - (pHalEndOfBoot)NULL, - (pHalMirrorVerify)NULL, - (pHalGetAcpiTable)NULL, - (pHalSetPciErrorHandlerCallback)NULL -}; - -HAL_PRIVATE_DISPATCH HalPrivateDispatchTable = -{ - HAL_PRIVATE_DISPATCH_VERSION, - (pHalHandlerForBus)NULL, - (pHalHandlerForConfigSpace)NULL, - (pHalLocateHiberRanges)NULL, - (pHalRegisterBusHandler)NULL, - (pHalSetWakeEnable)NULL, - (pHalSetWakeAlarm)NULL, - (pHalTranslateBusAddress)NULL, - (pHalAssignSlotResources)NULL, - (pHalHaltSystem)xHalHaltSystem, - (pHalFindBusAddressTranslation)NULL, - (pHalResetDisplay)NULL, - (pHalAllocateMapRegisters)NULL, - (pKdSetupPciDeviceForDebugging)NULL, - (pKdReleasePciDeviceForDebugging)NULL, - (pKdGetAcpiTablePhase0)NULL, - (pKdCheckPowerButton)NULL, - (pHalVectorToIDTEntry)xHalVectorToIDTEntry, - (pKdMapPhysicalMemory64)NULL, - (pKdUnmapVirtualAddress)NULL -}; Removed: trunk/reactos/boot/freeldr/freeldr/arch/i386/ntoskrnl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/ntoskrnl.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/ntoskrnl.c (removed) @@ -1,142 +0,0 @@ -/* - * PROJECT: ReactOS Kernel - * LICENSE: GPL - See COPYING in the top level directory - * FILE: boot/freeldr/freeldr/arch/i386/ntoskrnl.c - * PURPOSE: NTOS glue routines for the MINIHAL library - * PROGRAMMERS: Hervé Poussineau <hpoussin(a)reactos.org> - */ - -/* INCLUDES ******************************************************************/ - -#include <ntoskrnl.h> - -/* For KeStallExecutionProcessor */ -#if defined(_M_IX86) || defined(_M_AMD64) -#include <arch/pc/pcbios.h> -#endif - -/* FUNCTIONS *****************************************************************/ - -VOID -NTAPI -KeInitializeEvent( - IN PRKEVENT Event, - IN EVENT_TYPE Type, - IN BOOLEAN State) -{ - memset(Event, 0, sizeof(*Event)); -} - -VOID -FASTCALL -KiAcquireSpinLock( - IN PKSPIN_LOCK SpinLock) -{ -} - -VOID -FASTCALL -KiReleaseSpinLock( - IN PKSPIN_LOCK SpinLock) -{ -} - -VOID -NTAPI -KeSetTimeIncrement( - IN ULONG MaxIncrement, - IN ULONG MinIncrement) -{ -} - -VOID -FASTCALL -IoAssignDriveLetters( - IN struct _LOADER_PARAMETER_BLOCK *LoaderBlock, - IN PSTRING NtDeviceName, - OUT PUCHAR NtSystemPath, - OUT PSTRING NtSystemPathString) -{ -} - -NTSTATUS -FASTCALL -IoSetPartitionInformation( - IN PDEVICE_OBJECT DeviceObject, - IN ULONG SectorSize, - IN ULONG PartitionNumber, - IN ULONG PartitionType) -{ - return STATUS_NOT_IMPLEMENTED; -} - -/* - * NTSTATUS - * FASTCALL - * IoReadPartitionTable( - * IN PDEVICE_OBJECT DeviceObject, - * IN ULONG SectorSize, - * IN BOOLEAN ReturnRecognizedPartitions, - * OUT PDRIVE_LAYOUT_INFORMATION *PartitionBuffer); - * - * See boot/freeldr/freeldr/disk/partition.c - */ - -NTSTATUS -FASTCALL -IoWritePartitionTable( - IN PDEVICE_OBJECT DeviceObject, - IN ULONG SectorSize, - IN ULONG SectorsPerTrack, - IN ULONG NumberOfHeads, - IN PDRIVE_LAYOUT_INFORMATION PartitionBuffer) -{ - return STATUS_NOT_IMPLEMENTED; -} - -VOID -NTAPI -KeStallExecutionProcessor( - IN ULONG MicroSeconds) -{ -#if defined(_M_IX86) || defined(_M_AMD64) - REGS Regs; - ULONG usec_this; - - // Int 15h AH=86h - // BIOS - WAIT (AT,PS) - // - // AH = 86h - // CX:DX = interval in microseconds - // Return: - // CF clear if successful (wait interval elapsed) - // CF set on error or AH=83h wait already in progress - // AH = status (see #00496) - - // Note: The resolution of the wait period is 977 microseconds on - // many systems because many BIOSes use the 1/1024 second fast - // interrupt from the AT real-time clock chip which is available on INT 70; - // because newer BIOSes may have much more precise timers available, it is - // not possible to use this function accurately for very short delays unless - // the precise behavior of the BIOS is known (or found through testing) - - while (MicroSeconds) - { - usec_this = MicroSeconds; - - if (usec_this > 4000000) - { - usec_this = 4000000; - } - - Regs.b.ah = 0x86; - Regs.w.cx = usec_this >> 16; - Regs.w.dx = usec_this & 0xffff; - Int386(0x15, &Regs, &Regs); - - MicroSeconds -= usec_this; - } -#else - #error unimplemented -#endif -} Removed: trunk/reactos/boot/freeldr/freeldr/arch/i386/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/winldr.c (removed) @@ -1,693 +0,0 @@ -/* - * PROJECT: EFI Windows Loader - * LICENSE: GPL - See COPYING in the top level directory - * FILE: boot/freeldr/freeldr/arch/i386/winldr.c - * PURPOSE: Memory related routines - * PROGRAMMERS: Aleksey Bragin (aleksey(a)reactos.org) - */ - -/* INCLUDES ***************************************************************/ - -#include <freeldr.h> - -#include <ndk/asm.h> -#include <debug.h> - -// This is needed because headers define wrong one for ReactOS -#undef KIP0PCRADDRESS -#define KIP0PCRADDRESS 0xffdff000 - -#define SELFMAP_ENTRY 0x300 - -// This is needed only for SetProcessorContext routine -#pragma pack(2) - typedef struct - { - USHORT Limit; - ULONG Base; - } GDTIDT; -#pragma pack(4) - -DBG_DEFAULT_CHANNEL(WINDOWS); - -/* GLOBALS ***************************************************************/ - -PHARDWARE_PTE PDE; -PHARDWARE_PTE HalPageTable; - -PUCHAR PhysicalPageTablesBuffer; -PUCHAR KernelPageTablesBuffer; -ULONG PhysicalPageTables; -ULONG KernelPageTables; - -ULONG PcrBasePage; -ULONG TssBasePage; -PVOID GdtIdt; - -/* FUNCTIONS **************************************************************/ - -BOOLEAN -MempAllocatePageTables(VOID) -{ - ULONG NumPageTables, TotalSize; - PUCHAR Buffer; - // It's better to allocate PDE + PTEs contigiuos - - // Max number of entries = MaxPageNum >> 10 - // FIXME: This is a number to describe ALL physical memory - // and windows doesn't expect ALL memory mapped... - NumPageTables = TotalPagesInLookupTable >> 10; - - TRACE("NumPageTables = %d\n", NumPageTables); - - // Allocate memory block for all these things: - // PDE, HAL mapping page table, physical mapping, kernel mapping - TotalSize = (1 + 1 + NumPageTables * 2) * MM_PAGE_SIZE; - - // PDE+HAL+KernelPTEs == MemoryData - Buffer = MmAllocateMemoryWithType(TotalSize, LoaderMemoryData); - - // Physical PTEs = FirmwareTemporary - PhysicalPageTablesBuffer = (PUCHAR)Buffer + TotalSize - NumPageTables*MM_PAGE_SIZE; - MmSetMemoryType(PhysicalPageTablesBuffer, - NumPageTables*MM_PAGE_SIZE, - LoaderFirmwareTemporary); - - // This check is now redundant - if (Buffer + (TotalSize - NumPageTables*MM_PAGE_SIZE) != - PhysicalPageTablesBuffer) - { - TRACE("There was a problem allocating two adjacent blocks of memory!"); - } - - if (Buffer == NULL || PhysicalPageTablesBuffer == NULL) - { - UiMessageBox("Impossible to allocate memory block for page tables!"); - return FALSE; - } - - // Zero all this memory block - RtlZeroMemory(Buffer, TotalSize); - - // Set up pointers correctly now - PDE = (PHARDWARE_PTE)Buffer; - - // Map the page directory at 0xC0000000 (maps itself) - PDE[SELFMAP_ENTRY].PageFrameNumber = (ULONG)PDE >> MM_PAGE_SHIFT; - PDE[SELFMAP_ENTRY].Valid = 1; - PDE[SELFMAP_ENTRY].Write = 1; - - // The last PDE slot is allocated for HAL's memory mapping (Virtual Addresses 0xFFC00000 - 0xFFFFFFFF) - HalPageTable = (PHARDWARE_PTE)&Buffer[MM_PAGE_SIZE*1]; - - // Map it - PDE[1023].PageFrameNumber = (ULONG)HalPageTable >> MM_PAGE_SHIFT; - PDE[1023].Valid = 1; - PDE[1023].Write = 1; - - // Store pointer to the table for easier access - KernelPageTablesBuffer = &Buffer[MM_PAGE_SIZE*2]; - - // Zero counters of page tables used - PhysicalPageTables = 0; - KernelPageTables = 0; - - return TRUE; -} - -VOID -MempAllocatePTE(ULONG Entry, PHARDWARE_PTE *PhysicalPT, PHARDWARE_PTE *KernelPT) -{ - //Print(L"Creating PDE Entry %X\n", Entry); - - // Identity mapping - *PhysicalPT = (PHARDWARE_PTE)&PhysicalPageTablesBuffer[PhysicalPageTables*MM_PAGE_SIZE]; - PhysicalPageTables++; - - PDE[Entry].PageFrameNumber = (ULONG)*PhysicalPT >> MM_PAGE_SHIFT; - PDE[Entry].Valid = 1; - PDE[Entry].Write = 1; - - if (Entry+(KSEG0_BASE >> 22) > 1023) - { - TRACE("WARNING! Entry: %X > 1023\n", Entry+(KSEG0_BASE >> 22)); - } - - // Kernel-mode mapping - *KernelPT = (PHARDWARE_PTE)&KernelPageTablesBuffer[KernelPageTables*MM_PAGE_SIZE]; - KernelPageTables++; - - PDE[Entry+(KSEG0_BASE >> 22)].PageFrameNumber = ((ULONG)*KernelPT >> MM_PAGE_SHIFT); - PDE[Entry+(KSEG0_BASE >> 22)].Valid = 1; - PDE[Entry+(KSEG0_BASE >> 22)].Write = 1; -} - -BOOLEAN -MempSetupPaging(IN PFN_NUMBER StartPage, - IN PFN_COUNT NumberOfPages, - IN BOOLEAN KernelMapping) -{ - PHARDWARE_PTE PhysicalPT; - PHARDWARE_PTE KernelPT; - PFN_COUNT Entry, Page; - - TRACE("MempSetupPaging: SP 0x%X, Number: 0x%X, Kernel: %s\n", - StartPage, NumberOfPages, KernelMapping ? "yes" : "no"); - - // HACK - if (StartPage+NumberOfPages >= 0x80000) - { - // - // We can't map this as it requires more than 1 PDE - // and in fact it's not possible at all ;) - // - //Print(L"skipping...\n"); - return TRUE; - } - - // - // Now actually set up the page tables for identity mapping - // - for (Page = StartPage; Page < StartPage + NumberOfPages; Page++) - { - Entry = Page >> 10; - - if (((PULONG)PDE)[Entry] == 0) - { - MempAllocatePTE(Entry, &PhysicalPT, &KernelPT); - } - else - { - PhysicalPT = (PHARDWARE_PTE)(PDE[Entry].PageFrameNumber << MM_PAGE_SHIFT); - KernelPT = (PHARDWARE_PTE)(PDE[Entry+(KSEG0_BASE >> 22)].PageFrameNumber << MM_PAGE_SHIFT); - } - - PhysicalPT[Page & 0x3ff].PageFrameNumber = Page; - PhysicalPT[Page & 0x3ff].Valid = (Page != 0); - PhysicalPT[Page & 0x3ff].Write = (Page != 0); - - if (KernelMapping) - { - if (KernelPT[Page & 0x3ff].Valid) WARN("xxx already mapped \n"); - KernelPT[Page & 0x3ff].PageFrameNumber = Page; - KernelPT[Page & 0x3ff].Valid = (Page != 0); - KernelPT[Page & 0x3ff].Write = (Page != 0); - } - } - - return TRUE; -} - -VOID -MempUnmapPage(PFN_NUMBER Page) -{ - PHARDWARE_PTE KernelPT; - PFN_NUMBER Entry = (Page >> 10) + (KSEG0_BASE >> 22); - - /* Don't unmap page directory or HAL entries */ - if (Entry == SELFMAP_ENTRY || Entry == 1023) - return; - - if (PDE[Entry].Valid) - { - KernelPT = (PHARDWARE_PTE)(PDE[Entry].PageFrameNumber << MM_PAGE_SHIFT); - - if (KernelPT) - { - KernelPT[Page & 0x3ff].PageFrameNumber = 0; - KernelPT[Page & 0x3ff].Valid = 0; - KernelPT[Page & 0x3ff].Write = 0; - } - } -} - -VOID -WinLdrpMapApic(VOID) -{ - BOOLEAN LocalAPIC; - LARGE_INTEGER MsrValue; - ULONG APICAddress, CpuInfo[4]; - - /* Check if we have a local APIC */ - __cpuid((int*)CpuInfo, 1); - LocalAPIC = (((CpuInfo[3] >> 9) & 1) != 0); - - /* If there is no APIC, just return */ - if (!LocalAPIC) - return; - - /* Read the APIC Address */ - MsrValue.QuadPart = __readmsr(0x1B); - APICAddress = (MsrValue.LowPart & 0xFFFFF000); - - TRACE("Local APIC detected at address 0x%x\n", - APICAddress); - - /* Map it */ - HalPageTable[(APIC_BASE - 0xFFC00000) >> MM_PAGE_SHIFT].PageFrameNumber - = APICAddress >> MM_PAGE_SHIFT; - HalPageTable[(APIC_BASE - 0xFFC00000) >> MM_PAGE_SHIFT].Valid = 1; - HalPageTable[(APIC_BASE - 0xFFC00000) >> MM_PAGE_SHIFT].Write = 1; - HalPageTable[(APIC_BASE - 0xFFC00000) >> MM_PAGE_SHIFT].WriteThrough = 1; - HalPageTable[(APIC_BASE - 0xFFC00000) >> MM_PAGE_SHIFT].CacheDisable = 1; -} - -BOOLEAN -WinLdrMapSpecialPages(void) -{ - - //VideoDisplayString(L"Hello from VGA, going into the kernel\n"); - TRACE("HalPageTable: 0x%X\n", HalPageTable); - - // Page Tables have been setup, make special handling for PCR and TSS - // (which is done in BlSetupFotNt in usual ntldr) - HalPageTable[(KI_USER_SHARED_DATA - 0xFFC00000) >> MM_PAGE_SHIFT].PageFrameNumber = PcrBasePage+1; - HalPageTable[(KI_USER_SHARED_DATA - 0xFFC00000) >> MM_PAGE_SHIFT].Valid = 1; - HalPageTable[(KI_USER_SHARED_DATA - 0xFFC00000) >> MM_PAGE_SHIFT].Write = 1; - - HalPageTable[(KIP0PCRADDRESS - 0xFFC00000) >> MM_PAGE_SHIFT].PageFrameNumber = PcrBasePage; - HalPageTable[(KIP0PCRADDRESS - 0xFFC00000) >> MM_PAGE_SHIFT].Valid = 1; - HalPageTable[(KIP0PCRADDRESS - 0xFFC00000) >> MM_PAGE_SHIFT].Write = 1; - - // Map APIC - WinLdrpMapApic(); - - // Map VGA memory - //VideoMemoryBase = MmMapIoSpace(0xb8000, 4000, MmNonCached); - //TRACE("VideoMemoryBase: 0x%X\n", VideoMemoryBase); - - return TRUE; -} - -#define ExtendedBIOSDataArea ((PULONG)0x740) -#define ExtendedBIOSDataSize ((PULONG)0x744) -#define RomFontPointers ((PULONG)0x700) - -enum -{ - INT1FhFont = 0x00, - INT43hFont = 0x01, - ROM_8x14CharacterFont = 0x02, - ROM_8x8DoubleDotFontLo = 0x03, - ROM_8x8DoubleDotFontHi = 0x04, - ROM_AlphaAlternate = 0x05, - ROM_8x16Font = 0x06, - ROM_Alternate9x16Font = 0x07, - UltraVision_8x20Font = 0x11, - UltraVision_8x10Font = 0x12, -}; - -void WinLdrSetupSpecialDataPointers(VOID) -{ - REGS BiosRegs; - - /* Get the address of the bios rom fonts. Win 2003 videoprt reads these - values from address 0x700 .. 0x718 and store them in the registry - in HKLM\System\CurrentControlSet\Control\Wow\RomFontPointers - Int 10h, AX=1130h, BH = pointer specifier - returns: es:bp = address */ - BiosRegs.d.eax = 0x1130; - BiosRegs.b.bh = ROM_8x14CharacterFont; - Int386(0x10, &BiosRegs, &BiosRegs); - RomFontPointers[0] = BiosRegs.w.es << 4 | BiosRegs.w.bp; - - BiosRegs.b.bh = ROM_8x8DoubleDotFontLo; - Int386(0x10, &BiosRegs, &BiosRegs); - RomFontPointers[1] = BiosRegs.w.es << 16 | BiosRegs.w.bp; - - BiosRegs.b.bh = ROM_8x8DoubleDotFontHi; - Int386(0x10, &BiosRegs, &BiosRegs); - RomFontPointers[2] = BiosRegs.w.es << 16 | BiosRegs.w.bp; - - BiosRegs.b.bh = ROM_AlphaAlternate; - Int386(0x10, &BiosRegs, &BiosRegs); - RomFontPointers[3] = BiosRegs.w.es << 16 | BiosRegs.w.bp; - - BiosRegs.b.bh = ROM_8x16Font; - Int386(0x10, &BiosRegs, &BiosRegs); - RomFontPointers[4] = BiosRegs.w.es << 16 | BiosRegs.w.bp; - - BiosRegs.b.bh = ROM_Alternate9x16Font; - Int386(0x10, &BiosRegs, &BiosRegs); - RomFontPointers[5] = BiosRegs.w.es << 16 | BiosRegs.w.bp; - - /* Store address of the extended bios data area in 0x740 */ - BiosRegs.d.eax = 0xC100; - Int386(0x15, &BiosRegs, &BiosRegs); - if (INT386_SUCCESS(BiosRegs)) - { - *ExtendedBIOSDataArea = BiosRegs.w.es << 4; - *ExtendedBIOSDataSize = 1024; - TRACE("*ExtendedBIOSDataArea = 0x%lx\n", *ExtendedBIOSDataArea); - } - else - { - WARN("Couldn't get address of extended BIOS data area\n"); - *ExtendedBIOSDataArea = 0; - *ExtendedBIOSDataSize = 0; - } -} - -void WinLdrSetupMachineDependent(PLOADER_PARAMETER_BLOCK LoaderBlock) -{ - ULONG TssSize; - //ULONG TssPages; - ULONG_PTR Pcr = 0; - ULONG_PTR Tss = 0; - ULONG BlockSize, NumPages; - - LoaderBlock->u.I386.CommonDataArea = NULL; // Force No ABIOS support - LoaderBlock->u.I386.MachineType = MACHINE_TYPE_ISA; - - /* Allocate 2 pages for PCR */ - Pcr = (ULONG_PTR)MmAllocateMemoryWithType(2 * MM_PAGE_SIZE, LoaderStartupPcrPage); - PcrBasePage = Pcr >> MM_PAGE_SHIFT; - - if (Pcr == 0) - { - UiMessageBox("Can't allocate PCR."); - return; - } - - /* Allocate TSS */ - TssSize = (sizeof(KTSS) + MM_PAGE_SIZE) & ~(MM_PAGE_SIZE - 1); - //TssPages = TssSize / MM_PAGE_SIZE; - - Tss = (ULONG_PTR)MmAllocateMemoryWithType(TssSize, LoaderMemoryData); - - TssBasePage = Tss >> MM_PAGE_SHIFT; - - /* Allocate space for new GDT + IDT */ - BlockSize = NUM_GDT*sizeof(KGDTENTRY) + NUM_IDT*sizeof(KIDTENTRY);//FIXME: Use GDT/IDT limits here? - NumPages = (BlockSize + MM_PAGE_SIZE - 1) >> MM_PAGE_SHIFT; - GdtIdt = (PKGDTENTRY)MmAllocateMemoryWithType(NumPages * MM_PAGE_SIZE, LoaderMemoryData); - - if (GdtIdt == NULL) - { - UiMessageBox("Can't allocate pages for GDT+IDT!"); - return; - } - - /* Zero newly prepared GDT+IDT */ - RtlZeroMemory(GdtIdt, NumPages << MM_PAGE_SHIFT); - - // Before we start mapping pages, create a block of memory, which will contain - // PDE and PTEs - if (MempAllocatePageTables() == FALSE) - { - BugCheck("MempAllocatePageTables failed!\n"); - } - - /* Map stuff like PCR, KI_USER_SHARED_DATA and Apic */ - WinLdrMapSpecialPages(); - - /* Set some special fields */ - WinLdrSetupSpecialDataPointers(); -} - - -VOID -WinLdrSetProcessorContext(void) -{ - GDTIDT GdtDesc, IdtDesc, OldIdt; - PKGDTENTRY pGdt; - PKIDTENTRY pIdt; - USHORT Ldt = 0; - ULONG Pcr; - ULONG Tss; - //ULONG i; - - Pcr = KIP0PCRADDRESS; - Tss = KSEG0_BASE | (TssBasePage << MM_PAGE_SHIFT); - - TRACE("GDtIdt %p, Pcr %p, Tss 0x%08X\n", - GdtIdt, Pcr, Tss); - - // Enable paging - //BS->ExitBootServices(ImageHandle,MapKey); - - // Disable Interrupts - _disable(); - - // Re-initialize EFLAGS - __writeeflags(0); - - // Set the PDBR - __writecr3((ULONG_PTR)PDE); - - // Enable paging by modifying CR0 - __writecr0(__readcr0() | CR0_PG); - - // Kernel expects the PCR to be zero-filled on startup - // FIXME: Why zero it here when we can zero it right after allocation? - RtlZeroMemory((PVOID)Pcr, MM_PAGE_SIZE); //FIXME: Why zero only 1 page when we allocate 2? - - // Get old values of GDT and IDT - Ke386GetGlobalDescriptorTable(&GdtDesc); - __sidt(&IdtDesc); - - // Save old IDT - OldIdt.Base = IdtDesc.Base; - OldIdt.Limit = IdtDesc.Limit; - - // Prepare new IDT+GDT - GdtDesc.Base = KSEG0_BASE | (ULONG_PTR)GdtIdt; - GdtDesc.Limit = NUM_GDT * sizeof(KGDTENTRY) - 1; - IdtDesc.Base = (ULONG)((PUCHAR)GdtDesc.Base + GdtDesc.Limit + 1); - IdtDesc.Limit = NUM_IDT * sizeof(KIDTENTRY) - 1; - - // ======================== - // Fill all descriptors now - // ======================== - - pGdt = (PKGDTENTRY)GdtDesc.Base; - pIdt = (PKIDTENTRY)IdtDesc.Base; - - // - // Code selector (0x8) - // Flat 4Gb - // - pGdt[1].LimitLow = 0xFFFF; - pGdt[1].BaseLow = 0; - pGdt[1].HighWord.Bytes.BaseMid = 0; - pGdt[1].HighWord.Bytes.Flags1 = 0x9A; - pGdt[1].HighWord.Bytes.Flags2 = 0xCF; - pGdt[1].HighWord.Bytes.BaseHi = 0; - - // - // Data selector (0x10) - // Flat 4Gb - // - pGdt[2].LimitLow = 0xFFFF; - pGdt[2].BaseLow = 0; - pGdt[2].HighWord.Bytes.BaseMid = 0; - pGdt[2].HighWord.Bytes.Flags1 = 0x92; - pGdt[2].HighWord.Bytes.Flags2 = 0xCF; - pGdt[2].HighWord.Bytes.BaseHi = 0; - - // - // Selector (0x18) - // Flat 2Gb - // - pGdt[3].LimitLow = 0xFFFF; - pGdt[3].BaseLow = 0; - pGdt[3].HighWord.Bytes.BaseMid = 0; - pGdt[3].HighWord.Bytes.Flags1 = 0xFA; - pGdt[3].HighWord.Bytes.Flags2 = 0xCF; - pGdt[3].HighWord.Bytes.BaseHi = 0; - - // - // Selector (0x20) - // Flat 2Gb - // - pGdt[4].LimitLow = 0xFFFF; - pGdt[4].BaseLow = 0; - pGdt[4].HighWord.Bytes.BaseMid = 0; - pGdt[4].HighWord.Bytes.Flags1 = 0xF2; - pGdt[4].HighWord.Bytes.Flags2 = 0xCF; - pGdt[4].HighWord.Bytes.BaseHi = 0; - - // - // TSS Selector (0x28) - // - pGdt[5].LimitLow = 0x78-1; //FIXME: Check this - pGdt[5].BaseLow = (USHORT)(Tss & 0xffff); - pGdt[5].HighWord.Bytes.BaseMid = (UCHAR)((Tss >> 16) & 0xff); - pGdt[5].HighWord.Bytes.Flags1 = 0x89; - pGdt[5].HighWord.Bytes.Flags2 = 0x00; - pGdt[5].HighWord.Bytes.BaseHi = (UCHAR)((Tss >> 24) & 0xff); - - // - // PCR Selector (0x30) - // - pGdt[6].LimitLow = 0x01; - pGdt[6].BaseLow = (USHORT)(Pcr & 0xffff); - pGdt[6].HighWord.Bytes.BaseMid = (UCHAR)((Pcr >> 16) & 0xff); - pGdt[6].HighWord.Bytes.Flags1 = 0x92; - pGdt[6].HighWord.Bytes.Flags2 = 0xC0; - pGdt[6].HighWord.Bytes.BaseHi = (UCHAR)((Pcr >> 24) & 0xff); - - // - // Selector (0x38) - // - pGdt[7].LimitLow = 0xFFFF; - pGdt[7].BaseLow = 0; - pGdt[7].HighWord.Bytes.BaseMid = 0; - pGdt[7].HighWord.Bytes.Flags1 = 0xF3; - pGdt[7].HighWord.Bytes.Flags2 = 0x40; - pGdt[7].HighWord.Bytes.BaseHi = 0; - - // - // Some BIOS stuff (0x40) - // - pGdt[8].LimitLow = 0xFFFF; - pGdt[8].BaseLow = 0x400; - pGdt[8].HighWord.Bytes.BaseMid = 0; - pGdt[8].HighWord.Bytes.Flags1 = 0xF2; - pGdt[8].HighWord.Bytes.Flags2 = 0x0; - pGdt[8].HighWord.Bytes.BaseHi = 0; - - // - // Selector (0x48) - // - pGdt[9].LimitLow = 0; - pGdt[9].BaseLow = 0; - pGdt[9].HighWord.Bytes.BaseMid = 0; - pGdt[9].HighWord.Bytes.Flags1 = 0; - pGdt[9].HighWord.Bytes.Flags2 = 0; - pGdt[9].HighWord.Bytes.BaseHi = 0; - - // - // Selector (0x50) - // - pGdt[10].LimitLow = 0xFFFF; //FIXME: Not correct! - pGdt[10].BaseLow = 0; - pGdt[10].HighWord.Bytes.BaseMid = 0x2; - pGdt[10].HighWord.Bytes.Flags1 = 0x89; - pGdt[10].HighWord.Bytes.Flags2 = 0; - pGdt[10].HighWord.Bytes.BaseHi = 0; - - // - // Selector (0x58) - // - pGdt[11].LimitLow = 0xFFFF; - pGdt[11].BaseLow = 0; - pGdt[11].HighWord.Bytes.BaseMid = 0x2; - pGdt[11].HighWord.Bytes.Flags1 = 0x9A; - pGdt[11].HighWord.Bytes.Flags2 = 0; - pGdt[11].HighWord.Bytes.BaseHi = 0; - - // - // Selector (0x60) - // - pGdt[12].LimitLow = 0xFFFF; - pGdt[12].BaseLow = 0; //FIXME: Maybe not correct, but noone cares - pGdt[12].HighWord.Bytes.BaseMid = 0x2; - pGdt[12].HighWord.Bytes.Flags1 = 0x92; - pGdt[12].HighWord.Bytes.Flags2 = 0; - pGdt[12].HighWord.Bytes.BaseHi = 0; - - // - // Video buffer Selector (0x68) - // - pGdt[13].LimitLow = 0x3FFF; - pGdt[13].BaseLow = 0x8000; - pGdt[13].HighWord.Bytes.BaseMid = 0x0B; - pGdt[13].HighWord.Bytes.Flags1 = 0x92; - pGdt[13].HighWord.Bytes.Flags2 = 0; - pGdt[13].HighWord.Bytes.BaseHi = 0; - - // - // Points to GDT (0x70) - // - pGdt[14].LimitLow = NUM_GDT*sizeof(KGDTENTRY) - 1; - pGdt[14].BaseLow = 0x7000; - pGdt[14].HighWord.Bytes.BaseMid = 0xFF; - pGdt[14].HighWord.Bytes.Flags1 = 0x92; - pGdt[14].HighWord.Bytes.Flags2 = 0; - pGdt[14].HighWord.Bytes.BaseHi = 0xFF; - - // - // Some unused descriptors should go here - // - - // Copy the old IDT - RtlCopyMemory(pIdt, (PVOID)OldIdt.Base, OldIdt.Limit + 1); - - // Mask interrupts - //asm("cli\n"); // they are already masked before enabling paged mode - - // Load GDT+IDT - Ke386SetGlobalDescriptorTable(&GdtDesc); - __lidt(&IdtDesc); - - // Jump to proper CS and clear prefetch queue -#if defined(__GNUC__) - asm("ljmp $0x08, $1f\n" - "1:\n"); -#elif defined(_MSC_VER) - /* We can't express the above in MASM so we use this far return instead */ - __asm - { - push 8 - push offset resume - retf - resume: - }; -#else -#error -#endif - - // Set SS selector - Ke386SetSs(0x10); // DataSelector=0x10 - - // Set DS and ES selectors - Ke386SetDs(0x10); - Ke386SetEs(0x10); // this is vital for rep stosd - - // LDT = not used ever, thus set to 0 - Ke386SetLocalDescriptorTable(Ldt); - - // Load TSR - Ke386SetTr(KGDT_TSS); - - // Clear GS - Ke386SetGs(0); - - // Set FS to PCR - Ke386SetFs(0x30); - - // Real end of the function, just for information - /* do not uncomment! - pop edi; - pop esi; - pop ebx; - mov esp, ebp; - pop ebp; - ret - */ -} - -#if DBG -VOID -MempDump(VOID) -{ - ULONG *PDE_Addr=(ULONG *)PDE;//0xC0300000; - int i, j; - - TRACE("\nPDE\n"); - - for (i=0; i<128; i++) - { - TRACE("0x%04X | ", i*8); - - for (j=0; j<8; j++) - { - TRACE("0x%08X ", PDE_Addr[i*8+j]); - } - - TRACE("\n"); - } -} -#endif - Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] Wed Feb 3 15:20:37 2016 @@ -79,6 +79,8 @@ #include <ui.h> #include <ver.h> #include <video.h> + +/* NTOS loader */ #include <winldr.h> /* File system headers */ Removed: trunk/reactos/boot/freeldr/freeldr/include/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/ntoskrnl.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/ntoskrnl.h (removed) @@ -1,25 +0,0 @@ -/* - * PROJECT: ReactOS Kernel - * LICENSE: GPL - See COPYING in the top level directory - * FILE: boot/freeldr/freeldr/include/ntoskrnl.h - * PURPOSE: NTOS glue routines for the MINIHAL library - * PROGRAMMERS: Hervé Poussineau <hpoussin(a)reactos.org> - */ - -#include <ntdef.h> -#undef _NTHAL_ -//#undef DECLSPEC_IMPORT -//#define DECLSPEC_IMPORT -#undef NTSYSAPI -#define NTSYSAPI - -/* Windows Device Driver Kit */ -#include <ntddk.h> -#include <ndk/haltypes.h> - -//typedef GUID UUID; - -/* Disk stuff */ -#include <arc/arc.h> -#include <ntdddisk.h> -#include <internal/hal.h> Modified: trunk/reactos/boot/freeldr/freeldr/include/winldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/winldr.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/winldr.h [iso-8859-1] Wed Feb 3 15:20:37 2016 @@ -161,9 +161,6 @@ WinLdrpDumpArcDisks(PLOADER_PARAMETER_BLOCK LoaderBlock); BOOLEAN -MempAllocatePageTables(); - -BOOLEAN MempSetupPaging(IN PFN_NUMBER StartPage, IN PFN_NUMBER NumberOfPages, IN BOOLEAN KernelMapping); Copied: trunk/reactos/boot/freeldr/freeldr/windows/arch/amd64/winldr.c (from r70682, trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/arch/amd64/winldr.c [iso-8859-1] Wed Feb 3 15:20:37 2016 @@ -28,6 +28,7 @@ /* FUNCTIONS **************************************************************/ +static BOOLEAN MempAllocatePageTables(VOID) { @@ -60,6 +61,7 @@ return TRUE; } +static PHARDWARE_PTE MempGetOrCreatePageDir(PHARDWARE_PTE PdeBase, ULONG Index) { @@ -85,6 +87,7 @@ return SubDir; } +static BOOLEAN MempMapSinglePage(ULONG64 VirtualAddress, ULONG64 PhysicalAddress) { @@ -143,6 +146,7 @@ return TRUE; } +static PFN_NUMBER MempMapRangeOfPages(ULONG64 VirtualAddress, ULONG64 PhysicalAddress, PFN_NUMBER cPages) { @@ -202,6 +206,7 @@ // TRACE(">>> MempUnmapPage\n"); } +static VOID WinLdrpMapApic(VOID) { @@ -234,6 +239,7 @@ MempMapSinglePage(APIC_BASE, APICAddress); } +static BOOLEAN WinLdrMapSpecialPages(VOID) { @@ -265,6 +271,7 @@ return TRUE; } +static VOID Amd64SetupGdt(PVOID GdtBase, ULONG64 TssBase) { @@ -313,6 +320,7 @@ TRACE("Leave Amd64SetupGdt()\n"); } +static VOID Amd64SetupIdt(PVOID IdtBase) { @@ -421,4 +429,3 @@ MempDump(VOID) { } - Copied: trunk/reactos/boot/freeldr/freeldr/windows/arch/arm/winldr.c (from r70676, trunk/reactos/boot/freeldr/freeldr/arch/arm/winldr.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/arch/arm/winldr.c [iso-8859-1] Wed Feb 3 15:20:37 2016 @@ -99,6 +99,7 @@ return; } +static BOOLEAN WinLdrMapSpecialPages(ULONG PcrBasePage) { @@ -191,6 +192,7 @@ LoaderBlock->Thread = (ULONG_PTR)PdrPage->InitialThread; } +static BOOLEAN MempAllocatePageTables(VOID) { @@ -277,24 +279,3 @@ PLOADER_PARAMETER_BLOCK LoaderBlock) { } - -VOID DiskStopFloppyMotor(VOID) -{ -} - -VOID -RealEntryPoint(VOID) -{ - BootMain(""); -} - -VOID -FrLdrBugCheckWithMessage( - ULONG BugCode, - PCHAR File, - ULONG Line, - PSTR Format, - ...) -{ - -} Copied: trunk/reactos/boot/freeldr/freeldr/windows/arch/i386/halstub.c (from r70682, trunk/reactos/boot/freeldr/freeldr/arch/i386/halstub.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/halstub.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/arch/i386/halstub.c [iso-8859-1] Wed Feb 3 15:20:37 2016 @@ -8,7 +8,7 @@ /* INCLUDES ******************************************************************/ -#include <ntoskrnl.h> +#include "ntoskrnl.h" #define NDEBUG #include <debug.h> Copied: trunk/reactos/boot/freeldr/freeldr/windows/arch/i386/ntoskrnl.c (from r70682, trunk/reactos/boot/freeldr/freeldr/arch/i386/ntoskrnl.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/ntoskrnl.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/arch/i386/ntoskrnl.c [iso-8859-1] Wed Feb 3 15:20:37 2016 @@ -8,7 +8,7 @@ /* INCLUDES ******************************************************************/ -#include <ntoskrnl.h> +#include "ntoskrnl.h" /* For KeStallExecutionProcessor */ #if defined(_M_IX86) || defined(_M_AMD64) Copied: trunk/reactos/boot/freeldr/freeldr/windows/arch/i386/winldr.c (from r70682, trunk/reactos/boot/freeldr/freeldr/arch/i386/winldr.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/arch/i386/winldr.c [iso-8859-1] Wed Feb 3 15:20:37 2016 @@ -46,6 +46,7 @@ /* FUNCTIONS **************************************************************/ +static BOOLEAN MempAllocatePageTables(VOID) { @@ -115,6 +116,7 @@ return TRUE; } +static VOID MempAllocatePTE(ULONG Entry, PHARDWARE_PTE *PhysicalPT, PHARDWARE_PTE *KernelPT) { @@ -144,8 +146,8 @@ BOOLEAN MempSetupPaging(IN PFN_NUMBER StartPage, - IN PFN_COUNT NumberOfPages, - IN BOOLEAN KernelMapping) + IN PFN_COUNT NumberOfPages, + IN BOOLEAN KernelMapping) { PHARDWARE_PTE PhysicalPT; PHARDWARE_PTE KernelPT; @@ -221,6 +223,7 @@ } } +static VOID WinLdrpMapApic(VOID) { @@ -252,6 +255,7 @@ HalPageTable[(APIC_BASE - 0xFFC00000) >> MM_PAGE_SHIFT].CacheDisable = 1; } +static BOOLEAN WinLdrMapSpecialPages(void) { @@ -297,6 +301,7 @@ UltraVision_8x10Font = 0x12, }; +static void WinLdrSetupSpecialDataPointers(VOID) { REGS BiosRegs; @@ -690,4 +695,3 @@ } } #endif -

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs