Ros-diffs May 2013

ros-diffs@reactos.org

16 participants
234 discussions

[pschweitzer] 58960: [RTL] Finally reenable RtlAcquirePrivilege and RtlReleasePrivilege now that they are fixed. [KERNEL32] Remove the hacks in SetSystemTime() and SetLocalTime() now that RtlAcquir...
by pschweitzer＠svn.reactos.org 05 May '13

05 May '13

Author: pschweitzer Date: Sun May 5 22:31:17 2013 New Revision: 58960 URL: http://svn.reactos.org/svn/reactos?rev=58960&view=rev Log: [RTL] Finally reenable RtlAcquirePrivilege and RtlReleasePrivilege now that they are fixed. [KERNEL32] Remove the hacks in SetSystemTime() and SetLocalTime() now that RtlAcquirePrivilege is working properly. [SYSSETUP] Remove the hack for privileges in SetSystemLocalTime() now that SetLocalTime() can properly acquire needed privilege. CORE-7168 #comment Fixed with r58960 #resolve Modified: trunk/reactos/dll/win32/kernel32/client/time.c trunk/reactos/dll/win32/syssetup/wizard.c trunk/reactos/lib/rtl/priv.c Modified: trunk/reactos/dll/win32/kernel32/client/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/time.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/time.c [iso-8859-1] Sun May 5 22:31:17 2013 @@ -384,11 +384,6 @@ Status = NtSetSystemTime(&NewSystemTime, NULL); RtlReleasePrivilege(State); } - else - { - DPRINT1("HACK: Workaround RtlAcquirePrivilege failure! Remove me once RAP is fine\n"); - Status = NtSetSystemTime(&NewSystemTime, NULL); - } if (!NT_SUCCESS(Status)) { @@ -432,11 +427,6 @@ Status = NtSetSystemTime(&NewSystemTime, NULL); RtlReleasePrivilege(State); } - else - { - DPRINT1("HACK: Workaround RtlAcquirePrivilege failure! Remove me once RAP is fine\n"); - Status = NtSetSystemTime(&NewSystemTime, NULL); - } if (!NT_SUCCESS(Status)) { Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] Sun May 5 22:31:17 2013 @@ -1374,57 +1374,13 @@ static BOOL SetSystemLocalTime(HWND hwnd, PSETUPDATA SetupData) { - HANDLE hToken; - DWORD PrevSize; - TOKEN_PRIVILEGES priv, previouspriv; BOOL Ret = FALSE; /* - * enable the SeSystemtimePrivilege privilege + * Call SetLocalTime twice to ensure correct results */ - - if(OpenProcessToken(GetCurrentProcess(), - TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, - &hToken)) - { - priv.PrivilegeCount = 1; - priv.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED; - - if(LookupPrivilegeValue(NULL, - SE_SYSTEMTIME_NAME, - &priv.Privileges[0].Luid)) - { - if(AdjustTokenPrivileges(hToken, - FALSE, - &priv, - sizeof(previouspriv), - &previouspriv, - &PrevSize) && - GetLastError() == ERROR_SUCCESS) - { - /* - * We successfully enabled it, we're permitted to change the system time - * Call SetLocalTime twice to ensure correct results - */ - Ret = SetLocalTime(&SetupData->SystemTime) && - SetLocalTime(&SetupData->SystemTime); - - /* - * for the sake of security, restore the previous status again - */ - if(previouspriv.PrivilegeCount > 0) - { - AdjustTokenPrivileges(hToken, - FALSE, - &previouspriv, - 0, - NULL, - 0); - } - } - } - CloseHandle(hToken); - } + Ret = SetLocalTime(&SetupData->SystemTime) && + SetLocalTime(&SetupData->SystemTime); return Ret; } Modified: trunk/reactos/lib/rtl/priv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/priv.c?rev=58960&r… ============================================================================== --- trunk/reactos/lib/rtl/priv.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/priv.c [iso-8859-1] Sun May 5 22:31:17 2013 @@ -11,7 +11,7 @@ #include <rtl.h> -//#define NDEBUG +#define NDEBUG #include <debug.h> /* FUNCTIONS ***************************************************************/ @@ -112,7 +112,6 @@ IN ULONG Flags, OUT PVOID *ReturnedState) { -#if 0 PRTL_ACQUIRE_STATE State; NTSTATUS Status, IntStatus; ULONG ReturnLength, i, OldSize; @@ -354,10 +353,6 @@ DPRINT("RtlAcquirePrivilege() failed with status: %lx\n", Status); return Status; -#else - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -#endif } /* @@ -367,7 +362,6 @@ NTAPI RtlReleasePrivilege(IN PVOID ReturnedState) { -#if 0 NTSTATUS Status; PRTL_ACQUIRE_STATE State = (PRTL_ACQUIRE_STATE)ReturnedState; @@ -408,9 +402,6 @@ /* Release token and free state */ ZwClose(State->Token); RtlFreeHeap(RtlGetProcessHeap(), 0, State); -#else - UNIMPLEMENTED; -#endif } /*

1 0

[pschweitzer] 58959: [RTL] When we are impersonating, also set the flag, so that on release, we can kill it. This hopefully fixes 2nd stage and the whole mess it was causing in privileges.
by pschweitzer＠svn.reactos.org 05 May '13

05 May '13

Author: pschweitzer Date: Sun May 5 22:19:54 2013 New Revision: 58959 URL: http://svn.reactos.org/svn/reactos?rev=58959&view=rev Log: [RTL] When we are impersonating, also set the flag, so that on release, we can kill it. This hopefully fixes 2nd stage and the whole mess it was causing in privileges. Modified: trunk/reactos/lib/rtl/priv.c Modified: trunk/reactos/lib/rtl/priv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/priv.c?rev=58959&r… ============================================================================== --- trunk/reactos/lib/rtl/priv.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/priv.c [iso-8859-1] Sun May 5 22:19:54 2013 @@ -247,8 +247,9 @@ goto Cleanup; } - /* Save said token */ + /* Save said token and the fact we have impersonated */ State->Token = ImpersonationToken; + State->Flags |= RTL_ACQUIRE_PRIVILEGE_IMPERSONATE; ZwClose(ProcessToken); } @@ -372,7 +373,9 @@ DPRINT("RtlReleasePrivilege(%p)\n", ReturnedState); - /* If we had an active impersonation before we acquired privileges */ + /* If we had an active impersonation before we acquired privileges + * Or if we have impersonated, quit it + */ if (State->Flags & RTL_ACQUIRE_PRIVILEGE_IMPERSONATE) { /* Restore it for the current thread */

1 0

[hbelusca] 58958: [KDROSDBG] Place the (unimplemented) real KD functions into a dedicated file and isolate ReactOS-specific port functions. They can go into a libary along KDBG !
by hbelusca＠svn.reactos.org 05 May '13

05 May '13

Author: hbelusca Date: Sun May 5 21:57:42 2013 New Revision: 58958 URL: http://svn.reactos.org/svn/reactos?rev=58958&view=rev Log: [KDROSDBG] Place the (unimplemented) real KD functions into a dedicated file and isolate ReactOS-specific port functions. They can go into a libary along KDBG ! Added: branches/kd++/drivers/base/kdrosdbg/kdrosdbg.c - copied, changed from r58957, branches/kd++/drivers/base/kdrosdbg/i386/kdbg.c Modified: branches/kd++/drivers/base/kdrosdbg/CMakeLists.txt branches/kd++/drivers/base/kdrosdbg/arm/kdbg.c branches/kd++/drivers/base/kdrosdbg/i386/kdbg.c Modified: branches/kd++/drivers/base/kdrosdbg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/kd%2B%2B/drivers/base/kdrosdbg/… ============================================================================== --- branches/kd++/drivers/base/kdrosdbg/CMakeLists.txt [iso-8859-1] (original) +++ branches/kd++/drivers/base/kdrosdbg/CMakeLists.txt [iso-8859-1] Sun May 5 21:57:42 2013 @@ -9,6 +9,7 @@ list(APPEND SOURCE arm/kdbg.c) endif(ARCH STREQUAL "i386") list(APPEND SOURCE + kdrosdbg.c kdrosdbg.rc ${CMAKE_CURRENT_BINARY_DIR}/kdcom.def) Modified: branches/kd++/drivers/base/kdrosdbg/arm/kdbg.c URL: http://svn.reactos.org/svn/reactos/branches/kd%2B%2B/drivers/base/kdrosdbg/… ============================================================================== --- branches/kd++/drivers/base/kdrosdbg/arm/kdbg.c [iso-8859-1] (original) +++ branches/kd++/drivers/base/kdrosdbg/arm/kdbg.c [iso-8859-1] Sun May 5 21:57:42 2013 @@ -10,15 +10,16 @@ #define NOEXTAPI #include <ntifs.h> -#define NDEBUG #include <halfuncs.h> #include <stdio.h> -#include <debug.h> -#include "arc/arc.h" -#include "windbgkd.h" +#include <arc/arc.h> +#include <windbgkd.h> #include <kddll.h> #include <ioaccess.h> #include <arm/peripherals/pl011.h> + +#define NDEBUG +#include <debug.h> /* GLOBALS ********************************************************************/ @@ -117,79 +118,4 @@ WRITE_REGISTER_ULONG(UART_PL01x_DR, ByteToSend); } -/* WINDOWS FUNCTIONS **********************************************************/ - -NTSTATUS -NTAPI -KdDebuggerInitialize0(IN PLOADER_PARAMETER_BLOCK LoaderBlock OPTIONAL) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -KdDebuggerInitialize1(IN PLOADER_PARAMETER_BLOCK LoaderBlock OPTIONAL) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -KdD0Transition(VOID) -{ - return STATUS_SUCCESS; -} - -NTSTATUS -NTAPI -KdD3Transition(VOID) -{ - return STATUS_SUCCESS; -} - -NTSTATUS -NTAPI -KdSave(IN BOOLEAN SleepTransition) -{ - UNIMPLEMENTED; - while (TRUE); - return STATUS_SUCCESS; -} - -NTSTATUS -NTAPI -KdRestore(IN BOOLEAN SleepTransition) -{ - UNIMPLEMENTED; - while (TRUE); - return STATUS_SUCCESS; -} - -VOID -NTAPI -KdSendPacket(IN ULONG PacketType, - IN PSTRING MessageHeader, - IN PSTRING MessageData, - IN OUT PKD_CONTEXT Context) -{ - UNIMPLEMENTED; - while (TRUE); - return; -} - -KDSTATUS -NTAPI -KdReceivePacket(IN ULONG PacketType, - OUT PSTRING MessageHeader, - OUT PSTRING MessageData, - OUT PULONG DataLength, - IN OUT PKD_CONTEXT Context) -{ - UNIMPLEMENTED; - while (TRUE); - return 0; -} - /* EOF */ Modified: branches/kd++/drivers/base/kdrosdbg/i386/kdbg.c URL: http://svn.reactos.org/svn/reactos/branches/kd%2B%2B/drivers/base/kdrosdbg/… ============================================================================== --- branches/kd++/drivers/base/kdrosdbg/i386/kdbg.c [iso-8859-1] (original) +++ branches/kd++/drivers/base/kdrosdbg/i386/kdbg.c [iso-8859-1] Sun May 5 21:57:42 2013 @@ -13,8 +13,8 @@ #include <ntifs.h> #include <halfuncs.h> #include <stdio.h> -#include "arc/arc.h" -#include "windbgkd.h" +#include <arc/arc.h> +#include <windbgkd.h> #include <kddll.h> #include <ioaccess.h> /* port intrinsics */ #include <cportlib/cportlib.h> @@ -98,9 +98,8 @@ // static BOOLEAN PortInitialized = FALSE; -/* FUNCTIONS ****************************************************************/ - -/* ReactOS-specific */ +/* REACTOS FUNCTIONS **********************************************************/ + BOOLEAN NTAPI KdPortInitializeEx( @@ -229,8 +228,6 @@ return TRUE; } - -/* ReactOS-specific */ BOOLEAN NTAPI KdPortGetByteEx( @@ -248,7 +245,6 @@ return FALSE; } -/* ReactOS-specific */ VOID NTAPI KdPortPutByteEx( @@ -263,95 +259,4 @@ WRITE_PORT_UCHAR(SER_THR(ComPortBase), ByteToSend); } -/* - * @unimplemented - */ -NTSTATUS -NTAPI -KdDebuggerInitialize0( - IN PLOADER_PARAMETER_BLOCK LoaderBlock OPTIONAL) -{ - return STATUS_NOT_IMPLEMENTED; -} - -/* - * @unimplemented - */ -NTSTATUS -NTAPI -KdDebuggerInitialize1( - IN PLOADER_PARAMETER_BLOCK LoaderBlock OPTIONAL) -{ - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -KdD0Transition(VOID) -{ - return STATUS_SUCCESS; -} - -NTSTATUS -NTAPI -KdD3Transition(VOID) -{ - return STATUS_SUCCESS; -} - -/* - * @implemented - */ -NTSTATUS -NTAPI -KdSave( - IN BOOLEAN SleepTransition) -{ - /* Nothing to do on COM ports */ - return STATUS_SUCCESS; -} - -/* - * @implemented - */ -NTSTATUS -NTAPI -KdRestore( - IN BOOLEAN SleepTransition) -{ - /* Nothing to do on COM ports */ - return STATUS_SUCCESS; -} - -/* - * @unimplemented - */ -VOID -NTAPI -KdSendPacket( - IN ULONG PacketType, - IN PSTRING MessageHeader, - IN PSTRING MessageData, - IN OUT PKD_CONTEXT Context) -{ - UNIMPLEMENTED; - return; -} - -/* - * @unimplemented - */ -KDSTATUS -NTAPI -KdReceivePacket( - IN ULONG PacketType, - OUT PSTRING MessageHeader, - OUT PSTRING MessageData, - OUT PULONG DataLength, - IN OUT PKD_CONTEXT Context) -{ - UNIMPLEMENTED; - return 0; -} - /* EOF */ Copied: branches/kd++/drivers/base/kdrosdbg/kdrosdbg.c (from r58957, branches/kd++/drivers/base/kdrosdbg/i386/kdbg.c) URL: http://svn.reactos.org/svn/reactos/branches/kd%2B%2B/drivers/base/kdrosdbg/… ============================================================================== --- branches/kd++/drivers/base/kdrosdbg/i386/kdbg.c [iso-8859-1] (original) +++ branches/kd++/drivers/base/kdrosdbg/kdrosdbg.c [iso-8859-1] Sun May 5 21:57:42 2013 @@ -13,255 +13,14 @@ #include <ntifs.h> #include <halfuncs.h> #include <stdio.h> -#include "arc/arc.h" -#include "windbgkd.h" +#include <arc/arc.h> +#include <windbgkd.h> #include <kddll.h> -#include <ioaccess.h> /* port intrinsics */ -#include <cportlib/cportlib.h> #define NDEBUG #include <debug.h> - -typedef struct _KD_PORT_INFORMATION -{ - ULONG ComPort; - ULONG BaudRate; - ULONG BaseAddress; -} KD_PORT_INFORMATION, *PKD_PORT_INFORMATION; - -#define DEFAULT_BAUD_RATE 19200 - -#if defined(_M_IX86) || defined(_M_AMD64) -const ULONG BaseArray[] = {0, 0x3F8, 0x2F8, 0x3E8, 0x2E8}; -#elif defined(_M_PPC) -const ULONG BaseArray[] = {0, 0x800003F8}; -#elif defined(_M_MIPS) -const ULONG BaseArray[] = {0, 0x80006000, 0x80007000}; -#elif defined(_M_ARM) -const ULONG BaseArray[] = {0, 0xF1012000}; -#else -#error Unknown architecture -#endif - -/* MACROS *******************************************************************/ - -#define SER_RBR(x) ((PUCHAR)(x)+0) -#define SER_THR(x) ((PUCHAR)(x)+0) -#define SER_DLL(x) ((PUCHAR)(x)+0) -#define SER_IER(x) ((PUCHAR)(x)+1) -#define SR_IER_ERDA 0x01 -#define SR_IER_ETHRE 0x02 -#define SR_IER_ERLSI 0x04 -#define SR_IER_EMS 0x08 -#define SR_IER_ALL 0x0F -#define SER_DLM(x) ((PUCHAR)(x)+1) -#define SER_IIR(x) ((PUCHAR)(x)+2) -#define SER_FCR(x) ((PUCHAR)(x)+2) -#define SR_FCR_ENABLE_FIFO 0x01 -#define SR_FCR_CLEAR_RCVR 0x02 -#define SR_FCR_CLEAR_XMIT 0x04 -#define SER_LCR(x) ((PUCHAR)(x)+3) -#define SR_LCR_CS5 0x00 -#define SR_LCR_CS6 0x01 -#define SR_LCR_CS7 0x02 -#define SR_LCR_CS8 0x03 -#define SR_LCR_ST1 0x00 -#define SR_LCR_ST2 0x04 -#define SR_LCR_PNO 0x00 -#define SR_LCR_POD 0x08 -#define SR_LCR_PEV 0x18 -#define SR_LCR_PMK 0x28 -#define SR_LCR_PSP 0x38 -#define SR_LCR_BRK 0x40 -#define SR_LCR_DLAB 0x80 -#define SER_MCR(x) ((PUCHAR)(x)+4) -#define SR_MCR_DTR 0x01 -#define SR_MCR_RTS 0x02 -#define SR_MCR_OUT1 0x04 -#define SR_MCR_OUT2 0x08 -#define SR_MCR_LOOP 0x10 -#define SER_LSR(x) ((PUCHAR)(x)+5) -#define SR_LSR_DR 0x01 -#define SR_LSR_TBE 0x20 -#define SER_MSR(x) ((PUCHAR)(x)+6) -#define SR_MSR_CTS 0x10 -#define SR_MSR_DSR 0x20 -#define SER_SCR(x) ((PUCHAR)(x)+7) - - -/* STATIC VARIABLES *********************************************************/ - -// static KD_PORT_INFORMATION DefaultPort = { 0, 0, 0 }; - -/* The com port must only be initialized once! */ -// static BOOLEAN PortInitialized = FALSE; - - /* FUNCTIONS ****************************************************************/ - -/* ReactOS-specific */ -BOOLEAN -NTAPI -KdPortInitializeEx( - IN PKD_PORT_INFORMATION PortInformation, - IN ULONG Unknown1, - IN ULONG Unknown2) -{ - ULONG ComPortBase; - CHAR buffer[80]; - ULONG divisor; - UCHAR lcr; - -#if 0 // Deactivated because never used in fact (was in KdPortInitialize but we use KdPortInitializeEx) - /* - * Find the port if needed - */ - SIZE_T i; - - if (!PortInitialized) - { - DefaultPort.BaudRate = PortInformation->BaudRate; - - if (PortInformation->ComPort == 0) - { - /* - * Start enumerating COM ports from the last one to the first one, - * and break when we find a valid port. - * If we reach the first element of the list, the invalid COM port, - * then it means that no valid port was found. - */ - for (i = sizeof(BaseArray) / sizeof(BaseArray[0]) - 1; i > 0; i--) - { - if (CpDoesPortExist(UlongToPtr(BaseArray[i]))) - { - PortInformation->BaseAddress = DefaultPort.BaseAddress = BaseArray[i]; - PortInformation->ComPort = DefaultPort.ComPort = i; - break; - } - } - if (i == 0) - { - sprintf(buffer, - "\nKernel Debugger: No COM port found!\n\n"); - HalDisplayString(buffer); - return FALSE; - } - } - - PortInitialized = TRUE; - } -#endif - - /* - * Initialize the port - */ - - if (PortInformation->BaudRate == 0) - PortInformation->BaudRate = DEFAULT_BAUD_RATE; - - if (PortInformation->ComPort != 0) - { - if (!CpDoesPortExist(UlongToPtr(BaseArray[PortInformation->ComPort]))) - { - sprintf(buffer, - "\nKernel Debugger: Serial port not found!\n\n"); - HalDisplayString(buffer); - return FALSE; - } - - ComPortBase = BaseArray[PortInformation->ComPort]; - PortInformation->BaseAddress = ComPortBase; - } - else - { - ComPortBase = PortInformation->BaseAddress; - } - - if (ComPortBase == 0) - return FALSE; - -#ifndef NDEBUG - sprintf(buffer, - "\nSerial port COM%ld found at 0x%lx\n", - PortInformation->ComPort, - ComPortBase); - HalDisplayString(buffer); -#endif /* NDEBUG */ - - /* set baud rate and data format (8N1) */ - - /* turn on DTR and RTS */ - WRITE_PORT_UCHAR(SER_MCR(ComPortBase), SR_MCR_DTR | SR_MCR_RTS); - - /* set DLAB */ - lcr = READ_PORT_UCHAR(SER_LCR(ComPortBase)) | SR_LCR_DLAB; - WRITE_PORT_UCHAR(SER_LCR(ComPortBase), lcr); - - /* set baud rate */ - divisor = 115200 / PortInformation->BaudRate; - WRITE_PORT_UCHAR(SER_DLL(ComPortBase), (UCHAR)(divisor & 0xff)); - WRITE_PORT_UCHAR(SER_DLM(ComPortBase), (UCHAR)((divisor >> 8) & 0xff)); - - /* reset DLAB and set 8N1 format */ - WRITE_PORT_UCHAR(SER_LCR(ComPortBase), - SR_LCR_CS8 | SR_LCR_ST1 | SR_LCR_PNO); - - /* read junk out of the RBR */ - lcr = READ_PORT_UCHAR(SER_RBR(ComPortBase)); - -#ifndef NDEBUG - /* print message to blue screen */ - sprintf(buffer, - "\nKernel Debugger: COM%ld (Port 0x%lx) BaudRate %ld\n\n", - PortInformation->ComPort, - ComPortBase, - PortInformation->BaudRate); - - HalDisplayString(buffer); -#endif /* NDEBUG */ - -#if 0 - /* set global info */ - KdComPortInUse = (PUCHAR)DefaultPort.BaseAddress; -#endif - - return TRUE; -} - - -/* ReactOS-specific */ -BOOLEAN -NTAPI -KdPortGetByteEx( - IN PKD_PORT_INFORMATION PortInformation, - OUT PUCHAR ByteReceived) -{ - PUCHAR ComPortBase = (PUCHAR)PortInformation->BaseAddress; - - if ((READ_PORT_UCHAR(SER_LSR(ComPortBase)) & SR_LSR_DR)) - { - *ByteReceived = READ_PORT_UCHAR(SER_RBR(ComPortBase)); - return TRUE; - } - - return FALSE; -} - -/* ReactOS-specific */ -VOID -NTAPI -KdPortPutByteEx( - IN PKD_PORT_INFORMATION PortInformation, - IN UCHAR ByteToSend) -{ - PUCHAR ComPortBase = (PUCHAR)PortInformation->BaseAddress; - - while ((READ_PORT_UCHAR(SER_LSR(ComPortBase)) & SR_LSR_TBE) == 0) - ; - - WRITE_PORT_UCHAR(SER_THR(ComPortBase), ByteToSend); -} /* * @unimplemented

1 0

[hbelusca] 58957: [KDROSDBG] Comment that part too, because it was in KdPortInitialize and here, it reported an invalid port. KdPortInUse is initialized by KDBG.
by hbelusca＠svn.reactos.org 05 May '13

05 May '13

Author: hbelusca Date: Sun May 5 21:23:20 2013 New Revision: 58957 URL: http://svn.reactos.org/svn/reactos?rev=58957&view=rev Log: [KDROSDBG] Comment that part too, because it was in KdPortInitialize and here, it reported an invalid port. KdPortInUse is initialized by KDBG. Modified: branches/kd++/drivers/base/kdrosdbg/i386/kdbg.c branches/kd++/drivers/base/kdrosdbg/kdrosdbg.spec Modified: branches/kd++/drivers/base/kdrosdbg/i386/kdbg.c URL: http://svn.reactos.org/svn/reactos/branches/kd%2B%2B/drivers/base/kdrosdbg/… ============================================================================== --- branches/kd++/drivers/base/kdrosdbg/i386/kdbg.c [iso-8859-1] (original) +++ branches/kd++/drivers/base/kdrosdbg/i386/kdbg.c [iso-8859-1] Sun May 5 21:23:20 2013 @@ -92,7 +92,7 @@ /* STATIC VARIABLES *********************************************************/ -static KD_PORT_INFORMATION DefaultPort = { 0, 0, 0 }; +// static KD_PORT_INFORMATION DefaultPort = { 0, 0, 0 }; /* The com port must only be initialized once! */ // static BOOLEAN PortInitialized = FALSE; @@ -221,8 +221,10 @@ HalDisplayString(buffer); #endif /* NDEBUG */ +#if 0 /* set global info */ KdComPortInUse = (PUCHAR)DefaultPort.BaseAddress; +#endif return TRUE; } Modified: branches/kd++/drivers/base/kdrosdbg/kdrosdbg.spec URL: http://svn.reactos.org/svn/reactos/branches/kd%2B%2B/drivers/base/kdrosdbg/… ============================================================================== --- branches/kd++/drivers/base/kdrosdbg/kdrosdbg.spec [iso-8859-1] (original) +++ branches/kd++/drivers/base/kdrosdbg/kdrosdbg.spec [iso-8859-1] Sun May 5 21:23:20 2013 @@ -1,13 +1,13 @@ -@ stdcall KdD0Transition() -@ stdcall KdD3Transition() -@ stdcall KdDebuggerInitialize0(ptr) -@ stdcall KdDebuggerInitialize1(ptr) -@ stdcall KdReceivePacket(long ptr ptr ptr ptr) -@ stdcall KdRestore(long) -@ stdcall KdSave(long) -@ stdcall KdSendPacket(long ptr ptr ptr) +1 stdcall KdD0Transition() +2 stdcall KdD3Transition() +3 stdcall KdDebuggerInitialize0(ptr) +4 stdcall KdDebuggerInitialize1(ptr) +5 stdcall KdReceivePacket(long ptr ptr ptr ptr) +6 stdcall KdRestore(long) +7 stdcall KdSave(long) +8 stdcall KdSendPacket(long ptr ptr ptr) ; Legacy KD +@ stdcall KdPortInitializeEx(ptr long long) @ stdcall KdPortGetByteEx(ptr ptr) -@ stdcall KdPortInitializeEx(ptr long long) @ stdcall KdPortPutByteEx(ptr long)

1 0

[hbelusca] 58956: [KDROSDBG] One can safely remove these forward declarations.
by hbelusca＠svn.reactos.org 05 May '13

05 May '13

Author: hbelusca Date: Sun May 5 20:19:55 2013 New Revision: 58956 URL: http://svn.reactos.org/svn/reactos?rev=58956&view=rev Log: [KDROSDBG] One can safely remove these forward declarations. Modified: branches/kd++/drivers/base/kdrosdbg/i386/kdbg.c Modified: branches/kd++/drivers/base/kdrosdbg/i386/kdbg.c URL: http://svn.reactos.org/svn/reactos/branches/kd%2B%2B/drivers/base/kdrosdbg/… ============================================================================== --- branches/kd++/drivers/base/kdrosdbg/i386/kdbg.c [iso-8859-1] (original) +++ branches/kd++/drivers/base/kdrosdbg/i386/kdbg.c [iso-8859-1] Sun May 5 20:19:55 2013 @@ -29,31 +29,6 @@ ULONG BaudRate; ULONG BaseAddress; } KD_PORT_INFORMATION, *PKD_PORT_INFORMATION; - -BOOLEAN -NTAPI -KdPortInitializeEx( - IN PKD_PORT_INFORMATION PortInformation, - IN ULONG Unknown1, - IN ULONG Unknown2); - -BOOLEAN -NTAPI -KdPortGetByteEx( - IN PKD_PORT_INFORMATION PortInformation, - OUT PUCHAR ByteReceived); - -BOOLEAN -NTAPI -KdPortPollByteEx( - IN PKD_PORT_INFORMATION PortInformation, - OUT PUCHAR ByteReceived); - -VOID -NTAPI -KdPortPutByteEx( - IN PKD_PORT_INFORMATION PortInformation, - IN UCHAR ByteToSend); #define DEFAULT_BAUD_RATE 19200 @@ -115,8 +90,6 @@ #define SER_SCR(x) ((PUCHAR)(x)+7) -/* GLOBAL VARIABLES *********************************************************/ - /* STATIC VARIABLES *********************************************************/ static KD_PORT_INFORMATION DefaultPort = { 0, 0, 0 };

1 0

[pschweitzer] 58955: [RTL] Properly define the loop for privileges adjustement. Spotted & fixed by Thomas.
by pschweitzer＠svn.reactos.org 05 May '13

05 May '13

Author: pschweitzer Date: Sun May 5 20:19:23 2013 New Revision: 58955 URL: http://svn.reactos.org/svn/reactos?rev=58955&view=rev Log: [RTL] Properly define the loop for privileges adjustement. Spotted & fixed by Thomas. Modified: trunk/reactos/lib/rtl/priv.c Modified: trunk/reactos/lib/rtl/priv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/priv.c?rev=58955&r… ============================================================================== --- trunk/reactos/lib/rtl/priv.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/priv.c [iso-8859-1] Sun May 5 20:19:23 2013 @@ -314,8 +314,9 @@ else { *ReturnedState = State; - } - } while (FALSE); + break; + } + } while (TRUE); DPRINT("RtlAcquirePrivilege succeed!\n");

1 0

[hbelusca] 58954: Legacy code from KdPortInitialize, which was put in KdPortInitializeEx, is deactivated because it was unusued (the actual code doesn't call KdPortInitialize).
by hbelusca＠svn.reactos.org 05 May '13

05 May '13

Author: hbelusca Date: Sun May 5 20:05:50 2013 New Revision: 58954 URL: http://svn.reactos.org/svn/reactos?rev=58954&view=rev Log: Legacy code from KdPortInitialize, which was put in KdPortInitializeEx, is deactivated because it was unusued (the actual code doesn't call KdPortInitialize). Modified: branches/kd++/drivers/base/kdrosdbg/i386/kdbg.c Modified: branches/kd++/drivers/base/kdrosdbg/i386/kdbg.c URL: http://svn.reactos.org/svn/reactos/branches/kd%2B%2B/drivers/base/kdrosdbg/… ============================================================================== --- branches/kd++/drivers/base/kdrosdbg/i386/kdbg.c [iso-8859-1] (original) +++ branches/kd++/drivers/base/kdrosdbg/i386/kdbg.c [iso-8859-1] Sun May 5 20:05:50 2013 @@ -122,7 +122,7 @@ static KD_PORT_INFORMATION DefaultPort = { 0, 0, 0 }; /* The com port must only be initialized once! */ -static BOOLEAN PortInitialized = FALSE; +// static BOOLEAN PortInitialized = FALSE; /* FUNCTIONS ****************************************************************/ @@ -135,15 +135,16 @@ IN ULONG Unknown1, IN ULONG Unknown2) { - SIZE_T i; ULONG ComPortBase; CHAR buffer[80]; ULONG divisor; UCHAR lcr; +#if 0 // Deactivated because never used in fact (was in KdPortInitialize but we use KdPortInitializeEx) /* * Find the port if needed */ + SIZE_T i; if (!PortInitialized) { @@ -177,6 +178,7 @@ PortInitialized = TRUE; } +#endif /* * Initialize the port @@ -271,17 +273,6 @@ return FALSE; } -/* HAL.KdPortPutByte */ -VOID -NTAPI -KdPortPutByte( - IN UCHAR ByteToSend) -{ - if (!PortInitialized) - return; - KdPortPutByteEx(&DefaultPort, ByteToSend); -} - /* ReactOS-specific */ VOID NTAPI

1 0

[pschweitzer] 58953: [KERNEL32] Also "fix" hack of RtlAcquirePrivilege in SetSystemTime(). Spotted by Thomas. Note for syssetup/rtl/kernel32 devs: Make it crystal clear that this is a hack and has ...
by pschweitzer＠svn.reactos.org 05 May '13

05 May '13

Author: pschweitzer Date: Sun May 5 20:01:14 2013 New Revision: 58953 URL: http://svn.reactos.org/svn/reactos?rev=58953&view=rev Log: [KERNEL32] Also "fix" hack of RtlAcquirePrivilege in SetSystemTime(). Spotted by Thomas. Note for syssetup/rtl/kernel32 devs: Make it crystal clear that this is a hack and has to be deleted once RAP is fine. Also note that for SetLocalTime() and 2nd stage, syssetup acquires the privilege itself in SetSystemLocalTime() before calling SetLocalTime(). This will also have to be deleted once RAP is working fine. Otherwise it will keep failing: it is not possible to acquire a privilege already held. Modified: trunk/reactos/dll/win32/kernel32/client/time.c Modified: trunk/reactos/dll/win32/kernel32/client/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/time.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/time.c [iso-8859-1] Sun May 5 20:01:14 2013 @@ -386,7 +386,7 @@ } else { - DPRINT1("Workaround RtlAcquirePrivilege failure!\n"); + DPRINT1("HACK: Workaround RtlAcquirePrivilege failure! Remove me once RAP is fine\n"); Status = NtSetSystemTime(&NewSystemTime, NULL); } @@ -427,11 +427,15 @@ } Status = RtlAcquirePrivilege(&Privilege, 1, 0, &State); - Status = STATUS_SUCCESS; if (NT_SUCCESS(Status)) { Status = NtSetSystemTime(&NewSystemTime, NULL); RtlReleasePrivilege(State); + } + else + { + DPRINT1("HACK: Workaround RtlAcquirePrivilege failure! Remove me once RAP is fine\n"); + Status = NtSetSystemTime(&NewSystemTime, NULL); } if (!NT_SUCCESS(Status))

1 0

[hbelusca] 58952: Further remove legacy, now only 3 functions remain.
by hbelusca＠svn.reactos.org 05 May '13

05 May '13

Author: hbelusca Date: Sun May 5 19:55:42 2013 New Revision: 58952 URL: http://svn.reactos.org/svn/reactos?rev=58952&view=rev Log: Further remove legacy, now only 3 functions remain. Modified: branches/kd++/drivers/base/kdrosdbg/arm/kdbg.c branches/kd++/drivers/base/kdrosdbg/i386/kdbg.c branches/kd++/drivers/base/kdrosdbg/kdrosdbg.spec branches/kd++/ntoskrnl/include/internal/kd.h Modified: branches/kd++/drivers/base/kdrosdbg/arm/kdbg.c URL: http://svn.reactos.org/svn/reactos/branches/kd%2B%2B/drivers/base/kdrosdbg/… ============================================================================== --- branches/kd++/drivers/base/kdrosdbg/arm/kdbg.c [iso-8859-1] (original) +++ branches/kd++/drivers/base/kdrosdbg/arm/kdbg.c [iso-8859-1] Sun May 5 19:55:42 2013 @@ -93,18 +93,6 @@ BOOLEAN NTAPI -KdPortInitialize(IN PKD_PORT_INFORMATION PortInformation, - IN ULONG Unknown1, - IN ULONG Unknown2) -{ - // - // Call the extended version - // - return KdPortInitializeEx(PortInformation, Unknown1, Unknown2); -} - -BOOLEAN -NTAPI KdPortGetByteEx(IN PKD_PORT_INFORMATION PortInformation, OUT PUCHAR ByteReceived) { @@ -127,16 +115,6 @@ // Send the character // WRITE_REGISTER_ULONG(UART_PL01x_DR, ByteToSend); -} - -VOID -NTAPI -KdPortPutByte(IN UCHAR ByteToSend) -{ - // - // Call the extended version - // - KdPortPutByteEx(&DefaultPort, ByteToSend); } /* WINDOWS FUNCTIONS **********************************************************/ Modified: branches/kd++/drivers/base/kdrosdbg/i386/kdbg.c URL: http://svn.reactos.org/svn/reactos/branches/kd%2B%2B/drivers/base/kdrosdbg/… ============================================================================== --- branches/kd++/drivers/base/kdrosdbg/i386/kdbg.c [iso-8859-1] (original) +++ branches/kd++/drivers/base/kdrosdbg/i386/kdbg.c [iso-8859-1] Sun May 5 19:55:42 2013 @@ -127,16 +127,23 @@ /* FUNCTIONS ****************************************************************/ -/* HAL.KdPortInitialize */ -BOOLEAN -NTAPI -KdPortInitialize( +/* ReactOS-specific */ +BOOLEAN +NTAPI +KdPortInitializeEx( IN PKD_PORT_INFORMATION PortInformation, IN ULONG Unknown1, IN ULONG Unknown2) { SIZE_T i; + ULONG ComPortBase; CHAR buffer[80]; + ULONG divisor; + UCHAR lcr; + + /* + * Find the port if needed + */ if (!PortInitialized) { @@ -171,34 +178,9 @@ PortInitialized = TRUE; } - /* initialize port */ - if (!KdPortInitializeEx(&DefaultPort, Unknown1, Unknown2)) - return FALSE; - - /* set global info */ - KdComPortInUse = (PUCHAR)DefaultPort.BaseAddress; - - return TRUE; -} - - -/* HAL.KdPortInitializeEx ; ReactOS-specific */ -BOOLEAN -NTAPI -KdPortInitializeEx( - IN PKD_PORT_INFORMATION PortInformation, - IN ULONG Unknown1, - IN ULONG Unknown2) -{ - ULONG ComPortBase; - CHAR buffer[80]; - ULONG divisor; - UCHAR lcr; - -#ifdef _ARM_ - UNIMPLEMENTED; - return FALSE; -#endif + /* + * Initialize the port + */ if (PortInformation->BaudRate == 0) PortInformation->BaudRate = DEFAULT_BAUD_RATE; @@ -264,11 +246,14 @@ HalDisplayString(buffer); #endif /* NDEBUG */ + /* set global info */ + KdComPortInUse = (PUCHAR)DefaultPort.BaseAddress; + return TRUE; } -/* HAL.KdPortGetByteEx ; ReactOS-specific */ +/* ReactOS-specific */ BOOLEAN NTAPI KdPortGetByteEx( @@ -297,7 +282,7 @@ KdPortPutByteEx(&DefaultPort, ByteToSend); } -/* HAL.KdPortPutByteEx ; ReactOS-specific */ +/* ReactOS-specific */ VOID NTAPI KdPortPutByteEx( Modified: branches/kd++/drivers/base/kdrosdbg/kdrosdbg.spec URL: http://svn.reactos.org/svn/reactos/branches/kd%2B%2B/drivers/base/kdrosdbg/… ============================================================================== --- branches/kd++/drivers/base/kdrosdbg/kdrosdbg.spec [iso-8859-1] (original) +++ branches/kd++/drivers/base/kdrosdbg/kdrosdbg.spec [iso-8859-1] Sun May 5 19:55:42 2013 @@ -1,11 +1,3 @@ -; Old KD -@ stdcall KdPortGetByteEx(ptr ptr) -@ stdcall KdPortInitialize(ptr long long) -@ stdcall KdPortInitializeEx(ptr long long) -@ stdcall KdPortPutByte(long) -@ stdcall KdPortPutByteEx(ptr long) - -; New KD @ stdcall KdD0Transition() @ stdcall KdD3Transition() @ stdcall KdDebuggerInitialize0(ptr) @@ -14,3 +6,8 @@ @ stdcall KdRestore(long) @ stdcall KdSave(long) @ stdcall KdSendPacket(long ptr ptr ptr) + +; Legacy KD +@ stdcall KdPortGetByteEx(ptr ptr) +@ stdcall KdPortInitializeEx(ptr long long) +@ stdcall KdPortPutByteEx(ptr long) Modified: branches/kd++/ntoskrnl/include/internal/kd.h URL: http://svn.reactos.org/svn/reactos/branches/kd%2B%2B/ntoskrnl/include/inter… ============================================================================== --- branches/kd++/ntoskrnl/include/internal/kd.h [iso-8859-1] (original) +++ branches/kd++/ntoskrnl/include/internal/kd.h [iso-8859-1] Sun May 5 19:55:42 2013 @@ -25,14 +25,6 @@ BOOLEAN NTAPI -KdPortInitialize( - PKD_PORT_INFORMATION PortInformation, - ULONG Unknown1, - ULONG Unknown2 -); - -BOOLEAN -NTAPI KdPortInitializeEx( PKD_PORT_INFORMATION PortInformation, ULONG Unknown1, @@ -44,12 +36,6 @@ KdPortGetByteEx( PKD_PORT_INFORMATION PortInformation, PUCHAR ByteReceived); - -VOID -NTAPI -KdPortPutByte( - UCHAR ByteToSend -); VOID NTAPI

1 0

[hbelusca] 58951: I said "remove" !!
by hbelusca＠svn.reactos.org 05 May '13

05 May '13

Author: hbelusca Date: Sun May 5 19:38:12 2013 New Revision: 58951 URL: http://svn.reactos.org/svn/reactos?rev=58951&view=rev Log: I said "remove" !! Modified: branches/kd++/drivers/base/kdrosdbg/arm/kdbg.c branches/kd++/drivers/base/kdrosdbg/i386/kdbg.c branches/kd++/drivers/base/kdrosdbg/kdrosdbg.spec branches/kd++/ntoskrnl/include/internal/kd.h Modified: branches/kd++/drivers/base/kdrosdbg/arm/kdbg.c URL: http://svn.reactos.org/svn/reactos/branches/kd%2B%2B/drivers/base/kdrosdbg/… ============================================================================== --- branches/kd++/drivers/base/kdrosdbg/arm/kdbg.c [iso-8859-1] (original) +++ branches/kd++/drivers/base/kdrosdbg/arm/kdbg.c [iso-8859-1] Sun May 5 19:38:12 2013 @@ -113,38 +113,6 @@ return FALSE; } -#if 0 -BOOLEAN -NTAPI -KdPortGetByte(OUT PUCHAR ByteReceived) -{ - // - // Call the extended version - // - return KdPortGetByteEx(&DefaultPort, ByteReceived); -} - -BOOLEAN -NTAPI -KdPortPollByteEx(IN PKD_PORT_INFORMATION PortInformation, - OUT PUCHAR ByteReceived) -{ - UNIMPLEMENTED; - while (TRUE); - return TRUE; -} - -BOOLEAN -NTAPI -KdPortPollByte(OUT PUCHAR ByteReceived) -{ - // - // Call the extended version - // - return KdPortPollByteEx(&DefaultPort, ByteReceived); -} -#endif - VOID NTAPI KdPortPutByteEx(IN PKD_PORT_INFORMATION PortInformation, Modified: branches/kd++/drivers/base/kdrosdbg/i386/kdbg.c URL: http://svn.reactos.org/svn/reactos/branches/kd%2B%2B/drivers/base/kdrosdbg/… ============================================================================== --- branches/kd++/drivers/base/kdrosdbg/i386/kdbg.c [iso-8859-1] (original) +++ branches/kd++/drivers/base/kdrosdbg/i386/kdbg.c [iso-8859-1] Sun May 5 19:38:12 2013 @@ -286,48 +286,6 @@ return FALSE; } -#if 0 -/* HAL.KdPortGetByte */ -BOOLEAN -NTAPI -KdPortGetByte( - OUT PUCHAR ByteReceived) -{ - if (!PortInitialized) - return FALSE; - return KdPortGetByteEx(&DefaultPort, ByteReceived); -} - -/* HAL.KdPortPollByte */ -BOOLEAN -NTAPI -KdPortPollByte( - OUT PUCHAR ByteReceived) -{ - if (!PortInitialized) - return FALSE; - return KdPortPollByteEx(&DefaultPort, ByteReceived); -} - - -/* HAL.KdPortPollByteEx ; ReactOS-specific */ -BOOLEAN -NTAPI -KdPortPollByteEx( - IN PKD_PORT_INFORMATION PortInformation, - OUT PUCHAR ByteReceived) -{ - PUCHAR ComPortBase = (PUCHAR)PortInformation->BaseAddress; - - while ((READ_PORT_UCHAR(SER_LSR(ComPortBase)) & SR_LSR_DR) == 0) - ; - - *ByteReceived = READ_PORT_UCHAR(SER_RBR(ComPortBase)); - - return TRUE; -} -#endif - /* HAL.KdPortPutByte */ VOID NTAPI Modified: branches/kd++/drivers/base/kdrosdbg/kdrosdbg.spec URL: http://svn.reactos.org/svn/reactos/branches/kd%2B%2B/drivers/base/kdrosdbg/… ============================================================================== --- branches/kd++/drivers/base/kdrosdbg/kdrosdbg.spec [iso-8859-1] (original) +++ branches/kd++/drivers/base/kdrosdbg/kdrosdbg.spec [iso-8859-1] Sun May 5 19:38:12 2013 @@ -1,10 +1,7 @@ ; Old KD -;;@ stdcall KdPortGetByte(ptr) @ stdcall KdPortGetByteEx(ptr ptr) @ stdcall KdPortInitialize(ptr long long) @ stdcall KdPortInitializeEx(ptr long long) -;;@ stdcall KdPortPollByte(ptr) -;;@ stdcall KdPortPollByteEx(ptr ptr) @ stdcall KdPortPutByte(long) @ stdcall KdPortPutByteEx(ptr long) Modified: branches/kd++/ntoskrnl/include/internal/kd.h URL: http://svn.reactos.org/svn/reactos/branches/kd%2B%2B/ntoskrnl/include/inter… ============================================================================== --- branches/kd++/ntoskrnl/include/internal/kd.h [iso-8859-1] (original) +++ branches/kd++/ntoskrnl/include/internal/kd.h [iso-8859-1] Sun May 5 19:38:12 2013 @@ -38,13 +38,6 @@ ULONG Unknown1, ULONG Unknown2 ); - -#if 0 -BOOLEAN -NTAPI -KdPortGetByte( - PUCHAR ByteReceived); -#endif BOOLEAN NTAPI

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
24
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2013