Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 01:15:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTVDM]

Browse source 
Fix bugs in the VDM DOS executable loader.


svn path=/branches/ntvdm/; revision=59452
This commit is contained in:
Aleksandar Andrejevic 2013-07-09 17:28:16 +00:00
parent 59e28c4f15
commit 25cbe37d30
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
subsystems/ntvdm/dos.c
View file

@ -637,6 +637,7 @@ BOOLEAN DosCreateProcess(LPCSTR CommandLine, WORD EnvBlock)
CHAR CommandLineCopy[128]; CHAR CommandLineCopy[128];
INT ParamCount = 0; INT ParamCount = 0;
DWORD Segment = 0; DWORD Segment = 0;
WORD MaxAllocSize;
DWORD i, FileSize, ExeSize; DWORD i, FileSize, ExeSize;
PIMAGE_DOS_HEADER Header; PIMAGE_DOS_HEADER Header;
PDWORD RelocationTable; PDWORD RelocationTable;
@ -701,8 +702,6 @@ BOOLEAN DosCreateProcess(LPCSTR CommandLine, WORD EnvBlock)
/* Get the MZ header */ /* Get the MZ header */
Header = (PIMAGE_DOS_HEADER)Address; Header = (PIMAGE_DOS_HEADER)Address;
// TODO: Verify checksum and executable!
/* Get the base size of the file, in paragraphs (rounded up) */ /* Get the base size of the file, in paragraphs (rounded up) */
ExeSize = (((Header->e_cp - 1) * 512) + Header->e_cblp + 0x0F) >> 4; ExeSize = (((Header->e_cp - 1) * 512) + Header->e_cblp + 0x0F) >> 4;
@ -740,7 +739,8 @@ BOOLEAN DosCreateProcess(LPCSTR CommandLine, WORD EnvBlock)
RtlCopyMemory((PVOID)((ULONG_PTR)BaseAddress RtlCopyMemory((PVOID)((ULONG_PTR)BaseAddress
+ TO_LINEAR(Segment, 0x100)), + TO_LINEAR(Segment, 0x100)),
Address + (Header->e_cparhdr << 4), Address + (Header->e_cparhdr << 4),
FileSize - (Header->e_cparhdr << 4)); min(FileSize - (Header->e_cparhdr << 4),
(ExeSize << 4) - sizeof(DOS_PSP)));
/* Get the relocation table */ /* Get the relocation table */
RelocationTable = (PDWORD)(Address + Header->e_lfarlc); RelocationTable = (PDWORD)(Address + Header->e_lfarlc);
@ -777,10 +777,20 @@ BOOLEAN DosCreateProcess(LPCSTR CommandLine, WORD EnvBlock)
{ {
/* COM file */ /* COM file */
/* Allocate memory for the whole program and the PSP */ /* Find the maximum amount of memory that can be allocated */
Segment = DosAllocateMemory((FileSize + sizeof(DOS_PSP)) >> 4, NULL); DosAllocateMemory(0xFFFF, &MaxAllocSize);
/* Make sure it's enough for the whole program and the PSP */
if ((MaxAllocSize << 4) < (FileSize + sizeof(DOS_PSP))) goto Cleanup;
/* Allocate all of it */
Segment = DosAllocateMemory(MaxAllocSize, NULL);
if (Segment == 0) goto Cleanup; if (Segment == 0) goto Cleanup;
/* The process owns its own memory */
DosChangeMemoryOwner(Segment, Segment);
DosChangeMemoryOwner(EnvBlock, Segment);
/* Copy the program to Segment:0100 */ /* Copy the program to Segment:0100 */
RtlCopyMemory((PVOID)((ULONG_PTR)BaseAddress RtlCopyMemory((PVOID)((ULONG_PTR)BaseAddress
+ TO_LINEAR(Segment, 0x100)), + TO_LINEAR(Segment, 0x100)),