Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 08:23:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

[KERNEL32]

Browse source 
- Fix MSVC build

svn path=/trunk/; revision=54299
This commit is contained in:
Thomas Faber 2011-11-05 11:39:37 +00:00
parent e325aa3a89
commit 325e646e25
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
reactos/dll/win32/kernel32/client/except.c
View file

@ -88,7 +88,7 @@ PrintStackTrace(struct _EXCEPTION_POINTERS *ExceptionInfo)
_dump_context (ContextRecord); _dump_context (ContextRecord);
_module_name_from_addr(ExceptionRecord->ExceptionAddress, &StartAddr, szMod, sizeof(szMod)); _module_name_from_addr(ExceptionRecord->ExceptionAddress, &StartAddr, szMod, sizeof(szMod));
DbgPrint("Address:\n %8x+%-8x %s\n", DbgPrint("Address:\n %8x+%-8x %s\n",
(PVOID)StartAddr, (PVOID)StartAddr,
(ULONG_PTR)ExceptionRecord->ExceptionAddress - (ULONG_PTR)StartAddr, (ULONG_PTR)ExceptionRecord->ExceptionAddress - (ULONG_PTR)StartAddr,
szMod); szMod);
@ -242,6 +242,7 @@ UnhandledExceptionFilter(struct _EXCEPTION_POINTERS *ExceptionInfo)
ULONG_PTR ErrorParameters[4]; ULONG_PTR ErrorParameters[4];
ULONG ErrorResponse; ULONG ErrorResponse;
PEXCEPTION_RECORD ExceptionRecord = ExceptionInfo->ExceptionRecord; PEXCEPTION_RECORD ExceptionRecord = ExceptionInfo->ExceptionRecord;
LPTOP_LEVEL_EXCEPTION_FILTER RealFilter;
if ((NTSTATUS)ExceptionRecord->ExceptionCode == STATUS_ACCESS_VIOLATION && if ((NTSTATUS)ExceptionRecord->ExceptionCode == STATUS_ACCESS_VIOLATION &&
ExceptionRecord->NumberParameters >= 2) ExceptionRecord->NumberParameters >= 2)
@ -278,7 +279,6 @@ UnhandledExceptionFilter(struct _EXCEPTION_POINTERS *ExceptionInfo)
return EXCEPTION_CONTINUE_SEARCH; return EXCEPTION_CONTINUE_SEARCH;
} }
LPTOP_LEVEL_EXCEPTION_FILTER RealFilter;
RealFilter = RtlDecodePointer(GlobalTopLevelExceptionFilter); RealFilter = RtlDecodePointer(GlobalTopLevelExceptionFilter);
if (RealFilter) if (RealFilter)
{ {
@ -436,7 +436,7 @@ WINAPI
SetUnhandledExceptionFilter(IN LPTOP_LEVEL_EXCEPTION_FILTER lpTopLevelExceptionFilter) SetUnhandledExceptionFilter(IN LPTOP_LEVEL_EXCEPTION_FILTER lpTopLevelExceptionFilter)
{ {
PVOID EncodedPointer, NewPointer; PVOID EncodedPointer, NewPointer;
EncodedPointer = RtlEncodePointer(lpTopLevelExceptionFilter); EncodedPointer = RtlEncodePointer(lpTopLevelExceptionFilter);
NewPointer = InterlockedExchangePointer(&GlobalTopLevelExceptionFilter, NewPointer = InterlockedExchangePointer(&GlobalTopLevelExceptionFilter,
EncodedPointer); EncodedPointer);
@ -475,7 +475,7 @@ IsBadReadPtr(IN LPCVOID lp,
{ {
/* Do an initial probe */ /* Do an initial probe */
*Current; *Current;
/* Align the addresses */ /* Align the addresses */
Current = (volatile CHAR *)ROUND_DOWN(Current, PageSize); Current = (volatile CHAR *)ROUND_DOWN(Current, PageSize);
Last = (PCHAR)ROUND_DOWN(Last, PageSize); Last = (PCHAR)ROUND_DOWN(Last, PageSize);
@ -553,7 +553,7 @@ IsBadWritePtr(IN LPVOID lp,
{ {
/* Do an initial probe */ /* Do an initial probe */
*Current = *Current; *Current = *Current;
/* Align the addresses */ /* Align the addresses */
Current = (volatile CHAR *)ROUND_DOWN(Current, PageSize); Current = (volatile CHAR *)ROUND_DOWN(Current, PageSize);
Last = (PCHAR)ROUND_DOWN(Last, PageSize); Last = (PCHAR)ROUND_DOWN(Last, PageSize);