Ros-diffs August 2006

ros-diffs@reactos.org

19 participants
447 discussions

[ion] 23698: - If SeCaptureSubjectContextEx is called without a process, at least NULL-initialize the context to catch dereferences of invalid pointers.
by ion＠svn.reactos.org 25 Aug '06

25 Aug '06

Author: ion Date: Fri Aug 25 05:04:44 2006 New Revision: 23698 URL: http://svn.reactos.org/svn/reactos?rev=23698&view=rev Log: - If SeCaptureSubjectContextEx is called without a process, at least NULL-initialize the context to catch dereferences of invalid pointers. Modified: trunk/reactos/ntoskrnl/se/semgr.c Modified: trunk/reactos/ntoskrnl/se/semgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/semgr.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/se/semgr.c (original) +++ trunk/reactos/ntoskrnl/se/semgr.c Fri Aug 25 05:04:44 2006 @@ -426,7 +426,13 @@ PAGED_CODE(); /* ROS HACK */ - if (!Process) return; + if (!Process) + { + SubjectContext->PrimaryToken = NULL; + SubjectContext->ProcessAuditId = 0; + SubjectContext->ClientToken = NULL; + return; + } /* Save the unique ID */ SubjectContext->ProcessAuditId = Process->UniqueProcessId;

1 0

[ion] 23697: - Fix compiling/linking problems. - Remove KrnlFun entry - IRQs are now done through a typical NT/ROS trap frame and are synchronized and compatible with trap.S. - Enable 2nd entry interrupt calls in HalBeginSystemInterrupt, since IRQs now use the right trap frame.
by ion＠svn.reactos.org 25 Aug '06

25 Aug '06

Author: ion Date: Fri Aug 25 04:46:41 2006 New Revision: 23697 URL: http://svn.reactos.org/svn/reactos?rev=23697&view=rev Log: - Fix compiling/linking problems. - Remove KrnlFun entry - IRQs are now done through a typical NT/ROS trap frame and are synchronized and compatible with trap.S. - Enable 2nd entry interrupt calls in HalBeginSystemInterrupt, since IRQs now use the right trap frame. Modified: trunk/reactos/hal/halx86/generic/halinit.c trunk/reactos/hal/halx86/generic/irq.S trunk/reactos/hal/halx86/generic/systimer.S trunk/reactos/hal/halx86/include/halp.h trunk/reactos/hal/halx86/mp/apic.c trunk/reactos/hal/halx86/mp/halinit_mp.c trunk/reactos/hal/halx86/up/halinit_up.c trunk/reactos/hal/halx86/xbox/halinit_xbox.c trunk/reactos/ntoskrnl/KrnlFun.c trunk/reactos/ntoskrnl/ke/i386/clock.S Modified: trunk/reactos/hal/halx86/generic/halinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/halinit… ============================================================================== --- trunk/reactos/hal/halx86/generic/halinit.c (original) +++ trunk/reactos/hal/halx86/generic/halinit.c Fri Aug 25 04:46:41 2006 @@ -19,7 +19,6 @@ PVOID HalpZeroPageMapping = NULL; HALP_HOOKS HalpHooks; -VOID NTAPI HalpClockInterrupt(VOID); /* FUNCTIONS ***************************************************************/ @@ -43,12 +42,8 @@ } else if (BootPhase == 1) { - /* Enable the clock interrupt */ - ((PKIPCR)KeGetPcr())->IDT[IRQ2VECTOR(0)].ExtendedOffset = - (USHORT)(((ULONG_PTR)HalpClockInterrupt >> 16) & 0xFFFF); - ((PKIPCR)KeGetPcr())->IDT[IRQ2VECTOR(0)].Offset = - (USHORT)HalpClockInterrupt; - HalEnableSystemInterrupt(IRQ2VECTOR(0), CLOCK2_LEVEL, Latched); + /* Initialize the clock interrupt */ + HalpInitPhase1(); /* Initialize display and make the screen black */ HalInitializeDisplay ((PROS_LOADER_PARAMETER_BLOCK)LoaderBlock); Modified: trunk/reactos/hal/halx86/generic/irq.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/irq.S?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/irq.S (original) +++ trunk/reactos/hal/halx86/generic/irq.S Fri Aug 25 04:46:41 2006 @@ -10,9 +10,6 @@ #include <asm.h> #include <internal/i386/asmmacro.S> .intel_syntax noprefix - -.extern _Kei386EoiHelper@0 -.extern _KiUnexpectedInterrupt /* GLOBALS *******************************************************************/ @@ -393,10 +390,8 @@ DoCall: /* There are pending software interrupts, call their handlers */ - /* FIXME: Because ROS IRQs don't setup a nice trap frame yet, we can't optimize a 2nd entry */ - //add esp, 12 - //jmp SoftIntHandlerTable2[eax*4] - call SoftIntHandlerTable[eax*4] + add esp, 12 + jmp SoftIntHandlerTable2[eax*4] ret 8 .endfunc Modified: trunk/reactos/hal/halx86/generic/systimer.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/systime… ============================================================================== --- trunk/reactos/hal/halx86/generic/systimer.S (original) +++ trunk/reactos/hal/halx86/generic/systimer.S Fri Aug 25 04:46:41 2006 @@ -10,9 +10,6 @@ #include <asm.h> #include <internal/i386/asmmacro.S> .intel_syntax noprefix - -.extern _Kei386EoiHelper@0 -.extern _KeUpdateSystemTime@0 /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/hal/halx86/include/halp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/halp.h?… ============================================================================== --- trunk/reactos/hal/halx86/include/halp.h (original) +++ trunk/reactos/hal/halx86/include/halp.h Fri Aug 25 04:46:41 2006 @@ -48,6 +48,8 @@ /* Non-generic initialization */ VOID HalpInitPhase0 (PROS_LOADER_PARAMETER_BLOCK LoaderBlock); +VOID HalpInitPhase1(VOID); +VOID NTAPI HalpClockInterrupt(VOID); /* sysinfo.c */ NTSTATUS STDCALL Modified: trunk/reactos/hal/halx86/mp/apic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/apic.c?rev=2… ============================================================================== --- trunk/reactos/hal/halx86/mp/apic.c (original) +++ trunk/reactos/hal/halx86/mp/apic.c Fri Aug 25 04:46:41 2006 @@ -815,14 +815,15 @@ Count[CPU]++; #endif + /* FIXME: SMP is totally broken */ MpsIRQTrapFrameToTrapFrame(Trapframe, &KernelTrapFrame); if (KeGetCurrentProcessorNumber() == 0) { - KeUpdateSystemTime(&KernelTrapFrame, oldIrql, 100000); // FIXME: CLOCK_INCREMENT? + //KeUpdateSystemTime(&KernelTrapFrame, oldIrql); } else { - KeUpdateRunTime(&KernelTrapFrame, oldIrql); + //KeUpdateRunTime(&KernelTrapFrame, oldIrql); } Ki386DisableInterrupts(); Modified: trunk/reactos/hal/halx86/mp/halinit_mp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/halinit_mp.c… ============================================================================== --- trunk/reactos/hal/halx86/mp/halinit_mp.c (original) +++ trunk/reactos/hal/halx86/mp/halinit_mp.c Fri Aug 25 04:46:41 2006 @@ -52,4 +52,9 @@ } +VOID +HalpInitPhase1(VOID) +{ +} + /* EOF */ Modified: trunk/reactos/hal/halx86/up/halinit_up.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/up/halinit_up.c… ============================================================================== --- trunk/reactos/hal/halx86/up/halinit_up.c (original) +++ trunk/reactos/hal/halx86/up/halinit_up.c Fri Aug 25 04:46:41 2006 @@ -26,4 +26,15 @@ HalpCalibrateStallExecution(); } +VOID +HalpInitPhase1(VOID) +{ + /* Enable the clock interrupt */ + ((PKIPCR)KeGetPcr())->IDT[0x30].ExtendedOffset = + (USHORT)(((ULONG_PTR)HalpClockInterrupt >> 16) & 0xFFFF); + ((PKIPCR)KeGetPcr())->IDT[0x30].Offset = + (USHORT)HalpClockInterrupt; + HalEnableSystemInterrupt(0x30, CLOCK2_LEVEL, Latched); +} + /* EOF */ Modified: trunk/reactos/hal/halx86/xbox/halinit_xbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/xbox/halinit_xb… ============================================================================== --- trunk/reactos/hal/halx86/xbox/halinit_xbox.c (original) +++ trunk/reactos/hal/halx86/xbox/halinit_xbox.c Fri Aug 25 04:46:41 2006 @@ -31,4 +31,15 @@ HalpXboxInitPartIo(); } +VOID +HalpInitPhase1(VOID) +{ + /* Enable the clock interrupt */ + ((PKIPCR)KeGetPcr())->IDT[0x30].ExtendedOffset = + (USHORT)(((ULONG_PTR)HalpClockInterrupt >> 16) & 0xFFFF); + ((PKIPCR)KeGetPcr())->IDT[0x30].Offset = + (USHORT)HalpClockInterrupt; + HalEnableSystemInterrupt(0x30, CLOCK2_LEVEL, Latched); +} + /* EOF */ Modified: trunk/reactos/ntoskrnl/KrnlFun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/KrnlFun.c?rev=236… ============================================================================== --- trunk/reactos/ntoskrnl/KrnlFun.c (original) +++ trunk/reactos/ntoskrnl/KrnlFun.c Fri Aug 25 04:46:41 2006 @@ -25,7 +25,6 @@ // - Use Object Type Mutex/Lock. // // Ke: -// - Make sure IRQ trap code is synchronized with current trap code. // - Reimplement the V86 support using a mode that will be compatible with // VDM and the future and use ABIOS gates. // - Implement Invalid Opcode and GPD handlers for V86-mode. Modified: trunk/reactos/ntoskrnl/ke/i386/clock.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/clock.S?r… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/clock.S (original) +++ trunk/reactos/ntoskrnl/ke/i386/clock.S Fri Aug 25 04:46:41 2006 @@ -10,14 +10,6 @@ #include <asm.h> #include <internal/i386/asmmacro.S> .intel_syntax noprefix - -/* GLOBALS *******************************************************************/ - -.extern _KeTimeAdjustment -.extern _KiTickOffset -.extern _KeTickCount -.extern _KeMaximumIncrement -.extern _KiExpireTimerDpc /* FUNCTIONS ******************************************************************/

1 0

[gedmurphy] 23696: add an 'uptime' command. Available in either Windows or Linux output. (defaulted to Windows)
by gedmurphy＠svn.reactos.org 25 Aug '06

25 Aug '06

Author: gedmurphy Date: Fri Aug 25 04:33:27 2006 New Revision: 23696 URL: http://svn.reactos.org/svn/reactos?rev=23696&view=rev Log: add an 'uptime' command. Available in either Windows or Linux output. (defaulted to Windows) Added: trunk/reactos/base/applications/cmdutils/uptime/ trunk/reactos/base/applications/cmdutils/uptime/uptime.c trunk/reactos/base/applications/cmdutils/uptime/uptime.rbuild trunk/reactos/base/applications/cmdutils/uptime/uptime.rc Modified: trunk/reactos/base/applications/cmdutils/cmdutils.rbuild Modified: trunk/reactos/base/applications/cmdutils/cmdutils.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/cmdutils.rbuild (original) +++ trunk/reactos/base/applications/cmdutils/cmdutils.rbuild Fri Aug 25 04:33:27 2006 @@ -5,4 +5,7 @@ <directory name="more"> <xi:include href="more/more.rbuild" /> </directory> +<directory name="uptime"> + <xi:include href="uptime/uptime.rbuild" /> +</directory> </group> Added: trunk/reactos/base/applications/cmdutils/uptime/uptime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/uptime/uptime.c (added) +++ trunk/reactos/base/applications/cmdutils/uptime/uptime.c Fri Aug 25 04:33:27 2006 @@ -1,0 +1,34 @@ +#define WIN32_LEAN_AND_MEAN +#include <stdio.h> +#include <windows.h> +#include <tchar.h> + +int main(int argc, char* argv[]) +{ + SYSTEMTIME SystemTime; + LARGE_INTEGER liCount, liFreq; + + GetLocalTime(&SystemTime); + + if (QueryPerformanceCounter(&liCount) && + QueryPerformanceFrequency(&liFreq)) + { + LONGLONG TotalSecs = liCount.QuadPart / liFreq.QuadPart; + LONGLONG Days = (TotalSecs / 86400); + LONGLONG Hours = ((TotalSecs % 86400) / 3600); + LONGLONG Mins = ((TotalSecs % 86400) % 3600) / 60; + LONGLONG Secs = ((TotalSecs % 86400) % 3600) % 60; + +#ifdef LINUX_OUTPUT + UNREFERENCED_PARAMETER(Secs); + _tprintf(_T(" %.2u:%.2u "), SystemTime.wHour, SystemTime.wMinute); + _tprintf(_T("up %I64u days, %I64u:%I64u\n"), Days, Hours, Mins); /*%.2I64u secs*/ +#else + _tprintf(_T("System Up Time:\t\t%I64u days, %I64u Hours, %I64u Minutes, %.2I64u Seconds\n"), + Days, Hours, Mins, Secs); +#endif + return 0; + } + + return -1; +} Added: trunk/reactos/base/applications/cmdutils/uptime/uptime.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/uptime/uptime.rbuild (added) +++ trunk/reactos/base/applications/cmdutils/uptime/uptime.rbuild Fri Aug 25 04:33:27 2006 @@ -1,0 +1,9 @@ +<module name="uptime" type="win32cui" installbase="system32" installname="uptime.exe"> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + + <library>kernel32</library> + <file>uptime.c</file> + <file>uptime.rc</file> +</module> Added: trunk/reactos/base/applications/cmdutils/uptime/uptime.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/uptime/uptime.rc (added) +++ trunk/reactos/base/applications/cmdutils/uptime/uptime.rc Fri Aug 25 04:33:27 2006 @@ -1,0 +1,4 @@ +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS uptime\0" +#define REACTOS_STR_INTERNAL_NAME "uptime\0" +#define REACTOS_STR_ORIGINAL_FILENAME "uptime.exe\0" +#include <reactos/version.rc>

1 0

[ion] 23695: - The last piece of the puzzle: we had to initialize the IDR in HalInitProcessor to set it to the default of 0xFFFFFFB so that we don't get IRQ 0 and IRQ 1 until we're ready to handle them, which was causing the clock interrupt to be called too early. - Remove irqhand.S and all other remaining pieces of deprecated code.
by ion＠svn.reactos.org 25 Aug '06

25 Aug '06

Author: ion Date: Fri Aug 25 04:30:26 2006 New Revision: 23695 URL: http://svn.reactos.org/svn/reactos?rev=23695&view=rev Log: - The last piece of the puzzle: we had to initialize the IDR in HalInitProcessor to set it to the default of 0xFFFFFFB so that we don't get IRQ 0 and IRQ 1 until we're ready to handle them, which was causing the clock interrupt to be called too early. - Remove irqhand.S and all other remaining pieces of deprecated code. Removed: trunk/reactos/ntoskrnl/ke/i386/irqhand.s Modified: trunk/reactos/hal/halx86/generic/processor.c trunk/reactos/include/ndk/i386/ketypes.h trunk/reactos/ntoskrnl/ke/clock.c trunk/reactos/ntoskrnl/ke/i386/irq.c trunk/reactos/ntoskrnl/ke/i386/kernel.c trunk/reactos/ntoskrnl/ntoskrnl.rbuild Modified: trunk/reactos/hal/halx86/generic/processor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/process… ============================================================================== --- trunk/reactos/hal/halx86/generic/processor.c (original) +++ trunk/reactos/hal/halx86/generic/processor.c Fri Aug 25 04:30:26 2006 @@ -25,6 +25,9 @@ PLOADER_PARAMETER_BLOCK LoaderBlock) { DPRINT("HalInitializeProcessor(%lu %p)\n", ProcessorNumber, LoaderBlock); + /* Set default IDR */ + KeGetPcr()->IDR = 0xFFFFFFFB; + KeGetPcr()->StallScaleFactor = INITIAL_STALL_COUNT; } BOOLEAN STDCALL Modified: trunk/reactos/include/ndk/i386/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/ketypes.h… ============================================================================== --- trunk/reactos/include/ndk/i386/ketypes.h (original) +++ trunk/reactos/include/ndk/i386/ketypes.h Fri Aug 25 04:30:26 2006 @@ -94,6 +94,11 @@ #define IPI_FREEZE 4 #define IPI_PACKET_READY 8 #define IPI_SYNCH_REQUEST 16 + +// +// HAL Variables +// +#define INITIAL_STALL_COUNT 0x64 // // Static Kernel-Mode Address start (use MM_KSEG0_BASE for actual) Modified: trunk/reactos/ntoskrnl/ke/clock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/clock.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/ke/clock.c (original) +++ trunk/reactos/ntoskrnl/ke/clock.c Fri Aug 25 04:30:26 2006 @@ -78,7 +78,6 @@ { TIME_FIELDS TimeFields; - DPRINT1("KiInitializeSystemClock()\n"); InitializeListHead(&KiTimerListHead); KeInitializeDpc(&KiExpireTimerDpc, (PKDEFERRED_ROUTINE)KiExpireTimers, 0); @@ -95,9 +94,6 @@ SharedUserData->SystemTime.High2Time = SystemBootTime.u.HighPart; SharedUserData->SystemTime.LowPart = SystemBootTime.u.LowPart; SharedUserData->SystemTime.High1Time = SystemBootTime.u.HighPart; - - KiClockSetupComplete = TRUE; - DPRINT1("Finished KiInitializeSystemClock()\n"); } VOID Modified: trunk/reactos/ntoskrnl/ke/i386/irq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/irq.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/irq.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/irq.c Fri Aug 25 04:30:26 2006 @@ -14,21 +14,6 @@ #include <ntoskrnl.h> #define NDEBUG #include <debug.h> - -/* DEPRECATED FUNCTIONS ******************************************************/ - -void irq_handler_0(void); -extern IDT_DESCRIPTOR KiIdt[256]; - -VOID -INIT_FUNCTION -NTAPI -KeInitInterrupts (VOID) -{ - KiIdt[0x30].a=((ULONG)irq_handler_0&0xffff)+(KGDT_R0_CODE<<16); - KiIdt[0x30].b=((ULONG)irq_handler_0&0xffff0000)+0x8000+ - 0xe00; -} /* PRIVATE FUNCTIONS *********************************************************/ Removed: trunk/reactos/ntoskrnl/ke/i386/irqhand.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/irqhand.s… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/irqhand.s (original) +++ trunk/reactos/ntoskrnl/ke/i386/irqhand.s (removed) @@ -1,55 +1,0 @@ -/* - * FILE: ntoskrnl/ke/i386/clock.S - * COPYRIGHT: See COPYING in the top level directory - * PURPOSE: System Clock Management - * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) - */ - -/* INCLUDES ******************************************************************/ - -#include <asm.h> -#include <internal/i386/asmmacro.S> -.intel_syntax noprefix - -/* GLOBALS *******************************************************************/ - -#include <ndk/asm.h> -#include <../hal/halx86/include/halirq.h> - -.global _irq_handler_0 -_irq_handler_0: - pusha - cld - push ds - push es - push fs - push gs - push 0xCEAFBEEF - mov eax, KGDT_R0_DATA - mov ds, eax - mov es, eax - mov gs, eax - mov eax, KGDT_R0_PCR - mov fs, eax - - /* Increase interrupt count */ - inc dword ptr [fs:KPCR_PRCB_INTERRUPT_COUNT] - - /* Put vector in EBX and make space for KIRQL */ - sub esp, 4 - - /* Begin interrupt */ - push esp - push 0x30 - push HIGH_LEVEL - call _HalBeginSystemInterrupt@12 - - cli - call _HalEndSystemInterrupt@8 - - pop gs - pop fs - pop es - pop ds - popa - iret Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kernel.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kernel.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/kernel.c Fri Aug 25 04:30:26 2006 @@ -380,7 +380,6 @@ InitializeListHead(&KPCR->PrcbData.WaitListHead); KeInitExceptions (); - KeInitInterrupts (); KeActiveProcessors |= 1 << 0; Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Fri Aug 25 04:30:26 2006 @@ -34,7 +34,6 @@ <file>fpu.c</file> <file>gdt.c</file> <file>irq.c</file> - <file>irqhand.s</file> <file>kernel.c</file> <file>ldt.c</file> <file>thread.c</file>

1 0

[ion] 23694: - Got rid of the deprecated stuff left in irq.c and directly implemented it as part of irqhand.S (which is also deprecated). - Cleaned up irq.c. Fixed file header, function prototypes, includes, etc, and moved general definitions and externs to ke.h
by ion＠svn.reactos.org 24 Aug '06

24 Aug '06

Author: ion Date: Fri Aug 25 03:25:37 2006 New Revision: 23694 URL: http://svn.reactos.org/svn/reactos?rev=23694&view=rev Log: - Got rid of the deprecated stuff left in irq.c and directly implemented it as part of irqhand.S (which is also deprecated). - Cleaned up irq.c. Fixed file header, function prototypes, includes, etc, and moved general definitions and externs to ke.h Modified: trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/ke/i386/irq.c (contents, props changed) trunk/reactos/ntoskrnl/ke/i386/irqhand.s (contents, props changed) trunk/reactos/ntoskrnl/ke/i386/trap.s 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 Fri Aug 25 03:25:37 2006 @@ -29,6 +29,25 @@ MaximumCachedModuleType, } CACHED_MODULE_TYPE, *PCACHED_MODULE_TYPE; extern PLOADER_MODULE CachedModules[MaximumCachedModuleType]; + +typedef enum _CONNECT_TYPE +{ + NoConnect, + NormalConnect, + ChainConnect, + UnknownConnect +} CONNECT_TYPE, *PCONNECT_TYPE; + +typedef struct _DISPATCH_INFO +{ + CONNECT_TYPE Type; + PKINTERRUPT Interrupt; + PKINTERRUPT_ROUTINE NoDispatch; + PKINTERRUPT_ROUTINE InterruptDispatch; + PKINTERRUPT_ROUTINE FloatingDispatch; + PKINTERRUPT_ROUTINE ChainedDispatch; + PKINTERRUPT_ROUTINE *FlatDispatch; +} DISPATCH_INFO, *PDISPATCH_INFO; struct _KIRQ_TRAPFRAME; struct _KPCR; @@ -47,6 +66,11 @@ extern PKNODE KeNodeBlock[1]; extern UCHAR KeNumberNodes; extern UCHAR KeProcessNodeSeed; +extern ULONG KiInterruptTemplate[KINTERRUPT_DISPATCH_CODES]; +extern PULONG KiInterruptTemplateObject; +extern PULONG KiInterruptTemplateDispatch; +extern PULONG KiInterruptTemplate2ndDispatch; +extern ULONG KiUnexpectedEntrySize; /* MACROS *************************************************************************/ @@ -685,6 +709,30 @@ ULONG address ); +VOID +NTAPI +KiStartUnexpectedRange( + VOID +); + +VOID +NTAPI +KiEndUnexpectedRange( + VOID +); + +VOID +NTAPI +KiInterruptDispatch( + VOID +); + +VOID +NTAPI +KiChainedDispatch( + VOID +); + #include "ke_x.h" #endif /* __NTOSKRNL_INCLUDE_INTERNAL_KE_H */ Modified: trunk/reactos/ntoskrnl/ke/i386/irq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/irq.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/irq.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/irq.c Fri Aug 25 03:25:37 2006 @@ -1,113 +1,33 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory * FILE: ntoskrnl/ke/i386/irq.c - * PURPOSE: IRQ handling - * - * PROGRAMMERS: David Welch (welch(a)mcmail.com) + * PURPOSE: Manages the Kernel's IRQ support for external drivers, + * for the purpopses of connecting, disconnecting and setting + * up ISRs for drivers. The backend behind the Io* Interrupt + * routines. + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ -/* - * NOTE: In general the PIC interrupt priority facilities are used to - * preserve the NT IRQL semantics, global interrupt disables are only used - * to keep the PIC in a consistent state - * - */ - /* INCLUDES ****************************************************************/ #include <ntoskrnl.h> -#include <../hal/halx86/include/halirq.h> -#include <../hal/halx86/include/mps.h> - #define NDEBUG -#include <internal/debug.h> - -typedef enum _CONNECT_TYPE -{ - NoConnect, - NormalConnect, - ChainConnect, - UnknownConnect -} CONNECT_TYPE, *PCONNECT_TYPE; - -typedef struct _DISPATCH_INFO -{ - CONNECT_TYPE Type; - PKINTERRUPT Interrupt; - PKINTERRUPT_ROUTINE NoDispatch; - PKINTERRUPT_ROUTINE InterruptDispatch; - PKINTERRUPT_ROUTINE FloatingDispatch; - PKINTERRUPT_ROUTINE ChainedDispatch; - PKINTERRUPT_ROUTINE *FlatDispatch; -} DISPATCH_INFO, *PDISPATCH_INFO; - -extern ULONG KiInterruptTemplate[KINTERRUPT_DISPATCH_CODES]; -extern PULONG KiInterruptTemplateObject; -extern PULONG KiInterruptTemplateDispatch; -extern PULONG KiInterruptTemplate2ndDispatch; -extern ULONG KiUnexpectedEntrySize; - -VOID -NTAPI -KiStartUnexpectedRange(VOID); - -VOID -NTAPI -KiEndUnexpectedRange(VOID); - -VOID -NTAPI -KiInterruptDispatch3(VOID); - -VOID -NTAPI -KiChainedDispatch(VOID); +#include <debug.h> /* DEPRECATED FUNCTIONS ******************************************************/ void irq_handler_0(void); extern IDT_DESCRIPTOR KiIdt[256]; -#define PRESENT (0x8000) -#define I486_INTERRUPT_GATE (0xe00) VOID INIT_FUNCTION NTAPI KeInitInterrupts (VOID) { - - KiIdt[IRQ_BASE].a=((ULONG)irq_handler_0&0xffff)+(KGDT_R0_CODE<<16); - KiIdt[IRQ_BASE].b=((ULONG)irq_handler_0&0xffff0000)+PRESENT+ - I486_INTERRUPT_GATE; -} - -VOID -KiInterruptDispatch (ULONG vector, PKIRQ_TRAPFRAME Trapframe) -/* - * FUNCTION: Calls the irq specific handler for an irq - * ARGUMENTS: - * irq = IRQ that has interrupted - */ -{ - KIRQL old_level; - KeGetCurrentPrcb()->InterruptCount++; - - /* - * Notify the rest of the kernel of the raised irq level. For the - * default HAL this will send an EOI to the PIC and alter the IRQL. - */ - if (!HalBeginSystemInterrupt (VECTOR2IRQL(vector), - vector, - &old_level)) - { - return; - } - - Ke386EnableInterrupts(); - Ke386DisableInterrupts(); - HalEndSystemInterrupt (old_level, 0); + KiIdt[0x30].a=((ULONG)irq_handler_0&0xffff)+(KGDT_R0_CODE<<16); + KiIdt[0x30].b=((ULONG)irq_handler_0&0xffff0000)+0x8000+ + 0xe00; } /* PRIVATE FUNCTIONS *********************************************************/ @@ -126,7 +46,7 @@ KiUnexpectedEntrySize); /* Setup the handlers */ - Dispatch->InterruptDispatch = KiInterruptDispatch3; + Dispatch->InterruptDispatch = KiInterruptDispatch; Dispatch->FloatingDispatch = NULL; // Floating Interrupts are not supported Dispatch->ChainedDispatch = KiChainedDispatch; Dispatch->FlatDispatch = NULL; @@ -225,18 +145,18 @@ * @implemented */ VOID -STDCALL -KeInitializeInterrupt(PKINTERRUPT Interrupt, - PKSERVICE_ROUTINE ServiceRoutine, - PVOID ServiceContext, - PKSPIN_LOCK SpinLock, - ULONG Vector, - KIRQL Irql, - KIRQL SynchronizeIrql, - KINTERRUPT_MODE InterruptMode, - BOOLEAN ShareVector, - CHAR ProcessorNumber, - BOOLEAN FloatingSave) +NTAPI +KeInitializeInterrupt(IN PKINTERRUPT Interrupt, + IN PKSERVICE_ROUTINE ServiceRoutine, + IN PVOID ServiceContext, + IN PKSPIN_LOCK SpinLock, + IN ULONG Vector, + IN KIRQL Irql, + IN KIRQL SynchronizeIrql, + IN KINTERRUPT_MODE InterruptMode, + IN BOOLEAN ShareVector, + IN CHAR ProcessorNumber, + IN BOOLEAN FloatingSave) { ULONG i; PULONG DispatchCode = &Interrupt->DispatchCode[0], Patch = DispatchCode; @@ -378,8 +298,8 @@ * @implemented */ BOOLEAN -STDCALL -KeDisconnectInterrupt(PKINTERRUPT Interrupt) +NTAPI +KeDisconnectInterrupt(IN PKINTERRUPT Interrupt) { KIRQL OldIrql, Irql; ULONG Vector; Propchange: trunk/reactos/ntoskrnl/ke/i386/irq.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/ntoskrnl/ke/i386/irqhand.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/irqhand.s… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/irqhand.s (original) +++ trunk/reactos/ntoskrnl/ke/i386/irqhand.s Fri Aug 25 03:25:37 2006 @@ -1,89 +1,55 @@ +/* + * FILE: ntoskrnl/ke/i386/clock.S + * COPYRIGHT: See COPYING in the top level directory + * PURPOSE: System Clock Management + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + */ + +/* INCLUDES ******************************************************************/ + +#include <asm.h> +#include <internal/i386/asmmacro.S> +.intel_syntax noprefix + +/* GLOBALS *******************************************************************/ + #include <ndk/asm.h> #include <../hal/halx86/include/halirq.h> -_KiCommonInterrupt: - cld - pushl %ds - pushl %es - pushl %fs - pushl %gs - pushl $0xceafbeef - movl $KGDT_R0_DATA,%eax - movl %eax,%ds - movl %eax,%es - movl %eax,%gs - movl $KGDT_R0_PCR,%eax - movl %eax,%fs - pushl %esp - pushl %ebx - call _KiInterruptDispatch - addl $0xC, %esp - popl %gs - popl %fs - popl %es - popl %ds - popa - iret +.global _irq_handler_0 +_irq_handler_0: + pusha + cld + push ds + push es + push fs + push gs + push 0xCEAFBEEF + mov eax, KGDT_R0_DATA + mov ds, eax + mov es, eax + mov gs, eax + mov eax, KGDT_R0_PCR + mov fs, eax + /* Increase interrupt count */ + inc dword ptr [fs:KPCR_PRCB_INTERRUPT_COUNT] -#ifdef CONFIG_SMP + /* Put vector in EBX and make space for KIRQL */ + sub esp, 4 -#define BUILD_INTERRUPT_HANDLER(intnum) \ - .global _KiUnexpectedInterrupt##intnum; \ - _KiUnexpectedInterrupt##intnum:; \ - pusha; \ - movl $0x##intnum, %ebx; \ - jmp _KiCommonInterrupt; + /* Begin interrupt */ + push esp + push 0x30 + push HIGH_LEVEL + call _HalBeginSystemInterrupt@12 -/* Interrupt handlers and declarations */ + cli + call _HalEndSystemInterrupt@8 -#define B(x,y) \ - BUILD_INTERRUPT_HANDLER(x##y) - -#define B16(x) \ - B(x,0) B(x,1) B(x,2) B(x,3) \ - B(x,4) B(x,5) B(x,6) B(x,7) \ - B(x,8) B(x,9) B(x,A) B(x,B) \ - B(x,C) B(x,D) B(x,E) B(x,F) - -B16(3) B16(4) B16(5) B16(6) -B16(7) B16(8) B16(9) B16(A) -B16(B) B16(C) B16(D) B16(E) -B16(F) - -#undef B -#undef B16 -#undef BUILD_INTERRUPT_HANDLER - -#else /* CONFIG_SMP */ - -#define BUILD_INTERRUPT_HANDLER(intnum) \ - .global _irq_handler_##intnum; \ - _irq_handler_##intnum:; \ - pusha; \ - movl $(##intnum + IRQ_BASE), %ebx; \ - jmp _KiCommonInterrupt; - -/* Interrupt handlers and declarations */ - -#define B(x) \ - BUILD_INTERRUPT_HANDLER(x) - -B(0) B(1) B(2) B(3) -B(4) B(5) B(6) B(7) -B(8) B(9) B(10) B(11) -B(12) B(13) B(14) B(15) - -#undef B -#undef BUILD_INTERRUPT_HANDLER - -#endif /* CONFIG_SMP */ - -.intel_syntax noprefix -.globl _KiUnexpectedInterrupt@0 -_KiUnexpectedInterrupt@0: - - /* Bugcheck with invalid interrupt code */ - push 0x12 - call _KeBugCheck@4 - + pop gs + pop fs + pop es + pop ds + popa + iret Propchange: trunk/reactos/ntoskrnl/ke/i386/irqhand.s ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s Fri Aug 25 03:25:37 2006 @@ -63,7 +63,7 @@ /* Chained and Normal generic interrupt handlers for 1st and 2nd level entry*/ .globl _KiChainedDispatch2ndLvl@0 -.globl _KiInterruptDispatch3@0 +.globl _KiInterruptDispatch@0 .globl _KiChainedDispatch@0 /* We implement the following trap exit points: */ @@ -1437,8 +1437,8 @@ jmp _Kei386EoiHelper@0 .endfunc -.func KiInterruptDispatch3@0 -_KiInterruptDispatch3@0: +.func KiInterruptDispatch@0 +_KiInterruptDispatch@0: /* Increase interrupt count */ inc dword ptr [fs:KPCR_PRCB_INTERRUPT_COUNT]

1 0

[janderwald] 23693: * handle PSN_APPLY effectively * remove no longer used callback * reenable PropSheet_Changed macros * fix styles for dialog
by janderwald＠svn.reactos.org 24 Aug '06

24 Aug '06

Author: janderwald Date: Fri Aug 25 00:55:13 2006 New Revision: 23693 URL: http://svn.reactos.org/svn/reactos?rev=23693&view=rev Log: * handle PSN_APPLY effectively * remove no longer used callback * reenable PropSheet_Changed macros * fix styles for dialog Modified: trunk/reactos/dll/win32/console/colors.c trunk/reactos/dll/win32/console/console.c trunk/reactos/dll/win32/console/console.h trunk/reactos/dll/win32/console/en.rc trunk/reactos/dll/win32/console/options.c Modified: trunk/reactos/dll/win32/console/colors.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/colors.c… ============================================================================== --- trunk/reactos/dll/win32/console/colors.c (original) +++ trunk/reactos/dll/win32/console/colors.c Fri Aug 25 00:55:13 2006 @@ -100,6 +100,10 @@ { PConsoleInfo pConInfo; LPNMUPDOWN lpnmud; + LPPSHNOTIFY lppsn; + DWORD red = -1; + DWORD green = -1; + DWORD blue = -1; pConInfo = (PConsoleInfo) GetWindowLongPtr(hwndDlg, DWLP_USER); @@ -124,11 +128,23 @@ } case WM_NOTIFY: { - DWORD red = -1; - DWORD green = -1; - DWORD blue = -1; - lpnmud = (LPNMUPDOWN) lParam; + lppsn = (LPPSHNOTIFY) lParam; + + if (lppsn->hdr.code == PSN_APPLY) + { + if (!pConInfo->AppliedConfig) + { + ApplyConsoleInfo(hwndDlg, pConInfo); + } + else + { + /* options have already been applied */ + SetWindowLong(hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR); + return TRUE; + } + return TRUE; + } if (lpnmud->hdr.idFrom == IDC_UPDOWN_COLOR_RED) { @@ -141,6 +157,10 @@ else if (lpnmud->hdr.idFrom == IDC_UPDOWN_COLOR_BLUE) { blue = lpnmud->iPos; + } + else + { + break; } if (red == -1) Modified: trunk/reactos/dll/win32/console/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/console.… ============================================================================== --- trunk/reactos/dll/win32/console/console.c (original) +++ trunk/reactos/dll/win32/console/console.c Fri Aug 25 00:55:13 2006 @@ -10,6 +10,8 @@ #include "console.h" #define NUM_APPLETS (1) +#define WM_SETCONSOLE (WM_USER+10) + LONG APIENTRY InitApplet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam); INT_PTR CALLBACK OptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); @@ -64,8 +66,6 @@ pConInfo->ScreenBuffer = MAKELONG(80, 300); GetModuleFileName(NULL, pConInfo->szProcessName, MAX_PATH); - //MessageBox(hwnd, pConInfo->szProcessName, _T("GetModuleFileName"), MB_OK); - GetStartupInfo(&StartupInfo); @@ -134,7 +134,7 @@ } case WM_COMMAND: { - if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) + if (LOWORD(wParam) == IDOK) { hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_APPLY_CURRENT); if ( SendMessage(hDlgCtrl, BM_GETCHECK, 0, 0) == BST_CHECKED ) @@ -142,6 +142,10 @@ else EndDialog(hwndDlg, IDC_RADIO_APPLY_ALL); } + else if (LOWORD(wParam) == IDCANCEL) + { + EndDialog(hwndDlg, IDCANCEL); + } break; } default: @@ -154,65 +158,31 @@ void ApplyConsoleInfo(HWND hwndDlg, PConsoleInfo pConInfo) { - INT_PTR res; + INT_PTR res = 0; res = DialogBox(hApplet, MAKEINTRESOURCE(IDD_APPLYOPTIONS), hwndDlg, ApplyProc); - if ( res == IDC_RADIO_APPLY_ALL ) - { + if (res == IDCANCEL) + { + /* dont destroy when user presses cancel */ + SetWindowLong(hwndDlg, DWL_MSGRESULT, PSNRET_INVALID_NOCHANGEPAGE); + } + else if ( res == IDC_RADIO_APPLY_ALL ) + { + /* apply options */ WriteConsoleOptions(pConInfo); + pConInfo->AppliedConfig = TRUE; + SetWindowLong(hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR); } else if ( res == IDC_RADIO_APPLY_CURRENT ) { /* - * TODO: check if szProcessName != _T("Console") - * in that case notify win32csr that the changes are local + * TODO: + * exchange info in some private way with win32csr */ - } -} - -/* Property Sheet Callback */ -int CALLBACK -PropSheetProc( - HWND hwndDlg, - UINT uMsg, - LPARAM lParam -) -{ - PConsoleInfo pConInfo = (PConsoleInfo) GetWindowLongPtr(GetParent(hwndDlg), DWLP_USER); - - switch(uMsg) - { - case PSCB_BUTTONPRESSED: - { - switch(lParam) - { - case PSBTN_OK: /* OK */ - { - if ( pConInfo ) - { - ApplyConsoleInfo(hwndDlg, pConInfo); - } - break; - } - case PSBTN_CANCEL: /* Cancel */ - { - break; - } - case PSBTN_FINISH: /* Close */ - { - break; - } - default: - return FALSE; - } - break; - } - - default: - break; - } - return TRUE; + pConInfo->AppliedConfig = TRUE; + SetWindowLong(hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR); + } } /* First Applet */ @@ -233,7 +203,7 @@ ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); psh.dwSize = sizeof(PROPSHEETHEADER); - psh.dwFlags = PSH_PROPSHEETPAGE | PSH_NOAPPLYNOW | PSH_PROPTITLE | PSH_USECALLBACK; + psh.dwFlags = PSH_PROPSHEETPAGE | PSH_PROPTITLE | PSH_NOAPPLYNOW; psh.hwndParent = NULL; psh.hInstance = hApplet; psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDC_CPLICON)); @@ -241,7 +211,7 @@ psh.nPages = 4; psh.nStartPage = 0; psh.ppsp = psp; - psh.pfnCallback = PropSheetProc; + psh.pszCaption = pConInfo->szProcessName; InitPropSheetPage(&psp[i++], IDD_PROPPAGEOPTIONS, (DLGPROC) OptionsProc, (LPARAM)pConInfo); InitPropSheetPage(&psp[i++], IDD_PROPPAGEFONT, (DLGPROC) FontProc, (LPARAM)pConInfo); Modified: trunk/reactos/dll/win32/console/console.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/console.… ============================================================================== --- trunk/reactos/dll/win32/console/console.h (original) +++ trunk/reactos/dll/win32/console/console.h Fri Aug 25 00:55:13 2006 @@ -21,6 +21,7 @@ typedef struct TAGConsoleInfo { TCHAR szProcessName[MAX_PATH]; + BOOLEAN AppliedConfig; DWORD CursorSize; DWORD NumberOfHistoryBuffers; DWORD HistoryBufferSize; @@ -28,22 +29,19 @@ DWORD FullScreen; DWORD QuickEdit; DWORD InsertMode; - DWORD ScreenBuffer; DWORD WindowSize; DWORD WindowPosition; - - - DWORD ActiveStaticControl; COLORREF ScreenText; COLORREF ScreenBackground; COLORREF PopupText; COLORREF PopupBackground; - } ConsoleInfo, *PConsoleInfo; BOOL WriteConsoleOptions(PConsoleInfo pConInfo); +void ApplyConsoleInfo(HWND hwndDlg, PConsoleInfo pConInfo); + //globals extern HINSTANCE hApplet; Modified: trunk/reactos/dll/win32/console/en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/en.rc?re… ============================================================================== --- trunk/reactos/dll/win32/console/en.rc (original) +++ trunk/reactos/dll/win32/console/en.rc Fri Aug 25 00:55:13 2006 @@ -131,7 +131,7 @@ END IDD_APPLYOPTIONS DIALOGEX 0, 0, 220, 100 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION +STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION CAPTION "Apply Properties" FONT 8, "MS Shell Dlg" BEGIN Modified: trunk/reactos/dll/win32/console/options.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/options.… ============================================================================== --- trunk/reactos/dll/win32/console/options.c (original) +++ trunk/reactos/dll/win32/console/options.c Fri Aug 25 00:55:13 2006 @@ -57,7 +57,26 @@ hDlgCtrl = GetDlgItem(hwndDlg, IDC_EDIT_NUM_BUFFER); pConInfo->NumberOfHistoryBuffers = LOWORD(SendMessage(hDlgCtrl, UDM_GETPOS, 0, 0)); - //PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + //else if (lppsn->hdr.code == PSN_KILLACTIVE) + //{ + // SetWindowLong(hwndDlg, DWL_MSGRESULT, FALSE); + // return FALSE; + //} + else if (lppsn->hdr.code == PSN_APPLY) + { + if (!pConInfo->AppliedConfig) + { + ApplyConsoleInfo(hwndDlg, pConInfo); + } + else + { + /* options have already been applied */ + SetWindowLong(hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR); + return TRUE; + } + return TRUE; } break; } @@ -72,31 +91,31 @@ case IDC_RADIO_SMALL_CURSOR: { pConInfo->CursorSize = 0x0; - //PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; } case IDC_RADIO_MEDIUM_CURSOR: { pConInfo->CursorSize = 0x32; - //PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; } case IDC_RADIO_LARGE_CURSOR: { pConInfo->CursorSize = 0x64; - //PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; } case IDC_RADIO_DISPLAY_WINDOW: { pConInfo->FullScreen = FALSE; - //PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; } case IDC_RADIO_DISPLAY_FULL: { pConInfo->FullScreen = TRUE; - //PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; } case IDC_CHECK_QUICK_EDIT: @@ -112,7 +131,7 @@ pConInfo->QuickEdit = TRUE; SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); } - //PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; } case IDC_CHECK_INSERT_MODE: @@ -128,7 +147,7 @@ pConInfo->InsertMode = TRUE; SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); } - //PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; } case IDC_CHECK_DISCARD_DUPLICATES: @@ -144,7 +163,7 @@ pConInfo->HistoryNoDup = TRUE; SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); } - //PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; } default:

1 0

[ion] 23692: - Fix some bugs in clock.S - Enable clock.S versions of KeUpdateSystem/RunTime and export them properly. - Enable systimer.S to call into kernel's KeUpdateSystemTime. - Enable Hal's Clock Interrupt during Phase 1. - Remove most of the code that was still left in irq.c - Only one large problem remains now, which is the spurious firing of the clock interrupt before we're ready to handle it... I will try to fix this today.
by ion＠svn.reactos.org 24 Aug '06

24 Aug '06

Author: ion Date: Thu Aug 24 23:17:14 2006 New Revision: 23692 URL: http://svn.reactos.org/svn/reactos?rev=23692&view=rev Log: - Fix some bugs in clock.S - Enable clock.S versions of KeUpdateSystem/RunTime and export them properly. - Enable systimer.S to call into kernel's KeUpdateSystemTime. - Enable Hal's Clock Interrupt during Phase 1. - Remove most of the code that was still left in irq.c - Only one large problem remains now, which is the spurious firing of the clock interrupt before we're ready to handle it... I will try to fix this today. Modified: trunk/reactos/hal/halx86/generic/halinit.c trunk/reactos/hal/halx86/generic/systimer.S trunk/reactos/ntoskrnl/ke/clock.c trunk/reactos/ntoskrnl/ke/i386/clock.S trunk/reactos/ntoskrnl/ke/i386/irq.c trunk/reactos/ntoskrnl/ntoskrnl.def Modified: trunk/reactos/hal/halx86/generic/halinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/halinit… ============================================================================== --- trunk/reactos/hal/halx86/generic/halinit.c (original) +++ trunk/reactos/hal/halx86/generic/halinit.c Thu Aug 24 23:17:14 2006 @@ -32,10 +32,6 @@ return STATUS_SUCCESS; } -#define MAKEULONG(x, y) \ - (((((ULONG)(x))<<16) & 0xffff0000) | \ - ((ULONG)(y) & 0xffff)) - BOOLEAN STDCALL HalInitSystem (ULONG BootPhase, PLOADER_PARAMETER_BLOCK LoaderBlock) @@ -47,14 +43,13 @@ } else if (BootPhase == 1) { -#if 0 /* Enable the clock interrupt */ ((PKIPCR)KeGetPcr())->IDT[IRQ2VECTOR(0)].ExtendedOffset = (USHORT)(((ULONG_PTR)HalpClockInterrupt >> 16) & 0xFFFF); ((PKIPCR)KeGetPcr())->IDT[IRQ2VECTOR(0)].Offset = (USHORT)HalpClockInterrupt; HalEnableSystemInterrupt(IRQ2VECTOR(0), CLOCK2_LEVEL, Latched); -#endif + /* Initialize display and make the screen black */ HalInitializeDisplay ((PROS_LOADER_PARAMETER_BLOCK)LoaderBlock); HalpInitBusHandlers(); Modified: trunk/reactos/hal/halx86/generic/systimer.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/systime… ============================================================================== --- trunk/reactos/hal/halx86/generic/systimer.S (original) +++ trunk/reactos/hal/halx86/generic/systimer.S Thu Aug 24 23:17:14 2006 @@ -38,7 +38,8 @@ jz Spurious /* Do a tick */ - //jmp _KeUpdateSystemTime@0 + mov eax, 100000 + jmp _KeUpdateSystemTime@0 Spurious: Modified: trunk/reactos/ntoskrnl/ke/clock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/clock.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/ke/clock.c (original) +++ trunk/reactos/ntoskrnl/ke/clock.c Thu Aug 24 23:17:14 2006 @@ -36,13 +36,9 @@ #endif CHAR KiTimerSystemAuditing = 0; -static KDPC KiExpireTimerDpc; +KDPC KiExpireTimerDpc; BOOLEAN KiClockSetupComplete = FALSE; -extern ULONG KiMaximumDpcQueueDepth; -extern ULONG KiMinimumDpcRate; -extern ULONG KiAdjustDpcThreshold; -extern ULONG KiIdealDpcRate; /* * Number of timer interrupts since initialisation @@ -82,7 +78,7 @@ { TIME_FIELDS TimeFields; - DPRINT("KiInitializeSystemClock()\n"); + DPRINT1("KiInitializeSystemClock()\n"); InitializeListHead(&KiTimerListHead); KeInitializeDpc(&KiExpireTimerDpc, (PKDEFERRED_ROUTINE)KiExpireTimers, 0); @@ -101,7 +97,7 @@ SharedUserData->SystemTime.High1Time = SystemBootTime.u.HighPart; KiClockSetupComplete = TRUE; - DPRINT("Finished KiInitializeSystemClock()\n"); + DPRINT1("Finished KiInitializeSystemClock()\n"); } VOID @@ -235,192 +231,6 @@ } /* - * NOTE: On Windows this function takes exactly one parameter and EBP is - * guaranteed to point to KTRAP_FRAME. The function is used only - * by HAL, so there's no point in keeping that prototype. - * - * @implemented - */ -VOID -STDCALL -KeUpdateRunTime(IN PKTRAP_FRAME TrapFrame, - IN KIRQL Irql) -{ - PKPRCB Prcb = KeGetCurrentPrcb(); - PKTHREAD CurrentThread = Prcb->CurrentThread; - PKPROCESS CurrentProcess = CurrentThread->ApcState.Process; - - /* Increase interrupt count */ - Prcb->InterruptCount++; - - /* Check if we came from user mode */ - if ((TrapFrame->EFlags & EFLAGS_V86_MASK) || - (TrapFrame->SegCs & MODE_MASK)) - { - /* Update user times */ - CurrentThread->UserTime++; - InterlockedIncrement((PLONG)&CurrentProcess->UserTime); - Prcb->UserTime++; - } - else - { - /* Update CPU kernel time in all cases */ - Prcb->KernelTime++; - - /* Check IRQ */ - if (Irql > DISPATCH_LEVEL) - { - /* This was an interrupt */ - Prcb->InterruptTime++; - } - else if ((Irql < DISPATCH_LEVEL) || !(Prcb->DpcRoutineActive)) - { - /* This was normal kernel time */ - CurrentThread->KernelTime++; - InterlockedIncrement((PLONG)&CurrentProcess->KernelTime); - } - else if (Irql == DISPATCH_LEVEL) - { - /* This was DPC time */ - Prcb->DpcTime++; - } - } - - /* Set the last DPC Count and request rate */ - Prcb->DpcLastCount = Prcb->DpcData[0].DpcCount; - Prcb->DpcRequestRate = ((Prcb->DpcData[0].DpcCount - Prcb->DpcLastCount) + - Prcb->DpcRequestRate) / 2; - - /* Check if we should request a DPC */ - if ((Prcb->DpcData[0].DpcQueueDepth) && - !(Prcb->DpcRoutineActive) && - !(Prcb->DpcInterruptRequested)) - { - /* Request one */ - HalRequestSoftwareInterrupt(DISPATCH_LEVEL); - - /* Update the depth if needed */ - if ((Prcb->DpcRequestRate < KiIdealDpcRate) && - (Prcb->MaximumDpcQueueDepth > 1)) - { - /* Decrease the maximum depth by one */ - Prcb->MaximumDpcQueueDepth--; - } - } - else - { - /* Decrease the adjustment threshold */ - if (!(--Prcb->AdjustDpcThreshold)) - { - /* We've hit 0, reset it */ - Prcb->AdjustDpcThreshold = KiAdjustDpcThreshold; - - /* Check if we've hit queue maximum */ - if (KiMaximumDpcQueueDepth != Prcb->MaximumDpcQueueDepth) - { - /* Increase maximum by one */ - Prcb->MaximumDpcQueueDepth++; - } - } - } - - /* - * If we're at end of quantum request software interrupt. The rest - * is handled in KiDispatchInterrupt. - * - * NOTE: If one stays at DISPATCH_LEVEL for a long time the DPC routine - * which checks for quantum end will not be executed and decrementing - * the quantum here can result in overflow. This is not a problem since - * we don't care about the quantum value anymore after the QuantumEnd - * flag is set. - */ - if (((CurrentThread->Quantum -= 3) <= 0) && - (Prcb->IdleThread != CurrentThread)) - { - Prcb->QuantumEnd = TRUE; - HalRequestSoftwareInterrupt(DISPATCH_LEVEL); - } -} - - -/* - * NOTE: On Windows this function takes exactly zero parameters and EBP is - * guaranteed to point to KTRAP_FRAME. Also [esp+0] contains an IRQL. - * The function is used only by HAL, so there's no point in keeping - * that prototype. - * - * @implemented - */ -VOID -STDCALL -KeUpdateSystemTime(IN PKTRAP_FRAME TrapFrame, - IN KIRQL Irql, - IN ULONG Increment) -{ - LONG OldOffset; - LARGE_INTEGER Time; - ASSERT(KeGetCurrentIrql() == PROFILE_LEVEL); - - /* Update interrupt time */ - Time.LowPart = SharedUserData->InterruptTime.LowPart; - Time.HighPart = SharedUserData->InterruptTime.High1Time; - Time.QuadPart += Increment; - SharedUserData->InterruptTime.High2Time = Time.u.HighPart; - SharedUserData->InterruptTime.LowPart = Time.u.LowPart; - SharedUserData->InterruptTime.High1Time = Time.u.HighPart; - - /* Increase the tick offset */ - KiTickOffset -= Increment; - OldOffset = KiTickOffset; - - /* Check if this isn't a tick yet */ - if (KiTickOffset > 0) - { - /* Expire timers */ - KeInsertQueueDpc(&KiExpireTimerDpc, (PVOID)TrapFrame->Eip, 0); - } - else - { - /* Setup time structure for system time */ - Time.LowPart = SharedUserData->SystemTime.LowPart; - Time.HighPart = SharedUserData->SystemTime.High1Time; - Time.QuadPart += KeTimeAdjustment; - SharedUserData->SystemTime.High2Time = Time.HighPart; - SharedUserData->SystemTime.LowPart = Time.LowPart; - SharedUserData->SystemTime.High1Time = Time.HighPart; - - /* Setup time structure for tick time */ - Time.LowPart = KeTickCount.LowPart; - Time.HighPart = KeTickCount.High1Time; - Time.QuadPart += 1; - KeTickCount.High2Time = Time.HighPart; - KeTickCount.LowPart = Time.LowPart; - KeTickCount.High1Time = Time.HighPart; - SharedUserData->TickCount.High2Time = Time.HighPart; - SharedUserData->TickCount.LowPart = Time.LowPart; - SharedUserData->TickCount.High1Time = Time.HighPart; - - /* Update tick count in shared user data as well */ - SharedUserData->TickCountLowDeprecated++; - - /* Queue a DPC that will expire timers */ - KeInsertQueueDpc(&KiExpireTimerDpc, (PVOID)TrapFrame->Eip, 0); - } - - /* Update process and thread times */ - if (OldOffset <= 0) - { - /* This was a tick, calculate the next one */ - KiTickOffset += KeMaximumIncrement; - KeUpdateRunTime(TrapFrame, Irql); - } - - /* Return from the interrupt */ - Ke386DisableInterrupts(); - HalEndSystemInterrupt(Irql, 0); -} - -/* * @implemented */ ULONG Modified: trunk/reactos/ntoskrnl/ke/i386/clock.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/clock.S?r… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/clock.S (original) +++ trunk/reactos/ntoskrnl/ke/i386/clock.S Thu Aug 24 23:17:14 2006 @@ -17,12 +17,13 @@ .extern _KiTickOffset .extern _KeTickCount .extern _KeMaximumIncrement +.extern _KiExpireTimerDpc /* FUNCTIONS ******************************************************************/ -.globl _KeUpdateRunTime2@0 -.func KeUpdateRunTime2@0 -_KeUpdateRunTime2@0: +.globl _KeUpdateRunTime@4 +.func KeUpdateRunTime@4 +_KeUpdateRunTime@4: /* Get KPCR */ mov eax, [fs:KPCR_SELF] @@ -155,9 +156,9 @@ ret 4 .endfunc -.globl _KeUpdateSystemTime2@0 -.func KeUpdateSystemTime2@0 -_KeUpdateSystemTime2@0: +.globl _KeUpdateSystemTime@0 +.func KeUpdateSystemTime@0 +_KeUpdateSystemTime@0: /* Get shared data in ECX */ mov ecx, USER_SHARED_DATA @@ -185,8 +186,8 @@ mov ebx, USER_SHARED_DATA /* Get system time */ - mov edi, [ebx+USER_SHARED_DATA_SYSTEM_TIME] - mov esi, [ebx+USER_SHARED_DATA_SYSTEM_TIME+4] + mov ecx, [ebx+USER_SHARED_DATA_SYSTEM_TIME] + mov edx, [ebx+USER_SHARED_DATA_SYSTEM_TIME+4] /* Add the increment and get the carry */ add ecx, _KeTimeAdjustment @@ -218,9 +219,16 @@ mov [USER_SHARED_DATA+USER_SHARED_DATA_TICK_COUNT], ecx mov [USER_SHARED_DATA+USER_SHARED_DATA_TICK_COUNT+4], edx + /* FIXME: HACK */ + mov [USER_SHARED_DATA], ecx + IncompleteTick: - /* Queue DPC to handle registered timers */ + /* FIXME: NASTY Queue DPC to handle registered timers */ + push 0 + push [esp+KTRAP_FRAME_EIP] + push offset _KiExpireTimerDpc + call _KeInsertQueueDpc@12 /* Check if this was a full tick */ cmp dword ptr _KiTickOffset, 0 @@ -231,8 +239,8 @@ add _KiTickOffset, eax /* Update system run time */ - push esp - call _KeUpdateRunTime@8 + push [esp] + call _KeUpdateRunTime@4 jmp Done IncompleteTick2: Modified: trunk/reactos/ntoskrnl/ke/i386/irq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/irq.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/irq.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/irq.c Thu Aug 24 23:17:14 2006 @@ -83,29 +83,6 @@ I486_INTERRUPT_GATE; } -STATIC VOID -KeIRQTrapFrameToTrapFrame(PKIRQ_TRAPFRAME IrqTrapFrame, - PKTRAP_FRAME TrapFrame) -{ - TrapFrame->SegGs = (USHORT)IrqTrapFrame->Gs; - TrapFrame->SegFs = (USHORT)IrqTrapFrame->Fs; - TrapFrame->SegEs = (USHORT)IrqTrapFrame->Es; - TrapFrame->SegDs = (USHORT)IrqTrapFrame->Ds; - TrapFrame->Eax = IrqTrapFrame->Eax; - TrapFrame->Ecx = IrqTrapFrame->Ecx; - TrapFrame->Edx = IrqTrapFrame->Edx; - TrapFrame->Ebx = IrqTrapFrame->Ebx; - TrapFrame->HardwareEsp = IrqTrapFrame->Esp; - TrapFrame->Ebp = IrqTrapFrame->Ebp; - TrapFrame->Esi = IrqTrapFrame->Esi; - TrapFrame->Edi = IrqTrapFrame->Edi; - TrapFrame->Eip = IrqTrapFrame->Eip; - TrapFrame->SegCs = IrqTrapFrame->Cs; - TrapFrame->EFlags = IrqTrapFrame->Eflags; -} - -extern BOOLEAN KiClockSetupComplete; - VOID KiInterruptDispatch (ULONG vector, PKIRQ_TRAPFRAME Trapframe) /* @@ -115,23 +92,6 @@ */ { KIRQL old_level; - KTRAP_FRAME KernelTrapFrame; - ASSERT(vector == 0x30); -#if 0 - PULONG Frame; - DPRINT1("Received Interrupt: %lx\n", vector); - DPRINT1("My trap frame: %p\n", Trapframe); - DPRINT1("Stack trace\n"); - __asm__("mov %%ebp, %0" : "=r" (Frame) : ); - DPRINT1("Stack trace: %p %p %p %p\n", Frame, *Frame, Frame[1], *(PULONG)Frame[1]); - DPRINT1("Clock setup: %lx\n", KiClockSetupComplete); - if (KiClockSetupComplete) while(TRUE); -#endif - - /* - * At this point we have interrupts disabled, nothing has been done to - * the PIC. - */ KeGetCurrentPrcb()->InterruptCount++; /* @@ -145,23 +105,7 @@ return; } - - /* - * Enable interrupts - * NOTE: Only higher priority interrupts will get through - */ Ke386EnableInterrupts(); - - //DPRINT1("Tick\n"); - if (KiClockSetupComplete) - { - KeIRQTrapFrameToTrapFrame(Trapframe, &KernelTrapFrame); - return KeUpdateSystemTime(&KernelTrapFrame, old_level, 100000); - } - - /* - * End the system interrupt. - */ Ke386DisableInterrupts(); HalEndSystemInterrupt (old_level, 0); } Modified: trunk/reactos/ntoskrnl/ntoskrnl.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.def?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.def (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.def Thu Aug 24 23:17:14 2006 @@ -647,8 +647,8 @@ KeTerminateThread@4 KeTickCount DATA @KeTryToAcquireGuardedMutex@4 -KeUpdateRunTime@8 -KeUpdateSystemTime@12 +KeUpdateRunTime@4 +KeUpdateSystemTime@0 KeUnstackDetachProcess@4 KeUserModeCallback@20 KeWaitForMultipleObjects@32

1 0

[amunger] 23691: DBG=0 fixes, patch by Physicus.
by amunger＠svn.reactos.org 24 Aug '06

24 Aug '06

Author: amunger Date: Thu Aug 24 22:48:15 2006 New Revision: 23691 URL: http://svn.reactos.org/svn/reactos?rev=23691&view=rev Log: DBG=0 fixes, patch by Physicus. Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c Thu Aug 24 22:48:15 2006 @@ -6059,7 +6059,10 @@ { PEHCI_DEV ehci; - ULONG status, urb_count; + ULONG status; +#ifdef DBG + ULONG urb_count; +#endif PLIST_ENTRY pthis, pnext; PURB purb; BOOLEAN door_bell_rings; Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c Thu Aug 24 22:48:15 2006 @@ -3771,9 +3771,9 @@ NTSTATUS DriverEntry(IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath) { +#if DBG NTSTATUS ntStatus = STATUS_SUCCESS; -#if DBG // should be done before any debug output is done. // read our debug verbosity level from the registry //NetacOD_GetRegistryDword( NetacOD_REGISTRY_PARAMETERS_PATH, //absolute registry path Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S Thu Aug 24 22:48:15 2006 @@ -566,7 +566,9 @@ jnz 6f /* Assert the trap frame */ +#endif 5: +#ifdef DBG sub dword ptr [esp+KTRAP_FRAME_DEBUGARGMARK], 0xBADB0D00 //jnz 0f // FIXME: ROS IS BROKEN

1 0

[cwittich] 23690: some more msvc warning fixes
by cwittich＠svn.reactos.org 24 Aug '06

24 Aug '06

Author: cwittich Date: Thu Aug 24 21:23:07 2006 New Revision: 23690 URL: http://svn.reactos.org/svn/reactos?rev=23690&view=rev Log: some more msvc warning fixes Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/dmgrdisp.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 Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/dmgrdisp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/dmgrdisp.c (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/dmgrdisp.c Thu Aug 24 21:23:07 2006 @@ -29,6 +29,8 @@ NTSTATUS status; PDEVEXT_HEADER dev_hdr; + UNREFERENCED_PARAMETER(context); + if (purb == NULL) return; Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/hub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/hub.c (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/hub.c Thu Aug 24 21:23:07 2006 @@ -2272,6 +2272,9 @@ USE_BASIC_NON_PENDING_IRQL; + UNREFERENCED_PARAMETER(param); + UNREFERENCED_PARAMETER(context); + usb_dbg_print(DBGLVL_MAXIMUM, ("dev_mgr_event_select_driver(): pdev=%p event=0x%x\n", pdev, event)); if (pdev == NULL) @@ -3536,7 +3539,7 @@ KIRQL old_irql; BOOLEAN ret; KeAcquireSpinLock(&irp_list->irp_list_lock, &old_irql); - ret = (irp_list->irp_free_list_count == MAX_IRP_LIST_SIZE); + ret = (BOOLEAN) (irp_list->irp_free_list_count == MAX_IRP_LIST_SIZE); KeReleaseSpinLock(&irp_list->irp_list_lock, old_irql); return ret; } @@ -3547,7 +3550,7 @@ KIRQL old_irql; BOOLEAN ret; KeAcquireSpinLock(&irp_list->irp_list_lock, &old_irql); - ret = (irp_list->irp_free_list_count == 0); + ret = (BOOLEAN) (irp_list->irp_free_list_count == 0); KeReleaseSpinLock(&irp_list->irp_list_lock, old_irql); return ret; } Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/td.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/td.c (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/td.c Thu Aug 24 21:23:07 2006 @@ -176,7 +176,7 @@ if (pool == NULL) return FALSE; - return (pool->free_count == 0); + return (BOOLEAN) (pool->free_count == 0); } BOOLEAN Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c Thu Aug 24 21:23:07 2006 @@ -1527,6 +1527,7 @@ USE_BASIC_NON_PENDING_IRQL; UNREFERENCED_PARAMETER(dpc); + UNREFERENCED_PARAMETER(sysarg2); uhci = (PUHCI_DEV) context; if (uhci == NULL) @@ -3065,7 +3066,7 @@ KeSynchronizeExecution(uhci->pdev_ext->uhci_int, uhci_sync_cancel_urb, &sync_param); - found = sync_param.ret; + found = (BOOLEAN) sync_param.ret; if (found) return USB_STATUS_CANCELING;

1 0

[hpoussin] 23689: Fix all warnings detected by gcc 4.2 Patch by Thomas Weidenmueller
by hpoussin＠svn.reactos.org 24 Aug '06

24 Aug '06

Author: hpoussin Date: Thu Aug 24 20:58:12 2006 New Revision: 23689 URL: http://svn.reactos.org/svn/reactos?rev=23689&view=rev Log: Fix all warnings detected by gcc 4.2 Patch by Thomas Weidenmueller Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/bulkonly.c trunk/reactos/drivers/usb/nt4compat/usbdriver/devmgr.h trunk/reactos/drivers/usb/nt4compat/usbdriver/gendrv.c trunk/reactos/drivers/usb/nt4compat/usbdriver/umss.c Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/bulkonly.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/bulkonly.c (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/bulkonly.c Thu Aug 24 20:58:12 2006 @@ -605,7 +605,7 @@ umss_bulkonly_get_maxlun(IN PUMSS_DEVICE_EXTENSION pdev_ext) { PURB purb = NULL; - CHAR max_lun; + UCHAR max_lun; NTSTATUS status; purb = usb_alloc_mem(NonPagedPool, sizeof(URB)); Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/devmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/devmgr.h (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/devmgr.h Thu Aug 24 20:58:12 2006 @@ -42,7 +42,7 @@ BYTE if_protocol; // Interface Protocol // Driver Info - PBYTE driver_name; // Driver name for Name Registry + const char *driver_name; // Driver name for Name Registry BYTE dev_class; // Device Class (from SampleStorageDeviceID.h) BYTE dev_sub_class; // Device Subclass BYTE dev_protocol; // Protocol Info. Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/gendrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/gendrv.c (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/gendrv.c Thu Aug 24 20:58:12 2006 @@ -1343,7 +1343,7 @@ BOOLEAN is_if; PUSB_DRIVER pdrvr; PGENDRV_DEVICE_EXTENSION pdev_ext; - UCHAR dev_name[64]; + CHAR dev_name[64]; STRING string; UNICODE_STRING symb_link; PGENDRV_DRVR_EXTENSION pdrvr_ext; @@ -1579,7 +1579,7 @@ } else { - IoSetCancelRoutine(irp, NULL); + (void)IoSetCancelRoutine(irp, NULL); } IoReleaseCancelSpinLock(old_irql); Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/umss.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/umss.c (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/umss.c Thu Aug 24 20:58:12 2006 @@ -86,7 +86,7 @@ // and upper driver use this to register itself // with umss driver for future notification of // pnp event. 2004-03-22 23:12:41 - UCHAR dev_name[64]; + CHAR dev_name[64]; STRING string; NTSTATUS status; PDEVICE_OBJECT pdev; @@ -136,7 +136,7 @@ BOOLEAN umss_delete_port_device(PDEVICE_OBJECT dev_obj) { - UCHAR dev_name[64]; + CHAR dev_name[64]; STRING string; UNICODE_STRING symb_link; @@ -305,7 +305,7 @@ umss_create_device(PUSB_DEV_MANAGER dev_mgr, PUSB_DRIVER umss_drvr, DEV_HANDLE dev_handle, BOOLEAN is_if) { - UCHAR dev_name[64], dev_id; + CHAR dev_name[64], dev_id; STRING string; NTSTATUS status; PDEVICE_OBJECT pdev; @@ -708,7 +708,7 @@ BOOLEAN umss_delete_device(PUSB_DEV_MANAGER dev_mgr, PUSB_DRIVER pdrvr, PDEVICE_OBJECT dev_obj, BOOLEAN is_if) { - UCHAR dev_name[64]; + CHAR dev_name[64]; STRING string; UNICODE_STRING symb_link; PUMSS_DEVICE_EXTENSION pdev_ext;

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
45
Older →

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 August 2006