Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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

[hbelusca] 58950: [KDROSDBG] Remove further legacy exports (the aim is to obtain at least the same exports as kdcom).
by hbelusca＠svn.reactos.org 05 May '13

05 May '13

Author: hbelusca Date: Sun May 5 19:36:05 2013 New Revision: 58950 URL: http://svn.reactos.org/svn/reactos?rev=58950&view=rev Log: [KDROSDBG] Remove further legacy exports (the aim is to obtain at least the same exports as kdcom). 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:36:05 2013 @@ -113,6 +113,7 @@ return FALSE; } +#if 0 BOOLEAN NTAPI KdPortGetByte(OUT PUCHAR ByteReceived) @@ -142,6 +143,7 @@ // return KdPortPollByteEx(&DefaultPort, ByteReceived); } +#endif VOID NTAPI 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:36:05 2013 @@ -268,18 +268,6 @@ } -/* HAL.KdPortGetByte */ -BOOLEAN -NTAPI -KdPortGetByte( - OUT PUCHAR ByteReceived) -{ - if (!PortInitialized) - return FALSE; - return KdPortGetByteEx(&DefaultPort, ByteReceived); -} - - /* HAL.KdPortGetByteEx ; ReactOS-specific */ BOOLEAN NTAPI @@ -298,6 +286,17 @@ return FALSE; } +#if 0 +/* HAL.KdPortGetByte */ +BOOLEAN +NTAPI +KdPortGetByte( + OUT PUCHAR ByteReceived) +{ + if (!PortInitialized) + return FALSE; + return KdPortGetByteEx(&DefaultPort, ByteReceived); +} /* HAL.KdPortPollByte */ BOOLEAN @@ -327,7 +326,7 @@ return TRUE; } - +#endif /* HAL.KdPortPutByte */ VOID 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:36:05 2013 @@ -1,10 +1,10 @@ ; Old KD -@ stdcall KdPortGetByte(ptr) +;;@ 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 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:36:05 2013 @@ -39,10 +39,12 @@ ULONG Unknown2 ); +#if 0 BOOLEAN NTAPI KdPortGetByte( PUCHAR ByteReceived); +#endif BOOLEAN NTAPI

1 0

[pschweitzer] 58949: [RTL] Don't allocate an extra privilege entry when not required. Still doesn't fix issue.
by pschweitzer＠svn.reactos.org 05 May '13

05 May '13

Author: pschweitzer Date: Sun May 5 19:24:25 2013 New Revision: 58949 URL: http://svn.reactos.org/svn/reactos?rev=58949&view=rev Log: [RTL] Don't allocate an extra privilege entry when not required. Still doesn't fix issue. 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=58949&r… ============================================================================== --- trunk/reactos/lib/rtl/priv.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/priv.c [iso-8859-1] Sun May 5 19:24:25 2013 @@ -11,7 +11,7 @@ #include <rtl.h> -#define NDEBUG +//#define NDEBUG #include <debug.h> /* FUNCTIONS ***************************************************************/ @@ -138,7 +138,7 @@ * new privileges (big enough, after old privileges memory area) */ State = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(RTL_ACQUIRE_STATE) + sizeof(TOKEN_PRIVILEGES) + - NumPriv * sizeof(LUID_AND_ATTRIBUTES)); + (NumPriv - ANYSIZE_ARRAY) * sizeof(LUID_AND_ATTRIBUTES)); if (!State) { return STATUS_NO_MEMORY;

1 0

[hbelusca] 58948: [KDROSDBG] Remove some unneeded legacy.
by hbelusca＠svn.reactos.org 05 May '13

05 May '13

Author: hbelusca Date: Sun May 5 19:21:03 2013 New Revision: 58948 URL: http://svn.reactos.org/svn/reactos?rev=58948&view=rev Log: [KDROSDBG] Remove some unneeded legacy. Modified: branches/kd++/drivers/base/kdrosdbg/CMakeLists.txt branches/kd++/drivers/base/kdrosdbg/arm/kdbg.c branches/kd++/drivers/base/kdrosdbg/i386/kdbg.c branches/kd++/drivers/base/kdrosdbg/kdrosdbg.spec 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 19:21:03 2013 @@ -10,7 +10,7 @@ endif(ARCH STREQUAL "i386") list(APPEND SOURCE kdrosdbg.rc - ${CMAKE_CURRENT_BINARY_DIR}/kdrosdbg.def) + ${CMAKE_CURRENT_BINARY_DIR}/kdcom.def) add_library(kdcom SHARED ${SOURCE}) 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:21:03 2013 @@ -169,40 +169,6 @@ KdPortPutByteEx(&DefaultPort, ByteToSend); } -VOID -NTAPI -KdPortRestore(VOID) -{ - UNIMPLEMENTED; - while (TRUE); -} - -VOID -NTAPI -KdPortSave(VOID) -{ - UNIMPLEMENTED; - while (TRUE); -} - -BOOLEAN -NTAPI -KdPortDisableInterrupts(VOID) -{ - UNIMPLEMENTED; - while (TRUE); - return TRUE; -} - -BOOLEAN -NTAPI -KdPortEnableInterrupts(VOID) -{ - UNIMPLEMENTED; - while (TRUE); - return TRUE; -} - /* WINDOWS FUNCTIONS **********************************************************/ NTSTATUS @@ -219,6 +185,20 @@ { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +KdD0Transition(VOID) +{ + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +KdD3Transition(VOID) +{ + return STATUS_SUCCESS; } NTSTATUS 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:21:03 2013 @@ -355,70 +355,6 @@ WRITE_PORT_UCHAR(SER_THR(ComPortBase), ByteToSend); } - -/* HAL.KdPortRestore */ -VOID -NTAPI -KdPortRestore(VOID) -{ - UNIMPLEMENTED; -} - - -/* HAL.KdPortSave */ -VOID -NTAPI -KdPortSave(VOID) -{ - UNIMPLEMENTED; -} - - -/* HAL.KdPortDisableInterrupts */ -BOOLEAN -NTAPI -KdPortDisableInterrupts(VOID) -{ - UCHAR ch; - - if (!PortInitialized) - return FALSE; - - ch = READ_PORT_UCHAR(SER_MCR(DefaultPort.BaseAddress)); - ch &= (~(SR_MCR_OUT1 | SR_MCR_OUT2)); - WRITE_PORT_UCHAR(SER_MCR(DefaultPort.BaseAddress), ch); - - ch = READ_PORT_UCHAR(SER_IER(DefaultPort.BaseAddress)); - ch &= (~SR_IER_ALL); - WRITE_PORT_UCHAR(SER_IER(DefaultPort.BaseAddress), ch); - - return TRUE; -} - - -/* HAL.KdPortEnableInterrupts */ -BOOLEAN -NTAPI -KdPortEnableInterrupts(VOID) -{ - UCHAR ch; - - if (PortInitialized == FALSE) - return FALSE; - - ch = READ_PORT_UCHAR(SER_IER(DefaultPort.BaseAddress)); - ch &= (~SR_IER_ALL); - ch |= SR_IER_ERDA; - WRITE_PORT_UCHAR(SER_IER(DefaultPort.BaseAddress), ch); - - ch = READ_PORT_UCHAR(SER_MCR(DefaultPort.BaseAddress)); - ch &= (~SR_MCR_LOOP); - ch |= (SR_MCR_OUT1 | SR_MCR_OUT2); - WRITE_PORT_UCHAR(SER_MCR(DefaultPort.BaseAddress), ch); - - return TRUE; -} - /* * @unimplemented */ @@ -439,6 +375,20 @@ IN PLOADER_PARAMETER_BLOCK LoaderBlock OPTIONAL) { return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +KdD0Transition(VOID) +{ + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +KdD3Transition(VOID) +{ + return STATUS_SUCCESS; } /* 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:21:03 2013 @@ -7,15 +7,13 @@ @ stdcall KdPortPollByteEx(ptr ptr) @ stdcall KdPortPutByte(long) @ stdcall KdPortPutByteEx(ptr long) -@ stdcall KdPortRestore() -@ stdcall KdPortSave() -@ stdcall KdPortDisableInterrupts() -@ stdcall KdPortEnableInterrupts() ; New KD +@ stdcall KdD0Transition() +@ stdcall KdD3Transition() @ stdcall KdDebuggerInitialize0(ptr) @ stdcall KdDebuggerInitialize1(ptr) +@ stdcall KdReceivePacket(long ptr ptr ptr ptr) +@ stdcall KdRestore(long) @ stdcall KdSave(long) -@ stdcall KdRestore(long) -@ stdcall KdReceivePacket(long ptr ptr ptr ptr) @ stdcall KdSendPacket(long ptr ptr ptr)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs