diff --git a/reactos/base/setup/usetup/bootsup.c b/reactos/base/setup/usetup/bootsup.c index 49ec7d7df51..4af87e0861c 100644 --- a/reactos/base/setup/usetup/bootsup.c +++ b/reactos/base/setup/usetup/bootsup.c @@ -1826,7 +1826,7 @@ InstallFatBootcodeToPartition(PUNICODE_STRING SystemRootPath, 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 @@ InstallFatBootcodeToPartition(PUNICODE_STRING SystemRootPath, 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 @@ InstallFatBootcodeToPartition(PUNICODE_STRING SystemRootPath, 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 @@ InstallFatBootcodeToPartition(PUNICODE_STRING SystemRootPath, 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)) diff --git a/reactos/base/setup/usetup/inicache.c b/reactos/base/setup/usetup/inicache.c index 0804b716f8e..d839e9505ea 100644 --- a/reactos/base/setup/usetup/inicache.c +++ b/reactos/base/setup/usetup/inicache.c @@ -1032,7 +1032,7 @@ IniCacheSave(PINICACHE Cache, } BufferSize++; /* Null-terminator */ - DPRINT1("BufferSize: %lu\n", BufferSize); + DPRINT("BufferSize: %lu\n", BufferSize); /* Allocate file buffer */ Buffer = (CHAR*) RtlAllocateHeap(ProcessHeap, diff --git a/reactos/boot/freeldr/freeldr/reactos/setupldr.c b/reactos/boot/freeldr/freeldr/reactos/setupldr.c index 575f6b7490f..c5af7d3c308 100644 --- a/reactos/boot/freeldr/freeldr/reactos/setupldr.c +++ b/reactos/boot/freeldr/freeldr/reactos/setupldr.c @@ -481,10 +481,6 @@ for(;;); /* Load keyboard driver */ -#if 0 - if (!LoadDriver(SourcePath, "keyboard.sys")) - return; -#endif if (!LoadDriver(SourcePath, "i8042prt.sys")) return; if (!LoadDriver(SourcePath, "kbdclass.sys")) diff --git a/reactos/dll/win32/user32/windows/message.c b/reactos/dll/win32/user32/windows/message.c index d40c6a77506..23a204a39b2 100644 --- a/reactos/dll/win32/user32/windows/message.c +++ b/reactos/dll/win32/user32/windows/message.c @@ -1249,7 +1249,7 @@ CallWindowProcA(WNDPROC lpPrevWndFunc, 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 @@ CallWindowProcW(WNDPROC lpPrevWndFunc, hWnd, Msg, wParam, lParam); else { - DPRINT("CallWindowProcW: can not dereference WndProcHandle\n"); + WARN("CallWindowProcW: can not dereference WndProcHandle\n"); return 0; } } diff --git a/reactos/drivers/filesystems/vfat/create.c b/reactos/drivers/filesystems/vfat/create.c index 91759bb3845..fcc83dafe2f 100644 --- a/reactos/drivers/filesystems/vfat/create.c +++ b/reactos/drivers/filesystems/vfat/create.c @@ -249,7 +249,7 @@ FindFile ( } else { - CHECKPOINT1; + DPRINT1("File not found %wZ\n", &PathNameU); Status = STATUS_UNSUCCESSFUL; } vfatReleaseFCB(DeviceExt, rcFcb); diff --git a/reactos/drivers/input/i8042prt/registry.c b/reactos/drivers/input/i8042prt/registry.c index 2e532dd1615..8bad8ef14b7 100644 --- a/reactos/drivers/input/i8042prt/registry.c +++ b/reactos/drivers/input/i8042prt/registry.c @@ -194,13 +194,13 @@ VOID STDCALL I8042ReadRegistry(PDRIVER_OBJECT DriverObject, * 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"); } diff --git a/reactos/drivers/setup/blue/blue.c b/reactos/drivers/setup/blue/blue.c index 2b1743cb4fd..2cd7e007ee4 100644 --- a/reactos/drivers/setup/blue/blue.c +++ b/reactos/drivers/setup/blue/blue.c @@ -255,7 +255,7 @@ ScrAcquireOwnership(PDEVICE_EXTENSION DeviceExtension) 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); diff --git a/reactos/drivers/storage/scsiport/scsiport.c b/reactos/drivers/storage/scsiport/scsiport.c index 465832a5e49..0ba18aa405a 100644 --- a/reactos/drivers/storage/scsiport/scsiport.c +++ b/reactos/drivers/storage/scsiport/scsiport.c @@ -806,7 +806,7 @@ SpiInitOpenKeys(PCONFIGURATION_INFO ConfigInfo, PUNICODE_STRING RegistryPath) 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 @@ SpiInitOpenKeys(PCONFIGURATION_INFO ConfigInfo, PUNICODE_STRING RegistryPath) } } - /* Open the Device key */ - RtlInitUnicodeString(&KeyName, L"Device"); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - ConfigInfo->ServiceKey, - NULL); + 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); + /* We don't check for failure here - not needed */ + ZwOpenKey(&ConfigInfo->DeviceKey, + KEY_READ, + &ObjectAttributes); + } } diff --git a/reactos/include/psdk/msidefs.h b/reactos/include/psdk/msidefs.h index 30649072d2c..8a68932a5f1 100644 --- a/reactos/include/psdk/msidefs.h +++ b/reactos/include/psdk/msidefs.h @@ -168,6 +168,12 @@ enum msidbComponentAttributes msidbComponentAttributes64bit = 0x00000100 }; +enum msidbODBCDataSourceRegistration +{ + msidbODBCDataSourceRegistrationPerMachine = 0x00000000, + msidbODBCDataSourceRegistrationPerUser = 0x00000001 +}; + enum msidbRegistryRoot { msidbRegistryRootClassesRoot = 0, diff --git a/reactos/ntoskrnl/config/i386/cmhardwr.c b/reactos/ntoskrnl/config/i386/cmhardwr.c index 6d728c27bf2..e6e21769fc1 100644 --- a/reactos/ntoskrnl/config/i386/cmhardwr.c +++ b/reactos/ntoskrnl/config/i386/cmhardwr.c @@ -304,7 +304,13 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc 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 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc /* 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)) + if (BiosHandle) { - /* Save it to the registry */ - Status = NtSetValueKey(BiosHandle, - &ValueName, - 0, - REG_SZ, - Data.Buffer, - Data.Length + sizeof(UNICODE_NULL)); + /* Get the BIOS Date Identifier */ + RtlCopyMemory(Buffer, (PCHAR)BaseAddress + (16*PAGE_SIZE - 11), 8); + Buffer[8] = ANSI_NULL; - /* Free the string */ - RtlFreeUnicodeString(&Data); + /* 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); } - - /* Close the bios information handle */ - NtClose(BiosHandle); } /* Get the BIOS Version */ diff --git a/reactos/ntoskrnl/fstub/disksup.c b/reactos/ntoskrnl/fstub/disksup.c index a750bbc65f3..a30b52e2e8f 100644 --- a/reactos/ntoskrnl/fstub/disksup.c +++ b/reactos/ntoskrnl/fstub/disksup.c @@ -461,7 +461,7 @@ xHalIoAssignDriveLetters(IN PLOADER_PARAMETER_BLOCK LoaderBlock, 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 */ diff --git a/reactos/ntoskrnl/io/iomgr/driver.c b/reactos/ntoskrnl/io/iomgr/driver.c index 8ecb5e9c5da..6b913dde444 100644 --- a/reactos/ntoskrnl/io/iomgr/driver.c +++ b/reactos/ntoskrnl/io/iomgr/driver.c @@ -787,7 +787,6 @@ IopInitializeBuiltinDriver(IN PLDR_DATA_TABLE_ENTRY LdrEntry) if (!NT_SUCCESS(Status)) { IopFreeDeviceNode(DeviceNode); - CPRINT("Driver '%wZ' load failed, status (%x)\n", ModuleName, Status); return Status; } @@ -1253,6 +1252,7 @@ try_again: 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); } diff --git a/reactos/ntoskrnl/io/iomgr/iorsrce.c b/reactos/ntoskrnl/io/iomgr/iorsrce.c index c208166387f..34f12e4cd37 100644 --- a/reactos/ntoskrnl/io/iomgr/iorsrce.c +++ b/reactos/ntoskrnl/io/iomgr/iorsrce.c @@ -698,7 +698,7 @@ IoReportResourceUsage(PUNICODE_STRING DriverClassName, * a conflict is detected with another driver. */ { - DPRINT1("IoReportResourceUsage is unimplemented\n"); + UNIMPLEMENTED; *ConflictDetected = FALSE; return STATUS_SUCCESS; }