Ros-diffs January 2006

ros-diffs@reactos.org

23 participants
586 discussions

[ion] 20783: - Fix some bugs in KiCallUserMode (as of yet unused).

by ion＠svn.reactos.org

- Fix some bugs in KiCallUserMode (as of yet unused). Modified: trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S _____ Modified: trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S --- trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S 2006-01-11 06:40:41 UTC (rev 20782) +++ trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S 2006-01-11 06:44:06 UTC (rev 20783) @@ -71,6 +71,7 @@ mov ebx, fs:[KPCR_CURRENT_THREAD] /* Make sure we're at passive */ +#if DBG call _KeGetCurrentIrql@0 or al, al jz AtPassive @@ -89,7 +90,7 @@ movzx eax, byte ptr [ebx+KTHREAD_APC_STATE_INDEX] mov edx, [ebx+KTHREAD_COMBINED_APC_DISABLE] or eax, eax - jz InvalidIndex + jnz InvalidIndex or edx, edx jz ApcsEnabled @@ -103,6 +104,7 @@ call _KeBugCheckEx@20 ApcsEnabled: +#endif /* Get the lowest stack limit and check if we can handle it */ lea eax, [esp-0x3000] @@ -145,15 +147,15 @@ /* Now copy the NPX State */ mov ecx, [esi+FN_CONTROL_WORD] - mov [esi+FN_CONTROL_WORD], ecx + mov [esp+FN_CONTROL_WORD], ecx mov ecx, [esi+FN_STATUS_WORD] - mov [esi+FN_STATUS_WORD], ecx + mov [esp+FN_STATUS_WORD], ecx mov ecx, [esi+FN_TAG_WORD] - mov [esi+FN_TAG_WORD], ecx + mov [esp+FN_TAG_WORD], ecx mov ecx, [esi+FN_DATA_SELECTOR] - mov [esi+FN_DATA_SELECTOR], ecx + mov [esp+FN_DATA_SELECTOR], ecx mov ecx, [esi+FN_CR0_NPX_STATE] - mov [esi+FN_CR0_NPX_STATE], ecx + mov [esp+FN_CR0_NPX_STATE], ecx /* Get TSS */ mov esi, fs:[KPCR_TSS] @@ -179,7 +181,7 @@ /* Set copy iterator and dest/origin parameters and do the copy */ mov ecx, (KTRAP_FRAME_V86_ES - KTRAP_FRAME_FS) / 4 lea edi, [esp+KTRAP_FRAME_FS] - lea esi, [esp+KTRAP_FRAME_FS] + lea esi, [edx+KTRAP_FRAME_FS] rep movsd /* FIXME: Copy debug registers if needed */ @@ -193,7 +195,7 @@ mov [esp+KTRAP_FRAME_EXCEPTION_LIST], eax /* Set the previous mode */ - mov eax, [EDX+KTRAP_FRAME_PREVIOUS_MODE] + mov eax, [edx+KTRAP_FRAME_PREVIOUS_MODE] mov [esp+KTRAP_FRAME_PREVIOUS_MODE], eax /* Bring interrupts back */ @@ -250,6 +252,7 @@ _NtCallbackReturn2@12: /* Get the current thread and make sure we have a callback stack */ + call _KeBugCheckEx@20 mov eax, fs:[KPCR_CURRENT_THREAD] mov ecx, [eax+KTHREAD_CALLBACK_STACK] test ecx, ecx

18 years, 8 months

[ion] 20782: - Implement (although non-optimally) MmGrowKernelStack for future use.

by ion＠svn.reactos.org

- Implement (although non-optimally) MmGrowKernelStack for future use. Modified: trunk/reactos/ntoskrnl/mm/process.c _____ Modified: trunk/reactos/ntoskrnl/mm/process.c --- trunk/reactos/ntoskrnl/mm/process.c 2006-01-11 06:01:54 UTC (rev 20781) +++ trunk/reactos/ntoskrnl/mm/process.c 2006-01-11 06:40:41 UTC (rev 20782) @@ -166,7 +166,11 @@ KEBUGCHECK(0); } - /* Mark the Stack in use */ + /* + * Mark the Stack in use. + * Note: Currently we mark all 60KB in use for a GUI Thread. + * We should only do this inside MmGrowKernelStack. TODO! + */ for (i = 0; i < (StackSize / PAGE_SIZE); i++) { Status = MmRequestPageMemoryConsumer(MC_NPPOOL, TRUE, &Page[i]); @@ -197,9 +201,24 @@ STDCALL MmGrowKernelStack(PVOID StackPointer) { - DPRINT1("We don't support expansion yet :(\n"); - KEBUGCHECK(0); - return STATUS_NOT_IMPLEMENTED; + PETHREAD Thread = PsGetCurrentThread(); + + /* Make sure we have reserved space for our grow */ + ASSERT(((PCHAR)Thread->Tcb.StackBase - (PCHAR)Thread->Tcb.StackLimit) <= + (KERNEL_LARGE_STACK_SIZE + PAGE_SIZE)); + + /* + * We'll give you three more pages. + * NOTE: See note in MmCreateKernelStack. These pages are already being reserved. + * It would be more efficient to only grow them (commit them) here. + */ + Thread->Tcb.StackLimit -= KERNEL_STACK_SIZE; + + /* Return success */ + DPRINT1("Thread, Thread Limit, Stack %p %p %p\n", KeGetCurrentThread(), + KeGetCurrentThread()->StackLimit, + StackPointer); + return STATUS_SUCCESS; } NTSTATUS

18 years, 8 months

[ion] 20781: - Fix accidental build breakage.

by ion＠svn.reactos.org

- Fix accidental build breakage. Modified: trunk/reactos/ntoskrnl/ex/init.c Modified: trunk/reactos/ntoskrnl/ke/i386/tss.c Modified: trunk/reactos/ntoskrnl/ke/kthread.c Modified: trunk/reactos/ntoskrnl/ke/process.c _____ Modified: trunk/reactos/ntoskrnl/ex/init.c --- trunk/reactos/ntoskrnl/ex/init.c 2006-01-11 05:55:49 UTC (rev 20780) +++ trunk/reactos/ntoskrnl/ex/init.c 2006-01-11 06:01:54 UTC (rev 20781) @@ -580,7 +580,7 @@ KeCreateApplicationProcessorIdleThread(KeNumberProcessors); /* Allocate a stack for use when booting the processor */ - ProcessorStack = RVA(Ki386InitialStackArray[((int)KeNumberProcessors)], MM_STACK_SIZE); + ProcessorStack = RVA(Ki386InitialStackArray[((int)KeNumberProcessors)], KERNEL_STACK_SIZE); /* Tell HAL a new CPU is being started */ HalStartNextProcessor(0, (ULONG)ProcessorStack - 2*sizeof(FX_SAVE_AREA)); _____ Modified: trunk/reactos/ntoskrnl/ke/i386/tss.c --- trunk/reactos/ntoskrnl/ke/i386/tss.c 2006-01-11 05:55:49 UTC (rev 20780) +++ trunk/reactos/ntoskrnl/ke/i386/tss.c 2006-01-11 06:01:54 UTC (rev 20781) @@ -119,7 +119,7 @@ Tss = ExAllocatePool(NonPagedPool, sizeof(KTSS)); TrapTss = ExAllocatePool(NonPagedPool, sizeof(KTSSNOIOPM)); - TrapStack = ExAllocatePool(NonPagedPool, MM_STACK_SIZE); + TrapStack = ExAllocatePool(NonPagedPool, KERNEL_STACK_SIZE); Ki386TssArray[Id] = Tss; Ki386TrapTssArray[Id] = (KTSSNOIOPM*)TrapTss; @@ -127,7 +127,7 @@ KeGetCurrentKPCR()->TSS = Tss; /* Initialize the boot TSS. */ - Tss->Esp0 = (ULONG)Ki386InitialStackArray[Id] + MM_STACK_SIZE; /* FIXME: - sizeof(FX_SAVE_AREA)? */ + Tss->Esp0 = (ULONG)Ki386InitialStackArray[Id] + KERNEL_STACK_SIZE; /* FIXME: - sizeof(FX_SAVE_AREA)? */ Tss->Ss0 = KGDT_R0_DATA; Tss->IoMapBase = 0xFFFF; /* No i/o bitmap */ Tss->LDT = 0; @@ -146,7 +146,7 @@ /* Initialize the TSS used for handling double faults. */ TrapTss->Flags = 0; - TrapTss->Esp0 = ((ULONG)TrapStack + MM_STACK_SIZE); /* FIXME: - sizeof(FX_SAVE_AREA)? */ + TrapTss->Esp0 = ((ULONG)TrapStack + KERNEL_STACK_SIZE); /* FIXME: - sizeof(FX_SAVE_AREA)? */ TrapTss->Ss0 = KGDT_R0_DATA; TrapTss->Cs = KGDT_R0_CODE; TrapTss->Eip = (ULONG)KiTrap8; _____ Modified: trunk/reactos/ntoskrnl/ke/kthread.c --- trunk/reactos/ntoskrnl/ke/kthread.c 2006-01-11 05:55:49 UTC (rev 20780) +++ trunk/reactos/ntoskrnl/ke/kthread.c 2006-01-11 06:01:54 UTC (rev 20781) @@ -853,8 +853,8 @@ Thread->Teb = Teb; /* Set the Thread Stacks */ - Thread->InitialStack = (PCHAR)KernelStack + MM_STACK_SIZE; - Thread->StackBase = (PCHAR)KernelStack + MM_STACK_SIZE; + Thread->InitialStack = (PCHAR)KernelStack + KERNEL_STACK_SIZE; + Thread->StackBase = (PCHAR)KernelStack + KERNEL_STACK_SIZE; Thread->StackLimit = (ULONG_PTR)KernelStack; Thread->KernelStackResident = TRUE; @@ -864,7 +864,7 @@ * while handling page faults. At this point it isn't possible to call the * page fault handler for the missing pde's. */ - MmUpdatePageDir((PEPROCESS)Process, (PVOID)Thread->StackLimit, MM_STACK_SIZE); + MmUpdatePageDir((PEPROCESS)Process, (PVOID)Thread->StackLimit, KERNEL_STACK_SIZE); MmUpdatePageDir((PEPROCESS)Process, (PVOID)Thread, sizeof(ETHREAD)); /* Initalize the Thread Context */ _____ Modified: trunk/reactos/ntoskrnl/ke/process.c --- trunk/reactos/ntoskrnl/ke/process.c 2006-01-11 05:55:49 UTC (rev 20780) +++ trunk/reactos/ntoskrnl/ke/process.c 2006-01-11 06:01:54 UTC (rev 20781) @@ -60,7 +60,7 @@ * To prevent this, make sure the page directory of the process we're * attaching to is up-to-date. */ - MmUpdatePageDir((PEPROCESS)Process, (PVOID)Thread->StackLimit, MM_STACK_SIZE); + MmUpdatePageDir((PEPROCESS)Process, (PVOID)Thread->StackLimit, KERNEL_STACK_SIZE); MmUpdatePageDir((PEPROCESS)Process, (PVOID)Thread, sizeof(ETHREAD)); }

18 years, 8 months

[ion] 20780: - Fix MmCreateKernelStack to actually take into account the GuiStack parameter.

by ion＠svn.reactos.org

- Fix MmCreateKernelStack to actually take into account the GuiStack parameter. - Implement KeSwitchKernelStack - Enable code in PsConvertToGuiThread to create a new stack and switch to it. GUI Threads now get the 60KB of kernel stack space they deserve. - Define exported DDK constants for kernel stack size and undefine our own internal ones. Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h Modified: trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S Modified: trunk/reactos/ntoskrnl/mm/process.c Modified: trunk/reactos/ntoskrnl/ps/win32.c Modified: trunk/reactos/w32api/include/ddk/winddk.h _____ Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h --- trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h 2006-01-11 05:42:32 UTC (rev 20779) +++ trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h 2006-01-11 05:55:49 UTC (rev 20780) @@ -254,9 +254,5 @@ #endif #endif -/* - * - */ -#define MM_STACK_SIZE (3*4096) #endif /* INCLUDE_INTERNAL_NTOSKRNL_H */ _____ Modified: trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S --- trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S 2006-01-11 05:42:32 UTC (rev 20779) +++ trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S 2006-01-11 05:55:49 UTC (rev 20780) @@ -1,53 +1,439 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/ke/i386s/usercall.S + * PROJECT: ReactOS Kernel + * FILE: ntoskrnl/ke/i386/usercall_asm.S * PURPOSE: User-Mode callbacks and return. - * * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) */ /* INCLUDES ******************************************************************/ -#include <roscfg.h> +#include <asm.h> +//#include <bugcodes.h> +#define APC_INDEX_MISMATCH 1 +#define IRQL_GT_ZERO_AT_SYSTEM_SERVICE 0x4A +#define STATUS_NO_CALLBACK_ACTIVE 0xC0000258 .intel_syntax noprefix +// This file is a work in progress. Most of the code is currently disabled. + /* GLOBALS ****************************************************************/ -.extern PVOID _SystemDllCallbackDispatcher +.extern PVOID _KeUserCallbackDispatcher -#define CBSTACK_BUFFER_ADDRESS 0x20 -#define CBSTACK_BUFFER_LENGTH 0x24 /* FUNCTIONS ****************************************************************/ +.globl _KiGetUserModeStackAddress@0 +.func KiGetUserModeStackAddress@0 +_KiGetUserModeStackAddress@0: + + /* Get the current thread's trapframe and return the esp */ + mov eax, fs:[KPCR_CURRENT_THREAD] + mov eax, [eax+KTHREAD_TRAP_FRAME] + lea eax, [eax+KTRAP_FRAME_ESP] + +.endfunc + /*++ - * KiSwitchToUserMode + * @name KiCallUserMode * * The KiSwitchToUserMode routine sets up a Trap Frame and a Callback stack * for the purpose of switching to user mode. The actual final jump is done * by KiServiceExit which will treat this as a syscall return. * - * Params: - * OutputBuffer - Pointer to a caller-allocated buffer where to receive - * the return data from the user-mode function + * @param OutputBuffer + * Pointer to a caller-allocated buffer where to receive the return data + * from the user-mode function * - * OutputLength - Size of the Output Buffer described above. + * @param OutputLength + * Size of the Output Buffer described above. * - * Returns: - * Jumps into KiServiceExit. + * @return None. Jumps into KiServiceExit. * - * Remarks: - * If there is not enough Kernel Stack space, the routine will increase the - * Kernel Stack. + * @remark If there is not enough Kernel Stack space, the routine will increase the + * Kernel Stack. * - * User mode execution resumes at ntdll!KiUserCallbackDispatcher. + * User mode execution resumes at ntdll!KiUserCallbackDispatcher. * - * This call MUST be paired by interrupt 0x2B or NtCallbackReturn. + * This call MUST be paired by interrupt 0x2B or NtCallbackReturn. * *--*/ -.globl _KiSwitchToUserMode@8 -.func KiSwitchToUserMode@8 -_KiSwitchToUserMode@8: +.globl _KiCallUserMode@8 +.func KiCallUserMode@8 +_KiCallUserMode@8: + /* Save volatile registers */ + push ebp + push ebx + push esi + push edi + + /* Get the current thread */ + mov ebx, fs:[KPCR_CURRENT_THREAD] + + /* Make sure we're at passive */ + call _KeGetCurrentIrql@0 + or al, al + jz AtPassive + + /* We're not, bugcheck! */ + push 0 + push 0 + push eax + push 0 + push IRQL_GT_ZERO_AT_SYSTEM_SERVICE + call _KeBugCheckEx@20 + +AtPassive: + + /* Make sure that we are not attached and that APCs are not disabled */ + movzx eax, byte ptr [ebx+KTHREAD_APC_STATE_INDEX] + mov edx, [ebx+KTHREAD_COMBINED_APC_DISABLE] + or eax, eax + jz InvalidIndex + or edx, edx + jz ApcsEnabled + +InvalidIndex: + + push 0 + push edx + push eax + push 0 + push APC_INDEX_MISMATCH + call _KeBugCheckEx@20 + +ApcsEnabled: + + /* Get the lowest stack limit and check if we can handle it */ + lea eax, [esp-0x3000] + cmp eax, [ebx+KTHREAD_STACK_LIMIT] + jnb StackOk + + /* We can't, we'll have to grow our stack */ + push esp + call _MmGrowKernelStack@4 + + /* Quit if we failed */ + or eax, eax + jnz GrowFailed + + /* Save the current callback stack */ +StackOk: + push [ebx+KTHREAD_CALLBACK_STACK] + + /* Get and save the trap frame */ + mov edx, [ebx+KTHREAD_TRAP_FRAME] + push edx + + /* Get and save the initial stack */ + mov esi, [ebx+KTHREAD_INITIAL_STACK] + push esi + + /* Set the new callback stack */ + mov [ebx+KTHREAD_CALLBACK_STACK], esp + + /* Align stack on 16-byte boundary */ + and esp, ~16 + mov edi, esp + + /* Set destination and origin NPX Areas */ + sub esp, NPX_FRAME_LENGTH + sub esi, NPX_FRAME_LENGTH + + /* Disable interrupts so we can fill the NPX State */ + cli + + /* Now copy the NPX State */ + mov ecx, [esi+FN_CONTROL_WORD] + mov [esi+FN_CONTROL_WORD], ecx + mov ecx, [esi+FN_STATUS_WORD] + mov [esi+FN_STATUS_WORD], ecx + mov ecx, [esi+FN_TAG_WORD] + mov [esi+FN_TAG_WORD], ecx + mov ecx, [esi+FN_DATA_SELECTOR] + mov [esi+FN_DATA_SELECTOR], ecx + mov ecx, [esi+FN_CR0_NPX_STATE] + mov [esi+FN_CR0_NPX_STATE], ecx + + /* Get TSS */ + mov esi, fs:[KPCR_TSS] + + /* Set the stack address */ + mov [ebx+KTHREAD_INITIAL_STACK], edi + + /* Bias the stack for V86 mode */ + mov ecx, esp + sub esp, 16 + test dword ptr [edx+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK + jnz DontBias + mov ecx, esp + +DontBias: + /* Set new stack address in TSS */ + mov [esi+KTSS_ESP0], ecx + + /* Allocate the trap frame and set it */ + sub esp, KTRAP_FRAME_V86_ES + mov ebp, esp + + /* Set copy iterator and dest/origin parameters and do the copy */ + mov ecx, (KTRAP_FRAME_V86_ES - KTRAP_FRAME_FS) / 4 + lea edi, [esp+KTRAP_FRAME_FS] + lea esi, [esp+KTRAP_FRAME_FS] + rep movsd + + /* FIXME: Copy debug registers if needed */ + + /* Get user-mode dispatcher address and set it as EIP */ + mov eax, _KeUserCallbackDispatcher + mov [esp+KTRAP_FRAME_EIP], eax + + /* Set the exception list */ + mov eax, [KPCR_EXCEPTION_LIST] + mov [esp+KTRAP_FRAME_EXCEPTION_LIST], eax + + /* Set the previous mode */ + mov eax, [EDX+KTRAP_FRAME_PREVIOUS_MODE] + mov [esp+KTRAP_FRAME_PREVIOUS_MODE], eax + + /* Bring interrupts back */ + sti + + /* Write the debug data */ + mov edi, [ebp+KTRAP_FRAME_EBP] + mov edx, [ebp+KTRAP_FRAME_EIP] + mov [ebp+KTRAP_FRAME_DEBUGPOINTER], edx + mov dword ptr [ebp+KTRAP_FRAME_DEBUGARGMARK], 0xBADB0D00 + mov [ebp+KTRAP_FRAME_DEBUGEBP], ebx + mov [ebp+KTRAP_FRAME_DEBUGEIP], edi + + /* Exit to user-mode */ + jmp _KiServiceExit + +GrowFailed: + /* Restore registers */ + pop edi + pop esi + pop ebx + pop ebp + + /* Return */ + ret 8 + .endfunc +/*++ + * @name NtCallbackReturn + * + * The NtCallbackReturn routine returns to kernel mode after a user-mode + * callback was done through KeUserModeCallback. It uses the callback frame + * which was setup in order to return the information, restores the stack, + * and resumes execution where it was left off. + * + * @param Result + * Pointer to a caller-allocated buffer where the return data + * from the user-mode function is located. + * + * @param ResultLength + * Size of the Output Buffer described above. + * + * @param CallbackStatus + * Status code of the callback operation. + * + * @return Status code of the callback operation. + * + * @remark This call MUST be paired with KeUserModeCallback. + * + *--*/ +.globl _NtCallbackReturn2@12 +.func NtCallbackReturn2@12 +_NtCallbackReturn2@12: + /* Get the current thread and make sure we have a callback stack */ + mov eax, fs:[KPCR_CURRENT_THREAD] + mov ecx, [eax+KTHREAD_CALLBACK_STACK] + test ecx, ecx + jz NoStack + + /* Get the trap frame */ + mov ebx, [eax+KTHREAD_TRAP_FRAME] + + /* Restore the exception list */ + mov edx, [ebx+KTRAP_FRAME_EXCEPTION_LIST] + mov fs:[KPCR_EXCEPTION_LIST], edx + + /* Get the result, the result length and the status */ + mov edi, [esp+4] + mov esi, [esp+8] + mov ebp, [esp+12] + + /* Store the results in the callback stack */ + mov ebx, [ecx+CBSTACK_RESULT] + mov [ebx], edi + mov ebx, [ecx+CBSTACK_RESULT_LENGTH] + mov [ebx], esi + + /* Get the previous stack */ + mov ebx, [ecx] + + /* Disable interrupts for NPX save and stack switch */ + cli + + /* Get the initial stack and restore it */ + mov esi, fs:[KPCR_INITIAL_STACK] + mov [eax+KTHREAD_INITIAL_STACK], ebx + + /* Set desination and origin NPX Frames */ + sub esi, NPX_FRAME_LENGTH + sub ebx, NPX_FRAME_LENGTH + + /* Copy NPX Data */ + mov edx, [esi+FN_CONTROL_WORD] + mov [ebx+FN_CONTROL_WORD], edx + mov edx, [esi+FN_STATUS_WORD] + mov [ebx+FN_STATUS_WORD], edx + mov edx, [esi+FN_TAG_WORD] + mov [ebx+FN_TAG_WORD], edx + mov edx, [esi+FN_DATA_SELECTOR] + mov [ebx+FN_DATA_SELECTOR], edx + mov edx, [esi+FN_CR0_NPX_STATE] + mov [ebx+FN_CR0_NPX_STATE], edx + + /* Get saved trap frame and clear DR7 */ + mov edi, [ecx+CBSTACK_TRAP_FRAME] + and dword ptr [edi+KTRAP_FRAME_DR7], 0 + + /* FIXME: Restore debug regs */ + + /* Get TSS */ + mov edx, fs:[KPCR_TSS] + + /* Restore stack pointer */ + lea esp, [ecx+CBSTACK_CALLBACK_STACK] + + /* Check if we were in V86 mode */ + test dword ptr [edi+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK + jnz V86Ret + sub ebx, 16 + +V86Ret: + /* Restore the ESP in TSS */ + mov [edx+KTSS_ESP0], ebx + + /* Restore the trap frame */ + mov [eax+KTHREAD_TRAP_FRAME], edi + + /* Bring interrupts back */ + sti + + /* Restore the callback stack*/ + pop [eax+KTHREAD_CALLBACK_STACK] + + /* Set status and return */ + mov eax, ebp + pop edi + pop esi + pop ebx + pop ebp + pop edx + + /* Clean stack and jump back */ + add esp, 8 + jmp edx + +NoStack: + + /* Return failure */ + mov eax, STATUS_NO_CALLBACK_ACTIVE + ret 12 + +.endfunc + +.globl _KeSwitchKernelStack@8 +.func KeSwitchKernelStack@8 +_KeSwitchKernelStack@8: + + /* Save volatiles */ + push esi + push edi + + /* Get current thread */ + mov edx, fs:[KPCR_CURRENT_THREAD] + + /* Get new and current base */ + mov edi, [esp+12] + mov ecx, [edx+KTHREAD_STACK_BASE] + + /* Fixup the frame pointer */ + sub ebp, ecx + add ebp, edi + + /* Fixup the trap frame */ + mov eax, [edx+KTHREAD_TRAP_FRAME] + sub eax, ecx + add eax, edi + mov [edx+KTHREAD_TRAP_FRAME], eax + + /* Calculate stack size */ + sub ecx, esp + + /* Get desination and origin */ + sub edi, ecx + mov esi, esp + + /* Save stack pointer */ + push edi + + /* Copy stack */ + rep movsb + + /* Restore stack pointer */ + pop edi + + /* Save old stack base and get new limit/base */ + mov eax, [edx+KTHREAD_STACK_BASE] + mov ecx, [esp+12] + mov esi, [esp+16] + + /* Disable interrupts for stack switch */ + cli + + /* Set new base/limit */ + mov [edx+KTHREAD_STACK_BASE], ecx + mov [edx+KTHREAD_STACK_LIMIT], esi + + /* Set LargeStack */ + mov byte ptr [edx+KTHREAD_LARGE_STACK], 1 + + /* Set new initial stack */ + mov [edx+KTHREAD_INITIAL_STACK], ecx + + /* Get trap frame */ + mov esi, [edx+KTHREAD_TRAP_FRAME] + + /* Get TSS */ + mov edx, fs:[KPCR_TSS] + + /* Check if we came from V86 mode */ + test dword ptr [esi+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK + + /* Bias for NPX Area */ + lea ecx, [ecx-NPX_FRAME_LENGTH] + jnz V86Switch + sub ecx, 16 + +V86Switch: + + /* Update ESP in TSS */ + mov [edx+KTSS_ESP0], ecx + + /* Update stack pointer */ + mov esp, edi + + /* Bring back interrupts and return */ + sti + pop edi + pop esi + ret 8 + +.endfunc _____ Modified: trunk/reactos/ntoskrnl/mm/process.c --- trunk/reactos/ntoskrnl/mm/process.c 2006-01-11 05:42:32 UTC (rev 20779) +++ trunk/reactos/ntoskrnl/mm/process.c 2006-01-11 05:55:49 UTC (rev 20780) @@ -134,7 +134,8 @@ PMEMORY_AREA StackArea; ULONG i; PHYSICAL_ADDRESS BoundaryAddressMultiple; - PFN_TYPE Page[MM_STACK_SIZE / PAGE_SIZE]; + ULONG StackSize = GuiStack ? KERNEL_LARGE_STACK_SIZE : KERNEL_STACK_SIZE; + PFN_TYPE Page[KERNEL_LARGE_STACK_SIZE / PAGE_SIZE]; PVOID KernelStack = NULL; NTSTATUS Status; @@ -148,7 +149,7 @@ Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), MEMORY_AREA_KERNEL_STACK, &KernelStack, - MM_STACK_SIZE, + StackSize, PAGE_READWRITE, &StackArea, FALSE, @@ -166,7 +167,7 @@ } /* Mark the Stack in use */ - for (i = 0; i < (MM_STACK_SIZE / PAGE_SIZE); i++) + for (i = 0; i < (StackSize / PAGE_SIZE); i++) { Status = MmRequestPageMemoryConsumer(MC_NPPOOL, TRUE, &Page[i]); } @@ -176,7 +177,7 @@ KernelStack, PAGE_READWRITE, Page, - MM_STACK_SIZE / PAGE_SIZE); + StackSize / PAGE_SIZE); /* Check for success */ if (!NT_SUCCESS(Status)) _____ Modified: trunk/reactos/ntoskrnl/ps/win32.c --- trunk/reactos/ntoskrnl/ps/win32.c 2006-01-11 05:42:32 UTC (rev 20779) +++ trunk/reactos/ntoskrnl/ps/win32.c 2006-01-11 05:55:49 UTC (rev 20780) @@ -71,7 +71,7 @@ NTAPI PsConvertToGuiThread(VOID) { - //PVOID NewStack, OldStack; + PVOID NewStack, OldStack; PETHREAD Thread = PsGetCurrentThread(); PEPROCESS Process = PsGetCurrentProcess(); NTSTATUS Status; @@ -99,11 +99,9 @@ } /* Check if we don't already have a kernel-mode stack */ -#if 0 if (!Thread->Tcb.LargeStack) { /* We don't create one */ - DPRINT1("Creating large stack\n"); NewStack = MmCreateKernelStack(TRUE); if (!NewStack) { @@ -116,28 +114,15 @@ KeEnterCriticalRegion(); /* Switch stacks */ - DPRINT1("Switching stacks. NS IT, SL, SB, KS %p %p %p %p %p\n", - NewStack, - Thread->Tcb.InitialStack, - Thread->Tcb.StackLimit, - Thread->Tcb.StackBase, - Thread->Tcb.KernelStack); OldStack = KeSwitchKernelStack((PVOID)((ULONG_PTR)NewStack + 0x3000), NewStack); /* Leave the critical region */ KeLeaveCriticalRegion(); - DPRINT1("We made it!\n"); /* Delete the old stack */ //MmDeleteKernelStack(OldStack, FALSE); - DPRINT1("Old stack deleted. IT, SL, SB, KS %p %p %p %p\n", - Thread->Tcb.InitialStack, - Thread->Tcb.StackLimit, - Thread->Tcb.StackBase, - Thread->Tcb.KernelStack); } -#endif /* This check is bizare. Check out win32k later */ if (!Process->Win32Process) _____ Modified: trunk/reactos/w32api/include/ddk/winddk.h --- trunk/reactos/w32api/include/ddk/winddk.h 2006-01-11 05:42:32 UTC (rev 20779) +++ trunk/reactos/w32api/include/ddk/winddk.h 2006-01-11 05:55:49 UTC (rev 20780) @@ -204,6 +204,10 @@ #define NtCurrentThread() ( (HANDLE)(LONG_PTR) -2 ) #define ZwCurrentThread() NtCurrentThread() +#define KERNEL_STACK_SIZE 12288 +#define KERNEL_LARGE_STACK_SIZE 61440 + + #define DPFLTR_ERROR_LEVEL 0 #define DPFLTR_WARNING_LEVEL 1 #define DPFLTR_TRACE_LEVEL 2

18 years, 8 months

[ion] 20779: - Remove KiServiceCheck and implement PsConvertToGuiThread in its place. Has support for detecting and returning errors in case of invalid cases, currently disabled code for doing the required 4kb->12kb stack conversion, and handling certain failures.

by ion＠svn.reactos.org

- Remove KiServiceCheck and implement PsConvertToGuiThread in its place. Has support for detecting and returning errors in case of invalid cases, currently disabled code for doing the required 4kb->12kb stack conversion, and handling certain failures. Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S Modified: trunk/reactos/ntoskrnl/ke/kthread.c Modified: trunk/reactos/ntoskrnl/ps/win32.c _____ Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S --- trunk/reactos/ntoskrnl/ke/i386/syscall.S 2006-01-11 05:24:40 UTC (rev 20778) +++ trunk/reactos/ntoskrnl/ke/i386/syscall.S 2006-01-11 05:42:32 UTC (rev 20779) @@ -614,7 +614,7 @@ /* Set up Win32K Table */ push edx push ebx - call _KiServiceCheck@0 + call _PsConvertToGuiThread@0 /* FIXME: Handle failure */ pop eax _____ Modified: trunk/reactos/ntoskrnl/ke/kthread.c --- trunk/reactos/ntoskrnl/ke/kthread.c 2006-01-11 05:24:40 UTC (rev 20778) +++ trunk/reactos/ntoskrnl/ke/kthread.c 2006-01-11 05:42:32 UTC (rev 20779) @@ -1466,21 +1466,6 @@ return OldState; } -VOID -NTAPI -KiServiceCheck(VOID) -{ - PKTHREAD Thread = KeGetCurrentThread(); - - /* Check if we need to inialize Win32 for this Thread */ - if (Thread->ServiceTable != KeServiceDescriptorTableShadow) { - - /* We do. Initialize it and save the new table */ - Thread->ServiceTable = KeServiceDescriptorTableShadow; - PsInitWin32Thread((PETHREAD)Thread); - } -} - /* * * NOT EXPORTED _____ Modified: trunk/reactos/ntoskrnl/ps/win32.c --- trunk/reactos/ntoskrnl/ps/win32.c 2006-01-11 05:24:40 UTC (rev 20778) +++ trunk/reactos/ntoskrnl/ps/win32.c 2006-01-11 05:42:32 UTC (rev 20779) @@ -41,6 +41,13 @@ } NTW32CALL_SAVED_STATE, *PNTW32CALL_SAVED_STATE; #endif +PVOID +STDCALL +KeSwitchKernelStack( + IN PVOID StackBase, + IN PVOID StackLimit +); + /* FUNCTIONS ***************************************************************/ /* @@ -62,33 +69,105 @@ NTSTATUS NTAPI -PsInitWin32Thread (PETHREAD Thread) +PsConvertToGuiThread(VOID) { - PEPROCESS Process; - NTSTATUS Status = STATUS_SUCCESS; + //PVOID NewStack, OldStack; + PETHREAD Thread = PsGetCurrentThread(); + PEPROCESS Process = PsGetCurrentProcess(); + NTSTATUS Status; + PAGED_CODE(); - Process = Thread->ThreadsProcess; + /* Validate the previous mode */ + if (KeGetPreviousMode() == KernelMode) + { + DPRINT1("Danger: win32k call being made in kernel-mode?!\n"); + return STATUS_INVALID_PARAMETER; + } - if (Process->Win32Process == NULL) + /* Make sure win32k is here */ + if (!PspWin32ProcessCallback) { - if (PspWin32ProcessCallback != NULL) + DPRINT1("Danger: Win32K call attempted but Win32k not ready!\n"); + return STATUS_ACCESS_DENIED; + } + + /* Make sure it's not already win32 */ + if (Thread->Tcb.ServiceTable != KeServiceDescriptorTable) + { + DPRINT1("Danger: Thread is already a win32 thread. Limit bypassed?\n"); + return STATUS_ALREADY_WIN32; + } + + /* Check if we don't already have a kernel-mode stack */ +#if 0 + if (!Thread->Tcb.LargeStack) + { + /* We don't create one */ + DPRINT1("Creating large stack\n"); + NewStack = MmCreateKernelStack(TRUE); + if (!NewStack) { - Status = PspWin32ProcessCallback(Process, TRUE); + /* Panic in user-mode */ + NtCurrentTeb()->LastErrorValue = ERROR_NOT_ENOUGH_MEMORY; + return STATUS_NO_MEMORY; } + + /* We're about to switch stacks. Enter a critical region */ + KeEnterCriticalRegion(); + + /* Switch stacks */ + DPRINT1("Switching stacks. NS IT, SL, SB, KS %p %p %p %p %p\n", + NewStack, + Thread->Tcb.InitialStack, + Thread->Tcb.StackLimit, + Thread->Tcb.StackBase, + Thread->Tcb.KernelStack); + OldStack = KeSwitchKernelStack((PVOID)((ULONG_PTR)NewStack + 0x3000), + NewStack); + + /* Leave the critical region */ + KeLeaveCriticalRegion(); + DPRINT1("We made it!\n"); + + /* Delete the old stack */ + //MmDeleteKernelStack(OldStack, FALSE); + DPRINT1("Old stack deleted. IT, SL, SB, KS %p %p %p %p\n", + Thread->Tcb.InitialStack, + Thread->Tcb.StackLimit, + Thread->Tcb.StackBase, + Thread->Tcb.KernelStack); } +#endif - if (Thread->Tcb.Win32Thread == NULL) + /* This check is bizare. Check out win32k later */ + if (!Process->Win32Process) { - if (PspWin32ThreadCallback != NULL) + /* Now tell win32k about us */ + Status = PspWin32ProcessCallback(Process, TRUE); + if (!NT_SUCCESS(Status)) { - Status = PspWin32ThreadCallback(Thread, TRUE); + DPRINT1("Danger: Win32k wasn't happy about us!\n"); + return Status; } } + /* Set the new service table */ + Thread->Tcb.ServiceTable = KeServiceDescriptorTableShadow; + ASSERT(Thread->Tcb.Win32Thread == 0); + + /* Tell Win32k about our thread */ + Status = PspWin32ThreadCallback(Thread, TRUE); + if (!NT_SUCCESS(Status)) + { + /* Revert our table */ + DPRINT1("Danger: Win32k wasn't happy about us!\n"); + Thread->Tcb.ServiceTable = KeServiceDescriptorTable; + } + + /* Return status */ return Status; } - VOID NTAPI PsTerminateWin32Process (PEPROCESS Process) @@ -122,72 +201,6 @@ } } -VOID -STDCALL -DumpEspData(ULONG Esp, ULONG ThLimit, ULONG ThStack, ULONG PcrLimit, ULONG PcrStack, ULONG Esp0) -{ - DPRINT1("Current Esp: %p\n Thread Stack Limit: %p\n Thread Stack: %p\n Pcr Limit: %p, Pcr Stack: %p\n Esp0 :%p\n",Esp, ThLimit, ThStack, PcrLimit, PcrStack, Esp0) ; -} - - PVOID -STDCALL - PsAllocateCallbackStack(ULONG StackSize) - { - PVOID KernelStack = NULL; - NTSTATUS Status; - PMEMORY_AREA StackArea; - ULONG i, j; - PHYSICAL_ADDRESS BoundaryAddressMultiple; - PPFN_TYPE Pages = alloca(sizeof(PFN_TYPE) * (StackSize /PAGE_SIZE)); - - DPRINT1("PsAllocateCallbackStack\n"); - BoundaryAddressMultiple.QuadPart = 0; - StackSize = PAGE_ROUND_UP(StackSize); - MmLockAddressSpace(MmGetKernelAddressSpace()); - Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_KERNEL_STACK, - &KernelStack, - StackSize, - PAGE_READWRITE, - &StackArea, - FALSE, - 0, - BoundaryAddressMultiple); - MmUnlockAddressSpace(MmGetKernelAddressSpace()); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to create thread stack\n"); - return(NULL); - } - for (i = 0; i < (StackSize / PAGE_SIZE); i++) - { - Status = MmRequestPageMemoryConsumer(MC_NPPOOL, TRUE, &Pages[i]); - if (!NT_SUCCESS(Status)) - { - for (j = 0; j < i; j++) - { - MmReleasePageMemoryConsumer(MC_NPPOOL, Pages[j]); - } - return(NULL); - } - } - Status = MmCreateVirtualMapping(NULL, - KernelStack, - PAGE_READWRITE, - Pages, - StackSize / PAGE_SIZE); - if (!NT_SUCCESS(Status)) - { - for (i = 0; i < (StackSize / PAGE_SIZE); i++) - { - MmReleasePageMemoryConsumer(MC_NPPOOL, Pages[i]); - } - return(NULL); - } - DPRINT1("PsAllocateCallbackStack %x\n", KernelStack); - return(KernelStack); -} - NTSTATUS STDCALL NtW32Call(IN ULONG RoutineIndex,

18 years, 8 months

[ion] 20778: - Move MmGrowKernelStack to mm/process.c with the other functions for future use.

by ion＠svn.reactos.org

- Move MmGrowKernelStack to mm/process.c with the other functions for future use. - Make KiServiceCheck stdcall for future use. Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S Modified: trunk/reactos/ntoskrnl/ke/kthread.c Modified: trunk/reactos/ntoskrnl/mm/mm.c Modified: trunk/reactos/ntoskrnl/mm/process.c _____ Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S --- trunk/reactos/ntoskrnl/ke/i386/syscall.S 2006-01-11 04:45:45 UTC (rev 20777) +++ trunk/reactos/ntoskrnl/ke/i386/syscall.S 2006-01-11 05:24:40 UTC (rev 20778) @@ -614,12 +614,16 @@ /* Set up Win32K Table */ push edx push ebx - call _KiServiceCheck + call _KiServiceCheck@0 /* FIXME: Handle failure */ pop eax pop edx + /* Reset trap frame address */ + mov ebp, esp + mov [esi+KTHREAD_TRAP_FRAME], ebp + /* Try the Call again */ jmp CheckValidCall _____ Modified: trunk/reactos/ntoskrnl/ke/kthread.c --- trunk/reactos/ntoskrnl/ke/kthread.c 2006-01-11 04:45:45 UTC (rev 20777) +++ trunk/reactos/ntoskrnl/ke/kthread.c 2006-01-11 05:24:40 UTC (rev 20778) @@ -1467,7 +1467,8 @@ } VOID -KiServiceCheck (VOID) +NTAPI +KiServiceCheck(VOID) { PKTHREAD Thread = KeGetCurrentThread(); _____ Modified: trunk/reactos/ntoskrnl/mm/mm.c --- trunk/reactos/ntoskrnl/mm/mm.c 2006-01-11 04:45:45 UTC (rev 20777) +++ trunk/reactos/ntoskrnl/mm/mm.c 2006-01-11 05:24:40 UTC (rev 20778) @@ -405,24 +405,9 @@ return (0); } - /* * @unimplemented */ -NTSTATUS -STDCALL -MmGrowKernelStack ( - DWORD Unknown0 -) -{ - UNIMPLEMENTED; - return (STATUS_NOT_IMPLEMENTED); -} - - -/* - * @unimplemented - */ BOOLEAN STDCALL MmSetAddressRangeModified ( _____ Modified: trunk/reactos/ntoskrnl/mm/process.c --- trunk/reactos/ntoskrnl/mm/process.c 2006-01-11 04:45:45 UTC (rev 20777) +++ trunk/reactos/ntoskrnl/mm/process.c 2006-01-11 05:24:40 UTC (rev 20778) @@ -185,11 +185,24 @@ KEBUGCHECK(0); } + /* Return the stack */ return KernelStack; } +/* + * @implemented + */ NTSTATUS STDCALL +MmGrowKernelStack(PVOID StackPointer) +{ + DPRINT1("We don't support expansion yet :(\n"); + KEBUGCHECK(0); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +STDCALL MmCreatePeb(PEPROCESS Process) { PPEB Peb = NULL;

18 years, 8 months

[ion] 20777: - New asm definitions for future use.

by ion＠svn.reactos.org

- New asm definitions for future use. Modified: trunk/reactos/include/ndk/asm.h _____ Modified: trunk/reactos/include/ndk/asm.h --- trunk/reactos/include/ndk/asm.h 2006-01-11 00:02:14 UTC (rev 20776) +++ trunk/reactos/include/ndk/asm.h 2006-01-11 04:45:45 UTC (rev 20777) @@ -85,8 +85,12 @@ #define KTHREAD_WAIT_IRQL 0x4E #define KTHREAD_SERVICE_TABLE 0x118 #define KTHREAD_PREVIOUS_MODE 0xD7 +#define KTHREAD_COMBINED_APC_DISABLE 0x70 +#define KTHREAD_LARGE_STACK 0x107 #define KTHREAD_TRAP_FRAME 0x110 #define KTHREAD_CALLBACK_STACK 0x114 +#define KTHREAD_APC_STATE_INDEX 0x11C +#define KTHREAD_STACK_BASE 0x158 // // KPROCESS Offsets @@ -311,6 +315,15 @@ #define CR0_PG 0x80000000 // +// Usermode callout frame definitions +// +#define CBSTACK_STACK 0x0 +#define CBSTACK_TRAP_FRAME 0x4 +#define CBSTACK_CALLBACK_STACK 0x8 +#define CBSTACK_RESULT 0x20 +#define CBSTACK_RESULT_LENGTH 0x24 + +// // Generic Definitions // #define MAXIMUM_IDTVECTOR 0xFF

18 years, 8 months

[gedmurphy] 20776: use GET_X/Y_LPARAM as per MSDN

by gedmurphy＠svn.reactos.org

use GET_X/Y_LPARAM as per MSDN Modified: trunk/reactos/subsys/system/servman/servman.c Modified: trunk/reactos/subsys/system/servman/servman.h _____ Modified: trunk/reactos/subsys/system/servman/servman.c --- trunk/reactos/subsys/system/servman/servman.c 2006-01-10 23:48:33 UTC (rev 20775) +++ trunk/reactos/subsys/system/servman/servman.c 2006-01-11 00:02:14 UTC (rev 20776) @@ -318,8 +318,8 @@ { int xPos, yPos; - xPos = LOWORD(lParam); - yPos = HIWORD(lParam); + xPos = GET_X_LPARAM(lParam); + yPos = GET_Y_LPARAM(lParam); TrackPopupMenuEx(hShortcutMenu, TPM_RIGHTBUTTON, xPos, yPos, hwnd, NULL); } _____ Modified: trunk/reactos/subsys/system/servman/servman.h --- trunk/reactos/subsys/system/servman/servman.h 2006-01-10 23:48:33 UTC (rev 20775) +++ trunk/reactos/subsys/system/servman/servman.h 2006-01-11 00:02:14 UTC (rev 20776) @@ -1,8 +1,9 @@ #ifndef __SERVMAN_H #define __SERVMAN_H - +#define WIN32_LEAN_AND_MEAN #include <windows.h> +#include <windowsx.h> #include <stdio.h> #include <tchar.h> #include <commctrl.h>

18 years, 8 months

[gedmurphy] 20775: Use WM_CONTEXTMENU for shortcut menu. Thanks Thomas :)

by gedmurphy＠svn.reactos.org

Use WM_CONTEXTMENU for shortcut menu. Thanks Thomas :) Modified: trunk/reactos/subsys/system/servman/servman.c _____ Modified: trunk/reactos/subsys/system/servman/servman.c --- trunk/reactos/subsys/system/servman/servman.c 2006-01-10 23:29:29 UTC (rev 20774) +++ trunk/reactos/subsys/system/servman/servman.c 2006-01-10 23:48:33 UTC (rev 20775) @@ -236,17 +236,6 @@ switch (((LPNMHDR) lParam)->code) { - case NM_RCLICK: - { - //item = (LPNMITEMACTIVATE) lParam; - //lpnmh = (LPNMHDR) lParam; - POINT pt; - - GetCursorPos(&pt); - TrackPopupMenuEx(hShortcutMenu, TPM_RIGHTBUTTON, pt.x, pt.y, hwnd, NULL); - } - break; - case NM_DBLCLK: item = (LPNMITEMACTIVATE) lParam; PropSheets(hwnd); @@ -316,8 +305,7 @@ break; case WM_CLOSE: - /* free the service array */ - FreeMemory(); + FreeMemory(); /* free the service array */ DestroyMenu(hShortcutMenu); DestroyWindow(hwnd); break; @@ -326,6 +314,17 @@ PostQuitMessage(0); break; + case WM_CONTEXTMENU: + { + int xPos, yPos; + + xPos = LOWORD(lParam); + yPos = HIWORD(lParam); + + TrackPopupMenuEx(hShortcutMenu, TPM_RIGHTBUTTON, xPos, yPos, hwnd, NULL); + } + break; + case WM_COMMAND: switch(LOWORD(wParam)) {

18 years, 8 months

[gvg] 20774: WRC doesn't understand the "Default"

by gvg＠svn.reactos.org

WRC doesn't understand the "Default" Modified: trunk/reactos/subsys/system/servman/En.rc _____ Modified: trunk/reactos/subsys/system/servman/En.rc --- trunk/reactos/subsys/system/servman/En.rc 2006-01-10 22:39:49 UTC (rev 20773) +++ trunk/reactos/subsys/system/servman/En.rc 2006-01-10 23:29:29 UTC (rev 20774) @@ -50,7 +50,7 @@ MENUITEM SEPARATOR MENUITEM "Refresh",ID_REFRESH MENUITEM SEPARATOR - MENUITEM "Properties",ID_PROP, "Default" + MENUITEM "Properties",ID_PROP MENUITEM SEPARATOR MENUITEM "About",ID_HELP END

18 years, 8 months

← Newer
1
...
28
29
30
31
32
33
34
...
59
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2006