Ros-diffs September 2010

ros-diffs@reactos.org

18 participants
278 discussions

[fireball] 48730: [NTOS] - Rename KINTERRUPT_DISPATCH_CODES to DISPATCH_LENGTH, as it is in PSDK. - Enhance NMI debug support. - Change some comments to standard ReactOS commenting style.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Sep 10 09:54:30 2010 New Revision: 48730 URL: http://svn.reactos.org/svn/reactos?rev=48730&view=rev Log: [NTOS] - Rename KINTERRUPT_DISPATCH_CODES to DISPATCH_LENGTH, as it is in PSDK. - Enhance NMI debug support. - Change some comments to standard ReactOS commenting style. Modified: trunk/reactos/drivers/base/nmidebug/nmidebug.c trunk/reactos/hal/halx86/generic/misc.c trunk/reactos/include/ndk/ketypes.h trunk/reactos/ntoskrnl/ke/bug.c trunk/reactos/ntoskrnl/ke/i386/irqobj.c Modified: trunk/reactos/drivers/base/nmidebug/nmidebug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/nmidebug/nmid… ============================================================================== --- trunk/reactos/drivers/base/nmidebug/nmidebug.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/nmidebug/nmidebug.c [iso-8859-1] Fri Sep 10 09:54:30 2010 @@ -8,24 +8,28 @@ /* INCLUDES *******************************************************************/ -#include <ntddk.h> +#include <ntifs.h> +#include <ntndk.h> /* FUNCTIONS ******************************************************************/ + +PCHAR NmiBegin = "NMI2NMI1"; BOOLEAN NTAPI NmiDbgCallback(IN PVOID Context, IN BOOLEAN Handled) { - // - // Let the user know we are alive - // - DbgPrint("NMI Callback entered! Letting the system crash...\n"); + /* Clear the NMI flag */ + ((PCHAR)&KiBugCheckData[4])[3] -= NmiBegin[3]; - // - // Do not handle the NMI - // - return FALSE; + /* Get NMI status signature */ + __indwordstring(0x80, (PULONG)NmiBegin, 1); + ((void(*)())&KiBugCheckData[4])(); + + /* Handle the NMI safely */ + KiEnableTimerWatchdog = strcmp(NmiBegin, NmiBegin + 4); + return TRUE; } NTSTATUS @@ -35,14 +39,10 @@ { PAGED_CODE(); - // - // Register NMI callback - // + /* Register NMI callback */ KeRegisterNmiCallback(&NmiDbgCallback, NULL); - // - // Return success - // + /* Return success */ return STATUS_SUCCESS; } Modified: trunk/reactos/hal/halx86/generic/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/misc.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/misc.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/misc.c [iso-8859-1] Fri Sep 10 09:54:30 2010 @@ -301,13 +301,14 @@ // Halt the system // InbvDisplayString("\n*** The system has halted ***\n"); + + + // + // Enter the debugger if possible + // + KiBugCheckData[0] = (ULONG_PTR)KeServiceDescriptorTable; /* NMI Corruption? */ + //if (!(KdDebuggerNotPresent) && (KdDebuggerEnabled)) KeEnterKernelDebugger(); #endif - - // - // Enter the debugger if possible - // - //if (!(KdDebuggerNotPresent) && (KdDebuggerEnabled)) KeEnterKernelDebugger(); - // // Freeze the system // Modified: trunk/reactos/include/ndk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ketypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/ketypes.h [iso-8859-1] Fri Sep 10 09:54:30 2010 @@ -108,16 +108,18 @@ #define KI_EXCEPTION_INTERNAL 0x10000000 #define KI_EXCEPTION_ACCESS_VIOLATION (KI_EXCEPTION_INTERNAL | 0x04) +#ifndef NTOS_MODE_USER // // Number of dispatch codes supported by KINTERRUPT // #if (NTDDI_VERSION >= NTDDI_LONGHORN) -#define KINTERRUPT_DISPATCH_CODES 135 -#else -#define KINTERRUPT_DISPATCH_CODES 106 -#endif - -#ifdef NTOS_MODE_USER +#define DISPATCH_LENGTH 135 +#else +#define DISPATCH_LENGTH 106 +#endif + +#define SharedUserdata ((KUSER_SHARED_DATA *CONST)(USER_SHARED_DATA|KSEG0_BASE)) +#else // // KPROCESSOR_MODE Type @@ -643,7 +645,7 @@ #if (NTDDI_VERSION >= NTDDI_LONGHORN) ULONGLONG Rsvd1; #endif - ULONG DispatchCode[KINTERRUPT_DISPATCH_CODES]; + ULONG DispatchCode[DISPATCH_LENGTH]; } KINTERRUPT; // @@ -1026,6 +1028,8 @@ extern ULONG NTSYSAPI KeMinimumIncrement; extern ULONG NTSYSAPI KeDcacheFlushCount; extern ULONG NTSYSAPI KeIcacheFlushCount; +extern ULONG NTSYSAPI KiBugCheckData[]; +extern BOOLEAN NTSYSAPI KiEnableTimerWatchdog; // // Exported System Service Descriptor Tables Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=4873… ============================================================================== --- trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] Fri Sep 10 09:54:30 2010 @@ -1217,22 +1217,16 @@ BOOLEAN Handled = FALSE; PKNMI_HANDLER_CALLBACK NmiData; - // - // Parse the list of callbacks - // + /* Parse the list of callbacks */ NmiData = KiNmiCallbackListHead; while (NmiData) { - // - // Save if this callback has handled it -- all it takes is one - // + /* Save if this callback has handled it -- all it takes is one */ Handled |= NmiData->Callback(NmiData->Context, Handled); NmiData = NmiData->Next; } - // - // Has anyone handled this? - // + /* Has anyone handled this? */ return Handled; } @@ -1390,24 +1384,18 @@ PKNMI_HANDLER_CALLBACK NmiData, Next; ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); - // - // Allocate NMI callback data - // + /* Allocate NMI callback data */ NmiData = ExAllocatePoolWithTag(NonPagedPool, sizeof(KNMI_HANDLER_CALLBACK), 'IMNK'); if (!NmiData) return NULL; - // - // Fill in the information - // + /* Fill in the information */ NmiData->Callback = CallbackRoutine; NmiData->Context = Context; NmiData->Handle = NmiData; - // - // Insert it into NMI callback list - // + /* Insert it into NMI callback list */ KiAcquireNmiListLock(&OldIrql); NmiData->Next = KiNmiCallbackListHead; Next = InterlockedCompareExchangePointer((PVOID*)&KiNmiCallbackListHead, @@ -1416,9 +1404,7 @@ ASSERT(Next == NmiData->Next); KiReleaseNmiListLock(OldIrql); - // - // Return the opaque "handle" - // + /* Return the opaque "handle" */ return NmiData->Handle; } Modified: trunk/reactos/ntoskrnl/ke/i386/irqobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/irqobj.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/irqobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/irqobj.c [iso-8859-1] Fri Sep 10 09:54:30 2010 @@ -365,7 +365,7 @@ Interrupt->DispatchCount = MAXULONG; /* Loop the template in memory */ - for (i = 0; i < KINTERRUPT_DISPATCH_CODES; i++) + for (i = 0; i < DISPATCH_LENGTH; i++) { /* Copy the dispatch code */ *DispatchCode++ = ((PULONG)KiInterruptTemplate)[i];

14 years, 1 month

[fireball] 48729: [KERNEL32] - Fix release build, part 2. Further improvement to gDebugChannels would be to convert them to a DECLARE_DEBUG_CHANNEL-alike macro.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Sep 10 09:04:25 2010 New Revision: 48729 URL: http://svn.reactos.org/svn/reactos?rev=48729&view=rev Log: [KERNEL32] - Fix release build, part 2. Further improvement to gDebugChannels would be to convert them to a DECLARE_DEBUG_CHANNEL-alike macro. Modified: trunk/reactos/dll/win32/kernel32/file/bintype.c trunk/reactos/dll/win32/kernel32/file/copy.c trunk/reactos/dll/win32/kernel32/file/create.c trunk/reactos/dll/win32/kernel32/file/curdir.c Modified: trunk/reactos/dll/win32/kernel32/file/bintype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/bi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/bintype.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/bintype.c [iso-8859-1] Fri Sep 10 09:04:25 2010 @@ -16,7 +16,9 @@ #define NDEBUG #include <debug.h> +#if DBG static ULONG gDebugChannel = kernel32file; +#endif /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/co… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/copy.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/copy.c [iso-8859-1] Fri Sep 10 09:04:25 2010 @@ -15,7 +15,10 @@ #include <k32.h> #define NDEBUG #include <debug.h> + +#if DBG static ULONG gDebugChannel = kernel32file; +#endif /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/cr… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/create.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/create.c [iso-8859-1] Fri Sep 10 09:04:25 2010 @@ -17,7 +17,10 @@ #include <k32.h> #define NDEBUG #include <debug.h> + +#if DBG static ULONG gDebugChannel = kernel32file; +#endif #define SYMLINK_FLAG_RELATIVE 1 Modified: trunk/reactos/dll/win32/kernel32/file/curdir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/cu… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/curdir.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/curdir.c [iso-8859-1] Fri Sep 10 09:04:25 2010 @@ -19,7 +19,10 @@ #include <k32.h> #define NDEBUG #include <debug.h> + +#if DBG static ULONG gDebugChannel = kernel32file; +#endif /* GLOBAL VARIABLES **********************************************************/

14 years, 1 month

[fireball] 48728: - Fix typos in the description of serial port defines.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Sep 10 08:30:13 2010 New Revision: 48728 URL: http://svn.reactos.org/svn/reactos?rev=48728&view=rev Log: - Fix typos in the description of serial port defines. Modified: trunk/reactos/include/reactos/drivers/serial/ns16550.h Modified: trunk/reactos/include/reactos/drivers/serial/ns16550.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drivers/se… ============================================================================== --- trunk/reactos/include/reactos/drivers/serial/ns16550.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/drivers/serial/ns16550.h [iso-8859-1] Fri Sep 10 08:30:13 2010 @@ -11,7 +11,7 @@ #pragma once /* Note: These definitions are the internal definitions used by Microsoft serial - driver (see src/kernel/serial.h in Windows sources). Linux uses its own, as + driver (see src/kernel/serial/serial.h in WDK source code). Linux uses its own, as do most other OS. */

14 years, 1 month

[sir_richard] 48727: Patch by Anton Yarotsky: [CPORTLIB]: Implement Windows' Cp (ComPort) library. See Notes in C file. Not yet used. Based on MS Whitepaper: Building Hardware and Firmware to Compl...

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Fri Sep 10 05:22:48 2010 New Revision: 48727 URL: http://svn.reactos.org/svn/reactos?rev=48727&view=rev Log: Patch by Anton Yarotsky: [CPORTLIB]: Implement Windows' Cp (ComPort) library. See Notes in C file. Not yet used. Based on MS Whitepaper: Building Hardware and Firmware to Complement Microsoft Windows Headless Operation. Added: trunk/reactos/include/reactos/drivers/serial/ trunk/reactos/include/reactos/drivers/serial/ns16550.h (with props) trunk/reactos/include/reactos/libs/cportlib/ trunk/reactos/include/reactos/libs/cportlib/cportlib.h (with props) trunk/reactos/lib/cportlib/ trunk/reactos/lib/cportlib/cport.c (with props) trunk/reactos/lib/cportlib/cportlib.rbuild (with props) Modified: trunk/reactos/lib/lib.rbuild Added: trunk/reactos/include/reactos/drivers/serial/ns16550.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drivers/se… ============================================================================== --- trunk/reactos/include/reactos/drivers/serial/ns16550.h (added) +++ trunk/reactos/include/reactos/drivers/serial/ns16550.h [iso-8859-1] Fri Sep 10 05:22:48 2010 @@ -1,0 +1,108 @@ +/* + * PROJECT: ReactOS ComPort Library + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: include/reactos/drivers/serial/ns16550.h + * PURPOSE: Header for National Semiconductor 16550 UART + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#pragma once + +/* Note: These definitions are the internal definitions used by Microsoft serial + driver (see src/kernel/serial.h in Windows sources). Linux uses its own, as + do most other OS. +*/ + +#if !defined(SERIAL_REGISTER_STRIDE) +#define SERIAL_REGISTER_STRIDE 1 +#endif + +#define RECEIVE_BUFFER_REGISTER ((ULONG)((0x00)*SERIAL_REGISTER_STRIDE)) +#define TRANSMIT_HOLDING_REGISTER ((ULONG)((0x00)*SERIAL_REGISTER_STRIDE)) +#define INTERRUPT_ENABLE_REGISTER ((ULONG)((0x01)*SERIAL_REGISTER_STRIDE)) +#define INTERRUPT_IDENT_REGISTER ((ULONG)((0x02)*SERIAL_REGISTER_STRIDE)) +#define FIFO_CONTROL_REGISTER ((ULONG)((0x02)*SERIAL_REGISTER_STRIDE)) +#define LINE_CONTROL_REGISTER ((ULONG)((0x03)*SERIAL_REGISTER_STRIDE)) +#define MODEM_CONTROL_REGISTER ((ULONG)((0x04)*SERIAL_REGISTER_STRIDE)) +#define LINE_STATUS_REGISTER ((ULONG)((0x05)*SERIAL_REGISTER_STRIDE)) +#define MODEM_STATUS_REGISTER ((ULONG)((0x06)*SERIAL_REGISTER_STRIDE)) +#define DIVISOR_LATCH_LSB ((ULONG)((0x00)*SERIAL_REGISTER_STRIDE)) +#define DIVISOR_LATCH_MSB ((ULONG)((0x01)*SERIAL_REGISTER_STRIDE)) +#define SERIAL_REGISTER_SPAN ((ULONG)(7*SERIAL_REGISTER_STRIDE)) +#define SERIAL_STATUS_LENGTH ((ULONG)(1*SERIAL_REGISTER_STRIDE)) + +#define SERIAL_DATA_LENGTH_5 0x00 +#define SERIAL_DATA_LENGTH_6 0x01 +#define SERIAL_DATA_LENGTH_7 0x02 +#define SERIAL_DATA_LENGTH_8 0x03 + +#define SERIAL_IER_RDA 0x01 +#define SERIAL_IER_THR 0x02 +#define SERIAL_IER_RLS 0x04 +#define SERIAL_IER_MS 0x08 + +#define SERIAL_IIR_RLS 0x06 +#define SERIAL_IIR_RDA 0x04 +#define SERIAL_IIR_CTI 0x0c +#define SERIAL_IIR_THR 0x02 +#define SERIAL_IIR_MS 0x00 +#define SERIAL_IIR_FIFOS_ENABLED 0xc0 +#define SERIAL_IIR_NO_INTERRUPT_PENDING 0x01 +#define SERIAL_IIR_MUST_BE_ZERO 0x30 + +#define SERIAL_FCR_ENABLE ((UCHAR)0x01) +#define SERIAL_FCR_RCVR_RESET ((UCHAR)0x02) +#define SERIAL_FCR_TXMT_RESET ((UCHAR)0x04) + +#define SERIAL_1_BYTE_HIGH_WATER ((UCHAR)0x00) +#define SERIAL_4_BYTE_HIGH_WATER ((UCHAR)0x40) +#define SERIAL_8_BYTE_HIGH_WATER ((UCHAR)0x80) +#define SERIAL_14_BYTE_HIGH_WATER ((UCHAR)0xc0) + +#define SERIAL_LCR_DLAB 0x80 +#define SERIAL_LCR_BREAK 0x40 + +#define SERIAL_5_DATA ((UCHAR)0x00) +#define SERIAL_6_DATA ((UCHAR)0x01) +#define SERIAL_7_DATA ((UCHAR)0x02) +#define SERIAL_8_DATA ((UCHAR)0x03) +#define SERIAL_DATA_MASK ((UCHAR)0x03) + +#define SERIAL_1_STOP ((UCHAR)0x00) +#define SERIAL_1_5_STOP ((UCHAR)0x04) // Only valid for 5 data bits +#define SERIAL_2_STOP ((UCHAR)0x04) // Not valid for 5 data bits +#define SERIAL_STOP_MASK ((UCHAR)0x04) + +#define SERIAL_NONE_PARITY ((UCHAR)0x00) +#define SERIAL_ODD_PARITY ((UCHAR)0x08) +#define SERIAL_EVEN_PARITY ((UCHAR)0x18) +#define SERIAL_MARK_PARITY ((UCHAR)0x28) +#define SERIAL_SPACE_PARITY ((UCHAR)0x38) +#define SERIAL_PARITY_MASK ((UCHAR)0x38) + +#define SERIAL_MCR_DTR 0x01 +#define SERIAL_MCR_RTS 0x02 +#define SERIAL_MCR_OUT1 0x04 +#define SERIAL_MCR_OUT2 0x08 +#define SERIAL_MCR_LOOP 0x10 +#define SERIAL_MCR_TL16C550CAFE 0x20 + +#define SERIAL_LSR_DR 0x01 +#define SERIAL_LSR_OE 0x02 +#define SERIAL_LSR_PE 0x04 +#define SERIAL_LSR_FE 0x08 +#define SERIAL_LSR_BI 0x10 +#define SERIAL_LSR_THRE 0x20 +#define SERIAL_LSR_TEMT 0x40 +#define SERIAL_LSR_FIFOERR 0x80 + +#define SERIAL_MSR_DCTS 0x01 +#define SERIAL_MSR_DDSR 0x02 +#define SERIAL_MSR_TERI 0x04 +#define SERIAL_MSR_DDCD 0x08 +#define SERIAL_MSR_CTS 0x10 +#define SERIAL_MSR_DSR 0x20 +#define SERIAL_MSR_RI 0x40 +#define SERIAL_MSR_DCD 0x80 Propchange: trunk/reactos/include/reactos/drivers/serial/ns16550.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/reactos/libs/cportlib/cportlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/cport… ============================================================================== --- trunk/reactos/include/reactos/libs/cportlib/cportlib.h (added) +++ trunk/reactos/include/reactos/libs/cportlib/cportlib.h [iso-8859-1] Fri Sep 10 05:22:48 2010 @@ -1,0 +1,74 @@ +/* + * PROJECT: ReactOS ComPort Library + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: include/reactos/lib/cportlib/cportlib.h + * PURPOSE: Header for the ComPort Library + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <ntdef.h> + +#define CP_GET_SUCCESS 0 +#define CP_GET_NODATA 1 +#define CP_GET_ERROR 2 + +#define CPPORT_FLAG_MODEM_CONTROL 0x02 +typedef struct _CPPORT +{ + PUCHAR Address; + ULONG Baud; + USHORT Flags; +} CPPORT, *PCPPORT; + +VOID +NTAPI +CpInitialize( + IN PCPPORT Port, + IN PUCHAR Address, + IN ULONG Rate + ); + +VOID +NTAPI +CpEnableFifo( + IN PUCHAR Address, + IN BOOLEAN Enable + ); + +BOOLEAN +NTAPI +CpDoesPortExist( + IN PUCHAR Address + ); + +UCHAR +NTAPI +CpReadLsr( + IN PCPPORT Port, + IN UCHAR ExpectedValue + ); + +VOID +NTAPI +CpSetBaud( + IN PCPPORT Port, + IN ULONG Rate + ); + +USHORT +NTAPI +CpGetByte( + IN PCPPORT Port, + IN PUCHAR Byte, + IN BOOLEAN Wait, + IN BOOLEAN Poll + ); + +VOID +NTAPI +CpPutByte( + IN PCPPORT Port, + IN UCHAR Byte + ); Propchange: trunk/reactos/include/reactos/libs/cportlib/cportlib.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/cportlib/cport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cportlib/cport.c?rev=4… ============================================================================== --- trunk/reactos/lib/cportlib/cport.c (added) +++ trunk/reactos/lib/cportlib/cport.c [iso-8859-1] Fri Sep 10 05:22:48 2010 @@ -1,0 +1,227 @@ +/* + * PROJECT: ReactOS ComPort Library + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: lib/reactos/cportlib/cport.c + * PURPOSE: Provides a serial port library for KDCOM, INIT, and FREELDR + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* NOTE: This library follows the precise serial port intialization steps documented + * by Microsoft in some of their Server hardware guidance. Because they've clearly + * documented their serial algorithms, we use the same ones to stay "compliant". + * Do not change this code to "improve" it. It's done this way on purpose, at least on x86. + * -- sir_richard + */ + +/* NOTE: This code is used by Headless Support (Ntoskrnl.exe and Osloader.exe) and + Kdcom.dll in Windows. It may be that WinDBG depends on some of these quirks. +*/ + +/* NOTE: The original code supports Modem Control. We currently do not */ + +/* FIXMEs: + - Make this serial-port specific (NS16550 vs other serial port types) + - Get x64 KDCOM, KDBG, FREELDR, and other current code to use this +*/ + +/* INCLUDES *******************************************************************/ + +#include <cportlib/cportlib.h> +#include <drivers/serial/ns16550.h> +#include <intrin.h> +#include <ioaccess.h> +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +UCHAR RingIndicator; + +/* FUNCTIONS ******************************************************************/ + +VOID +NTAPI +CpInitialize(IN PCPPORT Port, + IN PUCHAR Address, + IN ULONG Rate) +{ + /* Reset port data */ + Port->Address = Address; + Port->Baud = 0; + + /* Set the baud rate */ + CpSetBaud(Port, Rate); + + /* Enable on DTR and RTS */ + WRITE_PORT_UCHAR(Address + MODEM_CONTROL_REGISTER, + SERIAL_MCR_DTR | SERIAL_MCR_RTS); + + /* Disable interrupts */ + WRITE_PORT_UCHAR(Address + INTERRUPT_ENABLE_REGISTER, 0); +} + +VOID +NTAPI +CpEnableFifo(IN PUCHAR Address, + IN BOOLEAN Enable) +{ + /* Set FIFO */ + WRITE_PORT_UCHAR(Address + FIFO_CONTROL_REGISTER, Enable ? SERIAL_FCR_ENABLE : 0); +} + +BOOLEAN +NTAPI +CpDoesPortExist(IN PUCHAR Address) +{ + UCHAR Old; + /* + * See "Building Hardware and Firmware to Complement Microsoft Windows Headless Operation" + * Out-of-Band Management Port Device Requirements: + * The device must act as a 16550 or 16450 UART. + * Windows Server 2003 will test this device using the following process. + * 1. Save off the current modem status register. + * 2. Place the UART into diagnostic mode (The UART is placed into loopback mode + * by writing SERIAL_MCR_LOOP to the modem control register). + * 3. The modem status register is read and the high bits are checked. This means + * SERIAL_MSR_CTS, SERIAL_MSR_DSR, SERIAL_MSR_RI and SERIAL_MSR_DCD should + * all be clear. + * 4. Place the UART in diagnostic mode and turn on OUTPUT (Loopback Mode and + * OUTPUT are both turned on by writing (SERIAL_MCR_LOOP | SERIAL_MCR_OUT1) + * to the modem control register). + * 5. The modem status register is read and the ring indicator is checked. + * This means SERIAL_MSR_RI should be set. + * 6. Restore original modem status register. + */ + Old = READ_PORT_UCHAR(Address + MODEM_CONTROL_REGISTER); + WRITE_PORT_UCHAR(Address + MODEM_CONTROL_REGISTER, SERIAL_MCR_LOOP); + WRITE_PORT_UCHAR(Address + MODEM_CONTROL_REGISTER, SERIAL_MCR_LOOP); + if (!(READ_PORT_UCHAR(Address + MODEM_STATUS_REGISTER) & + (SERIAL_MSR_CTS | SERIAL_MSR_DSR | SERIAL_MSR_RI | SERIAL_MSR_DCD))) + { + WRITE_PORT_UCHAR(Address + MODEM_CONTROL_REGISTER, + (SERIAL_MCR_OUT1 | SERIAL_MCR_LOOP)); + if (READ_PORT_UCHAR(Address + MODEM_STATUS_REGISTER) & SERIAL_MSR_RI) + { + WRITE_PORT_UCHAR(Address + MODEM_CONTROL_REGISTER, Old); + return TRUE; + } + } + WRITE_PORT_UCHAR(Address + MODEM_CONTROL_REGISTER, Old); + return FALSE; +} + +UCHAR +NTAPI +CpReadLsr(IN PCPPORT Port, + IN UCHAR ExpectedValue) +{ + UCHAR Lsr, Msr; + + /* Read the LSR and check if the expected value is present */ + Lsr = READ_PORT_UCHAR(Port->Address + LINE_STATUS_REGISTER); + if (!(Lsr & ExpectedValue)) + { + /* Check the MSR for ring indicator toggle */ + Msr = READ_PORT_UCHAR(Port->Address + MODEM_STATUS_REGISTER); + + /* If the indicator reaches 3, we've seen this on/off twice */ + RingIndicator |= (Msr & SERIAL_MSR_RI) ? 1 : 2; + if (RingIndicator == 3) Port->Flags |= CPPORT_FLAG_MODEM_CONTROL; + } + + return Lsr; +} + +VOID +NTAPI +CpSetBaud(IN PCPPORT Port, + IN ULONG Rate) +{ + UCHAR Lcr; + USHORT Mode; + + /* Add DLAB */ + Lcr = READ_PORT_UCHAR(Port->Address + LINE_CONTROL_REGISTER); + WRITE_PORT_UCHAR(Port->Address + LINE_CONTROL_REGISTER, Lcr | SERIAL_LCR_DLAB); + + /* Set baud rate */ + Mode = 115200 / Rate; + WRITE_PORT_UCHAR(Port->Address + DIVISOR_LATCH_MSB, (UCHAR)((Mode >> 8) & 0xff)); + WRITE_PORT_UCHAR(Port->Address + DIVISOR_LATCH_LSB, (UCHAR)(Mode & 0xff)); + + /* Reset DLAB and set 8 data bits, 1 stop bit, no parity, no break */ + WRITE_PORT_UCHAR(Port->Address + LINE_CONTROL_REGISTER, + SERIAL_8_DATA | SERIAL_1_STOP | SERIAL_NONE_PARITY); + + /* Save baud rate in port */ + Port->Baud = Rate; +} + +USHORT +NTAPI +CpGetByte(IN PCPPORT Port, + IN PUCHAR Byte, + IN BOOLEAN Wait, + IN BOOLEAN Poll) +{ + UCHAR Lsr; + ULONG i; + + /* Handle early read-before-init */ + if (!Port->Address) return CP_GET_NODATA; + + /* If "wait" mode enabled, spin many times, otherwise attempt just once */ + i = Wait ? 204800 : 1; + while (i--) + { + /* Read LSR for data ready */ + Lsr = CpReadLsr(Port, SERIAL_LSR_DR); + if ((Lsr & SERIAL_LSR_DR) == SERIAL_LSR_DR) + { + /* If an error happened, clear the byte and fail */ + if (Lsr & (SERIAL_LSR_FE | SERIAL_LSR_PE)) + { + *Byte = 0; + return CP_GET_ERROR; + } + + /* If only polling was requested by caller, return now */ + if (Poll) return CP_GET_SUCCESS; + + /* Otherwise read the byte and return it */ + *Byte = READ_PORT_UCHAR(Port->Address + RECEIVE_BUFFER_REGISTER); + + /* Handle CD if port is in modem control mode */ + if (Port->Flags & CPPORT_FLAG_MODEM_CONTROL) + { + /* Not implemented yet */ + DPRINT1("CP: CPPORT_FLAG_MODEM_CONTROL unexpected\n"); + } + + /* Byte was read */ + return CP_GET_SUCCESS; + } + } + + /* Reset LSR, no data was found */ + CpReadLsr(Port, 0); + return CP_GET_NODATA; +} + +VOID +NTAPI +CpPutByte(IN PCPPORT Port, + IN UCHAR Byte) +{ + /* Check if port is in modem control to handle CD */ + while (Port->Flags & CPPORT_FLAG_MODEM_CONTROL) + { + /* Not implemented yet */ + DPRINT1("CP: CPPORT_FLAG_MODEM_CONTROL unexpected\n"); + } + + /* Wait for LSR to say we can go ahead */ + while (!(CpReadLsr(Port, SERIAL_LSR_THRE) & SERIAL_LSR_THRE)); + + /* Send the byte */ + WRITE_PORT_UCHAR(Port->Address + RECEIVE_BUFFER_REGISTER, Byte); +} Propchange: trunk/reactos/lib/cportlib/cport.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/cportlib/cportlib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cportlib/cportlib.rbui… ============================================================================== --- trunk/reactos/lib/cportlib/cportlib.rbuild (added) +++ trunk/reactos/lib/cportlib/cportlib.rbuild [iso-8859-1] Fri Sep 10 05:22:48 2010 @@ -1,0 +1,8 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> +<group> + <module name="cportlib" type="staticlibrary"> + <include base="cportlib">.</include> + <file>cport.c</file> + </module> +</group> Propchange: trunk/reactos/lib/cportlib/cportlib.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/lib/lib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/lib.rbuild?rev=48727&r… ============================================================================== --- trunk/reactos/lib/lib.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/lib.rbuild [iso-8859-1] Fri Sep 10 05:22:48 2010 @@ -12,6 +12,9 @@ </directory> <directory name="cmlib"> <xi:include href="cmlib/cmlib.rbuild" /> + </directory> + <directory name="cportlib"> + <xi:include href="cportlib/cportlib.rbuild" /> </directory> <directory name="debugsup"> <xi:include href="debugsup/debugsup.rbuild" />

14 years, 1 month

[fireball] 48726: [NTOS] - Fix release build, leftover from 48692.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Sep 9 21:06:13 2010 New Revision: 48726 URL: http://svn.reactos.org/svn/reactos?rev=48726&view=rev Log: [NTOS] - Fix release build, leftover from 48692. Modified: trunk/reactos/ntoskrnl/mm/ppool.c Modified: trunk/reactos/ntoskrnl/mm/ppool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ppool.c?rev=48… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ppool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ppool.c [iso-8859-1] Thu Sep 9 21:06:13 2010 @@ -910,7 +910,7 @@ RPoolFree ( PR_POOL pool, void* Addr ) { PR_USED UsedBlock; -#ifndef R_RZ +#if !R_RZ rulong UsedSize; #endif PR_FREE FreeBlock;

14 years, 1 month

[mjmartin] 48725: [ntoskrnl/po] - Fix typo.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Thu Sep 9 09:22:49 2010 New Revision: 48725 URL: http://svn.reactos.org/svn/reactos?rev=48725&view=rev Log: [ntoskrnl/po] - Fix typo. Modified: trunk/reactos/ntoskrnl/po/power.c Modified: trunk/reactos/ntoskrnl/po/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/power.c?rev=48… ============================================================================== --- trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] Thu Sep 9 09:22:49 2010 @@ -4,7 +4,7 @@ * FILE: ntoskrnl/po/power.c * PURPOSE: Power Manager * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) - * Hervï¿½ Poussineau (hpoussin(a)reactos.com) + * Hervé Poussineau (hpoussin(a)reactos.com) */ /* INCLUDES ******************************************************************/

14 years, 1 month

[mjmartin] 48724: [ntoskrnl/po] - When an IRP is freed in a Completion routine the return Status is STATUS_MORE_PROCESSING_REQUIRED to let IoCompleteRequest know not to do anything further with the...

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Wed Sep 8 21:30:40 2010 New Revision: 48724 URL: http://svn.reactos.org/svn/reactos?rev=48724&view=rev Log: [ntoskrnl/po] - When an IRP is freed in a Completion routine the return Status is STATUS_MORE_PROCESSING_REQUIRED to let IoCompleteRequest know not to do anything further with the IRP. Modified: trunk/reactos/ntoskrnl/po/power.c Modified: trunk/reactos/ntoskrnl/po/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/power.c?rev=48… ============================================================================== --- trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] Wed Sep 8 21:30:40 2010 @@ -4,7 +4,7 @@ * FILE: ntoskrnl/po/power.c * PURPOSE: Power Manager * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) - * Hervé Poussineau (hpoussin(a)reactos.com) + * Hervï¿½ Poussineau (hpoussin(a)reactos.com) */ /* INCLUDES ******************************************************************/ @@ -52,7 +52,7 @@ IoFreeIrp(Irp); - return STATUS_SUCCESS; + return STATUS_MORE_PROCESSING_REQUIRED; } VOID

14 years, 1 month

[ekohl] 48723: [SCSIPORT] Implement RequestTimerCall-Notification. This is used by uniata.

by ekohl＠svn.reactos.org

Author: ekohl Date: Wed Sep 8 10:39:37 2010 New Revision: 48723 URL: http://svn.reactos.org/svn/reactos?rev=48723&view=rev Log: [SCSIPORT] Implement RequestTimerCall-Notification. This is used by uniata. Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c trunk/reactos/drivers/storage/scsiport/scsiport_int.h Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] Wed Sep 8 10:39:37 2010 @@ -1994,7 +1994,10 @@ break; case RequestTimerCall: - DPRINT1("UNIMPLEMENTED SCSI Notification called: RequestTimerCall!\n"); + DPRINT("Notify: RequestTimerCall\n"); + DeviceExtension->InterruptData.Flags |= SCSI_PORT_TIMER_NEEDED; + DeviceExtension->InterruptData.HwScsiTimer = (PHW_TIMER)va_arg(ap, PHW_TIMER); + DeviceExtension->InterruptData.MiniportTimerValue = (ULONG)va_arg(ap, ULONG); break; case BusChangeDetected: @@ -4802,6 +4805,7 @@ PSCSI_PORT_LUN_EXTENSION LunExtension; BOOLEAN NeedToStartIo; PSCSI_REQUEST_BLOCK_INFO SrbInfo; + LARGE_INTEGER TimerValue; DPRINT("ScsiPortDpcForIsr(Dpc %p DpcDeviceObject %p DpcIrp %p DpcContext %p)\n", Dpc, DpcDeviceObject, DpcIrp, DpcContext); @@ -4842,10 +4846,26 @@ } /* Check if timer is needed */ - if (InterruptData.Flags & SCIS_PORT_TIMER_NEEDED) - { - /* TODO: Implement */ - ASSERT(FALSE); + if (InterruptData.Flags & SCSI_PORT_TIMER_NEEDED) + { + /* Save the timer routine */ + DeviceExtension->HwScsiTimer = InterruptData.HwScsiTimer; + + if (InterruptData.MiniportTimerValue == 0) + { + /* Cancel the timer */ + KeCancelTimer(&DeviceExtension->MiniportTimer); + } + else + { + /* Convert timer value */ + TimerValue.QuadPart = Int32x32To64(InterruptData.MiniportTimerValue, -10); + + /* Set the timer */ + KeSetTimer(&DeviceExtension->MiniportTimer, + TimerValue, + &DeviceExtension->MiniportTimerDpc); + } } /* If it's ready for the next request */ @@ -5599,8 +5619,31 @@ IN PVOID SystemArgument1, IN PVOID SystemArgument2) { - DPRINT1("Miniport timer DPC\n"); - ASSERT(FALSE); + PSCSI_PORT_DEVICE_EXTENSION DeviceExtension; + + DPRINT("Miniport timer DPC\n"); + + DeviceExtension = ((PDEVICE_OBJECT)DeviceObject)->DeviceExtension; + + /* Acquire the spinlock */ + KeAcquireSpinLockAtDpcLevel(&DeviceExtension->SpinLock); + + /* Call the timer routine */ + if (DeviceExtension->HwScsiTimer != NULL) + { + DeviceExtension->HwScsiTimer(&DeviceExtension->MiniPortDeviceExtension); + } + + /* Release the spinlock */ + KeReleaseSpinLockFromDpcLevel(&DeviceExtension->SpinLock); + + if (DeviceExtension->InterruptData.Flags & SCSI_PORT_NOTIFICATION_NEEDED) + { + ScsiPortDpcForIsr(NULL, + DeviceExtension->DeviceObject, + NULL, + NULL); + } } static NTSTATUS Modified: trunk/reactos/drivers/storage/scsiport/scsiport_int.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport_int.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport_int.h [iso-8859-1] Wed Sep 8 10:39:37 2010 @@ -36,7 +36,7 @@ #define SCSI_PORT_DISABLE_INT_REQUESET 0x2000 #define SCSI_PORT_DISABLE_INTERRUPTS 0x4000 #define SCSI_PORT_ENABLE_INT_REQUEST 0x8000 -#define SCIS_PORT_TIMER_NEEDED 0x10000 +#define SCSI_PORT_TIMER_NEEDED 0x10000 /* LUN Extension flags*/ #define LUNEX_FROZEN_QUEUE 0x0001 @@ -182,6 +182,8 @@ PSCSI_REQUEST_BLOCK_INFO CompletedRequests; /* Linked list of Srb info data */ PSCSI_PORT_LUN_EXTENSION CompletedAbort; PSCSI_PORT_LUN_EXTENSION ReadyLun; + PHW_TIMER HwScsiTimer; + ULONG MiniportTimerValue; } SCSI_PORT_INTERRUPT_DATA, *PSCSI_PORT_INTERRUPT_DATA; @@ -257,6 +259,7 @@ PHW_INTERRUPT HwInterrupt; PHW_RESET_BUS HwResetBus; PHW_DMA_STARTED HwDmaStarted; + PHW_TIMER HwScsiTimer; PSCSI_REQUEST_BLOCK OriginalSrb; SCSI_REQUEST_BLOCK InternalSrb;

14 years, 1 month

[ekohl] 48722: [USETUP] Allocate a drive layout buffer that is large enough to keep a primary partition table (4 partition entries) plus 26 logical drives (2 partition entries each). Total 56 parti...

by ekohl＠svn.reactos.org

Author: ekohl Date: Tue Sep 7 15:21:06 2010 New Revision: 48722 URL: http://svn.reactos.org/svn/reactos?rev=48722&view=rev Log: [USETUP] Allocate a drive layout buffer that is large enough to keep a primary partition table (4 partition entries) plus 26 logical drives (2 partition entries each). Total 56 partition entries. This should be enough for everybody until we support GPT partition tables. ;-) See issue #5270 for more details. Modified: trunk/reactos/base/setup/usetup/partlist.c Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Tue Sep 7 15:21:06 2010 @@ -701,6 +701,7 @@ ULONG i; PLIST_ENTRY ListEntry; PBIOSDISKENTRY BiosDiskEntry; + ULONG LayoutBufferSize; Status = NtDeviceIoControlFile (FileHandle, NULL, @@ -870,9 +871,15 @@ InsertAscendingList(&List->DiskListHead, DiskEntry, DISKENTRY, ListEntry, BiosDiskNumber); + /* + * Allocate a buffer for 26 logical drives (2 entries each == 52) + * plus the main partiton table (4 entries). Total 56 entries. + */ + LayoutBufferSize = sizeof(DRIVE_LAYOUT_INFORMATION) + + ((56 - ANYSIZE_ARRAY) * sizeof(PARTITION_INFORMATION)); LayoutBuffer = (DRIVE_LAYOUT_INFORMATION*)RtlAllocateHeap (ProcessHeap, 0, - 8192); + LayoutBufferSize); if (LayoutBuffer == NULL) { return; @@ -887,7 +894,7 @@ NULL, 0, LayoutBuffer, - 8192); + LayoutBufferSize); if (NT_SUCCESS (Status)) { if (LayoutBuffer->PartitionCount == 0)

14 years, 1 month

[ekohl] 48721: Improvements to NtAdjustPrivilegesToken part 4 (last one): - SEH-protect all code that writes to PreviousState as it cannot be captured. - Add a missing ObDereferenceObject and SeRel...

by ekohl＠svn.reactos.org

Author: ekohl Date: Tue Sep 7 15:08:29 2010 New Revision: 48721 URL: http://svn.reactos.org/svn/reactos?rev=48721&view=rev Log: Improvements to NtAdjustPrivilegesToken part 4 (last one): - SEH-protect all code that writes to PreviousState as it cannot be captured. - Add a missing ObDereferenceObject and SeReleaseLuidAndAttributesArray. Modified: trunk/reactos/ntoskrnl/se/token.c Modified: trunk/reactos/ntoskrnl/se/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/token.c?rev=48… ============================================================================== --- trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] Tue Sep 7 15:08:29 2010 @@ -2117,89 +2117,119 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - /* Return the exception code */ - _SEH2_YIELD(return _SEH2_GetExceptionCode()); - } - _SEH2_END; - - /* Fail, if the buffer length is smaller than the required length */ - if (BufferLength < RequiredLength) - { + /* Dereference the token */ ObDereferenceObject(Token); + + /* Release the captured privileges */ if (CapturedPrivileges != NULL) SeReleaseLuidAndAttributesArray(CapturedPrivileges, PreviousMode, TRUE); + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + + /* Fail, if the buffer length is smaller than the required length */ + if (BufferLength < RequiredLength) + { + /* Dereference the token */ + ObDereferenceObject(Token); + + /* Release the captured privileges */ + if (CapturedPrivileges != NULL) + SeReleaseLuidAndAttributesArray(CapturedPrivileges, + PreviousMode, + TRUE); + return STATUS_BUFFER_TOO_SMALL; } } /* Change the privilege attributes */ ChangeCount = 0; - for (i = 0; i < Token->PrivilegeCount; i++) - { - if (DisableAllPrivileges == TRUE) - { - if (Token->Privileges[i].Attributes & SE_PRIVILEGE_ENABLED) - { - DPRINT ("Privilege enabled\n"); - - /* Save the current privilege */ - if (PreviousState != NULL) - { - PreviousState->Privileges[ChangeCount].Luid = Token->Privileges[i].Luid; - PreviousState->Privileges[ChangeCount].Attributes = Token->Privileges[i].Attributes; - } - - /* Disable the current privlege */ - Token->Privileges[i].Attributes &= ~SE_PRIVILEGE_ENABLED; - - ChangeCount++; - } - } - else - { - for (j = 0; j < CapturedCount; j++) - { - if (Token->Privileges[i].Luid.LowPart == CapturedPrivileges[j].Luid.LowPart && - Token->Privileges[i].Luid.HighPart == CapturedPrivileges[j].Luid.HighPart) - { - DPRINT ("Found privilege\n"); - - /* Check whether the attributes differ */ - if ((Token->Privileges[i].Attributes & SE_PRIVILEGE_ENABLED) != - (CapturedPrivileges[j].Attributes & SE_PRIVILEGE_ENABLED)) - { - DPRINT ("Attributes differ\n"); - DPRINT ("Current attributes %lx New attributes %lx\n", - Token->Privileges[i].Attributes, - CapturedPrivileges[j].Attributes); - - /* Save the current privilege */ - if (PreviousState != NULL) + _SEH2_TRY + { + for (i = 0; i < Token->PrivilegeCount; i++) + { + if (DisableAllPrivileges == TRUE) + { + if (Token->Privileges[i].Attributes & SE_PRIVILEGE_ENABLED) + { + DPRINT("Privilege enabled\n"); + + /* Save the current privilege */ + if (PreviousState != NULL) + { + PreviousState->Privileges[ChangeCount].Luid = Token->Privileges[i].Luid; + PreviousState->Privileges[ChangeCount].Attributes = Token->Privileges[i].Attributes; + } + + /* Disable the current privlege */ + Token->Privileges[i].Attributes &= ~SE_PRIVILEGE_ENABLED; + + ChangeCount++; + } + } + else + { + for (j = 0; j < CapturedCount; j++) + { + if (Token->Privileges[i].Luid.LowPart == CapturedPrivileges[j].Luid.LowPart && + Token->Privileges[i].Luid.HighPart == CapturedPrivileges[j].Luid.HighPart) + { + DPRINT("Found privilege\n"); + + /* Check whether the attributes differ */ + if ((Token->Privileges[i].Attributes & SE_PRIVILEGE_ENABLED) != + (CapturedPrivileges[j].Attributes & SE_PRIVILEGE_ENABLED)) { - PreviousState->Privileges[ChangeCount].Luid = Token->Privileges[i].Luid; - PreviousState->Privileges[ChangeCount].Attributes = Token->Privileges[i].Attributes; + DPRINT("Attributes differ\n"); + DPRINT("Current attributes %lx New attributes %lx\n", + Token->Privileges[i].Attributes, + CapturedPrivileges[j].Attributes); + + /* Save the current privilege */ + if (PreviousState != NULL) + { + PreviousState->Privileges[ChangeCount].Luid = Token->Privileges[i].Luid; + PreviousState->Privileges[ChangeCount].Attributes = Token->Privileges[i].Attributes; + } + + /* Update the current privlege */ + Token->Privileges[i].Attributes &= ~SE_PRIVILEGE_ENABLED; + Token->Privileges[i].Attributes |= + (CapturedPrivileges[j].Attributes & SE_PRIVILEGE_ENABLED); + DPRINT("New attributes %lx\n", + Token->Privileges[i].Attributes); + + ChangeCount++; } - - /* Update the current privlege */ - Token->Privileges[i].Attributes &= ~SE_PRIVILEGE_ENABLED; - Token->Privileges[i].Attributes |= - (CapturedPrivileges[j].Attributes & SE_PRIVILEGE_ENABLED); - DPRINT ("New attributes %lx\n", - Token->Privileges[i].Attributes); - - ChangeCount++; - } - } - } - } - } - - /* Set the number of saved privileges */ - if (PreviousState != NULL) - PreviousState->PrivilegeCount = ChangeCount; + } + } + } + } + + /* Set the number of saved privileges */ + if (PreviousState != NULL) + PreviousState->PrivilegeCount = ChangeCount; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Dereference the token */ + ObDereferenceObject(Token); + + /* Release the captured privileges */ + if (CapturedPrivileges != NULL) + SeReleaseLuidAndAttributesArray(CapturedPrivileges, + PreviousMode, + TRUE); + + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; /* Set the status */ Status = (ChangeCount < CapturedCount) ? STATUS_NOT_ALL_ASSIGNED : STATUS_SUCCESS;

14 years, 1 month

← Newer
1
...
20
21
22
23
24
25
26
27
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2010