From 774369adf561f7e3871e9792480402a1ec9242a9 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Sun, 29 Mar 2015 11:29:02 +0000 Subject: [PATCH] [USETUP] Upgrade a few DPRINT to DPRINT1 for failure cases. svn path=/trunk/; revision=66951 --- reactos/base/setup/usetup/interface/usetup.c | 6 ++--- reactos/base/setup/usetup/registry.c | 4 ++-- reactos/base/setup/usetup/settings.c | 24 ++++++++++---------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/reactos/base/setup/usetup/interface/usetup.c b/reactos/base/setup/usetup/interface/usetup.c index 84e0e04de30..8a5ccdaccc5 100644 --- a/reactos/base/setup/usetup/interface/usetup.c +++ b/reactos/base/setup/usetup/interface/usetup.c @@ -3633,7 +3633,7 @@ RegistryPage(PINPUT_RECORD Ir) if (!SetInstallPathValue(&DestinationPath)) { - DPRINT("SetInstallPathValue() failed\n"); + DPRINT1("SetInstallPathValue() failed\n"); MUIDisplayError(ERROR_INITIALIZE_REGISTRY, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } @@ -3643,7 +3643,7 @@ RegistryPage(PINPUT_RECORD Ir) Status = NtInitializeRegistry(CM_BOOT_FLAG_SETUP); if (!NT_SUCCESS(Status)) { - DPRINT("NtInitializeRegistry() failed (Status %lx)\n", Status); + DPRINT1("NtInitializeRegistry() failed (Status %lx)\n", Status); MUIDisplayError(ERROR_CREATE_HIVE, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } @@ -3689,7 +3689,7 @@ RegistryPage(PINPUT_RECORD Ir) if (!ImportRegistryFile(File, Section, LanguageId, Delete)) { - DPRINT("Importing %S failed\n", File); + DPRINT1("Importing %S failed\n", File); MUIDisplayError(ERROR_IMPORT_HIVE, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; diff --git a/reactos/base/setup/usetup/registry.c b/reactos/base/setup/usetup/registry.c index 032c5d961b9..55ee8e9016c 100644 --- a/reactos/base/setup/usetup/registry.c +++ b/reactos/base/setup/usetup/registry.c @@ -560,7 +560,7 @@ registry_callback(HINF hInf, PCWSTR Section, BOOLEAN Delete) &ObjectAttributes); if (!NT_SUCCESS(Status)) { - DPRINT("NtOpenKey(%wZ) failed (Status %lx)\n", &Name, Status); + DPRINT1("NtOpenKey(%wZ) failed (Status %lx)\n", &Name, Status); continue; /* ignore if it doesn't exist */ } } @@ -571,7 +571,7 @@ registry_callback(HINF hInf, PCWSTR Section, BOOLEAN Delete) &ObjectAttributes); if (!NT_SUCCESS(Status)) { - DPRINT("CreateNestedKey(%wZ) failed (Status %lx)\n", &Name, Status); + DPRINT1("CreateNestedKey(%wZ) failed (Status %lx)\n", &Name, Status); continue; } } diff --git a/reactos/base/setup/usetup/settings.c b/reactos/base/setup/usetup/settings.c index 03461671742..5cec9e77ad7 100644 --- a/reactos/base/setup/usetup/settings.c +++ b/reactos/base/setup/usetup/settings.c @@ -691,20 +691,20 @@ ProcessDisplayRegistry( Entry = GetCurrentListEntry(List); if (Entry == NULL) { - DPRINT("GetCurrentListEntry() failed\n"); + DPRINT1("GetCurrentListEntry() failed\n"); return FALSE; } if (!SetupFindFirstLineW(InfFile, L"Display", (WCHAR*)GetListEntryUserData(Entry), &Context)) { - DPRINT("SetupFindFirstLineW() failed\n"); + DPRINT1("SetupFindFirstLineW() failed\n"); return FALSE; } /* Enable the right driver */ if (!INF_GetDataField(&Context, 3, &ServiceName)) { - DPRINT("INF_GetDataField() failed\n"); + DPRINT1("INF_GetDataField() failed\n"); return FALSE; } @@ -720,7 +720,7 @@ ProcessDisplayRegistry( sizeof(ULONG)); if (!NT_SUCCESS(Status)) { - DPRINT("RtlWriteRegistryValue() failed (Status %lx)\n", Status); + DPRINT1("RtlWriteRegistryValue() failed (Status %lx)\n", Status); return FALSE; } @@ -729,7 +729,7 @@ ProcessDisplayRegistry( if (!INF_GetDataField(&Context, 4, &Buffer)) { - DPRINT("INF_GetDataField() failed\n"); + DPRINT1("INF_GetDataField() failed\n"); return FALSE; } @@ -742,13 +742,13 @@ ProcessDisplayRegistry( sizeof(ULONG)); if (!NT_SUCCESS(Status)) { - DPRINT("RtlWriteRegistryValue() failed (Status %lx)\n", Status); + DPRINT1("RtlWriteRegistryValue() failed (Status %lx)\n", Status); return FALSE; } if (!INF_GetDataField(&Context, 5, &Buffer)) { - DPRINT("INF_GetDataField() failed\n"); + DPRINT1("INF_GetDataField() failed\n"); return FALSE; } @@ -761,13 +761,13 @@ ProcessDisplayRegistry( sizeof(ULONG)); if (!NT_SUCCESS(Status)) { - DPRINT("RtlWriteRegistryValue() failed (Status %lx)\n", Status); + DPRINT1("RtlWriteRegistryValue() failed (Status %lx)\n", Status); return FALSE; } if (!INF_GetDataField(&Context, 6, &Buffer)) { - DPRINT("INF_GetDataField() failed\n"); + DPRINT1("INF_GetDataField() failed\n"); return FALSE; } @@ -780,7 +780,7 @@ ProcessDisplayRegistry( sizeof(ULONG)); if (!NT_SUCCESS(Status)) { - DPRINT("RtlWriteRegistryValue() failed (Status %lx)\n", Status); + DPRINT1("RtlWriteRegistryValue() failed (Status %lx)\n", Status); return FALSE; } @@ -928,7 +928,7 @@ GetDefaultLanguageIndex(VOID) PGENERIC_LIST CreateLanguageList( HINF InfFile, - WCHAR *DefaultLanguage) + WCHAR *DefaultLanguage) { CHAR Buffer[128]; PGENERIC_LIST List; @@ -956,7 +956,7 @@ CreateLanguageList( if (!SetupFindFirstLineW (InfFile, L"Language", NULL, &Context)) { DestroyGenericList(List, FALSE); - return NULL; + return NULL; } do