Author: tkreuzer
Date: Sun Mar 29 11:29:02 2015
New Revision: 66951
URL:
http://svn.reactos.org/svn/reactos?rev=66951&view=rev
Log:
[USETUP]
Upgrade a few DPRINT to DPRINT1 for failure cases.
Modified:
trunk/reactos/base/setup/usetup/interface/usetup.c
trunk/reactos/base/setup/usetup/registry.c
trunk/reactos/base/setup/usetup/settings.c
Modified: trunk/reactos/base/setup/usetup/interface/usetup.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac…
==============================================================================
--- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Sun Mar 29 11:29:02
2015
@@ -3633,7 +3633,7 @@
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 @@
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 @@
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;
Modified: trunk/reactos/base/setup/usetup/registry.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/registry…
==============================================================================
--- trunk/reactos/base/setup/usetup/registry.c [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/registry.c [iso-8859-1] Sun Mar 29 11:29:02 2015
@@ -560,7 +560,7 @@
&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 @@
&ObjectAttributes);
if (!NT_SUCCESS(Status))
{
- DPRINT("CreateNestedKey(%wZ) failed (Status %lx)\n",
&Name, Status);
+ DPRINT1("CreateNestedKey(%wZ) failed (Status %lx)\n",
&Name, Status);
continue;
}
}
Modified: trunk/reactos/base/setup/usetup/settings.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/settings…
==============================================================================
--- trunk/reactos/base/setup/usetup/settings.c [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/settings.c [iso-8859-1] Sun Mar 29 11:29:02 2015
@@ -691,20 +691,20 @@
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 @@
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 @@
if (!INF_GetDataField(&Context, 4, &Buffer))
{
- DPRINT("INF_GetDataField() failed\n");
+ DPRINT1("INF_GetDataField() failed\n");
return FALSE;
}
@@ -742,13 +742,13 @@
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 @@
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 @@
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 @@
PGENERIC_LIST
CreateLanguageList(
HINF InfFile,
- WCHAR *DefaultLanguage)
+ WCHAR *DefaultLanguage)
{
CHAR Buffer[128];
PGENERIC_LIST List;
@@ -956,7 +956,7 @@
if (!SetupFindFirstLineW (InfFile, L"Language", NULL, &Context))
{
DestroyGenericList(List, FALSE);
- return NULL;
+ return NULL;
}
do