Silence debug messages

svn path=/trunk/; revision=16911
This commit is contained in:
Alex Ionescu 2005-07-31 05:43:10 +00:00
parent 3f30061228
commit 838cc74dd0
2 changed files with 14 additions and 15 deletions

View file

@ -94,16 +94,16 @@ BasepInitConsole(VOID)
WCHAR lpTest[MAX_PATH]; WCHAR lpTest[MAX_PATH];
GetModuleFileNameW(NULL, lpTest, MAX_PATH); GetModuleFileNameW(NULL, lpTest, MAX_PATH);
DPRINT1("BasepInitConsole for : %S\n", lpTest); DPRINT("BasepInitConsole for : %S\n", lpTest);
DPRINT1("Our current console handles are: %lx, %lx, %lx %lx\n", DPRINT("Our current console handles are: %lx, %lx, %lx %lx\n",
Parameters->ConsoleHandle, Parameters->StandardInput, Parameters->ConsoleHandle, Parameters->StandardInput,
Parameters->StandardOutput, Parameters->StandardError); Parameters->StandardOutput, Parameters->StandardError);
/* We have nothing to do if this isn't a console app... */ /* We have nothing to do if this isn't a console app... */
if (RtlImageNtHeader(GetModuleHandle(NULL))->OptionalHeader.Subsystem != if (RtlImageNtHeader(GetModuleHandle(NULL))->OptionalHeader.Subsystem !=
IMAGE_SUBSYSTEM_WINDOWS_CUI) IMAGE_SUBSYSTEM_WINDOWS_CUI)
{ {
DPRINT1("Image is not a console application\n"); DPRINT("Image is not a console application\n");
Parameters->ConsoleHandle = NULL; Parameters->ConsoleHandle = NULL;
return TRUE; return TRUE;
} }
@ -115,14 +115,14 @@ BasepInitConsole(VOID)
if (Parameters->ConsoleHandle == HANDLE_DETACHED_PROCESS) if (Parameters->ConsoleHandle == HANDLE_DETACHED_PROCESS)
{ {
/* No console to create */ /* No console to create */
DPRINT1("No console to create\n"); DPRINT("No console to create\n");
Parameters->ConsoleHandle = NULL; Parameters->ConsoleHandle = NULL;
Request.Data.AllocConsoleRequest.ConsoleNeeded = FALSE; Request.Data.AllocConsoleRequest.ConsoleNeeded = FALSE;
} }
else if (Parameters->ConsoleHandle == HANDLE_CREATE_NEW_CONSOLE) else if (Parameters->ConsoleHandle == HANDLE_CREATE_NEW_CONSOLE)
{ {
/* We'll get the real one soon */ /* We'll get the real one soon */
DPRINT1("Creating new console\n"); DPRINT("Creating new console\n");
Parameters->ConsoleHandle = NULL; Parameters->ConsoleHandle = NULL;
} }
else if (Parameters->ConsoleHandle == HANDLE_CREATE_NO_WINDOW) else if (Parameters->ConsoleHandle == HANDLE_CREATE_NO_WINDOW)
@ -133,7 +133,7 @@ BasepInitConsole(VOID)
} }
else else
{ {
DPRINT1("Using existing console: %x\n", Parameters->ConsoleHandle); DPRINT("Using existing console: %x\n", Parameters->ConsoleHandle);
} }
/* Initialize Console Ctrl Handler */ /* Initialize Console Ctrl Handler */
@ -183,7 +183,7 @@ BasepInitConsole(VOID)
} }
} }
DPRINT1("Console setup: %lx, %lx, %lx, %lx\n", DPRINT("Console setup: %lx, %lx, %lx, %lx\n",
Parameters->ConsoleHandle, Parameters->ConsoleHandle,
Parameters->StandardInput, Parameters->StandardInput,
Parameters->StandardOutput, Parameters->StandardOutput,

View file

@ -86,7 +86,7 @@ BasepNotifyCsrOfCreation(ULONG dwCreationFlags,
CSR_API_MESSAGE CsrRequest; CSR_API_MESSAGE CsrRequest;
NTSTATUS Status; NTSTATUS Status;
DPRINT1("BasepNotifyCsrOfCreation: Process: %lx, Flags %lx\n", DPRINT("BasepNotifyCsrOfCreation: Process: %lx, Flags %lx\n",
ProcessId, dwCreationFlags); ProcessId, dwCreationFlags);
/* Fill out the request */ /* Fill out the request */
@ -308,13 +308,12 @@ BasepCopyHandles(IN PRTL_USER_PROCESS_PARAMETERS Params,
IN PRTL_USER_PROCESS_PARAMETERS PebParams, IN PRTL_USER_PROCESS_PARAMETERS PebParams,
IN BOOL InheritHandles) IN BOOL InheritHandles)
{ {
DPRINT1("BasepCopyHandles %p %p, %d\n", Params, PebParams, InheritHandles); DPRINT("BasepCopyHandles %p %p, %d\n", Params, PebParams, InheritHandles);
/* Copy the handle if we are inheriting or if it's a console handle */ /* Copy the handle if we are inheriting or if it's a console handle */
if (InheritHandles || IsConsoleHandle(PebParams->StandardInput)) if (InheritHandles || IsConsoleHandle(PebParams->StandardInput))
{ {
Params->StandardInput = PebParams->StandardInput; Params->StandardInput = PebParams->StandardInput;
DPRINT1("Standard Input: %x\n", Params->StandardInput);
} }
if (InheritHandles || IsConsoleHandle(PebParams->StandardOutput)) if (InheritHandles || IsConsoleHandle(PebParams->StandardOutput))
{ {
@ -352,7 +351,7 @@ BasepInitializeEnvironment(HANDLE ProcessHandle,
UNICODE_STRING Desktop, Shell, Runtime, Title; UNICODE_STRING Desktop, Shell, Runtime, Title;
PPEB OurPeb = NtCurrentPeb(); PPEB OurPeb = NtCurrentPeb();
DPRINT1("BasepInitializeEnvironment\n"); DPRINT("BasepInitializeEnvironment\n");
/* Get the full path name */ /* Get the full path name */
RetVal = GetFullPathNameW(ApplicationPathName, RetVal = GetFullPathNameW(ApplicationPathName,
@ -481,7 +480,7 @@ BasepInitializeEnvironment(HANDLE ProcessHandle,
/* Write the handles only if we have to */ /* Write the handles only if we have to */
if (StartupInfo->dwFlags & STARTF_USESTDHANDLES) if (StartupInfo->dwFlags & STARTF_USESTDHANDLES)
{ {
DPRINT1("Using Standard Handles\n"); DPRINT("Using Standard Handles\n");
ProcessParameters->StandardInput = StartupInfo->hStdInput; ProcessParameters->StandardInput = StartupInfo->hStdInput;
ProcessParameters->StandardOutput = StartupInfo->hStdOutput; ProcessParameters->StandardOutput = StartupInfo->hStdOutput;
ProcessParameters->StandardError = StartupInfo->hStdError; ProcessParameters->StandardError = StartupInfo->hStdError;
@ -510,7 +509,7 @@ BasepInitializeEnvironment(HANDLE ProcessHandle,
(STARTF_USESTDHANDLES | STARTF_USEHOTKEY | STARTF_SHELLPRIVATE))) (STARTF_USESTDHANDLES | STARTF_USEHOTKEY | STARTF_SHELLPRIVATE)))
{ {
/* Use handles from PEB, if inheriting or they are console */ /* Use handles from PEB, if inheriting or they are console */
DPRINT1("Copying handles from parent\n"); DPRINT("Copying handles from parent\n");
BasepCopyHandles(ProcessParameters, BasepCopyHandles(ProcessParameters,
OurPeb->ProcessParameters, OurPeb->ProcessParameters,
InheritHandles); InheritHandles);