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

[NTVDM]: Correctly set last (and returned) errors when we fail at reallocating a memory block (in case this is the last block), or if the block is invalid. Do the same stuff also for few other memory functions.

Browse source 
svn path=/trunk/; revision=68816
This commit is contained in:
Hermès Bélusca-Maïto 2015-08-25 01:48:17 +00:00
parent 7b30b216d0
commit 7710f1ed1c
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c
View file

@ -1314,7 +1314,7 @@ VOID WINAPI DosInt21h(LPWORD Stack)
else else
{ {
Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF;
setAX(ERROR_ARENA_TRASHED); setAX(Sda->LastErrorCode);
} }
break; break;

13
reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c
View file

@ -109,7 +109,7 @@ static VOID DosCombineFreeBlocks(WORD StartBlock)
if (!ValidateMcb(NextMcb)) if (!ValidateMcb(NextMcb))
{ {
DPRINT1("The DOS memory arena is corrupted!\n"); DPRINT1("The DOS memory arena is corrupted!\n");
// Sda->LastErrorCode = ERROR_ARENA_TRASHED; Sda->LastErrorCode = ERROR_ARENA_TRASHED;
return; return;
} }
@ -297,8 +297,8 @@ BOOLEAN DosResizeMemory(WORD BlockData, WORD NewSize, WORD *MaxAvailable)
/* Make sure this is a valid and allocated block */ /* Make sure this is a valid and allocated block */
if (BlockData == 0 || !ValidateMcb(Mcb) || Mcb->OwnerPsp == 0) if (BlockData == 0 || !ValidateMcb(Mcb) || Mcb->OwnerPsp == 0)
{ {
Sda->LastErrorCode = ERROR_INVALID_BLOCK;
Success = FALSE; Success = FALSE;
Sda->LastErrorCode = ERROR_INVALID_HANDLE;
goto Done; goto Done;
} }
@ -310,6 +310,8 @@ BOOLEAN DosResizeMemory(WORD BlockData, WORD NewSize, WORD *MaxAvailable)
/* We can't expand the last block */ /* We can't expand the last block */
if (Mcb->BlockType == 'Z') if (Mcb->BlockType == 'Z')
{ {
DPRINT("Cannot expand memory block 0x%04X: this is the last block (size 0x%04X)!\n", Segment, Mcb->Size);
Sda->LastErrorCode = ERROR_NOT_ENOUGH_MEMORY;
Success = FALSE; Success = FALSE;
goto Done; goto Done;
} }
@ -416,7 +418,11 @@ BOOLEAN DosFreeMemory(WORD BlockData)
PDOS_MCB Mcb = SEGMENT_TO_MCB(BlockData - 1); PDOS_MCB Mcb = SEGMENT_TO_MCB(BlockData - 1);
DPRINT("DosFreeMemory: BlockData 0x%04X\n", BlockData); DPRINT("DosFreeMemory: BlockData 0x%04X\n", BlockData);
if (BlockData == 0) return FALSE; if (BlockData == 0)
{
Sda->LastErrorCode = ERROR_INVALID_BLOCK;
return FALSE;
}
DosMemValidate(); DosMemValidate();
@ -424,6 +430,7 @@ BOOLEAN DosFreeMemory(WORD BlockData)
if (!ValidateMcb(Mcb)) if (!ValidateMcb(Mcb))
{ {
DPRINT("MCB block type '%c' not valid!\n", Mcb->BlockType); DPRINT("MCB block type '%c' not valid!\n", Mcb->BlockType);
Sda->LastErrorCode = ERROR_INVALID_BLOCK;
return FALSE; return FALSE;
} }