Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 23796: - Update kernel fun.
by ion＠svn.reactos.org 30 Aug '06

30 Aug '06

Author: ion Date: Wed Aug 30 10:56:06 2006 New Revision: 23796 URL: http://svn.reactos.org/svn/reactos?rev=23796&view=rev Log: - Update kernel fun. Modified: trunk/reactos/ntoskrnl/KrnlFun.c Modified: trunk/reactos/ntoskrnl/KrnlFun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/KrnlFun.c?rev=237… ============================================================================== --- trunk/reactos/ntoskrnl/KrnlFun.c (original) +++ trunk/reactos/ntoskrnl/KrnlFun.c Wed Aug 30 10:56:06 2006 @@ -25,14 +25,14 @@ // - Use Object Type Mutex/Lock. // // Ke: -// - Sanitize some context fields during conversions // - Add PSEH handler when an exception occurs in an exception (KiCopyExceptionRecord). +// - Get rid of KiRosPrintAddress and use KiDumpParameterImages instead. // - Forward exceptions to user-mode debugger. +// - Sanitize some context fields during conversions. // - Implement stack fault and segment fault handlers. // - Implement kernel-mode GPF handler, possibly fixing below: // - Figure out why ES/DS gets messed up in VMWare, when doing KiServiceExit only, // and only when called from user-mode, and returning to user-mode. -// - Figure out what the DEBUGEIP hack is for and how it can be moved away. // - Add DR macro/save and VM macro/save. // - Implement KiCallbackReturn, KiGetTickCount, KiRaiseAssertion. //

1 0

[ion] 23795: - Implement RtlCaptureStackBackTrace and RtlWalkFrameChain and add definitions to ntifs.h - Get rid of KeRosGetStackFrames and replace usage by RtlWalkFrameChain or RtlCaptureStackBackTrace, depending. - Remove this entry from Kernel Fun.
by ion＠svn.reactos.org 30 Aug '06

30 Aug '06

Author: ion Date: Wed Aug 30 10:52:10 2006 New Revision: 23795 URL: http://svn.reactos.org/svn/reactos?rev=23795&view=rev Log: - Implement RtlCaptureStackBackTrace and RtlWalkFrameChain and add definitions to ntifs.h - Get rid of KeRosGetStackFrames and replace usage by RtlWalkFrameChain or RtlCaptureStackBackTrace, depending. - Remove this entry from Kernel Fun. Modified: trunk/reactos/dll/ntdll/rtl/libsupp.c trunk/reactos/include/ddk/ntifs.h trunk/reactos/lib/rtl/exception.c trunk/reactos/lib/rtl/rtlp.h trunk/reactos/ntoskrnl/KrnlFun.c trunk/reactos/ntoskrnl/ke/bug.c trunk/reactos/ntoskrnl/mm/ppool.c trunk/reactos/ntoskrnl/ntoskrnl.def trunk/reactos/ntoskrnl/rtl/libsupp.c Modified: trunk/reactos/dll/ntdll/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/rtl/libsupp.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/rtl/libsupp.c (original) +++ trunk/reactos/dll/ntdll/rtl/libsupp.c Wed Aug 30 10:52:10 2006 @@ -171,6 +171,18 @@ IN ULONG Size) { /* Exception logging is not done in user-mode */ +} + +BOOLEAN +NTAPI +RtlpCaptureStackLimits(IN ULONG_PTR Ebp, + IN ULONG_PTR *StackBegin, + IN ULONG_PTR *StackEnd) +{ + /* FIXME: Verify */ + *StackBegin = (ULONG_PTR)NtCurrentTeb()->Tib.StackLimit; + *StackEnd = (ULONG_PTR)NtCurrentTeb()->Tib.StackBase; + return TRUE; } /* RTL Atom Tables ************************************************************/ Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=23… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h (original) +++ trunk/reactos/include/ddk/ntifs.h Wed Aug 30 10:52:10 2006 @@ -3676,6 +3676,16 @@ ); NTSYSAPI +USHORT +NTAPI +RtlCaptureStackBackTrace ( + IN ULONG FramesToSkip, + IN ULONG FramesToCapture, + OUT PVOID *BackTrace, + OUT PULONG BackTraceHash OPTIONAL +); + +NTSYSAPI NTSTATUS NTAPI RtlCompressBuffer ( Modified: trunk/reactos/lib/rtl/exception.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/exception.c?rev=23… ============================================================================== --- trunk/reactos/lib/rtl/exception.c (original) +++ trunk/reactos/lib/rtl/exception.c Wed Aug 30 10:52:10 2006 @@ -110,8 +110,92 @@ } /* -* @unimplemented -*/ + * @implemented + */ +ULONG +NTAPI +RtlWalkFrameChain(OUT PVOID *Callers, + IN ULONG Count, + IN ULONG Flags) +{ + PULONG Stack, NewStack; + ULONG Eip; + ULONG_PTR StackBegin, StackEnd; + BOOLEAN Result, StopSearch = FALSE; + ULONG i = 0; + + /* Get current EBP */ +#if defined __GNUC__ + __asm__("mov %%ebp, %0" : "=r" (Stack) : ); +#elif defined(_MSC_VER) + __asm mov Stack, ebp +#endif + + /* Set it as the stack begin limit as well */ + StackBegin = (ULONG_PTR)Stack; + + /* Check if we're called for non-logging mode */ + if (!Flags) + { + /* Get the actual safe limits */ + Result = RtlpCaptureStackLimits((ULONG_PTR)Stack, + &StackBegin, + &StackEnd); + if (!Result) return 0; + } + + /* Loop the frames */ + for (i = 0; i < Count; i++) + { + /* Check if we're past the stack */ + if ((ULONG_PTR)Stack >= StackEnd) break; + + /* Check if this is the first entry */ +#if 0 + if (!i) + { + if ((ULONG_PTR)Stack != StackBegin) break; + } + else + { + if ((ULONG_PTR)Stack == StackBegin) break; + } +#endif + + /* Make sure there's enough frames */ + if ((StackEnd - (ULONG_PTR)Stack) < (2 * sizeof(ULONG_PTR))) break; + + /* Get new stack and EIP */ + NewStack = (PULONG)Stack[0]; + Eip = Stack[1]; + + /* Check if the new pointer is above the oldone and past the end */ + if (!((Stack < NewStack) && ((ULONG_PTR)NewStack < StackEnd))) + { + /* Stop searching after this entry */ + StopSearch = TRUE; + } + + /* Also make sure that the EIP isn't a stack address */ + if ((StackBegin < Eip) && (Eip < StackEnd)) break; + + /* Save this frame */ + Callers[i] = (PVOID)Eip; + + /* Check if we should continue */ + if (StopSearch) break; + + /* Move to the next stack */ + Stack = NewStack; + } + + /* Return frames parsed */ + return i; +} + +/* + * @implemented + */ USHORT NTAPI RtlCaptureStackBackTrace(IN ULONG FramesToSkip, @@ -119,21 +203,39 @@ OUT PVOID *BackTrace, OUT PULONG BackTraceHash OPTIONAL) { - UNIMPLEMENTED; - return 0; -} - -/* -* @unimplemented -*/ -ULONG -NTAPI -RtlWalkFrameChain(OUT PVOID *Callers, - IN ULONG Count, - IN ULONG Flags) -{ - UNIMPLEMENTED; - return 0; + PVOID Frames[2 * 64]; + ULONG FrameCount; + ULONG Hash = 0, i; + + /* Skip a frame for the caller */ + FramesToSkip++; + + /* Don't go past the limit */ + if ((FramesToCapture + FramesToSkip) >= 128) return 0; + + /* Do the back trace */ + FrameCount = RtlWalkFrameChain(Frames, FramesToCapture + FramesToSkip, 0); + + /* Make sure we're not skipping all of them */ + if (FrameCount <= FramesToSkip) return 0; + + /* Loop all the frames */ + for (i = 0; i < FramesToCapture; i++) + { + /* Don't go past the limit */ + if ((FramesToSkip + i) >= FrameCount) break; + + /* Save this entry and hash it */ + BackTrace[i] = Frames[FramesToSkip + i]; + Hash += PtrToUlong(BackTrace[i]); + } + + /* Write the hash */ + if (BackTraceHash) *BackTraceHash = Hash; + + /* Clear the other entries and return count */ + RtlFillMemoryUlong(Frames, 128, 0); + return (USHORT)i; } /* Modified: trunk/reactos/lib/rtl/rtlp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtlp.h?rev=23795&r… ============================================================================== --- trunk/reactos/lib/rtl/rtlp.h (original) +++ trunk/reactos/lib/rtl/rtlp.h Wed Aug 30 10:52:10 2006 @@ -32,6 +32,14 @@ KPROCESSOR_MODE NTAPI RtlpGetMode(VOID); + +BOOLEAN +NTAPI +RtlpCaptureStackLimits( + IN ULONG_PTR Ebp, + IN ULONG_PTR *StackBegin, + IN ULONG_PTR *StackEnd +); NTSTATUS NTAPI Modified: trunk/reactos/ntoskrnl/KrnlFun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/KrnlFun.c?rev=237… ============================================================================== --- trunk/reactos/ntoskrnl/KrnlFun.c (original) +++ trunk/reactos/ntoskrnl/KrnlFun.c Wed Aug 30 10:52:10 2006 @@ -25,7 +25,6 @@ // - Use Object Type Mutex/Lock. // // Ke: -// - Clean up exp.c (remove all stack functions and use RtlWalkFrameChain/RtlCaptureStackBacktrace) // - Sanitize some context fields during conversions // - Add PSEH handler when an exception occurs in an exception (KiCopyExceptionRecord). // - Forward exceptions to user-mode debugger. Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=2379… ============================================================================== --- trunk/reactos/ntoskrnl/ke/bug.c (original) +++ trunk/reactos/ntoskrnl/ke/bug.c Wed Aug 30 10:52:10 2006 @@ -83,83 +83,22 @@ return(FALSE); } -ULONG -NTAPI -KeRosGetStackFrames(PULONG Frames, - ULONG FrameCount) -{ - ULONG Count = 0; - PULONG StackBase, StackEnd, Frame; - MEMORY_BASIC_INFORMATION mbi; - ULONG ResultLength = sizeof(mbi); - NTSTATUS Status; - - _SEH_TRY - { -#if defined __GNUC__ - __asm__("mov %%ebp, %0" : "=r" (Frame) : ); -#elif defined(_MSC_VER) - __asm mov [Frame], ebp -#endif - - Status = MiQueryVirtualMemory ( - (HANDLE)-1, - Frame, - MemoryBasicInformation, - &mbi, - sizeof(mbi), - &ResultLength ); - if ( !NT_SUCCESS(Status) ) - { - DPRINT1("Can't get stack frames: MiQueryVirtualMemory() failed: %x\n", Status ); - return 0; - } - - StackBase = Frame; - StackEnd = (PULONG)((ULONG_PTR)mbi.BaseAddress + mbi.RegionSize); - - while ( Count < FrameCount && Frame >= StackBase && Frame < StackEnd ) - { - Frames[Count++] = Frame[1]; - StackBase = Frame; - Frame = (PULONG)Frame[0]; - } - } - _SEH_HANDLE - { - } - _SEH_END; - return Count; -} - -VOID -NTAPI -KeDumpStackFrames(PULONG Frame) -{ - /* Just call the extended version */ - KeRosDumpStackFrames(Frame, 0); -} - VOID NTAPI KeRosDumpStackFrames(IN PULONG Frame OPTIONAL, IN ULONG FrameCount OPTIONAL) { ULONG Frames[32]; - ULONG Count, i, Addr; - - /* Don't let anyone ask more then 32 frames */ - if (FrameCount > 32) return; + ULONG i, Addr; /* If the caller didn't ask, assume 32 frames */ if (!FrameCount) FrameCount = 32; - /* Get the current frames, and make sure caller didn't ask too many */ - Count = KeRosGetStackFrames(Frames, FrameCount); // <= should be replaced with Rtl - if (FrameCount > Count) FrameCount = Count; + /* Get the current frames */ + FrameCount = RtlCaptureStackBackTrace(2, FrameCount, (PVOID*)Frames, NULL); /* Now loop them (skip the two. One for the dumper, one for the caller) */ - for (i = 2; i < FrameCount; i++) + for (i = 0; i < FrameCount; i++) { /* Get the EIP */ Addr = Frames[i]; @@ -177,9 +116,6 @@ /* Print it out */ if (!KeRosPrintAddress((PVOID)Addr)) DbgPrint("<%X>", Addr); - - /* Break out of invalid addresses */ - if (Addr == 0 || Addr == 0xDEADBEEF) break; /* Go to the next frame */ DbgPrint("\n"); Modified: trunk/reactos/ntoskrnl/mm/ppool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ppool.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ppool.c (original) +++ trunk/reactos/ntoskrnl/mm/ppool.c Wed Aug 30 10:52:10 2006 @@ -34,7 +34,7 @@ #define R_PRINT_ADDRESS(addr) KeRosPrintAddress(addr) #define R_PANIC() KeBugCheck(0) #define R_DEBUG DbgPrint -#define R_GET_STACK_FRAMES(ptr,cnt) KeRosGetStackFrames(ptr,cnt) +#define R_GET_STACK_FRAMES(ptr,cnt) RtlWalkFrameChain((PVOID*)ptr,cnt, 0) #include "rpoolmgr.h" Modified: trunk/reactos/ntoskrnl/ntoskrnl.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.def?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.def (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.def Wed Aug 30 10:52:10 2006 @@ -977,7 +977,6 @@ READ_REGISTER_BUFFER_USHORT@12 KiRosPrintAddress@4 KeRosDumpStackFrames@8 -KeRosGetStackFrames@8 RtlAbsoluteToSelfRelativeSD@12 RtlAddAccessAllowedAce@16 RtlAddAce@20 Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/libsupp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/rtl/libsupp.c (original) +++ trunk/reactos/ntoskrnl/rtl/libsupp.c Wed Aug 30 10:52:10 2006 @@ -186,6 +186,34 @@ /* Not in DPC stack */ return FALSE; +} + +BOOLEAN +NTAPI +RtlpCaptureStackLimits(IN ULONG_PTR Ebp, + IN ULONG_PTR *StackBegin, + IN ULONG_PTR *StackEnd) +{ + PKTHREAD Thread = KeGetCurrentThread(); + + /* FIXME: Super native implementation */ + + /* FIXME: ROS HACK */ + if (!Thread) return FALSE; + + /* Start with defaults */ + *StackBegin = Thread->StackLimit; + *StackEnd = (ULONG_PTR)Thread->StackBase; + + /* Check if we seem to be on the DPC stack */ + if ((*StackBegin > Ebp) || (Ebp > *StackEnd)) + { + /* FIXME: TODO */ + ASSERT(FALSE); + } + + /* Return success */ + return TRUE; } /* RTL Atom Tables ************************************************************/

1 0

[ion] 23794: - Add about two dozen new bugcheck codes and strings. - Major cleanup of exp.c to move out deprecated and old code. - Use KdDebuggerNotPresent to determine if KDBG is there or not. KdDebuggerEnable is now set whenever booting with debugging -- even if only serial port or screen debugging. - Complete cleanup and major rewrite/improvement of bugcheck code: - Moved stack dump routines to bug.c and cleaned them up. Next step is to remove most of them and implement them properly as part
by ion＠svn.reactos.org 30 Aug '06

30 Aug '06

Author: ion Date: Wed Aug 30 09:22:56 2006 New Revision: 23794 URL: http://svn.reactos.org/svn/reactos?rev=23794&view=rev Log: - Add about two dozen new bugcheck codes and strings. - Major cleanup of exp.c to move out deprecated and old code. - Use KdDebuggerNotPresent to determine if KDBG is there or not. KdDebuggerEnable is now set whenever booting with debugging -- even if only serial port or screen debugging. - Complete cleanup and major rewrite/improvement of bugcheck code: - Moved stack dump routines to bug.c and cleaned them up. Next step is to remove most of them and implement them properly as part of RtlCaptureStackBackTrace and RtlWalkFrameChain. - Use InbvDisplayString for everything now. BSODs will only truly show on screen. (however, part of the KeBugCheckWithTf improvements, a special "if debugger enabled" BSOD will also be displayed for debugging purposes). - Do checksum calculation in bugcheck callbacks. - Detect and display which drivers belong to which EIP. - Implemented code to select the proper verbose BSOD message depending on the bug check code. - Also implemented code to detect a variety of "known" bug check codes and to recover more data on them, and/or modify them accordingly. Sadly ROS doesn't yet make use of most of these codes. - Factored out and split some code into individual routines. - Look and functionality is now identical to Windows XP. - Stack trace will only be shown if KDBG isn't connected. If KDBG is connected you can do "bt" anyway (which is more powerful). Modified: trunk/reactos/ntoskrnl/deprecated/irq.c trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/kd/kdinit.c trunk/reactos/ntoskrnl/kd/kdmain.c trunk/reactos/ntoskrnl/ke/bug.c trunk/reactos/ntoskrnl/ke/i386/exp.c trunk/reactos/ntoskrnl/ke/i386/v86vdm.c trunk/reactos/ntoskrnl/ntoskrnl.mc Modified: trunk/reactos/ntoskrnl/deprecated/irq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/deprecated/irq.c?… ============================================================================== --- trunk/reactos/ntoskrnl/deprecated/irq.c (original) +++ trunk/reactos/ntoskrnl/deprecated/irq.c Wed Aug 30 09:22:56 2006 @@ -142,7 +142,6 @@ #endif #define TAG_ISR_LOCK TAG('I', 'S', 'R', 'L') -extern IDT_DESCRIPTOR KiIdt[256]; /* FUNCTIONS ****************************************************************/ @@ -162,8 +161,8 @@ */ for (i=0;i<NR_IRQS;i++) { - KiIdt[IRQ_BASE+i].a=(irq_handler[i]&0xffff)+(KGDT_R0_CODE<<16); - KiIdt[IRQ_BASE+i].b=(irq_handler[i]&0xffff0000)+PRESENT+ + ((IDT_DESCRIPTOR*)&KiIdt[IRQ_BASE+i])->a=(irq_handler[i]&0xffff)+(KGDT_R0_CODE<<16); + ((IDT_DESCRIPTOR*)&KiIdt[IRQ_BASE+i])->b=(irq_handler[i]&0xffff0000)+PRESENT+ I486_INTERRUPT_GATE; #ifdef CONFIG_SMP for (j = 0; j < MAXIMUM_PROCESSORS; j++) Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h Wed Aug 30 09:22:56 2006 @@ -75,6 +75,7 @@ extern ULONG KeI386EFlagsAndMaskV86; extern ULONG KeI386EFlagsOrMaskV86; extern BOOLEAN KeI386VirtualIntExtensions; +extern KIDTENTRY KiIdt[]; /* MACROS *************************************************************************/ @@ -145,6 +146,8 @@ #define IOPM_OFFSET FIELD_OFFSET(KTSS, IoMaps[0].IoMap) +#define SIZE_OF_FX_REGISTERS 32 + /* INTERNAL KERNEL FUNCTIONS ************************************************/ /* threadsch.c ********************************************************************/ @@ -679,14 +682,6 @@ VOID STDCALL -KiDumpTrapFrame( - PKTRAP_FRAME Tf, - ULONG ExceptionNr, - ULONG cr2 -); - -VOID -STDCALL KeFlushCurrentTb(VOID); VOID @@ -757,6 +752,12 @@ VOID ); +VOID +NTAPI +KiFlushNPXState( + IN FLOATING_SAVE_AREA *SaveArea +); + #include "ke_x.h" #endif /* __NTOSKRNL_INCLUDE_INTERNAL_KE_H */ Modified: trunk/reactos/ntoskrnl/kd/kdinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdinit.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdinit.c (original) +++ trunk/reactos/ntoskrnl/kd/kdinit.c Wed Aug 30 09:22:56 2006 @@ -74,6 +74,7 @@ #ifdef KDBG /* Get the KDBG Settings and enable it */ KdDebuggerEnabled = TRUE; + KdDebuggerNotPresent = FALSE; KdpDebugMode.Gdb = TRUE; KdbpGetCommandLineSettings((PCHAR)LoaderBlock->CommandLine); #endif @@ -183,6 +184,7 @@ p2 += 10; p2 = KdpGetDebugMode(p2); p2 = KdpGetWrapperDebugMode(p2, LoaderBlock); + KdDebuggerEnabled = TRUE; } /* Check for early breakpoint */ else if (!_strnicmp(p2, "BREAK", 5)) Modified: trunk/reactos/ntoskrnl/kd/kdmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdmain.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdmain.c (original) +++ trunk/reactos/ntoskrnl/kd/kdmain.c Wed Aug 30 09:22:56 2006 @@ -105,8 +105,8 @@ BOOLEAN FirstChance, BOOLEAN Gdb) { - /* Get out of here if the Debugger isn't enabled */ - if (!KdDebuggerEnabled) return kdHandleException; + /* Get out of here if the Debugger isn't connected */ + if (KdDebuggerNotPresent) return kdHandleException; /* FIXME: * Right now, the GDB wrapper seems to handle exceptions differntly Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=2379… ============================================================================== --- trunk/reactos/ntoskrnl/ke/bug.c (original) +++ trunk/reactos/ntoskrnl/ke/bug.c Wed Aug 30 09:22:56 2006 @@ -1,15 +1,12 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory * FILE: ntoskrnl/ke/bug.c - * PURPOSE: Graceful system shutdown if a bug is detected - * - * PROGRAMMERS: Alex Ionescu - Rewrote Bugcheck Routines and implemented Reason Callbacks. - * David Welch (welch(a)cwcom.net) - * Phillip Susi + * PURPOSE: Bugcheck Support + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ -/* INCLUDES *****************************************************************/ +/* INCLUDES ******************************************************************/ #include <ntoskrnl.h> #define NDEBUG @@ -29,15 +26,168 @@ extern FAST_MUTEX KernelAddressSpaceLock; -/* GLOBALS ******************************************************************/ - -static LIST_ENTRY BugcheckCallbackListHead = {NULL,NULL}; -static LIST_ENTRY BugcheckReasonCallbackListHead = {NULL,NULL}; -static ULONG InBugCheck; -static PRTL_MESSAGE_RESOURCE_DATA KiBugCodeMessages; -static ULONG KeBugCheckCount = 1; - -/* FUNCTIONS *****************************************************************/ +/* GLOBALS *******************************************************************/ + +LIST_ENTRY BugcheckCallbackListHead = {NULL,NULL}; +LIST_ENTRY BugcheckReasonCallbackListHead = {NULL,NULL}; +ULONG KeBugCheckActive, KeBugCheckOwner; +LONG KeBugCheckOwnerRecursionCount; +PRTL_MESSAGE_RESOURCE_DATA KiBugCodeMessages; +ULONG KeBugCheckCount = 1; +ULONG KiHardwareTrigger; +PUNICODE_STRING KiBugCheckDriver; +ULONG_PTR KiBugCheckData[5]; + +typedef PCHAR +(NTAPI *PKE_BUGCHECK_UNICODE_TO_ANSI)( + IN PUNICODE_STRING Unicode, + IN PCHAR Ansi, + IN ULONG Length +); + +/* PRIVATE FUNCTIONS *********************************************************/ + +BOOLEAN +NTAPI +KiRosPrintAddress(PVOID address) +{ + PLIST_ENTRY current_entry; + PLDR_DATA_TABLE_ENTRY current; + extern LIST_ENTRY ModuleListHead; + ULONG_PTR RelativeAddress; + ULONG i = 0; + + do + { + current_entry = ModuleListHead.Flink; + + while (current_entry != &ModuleListHead) + { + current = CONTAINING_RECORD(current_entry, + LDR_DATA_TABLE_ENTRY, + InLoadOrderLinks); + + if (address >= (PVOID)current->DllBase && + address < (PVOID)((ULONG_PTR)current->DllBase + + current->SizeOfImage)) + { + RelativeAddress = (ULONG_PTR)address - + (ULONG_PTR)current->DllBase; + DbgPrint("<%wZ: %x>", &current->FullDllName, RelativeAddress); + return(TRUE); + } + current_entry = current_entry->Flink; + } + } while(++i <= 1); + + return(FALSE); +} + +ULONG +NTAPI +KeRosGetStackFrames(PULONG Frames, + ULONG FrameCount) +{ + ULONG Count = 0; + PULONG StackBase, StackEnd, Frame; + MEMORY_BASIC_INFORMATION mbi; + ULONG ResultLength = sizeof(mbi); + NTSTATUS Status; + + _SEH_TRY + { +#if defined __GNUC__ + __asm__("mov %%ebp, %0" : "=r" (Frame) : ); +#elif defined(_MSC_VER) + __asm mov [Frame], ebp +#endif + + Status = MiQueryVirtualMemory ( + (HANDLE)-1, + Frame, + MemoryBasicInformation, + &mbi, + sizeof(mbi), + &ResultLength ); + if ( !NT_SUCCESS(Status) ) + { + DPRINT1("Can't get stack frames: MiQueryVirtualMemory() failed: %x\n", Status ); + return 0; + } + + StackBase = Frame; + StackEnd = (PULONG)((ULONG_PTR)mbi.BaseAddress + mbi.RegionSize); + + while ( Count < FrameCount && Frame >= StackBase && Frame < StackEnd ) + { + Frames[Count++] = Frame[1]; + StackBase = Frame; + Frame = (PULONG)Frame[0]; + } + } + _SEH_HANDLE + { + } + _SEH_END; + return Count; +} + +VOID +NTAPI +KeDumpStackFrames(PULONG Frame) +{ + /* Just call the extended version */ + KeRosDumpStackFrames(Frame, 0); +} + +VOID +NTAPI +KeRosDumpStackFrames(IN PULONG Frame OPTIONAL, + IN ULONG FrameCount OPTIONAL) +{ + ULONG Frames[32]; + ULONG Count, i, Addr; + + /* Don't let anyone ask more then 32 frames */ + if (FrameCount > 32) return; + + /* If the caller didn't ask, assume 32 frames */ + if (!FrameCount) FrameCount = 32; + + /* Get the current frames, and make sure caller didn't ask too many */ + Count = KeRosGetStackFrames(Frames, FrameCount); // <= should be replaced with Rtl + if (FrameCount > Count) FrameCount = Count; + + /* Now loop them (skip the two. One for the dumper, one for the caller) */ + for (i = 2; i < FrameCount; i++) + { + /* Get the EIP */ + Addr = Frames[i]; + + /* If we had a custom frame, make sure we've reached it first */ + if ((Frame) && (Frame[1] == Addr)) + { + Frame = NULL; + } + else if (Frame) + { + /* Skip this entry */ + continue; + } + + /* Print it out */ + if (!KeRosPrintAddress((PVOID)Addr)) DbgPrint("<%X>", Addr); + + /* Break out of invalid addresses */ + if (Addr == 0 || Addr == 0xDEADBEEF) break; + + /* Go to the next frame */ + DbgPrint("\n"); + } + + /* Finish the output */ + DbgPrint("\n"); +} VOID INIT_FUNCTION @@ -52,7 +202,6 @@ /* Initialize Callbadk Listhead and State */ InitializeListHead(&BugcheckCallbackListHead); InitializeListHead(&BugcheckReasonCallbackListHead); - InBugCheck = 0; /* Cache the Bugcheck Message Strings. Prepare the Lookup Data */ ResourceInfo.Type = 11; @@ -66,31 +215,795 @@ &ResourceDataEntry); /* Make sure it worked */ - if (NT_SUCCESS(Status)) { - - DPRINT("Found Bugcheck Resource Data!\n"); - + if (NT_SUCCESS(Status)) + { /* Now actually get a pointer to it */ Status = LdrAccessResource((PVOID)KERNEL_BASE, ResourceDataEntry, (PVOID*)&BugCheckData, NULL); - - /* Make sure it worked */ - if (NT_SUCCESS(Status)) { - - DPRINT("Got Pointer to Bugcheck Resource Data!\n"); - KiBugCodeMessages = BugCheckData; - } - } -} + if (NT_SUCCESS(Status)) KiBugCodeMessages = BugCheckData; + } +} + +VOID +NTAPI +KeGetBugMessageText(IN ULONG BugCheckCode, + OUT PANSI_STRING OutputString OPTIONAL) +{ + ULONG i; + ULONG IdOffset; + ULONG_PTR MessageEntry; + PCHAR BugCode; + + /* Find the message. This code is based on RtlFindMesssage */ + for (i = 0; i < KiBugCodeMessages->NumberOfBlocks; i++) + { + /* Check if the ID Matches */ + if ((BugCheckCode >= KiBugCodeMessages->Blocks[i].LowId) && + (BugCheckCode <= KiBugCodeMessages->Blocks[i].HighId)) + { + /* Get Offset to Entry */ + MessageEntry = KiBugCodeMessages->Blocks[i].OffsetToEntries + + (ULONG_PTR)KiBugCodeMessages; + IdOffset = BugCheckCode - KiBugCodeMessages->Blocks[i].LowId; + + /* Get offset to ID */ + for (i = 0; i < IdOffset; i++) + { + /* Advance in the Entries */ + MessageEntry += ((PRTL_MESSAGE_RESOURCE_ENTRY)MessageEntry)-> + Length; + } + + /* Get the final Code */ + BugCode = ((PRTL_MESSAGE_RESOURCE_ENTRY)MessageEntry)->Text; + i = strlen(BugCode); + + /* Return it in the OutputString */ + if (OutputString) + { + OutputString->Buffer = BugCode; + OutputString->Length = i + 1; + OutputString->MaximumLength = i + 1; + } + else + { + /* Direct Output to Screen */ + InbvDisplayString(BugCode); + InbvDisplayString("\r"); + break; + } + } + } +} + +VOID +NTAPI +KiDoBugCheckCallbacks(VOID) +{ + PKBUGCHECK_CALLBACK_RECORD CurrentRecord; + PLIST_ENTRY ListHead, NextEntry, LastEntry; + ULONG_PTR Checksum; + + /* First make sure that the list is Initialized... it might not be */ + ListHead = &BugcheckCallbackListHead; + if ((ListHead->Flink) && (ListHead->Blink)) + { + /* Loop the list */ + LastEntry = ListHead; + NextEntry = ListHead->Flink; + while (NextEntry != ListHead) + { + /* Get the reord */ + CurrentRecord = CONTAINING_RECORD(NextEntry, + KBUGCHECK_CALLBACK_RECORD, + Entry); + + /* Validate it */ + if (CurrentRecord->Entry.Blink != LastEntry) return; + Checksum = (ULONG_PTR)CurrentRecord->CallbackRoutine; + Checksum += (ULONG_PTR)CurrentRecord->Buffer; + Checksum += (ULONG_PTR)CurrentRecord->Length; + Checksum += (ULONG_PTR)CurrentRecord->Component; + + /* Make sure it's inserted and valitdated */ + if ((CurrentRecord->State == BufferInserted) && + (CurrentRecord->Checksum == Checksum)) + { + /* Call the routine */ + CurrentRecord->State = BufferStarted; + (CurrentRecord->CallbackRoutine)(CurrentRecord->Buffer, + CurrentRecord->Length); + CurrentRecord->State = BufferFinished; + } + + /* Go to the next entry */ + LastEntry = NextEntry; + NextEntry = NextEntry->Flink; + } + } +} + +VOID +NTAPI +KiBugCheckDebugBreak(IN ULONG StatusCode) +{ + /* If KDBG isn't connected, freeze the CPU, otherwise, break */ + if (KdDebuggerNotPresent) for (;;) Ke386HaltProcessor(); + DbgBreakPointWithStatus(StatusCode); +} + +PVOID +NTAPI +KiPcToFileHeader(IN PVOID Eip, + OUT PLDR_DATA_TABLE_ENTRY *LdrEntry, + IN BOOLEAN DriversOnly, + OUT PBOOLEAN InKernel) +{ + ULONG i = 0; + PVOID ImageBase, EipBase = NULL; + PLDR_DATA_TABLE_ENTRY Entry; + PLIST_ENTRY ListHead, NextEntry; + extern LIST_ENTRY ModuleListHead; + + /* Assume no */ + *InKernel = FALSE; + + /* Set list pointers and make sure it's valid */ + ListHead = &ModuleListHead; + NextEntry = ListHead->Flink; + if (NextEntry) + { + /* Start loop */ + while (NextEntry != ListHead) + { + /* Increase entry */ + i++; + + /* Check if this is a kernel entry and we only want drivers */ + if ((i <= 2) && (DriversOnly == TRUE)) + { + /* Skip it */ + NextEntry = NextEntry->Flink; + continue; + } + + /* Get the loader entry */ + Entry = CONTAINING_RECORD(NextEntry, + LDR_DATA_TABLE_ENTRY, + InLoadOrderLinks); + + /* Move to the next entry */ + NextEntry = NextEntry->Flink; + ImageBase = Entry->DllBase; + + /* Check if this is the right one */ + if (((ULONG_PTR)Eip >= (ULONG_PTR)Entry->DllBase) && + ((ULONG_PTR)Eip < ((ULONG_PTR)Entry->DllBase + Entry->SizeOfImage))) + { + /* Return this entry */ + *LdrEntry = Entry; + EipBase = ImageBase; + + /* Check if this was a kernel or HAL entry */ + if (i <= 2) *InKernel = TRUE; + break; + } + } + } + + /* Return the base address */ + return EipBase; +} + +PCHAR +NTAPI +KeBugCheckUnicodeToAnsi(IN PUNICODE_STRING Unicode, + OUT PCHAR Ansi, + IN ULONG Length) +{ + PCHAR p; + PWCHAR pw; + ULONG i; + + /* Set length and normalize it */ + i = Unicode->Length / sizeof(WCHAR); + i = min(i, Length - 1); + + /* Set source and destination, and copy */ + pw = Unicode->Buffer; + p = Ansi; + while (i--) *p++ = (CHAR)*pw++; + + /* Null terminate and return */ + *p = ANSI_NULL; + return Ansi; +} + +VOID +NTAPI +KiDumpParameterImages(IN PCHAR Message, + IN PULONG_PTR Parameters, + IN ULONG ParameterCount, + IN PKE_BUGCHECK_UNICODE_TO_ANSI ConversionRoutine) +{ + ULONG i; + BOOLEAN InSystem; + PLDR_DATA_TABLE_ENTRY LdrEntry; + PVOID ImageBase; + PUNICODE_STRING DriverName; + CHAR AnsiName[32]; + PIMAGE_NT_HEADERS NtHeader; + ULONG TimeStamp; + BOOLEAN FirstRun = TRUE; + + /* Loop parameters */ + for (i = 0; i < ParameterCount; i++) + { + /* Get the base for this parameter */ + ImageBase = KiPcToFileHeader((PVOID)Parameters[i], + &LdrEntry, + FALSE, + &InSystem); + if (!ImageBase) + { + /* Driver wasn't found, check for unloaded driver */ + DriverName = NULL; // FIXME: ROS can't + if (!DriverName) continue; + + /* Convert the driver name */ + ImageBase = (PVOID)Parameters[i]; + ConversionRoutine(DriverName, AnsiName, sizeof(AnsiName)); + } + else + { + /* Get the NT Headers and Timestamp */ + NtHeader = RtlImageNtHeader(LdrEntry->DllBase); + TimeStamp = NtHeader->FileHeader.TimeDateStamp; + + /* Convert the driver name */ + DriverName = &LdrEntry->BaseDllName; + ConversionRoutine(&LdrEntry->BaseDllName, + AnsiName, + sizeof(AnsiName)); + } + + /* Format driver name */ + sprintf(Message, + "%s** %12s - Address %p base at %p, DateStamp %08lx\n", + FirstRun ? "\r\n*":"*", + AnsiName, + (PVOID)Parameters[i], + ImageBase, + TimeStamp); + + /* Check if we only had one parameter */ + if (ParameterCount <= 1) + { + /* Then just save the name */ + KiBugCheckDriver = DriverName; + } + else + { + /* Otherwise, display the message */ + InbvDisplayString(Message); + } + + /* Loop again */ + FirstRun = FALSE; + } +} + +VOID +NTAPI +KiDisplayBlueScreen(IN ULONG MessageId, + IN BOOLEAN IsHardError, + IN PCHAR HardErrCaption OPTIONAL, + IN PCHAR HardErrMessage OPTIONAL, + IN PCHAR Message) +{ + CHAR AnsiName[75]; + + /* FIXMEs: Use inbv to clear, fill and write to screen. */ + + /* Check if this is a hard error */ + if (IsHardError) + { + /* Display caption and message */ + if (HardErrCaption) InbvDisplayString(HardErrCaption); + if (HardErrMessage) InbvDisplayString(HardErrMessage); + return; + } + + /* Begin the display */ + InbvDisplayString("\r\n"); + + /* Print out initial message */ + KeGetBugMessageText(BUGCHECK_MESSAGE_INTRO, NULL); + InbvDisplayString("\r\n\r\n"); + + /* Check if we have a driver */ + if (KiBugCheckDriver) + { + /* Print out into to driver name */ + KeGetBugMessageText(BUGCODE_ID_DRIVER, NULL); + + /* Convert and print out driver name */ + KeBugCheckUnicodeToAnsi(KiBugCheckDriver, AnsiName, sizeof(AnsiName)); + InbvDisplayString(" "); + InbvDisplayString(AnsiName); + InbvDisplayString("\r\n\r\n"); + } + + /* Check if this is the generic message */ + if (MessageId == BUGCODE_PSS_MESSAGE) + { + /* It is, so get the bug code string as well */ + KeGetBugMessageText(KiBugCheckData[0], NULL); + InbvDisplayString("\r\n\r\n"); + } + + /* Print second introduction message */ + KeGetBugMessageText(PSS_MESSAGE_INTRO, NULL); + InbvDisplayString("\r\n\r\n"); + + /* Get the bug code string */ + KeGetBugMessageText(MessageId, NULL); + InbvDisplayString("\r\n\r\n"); + + /* Print message for technical information */ + KeGetBugMessageText(BUGCHECK_TECH_INFO, NULL); + + /* Show the techincal Data */ + sprintf(AnsiName, + "\r\n\r\n*** STOP: 0x%08lX (0x%p,0x%p,0x%p,0x%p)\r\n\r\n", + KiBugCheckData[0], + (PVOID)KiBugCheckData[1], + (PVOID)KiBugCheckData[2], + (PVOID)KiBugCheckData[3], + (PVOID)KiBugCheckData[4]); + InbvDisplayString(AnsiName); + + /* Check if we have a driver*/ + if (KiBugCheckDriver) + { + /* Display technical driver data */ + InbvDisplayString(Message); + } + else + { + /* Dump parameter information */ + KiDumpParameterImages(Message, + (PVOID)&KiBugCheckData[1], + 4, + KeBugCheckUnicodeToAnsi); + } +} + +VOID +NTAPI +KeBugCheckWithTf(IN ULONG BugCheckCode, + IN ULONG_PTR BugCheckParameter1, + IN ULONG_PTR BugCheckParameter2, + IN ULONG_PTR BugCheckParameter3, + IN ULONG_PTR BugCheckParameter4, + IN PKTRAP_FRAME TrapFrame) +{ + PKPRCB Prcb = KeGetCurrentPrcb(); + CONTEXT Context; + ULONG MessageId; + CHAR AnsiName[128]; + BOOLEAN IsSystem, IsHardError = FALSE; + PCHAR HardErrCaption = NULL, HardErrMessage = NULL; + PVOID Eip = NULL, Memory; + PVOID DriverBase; + PLDR_DATA_TABLE_ENTRY LdrEntry; + PULONG_PTR HardErrorParameters; + KIRQL OldIrql; + + /* Set active bugcheck */ + KeBugCheckActive = TRUE; + KiBugCheckDriver = NULL; + + /* Check if this is power failure simulation */ + if (BugCheckCode == POWER_FAILURE_SIMULATE) + { + /* Call the Callbacks and reboot */; + KiDoBugCheckCallbacks(); + HalReturnToFirmware(HalRebootRoutine); + } + + /* Save the IRQL and set hardware trigger */ + Prcb->DebuggerSavedIRQL = KeGetCurrentIrql(); + InterlockedIncrement(&KiHardwareTrigger); + + /* Capture the CPU Context */ + RtlCaptureContext(&Prcb->ProcessorState.ContextFrame); + Context = Prcb->ProcessorState.ContextFrame; + + /* FIXME: Call the Watchdog if it's regsitered */ + + /* Check which bugcode this is */ + switch (BugCheckCode) + { + /* These bug checks already have detailed messages, keep them */ + case UNEXPECTED_KERNEL_MODE_TRAP: + case DRIVER_CORRUPTED_EXPOOL: + case ACPI_BIOS_ERROR: + case ACPI_BIOS_FATAL_ERROR: + case THREAD_STUCK_IN_DEVICE_DRIVER: + case DATA_BUS_ERROR: + case FAT_FILE_SYSTEM: + case NO_MORE_SYSTEM_PTES: + case INACCESSIBLE_BOOT_DEVICE: + case KMODE_EXCEPTION_NOT_HANDLED: + + /* Keep the same code */ + MessageId = BugCheckCode; + break; + + /* Check if this is a kernel-mode exception */ + case KERNEL_MODE_EXCEPTION_NOT_HANDLED: + + /* Use the generic text message */ + MessageId = KMODE_EXCEPTION_NOT_HANDLED; + + /* File-system errors */ + case NTFS_FILE_SYSTEM: + + /* Use the generic message for FAT */ + MessageId = FAT_FILE_SYSTEM; + + /* Check if this is a coruption of the Mm's Pool */ + case DRIVER_CORRUPTED_MMPOOL: + + /* Use generic corruption message */ + MessageId = DRIVER_CORRUPTED_EXPOOL; + + /* Check if this is a signature check failure */ + case STATUS_SYSTEM_IMAGE_BAD_SIGNATURE: + + /* Use the generic corruption message */ + MessageId = BUGCODE_PSS_MESSAGE_SIGNATURE; + + /* All other codes */ + default: + + /* Use the default bugcheck message */ + MessageId = BUGCODE_PSS_MESSAGE; + } + + /* Save bugcheck data */ + KiBugCheckData[0] = BugCheckCode; + KiBugCheckData[1] = BugCheckParameter1; + KiBugCheckData[2] = BugCheckParameter2; + KiBugCheckData[3] = BugCheckParameter3; + KiBugCheckData[4] = BugCheckParameter4; + + /* Now check what bugcheck this is */ + switch (BugCheckCode) + { + /* Invalid access to R/O memory or Unhandled KM Exception */ + case KERNEL_MODE_EXCEPTION_NOT_HANDLED: + case ATTEMPTED_WRITE_TO_READONLY_MEMORY: + case ATTEMPTED_EXECUTE_OF_NOEXECUTE_MEMORY: + + /* Check if we have a trap frame */ + if (!TrapFrame) + { + /* Use parameter 3 as a trap frame, if it exists */ + if (BugCheckParameter3) TrapFrame = (PVOID)BugCheckParameter3; + } + + /* Check if we got one now and if we need to get EIP */ + if ((TrapFrame) && + (BugCheckCode != KERNEL_MODE_EXCEPTION_NOT_HANDLED)) + { + /* Get EIP */ + Eip = (PVOID)TrapFrame->Eip; + } + break; + + /* Wrong IRQL */ + case IRQL_NOT_LESS_OR_EQUAL: + + /* + * The NT kernel has 3 special sections: + * MISYSPTE, POOLMI and POOLCODE. The bug check code can + * determine in which of these sections this bugcode happened + * and provide a more detailed analysis. For now, we don't. + */ + + /* Eip is in parameter 4 */ + Eip = (PVOID)BugCheckParameter4; + + /* Get the driver base */ + DriverBase = KiPcToFileHeader(Eip, &LdrEntry, FALSE, &IsSystem); + if (IsSystem) + { + /* + * The error happened inside the kernel or HAL. + * Get the memory address that was being referenced. + */ + Memory = (PVOID)BugCheckParameter1; + + /* Find to which driver it belongs */ + DriverBase = KiPcToFileHeader(Memory, + &LdrEntry, + TRUE, + &IsSystem); + if (DriverBase) + { + /* Get the driver name and update the bug code */ + KiBugCheckDriver = &LdrEntry->BaseDllName; + KiBugCheckData[0] = DRIVER_PORTION_MUST_BE_NONPAGED; + } + else + { + /* Find the driver that unloaded at this address */ + KiBugCheckDriver = NULL; // FIXME: ROS can't locate + + /* Check if the cause was an unloaded driver */ + if (KiBugCheckDriver) + { + /* Update bug check code */ + KiBugCheckData[0] = + SYSTEM_SCAN_AT_RAISED_IRQL_CAUGHT_IMPROPER_DRIVER_UNLOAD; + } + } + } + else + { + /* Update the bug check code */ + KiBugCheckData[0] = DRIVER_IRQL_NOT_LESS_OR_EQUAL; + } + + /* Clear EIP so we don't look it up later */ + Eip = NULL; + break; + + /* Hard error */ + case FATAL_UNHANDLED_HARD_ERROR: + + /* Copy bug check data from hard error */ + HardErrorParameters = (PULONG_PTR)BugCheckParameter2; + KiBugCheckData[0] = BugCheckParameter1; + KiBugCheckData[1] = HardErrorParameters[0]; + KiBugCheckData[2] = HardErrorParameters[1]; + KiBugCheckData[3] = HardErrorParameters[2]; + KiBugCheckData[4] = HardErrorParameters[3]; + + /* Remember that this is hard error and set the caption/message */ + IsHardError = TRUE; + HardErrCaption = (PCHAR)BugCheckParameter3; + HardErrMessage = (PCHAR)BugCheckParameter4; + break; + + /* Page fault */ + case PAGE_FAULT_IN_NONPAGED_AREA: + + /* Assume no driver */ + DriverBase = NULL; + + /* Check if we have a trap frame */ + if (!TrapFrame) + { + /* We don't, use parameter 3 if possible */ + if (BugCheckParameter3) TrapFrame = (PVOID)BugCheckParameter3; + } + + /* Check if we have a frame now */ + if (TrapFrame) + { + /* Get EIP */ + Eip = (PVOID)TrapFrame->Eip; + + /* Find out if was in the kernel or drivers */ + DriverBase = KiPcToFileHeader(Eip, &LdrEntry, FALSE, &IsSystem); + } + + /* + * Now we should check if this happened in: + * 1) Special Pool 2) Free Special Pool 3) Session Pool + * and update the bugcheck code appropriately. + */ + + /* Check if we had a driver base */ + if (DriverBase) + { + /* Find the driver that unloaded at this address */ + KiBugCheckDriver = NULL; // FIXME: ROS can't locate + + /* Check if the cause was an unloaded driver */ + if (KiBugCheckDriver) + { + KiBugCheckData[0] = + DRIVER_UNLOADED_WITHOUT_CANCELLING_PENDING_OPERATIONS; + } + } + break; + + /* Check if the driver forgot to unlock pages */ + case DRIVER_LEFT_LOCKED_PAGES_IN_PROCESS: + + /* EIP is in parameter 1 */ + Eip = (PVOID)BugCheckParameter1; + break; + + /* Check if the driver consumed too many PTEs */ + case DRIVER_USED_EXCESSIVE_PTES: + + /* Driver base is in parameter 1 */ + DriverBase = (PVOID)BugCheckParameter1; + KiBugCheckDriver = &LdrEntry->BaseDllName; + break; + + /* Check if the driver has a stuck thread */ + case THREAD_STUCK_IN_DEVICE_DRIVER: + + /* The name is in Parameter 3 */ + KiBugCheckDriver = (PVOID)BugCheckParameter3; + break; + + /* Anything else */ + default: + break; + } + + /* Do we have a driver name? */ + if (KiBugCheckDriver) + { + /* Convert it to ANSI */ + KeBugCheckUnicodeToAnsi(KiBugCheckDriver, AnsiName, sizeof(AnsiName)); + } + else + { + /* Do we have an EIP? */ + if (Eip) + { + /* Dump image name */ + KiDumpParameterImages(AnsiName, + (PULONG_PTR)&Eip, + 1, + KeBugCheckUnicodeToAnsi); + } + } + + /* FIXME: Check if we need to save the context for KD */ + + /* Check if a debugger is connected */ + if ((BugCheckCode != MANUALLY_INITIATED_CRASH) && (KdDebuggerEnabled)) + { + /* Crash on the debugger console */ + DbgPrint("\n*** Fatal System Error: 0x%08lx\n" + " (0x%p,0x%p,0x%p,0x%p)\n\n", + KiBugCheckData[0], + KiBugCheckData[1], + KiBugCheckData[2], + KiBugCheckData[3], + KiBugCheckData[4]); + + /* Check if the debugger isn't currently connected */ + if (!KdDebuggerNotPresent) + { + /* Check if we have a driver to blame */ + if (KiBugCheckDriver) + { + /* Dump it */ + DbgPrint("Driver at fault: %s.\n", AnsiName); + } + + /* Check if this was a hard error */ + if (IsHardError) + { + /* Print caption and message */ + if (HardErrCaption) DbgPrint(HardErrCaption); + if (HardErrMessage) DbgPrint(HardErrMessage); + } + + /* Break in the debugger */ + KiBugCheckDebugBreak(DBG_STATUS_BUGCHECK_FIRST); + } + else + { + /* + * ROS HACK. + * Ok, so debugging is enabled, but KDBG isn't there. + * We'll manually dump the stack for the user. + */ + KeRosDumpStackFrames(NULL, 0); + } + } + + /* Switching back to the blue screen so we print messages on it */ + HalReleaseDisplayOwnership(); + + /* Raise IRQL to HIGH_LEVEL */ + Ke386DisableInterrupts(); + KeRaiseIrql(HIGH_LEVEL, &OldIrql); + + /* Unlock the Kernel Adress Space if we own it */ + if (KernelAddressSpaceLock.Owner == KeGetCurrentThread()) + { + MmUnlockAddressSpace(MmGetKernelAddressSpace()); + } + + /* Avoid recursion */ + if (!InterlockedDecrement(&KeBugCheckCount)) + { + /* Set CPU that is bug checking now */ + KeBugCheckOwner = Prcb->Number; + +#ifdef CONFIG_SMP + /* Freeze the other CPUs */ + for (i = 0; i < KeNumberProcessors; i++) + { + if (i != (LONG)KeGetCurrentProcessorNumber()) + { + /* Send the IPI and give them one second to catch up */ + KiIpiSendRequest(1 << i, IPI_FREEZE); + KeStallExecutionProcessor(1000000); + } + } +#endif + + /* Display the BSOD */ + KiDisplayBlueScreen(MessageId, + IsHardError, + HardErrCaption, + HardErrMessage, + AnsiName); + + /* FIXME: Enable debugger if it was pending */ + + /* Print the last line */ + InbvDisplayString("\r\n"); + + /* Save the context */ + Prcb->ProcessorState.ContextFrame = Context; + + /* FIXME: Support Triage Dump */ + + /* Write the crash dump */ + MmDumpToPagingFile(KiBugCheckData[4], + KiBugCheckData[0], + KiBugCheckData[1], + KiBugCheckData[2], + KiBugCheckData[3], + TrapFrame); + } + + /* Increase recursioun count */ + KeBugCheckOwnerRecursionCount++; + if (KeBugCheckOwnerRecursionCount == 2) + { + /* Break in the debugger */ + KiBugCheckDebugBreak(DBG_STATUS_BUGCHECK_SECOND); + } + else if (KeBugCheckOwnerRecursionCount > 2) + { + /* Halt the CPU */ + for (;;) Ke386HaltProcessor(); + } + + /* Call the Callbacks */ + KiDoBugCheckCallbacks(); + + /* FIXME: Call Watchdog if enabled */ + + /* Attempt to break in the debugger (otherwise halt CPU) */ + KiBugCheckDebugBreak(DBG_STATUS_BUGCHECK_SECOND); +} + +/* PUBLIC FUNCTIONS **********************************************************/ /* * @implemented */ BOOLEAN -STDCALL -KeDeregisterBugCheckCallback(PKBUGCHECK_CALLBACK_RECORD CallbackRecord) +NTAPI +KeDeregisterBugCheckCallback(IN PKBUGCHECK_CALLBACK_RECORD CallbackRecord) { KIRQL OldIrql; BOOLEAN Status = FALSE; @@ -99,12 +1012,11 @@ KeRaiseIrql(HIGH_LEVEL, &OldIrql); /* Check the Current State */ - if (CallbackRecord->State == BufferInserted) { - + if (CallbackRecord->State == BufferInserted) + { /* Reset state and remove from list */ CallbackRecord->State = BufferEmpty; RemoveEntryList(&CallbackRecord->Entry); - Status = TRUE; } @@ -117,8 +1029,9 @@ * @implemented */ BOOLEAN -STDCALL -KeDeregisterBugCheckReasonCallback(IN PKBUGCHECK_REASON_CALLBACK_RECORD CallbackRecord) +NTAPI +KeDeregisterBugCheckReasonCallback( + IN PKBUGCHECK_REASON_CALLBACK_RECORD CallbackRecord) { KIRQL OldIrql; BOOLEAN Status = FALSE; @@ -127,12 +1040,11 @@ KeRaiseIrql(HIGH_LEVEL, &OldIrql); /* Check the Current State */ - if (CallbackRecord->State == BufferInserted) { - + if (CallbackRecord->State == BufferInserted) + { /* Reset state and remove from list */ CallbackRecord->State = BufferEmpty; RemoveEntryList(&CallbackRecord->Entry); - Status = TRUE; } @@ -145,12 +1057,12 @@ * @implemented */ BOOLEAN -STDCALL -KeRegisterBugCheckCallback(PKBUGCHECK_CALLBACK_RECORD CallbackRecord, - PKBUGCHECK_CALLBACK_ROUTINE CallbackRoutine, - PVOID Buffer, - ULONG Length, - PUCHAR Component) +NTAPI +KeRegisterBugCheckCallback(IN PKBUGCHECK_CALLBACK_RECORD CallbackRecord, + IN PKBUGCHECK_CALLBACK_ROUTINE CallbackRoutine, + IN PVOID Buffer, + IN ULONG Length, + IN PUCHAR Component) { KIRQL OldIrql; BOOLEAN Status = FALSE; @@ -159,8 +1071,8 @@ KeRaiseIrql(HIGH_LEVEL, &OldIrql); /* Check the Current State first so we don't double-register */ - if (CallbackRecord->State == BufferEmpty) { - + if (CallbackRecord->State == BufferEmpty) + { /* Set the Callback Settings and insert into the list */ CallbackRecord->Length = Length; CallbackRecord->Buffer = Buffer; @@ -168,7 +1080,6 @@ CallbackRecord->CallbackRoutine = CallbackRoutine; CallbackRecord->State = BufferInserted; InsertTailList(&BugcheckCallbackListHead, &CallbackRecord->Entry); - Status = TRUE; } @@ -181,11 +1092,12 @@ * @implemented */ BOOLEAN -STDCALL -KeRegisterBugCheckReasonCallback(IN PKBUGCHECK_REASON_CALLBACK_RECORD CallbackRecord, - IN PKBUGCHECK_REASON_CALLBACK_ROUTINE CallbackRoutine, - IN KBUGCHECK_CALLBACK_REASON Reason, - IN PUCHAR Component) +NTAPI +KeRegisterBugCheckReasonCallback( + IN PKBUGCHECK_REASON_CALLBACK_RECORD CallbackRecord, + IN PKBUGCHECK_REASON_CALLBACK_ROUTINE CallbackRoutine, + IN KBUGCHECK_CALLBACK_REASON Reason, + IN PUCHAR Component) { KIRQL OldIrql; BOOLEAN Status = FALSE; @@ -194,15 +1106,15 @@ KeRaiseIrql(HIGH_LEVEL, &OldIrql); /* Check the Current State first so we don't double-register */ - if (CallbackRecord->State == BufferEmpty) { - + if (CallbackRecord->State == BufferEmpty) + { /* Set the Callback Settings and insert into the list */ CallbackRecord->Component = Component; CallbackRecord->CallbackRoutine = CallbackRoutine; CallbackRecord->State = BufferInserted; CallbackRecord->Reason = Reason; - InsertTailList(&BugcheckReasonCallbackListHead, &CallbackRecord->Entry); - + InsertTailList(&BugcheckReasonCallbackListHead, + &CallbackRecord->Entry); Status = TRUE; } @@ -211,285 +1123,18 @@ return Status; } -VOID -STDCALL -KeGetBugMessageText(ULONG BugCheckCode, PANSI_STRING OutputString) -{ - ULONG i; - ULONG IdOffset; - ULONG_PTR MessageEntry; - PCHAR BugCode; - - /* Find the message. This code is based on RtlFindMesssage -- Alex */ - for (i = 0; i < KiBugCodeMessages->NumberOfBlocks; i++) - { - /* Check if the ID Matches */ - if ((BugCheckCode >= KiBugCodeMessages->Blocks[i].LowId) && - (BugCheckCode <= KiBugCodeMessages->Blocks[i].HighId)) - { - /* Get Offset to Entry */ - MessageEntry = (ULONG_PTR)KiBugCodeMessages + KiBugCodeMessages->Blocks[i].OffsetToEntries; - IdOffset = BugCheckCode - KiBugCodeMessages->Blocks[i].LowId; - - /* Get offset to ID */ - for (i = 0; i < IdOffset; i++) - { - /* Advance in the Entries */ - MessageEntry += ((PRTL_MESSAGE_RESOURCE_ENTRY)MessageEntry)->Length; - } - - /* Get the final Code */ - BugCode = ((PRTL_MESSAGE_RESOURCE_ENTRY)MessageEntry)->Text; - - /* Return it in the OutputString */ - if (OutputString) - { - OutputString->Buffer = BugCode; - OutputString->Length = strlen(BugCode) + 1; - OutputString->MaximumLength = strlen(BugCode) + 1; - } - else - { - /* Direct Output to Screen */ - CHAR BugString[100]; - sprintf(BugString, "%s\n", BugCode); - InbvDisplayString(BugString); - break; - } - } - } -} - -VOID -STDCALL -KiDoBugCheckCallbacks(VOID) -{ - PKBUGCHECK_CALLBACK_RECORD CurrentRecord; - PLIST_ENTRY ListHead; - - /* FIXME: Check Checksum and add support for WithReason Callbacks */ - - /* First make sure that the list is Initialized... it might not be */ - ListHead = &BugcheckCallbackListHead; - if (ListHead->Flink && ListHead->Blink) { - - /* Loop the list */ - LIST_FOR_EACH(CurrentRecord, ListHead, KBUGCHECK_CALLBACK_RECORD, Entry) - { - /* Make sure it's inserted */ - if (CurrentRecord->State == BufferInserted) { - - /* Call the routine */ - CurrentRecord->State = BufferStarted; - (CurrentRecord->CallbackRoutine)(CurrentRecord->Buffer, - CurrentRecord->Length); - CurrentRecord->State = BufferFinished; - } - } - } -} - -VOID -STDCALL -KeBugCheckWithTf(ULONG BugCheckCode, - ULONG BugCheckParameter1, - ULONG BugCheckParameter2, - ULONG BugCheckParameter3, - ULONG BugCheckParameter4, - PKTRAP_FRAME Tf) -{ - KIRQL OldIrql; - BOOLEAN GotExtendedCrashInfo = FALSE; - PVOID Address = 0; - PLDR_DATA_TABLE_ENTRY CurrentModule = NULL; - extern LIST_ENTRY ModuleListHead; -#if 0 - CHAR PrintString[100]; -#endif - /* Make sure we're switching back to the blue screen and print messages on it */ - HalReleaseDisplayOwnership(); - if (!KdpDebugMode.Screen) - { - /* Enable screen debug mode */ - KdpDebugMode.Screen = TRUE; - InitRoutines[0](&DispatchTable[0], 0); - } - - /* Try to find out who did this. For this, we need a Trap Frame. - * Note: Some special BSODs pass the Frame/EIP as a Param. MSDN has the - * info so it eventually needs to be supported. - */ - if (Tf) - { - /* For now, get Address from EIP */ - Address = (PVOID)Tf->Eip; - - /* Try to get information on the module */ - LIST_FOR_EACH(CurrentModule, &ModuleListHead, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks) - { - /* Check if this is the right one */ - if ((Address != NULL && (Address >= (PVOID)CurrentModule->DllBase && - Address < (PVOID)((ULONG_PTR)CurrentModule->DllBase + CurrentModule->SizeOfImage)))) - { - /* We got it */ - GotExtendedCrashInfo = TRUE; - break; - } - } - } - - /* Raise IRQL to HIGH_LEVEL */ - Ke386DisableInterrupts(); - KeRaiseIrql(HIGH_LEVEL, &OldIrql); - - /* Unload the Kernel Adress Space if we own it */ - if (KernelAddressSpaceLock.Owner == KeGetCurrentThread()) - MmUnlockAddressSpace(MmGetKernelAddressSpace()); - - /* FIXMEs: Use inbv to clear, fill and write to screen. */ - - /* Show the STOP Message */ -#if 0 - InbvDisplayString("A problem has been detected and ReactOS has been shut down to prevent " - "damage to your computer.\n\n"); -#else - DbgPrint("A problem has been detected and ReactOS has been shut down to prevent " - "damage to your computer.\n\n"); -#endif - /* Show the module name of who caused this */ - if (GotExtendedCrashInfo) - { -#if 0 - sprintf(PrintString, - "The problem seems to be caused by the following file: %wZ\n\n", - &CurrentModule->BaseDllName); - InbvDisplayString(PrintString); -#else - DbgPrint("The problem seems to be caused by the following file: %wZ\n\n", - &CurrentModule->BaseDllName); -#endif - } - - /* Find the Bug Code String */ - KeGetBugMessageText(BugCheckCode, NULL); - - /* Show the techincal Data */ -#if 0 - sprintf(PrintString, - "Technical information:\n\n*** STOP: 0x%08lX (0x%p,0x%p,0x%p,0x%p)\n\n", - BugCheckCode, - (PVOID)BugCheckParameter1, - (PVOID)BugCheckParameter2, - (PVOID)BugCheckParameter3, - (PVOID)BugCheckParameter4); - InbvDisplayString(PrintString); -#else - DbgPrint("Technical information:\n\n*** STOP: 0x%08lX (0x%p,0x%p,0x%p,0x%p)\n\n", - BugCheckCode, - (PVOID)BugCheckParameter1, - (PVOID)BugCheckParameter2, - (PVOID)BugCheckParameter3, - (PVOID)BugCheckParameter4); -#endif - /* Show the module name and more data of who caused this */ - if (GotExtendedCrashInfo) - { -#if 0 - sprintf(PrintString, - "*** %wZ - Address 0x%p base at 0x%p, DateStamp 0x%x\n\n", - &CurrentModule->BaseDllName, - Address, - (PVOID)CurrentModule->DllBase, - 0); - InbvDisplayString(PrintString); -#else - DbgPrint("*** %wZ - Address 0x%p base at 0x%p, DateStamp 0x%x\n\n", - &CurrentModule->BaseDllName, - Address, - (PVOID)CurrentModule->DllBase, - 0); -#endif - } - - /* There can only be one Bugcheck per Bootup */ - if (!InterlockedDecrement((PLONG)&KeBugCheckCount)) - { -#ifdef CONFIG_SMP - LONG i; - /* Freeze the other CPUs */ - for (i = 0; i < KeNumberProcessors; i++) - { - if (i != (LONG)KeGetCurrentProcessorNumber()) - { - /* Send the IPI and give them one second to catch up */ - KiIpiSendRequest(1 << i, IPI_FREEZE); - KeStallExecutionProcessor(1000000); - } - } -#endif - /* Check if we got a Trap Frame */ - if (Tf) - { - /* Dump it */ - KiDumpTrapFrame(Tf, BugCheckParameter1, BugCheckParameter2); - } - else - { - /* We can only dump the frames */ -#if defined(__GNUC__) - KeDumpStackFrames((PULONG)__builtin_frame_address(0)); -#elif defined(_MSC_VER) - __asm push ebp - __asm call KeDumpStackFrames - __asm add esp, 4 -#else -#error Unknown compiler for inline assembler -#endif - } - - /* Call the Callbacks */; - KiDoBugCheckCallbacks(); - - /* Dump the BSOD to the Paging File */ - MmDumpToPagingFile(BugCheckCode, - BugCheckParameter1, - BugCheckParameter2, - BugCheckParameter3, - BugCheckParameter4, - Tf); - - /* Wake up the Debugger */ - if (KdDebuggerEnabled) - { - Ke386EnableInterrupts(); - DbgBreakPointWithStatus(DBG_STATUS_BUGCHECK_SECOND); - Ke386DisableInterrupts(); - } - } - - /* Halt this CPU now */ - for (;;) Ke386HaltProcessor(); -} - /* * @implemented - * - * FUNCTION: Brings the system down in a controlled manner when an - * inconsistency that might otherwise cause corruption has been detected - * ARGUMENTS: - * BugCheckCode = Specifies the reason for the bug check - * BugCheckParameter[1-4] = Additional information about bug - * RETURNS: Doesn't */ VOID -STDCALL -KeBugCheckEx(ULONG BugCheckCode, - ULONG BugCheckParameter1, - ULONG BugCheckParameter2, - ULONG BugCheckParameter3, - ULONG BugCheckParameter4) -{ - /* Call the Trap Frame version without a Trap Frame */ +NTAPI +KeBugCheckEx(IN ULONG BugCheckCode, + IN ULONG_PTR BugCheckParameter1, + IN ULONG_PTR BugCheckParameter2, + IN ULONG_PTR BugCheckParameter3, + IN ULONG_PTR BugCheckParameter4) +{ + /* Call the internal API */ KeBugCheckWithTf(BugCheckCode, BugCheckParameter1, BugCheckParameter2, @@ -500,18 +1145,13 @@ /* * @implemented - * - * FUNCTION: Brings the system down in a controlled manner when an - * inconsistency that might otherwise cause corruption has been detected - * ARGUMENTS: - * BugCheckCode = Specifies the reason for the bug check - * RETURNS: Doesn't */ VOID -STDCALL +NTAPI KeBugCheck(ULONG BugCheckCode) { - KeBugCheckEx(BugCheckCode, 0, 0, 0, 0); + /* Call the internal API */ + KeBugCheckWithTf(BugCheckCode, 0, 0, 0, 0, NULL); } /* EOF */ Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/exp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/exp.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c Wed Aug 30 09:22:56 2006 @@ -1,214 +1,40 @@ /* - * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory * FILE: ntoskrnl/ke/i386/exp.c - * PURPOSE: Exception Support Code - * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) + * PURPOSE: Exception Dispatching and Context<->Trap Frame Conversion + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) * Gregor Anich - * David Welch (welch(a)cwcom.net) * Skywing (skywing(a)valhallalegends.com) */ -/* INCLUDES *****************************************************************/ +/* INCLUDES ******************************************************************/ #include <ntoskrnl.h> - #define NDEBUG -#include <internal/debug.h> - -#if defined (ALLOC_PRAGMA) -#pragma alloc_text(INIT, KeInitExceptions) -#endif - -#define SIZE_OF_FX_REGISTERS 32 +#include <debug.h> + +/* FUNCTIONS *****************************************************************/ VOID -NTAPI -Ki386AdjustEsp0( - IN PKTRAP_FRAME TrapFrame -); - -VOID -NTAPI -KiFlushNPXState( - IN FLOATING_SAVE_AREA *SaveArea -); - -extern KIDTENTRY KiIdt[]; - -/* GLOBALS *****************************************************************/ - -#define FLAG_IF (1<<9) - -#define _STR(x) #x -#define STR(x) _STR(x) - -#ifndef ARRAY_SIZE -# define ARRAY_SIZE(x) (sizeof (x) / sizeof (x[0])) -#endif - -extern ULONG init_stack; -extern ULONG init_stack_top; - -extern BOOLEAN Ke386NoExecute; - -static char *ExceptionTypeStrings[] = - { - "Divide Error", - "Debug Trap", - "NMI", - "Breakpoint", - "Overflow", - "BOUND range exceeded", - "Invalid Opcode", - "No Math Coprocessor", - "Double Fault", - "Unknown(9)", - "Invalid TSS", - "Segment Not Present", - "Stack Segment Fault", - "General Protection", - "Page Fault", - "Reserved(15)", - "Math Fault", - "Alignment Check", - "Machine Check", - "SIMD Fault" - }; - -NTSTATUS ExceptionToNtStatus[] = - { - STATUS_INTEGER_DIVIDE_BY_ZERO, - STATUS_SINGLE_STEP, - STATUS_ACCESS_VIOLATION, - STATUS_BREAKPOINT, - STATUS_INTEGER_OVERFLOW, - STATUS_ARRAY_BOUNDS_EXCEEDED, - STATUS_ILLEGAL_INSTRUCTION, - STATUS_FLOAT_INVALID_OPERATION, - STATUS_ACCESS_VIOLATION, - STATUS_ACCESS_VIOLATION, - STATUS_ACCESS_VIOLATION, - STATUS_ACCESS_VIOLATION, - STATUS_STACK_OVERFLOW, - STATUS_ACCESS_VIOLATION, - STATUS_ACCESS_VIOLATION, - STATUS_ACCESS_VIOLATION, /* RESERVED */ - STATUS_FLOAT_INVALID_OPERATION, /* Should not be used, the FPU can give more specific info */ - STATUS_DATATYPE_MISALIGNMENT, - STATUS_ACCESS_VIOLATION, - STATUS_FLOAT_MULTIPLE_TRAPS, - }; - -/* FUNCTIONS ****************************************************************/ - -BOOLEAN STDCALL -KiRosPrintAddress(PVOID address) -{ - PLIST_ENTRY current_entry; - PLDR_DATA_TABLE_ENTRY current; - extern LIST_ENTRY ModuleListHead; - ULONG_PTR RelativeAddress; - ULONG i = 0; - - do - { - current_entry = ModuleListHead.Flink; - - while (current_entry != &ModuleListHead) - { - current = - CONTAINING_RECORD(current_entry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); - - if (address >= (PVOID)current->DllBase && - address < (PVOID)((ULONG_PTR)current->DllBase + current->SizeOfImage)) - { - RelativeAddress = (ULONG_PTR) address - (ULONG_PTR) current->DllBase; - DbgPrint("<%wZ: %x>", &current->FullDllName, RelativeAddress); - return(TRUE); - } - current_entry = current_entry->Flink; - } - - address = (PVOID)((ULONG_PTR)address & ~(ULONG_PTR)MmSystemRangeStart); - } while(++i <= 1); - - return(FALSE); -} - -VOID -NTAPI -KiDumpTrapFrame(PKTRAP_FRAME Tf, ULONG Parameter1, ULONG Parameter2) -{ - ULONG cr3_; - ULONG StackLimit; - ULONG Esp0; - ULONG ExceptionNr = (ULONG)Tf->DbgArgMark; - ULONG cr2 = (ULONG)Tf->DbgArgPointer; - - Esp0 = (ULONG)Tf; - - /* - * Print out the CPU registers - */ - if (ExceptionNr < ARRAY_SIZE(ExceptionTypeStrings)) - { - DbgPrint("%s Exception: %d(%x)\n", ExceptionTypeStrings[ExceptionNr], - ExceptionNr, Tf->ErrCode&0xffff); - } - else - { - DbgPrint("Exception: %d(%x)\n", ExceptionNr, Tf->ErrCode&0xffff); - } - DbgPrint("Processor: %d CS:EIP %x:%x ", KeGetCurrentProcessorNumber(), - Tf->SegCs&0xffff, Tf->Eip); - KeRosPrintAddress((PVOID)Tf->Eip); - DbgPrint("\n"); - Ke386GetPageTableDirectory(cr3_); - DbgPrint("cr2 %x cr3 %x ", cr2, cr3_); - DbgPrint("Proc: %x ",PsGetCurrentProcess()); - if (PsGetCurrentProcess() != NULL) - { - DbgPrint("Pid: %x <", PsGetCurrentProcess()->UniqueProcessId); - DbgPrint("%.16s> ", PsGetCurrentProcess()->ImageFileName); - } - if (PsGetCurrentThread() != NULL) - { - DbgPrint("Thrd: %x Tid: %x", - PsGetCurrentThread(), - PsGetCurrentThread()->Cid.UniqueThread); - } - DbgPrint("\n"); - DbgPrint("DS %x ES %x FS %x GS %x\n", Tf->SegDs&0xffff, Tf->SegEs&0xffff, - Tf->SegFs&0xffff, Tf->SegGs&0xfff); - DbgPrint("EAX: %.8x EBX: %.8x ECX: %.8x\n", Tf->Eax, Tf->Ebx, Tf->Ecx); - DbgPrint("EDX: %.8x EBP: %.8x ESI: %.8x ESP: %.8x\n", Tf->Edx, - Tf->Ebp, Tf->Esi, Esp0); - DbgPrint("EDI: %.8x EFLAGS: %.8x ", Tf->Edi, Tf->EFlags); - if ((Tf->SegCs&0xffff) == KGDT_R0_CODE) - { - DbgPrint("kESP %.8x ", Esp0); - if (PsGetCurrentThread() != NULL) - { - DbgPrint("kernel stack base %x\n", - PsGetCurrentThread()->Tcb.StackLimit); - - } - } - - if (PsGetCurrentThread() != NULL) - { - StackLimit = (ULONG)PsGetCurrentThread()->Tcb.StackBase; - } - else - { - StackLimit = (ULONG)init_stack_top; - } - - /* - * Dump the stack frames - */ - KeDumpStackFrames((PULONG)Tf->Ebp); +INIT_FUNCTION +NTAPI +KeInitExceptions(VOID) +{ + ULONG i; + USHORT FlippedSelector; + extern KIDTENTRY KiIdt[]; + + /* Loop the IDT */ + for (i = 0; i <= MAXIMUM_IDTVECTOR; i ++) + { + /* Save the current Selector */ + FlippedSelector = KiIdt[i].Selector; + + /* Flip Selector and Extended Offset */ + KiIdt[i].Selector = KiIdt[i].ExtendedOffset; + KiIdt[i].ExtendedOffset = FlippedSelector; + } } ULONG @@ -752,177 +578,6 @@ VOID NTAPI -KeDumpStackFrames(PULONG Frame) -{ - PULONG StackBase, StackEnd; - MEMORY_BASIC_INFORMATION mbi; - ULONG ResultLength = sizeof(mbi); - NTSTATUS Status; - - DbgPrint("Frames:\n"); - _SEH_TRY - { - Status = MiQueryVirtualMemory ( - (HANDLE)-1, - Frame, - MemoryBasicInformation, - &mbi, - sizeof(mbi), - &ResultLength ); - if ( !NT_SUCCESS(Status) ) - { - DPRINT1("Can't dump stack frames: MiQueryVirtualMemory() failed: %x\n", Status ); - return; - } - - StackBase = Frame; - StackEnd = (PULONG)((ULONG_PTR)mbi.BaseAddress + mbi.RegionSize); - - while ( Frame >= StackBase && Frame < StackEnd ) - { - ULONG Addr = Frame[1]; - if (!KeRosPrintAddress((PVOID)Addr)) - DbgPrint("<%X>", Addr); - if ( Addr == 0 || Addr == 0xDEADBEEF ) - break; - StackBase = Frame; - Frame = (PULONG)Frame[0]; - DbgPrint("\n"); - } - } - _SEH_HANDLE - { - } - _SEH_END; - DbgPrint("\n"); -} - -VOID STDCALL -KeRosDumpStackFrames ( PULONG Frame, ULONG FrameCount ) -{ - ULONG i=0; - PULONG StackBase, StackEnd; - MEMORY_BASIC_INFORMATION mbi; - ULONG ResultLength = sizeof(mbi); - NTSTATUS Status; - - DbgPrint("Frames: "); - _SEH_TRY - { - if ( !Frame ) - { -#if defined __GNUC__ - __asm__("mov %%ebp, %0" : "=r" (Frame) : ); -#elif defined(_MSC_VER) - __asm mov [Frame], ebp -#endif - //Frame = (PULONG)Frame[0]; // step out of KeRosDumpStackFrames - } - - Status = MiQueryVirtualMemory ( - (HANDLE)-1, - Frame, - MemoryBasicInformation, - &mbi, - sizeof(mbi), - &ResultLength ); - if ( !NT_SUCCESS(Status) ) - { - DPRINT1("Can't dump stack frames: MiQueryVirtualMemory() failed: %x\n", Status ); - return; - } - - StackBase = Frame; - StackEnd = (PULONG)((ULONG_PTR)mbi.BaseAddress + mbi.RegionSize); - - while ( Frame >= StackBase && Frame < StackEnd && i++ < FrameCount ) - { - ULONG Addr = Frame[1]; - if (!KeRosPrintAddress((PVOID)Addr)) - DbgPrint("<%X>", Addr); - if ( Addr == 0 || Addr == 0xDEADBEEF ) - break; - StackBase = Frame; - Frame = (PULONG)Frame[0]; - DbgPrint(" "); - } - } - _SEH_HANDLE - { - } - _SEH_END; - DbgPrint("\n"); -} - -ULONG STDCALL -KeRosGetStackFrames ( PULONG Frames, ULONG FrameCount ) -{ - ULONG Count = 0; - PULONG StackBase, StackEnd, Frame; - MEMORY_BASIC_INFORMATION mbi; - ULONG ResultLength = sizeof(mbi); - NTSTATUS Status; - - _SEH_TRY - { -#if defined __GNUC__ - __asm__("mov %%ebp, %0" : "=r" (Frame) : ); -#elif defined(_MSC_VER) - __asm mov [Frame], ebp -#endif - - Status = MiQueryVirtualMemory ( - (HANDLE)-1, - Frame, - MemoryBasicInformation, - &mbi, - sizeof(mbi), - &ResultLength ); - if ( !NT_SUCCESS(Status) ) - { - DPRINT1("Can't get stack frames: MiQueryVirtualMemory() failed: %x\n", Status ); - return 0; - } - - StackBase = Frame; - StackEnd = (PULONG)((ULONG_PTR)mbi.BaseAddress + mbi.RegionSize); - - while ( Count < FrameCount && Frame >= StackBase && Frame < StackEnd ) - { - Frames[Count++] = Frame[1]; - StackBase = Frame; - Frame = (PULONG)Frame[0]; - } - } - _SEH_HANDLE - { - } - _SEH_END; - return Count; -} - -VOID -INIT_FUNCTION -NTAPI -KeInitExceptions(VOID) -{ - ULONG i; - USHORT FlippedSelector; - - /* Loop the IDT */ - for (i = 0; i <= MAXIMUM_IDTVECTOR; i ++) - { - /* Save the current Selector */ - FlippedSelector = KiIdt[i].Selector; - - /* Flip Selector and Extended Offset */ - KiIdt[i].Selector = KiIdt[i].ExtendedOffset; - KiIdt[i].ExtendedOffset = FlippedSelector; - } -} - -VOID -NTAPI KiDispatchException(PEXCEPTION_RECORD ExceptionRecord, PKEXCEPTION_FRAME ExceptionFrame, PKTRAP_FRAME TrapFrame, @@ -1091,10 +746,10 @@ NTAPI KeRaiseUserException(IN NTSTATUS ExceptionCode) { - ULONG OldEip; - PKTHREAD Thread = KeGetCurrentThread(); - - /* Make sure we can access the TEB */ + ULONG OldEip; + PKTHREAD Thread = KeGetCurrentThread(); + + /* Make sure we can access the TEB */ _SEH_TRY { Thread->Teb->ExceptionCode = ExceptionCode; Modified: trunk/reactos/ntoskrnl/ke/i386/v86vdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/v86vdm.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/v86vdm.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/v86vdm.c Wed Aug 30 09:22:56 2006 @@ -86,7 +86,8 @@ KeSetSystemAffinityThread(1); /* Make sure there's space for two IOPMs, then copy & clear the current */ - //ASSERT(((PKGDTENTRY)&KeGetPcr()->GDT[KGDT_TSS / 8])->LimitLow >= (0x2000 + IOPM_OFFSET - 1)); + //ASSERT(((PKGDTENTRY)&KeGetPcr()->GDT[KGDT_TSS / 8])->LimitLow >= + // (0x2000 + IOPM_OFFSET - 1)); RtlMoveMemory(Ki386IopmSaveArea, &Tss->IoMaps[0].IoMap, PAGE_SIZE * 2); RtlZeroMemory(&Tss->IoMaps[0].IoMap, PAGE_SIZE * 2); Modified: trunk/reactos/ntoskrnl/ntoskrnl.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.mc?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.mc (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.mc Wed Aug 30 09:22:56 2006 @@ -21,6 +21,58 @@ ; ; message definitions ; +MessageId=0x7F +Severity=Warning +Facility=System +SymbolicName=BUGCHECK_MESSAGE_INTRO +Language=English +A problem has been detected and ReactOS has been shut down to prevent damage +to your computer. +. + +MessageId=0x80 +Severity=Warning +Facility=System +SymbolicName=BUGCODE_ID_DRIVER +Language=English +The problem seems to be caused by the following file: + +. + +MessageId=0x81 +Severity=Warning +Facility=System +SymbolicName=PSS_MESSAGE_INTRO +Language=English +If this is the first time you've seen this Stop error screen, +restart your computer. If this screen appears again, follow +these steps: + +. + +MessageId=0x82 +Severity=Warning +Facility=System +SymbolicName=BUGCODE_PSS_MESSAGE +Language=English +Check to make sure any new hardware or software is properly installed. +If this is a new installation, ask your hardware or software manufacturer +for any ReactOS updates you might need. + +If problems continue, disable or remove any newly installed hardware +or software. Disable BIOS memory options such as caching or shadowing. +If you need to use Safe Mode to remove or disable components, restart +your computer, press F8 to select Advanced Startup Options, and then +select Safe Mode. +. + +MessageId=0x83 +Severity=Warning +Facility=System +SymbolicName=BUGCHECK_TECH_INFO +Language=English +Technical information: +. MessageId=0x0 Severity=Success @@ -267,7 +319,16 @@ Facility=System SymbolicName=KMODE_EXCEPTION_NOT_HANDLED Language=English -KMODE_EXCEPTION_NOT_HANDLED +Check to be sure you have adequate disk space. If a driver is +identified in the Stop message, disable the driver or check +with the manufacturer for driver updates. Try changing video +adapters. + +Check with your hardware vendor for any BIOS updates. Disable +BIOS memory options such as caching or shadowing. If you need +to use Safe Mode to remove or disable components, restart your +computer, press F8 to select Advanced Startup Options, and then +select Safe Mode. . MessageId=0x1F @@ -307,7 +368,10 @@ Facility=System SymbolicName=FAT_FILE_SYSTEM Language=English -FAT_FILE_SYSTEM +Disable or uninstall any anti-virus, disk defragmentation +or backup utilities. Check your hard drive configuration, +and check for any updated drivers. Run CHKDSK /F to check +for hard drive corruption, and then restart your computer. . MessageId=0x24 @@ -395,7 +459,15 @@ Facility=System SymbolicName=DATA_BUS_ERROR Language=English -DATA_BUS_ERROR +Run system diagnostics supplied by your hardware manufacturer. +In particular, run a memory check, and check for faulty or +mismatched memory. Try changing video adapters. + +Check with your hardware vendor for any BIOS updates. Disable +BIOS memory options such as caching or shadowing. If you need +to use Safe Mode to remove or disable components, restart your +computer, press F8 to select Advanced Startup Options, and then +select Safe Mode. . MessageId=0x2F @@ -502,7 +574,12 @@ Facility=System SymbolicName=NO_MORE_SYSTEM_PTES Language=English -NO_MORE_SYSTEM_PTES +Remove any recently installed software including backup +utilities or disk-intensive applications. + +If you need to use Safe Mode to remove or disable components, +restart your computer, press F8 to select Advanced Startup +Options, and then select Safe Mode. . MessageId=0x40 @@ -581,7 +658,13 @@ STREAMS_INTERNAL_ERROR . - +MessageId=0x4C +Severity=Success +Facility=System +SymbolicName=FATAL_UNHANDLED_HARD_ERROR +Language=English +FATAL_UNHANDLED_HARD_ERROR +. MessageId=0x4D Severity=Success @@ -942,7 +1025,11 @@ Facility=System SymbolicName=INACCESSIBLE_BOOT_DEVICE Language=English -INACCESSIBLE_BOOT_DEVICE +Check for viruses on your computer. Remove any newly installed +hard drives or hard drive controllers. Check your hard drive +to make sure it is properly configured and terminated. +Run CHKDSK /F to check for hard drive corruption, and then +restart your computer. . @@ -960,7 +1047,14 @@ Facility=System SymbolicName=UNEXPECTED_KERNEL_MODE_TRAP Language=English -UNEXPECTED_KERNEL_MODE_TRAP +Run a system diagnostic utility supplied by your hardware manufacturer. +In particular, run a memory check, and check for faulty or mismatched +memory. Try changing video adapters. + +Disable or remove any newly installed hardware and drivers. Disable or +remove any newly installed software. If you need to use Safe Mode to +remove or disable components, restart your computer, press F8 to select +Advanced Startup Options, and then select Safe Mode. . MessageId=0x7F @@ -974,6 +1068,14 @@ MessageId=0x80 Severity=Success Facility=System +SymbolicName=KERNEL_MODE_EXCEPTION_NOT_HANDLED +Language=English +KERNEL_MODE_EXCEPTION_NOT_HANDLED +. + +MessageId=0x8E +Severity=Success +Facility=System SymbolicName=SPIN_LOCK_INIT_FAILURE Language=English SPIN_LOCK_INIT_FAILURE @@ -995,6 +1097,22 @@ INVALID_WORK_QUEUE_ITEM . +MessageId=0xA5 +Severity=Success +Facility=System +SymbolicName=ACPI_BIOS_ERROR +Language=English +The BIOS in this system is not fully ACPI compliant. Please contact your +system vendor for an updated BIOS. +. + +MessageId=0xBE +Severity=Success +Facility=System +SymbolicName=ATTEMPTED_WRITE_TO_READONLY_MEMORY +Language=English +ATTEMPTED_WRITE_TO_READONLY_MEMORY + MessageId=0xC2 Severity=Success Facility=System @@ -1003,6 +1121,110 @@ BAD_POOL_CALLER . +MessageId=0xC3 +Severity=Success +Facility=System +SymbolicName=BUGCODE_PSS_MESSAGE_SIGNATURE +Language=English +A system file that is owned by ReactOS was replaced by an application +running on your system. The operating system detected this and tried to +verify the validity of the file's signature. The operating system found that +the file signature is not valid and put the original, correct file back +so that your operating system will continue to function properly. +. + +MessageId=0xC5 +Severity=Success +Facility=System +SymbolicName=DRIVER_CORRUPTED_EXPOOL +Language=English +A device driver has pool. + +Check to make sure any new hardware or software is properly installed. +If this is a new installation, ask your hardware or software manufacturer +for any ReactOS updates you might need. + +Run the driver verifier against any new (or suspect) drivers. +If that doesn't reveal the corrupting driver, try enabling special pool. +Both of these features are intended to catch the corruption at an earlier +point where the offending driver can be identified. + +If you need to use Safe Mode to remove or disable components, +restart your computer, press F8 to select Advanced Startup Options, +and then select Safe Mode. +. + +MessageId=0xCB +Severity=Success +Facility=System +SymbolicName=DRIVER_LEFT_LOCKED_PAGES_IN_PROCESS +Language=English +DRIVER_LEFT_LOCKED_PAGES_IN_PROCESS +. + +MessageId=0xCE +Severity=Success +Facility=System +SymbolicName=DRIVER_UNLOADED_WITHOUT_CANCELLING_PENDING_OPERATIONS +Language=English +DRIVER_UNLOADED_WITHOUT_CANCELLING_PENDING_OPERATIONS +. + +MessageId=0xD0 +Severity=Success +Facility=System +SymbolicName=DRIVER_CORRUPTED_MMPOOL +Language=English +DRIVER_CORRUPTED_MMPOOL +. + +MessageId=0xD1 +Severity=Success +Facility=System +SymbolicName=DRIVER_IRQL_NOT_LESS_OR_EQUAL +Language=English +DRIVER_IRQL_NOT_LESS_OR_EQUAL +. + +MessageId=0xD3 +Severity=Success +Facility=System +SymbolicName=DRIVER_PORTION_MUST_BE_NONPAGED +Language=English +DRIVER_PORTION_MUST_BE_NONPAGED +. + +MessageId=0xD8 +Severity=Success +Facility=System +SymbolicName=DRIVER_USED_EXCESSIVE_PTES +Language=English +DRIVER_USED_EXCESSIVE_PTES +. + +MessageId=0xD4 +Severity=Success +Facility=System +SymbolicName=SYSTEM_SCAN_AT_RAISED_IRQL_CAUGHT_IMPROPER_DRIVER_UNLOAD +Language=English +SYSTEM_SCAN_AT_RAISED_IRQL_CAUGHT_IMPROPER_DRIVER_UNLOAD +. + +MessageId=0xE0 +Severity=Success +Facility=System +SymbolicName=ACPI_BIOS_FATAL_ERROR +Language=English + +Your computer (BIOS) has reported that a component in your system is faulty and +has prevented ReactOS from operating. You can determine which component is +faulty by running the diagnostic disk or tool that came with your computer. + +If you do not have this tool, you must contact your system vendor and report +this error message to them. They will be able to assist you in correcting this +hardware problem thereby allowing ReactOS to operate. +. + MessageId=0xE1 Severity=Success Facility=System @@ -1033,6 +1255,14 @@ SymbolicName=WORKER_INVALID Language=English WORKER_INVALID +. + +MessageId=0xE5 +Severity=Success +Facility=System +SymbolicName=POWER_FAILURE_SIMULATE +Language=English +POWER_FAILURE_SIMULATE . MessageId=0xFA @@ -1101,6 +1331,19 @@ ACTIVE_EX_WORKER_THREAD_TERMINATION . +MessageId=0xEA +Severity=Success +Facility=System +SymbolicName=THREAD_STUCK_IN_DEVICE_DRIVER +Language=English + +The device driver got stuck in an infinite loop. This usually indicates +problem with the device itself or with the device driver programming the +hardware incorrectly. + +Please check with your hardware device vendor for any driver updates. +. + MessageId=0xEF Severity=Success Facility=System

1 0

[ion] 23793: - Jesus Christ... will Hell freeze over before someone finally listens and implements a proper PE loader in Freeloader?
by ion＠svn.reactos.org 30 Aug '06

30 Aug '06

Author: ion Date: Wed Aug 30 05:22:41 2006 New Revision: 23793 URL: http://svn.reactos.org/svn/reactos?rev=23793&view=rev Log: - Jesus Christ... will Hell freeze over before someone finally listens and implements a proper PE loader in Freeloader? Modified: trunk/reactos/ntoskrnl/ke/main.c Modified: trunk/reactos/ntoskrnl/ke/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/main.c?rev=237… ============================================================================== --- trunk/reactos/ntoskrnl/ke/main.c (original) +++ trunk/reactos/ntoskrnl/ke/main.c Wed Aug 30 05:22:41 2006 @@ -71,6 +71,8 @@ #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, _main) #endif + +extern LDR_DATA_TABLE_ENTRY HalModuleObject; /* FUNCTIONS ****************************************************************/ @@ -240,6 +242,17 @@ (PVOID)KERNEL_BASE, &DriverSize); + // + // + // HACK HACK HACK WHEN WILL YOU PEOPLE FIX FREELDR?!?!?! + // FREELDR SENDS US AN ***INVALID*** HAL PE HEADER!!! + // WE READ IT IN LdrInitModuleManagement ABOVE!!! + // WE SET .SizeOfImage TO A *GARBAGE* VALUE!!! + // + // This dirty hack fixes it, and should make symbol lookup work too. + // + HalModuleObject.SizeOfImage = RtlImageNtHeader((PVOID)HalModuleObject.DllBase)->OptionalHeader.SizeOfImage; + /* Increase the last kernel address with the size of HAL */ LastKernelAddress += PAGE_ROUND_UP(DriverSize);

1 0

[hpoussin] 23792: Implement RegNtPreEnumerateValueKey/RegNtPostEnumerateValueKey registry callbacks. Add missing callbacks in some paths Fix a few typos
by hpoussin＠svn.reactos.org 29 Aug '06

29 Aug '06

Author: hpoussin Date: Wed Aug 30 03:01:52 2006 New Revision: 23792 URL: http://svn.reactos.org/svn/reactos?rev=23792&view=rev Log: Implement RegNtPreEnumerateValueKey/RegNtPostEnumerateValueKey registry callbacks. Add missing callbacks in some paths Fix a few typos Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/ntfunc.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/cm/ntfunc.c (original) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c Wed Aug 30 03:01:52 2006 @@ -359,6 +359,9 @@ Status = CmiCallRegisteredCallbacks(RegNtPreCreateKey, &PreCreateKeyInfo); if (!NT_SUCCESS(Status)) { + PostCreateKeyInfo.Object = NULL; + PostCreateKeyInfo.Status = Status; + CmiCallRegisteredCallbacks(RegNtPostCreateKey, &PostCreateKeyInfo); goto Cleanup; } @@ -612,11 +615,11 @@ PostOperationInfo.Object = (PVOID)KeyObject; DeleteKeyInfo.Object = (PVOID)KeyObject; - Status = CmiCallRegisteredCallbacks(RegNtPreSetValueKey, &DeleteKeyInfo); + Status = CmiCallRegisteredCallbacks(RegNtPreDeleteKey, &DeleteKeyInfo); if (!NT_SUCCESS(Status)) { PostOperationInfo.Status = Status; - CmiCallRegisteredCallbacks(RegNtDeleteKey, &PostOperationInfo); + CmiCallRegisteredCallbacks(RegNtPostDeleteKey, &PostOperationInfo); ObDereferenceObject(KeyObject); return Status; } @@ -728,9 +731,11 @@ EnumerateKeyInfo.Length = Length; EnumerateKeyInfo.ResultLength = ResultLength; - Status = CmiCallRegisteredCallbacks(RegNtEnumerateKey, &EnumerateKeyInfo); - if (!NT_SUCCESS(Status)) - { + Status = CmiCallRegisteredCallbacks(RegNtPreEnumerateKey, &EnumerateKeyInfo); + if (!NT_SUCCESS(Status)) + { + PostOperationInfo.Status = Status; + CmiCallRegisteredCallbacks(RegNtPostEnumerateKey, &PostOperationInfo); ObDereferenceObject(KeyObject); return Status; } @@ -752,7 +757,7 @@ ExReleaseResourceLite(&CmiRegistryLock); KeLeaveCriticalRegion(); PostOperationInfo.Status = STATUS_NO_MORE_ENTRIES; - CmiCallRegisteredCallbacks(RegNtPostDeleteKey, &PostOperationInfo); + CmiCallRegisteredCallbacks(RegNtPostEnumerateKey, &PostOperationInfo); ObDereferenceObject(KeyObject); DPRINT("No more volatile entries\n"); return STATUS_NO_MORE_ENTRIES; @@ -990,6 +995,8 @@ PCM_KEY_VALUE ValueCell; PVOID DataCell; ULONG NameSize, DataSize; + REG_ENUMERATE_VALUE_KEY_INFORMATION EnumerateValueKeyInfo; + REG_POST_OPERATION_INFORMATION PostOperationInfo; PKEY_VALUE_BASIC_INFORMATION ValueBasicInformation; PKEY_VALUE_PARTIAL_INFORMATION ValuePartialInformation; PKEY_VALUE_FULL_INFORMATION ValueFullInformation; @@ -1017,6 +1024,23 @@ return Status; } + PostOperationInfo.Object = (PVOID)KeyObject; + EnumerateValueKeyInfo.Object = (PVOID)KeyObject; + EnumerateValueKeyInfo.Index = Index; + EnumerateValueKeyInfo.KeyValueInformationClass = KeyValueInformationClass; + EnumerateValueKeyInfo.KeyValueInformation = KeyValueInformation; + EnumerateValueKeyInfo.Length = Length; + EnumerateValueKeyInfo.ResultLength = ResultLength; + + Status = CmiCallRegisteredCallbacks(RegNtPreEnumerateValueKey, &EnumerateValueKeyInfo); + if (!NT_SUCCESS(Status)) + { + PostOperationInfo.Status = Status; + CmiCallRegisteredCallbacks(RegNtPostEnumerateValueKey, &PostOperationInfo); + ObDereferenceObject(KeyObject); + return Status; + } + /* Acquire hive lock */ KeEnterCriticalRegion(); ExAcquireResourceSharedLite(&CmiRegistryLock, TRUE); @@ -1038,6 +1062,8 @@ ExReleaseResourceLite(&CmiRegistryLock); KeLeaveCriticalRegion(); ObDereferenceObject(KeyObject); + PostOperationInfo.Status = Status; + CmiCallRegisteredCallbacks(RegNtPostEnumerateValueKey, &PostOperationInfo); return Status; } @@ -1217,6 +1243,8 @@ ExReleaseResourceLite(&CmiRegistryLock); KeLeaveCriticalRegion(); ObDereferenceObject(KeyObject); + PostOperationInfo.Status = Status; + CmiCallRegisteredCallbacks(RegNtPostEnumerateValueKey, &PostOperationInfo); return Status; } @@ -1351,6 +1379,9 @@ Status = CmiCallRegisteredCallbacks(RegNtPreOpenKey, &PreOpenKeyInfo); if (!NT_SUCCESS(Status)) { + PostOpenKeyInfo.Object = NULL; + PostOpenKeyInfo.Status = Status; + CmiCallRegisteredCallbacks (RegNtPostOpenKey, &PostOpenKeyInfo); ObpReleaseCapturedAttributes(&ObjectCreateInfo); if (ObjectName.Buffer) ObpReleaseCapturedName(&ObjectName); return Status; @@ -1475,9 +1506,11 @@ QueryKeyInfo.Length = Length; QueryKeyInfo.ResultLength = ResultLength; - Status = CmiCallRegisteredCallbacks(RegNtQueryKey, &QueryKeyInfo); - if (!NT_SUCCESS(Status)) - { + Status = CmiCallRegisteredCallbacks(RegNtPreQueryKey, &QueryKeyInfo); + if (!NT_SUCCESS(Status)) + { + PostOperationInfo.Status = Status; + CmiCallRegisteredCallbacks(RegNtPostQueryKey, &PostOperationInfo); ObDereferenceObject(KeyObject); return Status; } @@ -1704,6 +1737,8 @@ Status = CmiCallRegisteredCallbacks(RegNtPreQueryValueKey, &QueryValueKeyInfo); if (!NT_SUCCESS(Status)) { + PostOperationInfo.Status = Status; + CmiCallRegisteredCallbacks(RegNtPostQueryValueKey, &PostOperationInfo); ObDereferenceObject(KeyObject); return Status; } @@ -1962,6 +1997,8 @@ Status = CmiCallRegisteredCallbacks(RegNtPreSetValueKey, &SetValueKeyInfo); if (!NT_SUCCESS(Status)) { + PostOperationInfo.Status = Status; + CmiCallRegisteredCallbacks(RegNtPostSetValueKey, &PostOperationInfo); ObDereferenceObject(KeyObject); return Status; } @@ -2141,6 +2178,9 @@ Status = CmiCallRegisteredCallbacks(RegNtPreDeleteValueKey, &DeleteValueKeyInfo); if (!NT_SUCCESS(Status)) { + PostOperationInfo.Object = (PVOID)KeyObject; + PostOperationInfo.Status = Status; + CmiCallRegisteredCallbacks(RegNtPostDeleteValueKey, &PostOperationInfo); ReleaseCapturedUnicodeString(&CapturedValueName, PreviousMode); Fail: @@ -2411,6 +2451,8 @@ Status = CmiCallRegisteredCallbacks(RegNtPreQueryMultipleValueKey, &QueryMultipleValueKeyInfo); if (!NT_SUCCESS(Status)) { + PostOperationInfo.Status = Status; + CmiCallRegisteredCallbacks(RegNtPostQueryMultipleValueKey, &PostOperationInfo); ObDereferenceObject(KeyObject); return Status; } @@ -2658,9 +2700,11 @@ SetInformationKeyInfo.KeySetInformation = KeyInformation; SetInformationKeyInfo.KeySetInformationLength = KeyInformationLength; - Status = CmiCallRegisteredCallbacks(RegNtSetInformationKey, &SetInformationKeyInfo); - if (!NT_SUCCESS(Status)) - { + Status = CmiCallRegisteredCallbacks(RegNtPreSetInformationKey, &SetInformationKeyInfo); + if (!NT_SUCCESS(Status)) + { + PostOperationInfo.Status = Status; + CmiCallRegisteredCallbacks(RegNtPostSetInformationKey, &PostOperationInfo); ObDereferenceObject (KeyObject); return Status; }

1 0

[turner] 23791: Better rand() implementation. This should fix the problem where you get 0 every time you use rand()
by turner＠svn.reactos.org 29 Aug '06

29 Aug '06

Author: turner Date: Wed Aug 30 02:27:48 2006 New Revision: 23791 URL: http://svn.reactos.org/svn/reactos?rev=23791&view=rev Log: Better rand() implementation. This should fix the problem where you get 0 every time you use rand() Modified: trunk/reactos/lib/crt/misc/tls.c trunk/reactos/lib/crt/stdlib/rand.c Modified: trunk/reactos/lib/crt/misc/tls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/crt/misc/tls.c?rev=237… ============================================================================== --- trunk/reactos/lib/crt/misc/tls.c (original) +++ trunk/reactos/lib/crt/misc/tls.c Wed Aug 30 02:27:48 2006 @@ -13,6 +13,8 @@ ThreadData->tdoserrno = 0; ThreadData->fpecode = 0; + + ThreadData->tnext = 1; /* FIXME: init more thread local data */ Modified: trunk/reactos/lib/crt/stdlib/rand.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/crt/stdlib/rand.c?rev=… ============================================================================== --- trunk/reactos/lib/crt/stdlib/rand.c (original) +++ trunk/reactos/lib/crt/stdlib/rand.c Wed Aug 30 02:27:48 2006 @@ -11,7 +11,7 @@ { PTHREADDATA ThreadData = GetThreadData(); - ThreadData->tnext = ThreadData->tnext * 0x5deece66dLL + 11; + ThreadData->tnext = ThreadData->tnext * 0x5deece66dLL + 2531011; return (int)((ThreadData->tnext >> 16) & RAND_MAX); }

1 0

[greatlrd] 23790: found more inline asm. 1. move all inline asm to folder i386 2. to do : seh.s should be rewrites to intel syntax 3. to do : almost all c files in folders i386 need be convert to true asm instead using inline asm 4. add dection for x86 arch in rbuild for each found I have done
by greatlrd＠svn.reactos.org 29 Aug '06

29 Aug '06

Author: greatlrd Date: Tue Aug 29 23:14:18 2006 New Revision: 23790 URL: http://svn.reactos.org/svn/reactos?rev=23790&view=rev Log: found more inline asm. 1. move all inline asm to folder i386 2. to do : seh.s should be rewrites to intel syntax 3. to do : almost all c files in folders i386 need be convert to true asm instead using inline asm 4. add dection for x86 arch in rbuild for each found I have done Added: trunk/reactos/lib/crt/except/i386/ trunk/reactos/lib/crt/except/i386/seh.s - copied unchanged from r23781, trunk/reactos/lib/crt/except/seh.s trunk/reactos/lib/crt/except/i386/unwind.c - copied unchanged from r23788, trunk/reactos/lib/crt/except/unwind.c trunk/reactos/lib/crt/float/i386/ trunk/reactos/lib/crt/float/i386/clearfp.c - copied unchanged from r23781, trunk/reactos/lib/crt/float/clearfp.c trunk/reactos/lib/crt/float/i386/cntrlfp.c - copied unchanged from r23781, trunk/reactos/lib/crt/float/cntrlfp.c trunk/reactos/lib/crt/float/i386/logb.c - copied unchanged from r23781, trunk/reactos/lib/crt/float/logb.c trunk/reactos/lib/crt/float/i386/statfp.c - copied unchanged from r23781, trunk/reactos/lib/crt/float/statfp.c trunk/reactos/lib/crt/math/i386/atan2.c - copied unchanged from r23784, trunk/reactos/lib/crt/math/atan2.c trunk/reactos/lib/crt/math/i386/exp.c - copied unchanged from r23784, trunk/reactos/lib/crt/math/exp.c trunk/reactos/lib/crt/math/i386/fmod.c - copied unchanged from r23784, trunk/reactos/lib/crt/math/fmod.c trunk/reactos/lib/crt/math/i386/ldexp.c - copied unchanged from r23784, trunk/reactos/lib/crt/math/ldexp.c Removed: trunk/reactos/lib/crt/except/seh.s trunk/reactos/lib/crt/except/unwind.c trunk/reactos/lib/crt/float/clearfp.c trunk/reactos/lib/crt/float/cntrlfp.c trunk/reactos/lib/crt/float/logb.c trunk/reactos/lib/crt/float/statfp.c trunk/reactos/lib/crt/math/atan2.c trunk/reactos/lib/crt/math/exp.c trunk/reactos/lib/crt/math/fmod.c trunk/reactos/lib/crt/math/ldexp.c Modified: trunk/reactos/lib/crt/crt.rbuild Modified: trunk/reactos/lib/crt/crt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/crt/crt.rbuild?rev=237… ============================================================================== --- trunk/reactos/lib/crt/crt.rbuild (original) +++ trunk/reactos/lib/crt/crt.rbuild Tue Aug 29 23:14:18 2006 @@ -41,23 +41,32 @@ <file>abnorter.c</file> <file>exhand2.c</file> <file>matherr.c</file> - <file>seh.s</file> - <file>unwind.c</file> + <if property="ARCH" value="i386"> + <directory name="i386"> + <file>seh.s</file> + <file>unwind.c</file> + </directory> + </if> <file>xcptfil.c</file> </directory> <directory name="float"> - <file>chgsign.c</file> - <file>clearfp.c</file> - <file>cntrlfp.c</file> + <file>chgsign.c</file> <file>copysign.c</file> <file>fpclass.c</file> <file>fpecode.c</file> <file>fpreset.c</file> <file>isnan.c</file> - <file>logb.c</file> <file>nafter.c</file> <file>scalb.c</file> - <file>statfp.c</file> + + <if property="ARCH" value="i386"> + <directory name="i386"> + <file>clearfp.c</file> + <file>cntrlfp.c</file> + <file>logb.c</file> + <file>statfp.c</file> + </directory> + </if> </directory> <directory name="io"> <file>access.c</file> @@ -121,13 +130,12 @@ <file>tanh.c</file> <file>pow_asm.c</file> - <if property="ARCH" value="i386"> - <file>atan2.c</file> - <file>exp.c</file> - <file>fmod.c</file> - <file>ldexp.c</file> - + <if property="ARCH" value="i386"> <directory name="i386"> + <file>atan2.c</file> + <file>exp.c</file> + <file>fmod.c</file> + <file>ldexp.c</file> <file>atan_asm.s</file> <file>pow_asm.s</file> <file>log10_asm.s</file> Removed: trunk/reactos/lib/crt/except/seh.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/crt/except/seh.s?rev=2… ============================================================================== --- trunk/reactos/lib/crt/except/seh.s (original) +++ trunk/reactos/lib/crt/except/seh.s (removed) @@ -1,380 +1,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS MSVCRT Runtime Library - * PURPOSE: Runtime library exception support for IA-32 - * FILE: lib/msvcrt/except/seh.s - * PROGRAMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) - * NOTES: This file is shared with ntoskrnl/rtl/i386/seh.s. - * Please keep them in sync. - */ - -#define ExceptionContinueExecution 0 -#define ExceptionContinueSearch 1 -#define ExceptionNestedException 2 -#define ExceptionCollidedUnwind 3 - -#define EXCEPTION_NONCONTINUABLE 0x01 -#define EXCEPTION_UNWINDING 0x02 -#define EXCEPTION_EXIT_UNWIND 0x04 -#define EXCEPTION_STACK_INVALID 0x08 -#define EXCEPTION_NESTED_CALL 0x10 -#define EXCEPTION_TARGET_UNWIND 0x20 -#define EXCEPTION_COLLIDED_UNWIND 0x40 - -#define EXCEPTION_UNWIND_MODE \ -( EXCEPTION_UNWINDING \ - | EXCEPTION_EXIT_UNWIND \ - | EXCEPTION_TARGET_UNWIND \ - | EXCEPTION_COLLIDED_UNWIND) - -#define EREC_CODE 0x00 -#define EREC_FLAGS 0x04 -#define EREC_RECORD 0x08 -#define EREC_ADDRESS 0x0C -#define EREC_NUMPARAMS 0x10 -#define EREC_INFO 0x14 - -#define TRYLEVEL_NONE -1 -#define TRYLEVEL_INVALID -2 - -#define ER_STANDARDESP -0x08 -#define ER_EPOINTERS -0x04 -#define ER_PREVFRAME 0x00 -#define ER_HANDLER 0x04 -#define ER_SCOPETABLE 0x08 -#define ER_TRYLEVEL 0x0C -#define ER_EBP 0x10 - -#define ST_TRYLEVEL 0x00 -#define ST_FILTER 0x04 -#define ST_HANDLER 0x08 - -#define CONTEXT_EDI 0x9C -#define CONTEXT_EBX 0xA4 -#define CONTEXT_EIP 0xB8 - -.globl __local_unwind2 -.globl __except_handler3 -.globl __EH_prolog - -// EAX = value to print -_do_debug: - pushal - pushl %eax - call _MsvcrtDebug@4 - popal - ret - -#define LU2_TRYLEVEL 0x08 -#define LU2_REGFRAME 0x04 - -// -// void -// _local_unwind2(PEXCEPTION_REGISTRATION RegistrationFrame, -// LONG TryLevel) -// -// Parameters: -// [EDX+08h] - PEXCEPTION_REGISTRATION RegistrationFrame -// [EDX+04h] - LONG TryLevel -// Registers: -// EBP - EBP of call frame we are unwinding -// Returns: -// Nothing -// Notes: -// Run all termination handlers for a call frame from the current -// try-level up to (but not including) the given stop try-level. -__local_unwind2: - // Setup our call frame so we can access parameters using EDX - //pushl %ebp - movl %esp, %edx - - // FIXME: Setup an EXCEPTION_REGISTRATION entry to protect the - // unwinding in case something goes wrong - -.lu2_next_scope: - - // Keep a pointer to the exception registration in EBX - movl LU2_REGFRAME(%edx), %ebx - - // If we have reached the end of the chain or we're asked to stop here - // by the caller then exit - test %ebx, %ebx - je .lu2_done - - movl ER_TRYLEVEL(%ebx), %eax - cmpl $-1, %eax - je .lu2_done - - cmpl LU2_TRYLEVEL(%edx), %eax - je .lu2_done - - // Keep a pointer to the scopetable in ESI - movl ER_SCOPETABLE(%ebx), %esi - - // Compute the offset of the entry in the scopetable that describes - // the scope that is to be unwound. Put the offset in EDI. - movl ST_TRYLEVEL(%esi), %edi - lea (%edi, %edi, 2), %edi - shll $2, %edi - addl %esi, %edi - - // If this is not a termination handler then skip it - cmpl $0, ST_FILTER(%edi) - jne .lu2_next_scope - - // Save the previous try-level in the exception registration structure - movl ST_TRYLEVEL(%edi), %eax - movl %eax, ER_TRYLEVEL(%ebx) - - // Fetch the address of the termination handler - movl ST_HANDLER(%edi), %eax - - // Termination handlers may trash all registers so save the - // important ones and then call the handler - pushl %edx - call *%eax - - // Get our base pointer back - popl %edx - - jmp .lu2_next_scope - -.lu2_done: - - // FIXME: Tear down the EXCEPTION_REGISTRATION entry setup to protect - // the unwinding - - //movl %esi, %esp - //popl %ebp - ret - -#define EH3_DISPCONTEXT 0x14 -#define EH3_CONTEXT 0x10 -#define EH3_REGFRAME 0x0C -#define EH3_ERECORD 0x08 - -// Parameters: -// [ESP+14h] - PVOID DispatcherContext -// [ESP+10h] - PCONTEXT Context -// [ESP+0Ch] - PEXCEPTION_REGISTRATION RegistrationFrame -// [ESP+08h] - PEXCEPTION_RECORD ExceptionRecord -// Registers: -// Unknown -// Returns: -// EXCEPTION_DISPOSITION - How this handler handled the exception -// Notes: -// Try to find an exception handler that will handle the exception. -// Traverse the entries in the scopetable that is associated with the -// exception registration passed as a parameter to this function. -// If an exception handler that will handle the exception is found, it -// is called and this function never returns -__except_handler3: - // Setup our call frame so we can access parameters using EBP - pushl %ebp // Standard ESP in frame (considered part of EXCEPTION_REGISTRATION) - movl %esp, %ebp - - // Don't trust the direction flag to be cleared - cld - - // Either we're called to handle an exception or we're called to unwind - movl EH3_ERECORD(%ebp), %eax - testl $EXCEPTION_UNWIND_MODE, EREC_FLAGS(%eax) - jnz .eh3_unwind - - // Keep a pointer to the exception registration in EBX - movl EH3_REGFRAME(%ebp), %ebx - - // Build an EXCEPTION_POINTERS structure on the stack and store it's - // address in the EXCEPTION_REGISTRATION structure - movl EH3_CONTEXT(%esp), %eax - pushl %ebx // Registration frame - pushl %eax // Context - movl %esp, ER_EPOINTERS(%ebx) // Pointer to EXCEPTION_REGISTRATION on the stack - - // Keep current try-level in EDI - movl ER_TRYLEVEL(%ebx), %edi - - // Keep a pointer to the scopetable in ESI - movl ER_SCOPETABLE(%ebx), %esi - -.eh3_next_scope: - - // If we have reached the end of the chain then exit - cmpl $-1, %edi - je .eh3_search - - // Compute the offset of the entry in the scopetable and store - // the absolute address in EAX - lea (%edi, %edi, 2), %eax - shll $2, %eax - addl %esi, %eax - - // Fetch the address of the filter routine - movl ST_FILTER(%eax), %eax - - // If this is a termination handler then skip it - cmpl $0, %eax - je .eh3_continue - - // Filter routines may trash all registers so save the important - // ones before restoring the call frame ebp and calling the handler - pushl %ebp - pushl %edi // Stop try-level - lea ER_EBP(%ebx), %ebp - call *%eax - popl %edi // Stop try-level - popl %ebp - - // Reload EBX with registration frame address - movl EH3_REGFRAME(%ebp), %ebx - - // Be more flexible here by checking if the return value is less than - // zero, equal to zero, or larger than zero instead of the defined - // values: - // -1 (EXCEPTION_CONTINUE_EXECUTION) - // 0 (EXCEPTION_CONTINUE_SEARCH) - // +1 (EXCEPTION_EXECUTE_HANDLER) - orl %eax, %eax - jz .eh3_continue - js .eh3_dismiss - - // Filter returned: EXCEPTION_EXECUTE_HANDLER - - // Ask the OS to perform global unwinding. - pushl %edi // Save stop try-level - pushl %ebx // Save registration frame address - pushl %ebx // Registration frame address - call __global_unwind2 - popl %eax // Remove parameter to __global_unwind2 - popl %ebx // Restore registration frame address - popl %edi // Restore stop try-level - - // Change the context structure so _except_finish is called in the - // correct context since we return ExceptionContinueExecution. - movl EH3_CONTEXT(%ebp), %eax - - movl %edi, CONTEXT_EDI(%eax) // Stop try-level - movl %ebx, CONTEXT_EBX(%eax) // Registration frame address - movl $_except_finish, CONTEXT_EIP(%eax) - - movl $ExceptionContinueExecution, %eax - jmp .eh3_return - - // Filter returned: EXCEPTION_CONTINUE_SEARCH -.eh3_continue: - - // Reload ESI because the filter routine may have trashed it - movl ER_SCOPETABLE(%ebx), %esi - - // Go one try-level closer to the top - lea (%edi, %edi, 2), %edi - shll $2, %edi - addl %esi, %edi - movl ST_TRYLEVEL(%edi), %edi - - jmp .eh3_next_scope - - // Filter returned: EXCEPTION_CONTINUE_EXECUTION - // Continue execution like nothing happened -.eh3_dismiss: - movl $ExceptionContinueExecution, %eax - jmp .eh3_return - - // Tell the OS to search for another handler that will handle the exception -.eh3_search: - - movl $ExceptionContinueSearch, %eax - jmp .eh3_return - - // Perform local unwinding -.eh3_unwind: - - testl $EXCEPTION_TARGET_UNWIND, EREC_FLAGS(%eax) - jnz .eh3_return - - // Save some important registers - pushl %ebp - - lea ER_EBP(%ebx), %ebp - pushl $-1 - pushl %ebx - call __local_unwind2 - addl $8, %esp - - // Restore some important registers - popl %ebp - - movl $ExceptionContinueSearch, %eax - - // Get me out of here -.eh3_return: - - movl %ebp, %esp - popl %ebp - ret - -// Parameters: -// None -// Registers: -// EBX - Pointer to exception registration structure -// EDI - Stop try-level -// Returns: -// - -// Notes: -// - -_except_finish: - - // Setup EBP for the exception handler. By doing this the exception - // handler can access local variables as normal - lea ER_EBP(%ebx), %ebp - - // Save some important registers - pushl %ebp - pushl %ebx - pushl %edi - - // Stop try-level - pushl %edi - - // Pointer to exception registration structure - pushl %ebx - call __local_unwind2 - addl $8, %esp - - // Restore some important registers - popl %edi - popl %ebx - popl %ebp - - // Keep a pointer to the scopetable in ESI - movl ER_SCOPETABLE(%ebx), %esi - - // Compute the offset of the entry in the scopetable and store - // the absolute address in EDI - lea (%edi, %edi, 2), %edi - shll $2, %edi - addl %esi, %edi - - // Set the current try-level to the previous try-level and call - // the exception handler - movl ST_TRYLEVEL(%edi), %eax - movl %eax, ER_TRYLEVEL(%ebx) - movl ST_HANDLER(%edi), %eax - - call *%eax - - // We should never get here - ret - -// Copied from Wine. -__EH_prolog: - pushl $-1 - pushl %eax - pushl %fs:0 - movl %esp, %fs:0 - movl 12(%esp), %eax - movl %ebp, 12(%esp) - leal 12(%esp), %ebp - pushl %eax - ret Removed: trunk/reactos/lib/crt/except/unwind.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/crt/except/unwind.c?re… ============================================================================== --- trunk/reactos/lib/crt/except/unwind.c (original) +++ trunk/reactos/lib/crt/except/unwind.c (removed) @@ -1,72 +1,0 @@ -#define WIN32_NO_STATUS -#include <precomp.h> -#include <windows.h> -#define NTOS_MODE_USER -#include <ndk/umtypes.h> -#include <ndk/extypes.h> -#include <ndk/rtlfuncs.h> - -/* - * @implemented - */ -void __cdecl -_global_unwind2(PEXCEPTION_REGISTRATION_RECORD RegistrationFrame) -{ -#ifdef __GNUC__ - RtlUnwind(RegistrationFrame, &&__ret_label, NULL, 0); -__ret_label: - // return is important - return; -#else -#endif -} - - -/* VC++ extensions to Win32 SEH */ -typedef struct _SCOPETABLE -{ - int previousTryLevel; - int (*lpfnFilter)(PEXCEPTION_POINTERS); - int (*lpfnHandler)(void); -} SCOPETABLE, *PSCOPETABLE; - -typedef struct _MSVCRT_EXCEPTION_FRAME -{ - PEXCEPTION_REGISTRATION_RECORD *prev; - void (*handler)(PEXCEPTION_RECORD, PEXCEPTION_REGISTRATION_RECORD, - PCONTEXT, PEXCEPTION_RECORD); - PSCOPETABLE scopetable; - int trylevel; - int _ebp; - PEXCEPTION_POINTERS xpointers; -} MSVCRT_EXCEPTION_FRAME; - - -typedef struct __JUMP_BUFFER -{ - unsigned long Ebp; - unsigned long Ebx; - unsigned long Edi; - unsigned long Esi; - unsigned long Esp; - unsigned long Eip; - unsigned long Registration; - unsigned long TryLevel; - /* Start of new struct members */ - unsigned long Cookie; - unsigned long UnwindFunc; - unsigned long UnwindData[6]; -} _JUMP_BUFFER; - -void -_local_unwind2(MSVCRT_EXCEPTION_FRAME *RegistrationFrame, - LONG TryLevel); - -/* - * @implemented -*/ - -void __stdcall _seh_longjmp_unwind(_JUMP_BUFFER *jmp) -{ - _local_unwind2((MSVCRT_EXCEPTION_FRAME*) jmp->Registration, jmp->TryLevel); -} Removed: trunk/reactos/lib/crt/float/clearfp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/crt/float/clearfp.c?re… ============================================================================== --- trunk/reactos/lib/crt/float/clearfp.c (original) +++ trunk/reactos/lib/crt/float/clearfp.c (removed) @@ -1,29 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * FILE: lib/crt/?????? - * PURPOSE: Unknown - * PROGRAMER: Unknown - * UPDATE HISTORY: - * 25/11/05: Added license header - */ - -#include <precomp.h> - -unsigned int _statusfp( void ); - -/* - * @implemented - */ -unsigned int _clearfp (void) -{ - unsigned short __res = _statusfp(); -#ifdef __GNUC__ -__asm__ __volatile__ ( - "fclex \n\t" - ); -#else -#endif /*__GNUC__*/ - return __res; -} - Removed: trunk/reactos/lib/crt/float/cntrlfp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/crt/float/cntrlfp.c?re… ============================================================================== --- trunk/reactos/lib/crt/float/cntrlfp.c (original) +++ trunk/reactos/lib/crt/float/cntrlfp.c (removed) @@ -1,174 +1,0 @@ -/* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ - -#include <precomp.h> - -#define X87_CW_IM (1<<0) /* Invalid operation mask */ -#define X87_CW_DM (1<<1) /* Denormal operand mask */ -#define X87_CW_ZM (1<<2) /* Zero divide mask */ -#define X87_CW_OM (1<<3) /* Overflow mask */ -#define X87_CW_UM (1<<4) /* Underflow mask */ -#define X87_CW_PM (1<<5) /* Precision mask */ - -#define X87_CW_PC_MASK (3<<8) /* precision control mask */ -#define X87_CW_PC24 (0<<8) /* 24 bit precision */ -#define X87_CW_PC53 (2<<8) /* 53 bit precision */ -#define X87_CW_PC64 (3<<8) /* 64 bit precision */ - -#define X87_CW_RC_MASK (3<<10) /* rounding control mask */ -#define X87_CW_RC_NEAREST (0<<10) /* round to nearest */ -#define X87_CW_RC_DOWN (1<<10) /* round down */ -#define X87_CW_RC_UP (2<<10) /* round up */ -#define X87_CW_RC_ZERO (3<<10) /* round toward zero (chop) */ - -#define X87_CW_IC (1<<12) /* infinity control flag */ - -/* - * @implemented - */ -unsigned int _controlfp(unsigned int unNew, unsigned int unMask) -{ - return _control87(unNew,unMask); -} - -/* - * @implemented - */ -unsigned int _control87(unsigned int unNew, unsigned int unMask) -{ - unsigned int FpuCw; - unsigned int DummyCw = 0; - - /* get the controlword */ - asm volatile("fstcw %0\n\t" : "=m"(FpuCw)); - FpuCw &= 0x0000ffff; - - /* translate it into _control87 format */ - if (FpuCw & X87_CW_IM) - DummyCw |= _EM_INVALID; - if (FpuCw & X87_CW_DM) - DummyCw |= _EM_DENORMAL; - if (FpuCw & X87_CW_ZM) - DummyCw |= _EM_ZERODIVIDE; - if (FpuCw & X87_CW_OM) - DummyCw |= _EM_OVERFLOW; - if (FpuCw & X87_CW_UM) - DummyCw |= _EM_UNDERFLOW; - if (FpuCw & X87_CW_PM) - DummyCw |= _EM_INEXACT; - - switch (FpuCw & X87_CW_PC_MASK) - { - case X87_CW_PC24: - DummyCw |= _PC_24; - break; - case X87_CW_PC53: - DummyCw |= _PC_53; - break; - case X87_CW_PC64: - DummyCw |= _PC_64; - break; - } - - switch (FpuCw & X87_CW_RC_MASK) - { - case X87_CW_RC_NEAREST: - DummyCw |= _RC_NEAR; - break; - case X87_CW_RC_DOWN: - DummyCw |= _RC_DOWN; - break; - case X87_CW_RC_UP: - DummyCw |= _RC_UP; - break; - case X87_CW_RC_ZERO: - DummyCw |= _RC_CHOP; - break; - } - - /* unset (un)masked bits */ - DummyCw &= ~unMask; - unNew &= unMask; - - /* set new bits */ - DummyCw |= unNew; - - /* translate back into x87 format - * FIXME: translate infinity control! - */ - FpuCw = 0; - if (DummyCw & _EM_INVALID) - FpuCw |= X87_CW_IM; - if (DummyCw & _EM_DENORMAL) - FpuCw |= X87_CW_DM; - if (DummyCw & _EM_ZERODIVIDE) - FpuCw |= X87_CW_ZM; - if (DummyCw & _EM_OVERFLOW) - FpuCw |= X87_CW_OM; - if (DummyCw & _EM_UNDERFLOW) - FpuCw |= X87_CW_UM; - if (DummyCw & _EM_INEXACT) - FpuCw |= X87_CW_PM; - - switch (DummyCw & _MCW_PC) - { - case _PC_24: - FpuCw |= X87_CW_PC24; - break; - case _PC_53: - FpuCw |= X87_CW_PC53; - break; - case _PC_64: - default: - FpuCw |= X87_CW_PC64; - break; - } - - switch (DummyCw & _MCW_RC) - { - case _RC_NEAR: - FpuCw |= X87_CW_RC_NEAREST; - break; - case _RC_DOWN: - FpuCw |= X87_CW_RC_DOWN; - break; - case _RC_UP: - FpuCw |= X87_CW_RC_UP; - break; - case _RC_CHOP: - FpuCw |= X87_CW_RC_ZERO; - break; - } - - /* set controlword */ - asm volatile("fldcw %0" : : "m"(FpuCw)); - - return DummyCw; - -#if 0 /* The follwing is the original code, broken I think! -blight */ -register unsigned int __res; -#ifdef __GNUC__ -__asm__ __volatile__ ( - "pushl %%eax \n\t" /* make room on stack */ - "fstcw (%%esp) \n\t" - "fwait \n\t" - "popl %%eax \n\t" - "andl $0xffff, %%eax \n\t" /* OK; we have the old value ready */ - - "movl %1, %%ecx \n\t" - "notl %%ecx \n\t" - "andl %%eax, %%ecx \n\t" /* the bits we want to keep */ - - "movl %2, %%edx \n\t" - "andl %1, %%edx \n\t" /* the bits we want to change */ - - "orl %%ecx, %%edx\n\t" /* the new value */ - "pushl %%edx \n\t" - "fldcw (%%esp) \n\t" - "popl %%edx \n\t" - - :"=a" (__res):"r" (unNew),"r" (unMask): "dx", "cx"); -#else -#endif /*__GNUC__*/ - return __res; -#endif -} Removed: trunk/reactos/lib/crt/float/logb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/crt/float/logb.c?rev=2… ============================================================================== --- trunk/reactos/lib/crt/float/logb.c (original) +++ trunk/reactos/lib/crt/float/logb.c (removed) @@ -1,34 +1,0 @@ -/* Math functions for i387. - Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by John C. Bowman <bowman(a)ipp-garching.mpg.de>, 1995. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -#include <precomp.h> - -double _logb (double __x) -{ - register double __val; -#ifdef __GNUC__ - register double __junk; - __asm __volatile__ - ("fxtract\n\t" - : "=t" (__junk), "=u" (__val) : "0" (__x)); -#else -#endif /*__GNUC__*/ - return __val; -} Removed: trunk/reactos/lib/crt/float/statfp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/crt/float/statfp.c?rev… ============================================================================== --- trunk/reactos/lib/crt/float/statfp.c (original) +++ trunk/reactos/lib/crt/float/statfp.c (removed) @@ -1,29 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * FILE: lib/crt/?????? - * PURPOSE: Unknown - * PROGRAMER: Unknown - * UPDATE HISTORY: - * 25/11/05: Added license header - */ - -#include <precomp.h> - -/* - * @implemented - */ -unsigned int _statusfp (void) -{ - -register unsigned short __res; -#ifdef __GNUC__ -__asm__ __volatile__ ( - "fstsw %0 \n\t" -// "movzwl %ax, %eax" - :"=a" (__res) - ); -#else -#endif /*__GNUC__*/ - return __res; -} Removed: trunk/reactos/lib/crt/math/atan2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/crt/math/atan2.c?rev=2… ============================================================================== --- trunk/reactos/lib/crt/math/atan2.c (original) +++ trunk/reactos/lib/crt/math/atan2.c (removed) @@ -1,21 +1,0 @@ - -#include <math.h> - -double atan2 (double __y, double __x); - -/* - * @implemented - */ -double atan2 (double __y, double __x) -{ - register double __val; -#ifdef __GNUC__ - __asm __volatile__ - ("fpatan\n\t" - "fld %%st(0)" - : "=t" (__val) : "0" (__x), "u" (__y)); -#else - __val = linkme_atan2(__x, __y); -#endif /*__GNUC__*/ - return __val; -} Removed: trunk/reactos/lib/crt/math/exp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/crt/math/exp.c?rev=237… ============================================================================== --- trunk/reactos/lib/crt/math/exp.c (original) +++ trunk/reactos/lib/crt/math/exp.c (removed) @@ -1,47 +1,0 @@ -/* Math functions for i387. - Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by John C. Bowman <bowman(a)ipp-garching.mpg.de>, 1995. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -#include <math.h> - -double exp (double __x); - -double exp (double __x) -{ -#ifdef __GNUC__ - register double __value, __exponent; - __asm __volatile__ - ("fldl2e # e^x = 2^(x * log2(e))\n\t" - "fmul %%st(1) # x * log2(e)\n\t" - "fst %%st(1)\n\t" - "frndint # int(x * log2(e))\n\t" - "fxch\n\t" - "fsub %%st(1) # fract(x * log2(e))\n\t" - "f2xm1 # 2^(fract(x * log2(e))) - 1\n\t" - : "=t" (__value), "=u" (__exponent) : "0" (__x)); - __value += 1.0; - __asm __volatile__ - ("fscale" - : "=t" (__value) : "0" (__value), "u" (__exponent)); - - return __value; -#else - return linkme_exp(__x); -#endif /*__GNUC__*/ -} Removed: trunk/reactos/lib/crt/math/fmod.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/crt/math/fmod.c?rev=23… ============================================================================== --- trunk/reactos/lib/crt/math/fmod.c (original) +++ trunk/reactos/lib/crt/math/fmod.c (removed) @@ -1,39 +1,0 @@ -/* Math functions for i387. - Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by John C. Bowman <bowman(a)ipp-garching.mpg.de>, 1995. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -#include <math.h> - -double fmod (double __x, double __y); - -double fmod (double __x, double __y) -{ - register double __val; -#ifdef __GNUC__ - __asm __volatile__ - ("1: fprem\n\t" - "fstsw %%ax\n\t" - "sahf\n\t" - "jp 1b" - : "=t" (__val) : "0" (__x), "u" (__y) : "ax", "cc"); -#else - __val = linkme_fmod(__x, __y); -#endif /*__GNUC__*/ - return __val; -} Removed: trunk/reactos/lib/crt/math/ldexp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/crt/math/ldexp.c?rev=2… ============================================================================== --- trunk/reactos/lib/crt/math/ldexp.c (original) +++ trunk/reactos/lib/crt/math/ldexp.c (removed) @@ -1,36 +1,0 @@ -/* Math functions for i387. - Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by John C. Bowman <bowman(a)ipp-garching.mpg.de>, 1995. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -#include <math.h> - -double ldexp (double __x, int __y); - -double ldexp (double __x, int __y) -{ - register double __val; -#ifdef __GNUC__ - __asm __volatile__ - ("fscale" - : "=t" (__val) : "0" (__x), "u" ((double) __y)); -#else - __val = linkme_ldexp(__x, __y); -#endif /*__GNUC__*/ - return __val; -}

1 0

[greatlrd] 23789: Audult : code is from djgpp most of it, ReactOS own code is like two line long
by greatlrd＠svn.reactos.org 29 Aug '06

29 Aug '06

Author: greatlrd Date: Tue Aug 29 23:10:12 2006 New Revision: 23789 URL: http://svn.reactos.org/svn/reactos?rev=23789&view=rev Log: Audult : code is from djgpp most of it, ReactOS own code is like two line long Modified: trunk/reactos/lib/crt/float/chgsign.c (props changed) trunk/reactos/lib/crt/float/clearfp.c (props changed) trunk/reactos/lib/crt/float/cntrlfp.c (props changed) trunk/reactos/lib/crt/float/copysign.c (props changed) trunk/reactos/lib/crt/float/fpclass.c (props changed) trunk/reactos/lib/crt/float/fpecode.c (props changed) trunk/reactos/lib/crt/float/fpreset.c (props changed) trunk/reactos/lib/crt/float/isnan.c (props changed) trunk/reactos/lib/crt/float/logb.c (props changed) trunk/reactos/lib/crt/float/nafter.c (props changed) trunk/reactos/lib/crt/float/scalb.c (props changed) trunk/reactos/lib/crt/float/statfp.c (props changed) Propchange: trunk/reactos/lib/crt/float/chgsign.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/float/clearfp.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/float/cntrlfp.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/float/copysign.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/float/fpclass.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/float/fpecode.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/float/fpreset.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/float/isnan.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/float/logb.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/float/nafter.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/float/scalb.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/float/statfp.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[greatlrd] 23788: [Audut] clean, after locking at the header I can see clear they comes from wine/djgpp with small changes in some headers that is ros specify.
by greatlrd＠svn.reactos.org 29 Aug '06

29 Aug '06

Author: greatlrd Date: Tue Aug 29 22:31:06 2006 New Revision: 23788 URL: http://svn.reactos.org/svn/reactos?rev=23788&view=rev Log: [Audut] clean, after locking at the header I can see clear they comes from wine/djgpp with small changes in some headers that is ros specify. Modified: trunk/reactos/lib/crt/include/internal/atexit.h (props changed) trunk/reactos/lib/crt/include/internal/console.h (props changed) trunk/reactos/lib/crt/include/internal/debug.h (props changed) trunk/reactos/lib/crt/include/internal/file.h (props changed) trunk/reactos/lib/crt/include/internal/ieee.h (props changed) trunk/reactos/lib/crt/include/internal/math.h (props changed) trunk/reactos/lib/crt/include/internal/mbstring.h (props changed) trunk/reactos/lib/crt/include/internal/mtdll.h (props changed) trunk/reactos/lib/crt/include/internal/rterror.h (props changed) trunk/reactos/lib/crt/include/internal/tls.h (props changed) trunk/reactos/lib/crt/include/internal/wine/cppexcept.h (props changed) trunk/reactos/lib/crt/include/internal/wine/eh.h (props changed) trunk/reactos/lib/crt/include/internal/wine/msvcrt.h (props changed) Propchange: trunk/reactos/lib/crt/include/internal/atexit.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/include/internal/console.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/include/internal/debug.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/include/internal/file.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/include/internal/ieee.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/include/internal/math.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/include/internal/mbstring.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/include/internal/mtdll.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/include/internal/rterror.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/include/internal/tls.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/include/internal/wine/cppexcept.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/include/internal/wine/eh.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/include/internal/wine/msvcrt.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[greatlrd] 23787: Detect i386 asm code for setjump (we only have one asm version I add arch dections for it in rbuild
by greatlrd＠svn.reactos.org 29 Aug '06

29 Aug '06

Author: greatlrd Date: Tue Aug 29 22:03:24 2006 New Revision: 23787 URL: http://svn.reactos.org/svn/reactos?rev=23787&view=rev Log: Detect i386 asm code for setjump (we only have one asm version I add arch dections for it in rbuild Modified: trunk/reactos/lib/crt/crt.rbuild Modified: trunk/reactos/lib/crt/crt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/crt/crt.rbuild?rev=237… ============================================================================== --- trunk/reactos/lib/crt/crt.rbuild (original) +++ trunk/reactos/lib/crt/crt.rbuild Tue Aug 29 22:03:24 2006 @@ -221,11 +221,15 @@ <file>lfind.c</file> <file>lsearch.c</file> </directory> + <directory name="setjmp"> - <directory name="i386"> - <file>setjmp.s</file> - </directory> - </directory> + <if property="ARCH" value="i386"> + <directory name="i386"> + <file>setjmp.s</file> + </directory> + </if> + </directory> + <directory name="signal"> <file>signal.c</file> <file>xcptinfo.c</file>

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