Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 09:13:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTDLL]

Browse source 
Fix harderror status on machine type mismatch and pass file name.

svn path=/trunk/; revision=50106
This commit is contained in:
Timo Kreuzer 2010-12-22 20:20:52 +00:00
parent 96d2fe3970
commit 27a2217c5b
1 changed files with 41 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

50
reactos/dll/ntdll/ldr/startup.c
View file

@ -330,7 +330,6 @@ LdrpInit2(PCONTEXT Context,
SYSTEM_BASIC_INFORMATION SystemInformation; SYSTEM_BASIC_INFORMATION SystemInformation;
NTSTATUS Status; NTSTATUS Status;
PVOID BaseAddress = SystemArgument1; PVOID BaseAddress = SystemArgument1;
ULONG ErrorResponse;
DPRINT("LdrpInit()\n"); DPRINT("LdrpInit()\n");
DPRINT("Peb %p\n", Peb); DPRINT("Peb %p\n", Peb);
@ -356,14 +355,6 @@ LdrpInit2(PCONTEXT Context,
ZwTerminateProcess(NtCurrentProcess(), STATUS_INVALID_IMAGE_FORMAT); ZwTerminateProcess(NtCurrentProcess(), STATUS_INVALID_IMAGE_FORMAT);
} }
if (NTHeaders->FileHeader.Machine != IMAGE_FILE_MACHINE_NATIVE)
{
DPRINT1("Image is for a foreign architecture (0x%x).\n",
NTHeaders->FileHeader.Machine);
NtRaiseHardError(STATUS_IMAGE_MACHINE_TYPE_MISMATCH, 0, 0, NULL, OptionOk, &ErrorResponse);
ZwTerminateProcess(NtCurrentProcess(), STATUS_IMAGE_MACHINE_TYPE_MISMATCH);
}
/* normalize process parameters */ /* normalize process parameters */
RtlNormalizeProcessParams(Peb->ProcessParameters); RtlNormalizeProcessParams(Peb->ProcessParameters);
@ -408,6 +399,47 @@ LdrpInit2(PCONTEXT Context,
ZwTerminateProcess(NtCurrentProcess(), STATUS_INSUFFICIENT_RESOURCES); ZwTerminateProcess(NtCurrentProcess(), STATUS_INSUFFICIENT_RESOURCES);
} }
/* Check for correct machine type */
if (NTHeaders->FileHeader.Machine != IMAGE_FILE_MACHINE_NATIVE)
{
ULONG_PTR HardErrorParameters[1];
UNICODE_STRING ImageNameU;
ANSI_STRING ImageNameA;
WCHAR *Ptr;
ULONG ErrorResponse;
DPRINT1("Image %wZ is for a foreign architecture (0x%x).\n",
&Peb->ProcessParameters->ImagePathName, NTHeaders->FileHeader.Machine);
/* Get the full image path name */
ImageNameU = Peb->ProcessParameters->ImagePathName;
/* Get the file name */
Ptr = Peb->ProcessParameters->ImagePathName.Buffer +
(Peb->ProcessParameters->ImagePathName.Length / sizeof(WCHAR)) -1;
while ((Ptr >= Peb->ProcessParameters->ImagePathName.Buffer) &&
(*Ptr != L'\\')) Ptr--;
ImageNameU.Buffer = Ptr + 1;
ImageNameU.Length = Peb->ProcessParameters->ImagePathName.Length -
(ImageNameU.Buffer - Peb->ProcessParameters->ImagePathName.Buffer) * sizeof(WCHAR);
ImageNameU.MaximumLength = ImageNameU.Length;
/*`Convert to ANSI, harderror message needs that */
RtlUnicodeStringToAnsiString(&ImageNameA, &ImageNameU, TRUE);
/* Raise harderror */
HardErrorParameters[0] = (ULONG_PTR)&ImageNameA;
NtRaiseHardError(STATUS_IMAGE_MACHINE_TYPE_MISMATCH_EXE,
1,
1,
HardErrorParameters,
OptionOk,
&ErrorResponse);
RtlFreeAnsiString(&ImageNameA);
ZwTerminateProcess(NtCurrentProcess(), STATUS_IMAGE_MACHINE_TYPE_MISMATCH_EXE);
}
/* initialized vectored exception handling */ /* initialized vectored exception handling */
RtlpInitializeVectoredExceptionHandling(); RtlpInitializeVectoredExceptionHandling();