Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 23623: - Damn copy/paste bug.
by ion＠svn.reactos.org 20 Aug '06

20 Aug '06

Author: ion Date: Mon Aug 21 00:02:18 2006 New Revision: 23623 URL: http://svn.reactos.org/svn/reactos?rev=23623&view=rev Log: - Damn copy/paste bug. Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/device.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/device.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/device.c Mon Aug 21 00:02:18 2006 @@ -1096,7 +1096,7 @@ else { /* It's not, so return failure */ - return STATUS_VOLUME_DISMOUNTED; + Status = STATUS_VOLUME_DISMOUNTED; } } else

1 0

[ion] 23622: - Fix bug 1764 reported by alexvlas.
by ion＠svn.reactos.org 20 Aug '06

20 Aug '06

Author: ion Date: Mon Aug 21 00:00:56 2006 New Revision: 23622 URL: http://svn.reactos.org/svn/reactos?rev=23622&view=rev Log: - Fix bug 1764 reported by alexvlas. Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/device.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/device.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/device.c Mon Aug 21 00:00:56 2006 @@ -1067,6 +1067,7 @@ PEXTENDED_DEVOBJ_EXTENSION DeviceExtension; PVPB Vpb; KIRQL OldIrql; + NTSTATUS Status; /* Make sure there's a VPB */ if (!FileSystemDeviceObject->Vpb) return STATUS_INVALID_PARAMETER; @@ -1079,21 +1080,34 @@ /* Make sure this one has a VPB too */ Vpb = DeviceExtension->Vpb; - if (!Vpb) return STATUS_INVALID_PARAMETER; - - /* Make sure that it's mounted */ - if ((!Vpb->ReferenceCount) || (Vpb->Flags & VPB_MOUNTED)) - { - /* It's not, so return failure */ - return STATUS_VOLUME_DISMOUNTED; - } - - /* Return the Disk Device Object */ - *DiskDeviceObject = Vpb->RealDevice; + if (Vpb) + { + /* Make sure that it's mounted */ + if ((Vpb->ReferenceCount) && + (Vpb->Flags & VPB_MOUNTED)) + { + /* Return the Disk Device Object */ + *DiskDeviceObject = Vpb->RealDevice; + + /* Reference it and return success */ + ObReferenceObject(Vpb->RealDevice); + Status = STATUS_SUCCESS; + } + else + { + /* It's not, so return failure */ + return STATUS_VOLUME_DISMOUNTED; + } + } + else + { + /* Fail */ + Status = STATUS_INVALID_PARAMETER; + } /* Release the lock */ IoReleaseVpbSpinLock(OldIrql); - return STATUS_SUCCESS; + return Status; } /*

1 0

[ion] 23621: - Add support for APC-delivery after context-switch (not yet programmed) - Detect and crash if context switch is done inside a DPC. - Switch kernel stack a bit earlier - Don't switch address space if we're still in the same process, and fix some duplicated code that was mixed up together. - Move LDT setup out-of-line.
by ion＠svn.reactos.org 20 Aug '06

20 Aug '06

Author: ion Date: Sun Aug 20 23:55:32 2006 New Revision: 23621 URL: http://svn.reactos.org/svn/reactos?rev=23621&view=rev Log: - Add support for APC-delivery after context-switch (not yet programmed) - Detect and crash if context switch is done inside a DPC. - Switch kernel stack a bit earlier - Don't switch address space if we're still in the same process, and fix some duplicated code that was mixed up together. - Move LDT setup out-of-line. Modified: trunk/reactos/include/ndk/asm.h trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S trunk/reactos/ntoskrnl/ke/i386/thread.c Modified: trunk/reactos/include/ndk/asm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/asm.h?rev=2362… ============================================================================== --- trunk/reactos/include/ndk/asm.h (original) +++ trunk/reactos/include/ndk/asm.h Sun Aug 20 23:55:32 2006 @@ -148,6 +148,7 @@ #define KPCR_DR6 0x428 #define KPCR_DR7 0x42C #define KPCR_SYSTEM_CALLS 0x6B8 +#define KPCR_PRCB_DPC_ROUTINE_ACTIVE 0x994 // // KGDTENTRY Offsets @@ -383,6 +384,7 @@ #define APC_INDEX_MISMATCH 0x01 #define IRQL_GT_ZERO_AT_SYSTEM_SERVICE 0x4A #define UNEXPECTED_KERNEL_MODE_TRAP 0x7F +#define ATTEMPTED_SWITCH_FROM_DPC 0xB8 #endif // Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/ctxswitch… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S (original) +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S Sun Aug 20 23:55:32 2006 @@ -115,19 +115,30 @@ .globl @KiSwapContextInternal@0 @KiSwapContextInternal@0: + /* Save WaitIrql APC-bypass in EFLAGS */ + or cl, cl + /* Set the Thread to running */ mov byte ptr [esi+KTHREAD_STATE], Running + /* Save the flags */ + pushf + /* Save the Exception list */ push [ebx+KPCR_EXCEPTION_LIST] - + + /* DPC shouldn't be active */ + cmp byte ptr [ebx+KPCR_PRCB_DPC_ROUTINE_ACTIVE], 0 + jnz BugCheckDpc + /* Switching, disable interrupts now */ cli - /* Save the initial stack in EAX */ + /* Update kernel stack */ + mov [edi+KTHREAD_KERNEL_STACK], esp + + /* Get stack pointers */ mov eax, [esi+KTHREAD_INITIAL_STACK] - - /* Save the stack limit in ecx */ mov ecx, [esi+KTHREAD_STACK_LIMIT] /* Make space for the NPX Frame */ @@ -137,8 +148,7 @@ mov [ebx+KPCR_INITIAL_STACK], eax mov [ebx+KPCR_STACK_LIMIT], ecx - /* Save the stack pointer in this processors TSS */ - mov ebp, [ebx+KPCR_TSS] + /* FIXME Check and update CR0 */ /* Check if this isn't V86 Mode, so we can bias the Esp0 */ test dword ptr [eax - KTRAP_FRAME_SIZE + KTRAP_FRAME_EFLAGS], X86_EFLAGS_VM @@ -150,38 +160,22 @@ NoAdjust: /* Set new ESP0 */ - mov [ebp+KTSS_ESP0], eax + mov ecx, [ebx+KPCR_TSS] + mov [ecx+KTSS_ESP0], eax + + /* Switch to new stack */ + mov esp, [esi+KTHREAD_KERNEL_STACK] /* Set TEB pointer */ mov eax, [esi+KTHREAD_TEB] mov [ebx+KPCR_TEB], eax + /* Stack is OK, safe to enable interrupts now */ + sti + /* Check if address space switch is needed */ mov eax, [esi+KTHREAD_APCSTATE_PROCESS] cmp eax, [edi+KTHREAD_APCSTATE_PROCESS] - mov eax, [eax+KPROCESS_DIRECTORY_TABLE_BASE] - - /* Switch stacks */ - mov [edi+KTHREAD_KERNEL_STACK], esp - mov esp, [esi+KTHREAD_KERNEL_STACK] - - jz NoAddressSpaceSwitch - - /* Clear gs */ - xor ecx, ecx - mov gs, cx - - /* Switch address space */ - mov cr3, eax - mov [ebp+KTSS_CR3], eax - -NoAddressSpaceSwitch: - - /* Stack is OK, safe to enable interrupts now */ - sti - - /* Check if address space switch is needed (the result from above is valid) */ - /* If they match, then use the fast-path and skip all this */ jz SameProcess /* Get the new Process. */ @@ -190,31 +184,31 @@ /* Check if we need an LDT */ xor eax, eax cmp [edi+KPROCESS_LDT_DESCRIPTOR0], eax - jz NoLdt - - /* Write the LDT Selector */ - mov ecx, [ebx+KPCR_GDT] - mov eax, [edi+KPROCESS_LDT_DESCRIPTOR0] - mov [ecx+KGDT_LDT], eax - mov eax, [edi+KPROCESS_LDT_DESCRIPTOR1] - mov [ecx+KGDT_LDT+4], eax - - /* Save LDT Selector */ - mov eax, KGDT_LDT - -NoLdt: - + jnz LdtStuff + +LoadLdt: /* Load LDT */ lldt ax - /* Get the IOPM */ + /* Clear gs */ + xor eax, eax + mov gs, ax + + /* Get the address space */ + mov eax, [edi+KPROCESS_DIRECTORY_TABLE_BASE] + + /* Get the IOPM and TSS */ + mov ebp, [ebx+KPCR_TSS] mov ecx, [edi+KPROCESS_IOPM_OFFSET] + + /* Switch address space */ + mov [ebp+KTSS_CR3], eax + mov cr3, eax /* Set current IOPM offset in the TSS */ mov [ebp+KTSS_IOMAPBASE], cx SameProcess: - /* Set the TEB */ mov eax, [esi+KTHREAD_TEB] mov ecx, [ebx+KPCR_GDT] @@ -225,12 +219,34 @@ /* Increase context switches */ inc dword ptr [esi+KTHREAD_CONTEXT_SWITCHES] + //inc dword ptr [esi+KPRC_PRCB_CONTEXT_SWITCHES] /* Restore exception list */ pop [ebx+KPCR_EXCEPTION_LIST] - /* Return */ + /* Retore EFLAGS */ + popf + + /* Return no APC pending */ + xor eax, eax ret + +LdtStuff: + + /* Write the LDT Selector */ + mov ecx, [ebx+KPCR_GDT] + mov eax, [edi+KPROCESS_LDT_DESCRIPTOR0] + mov [ecx+KGDT_LDT], eax + mov eax, [edi+KPROCESS_LDT_DESCRIPTOR1] + mov [ecx+KGDT_LDT+4], eax + + /* Save LDT Selector */ + mov eax, KGDT_LDT + jmp LoadLdt + +BugCheckDpc: + push ATTEMPTED_SWITCH_FROM_DPC + call _KeBugCheck@4 /*++ * KiSwapContext @@ -275,11 +291,11 @@ /* Get the New Thread */ mov esi, edx + /* Save it as Current thread */ + mov fs:[KPCR_CURRENT_THREAD], esi + /* Get the wait IRQL */ movzx ecx, byte ptr [edi+KTHREAD_WAIT_IRQL] - - /* Save it as Current thread */ - mov fs:[KPCR_CURRENT_THREAD], esi /* Do the swap with the registers correctly setup */ call @KiSwapContextInternal@0 Modified: trunk/reactos/ntoskrnl/ke/i386/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/thread.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/thread.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/thread.c Sun Aug 20 23:55:32 2006 @@ -15,6 +15,7 @@ typedef struct _KSHARED_CTXSWITCH_FRAME { PVOID ExceptionList; + ULONG Flags; PVOID RetEip; } KSHARED_CTXSWITCH_FRAME, *PKSHARED_CTXSWITCH_FRAME; @@ -230,6 +231,7 @@ /* And set up the Context Switch Frame */ CtxSwitchFrame->RetEip = KiThreadStartup; + CtxSwitchFrame->Flags = EFLAGS_INTERRUPT_MASK; CtxSwitchFrame->ExceptionList = (PVOID)0xFFFFFFFF; /* Save back the new value of the kernel stack. */

1 0

[janderwald] 23620: * implement debugger settings for Control Panel Applets for MSVC2005 * in order to use, start the vcproj save sln and restart && enjoy
by janderwald＠svn.reactos.org 20 Aug '06

20 Aug '06

Author: janderwald Date: Sun Aug 20 23:19:21 2006 New Revision: 23620 URL: http://svn.reactos.org/svn/reactos?rev=23620&view=rev Log: * implement debugger settings for Control Panel Applets for MSVC2005 * in order to use, start the vcproj save sln and restart && enjoy Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Sun Aug 20 23:19:21 2006 @@ -242,6 +242,14 @@ fprintf ( OUT, "\t\t\tConfigurationType=\"%d\"\r\n", exe ? 1 : dll ? 2 : lib ? 4 : -1 ); fprintf ( OUT, "\t\t\tCharacterSet=\"2\">\r\n" ); + + if ( module_type == ".cpl" && configuration.VSProjectVersion == "8.00") + { + fprintf ( OUT, "\t\t\t<DebugSettings\r\n" ); + fprintf ( OUT, "\t\t\t\tCommand=\"rundll32.exe\"\r\n" ); + fprintf ( OUT, "\t\t\t\tCommandArguments=\" shell32, Control_RunDLL $(TargetPath),@\"\r\n" ); + fprintf ( OUT, "\t\t\t/>" ); + } fprintf ( OUT, "\t\t\t<Tool\r\n" ); fprintf ( OUT, "\t\t\t\tName=\"VCCLCompilerTool\"\r\n" );

1 0

[ion] 23619: - Some micro-architectural changes and cleanups.
by ion＠svn.reactos.org 20 Aug '06

20 Aug '06

Author: ion Date: Sun Aug 20 23:08:57 2006 New Revision: 23619 URL: http://svn.reactos.org/svn/reactos?rev=23619&view=rev Log: - Some micro-architectural changes and cleanups. Modified: trunk/reactos/include/ndk/asm.h trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S trunk/reactos/ntoskrnl/ke/i386/thread.c trunk/reactos/ntoskrnl/ke/kthread.c Modified: trunk/reactos/include/ndk/asm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/asm.h?rev=2361… ============================================================================== --- trunk/reactos/include/ndk/asm.h (original) +++ trunk/reactos/include/ndk/asm.h Sun Aug 20 23:08:57 2006 @@ -90,17 +90,20 @@ #define KTHREAD_STACK_LIMIT 0x1C #define KTHREAD_TEB 0x74 #define KTHREAD_KERNEL_STACK 0x20 +#define KTHREAD_STATE 0x4C #define KTHREAD_NPX_STATE 0x4D -#define KTHREAD_STATE 0x4C #define KTHREAD_ALERTED 0x5E #define KTHREAD_APCSTATE_PROCESS 0x28 + 0x10 #define KTHREAD_PENDING_USER_APC 0x28 + 0x16 #define KTHREAD_PENDING_KERNEL_APC 0x28 + 0x15 #define KTHREAD_CONTEXT_SWITCHES 0x48 #define KTHREAD_WAIT_IRQL 0x4E +#define KTHREAD_NEXT_PROCESSOR 0x40 +#define KTHREAD_SWAP_BUSY 0x5D #define KTHREAD_SERVICE_TABLE 0x118 #define KTHREAD_PREVIOUS_MODE 0xD7 #define KTHREAD_COMBINED_APC_DISABLE 0x70 +#define KTHREAD_SPECIAL_APC_DISABLE 0x72 #define KTHREAD_LARGE_STACK 0x107 #define KTHREAD_TRAP_FRAME 0x110 #define KTHREAD_CALLBACK_STACK 0x114 @@ -113,7 +116,10 @@ #define KPROCESS_DIRECTORY_TABLE_BASE 0x18 #define KPROCESS_LDT_DESCRIPTOR0 0x20 #define KPROCESS_LDT_DESCRIPTOR1 0x24 +#define KPROCESS_INT21_DESCRIPTOR0 0x28 +#define KPROCESS_INT21_DESCRIPTOR1 0x2C #define KPROCESS_IOPM_OFFSET 0x30 +#define KPROCESS_ACTIVE_PROCESSORS 0x34 // // KPCR Offsets @@ -121,12 +127,15 @@ #define KPCR_EXCEPTION_LIST 0x0 #define KPCR_INITIAL_STACK 0x4 #define KPCR_STACK_LIMIT 0x8 +#define KPCR_PERF_GLOBAL_GROUP_MASK 0x8 +#define KPCR_CONTEXT_SWITCHES 0x10 #define KPCR_SET_MEMBER_COPY 0x14 #define KPCR_TEB 0x18 #define KPCR_SELF 0x1C #define KPCR_PRCB 0x20 #define KPCR_IRQL 0x24 #define KPCR_KD_VERSION_BLOCK 0x34 +#define KPCR_IDT 0x38 #define KPCR_GDT 0x3C #define KPCR_TSS 0x40 #define KPCR_SET_MEMBER 0x48 @@ -134,6 +143,7 @@ #define KPCR_CURRENT_THREAD 0x124 #define KPCR_PROCESSOR_NUMBER 0x130 #define KPCR_PRCB_SET_MEMBER 0x134 +#define KPCR_PRCB_CPU_TYPE 0x138 #define KPCR_NPX_THREAD 0x640 #define KPCR_DR6 0x428 #define KPCR_DR7 0x42C 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 Sun Aug 20 23:08:57 2006 @@ -122,7 +122,7 @@ /* Thread Scheduler Functions */ /* Readies a Thread for Execution. */ -VOID +BOOLEAN STDCALL KiDispatchThreadNoLock(ULONG NewThreadStatus); @@ -148,7 +148,10 @@ NTSTATUS FASTCALL -KiSwapContext(PKTHREAD NewThread); +KiSwapContext( + IN PKTHREAD CurrentThread, + IN PKTHREAD NewThread +); VOID STDCALL Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/ctxswitch… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S (original) +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S Sun Aug 20 23:08:57 2006 @@ -115,9 +115,6 @@ .globl @KiSwapContextInternal@0 @KiSwapContextInternal@0: - /* Get the PCR. It's faster to use ebx+offset then fs:offset */ - mov ebx, [fs:KPCR_SELF] - /* Set the Thread to running */ mov byte ptr [esi+KTHREAD_STATE], Running @@ -140,24 +137,6 @@ mov [ebx+KPCR_INITIAL_STACK], eax mov [ebx+KPCR_STACK_LIMIT], ecx -#ifdef CONFIG_SMP - /* Save FPU state if the thread has used it. */ - mov ecx, [edi+KTHREAD_INITIAL_STACK] - sub ecx, NPX_FRAME_LENGTH - mov dword ptr [ebx+KPCR_NPX_THREAD], 0 - test byte ptr [edi+KTHREAD_NPX_STATE], NPX_STATE_DIRTY - jz 3f - cmp dword ptr _KeI386FxsrPresent, 0 - je 1f - fxsave [ecx] - jmp 2f -1: - fnsave [ecx] -2: - mov byte ptr [edi+KTHREAD_NPX_STATE], NPX_STATE_VALID -3: -#endif /* CONFIG_SMP */ - /* Save the stack pointer in this processors TSS */ mov ebp, [ebx+KPCR_TSS] @@ -169,9 +148,6 @@ sub eax, KTRAP_FRAME_V86_GS - KTRAP_FRAME_SS NoAdjust: - - /* Save it */ - push [ebp+KTSS_ESP0] /* Set new ESP0 */ mov [ebp+KTSS_ESP0], eax @@ -250,28 +226,11 @@ /* Increase context switches */ inc dword ptr [esi+KTHREAD_CONTEXT_SWITCHES] - /* Set TS in cr0 to catch FPU code and load the FPU state when needed */ -#ifndef CONFIG_SMP - cmp [ebx+KPCR_NPX_THREAD], esi - je 4f -#endif /* !CONFIG_SMP */ - mov eax, cr0 - or eax, X86_CR0_TS - mov cr0, eax -4: - - /* Restore ESP0 */ - pop [ebp+KTSS_ESP0] - /* Restore exception list */ pop [ebx+KPCR_EXCEPTION_LIST] /* Return */ -#ifdef CONFIG_SMP - mov ecx, offset _DispatcherDatabaseLock - call @KefReleaseSpinLockFromDpcLevel@4 -#endif - ret + ret /*++ * KiSwapContext @@ -294,37 +253,43 @@ * another thread switches to IT. * *--*/ -.globl @KiSwapContext@4 -@KiSwapContext@4: +.globl @KiSwapContext@8 +@KiSwapContext@8: /* Note, we CANNOT touch ebp */ /* Save 4 registers */ sub esp, 4 * 4 - + /* Save all the non-volatile ones */ mov [esp+12], ebx mov [esp+8], esi mov [esp+4], edi mov [esp+0], ebp - + + /* Get the current KPCR */ + mov ebx, fs:[KPCR_SELF] + /* Get the Current Thread */ - mov edi, fs:[KPCR_CURRENT_THREAD] - + mov edi, ecx + /* Get the New Thread */ - mov esi, ecx - + mov esi, edx + + /* Get the wait IRQL */ + movzx ecx, byte ptr [edi+KTHREAD_WAIT_IRQL] + /* Save it as Current thread */ mov fs:[KPCR_CURRENT_THREAD], esi - + /* Do the swap with the registers correctly setup */ call @KiSwapContextInternal@0 - + /* Return the registers */ mov ebp, [esp+0] mov edi, [esp+4] mov esi, [esp+8] mov ebx, [esp+12] - + /* Clean stack */ add esp, 4 * 4 ret Modified: trunk/reactos/ntoskrnl/ke/i386/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/thread.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/thread.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/thread.c Sun Aug 20 23:08:57 2006 @@ -14,7 +14,6 @@ typedef struct _KSHARED_CTXSWITCH_FRAME { - ULONG Esp0; PVOID ExceptionList; PVOID RetEip; } KSHARED_CTXSWITCH_FRAME, *PKSHARED_CTXSWITCH_FRAME; @@ -94,7 +93,6 @@ /* Setup the Fx Area */ FxSaveArea = &InitFrame->FxSaveArea; - Thread->NpxState = NPX_STATE_INVALID; /* Check if we support FXsr */ if (KeI386FxsrPresent) @@ -108,7 +106,7 @@ FxSaveFormat->TagWord = 0; FxSaveFormat->ErrorOffset = 0; FxSaveFormat->ErrorSelector = 0; - FxSaveFormat->DataOffset =0; + FxSaveFormat->DataOffset = 0; FxSaveFormat->DataSelector = 0; FxSaveFormat->MXCsr = 0x1F80; } @@ -137,7 +135,7 @@ CONTEXT_FLOATING_POINT; /* Set the Thread's NPX State */ - Thread->NpxState = NPX_STATE_INVALID; + Thread->NpxState = NPX_STATE_NOT_LOADED; Thread->DispatcherHeader.NpxIrql = PASSIVE_LEVEL; } else @@ -232,9 +230,6 @@ /* And set up the Context Switch Frame */ CtxSwitchFrame->RetEip = KiThreadStartup; - CtxSwitchFrame->Esp0 = (ULONG_PTR)Thread->InitialStack - - sizeof(FX_SAVE_AREA) - - 0x10; CtxSwitchFrame->ExceptionList = (PVOID)0xFFFFFFFF; /* Save back the new value of the kernel stack. */ Modified: trunk/reactos/ntoskrnl/ke/kthread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/kthread.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/kthread.c (original) +++ trunk/reactos/ntoskrnl/ke/kthread.c Sun Aug 20 23:08:57 2006 @@ -128,7 +128,7 @@ return(NULL); } -VOID +BOOLEAN STDCALL KiDispatchThreadNoLock(ULONG NewThreadStatus) { @@ -136,6 +136,7 @@ PKTHREAD Candidate; ULONG Affinity; PKTHREAD CurrentThread = KeGetCurrentThread(); + BOOLEAN ApcState; DPRINT("KiDispatchThreadNoLock() %d/%d/%d/%d\n", KeGetCurrentProcessorNumber(), CurrentThread, NewThreadStatus, CurrentThread->State); @@ -158,7 +159,7 @@ Candidate->State = Running; KeReleaseDispatcherDatabaseLockFromDpcLevel(); - return; + return FALSE; } if (Candidate != NULL) { @@ -186,15 +187,16 @@ MmUpdatePageDir((PEPROCESS)PsGetCurrentProcess(),((PETHREAD)CurrentThread)->ThreadsProcess, sizeof(EPROCESS)); /* Special note for Filip: This will release the Dispatcher DB Lock ;-) -- Alex */ - DPRINT("You are : %x, swapping to: %x\n", OldThread, CurrentThread); - KiSwapContext(CurrentThread); + DPRINT("You are : %x, swapping to: %x.\n", OldThread, CurrentThread); + ApcState = KiSwapContext(OldThread, CurrentThread); DPRINT("You are : %x, swapped from: %x\n", OldThread, CurrentThread); - return; + return ApcState; } } DPRINT1("CRITICAL: No threads are ready (CPU%d)\n", KeGetCurrentProcessorNumber()); KEBUGCHECK(0); + return FALSE; } NTSTATUS @@ -202,13 +204,26 @@ KiSwapThread(VOID) { PKTHREAD CurrentThread = KeGetCurrentThread(); + BOOLEAN ApcState; /* Find a new thread to run */ DPRINT("Dispatching Thread as blocked\n"); - KiDispatchThreadNoLock(Waiting); - - /* Lower IRQL back */ - DPRINT("Lowering IRQL \n"); + ApcState = KiDispatchThreadNoLock(Waiting); + +#if 0 + /* Check if we need to deliver APCs */ + if (ApcState) + { + /* Lower to APC_LEVEL */ + KeLowerIrql(APC_LEVEL); + + /* Deliver APCs */ + KiDeliverApc(KernelMode, NULL, NULL); + ASSERT(CurrentThread->WaitIrql == 0); + } +#endif + + /* Lower IRQL back to what it was */ KfLowerIrql(CurrentThread->WaitIrql); /* Return the wait status */

1 0

[turner] 23618: add a batch file for basic qemu settings and a batch file for basic vm player settings
by turner＠svn.reactos.org 20 Aug '06

20 Aug '06

Author: turner Date: Sun Aug 20 22:01:59 2006 New Revision: 23618 URL: http://svn.reactos.org/svn/reactos?rev=23618&view=rev Log: add a batch file for basic qemu settings and a batch file for basic vm player settings Added: trunk/tools/ReactOS.vmx trunk/tools/boot.bat Added: trunk/tools/ReactOS.vmx URL: http://svn.reactos.org/svn/reactos/trunk/tools/ReactOS.vmx?rev=23618&view=a… ============================================================================== --- trunk/tools/ReactOS.vmx (added) +++ trunk/tools/ReactOS.vmx Sun Aug 20 22:01:59 2006 @@ -1,0 +1,56 @@ +config.version = "8" +virtualHW.version = "3" +memsize = "128" +ide0:0.present = "TRUE" +ide0:0.fileName = "ReactOS.vmdk" +floppy0.present = "FALSE" +floppy0.startConnected = "FALSE" +floppy0.fileName = "" +Ethernet0.present = "TRUE" +displayName = "ReactOS" +guestOS = "winxppro" +priority.grabbed = "normal" +priority.ungrabbed = "normal" +powerType.powerOff = "hard" +powerType.powerOn = "hard" +powerType.suspend = "hard" +powerType.reset = "hard" + +sound.present = "FALSE" +sound.virtualDev = "es1371" + +Ethernet0.addressType = "generated" +uuid.location = "56 4d f3 82 2e e6 c2 57-a8 3d d3 58 af 7c 4c 8b" +uuid.bios = "56 4d f3 82 2e e6 c2 57-a8 3d d3 58 af 7c 4c 8b" +ethernet0.generatedAddress = "00:0c:29:7c:4c:8b" +ethernet0.generatedAddressOffset = "0" + +tools.remindInstall = "TRUE" + +### CDROM ### +ide1:0.startConnected = "FALSE" +ide1:0.present = "FALSE" +ide1:0.fileName = "ReactOS.iso" +ide1:0.deviceType = "cdrom-image" + +ide0:0.deviceType = "disk" +usb.present = "FALSE" + +ide0:0.redo = "" + +nvram = "ReactOS.nvram" + +floppy0.fileType = "file" + +checkpoint.vmState = "" + +ethernet0.connectionType = "nat" + +serial0.present = "TRUE" +serial0.fileName = "debug.txt" +serial0.fileType = "file" +serial0.tryNoRxLoss = "FALSE" +serial0.yieldOnMsrRead = "TRUE" +serial0.startConnected = "TRUE" + +uuid.action = "create" Added: trunk/tools/boot.bat URL: http://svn.reactos.org/svn/reactos/trunk/tools/boot.bat?rev=23618&view=auto ============================================================================== --- trunk/tools/boot.bat (added) +++ trunk/tools/boot.bat Sun Aug 20 22:01:59 2006 @@ -1,0 +1,2 @@ +qemu -boot c -m 128 -L . c.img +REM qemu -boot d -m 128 -L . c.img -cdrom ReactOS.iso

1 0

[turner] 23617: rc3.......
by turner＠svn.reactos.org 20 Aug '06

20 Aug '06

Author: turner Date: Sun Aug 20 19:59:55 2006 New Revision: 23617 URL: http://svn.reactos.org/svn/reactos?rev=23617&view=rev Log: rc3....... Modified: branches/ros-branch-0_3_0/reactos/include/reactos/version.h Modified: branches/ros-branch-0_3_0/reactos/include/reactos/version.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/includ… ============================================================================== --- branches/ros-branch-0_3_0/reactos/include/reactos/version.h (original) +++ branches/ros-branch-0_3_0/reactos/include/reactos/version.h Sun Aug 20 19:59:55 2006 @@ -22,7 +22,7 @@ #define KERNEL_VERSION_PATCH_LEVEL 0 /* KERNEL_VERSION_BUILD_TYPE is L"SVN", L"RC1", L"RC2" or L"RELEASE" */ -#define KERNEL_VERSION_BUILD_TYPE L"RC2" +#define KERNEL_VERSION_BUILD_TYPE L"RC3" #endif

1 0

[fireball] 23616: [FORMATTING]
by fireball＠svn.reactos.org 20 Aug '06

20 Aug '06

Author: fireball Date: Sun Aug 20 18:01:17 2006 New Revision: 23616 URL: http://svn.reactos.org/svn/reactos?rev=23616&view=rev Log: [FORMATTING] Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/bulkonly.c trunk/reactos/drivers/usb/nt4compat/usbdriver/cbi.c trunk/reactos/drivers/usb/nt4compat/usbdriver/compdrv.c trunk/reactos/drivers/usb/nt4compat/usbdriver/dmgrdisp.c trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c trunk/reactos/drivers/usb/nt4compat/usbdriver/etd.c trunk/reactos/drivers/usb/nt4compat/usbdriver/gendrv.c trunk/reactos/drivers/usb/nt4compat/usbdriver/hub.c trunk/reactos/drivers/usb/nt4compat/usbdriver/td.c trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c trunk/reactos/drivers/usb/nt4compat/usbdriver/umss.c trunk/reactos/drivers/usb/nt4compat/usbdriver/usb.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/bulkonly.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/cbi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/compdrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/dmgrdisp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/etd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/gendrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/hub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/td.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/umss.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/usb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd…

1 0

[greatlrd] 23615: do not hard code to Bitstream Vera Sans use MS Shell Dlg instead
by greatlrd＠svn.reactos.org 20 Aug '06

20 Aug '06

Author: greatlrd Date: Sun Aug 20 16:46:02 2006 New Revision: 23615 URL: http://svn.reactos.org/svn/reactos?rev=23615&view=rev Log: do not hard code to Bitstream Vera Sans use MS Shell Dlg instead Modified: trunk/reactos/dll/win32/user32/Uk.rc Modified: trunk/reactos/dll/win32/user32/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/Uk.rc?rev… ============================================================================== --- trunk/reactos/dll/win32/user32/Uk.rc (original) +++ trunk/reactos/dll/win32/user32/Uk.rc Sun Aug 20 16:46:02 2006 @@ -8,7 +8,7 @@ SELWINDOW DIALOG DISCARDABLE 20, 20, 220, 140 STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -FONT 8, "Bitstream Vera Sans" +FONT 8, "MS Shell Dlg" CAPTION "Âèá³ð â³êíà" BEGIN LISTBOX 100, 5, 5, 210, 110, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_HSCROLL

1 0

[greatlrd] 23614: Fixed some hard code font name 1. Bitstream Vera Sans to MS Sans Serif 2. Bitstream Vera Sans Mono to Courier New This fixed some problem that bug 1191 mentor but not all. I tested this change in ReactOS 1. using BootCD install whole process and run some ros own program and tested cmd. No problem was found with this change.
by greatlrd＠svn.reactos.org 20 Aug '06

20 Aug '06

Author: greatlrd Date: Sun Aug 20 16:42:30 2006 New Revision: 23614 URL: http://svn.reactos.org/svn/reactos?rev=23614&view=rev Log: Fixed some hard code font name 1. Bitstream Vera Sans to MS Sans Serif 2. Bitstream Vera Sans Mono to Courier New This fixed some problem that bug 1191 mentor but not all. I tested this change in ReactOS 1. using BootCD install whole process and run some ros own program and tested cmd. No problem was found with this change. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c trunk/reactos/subsystems/win32/win32k/objects/stockobj.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Sun Aug 20 16:42:30 2006 @@ -916,7 +916,7 @@ static LOGFONTW DefaultFont = { -11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, - L"Bitstream Vera Sans" + L"MS Sans Serif" }; RtlZeroMemory(&QueryTable, sizeof(QueryTable)); Modified: trunk/reactos/subsystems/win32/win32k/objects/stockobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/stockobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/stockobj.c Sun Aug 20 16:42:30 2006 @@ -80,11 +80,11 @@ static LOGFONTW OEMFixedFont = { 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, OEM_CHARSET, - 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, L"Bitstream Vera Sans Mono" }; + 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, L"Courier New" }; //Bitstream Vera Sans Mono static LOGFONTW AnsiFixedFont = { 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, - 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, L"Bitstream Vera Sans Mono" }; + 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, L"Courier New" }; //Bitstream Vera Sans Mono /*static LOGFONTW AnsiVarFont = *{ 10, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, @@ -92,20 +92,20 @@ static LOGFONTW SystemFont = { 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, - 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, L"Bitstream Vera Sans" }; + 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, L"Courier New" }; //Bitstream Vera Sans static LOGFONTW DeviceDefaultFont = { 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, - 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, L"Bitstream Vera Sans" }; + 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, L"MS Sans Serif" }; //Bitstream Vera Sans static LOGFONTW SystemFixedFont = { 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, - 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, L"Bitstream Vera Sans Mono" }; - + 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, L"Courier New" }; //Bitstream Vera Sans Mono + /* FIXME: Is this correct? */ static LOGFONTW DefaultGuiFont = { 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, - 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, L"Bitstream Vera Sans" }; + 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, L"MS Sans Serif" }; //Bitstream Vera Sans #define NB_STOCK_OBJECTS (DEFAULT_GUI_FONT + 1)

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