Author: weiden Date: Mon Nov 20 00:14:49 2006 New Revision: 24791
URL: http://svn.reactos.org/svn/reactos?rev=24791&view=rev Log: - Correct definition of DbgPrompt - Add definitions for the CSTRING structure
Modified: trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/include/ndk/umtypes.h trunk/reactos/include/psdk/ntdef.h trunk/reactos/lib/rtl/debug.c trunk/reactos/lib/rtl/rtlp.h
Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev=... ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h (original) +++ trunk/reactos/include/ndk/rtlfuncs.h Mon Nov 20 00:14:49 2006 @@ -2495,9 +2495,9 @@ ULONG NTAPI DbgPrompt( - IN PCCH PromptString, - OUT PCH OutputString, - IN ULONG OutputSize + IN PCCH Prompt, + OUT PCH Response, + IN ULONG MaximumResponseLength );
VOID
Modified: trunk/reactos/include/ndk/umtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/umtypes.h?rev=2... ============================================================================== --- trunk/reactos/include/ndk/umtypes.h (original) +++ trunk/reactos/include/ndk/umtypes.h Mon Nov 20 00:14:49 2006 @@ -141,6 +141,13 @@ PCHAR Buffer; } STRING, *PSTRING;
+typedef struct _CSTRING +{ + USHORT Length; + USHORT MaximumLength; + CONST CHAR *Buffer; +} CSTRING, *PCSTRING; + #endif
typedef struct _OBJECT_ATTRIBUTES
Modified: trunk/reactos/include/psdk/ntdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntdef.h?rev=24... ============================================================================== --- trunk/reactos/include/psdk/ntdef.h (original) +++ trunk/reactos/include/psdk/ntdef.h Mon Nov 20 00:14:49 2006 @@ -53,6 +53,11 @@ USHORT MaximumLength; PCHAR Buffer; } STRING, *PSTRING; +typedef struct _CSTRING { + USHORT Length; + USHORT MaximumLength; + CONST CHAR *Buffer; +} CSTRING, *PCSTRING; #endif typedef STRING ANSI_STRING; typedef PSTRING PANSI_STRING;
Modified: trunk/reactos/lib/rtl/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/debug.c?rev=24791&a... ============================================================================== --- trunk/reactos/lib/rtl/debug.c (original) +++ trunk/reactos/lib/rtl/debug.c Mon Nov 20 00:14:49 2006 @@ -40,8 +40,8 @@
NTSTATUS NTAPI -DebugPrompt(IN PANSI_STRING Output, - IN PANSI_STRING Input) +DebugPrompt(IN PCSTRING Output, + IN PSTRING Input) { /* Call the INT2D Service */ return DebugService(BREAKPOINT_PROMPT, @@ -270,20 +270,20 @@ */ ULONG NTAPI -DbgPrompt(PCCH OutputString, - PCH InputString, - ULONG InputSize) -{ - ANSI_STRING Output; - ANSI_STRING Input; +DbgPrompt(IN PCCH Prompt, + OUT PCH Response, + IN ULONG MaximumResponseLength) +{ + CSTRING Output; + STRING Input;
/* Setup the input string */ - Input.MaximumLength = InputSize; - Input.Buffer = InputString; + Input.MaximumLength = MaximumResponseLength; + Input.Buffer = Response;
/* Setup the output string */ - Output.Length = strlen (OutputString); - Output.Buffer = (PCHAR)OutputString; + Output.Length = strlen (Prompt); + Output.Buffer = Prompt;
/* Call the system service */ return DebugPrompt(&Output, &Input);
Modified: trunk/reactos/lib/rtl/rtlp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtlp.h?rev=24791&am... ============================================================================== --- trunk/reactos/lib/rtl/rtlp.h (original) +++ trunk/reactos/lib/rtl/rtlp.h Mon Nov 20 00:14:49 2006 @@ -112,7 +112,7 @@ NTSTATUS NTAPI DebugService(IN ULONG Service, - IN PVOID Buffer, + IN PCVOID Buffer, IN ULONG Length, IN PVOID Argument1, IN PVOID Argument2);