Ros-diffs September 2005

ros-diffs@reactos.org

22 participants
582 discussions

[ion] 18081: - Put executive atom functions in the executive folder, not rtl.

by ion＠svn.reactos.com

- 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 */

18 years, 11 months

[ion] 18080: - Remove some deprecated files.

by ion＠svn.reactos.com

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

18 years, 11 months

[ion] 18079: Forgot to svn add these two files.

by ion＠svn.reactos.com

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 */

18 years, 11 months

[ion] 18078: - More sharing between ntdll/ntoskrnl: shared Dbg code.

by ion＠svn.reactos.com

- 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]

18 years, 11 months

[npwoods] 18077: 1. More merging from WINE regedit; imported refresh feature (which is wayyy slower than Windows regedit; need to optimize this)

by npwoods＠svn.reactos.com

1. More merging from WINE regedit; imported refresh feature (which is wayyy slower than Windows regedit; need to optimize this) 2. Using GetVersion() to determine whether to add HKEY_DYN_DATA Modified: trunk/reactos/subsys/system/regedit/framewnd.c Modified: trunk/reactos/subsys/system/regedit/main.h Modified: trunk/reactos/subsys/system/regedit/treeview.c _____ Modified: trunk/reactos/subsys/system/regedit/framewnd.c --- trunk/reactos/subsys/system/regedit/framewnd.c 2005-09-25 22:16:05 UTC (rev 18076) +++ trunk/reactos/subsys/system/regedit/framewnd.c 2005-09-26 03:18:53 UTC (rev 18077) @@ -77,7 +77,7 @@ /* Update the status bar pane sizes */ nParts = -1; - SendMessage(hStatusBar, SB_SETPARTS, 1, (long)&nParts); + SendMessage(hStatusBar, SB_SETPARTS, 1, (LPARAM)&nParts); bInMenuLoop = TRUE; SendMessage(hStatusBar, SB_SETTEXT, (WPARAM)0, (LPARAM)_T("")); } @@ -454,18 +454,6 @@ return result; } -BOOL RefreshView(HWND hWnd) -{ - /* TODO:*/ - MessageBeep(-1); - MessageBeep(MB_ICONASTERISK); - MessageBeep(MB_ICONEXCLAMATION); - MessageBeep(MB_ICONHAND); - MessageBeep(MB_ICONQUESTION); - MessageBeep(MB_OK); - return TRUE; -} - static BOOL CreateNewValue(HKEY hRootKey, LPCTSTR pszKeyPath, DWORD dwType) { TCHAR szNewValueFormat[128]; @@ -689,7 +677,8 @@ break; case ID_VIEW_REFRESH: - RefreshView(hWnd); + RefreshTreeView(g_pChildWnd->hTreeWnd); + /*RefreshListView(g_pChildWnd->hListWnd, hKeyRoot, keyPath, NULL); */ break; /*case ID_OPTIONS_TOOLBAR:*/ /* toggle_child(hWnd, LOWORD(wParam), hToolBar);*/ _____ Modified: trunk/reactos/subsys/system/regedit/main.h --- trunk/reactos/subsys/system/regedit/main.h 2005-09-25 22:16:05 UTC (rev 18076) +++ trunk/reactos/subsys/system/regedit/main.h 2005-09-26 03:18:53 UTC (rev 18077) @@ -37,6 +37,8 @@ #define PM_NEW 1 #define PM_TREECONTEXT 2 +#define MAX_NEW_KEY_LEN 128 + extern HINSTANCE hInst; /*********************************************************************** *******/ @@ -97,8 +99,11 @@ /* treeview.c */ extern HWND CreateTreeView(HWND hwndParent, LPTSTR pHostName, int id); +extern BOOL RefreshTreeView(HWND hWndTV); extern BOOL OnTreeExpanding(HWND hWnd, NMTREEVIEW* pnmtv); extern LPCTSTR GetItemPath(HWND hwndTV, HTREEITEM hItem, HKEY* phRootKey); +extern HTREEITEM InsertNode(HWND hwndTV, HTREEITEM hItem, LPTSTR name); +extern HWND StartKeyRename(HWND hwndTV); extern BOOL CreateNewKey(HWND hwndTV, HTREEITEM hItem); /* edit.c */ _____ Modified: trunk/reactos/subsys/system/regedit/treeview.c --- trunk/reactos/subsys/system/regedit/treeview.c 2005-09-25 22:16:05 UTC (rev 18076) +++ trunk/reactos/subsys/system/regedit/treeview.c 2005-09-26 03:18:53 UTC (rev 18077) @@ -103,25 +103,197 @@ return pathBuffer; } -static HTREEITEM AddEntryToTree(HWND hwndTV, HTREEITEM hParent, LPTSTR label, HKEY hKey, DWORD dwChildren, HTREEITEM insAfter ) +/* Add an entry to the tree. Only give hKey for root nodes (HKEY_ constants) */ +static HTREEITEM AddEntryToTree(HWND hwndTV, HTREEITEM hParent, LPTSTR label, HKEY hKey, DWORD dwChildren) { TVITEM tvi; TVINSERTSTRUCT tvins; + if (hKey) { + if (RegQueryInfoKey(hKey, 0, 0, 0, &dwChildren, 0, 0, 0, 0, 0, 0, 0) != ERROR_SUCCESS) { + dwChildren = 0; + } + } + tvi.mask = TVIF_TEXT | TVIF_IMAGE | TVIF_SELECTEDIMAGE | TVIF_CHILDREN | TVIF_PARAM; tvi.pszText = label; - tvi.cchTextMax = _tcslen(tvi.pszText); + tvi.cchTextMax = lstrlen(tvi.pszText); tvi.iImage = Image_Closed; tvi.iSelectedImage = Image_Open; tvi.cChildren = dwChildren; tvi.lParam = (LPARAM)hKey; tvins.u.item = tvi; - tvins.hInsertAfter = insAfter; + tvins.hInsertAfter = (HTREEITEM)(hKey ? TVI_LAST : TVI_SORT); tvins.hParent = hParent; return TreeView_InsertItem(hwndTV, &tvins); } +static BOOL RefreshTreeItem(HWND hwndTV, HTREEITEM hItem) +{ + HKEY hRoot, hKey, hSubKey; + HTREEITEM childItem; + LPCTSTR KeyPath; + DWORD dwCount, dwIndex, dwMaxSubKeyLen; + LPSTR Name; + TVITEM tvItem; + + KeyPath = GetItemPath(hwndTV, hItem, &hRoot); + if (*KeyPath) { + if (RegOpenKeyEx(hRoot, KeyPath, 0, KEY_READ, &hKey) != ERROR_SUCCESS) { + return FALSE; + } + } else { + hKey = hRoot; + } + + if (RegQueryInfoKey(hKey, 0, 0, 0, &dwCount, &dwMaxSubKeyLen, 0, 0, 0, 0, 0, 0) != ERROR_SUCCESS) { + return FALSE; + } + + /* Set the number of children again */ + tvItem.mask = TVIF_CHILDREN; + tvItem.hItem = hItem; + tvItem.cChildren = dwCount; + if (!TreeView_SetItem(hwndTV, &tvItem)) { + return FALSE; + } + + /* We don't have to bother with the rest if it's not expanded. */ + if (TreeView_GetItemState(hwndTV, hItem, TVIS_EXPANDED) == 0) { + RegCloseKey(hKey); + return TRUE; + } + + dwMaxSubKeyLen++; /* account for the \0 terminator */ + if (!(Name = HeapAlloc(GetProcessHeap(), 0, dwMaxSubKeyLen * sizeof(TCHAR)))) { + return FALSE; + } + tvItem.cchTextMax = dwMaxSubKeyLen; + if (!(tvItem.pszText = HeapAlloc(GetProcessHeap(), 0, dwMaxSubKeyLen * sizeof(TCHAR)))) { + return FALSE; + } + + /* Now go through all the children in the registry, and check if any have to be added. */ + for (dwIndex = 0; dwIndex < dwCount; dwIndex++) { + DWORD cName = dwMaxSubKeyLen, dwSubCount; + BOOL found; + + found = FALSE; + if (RegEnumKeyEx(hKey, dwIndex, Name, &cName, 0, 0, 0, NULL) != ERROR_SUCCESS) { + continue; + } + + /* Find the number of children of the node. */ + dwSubCount = 0; + if (RegOpenKeyEx(hKey, Name, 0, KEY_QUERY_VALUE, &hSubKey) == ERROR_SUCCESS) { + if (RegQueryInfoKey(hSubKey, 0, 0, 0, &dwSubCount, 0, 0, 0, 0, 0, 0, 0) != ERROR_SUCCESS) { + dwSubCount = 0; + } + RegCloseKey(hSubKey); + } + + /* Check if the node is already in there. */ + for (childItem = TreeView_GetChild(hwndTV, hItem); childItem; + childItem = TreeView_GetNextSibling(hwndTV, childItem)) { + tvItem.mask = TVIF_TEXT; + tvItem.hItem = childItem; + if (!TreeView_GetItem(hwndTV, &tvItem)) { + return FALSE; + } + + if (!strcmp(tvItem.pszText, Name)) { + found = TRUE; + break; + } + } + + if (found == FALSE) { + AddEntryToTree(hwndTV, hItem, Name, NULL, dwSubCount); + } + } + HeapFree(GetProcessHeap(), 0, Name); + HeapFree(GetProcessHeap(), 0, tvItem.pszText); + RegCloseKey(hKey); + + /* Now go through all the children in the tree, and check if any have to be removed. */ + childItem = TreeView_GetChild(hwndTV, hItem); + while (childItem) { + HTREEITEM nextItem = TreeView_GetNextSibling(hwndTV, childItem); + if (RefreshTreeItem(hwndTV, childItem) == FALSE) { + TreeView_DeleteItem(hwndTV, childItem); + } + childItem = nextItem; + } + + return TRUE; +} + +BOOL RefreshTreeView(HWND hwndTV) +{ + HTREEITEM hItem; + HTREEITEM hSelectedItem; + HCURSOR hcursorOld; + + hSelectedItem = TreeView_GetSelection(hwndTV); + hcursorOld = SetCursor(LoadCursor(NULL, IDC_WAIT)); + SendMessage(hwndTV, WM_SETREDRAW, FALSE, 0); + + hItem = TreeView_GetChild(hwndTV, TreeView_GetRoot(hwndTV)); + while (hItem) { + RefreshTreeItem(hwndTV, hItem); + hItem = TreeView_GetNextSibling(hwndTV, hItem); + } + + SendMessage(hwndTV, WM_SETREDRAW, TRUE, 0); + SetCursor(hcursorOld); + + /* We reselect the currently selected node, this will prompt a refresh of the listview. */ + TreeView_SelectItem(hwndTV, hSelectedItem); + return TRUE; +} + +HTREEITEM InsertNode(HWND hwndTV, HTREEITEM hItem, LPTSTR name) +{ + TCHAR buf[MAX_NEW_KEY_LEN]; + HTREEITEM hNewItem = 0; + TVITEMEX item; + + if (!hItem) hItem = TreeView_GetSelection(hwndTV); + if (!hItem) return FALSE; + if (TreeView_GetItemState(hwndTV, hItem, TVIS_EXPANDEDONCE)) { + hNewItem = AddEntryToTree(hwndTV, hItem, name, 0, 0); + } else { + item.mask = TVIF_CHILDREN | TVIF_HANDLE; + item.hItem = hItem; + if (!TreeView_GetItem(hwndTV, &item)) return FALSE; + item.cChildren = 1; + if (!TreeView_SetItem(hwndTV, &item)) return FALSE; + } + TreeView_Expand(hwndTV, hItem, TVE_EXPAND); + if (!hNewItem) { + for(hNewItem = TreeView_GetChild(hwndTV, hItem); hNewItem; hNewItem = TreeView_GetNextSibling(hwndTV, hNewItem)) { + item.mask = TVIF_HANDLE | TVIF_TEXT; + item.hItem = hNewItem; + item.pszText = buf; + item.cchTextMax = COUNT_OF(buf); + if (!TreeView_GetItem(hwndTV, &item)) continue; + if (lstrcmp(name, item.pszText) == 0) break; + } + } + if (hNewItem) TreeView_SelectItem(hwndTV, hNewItem); + + return hNewItem; +} + +HWND StartKeyRename(HWND hwndTV) +{ + HTREEITEM hItem; + + if(!(hItem = TreeView_GetSelection(hwndTV))) return 0; + return TreeView_EditLabel(hwndTV, hItem); +} + static BOOL InitTreeViewItems(HWND hwndTV, LPTSTR pHostName) { TVITEM tvi; @@ -131,7 +303,7 @@ tvi.mask = TVIF_TEXT | TVIF_IMAGE | TVIF_SELECTEDIMAGE | TVIF_CHILDREN | TVIF_PARAM; /* Set the text of the item. */ tvi.pszText = pHostName; - tvi.cchTextMax = _tcslen(tvi.pszText); + tvi.cchTextMax = lstrlen(tvi.pszText); /* Assume the item is not a parent item, so give it an image. */ tvi.iImage = Image_Root; tvi.iSelectedImage = Image_Root; @@ -144,12 +316,18 @@ /* Add the item to the tree view control. */ if (!(hRoot = TreeView_InsertItem(hwndTV, &tvins))) return FALSE; - if (!AddEntryToTree(hwndTV, hRoot, _T("HKEY_CLASSES_ROOT"), HKEY_CLASSES_ROOT, 1, TVI_LAST)) return FALSE; - if (!AddEntryToTree(hwndTV, hRoot, _T("HKEY_CURRENT_USER"), HKEY_CURRENT_USER, 1, TVI_LAST)) return FALSE; - if (!AddEntryToTree(hwndTV, hRoot, _T("HKEY_LOCAL_MACHINE"), HKEY_LOCAL_MACHINE, 1, TVI_LAST)) return FALSE; - if (!AddEntryToTree(hwndTV, hRoot, _T("HKEY_USERS"), HKEY_USERS, 1, TVI_LAST)) return FALSE; - if (!AddEntryToTree(hwndTV, hRoot, _T("HKEY_CURRENT_CONFIG"), HKEY_CURRENT_CONFIG, 1, TVI_LAST)) return FALSE; + if (!AddEntryToTree(hwndTV, hRoot, _T("HKEY_CLASSES_ROOT"), HKEY_CLASSES_ROOT, 1)) return FALSE; + if (!AddEntryToTree(hwndTV, hRoot, _T("HKEY_CURRENT_USER"), HKEY_CURRENT_USER, 1)) return FALSE; + if (!AddEntryToTree(hwndTV, hRoot, _T("HKEY_LOCAL_MACHINE"), HKEY_LOCAL_MACHINE, 1)) return FALSE; + if (!AddEntryToTree(hwndTV, hRoot, _T("HKEY_USERS"), HKEY_USERS, 1)) return FALSE; + if (!AddEntryToTree(hwndTV, hRoot, _T("HKEY_CURRENT_CONFIG"), HKEY_CURRENT_CONFIG, 1)) return FALSE; + if (GetVersion() & 0x80000000) + { + /* Win9x specific key */ + if (!AddEntryToTree(hwndTV, hRoot, _T("HKEY_DYN_DATA"), HKEY_DYN_DATA, 1)) return FALSE; + } + /* expand and select host name */ TreeView_Expand(hwndTV, hRoot, TVE_EXPAND); TreeView_Select(hwndTV, hRoot, TVGN_CARET); @@ -230,19 +408,17 @@ if (!Name) goto done; for (dwIndex = 0; dwIndex < dwCount; dwIndex++) { - DWORD cName = dwMaxSubKeyLen, dwSubCount; - FILETIME LastWriteTime; + DWORD cName = dwMaxSubKeyLen, dwSubCount; - errCode = RegEnumKeyEx(hNewKey, dwIndex, Name, &cName, 0, 0, 0, &LastWriteTime); - if (errCode != ERROR_SUCCESS) continue; - errCode = RegOpenKeyEx(hNewKey, Name, 0, KEY_QUERY_VALUE, &hKey); - if (errCode == ERROR_SUCCESS) { - errCode = RegQueryInfoKey(hKey, 0, 0, 0, &dwSubCount, 0, 0, 0, 0, 0, 0, 0); - RegCloseKey(hKey); - } - if (errCode != ERROR_SUCCESS) dwSubCount = 0; - /*printf("dwSubCount=%ld, Name=%s\n", dwSubCount, Name);*/ - AddEntryToTree(hwndTV, pnmtv->itemNew.hItem, Name, NULL, dwSubCount, TVI_FIRST); + errCode = RegEnumKeyEx(hNewKey, dwIndex, Name, &cName, 0, 0, 0, 0); + if (errCode != ERROR_SUCCESS) continue; + errCode = RegOpenKeyEx(hNewKey, Name, 0, KEY_QUERY_VALUE, &hKey); + if (errCode == ERROR_SUCCESS) { + errCode = RegQueryInfoKey(hKey, 0, 0, 0, &dwSubCount, 0, 0, 0, 0, 0, 0, 0); + RegCloseKey(hKey); + } + if (errCode != ERROR_SUCCESS) dwSubCount = 0; + AddEntryToTree(hwndTV, pnmtv->itemNew.hItem, Name, NULL, dwSubCount); } SendMessage(hwndTV, TVM_SORTCHILDREN, 0, (LPARAM)pnmtv->itemNew.hItem); @@ -292,7 +468,7 @@ } while(!hNewKey); - hNewItem = AddEntryToTree(hwndTV, hItem, szNewKey, NULL, 0, NULL); + hNewItem = AddEntryToTree(hwndTV, hItem, szNewKey, NULL, 0); if (!hNewItem) goto done; TreeView_EditLabel(hwndTV, hNewItem);

18 years, 11 months

[greatlrd] 18076: remove dead code

by greatlrd＠svn.reactos.com

remove dead code Modified: trunk/reactos/lib/kernel32/file/move.c _____ Modified: trunk/reactos/lib/kernel32/file/move.c --- trunk/reactos/lib/kernel32/file/move.c 2005-09-25 22:05:39 UTC (rev 18075) +++ trunk/reactos/lib/kernel32/file/move.c 2005-09-25 22:16:05 UTC (rev 18076) @@ -693,55 +693,6 @@ } } -#if 1 - /* FIXME file rename not yet implemented in all FSDs so it will always - * fail, even when the move is to the same device - */ - //else if (STATUS_NOT_IMPLEMENTED == errCode) - { - - UNICODE_STRING SrcPathU; - - SrcPathU.Buffer = alloca(sizeof(WCHAR) * MAX_PATH); - SrcPathU.MaximumLength = MAX_PATH * sizeof(WCHAR); - SrcPathU.Length = GetFullPathNameW(lpExistingFileName, MAX_PATH, SrcPathU.Buffer, NULL); - if (SrcPathU.Length >= MAX_PATH) - { - SetLastError(ERROR_FILENAME_EXCED_RANGE); - return FALSE; - } - SrcPathU.Length *= sizeof(WCHAR); - - DstPathU.Buffer = alloca(sizeof(WCHAR) * MAX_PATH); - DstPathU.MaximumLength = MAX_PATH * sizeof(WCHAR); - DstPathU.Length = GetFullPathNameW(lpNewFileName, MAX_PATH, DstPathU.Buffer, NULL); - if (DstPathU.Length >= MAX_PATH) - { - SetLastError(ERROR_FILENAME_EXCED_RANGE); - return FALSE; - } - DstPathU.Length *= sizeof(WCHAR); - - if (0 == RtlCompareUnicodeString(&SrcPathU, &DstPathU, TRUE)) - { - /* Source and destination file are the same, nothing to do */ - return TRUE; - } - - Result = CopyFileExW (lpExistingFileName, - lpNewFileName, - lpProgressRoutine, - lpData, - NULL, - FileRename->ReplaceIfExists ? 0 : COPY_FILE_FAIL_IF_EXISTS); - if (Result) - { - /* Cleanup the source file */ - AdjustFileAttributes(lpExistingFileName, lpNewFileName); - Result = DeleteFileW (lpExistingFileName); - } - } -#endif return Result; }

18 years, 11 months

[greatlrd] 18075: don't expect FS drivers to return STATUS_NOT_IMPLEMENTED if they don't know how to do the move (STATUS_NOT_SUPPORTED is also a perfect valid error code), this change did hpoussin suggest

by greatlrd＠svn.reactos.com

don't expect FS drivers to return STATUS_NOT_IMPLEMENTED if they don't know how to do the move (STATUS_NOT_SUPPORTED is also a perfect valid error code), this change did hpoussin suggest Modified: trunk/reactos/lib/kernel32/file/move.c _____ Modified: trunk/reactos/lib/kernel32/file/move.c --- trunk/reactos/lib/kernel32/file/move.c 2005-09-25 21:18:27 UTC (rev 18074) +++ trunk/reactos/lib/kernel32/file/move.c 2005-09-25 22:05:39 UTC (rev 18075) @@ -386,7 +386,7 @@ { Result = TRUE; } - else if (STATUS_NOT_IMPLEMENTED == errCode) + else { if (folder==FALSE) { @@ -697,7 +697,7 @@ /* FIXME file rename not yet implemented in all FSDs so it will always * fail, even when the move is to the same device */ - else if (STATUS_NOT_IMPLEMENTED == errCode) + //else if (STATUS_NOT_IMPLEMENTED == errCode) { UNICODE_STRING SrcPathU; @@ -742,11 +742,7 @@ } } #endif - else - { - SetLastErrorByStatus (errCode); - Result = TRUE; - } + return Result; }

18 years, 11 months

[hpoussin] 18074: Implement SetupDiInstallDriverFiles

by hpoussin＠svn.reactos.com

Implement SetupDiInstallDriverFiles Modified: trunk/reactos/lib/setupapi/devinst.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-09-25 21:05:18 UTC (rev 18073) +++ trunk/reactos/lib/setupapi/devinst.c 2005-09-25 21:18:27 UTC (rev 18074) @@ -129,6 +129,8 @@ DWORD DriverRank; SP_DRVINFO_DATA_V2_W Info; + LPWSTR InfPath; + LPWSTR InfSection; }; struct DeviceInfoElement /* Element of DeviceInfoSet.ListHead */ @@ -3271,8 +3273,45 @@ } SetLastError(ERROR_INSUFFICIENT_BUFFER); + driverInfo->InfSection = NULL; while (!Result && GetLastError() == ERROR_INSUFFICIENT_BUFFER) { + HeapFree(GetProcessHeap(), 0, driverInfo->InfSection); + driverInfo->InfSection = HeapAlloc(GetProcessHeap(), 0, RequiredSize * sizeof(WCHAR)); + if (!driverInfo->InfSection) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + HeapFree(GetProcessHeap(), 0, driverInfo); + return FALSE; + } + Result = SetupGetStringFieldW( + &ContextDevice, + 1, + driverInfo->InfSection, RequiredSize, + &RequiredSize); + } + if (!Result) + { + HeapFree(GetProcessHeap(), 0, driverInfo->InfSection); + HeapFree(GetProcessHeap(), 0, driverInfo); + return FALSE; + } + + driverInfo->InfPath = HeapAlloc(GetProcessHeap(), 0, (wcslen(InfFile) + 1) * sizeof(WCHAR)); + if (!driverInfo->InfPath) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + HeapFree(GetProcessHeap(), 0, driverInfo->InfSection); + HeapFree(GetProcessHeap(), 0, driverInfo); + return FALSE; + } + RtlCopyMemory(driverInfo->InfPath, InfFile, (wcslen(InfFile) + 1) * sizeof(WCHAR)); + + Result = FALSE; + RequiredSize = 128; /* Initial buffer size */ + SetLastError(ERROR_INSUFFICIENT_BUFFER); + while (!Result && GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { HeapFree(GetProcessHeap(), 0, DeviceDescription); DeviceDescription = HeapAlloc(GetProcessHeap(), 0, RequiredSize * sizeof(WCHAR)); if (!DeviceDescription) @@ -3285,6 +3324,8 @@ } if (!Result) { + HeapFree(GetProcessHeap(), 0, driverInfo->InfPath); + HeapFree(GetProcessHeap(), 0, driverInfo->InfSection); HeapFree(GetProcessHeap(), 0, driverInfo); HeapFree(GetProcessHeap(), 0, DeviceDescription); return FALSE; @@ -3299,6 +3340,8 @@ InfInstallSection = HeapAlloc(GetProcessHeap(), 0, RequiredSize * sizeof(WCHAR)); if (!InfInstallSection) { + HeapFree(GetProcessHeap(), 0, driverInfo->InfPath); + HeapFree(GetProcessHeap(), 0, driverInfo->InfSection); HeapFree(GetProcessHeap(), 0, driverInfo); HeapFree(GetProcessHeap(), 0, DeviceDescription); return FALSE; @@ -3311,6 +3354,8 @@ } if (!Result) { + HeapFree(GetProcessHeap(), 0, driverInfo->InfPath); + HeapFree(GetProcessHeap(), 0, driverInfo->InfSection); HeapFree(GetProcessHeap(), 0, driverInfo); HeapFree(GetProcessHeap(), 0, DeviceDescription); HeapFree(GetProcessHeap(), 0, InfInstallSection); @@ -4232,12 +4277,62 @@ IN HDEVINFO DeviceInfoSet, IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) { + BOOL ret = FALSE; + TRACE("%p %p\n", DeviceInfoSet, DeviceInfoData); - FIXME("SetupDiInstallDriverFiles not implemented. Doing nothing\n"); - //SetLastError(ERROR_GEN_FAILURE); - //return FALSE; - return TRUE; + if (!DeviceInfoSet) + SetLastError(ERROR_INVALID_PARAMETER); + else if (DeviceInfoSet == (HDEVINFO)INVALID_HANDLE_VALUE) + SetLastError(ERROR_INVALID_HANDLE); + else if (((struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEV_INFO_SET_MAGIC) + SetLastError(ERROR_INVALID_HANDLE); + else if (DeviceInfoData && DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA)) + SetLastError(ERROR_INVALID_USER_BUFFER); + else if (DeviceInfoData && ((struct DeviceInfoElement *)DeviceInfoData->Reserved)->SelectedDriver == NULL) + SetLastError(ERROR_INVALID_PARAMETER); + else if (!DeviceInfoData && ((struct DeviceInfoSet *)DeviceInfoSet)->SelectedDriver == NULL) + SetLastError(ERROR_INVALID_PARAMETER); + else + { + struct DriverInfoElement *DriverInfo; + HWND hWnd; + HINF hInf; + + if (DeviceInfoData) + { + DriverInfo = ((struct DeviceInfoElement *)DeviceInfoData->Reserved)->SelectedDriver; + hWnd = ((struct DeviceInfoElement *)DeviceInfoData->Reserved)->hwndParent; + } + else + { + DriverInfo = ((struct DeviceInfoSet *)DeviceInfoSet)->SelectedDriver; + hWnd = ((struct DeviceInfoSet *)DeviceInfoSet)->hwndParent; + } + + hInf = SetupOpenInfFileW(DriverInfo->InfPath, NULL, INF_STYLE_WIN4, NULL); + if (hInf != INVALID_HANDLE_VALUE) + { + WCHAR SectionName[MAX_PATH]; + DWORD SectionNameLength = 0; + + ret = SetupDiGetActualSectionToInstallW(hInf, DriverInfo->InfSection, + SectionName, MAX_PATH, &SectionNameLength, NULL); + if (ret) + { + PVOID callback_context = SetupInitDefaultQueueCallback(hWnd); + ret = SetupInstallFromInfSectionW(hWnd, hInf, SectionName, + SPINST_FILES, NULL, NULL, SP_COPY_NEWER, + SetupDefaultQueueCallbackW, callback_context, + NULL, NULL); + SetupTermDefaultQueueCallback(callback_context); + } + SetupCloseInfFile(hInf); + } + } + + TRACE("Returning %d\n", ret); + return ret; } /***********************************************************************

18 years, 11 months

[greatlrd] 18073: Implement support for move folder, even from different vol. But for now it does not think of EA or set file attrib right. it is a present to brandon so he stop nag about ros can not move a folder. It maybe got some other bugs. it need more testing see if it handling all case right.

by greatlrd＠svn.reactos.com

Implement support for move folder, even from different vol. But for now it does not think of EA or set file attrib right. it is a present to brandon so he stop nag about ros can not move a folder. It maybe got some other bugs. it need more testing see if it handling all case right. Modified: trunk/reactos/lib/kernel32/file/move.c Modified: trunk/reactos/lib/kernel32/include/kernel32.h _____ Modified: trunk/reactos/lib/kernel32/file/move.c --- trunk/reactos/lib/kernel32/file/move.c 2005-09-25 21:02:43 UTC (rev 18072) +++ trunk/reactos/lib/kernel32/file/move.c 2005-09-25 21:05:18 UTC (rev 18073) @@ -405,14 +405,291 @@ } else { - /* move folder not complete code */ - Result = CreateDirectoryW (lpNewFileName, NULL); - if (Result == FALSE) return FALSE; + /* move folder code start */ + WIN32_FIND_DATAW findBuffer; + LPCWSTR lpExistingFileName2 = NULL; + LPCWSTR lpNewFileName2 = NULL; + LPCWSTR lpDeleteFile = NULL; + INT size; + INT size2; + BOOL loop = TRUE; + BOOL Result = FALSE; + + /* Build the string */ + size = wcslen(lpExistingFileName); + + lpDeleteFile = (LPCWSTR) HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,MAX_PATH * sizeof(WCHAR)); + if (lpDeleteFile == NULL) + goto FreeMemAndExit; + + lpNewFileName2 = (LPCWSTR) HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,MAX_PATH * sizeof(WCHAR)); + if (lpNewFileName2 == NULL) + goto FreeMemAndExit; + + lpExistingFileName2 = (LPCWSTR) HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,MAX_PATH * sizeof(WCHAR)); + if (lpExistingFileName2 == NULL) + goto FreeMemAndExit; + + if ((size+6)*sizeof(WCHAR)>MAX_PATH) + { + HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,(VOID *) lpExistingFileName2,(size+6)*sizeof(WCHAR)); + if (lpExistingFileName2 == NULL) + goto FreeMemAndExit; + } + + wcscpy( (WCHAR *)lpExistingFileName2,lpExistingFileName); + wcscpy( (WCHAR *)&lpExistingFileName2[size],L"\\*.*\0"); + + /* Get the file name */ + memset(&findBuffer,0,sizeof(WIN32_FIND_DATAW)); + hFile = FindFirstFileW(lpExistingFileName2, &findBuffer); + if (hFile == NULL) + loop=FALSE; + + if (findBuffer.cFileName[0] == L'\0') + loop=FALSE; + + DPRINT("MoveFileWithProgressW : lpExistingFileName1 = %S\n",lpExistingFileName); + DPRINT("MoveFileWithProgressW : lpExistingFileName2 = %S\n",lpExistingFileName2); + DPRINT("MoveFileWithProgressW : lpNewFileName = %S\n",lpNewFileName); + + DPRINT("MoveFileWithProgressW : loop = %d %d %d\n",TRUE, FALSE, loop); + + + CreateDirectoryW(lpNewFileName,NULL); + + + /* search the file */ + while (loop==TRUE) + { + Result = TRUE; + + if ((!wcscmp(findBuffer.cFileName,L"..")) || (!wcscmp(findBuffer.cFileName,L"."))) + { + loop = FindNextFileW(hFile, &findBuffer); + + if (!loop) + { + size = wcslen(lpExistingFileName2)-4; + FindClose(hFile); + wcscpy( (WCHAR *)&lpExistingFileName2[size],L"\0"); + + if (wcsncmp(lpExistingFileName,lpExistingFileName2,size)) + { + FindClose(hFile); + + /* delete folder */ + + size = GetFullPathNameW(lpExistingFileName2, MAX_PATH,(LPWSTR) lpDeleteFile, NULL); + if (size>MAX_PATH) + { + lpDeleteFile = (LPCWSTR) HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY, + (VOID *) lpDeleteFile,size); + + if (lpDeleteFile == NULL) + { + Result = FALSE; + goto FreeMemAndExit; + } + + GetFullPathNameW(lpExistingFileName2, size,(LPWSTR) lpDeleteFile, NULL); + } + + DPRINT("MoveFileWithProgressW : folder : %s\n",lpDeleteFile); + + Result = RemoveDirectoryW(lpDeleteFile); + if (Result == FALSE) + break; + + loop=TRUE; + size = wcslen(lpExistingFileName); + + if ((size+6)*sizeof(WCHAR)>MAX_PATH) + { + lpExistingFileName2 = (LPCWSTR) HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY, + (VOID *)lpExistingFileName2,(size+6)*sizeof(WCHAR)); + + if (lpExistingFileName2 == NULL) + { + Result = FALSE; + goto FreeMemAndExit; + } + } + + wcscpy( (WCHAR *)lpExistingFileName2,lpExistingFileName); + wcscpy( (WCHAR *)&lpExistingFileName2[size],L"\\*.*\0"); + + /* Get the file name */ + memset(&findBuffer,0,sizeof(WIN32_FIND_DATAW)); + hFile = FindFirstFileW(lpExistingFileName2, &findBuffer); + } + } + continue; + } + + if (findBuffer.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + { + DPRINT("MoveFileWithProgressW : 1: %S %S\n",lpExistingFileName2,findBuffer.cFileName); + + /* Build the new string */ + size = wcslen(findBuffer.cFileName); + size2= wcslen(lpExistingFileName2); + + if ((size2+size+6)*sizeof(WCHAR)>MAX_PATH) + { + lpExistingFileName2 = (LPCWSTR) HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY, + (VOID *)lpExistingFileName2, (size2+size+6)*sizeof(WCHAR)); + + if (lpExistingFileName2 == NULL) + { + Result = FALSE; + goto FreeMemAndExit; + } + } + + wcscpy( (WCHAR *)&lpExistingFileName2[size2-3],findBuffer.cFileName); + wcscpy( (WCHAR *)&lpExistingFileName2[size2+size-3],L"\\*.*\0"); + - /* add scan code for move the folder */ + /* Build the new dst string */ + size = wcslen(lpExistingFileName2) + wcslen(lpNewFileName); + size2 = wcslen(lpExistingFileName); - AdjustFileAttributes(lpExistingFileName, lpNewFileName); - Result = RemoveDirectoryW(lpExistingFileName); + if (size>MAX_PATH) + { + lpNewFileName2 = (LPCWSTR) HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY, + (VOID *) lpNewFileName2, size*sizeof(WCHAR)); + + if (lpNewFileName2 == NULL) + { + Result = FALSE; + goto FreeMemAndExit; + } + } + + wcscpy((WCHAR *) lpNewFileName2,lpNewFileName); + size = wcslen(lpNewFileName); + wcscpy((WCHAR *)&lpNewFileName2[size], (WCHAR *)&lpExistingFileName2[size2]); + size = wcslen(lpNewFileName2); + wcscpy( (WCHAR *)&lpNewFileName2[size-4],L"\0"); + + /* build dest path */ + /* remove this code when it will be out into kernel32.dll ? */ + + size = GetFullPathNameW(lpNewFileName2, MAX_PATH,(LPWSTR) lpDeleteFile, NULL); + if (MAX_PATH>size2) + { + lpDeleteFile = (LPCWSTR) HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY, + (VOID *) lpDeleteFile,size) ; + + if (lpDeleteFile == NULL) + { + Result = FALSE; + goto FreeMemAndExit; + } + + GetFullPathNameW(lpNewFileName2, size,(LPWSTR) lpDeleteFile, NULL); + } + + /* Create Folder */ + + DPRINT("MoveFileWithProgressW : CreateDirectoryW lpNewFileName2 : %S\n",lpNewFileName2); + DPRINT("MoveFileWithProgressW : CreateDirectoryW : %S\n",lpDeleteFile); + + CreateDirectoryW(lpDeleteFile,NULL); + + DPRINT("MoveFileWithProgressW : 1x: %S : %S \n",lpExistingFileName2, lpNewFileName2); + + FindClose(hFile); + memset(&findBuffer,0,sizeof(WIN32_FIND_DATAW)); + hFile = FindFirstFileW(lpExistingFileName2, &findBuffer); + } + else + { + + /* Build the new string */ + size = wcslen(findBuffer.cFileName); + size2= wcslen(lpExistingFileName2); + wcscpy( (WCHAR *)lpDeleteFile,lpExistingFileName2); + wcscpy( (WCHAR *)&lpDeleteFile[size2-3],findBuffer.cFileName); + + /* Build dest string */ + size = wcslen(lpDeleteFile) + wcslen(lpNewFileName); + size2 = wcslen(lpExistingFileName); + + if (size*sizeof(WCHAR)>MAX_PATH) + { + lpNewFileName2 = (LPCWSTR) HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY, + (VOID *) lpNewFileName2, size*sizeof(WCHAR)); + + if (lpNewFileName2 == NULL) + { + Result = FALSE; + goto FreeMemAndExit; + } + } + + wcscpy((WCHAR *) lpNewFileName2,lpNewFileName); + size = wcslen(lpNewFileName); + wcscpy((WCHAR *)&lpNewFileName2[size], (WCHAR *)&lpDeleteFile[size2]); + + /* copy file */ + Result = CopyFileW(lpDeleteFile,lpNewFileName2, FALSE); + + /* delete file */ + DPRINT("MoveFileWithProgressW : Delete file : %S : %S\n",lpDeleteFile, lpNewFileName2); + + + Result = DeleteFileW(lpDeleteFile); + if (Result == FALSE) + { + DPRINT("MoveFileWithProgressW : Fails\n"); + break; + } + } + DPRINT("MoveFileWithProgressW : 2 : %S : %S \n",lpExistingFileName2,findBuffer.cFileName); + loop = FindNextFileW(hFile, &findBuffer); + } + + FindClose(hFile); + memset(&findBuffer,0,sizeof(WIN32_FIND_DATAW)); + hFile = FindFirstFileW(lpExistingFileName2, &findBuffer); + if (hFile == NULL) + loop=TRUE; + + if (findBuffer.cFileName[0] == L'\0') + loop=TRUE; + + if (loop == FALSE) + { + FindClose(hFile); + Result = RemoveDirectoryW(lpExistingFileName); + DPRINT("MoveFileWithProgressW RemoveDirectoryW :%S",lpExistingFileName); + } + +FreeMemAndExit: + DPRINT("MoveFileWithProgressW : result : r=%d, T=%d, F=%d",Result,TRUE,FALSE); + + if (lpNewFileName2 != NULL) + { + HeapFree(GetProcessHeap(),0,(VOID *) lpNewFileName2); + lpNewFileName2 = NULL; + } + + if (lpExistingFileName2 != NULL) + { + HeapFree(GetProcessHeap(),0,(VOID *) lpExistingFileName2); + lpExistingFileName2 = NULL; + } + + if (lpDeleteFile != NULL) + { + HeapFree(GetProcessHeap(),0,(VOID *) lpDeleteFile); + lpDeleteFile = NULL; + } + + return Result; + // end move folder code } } _____ Modified: trunk/reactos/lib/kernel32/include/kernel32.h --- trunk/reactos/lib/kernel32/include/kernel32.h 2005-09-25 21:02:43 UTC (rev 18072) +++ trunk/reactos/lib/kernel32/include/kernel32.h 2005-09-25 21:05:18 UTC (rev 18073) @@ -74,6 +74,7 @@ DWORD FilenameU2A_FitOrFail(LPSTR DestA, INT destLen, PUNICODE_STRING SourceU); #define HeapAlloc RtlAllocateHeap +#define HeapReAlloc RtlReAllocateHeap #define HeapFree RtlFreeHeap POBJECT_ATTRIBUTES

18 years, 11 months

[ekohl] 18072: - Implement CM_Is_Dock_Station_Present[_Ex]

by ekohl＠svn.reactos.com

- Implement CM_Is_Dock_Station_Present[_Ex] Modified: trunk/reactos/include/idl/pnp.idl Modified: trunk/reactos/include/wine/cfgmgr32.h Modified: trunk/reactos/lib/setupapi/cfgmgr.c Modified: trunk/reactos/lib/setupapi/setupapi.spec Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c Modified: trunk/reactos/w32api/include/ddk/cfgmgr32.h _____ Modified: trunk/reactos/include/idl/pnp.idl --- trunk/reactos/include/idl/pnp.idl 2005-09-25 20:56:58 UTC (rev 18071) +++ trunk/reactos/include/idl/pnp.idl 2005-09-25 21:02:43 UTC (rev 18072) @@ -5,6 +5,7 @@ #define WORD unsigned short #define DWORD unsigned long #define CONFIGRET unsigned long +#define PBOOL unsigned long * [ uuid (809F4e40-A03D-11CE-8F69-08003E30051B), @@ -14,21 +15,32 @@ ] interface pnp { + /* Function 0 */ +// CONFIGRET PNP_Unknown0(handle_t BindingHandle); + + /* Function 1 */ +// CONFIGRET PNP_Unknown1(handle_t BindingHandle); + + /* Function 2 */ CONFIGRET PNP_GetVersion(handle_t BindingHandle, [out] WORD *Version); + /* Function 3 */ CONFIGRET PNP_GetGlobalState(handle_t BindingHandle, [out] unsigned long *State, [in] unsigned long Flags); + /* Function 6 */ CONFIGRET PNP_ValidateDeviceInstance(handle_t BindingHandle, [in, string] wchar_t *DeviceInstance, [in] DWORD Flags); + /* Function 7 */ CONFIGRET PNP_GetRootDeviceInstance(handle_t BindingHandle, [out, string, size_is(Length)] wchar_t *DeviceInstance, [in] DWORD Length); + /* Function 8 */ cpp_quote("#define PNP_DEVICE_PARENT 1") cpp_quote("#define PNP_DEVICE_CHILD 2") cpp_quote("#define PNP_DEVICE_SIBLING 3") @@ -39,6 +51,7 @@ [in] DWORD Length, [in] DWORD Flags); + /* Function 9 */ cpp_quote("#define PNP_BRANCH_ENUM 1") cpp_quote("#define PNP_BRANCH_CLASS 2") CONFIGRET PNP_EnumerateSubKeys(handle_t BindingHandle, @@ -49,22 +62,26 @@ [out] unsigned long *RequiredLength, [in] DWORD Flags); + /* Function 10 */ // CONFIGRET PNP_GetDeviceList(handle_t BindingHandle, // [in, unique, string] wchar_t *Filter, // [out, string, size_is(*Length)] unsigned char *Buffer // [in, out] unsigned long *Length, // [in] DWORD Flags); + /* Function 11 */ CONFIGRET PNP_GetDeviceListSize(handle_t BindingHandle, [in, unique, string] wchar_t *Filter, [out] unsigned long *Length, [in] DWORD Flags); + /* Function 12 */ CONFIGRET PNP_GetDepth(handle_t BindingHandle, [in, string] wchar_t *DeviceInstance, [out] unsigned long *Depth, [in] DWORD Flags); + /* Function 13 */ CONFIGRET PNP_GetDeviceRegProp(handle_t BindingHandle, [in, string] wchar_t *DeviceInstance, [in] unsigned long Property, @@ -74,6 +91,7 @@ [in, out] unsigned long *Length, [in] DWORD Flags); + /* Function 14 */ CONFIGRET PNP_SetDeviceRegProp(handle_t BindingHandle, [in, string] wchar_t *DeviceId, [in] unsigned long Property, @@ -82,24 +100,38 @@ [in] unsigned long Length, [in] unsigned long Flags); + /* Function 16 */ + CONFIGRET PNP_CreateKey(handle_t BindingHandle, + [in, string] wchar_t *SubKey, + [in] unsigned long DesiredAccess, + [in] unsigned long Flags); + + /* Function 19 */ CONFIGRET PNP_GetClassName(handle_t BindingHandle, [in, string] wchar_t *ClassGuid, [out, string, size_is(*Length)] wchar_t *Buffer, [in, out] unsigned long *Length, [in] unsigned long Flags); + /* Function 20 */ CONFIGRET PNP_DeleteClassKey(handle_t BindingHandle, [in, string] wchar_t *ClassGuid, [in] unsigned long Flags); + /* Function 30 */ CONFIGRET PNP_GetDeviceStatus(handle_t BindingHandle, [in, string] wchar_t *DeviceInstance, [out] unsigned long *Status, [out] unsigned long *Problem, [in] DWORD Flags); + /* Function 31 */ CONFIGRET PNP_SetDeviceProblem(handle_t BindingHandle, [in, string] wchar_t *DeviceInstance, [in] unsigned long Problem, [in] DWORD Flags); + + /* Function 38 */ + CONFIGRET PNP_IsDockStationPresent(handle_t BindingHandle, + [out]PBOOL Present); } _____ Modified: trunk/reactos/include/wine/cfgmgr32.h --- trunk/reactos/include/wine/cfgmgr32.h 2005-09-25 20:56:58 UTC (rev 18071) +++ trunk/reactos/include/wine/cfgmgr32.h 2005-09-25 21:02:43 UTC (rev 18072) @@ -207,6 +207,8 @@ WORD WINAPI CM_Get_Version( VOID ); WORD WINAPI CM_Get_Version_Ex( HMACHINE ); +CONFIGRET WINAPI CM_Is_Dock_Station_Present( PBOOL ); +CONFIGRET WINAPI CM_Is_Dock_Station_Present_Ex( PBOOL, HMACHINE ); CONFIGRET WINAPI CM_Locate_DevNodeA(PDEVINST, DEVINSTID_A, ULONG); CONFIGRET WINAPI CM_Locate_DevNodeW(PDEVINST, DEVINSTID_W, ULONG); #define CM_Locate_DevNode WINELIB_NAME_AW(CM_Locate_DevNode) _____ Modified: trunk/reactos/lib/setupapi/cfgmgr.c --- trunk/reactos/lib/setupapi/cfgmgr.c 2005-09-25 20:56:58 UTC (rev 18071) +++ trunk/reactos/lib/setupapi/cfgmgr.c 2005-09-25 21:02:43 UTC (rev 18072) @@ -1521,6 +1521,49 @@ /*********************************************************************** + * CM_Is_Dock_Station_Present [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Is_Dock_Station_Present( + PBOOL pbPresent) +{ + TRACE("%p\n", pbPresent); + return CM_Is_Dock_Station_Present_Ex(pbPresent, NULL); +} + + +/********************************************************************** * + * CM_Is_Dock_Station_Present_Ex [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Is_Dock_Station_Present_Ex( + PBOOL pbPresent, HMACHINE hMachine) +{ + RPC_BINDING_HANDLE BindingHandle = NULL; + + FIXME("%p %lx\n", pbPresent, hMachine); + + if (pbPresent == NULL) + return CR_INVALID_POINTER; + + *pbPresent = FALSE; + + if (hMachine != NULL) + { + BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle; + if (BindingHandle == NULL) + return CR_FAILURE; + } + else + { + if (!PnpGetLocalHandles(&BindingHandle, NULL)) + return CR_FAILURE; + } + + return PNP_IsDockStationPresent(BindingHandle, + (unsigned long *)pbPresent); +} + + +/********************************************************************** * * CM_Locate_DevNodeA [SETUPAPI.@] */ CONFIGRET WINAPI CM_Locate_DevNodeA( _____ Modified: trunk/reactos/lib/setupapi/setupapi.spec --- trunk/reactos/lib/setupapi/setupapi.spec 2005-09-25 20:56:58 UTC (rev 18071) +++ trunk/reactos/lib/setupapi/setupapi.spec 2005-09-25 21:02:43 UTC (rev 18072) @@ -127,8 +127,8 @@ @ stdcall CM_Get_Version_Ex(long) @ stub CM_Intersect_Range_List @ stub CM_Invert_Range_List -@ stub CM_Is_Dock_Station_Present -@ stub CM_Is_Dock_Station_Present_Ex +@ stdcall CM_Is_Dock_Station_Present(ptr) +@ stdcall CM_Is_Dock_Station_Present_Ex(ptr long) @ stdcall CM_Locate_DevNodeA(ptr str long) @ stdcall CM_Locate_DevNodeW(ptr wstr long) @ stdcall CM_Locate_DevNode_ExA(ptr str long long) _____ Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c --- trunk/reactos/services/umpnpmgr/umpnpmgr.c 2005-09-25 20:56:58 UTC (rev 18071) +++ trunk/reactos/services/umpnpmgr/umpnpmgr.c 2005-09-25 21:02:43 UTC (rev 18072) @@ -794,6 +794,56 @@ } +CONFIGRET +PNP_IsDockStationPresent(handle_t BindingHandle, + unsigned long *Present) +{ + HKEY hKey; + DWORD dwType; + DWORD dwValue; + DWORD dwSize; + CONFIGRET ret = CR_SUCCESS; + + DPRINT1("PNP_IsDockStationPresent() called\n"); + + *Present = FALSE; + + if (RegOpenKeyExW(HKEY_CURRENT_CONFIG, + L"CurrentDockInfo", + 0, + KEY_READ, + &hKey) != ERROR_SUCCESS) + return CR_REGISTRY_ERROR; + + dwSize = sizeof(DWORD); + if (RegQueryValueExW(hKey, + L"DockingState", + NULL, + &dwType, + (LPBYTE)&dwValue, + &dwSize) != ERROR_SUCCESS) + ret = CR_REGISTRY_ERROR; + + RegCloseKey(hKey); + + if (ret == CR_SUCCESS) + { + if (dwType != REG_DWORD || dwSize != sizeof(DWORD)) + { + ret = CR_REGISTRY_ERROR; + } + else if (dwValue != 0) + { + *Present = TRUE; + } + } + + DPRINT1("PNP_IsDockStationPresent() done (returns %lx)\n", ret); + + return ret; +} + + static DWORD WINAPI PnpEventThread(LPVOID lpParameter) { _____ Modified: trunk/reactos/w32api/include/ddk/cfgmgr32.h --- trunk/reactos/w32api/include/ddk/cfgmgr32.h 2005-09-25 20:56:58 UTC (rev 18071) +++ trunk/reactos/w32api/include/ddk/cfgmgr32.h 2005-09-25 21:02:43 UTC (rev 18072) @@ -587,6 +587,13 @@ +/* FIXME: Missing CMP_Init_Detection */ +/* FIXME: Missing CMP_RegisterNotification */ +/* FIXME: Missing CMP_Report_LogOn */ +/* FIXME: Missing CMP_UnregisterNotification */ +/* FIXME: Missing CMP_WaitNoPendingInstallEvents */ +/* FIXME: Missing CMP_WaitServicesAvailable */ + /* CM_Add_Empty_Log_Conf.ulFlags constants */ #define PRIORITY_EQUAL_FIRST 0x00000008 #define PRIORITY_EQUAL_LAST 0x00000000 @@ -1452,21 +1459,32 @@ /* FIXME: Obsolete CM_Intersect_Range_List */ /* FIXME: Obsolete CM_Invert_Range_List */ -/* FIXME: Obsolete CM_Is_Dock_Station_Present */ -/* FIXME: Obsolete CM_Is_Dock_Station_Present_Ex */ +CMAPI +CONFIGRET +WINAPI +CM_Is_Dock_Station_Present( + OUT PBOOL pbPresent); + +CMAPI +CONFIGRET +WINAPI +CM_Is_Dock_Station_Present_Ex( + OUT PBOOL pbPresent, + IN HMACHINE hMachine); + /* CM_Locate_DevNode.ulFlags constants */ -#define CM_LOCATE_DEVNODE_NORMAL 0x00000000 -#define CM_LOCATE_DEVNODE_PHANTOM 0x00000001 -#define CM_LOCATE_DEVNODE_CANCELREMOVE 0x00000002 -#define CM_LOCATE_DEVNODE_NOVALIDATION 0x00000004 -#define CM_LOCATE_DEVNODE_BITS 0x00000007 +#define CM_LOCATE_DEVNODE_NORMAL 0x00000000 +#define CM_LOCATE_DEVNODE_PHANTOM 0x00000001 +#define CM_LOCATE_DEVNODE_CANCELREMOVE 0x00000002 +#define CM_LOCATE_DEVNODE_NOVALIDATION 0x00000004 +#define CM_LOCATE_DEVNODE_BITS 0x00000007 -#define CM_LOCATE_DEVINST_NORMAL CM_LOCATE_DEVNODE_NORMAL -#define CM_LOCATE_DEVINST_PHANTOM CM_LOCATE_DEVNODE_PHANTOM -#define CM_LOCATE_DEVINST_CANCELREMOVE CM_LOCATE_DEVNODE_CANCELREMOVE -#define CM_LOCATE_DEVINST_NOVALIDATION CM_LOCATE_DEVNODE_NOVALIDATION -#define CM_LOCATE_DEVINST_BITS CM_LOCATE_DEVNODE_BITS +#define CM_LOCATE_DEVINST_NORMAL CM_LOCATE_DEVNODE_NORMAL +#define CM_LOCATE_DEVINST_PHANTOM CM_LOCATE_DEVNODE_PHANTOM +#define CM_LOCATE_DEVINST_CANCELREMOVE CM_LOCATE_DEVNODE_CANCELREMOVE +#define CM_LOCATE_DEVINST_NOVALIDATION CM_LOCATE_DEVNODE_NOVALIDATION +#define CM_LOCATE_DEVINST_BITS CM_LOCATE_DEVNODE_BITS CMAPI CONFIGRET

18 years, 11 months

← Newer
1
...
8
9
10
11
12
13
14
...
59
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2005