\r\n for strings being displayed by NtDisplayString.

[AUTOCHK]: Fix some DPRINTs

svn path=/trunk/; revision=60656
This commit is contained in:
Hermès Bélusca-Maïto 2013-10-13 23:22:03 +00:00
parent b748144fcd
commit 2fff802939
2 changed files with 22 additions and 22 deletions

View file

@ -167,59 +167,59 @@ ChkdskCallback(
switch(Command)
{
case UNKNOWN2:
DPRINT("UNKNOWN2\r");
DPRINT("UNKNOWN2\n");
break;
case UNKNOWN3:
DPRINT("UNKNOWN3\r");
DPRINT("UNKNOWN3\n");
break;
case UNKNOWN4:
DPRINT("UNKNOWN4\r");
DPRINT("UNKNOWN4\n");
break;
case UNKNOWN5:
DPRINT("UNKNOWN5\r");
DPRINT("UNKNOWN5\n");
break;
case UNKNOWN9:
DPRINT("UNKNOWN9\r");
DPRINT("UNKNOWN9\n");
break;
case UNKNOWNA:
DPRINT("UNKNOWNA\r");
DPRINT("UNKNOWNA\n");
break;
case UNKNOWNC:
DPRINT("UNKNOWNC\r");
DPRINT("UNKNOWNC\n");
break;
case UNKNOWND:
DPRINT("UNKNOWND\r");
DPRINT("UNKNOWND\n");
break;
case INSUFFICIENTRIGHTS:
DPRINT("INSUFFICIENTRIGHTS\r");
DPRINT("INSUFFICIENTRIGHTS\n");
break;
case FSNOTSUPPORTED:
DPRINT("FSNOTSUPPORTED\r");
DPRINT("FSNOTSUPPORTED\n");
break;
case VOLUMEINUSE:
DPRINT("VOLUMEINUSE\r");
DPRINT("VOLUMEINUSE\n");
break;
case STRUCTUREPROGRESS:
DPRINT("STRUCTUREPROGRESS\r");
DPRINT("STRUCTUREPROGRESS\n");
break;
case DONEWITHSTRUCTURE:
DPRINT("DONEWITHSTRUCTURE\r");
DPRINT("DONEWITHSTRUCTURE\n");
break;
case CLUSTERSIZETOOSMALL:
DPRINT("CLUSTERSIZETOOSMALL\r");
DPRINT("CLUSTERSIZETOOSMALL\n");
break;
case PROGRESS:
@ -236,8 +236,8 @@ ChkdskCallback(
Status = (PBOOLEAN)Argument;
if (*Status == TRUE)
{
PrintString("Autochk was unable to complete successfully.\n\n");
//Error = TRUE;
PrintString("Autochk was unable to complete successfully.\r\n\r\n");
// Error = TRUE;
}
break;
}
@ -294,7 +294,7 @@ CheckVolume(
if (!NT_SUCCESS(Status))
{
DPRINT1("GetFileSystem() failed with status 0x%08lx\n", Status);
PrintString(" Unable to get file system of %S\n", DrivePath);
PrintString(" Unable to get file system of %S\r\n", DrivePath);
return Status;
}
@ -303,7 +303,7 @@ CheckVolume(
if (Provider == NULL)
{
DPRINT1("LoadProvider() failed\n");
PrintString(" Unable to verify a %S volume\n", FileSystem);
PrintString(" Unable to verify a %S volume\r\n", FileSystem);
return STATUS_DLL_NOT_FOUND;
}
@ -315,13 +315,13 @@ CheckVolume(
if (!NT_SUCCESS(Status))
{
DPRINT1("LdrGetProcedureAddress() failed with status 0x%08lx\n", Status);
PrintString(" Unable to verify a %S volume\n", FileSystem);
PrintString(" Unable to verify a %S volume\r\n", FileSystem);
LdrUnloadDll(Provider);
return Status;
}
/* Call provider */
//PrintString(" Verifying volume %S\n", DrivePath);
// PrintString(" Verifying volume %S\r\n", DrivePath);
swprintf(NtDrivePath, L"\\??\\");
wcscat(NtDrivePath, DrivePath);
NtDrivePath[wcslen(NtDrivePath)-1] = 0;
@ -384,7 +384,7 @@ _main(int argc,
CheckVolume(DrivePath);
}
}
//PrintString(" Done\n\n");
// PrintString(" Done\r\n\r\n");
return 0;
}

View file

@ -174,7 +174,7 @@ SmpInvokeAutoChk(IN PUNICODE_STRING FileName,
{
/* It wasn't, so create an error message to print on the screen */
sprintf_nt(MessageBuffer,
"%wZ program not found - skipping AUTOCHECK\n",
"%wZ program not found - skipping AUTOCHECK\r\n",
FileName);
RtlInitAnsiString(&MessageString, MessageBuffer);
if (NT_SUCCESS(RtlAnsiStringToUnicodeString(&Destination,