Ros-diffs

ros-diffs@reactos.org

81390 discussions

[weiden] 18087: copy the buffer to the right place in IntWriteConsoleOutput
by weiden＠svn.reactos.com 26 Sep '05

26 Sep '05

copy the buffer to the right place in IntWriteConsoleOutput Modified: trunk/reactos/lib/kernel32/misc/console.c _____ Modified: trunk/reactos/lib/kernel32/misc/console.c --- trunk/reactos/lib/kernel32/misc/console.c 2005-09-26 11:14:34 UTC (rev 18086) +++ trunk/reactos/lib/kernel32/misc/console.c 2005-09-26 11:35:23 UTC (rev 18087) @@ -2013,7 +2013,7 @@ (PVOID*)&Request.Data.WriteConsoleOutputRequest.CharInfo); /* Copy from the buffer */ - RtlCopyMemory(&Request.Data.WriteConsoleOutputRequest.CharInfo, lpBuffer, Size); + RtlCopyMemory(Request.Data.WriteConsoleOutputRequest.CharInfo, lpBuffer, Size); /* Set up the data to send to the Console Server */ CsrRequest = MAKE_CSR_API(WRITE_CONSOLE_OUTPUT, CSR_CONSOLE);

1 0

[weiden] 18086: - fixed uninitialized variable warning
by weiden＠svn.reactos.com 26 Sep '05

26 Sep '05

- fixed uninitialized variable warning - fixed memory leak in SetupDiBuildDriverInfoList() Modified: trunk/reactos/lib/setupapi/devinst.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-09-26 11:11:48 UTC (rev 18085) +++ trunk/reactos/lib/setupapi/devinst.c 2005-09-26 11:14:34 UTC (rev 18086) @@ -3454,7 +3454,9 @@ &RequiredSize); } //FIXME: DriverDate = Version.DriverVer => invalid date = 00/00/00 + RtlZeroMemory(DriverDate, sizeof(FILETIME)); //FIXME: DriverVersion = Version.DriverVer => invalid = 0 + *DriverVersion = 0; *pProviderName = ProviderName; return TRUE; @@ -3613,9 +3615,7 @@ /* Check if the ClassGuid in this .inf file is corresponding with our needs */ if (!IsEqualIID(&list->ClassGuid, &GUID_NULL) && !IsEqualIID(&list->ClassGuid, &ClassGuid)) { - SetupCloseInfFile(hInf); - hInf = INVALID_HANDLE_VALUE; - continue; + goto next; } } @@ -3766,9 +3766,11 @@ ManufacturerName = ManufacturerSection = NULL; Result = SetupFindNextLine(&ContextManufacturer, &ContextManufacturer); } + + ret = TRUE; +next: HeapFree(GetProcessHeap(), 0, ProviderName); ProviderName = NULL; - ret = TRUE; SetupCloseInfFile(hInf); hInf = INVALID_HANDLE_VALUE;

1 0

[weiden] 18085: fixed uninitialized variable warning
by weiden＠svn.reactos.com 26 Sep '05

26 Sep '05

fixed uninitialized variable warning Modified: trunk/reactos/lib/rtl/debug.c _____ Modified: trunk/reactos/lib/rtl/debug.c --- trunk/reactos/lib/rtl/debug.c 2005-09-26 11:10:27 UTC (rev 18084) +++ trunk/reactos/lib/rtl/debug.c 2005-09-26 11:11:48 UTC (rev 18085) @@ -256,6 +256,7 @@ va_list ap; /* Call the internal routine that also handles ControlC */ + va_start(ap, Format); return vDbgPrintExWithPrefixInternal(NULL, -1, DPFLTR_ERROR_LEVEL,

1 0

[weiden] 18084: don't copy the buffer to a random pointer in IntWriteConsoleOutput()
by weiden＠svn.reactos.com 26 Sep '05

26 Sep '05

don't copy the buffer to a random pointer in IntWriteConsoleOutput() Modified: trunk/reactos/lib/kernel32/misc/console.c _____ Modified: trunk/reactos/lib/kernel32/misc/console.c --- trunk/reactos/lib/kernel32/misc/console.c 2005-09-26 08:21:38 UTC (rev 18083) +++ trunk/reactos/lib/kernel32/misc/console.c 2005-09-26 11:10:27 UTC (rev 18084) @@ -1999,7 +1999,6 @@ PCSR_CAPTURE_BUFFER CaptureBuffer; NTSTATUS Status; ULONG Size; - PVOID BufferTargetBase; Size = dwBufferSize.Y * dwBufferSize.X * sizeof(CHAR_INFO); @@ -2014,7 +2013,7 @@ (PVOID*)&Request.Data.WriteConsoleOutputRequest.CharInfo); /* Copy from the buffer */ - RtlCopyMemory(BufferTargetBase, lpBuffer, Size); + RtlCopyMemory(&Request.Data.WriteConsoleOutputRequest.CharInfo, lpBuffer, Size); /* Set up the data to send to the Console Server */ CsrRequest = MAKE_CSR_API(WRITE_CONSOLE_OUTPUT, CSR_CONSOLE);

1 0

[gvg] 18083: Silence some debug messages
by gvg＠svn.reactos.com 26 Sep '05

26 Sep '05

Silence some debug messages Modified: trunk/reactos/ntoskrnl/ke/apc.c Modified: trunk/reactos/ntoskrnl/ps/kill.c _____ Modified: trunk/reactos/ntoskrnl/ke/apc.c --- trunk/reactos/ntoskrnl/ke/apc.c 2005-09-26 07:43:55 UTC (rev 18082) +++ trunk/reactos/ntoskrnl/ke/apc.c 2005-09-26 08:21:38 UTC (rev 18083) @@ -273,7 +273,7 @@ */ if ((Apc->ApcMode != KernelMode) && (Apc->KernelRoutine == (PKKERNEL_ROUTINE)PsExitSpecialApc)) { - DPRINT1("Inserting the Thread Exit APC for '%.16s' into the Queue\n", ((PETHREAD)Thread)->ThreadsProcess->ImageFileName); + DPRINT("Inserting the Thread Exit APC for '%.16s' into the Queue\n", ((PETHREAD)Thread)->ThreadsProcess->ImageFileName); Thread->ApcStatePointer[(int)Apc->ApcStateIndex]->UserApcPending = TRUE; InsertHeadList(&Thread->ApcStatePointer[(int)Apc->ApcStateIndex]->ApcLis tHead[(int)Apc->ApcMode], &Apc->ApcListEntry); _____ Modified: trunk/reactos/ntoskrnl/ps/kill.c --- trunk/reactos/ntoskrnl/ps/kill.c 2005-09-26 07:43:55 UTC (rev 18082) +++ trunk/reactos/ntoskrnl/ps/kill.c 2005-09-26 08:21:38 UTC (rev 18083) @@ -396,8 +396,8 @@ PVOID* SystemArgument1, PVOID* SystemArguemnt2) { - DPRINT1("PsExitSpecialApc called: 0x%x (proc: 0x%x, '%.16s')\n", - PsGetCurrentThread(), PsGetCurrentProcess(), PsGetCurrentProcess()->ImageFileName); + DPRINT("PsExitSpecialApc called: 0x%x (proc: 0x%x, '%.16s')\n", + PsGetCurrentThread(), PsGetCurrentProcess(), PsGetCurrentProcess()->ImageFileName); /* Don't do anything unless we are in User-Mode */ if (Apc->SystemArgument2) @@ -425,8 +425,8 @@ PETHREAD Thread = PsGetCurrentThread(); NTSTATUS ExitStatus; - DPRINT1("PspExitNormalApc called: 0x%x (proc: 0x%x, '%.16s')\n", - PsGetCurrentThread(), PsGetCurrentProcess(), PsGetCurrentProcess()->ImageFileName); + DPRINT("PspExitNormalApc called: 0x%x (proc: 0x%x, '%.16s')\n", + PsGetCurrentThread(), PsGetCurrentProcess(), PsGetCurrentProcess()->ImageFileName); /* This should never happen */ ASSERT(!SystemArgument2); @@ -446,7 +446,7 @@ } /* If we're here, this is not a System Thread, so kill it from User-Mode */ - DPRINT1("Initializing User-Mode APC\n"); + DPRINT("Initializing User-Mode APC\n"); KeInitializeApc(Apc, &Thread->Tcb, OriginalApcEnvironment,

1 0

[ion] 18082: - Fix a bug in CSR Capture APIs
by ion＠svn.reactos.com 26 Sep '05

26 Sep '05

- Fix a bug in CSR Capture APIs - Fix bugs in kernel32 console APIs. - These changes fix vim and fix bug 796 as I promised. Modified: trunk/reactos/lib/kernel32/misc/console.c Modified: trunk/reactos/lib/ntdll/csr/capture.c Modified: trunk/reactos/lib/ntdll/csr/connect.c _____ Modified: trunk/reactos/lib/kernel32/misc/console.c --- trunk/reactos/lib/kernel32/misc/console.c 2005-09-26 05:41:35 UTC (rev 18081) +++ trunk/reactos/lib/kernel32/misc/console.c 2005-09-26 07:43:55 UTC (rev 18082) @@ -1548,7 +1548,6 @@ CSR_API_MESSAGE Request; ULONG CsrRequest; PCSR_CAPTURE_BUFFER CaptureBuffer; NTSTATUS Status; - PVOID BufferTargetBase; ULONG Size; if(lpBuffer == NULL) @@ -1560,38 +1559,38 @@ Size = nLength * sizeof(INPUT_RECORD); /* Allocate a Capture Buffer */ - DPRINT1("IntPeekConsoleInput: %lx %p\n", Size, lpNumberOfEventsRead); + DPRINT("IntPeekConsoleInput: %lx %p\n", Size, lpNumberOfEventsRead); CaptureBuffer = CsrAllocateCaptureBuffer(1, Size); /* Allocate space in the Buffer */ - CsrCaptureMessageBuffer(CaptureBuffer, NULL, Size, &BufferTargetBase); - DPRINT1("Allocated message buffer: %p %p\n", CaptureBuffer, BufferTargetBase); + CsrCaptureMessageBuffer(CaptureBuffer, + NULL, + Size, + (PVOID*)&Request.Data.PeekConsoleInputRequest.InputRecord); /* Set up the data to send to the Console Server */ CsrRequest = MAKE_CSR_API(PEEK_CONSOLE_INPUT, CSR_CONSOLE); Request.Data.PeekConsoleInputRequest.ConsoleHandle = hConsoleInput; Request.Data.PeekConsoleInputRequest.Unicode = bUnicode; Request.Data.PeekConsoleInputRequest.Length = nLength; - Request.Data.PeekConsoleInputRequest.InputRecord = (INPUT_RECORD*)BufferTargetBase; /* Call the server */ - DPRINT1("Calling Server\n"); Status = CsrClientCallServer(&Request, CaptureBuffer, CsrRequest, sizeof(CSR_API_MESSAGE)); - DPRINT1("Server returned: %x\n", Request.Status); + DPRINT("Server returned: %x\n", Request.Status); /* Check for success*/ if (NT_SUCCESS(Request.Status)) { /* Return the number of events read */ - DPRINT1("Events read: %lx\n", Request.Data.PeekConsoleInputRequest.Length); + DPRINT("Events read: %lx\n", Request.Data.PeekConsoleInputRequest.Length); *lpNumberOfEventsRead = Request.Data.PeekConsoleInputRequest.Length; /* Copy into the buffer */ - DPRINT1("Copying to buffer\n"); - RtlCopyMemory(lpBuffer, + DPRINT("Copying to buffer\n"); + RtlCopyMemory(lpBuffer, Request.Data.PeekConsoleInputRequest.InputRecord, sizeof(INPUT_RECORD) * *lpNumberOfEventsRead); } @@ -1603,7 +1602,6 @@ } /* Release the capture buffer */ - DPRINT1("Release buffer and return\n"); CsrFreeCaptureBuffer(CaptureBuffer); /* Return TRUE or FALSE */ @@ -1767,7 +1765,6 @@ { CSR_API_MESSAGE Request; ULONG CsrRequest; PCSR_CAPTURE_BUFFER CaptureBuffer; - PVOID BufferTargetBase; NTSTATUS Status; DWORD Size; @@ -1780,37 +1777,37 @@ Size = nLength * sizeof(INPUT_RECORD); /* Allocate a Capture Buffer */ - DPRINT1("IntWriteConsoleInput: %lx %p\n", Size, lpNumberOfEventsWritten); + DPRINT("IntWriteConsoleInput: %lx %p\n", Size, lpNumberOfEventsWritten); CaptureBuffer = CsrAllocateCaptureBuffer(1, Size); /* Allocate space in the Buffer */ - CsrCaptureMessageBuffer(CaptureBuffer, NULL, Size, &BufferTargetBase); - DPRINT1("Allocated message buffer: %p %p\n", CaptureBuffer, BufferTargetBase); + CsrCaptureMessageBuffer(CaptureBuffer, + NULL, + Size, + (PVOID*)&Request.Data.WriteConsoleInputRequest.InputRecord); /* Set up the data to send to the Console Server */ CsrRequest = MAKE_CSR_API(WRITE_CONSOLE_INPUT, CSR_CONSOLE); Request.Data.WriteConsoleInputRequest.ConsoleHandle = hConsoleInput; Request.Data.WriteConsoleInputRequest.Unicode = bUnicode; Request.Data.WriteConsoleInputRequest.Length = nLength; - Request.Data.WriteConsoleInputRequest.InputRecord = (PINPUT_RECORD)BufferTargetBase; /* Call the server */ - DPRINT1("Calling Server\n"); Status = CsrClientCallServer(&Request, CaptureBuffer, CsrRequest, sizeof(CSR_API_MESSAGE)); - DPRINT1("Server returned: %x\n", Request.Status); + DPRINT("Server returned: %x\n", Request.Status); /* Check for success*/ if (NT_SUCCESS(Request.Status)) { /* Return the number of events read */ - DPRINT1("Events read: %lx\n", Request.Data.WriteConsoleInputRequest.Length); + DPRINT("Events read: %lx\n", Request.Data.WriteConsoleInputRequest.Length); *lpNumberOfEventsWritten = Request.Data.WriteConsoleInputRequest.Length; /* Copy into the buffer */ - DPRINT1("Copying to buffer\n"); + DPRINT("Copying to buffer\n"); RtlCopyMemory(lpBuffer, Request.Data.WriteConsoleInputRequest.InputRecord, sizeof(INPUT_RECORD) * *lpNumberOfEventsWritten); @@ -1823,7 +1820,6 @@ } /* Release the capture buffer */ - DPRINT1("Release buffer and return\n"); CsrFreeCaptureBuffer(CaptureBuffer); /* Return TRUE or FALSE */ @@ -1885,7 +1881,6 @@ { CSR_API_MESSAGE Request; ULONG CsrRequest; PCSR_CAPTURE_BUFFER CaptureBuffer; - PVOID BufferTargetBase; NTSTATUS Status; DWORD Size, SizeX, SizeY; @@ -1898,12 +1893,14 @@ Size = dwBufferSize.X * dwBufferSize.Y * sizeof(CHAR_INFO); /* Allocate a Capture Buffer */ - DPRINT1("IntReadConsoleOutput: %lx %p\n", Size, lpReadRegion); + DPRINT("IntReadConsoleOutput: %lx %p\n", Size, lpReadRegion); CaptureBuffer = CsrAllocateCaptureBuffer(1, Size); /* Allocate space in the Buffer */ - CsrCaptureMessageBuffer(CaptureBuffer, NULL, Size, &BufferTargetBase); - DPRINT1("Allocated message buffer: %p %p\n", CaptureBuffer, BufferTargetBase); + CsrCaptureMessageBuffer(CaptureBuffer, + NULL, + Size, + (PVOID*)&Request.Data.ReadConsoleOutputRequest.CharInfo); /* Set up the data to send to the Console Server */ CsrRequest = MAKE_CSR_API(READ_CONSOLE_OUTPUT, CSR_CONSOLE); @@ -1912,21 +1909,19 @@ Request.Data.ReadConsoleOutputRequest.BufferSize = dwBufferSize; Request.Data.ReadConsoleOutputRequest.BufferCoord = dwBufferCoord; Request.Data.ReadConsoleOutputRequest.ReadRegion = *lpReadRegion; - Request.Data.ReadConsoleOutputRequest.CharInfo = (PCHAR_INFO)BufferTargetBase; /* Call the server */ - DPRINT1("Calling Server\n"); Status = CsrClientCallServer(&Request, CaptureBuffer, CsrRequest, sizeof(CSR_API_MESSAGE)); - DPRINT1("Server returned: %x\n", Request.Status); + DPRINT("Server returned: %x\n", Request.Status); /* Check for success*/ if (NT_SUCCESS(Request.Status)) { /* Copy into the buffer */ - DPRINT1("Copying to buffer\n"); + DPRINT("Copying to buffer\n"); SizeX = Request.Data.ReadConsoleOutputRequest.ReadRegion.Right - Request.Data.ReadConsoleOutputRequest.ReadRegion.Left + 1; SizeY = Request.Data.ReadConsoleOutputRequest.ReadRegion.Bottom - @@ -1942,11 +1937,10 @@ } /* Return the read region */ - DPRINT1("read region: %lx\n", Request.Data.ReadConsoleOutputRequest.ReadRegion); + DPRINT("read region: %lx\n", Request.Data.ReadConsoleOutputRequest.ReadRegion); *lpReadRegion = Request.Data.ReadConsoleOutputRequest.ReadRegion; /* Release the capture buffer */ - DPRINT1("Release buffer and return\n"); CsrFreeCaptureBuffer(CaptureBuffer); /* Return TRUE or FALSE */ @@ -2010,15 +2004,16 @@ Size = dwBufferSize.Y * dwBufferSize.X * sizeof(CHAR_INFO); /* Allocate a Capture Buffer */ - DPRINT1("IntWriteConsoleOutput: %lx %p\n", Size, lpWriteRegion); + DPRINT("IntWriteConsoleOutput: %lx %p\n", Size, lpWriteRegion); CaptureBuffer = CsrAllocateCaptureBuffer(1, Size); /* Allocate space in the Buffer */ - CsrCaptureMessageBuffer(CaptureBuffer, NULL, Size, &BufferTargetBase); - DPRINT1("Allocated message buffer: %p %p\n", CaptureBuffer, BufferTargetBase); + CsrCaptureMessageBuffer(CaptureBuffer, + NULL, + Size, + (PVOID*)&Request.Data.WriteConsoleOutputRequest.CharInfo); /* Copy from the buffer */ - DPRINT1("Copying into buffer\n"); RtlCopyMemory(BufferTargetBase, lpBuffer, Size); /* Set up the data to send to the Console Server */ @@ -2028,15 +2023,13 @@ Request.Data.WriteConsoleOutputRequest.BufferSize = dwBufferSize; Request.Data.WriteConsoleOutputRequest.BufferCoord = dwBufferCoord; Request.Data.WriteConsoleOutputRequest.WriteRegion = *lpWriteRegion; - Request.Data.WriteConsoleOutputRequest.CharInfo = (CHAR_INFO*)BufferTargetBase; /* Call the server */ - DPRINT1("Calling Server\n"); Status = CsrClientCallServer(&Request, CaptureBuffer, CsrRequest, sizeof(CSR_API_MESSAGE)); - DPRINT1("Server returned: %x\n", Request.Status); + DPRINT("Server returned: %x\n", Request.Status); /* Check for success*/ if (!NT_SUCCESS(Request.Status)) @@ -2046,11 +2039,10 @@ } /* Return the read region */ - DPRINT1("read region: %lx\n", Request.Data.WriteConsoleOutputRequest.WriteRegion); + DPRINT("read region: %lx\n", Request.Data.WriteConsoleOutputRequest.WriteRegion); *lpWriteRegion = Request.Data.WriteConsoleOutputRequest.WriteRegion; /* Release the capture buffer */ - DPRINT1("Release buffer and return\n"); CsrFreeCaptureBuffer(CaptureBuffer); /* Return TRUE or FALSE */ _____ Modified: trunk/reactos/lib/ntdll/csr/capture.c --- trunk/reactos/lib/ntdll/csr/capture.c 2005-09-26 05:41:35 UTC (rev 18081) +++ trunk/reactos/lib/ntdll/csr/capture.c 2005-09-26 07:43:55 UTC (rev 18082) @@ -142,12 +142,12 @@ CaptureBuffer->BufferEnd += MessageLength; } + /* Write down this pointer in the array */ + CaptureBuffer->PointerArray[CaptureBuffer->PointerCount] = (ULONG_PTR)CaptureData; + /* Increase the pointer count */ CaptureBuffer->PointerCount++; - /* Write down this pointer in the array */ - CaptureBuffer->PointerArray[CaptureBuffer->PointerCount] = (ULONG_PTR)CaptureData; - /* Return the aligned length */ return MessageLength; } _____ Modified: trunk/reactos/lib/ntdll/csr/connect.c --- trunk/reactos/lib/ntdll/csr/connect.c 2005-09-26 05:41:35 UTC (rev 18081) +++ trunk/reactos/lib/ntdll/csr/connect.c 2005-09-26 07:43:55 UTC (rev 18082) @@ -57,7 +57,7 @@ PULONG_PTR Pointers; ULONG_PTR CurrentPointer; DPRINT("CsrClientCallServer\n"); - + /* Fill out the Port Message Header */ ApiMessage->Header.u1.s1.DataLength = RequestLength - sizeof(PORT_MESSAGE); ApiMessage->Header.u1.s1.TotalLength = RequestLength; @@ -79,7 +79,6 @@ if (CaptureBuffer) { /* We have to convert from our local view to the remote view */ - DPRINT1("Converting CaptureBuffer\n"); ApiMessage->CsrCaptureData = (PVOID)((ULONG_PTR)CaptureBuffer + CsrPortMemoryDelta); @@ -91,14 +90,19 @@ Pointers = CaptureBuffer->PointerArray; /* Loop through every pointer and convert it */ + DPRINT("PointerCount: %lx\n", PointerCount); while (PointerCount--) { /* Get this pointer and check if it's valid */ + DPRINT("Array Address: %p. This pointer: %p. Data: %p\n", + &Pointers, Pointers, *Pointers); if ((CurrentPointer = *Pointers++)) { /* Update it */ + DPRINT("CurrentPointer: %p.\n", *(PULONG_PTR)CurrentPointer); *(PULONG_PTR)CurrentPointer += CsrPortMemoryDelta; Pointers[-1] = CurrentPointer - (ULONG_PTR)ApiMessage; + DPRINT("CurrentPointer: %p.\n", *(PULONG_PTR)CurrentPointer); } } } @@ -112,7 +116,7 @@ if (CaptureBuffer) { /* We have to convert from the remote view to our remote view */ - DPRINT1("Reconverting CaptureBuffer\n"); + DPRINT("Reconverting CaptureBuffer\n"); ApiMessage->CsrCaptureData = (PVOID)((ULONG_PTR) ApiMessage->CsrCaptureData - CsrPortMemoryDelta);

1 0

[ion] 18081: - Put executive atom functions in the executive folder, not rtl.
by ion＠svn.reactos.com 26 Sep '05

26 Sep '05

- Put executive atom functions in the executive folder, not rtl. - Move purecall to the executive error APIs. Added: trunk/reactos/ntoskrnl/ex/atom.c Modified: trunk/reactos/ntoskrnl/ex/error.c Modified: trunk/reactos/ntoskrnl/include/internal/rtl.h Modified: trunk/reactos/ntoskrnl/ntoskrnl.xml Deleted: trunk/reactos/ntoskrnl/rtl/atom.c Deleted: trunk/reactos/ntoskrnl/rtl/purecall.c _____ Added: trunk/reactos/ntoskrnl/ex/atom.c --- trunk/reactos/ntoskrnl/ex/atom.c 2005-09-26 05:03:28 UTC (rev 18080) +++ trunk/reactos/ntoskrnl/ex/atom.c 2005-09-26 05:41:35 UTC (rev 18081) @@ -0,0 +1,225 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: ntoskrnl/ex/atom.c + * PURPOSE: Executive Atom Functions + * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) + * Gunnar Dalsnes + */ + +/* INCLUDES *****************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <internal/debug.h> + +/* GLOBALS ****************************************************************/ + +/* + * FIXME: this is WRONG! The global atom table should live in the WinSta struct + * and accessed through a win32k callout (received in PsEstablishWin32Callouts) + * NOTE: There is a session/win32k global atom table also, but its private to + * win32k. Its used for RegisterWindowMessage() and for window classes. + * -Gunnar + */ +PRTL_ATOM_TABLE GlobalAtomTable; + +/* PRIVATE FUNCTIONS *********************************************************/ + +PRTL_ATOM_TABLE +NTAPI +ExpGetGlobalAtomTable(VOID) +{ + NTSTATUS Status; + + /* Return it if we have one */ + if (GlobalAtomTable) return GlobalAtomTable; + + /* Create it */ + Status = RtlCreateAtomTable(37, &GlobalAtomTable); + + /* If we couldn't create it, return NULL */ + if (!NT_SUCCESS(Status)) return NULL; + + /* Return the newly created one */ + return GlobalAtomTable; +} + +NTSTATUS +NTAPI +RtlpQueryAtomInformation(PRTL_ATOM_TABLE AtomTable, + RTL_ATOM Atom, + PATOM_BASIC_INFORMATION AtomInformation, + ULONG AtomInformationLength, + PULONG ReturnLength) +{ + NTSTATUS Status; + ULONG UsageCount; + ULONG Flags; + ULONG NameLength; + + NameLength = AtomInformationLength - sizeof(ATOM_BASIC_INFORMATION) + sizeof(WCHAR); + Status = RtlQueryAtomInAtomTable(AtomTable, + Atom, + &UsageCount, + &Flags, + AtomInformation->Name, + &NameLength); + + if (!NT_SUCCESS(Status)) return Status; + DPRINT("NameLength: %lu\n", NameLength); + + if (ReturnLength != NULL) + { + *ReturnLength = NameLength + sizeof(ATOM_BASIC_INFORMATION); + } + + if (NameLength + sizeof(ATOM_BASIC_INFORMATION) > AtomInformationLength) + { + return STATUS_INFO_LENGTH_MISMATCH; + } + + AtomInformation->UsageCount = (USHORT)UsageCount; + AtomInformation->Flags = (USHORT)Flags; + AtomInformation->NameLength = (USHORT)NameLength; + + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +RtlpQueryAtomTableInformation(PRTL_ATOM_TABLE AtomTable, + RTL_ATOM Atom, + PATOM_TABLE_INFORMATION AtomInformation, + ULONG AtomInformationLength, + PULONG ReturnLength) +{ + ULONG Length; + NTSTATUS Status; + + Length = sizeof(ATOM_TABLE_INFORMATION); + DPRINT("RequiredLength: %lu\n", Length); + + if (ReturnLength) *ReturnLength = Length; + + if (Length > AtomInformationLength) return STATUS_INFO_LENGTH_MISMATCH; + + Status = RtlQueryAtomListInAtomTable(AtomTable, + (AtomInformationLength - Length) / + sizeof(RTL_ATOM), + &AtomInformation->NumberOfAtoms, + AtomInformation->Atoms); + if (NT_SUCCESS(Status)) + { + ReturnLength += AtomInformation->NumberOfAtoms * sizeof(RTL_ATOM); + if (ReturnLength != NULL) *ReturnLength = Length; + } + + return Status; +} + +/* FUNCTIONS ****************************************************************/ + +/* + * @implemented + */ +NTSTATUS +NTAPI +NtAddAtom(IN PWSTR AtomName, + IN ULONG AtomNameLength, + OUT PRTL_ATOM Atom) +{ + PRTL_ATOM_TABLE AtomTable = ExpGetGlobalAtomTable(); + + /* Check for the table */ + if (AtomTable == NULL) return STATUS_ACCESS_DENIED; + + /* FIXME: SEH! */ + + /* Call the worker function */ + return RtlAddAtomToAtomTable(AtomTable, AtomName, Atom); +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +NtDeleteAtom(IN RTL_ATOM Atom) +{ + PRTL_ATOM_TABLE AtomTable = ExpGetGlobalAtomTable(); + + /* Check for valid table */ + if (AtomTable == NULL) return STATUS_ACCESS_DENIED; + + /* Call worker function */ + return RtlDeleteAtomFromAtomTable(AtomTable, Atom); +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +NtFindAtom(IN PWSTR AtomName, + IN ULONG AtomNameLength, + OUT PRTL_ATOM Atom) +{ + PRTL_ATOM_TABLE AtomTable = ExpGetGlobalAtomTable(); + + /* Check for valid table */ + if (AtomTable == NULL) return STATUS_ACCESS_DENIED; + + /* FIXME: SEH!!! */ + + /* Call worker function */ + return RtlLookupAtomInAtomTable(AtomTable, AtomName, Atom); +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +NtQueryInformationAtom(RTL_ATOM Atom, + ATOM_INFORMATION_CLASS AtomInformationClass, + PVOID AtomInformation, + ULONG AtomInformationLength, + PULONG ReturnLength) +{ + PRTL_ATOM_TABLE AtomTable = ExpGetGlobalAtomTable(); + NTSTATUS Status; + + /* Check for valid table */ + if (AtomTable == NULL) return STATUS_ACCESS_DENIED; + + /* FIXME: SEH! */ + + /* Choose class */ + switch (AtomInformationClass) + { + case AtomBasicInformation: + Status = RtlpQueryAtomInformation(AtomTable, + Atom, + AtomInformation, + AtomInformationLength, + ReturnLength); + break; + + case AtomTableInformation: + Status = RtlpQueryAtomTableInformation(AtomTable, + Atom, + AtomInformation, + AtomInformationLength, + ReturnLength); + break; + + default: + Status = STATUS_INVALID_INFO_CLASS; + } + + /* Return to caller */ + return Status; +} + +/* EOF */ _____ Modified: trunk/reactos/ntoskrnl/ex/error.c --- trunk/reactos/ntoskrnl/ex/error.c 2005-09-26 05:03:28 UTC (rev 18080) +++ trunk/reactos/ntoskrnl/ex/error.c 2005-09-26 05:41:35 UTC (rev 18081) @@ -95,7 +95,6 @@ STDCALL NtSetDefaultHardErrorPort(IN HANDLE PortHandle) { - KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status = STATUS_UNSUCCESSFUL; @@ -128,4 +127,12 @@ return Status; } +VOID +__cdecl +_purecall(VOID) +{ + /* Not supported in Kernel Mode */ + RtlRaiseStatus(STATUS_NOT_IMPLEMENTED); +} + /* EOF */ _____ Modified: trunk/reactos/ntoskrnl/include/internal/rtl.h --- trunk/reactos/ntoskrnl/include/internal/rtl.h 2005-09-26 05:03:28 UTC (rev 18080) +++ trunk/reactos/ntoskrnl/include/internal/rtl.h 2005-09-26 05:41:35 UTC (rev 18081) @@ -43,6 +43,15 @@ NTAPI RtlpCreateNlsSection(VOID); +NTSTATUS +NTAPI +RtlQueryAtomListInAtomTable( + IN PRTL_ATOM_TABLE AtomTable, + IN ULONG MaxAtomCount, + OUT ULONG *AtomCount, + OUT RTL_ATOM *AtomList +); + #endif /* __NTOSKRNL_INCLUDE_INTERNAL_NLS_H */ /* EOF */ _____ Modified: trunk/reactos/ntoskrnl/ntoskrnl.xml --- trunk/reactos/ntoskrnl/ntoskrnl.xml 2005-09-26 05:03:28 UTC (rev 18080) +++ trunk/reactos/ntoskrnl/ntoskrnl.xml 2005-09-26 05:41:35 UTC (rev 18081) @@ -116,6 +116,7 @@ <file>debug.c</file> </directory> <directory name="ex"> + <file>atom.c</file> <if property="ARCH" value="i386"> <directory name="i386"> <file>interlck.S</file> @@ -305,11 +306,9 @@ <file>seh.s</file> </directory> </if> - <file>atom.c</file> <file>libsupp.c</file> <file>misc.c</file> <file>nls.c</file> - <file>purecall.c</file> <file>regio.c</file> <file>strtok.c</file> </directory> _____ Deleted: trunk/reactos/ntoskrnl/rtl/atom.c --- trunk/reactos/ntoskrnl/rtl/atom.c 2005-09-26 05:03:28 UTC (rev 18080) +++ trunk/reactos/ntoskrnl/rtl/atom.c 2005-09-26 05:41:35 UTC (rev 18081) @@ -1,255 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/rtl/atom.c - * PURPOSE: Atom managment - * - * PROGRAMMERS: No programmer listed. - */ - -/* INCLUDES *****************************************************************/ - -#include <ntoskrnl.h> -#define NDEBUG -#include <internal/debug.h> - - -/* PROTOTYPES ****************************************************************/ - -static PRTL_ATOM_TABLE RtlpGetGlobalAtomTable(VOID); -static NTSTATUS -RtlpQueryAtomInformation(PRTL_ATOM_TABLE AtomTable, - RTL_ATOM Atom, - PATOM_BASIC_INFORMATION AtomInformation, - ULONG AtomInformationLength, - PULONG ReturnLength); -static NTSTATUS -RtlpQueryAtomTableInformation(PRTL_ATOM_TABLE AtomTable, - RTL_ATOM Atom, - PATOM_TABLE_INFORMATION AtomInformation, - ULONG AtomInformationLength, - PULONG ReturnLength); - -extern NTSTATUS STDCALL -RtlQueryAtomListInAtomTable(IN PRTL_ATOM_TABLE AtomTable, - IN ULONG MaxAtomCount, - OUT ULONG *AtomCount, - OUT RTL_ATOM *AtomList); - -/* GLOBALS *******************************************************************/ - -/* FIXME: this is WRONG! The global atom table should live in the WinSta struct - * and accessed thru win32k callouts. - * NOTE: There is a session/win32k global atom table also, but its private to - * win32k. Its used for RegisterWindowMessage() and for window classes. - * -Gunnar - */ -static PRTL_ATOM_TABLE GlobalAtomTable = NULL; - -/* FUNCTIONS *****************************************************************/ - - -/* - * @implemented - */ -NTSTATUS STDCALL -NtAddAtom( - IN PWSTR AtomName, - IN ULONG AtomNameLength, - OUT PRTL_ATOM Atom) -{ - PRTL_ATOM_TABLE AtomTable; - - AtomTable = RtlpGetGlobalAtomTable(); - if (AtomTable == NULL) - return STATUS_ACCESS_DENIED; - - return RtlAddAtomToAtomTable(AtomTable, AtomName, Atom); -} - - -/* - * @implemented - */ -NTSTATUS STDCALL -NtDeleteAtom(IN RTL_ATOM Atom) -{ - PRTL_ATOM_TABLE AtomTable; - - AtomTable = RtlpGetGlobalAtomTable(); - if (AtomTable == NULL) - return STATUS_ACCESS_DENIED; - - return (RtlDeleteAtomFromAtomTable(AtomTable, - Atom)); -} - - -/* - * @implemented - */ -NTSTATUS STDCALL -NtFindAtom(IN PWSTR AtomName, - IN ULONG AtomNameLength, - OUT PRTL_ATOM Atom) -{ - PRTL_ATOM_TABLE AtomTable; - - AtomTable = RtlpGetGlobalAtomTable(); - if (AtomTable == NULL) - return STATUS_ACCESS_DENIED; - - return (RtlLookupAtomInAtomTable(AtomTable, - AtomName, - Atom)); -} - - -/* - * @implemented - */ -NTSTATUS STDCALL -NtQueryInformationAtom(RTL_ATOM Atom, - ATOM_INFORMATION_CLASS AtomInformationClass, - PVOID AtomInformation, - ULONG AtomInformationLength, - PULONG ReturnLength) -{ - PRTL_ATOM_TABLE AtomTable; - NTSTATUS Status; - - AtomTable = RtlpGetGlobalAtomTable(); - if (AtomTable == NULL) - return STATUS_ACCESS_DENIED; - - switch (AtomInformationClass) - { - case AtomBasicInformation: - Status = RtlpQueryAtomInformation(AtomTable, - Atom, - AtomInformation, - AtomInformationLength, - ReturnLength); - break; - - case AtomTableInformation: - Status = RtlpQueryAtomTableInformation(AtomTable, - Atom, - AtomInformation, - AtomInformationLength, - ReturnLength); - break; - - default: - Status = STATUS_INVALID_INFO_CLASS; - } - - return Status; -} - - -/* INTERNAL FUNCTIONS ********************************************************/ - -static PRTL_ATOM_TABLE -RtlpGetGlobalAtomTable(VOID) -{ - NTSTATUS Status; - - if (GlobalAtomTable != NULL) - return GlobalAtomTable; - - Status = RtlCreateAtomTable(37, &GlobalAtomTable); - if (!NT_SUCCESS(Status)) - return NULL; - - return GlobalAtomTable; -} - -static NTSTATUS -RtlpQueryAtomInformation(PRTL_ATOM_TABLE AtomTable, - RTL_ATOM Atom, - PATOM_BASIC_INFORMATION AtomInformation, - ULONG AtomInformationLength, - PULONG ReturnLength) -{ - NTSTATUS Status; - ULONG UsageCount; - ULONG Flags; - ULONG NameLength; - - NameLength = AtomInformationLength - sizeof(ATOM_BASIC_INFORMATION) + sizeof(WCHAR); - Status = RtlQueryAtomInAtomTable(AtomTable, - Atom, - &UsageCount, - &Flags, - AtomInformation->Name, - &NameLength); - - if (!NT_SUCCESS(Status)) - { - return Status; - } - - DPRINT("NameLength: %lu\n", NameLength); - - if (ReturnLength != NULL) - { - *ReturnLength = NameLength + sizeof(ATOM_BASIC_INFORMATION); - } - - if (NameLength + sizeof(ATOM_BASIC_INFORMATION) > AtomInformationLength) - { - return STATUS_INFO_LENGTH_MISMATCH; - } - - AtomInformation->UsageCount = (USHORT)UsageCount; - AtomInformation->Flags = (USHORT)Flags; - AtomInformation->NameLength = (USHORT)NameLength; - - return STATUS_SUCCESS; -} - - -static NTSTATUS -RtlpQueryAtomTableInformation(PRTL_ATOM_TABLE AtomTable, - RTL_ATOM Atom, - PATOM_TABLE_INFORMATION AtomInformation, - ULONG AtomInformationLength, - PULONG ReturnLength) -{ - ULONG Length; - NTSTATUS Status; - - Length = sizeof(ATOM_TABLE_INFORMATION); - - DPRINT("RequiredLength: %lu\n", Length); - - if (ReturnLength != NULL) - { - *ReturnLength = Length; - } - - if (Length > AtomInformationLength) - { - return STATUS_INFO_LENGTH_MISMATCH; - } - - Status = RtlQueryAtomListInAtomTable(AtomTable, - (AtomInformationLength - Length) / sizeof(RTL_ATOM), - &AtomInformation->NumberOfAtoms, - AtomInformation->Atoms); - if (NT_SUCCESS(Status)) - { - ReturnLength += AtomInformation->NumberOfAtoms * sizeof(RTL_ATOM); - - if (ReturnLength != NULL) - { - *ReturnLength = Length; - } - } - - return Status; -} - -/* EOF */ _____ Deleted: trunk/reactos/ntoskrnl/rtl/purecall.c --- trunk/reactos/ntoskrnl/rtl/purecall.c 2005-09-26 05:03:28 UTC (rev 18080) +++ trunk/reactos/ntoskrnl/rtl/purecall.c 2005-09-26 05:41:35 UTC (rev 18081) @@ -1,22 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/rtl/purecall.c - * PURPOSE: No purpose listed. - * - * PROGRAMMERS: Eric Kohl <ekohl(a)zr-online.de> - */ - -/* INCLUDES *****************************************************************/ - -#include <ntoskrnl.h> - -/* FUNCTIONS ****************************************************************/ - -void _purecall(void) -{ - ExRaiseStatus(STATUS_NOT_IMPLEMENTED); -} - -/* EOF */

1 0

[ion] 18080: - Remove some deprecated files.
by ion＠svn.reactos.com 26 Sep '05

26 Sep '05

- Remove some deprecated files. Deleted: trunk/reactos/ntoskrnl/ps/i386/ Deleted: trunk/reactos/ntoskrnl/rtl/debug.c _____ Deleted: trunk/reactos/ntoskrnl/rtl/debug.c

1 0

[ion] 18079: Forgot to svn add these two files.
by ion＠svn.reactos.com 26 Sep '05

26 Sep '05

Forgot to svn add these two files. Added: trunk/reactos/lib/ntdll/dbg/dbgui.c Added: trunk/reactos/lib/rtl/debug.c _____ Added: trunk/reactos/lib/ntdll/dbg/dbgui.c --- trunk/reactos/lib/ntdll/dbg/dbgui.c 2005-09-26 04:59:48 UTC (rev 18078) +++ trunk/reactos/lib/ntdll/dbg/dbgui.c 2005-09-26 05:01:14 UTC (rev 18079) @@ -0,0 +1,138 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: lib/ntdll/dbg/dbgui.c + * PURPOSE: User-Mode DbgUI Support + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + */ + +/* INCLUDES *****************************************************************/ + +#include <ntdll.h> +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS *****************************************************************/ + +NTSTATUS +NTAPI +DebugService(IN ULONG Service, + IN PVOID Buffer, + IN ULONG Length, + IN PVOID Argument1, + IN PVOID Argument2); + +NTSTATUS +NTAPI +DebugPrint(IN PANSI_STRING DebugString, + IN ULONG ComponentId, + IN ULONG Level) +{ + /* Call the INT2D Service */ + return DebugService(BREAKPOINT_PRINT, + DebugString->Buffer, + DebugString->Length, + UlongToPtr(ComponentId), + UlongToPtr(Level)); +} + +/* + * @implemented + */ +NTSTATUS +STDCALL +DbgUiConnectToDbg(VOID) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + + /* Don't connect twice */ + if (NtCurrentTeb()->DbgSsReserved[0]) return STATUS_SUCCESS; + + /* Setup the Attributes */ + InitializeObjectAttributes(&ObjectAttributes, + 0, + 0, + 0, + 0); + + /* Create the object */ + return ZwCreateDebugObject(&NtCurrentTeb()->DbgSsReserved[0], + DEBUG_OBJECT_ALL_ACCESS, + &ObjectAttributes, + TRUE); +} + +/* + * @implemented + */ +NTSTATUS +STDCALL +DbgUiContinue(PCLIENT_ID ClientId, + ULONG ContinueStatus) +{ + /* Tell the kernel object to continue */ + return ZwDebugContinue(NtCurrentTeb()->DbgSsReserved[0], + ClientId, + ContinueStatus); +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +DbgUiWaitStateChange(PDBGUI_WAIT_STATE_CHANGE DbgUiWaitStateCange, + PLARGE_INTEGER TimeOut) +{ + /* Tell the kernel to wait */ + return NtWaitForDebugEvent(NtCurrentTeb()->DbgSsReserved[0], + TRUE, + TimeOut, + DbgUiWaitStateCange); +} + +/* + * @implemented + */ +VOID +STDCALL +DbgUiRemoteBreakin(VOID) +{ + /* Make sure a debugger is enabled; if so, breakpoint */ + if (NtCurrentPeb()->BeingDebugged) DbgBreakPoint(); + + /* Exit the thread */ + RtlExitUserThread(STATUS_SUCCESS); +} + +/* + * @implemented + */ +NTSTATUS +STDCALL +DbgUiIssueRemoteBreakin(HANDLE Process) +{ + HANDLE hThread; + CLIENT_ID ClientId; + NTSTATUS Status; + + /* Create the thread that will do the breakin */ + Status = RtlCreateUserThread(Process, + NULL, + FALSE, + 0, + 0, + PAGE_SIZE, + (PVOID)DbgUiRemoteBreakin, + NULL, + &hThread, + &ClientId); + + /* Close the handle on success */ + if(NT_SUCCESS(Status)) NtClose(hThread); + + /* Return status */ + return Status; +} + +/* EOF */ _____ Added: trunk/reactos/lib/rtl/debug.c --- trunk/reactos/lib/rtl/debug.c 2005-09-26 04:59:48 UTC (rev 18078) +++ trunk/reactos/lib/rtl/debug.c 2005-09-26 05:01:14 UTC (rev 18079) @@ -0,0 +1,328 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Run-Time Library + * FILE: ntoskrnl/rtl/dbgprint.c + * PURPOSE: Debug Print and Prompt routines + * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) + * Royce Mitchel III + */ + +/* INCLUDES *****************************************************************/ + +#include <rtl.h> + +#define NDEBUG +#include <debug.h> + +/* PRIVATE FUNCTIONS ********************************************************/ + +#if 0 +NTSTATUS +NTAPI +DebugPrint(IN PANSI_STRING DebugString, + IN ULONG ComponentId, + IN ULONG Level) +{ + /* Call the INT2D Service */ + return DebugService(BREAKPOINT_PRINT, + DebugString->Buffer, + DebugString->Length, + UlongToPtr(ComponentId), + UlongToPtr(Level)); +} +#else +NTSTATUS +NTAPI +DebugPrint(IN PANSI_STRING DebugString, + IN ULONG ComponentId, + IN ULONG Level); +#endif + +NTSTATUS +NTAPI +DebugPrompt(IN PANSI_STRING Output, + IN PANSI_STRING Input) +{ + /* Call the INT2D Service */ + return DebugService(BREAKPOINT_PROMPT, + Output->Buffer, + Output->Length, + Input->Buffer, + UlongToPtr(Input->MaximumLength)); +} + +/* FUNCTIONS ****************************************************************/ + +ULONG +NTAPI +vDbgPrintExWithPrefixInternal(IN LPCSTR Prefix, + IN ULONG ComponentId, + IN ULONG Level, + IN LPCSTR Format, + IN va_list ap, + IN BOOLEAN HandleBreakpoint) +{ + NTSTATUS Status; + ANSI_STRING DebugString; + CHAR Buffer[512]; + PCHAR pBuffer = Buffer; + ULONG pBufferSize = sizeof(Buffer); + ULONG Length; + EXCEPTION_RECORD ExceptionRecord; + + /* Check if we should print it or not */ + if (ComponentId != -1 && !NtQueryDebugFilterState(ComponentId, Level)) + { + /* This message is masked */ + return STATUS_SUCCESS; + } + + /* For user mode, don't recursively DbgPrint */ + if (RtlpSetInDbgPrint(TRUE)) return STATUS_SUCCESS; + + /* Initialize the length to 8 */ + DebugString.Length = 0; + + /* Handle the prefix */ + if (Prefix && *Prefix) + { + /* Get the length */ + DebugString.Length = strlen(Prefix); + + /* Normalize it */ + if(DebugString.Length > sizeof(Buffer)) + { + DebugString.Length = sizeof(Buffer); + } + + /* Copy it */ + strncpy(Buffer, Prefix, DebugString.Length); + + /* Set the pointer and update the size */ + pBuffer = &Buffer[DebugString.Length]; + pBufferSize -= DebugString.Length; + } + + /* Setup the ANSI String */ + DebugString.Buffer = Buffer; + DebugString.MaximumLength = sizeof(Buffer); + Length = _vsnprintf(pBuffer, pBufferSize, Format, ap); + + /* Check if we went past the buffer */ + if (Length == -1) + { + /* Terminate it if we went over-board */ + Buffer[sizeof(Buffer) - 1] = '\n'; + + /* Put maximum */ + Length = sizeof(Buffer); + } + + /* Update length */ + DebugString.Length += Length; + + /* First, let the debugger know as well */ + if (RtlpCheckForActiveDebugger(FALSE)) + { + /* Fill out an exception record */ + ExceptionRecord.ExceptionCode = DBG_PRINTEXCEPTION_C; + ExceptionRecord.ExceptionRecord = NULL; + ExceptionRecord.NumberParameters = 2; + ExceptionRecord.ExceptionFlags = 0; + ExceptionRecord.ExceptionInformation[0] = DebugString.Length + 1; + ExceptionRecord.ExceptionInformation[1] = (ULONG_PTR)DebugString.Buffer; + + /* Raise the exception */ + RtlRaiseException(&ExceptionRecord); + + /* This code only runs in user-mode, so setting the flag is safe */ + NtCurrentTeb()->InDbgPrint = FALSE; + return STATUS_SUCCESS; + } + + /* Call the Debug Print routine */ + Status = DebugPrint(&DebugString, ComponentId, Level); + + /* Check if this was with Control-C */ + if (HandleBreakpoint) + { + /* Check if we got a breakpoint */ + if (Status == STATUS_BREAKPOINT) + { + /* Breakpoint */ + DbgBreakPointWithStatus(DBG_STATUS_CONTROL_C); + Status = STATUS_SUCCESS; + } + } + + /* In user-mode, remove the InDbgPrint Flag */ + RtlpSetInDbgPrint(FALSE); + + /* Return */ + return Status; +} + +/* + * @implemented + */ +ULONG +NTAPI +vDbgPrintExWithPrefix(IN LPCSTR Prefix, + IN ULONG ComponentId, + IN ULONG Level, + IN LPCSTR Format, + IN va_list ap) +{ + /* Call the internal routine that also handles ControlC */ + return vDbgPrintExWithPrefixInternal(Prefix, + ComponentId, + Level, + Format, + ap, + TRUE); +} + +/* + * @implemented + */ +ULONG +NTAPI +vDbgPrintEx(IN ULONG ComponentId, + IN ULONG Level, + IN LPCSTR Format, + IN va_list ap) +{ + /* Call the internal routine that also handles ControlC */ + return vDbgPrintExWithPrefixInternal(NULL, + ComponentId, + Level, + Format, + ap, + TRUE); +} + +/* + * @implemented + */ +ULONG +__cdecl +DbgPrint(PCH Format, + ...) +{ + va_list ap; + + /* Call the internal routine that also handles ControlC */ + va_start(ap, Format); + return vDbgPrintExWithPrefixInternal(NULL, + -1, + DPFLTR_ERROR_LEVEL, + Format, + ap, + TRUE); + va_end(ap); +} + +/* + * @implemented + */ +ULONG +__cdecl +DbgPrintEx(IN ULONG ComponentId, + IN ULONG Level, + IN PCH Format, + ...) +{ + va_list ap; + + /* Call the internal routine that also handles ControlC */ + va_start(ap, Format); + return vDbgPrintExWithPrefixInternal(NULL, + ComponentId, + Level, + Format, + ap, + TRUE); + va_end(ap); +} + +/* + * @implemented + */ +ULONG +__cdecl +DbgPrintReturnControlC(PCH Format, + ...) +{ + va_list ap; + + /* Call the internal routine that also handles ControlC */ + return vDbgPrintExWithPrefixInternal(NULL, + -1, + DPFLTR_ERROR_LEVEL, + Format, + ap, + FALSE); +} + +/* + * @implemented + */ +ULONG +STDCALL +DbgPrompt(PCH OutputString, + PCH InputString, + USHORT InputSize) +{ + ANSI_STRING Output; + ANSI_STRING Input; + + /* Setup the input string */ + Input.MaximumLength = InputSize; + Input.Buffer = InputString; + + /* Setup the output string */ + Output.Length = strlen (OutputString); + Output.Buffer = OutputString; + + /* Call the system service */ + return DebugPrompt(&Output, &Input); +} + +/* + * @implemented + */ +BOOLEAN +STDCALL +DbgQueryDebugFilterState(IN ULONG ComponentId, + IN ULONG Level) +{ + /* Call the Nt routine */ + return NtQueryDebugFilterState(ComponentId, Level); +} + +/* + * @implemented + */ +NTSTATUS +STDCALL +DbgSetDebugFilterState(IN ULONG ComponentId, + IN ULONG Level, + IN BOOLEAN State) +{ + /* Call the Nt routine */ + return NtSetDebugFilterState(ComponentId, Level, State); +} + +/* + * @unimplemented + */ +NTSTATUS +STDCALL +DbgLoadImageSymbols(IN PUNICODE_STRING Name, + IN ULONG Base, + IN ULONG Unknown3) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} +/* EOF */

1 0

[ion] 18078: - More sharing between ntdll/ntoskrnl: shared Dbg code.
by ion＠svn.reactos.com 26 Sep '05

26 Sep '05

- More sharing between ntdll/ntoskrnl: shared Dbg code. - Added NtCreateDebugObject, NtDebugContinue, NtQueryDebugFilterState, NtSetDebugFilterState, NtWaitForDebugEvent to system call list. - Added some debug constants to headers - Updated RtlpCheckForActiveDebugger in ntoskrnl to return whatever we're expecting as the "normal" case. - Added RtlpSetInDbgPrint to rtl support library for special DbgPrint implementation difference in user-mode - Removed all the deprecated debug APIs in ntdll. - Implemented NtQueryDebugFilterState and NtSetDebugFilterState based on royce's implementation. - Started modifications on KeDebugService, and implemented DebugService in rtl - Implemented all the Dbg* APIs in RTL. - Implemented DbgUiConnectToDbg, DbgUiContinue, DbgUiWaitStateChange, DbgUiRemoteBreakin, DbgUiIssueRemoteBreakin - Changed KD Print callbacks to also receive the length of the string. Right now, one call that should be shared still isn't (the final DebugPrint call) because calling KeDebugService from kernel-mode seems to cause a hang. Also, DebugService does not currently cause an exception like it should (instead it still calls the Kdp handler), because those changes would've made the patch even bigger and are still untested. Deleted: trunk/reactos/lib/ntdll/dbg/debug.c Deleted: trunk/reactos/lib/ntdll/dbg/print.c Modified: trunk/reactos/lib/ntdll/def/ntdll.def Modified: trunk/reactos/lib/ntdll/ntdll.xml Modified: trunk/reactos/lib/ntdll/rtl/libsupp.c Modified: trunk/reactos/lib/rtl/exception.c Modified: trunk/reactos/lib/rtl/i386/debug.S Modified: trunk/reactos/lib/rtl/rtl.xml Modified: trunk/reactos/lib/rtl/rtlp.h Modified: trunk/reactos/ntoskrnl/include/internal/kd.h Modified: trunk/reactos/ntoskrnl/kd/kdio.c Modified: trunk/reactos/ntoskrnl/kd/kdmain.c Modified: trunk/reactos/ntoskrnl/kd/wrappers/bochs.c Modified: trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S Modified: trunk/reactos/ntoskrnl/ntoskrnl.xml Modified: trunk/reactos/ntoskrnl/rtl/debug.c Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c Modified: trunk/reactos/ntoskrnl/rtl/misc.c Modified: trunk/reactos/tools/nci/sysfuncs.lst Modified: trunk/reactos/w32api/include/ddk/winddk.h Modified: trunk/reactos/w32api/include/ntstatus.h _____ Deleted: trunk/reactos/lib/ntdll/dbg/debug.c --- trunk/reactos/lib/ntdll/dbg/debug.c 2005-09-26 03:18:53 UTC (rev 18077) +++ trunk/reactos/lib/ntdll/dbg/debug.c 2005-09-26 04:59:48 UTC (rev 18078) @@ -1,222 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: lib/ntdll/dbg/debug.c - * PURPOSE: User mode debugger support functions - * PROGRAMMER: Eric Kohl - * UPDATE HISTORY: - * 14/04/2000 Created - */ - -/* INCLUDES *****************************************************************/ - -#include <ntdll.h> -#define NDEBUG -#include <debug.h> - -/* FUNCTIONS *****************************************************************/ - -static HANDLE DbgSsApiPort = NULL; -static HANDLE DbgSsReplyPort = NULL; -static NTSTATUS (STDCALL * DbgSsCallback)(PVOID,PVOID) = NULL; - - -typedef struct _LPC_DBGSS_MESSAGE -{ - PORT_MESSAGE Header; - ULONG Unknown1; - ULONG Unknown2; - ULONG Unknown3; - ULONG Unknown4; -} LPC_DBGSS_MESSAGE, *PLPC_DBGSS_MESSAGE; - - -/* FUNCTIONS *****************************************************************/ - -VOID STDCALL -DbgSsServerThread(PVOID Unused) -{ - LPC_DBGSS_MESSAGE Message; - NTSTATUS Status; - - for (;;) - { - Status = NtReplyWaitReceivePort (DbgSsApiPort, - NULL, - NULL, - (PPORT_MESSAGE)&Message); - if (!NT_SUCCESS(Status)) - { - DbgPrint ("DbgSs: NtReplyWaitReceivePort failed - Status == %lx\n", - Status); - - DbgBreakPoint (); - } - else - { - /* FIXME: missing code!! */ - - } - } -} - - -/* - * @unimplemented - */ -NTSTATUS STDCALL -DbgSsHandleKmApiMsg(ULONG Unknown1, - HANDLE EventHandle) -{ - return STATUS_NOT_IMPLEMENTED; -} - - -/* - * @implemented - */ -NTSTATUS STDCALL -DbgSsInitialize(HANDLE ReplyPort, - PVOID Callback, - ULONG Unknown2, - ULONG Unknown3) -{ - SECURITY_QUALITY_OF_SERVICE Qos; - UNICODE_STRING PortName = RTL_CONSTANT_STRING(L"\\DbgSsApiPort"); - NTSTATUS Status; - - Qos.Length = sizeof(SECURITY_QUALITY_OF_SERVICE); - Qos.ImpersonationLevel = SecurityIdentification; - Qos.ContextTrackingMode = SECURITY_DYNAMIC_TRACKING; - Qos.EffectiveOnly = TRUE; - - Status = NtConnectPort (&DbgSsApiPort, - &PortName, - &Qos, - NULL, - NULL, - NULL, - NULL, - NULL); - if (!NT_SUCCESS(Status)) - return Status; - - DbgSsReplyPort = ReplyPort; - DbgSsCallback = Callback; -// UnknownData2 = Unknown2; -// UnknownData3 = Unknown3; - - Status = RtlCreateUserThread (NtCurrentProcess (), - NULL, - FALSE, - 0, - 0, - 0, - (PTHREAD_START_ROUTINE)DbgSsServerThread, - NULL, - NULL, - NULL); - - return Status; -} - - -/* - * @implemented - */ -NTSTATUS STDCALL -DbgUiConnectToDbg(VOID) -{ - SECURITY_QUALITY_OF_SERVICE Qos; - UNICODE_STRING PortName = RTL_CONSTANT_STRING(L"\\DbgUiApiPort"); - NTSTATUS Status; - PTEB Teb; - ULONG InfoSize; - - Teb = NtCurrentTeb (); - - Qos.Length = sizeof(SECURITY_QUALITY_OF_SERVICE); - Qos.ImpersonationLevel = SecurityIdentification; - Qos.ContextTrackingMode = SECURITY_DYNAMIC_TRACKING; - Qos.EffectiveOnly = TRUE; - - InfoSize = sizeof(ULONG); - - Status = NtConnectPort (&Teb->DbgSsReserved[1], - &PortName, - &Qos, - NULL, - NULL, - NULL, - &Teb->DbgSsReserved[0], - &InfoSize); - if (!NT_SUCCESS(Status)) - { - Teb->DbgSsReserved[1] = NULL; - return Status; - } - - NtRegisterThreadTerminatePort(Teb->DbgSsReserved[1]); - - return Status; -} - - -/* - * @unimplemented - */ -NTSTATUS STDCALL -DbgUiContinue(PCLIENT_ID ClientId, - ULONG ContinueStatus) -{ - return STATUS_NOT_IMPLEMENTED; -} - - -/* - * @unimplemented - */ -NTSTATUS STDCALL -DbgUiWaitStateChange(PDBGUI_WAIT_STATE_CHANGE DbgUiWaitStateCange, - PLARGE_INTEGER TimeOut) -{ - return STATUS_NOT_IMPLEMENTED; -} - -VOID STDCALL DbgUiRemoteBreakin(VOID) -{ - DbgBreakPoint(); - - RtlExitUserThread(STATUS_SUCCESS); -} - -NTSTATUS STDCALL DbgUiIssueRemoteBreakin(HANDLE Process) -{ - HANDLE hThread; - CLIENT_ID cidClientId; - NTSTATUS nErrCode; - ULONG nStackSize = PAGE_SIZE; - - nErrCode = RtlCreateUserThread - ( - Process, - NULL, - FALSE, - 0, - nStackSize, - nStackSize, - (PTHREAD_START_ROUTINE)DbgUiRemoteBreakin, - NULL, - &hThread, - &cidClientId - ); - - if(!NT_SUCCESS(nErrCode)) return nErrCode; - - NtClose(hThread); - - return STATUS_SUCCESS; -} - -/* EOF */ _____ Deleted: trunk/reactos/lib/ntdll/dbg/print.c --- trunk/reactos/lib/ntdll/dbg/print.c 2005-09-26 03:18:53 UTC (rev 18077) +++ trunk/reactos/lib/ntdll/dbg/print.c 2005-09-26 04:59:48 UTC (rev 18078) @@ -1,106 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: lib/ntdll/dbg/print.c - * PURPOSE: Debug output - * PROGRAMMER: Eric Kohl - * UPDATE HISTORY: - * Created 28/12/1999 - */ - -#include <ntdll.h> -#define NDEBUG -#include <debug.h> - -/* FUNCTIONS ***************************************************************/ - -ULONG DbgService (ULONG Service, PVOID Context1, PVOID Context2); -__asm__ ("\n\t.global _DbgService\n\t" - "_DbgService:\n\t" - "mov 4(%esp), %eax\n\t" - "mov 8(%esp), %ecx\n\t" - "mov 12(%esp), %edx\n\t" - "int $0x2D\n\t" - "ret\n\t"); - -/* - * @unimplemented - */ -ULONG -DbgPrintEx( - IN ULONG ComponentId, - IN ULONG Level, - IN PCH Format, - ... - ) -{ - ANSI_STRING DebugString; - CHAR Buffer[4096]; - va_list ap; - - /* init ansi string */ - DebugString.Buffer = Buffer; - DebugString.MaximumLength = sizeof(Buffer); - - va_start (ap, Format); - DebugString.Length = _vsnprintf (Buffer, sizeof(Buffer), Format, ap); - va_end (ap); - - DbgService (1, &DebugString, NULL); - - return (ULONG)DebugString.Length; -} - - -/* - * @implemented - */ -ULONG -DbgPrint(PCH Format, ...) -{ - ANSI_STRING DebugString; - CHAR Buffer[4096]; - va_list ap; - - /* init ansi string */ - DebugString.Buffer = Buffer; - DebugString.MaximumLength = sizeof(Buffer); - - va_start (ap, Format); - DebugString.Length = _vsnprintf (Buffer, sizeof(Buffer), Format, ap); - va_end (ap); - - - return DbgPrintEx (0, 0, DebugString.Buffer); -} - - -/* - * @implemented - */ -VOID -STDCALL -DbgPrompt ( - PCH OutputString, - PCH InputString, - USHORT InputSize - ) -{ - ANSI_STRING Output; - ANSI_STRING Input; - - Input.Length = 0; - Input.MaximumLength = InputSize; - Input.Buffer = InputString; - - Output.Length = strlen (OutputString); - Output.MaximumLength = Output.Length + 1; - Output.Buffer = OutputString; - - DbgService (2, - &Output, - &Input); -} - -/* EOF */ _____ Modified: trunk/reactos/lib/ntdll/def/ntdll.def --- trunk/reactos/lib/ntdll/def/ntdll.def 2005-09-26 03:18:53 UTC (rev 18077) +++ trunk/reactos/lib/ntdll/def/ntdll.def 2005-09-26 04:59:48 UTC (rev 18078) @@ -24,8 +24,6 @@ DbgPrint DbgPrintEx DbgPrompt@12 -DbgSsHandleKmApiMsg@8 -DbgSsInitialize@16 DbgUiConnectToDbg@0 DbgUiContinue@8 DbgUiIssueRemoteBreakin@4 @@ -161,6 +159,7 @@ NtProtectVirtualMemory@20 NtPulseEvent@8 NtQueryAttributesFile@8 +NtQueryDebugFilterState@8 NtQueryDefaultLocale@8 NtQueryDefaultUILanguage@4 NtQueryDirectoryFile@44 @@ -218,6 +217,7 @@ NtResumeThread@8 NtSaveKey@8 NtSecureConnectPort@36 +NtSetDebugFilterState@12 NtSetContextThread@8 NtSetDefaultHardErrorPort@4 NtSetDefaultLocale@8 @@ -265,6 +265,7 @@ NtUnlockVirtualMemory@16 NtUnmapViewOfSection@8 NtVdmControl@8 +NtWaitForDebugEvent@16 NtWaitForMultipleObjects@20 NtWaitForSingleObject@12 NtWaitHighEventPair@4 @@ -716,6 +717,7 @@ ZwCompleteConnectPort@4 ZwConnectPort@32 ZwContinue@8 +ZwCreateDebugObject@16 ZwCreateDirectoryObject@12 ZwCreateEvent@20 ZwCreateEventPair@12 @@ -735,6 +737,7 @@ ZwCreateThread@32 ZwCreateTimer@16 ZwCreateToken@52 +ZwDebugContinue@12 ZwDelayExecution@8 ZwDeleteAtom@4 ZwDeleteFile@4 _____ Modified: trunk/reactos/lib/ntdll/ntdll.xml --- trunk/reactos/lib/ntdll/ntdll.xml 2005-09-26 03:18:53 UTC (rev 18077) +++ trunk/reactos/lib/ntdll/ntdll.xml 2005-09-26 04:59:48 UTC (rev 18078) @@ -20,8 +20,7 @@ <file>connect.c</file> </directory> <directory name="dbg"> - <file>debug.c</file> - <file>print.c</file> + <file>dbgui.c</file> </directory> <directory name="ldr"> <file>res.c</file> _____ Modified: trunk/reactos/lib/ntdll/rtl/libsupp.c --- trunk/reactos/lib/ntdll/rtl/libsupp.c 2005-09-26 03:18:53 UTC (rev 18077) +++ trunk/reactos/lib/ntdll/rtl/libsupp.c 2005-09-26 04:59:48 UTC (rev 18078) @@ -17,11 +17,30 @@ BOOLEAN NTAPI -RtlpCheckForActiveDebugger(VOID) +RtlpCheckForActiveDebugger(BOOLEAN Type) { return (NtCurrentPeb()->BeingDebugged); } +BOOLEAN +NTAPI +RtlpSetInDbgPrint(IN BOOLEAN NewValue) +{ + /* If we're setting it to false, do it and return */ + if (NewValue == FALSE) + { + NtCurrentTeb()->InDbgPrint = FALSE; + return FALSE; + } + + /* Setting to true; check if it's not already */ + if (NtCurrentTeb()->InDbgPrint) return TRUE; + + /* Set it and return */ + NtCurrentTeb()->InDbgPrint = TRUE; + return FALSE; +} + KPROCESSOR_MODE STDCALL RtlpGetMode() _____ Modified: trunk/reactos/lib/rtl/exception.c --- trunk/reactos/lib/rtl/exception.c 2005-09-26 03:18:53 UTC (rev 18077) +++ trunk/reactos/lib/rtl/exception.c 2005-09-26 04:59:48 UTC (rev 18078) @@ -39,7 +39,7 @@ Context.ContextFlags = CONTEXT_FULL; /* Check if we're being debugged (user-mode only) */ - if (!RtlpCheckForActiveDebugger()) + if (!RtlpCheckForActiveDebugger(TRUE)) { /* Raise an exception immediately */ Status = ZwRaiseException(ExceptionRecord, &Context, TRUE); @@ -91,7 +91,7 @@ Context.ContextFlags = CONTEXT_FULL; /* Check if we're being debugged (user-mode only) */ - if (!RtlpCheckForActiveDebugger()) + if (!RtlpCheckForActiveDebugger(TRUE)) { /* Raise an exception immediately */ ZwRaiseException(&ExceptionRecord, &Context, TRUE); _____ Modified: trunk/reactos/lib/rtl/i386/debug.S --- trunk/reactos/lib/rtl/i386/debug.S 2005-09-26 03:18:53 UTC (rev 18077) +++ trunk/reactos/lib/rtl/i386/debug.S 2005-09-26 04:59:48 UTC (rev 18078) @@ -1,10 +1,9 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Run-Time Library + * PROJECT: ReactOS Run-Time Library + * PURPOSE: Debug Routines * FILE: lib/rtl/i386/debug.S * PROGRAMER: Alex Ionescu (alex(a)relsoft.net) - * REVISION HISTORY: 27/07/2005 Created */ .intel_syntax noprefix @@ -14,6 +13,7 @@ .globl _DbgBreakPoint@0 .globl _DbgBreakPointWithStatus@4 .globl _DbgUserBreakPoint@0 +.globl _DebugService@20 /* FUNCTIONS ***************************************************************/ @@ -26,3 +26,36 @@ mov eax, [esp+4] int 3 ret 4 + +_DebugService@20: + + /* Setup the stack */ + push ebp + mov ebp, esp + + /* Save the registers */ + push ecx + push ebx + push edi + push edi + push ebx + + /* Call the Interrupt */ + mov eax, [ebp+8] + mov ecx, [ebp+12] + mov edx, [ebp+16] + mov ebx, [ebp+20] + mov edi, [ebp+24] + int 0x2D + //int 3 + + /* Restore registers */ + pop ebx + pop edi + pop edi + pop ebx + + /* Return */ + leave + ret 20 + _____ Modified: trunk/reactos/lib/rtl/rtl.xml --- trunk/reactos/lib/rtl/rtl.xml 2005-09-26 03:18:53 UTC (rev 18077) +++ trunk/reactos/lib/rtl/rtl.xml 2005-09-26 04:59:48 UTC (rev 18078) @@ -24,6 +24,7 @@ <file>crc32.c</file> <file>critical.c</file> <file>dbgbuffer.c</file> + <file>debug.c</file> <file>dos8dot3.c</file> <file>encode.c</file> <file>env.c</file> _____ Modified: trunk/reactos/lib/rtl/rtlp.h --- trunk/reactos/lib/rtl/rtlp.h 2005-09-26 03:18:53 UTC (rev 18077) +++ trunk/reactos/lib/rtl/rtlp.h 2005-09-26 04:59:48 UTC (rev 18078) @@ -51,7 +51,7 @@ BOOLEAN NTAPI -RtlpCheckForActiveDebugger(VOID); +RtlpCheckForActiveDebugger(BOOLEAN Type); BOOLEAN NTAPI _____ Modified: trunk/reactos/ntoskrnl/include/internal/kd.h --- trunk/reactos/ntoskrnl/include/internal/kd.h 2005-09-26 03:18:53 UTC (rev 18077) +++ trunk/reactos/ntoskrnl/include/internal/kd.h 2005-09-26 04:59:48 UTC (rev 18078) @@ -107,7 +107,10 @@ typedef VOID -(STDCALL*PKDP_PRINT_ROUTINE)(PCH String); +(STDCALL*PKDP_PRINT_ROUTINE)( + LPSTR String, + ULONG Length +); typedef VOID @@ -172,7 +175,9 @@ ULONG STDCALL -KdpPrintString(PANSI_STRING String); +KdpPrintString( + LPSTR String, + ULONG Length); BOOLEAN STDCALL @@ -180,7 +185,10 @@ VOID STDCALL -KdpBochsDebugPrint(IN PCH Message); +KdpBochsDebugPrint( + IN PCH Message, + IN ULONG Length +); /* KD GLOBALS ***************************************************************/ _____ Modified: trunk/reactos/ntoskrnl/kd/kdio.c --- trunk/reactos/ntoskrnl/kd/kdio.c 2005-09-26 03:18:53 UTC (rev 18077) +++ trunk/reactos/ntoskrnl/kd/kdio.c 2005-09-26 04:59:48 UTC (rev 18078) @@ -55,10 +55,9 @@ VOID STDCALL -KdpPrintToLog(PCH String) +KdpPrintToLog(PCH String, + ULONG StringLength) { - ULONG StringLength = strlen(String); - /* Don't overflow */ if ((CurrentPosition + StringLength) > BufferSize) return; @@ -142,7 +141,8 @@ VOID STDCALL -KdpSerialDebugPrint(LPSTR Message) +KdpSerialDebugPrint(LPSTR Message, + ULONG Length) { PCHAR pch = (PCHAR) Message; @@ -186,6 +186,15 @@ VOID STDCALL +KdpScreenPrint(LPSTR Message, + ULONG Length) +{ + /* Call HAL */ + HalDisplayString(Message); +} + +VOID +STDCALL KdpScreenInit(PKD_DISPATCH_TABLE DispatchTable, ULONG BootPhase) { @@ -195,7 +204,7 @@ { /* Write out the functions that we support for now */ DispatchTable->KdpInitRoutine = KdpScreenInit; - DispatchTable->KdpPrintRoutine = HalDisplayString; + DispatchTable->KdpPrintRoutine = KdpScreenPrint; /* Register as a Provider */ InsertTailList(&KdProviders, &DispatchTable->KdProvidersList); @@ -247,10 +256,10 @@ ULONG STDCALL -KdpPrintString(PANSI_STRING String) +KdpPrintString(LPSTR String, + ULONG Length) { if (!KdpDebugMode.Value) return 0; - PCH pch = String->Buffer; PLIST_ENTRY CurrentEntry; PKD_DISPATCH_TABLE CurrentTable; @@ -264,17 +273,17 @@ KdProvidersList); /* Call it */ - CurrentTable->KdpPrintRoutine(pch); + CurrentTable->KdpPrintRoutine(String, Length); /* Next Table */ CurrentEntry = CurrentEntry->Flink; } /* Call the Wrapper Routine */ - if (WrapperInitRoutine) WrapperTable.KdpPrintRoutine(pch); + if (WrapperInitRoutine) WrapperTable.KdpPrintRoutine(String, Length); /* Return the Length */ - return((ULONG)String->Length); + return Length; } /* EOF */ _____ Modified: trunk/reactos/ntoskrnl/kd/kdmain.c --- trunk/reactos/ntoskrnl/kd/kdmain.c 2005-09-26 03:18:53 UTC (rev 18077) +++ trunk/reactos/ntoskrnl/kd/kdmain.c 2005-09-26 04:59:48 UTC (rev 18078) @@ -21,26 +21,35 @@ BOOLEAN KdpBreakPending; VOID STDCALL PspDumpThreads(BOOLEAN SystemThreads); +typedef struct +{ + ULONG ComponentId; + ULONG Level; +} KD_COMPONENT_DATA; +#define MAX_KD_COMPONENT_TABLE_ENTRIES 128 +KD_COMPONENT_DATA KdComponentTable[MAX_KD_COMPONENT_TABLE_ENTRIES]; +ULONG KdComponentTableEntries = 0; + /* PRIVATE FUNCTIONS *********************************************************/ ULONG STDCALL KdpServiceDispatcher(ULONG Service, - PVOID Context1, - PVOID Context2) + PVOID Buffer1, + ULONG Buffer1Length) { ULONG Result = 0; switch (Service) { - case 1: /* DbgPrint */ - Result = KdpPrintString ((PANSI_STRING)Context1); + case BREAKPOINT_PRINT: /* DbgPrint */ + Result = KdpPrintString(Buffer1, Buffer1Length); break; #ifdef DBG case TAG('R', 'o', 's', ' '): /* ROS-INTERNAL */ { - switch ((ULONG)Context1) + switch ((ULONG)Buffer1) { case DumpNonPagedPool: MiDebugDumpNonPagedPool(FALSE); @@ -203,4 +212,54 @@ return STATUS_NOT_IMPLEMENTED; } +NTSTATUS +STDCALL +NtQueryDebugFilterState(IN ULONG ComponentId, + IN ULONG Level) +{ + int i; + + /* convert Level to mask if it isn't already one */ + if ( Level < 32 ) + Level = 1 << Level; + + for ( i = 0; i < KdComponentTableEntries; i++ ) + { + if ( ComponentId == KdComponentTable[i].ComponentId ) + { + if ( Level & KdComponentTable[i].Level ) + return TRUE; + break; + } + } + return FALSE; +} + +NTSTATUS +STDCALL +NtSetDebugFilterState(IN ULONG ComponentId, + IN ULONG Level, + IN BOOLEAN State) +{ + int i; + for ( i = 0; i < KdComponentTableEntries; i++ ) + { + if ( ComponentId == KdComponentTable[i].ComponentId ) + break; + } + if ( i == KdComponentTableEntries ) + { + if ( i == MAX_KD_COMPONENT_TABLE_ENTRIES ) + return STATUS_INVALID_PARAMETER_1; + ++KdComponentTableEntries; + KdComponentTable[i].ComponentId = ComponentId; + KdComponentTable[i].Level = 0; + } + if ( State ) + KdComponentTable[i].Level |= Level; + else + KdComponentTable[i].Level &= ~Level; + return STATUS_SUCCESS; +} + /* EOF */ _____ Modified: trunk/reactos/ntoskrnl/kd/wrappers/bochs.c --- trunk/reactos/ntoskrnl/kd/wrappers/bochs.c 2005-09-26 03:18:53 UTC (rev 18077) +++ trunk/reactos/ntoskrnl/kd/wrappers/bochs.c 2005-09-26 04:59:48 UTC (rev 18078) @@ -18,7 +18,8 @@ VOID STDCALL -KdpBochsDebugPrint(IN PCH Message) +KdpBochsDebugPrint(IN PCH Message, + IN ULONG Length) { while (*Message != 0) { @@ -41,8 +42,6 @@ } } - - VOID STDCALL KdpBochsInit(PKD_DISPATCH_TABLE WrapperTable, _____ Modified: trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c --- trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c 2005-09-26 03:18:53 UTC (rev 18077) +++ trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c 2005-09-26 04:59:48 UTC (rev 18078) @@ -1446,7 +1446,7 @@ VOID STDCALL -KdpGdbDebugPrint(PCH Message) +KdpGdbDebugPrint(PCH Message, ULONG Length) { #if 0 /* This can be quite annoying! */ _____ Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S --- trunk/reactos/ntoskrnl/ke/i386/syscall.S 2005-09-26 03:18:53 UTC (rev 18077) +++ trunk/reactos/ntoskrnl/ke/i386/syscall.S 2005-09-26 04:59:48 UTC (rev 18078) @@ -839,12 +839,49 @@ mov [ebp+KTRAP_FRAME_DEBUGEBP], ebx mov [ebp+KTRAP_FRAME_DEBUGEIP], edi + /* Increase EIP so we skip the INT3 */ + //inc dword ptr [ebp+KTRAP_FRAME_EIP] + /* Call debug service dispatcher */ - push [ebp+KTRAP_FRAME_EDX] - push [ebp+KTRAP_FRAME_ECX] - push [ebp+KTRAP_FRAME_EAX] + mov eax, [ebp+KTRAP_FRAME_EAX] + mov ecx, [ebp+KTRAP_FRAME_ECX] + mov edx, [ebp+KTRAP_FRAME_EAX] + + /* Check for V86 mode */ + test dword ptr [ebp+KTRAP_FRAME_EFLAGS], X86_EFLAGS_VM + jnz NotUserMode + + /* Check if this is kernel or user-mode */ + test byte ptr [ebp+KTRAP_FRAME_CS], 1 + jz CallDispatch + cmp word ptr [ebp+KTRAP_FRAME_CS], USER_CS + jnz NotUserMode + + /* Re-enable interrupts */ +VdmProc: + sti + + /* Call the debug routine */ +CallDispatch: + mov esi, ecx + mov edi, edx + mov edx, eax + mov ecx, 3 + push edi + push esi + push edx call _KdpServiceDispatcher@12 +NotUserMode: + + /* Get the current process */ + mov ebx, [fs:KPCR_CURRENT_THREAD] + mov ebx, [ebx+KTHREAD_APCSTATE_PROCESS] + + /* Check if this is a VDM Process */ + //cmp dword ptr [ebx+KPROCESS_VDM_OBJECTS], 0 + //jz VdmProc + /* Exit through common routine */ jmp Kei386EoiHelper@0 _____ Modified: trunk/reactos/ntoskrnl/ntoskrnl.xml --- trunk/reactos/ntoskrnl/ntoskrnl.xml 2005-09-26 03:18:53 UTC (rev 18077) +++ trunk/reactos/ntoskrnl/ntoskrnl.xml 2005-09-26 04:59:48 UTC (rev 18078) @@ -306,7 +306,6 @@ </directory> </if> <file>atom.c</file> - <file>debug.c</file> <file>libsupp.c</file> <file>misc.c</file> <file>nls.c</file> _____ Modified: trunk/reactos/ntoskrnl/rtl/debug.c --- trunk/reactos/ntoskrnl/rtl/debug.c 2005-09-26 03:18:53 UTC (rev 18077) +++ trunk/reactos/ntoskrnl/rtl/debug.c 2005-09-26 04:59:48 UTC (rev 18078) @@ -1,299 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/rtl/dbgprint.c - * PURPOSE: Debug output - * - * PROGRAMMERS: Eric Kohl (ekohl(a)abo.rhein-zeitung.de) - */ - -/* INCLUDES *****************************************************************/ - -#include <ntoskrnl.h> -#include <internal/debug.h> - -/* DATA *********************************************************************/ - -typedef struct -{ - ULONG ComponentId; - ULONG Level; -} KD_COMPONENT_DATA; -#define MAX_KD_COMPONENT_TABLE_ENTRIES 128 -KD_COMPONENT_DATA KdComponentTable[MAX_KD_COMPONENT_TABLE_ENTRIES]; -ULONG KdComponentTableEntries = 0; - -/* FUNCTIONS ****************************************************************/ - -/* - * Note: DON'T CHANGE THIS FUNCTION!!! - * DON'T CALL HalDisplayString OR SOMETING ELSE!!! - * You'll only break the serial/bochs debugging feature!!! - */ - -/* - * @implemented - */ -ULONG STDCALL -vDbgPrintExWithPrefix(IN LPCSTR Prefix, - IN ULONG ComponentId, - IN ULONG Level, - IN LPCSTR Format, - IN va_list ap) -{ - ANSI_STRING DebugString; - CHAR Buffer[513]; - PCHAR pBuffer; - ULONG pBufferSize; -#ifdef SERIALIZE_DBGPRINT -# define MESSAGETABLE_SIZE 16 - LONG MyTableIndex; - static LONG Lock = 0; - static LONG TableWriteIndex = 0, TableReadIndex = 0; - static CHAR MessageTable[MESSAGETABLE_SIZE][sizeof(Buffer)] = { { '\0' } }; -#endif /* SERIALIZE_DBGPRINT */ - - /* TODO FIXME - call NtQueryDebugFilterState() instead per Alex */ - if ( !DbgQueryDebugFilterState ( ComponentId, Level ) ) - return 0; - - /* init ansi string */ - DebugString.Buffer = Buffer; - DebugString.MaximumLength = sizeof(Buffer); - - pBuffer = Buffer; - pBufferSize = sizeof(Buffer); - DebugString.Length = 0; - if ( Prefix && *Prefix ) - { - DebugString.Length = strlen(Prefix); - if ( DebugString.Length >= sizeof(Buffer) ) - DebugString.Length = sizeof(Buffer) - 1; - memmove ( Buffer, Prefix, DebugString.Length ); - Buffer[DebugString.Length] = '\0'; - pBuffer = &Buffer[DebugString.Length]; - pBufferSize -= DebugString.Length; - } - - DebugString.Length += _vsnprintf ( pBuffer, pBufferSize, Format, ap ); - Buffer[sizeof(Buffer)-1] = '\0'; - -#ifdef SERIALIZE_DBGPRINT - /* check if we are already running */ - if (InterlockedCompareExchange(&Lock, 1, 0) == 1) - { - MyTableIndex = InterlockedIncrement(&TableWriteIndex) - 1; - InterlockedCompareExchange(&TableWriteIndex, 0, MESSAGETABLE_SIZE); - MyTableIndex %= MESSAGETABLE_SIZE; - - if (MessageTable[MyTableIndex][0] != '\0') /* table is full */ - { - DebugString.Buffer = "CRITICAL ERROR: DbgPrint Table is FULL!"; - DebugString.Length = 39; - KdpPrintString(&DebugString); - for (;;); - } - else - { - memcpy(MessageTable[MyTableIndex], DebugString.Buffer, DebugString.Length); - MessageTable[MyTableIndex][DebugString.Length] = '\0'; - } - } - else - { -#endif /* SERIALIZE_DBGPRINT */ - KdpPrintString (&DebugString); -#ifdef SERIALIZE_DBGPRINT - MyTableIndex = TableReadIndex; - while (MessageTable[MyTableIndex][0] != '\0') - { - /*DebugString.Buffer = "$$$"; - DebugString.Length = 3; - KdpPrintString(&DebugString);*/ - - DebugString.Buffer = MessageTable[MyTableIndex]; - DebugString.Length = strlen(DebugString.Buffer); [truncated at 1000 lines; 306 more skipped]

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