Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 64815: [FREELDR] - Improve memory layout by moving the 32/64 bit stack to 0x7000-0xF000 and moving the BIOSCALLBUFFER up a bit. This gives us 56 KB additional space for freeldr itself. T...
by tkreuzer＠svn.reactos.org 18 Oct '14

18 Oct '14

Author: tkreuzer Date: Sat Oct 18 21:12:12 2014 New Revision: 64815 URL: http://svn.reactos.org/svn/reactos?rev=64815&view=rev Log: [FREELDR] - Improve memory layout by moving the 32/64 bit stack to 0x7000-0xF000 and moving the BIOSCALLBUFFER up a bit. This gives us 56 KB additional space for freeldr itself. This allows to compile freeldr with /RTC1 (x86 only, the x64 version would get too big). And yes, it works. - Implement FrLdrBugCheckWithMessage to get some useful messages on the screen and use it in MmCheckFreeldrImageFile - Merge the .rtc section into the .text section, when we use RTC1 - Check the location of the Extended BIOS Data Area, add it to the memory descriptors and make sure we have enough space to put freeldr in. If the location of the EBDA is too low, print out a nice message on a blue screen :) Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt trunk/reactos/boot/freeldr/freeldr/arch/amd64/entry.S trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S trunk/reactos/boot/freeldr/freeldr/arch/i386/i386bug.c trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c trunk/reactos/boot/freeldr/freeldr/debug.c trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h trunk/reactos/boot/freeldr/freeldr/include/debug.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] Sat Oct 18 21:12:12 2014 @@ -216,6 +216,7 @@ elseif(RUNTIME_CHECKS) target_link_libraries(freeldr_pe runtmchk) target_link_libraries(freeldr_pe_dbg runtmchk) + add_target_link_flags(freeldr_pe "/MERGE:.rtc=.text") endif() add_dependencies(freeldr_pe asm) @@ -279,6 +280,7 @@ elseif(RUNTIME_CHECKS) target_link_libraries(setupldr_pe runtmchk) target_link_libraries(setupldr_pe_dbg runtmchk) + add_target_link_flags(setupldr_pe "/MERGE:.rtc=.text") endif() add_dependencies(setupldr_pe asm) Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/entry.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/amd64/entry.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/amd64/entry.S [iso-8859-1] Sat Oct 18 21:12:12 2014 @@ -121,7 +121,7 @@ /* 64-bit stack pointer */ stack64: - .double STACK64ADDR + .double STACKADDR PUBLIC FrldrBootDrive FrldrBootDrive: Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S [iso-8859-1] Sat Oct 18 21:12:12 2014 @@ -257,7 +257,7 @@ /* 32-bit stack pointer */ stack32: - .long STACK32ADDR + .long STACKADDR .align 4 /* force 4-byte alignment */ gdt: Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386bug.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386bug.c [iso-8859-1] Sat Oct 18 21:12:12 2014 @@ -86,11 +86,11 @@ PrintText("Frames:\n"); #ifdef _M_IX86 for (Frame = (FRAME*)TrapFrame->Ebp; - Frame != 0 && (ULONG_PTR)Frame < STACK32ADDR; + Frame != 0 && (ULONG_PTR)Frame < STACKADDR; Frame = Frame->Next) #else for (Frame = (FRAME*)TrapFrame->TrapFrame; - Frame != 0 && (ULONG_PTR)Frame < STACK32ADDR; + Frame != 0 && (ULONG_PTR)Frame < STACKADDR; Frame = Frame->Next) #endif { @@ -171,6 +171,44 @@ InstructionPointer[6], InstructionPointer[7]); } +VOID +NTAPI +FrLdrBugCheckWithMessage( + ULONG BugCode, + PCHAR File, + ULONG Line, + PSTR Format, + ...) +{ + CHAR Buffer[1024]; + va_list argptr; + + /* Blue screen for the win */ + MachVideoClearScreen(SCREEN_ATTR); + i386_ScreenPosX = 0; + i386_ScreenPosY = 0; + + PrintText("A problem has been detected and FreeLoader boot has been aborted.\n\n"); + + PrintText("%ld: %s\n\n", BugCode, BugCodeStrings[BugCode]); + + if (File) + { + PrintText("Location: %s:%ld\n\n", File, Line); + } + + va_start(argptr, Format); + _vsnprintf(Buffer, sizeof(Buffer), Format, argptr); + va_end(argptr); + Buffer[sizeof(Buffer) - 1] = 0; + + i386PrintText(Buffer); + + _disable(); + __halt(); + for (;;); +} + void NTAPI FrLdrBugCheckEx( Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c [iso-8859-1] Sat Oct 18 21:12:12 2014 @@ -28,15 +28,15 @@ DBG_DEFAULT_CHANNEL(MEMORY); #define MAX_BIOS_DESCRIPTORS 32 + +#define STACK_BASE_PAGE (STACKLOW / PAGE_SIZE) #define FREELDR_BASE_PAGE (FREELDR_BASE / PAGE_SIZE) #define DISKBUF_BASE_PAGE (DISKREADBUFFER / PAGE_SIZE) -#define STACK_BASE_PAGE (STACKLOWLIMIT / PAGE_SIZE) -#define STACK_END_PAGE (STACK32ADDR / PAGE_SIZE) #define BIOSBUF_BASE_PAGE (BIOSCALLBUFFER / PAGE_SIZE) +#define STACK_PAGE_COUNT (FREELDR_BASE_PAGE - STACK_BASE_PAGE) #define FREELDR_PAGE_COUNT (DISKBUF_BASE_PAGE - FREELDR_BASE_PAGE) -#define DISKBUF_PAGE_COUNT (STACK_BASE_PAGE - DISKBUF_BASE_PAGE) -#define STACK_PAGE_COUNT (STACK_END_PAGE - STACK_BASE_PAGE) +#define DISKBUF_PAGE_COUNT (0x10) #define BIOSBUF_PAGE_COUNT (1) BIOS_MEMORY_MAP PcBiosMemoryMap[MAX_BIOS_DESCRIPTORS]; @@ -45,11 +45,12 @@ FREELDR_MEMORY_DESCRIPTOR PcMemoryMap[MAX_BIOS_DESCRIPTORS + 1] = { { LoaderFirmwarePermanent, 0x00, 1 }, // realmode int vectors - { LoaderFirmwareTemporary, 0x01, FREELDR_BASE_PAGE - 1 }, // freeldr stack + cmdline + { LoaderFirmwareTemporary, 0x01, STACK_BASE_PAGE - 1 }, // freeldr stack + cmdline + { LoaderOsloaderStack, STACK_BASE_PAGE, FREELDR_BASE_PAGE - STACK_BASE_PAGE }, // prot mode stack. { LoaderLoadedProgram, FREELDR_BASE_PAGE, FREELDR_PAGE_COUNT }, // freeldr image { LoaderFirmwareTemporary, DISKBUF_BASE_PAGE, DISKBUF_PAGE_COUNT }, // Disk read buffer for int 13h. DISKREADBUFFER - { LoaderOsloaderStack, STACK_BASE_PAGE, STACK_PAGE_COUNT }, // prot mode stack. { LoaderFirmwareTemporary, BIOSBUF_BASE_PAGE, BIOSBUF_PAGE_COUNT }, // BIOSCALLBUFFER + { LoaderFirmwarePermanent, 0x9F, 0x1 }, // EBDA { LoaderFirmwarePermanent, 0xA0, 0x50 }, // ROM / Video { LoaderSpecialMemory, 0xF0, 0x10 }, // ROM / Video { LoaderSpecialMemory, 0xFFF, 1 }, // unusable memory @@ -193,9 +194,63 @@ ULONG MapCount = 0; ULONGLONG RealBaseAddress, RealSize; TYPE_OF_MEMORY MemoryType; + ULONG Size; ASSERT(PcBiosMapCount == 0); TRACE("GetBiosMemoryMap()\n"); + + /* Make sure the usable memory is large enough. To do this we check the 16 + bit value at address 0x413 inside the BDA, which gives us the usable size + in KB */ + Size = (*(PUSHORT)(ULONG_PTR)0x413) * 1024; + if (Size < 0x9F000) + { + FrLdrBugCheckWithMessage( + MEMORY_INIT_FAILURE, + __FILE__, + __LINE__, + "The BIOS reported a usable memory range up to 0x%x, which is too small!\n", + Size); + } + + /* Get the address of the Extended BIOS Data Area (EBDA). + * Int 15h, AH=C1h + * SYSTEM - RETURN EXTENDED-BIOS DATA-AREA SEGMENT ADDRESS (PS) + * + * Return: + * CF set on error + * CF clear if successful + * ES = segment of data area + */ + Regs.x.eax = 0x0000C100; + Int386(0x15, &Regs, &Regs); + + /* If the function fails, there is no EBDA */ + if (INT386_SUCCESS(Regs)) + { + /* Check if this is high enough */ + ULONG EbdaBase = (ULONG)Regs.w.es << 4; + if (EbdaBase < 0x9F000) + { + FrLdrBugCheckWithMessage( + MEMORY_INIT_FAILURE, + __FILE__, + __LINE__, + "The location of your EBDA is 0x%lx, which is too low!\n" + "If you see this, please report to the ReactOS team!", + EbdaBase); + } + + /* Calculate the (max) size of the EBDA */ + Size = 0xA0000 - EbdaBase; + + /* Add the descriptor */ + MapCount = AddMemoryDescriptor(PcMemoryMap, + MAX_BIOS_DESCRIPTORS, + (EbdaBase / MM_PAGE_SIZE), + (Size / MM_PAGE_SIZE), + LoaderFirmwarePermanent); + } /* Int 15h AX=E820h * Newer BIOSes - GET SYSTEM MEMORY MAP Modified: 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 [iso-8859-1] Sat Oct 18 21:12:12 2014 @@ -444,6 +444,7 @@ "TEST_BUGCHECK", "MISSING_HARDWARE_REQUIREMENTS", "FREELDR_IMAGE_CORRUPTION", + "MEMORY_INIT_FAILURE", }; ULONG_PTR BugCheckInfo[5]; Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h [iso-8859-1] Sat Oct 18 21:12:12 2014 @@ -11,13 +11,13 @@ //#endif #define STACK16ADDR HEX(6F00) /* The 16-bit stack top will be at 0000:6F00 */ #define BSS_START HEX(6F00) +#define STACKLOW HEX(7000) +#define STACKADDR HEX(F000) /* The 32/64-bit stack top will be at 0000:F000, or 0xF000 */ #define FREELDR_BASE HEX(F800) #define FREELDR_PE_BASE HEX(10000) -#define DISKREADBUFFER HEX(80000) /* Buffer to store data read in from the disk via the BIOS */ -#define STACKLOWLIMIT HEX(90000) -#define STACK32ADDR HEX(98000) /* The 32-bit stack top will be at 9000:8000, or 0xA8000 */ -#define STACK64ADDR HEX(98000) /* The 64-bit stack top will be at 98000 */ -#define BIOSCALLBUFFER HEX(98000) /* Buffer to store temporary data for any Int386() call */ +#define DISKREADBUFFER HEX(8E000) /* Buffer to store data read in from the disk via the BIOS */ +#define BIOSCALLBUFFER HEX(9E000) /* Buffer to store temporary data for any Int386() call */ +/* 9F000- 9FFFF is reserved for the EBDA */ #define DISKREADBUFFER_SIZE HEX(10000) #define BIOSCALLBUFSEGMENT (BIOSCALLBUFFER/16) /* Buffer to store temporary data for any Int386() call */ Modified: trunk/reactos/boot/freeldr/freeldr/include/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/debug.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/debug.h [iso-8859-1] Sat Oct 18 21:12:12 2014 @@ -124,12 +124,22 @@ NTAPI FrLdrBugCheck(ULONG BugCode); +VOID +NTAPI +FrLdrBugCheckWithMessage( + ULONG BugCode, + PCHAR File, + ULONG Line, + PSTR Format, + ...); + /* Bugcheck codes */ enum _FRLDR_BUGCHECK_CODES { TEST_BUGCHECK, MISSING_HARDWARE_REQUIREMENTS, FREELDR_IMAGE_CORRUPTION, + MEMORY_INIT_FAILURE, }; extern char *BugCodeStrings[]; 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] Sat Oct 18 21:12:12 2014 @@ -159,8 +159,8 @@ } } - -BOOLEAN +static +VOID MmCheckFreeldrImageFile() { PIMAGE_NT_HEADERS NtHeaders; @@ -172,7 +172,11 @@ if (!NtHeaders) { ERR("Could not get NtHeaders!\n"); - return FALSE; + FrLdrBugCheckWithMessage( + FREELDR_IMAGE_CORRUPTION, + __FILE__, + __LINE__, + "Could not get NtHeaders!\n"); } /* Check the file header */ @@ -184,12 +188,21 @@ (FileHeader->SizeOfOptionalHeader != sizeof(IMAGE_OPTIONAL_HEADER))) { ERR("FreeLdr FileHeader is invalid.\n"); - BugCheckInfo[0] = FileHeader->Machine; - BugCheckInfo[1] = FileHeader->NumberOfSections; - BugCheckInfo[2] = FileHeader->PointerToSymbolTable; - BugCheckInfo[3] = FileHeader->NumberOfSymbols; - BugCheckInfo[4] = FileHeader->SizeOfOptionalHeader; - return FALSE; + FrLdrBugCheckWithMessage( + FREELDR_IMAGE_CORRUPTION, + __FILE__, + __LINE__, + "FreeLdr FileHeader is invalid.\n" + "Machine == 0x%lx, expected 0x%lx\n" + "NumberOfSections == 0x%lx, expected 0x%lx\n" + "PointerToSymbolTable == 0x%lx, expected 0\n" + "NumberOfSymbols == 0x%lx, expected 0\n" + "SizeOfOptionalHeader == 0x%lx, expected 0x%lx\n", + FileHeader->Machine, IMAGE_FILE_MACHINE_NATIVE, + FileHeader->NumberOfSections, FREELDR_SECTION_COUNT, + FileHeader->PointerToSymbolTable, + FileHeader->NumberOfSymbols, + FileHeader->SizeOfOptionalHeader, sizeof(IMAGE_OPTIONAL_HEADER)); } /* Check the optional header */ @@ -201,15 +214,22 @@ (OptionalHeader->SectionAlignment != OptionalHeader->FileAlignment)) { ERR("FreeLdr OptionalHeader is invalid.\n"); - BugCheckInfo[0] = 0x80000000 | (OptionalHeader->Subsystem << 16) | OptionalHeader->Magic; - BugCheckInfo[1] = OptionalHeader->ImageBase; - BugCheckInfo[2] = OptionalHeader->SizeOfImage; - BugCheckInfo[3] = OptionalHeader->SectionAlignment; - BugCheckInfo[4] = OptionalHeader->FileAlignment; - return FALSE; - } - - return TRUE; + FrLdrBugCheckWithMessage( + FREELDR_IMAGE_CORRUPTION, + __FILE__, + __LINE__, + "FreeLdr OptionalHeader is invalid.\n" + "Magic == 0x%lx, expected 0x%lx\n" + "Subsystem == 0x%lx, expected 1 (native)\n" + "ImageBase == 0x%lx, expected 0x%lx\n" + "SizeOfImage == 0x%lx, maximum 0x%lx\n" + "SectionAlignment 0x%lx doesn't match FileAlignment 0x%lx\n", + OptionalHeader->Magic, IMAGE_NT_OPTIONAL_HDR_MAGIC, + OptionalHeader->Subsystem, + OptionalHeader->ImageBase, FREELDR_PE_BASE, + OptionalHeader->SizeOfImage, MAX_FREELDR_PE_SIZE, + OptionalHeader->SectionAlignment, OptionalHeader->FileAlignment); + } } BOOLEAN MmInitializeMemoryManager(VOID) @@ -221,10 +241,7 @@ TRACE("Initializing Memory Manager.\n"); /* Check the freeldr binary */ - if (!MmCheckFreeldrImageFile()) - { - FrLdrBugCheck(FREELDR_IMAGE_CORRUPTION); - } + MmCheckFreeldrImageFile(); BiosMemoryMap = MachVtbl.GetMemoryMap(&BiosMemoryMapEntryCount);

1 0

[hpoussin] 64814: [ACPI] Fix some traces
by hpoussin＠svn.reactos.org 18 Oct '14

18 Oct '14

Author: hpoussin Date: Sat Oct 18 21:09:31 2014 New Revision: 64814 URL: http://svn.reactos.org/svn/reactos?rev=64814&view=rev Log: [ACPI] Fix some traces Modified: trunk/reactos/drivers/bus/acpi/busmgr/bus.c trunk/reactos/drivers/bus/acpi/busmgr/power.c trunk/reactos/drivers/bus/acpi/busmgr/system.c Modified: trunk/reactos/drivers/bus/acpi/busmgr/bus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/busmgr/bu… ============================================================================== --- trunk/reactos/drivers/bus/acpi/busmgr/bus.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/busmgr/bus.c [iso-8859-1] Sat Oct 18 21:09:31 2014 @@ -96,7 +96,7 @@ ACPI_HANDLE handle, void *context) { - DPRINT1("acpi_bus_data_handler not implemented"); + DPRINT1("acpi_bus_data_handler not implemented\n"); /* TBD */ @@ -489,7 +489,7 @@ { ULONG_PTR TypeData = 0; - DPRINT("acpi_bus_generate_event"); + DPRINT("acpi_bus_generate_event\n"); if (!device) return_VALUE(AE_BAD_PARAMETER); @@ -519,7 +519,7 @@ //DECLARE_WAITQUEUE(wait, current); - DPRINT("acpi_bus_receive_event"); + DPRINT("acpi_bus_receive_event\n"); if (!event) return AE_BAD_PARAMETER; @@ -1635,7 +1635,7 @@ int result = 0; ACPI_STATUS status = AE_OK; - DPRINT("acpi_bus_init"); + DPRINT1("acpi_bus_init\n"); KeInitializeDpc(&event_dpc, acpi_bus_generate_event_dpc, NULL); @@ -1714,7 +1714,7 @@ { ACPI_STATUS status = AE_OK; - DPRINT("acpi_bus_exit"); + DPRINT1("acpi_bus_exit\n"); status = AcpiRemoveNotifyHandler(ACPI_ROOT_OBJECT, ACPI_SYSTEM_NOTIFY, acpi_bus_notify); @@ -1748,7 +1748,7 @@ { int result = 0; - DPRINT("acpi_init"); + DPRINT("acpi_init\n"); DPRINT("Subsystem revision %08x\n",ACPI_CA_VERSION); @@ -1806,7 +1806,7 @@ void acpi_exit (void) { - DPRINT("acpi_exit"); + DPRINT("acpi_exit\n"); #ifdef CONFIG_PM pm_active = 0; Modified: trunk/reactos/drivers/bus/acpi/busmgr/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/busmgr/po… ============================================================================== --- trunk/reactos/drivers/bus/acpi/busmgr/power.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/busmgr/power.c [iso-8859-1] Sat Oct 18 21:09:31 2014 @@ -659,7 +659,7 @@ { int result = 0; - DPRINT("acpi_power_init"); + DPRINT("acpi_power_init\n"); INIT_LIST_HEAD(&acpi_power_resource_list); Modified: trunk/reactos/drivers/bus/acpi/busmgr/system.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/busmgr/sy… ============================================================================== --- trunk/reactos/drivers/bus/acpi/busmgr/system.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/busmgr/system.c [iso-8859-1] Sat Oct 18 21:09:31 2014 @@ -94,7 +94,7 @@ case ACPI_STATE_S4: if (/*AcpiGbl_FACS->S4bios_f &&*/ 0 != AcpiGbl_FADT.SmiCommand) { - DPRINT(" S4bios"); + DPRINT(" S4bios\n"); system->states[i] = 1; } /* no break */

1 0

[hpoussin] 64813: [CMLIB] Add an assert to track potential registry corruptions
by hpoussin＠svn.reactos.org 18 Oct '14

18 Oct '14

Author: hpoussin Date: Sat Oct 18 21:08:40 2014 New Revision: 64813 URL: http://svn.reactos.org/svn/reactos?rev=64813&view=rev Log: [CMLIB] Add an assert to track potential registry corruptions Modified: trunk/reactos/lib/cmlib/hivecell.c Modified: trunk/reactos/lib/cmlib/hivecell.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivecell.c?rev=6… ============================================================================== --- trunk/reactos/lib/cmlib/hivecell.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hivecell.c [iso-8859-1] Sat Oct 18 21:08:40 2014 @@ -71,6 +71,7 @@ PHHIVE RegistryHive, HCELL_INDEX CellIndex) { + ASSERT(CellIndex != HCELL_NIL); return (PVOID)(HvpGetCellHeader(RegistryHive, CellIndex) + 1); }

1 0

[tkreuzer] 64812: [AMD64] Fix build
by tkreuzer＠svn.reactos.org 18 Oct '14

18 Oct '14

Author: tkreuzer Date: Sat Oct 18 21:01:17 2014 New Revision: 64812 URL: http://svn.reactos.org/svn/reactos?rev=64812&view=rev Log: [AMD64] Fix build Modified: trunk/reactos/include/asm/genincdata.c trunk/reactos/include/crt/msc/intrin.h Modified: trunk/reactos/include/asm/genincdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/asm/genincdata.c?r… ============================================================================== --- trunk/reactos/include/asm/genincdata.c [iso-8859-1] (original) +++ trunk/reactos/include/asm/genincdata.c [iso-8859-1] Sat Oct 18 21:01:17 2014 @@ -74,7 +74,7 @@ ASMGENDATA Table[] = { -#if defined (_M_IX86) || defined (M_AMD64) +#if defined (_M_IX86) || defined (_M_AMD64) /* PORTABLE CONSTANTS ********************************************************/ #include "ksx.template.h" #endif Modified: trunk/reactos/include/crt/msc/intrin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/msc/intrin.h?r… ============================================================================== --- trunk/reactos/include/crt/msc/intrin.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/msc/intrin.h [iso-8859-1] Sat Oct 18 21:01:17 2014 @@ -651,7 +651,6 @@ #elif defined(_M_AMD64) void __invlpg(void * Address); #pragma intrinsic(__invlpg) -#elif defined(_M_AMD64) unsigned __int64 __readcr0(void); #pragma intrinsic(__readcr0) unsigned __int64 __readcr2(void);

1 0

[tkreuzer] 64811: [FREELDR] Apply proper indentation, no code change.
by tkreuzer＠svn.reactos.org 18 Oct '14

18 Oct '14

Author: tkreuzer Date: Sat Oct 18 19:01:53 2014 New Revision: 64811 URL: http://svn.reactos.org/svn/reactos?rev=64811&view=rev Log: [FREELDR] Apply proper indentation, no code change. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c [iso-8859-1] Sat Oct 18 19:01:53 2014 @@ -44,16 +44,16 @@ FREELDR_MEMORY_DESCRIPTOR PcMemoryMap[MAX_BIOS_DESCRIPTORS + 1] = { - { LoaderFirmwarePermanent, 0x00, 1 }, // realmode int vectors - { LoaderFirmwareTemporary, 0x01, FREELDR_BASE_PAGE - 1 }, // freeldr stack + cmdline - { LoaderLoadedProgram, FREELDR_BASE_PAGE, FREELDR_PAGE_COUNT }, // freeldr image - { LoaderFirmwareTemporary, DISKBUF_BASE_PAGE, DISKBUF_PAGE_COUNT }, // Disk read buffer for int 13h. DISKREADBUFFER - { LoaderOsloaderStack, STACK_BASE_PAGE, STACK_PAGE_COUNT }, // prot mode stack. - { LoaderFirmwareTemporary, BIOSBUF_BASE_PAGE, BIOSBUF_PAGE_COUNT }, // BIOSCALLBUFFER - { LoaderFirmwarePermanent, 0xA0, 0x50 }, // ROM / Video - { LoaderSpecialMemory, 0xF0, 0x10 }, // ROM / Video - { LoaderSpecialMemory, 0xFFF, 1 }, // unusable memory - { 0, 0, 0 }, // end of map + { LoaderFirmwarePermanent, 0x00, 1 }, // realmode int vectors + { LoaderFirmwareTemporary, 0x01, FREELDR_BASE_PAGE - 1 }, // freeldr stack + cmdline + { LoaderLoadedProgram, FREELDR_BASE_PAGE, FREELDR_PAGE_COUNT }, // freeldr image + { LoaderFirmwareTemporary, DISKBUF_BASE_PAGE, DISKBUF_PAGE_COUNT }, // Disk read buffer for int 13h. DISKREADBUFFER + { LoaderOsloaderStack, STACK_BASE_PAGE, STACK_PAGE_COUNT }, // prot mode stack. + { LoaderFirmwareTemporary, BIOSBUF_BASE_PAGE, BIOSBUF_PAGE_COUNT }, // BIOSCALLBUFFER + { LoaderFirmwarePermanent, 0xA0, 0x50 }, // ROM / Video + { LoaderSpecialMemory, 0xF0, 0x10 }, // ROM / Video + { LoaderSpecialMemory, 0xFFF, 1 }, // unusable memory + { 0, 0, 0 }, // end of map }; ULONG @@ -163,187 +163,187 @@ static ULONG PcMemGetConventionalMemorySize(VOID) { - REGS Regs; - - TRACE("GetConventionalMemorySize()\n"); - - /* Int 12h - * BIOS - GET MEMORY SIZE - * - * Return: - * AX = kilobytes of contiguous memory starting at absolute address 00000h - * - * This call returns the contents of the word at 0040h:0013h; - * in PC and XT, this value is set from the switches on the motherboard - */ - Regs.w.ax = 0; - Int386(0x12, &Regs, &Regs); - - TRACE("Int12h\n"); - TRACE("AX = 0x%x\n\n", Regs.w.ax); - - return (ULONG)Regs.w.ax; + REGS Regs; + + TRACE("GetConventionalMemorySize()\n"); + + /* Int 12h + * BIOS - GET MEMORY SIZE + * + * Return: + * AX = kilobytes of contiguous memory starting at absolute address 00000h + * + * This call returns the contents of the word at 0040h:0013h; + * in PC and XT, this value is set from the switches on the motherboard + */ + Regs.w.ax = 0; + Int386(0x12, &Regs, &Regs); + + TRACE("Int12h\n"); + TRACE("AX = 0x%x\n\n", Regs.w.ax); + + return (ULONG)Regs.w.ax; } static ULONG PcMemGetBiosMemoryMap(PFREELDR_MEMORY_DESCRIPTOR MemoryMap, ULONG MaxMemoryMapSize) { - REGS Regs; - ULONG MapCount = 0; - ULONGLONG RealBaseAddress, RealSize; - TYPE_OF_MEMORY MemoryType; - ASSERT(PcBiosMapCount == 0); - - TRACE("GetBiosMemoryMap()\n"); - - /* Int 15h AX=E820h - * Newer BIOSes - GET SYSTEM MEMORY MAP - * - * AX = E820h - * EAX = 0000E820h - * EDX = 534D4150h ('SMAP') - * EBX = continuation value or 00000000h to start at beginning of map - * ECX = size of buffer for result, in bytes (should be >= 20 bytes) - * ES:DI -> buffer for result - * Return: - * CF clear if successful - * EAX = 534D4150h ('SMAP') - * ES:DI buffer filled - * EBX = next offset from which to copy or 00000000h if all done - * ECX = actual length returned in bytes - * CF set on error - * AH = error code (86h) - */ - Regs.x.ebx = 0x00000000; - - while (PcBiosMapCount < MAX_BIOS_DESCRIPTORS) - { - /* Setup the registers for the BIOS call */ - Regs.x.eax = 0x0000E820; - Regs.x.edx = 0x534D4150; /* ('SMAP') */ - /* Regs.x.ebx = 0x00000001; Continuation value already set */ - Regs.x.ecx = sizeof(BIOS_MEMORY_MAP); - Regs.w.es = BIOSCALLBUFSEGMENT; - Regs.w.di = BIOSCALLBUFOFFSET; - Int386(0x15, &Regs, &Regs); - - TRACE("Memory Map Entry %d\n", PcBiosMapCount); - TRACE("Int15h AX=E820h\n"); - TRACE("EAX = 0x%x\n", Regs.x.eax); - TRACE("EBX = 0x%x\n", Regs.x.ebx); - TRACE("ECX = 0x%x\n", Regs.x.ecx); - TRACE("CF set = %s\n", (Regs.x.eflags & EFLAGS_CF) ? "TRUE" : "FALSE"); - - /* If the BIOS didn't return 'SMAP' in EAX then - * it doesn't support this call. If CF is set, we're done */ - if (Regs.x.eax != 0x534D4150 || !INT386_SUCCESS(Regs)) - { - break; - } - - /* Copy data to global buffer */ - RtlCopyMemory(&PcBiosMemoryMap[PcBiosMapCount], (PVOID)BIOSCALLBUFFER, Regs.x.ecx); - - TRACE("BaseAddress: 0x%llx\n", PcBiosMemoryMap[PcBiosMapCount].BaseAddress); - TRACE("Length: 0x%llx\n", PcBiosMemoryMap[PcBiosMapCount].Length); - TRACE("Type: 0x%lx\n", PcBiosMemoryMap[PcBiosMapCount].Type); - TRACE("Reserved: 0x%lx\n", PcBiosMemoryMap[PcBiosMapCount].Reserved); - TRACE("\n"); - - /* Check if this is free memory */ - if (PcBiosMemoryMap[PcBiosMapCount].Type == BiosMemoryUsable) - { - MemoryType = LoaderFree; - - /* Align up base of memory area */ - RealBaseAddress = PcBiosMemoryMap[PcBiosMapCount].BaseAddress & ~(MM_PAGE_SIZE - 1ULL); - - /* Calculate the length after aligning the base */ - RealSize = PcBiosMemoryMap[PcBiosMapCount].BaseAddress + - PcBiosMemoryMap[PcBiosMapCount].Length - RealBaseAddress; - RealSize = (RealSize + MM_PAGE_SIZE - 1) & ~(MM_PAGE_SIZE - 1ULL); - } - else - { - if (PcBiosMemoryMap[PcBiosMapCount].Type == BiosMemoryReserved) - MemoryType = LoaderFirmwarePermanent; - else - MemoryType = LoaderSpecialMemory; - - /* Align down base of memory area */ - RealBaseAddress = PcBiosMemoryMap[PcBiosMapCount].BaseAddress & ~(MM_PAGE_SIZE - 1ULL); - /* Calculate the length after aligning the base */ - RealSize = PcBiosMemoryMap[PcBiosMapCount].BaseAddress + - PcBiosMemoryMap[PcBiosMapCount].Length - RealBaseAddress; - RealSize = (RealSize + MM_PAGE_SIZE - 1) & ~(MM_PAGE_SIZE - 1ULL); - } - - /* Check if we can add this descriptor */ - if ((RealSize >= MM_PAGE_SIZE) && (MapCount < MaxMemoryMapSize)) - { - /* Add the descriptor */ - MapCount = AddMemoryDescriptor(PcMemoryMap, - MAX_BIOS_DESCRIPTORS, - (PFN_NUMBER)(RealBaseAddress / MM_PAGE_SIZE), - (PFN_NUMBER)(RealSize / MM_PAGE_SIZE), - MemoryType); - } - - PcBiosMapCount++; - - /* If the continuation value is zero or the - * carry flag is set then this was - * the last entry so we're done */ - if (Regs.x.ebx == 0x00000000) - { - TRACE("End Of System Memory Map!\n\n"); - break; - } - - } - - return MapCount; + REGS Regs; + ULONG MapCount = 0; + ULONGLONG RealBaseAddress, RealSize; + TYPE_OF_MEMORY MemoryType; + ASSERT(PcBiosMapCount == 0); + + TRACE("GetBiosMemoryMap()\n"); + + /* Int 15h AX=E820h + * Newer BIOSes - GET SYSTEM MEMORY MAP + * + * AX = E820h + * EAX = 0000E820h + * EDX = 534D4150h ('SMAP') + * EBX = continuation value or 00000000h to start at beginning of map + * ECX = size of buffer for result, in bytes (should be >= 20 bytes) + * ES:DI -> buffer for result + * Return: + * CF clear if successful + * EAX = 534D4150h ('SMAP') + * ES:DI buffer filled + * EBX = next offset from which to copy or 00000000h if all done + * ECX = actual length returned in bytes + * CF set on error + * AH = error code (86h) + */ + Regs.x.ebx = 0x00000000; + + while (PcBiosMapCount < MAX_BIOS_DESCRIPTORS) + { + /* Setup the registers for the BIOS call */ + Regs.x.eax = 0x0000E820; + Regs.x.edx = 0x534D4150; /* ('SMAP') */ + /* Regs.x.ebx = 0x00000001; Continuation value already set */ + Regs.x.ecx = sizeof(BIOS_MEMORY_MAP); + Regs.w.es = BIOSCALLBUFSEGMENT; + Regs.w.di = BIOSCALLBUFOFFSET; + Int386(0x15, &Regs, &Regs); + + TRACE("Memory Map Entry %d\n", PcBiosMapCount); + TRACE("Int15h AX=E820h\n"); + TRACE("EAX = 0x%x\n", Regs.x.eax); + TRACE("EBX = 0x%x\n", Regs.x.ebx); + TRACE("ECX = 0x%x\n", Regs.x.ecx); + TRACE("CF set = %s\n", (Regs.x.eflags & EFLAGS_CF) ? "TRUE" : "FALSE"); + + /* If the BIOS didn't return 'SMAP' in EAX then + * it doesn't support this call. If CF is set, we're done */ + if (Regs.x.eax != 0x534D4150 || !INT386_SUCCESS(Regs)) + { + break; + } + + /* Copy data to global buffer */ + RtlCopyMemory(&PcBiosMemoryMap[PcBiosMapCount], (PVOID)BIOSCALLBUFFER, Regs.x.ecx); + + TRACE("BaseAddress: 0x%llx\n", PcBiosMemoryMap[PcBiosMapCount].BaseAddress); + TRACE("Length: 0x%llx\n", PcBiosMemoryMap[PcBiosMapCount].Length); + TRACE("Type: 0x%lx\n", PcBiosMemoryMap[PcBiosMapCount].Type); + TRACE("Reserved: 0x%lx\n", PcBiosMemoryMap[PcBiosMapCount].Reserved); + TRACE("\n"); + + /* Check if this is free memory */ + if (PcBiosMemoryMap[PcBiosMapCount].Type == BiosMemoryUsable) + { + MemoryType = LoaderFree; + + /* Align up base of memory area */ + RealBaseAddress = PcBiosMemoryMap[PcBiosMapCount].BaseAddress & ~(MM_PAGE_SIZE - 1ULL); + + /* Calculate the length after aligning the base */ + RealSize = PcBiosMemoryMap[PcBiosMapCount].BaseAddress + + PcBiosMemoryMap[PcBiosMapCount].Length - RealBaseAddress; + RealSize = (RealSize + MM_PAGE_SIZE - 1) & ~(MM_PAGE_SIZE - 1ULL); + } + else + { + if (PcBiosMemoryMap[PcBiosMapCount].Type == BiosMemoryReserved) + MemoryType = LoaderFirmwarePermanent; + else + MemoryType = LoaderSpecialMemory; + + /* Align down base of memory area */ + RealBaseAddress = PcBiosMemoryMap[PcBiosMapCount].BaseAddress & ~(MM_PAGE_SIZE - 1ULL); + /* Calculate the length after aligning the base */ + RealSize = PcBiosMemoryMap[PcBiosMapCount].BaseAddress + + PcBiosMemoryMap[PcBiosMapCount].Length - RealBaseAddress; + RealSize = (RealSize + MM_PAGE_SIZE - 1) & ~(MM_PAGE_SIZE - 1ULL); + } + + /* Check if we can add this descriptor */ + if ((RealSize >= MM_PAGE_SIZE) && (MapCount < MaxMemoryMapSize)) + { + /* Add the descriptor */ + MapCount = AddMemoryDescriptor(PcMemoryMap, + MAX_BIOS_DESCRIPTORS, + (PFN_NUMBER)(RealBaseAddress / MM_PAGE_SIZE), + (PFN_NUMBER)(RealSize / MM_PAGE_SIZE), + MemoryType); + } + + PcBiosMapCount++; + + /* If the continuation value is zero or the + * carry flag is set then this was + * the last entry so we're done */ + if (Regs.x.ebx == 0x00000000) + { + TRACE("End Of System Memory Map!\n\n"); + break; + } + + } + + return MapCount; } PFREELDR_MEMORY_DESCRIPTOR PcMemGetMemoryMap(ULONG *MemoryMapSize) { - ULONG i, EntryCount; - ULONG ExtendedMemorySizeAtOneMB; - ULONG ExtendedMemorySizeAtSixteenMB; - - EntryCount = PcMemGetBiosMemoryMap(PcMemoryMap, MAX_BIOS_DESCRIPTORS); - - /* If the BIOS didn't provide a memory map, synthesize one */ - if (0 == EntryCount) - { - GetExtendedMemoryConfiguration(&ExtendedMemorySizeAtOneMB, &ExtendedMemorySizeAtSixteenMB); - - /* Conventional memory */ - AddMemoryDescriptor(PcMemoryMap, - MAX_BIOS_DESCRIPTORS, - 0, - PcMemGetConventionalMemorySize() * 1024 / PAGE_SIZE, - LoaderFree); - - /* Extended memory */ - EntryCount = AddMemoryDescriptor(PcMemoryMap, - MAX_BIOS_DESCRIPTORS, - 1024 * 1024 / PAGE_SIZE, - ExtendedMemorySizeAtOneMB * 1024 / PAGE_SIZE, - LoaderFree); - - if (ExtendedMemorySizeAtSixteenMB != 0) - { - /* Extended memory at 16MB */ + ULONG i, EntryCount; + ULONG ExtendedMemorySizeAtOneMB; + ULONG ExtendedMemorySizeAtSixteenMB; + + EntryCount = PcMemGetBiosMemoryMap(PcMemoryMap, MAX_BIOS_DESCRIPTORS); + + /* If the BIOS didn't provide a memory map, synthesize one */ + if (0 == EntryCount) + { + GetExtendedMemoryConfiguration(&ExtendedMemorySizeAtOneMB, &ExtendedMemorySizeAtSixteenMB); + + /* Conventional memory */ + AddMemoryDescriptor(PcMemoryMap, + MAX_BIOS_DESCRIPTORS, + 0, + PcMemGetConventionalMemorySize() * 1024 / PAGE_SIZE, + LoaderFree); + + /* Extended memory */ EntryCount = AddMemoryDescriptor(PcMemoryMap, - MAX_BIOS_DESCRIPTORS, - 0x1000000 / PAGE_SIZE, - ExtendedMemorySizeAtSixteenMB * 64 * 1024 / PAGE_SIZE, - LoaderFree); - } + MAX_BIOS_DESCRIPTORS, + 1024 * 1024 / PAGE_SIZE, + ExtendedMemorySizeAtOneMB * 1024 / PAGE_SIZE, + LoaderFree); + + if (ExtendedMemorySizeAtSixteenMB != 0) + { + /* Extended memory at 16MB */ + EntryCount = AddMemoryDescriptor(PcMemoryMap, + MAX_BIOS_DESCRIPTORS, + 0x1000000 / PAGE_SIZE, + ExtendedMemorySizeAtSixteenMB * 64 * 1024 / PAGE_SIZE, + LoaderFree); + } } TRACE("Dumping resulting memory map:\n"); @@ -355,9 +355,9 @@ MmGetSystemMemoryMapTypeString(PcMemoryMap[i].MemoryType)); } - *MemoryMapSize = EntryCount; - - return PcMemoryMap; + *MemoryMapSize = EntryCount; + + return PcMemoryMap; } /* EOF */

1 0

[akhaldi] 64810: [USER32] * WINEMessageTypeNames is only used in a case wrapped inside #ifndef __REACTOS__.
by akhaldi＠svn.reactos.org 18 Oct '14

18 Oct '14

Author: akhaldi Date: Sat Oct 18 18:41:15 2014 New Revision: 64810 URL: http://svn.reactos.org/svn/reactos?rev=64810&view=rev Log: [USER32] * WINEMessageTypeNames is only used in a case wrapped inside #ifndef __REACTOS__. Modified: trunk/reactos/win32ss/user/user32/windows/spy.c Modified: trunk/reactos/win32ss/user/user32/windows/spy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/spy.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/spy.c [iso-8859-1] Sat Oct 18 18:41:15 2014 @@ -1122,6 +1122,8 @@ }; #define SPY_MAX_WINEMSGNUM 9 + +#ifndef __REACTOS__ static const char * const WINEMessageTypeNames[SPY_MAX_WINEMSGNUM + 1] = { "WM_WINE_DESTROYWINDOW", @@ -1134,6 +1136,7 @@ "WM_WINE_KEYBOARD_LL_HOOK", "WM_WINE_MOUSE_LL_HOOK", }; +#endif /* Virtual key names */ #define SPY_MAX_VKKEYSNUM 255

1 0

[akhaldi] 64809: [USER32] * We're not using any debugging routines here.
by akhaldi＠svn.reactos.org 18 Oct '14

18 Oct '14

Author: akhaldi Date: Sat Oct 18 18:37:28 2014 New Revision: 64809 URL: http://svn.reactos.org/svn/reactos?rev=64809&view=rev Log: [USER32] * We're not using any debugging routines here. Modified: trunk/reactos/win32ss/user/user32/windows/paint.c Modified: trunk/reactos/win32ss/user/user32/windows/paint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/paint.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/paint.c [iso-8859-1] Sat Oct 18 18:37:28 2014 @@ -28,10 +28,6 @@ /* INCLUDES ******************************************************************/ #include <user32.h> - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(user32); static HBRUSH FrameBrushes[13]; static HBITMAP hHatch;

1 0

[akhaldi] 64808: [CMAKE/MSVC] * Rename the lib to runtmchk. Really. CORE-8626
by akhaldi＠svn.reactos.org 18 Oct '14

18 Oct '14

Author: akhaldi Date: Sat Oct 18 14:45:02 2014 New Revision: 64808 URL: http://svn.reactos.org/svn/reactos?rev=64808&view=rev Log: [CMAKE/MSVC] * Rename the lib to runtmchk. Really. CORE-8626 Added: trunk/reactos/lib/sdk/runtmchk/ - copied from r64807, trunk/reactos/lib/sdk/RunTmChk/ Removed: trunk/reactos/lib/sdk/RunTmChk/ Modified: trunk/reactos/lib/sdk/runtmchk/CMakeLists.txt trunk/reactos/lib/sdk/runtmchk/rtcapi.c Modified: trunk/reactos/lib/sdk/runtmchk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/runtmchk/CMakeList… ============================================================================== --- trunk/reactos/lib/sdk/runtmchk/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/runtmchk/CMakeLists.txt [iso-8859-1] Sat Oct 18 14:45:02 2014 @@ -5,6 +5,6 @@ list(APPEND ASM_SOURCE i386/_RTC_CheckEsp.S) endif() -add_asm_files(RunTmChk_asm ${ASM_SOURCE}) -add_library(RunTmChk ${SOURCE} ${RunTmChk_asm}) -add_dependencies(RunTmChk asm) +add_asm_files(runtmchk_asm ${ASM_SOURCE}) +add_library(runtmchk ${SOURCE} ${runtmchk_asm}) +add_dependencies(runtmchk asm) Modified: trunk/reactos/lib/sdk/runtmchk/rtcapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/runtmchk/rtcapi.c?… ============================================================================== --- trunk/reactos/lib/sdk/runtmchk/rtcapi.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/runtmchk/rtcapi.c [iso-8859-1] Sat Oct 18 14:45:02 2014 @@ -30,7 +30,6 @@ void* retaddr, int errnum) { - DbgPrint("Invalid stack pointer value caught at %p, error %d\n", retaddr, errnum); __debugbreak(); } @@ -39,7 +38,6 @@ _RTC_UninitUse( const char *_Varname) { - DbgPrint("Use of uninitialized variable %s!\n", _Varname); __debugbreak(); } @@ -61,7 +59,6 @@ /* Check if they contain the guard bytes */ if ((*guard1 != 0xCCCCCCCC) || (*guard2 != 0xCCCCCCCC)) { - DbgPrint("Stack corruption near '%s'\n", _Fd->variables[i].name); __debugbreak(); } } @@ -127,4 +124,3 @@ *_PAllocaInfoList = _PAllocaBase; } } -

1 0

[akhaldi] 64807: [CMAKE/MSVC] * Use the runtime checks globally in ReactOS now, not just for user mode modules. * We no longer need the MS support lib, as Timo kindly implemented one for ReactOS. *...
by akhaldi＠svn.reactos.org 18 Oct '14

18 Oct '14

Author: akhaldi Date: Sat Oct 18 14:22:09 2014 New Revision: 64807 URL: http://svn.reactos.org/svn/reactos?rev=64807&view=rev Log: [CMAKE/MSVC] * Use the runtime checks globally in ReactOS now, not just for user mode modules. * We no longer need the MS support lib, as Timo kindly implemented one for ReactOS. * Rename the lib to runtmchk. [PSEH][CRT] * Remove some constrictions to seh.s source files, we no longer need them. [KERNEL32] * We no longer need to explicitly link to the runtime checks lib. [FREELDR][KEYBOARD][NTOS][SETUPLDR] * Link to the runtime checks lib when this mode is enabled. CORE-8626 Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt trunk/reactos/cmake/CMakeMacros.cmake trunk/reactos/cmake/msvc.cmake trunk/reactos/dll/keyboard/CMakeLists.txt trunk/reactos/dll/win32/kernel32/CMakeLists.txt trunk/reactos/lib/pseh/i386/seh.s trunk/reactos/lib/sdk/crt/except/i386/seh.s trunk/reactos/ntoskrnl/CMakeLists.txt trunk/reactos/ntoskrnl/ntkrnlmp/CMakeLists.txt 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] Sat Oct 18 14:22:09 2014 @@ -213,6 +213,9 @@ if(STACK_PROTECTOR) target_link_libraries(freeldr_pe gcc_ssp) target_link_libraries(freeldr_pe_dbg gcc_ssp) +elseif(RUNTIME_CHECKS) + target_link_libraries(freeldr_pe runtmchk) + target_link_libraries(freeldr_pe_dbg runtmchk) endif() add_dependencies(freeldr_pe asm) @@ -273,6 +276,9 @@ if(STACK_PROTECTOR) target_link_libraries(setupldr_pe gcc_ssp) target_link_libraries(setupldr_pe_dbg gcc_ssp) +elseif(RUNTIME_CHECKS) + target_link_libraries(setupldr_pe runtmchk) + target_link_libraries(setupldr_pe_dbg runtmchk) endif() add_dependencies(setupldr_pe asm) Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Sat Oct 18 14:22:09 2014 @@ -502,14 +502,6 @@ if("${LIB}" MATCHES "msvcrt") add_target_compile_definitions(${_module} _DLL __USE_CRTIMP) target_link_libraries(${_module} msvcrtex) - if(MSVC) - if(RUNTIME_CHECKS) - if(NOT ${_module} STREQUAL "kernel32") - add_target_compile_flags(${_module} "/RTC1") - target_link_libraries(${_module} RunTmChk.lib) - endif() - endif() - endif() endif() target_link_libraries(${_module} lib${LIB}) add_dependencies(${_module} lib${LIB}) Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=64807… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Sat Oct 18 14:22:09 2014 @@ -88,6 +88,7 @@ if(RUNTIME_CHECKS) add_definitions(-D__RUNTIME_CHECKS__) + add_compile_flags("/RTC1") endif() set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO /INCREMENTAL:NO /SAFESEH:NO /NODEFAULTLIB /RELEASE") @@ -232,6 +233,11 @@ elseif(${TYPE} STREQUAL "wdmdriver") add_target_link_flags(${MODULE} "/DRIVER:WDM") endif() + + if(RUNTIME_CHECKS) + target_link_libraries(${MODULE} runtmchk) + endif() + endfunction() # Define those for having real libraries Modified: trunk/reactos/dll/keyboard/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/CMakeLists.tx… ============================================================================== --- trunk/reactos/dll/keyboard/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/CMakeLists.txt [iso-8859-1] Sat Oct 18 14:22:09 2014 @@ -102,6 +102,10 @@ add_target_link_flags(${_keyboard_layout} "-Wl,-T,${CMAKE_SOURCE_DIR}/kbdlayout.lds") endif() + if(RUNTIME_CHECKS) + target_link_libraries(${_keyboard_layout} runtmchk) + endif() + add_dependencies(${_keyboard_layout} psdk) add_cd_file(TARGET ${_keyboard_layout} DESTINATION reactos/system32 FOR all) endforeach() Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] Sat Oct 18 14:22:09 2014 @@ -106,11 +106,6 @@ ################# END HACK ################# target_link_libraries(kernel32 wine chkstk ${PSEH_LIB}) - -if(RUNTIME_CHECKS) - target_link_libraries(kernel32 RunTmChk.lib) -endif() - add_importlibs(kernel32 ntdll) add_pch(kernel32 k32.h SOURCE) add_dependencies(kernel32 psdk errcodes asm) Modified: trunk/reactos/lib/pseh/i386/seh.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/i386/seh.s?rev=64… ============================================================================== --- trunk/reactos/lib/pseh/i386/seh.s [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/i386/seh.s [iso-8859-1] Sat Oct 18 14:22:09 2014 @@ -22,12 +22,9 @@ /* GLOBALS *******************************************************************/ -#ifndef __RUNTIME_CHECKS__ PUBLIC __global_unwind2 PUBLIC __local_unwind2 PUBLIC __abnormal_termination -#endif - PUBLIC __except_handler2 PUBLIC __except_handler3 Modified: trunk/reactos/lib/sdk/crt/except/i386/seh.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/i386/se… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/i386/seh.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/except/i386/seh.s [iso-8859-1] Sat Oct 18 14:22:09 2014 @@ -25,11 +25,8 @@ PUBLIC __global_unwind2 PUBLIC __local_unwind2 PUBLIC __abnormal_termination - -#if !defined(__RUNTIME_CHECKS__) || (defined(__RUNTIME_CHECKS__) && !defined(_LIBCNT_)) PUBLIC __except_handler2 PUBLIC __except_handler3 -#endif /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/CMakeLists.txt?re… ============================================================================== --- trunk/reactos/ntoskrnl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/CMakeLists.txt [iso-8859-1] Sat Oct 18 14:22:09 2014 @@ -10,7 +10,6 @@ set(NTKRNLMP_ASM_SOURCE ${ASM_SOURCE}) spec2def(ntoskrnl.exe ntoskrnl.spec ADD_IMPORTLIB) - add_asm_files(ntoskrnl_asm ${NTOSKRNL_ASM_SOURCE}) add_executable(ntoskrnl @@ -37,19 +36,12 @@ endif() endif() -target_link_libraries(ntoskrnl - cportlib - csq - ${PSEH_LIB} - cmlib - rtl - ${ROSSYM_LIB} - libcntpr - wdmguid - ioevent) +target_link_libraries(ntoskrnl cportlib csq ${PSEH_LIB} cmlib rtl ${ROSSYM_LIB} libcntpr wdmguid ioevent) if(STACK_PROTECTOR) target_link_libraries(ntoskrnl gcc_ssp) +elseif(RUNTIME_CHECKS) + target_link_libraries(ntoskrnl runtmchk) endif() add_importlibs(ntoskrnl hal kdcom bootvid) Modified: trunk/reactos/ntoskrnl/ntkrnlmp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntkrnlmp/CMakeLis… ============================================================================== --- trunk/reactos/ntoskrnl/ntkrnlmp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntkrnlmp/CMakeLists.txt [iso-8859-1] Sat Oct 18 14:22:09 2014 @@ -1,3 +1,4 @@ + include(../ntos.cmake) spec2def(ntkrnlmp.exe ../ntoskrnl.spec) @@ -32,19 +33,11 @@ if(STACK_PROTECTOR) target_link_libraries(ntkrnlmp gcc_ssp) +elseif(RUNTIME_CHECKS) + target_link_libraries(ntkrnlmp runtmchk) endif() -target_link_libraries(ntkrnlmp - cportlib - csq - ${PSEH_LIB} - cmlib - rtl - ${ROSSYM_LIB} - libcntpr - wdmguid - ioevent) - +target_link_libraries(ntkrnlmp cportlib csq ${PSEH_LIB} cmlib rtl ${ROSSYM_LIB} libcntpr wdmguid ioevent) add_importlibs(ntkrnlmp hal kdcom bootvid) add_pch(ntkrnlmp ${REACTOS_SOURCE_DIR}/ntoskrnl/include/ntoskrnl.h NTKRNLMP_SOURCE) add_dependencies(ntkrnlmp psdk bugcodes asm)

1 0

[akhaldi] 64806: [BMFD] * Use set_module_type() instead of the combination of set_entrypoint(), set_subsystem() and set_image_base(). * Remove the now redundant bugcodes dependency. [FRAMEBUF_NEW] ...
by akhaldi＠svn.reactos.org 18 Oct '14

18 Oct '14

Author: akhaldi Date: Sat Oct 18 14:16:54 2014 New Revision: 64806 URL: http://svn.reactos.org/svn/reactos?rev=64806&view=rev Log: [BMFD] * Use set_module_type() instead of the combination of set_entrypoint(), set_subsystem() and set_image_base(). * Remove the now redundant bugcodes dependency. [FRAMEBUF_NEW] * Remove redundant bugcodes dependency. Modified: trunk/reactos/win32ss/drivers/displays/framebuf_new/CMakeLists.txt trunk/reactos/win32ss/drivers/font/bmfd/CMakeLists.txt Modified: trunk/reactos/win32ss/drivers/displays/framebuf_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/f… ============================================================================== --- trunk/reactos/win32ss/drivers/displays/framebuf_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/displays/framebuf_new/CMakeLists.txt [iso-8859-1] Sat Oct 18 14:16:54 2014 @@ -18,4 +18,4 @@ target_link_libraries(framebuf_new libcntpr) add_importlibs(framebuf_new win32k) add_pch(framebuf_new driver.h SOURCE) -add_dependencies(framebuf_new psdk bugcodes) +add_dependencies(framebuf_new psdk) Modified: trunk/reactos/win32ss/drivers/font/bmfd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/font/bmfd/… ============================================================================== --- trunk/reactos/win32ss/drivers/font/bmfd/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/font/bmfd/CMakeLists.txt [iso-8859-1] Sat Oct 18 14:16:54 2014 @@ -6,10 +6,8 @@ bmfd.h) add_library(bmfd SHARED ${SOURCE}) -set_entrypoint(bmfd BmfdEnableDriver 12) -set_subsystem(bmfd native) -set_image_base(bmfd 0x00010000) +set_module_type(bmfd kerneldll ENTRYPOINT BmfdEnableDriver 12) target_link_libraries(bmfd libcntpr) add_importlibs(bmfd win32k) add_pch(bmfd bmfd.h SOURCE) -add_dependencies(bmfd psdk bugcodes) +add_dependencies(bmfd psdk)

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