Author: hpoussin Date: Tue Aug 7 15:45:30 2007 New Revision: 28217
URL: http://svn.reactos.org/svn/reactos?rev=28217&view=rev Log: Remove some debug messages scsiport.c: Do not try to open Device subkey if we don't have a service key cmhardwr.c: Write BIOS information only if we succeeded to open the key
Modified: trunk/reactos/base/setup/usetup/bootsup.c trunk/reactos/base/setup/usetup/inicache.c trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c trunk/reactos/dll/win32/user32/windows/message.c trunk/reactos/drivers/filesystems/vfat/create.c trunk/reactos/drivers/input/i8042prt/registry.c trunk/reactos/drivers/setup/blue/blue.c trunk/reactos/drivers/storage/scsiport/scsiport.c trunk/reactos/include/psdk/msidefs.h trunk/reactos/ntoskrnl/config/i386/cmhardwr.c trunk/reactos/ntoskrnl/fstub/disksup.c trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c
Modified: trunk/reactos/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.c... ============================================================================== --- trunk/reactos/base/setup/usetup/bootsup.c (original) +++ trunk/reactos/base/setup/usetup/bootsup.c Tue Aug 7 15:45:30 2007 @@ -1826,7 +1826,7 @@ NTSTATUS Status;
/* FAT or FAT32 partition */ - DPRINT1("System path: '%wZ'\n", SystemRootPath); + DPRINT("System path: '%wZ'\n", SystemRootPath);
if (DoesFileExist(SystemRootPath->Buffer, L"ntldr") == TRUE || DoesFileExist(SystemRootPath->Buffer, L"boot.ini") == TRUE) @@ -2040,7 +2040,7 @@ wcscpy(DstPath, SystemRootPath->Buffer); wcscat(DstPath, L"\freeldr.sys");
- DPRINT1("Copy: %S ==> %S\n", SrcPath, DstPath); + DPRINT("Copy: %S ==> %S\n", SrcPath, DstPath); Status = SetupCopyFile(SrcPath, DstPath); if (!NT_SUCCESS(Status)) { @@ -2055,7 +2055,7 @@ wcscpy(DstPath, SystemRootPath->Buffer); wcscat(DstPath, L"\freeldr.ini");
- DPRINT1("Copy: %S ==> %S\n", SrcPath, DstPath); + DPRINT("Copy: %S ==> %S\n", SrcPath, DstPath); Status = CreateFreeLoaderIniForReactos(DstPath, DestinationArcPath->Buffer); if (!NT_SUCCESS(Status)) @@ -2069,7 +2069,7 @@ wcscpy(DstPath, SystemRootPath->Buffer); wcscat(DstPath, L"\bootsect.old");
- DPRINT1("Save bootsector: %S ==> %S\n", SrcPath, DstPath); + DPRINT("Save bootsector: %S ==> %S\n", SrcPath, DstPath); Status = SaveCurrentBootSector(SrcPath, DstPath); if (!NT_SUCCESS(Status))
Modified: trunk/reactos/base/setup/usetup/inicache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/inicache.... ============================================================================== --- trunk/reactos/base/setup/usetup/inicache.c (original) +++ trunk/reactos/base/setup/usetup/inicache.c Tue Aug 7 15:45:30 2007 @@ -1032,7 +1032,7 @@ } BufferSize++; /* Null-terminator */
- DPRINT1("BufferSize: %lu\n", BufferSize); + DPRINT("BufferSize: %lu\n", BufferSize);
/* Allocate file buffer */ Buffer = (CHAR*) RtlAllocateHeap(ProcessHeap,
Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/reacto... ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Tue Aug 7 15:45:30 2007 @@ -481,10 +481,6 @@
/* Load keyboard driver */ -#if 0 - if (!LoadDriver(SourcePath, "keyboard.sys")) - return; -#endif if (!LoadDriver(SourcePath, "i8042prt.sys")) return; if (!LoadDriver(SourcePath, "kbdclass.sys"))
Modified: trunk/reactos/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/me... ============================================================================== --- trunk/reactos/dll/win32/user32/windows/message.c (original) +++ trunk/reactos/dll/win32/user32/windows/message.c Tue Aug 7 15:45:30 2007 @@ -1249,7 +1249,7 @@ hWnd, Msg, wParam, lParam); else { - DPRINT("CallWindowProcA: can not dereference WndProcHandle\n"); + WARN("CallWindowProcA: can not dereference WndProcHandle\n"); return 0; } } @@ -1282,7 +1282,7 @@ hWnd, Msg, wParam, lParam); else { - DPRINT("CallWindowProcW: can not dereference WndProcHandle\n"); + WARN("CallWindowProcW: can not dereference WndProcHandle\n"); return 0; } }
Modified: trunk/reactos/drivers/filesystems/vfat/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/vfat/cr... ============================================================================== --- trunk/reactos/drivers/filesystems/vfat/create.c (original) +++ trunk/reactos/drivers/filesystems/vfat/create.c Tue Aug 7 15:45:30 2007 @@ -249,7 +249,7 @@ } else { - CHECKPOINT1; + DPRINT1("File not found %wZ\n", &PathNameU); Status = STATUS_UNSUCCESSFUL; } vfatReleaseFCB(DeviceExt, rcFcb);
Modified: trunk/reactos/drivers/input/i8042prt/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/regi... ============================================================================== --- trunk/reactos/drivers/input/i8042prt/registry.c (original) +++ trunk/reactos/drivers/input/i8042prt/registry.c Tue Aug 7 15:45:30 2007 @@ -194,13 +194,13 @@ * set them manually anyway... */ RTL_QUERY_REGISTRY_TABLE *Current = Parameters; - DPRINT1 ("Can't read registry: %x\n", Status); + DPRINT ("Can't read registry: %x\n", Status); while (Current->Name) { *((PULONG)Current->EntryContext) = *((PULONG)Current->DefaultData); Current++; } - DPRINT1 ("Manually set defaults\n"); + DPRINT ("Manually set defaults\n");
}
Modified: trunk/reactos/drivers/setup/blue/blue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/setup/blue/blue.c?r... ============================================================================== --- trunk/reactos/drivers/setup/blue/blue.c (original) +++ trunk/reactos/drivers/setup/blue/blue.c Tue Aug 7 15:45:30 2007 @@ -255,7 +255,7 @@ DeviceExtension->Rows = 30; #endif
- DPRINT1 ("%d Columns %d Rows %d Scanlines\n", + DPRINT ("%d Columns %d Rows %d Scanlines\n", DeviceExtension->Columns, DeviceExtension->Rows, DeviceExtension->ScanLines);
Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/sc... ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.c (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c Tue Aug 7 15:45:30 2007 @@ -806,7 +806,7 @@
if (!NT_SUCCESS(Status)) { - DPRINT1("Unable to open driver's registry key %wZ, status 0x%08x\n", RegistryPath, Status); + DPRINT("Unable to open driver's registry key %wZ, status 0x%08x\n", RegistryPath, Status); ConfigInfo->ServiceKey = NULL; }
@@ -835,18 +835,21 @@ } }
- /* Open the Device key */ - RtlInitUnicodeString(&KeyName, L"Device"); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - ConfigInfo->ServiceKey, - NULL); - - /* We don't check for failure here - not needed */ - ZwOpenKey(&ConfigInfo->DeviceKey, - KEY_READ, - &ObjectAttributes); + if (ConfigInfo->ServiceKey != NULL) + { + /* Open the Device key */ + RtlInitUnicodeString(&KeyName, L"Device"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + ConfigInfo->ServiceKey, + NULL); + + /* We don't check for failure here - not needed */ + ZwOpenKey(&ConfigInfo->DeviceKey, + KEY_READ, + &ObjectAttributes); + } }
Modified: trunk/reactos/include/psdk/msidefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msidefs.h?rev=... ============================================================================== --- trunk/reactos/include/psdk/msidefs.h (original) +++ trunk/reactos/include/psdk/msidefs.h Tue Aug 7 15:45:30 2007 @@ -166,6 +166,12 @@ msidbComponentAttributesTransitive = 0x00000040, msidbComponentAttributesNeverOverwrite = 0x00000080, msidbComponentAttributes64bit = 0x00000100 +}; + +enum msidbODBCDataSourceRegistration +{ + msidbODBCDataSourceRegistrationPerMachine = 0x00000000, + msidbODBCDataSourceRegistrationPerUser = 0x00000001 };
enum msidbRegistryRoot
Modified: trunk/reactos/ntoskrnl/config/i386/cmhardwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/i386/cmhard... ============================================================================== --- trunk/reactos/ntoskrnl/config/i386/cmhardwr.c (original) +++ trunk/reactos/ntoskrnl/config/i386/cmhardwr.c Tue Aug 7 15:45:30 2007 @@ -304,7 +304,13 @@ NULL, REG_OPTION_NON_VOLATILE, &Disposition); - if (!NT_SUCCESS(Status) && !ExpInTextModeSetup) return Status; + if (ExpInTextModeSetup) + { + if (!NT_SUCCESS(Status)) + BiosHandle = NULL; + } + else if (!NT_SUCCESS(Status)) + return Status;
/* Create the CPU Key, and check if it already existed */ RtlInitUnicodeString(&KeyName, L"CentralProcessor"); @@ -623,29 +629,32 @@ /* Free the string */ RtlFreeUnicodeString(&Data);
- /* Get the BIOS Date Identifier */ - RtlCopyMemory(Buffer, (PCHAR)BaseAddress + (16*PAGE_SIZE - 11), 8); - Buffer[8] = ANSI_NULL; - - /* Convert it to unicode */ - RtlInitAnsiString(&TempString, Buffer); - Status = RtlAnsiStringToUnicodeString(&Data, &TempString, TRUE); - if (NT_SUCCESS(Status)) - { - /* Save it to the registry */ - Status = NtSetValueKey(BiosHandle, - &ValueName, - 0, - REG_SZ, - Data.Buffer, - Data.Length + sizeof(UNICODE_NULL)); - - /* Free the string */ - RtlFreeUnicodeString(&Data); - } - - /* Close the bios information handle */ - NtClose(BiosHandle); + if (BiosHandle) + { + /* Get the BIOS Date Identifier */ + RtlCopyMemory(Buffer, (PCHAR)BaseAddress + (16*PAGE_SIZE - 11), 8); + Buffer[8] = ANSI_NULL; + + /* Convert it to unicode */ + RtlInitAnsiString(&TempString, Buffer); + Status = RtlAnsiStringToUnicodeString(&Data, &TempString, TRUE); + if (NT_SUCCESS(Status)) + { + /* Save it to the registry */ + Status = NtSetValueKey(BiosHandle, + &ValueName, + 0, + REG_SZ, + Data.Buffer, + Data.Length + sizeof(UNICODE_NULL)); + + /* Free the string */ + RtlFreeUnicodeString(&Data); + } + + /* Close the bios information handle */ + NtClose(BiosHandle); + } }
/* Get the BIOS Version */
Modified: trunk/reactos/ntoskrnl/fstub/disksup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/disksup.c?re... ============================================================================== --- trunk/reactos/ntoskrnl/fstub/disksup.c (original) +++ trunk/reactos/ntoskrnl/fstub/disksup.c Tue Aug 7 15:45:30 2007 @@ -461,7 +461,7 @@ if (!NT_SUCCESS(Status)) { hKey = NULL; - DPRINT1("ZwCreateKey failed for %wZ, status=%x\n", &UnicodeString1, Status); + DPRINT("ZwCreateKey failed for %wZ, status=%x\n", &UnicodeString1, Status); }
/* Create PhysicalDrive links */
Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c?... ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Tue Aug 7 15:45:30 2007 @@ -787,7 +787,6 @@ if (!NT_SUCCESS(Status)) { IopFreeDeviceNode(DeviceNode); - CPRINT("Driver '%wZ' load failed, status (%x)\n", ModuleName, Status); return Status; }
@@ -1253,6 +1252,7 @@ if (!NT_SUCCESS(Status)) { /* If it didn't work, then kill the object */ + DPRINT1("'%wZ' initialization failed, status (0x%08lx)\n", DriverName, Status); ObMakeTemporaryObject(DriverObject); ObDereferenceObject(DriverObject); }
Modified: trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c... ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c Tue Aug 7 15:45:30 2007 @@ -698,7 +698,7 @@ * a conflict is detected with another driver. */ { - DPRINT1("IoReportResourceUsage is unimplemented\n"); + UNIMPLEMENTED; *ConflictDetected = FALSE; return STATUS_SUCCESS; }