- Don't use EXPORTED

- Define MM_HIGHEST_VAD_ADDRESS; this seems to be the actual value of the PEB and represents the highest address that a VAD can be on Windows (and the PEB is the highest vad). This define shoudl probably go in mm.h since I believe the checks and code in NtXxxVirtualMemory should use -it- instead of MM_HIGHEST_USER_ADDRESS.

svn path=/trunk/; revision=19445
This commit is contained in:
Alex Ionescu 2005-11-22 02:30:18 +00:00
parent 2f4ea4daeb
commit 75ae595a8d
16 changed files with 46 additions and 49 deletions

View file

@ -29,9 +29,9 @@ void* _alloca(size_t size);
#error Unknown compiler for alloca intrinsic stack allocation "function" #error Unknown compiler for alloca intrinsic stack allocation "function"
#endif #endif
ULONG EXPORTED CcFastMdlReadWait; ULONG CcFastMdlReadWait;
ULONG EXPORTED CcFastReadNotPossible; ULONG CcFastReadNotPossible;
ULONG EXPORTED CcFastReadWait; ULONG CcFastReadWait;
ULONG CcFastReadNoWait; ULONG CcFastReadNoWait;
ULONG CcFastReadResourceMiss; ULONG CcFastReadResourceMiss;

View file

@ -16,7 +16,7 @@
/* GLOBALS *******************************************************************/ /* GLOBALS *******************************************************************/
POBJECT_TYPE EXPORTED ExEventObjectType = NULL; POBJECT_TYPE ExEventObjectType = NULL;
static GENERIC_MAPPING ExpEventMapping = { static GENERIC_MAPPING ExpEventMapping = {
STANDARD_RIGHTS_READ | SYNCHRONIZE | EVENT_QUERY_STATE, STANDARD_RIGHTS_READ | SYNCHRONIZE | EVENT_QUERY_STATE,

View file

@ -13,7 +13,7 @@
#include <ntoskrnl.h> #include <ntoskrnl.h>
#include <internal/debug.h> #include <internal/debug.h>
/* This structure is a *GUESS* -- Alex */ /* FIXME: NDK This structure is a *GUESS* -- Alex */
typedef struct _EPROFILE { typedef struct _EPROFILE {
PEPROCESS Process; PEPROCESS Process;
PVOID ImageBase; PVOID ImageBase;
@ -30,7 +30,7 @@ typedef struct _EPROFILE {
/* GLOBALS *******************************************************************/ /* GLOBALS *******************************************************************/
POBJECT_TYPE EXPORTED ExProfileObjectType = NULL; POBJECT_TYPE ExProfileObjectType = NULL;
static KMUTEX ExpProfileMutex; static KMUTEX ExpProfileMutex;

View file

@ -15,8 +15,8 @@
/* DATA **********************************************************************/ /* DATA **********************************************************************/
POBJECT_TYPE EXPORTED ExWindowStationObjectType = NULL; POBJECT_TYPE ExWindowStationObjectType = NULL;
POBJECT_TYPE EXPORTED ExDesktopObjectType = NULL; POBJECT_TYPE ExDesktopObjectType = NULL;
static GENERIC_MAPPING ExpWindowStationMapping = static GENERIC_MAPPING ExpWindowStationMapping =
{ {

View file

@ -15,9 +15,9 @@
/* DATA **********************************************************************/ /* DATA **********************************************************************/
POBJECT_TYPE EXPORTED IoAdapterObjectType = NULL; /* FIXME */ POBJECT_TYPE IoAdapterObjectType = NULL; /* FIXME */
POBJECT_TYPE EXPORTED IoDeviceHandlerObjectType = NULL; /* FIXME */ POBJECT_TYPE IoDeviceHandlerObjectType = NULL; /* FIXME */
ULONG EXPORTED IoDeviceHandlerObjectSize = 0; /* FIXME */ ULONG IoDeviceHandlerObjectSize = 0; /* FIXME */
/* FUNCTIONS *****************************************************************/ /* FUNCTIONS *****************************************************************/

View file

@ -64,7 +64,7 @@ typedef enum _DISK_MANAGER
EZ_Drive EZ_Drive
} DISK_MANAGER; } DISK_MANAGER;
HAL_DISPATCH EXPORTED HalDispatchTable = HAL_DISPATCH HalDispatchTable =
{ {
HAL_DISPATCH_VERSION, HAL_DISPATCH_VERSION,
(pHalQuerySystemInformation) NULL, // HalQuerySystemInformation (pHalQuerySystemInformation) NULL, // HalQuerySystemInformation
@ -90,7 +90,7 @@ HAL_DISPATCH EXPORTED HalDispatchTable =
(pHalMirrorVerify) NULL //HalMirrorVerify; (pHalMirrorVerify) NULL //HalMirrorVerify;
}; };
HAL_PRIVATE_DISPATCH EXPORTED HalPrivateDispatchTable = HAL_PRIVATE_DISPATCH HalPrivateDispatchTable =
{ {
HAL_PRIVATE_DISPATCH_VERSION HAL_PRIVATE_DISPATCH_VERSION
}; };

View file

@ -15,7 +15,7 @@
#include <internal/debug.h> #include <internal/debug.h>
/* ke/main.c */ /* ke/main.c */
extern LOADER_PARAMETER_BLOCK EXPORTED KeLoaderBlock; extern LOADER_PARAMETER_BLOCK KeLoaderBlock;
extern ULONG KeTickCount; extern ULONG KeTickCount;
extern BOOLEAN SetupMode; extern BOOLEAN SetupMode;
@ -73,7 +73,7 @@ static LIST_ENTRY ServiceListHead = {NULL, NULL};
static UNICODE_STRING IopHardwareDatabaseKey = static UNICODE_STRING IopHardwareDatabaseKey =
RTL_CONSTANT_STRING(L"\\REGISTRY\\MACHINE\\HARDWARE\\DESCRIPTION\\SYSTEM"); RTL_CONSTANT_STRING(L"\\REGISTRY\\MACHINE\\HARDWARE\\DESCRIPTION\\SYSTEM");
POBJECT_TYPE EXPORTED IoDriverObjectType = NULL; POBJECT_TYPE IoDriverObjectType = NULL;
/* DECLARATIONS ***************************************************************/ /* DECLARATIONS ***************************************************************/

View file

@ -13,11 +13,11 @@
/* VARIABLES ***************************************************************/ /* VARIABLES ***************************************************************/
BOOLEAN EXPORTED KdDebuggerEnabled = FALSE; BOOLEAN KdDebuggerEnabled = FALSE;
BOOLEAN EXPORTED KdEnteredDebugger = FALSE; BOOLEAN KdEnteredDebugger = FALSE;
BOOLEAN EXPORTED KdDebuggerNotPresent = TRUE; BOOLEAN KdDebuggerNotPresent = TRUE;
BOOLEAN EXPORTED KiEnableTimerWatchdog = FALSE; BOOLEAN KiEnableTimerWatchdog = FALSE;
ULONG EXPORTED KiBugCheckData; ULONG KiBugCheckData;
BOOLEAN KdpBreakPending; BOOLEAN KdpBreakPending;
VOID STDCALL PspDumpThreads(BOOLEAN SystemThreads); VOID STDCALL PspDumpThreads(BOOLEAN SystemThreads);

View file

@ -52,14 +52,8 @@ extern LIST_ENTRY KiTimerListHead;
*/ */
#define CLOCK_INCREMENT (100000) #define CLOCK_INCREMENT (100000)
#ifdef __GNUC__ ULONG KeMaximumIncrement = 100000;
ULONG EXPORTED KeMaximumIncrement = 100000; ULONG KeMinimumIncrement = 100000;
ULONG EXPORTED KeMinimumIncrement = 100000;
#else
/* Microsoft-style declarations */
EXPORTED ULONG KeMaximumIncrement = 100000;
EXPORTED ULONG KeMinimumIncrement = 100000;
#endif
#define MICROSECONDS_PER_TICK (10000) #define MICROSECONDS_PER_TICK (10000)
#define TICKS_TO_CALIBRATE (1) #define TICKS_TO_CALIBRATE (1)

View file

@ -22,15 +22,15 @@
ULONG NtMajorVersion = 5; ULONG NtMajorVersion = 5;
ULONG NtMinorVersion = 0; ULONG NtMinorVersion = 0;
ULONG NtOSCSDVersion = BUILD_OSCSDVERSION(6, 0); ULONG NtOSCSDVersion = BUILD_OSCSDVERSION(6, 0);
EXPORTED ULONG NtBuildNumber = KERNEL_VERSION_BUILD; ULONG NtBuildNumber = KERNEL_VERSION_BUILD;
EXPORTED ULONG NtGlobalFlag = 0; ULONG NtGlobalFlag = 0;
EXPORTED CHAR KeNumberProcessors; CHAR KeNumberProcessors;
EXPORTED KAFFINITY KeActiveProcessors = 1; KAFFINITY KeActiveProcessors = 1;
EXPORTED LOADER_PARAMETER_BLOCK KeLoaderBlock; LOADER_PARAMETER_BLOCK KeLoaderBlock;
EXPORTED ULONG KeDcacheFlushCount = 0; ULONG KeDcacheFlushCount = 0;
EXPORTED ULONG KeIcacheFlushCount = 0; ULONG KeIcacheFlushCount = 0;
EXPORTED ULONG KiDmaIoCoherency = 0; /* RISC Architectures only */ ULONG KiDmaIoCoherency = 0; /* RISC Architectures only */
EXPORTED ULONG InitSafeBootMode = 0; /* KB83764 */ ULONG InitSafeBootMode = 0; /* KB83764 */
LOADER_MODULE KeLoaderModules[64]; LOADER_MODULE KeLoaderModules[64];
static CHAR KeLoaderModuleStrings[64][256]; static CHAR KeLoaderModuleStrings[64][256];

View file

@ -18,10 +18,10 @@
extern LDR_DATA_TABLE_ENTRY NtoskrnlModuleObject; extern LDR_DATA_TABLE_ENTRY NtoskrnlModuleObject;
extern LDR_DATA_TABLE_ENTRY HalModuleObject; extern LDR_DATA_TABLE_ENTRY HalModuleObject;
ULONG EXPORTED MmUserProbeAddress = 0; ULONG MmUserProbeAddress = 0;
PVOID EXPORTED MmHighestUserAddress = NULL; PVOID MmHighestUserAddress = NULL;
PBOOLEAN EXPORTED Mm64BitPhysicalAddress = FALSE; PBOOLEAN Mm64BitPhysicalAddress = FALSE;
PVOID EXPORTED MmSystemRangeStart = NULL; PVOID MmSystemRangeStart = NULL;
MM_STATS MmStats; MM_STATS MmStats;

View file

@ -18,6 +18,9 @@ extern ULONG NtMinorVersion;
extern ULONG NtOSCSDVersion; extern ULONG NtOSCSDVersion;
extern ULONG NtGlobalFlag; extern ULONG NtGlobalFlag;
#define MM_HIGHEST_VAD_ADDRESS \
(PVOID)((ULONG_PTR)MM_HIGHEST_USER_ADDRESS - (16 * PAGE_SIZE))
/* FUNCTIONS *****************************************************************/ /* FUNCTIONS *****************************************************************/
PVOID PVOID
@ -202,8 +205,8 @@ MmCreatePeb(PEPROCESS Process)
DPRINT("MmCreatePeb\n"); DPRINT("MmCreatePeb\n");
/* Allocate the PEB */ /* Allocate the PEB */
Peb = MiCreatePebOrTeb(Process, (PVOID)PEB_BASE); Peb = MiCreatePebOrTeb(Process, MM_HIGHEST_VAD_ADDRESS);
if (Peb != (PVOID)PEB_BASE) if (Peb != MM_HIGHEST_VAD_ADDRESS)
{ {
DPRINT1("MiCreatePebOrTeb() returned %x\n", Peb); DPRINT1("MiCreatePebOrTeb() returned %x\n", Peb);
return STATUS_UNSUCCESSFUL; return STATUS_UNSUCCESSFUL;
@ -345,7 +348,7 @@ MmCreateTeb(PEPROCESS Process,
} }
/* Allocate the TEB */ /* Allocate the TEB */
Teb = MiCreatePebOrTeb(Process, (PVOID)TEB_BASE); Teb = MiCreatePebOrTeb(Process, MM_HIGHEST_VAD_ADDRESS);
/* Initialize the PEB */ /* Initialize the PEB */
RtlZeroMemory(Teb, sizeof(TEB)); RtlZeroMemory(Teb, sizeof(TEB));

View file

@ -66,7 +66,7 @@ MM_SECTION_PAGEOUT_CONTEXT;
/* GLOBALS *******************************************************************/ /* GLOBALS *******************************************************************/
POBJECT_TYPE EXPORTED MmSectionObjectType = NULL; POBJECT_TYPE MmSectionObjectType = NULL;
static GENERIC_MAPPING MmpSectionMapping = { static GENERIC_MAPPING MmpSectionMapping = {
STANDARD_RIGHTS_READ | SECTION_MAP_READ | SECTION_QUERY, STANDARD_RIGHTS_READ | SECTION_MAP_READ | SECTION_QUERY,

View file

@ -18,7 +18,7 @@
/* GLOBALS *******************************************************************/ /* GLOBALS *******************************************************************/
POBJECT_TYPE EXPORTED PsJobType = NULL; POBJECT_TYPE PsJobType = NULL;
LIST_ENTRY PsJobListHead; LIST_ENTRY PsJobListHead;
static FAST_MUTEX PsJobListLock; static FAST_MUTEX PsJobListLock;

View file

@ -16,9 +16,9 @@
/* GLOBALS ******************************************************************/ /* GLOBALS ******************************************************************/
PEPROCESS EXPORTED PsInitialSystemProcess = NULL; PEPROCESS PsInitialSystemProcess = NULL;
PEPROCESS PsIdleProcess = NULL; PEPROCESS PsIdleProcess = NULL;
POBJECT_TYPE EXPORTED PsProcessType = NULL; POBJECT_TYPE PsProcessType = NULL;
extern PHANDLE_TABLE PspCidTable; extern PHANDLE_TABLE PspCidTable;
EPROCESS_QUOTA_BLOCK PspDefaultQuotaBlock; EPROCESS_QUOTA_BLOCK PspDefaultQuotaBlock;

View file

@ -21,7 +21,7 @@ extern PEPROCESS PsIdleProcess;
extern PVOID PspSystemDllEntryPoint; extern PVOID PspSystemDllEntryPoint;
extern PHANDLE_TABLE PspCidTable; extern PHANDLE_TABLE PspCidTable;
POBJECT_TYPE EXPORTED PsThreadType = NULL; POBJECT_TYPE PsThreadType = NULL;
/* FUNCTIONS ***************************************************************/ /* FUNCTIONS ***************************************************************/