Ros-diffs September 2015

ros-diffs@reactos.org

17 participants
535 discussions

[cwittich] 68910: [NTMARTA] fix copypasta
by cwittich＠svn.reactos.org 02 Sep '15

02 Sep '15

Author: cwittich Date: Wed Sep 2 08:56:58 2015 New Revision: 68910 URL: http://svn.reactos.org/svn/reactos?rev=68910&view=rev Log: [NTMARTA] fix copypasta Modified: trunk/reactos/dll/win32/ntmarta/ntmarta.c Modified: trunk/reactos/dll/win32/ntmarta/ntmarta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntmarta/ntmarta.… ============================================================================== --- trunk/reactos/dll/win32/ntmarta/ntmarta.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ntmarta/ntmarta.c [iso-8859-1] Wed Sep 2 08:56:58 2015 @@ -252,7 +252,7 @@ *pObjectTypeGuid = pOas->ObjectTypeGuid; if (pInheritedObjectTypeGuid != NULL && pOas->ObjectsPresent & ACE_INHERITED_OBJECT_TYPE_PRESENT) - *pObjectTypeGuid = pOas->InheritedObjectTypeGuid; + *pInheritedObjectTypeGuid = pOas->InheritedObjectTypeGuid; Ret = pOas->ObjectsPresent; break; @@ -705,7 +705,7 @@ if (SecurityInfo & GROUP_SECURITY_INFORMATION && ppsidGroup != NULL) { - *ppsidOwner = NULL; + *ppsidGroup = NULL; if (!GetSecurityDescriptorGroup(pSD, ppsidGroup, &Defaulted))

1 0

[tfaber] 68909: [RTL] - Fix check for optional parameters in RtlGetCallersAddress
by tfaber＠svn.reactos.org 02 Sep '15

02 Sep '15

Author: tfaber Date: Wed Sep 2 05:38:02 2015 New Revision: 68909 URL: http://svn.reactos.org/svn/reactos?rev=68909&view=rev Log: [RTL] - Fix check for optional parameters in RtlGetCallersAddress Modified: trunk/reactos/lib/rtl/i386/except.c Modified: trunk/reactos/lib/rtl/i386/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/except.c?rev=… ============================================================================== --- trunk/reactos/lib/rtl/i386/except.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/i386/except.c [iso-8859-1] Wed Sep 2 05:38:02 2015 @@ -31,7 +31,7 @@ FrameCount = RtlCaptureStackBackTrace(2, 2, &BackTrace[0],BackTraceHash); /* Only if user want it */ - if (*CallersAddress != NULL) + if (CallersAddress != NULL) { /* only when first frames exist */ if (FrameCount >= 1) @@ -45,7 +45,7 @@ } /* Only if user want it */ - if (*CallersCaller != NULL) + if (CallersCaller != NULL) { /* only when second frames exist */ if (FrameCount >= 2)

1 0

[jimtabor] 68908: [Win32k] - Fix painting message regression.
by jimtabor＠svn.reactos.org 01 Sep '15

01 Sep '15

Author: jimtabor Date: Tue Sep 1 23:58:23 2015 New Revision: 68908 URL: http://svn.reactos.org/svn/reactos?rev=68908&view=rev Log: [Win32k] - Fix painting message regression. Modified: trunk/reactos/win32ss/user/ntuser/desktop.c Modified: trunk/reactos/win32ss/user/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/deskto… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] Tue Sep 1 23:58:23 2015 @@ -696,7 +696,7 @@ } default: TRACE("DWP calling IDWP Msg %d\n",Msg); - *lResult = IntDefWindowProc(Wnd, Msg, wParam, lParam, FALSE); + //*lResult = IntDefWindowProc(Wnd, Msg, wParam, lParam, FALSE); } return TRUE; /* We are done. Do not do any callbacks to user mode */ }

1 0

[sginsberg] 68907: - Implement super-simple KeSweepICache that always flushes the entire instruction cache. Use it in KD64 after modifying memory to make sure CPU gets the correct code to execute, ...
by sginsberg＠svn.reactos.org 01 Sep '15

01 Sep '15

Author: sginsberg Date: Tue Sep 1 23:45:48 2015 New Revision: 68907 URL: http://svn.reactos.org/svn/reactos?rev=68907&view=rev Log: - Implement super-simple KeSweepICache that always flushes the entire instruction cache. Use it in KD64 after modifying memory to make sure CPU gets the correct code to execute, and in NtFlushInstructionCache. May improve breakpoints somewhat. - Move NtFlushInstructionCache from sysinfo.c to virtual.c where it fits better. Likewise, move it from kefuncs to mmfuncs in NDK, and fix function arguments (ULONG -> SIZE_T). - Re-enable TRAP_DEBUG, adding back critical checks in the trap code. Checks can be improved but it is better than potentially silently messing up system state. - Move remaining RtlPrefetchMemoryNonTemporal code into kernel. Stubbed for non-x86. - By Hermes suggestion, override ASSERT to NT_ASSERT only for MSVC builds as that is where the main benefit is. Modified: trunk/reactos/dll/win32/kernel32/client/proc.c trunk/reactos/include/ndk/kefuncs.h trunk/reactos/include/ndk/mmfuncs.h trunk/reactos/lib/rtl/mem.c trunk/reactos/lib/rtl/powerpc/rtlmem.s trunk/reactos/ntoskrnl/ex/sysinfo.c trunk/reactos/ntoskrnl/include/internal/amd64/ke.h trunk/reactos/ntoskrnl/include/internal/arm/ke.h trunk/reactos/ntoskrnl/include/internal/i386/ke.h trunk/reactos/ntoskrnl/include/internal/i386/trap_x.h trunk/reactos/ntoskrnl/include/internal/powerpc/ke.h trunk/reactos/ntoskrnl/include/ntoskrnl.h trunk/reactos/ntoskrnl/kd64/kdapi.c trunk/reactos/ntoskrnl/ke/i386/traphdlr.c trunk/reactos/ntoskrnl/mm/ARM3/virtual.c trunk/reactos/ntoskrnl/rtl/misc.c Modified: trunk/reactos/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] Tue Sep 1 23:45:48 2015 @@ -1507,12 +1507,12 @@ WINAPI FlushInstructionCache(IN HANDLE hProcess, IN LPCVOID lpBaseAddress, - IN SIZE_T dwSize) + IN SIZE_T nSize) { NTSTATUS Status; /* Call the native function */ - Status = NtFlushInstructionCache(hProcess, (PVOID)lpBaseAddress, dwSize); + Status = NtFlushInstructionCache(hProcess, (PVOID)lpBaseAddress, nSize); if (!NT_SUCCESS(Status)) { /* Handle failure case */ Modified: trunk/reactos/include/ndk/kefuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/kefuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/kefuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/kefuncs.h [iso-8859-1] Tue Sep 1 23:45:48 2015 @@ -398,15 +398,6 @@ _In_ LARGE_INTEGER *Interval ); -NTSYSCALLAPI -NTSTATUS -NTAPI -NtFlushInstructionCache( - _In_ HANDLE ProcessHandle, - _In_ PVOID BaseAddress, - _In_ ULONG NumberOfBytesToFlush -); - ULONG NTAPI NtGetCurrentProcessorNumber( Modified: trunk/reactos/include/ndk/mmfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/mmfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/mmfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/mmfuncs.h [iso-8859-1] Tue Sep 1 23:45:48 2015 @@ -137,6 +137,15 @@ NTSYSCALLAPI NTSTATUS NTAPI +NtFlushInstructionCache( + _In_ HANDLE ProcessHandle, + _In_ PVOID BaseAddress, + _In_ SIZE_T NumberOfBytesToFlush +); + +NTSYSCALLAPI +NTSTATUS +NTAPI NtFlushVirtualMemory( _In_ HANDLE ProcessHandle, _Inout_ PVOID *BaseAddress, Modified: trunk/reactos/lib/rtl/mem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/mem.c?rev=68907&r1… ============================================================================== --- trunk/reactos/lib/rtl/mem.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/mem.c [iso-8859-1] Tue Sep 1 23:45:48 2015 @@ -146,21 +146,6 @@ memmove(Destination, Source, Length); } - -/* -* @implemented -*/ -VOID -FASTCALL -RtlPrefetchMemoryNonTemporal(IN PVOID Source, - IN SIZE_T Length) -{ - /* By nature of prefetch, this is non-portable. */ - (void)Source; - (void)Length; -} - - #undef RtlZeroMemory /* * @implemented Modified: trunk/reactos/lib/rtl/powerpc/rtlmem.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/powerpc/rtlmem.s?r… ============================================================================== --- trunk/reactos/lib/rtl/powerpc/rtlmem.s [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/powerpc/rtlmem.s [iso-8859-1] Tue Sep 1 23:45:48 2015 @@ -100,6 +100,3 @@ mr 5,4 xor 4,4,4 b memset - -RtlPrefetchMemoryNonTemporal: - blr Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Tue Sep 1 23:45:48 2015 @@ -2533,99 +2533,19 @@ return Status; } -NTSTATUS -NTAPI -NtFlushInstructionCache( - _In_ HANDLE ProcessHandle, - _In_opt_ PVOID BaseAddress, - _In_ ULONG FlushSize) -{ - KAPC_STATE ApcState; - PKPROCESS Process; - NTSTATUS Status; - PAGED_CODE(); - - /* Is a base address given? */ - if (BaseAddress != NULL) - { - /* If the requested size is 0, there is nothing to do */ - if (FlushSize == 0) - { - return STATUS_SUCCESS; - } - - /* Is this a user mode call? */ - if (KeGetPreviousMode() != KernelMode) - { - /* Make sure the base address is in user space */ - if (BaseAddress > MmHighestUserAddress) - { - DPRINT1("Invalid BaseAddress 0x%p\n", BaseAddress); - return STATUS_ACCESS_VIOLATION; - } - } - } - - /* Is another process requested? */ - if (ProcessHandle != NtCurrentProcess()) - { - /* Reference the process */ - Status = ObReferenceObjectByHandle(ProcessHandle, - PROCESS_VM_WRITE, - PsProcessType, - KeGetPreviousMode(), - (PVOID*)&Process, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to reference the process %p\n", ProcessHandle); - return Status; - } - - /* Attach to the process */ - KeStackAttachProcess(Process, &ApcState); - } - - /* FIXME: don't flush everything if a range is requested */ -#if defined(_M_IX86) || defined(_M_AMD64) - __wbinvd(); -#elif defined(_M_PPC) - __asm__ __volatile__("tlbsync"); -#elif defined(_M_MIPS) - DPRINT1("NtFlushInstructionCache() is not implemented\n"); - DbgBreakPoint(); -#elif defined(_M_ARM) - _MoveToCoprocessor(0, CP15_ICIALLU); -#else -#error Unknown architecture -#endif - - /* Check if we attached */ - if (ProcessHandle != NtCurrentProcess()) - { - /* Detach from the process */ - KeUnstackDetachProcess(&ApcState); - ObDereferenceObject(Process); - } - - return STATUS_SUCCESS; -} - ULONG NTAPI NtGetCurrentProcessorNumber(VOID) { - /* Just return the CPU */ + /* Just use Ke */ return KeGetCurrentProcessorNumber(); } -/* - * @implemented - */ #undef ExGetPreviousMode KPROCESSOR_MODE NTAPI -ExGetPreviousMode (VOID) -{ +ExGetPreviousMode(VOID) +{ + /* Just use Ke */ return KeGetPreviousMode(); } Modified: trunk/reactos/ntoskrnl/include/internal/amd64/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/amd64/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/amd64/ke.h [iso-8859-1] Tue Sep 1 23:45:48 2015 @@ -186,6 +186,19 @@ { /* Flush the TLB by resetting CR3 */ __writecr3(__readcr3()); +} + +FORCEINLINE +VOID +KeSweepICache(IN PVOID BaseAddress, + IN SIZE_T FlushSize) +{ + // + // Always sweep the whole cache + // + UNREFERENCED_PARAMETER(BaseAddress); + UNREFERENCED_PARAMETER(FlushSize); + __wbinvd(); } FORCEINLINE Modified: trunk/reactos/ntoskrnl/include/internal/arm/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/ke.h [iso-8859-1] Tue Sep 1 23:45:48 2015 @@ -118,6 +118,19 @@ FORCEINLINE VOID +KeSweepICache(IN PVOID BaseAddress, + IN SIZE_T FlushSize) +{ + // + // Always sweep the whole cache + // + UNREFERENCED_PARAMETER(BaseAddress); + UNREFERENCED_PARAMETER(FlushSize); + _MoveToCoprocessor(0, CP15_ICIALLU); +} + +FORCEINLINE +VOID KiRundownThread(IN PKTHREAD Thread) { /* FIXME */ Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] Tue Sep 1 23:45:48 2015 @@ -264,6 +264,19 @@ { /* Flush the TLB by resetting CR3 */ __writecr3(__readcr3()); +} + +FORCEINLINE +VOID +KeSweepICache(IN PVOID BaseAddress, + IN SIZE_T FlushSize) +{ + // + // Always sweep the whole cache + // + UNREFERENCED_PARAMETER(BaseAddress); + UNREFERENCED_PARAMETER(FlushSize); + __wbinvd(); } FORCEINLINE Modified: trunk/reactos/ntoskrnl/include/internal/i386/trap_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/trap_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/trap_x.h [iso-8859-1] Tue Sep 1 23:45:48 2015 @@ -7,8 +7,6 @@ */ #pragma once - -#define TRAP_DEBUG 0 #define UNREACHABLE __assume(0) @@ -72,9 +70,9 @@ DbgPrint("V86Gs: %x\n", TrapFrame->V86Gs); } -#if TRAP_DEBUG -VOID -FORCEINLINE +#if DBG +FORCEINLINE +VOID KiFillTrapFrameDebug(IN PKTRAP_FRAME TrapFrame) { /* Set the debug information */ Modified: trunk/reactos/ntoskrnl/include/internal/powerpc/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/powerpc/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/powerpc/ke.h [iso-8859-1] Tue Sep 1 23:45:48 2015 @@ -90,6 +90,19 @@ } FORCEINLINE +VOID +KeSweepICache(IN PVOID BaseAddress, + IN SIZE_T FlushSize) +{ + // + // Always sweep the whole cache + // + UNREFERENCED_PARAMETER(BaseAddress); + UNREFERENCED_PARAMETER(FlushSize); + __asm__ __volatile__("tlbsync"); +} + +FORCEINLINE PRKTHREAD KeGetCurrentThread(VOID) { Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/ntoskrnl.… ============================================================================== --- trunk/reactos/ntoskrnl/include/ntoskrnl.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/ntoskrnl.h [iso-8859-1] Tue Sep 1 23:45:48 2015 @@ -98,8 +98,10 @@ // // NT_ASSERT Best Assert // +#if defined(_MSC_VER) #undef ASSERT #define ASSERT NT_ASSERT +#endif /* Internal Headers */ #include "internal/ntoskrnl.h" Modified: trunk/reactos/ntoskrnl/kd64/kdapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdapi.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kdapi.c [iso-8859-1] Tue Sep 1 23:45:48 2015 @@ -83,6 +83,11 @@ Buffer = (PVOID)((ULONG_PTR)Buffer + CopyChunk); RemainingLength = RemainingLength - CopyChunk; } + + /* + * We may have modified executable code, flush the instruction cache + */ + KeSweepICache((PVOID)Address, TotalSize); /* * Return the size we managed to copy 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] Tue Sep 1 23:45:48 2015 @@ -56,7 +56,7 @@ PKDBG_PRESERVICEHOOK KeWin32PreServiceHook = NULL; PKDBG_POSTSERVICEHOOK KeWin32PostServiceHook = NULL; #endif -#if TRAP_DEBUG +#if DBG BOOLEAN StopChecking = FALSE; #endif Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Tue Sep 1 23:45:48 2015 @@ -2912,6 +2912,73 @@ // Return status // return Status; +} + +NTSTATUS +NTAPI +NtFlushInstructionCache(_In_ HANDLE ProcessHandle, + _In_opt_ PVOID BaseAddress, + _In_ SIZE_T FlushSize) +{ + KAPC_STATE ApcState; + PKPROCESS Process; + NTSTATUS Status; + PAGED_CODE(); + + /* Is a base address given? */ + if (BaseAddress != NULL) + { + /* If the requested size is 0, there is nothing to do */ + if (FlushSize == 0) + { + return STATUS_SUCCESS; + } + + /* Is this a user mode call? */ + if (ExGetPreviousMode() != KernelMode) + { + /* Make sure the base address is in user space */ + if (BaseAddress > MmHighestUserAddress) + { + DPRINT1("Invalid BaseAddress 0x%p\n", BaseAddress); + return STATUS_ACCESS_VIOLATION; + } + } + } + + /* Is another process requested? */ + if (ProcessHandle != NtCurrentProcess()) + { + /* Reference the process */ + Status = ObReferenceObjectByHandle(ProcessHandle, + PROCESS_VM_WRITE, + PsProcessType, + ExGetPreviousMode(), + (PVOID*)&Process, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to reference the process %p\n", ProcessHandle); + return Status; + } + + /* Attach to the process */ + KeStackAttachProcess(Process, &ApcState); + } + + /* Forward to Ke */ + KeSweepICache(BaseAddress, FlushSize); + + /* Check if we attached */ + if (ProcessHandle != NtCurrentProcess()) + { + /* Detach from the process and dereference it */ + KeUnstackDetachProcess(&ApcState); + ObDereferenceObject(Process); + } + + /* All done, return to caller */ + return STATUS_SUCCESS; } NTSTATUS Modified: trunk/reactos/ntoskrnl/rtl/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/misc.c?rev=68… ============================================================================== --- trunk/reactos/ntoskrnl/rtl/misc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/rtl/misc.c [iso-8859-1] Tue Sep 1 23:45:48 2015 @@ -62,4 +62,21 @@ return STATUS_SUCCESS; } +#if !defined(_M_IX86) +// +// Stub for architectures which don't have this implemented +// +VOID +FASTCALL +RtlPrefetchMemoryNonTemporal(IN PVOID Source, + IN SIZE_T Length) +{ + // + // Do nothing + // + UNREFERENCED_PARAMETER(Source); + UNREFERENCED_PARAMETER(Length); +} +#endif + /* EOF */

1 0

[pschweitzer] 68906: [HHPCOMP] Fix headers inclusion on MacOSX. This fixes hhpcomp build on MacOSX Patch by Nicolas Rouvière CORE-10084 #resolve #comment Committed in r68906. Thanks!
by pschweitzer＠svn.reactos.org 01 Sep '15

01 Sep '15

Author: pschweitzer Date: Tue Sep 1 22:44:56 2015 New Revision: 68906 URL: http://svn.reactos.org/svn/reactos?rev=68906&view=rev Log: [HHPCOMP] Fix headers inclusion on MacOSX. This fixes hhpcomp build on MacOSX Patch by Nicolas Rouvière CORE-10084 #resolve #comment Committed in r68906. Thanks! Modified: trunk/reactos/tools/hhpcomp/chmc/chmc.c trunk/reactos/tools/hhpcomp/lzx_compress/lz_nonslide.h Modified: trunk/reactos/tools/hhpcomp/chmc/chmc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/hhpcomp/chmc/chmc.c?… ============================================================================== --- trunk/reactos/tools/hhpcomp/chmc/chmc.c [iso-8859-1] (original) +++ trunk/reactos/tools/hhpcomp/chmc/chmc.c [iso-8859-1] Tue Sep 1 22:44:56 2015 @@ -26,7 +26,7 @@ #include <string.h> #include <assert.h> -#if defined(_WIN32) +#if defined(_WIN32) || defined(__APPLE__) #include <stdlib.h> #include <sys/types.h> #include <sys/stat.h> Modified: trunk/reactos/tools/hhpcomp/lzx_compress/lz_nonslide.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/hhpcomp/lzx_compress… ============================================================================== --- trunk/reactos/tools/hhpcomp/lzx_compress/lz_nonslide.h [iso-8859-1] (original) +++ trunk/reactos/tools/hhpcomp/lzx_compress/lz_nonslide.h [iso-8859-1] Tue Sep 1 22:44:56 2015 @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#if defined(_WIN32) +#if defined(_WIN32) || defined(__APPLE__) typedef unsigned char u_char; #endif

1 0

[pschweitzer] 68905: [NTOSKRNL] Fix KdpPrompt(): - Don't attempt to return in the middle of the loop. It leads to keep the mouse disabled instead of reenabling it. - Also, return a string length th...
by pschweitzer＠svn.reactos.org 01 Sep '15

01 Sep '15

Author: pschweitzer Date: Tue Sep 1 22:32:55 2015 New Revision: 68905 URL: http://svn.reactos.org/svn/reactos?rev=68905&view=rev Log: [NTOSKRNL] Fix KdpPrompt(): - Don't attempt to return in the middle of the loop. It leads to keep the mouse disabled instead of reenabling it. - Also, return a string length that actually matches what was written to the output buffer. This fixes invalid behavior on RtlAssert when used with #if 0 moved to #if 1, or when Windows NTDLL is used in ReactOS. CORE-10082 #resolve #comment Fixed with r68905 CORE-10083 #resolve #comment Fixed with r68905 Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_cli.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] Tue Sep 1 22:32:55 2015 @@ -3745,19 +3745,7 @@ * DbgPrompt does not null terminate, but it does */ *(PCHAR)(OutString + i) = 0; - - /* Print a new line */ - KdPortPutByteEx(&SerialPortInfo, '\r'); - KdPortPutByteEx(&SerialPortInfo, '\n'); - - /* Release spinlock */ - KiReleaseSpinLock(&KdpSerialSpinLock); - - /* Lower IRQL back */ - KeLowerIrql(OldIrql); - - /* Return the length */ - return OutStringLength + 1; + break; } /* Write it back and print it to the log */ @@ -3779,5 +3767,5 @@ KeLowerIrql(OldIrql); /* Return the length */ - return OutStringLength; -} + return i; +}

1 0

[jimtabor] 68904: [Win32SS|UxTheme] - Move Menu to server side. See CORE-7797 and CORE-8299. - This was for speed while moving windows about the desktop and fixed test results too.
by jimtabor＠svn.reactos.org 01 Sep '15

01 Sep '15

Author: jimtabor Date: Tue Sep 1 22:10:13 2015 New Revision: 68904 URL: http://svn.reactos.org/svn/reactos?rev=68904&view=rev Log: [Win32SS|UxTheme] - Move Menu to server side. See CORE-7797 and CORE-8299. - This was for speed while moving windows about the desktop and fixed test results too. Added: trunk/reactos/win32ss/user/rtl/ trunk/reactos/win32ss/user/rtl/text.c - copied, changed from r68897, trunk/reactos/win32ss/user/user32/windows/font.c Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c trunk/reactos/dll/win32/uxtheme/themehooks.c trunk/reactos/include/reactos/undocuser.h trunk/reactos/win32ss/CMakeLists.txt trunk/reactos/win32ss/include/ntuser.h trunk/reactos/win32ss/user/ntuser/callback.c trunk/reactos/win32ss/user/ntuser/class.c trunk/reactos/win32ss/user/ntuser/defwnd.c trunk/reactos/win32ss/user/ntuser/desktop.c trunk/reactos/win32ss/user/ntuser/draw.c trunk/reactos/win32ss/user/ntuser/focus.c trunk/reactos/win32ss/user/ntuser/keyboard.c trunk/reactos/win32ss/user/ntuser/menu.c trunk/reactos/win32ss/user/ntuser/menu.h trunk/reactos/win32ss/user/ntuser/message.c trunk/reactos/win32ss/user/ntuser/misc.c trunk/reactos/win32ss/user/ntuser/msgqueue.c trunk/reactos/win32ss/user/ntuser/msgqueue.h trunk/reactos/win32ss/user/ntuser/nonclient.c trunk/reactos/win32ss/user/ntuser/ntstubs.c trunk/reactos/win32ss/user/ntuser/painting.c trunk/reactos/win32ss/user/ntuser/painting.h trunk/reactos/win32ss/user/ntuser/scroll.h trunk/reactos/win32ss/user/ntuser/scrollbar.c trunk/reactos/win32ss/user/ntuser/scrollex.c trunk/reactos/win32ss/user/ntuser/userfuncs.h trunk/reactos/win32ss/user/ntuser/win32.h trunk/reactos/win32ss/user/ntuser/window.c trunk/reactos/win32ss/user/ntuser/window.h trunk/reactos/win32ss/user/ntuser/winpos.c trunk/reactos/win32ss/user/ntuser/winpos.h trunk/reactos/win32ss/user/ntuser/winsta.c trunk/reactos/win32ss/user/user32/CMakeLists.txt trunk/reactos/win32ss/user/user32/misc/usrapihk.c trunk/reactos/win32ss/user/user32/user32.spec trunk/reactos/win32ss/user/user32/windows/defwnd.c trunk/reactos/win32ss/user/user32/windows/draw.c trunk/reactos/win32ss/user/user32/windows/font.c trunk/reactos/win32ss/user/user32/windows/menu.c trunk/reactos/win32ss/user/user32/windows/nonclient.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/nonclien… Modified: trunk/reactos/dll/win32/uxtheme/themehooks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/themehoo… Modified: trunk/reactos/include/reactos/undocuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/undocuser.… Modified: trunk/reactos/win32ss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/CMakeLists.txt?rev… Modified: trunk/reactos/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r… Modified: trunk/reactos/win32ss/user/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/callba… Modified: trunk/reactos/win32ss/user/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/class.… Modified: trunk/reactos/win32ss/user/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/defwnd… Modified: trunk/reactos/win32ss/user/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/deskto… Modified: trunk/reactos/win32ss/user/ntuser/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/draw.c… Modified: trunk/reactos/win32ss/user/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/focus.… Modified: trunk/reactos/win32ss/user/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/keyboa… Modified: trunk/reactos/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/menu.c… Modified: trunk/reactos/win32ss/user/ntuser/menu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/menu.h… Modified: trunk/reactos/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag… Modified: trunk/reactos/win32ss/user/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/misc.c… Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… Modified: trunk/reactos/win32ss/user/ntuser/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/noncli… Modified: trunk/reactos/win32ss/user/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntstub… Modified: trunk/reactos/win32ss/user/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/painti… Modified: trunk/reactos/win32ss/user/ntuser/painting.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/painti… Modified: trunk/reactos/win32ss/user/ntuser/scroll.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/scroll… Modified: trunk/reactos/win32ss/user/ntuser/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/scroll… Modified: trunk/reactos/win32ss/user/ntuser/scrollex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/scroll… Modified: trunk/reactos/win32ss/user/ntuser/userfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/userfu… Modified: trunk/reactos/win32ss/user/ntuser/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/win32.… Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… Modified: trunk/reactos/win32ss/user/ntuser/window.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… Modified: trunk/reactos/win32ss/user/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winpos… Modified: trunk/reactos/win32ss/user/ntuser/winpos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winpos… Modified: trunk/reactos/win32ss/user/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winsta… Copied: trunk/reactos/win32ss/user/rtl/text.c (from r68897, trunk/reactos/win32ss/user/user32/windows/font.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/rtl/text.c?p2… Modified: trunk/reactos/win32ss/user/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/CMakeL… Modified: trunk/reactos/win32ss/user/user32/misc/usrapihk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/u… Modified: trunk/reactos/win32ss/user/user32/user32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/user32… Modified: trunk/reactos/win32ss/user/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… Modified: trunk/reactos/win32ss/user/user32/windows/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… Modified: trunk/reactos/win32ss/user/user32/windows/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… Modified: trunk/reactos/win32ss/user/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… Modified: trunk/reactos/win32ss/user/user32/windows/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window…

1 0

[sginsberg] 68903: - Move misplaced RtlPrefetchMemoryNonTemporal from rtl into kernel where it belongs (it only exists as an export for use by drivers to safely try to use prefetchnta even if it ma...
by sginsberg＠svn.reactos.org 01 Sep '15

01 Sep '15

Author: sginsberg Date: Tue Sep 1 19:51:52 2015 New Revision: 68903 URL: http://svn.reactos.org/svn/reactos?rev=68903&view=rev Log: - Move misplaced RtlPrefetchMemoryNonTemporal from rtl into kernel where it belongs (it only exists as an export for use by drivers to safely try to use prefetchnta even if it may not be available). Use existing global KePrefetchNTAGranularity that is set to the correct value via cpuid instead of hardcoded "Ke386CacheAlignment". Modified: trunk/reactos/lib/rtl/i386/rtlmem.s trunk/reactos/ntoskrnl/include/internal/amd64/ke.h trunk/reactos/ntoskrnl/include/internal/i386/ke.h trunk/reactos/ntoskrnl/ke/i386/kiinit.c trunk/reactos/ntoskrnl/rtl/i386/stack.S Modified: trunk/reactos/lib/rtl/i386/rtlmem.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/rtlmem.s?rev=… ============================================================================== --- trunk/reactos/lib/rtl/i386/rtlmem.s [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/i386/rtlmem.s [iso-8859-1] Tue Sep 1 19:51:52 2015 @@ -16,7 +16,6 @@ PUBLIC _RtlFillMemoryUlong@12 PUBLIC _RtlMoveMemory@12 PUBLIC _RtlZeroMemory@8 -PUBLIC @RtlPrefetchMemoryNonTemporal@8 /* FUNCTIONS *****************************************************************/ .code @@ -328,35 +327,4 @@ dec edi jmp .CopyDownBytes - - -@RtlPrefetchMemoryNonTemporal@8: - - /* - * Overwritten by ntoskrnl/ke/i386/kernel.c if SSE is supported - * (see Ki386SetProcessorFeatures()) - */ - ret - - /* Get granularity */ - mov eax, [_Ke386CacheAlignment] - -FetchLine: - - /* Prefetch this line */ - prefetchnta byte ptr [ecx] - - /* Update address and count */ - add ecx, eax - sub edx, eax - - /* Keep looping for the next line, or return if done */ - ja FetchLine - ret - - -/* FIXME: HACK */ -_Ke386CacheAlignment: - .long 64 - END Modified: trunk/reactos/ntoskrnl/include/internal/amd64/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/amd64/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/amd64/ke.h [iso-8859-1] Tue Sep 1 19:51:52 2015 @@ -81,7 +81,6 @@ } KI_INTERRUPT_DISPATCH_ENTRY, *PKI_INTERRUPT_DISPATCH_ENTRY; #include <poppack.h> -extern ULONG Ke386CacheAlignment; extern ULONG KeI386NpxPresent; extern ULONG KeI386XMMIPresent; extern ULONG KeI386FxsrPresent; Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] Tue Sep 1 19:51:52 2015 @@ -529,7 +529,6 @@ extern ULONG KiMXCsrMask; extern ULONG KeI386CpuType; extern ULONG KeI386CpuStep; -extern ULONG Ke386CacheAlignment; extern ULONG KiFastSystemCallDisable; extern UCHAR KiDebugRegisterTrapOffsets[9]; extern UCHAR KiDebugRegisterContextOffsets[9]; Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] Tue Sep 1 19:51:52 2015 @@ -162,7 +162,7 @@ /* FIXME: Implement and enable XMM Page Zeroing for Mm */ /* Patch the RtlPrefetchMemoryNonTemporal routine to enable it */ - *(PCHAR)RtlPrefetchMemoryNonTemporal = 0x90; + *(PCHAR)RtlPrefetchMemoryNonTemporal = 0x90; // NOP } } Modified: trunk/reactos/ntoskrnl/rtl/i386/stack.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/i386/stack.S?… ============================================================================== --- trunk/reactos/ntoskrnl/rtl/i386/stack.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/rtl/i386/stack.S [iso-8859-1] Tue Sep 1 19:51:52 2015 @@ -10,6 +10,8 @@ #include <asm.inc> #include <ks386.inc> + +EXTERN _KePrefetchNTAGranularity:DWORD /* FUNCTIONS *****************************************************************/ .code @@ -35,4 +37,30 @@ /* return */ ret 8 + +PUBLIC @RtlPrefetchMemoryNonTemporal@8 +@RtlPrefetchMemoryNonTemporal@8: + + /* + * Kernel will overwrite this to 'nop' during init + * if prefetchnta is available. Slight optimization + * as compared to checking KeI386XMMIPresent for every call. + */ + ret + + /* Get granularity */ + mov eax, [_KePrefetchNTAGranularity] + + /* Prefetch this line */ +FetchLine: + prefetchnta byte ptr [ecx] + + /* Update address and count */ + add ecx, eax + sub edx, eax + + /* Keep looping for the next line, or return if done */ + ja FetchLine + ret + END

1 0

[tfaber] 68902: [NTOS:KE] - Enable DPC timeout check on debug builds. Suggested by Stefan
by tfaber＠svn.reactos.org 01 Sep '15

01 Sep '15

Author: tfaber Date: Tue Sep 1 18:26:29 2015 New Revision: 68902 URL: http://svn.reactos.org/svn/reactos?rev=68902&view=rev Log: [NTOS:KE] - Enable DPC timeout check on debug builds. Suggested by Stefan Modified: trunk/reactos/ntoskrnl/ke/dpc.c trunk/reactos/ntoskrnl/ke/time.c Modified: trunk/reactos/ntoskrnl/ke/dpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/dpc.c?rev=6890… ============================================================================== --- trunk/reactos/ntoskrnl/ke/dpc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/dpc.c [iso-8859-1] Tue Sep 1 18:26:29 2015 @@ -601,8 +601,10 @@ /* Decrease the queue depth */ DpcData->DpcQueueDepth--; +#if DBG /* Clear DPC Time */ Prcb->DebugDpcTime = 0; +#endif /* Release the lock */ KeReleaseSpinLockFromDpcLevel(&DpcData->DpcLock); Modified: trunk/reactos/ntoskrnl/ke/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/time.c?rev=689… ============================================================================== --- trunk/reactos/ntoskrnl/ke/time.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/time.c [iso-8859-1] Tue Sep 1 18:26:29 2015 @@ -184,12 +184,12 @@ /* Handle being in a DPC */ Prcb->DpcTime++; -#if 0 //DBG +#if DBG /* Update the DPC time */ Prcb->DebugDpcTime++; /* Check if we have timed out */ - if (Prcb->DebugDpcTime == KiDPCTimeout); + if (Prcb->DebugDpcTime == KiDPCTimeout) { /* We did! */ DbgPrint("*** DPC routine > 1 sec --- This is not a break in KeUpdateSystemTime\n");

1 0

[tfaber] 68901: [NTOS:EX] - Remove the timer's list entry instead of the list head in NtSetTimer and NtCancelTimer. Fixes list entry corruption on VMware Hybrid builder CORE-10081 #resolve
by tfaber＠svn.reactos.org 01 Sep '15

01 Sep '15

Author: tfaber Date: Tue Sep 1 17:52:09 2015 New Revision: 68901 URL: http://svn.reactos.org/svn/reactos?rev=68901&view=rev Log: [NTOS:EX] - Remove the timer's list entry instead of the list head in NtSetTimer and NtCancelTimer. Fixes list entry corruption on VMware Hybrid builder CORE-10081 #resolve Modified: trunk/reactos/ntoskrnl/ex/timer.c Modified: trunk/reactos/ntoskrnl/ex/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/timer.c?rev=68… ============================================================================== --- trunk/reactos/ntoskrnl/ex/timer.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/timer.c [iso-8859-1] Tue Sep 1 17:52:09 2015 @@ -301,7 +301,7 @@ KeAcquireSpinLockAtDpcLevel(&TimerThread->ActiveTimerListLock); /* Remove it */ - RemoveEntryList(&TimerThread->ActiveTimerListHead); + RemoveEntryList(&Timer->ActiveTimerListEntry); Timer->ApcAssociated = FALSE; /* Unlock the list */ @@ -659,7 +659,7 @@ KeAcquireSpinLockAtDpcLevel(&TimerThread->ActiveTimerListLock); /* Remove it */ - RemoveEntryList(&TimerThread->ActiveTimerListHead); + RemoveEntryList(&Timer->ActiveTimerListEntry); Timer->ApcAssociated = FALSE; /* Unlock the list */

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2015