Ros-diffs October 2014

ros-diffs@reactos.org

19 participants
730 discussions

by tkreuzer＠svn.reactos.org

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);

9 years, 11 months

[tkreuzer] 64811: [FREELDR] Apply proper indentation, no code change.

by tkreuzer＠svn.reactos.org

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 */

9 years, 11 months

[akhaldi] 64810: [USER32] * WINEMessageTypeNames is only used in a case wrapped inside #ifndef __REACTOS__.

by akhaldi＠svn.reactos.org

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

9 years, 11 months

[akhaldi] 64809: [USER32] * We're not using any debugging routines here.

by akhaldi＠svn.reactos.org

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;

9 years, 11 months

[akhaldi] 64808: [CMAKE/MSVC] * Rename the lib to runtmchk. Really. CORE-8626

by akhaldi＠svn.reactos.org

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; } } -

9 years, 11 months

[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

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)

9 years, 11 months

[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

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)

9 years, 11 months

[akhaldi] 64805: [FRAMEBUF_NEW] * Use set_module_type() instead of the combination of set_entrypoint(), set_subsystem() and set_image_base().

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Oct 18 14:12:41 2014 New Revision: 64805 URL: http://svn.reactos.org/svn/reactos?rev=64805&view=rev Log: [FRAMEBUF_NEW] * Use set_module_type() instead of the combination of set_entrypoint(), set_subsystem() and set_image_base(). Modified: trunk/reactos/win32ss/drivers/displays/framebuf_new/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:12:41 2014 @@ -14,9 +14,7 @@ framebuf_new.rc ${CMAKE_CURRENT_BINARY_DIR}/framebuf_new.def) -set_entrypoint(framebuf_new DrvEnableDriver 12) -set_subsystem(framebuf_new native) -set_image_base(framebuf_new 0x00010000) +set_module_type(framebuf_new kerneldll ENTRYPOINT DrvEnableDriver 12) target_link_libraries(framebuf_new libcntpr) add_importlibs(framebuf_new win32k) add_pch(framebuf_new driver.h SOURCE)

9 years, 11 months

[akhaldi] 64804: [CMAKE] * Fix inconsistencies around kernel mode dlls handling.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Oct 18 14:09:11 2014 New Revision: 64804 URL: http://svn.reactos.org/svn/reactos?rev=64804&view=rev Log: [CMAKE] * Fix inconsistencies around kernel mode dlls handling. Modified: trunk/reactos/cmake/CMakeMacros.cmake 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:09:11 2014 @@ -614,12 +614,12 @@ else() message(STATUS "${MODULE} has no base address") endif() - elseif((${TYPE} STREQUAL kernelmodedriver) OR (${TYPE} STREQUAL wdmdriver) OR (${TYPE} STREQUAL kernelmodedll)) + elseif((${TYPE} STREQUAL kernelmodedriver) OR (${TYPE} STREQUAL wdmdriver) OR (${TYPE} STREQUAL kerneldll)) set_image_base(${MODULE} 0x00010000) endif() # Now do some stuff which is specific to each type - if((${TYPE} STREQUAL kernelmodedriver) OR (${TYPE} STREQUAL wdmdriver) OR (${TYPE} STREQUAL kernelmodedll)) + if((${TYPE} STREQUAL kernelmodedriver) OR (${TYPE} STREQUAL wdmdriver) OR (${TYPE} STREQUAL kerneldll)) add_dependencies(${MODULE} bugcodes) if((${TYPE} STREQUAL kernelmodedriver) OR (${TYPE} STREQUAL wdmdriver)) set_target_properties(${MODULE} PROPERTIES SUFFIX ".sys")

9 years, 11 months

[hbelusca] 64803: [FAST486]: Implement a basic support for the Trap Flag.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Oct 18 14:08:50 2014 New Revision: 64803 URL: http://svn.reactos.org/svn/reactos?rev=64803&view=rev Log: [FAST486]: Implement a basic support for the Trap Flag. Modified: trunk/reactos/lib/fast486/debug.c trunk/reactos/lib/fast486/fast486.c Modified: trunk/reactos/lib/fast486/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/debug.c?rev=64… ============================================================================== --- trunk/reactos/lib/fast486/debug.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/debug.c [iso-8859-1] Sat Oct 18 14:08:50 2014 @@ -83,7 +83,21 @@ * Check if there is an interrupt to execute, or a hardware interrupt signal * while interrupts are enabled. */ - if (State->IntStatus == FAST486_INT_EXECUTE) + if (State->Flags.Tf) + { + /* Perform the interrupt */ + Fast486PerformInterrupt(State, 0x01); + + /* + * Flags and TF are pushed on stack so we can reset TF now, + * to not break into the INT 0x01 handler. + * After the INT 0x01 handler returns, the flags and therefore + * TF are popped back off the stack and restored, so TF will be + * automatically reset to its previous state. + */ + State->Flags.Tf = FALSE; + } + else if (State->IntStatus == FAST486_INT_EXECUTE) { /* Perform the interrupt */ Fast486PerformInterrupt(State, State->PendingIntNum); @@ -91,8 +105,7 @@ /* Clear the interrupt status */ State->IntStatus = FAST486_INT_NONE; } - else if (State->Flags.If && (State->IntStatus == FAST486_INT_SIGNAL) - && (State->IntAckCallback != NULL)) + else if (State->Flags.If && (State->IntStatus == FAST486_INT_SIGNAL)) { /* Acknowledge the interrupt to get the number */ State->PendingIntNum = State->IntAckCallback(State); Modified: trunk/reactos/lib/fast486/fast486.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fast486.c?rev=… ============================================================================== --- trunk/reactos/lib/fast486/fast486.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fast486.c [iso-8859-1] Sat Oct 18 14:08:50 2014 @@ -82,7 +82,21 @@ * Check if there is an interrupt to execute, or a hardware interrupt signal * while interrupts are enabled. */ - if (State->IntStatus == FAST486_INT_EXECUTE) + if (State->Flags.Tf) + { + /* Perform the interrupt */ + Fast486PerformInterrupt(State, 0x01); + + /* + * Flags and TF are pushed on stack so we can reset TF now, + * to not break into the INT 0x01 handler. + * After the INT 0x01 handler returns, the flags and therefore + * TF are popped back off the stack and restored, so TF will be + * automatically reset to its previous state. + */ + State->Flags.Tf = FALSE; + } + else if (State->IntStatus == FAST486_INT_EXECUTE) { /* Perform the interrupt */ Fast486PerformInterrupt(State, State->PendingIntNum); @@ -90,8 +104,7 @@ /* Clear the interrupt status */ State->IntStatus = FAST486_INT_NONE; } - else if (State->Flags.If && (State->IntStatus == FAST486_INT_SIGNAL) - && (State->IntAckCallback != NULL)) + else if (State->Flags.If && (State->IntStatus == FAST486_INT_SIGNAL)) { /* Acknowledge the interrupt to get the number */ State->PendingIntNum = State->IntAckCallback(State); @@ -171,8 +184,8 @@ { UNREFERENCED_PARAMETER(State); - /* Return something... */ - return 0; + /* Return something... defaulted to single-step interrupt */ + return 0x01; } /* PUBLIC FUNCTIONS ***********************************************************/ @@ -211,6 +224,7 @@ { FAST486_SEG_REGS i; + /* Save the callbacks and TLB */ FAST486_MEM_READ_PROC MemReadCallback = State->MemReadCallback; FAST486_MEM_WRITE_PROC MemWriteCallback = State->MemWriteCallback; FAST486_IO_READ_PROC IoReadCallback = State->IoReadCallback;

9 years, 11 months

← Newer
1
...
33
34
35
36
37
38
39
...
73
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2014