mirror of
https://github.com/reactos/reactos.git
synced 2024-10-04 00:13:57 +00:00
[NTOSKRNL]
- Add IoWMIDeviceObjectToProviderId and IoIs32bitProcess stubs for 64bit builds - Comment out some deprecated amd64 code - Add MmProtectToValue - Fix a typo svn path=/trunk/; revision=49322
This commit is contained in:
parent
28b8adb2ee
commit
f69973e1e6
|
@ -1731,4 +1731,15 @@ IoStartPacket(IN PDEVICE_OBJECT DeviceObject,
|
|||
KeLowerIrql(OldIrql);
|
||||
}
|
||||
|
||||
#if defined (_WIN64)
|
||||
ULONG
|
||||
NTAPI
|
||||
IoWMIDeviceObjectToProviderId(
|
||||
IN PDEVICE_OBJECT DeviceObject)
|
||||
{
|
||||
UNIMPLEMENTED;
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
/* EOF */
|
||||
|
|
|
@ -1816,3 +1816,14 @@ IoSetTopLevelIrp(IN PIRP Irp)
|
|||
/* Set the IRP */
|
||||
PsGetCurrentThread()->TopLevelIrp = (ULONG_PTR)Irp;
|
||||
}
|
||||
|
||||
#if defined (_WIN64)
|
||||
BOOLEAN
|
||||
NTAPI
|
||||
IoIs32bitProcess(
|
||||
IN PIRP Irp OPTIONAL)
|
||||
{
|
||||
#pragma message IoIs32bitProcess is hardcoded to FALSE
|
||||
return FALSE;
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -571,7 +571,7 @@ MiInitMachineDependent(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
|
|||
if (KiI386PentiumLockErrataPresent)
|
||||
{
|
||||
/* Mark the 1st IDT page as Write-Through to prevent a lockup
|
||||
on a FOOF instruction.
|
||||
on a F00F instruction.
|
||||
See http://www.rcollins.org/Errata/Dec97/F00FBug.html */
|
||||
PointerPte = MiAddressToPte(KeGetPcr()->IDT);
|
||||
PointerPte->u.Hard.WriteThrough = 1;
|
||||
|
|
|
@ -77,6 +77,43 @@ MmProtectToPteMask[32] =
|
|||
PTE_EXECUTE_WRITECOPY | PTE_WRITECOMBINED_CACHE,
|
||||
};
|
||||
|
||||
const
|
||||
ULONG MmProtectToValue[32] =
|
||||
{
|
||||
PAGE_NOACCESS,
|
||||
PAGE_READONLY,
|
||||
PAGE_EXECUTE,
|
||||
PAGE_EXECUTE_READ,
|
||||
PAGE_READWRITE,
|
||||
PAGE_WRITECOPY,
|
||||
PAGE_EXECUTE_READWRITE,
|
||||
PAGE_EXECUTE_WRITECOPY,
|
||||
PAGE_NOACCESS,
|
||||
PAGE_NOCACHE | PAGE_READONLY,
|
||||
PAGE_NOCACHE | PAGE_EXECUTE,
|
||||
PAGE_NOCACHE | PAGE_EXECUTE_READ,
|
||||
PAGE_NOCACHE | PAGE_READWRITE,
|
||||
PAGE_NOCACHE | PAGE_WRITECOPY,
|
||||
PAGE_NOCACHE | PAGE_EXECUTE_READWRITE,
|
||||
PAGE_NOCACHE | PAGE_EXECUTE_WRITECOPY,
|
||||
PAGE_NOACCESS,
|
||||
PAGE_GUARD | PAGE_READONLY,
|
||||
PAGE_GUARD | PAGE_EXECUTE,
|
||||
PAGE_GUARD | PAGE_EXECUTE_READ,
|
||||
PAGE_GUARD | PAGE_READWRITE,
|
||||
PAGE_GUARD | PAGE_WRITECOPY,
|
||||
PAGE_GUARD | PAGE_EXECUTE_READWRITE,
|
||||
PAGE_GUARD | PAGE_EXECUTE_WRITECOPY,
|
||||
PAGE_NOACCESS,
|
||||
PAGE_WRITECOMBINE | PAGE_READONLY,
|
||||
PAGE_WRITECOMBINE | PAGE_EXECUTE,
|
||||
PAGE_WRITECOMBINE | PAGE_EXECUTE_READ,
|
||||
PAGE_WRITECOMBINE | PAGE_READWRITE,
|
||||
PAGE_WRITECOMBINE | PAGE_WRITECOPY,
|
||||
PAGE_WRITECOMBINE | PAGE_EXECUTE_READWRITE,
|
||||
PAGE_WRITECOMBINE | PAGE_EXECUTE_WRITECOPY
|
||||
};
|
||||
|
||||
/* PRIVATE FUNCTIONS *******************************************************/
|
||||
|
||||
BOOLEAN
|
||||
|
@ -418,8 +455,8 @@ MmDeleteVirtualMapping(
|
|||
{
|
||||
Pfn = OldPte.u.Hard.PageFrameNumber;
|
||||
|
||||
if (FreePage)
|
||||
MmReleasePageMemoryConsumer(MC_NPPOOL, Pfn);
|
||||
//if (FreePage)
|
||||
//MmReleasePageMemoryConsumer(MC_NPPOOL, Pfn);
|
||||
}
|
||||
else
|
||||
Pfn = 0;
|
||||
|
|
|
@ -454,6 +454,7 @@
|
|||
@ stdcall IoInitializeTimer(ptr ptr ptr)
|
||||
@ stdcall IoInvalidateDeviceRelations(ptr long)
|
||||
@ stdcall IoInvalidateDeviceState(ptr)
|
||||
@ stdcall -arch=x86_64 IoIs32bitProcess(ptr)
|
||||
@ stdcall IoIsFileOriginRemote(ptr)
|
||||
@ stdcall IoIsOperationSynchronous(ptr)
|
||||
@ stdcall IoIsSystemThread(ptr)
|
||||
|
@ -533,6 +534,7 @@
|
|||
@ stdcall IoVolumeDeviceToDosName(ptr ptr)
|
||||
@ stdcall IoWMIAllocateInstanceIds(ptr long ptr)
|
||||
@ stdcall IoWMIDeviceObjectToInstanceName(ptr ptr ptr)
|
||||
@ stdcall -arch=x86_64 IoWMIDeviceObjectToProviderId(ptr)
|
||||
@ stdcall IoWMIExecuteMethod(ptr ptr long long ptr ptr)
|
||||
@ stdcall IoWMIHandleToInstanceName(ptr ptr ptr)
|
||||
@ stdcall IoWMIOpenBlock(ptr long ptr)
|
||||
|
|
Loading…
Reference in a new issue