Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-06 09:50:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Silence debug messages

Browse source 
svn path=/trunk/; revision=5893
This commit is contained in:
Gé van Geldorp 2003-08-28 13:38:24 +00:00
parent 4ab5d75768
commit e9b3a79c09
10 changed files with 66 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/lib/advapi32/service/sctrl.c
View file

@ -1,4 +1,4 @@
/* $Id: sctrl.c,v 1.11 2003/08/07 04:03:22 royce Exp $ /* $Id: sctrl.c,v 1.12 2003/08/28 13:38:23 gvg Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries * PROJECT: ReactOS system libraries
@ -340,7 +340,7 @@ StartServiceCtrlDispatcherW(LPSERVICE_TABLE_ENTRYW lpServiceStartTable)
HANDLE hPipe; HANDLE hPipe;
DWORD dwError; DWORD dwError;
DPRINT1("StartServiceCtrlDispatcherW() called\n"); DPRINT("StartServiceCtrlDispatcherW() called\n");
i = 0; i = 0;
while (lpServiceStartTable[i].lpServiceProc != NULL) while (lpServiceStartTable[i].lpServiceProc != NULL)

8
reactos/lib/user32/controls/regcontrol.c
View file

@ -1,4 +1,4 @@
/* $Id: regcontrol.c,v 1.11 2003/08/17 22:45:40 silverblade Exp $ /* $Id: regcontrol.c,v 1.12 2003/08/28 13:38:23 gvg Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS User32 * PROJECT: ReactOS User32
@ -27,7 +27,7 @@ static void RegisterBuiltinClass(const struct builtin_class_descr *Descr)
wc.cbClsExtra = 0; wc.cbClsExtra = 0;
wc.cbWndExtra = Descr->extra; wc.cbWndExtra = Descr->extra;
#if 1 #if 0
if(IS_ATOM(wc.lpszClassName)) if(IS_ATOM(wc.lpszClassName))
DbgPrint("Registering built-in class atom=0x%x\n", wc.lpszClassName); DbgPrint("Registering built-in class atom=0x%x\n", wc.lpszClassName);
else else
@ -43,7 +43,9 @@ static void RegisterBuiltinClass(const struct builtin_class_descr *Descr)
*/ */
void ControlsInit(void) void ControlsInit(void)
{ {
DbgPrint("ControlsInit()\n"); #if 0
DbgPrint("ControlsInit()\n");
#endif
RegisterBuiltinClass(&DIALOG_builtin_class); RegisterBuiltinClass(&DIALOG_builtin_class);
RegisterBuiltinClass(&POPUPMENU_builtin_class); RegisterBuiltinClass(&POPUPMENU_builtin_class);

8
reactos/lib/user32/windows/window.c
View file

@ -1,4 +1,4 @@
/* $Id: window.c,v 1.70 2003/08/21 15:26:19 weiden Exp $ /* $Id: window.c,v 1.71 2003/08/28 13:38:23 gvg Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS user32.dll * PROJECT: ReactOS user32.dll
@ -482,7 +482,9 @@ CreateWindowExA(DWORD dwExStyle,
HWND Handle; HWND Handle;
INT sw; INT sw;
#if 0
DbgPrint("[window] CreateWindowExA style %d, exstyle %d, parent %d\n", dwStyle, dwExStyle, hWndParent); DbgPrint("[window] CreateWindowExA style %d, exstyle %d, parent %d\n", dwStyle, dwExStyle, hWndParent);
#endif
/* Register built-in controls if not already done */ /* Register built-in controls if not already done */
if (! ControlsInitCalled) if (! ControlsInitCalled)
@ -588,7 +590,9 @@ CreateWindowExA(DWORD dwExStyle,
lpParam, lpParam,
sw); sw);
DbgPrint("[window] NtUserCreateWindowEx() == %d\n", Handle); #if 0
DbgPrint("[window] NtUserCreateWindowEx() == %d\n", Handle);
#endif
RtlFreeUnicodeString(&WindowName); RtlFreeUnicodeString(&WindowName);

11
reactos/services/eventlog/eventlog.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: eventlog.c,v 1.4 2002/09/08 10:23:44 chorns Exp $ /* $Id: eventlog.c,v 1.5 2003/08/28 13:38:23 gvg Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -64,7 +64,6 @@ PrintString(char* fmt,...)
VOID CALLBACK VOID CALLBACK
ServiceMain(DWORD argc, LPTSTR *argv) ServiceMain(DWORD argc, LPTSTR *argv)
{ {
PrintString("ServiceMain() called\n"); PrintString("ServiceMain() called\n");
@ -82,14 +81,18 @@ main(int argc, char *argv[])
HANDLE hEvent; HANDLE hEvent;
// NTSTATUS Status; // NTSTATUS Status;
#if 0
PrintString("EventLog started\n"); PrintString("EventLog started\n");
#endif
StartServiceCtrlDispatcher(ServiceTable); StartServiceCtrlDispatcher(ServiceTable);
#if 0
PrintString("StartServiceCtrlDispatcher() done\n"); PrintString("StartServiceCtrlDispatcher() done\n");
#endif
#if 0 #if 0
if (StartPortThread() == FALSE) if (StartPortThread() == FALSE)
@ -100,11 +103,15 @@ main(int argc, char *argv[])
#if 0
PrintString("EventLog waiting\n"); PrintString("EventLog waiting\n");
#endif
hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
WaitForSingleObject(hEvent, INFINITE); WaitForSingleObject(hEvent, INFINITE);
#if 0
PrintString("EventLog done\n"); PrintString("EventLog done\n");
#endif
ExitThread(0); ExitThread(0);
return(0); return(0);

4
reactos/subsys/csrss/api/conio.c
View file

@ -1,4 +1,4 @@
/* $Id: conio.c,v 1.51 2003/08/18 10:58:49 hbirr Exp $ /* $Id: conio.c,v 1.52 2003/08/28 13:38:23 gvg Exp $
* *
* reactos/subsys/csrss/api/conio.c * reactos/subsys/csrss/api/conio.c
* *
@ -155,7 +155,7 @@ CSR_API(CsrAllocConsole)
NtClose( Process ); NtClose( Process );
LOCK; LOCK;
ProcessData->CtrlDispatcher = Request->Data.AllocConsoleRequest.CtrlDispatcher; ProcessData->CtrlDispatcher = Request->Data.AllocConsoleRequest.CtrlDispatcher;
DPRINT1("CSRSS:CtrlDispatcher address: %x\n", ProcessData->CtrlDispatcher); DPRINT("CSRSS:CtrlDispatcher address: %x\n", ProcessData->CtrlDispatcher);
InsertHeadList(&ProcessData->Console->ProcessList, &ProcessData->ProcessEntry); InsertHeadList(&ProcessData->Console->ProcessList, &ProcessData->ProcessEntry);
UNLOCK; UNLOCK;

18
reactos/subsys/system/services/database.c
View file

@ -1,4 +1,4 @@
/* $Id: database.c,v 1.8 2003/08/04 17:54:52 royce Exp $ /* $Id: database.c,v 1.9 2003/08/28 13:38:24 gvg Exp $
* *
* service control manager * service control manager
* *
@ -505,7 +505,7 @@ ScmStartService(PSERVICE Service,
4, 4,
30000, 30000,
NULL); NULL);
DPRINT1("CreateNamedPipeW() done\n"); DPRINT("CreateNamedPipeW() done\n");
if (Service->ControlPipeHandle == INVALID_HANDLE_VALUE) if (Service->ControlPipeHandle == INVALID_HANDLE_VALUE)
{ {
DPRINT1("Failed to create control pipe!\n"); DPRINT1("Failed to create control pipe!\n");
@ -544,12 +544,12 @@ ScmStartService(PSERVICE Service,
} }
else else
{ {
DPRINT1("Process Id: %lu Handle %lx\n", DPRINT("Process Id: %lu Handle %lx\n",
ProcessInformation.dwProcessId, ProcessInformation.dwProcessId,
ProcessInformation.hProcess); ProcessInformation.hProcess);
DPRINT1("Thread Id: %lu Handle %lx\n", DPRINT("Thread Id: %lu Handle %lx\n",
ProcessInformation.dwThreadId, ProcessInformation.dwThreadId,
ProcessInformation.hThread); ProcessInformation.hThread);
/* Get process and thread ids */ /* Get process and thread ids */
Service->ProcessId = ProcessInformation.dwProcessId; Service->ProcessId = ProcessInformation.dwProcessId;
@ -561,7 +561,7 @@ ScmStartService(PSERVICE Service,
/* FIXME: connect control pipe */ /* FIXME: connect control pipe */
if (ConnectNamedPipe(Service->ControlPipeHandle, NULL)) if (ConnectNamedPipe(Service->ControlPipeHandle, NULL))
{ {
DPRINT1("Control pipe connected!\n"); DPRINT("Control pipe connected!\n");
Status = STATUS_SUCCESS; Status = STATUS_SUCCESS;
} }
else else

39
reactos/subsys/system/services/services.c
View file

@ -1,4 +1,4 @@
/* $Id: services.c,v 1.11 2003/01/05 19:18:44 robd Exp $ /* $Id: services.c,v 1.12 2003/08/28 13:38:24 gvg Exp $
* *
* service control manager * service control manager
* *
@ -35,8 +35,7 @@
#include "services.h" #include "services.h"
#define DBG #define NDEBUG
//#define NDEBUG
#include <debug.h> #include <debug.h>
@ -210,14 +209,14 @@ ScmNamedPipeListenerThread(LPVOID Context)
// hPipe = (HANDLE)Context; // hPipe = (HANDLE)Context;
for (;;) { for (;;) {
PrintString("SCM: Waiting for new connection on named pipe...\n"); DPRINT("SCM: Waiting for new connection on named pipe...\n");
/* Create named pipe */ /* Create named pipe */
if (!ScmCreateNamedPipe()) { if (!ScmCreateNamedPipe()) {
PrintString("\nSCM: Failed to create named pipe\n"); DPRINT1("\nSCM: Failed to create named pipe\n");
break; break;
//ExitThread(0); //ExitThread(0);
} }
PrintString("\nSCM: named pipe session created.\n"); DPRINT("\nSCM: named pipe session created.\n");
Sleep(10); Sleep(10);
} }
DPRINT("\n\nWARNING: ScmNamedPipeListenerThread(%x) - Aborted.\n\n", Context); DPRINT("\n\nWARNING: ScmNamedPipeListenerThread(%x) - Aborted.\n\n", Context);
@ -237,7 +236,7 @@ BOOL StartScmNamedPipeThreadListener(void)
&dwThreadId); &dwThreadId);
if (!hThread) { if (!hThread) {
PrintString("SERVICES: Could not create thread (Status %lx)\n", GetLastError()); DPRINT1("SERVICES: Could not create thread (Status %lx)\n", GetLastError());
return FALSE; return FALSE;
} }
return TRUE; return TRUE;
@ -253,16 +252,16 @@ WinMain(HINSTANCE hInstance,
HANDLE hEvent; HANDLE hEvent;
NTSTATUS Status; NTSTATUS Status;
PrintString("SERVICES: Service Control Manager\n"); DPRINT("SERVICES: Service Control Manager\n");
/* Create start event */ /* Create start event */
if (!ScmCreateStartEvent(&hScmStartEvent)) if (!ScmCreateStartEvent(&hScmStartEvent))
{ {
PrintString("SERVICES: Failed to create start event\n"); DPRINT1("SERVICES: Failed to create start event\n");
ExitThread(0); ExitThread(0);
} }
PrintString("SERVICES: created start event with handle %x.\n", hScmStartEvent); DPRINT("SERVICES: created start event with handle %x.\n", hScmStartEvent);
/* FIXME: more initialization */ /* FIXME: more initialization */
@ -271,7 +270,7 @@ WinMain(HINSTANCE hInstance,
Status = ScmCreateServiceDataBase(); Status = ScmCreateServiceDataBase();
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
PrintString("SERVICES: failed to create SCM database (Status %lx)\n", Status); DPRINT1("SERVICES: failed to create SCM database (Status %lx)\n", Status);
ExitThread(0); ExitThread(0);
} }
@ -279,20 +278,20 @@ WinMain(HINSTANCE hInstance,
ScmGetBootAndSystemDriverState(); ScmGetBootAndSystemDriverState();
#if 0 #if 0
PrintString("SERVICES: Attempting to create named pipe...\n"); DPRINT("SERVICES: Attempting to create named pipe...\n");
/* Create named pipe */ /* Create named pipe */
if (!ScmCreateNamedPipe()) { if (!ScmCreateNamedPipe()) {
PrintString("SERVICES: Failed to create named pipe\n"); DPRINT1("SERVICES: Failed to create named pipe\n");
ExitThread(0); ExitThread(0);
} }
PrintString("SERVICES: named pipe created successfully.\n"); DPRINT("SERVICES: named pipe created successfully.\n");
#else #else
PrintString("SERVICES: Attempting to create named pipe listener...\n"); DPRINT("SERVICES: Attempting to create named pipe listener...\n");
if (!StartScmNamedPipeThreadListener()) { if (!StartScmNamedPipeThreadListener()) {
PrintString("SERVICES: Failed to create named pipe listener thread.\n"); DPRINT1("SERVICES: Failed to create named pipe listener thread.\n");
ExitThread(0); ExitThread(0);
} }
PrintString("SERVICES: named pipe listener thread created.\n"); DPRINT("SERVICES: named pipe listener thread created.\n");
#endif #endif
/* FIXME: create listener thread for pipe */ /* FIXME: create listener thread for pipe */
@ -300,7 +299,7 @@ WinMain(HINSTANCE hInstance,
/* Register service process with CSRSS */ /* Register service process with CSRSS */
RegisterServicesProcess(GetCurrentProcessId()); RegisterServicesProcess(GetCurrentProcessId());
PrintString("SERVICES: Initialized.\n"); DPRINT("SERVICES: Initialized.\n");
/* Signal start event */ /* Signal start event */
SetEvent(hScmStartEvent); SetEvent(hScmStartEvent);
@ -315,7 +314,7 @@ WinMain(HINSTANCE hInstance,
/* FIXME: more to do ? */ /* FIXME: more to do ? */
PrintString("SERVICES: Running.\n"); DPRINT("SERVICES: Running.\n");
#if 1 #if 1
hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
@ -327,7 +326,7 @@ WinMain(HINSTANCE hInstance,
} }
#endif #endif
PrintString("SERVICES: Finished.\n"); DPRINT("SERVICES: Finished.\n");
ExitThread(0); ExitThread(0);
return(0); return(0);

6
reactos/subsys/system/winlogon/winlogon.c
View file

@ -1,4 +1,4 @@
/* $Id: winlogon.c,v 1.18 2003/03/25 19:26:33 ekohl Exp $ /* $Id: winlogon.c,v 1.19 2003/08/28 13:38:24 gvg Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -65,7 +65,9 @@ static BOOLEAN StartServices(VOID)
StartupInfo.cbReserved2 = 0; StartupInfo.cbReserved2 = 0;
StartupInfo.lpReserved2 = 0; StartupInfo.lpReserved2 = 0;
#if 0
PrintString("WL: Creating new process - \"services.exe\".\n"); PrintString("WL: Creating new process - \"services.exe\".\n");
#endif
Result = CreateProcess(CommandLine, Result = CreateProcess(CommandLine,
NULL, NULL,
@ -109,7 +111,7 @@ static BOOLEAN StartServices(VOID)
WaitForSingleObject(ServicesInitEvent, INFINITE); WaitForSingleObject(ServicesInitEvent, INFINITE);
//DbgPrint("WL: Closing event object \"SvcctrlStartEvent_A3725DX\"\n"); //DbgPrint("WL: Closing event object \"SvcctrlStartEvent_A3725DX\"\n");
CloseHandle(ServicesInitEvent); CloseHandle(ServicesInitEvent);
DbgPrint("WL: StartServices() Done.\n"); //DbgPrint("WL: StartServices() Done.\n");
return TRUE; return TRUE;
} }

4
reactos/subsys/win32k/ntuser/painting.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: painting.c,v 1.29 2003/08/19 11:48:49 weiden Exp $ /* $Id: painting.c,v 1.30 2003/08/28 13:38:24 gvg Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -462,7 +462,7 @@ PaintRedrawWindow( PWINDOW_OBJECT Window,
POINT Pt; POINT Pt;
HRGN hRgn = NULL; HRGN hRgn = NULL;
DbgPrint("[win32k.sys:painting] In PaintRedrawWindow()\n"); DPRINT("[win32k.sys:painting] In PaintRedrawWindow()\n");
if ((RDW_INVALIDATE | RDW_FRAME) == (Flags & (RDW_INVALIDATE | RDW_FRAME)) || if ((RDW_INVALIDATE | RDW_FRAME) == (Flags & (RDW_INVALIDATE | RDW_FRAME)) ||
(RDW_VALIDATE | RDW_NOFRAME) == (Flags & (RDW_VALIDATE | RDW_NOFRAME))) (RDW_VALIDATE | RDW_NOFRAME) == (Flags & (RDW_VALIDATE | RDW_NOFRAME)))

14
reactos/subsys/win32k/ntuser/window.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: window.c,v 1.104 2003/08/25 23:24:02 rcampbell Exp $ /* $Id: window.c,v 1.105 2003/08/28 13:38:24 gvg Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -1167,7 +1167,7 @@ NtUserCreateWindowEx(DWORD dwExStyle,
WindowObject->Class = ClassObject; WindowObject->Class = ClassObject;
WindowObject->ExStyle = dwExStyle; WindowObject->ExStyle = dwExStyle;
WindowObject->Style = dwStyle & ~WS_VISIBLE; WindowObject->Style = dwStyle & ~WS_VISIBLE;
DbgPrint("1: Style is now %d\n", WindowObject->Style); DPRINT("1: Style is now %d\n", WindowObject->Style);
SystemMenu = IntGetSystemMenu(WindowObject, TRUE, TRUE); SystemMenu = IntGetSystemMenu(WindowObject, TRUE, TRUE);
@ -1221,12 +1221,12 @@ NtUserCreateWindowEx(DWORD dwExStyle,
if (!(dwStyle & WS_CHILD)) if (!(dwStyle & WS_CHILD))
{ {
WindowObject->Style |= WS_CLIPSIBLINGS; WindowObject->Style |= WS_CLIPSIBLINGS;
DbgPrint("3: Style is now %d\n", WindowObject->Style); DPRINT("3: Style is now %d\n", WindowObject->Style);
if (!(dwStyle & WS_POPUP)) if (!(dwStyle & WS_POPUP))
{ {
WindowObject->Style |= WS_CAPTION; WindowObject->Style |= WS_CAPTION;
WindowObject->Flags |= WINDOWOBJECT_NEED_SIZE; WindowObject->Flags |= WINDOWOBJECT_NEED_SIZE;
DbgPrint("4: Style is now %d\n", WindowObject->Style); DPRINT("4: Style is now %d\n", WindowObject->Style);
/* FIXME: Note the window needs a size. */ /* FIXME: Note the window needs a size. */
} }
} }
@ -1293,7 +1293,7 @@ NtUserCreateWindowEx(DWORD dwExStyle,
// AG: For some reason these don't get set already. This might need moving // AG: For some reason these don't get set already. This might need moving
// elsewhere... What is actually done with WindowObject anyway, to retain // elsewhere... What is actually done with WindowObject anyway, to retain
// its data? // its data?
DbgPrint("[win32k.window] NtUserCreateWindowEx style %d, exstyle %d, parent %d\n", Cs.style, Cs.dwExStyle, Cs.hwndParent); DPRINT("[win32k.window] NtUserCreateWindowEx style %d, exstyle %d, parent %d\n", Cs.style, Cs.dwExStyle, Cs.hwndParent);
// NtUserSetWindowLong(Handle, GWL_STYLE, WindowObject->Style, TRUE); // NtUserSetWindowLong(Handle, GWL_STYLE, WindowObject->Style, TRUE);
// NtUserSetWindowLong(Handle, GWL_EXSTYLE, WindowObject->ExStyle, TRUE); // NtUserSetWindowLong(Handle, GWL_EXSTYLE, WindowObject->ExStyle, TRUE);
// Any more? // Any more?
@ -1418,10 +1418,10 @@ NtUserCreateWindowEx(DWORD dwExStyle,
WinPosShowWindow(WindowObject->Self, dwShowMode); WinPosShowWindow(WindowObject->Self, dwShowMode);
} }
/* FIXME: Should code be reworked to accomodate the following line? */ /* FIXME: Should code be reworked to accomodate the following line? */
DbgPrint("Setting Active Window to %d\n\n\n",WindowObject->Self); DPRINT("Setting Active Window to %d\n\n\n",WindowObject->Self);
NtUserSetActiveWindow(WindowObject->Self); NtUserSetActiveWindow(WindowObject->Self);
DPRINT("NtUserCreateWindow(): = %X\n", Handle); DPRINT("NtUserCreateWindow(): = %X\n", Handle);
DbgPrint("WindowObject->SystemMenu = 0x%x\n", WindowObject->SystemMenu); DPRINT("WindowObject->SystemMenu = 0x%x\n", WindowObject->SystemMenu);
return((HWND)Handle); return((HWND)Handle);
} }