Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-27 14:49:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not crash with "Assertion 'Process == PsGetCurrentProcess()' failed" msg.

Browse source 
svn path=/trunk/; revision=40295
This commit is contained in:
Dmitry Gorbachev 2009-03-30 09:12:25 +00:00
parent c40699db49
commit 63de8c6dce
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
reactos/ntoskrnl/mm/kmap.c
View file

@ -25,7 +25,7 @@ MiZeroPage(PFN_TYPE Page)
KIRQL Irql;
PVOID TempAddress;
Process = (PEPROCESS)KeGetCurrentThread()->ApcState.Process;
Process = PsGetCurrentProcess();
TempAddress = MiMapPageInHyperSpace(Process, Page, &Irql);
if (TempAddress == NULL)
{
@ -40,15 +40,19 @@ NTSTATUS
NTAPI
MiCopyFromUserPage(PFN_TYPE DestPage, PVOID SourceAddress)
{
PEPROCESS Process;
KIRQL Irql;
PVOID TempAddress;
TempAddress = MmCreateHyperspaceMapping(DestPage);
Process = PsGetCurrentProcess();
TempAddress = MiMapPageInHyperSpace(Process, DestPage, &Irql);
if (TempAddress == NULL)
{
return(STATUS_NO_MEMORY);
}
memcpy(TempAddress, SourceAddress, PAGE_SIZE);
MmDeleteHyperspaceMapping(TempAddress);
MiUnmapPageInHyperSpace(Process, TempAddress, Irql);
return(STATUS_SUCCESS);
}
/* EOF */

12
reactos/ntoskrnl/mm/section.c
View file

@ -657,8 +657,11 @@ MiReadPage(PMEMORY_AREA MemoryArea,
}
else
{
PEPROCESS Process;
KIRQL Irql;
PVOID PageAddr;
ULONG CacheSegOffset;
/*
* Allocate a page, this is rather complicated by the possibility
* we might have to move other things out of memory
@ -692,7 +695,8 @@ MiReadPage(PMEMORY_AREA MemoryArea,
}
}
PageAddr = MmCreateHyperspaceMapping(*Page);
Process = PsGetCurrentProcess();
PageAddr = MiMapPageInHyperSpace(Process, *Page, &Irql);
CacheSegOffset = BaseOffset + CacheSeg->Bcb->CacheSegmentSize - FileOffset;
Length = RawLength - SegOffset;
if (Length <= CacheSegOffset && Length <= PAGE_SIZE)
@ -706,7 +710,7 @@ MiReadPage(PMEMORY_AREA MemoryArea,
else
{
memcpy(PageAddr, (char*)BaseAddress + FileOffset - BaseOffset, CacheSegOffset);
MmDeleteHyperspaceMapping(PageAddr);
MiUnmapPageInHyperSpace(Process, PageAddr, Irql);
CcRosReleaseCacheSegment(Bcb, CacheSeg, TRUE, FALSE, FALSE);
Status = CcRosGetCacheSegment(Bcb,
FileOffset + CacheSegOffset,
@ -731,7 +735,7 @@ MiReadPage(PMEMORY_AREA MemoryArea,
return Status;
}
}
PageAddr = MmCreateHyperspaceMapping(*Page);
PageAddr = MiMapPageInHyperSpace(Process, *Page, &Irql);
if (Length < PAGE_SIZE)
{
memcpy((char*)PageAddr + CacheSegOffset, BaseAddress, Length - CacheSegOffset);
@ -741,7 +745,7 @@ MiReadPage(PMEMORY_AREA MemoryArea,
memcpy((char*)PageAddr + CacheSegOffset, BaseAddress, PAGE_SIZE - CacheSegOffset);
}
}
MmDeleteHyperspaceMapping(PageAddr);
MiUnmapPageInHyperSpace(Process, PageAddr, Irql);
CcRosReleaseCacheSegment(Bcb, CacheSeg, TRUE, FALSE, FALSE);
}
return(STATUS_SUCCESS);