- Fix an NTSTATUS vs boolean issue
- Fix an MSVC warning

svn path=/trunk/; revision=56853
This commit is contained in:
Thomas Faber 2012-07-08 16:04:39 +00:00
parent cdb96189b4
commit 2d81eed739

View file

@ -160,8 +160,8 @@ SmpInvokeAutoChk(IN PUNICODE_STRING FileName,
IN PUNICODE_STRING Arguments, IN PUNICODE_STRING Arguments,
IN ULONG Flags) IN ULONG Flags)
{ {
ANSI_STRING DestinationString; ANSI_STRING MessageString;
CHAR SourceString[256]; CHAR MessageBuffer[256];
UNICODE_STRING Destination; UNICODE_STRING Destination;
WCHAR Buffer[1024]; WCHAR Buffer[1024];
BOOLEAN BootState, BootOkay, ShutdownOkay; BOOLEAN BootState, BootOkay, ShutdownOkay;
@ -173,13 +173,13 @@ SmpInvokeAutoChk(IN PUNICODE_STRING FileName,
if (Flags & SMP_INVALID_PATH) if (Flags & SMP_INVALID_PATH)
{ {
/* It wasn't, so create an error message to print on the screen */ /* It wasn't, so create an error message to print on the screen */
sprintf_nt(SourceString, sprintf_nt(MessageBuffer,
"%wZ program not found - skipping AUTOCHECK\n", "%wZ program not found - skipping AUTOCHECK\n",
FileName); FileName);
RtlInitAnsiString(&DestinationString, SourceString); RtlInitAnsiString(&MessageString, MessageBuffer);
if (RtlAnsiStringToUnicodeString(&Destination, if (NT_SUCCESS(RtlAnsiStringToUnicodeString(&Destination,
&DestinationString, &MessageString,
TRUE)) TRUE)))
{ {
/* And show it */ /* And show it */
NtDisplayString(&Destination); NtDisplayString(&Destination);
@ -469,7 +469,7 @@ _main(IN INT argc,
ASSERT(NT_SUCCESS(Status)); ASSERT(NT_SUCCESS(Status));
/* Save the debug flag if it was passed */ /* Save the debug flag if it was passed */
if (DebugFlag) SmpDebug = DebugFlag; if (DebugFlag) SmpDebug = DebugFlag != 0;
/* Build the hard error parameters */ /* Build the hard error parameters */
Parameters[0] = (ULONG_PTR)&DbgString; Parameters[0] = (ULONG_PTR)&DbgString;