Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 35740: Fix Ki386InitializeTss. Load idt in KeInitExceptions. Implement KiDebugServiceTrap. Add #ifed out threadini.c. Update Stubs. Now DbgPrints are working.
by tkreuzer＠svn.reactos.org 29 Aug '08

29 Aug '08

Author: tkreuzer Date: Thu Aug 28 19:38:15 2008 New Revision: 35740 URL: http://svn.reactos.org/svn/reactos?rev=35740&view=rev Log: Fix Ki386InitializeTss. Load idt in KeInitExceptions. Implement KiDebugServiceTrap. Add #ifed out threadini.c. Update Stubs. Now DbgPrints are working. Added: branches/ros-amd64-bringup/reactos/ntoskrnl/kd/amd64/ branches/ros-amd64-bringup/reactos/ntoskrnl/kd/amd64/kd.c (with props) branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/amd64/ branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/amd64/kdb.c (with props) branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/thrdini.c (with props) Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/except.c branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-amd64hack.rbuild Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c [iso-8859-1] Thu Aug 28 19:38:15 2008 @@ -69,7 +69,6 @@ STUB(KeFeatureBits) STUB(KiSystemService) STUB(KdpGdbStubInit) -STUB(KdbpGetCommandLineSettings) STUB(KdbpSafeReadMemory) STUB(RtlFillMemoryUlong) STUB(RtlCaptureContext) Added: branches/ros-amd64-bringup/reactos/ntoskrnl/kd/amd64/kd.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/kd/amd64/kd.c (added) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/kd/amd64/kd.c [iso-8859-1] Thu Aug 28 19:38:15 2008 @@ -1,0 +1,30 @@ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +VOID +STDCALL +KdbpGetCommandLineSettings(PCHAR p1) +{ + PCHAR p2; + + while (p1 && (p2 = strchr(p1, ' '))) + { + p2++; + + if (!_strnicmp(p2, "KDSERIAL", 8)) + { + p2 += 8; + KdbDebugState |= KD_DEBUG_KDSERIAL; + KdpDebugMode.Serial = TRUE; + } + else if (!_strnicmp(p2, "KDNOECHO", 8)) + { + p2 += 8; + KdbDebugState |= KD_DEBUG_KDNOECHO; + } + + p1 = p2; + } +} Propchange: branches/ros-amd64-bringup/reactos/ntoskrnl/kd/amd64/kd.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/amd64/kdb.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/amd64/kdb.c (added) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/amd64/kdb.c [iso-8859-1] Thu Aug 28 19:38:15 2008 @@ -1,0 +1,47 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: ntoskrnl/kdbg/kdb.c + * PURPOSE: Kernel Debugger + * + * PROGRAMMERS: Gregor Anich + */ + +/* INCLUDES ******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <internal/debug.h> + +/* GLOBALS *******************************************************************/ + +ULONG KdbDebugState = 0; /* KDBG Settings (NOECHO, KDSERIAL) */ + +/* FUNCTIONS *****************************************************************/ + +VOID +STDCALL +KdbpGetCommandLineSettings(PCHAR p1) +{ + PCHAR p2; + + while (p1 && (p2 = strchr(p1, ' '))) + { + p2++; + + if (!_strnicmp(p2, "KDSERIAL", 8)) + { + p2 += 8; + KdbDebugState |= KD_DEBUG_KDSERIAL; + KdpDebugMode.Serial = TRUE; + } + else if (!_strnicmp(p2, "KDNOECHO", 8)) + { + p2 += 8; + KdbDebugState |= KD_DEBUG_KDNOECHO; + } + + p1 = p2; + } +} + Propchange: branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/amd64/kdb.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c [iso-8859-1] Thu Aug 28 19:38:15 2008 @@ -456,30 +456,45 @@ IN PKGDTENTRY Gdt, IN UINT64 Stack) { - PKGDTENTRY TssEntry; - - /* Initialize the boot TSS entry */ - TssEntry = &Gdt[KGDT_TSS / sizeof(KGDTENTRY)]; - TssEntry->Bits.Type = I386_TSS; + PKGDTENTRY64 TssEntry; + + /* Initialize the TSS descriptor entry */ + TssEntry = (PVOID)((ULONG64)Gdt + KGDT_TSS); + TssEntry->Bits.Type = 9;//AMD64_TSS; + TssEntry->Bits.Dpl = 0; TssEntry->Bits.Present = 1; - TssEntry->Bits.Dpl = 0; - - /* FIXME: I/O Map */ + TssEntry->Bits.System = 0; + TssEntry->Bits.LongMode = 0; + TssEntry->Bits.DefaultBig = 0; + TssEntry->Bits.Granularity = 0; + + /* Descriptor base is the TSS address */ + TssEntry->BaseLow = (ULONG64)Tss & 0xffff; + TssEntry->Bits.BaseMiddle = ((ULONG64)Tss >> 16) & 0xff; + TssEntry->Bits.BaseHigh = ((ULONG64)Tss >> 24) & 0xff; + TssEntry->BaseUpper = (ULONG64)Tss >> 32; + + /* Set the limit */ + TssEntry->LimitLow = sizeof(KTSS64) -1; + TssEntry->Bits.LimitHigh = 0; + + /* FIXME: I/O Map? */ + Tss->IoMapBase = 0; + + /* Setup ring 0 stack pointer */ + Tss->Rsp0 = Stack; + + /* Setup a stack for Double Fault Traps */ + Tss->Ist[1] = (ULONG64)KiDoubleFaultStack; + + /* Setup a stack for CheckAbort Traps */ + Tss->Ist[2] = (ULONG64)KiDoubleFaultStack; + + /* Setup a stack for NMI Traps */ + Tss->Ist[3] = (ULONG64)KiDoubleFaultStack; /* Load the task register */ Ke386SetTr(KGDT_TSS); - - /* Setup stack pointer */ - Tss->Rsp0 = Stack; - - /* Setup a stack for Double Fault Traps */ - Tss->Ist[1] = PtrToUlong(KiDoubleFaultStack); - - /* Setup a stack for CheckAbort Traps */ - Tss->Ist[2] = PtrToUlong(KiDoubleFaultStack); - - /* Setup a stack for NMI Traps */ - Tss->Ist[3] = PtrToUlong(KiDoubleFaultStack); } Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/except.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/except.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/except.c [iso-8859-1] Thu Aug 28 19:38:15 2008 @@ -87,5 +87,6 @@ KiIdt[i].Reserved1 = 0; } + __lidt(&KiIdtDescriptor.Limit); } Added: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/thrdini.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/thrdini.c (added) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/thrdini.c [iso-8859-1] Thu Aug 28 19:38:15 2008 @@ -1,0 +1,231 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: ntoskrnl/ke/i386/thread.c + * PURPOSE: i386 Thread Context Creation + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + */ + +/* INCLUDES ******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> +#if 0 +typedef struct _KSWITCHFRAME +{ + PVOID ExceptionList; + BOOLEAN ApcBypassDisable; + PVOID RetAddr; +} KSWITCHFRAME, *PKSWITCHFRAME; + +typedef struct _KSTART_FRAME +{ + PKSYSTEM_ROUTINE SystemRoutine; + PKSTART_ROUTINE StartRoutine; + PVOID StartContext; + BOOLEAN UserThread; +} KSTART_FRAME, *PKSTART_FRAME; + +typedef struct _KUINIT_FRAME +{ + KSWITCHFRAME CtxSwitchFrame; + KSTART_FRAME StartFrame; + KTRAP_FRAME TrapFrame; + FX_SAVE_AREA FxSaveArea; +} KUINIT_FRAME, *PKUINIT_FRAME; + +typedef struct _KKINIT_FRAME +{ + KSWITCHFRAME CtxSwitchFrame; + KSTART_FRAME StartFrame; + FX_SAVE_AREA FxSaveArea; +} KKINIT_FRAME, *PKKINIT_FRAME; +#endif +/* FUNCTIONS *****************************************************************/ + +VOID +NTAPI +Ke386InitThreadWithContext(IN PKTHREAD Thread, + IN PKSYSTEM_ROUTINE SystemRoutine, + IN PKSTART_ROUTINE StartRoutine, + IN PVOID StartContext, + IN PCONTEXT ContextPointer) +{ + FrLdrDbgPrint("Ke386InitThreadWithContext stub\n"); +#if 0 + PFX_SAVE_AREA FxSaveArea; + PFXSAVE_FORMAT FxSaveFormat; + PKSTART_FRAME StartFrame; + PKSWITCHFRAME CtxSwitchFrame; + PKTRAP_FRAME TrapFrame; + CONTEXT LocalContext; + PCONTEXT Context = NULL; + ULONG ContextFlags; + + /* Check if this is a With-Context Thread */ + if (ContextPointer) + { + /* Set up the Initial Frame */ + PKUINIT_FRAME InitFrame; + InitFrame = (PKUINIT_FRAME)((ULONG_PTR)Thread->InitialStack - + sizeof(KUINIT_FRAME)); + + /* Copy over the context we got */ + RtlCopyMemory(&LocalContext, ContextPointer, sizeof(CONTEXT)); + Context = &LocalContext; + ContextFlags = CONTEXT_CONTROL; + + /* Zero out the trap frame and save area */ + RtlZeroMemory(&InitFrame->TrapFrame, + KTRAP_FRAME_LENGTH + sizeof(FX_SAVE_AREA)); + + /* Setup the Fx Area */ + FxSaveArea = &InitFrame->FxSaveArea; + + /* Check if we support FXsr */ + if (KeI386FxsrPresent) + { + /* Get the FX Save Format Area */ + FxSaveFormat = (PFXSAVE_FORMAT)Context->ExtendedRegisters; + + /* Set an initial state */ + FxSaveFormat->ControlWord = 0x27F; + FxSaveFormat->StatusWord = 0; + FxSaveFormat->TagWord = 0; + FxSaveFormat->ErrorOffset = 0; + FxSaveFormat->ErrorSelector = 0; + FxSaveFormat->DataOffset = 0; + FxSaveFormat->DataSelector = 0; + FxSaveFormat->MXCsr = 0x1F80; + } + else + { + /* Setup the regular save area */ + Context->FloatSave.ControlWord = 0x27F; + Context->FloatSave.StatusWord = 0; + Context->FloatSave.TagWord = -1; + Context->FloatSave.ErrorOffset = 0; + Context->FloatSave.ErrorSelector = 0; + Context->FloatSave.DataOffset =0; + Context->FloatSave.DataSelector = 0; + } + + /* Check if the CPU has NPX */ + if (KeI386NpxPresent) + { + /* Set an intial NPX State */ + Context->FloatSave.Cr0NpxState = 0; + FxSaveArea->Cr0NpxState = 0; + FxSaveArea->NpxSavedCpu = 0; + + /* Now set the context flags depending on XMM support */ + ContextFlags |= (KeI386FxsrPresent) ? CONTEXT_EXTENDED_REGISTERS : + CONTEXT_FLOATING_POINT; + + /* Set the Thread's NPX State */ + Thread->NpxState = NPX_STATE_NOT_LOADED; + Thread->DispatcherHeader.NpxIrql = PASSIVE_LEVEL; + } + else + { + /* We'll use emulation */ + FxSaveArea->Cr0NpxState = CR0_EM; + Thread->NpxState = NPX_STATE_NOT_LOADED &~ CR0_MP; + } + + /* Disable any debug regiseters */ + Context->ContextFlags &= ~CONTEXT_DEBUG_REGISTERS; + + /* Setup the Trap Frame */ + TrapFrame = &InitFrame->TrapFrame; + + /* Set up a trap frame from the context. */ + KeContextToTrapFrame(Context, + NULL, + TrapFrame, + Context->ContextFlags | ContextFlags, + UserMode); + + /* Set SS, DS, ES's RPL Mask properly */ + TrapFrame->HardwareSegSs |= RPL_MASK; + TrapFrame->SegDs |= RPL_MASK; + TrapFrame->SegEs |= RPL_MASK; + TrapFrame->Dr7 = 0; + + /* Set the debug mark */ + TrapFrame->DbgArgMark = 0xBADB0D00; + + /* Set the previous mode as user */ + TrapFrame->PreviousPreviousMode = UserMode; + + /* Terminate the Exception Handler List */ + TrapFrame->ExceptionList = EXCEPTION_CHAIN_END; + + /* Setup the Stack for KiThreadStartup and Context Switching */ + StartFrame = &InitFrame->StartFrame; + CtxSwitchFrame = &InitFrame->CtxSwitchFrame; + + /* Tell the thread it will run in User Mode */ + Thread->PreviousMode = UserMode; + + /* Tell KiThreadStartup of that too */ + StartFrame->UserThread = TRUE; + } + else + { + /* Set up the Initial Frame for the system thread */ + PKKINIT_FRAME InitFrame; + InitFrame = (PKKINIT_FRAME)((ULONG_PTR)Thread->InitialStack - + sizeof(KKINIT_FRAME)); + + /* Setup the Fx Area */ + FxSaveArea = &InitFrame->FxSaveArea; + RtlZeroMemory(FxSaveArea, sizeof(FX_SAVE_AREA)); + + /* Check if we have Fxsr support */ + if (KeI386FxsrPresent) + { + /* Set the stub FX area */ + FxSaveArea->U.FxArea.ControlWord = 0x27F; + FxSaveArea->U.FxArea.MXCsr = 0x1F80; + } + else + { + /* Set the stub FN area */ + FxSaveArea->U.FnArea.ControlWord = 0x27F; + FxSaveArea->U.FnArea.TagWord = -1; + } + + /* No NPX State */ + Thread->NpxState = NPX_STATE_NOT_LOADED; + + /* Setup the Stack for KiThreadStartup and Context Switching */ + StartFrame = &InitFrame->StartFrame; + CtxSwitchFrame = &InitFrame->CtxSwitchFrame; + + /* Tell the thread it will run in Kernel Mode */ + Thread->PreviousMode = KernelMode; + + /* Tell KiThreadStartup of that too */ + StartFrame->UserThread = FALSE; + } + + /* Now setup the remaining data for KiThreadStartup */ + StartFrame->StartContext = StartContext; + StartFrame->StartRoutine = StartRoutine; + StartFrame->SystemRoutine = SystemRoutine; + + /* And set up the Context Switch Frame */ + CtxSwitchFrame->RetAddr = KiThreadStartup; + CtxSwitchFrame->ApcBypassDisable = TRUE; + CtxSwitchFrame->ExceptionList = EXCEPTION_CHAIN_END;; + + /* Save back the new value of the kernel stack. */ + Thread->KernelStack = (PVOID)CtxSwitchFrame; +#endif +} + +/* EOF */ + + Propchange: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/thrdini.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] Thu Aug 28 19:38:15 2008 @@ -17,6 +17,9 @@ .data +_MsgPageFault: +.ascii "Page fault 0x%x at %p!\n\0" + _MsgGeneralProtFault: .ascii "General protection fault at %p!\n\0" @@ -33,55 +36,95 @@ .global _KiDivideErrorFault _KiDivideErrorFault: + /* Push pseudo error code */ + push 0 + .global _KiDebugTrapOrFault _KiDebugTrapOrFault: + /* Push pseudo error code */ + push 0 .global _KiNmiInterrupt _KiNmiInterrupt: + /* Push pseudo error code */ + push 0 + +jmp $ .global _KiBreakpointTrap _KiBreakpointTrap: -// mov rdx, [rsp] + /* Push pseudo error code */ + push 0 + + push rax + push rcx + push rdx + sub rsp, 0x10 -// movabs rcx, offset _MsgBreakpointTrap -// movabs rax, offset _FrLdrDbgPrint -// call [rax] + movabs rcx, offset _MsgBreakpointTrap + mov rdx, [rsp + 0x10 + 24 + 8] + movabs rax, offset _FrLdrDbgPrint + call [rax] add rsp, 0x10 - iret + + pop rdx + pop rcx + pop rax + add rsp, 8 + iretq .global _KiOverflowTrap _KiOverflowTrap: + /* Push pseudo error code */ + push 0 .global _KiBoundFault _KiBoundFault: + /* Push pseudo error code */ + push 0 .global _KiInvalidOpcodeFault _KiInvalidOpcodeFault: + /* Push pseudo error code */ + push 0 .global _KiNpxNotAvailableFault _KiNpxNotAvailableFault: + /* Push pseudo error code */ + push 0 .global _KiDoubleFaultAbort _KiDoubleFaultAbort: + /* Push pseudo error code */ + push 0 .global _KiNpxSegmentOverrunAbort _KiNpxSegmentOverrunAbort: + /* Push pseudo error code */ + push 0 .global _KiInvalidTssFault _KiInvalidTssFault: + /* We have an error code */ + .global _KiSegmentNotPresentFault _KiSegmentNotPresentFault: + /* We have an error code */ + .global _KiStackFault _KiStackFault: + /* We have an error code */ jmp $ .global _KiGeneralProtectionFault _KiGeneralProtectionFault: + /* We have an error code */ + mov rdx, 0 mov dx, ss movabs rcx, offset _MsgGeneralProtFault @@ -92,18 +135,34 @@ .global _KiPageFault _KiPageFault: + /* We have an error code */ + movabs rcx, offset _MsgPageFault + mov rdx, [rsp] + mov r8, [rsp+8] + mov r9, rsp + movabs rax, offset _FrLdrDbgPrint + call [rax] + jmp $ + .global _KiFloatingErrorFault _KiFloatingErrorFault: + /* Push pseudo error code */ + push 0 .global _KiAlignmentFault _KiAlignmentFault: + /* We have an error code */ .global _KiMcheckAbort _KiMcheckAbort: + /* Push pseudo error code */ + push 0 .global _KiXmmException _KiXmmException: + /* Push pseudo error code */ + push 0 .global _KiApcInterrupt _KiApcInterrupt: @@ -111,9 +170,40 @@ .global _KiRaiseAssertion _KiRaiseAssertion: +jmp $ .global _KiDebugServiceTrap _KiDebugServiceTrap: + /* Push pseudo error code */ + push 0 + + push rax + push rcx + push rdx + push r8 + push r9 + + /* Create stack space for parameters */ + sub rsp, 0x18 + + /* just forward first 3 parameters */ + call _KdpServiceDispatcher + + /* Skip the int 3, increment return rip */ + inc qword ptr [rsp + 0x18 + 48] + + /* Cleanup */ + add rsp, 0x18 + + pop r9 + pop r8 + pop rdx + pop rcx + pop rax + + add rsp, 8 + iretq + .global _KiDpcInterrupt _KiDpcInterrupt: @@ -121,10 +211,12 @@ .global _KiIpiInterrupt _KiIpiInterrupt: - iret +jmp $ + .global _KiUnexpectedInterrupt _KiUnexpectedInterrupt: +jmp $ movabs rcx, offset _MsgUnexpectedInterrupt movabs rax, offset _FrLdrDbgPrint call [rax] Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-amd64hack.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-amd64hack.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-amd64hack.rbuild [iso-8859-1] Thu Aug 28 19:38:15 2008 @@ -95,6 +95,7 @@ <file>except.c</file> <file>irql.c</file> <file>kiinit.c</file> + <file>thrdini.c</file> <file>trap.S</file> </directory> </if> @@ -303,6 +304,11 @@  <file>kdb_keyboard.c</file> <file>kdb_serial.c</file> + <if property="ARCH" value="amd64"> + <directory name="amd64"> + <file>kdb.c</file> + </directory> + </if> </if> <if property="DBG_OR_KDBG" value="true"> <file>kdb_symbols.c</file>

1 0

[tkreuzer] 35739: KGDT_TSS is 0x40 (vista 64bit).
by tkreuzer＠svn.reactos.org 29 Aug '08

29 Aug '08

Author: tkreuzer Date: Thu Aug 28 19:35:46 2008 New Revision: 35739 URL: http://svn.reactos.org/svn/reactos?rev=35739&view=rev Log: KGDT_TSS is 0x40 (vista 64bit). Modified: branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h Modified: branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h [iso-8859-1] Thu Aug 28 19:35:46 2008 @@ -62,9 +62,9 @@ #define KGDT_64_R0_SS 0x0018 #define KGDT_64_DATA 0x0028 // 2b #define KGDT_64_R3_CODE 0x0030 // 33 +#define KGDT_TSS 0x0040 #define KGDT_32_R3_TEB 0x0050 // 53 -#define KGDT_TSS 0x0038 // ?? // // CR4

1 0

[tkreuzer] 35738: Fix DebugService
by tkreuzer＠svn.reactos.org 29 Aug '08

29 Aug '08

Author: tkreuzer Date: Thu Aug 28 19:35:02 2008 New Revision: 35738 URL: http://svn.reactos.org/svn/reactos?rev=35738&view=rev Log: Fix DebugService Modified: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/debug_asm.S Modified: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/debug_asm.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/amd64/debug_asm.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/amd64/debug_asm.S [iso-8859-1] Thu Aug 28 19:35:02 2008 @@ -51,27 +51,38 @@ .endfunc +/****************************************************************************** + * NTSTATUS NTAPI DebugService( + * IN ULONG Service, // <rcx> = [rsp + 8] + * IN PVOID Buffer, // <rdx> = [rsp + 16] + * IN ULONG Length, // <r8> = [rsp + 24] + * IN PVOID Argument1, // <r9> = [rsp + 32] + * IN PVOID Argument2); // [rsp + 40] + */ .func DebugService _DebugService: /* Save the registers */ + push rbx push rcx - push rbx + push rdx + push rsi push rdi - push rdi - push rbx + + /* Load Argument 2 in rax */ + mov rax, [rsp + 48 + 40] /* Call the Interrupt */ - // FIXME: setup registers int 0x2D int 3 /* Restore registers */ - pop rbx pop rdi - pop rdi + pop rsi + pop rdx + pop rcx pop rbx /* Return */ - ret 20 + ret .endfunc

1 0

[tkreuzer] 35737: Implement MmUpdatePageDir
by tkreuzer＠svn.reactos.org 29 Aug '08

29 Aug '08

Author: tkreuzer Date: Thu Aug 28 19:24:55 2008 New Revision: 35737 URL: http://svn.reactos.org/svn/reactos?rev=35737&view=rev Log: Implement MmUpdatePageDir Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/mm.h branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/page.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/mm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] Thu Aug 28 19:24:55 2008 @@ -2,8 +2,8 @@ * Lowlevel memory managment definitions */ -#ifndef __NTOSKRNL_INCLUDE_INTERNAL_I386_MM_H -#define __NTOSKRNL_INCLUDE_INTERNAL_I386_MM_H +#ifndef __NTOSKRNL_INCLUDE_INTERNAL_AMD64_MM_H +#define __NTOSKRNL_INCLUDE_INTERNAL_AMD64_MM_H struct _EPROCESS; PULONG_PTR MmGetPageDirectory(VOID); @@ -17,15 +17,21 @@ /* Converting address to a corresponding PDE or PTE entry */ #define MiAddressToPde(x) \ - ((PMMPTE)(((((ULONG)(x)) >> 22) << 2) + PAGEDIRECTORY_MAP)) + ((PMMPTE)(((((ULONG64)(x)) >> 22) << 2) + PAGEDIRECTORY_MAP)) #define MiAddressToPte(x) \ - ((PMMPTE)(((((ULONG)(x)) >> 12) << 2) + PAGETABLE_MAP)) + ((PMMPTE)(((((ULONG64)(x)) >> 12) << 2) + PAGETABLE_MAP)) -#define ADDR_TO_PAGE_TABLE(v) (((ULONG)(v)) / (1024 * PAGE_SIZE)) -#define ADDR_TO_PDE_OFFSET(v) ((((ULONG)(v)) / (1024 * PAGE_SIZE))) -#define ADDR_TO_PTE_OFFSET(v) ((((ULONG)(v)) % (1024 * PAGE_SIZE)) / PAGE_SIZE) +//#define ADDR_TO_PAGE_TABLE(v) (((ULONG)(v)) / (1024 * PAGE_SIZE)) +//#define ADDR_TO_PDE_OFFSET(v) ((((ULONG)(v)) / (1024 * PAGE_SIZE))) +//#define ADDR_TO_PTE_OFFSET(v) ((((ULONG)(v)) % (1024 * PAGE_SIZE)) / PAGE_SIZE) + +#define VAtoPXI(va) ((((ULONG64)va) >> PXI_SHIFT) & 0x1FF) +#define VAtoPPI(va) ((((ULONG64)va) >> PPI_SHIFT) & 0x1FF) +#define VAtoPDI(va) ((((ULONG64)va) >> PDI_SHIFT) & 0x1FF) +#define VAtoPTI(va) ((((ULONG64)va) >> PTI_SHIFT) & 0x1FF) + /* Easy accessing PFN in PTE */ #define PFN_FROM_PTE(v) ((v)->u.Hard.PageFrameNumber) -#endif /* __NTOSKRNL_INCLUDE_INTERNAL_I386_MM_H */ +#endif /* __NTOSKRNL_INCLUDE_INTERNAL_AMD64_MM_H */ Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/page.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/page.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/page.c [iso-8859-1] Thu Aug 28 19:24:55 2008 @@ -21,6 +21,7 @@ /* GLOBALS *****************************************************************/ +ULONG64 MmGlobalKernelPageDirectory[512]; /* FUNCTIONS ***************************************************************/ @@ -301,7 +302,37 @@ NTAPI MmUpdatePageDir(PEPROCESS Process, PVOID Address, ULONG Size) { - UNIMPLEMENTED; + ULONG StartIndex, EndIndex, Index; + PULONG64 Pde; + + /* Sanity check */ + if (Address < MmSystemRangeStart) + { + KEBUGCHECK(0); + } + + /* Get pointer to the page directory to update */ + if (Process != NULL && Process != PsGetCurrentProcess()) + { +// Pde = MmCreateHyperspaceMapping(PTE_TO_PFN(Process->Pcb.DirectoryTableBase[0])); + } + else + { + Pde = (PULONG64)PXE_BASE; + } + + /* Update PML4 entries */ + StartIndex = VAtoPXI(Address); + EndIndex = VAtoPXI((ULONG64)Address + Size); + for (Index = StartIndex; Index <= EndIndex; Index++) + { + if (Index != VAtoPXI(PXE_BASE)) + { + (void)InterlockedCompareExchangePointer((PVOID*)&Pde[Index], + MmGlobalKernelPageDirectory[Index], + 0); + } + } } VOID

1 0

[tkreuzer] 35736: Implement KegetCurrentThread inline function
by tkreuzer＠svn.reactos.org 29 Aug '08

29 Aug '08

Author: tkreuzer Date: Thu Aug 28 19:17:53 2008 New Revision: 35736 URL: http://svn.reactos.org/svn/reactos?rev=35736&view=rev Log: Implement KegetCurrentThread inline function Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ke_x.h Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ke_x.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ke_x.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ke_x.h [iso-8859-1] Thu Aug 28 19:17:53 2008 @@ -1534,6 +1534,8 @@ #ifdef _M_IX86 /* Return the current thread */ return ((PKIPCR)KeGetPcr())->PrcbData.CurrentThread; +#elif defined (_M_AMD64) + return (PRKTHREAD)__readgsqword(FIELD_OFFSET(KIPCR, Prcb.CurrentThread)); #else PKPRCB Prcb = KeGetCurrentPrcb(); return Prcb->CurrentThread;

1 0

[weiden] 35735: Fix warning that variable might be used uninitialized
by weiden＠svn.reactos.org 28 Aug '08

28 Aug '08

Author: weiden Date: Thu Aug 28 18:47:23 2008 New Revision: 35735 URL: http://svn.reactos.org/svn/reactos?rev=35735&view=rev Log: Fix warning that variable might be used uninitialized Modified: trunk/reactos/lib/fslib/vfatlib/check/fat.c Modified: trunk/reactos/lib/fslib/vfatlib/check/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/fa… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/fat.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/fat.c [iso-8859-1] Thu Aug 28 18:47:23 2008 @@ -66,6 +66,8 @@ second = NULL; if (second && memcmp(first,second,eff_size) != 0) { FAT_ENTRY first_media, second_media; + memset (&first_media, 0, sizeof (first_media)); + memset (&second_media, 0, sizeof (second_media)); get_fat(&first_media,first,0,fs); get_fat(&second_media,second,0,fs); first_ok = (first_media.value & FAT_EXTD(fs)) == FAT_EXTD(fs);

1 0

[cgutman] 35734: - Merge aicom-network-fixes up to r35714
by cgutman＠svn.reactos.org 28 Aug '08

28 Aug '08

Author: cgutman Date: Thu Aug 28 18:21:05 2008 New Revision: 35734 URL: http://svn.reactos.org/svn/reactos?rev=35734&view=rev Log: - Merge aicom-network-fixes up to r35714 Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Thu Aug 28 18:21:05 2008 @@ -592,10 +592,7 @@ TcpipRecursiveMutexLeave( &TCPLock ); - if( Status == OSK_EINPROGRESS ) - return STATUS_PENDING; - else - return Status; + return Status; } NTSTATUS TCPDisconnect

1 0

[cfinck] 35733: Update the link, which is shown in the rare case that a user tries an option in our forum for which no link exists :-D
by cfinck＠svn.reactos.org 28 Aug '08

28 Aug '08

Author: cfinck Date: Thu Aug 28 15:02:43 2008 New Revision: 35733 URL: http://svn.reactos.org/svn/reactos?rev=35733&view=rev Log: Update the link, which is shown in the rare case that a user tries an option in our forum for which no link exists :-D Modified: trunk/web/reactos.org/htdocs/forum/includes/ucp/ucp_profile.php Modified: trunk/web/reactos.org/htdocs/forum/includes/ucp/ucp_profile.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/forum/inclu… ============================================================================== --- trunk/web/reactos.org/htdocs/forum/includes/ucp/ucp_profile.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/forum/includes/ucp/ucp_profile.php [iso-8859-1] Thu Aug 28 15:02:43 2008 @@ -42,7 +42,7 @@ switch ($mode) { case 'reg_details': - die('You can modify your account settings using the <a href="/roscms/?page=user&sec=account&sec2=edit">myReactOS Settings</a> page.<br /><br />Please tell an Administrator to disable this page in the phpBB Administration Panel.'); + die('You can modify your account settings using the <a href="/roscms/index.php/my/edit">myReactOS Settings</a> page.<br /><br />Please tell an Administrator to disable this page in the phpBB Administration Panel.'); case 'profile_info':

1 0

[fireball] 35732: - Use CmpCompressedNameSize to obtain the compressed name length (I'll convert the other part of the routine to use CmpCopyCompressedName later, instead of assuming the current way of things). - Fix incorrect freeing of a buffer returned by a call to CmpConstructName (spotted by Stefan Ginsberg). - Changes in a couple of comments for better description, and a couple of 80col exceeders fixed.
by fireball＠svn.reactos.org 28 Aug '08

28 Aug '08

Author: fireball Date: Thu Aug 28 10:37:57 2008 New Revision: 35732 URL: http://svn.reactos.org/svn/reactos?rev=35732&view=rev Log: - Use CmpCompressedNameSize to obtain the compressed name length (I'll convert the other part of the routine to use CmpCopyCompressedName later, instead of assuming the current way of things). - Fix incorrect freeing of a buffer returned by a call to CmpConstructName (spotted by Stefan Ginsberg). - Changes in a couple of comments for better description, and a couple of 80col exceeders fixed. Modified: trunk/reactos/ntoskrnl/config/cmkcbncb.c trunk/reactos/ntoskrnl/config/cmsysini.c Modified: trunk/reactos/ntoskrnl/config/cmkcbncb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmkcbncb.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmkcbncb.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmkcbncb.c [iso-8859-1] Thu Aug 28 10:37:57 2008 @@ -898,7 +898,7 @@ PWCHAR TargetBuffer, CurrentNameW; PUCHAR CurrentName; - /* Calculate how much size our key name is going to occupy */ + /* Calculate how much size our key name is going to occupy */ NameLength = 0; MyKcb = Kcb; @@ -906,11 +906,16 @@ { /* Add length of the name */ if (!MyKcb->NameBlock->Compressed) + { NameLength += MyKcb->NameBlock->NameLength; + } else - NameLength += MyKcb->NameBlock->NameLength * sizeof(WCHAR); - - /* Sum up the separator also */ + { + NameLength += CmpCompressedNameSize(MyKcb->NameBlock->Name, + MyKcb->NameBlock->NameLength); + } + + /* Sum up the separator too */ NameLength += sizeof(WCHAR); /* Go to the parent KCB */ @@ -918,10 +923,13 @@ } /* Allocate the unicode string now */ - KeyName = ExAllocatePoolWithTag(PagedPool, NameLength + sizeof(UNICODE_STRING), TAG_CM); + KeyName = ExAllocatePoolWithTag(PagedPool, + NameLength + sizeof(UNICODE_STRING), + TAG_CM); if (!KeyName) return NULL; + /* Set it up */ KeyName->Buffer = (PWSTR)(KeyName + 1); KeyName->Length = NameLength; KeyName->MaximumLength = NameLength; @@ -932,7 +940,7 @@ while (MyKcb) { - /* Sanity checks for deleted keys */ + /* Sanity checks for deleted and fake keys */ if ((!MyKcb->KeyCell && !MyKcb->Delete) || !MyKcb->KeyHive || MyKcb->ExtFlags & CM_KCB_KEY_NON_EXIST) Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] Thu Aug 28 10:37:57 2008 @@ -159,7 +159,7 @@ (Length < (*ReturnLength - sizeof(OBJECT_NAME_INFORMATION)))) { /* Free the buffer allocated by CmpConstructName */ - ExFreePool(KeyName->Buffer); + ExFreePool(KeyName); /* Return buffer length failure */ return STATUS_INFO_LENGTH_MISMATCH; @@ -174,7 +174,9 @@ ObjectNameInfo->Name.Length = KeyName->Length; /* Copy string content*/ - RtlCopyMemory(ObjectNameInfo->Name.Buffer, KeyName->Buffer, *ReturnLength); + RtlCopyMemory(ObjectNameInfo->Name.Buffer, + KeyName->Buffer, + *ReturnLength); } _SEH_HANDLE { @@ -186,6 +188,7 @@ /* Free the buffer allocated by CmpConstructName */ ExFreePool(KeyName); + /* Return status */ return Status; }

1 0

[pschweitzer] 35731: Sorry, I committed stuff I shouldn't
by pschweitzer＠svn.reactos.org 28 Aug '08

28 Aug '08

Author: pschweitzer Date: Thu Aug 28 06:55:35 2008 New Revision: 35731 URL: http://svn.reactos.org/svn/reactos?rev=35731&view=rev Log: Sorry, I committed stuff I shouldn't Modified: trunk/reactos/dll/win32/netshell/netshell.c Modified: trunk/reactos/dll/win32/netshell/netshell.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/netshel… ============================================================================== --- trunk/reactos/dll/win32/netshell/netshell.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/netshell.c [iso-8859-1] Thu Aug 28 06:55:35 2008 @@ -47,8 +47,6 @@ return S_FALSE; } -//#define CHECKPOINT1 ERR("\n"); - STDAPI DllRegisterServer(void) { @@ -57,12 +55,8 @@ WCHAR szNet[20]; UINT Length, Offset; - //CHECKPOINT1; - if (RegCreateKeyExW(HKEY_CLASSES_ROOT, szNetConnectClass, 0, NULL, 0, KEY_WRITE, NULL, &hKey, NULL) != ERROR_SUCCESS) return SELFREG_E_CLASS; - - //CHECKPOINT1; if (LoadStringW(netshell_hInstance, IDS_NETWORKCONNECTION, szName, MAX_PATH)) { @@ -70,15 +64,11 @@ RegSetValueW(hKey, NULL, REG_SZ, szName, (wcslen(szName)+1) * sizeof(WCHAR)); } - //CHECKPOINT1; - if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, szNamespaceKey, 0, NULL, 0, KEY_WRITE, NULL, &hSubKey, NULL) == ERROR_SUCCESS) { RegSetValueW(hSubKey, NULL, REG_SZ, szName, (wcslen(szName)+1) * sizeof(WCHAR)); RegCloseKey(hSubKey); } - - //CHECKPOINT1; Length = swprintf(szNet, L",-%u", IDS_NETWORKCONNECTION); Offset = GetModuleFileNameW(netshell_hInstance, &szName[1], MAX_PATH); @@ -90,12 +80,7 @@ RegSetValueExW(hKey, L"LocalizedString", 0, REG_SZ, (const LPBYTE)szName, (wcslen(szName)+1) * sizeof(WCHAR)); } - - //CHECKPOINT1; - szName[Offset+1] = L'\0'; - - //CHECKPOINT1; /* store default icon */ if (RegCreateKeyExW(hKey, L"DefaultIcon", 0, NULL, 0, KEY_WRITE, NULL, &hSubKey, NULL) == ERROR_SUCCESS) @@ -103,23 +88,17 @@ RegSetValueW(hSubKey, NULL, REG_SZ, &szName[1], (Offset+1) * sizeof(WCHAR)); RegCloseKey(hSubKey); } - //CHECKPOINT1; if (RegCreateKeyExW(hKey, L"InProcServer32", 0, NULL, 0, KEY_WRITE, NULL, &hSubKey, NULL) == ERROR_SUCCESS) { RegSetValueW(hSubKey, NULL, REG_SZ, &szName[1], (Offset+1) * sizeof(WCHAR)); RegCloseKey(hSubKey); } - - //CHECKPOINT1; - if (RegCreateKeyExW(hKey, L"ShellFolder", 0, NULL, 0, KEY_WRITE, NULL, &hSubKey, NULL) == ERROR_SUCCESS) { DWORD dwAttributes = SFGAO_FOLDER; RegSetValueExW(hSubKey, L"Attributes",0, REG_BINARY, (const LPBYTE)&dwAttributes, sizeof(DWORD)); } - - //CHECKPOINT1; return S_OK; }

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