diff --git a/reactos/config b/reactos/config index 1b36a169c19..54baab369b7 100644 --- a/reactos/config +++ b/reactos/config @@ -13,7 +13,7 @@ KDBG := 0 # # Whether to compile for debugging # -DBG := 1 +DBG := 0 # # Whether to compile a multiprocessor or single processor version diff --git a/reactos/drivers/dd/blue/blue.c b/reactos/drivers/dd/blue/blue.c index 81aaea4321e..390c09a6f36 100644 --- a/reactos/drivers/dd/blue/blue.c +++ b/reactos/drivers/dd/blue/blue.c @@ -1,4 +1,4 @@ -/* $Id: blue.c,v 1.31 2001/08/27 01:25:37 ekohl Exp $ +/* $Id: blue.c,v 1.32 2002/02/08 02:57:07 chorns Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -610,7 +610,7 @@ DriverEntry (PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath) UNICODE_STRING DeviceName; UNICODE_STRING SymlinkName; - DbgPrint ("Screen Driver 0.0.6\n"); + DPRINT ("Screen Driver 0.0.6\n"); DriverObject->MajorFunction[IRP_MJ_CREATE] = ScrCreate; DriverObject->MajorFunction[IRP_MJ_CLOSE] = ScrDispatch; diff --git a/reactos/drivers/dd/floppy/floppy.c b/reactos/drivers/dd/floppy/floppy.c index f6d4dcca05c..ce68b291891 100644 --- a/reactos/drivers/dd/floppy/floppy.c +++ b/reactos/drivers/dd/floppy/floppy.c @@ -243,7 +243,7 @@ FloppyCreateController(PDRIVER_OBJECT DriverObject, RtlInitUnicodeString( &arcname, L"\\ArcName\\multi(0)disk(0)fdisk(0)" ); Status = IoAssignArcName( &arcname, &DeviceName ); - DbgPrint( "Floppy drive initialized\n" ); + DPRINT( "Floppy drive initialized\n" ); return TRUE; devicecleanup: @@ -499,7 +499,7 @@ NTSTATUS STDCALL DriverEntry(IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath) { - DbgPrint("Floppy driver\n"); + DPRINT("Floppy driver\n"); /* Export other driver entry points... */ DriverObject->MajorFunction[IRP_MJ_CREATE] = FloppyDispatchOpenClose; diff --git a/reactos/drivers/dd/ide/ide.c b/reactos/drivers/dd/ide/ide.c index a4d7eceff51..bc8e01ab28f 100644 --- a/reactos/drivers/dd/ide/ide.c +++ b/reactos/drivers/dd/ide/ide.c @@ -1,4 +1,4 @@ -/* $Id: ide.c,v 1.50 2002/01/24 10:04:50 ekohl Exp $ +/* $Id: ide.c,v 1.51 2002/02/08 02:57:08 chorns Exp $ * * IDE.C - IDE Disk driver * written by Rex Jolliff @@ -241,7 +241,7 @@ DriverEntry(IN PDRIVER_OBJECT DriverObject, { NTSTATUS Status; - DbgPrint("IDE Driver %s\n", VERSION); + DPRINT("IDE Driver %s\n", VERSION); /* Export other driver entry points... */ DriverObject->DriverStartIo = IDEStartIo; @@ -674,13 +674,13 @@ IDECreateDevices(IN PDRIVER_OBJECT DriverObject, /* Get the Drive Identification Data */ if (!IDEGetDriveIdentification(CommandPort, DriveIdx, &DrvParms)) { - DbgPrint("No ATA drive %d found on controller %d...\n", + DPRINT("No ATA drive %d found on controller %d...\n", DriveIdx, ControllerExtension->Number); return(FALSE); } - DbgPrint("Found ATA drive %d on controller %d...\n", + DPRINT("Found ATA drive %d on controller %d...\n", DriveIdx, ControllerExtension->Number); @@ -745,7 +745,7 @@ IDECreateDevices(IN PDRIVER_OBJECT DriverObject, ControllerExtension); } - DPRINT1("DrvParms.BytesPerSector %ld\n",DrvParms.BytesPerSector); + DPRINT("DrvParms.BytesPerSector %ld\n",DrvParms.BytesPerSector); /* Read partition table */ Status = IoReadPartitionTable(DiskDeviceObject, @@ -1072,7 +1072,7 @@ IDECreatePartitionDevice(IN PDRIVER_OBJECT DriverObject, /* Initialize the DPC object here */ IoInitializeDpcRequest(*DeviceObject, IDEDpcForIsr); - DbgPrint("%wZ %luMB\n", &DeviceName, DeviceExtension->Size / 2048); + DPRINT("%wZ %luMB\n", &DeviceName, DeviceExtension->Size / 2048); /* assign arc name */ swprintf(ArcNameBuffer, @@ -1206,7 +1206,7 @@ IDEPolledRead(IN WORD Address, { if (Status & IDE_SR_ERR) { - DPRINT1("IDE_SR_ERR asserted!\n"); + DPRINT("IDE_SR_ERR asserted!\n"); } if ((Status & IDE_SR_DRQ) && !(Status & IDE_SR_ERR)) { @@ -1247,7 +1247,7 @@ IDEPolledRead(IN WORD Address, { if (Status & IDE_SR_ERR) { - DPRINT1("IDE_SR_ERR asserted!\n"); + DPRINT("IDE_SR_ERR asserted!\n"); } if (Status & IDE_SR_DRQ) { @@ -1432,7 +1432,7 @@ IDEDispatchDeviceControl(IN PDEVICE_OBJECT DeviceObject, DiskDeviceExtension->SectorsPerLogTrk; Geometry->SectorsPerTrack = DiskDeviceExtension->SectorsPerLogTrk; Geometry->BytesPerSector = DiskDeviceExtension->BytesPerSector; -DPRINT1("DiskDeviceExtension->BytesPerSector %lu\n", DiskDeviceExtension->BytesPerSector); +DPRINT("DiskDeviceExtension->BytesPerSector %lu\n", DiskDeviceExtension->BytesPerSector); Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = sizeof(DISK_GEOMETRY); } diff --git a/reactos/drivers/dd/null/null.c b/reactos/drivers/dd/null/null.c index 317ffe7ce0f..6230abe114e 100644 --- a/reactos/drivers/dd/null/null.c +++ b/reactos/drivers/dd/null/null.c @@ -1,4 +1,4 @@ -/* $Id: null.c,v 1.5 2001/06/12 12:36:58 ekohl Exp $ +/* $Id: null.c,v 1.6 2002/02/08 02:57:08 chorns Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -84,8 +84,6 @@ DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath) UNICODE_STRING DeviceName; NTSTATUS Status; - DbgPrint("Null Device Driver 0.0.2\n"); - DeviceObject->Flags=0; DriverObject->MajorFunction[IRP_MJ_CLOSE] = NullDispatch; DriverObject->MajorFunction[IRP_MJ_CREATE] = NullDispatch; diff --git a/reactos/drivers/dd/parallel/parallel.c b/reactos/drivers/dd/parallel/parallel.c index 4c42841ccfa..dfc48be08ee 100644 --- a/reactos/drivers/dd/parallel/parallel.c +++ b/reactos/drivers/dd/parallel/parallel.c @@ -1,4 +1,4 @@ -/* $Id: parallel.c,v 1.6 2000/10/22 02:02:28 ekohl Exp $ +/* $Id: parallel.c,v 1.7 2002/02/08 02:57:08 chorns Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -130,7 +130,7 @@ DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath) UNICODE_STRING DeviceName; NTSTATUS Status; - DbgPrint("Parallel Port Driver 0.0.1\n"); + DPRINT("Parallel Port Driver 0.0.1\n"); RtlInitUnicodeString (&DeviceName, L"\\Device\\Parallel"); diff --git a/reactos/drivers/dd/ramdrv/ramdrv.c b/reactos/drivers/dd/ramdrv/ramdrv.c index 386678fcffa..a0a6d4494ba 100644 --- a/reactos/drivers/dd/ramdrv/ramdrv.c +++ b/reactos/drivers/dd/ramdrv/ramdrv.c @@ -57,7 +57,7 @@ NTSTATUS STDCALL DriverEntry(IN PDRIVER_OBJECT DriverObject, FILE_STANDARD_INFORMATION finfo; DWORD err; - DbgPrint("Ramdisk driver\n"); + DPRINT("Ramdisk driver\n"); /* Export other driver entry points... */ DriverObject->MajorFunction[IRP_MJ_CREATE] = RamdrvDispatchOpenClose; @@ -170,7 +170,7 @@ NTSTATUS STDCALL DriverEntry(IN PDRIVER_OBJECT DriverObject, DPRINT( "Failed to read floppy\n" ); goto cleantbuff; } - DbgPrint( "RAMDRV: Read in %d bytes, decompressing now\n", iosb.Information ); + DPRINT( "RAMDRV: Read in %d bytes, decompressing now\n", iosb.Information ); err = BZ2_bzBuffToBuffDecompress( devext->Buffer, &dstlen, tbuff, @@ -178,7 +178,7 @@ NTSTATUS STDCALL DriverEntry(IN PDRIVER_OBJECT DriverObject, 1, 0 ); if( err == 0 ) - DbgPrint( "RAMDRV: Image Decompressed\n"); + DPRINT( "RAMDRV: Image Decompressed\n"); else DbgPrint( "RAMDRV: Failed to decomparess image, error: %d\n", err ); ExFreePool( tbuff ); NtClose( file ); diff --git a/reactos/drivers/dd/vga/display/main/enable.c b/reactos/drivers/dd/vga/display/main/enable.c index a75cbd2e704..f584233d100 100644 --- a/reactos/drivers/dd/vga/display/main/enable.c +++ b/reactos/drivers/dd/vga/display/main/enable.c @@ -1,9 +1,9 @@ /* * entry.c * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * $Author: chorns $ - * $Date: 2001/09/23 22:14:10 $ + * $Date: 2002/02/08 02:57:09 $ * */ @@ -185,9 +185,9 @@ DHPDEV VGADDIEnablePDEV(IN DEVMODEW *DM, // FIXME: full out DevInfo devinfoVGA.hpalDefault = EngCreatePalette(PAL_INDEXED, 16, (PULONG)(VGApalette.PaletteEntry), 0, 0, 0); -DbgPrint("Palette from Driver: %u\n", devinfoVGA.hpalDefault); +DPRINT("Palette from Driver: %u\n", devinfoVGA.hpalDefault); *DI = devinfoVGA; -DbgPrint("Palette from Driver 2: %u and DI is %08x\n", DI->hpalDefault, DI); +DPRINT("Palette from Driver 2: %u and DI is %08x\n", DI->hpalDefault, DI); return PDev; } diff --git a/reactos/drivers/dd/vga/miniport/vgamp.c b/reactos/drivers/dd/vga/miniport/vgamp.c index 5ef6024b3fd..c28b6d6067c 100644 --- a/reactos/drivers/dd/vga/miniport/vgamp.c +++ b/reactos/drivers/dd/vga/miniport/vgamp.c @@ -73,8 +73,6 @@ DriverEntry(IN PVOID Context1, IN PVOID Context2) { VIDEO_HW_INITIALIZATION_DATA InitData; - - DbgPrint("VGA miniport Driver %s\n", VERSION); VideoPortZeroMemory(&InitData, sizeof InitData); diff --git a/reactos/drivers/dd/vidport/vidport.c b/reactos/drivers/dd/vidport/vidport.c index c9d0d9a5d1b..3b7dd8f05da 100644 --- a/reactos/drivers/dd/vidport/vidport.c +++ b/reactos/drivers/dd/vidport/vidport.c @@ -1,4 +1,4 @@ -/* $Id: vidport.c,v 1.20 2001/06/26 12:51:00 ekohl Exp $ +/* $Id: vidport.c,v 1.21 2002/02/08 02:57:09 chorns Exp $ * * VideoPort driver * Written by Rex Jolliff @@ -50,7 +50,6 @@ STDCALL NTSTATUS DriverEntry(IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath) { - DbgPrint("VideoPort Driver %s\n", VERSION); return STATUS_SUCCESS; } @@ -293,7 +292,7 @@ VideoPortInitialize(IN PVOID Context1, DeviceNumber++; } while (Again); - +#if 0 /* Find a process handle for csrss */ Cid.UniqueProcess = (HANDLE)3; Cid.UniqueThread = 0; @@ -320,7 +319,9 @@ VideoPortInitialize(IN PVOID Context1, Csrss = NULL; } } - +#else + Csrss = NULL; +#endif /* FIXME: initialize timer routine for MP Driver */ if (HwInitializationData->HwTimer != NULL) { @@ -792,8 +793,6 @@ VidDispatchDeviceControl(IN PDEVICE_OBJECT DeviceObject, { PVIDEO_REQUEST_PACKET vrp; - DbgPrint("IO Control code: %u\n", Irp->Stack[0].Parameters.DeviceIoControl.IoControlCode); - // Translate the IRP to a VRP vrp = ExAllocatePool(PagedPool, sizeof(VIDEO_REQUEST_PACKET)); vrp->StatusBlock = ExAllocatePool(PagedPool, sizeof(STATUS_BLOCK)); diff --git a/reactos/drivers/fs/vfat/create.c b/reactos/drivers/fs/vfat/create.c index 4c77e0f6b9e..833deaaf8db 100644 --- a/reactos/drivers/fs/vfat/create.c +++ b/reactos/drivers/fs/vfat/create.c @@ -1,4 +1,4 @@ -/* $Id: create.c,v 1.37 2002/02/05 21:32:30 hbirr Exp $ +/* $Id: create.c,v 1.38 2002/02/08 02:57:09 chorns Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -475,7 +475,7 @@ vfatMakeAbsoluteFilename (PFILE_OBJECT pFileObject, PVFATFCB fcb; PVFATCCB ccb; - DbgPrint ("try related for %S\n", pRelativeFileName); + DPRINT ("try related for %S\n", pRelativeFileName); ccb = pFileObject->FsContext2; assert (ccb); fcb = ccb->pFcb; @@ -798,7 +798,7 @@ NTSTATUS VfatCreate (PVFAT_IRP_CONTEXT IrpContext) if (IrpContext->DeviceObject->Size == sizeof (DEVICE_OBJECT)) { /* DeviceObject represents FileSystem instead of logical volume */ - DbgPrint ("FsdCreate called with file system\n"); + DPRINT ("FsdCreate called with file system\n"); IrpContext->Irp->IoStatus.Information = FILE_OPENED; Status = STATUS_SUCCESS; goto ByeBye; diff --git a/reactos/drivers/fs/vfat/iface.c b/reactos/drivers/fs/vfat/iface.c index f636cb43d2d..d42ee5c8d29 100644 --- a/reactos/drivers/fs/vfat/iface.c +++ b/reactos/drivers/fs/vfat/iface.c @@ -1,4 +1,4 @@ -/* $Id: iface.c,v 1.60 2001/11/07 02:21:19 phreak Exp $ +/* $Id: iface.c,v 1.61 2002/02/08 02:57:09 chorns Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -61,7 +61,7 @@ VfatHasFileSystem(PDEVICE_OBJECT DeviceToMount, return(Status); } - DPRINT1("Boot->SysType %.5s\n", Boot->SysType); + DPRINT("Boot->SysType %.5s\n", Boot->SysType); if (strncmp(Boot->SysType, "FAT12", 5) == 0 || strncmp(Boot->SysType, "FAT16", 5) == 0 || strncmp(((struct _BootSector32 *) (Boot))->SysType, "FAT32", 5) == 0) @@ -127,14 +127,14 @@ VfatMountDevice(PDEVICE_EXTENSION DeviceExt, if (strncmp (DeviceExt->Boot->SysType, "FAT12", 5) == 0) { - DbgPrint("FAT12\n"); + DPRINT("FAT12\n"); DeviceExt->FatType = FAT12; } else if (strncmp (((struct _BootSector32 *) (DeviceExt->Boot))->SysType, "FAT32", 5) == 0) { - DbgPrint("FAT32\n"); + DPRINT("FAT32\n"); DeviceExt->FatType = FAT32; DeviceExt->rootDirectorySectors = DeviceExt->Boot->SectorsPerCluster; DeviceExt->dataStart = DeviceExt->FATStart + DeviceExt->Boot->FATCount @@ -144,7 +144,7 @@ VfatMountDevice(PDEVICE_EXTENSION DeviceExt, } else { - DbgPrint("FAT16\n"); + DPRINT("FAT16\n"); DeviceExt->FatType = FAT16; } @@ -165,7 +165,7 @@ VfatMount (PVFAT_IRP_CONTEXT IrpContext) PVFATFCB Fcb = NULL; PVFATCCB Ccb = NULL; - DPRINT1("VfatMount(IrpContext %x)\n", IrpContext); + DPRINT("VfatMount(IrpContext %x)\n", IrpContext); assert (IrpContext); @@ -209,7 +209,7 @@ VfatMount (PVFAT_IRP_CONTEXT IrpContext) goto ByeBye; } -#if 1 +#ifdef DBG DbgPrint("BytesPerSector: %d\n", DeviceExt->Boot->BytesPerSector); DbgPrint("SectorsPerCluster: %d\n", DeviceExt->Boot->SectorsPerCluster); DbgPrint("ReservedSectors: %d\n", DeviceExt->Boot->ReservedSectors); @@ -348,14 +348,14 @@ NTSTATUS VfatFileSystemControl(PVFAT_IRP_CONTEXT IrpContext) NTSTATUS Status; - DPRINT1("VfatFileSystemControl(IrpContext %x)\n", IrpContext); + DPRINT("VfatFileSystemControl(IrpContext %x)\n", IrpContext); assert (IrpContext); switch (IrpContext->MinorFunction) { case IRP_MN_USER_FS_REQUEST: - DPRINT1("VFAT FSC: IRP_MN_USER_FS_REQUEST\n"); + DPRINT("VFAT FSC: IRP_MN_USER_FS_REQUEST\n"); Status = STATUS_INVALID_DEVICE_REQUEST; break; @@ -364,12 +364,12 @@ NTSTATUS VfatFileSystemControl(PVFAT_IRP_CONTEXT IrpContext) break; case IRP_MN_VERIFY_VOLUME: - DPRINT1("VFAT FSC: IRP_MN_VERIFY_VOLUME\n"); + DPRINT("VFAT FSC: IRP_MN_VERIFY_VOLUME\n"); Status = STATUS_INVALID_DEVICE_REQUEST; break; default: - DPRINT1("VFAT FSC: MinorFunction %d\n", IrpContext->MinorFunction); + DPRINT("VFAT FSC: MinorFunction %d\n", IrpContext->MinorFunction); Status = STATUS_INVALID_DEVICE_REQUEST; break; } @@ -397,7 +397,7 @@ DriverEntry(PDRIVER_OBJECT _DriverObject, UNICODE_STRING DeviceName; NTSTATUS Status; - DbgPrint("VFAT 0.0.6\n"); + DPRINT("VFAT 0.0.6\n"); VfatDriverObject = _DriverObject; diff --git a/reactos/drivers/input/keyboard/keyboard.c b/reactos/drivers/input/keyboard/keyboard.c index 7bd5b1613ba..48981729f6a 100644 --- a/reactos/drivers/input/keyboard/keyboard.c +++ b/reactos/drivers/input/keyboard/keyboard.c @@ -834,7 +834,7 @@ NTSTATUS STDCALL DriverEntry(PDRIVER_OBJECT DriverObject, UNICODE_STRING DeviceName; UNICODE_STRING SymlinkName; - DbgPrint("Keyboard Driver 0.0.4\n"); + DPRINT("Keyboard Driver 0.0.4\n"); DriverObject->MajorFunction[IRP_MJ_CREATE] = KbdDispatch; DriverObject->MajorFunction[IRP_MJ_CLOSE] = KbdDispatch; diff --git a/reactos/drivers/input/mouclass/mouclass.c b/reactos/drivers/input/mouclass/mouclass.c index 4c92e724720..9caf6290019 100644 --- a/reactos/drivers/input/mouclass/mouclass.c +++ b/reactos/drivers/input/mouclass/mouclass.c @@ -266,8 +266,6 @@ DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath) UNICODE_STRING DeviceName; UNICODE_STRING SymlinkName; - DbgPrint("Mouse Class Driver 0.0.1\n"); - DriverObject->MajorFunction[IRP_MJ_CREATE] = MouseClassDispatch; // DriverObject->MajorFunction[IRP_MJ_CLOSE] = MouseClassDispatch; // DriverObject->MajorFunction[IRP_MJ_READ] = MouseClassDispatch; diff --git a/reactos/drivers/input/psaux/psaux.c b/reactos/drivers/input/psaux/psaux.c index 290a77c57f1..1386de4322e 100644 --- a/reactos/drivers/input/psaux/psaux.c +++ b/reactos/drivers/input/psaux/psaux.c @@ -161,11 +161,8 @@ DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath) UNICODE_STRING SymlinkName; PDEVICE_EXTENSION DeviceExtension; - DbgPrint("PS/2 Keyboard & Mouse Driver 0.0.2\n"); - if(detect_ps2_port() == TRUE) { - DbgPrint("PS/2 Mouse Detected\n"); } else return STATUS_UNSUCCESSFUL; diff --git a/reactos/drivers/net/afd/afd/afd.c b/reactos/drivers/net/afd/afd/afd.c index 34aa082cba2..8fbe35dcf1e 100644 --- a/reactos/drivers/net/afd/afd/afd.c +++ b/reactos/drivers/net/afd/afd/afd.c @@ -127,7 +127,6 @@ VOID AfdUnload( * DriverObject = Pointer to driver object created by the system */ { - DbgPrint("Unloading Ancillary Function Driver\n"); } @@ -150,8 +149,6 @@ DriverEntry( UNICODE_STRING DeviceName; NTSTATUS Status; - DbgPrint("Ancillary Function Driver\n"); - RtlInitUnicodeString(&DeviceName, L"\\Device\\Afd"); Status = IoCreateDevice(DriverObject, sizeof(DEVICE_EXTENSION), diff --git a/reactos/lib/ntdll/ldr/startup.c b/reactos/lib/ntdll/ldr/startup.c index 8dd97903248..5f1a6b92f7b 100644 --- a/reactos/lib/ntdll/ldr/startup.c +++ b/reactos/lib/ntdll/ldr/startup.c @@ -1,4 +1,4 @@ -/* $Id: startup.c,v 1.35 2002/01/27 03:25:44 dwelch Exp $ +/* $Id: startup.c,v 1.36 2002/02/08 02:57:06 chorns Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -248,7 +248,6 @@ LdrInitializeThunk (ULONG Unknown1, ZwTerminateProcess(NtCurrentProcess(),STATUS_UNSUCCESSFUL); } - DbgPrint("Transferring control to image at %x\n",EntryPoint); Status = EntryPoint(Peb); ZwTerminateProcess(NtCurrentProcess(),Status); } diff --git a/reactos/ntoskrnl/cc/view.c b/reactos/ntoskrnl/cc/view.c index 9a2c26d0a81..94b932035fa 100644 --- a/reactos/ntoskrnl/cc/view.c +++ b/reactos/ntoskrnl/cc/view.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: view.c,v 1.36 2002/01/26 21:21:02 dwelch Exp $ +/* $Id: view.c,v 1.37 2002/02/08 02:57:06 chorns Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -560,7 +560,7 @@ CcRosInitializeFileCache(PFILE_OBJECT FileObject, VOID CcInitView(VOID) { - DPRINT1("CcInitView()\n"); + DPRINT("CcInitView()\n"); InitializeListHead(&CacheSegmentListHead); InitializeListHead(&DirtySegmentListHead); InitializeListHead(&CacheSegmentLRUListHead); diff --git a/reactos/ntoskrnl/kd/kdebug.c b/reactos/ntoskrnl/kd/kdebug.c index 480f3709d36..3bdc5ad4911 100644 --- a/reactos/ntoskrnl/kd/kdebug.c +++ b/reactos/ntoskrnl/kd/kdebug.c @@ -1,4 +1,4 @@ -/* $Id: kdebug.c,v 1.32 2002/02/02 20:13:08 ekohl Exp $ +/* $Id: kdebug.c,v 1.33 2002/02/08 02:57:06 chorns Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -201,7 +201,7 @@ KdInitSystem(ULONG Reserved, break; case ScreenDebug: - PrintString("\n Screen debugging enabled\n\n"); + //PrintString("\n Screen debugging enabled\n\n"); break; case BochsDebug: diff --git a/reactos/ntoskrnl/ke/main.c b/reactos/ntoskrnl/ke/main.c index de47b47f157..86ed648d1e3 100644 --- a/reactos/ntoskrnl/ke/main.c +++ b/reactos/ntoskrnl/ke/main.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: main.c,v 1.112 2002/01/23 23:39:25 chorns Exp $ +/* $Id: main.c,v 1.113 2002/02/08 02:57:06 chorns Exp $ * * PROJECT: ReactOS kernel * FILE: ntoskrnl/ke/main.c @@ -445,7 +445,7 @@ CreateSystemRootLink (PCSZ ParameterLine) swprintf (ArcNameBuffer, L"\\ArcName\\%S", ParamBuffer); RtlInitUnicodeString (&ArcName, ArcNameBuffer); - DPRINT1("Arc name: %wZ\n", &ArcName); + DPRINT("Arc name: %wZ\n", &ArcName); /* free ParamBuffer */ ExFreePool (ParamBuffer); @@ -485,7 +485,7 @@ CreateSystemRootLink (PCSZ ParameterLine) { RtlFreeUnicodeString (&BootPath); RtlFreeUnicodeString (&DeviceName); - DbgPrint("NtQuerySymbolicObject() failed (Status %x)\n", + CPRINT("NtQuerySymbolicObject() failed (Status %x)\n", Status); KeBugCheck (0x0); @@ -507,7 +507,7 @@ CreateSystemRootLink (PCSZ ParameterLine) RtlFreeUnicodeString (&DeviceName); if (!NT_SUCCESS(Status)) { - DbgPrint("IoCreateSymbolicLink() failed (Status %x)\n", + CPRINT("IoCreateSymbolicLink() failed (Status %x)\n", Status); KeBugCheck (0x0); @@ -525,7 +525,7 @@ CreateSystemRootLink (PCSZ ParameterLine) &ObjectAttributes); if (!NT_SUCCESS(Status)) { - DbgPrint("NtOpenSymbolicLinkObject() failed to open '\\SystemRoot' (Status %x)\n", + CPRINT("NtOpenSymbolicLinkObject() failed to open '\\SystemRoot' (Status %x)\n", Status); KeBugCheck (0x0); } @@ -627,7 +627,7 @@ InitSystemSharedUserPage (PCSZ ParameterLine) { RtlFreeUnicodeString (&BootPath); RtlFreeUnicodeString (&ArcDeviceName); - DbgPrint("NtOpenSymbolicLinkObject() failed (Status %x)\n", + CPRINT("NtOpenSymbolicLinkObject() failed (Status %x)\n", Status); KeBugCheck (0x0); @@ -641,7 +641,7 @@ InitSystemSharedUserPage (PCSZ ParameterLine) { RtlFreeUnicodeString (&BootPath); RtlFreeUnicodeString (&ArcDeviceName); - DbgPrint("NtQuerySymbolicObject() failed (Status %x)\n", + CPRINT("NtQuerySymbolicObject() failed (Status %x)\n", Status); KeBugCheck (0x0); @@ -1040,7 +1040,7 @@ ExpInitializeExecutive(VOID) /* * Initalize services loaded at boot time */ - DPRINT1("%d files loaded\n",KeLoaderBlock.ModsCount); + DPRINT("%d files loaded\n",KeLoaderBlock.ModsCount); for (i=0; i < KeLoaderBlock.ModsCount; i++) { CPRINT("Module: '%s' at %08lx, length 0x%08lx\n", diff --git a/reactos/ntoskrnl/ldr/init.c b/reactos/ntoskrnl/ldr/init.c index a26e14f1e2e..015c7f5f60f 100644 --- a/reactos/ntoskrnl/ldr/init.c +++ b/reactos/ntoskrnl/ldr/init.c @@ -95,7 +95,7 @@ NTSTATUS LdrLoadInitialProcess (VOID) FileHandle); if (!NT_SUCCESS(Status)) { - DbgPrint("ZwCreateSection failed (Status %x)\n", Status); + DPRINT("ZwCreateSection failed (Status %x)\n", Status); ZwClose(FileHandle); return(Status); } @@ -112,7 +112,7 @@ NTSTATUS LdrLoadInitialProcess (VOID) NULL); if (!NT_SUCCESS(Status)) { - DbgPrint("Could not create process\n"); + DPRINT("Could not create process\n"); return Status; } @@ -140,7 +140,7 @@ NTSTATUS LdrLoadInitialProcess (VOID) NULL); if (!NT_SUCCESS(Status)) { - DbgPrint("ObReferenceObjectByProcess() failed (Status %x)\n", Status); + DPRINT("ObReferenceObjectByProcess() failed (Status %x)\n", Status); return(Status); } diff --git a/reactos/ntoskrnl/ldr/rtl.c b/reactos/ntoskrnl/ldr/rtl.c index 399b86f089c..8ca1b6cbd84 100644 --- a/reactos/ntoskrnl/ldr/rtl.c +++ b/reactos/ntoskrnl/ldr/rtl.c @@ -1,4 +1,4 @@ -/* $Id: rtl.c,v 1.12 2001/02/10 22:51:09 dwelch Exp $ +/* $Id: rtl.c,v 1.13 2002/02/08 02:57:07 chorns Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -212,7 +212,7 @@ LdrGetProcedureAddress (IN PVOID BaseAddress, return STATUS_SUCCESS; } } - DbgPrint("LdrGetProcedureAddress: Can't resolve symbol '%Z'\n", Name); + CPRINT("LdrGetProcedureAddress: Can't resolve symbol '%Z'\n", Name); } else { @@ -225,7 +225,7 @@ LdrGetProcedureAddress (IN PVOID BaseAddress, (ULONG)AddressPtr[Ordinal - ExportDir->Base]); return STATUS_SUCCESS; } - DbgPrint("LdrGetProcedureAddress: Can't resolve symbol @%d\n", + CPRINT("LdrGetProcedureAddress: Can't resolve symbol @%d\n", Ordinal); } diff --git a/reactos/ntoskrnl/ldr/userldr.c b/reactos/ntoskrnl/ldr/userldr.c index a1a715c9123..3856b6e9d7b 100644 --- a/reactos/ntoskrnl/ldr/userldr.c +++ b/reactos/ntoskrnl/ldr/userldr.c @@ -59,7 +59,7 @@ NTSTATUS LdrpMapImage(HANDLE ProcessHandle, PAGE_READWRITE); if (!NT_SUCCESS(Status)) { - DbgPrint("Image map view of section failed (Status %x)", Status); + CPRINT("Image map view of section failed (Status %x)", Status); return(Status); } diff --git a/reactos/ntoskrnl/mm/pagefile.c b/reactos/ntoskrnl/mm/pagefile.c index d6c462578c4..8b4b5d3f379 100644 --- a/reactos/ntoskrnl/mm/pagefile.c +++ b/reactos/ntoskrnl/mm/pagefile.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: pagefile.c,v 1.16 2002/01/27 03:25:44 dwelch Exp $ +/* $Id: pagefile.c,v 1.17 2002/02/08 02:57:07 chorns Exp $ * * PROJECT: ReactOS kernel * FILE: ntoskrnl/mm/pagefile.c @@ -33,6 +33,7 @@ #include #include +#define NDEBUG #include /* TYPES *********************************************************************/ @@ -376,7 +377,7 @@ NtCreatePagingFile(IN PUNICODE_STRING PageFileName, PVOID Buffer; LARGE_INTEGER ByteOffset; - DPRINT1("NtCreatePagingFile(PageFileName %wZ, MinimumSize %d)\n", + DPRINT("NtCreatePagingFile(PageFileName %wZ, MinimumSize %d)\n", PageFileName, MinimumSize); InitializeObjectAttributes(&ObjectAttributes, diff --git a/reactos/ntoskrnl/ob/object.c b/reactos/ntoskrnl/ob/object.c index 79bf5467b37..2a7722b5136 100644 --- a/reactos/ntoskrnl/ob/object.c +++ b/reactos/ntoskrnl/ob/object.c @@ -1,4 +1,4 @@ -/* $Id: object.c,v 1.40 2001/08/30 20:38:20 dwelch Exp $ +/* $Id: object.c,v 1.41 2002/02/08 02:57:07 chorns Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -394,13 +394,13 @@ NTSTATUS ObPerformRetentionChecks(POBJECT_HEADER Header) if (Header->RefCount < 0) { - DbgPrint("Object %x/%x has invalid reference count (%d)\n", + CPRINT("Object %x/%x has invalid reference count (%d)\n", Header, HEADER_TO_BODY(Header), Header->RefCount); KeBugCheck(0); } if (Header->HandleCount < 0) { - DbgPrint("Object %x/%x has invalid handle count (%d)\n", + CPRINT("Object %x/%x has invalid handle count (%d)\n", Header, HEADER_TO_BODY(Header), Header->HandleCount); KeBugCheck(0); } diff --git a/reactos/ntoskrnl/ps/create.c b/reactos/ntoskrnl/ps/create.c index 082075d44d5..7713895a768 100644 --- a/reactos/ntoskrnl/ps/create.c +++ b/reactos/ntoskrnl/ps/create.c @@ -1,4 +1,4 @@ -/* $Id: create.c,v 1.42 2002/01/03 17:59:09 ekohl Exp $ +/* $Id: create.c,v 1.43 2002/02/08 02:57:07 chorns Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -467,7 +467,7 @@ PsCreateTeb(HANDLE ProcessHandle, &ResultLength); if (!NT_SUCCESS(Status)) { - DbgPrint("NtQueryVirtualMemory (Status %x)\n", Status); + CPRINT("NtQueryVirtualMemory (Status %x)\n", Status); KeBugCheck(0); } /* FIXME: Race between this and the above check */ diff --git a/reactos/ntoskrnl/ps/process.c b/reactos/ntoskrnl/ps/process.c index fbaaebf6305..225032f78b2 100644 --- a/reactos/ntoskrnl/ps/process.c +++ b/reactos/ntoskrnl/ps/process.c @@ -1,4 +1,4 @@ -/* $Id: process.c,v 1.76 2002/01/04 22:35:26 hbirr Exp $ +/* $Id: process.c,v 1.77 2002/02/08 02:57:07 chorns Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -87,7 +87,7 @@ PsGetNextProcess(PEPROCESS OldProcess) KernelMode); if (!NT_SUCCESS(Status)) { - DbgPrint("PsGetNextProcess(): ObReferenceObjectByPointer failed\n"); + CPRINT("PsGetNextProcess(): ObReferenceObjectByPointer failed\n"); KeBugCheck(0); } ObDereferenceObject(OldProcess); diff --git a/reactos/ntoskrnl/ps/thread.c b/reactos/ntoskrnl/ps/thread.c index 9a8bf11b144..e1a16eeb585 100644 --- a/reactos/ntoskrnl/ps/thread.c +++ b/reactos/ntoskrnl/ps/thread.c @@ -1,4 +1,4 @@ -/* $Id: thread.c,v 1.87 2002/01/15 02:51:32 dwelch Exp $ +/* $Id: thread.c,v 1.88 2002/02/08 02:57:07 chorns Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -230,7 +230,7 @@ VOID PsDispatchThreadNoLock (ULONG NewThreadStatus) return; } } - DbgPrint("CRITICAL: No threads are runnable\n"); + CPRINT("CRITICAL: No threads are runnable\n"); KeBugCheck(0); } @@ -350,7 +350,7 @@ PsPrepareForApplicationProcessorInit(ULONG Id) IdleThreads[Id] = IdleThread; NtClose(IdleThreadHandle); - DbgPrint("IdleThread for Processor %d has PID %d\n", + DPRINT("IdleThread for Processor %d has PID %d\n", Id, IdleThread->Cid.UniqueThread); } @@ -663,7 +663,7 @@ NtContinue(IN PCONTEXT Context, TrapFrame = KeGetCurrentThread()->TrapFrame; if (TrapFrame == NULL) { - DbgPrint("NtContinue called but TrapFrame was NULL\n"); + CPRINT("NtContinue called but TrapFrame was NULL\n"); KeBugCheck(0); } KeContextToTrapFrame(Context, TrapFrame); diff --git a/reactos/subsys/csrss/api/conio.c b/reactos/subsys/csrss/api/conio.c index 7aeefc61bf4..da3b4860693 100644 --- a/reactos/subsys/csrss/api/conio.c +++ b/reactos/subsys/csrss/api/conio.c @@ -1,4 +1,4 @@ -/* $Id: conio.c,v 1.27 2001/12/02 23:34:43 dwelch Exp $ +/* $Id: conio.c,v 1.28 2002/02/08 02:57:10 chorns Exp $ * * reactos/subsys/csrss/api/conio.c * @@ -15,6 +15,8 @@ #include "api.h" #include #include + +#define NDEBUG #include #define LOCK RtlEnterCriticalSection(&ActiveConsoleLock) @@ -738,7 +740,7 @@ VOID STDCALL CsrDrawConsole( PCSRSS_SCREEN_BUFFER Buff ) VOID STDCALL CsrDeleteConsole( PCSRSS_CONSOLE Console ) { ConsoleInput *Event; - DPRINT1( "CsrDeleteConsole\n" ); + DPRINT( "CsrDeleteConsole\n" ); LOCK; /* Drain input event queue */ while( Console->InputEvents.Flink != &Console->InputEvents ) @@ -777,7 +779,7 @@ VOID STDCALL CsrInitConsoleSupport(VOID) IO_STATUS_BLOCK Iosb; CONSOLE_SCREEN_BUFFER_INFO ScrInfo; - DbgPrint("CSR: CsrInitConsoleSupport()\n"); + DPRINT("CSR: CsrInitConsoleSupport()\n"); RtlInitUnicodeString(&DeviceName, L"\\??\\BlueScreen"); InitializeObjectAttributes(&ObjectAttributes, diff --git a/reactos/subsys/csrss/csrss.c b/reactos/subsys/csrss/csrss.c index a6f2a44e459..c821f84a323 100644 --- a/reactos/subsys/csrss/csrss.c +++ b/reactos/subsys/csrss/csrss.c @@ -1,4 +1,4 @@ -/* $Id: csrss.c,v 1.9 2001/08/14 12:57:16 ea Exp $ +/* $Id: csrss.c,v 1.10 2002/02/08 02:57:10 chorns Exp $ * * csrss.c - Client/Server Runtime subsystem * @@ -51,8 +51,6 @@ VOID NtProcessStartup(PPEB Peb) HANDLE CsrssInitEvent; UNICODE_STRING UnicodeString; NTSTATUS Status; - - DisplayString(L"Client/Server Runtime Subsystem\n"); ProcParams = RtlNormalizeProcessParams (Peb->ProcessParameters); @@ -106,7 +104,6 @@ VOID NtProcessStartup(PPEB Peb) } if (CsrServerInitialization (argc, argv) == TRUE) { - DisplayString( L"CSR: Subsystem initialized.\n" ); NtSetEvent(CsrssInitEvent, NULL); diff --git a/reactos/subsys/smss/init.c b/reactos/subsys/smss/init.c index c3bb71a1dd5..be7327bbe73 100644 --- a/reactos/subsys/smss/init.c +++ b/reactos/subsys/smss/init.c @@ -1,4 +1,4 @@ -/* $Id: init.c,v 1.29 2001/12/31 19:06:49 dwelch Exp $ +/* $Id: init.c,v 1.30 2002/02/08 02:57:10 chorns Exp $ * * init.c - Session Manager initialization * @@ -195,9 +195,6 @@ SmInitDosDevices(VOID) RtlInitUnicodeString(&DeviceName, LinkPtr->DeviceName); - PrintString("SM: Linking %wZ --> %wZ\n", - &LinkName, - &DeviceName); #if 0 /* check if target device exists (can be opened) */ InitializeObjectAttributes(&ObjectAttributes, @@ -489,7 +486,6 @@ BOOL InitSessionManager (HANDLE Children[]) /* * Start the Win32 subsystem (csrss.exe) */ - DisplayString (L"SM: Running csrss.exe\n"); /* initialize executable path */ wcscpy(UnicodeBuffer, L"\\??\\"); @@ -528,18 +524,15 @@ BOOL InitSessionManager (HANDLE Children[]) return FALSE; } - DbgPrint("SM: Waiting for csrss\n"); NtWaitForSingleObject(CsrssInitEvent, FALSE, NULL); - DbgPrint("SM: Finished waiting for csrss\n"); Children[CHILD_CSRSS] = ProcessInfo.ProcessHandle; /* * Start the logon process (winlogon.exe) */ - DisplayString(L"SM: Running winlogon.exe\n"); /* initialize executable path */ wcscpy(UnicodeBuffer, L"\\??\\"); diff --git a/reactos/subsys/smss/smapi.c b/reactos/subsys/smss/smapi.c index a66ad9556dc..25a3c0e557f 100644 --- a/reactos/subsys/smss/smapi.c +++ b/reactos/subsys/smss/smapi.c @@ -1,4 +1,4 @@ -/* $Id: smapi.c,v 1.4 2000/04/03 21:54:42 dwelch Exp $ +/* $Id: smapi.c,v 1.5 2002/02/08 02:57:10 chorns Exp $ * * Reactos Session Manager * @@ -10,7 +10,7 @@ #include "smss.h" -//#define NDEBUG +#define NDEBUG VOID STDCALL diff --git a/reactos/subsys/smss/smss.c b/reactos/subsys/smss/smss.c index aec6828710e..57c5b85512a 100644 --- a/reactos/subsys/smss/smss.c +++ b/reactos/subsys/smss/smss.c @@ -1,4 +1,4 @@ -/* $Id: smss.c,v 1.8 2000/10/09 00:18:00 ekohl Exp $ +/* $Id: smss.c,v 1.9 2002/02/08 02:57:10 chorns Exp $ * * smss.c - Session Manager * @@ -69,13 +69,9 @@ void NtProcessStartup (PPEB Peb) { HANDLE Children[2]; /* csrss, winlogon */ - DisplayString( L"Session Manager\n" ); - if (TRUE == InitSessionManager(Children)) { NTSTATUS wws; - - DisplayString( L"SM: Waiting for process termination...\n" ); #if 0 wws = NtWaitForMultipleObjects ( diff --git a/reactos/subsys/system/services/services.c b/reactos/subsys/system/services/services.c index f990a22d7fe..24aeec87bad 100644 --- a/reactos/subsys/system/services/services.c +++ b/reactos/subsys/system/services/services.c @@ -1,4 +1,4 @@ -/* $Id: services.c,v 1.4 2001/10/21 19:09:06 chorns Exp $ +/* $Id: services.c,v 1.5 2002/02/08 02:57:05 chorns Exp $ * * service control manager * @@ -47,6 +47,7 @@ void PrintString (char* fmt,...) { +#ifdef DBG char buffer[512]; va_list ap; @@ -55,6 +56,7 @@ void PrintString (char* fmt,...) va_end(ap); OutputDebugStringA(buffer); +#endif } diff --git a/reactos/subsys/system/shell/shell.c b/reactos/subsys/system/shell/shell.c index 9378ecbb0e6..4c080e71f37 100644 --- a/reactos/subsys/system/shell/shell.c +++ b/reactos/subsys/system/shell/shell.c @@ -1,4 +1,4 @@ -/* $Id: shell.c,v 1.7 2001/07/30 11:50:44 ea Exp $ +/* $Id: shell.c,v 1.8 2002/02/08 02:57:06 chorns Exp $ * * PROJECT : ReactOS Operating System * DESCRIPTION: ReactOS' Native Shell @@ -460,8 +460,6 @@ int main(void) InputHandle = GetStdHandle(STD_INPUT_HANDLE); OutputHandle = GetStdHandle(STD_OUTPUT_HANDLE); - debug_printf("Shell Starting...\n"); - ParseCommandLine (); for(;;) diff --git a/reactos/subsys/system/winlogon/winlogon.c b/reactos/subsys/system/winlogon/winlogon.c index d279045fd45..1b585ae150c 100644 --- a/reactos/subsys/system/winlogon/winlogon.c +++ b/reactos/subsys/system/winlogon/winlogon.c @@ -1,4 +1,4 @@ -/* $Id: winlogon.c,v 1.7 2001/06/22 02:10:11 phreak Exp $ +/* $Id: winlogon.c,v 1.8 2002/02/08 02:57:06 chorns Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -18,6 +18,8 @@ #include +#define NDEBUG +#include /* GLOBALS ******************************************************************/ @@ -50,14 +52,10 @@ BOOLEAN StartServices(VOID) CHAR CommandLine[MAX_PATH]; DWORD Count; - /* Start the service control manager (services.exe) */ - PrintString("WL: Running services.exe\n"); - + /* Start the service control manager (services.exe) */ GetSystemDirectory(CommandLine, MAX_PATH); strcat(CommandLine, "\\services.exe"); - - PrintString("WL: %s\n", CommandLine); - + StartupInfo.cb = sizeof(StartupInfo); StartupInfo.lpReserved = NULL; StartupInfo.lpDesktop = NULL; @@ -83,7 +81,6 @@ BOOLEAN StartServices(VOID) } /* wait for event creation (by SCM) for max. 20 seconds */ - PrintString("WL: Waiting for services\n"); for (Count = 0; Count < 20; Count++) { Sleep(1000); @@ -93,19 +90,14 @@ BOOLEAN StartServices(VOID) "SvcctrlStartEvent_A3725DX"); if (ServicesInitEvent != NULL) { - PrintString("WL: Opened start event\n"); break; } - PrintString("WL: Waiting for %ld seconds\n", Count+1); } /* wait for event signalization */ - DbgPrint("WL: Waiting for services initialization\n"); WaitForSingleObject(ServicesInitEvent, INFINITE); CloseHandle(ServicesInitEvent); - - DbgPrint("WL: Finished waiting for services\n"); - + return TRUE; } @@ -129,7 +121,6 @@ BOOLEAN StartLsass(VOID) } /* Start the local security authority subsystem (lsass.exe) */ - DbgPrint("WL: Running lsass.exe\n"); GetSystemDirectory(CommandLine, MAX_PATH); strcat(CommandLine, "\\lsass.exe"); @@ -158,11 +149,10 @@ BOOLEAN StartLsass(VOID) return(FALSE); } - DbgPrint("WL: Waiting for lsass\n"); + DPRINT("WL: Waiting for lsass\n"); WaitForSingleObject(LsassInitEvent, INFINITE); CloseHandle(LsassInitEvent); - DbgPrint("WL: Finished waiting for lsass\n"); return(TRUE); } @@ -174,8 +164,6 @@ VOID DoLoginUser(PCHAR Name, PCHAR Password) CHAR CommandLine[MAX_PATH]; CHAR CurrentDirectory[MAX_PATH]; - DbgPrint("WL: Running shell.exe\n"); - GetSystemDirectory(CommandLine, MAX_PATH); strcat(CommandLine, "\\shell.exe"); @@ -316,6 +304,7 @@ WinMain(HINSTANCE hInstance, /* Main loop */ for (;;) { +#if 0 /* Display login prompt */ WriteConsole(GetStdHandle(STD_OUTPUT_HANDLE), LoginPrompt, @@ -351,7 +340,7 @@ WinMain(HINSTANCE hInstance, i++; } while (Password[i - 1] != '\n'); Password[i - 1] =0; - +#endif DoLoginUser(LoginName, Password); } diff --git a/reactos/subsys/win32k/main/dllmain.c b/reactos/subsys/win32k/main/dllmain.c index 830a07fa160..bb8307b1cdc 100644 --- a/reactos/subsys/win32k/main/dllmain.c +++ b/reactos/subsys/win32k/main/dllmain.c @@ -1,4 +1,4 @@ -/* $Id: dllmain.c,v 1.23 2002/01/27 01:11:24 dwelch Exp $ +/* $Id: dllmain.c,v 1.24 2002/02/08 02:57:10 chorns Exp $ * * Entry Point for win32k.sys */ @@ -36,8 +36,6 @@ DllMain ( NTSTATUS Status; BOOLEAN Result; - DbgPrint("Win32 kernel mode driver\n"); - /* * Register user mode call interface * (system service table index = 1) @@ -49,8 +47,6 @@ DllMain ( return STATUS_UNSUCCESSFUL; } - DbgPrint("System services added successfully!\n"); - /* * Register our per-process and per-thread structures. */ @@ -99,8 +95,6 @@ BOOLEAN STDCALL W32kInitialize (VOID) { - DbgPrint("W32kInitialize\n"); - InitGdiObjectHandleTable (); // FIXME: Retrieve name from registry