Use native BOOLEAN instead of win32k BOOL

svn path=/trunk/; revision=13076
This commit is contained in:
Gé van Geldorp 2005-01-16 11:29:03 +00:00
parent 3944d90e5e
commit 182c4064e6
4 changed files with 20 additions and 20 deletions

View file

@ -102,7 +102,7 @@ NTSTATUS LdrMapSections(HANDLE ProcessHandle,
PIMAGE_NT_HEADERS NTHeaders); PIMAGE_NT_HEADERS NTHeaders);
NTSTATUS LdrMapNTDllForProcess(HANDLE ProcessHandle, NTSTATUS LdrMapNTDllForProcess(HANDLE ProcessHandle,
PHANDLE NTDllSectionHandle); PHANDLE NTDllSectionHandle);
BOOL LdrMappedAsDataFile(PVOID *BaseAddress); BOOLEAN LdrMappedAsDataFile(PVOID *BaseAddress);
NTSTATUS STDCALL NTSTATUS STDCALL
LdrDisableThreadCalloutsForDll(IN PVOID BaseAddress); LdrDisableThreadCalloutsForDll(IN PVOID BaseAddress);

View file

@ -110,7 +110,7 @@ LdrFindResource_U(PVOID BaseAddress,
int j, pos = 0; int j, pos = 0;
LCID UserLCID, SystemLCID; LCID UserLCID, SystemLCID;
LANGID UserLangID, SystemLangID; LANGID UserLangID, SystemLangID;
BOOL MappedAsDataFile; BOOLEAN MappedAsDataFile;
MappedAsDataFile = LdrMappedAsDataFile(&BaseAddress); MappedAsDataFile = LdrMappedAsDataFile(&BaseAddress);
DPRINT("LdrFindResource_U(%08x, %08x, %d, %08x)\n", BaseAddress, ResourceInfo, Level, ResourceDataEntry); DPRINT("LdrFindResource_U(%08x, %08x, %d, %08x)\n", BaseAddress, ResourceInfo, Level, ResourceDataEntry);
@ -280,7 +280,7 @@ LdrAccessResource(IN PVOID BaseAddress,
ULONG DataSize; ULONG DataSize;
ULONG Offset = 0; ULONG Offset = 0;
ULONG Data; ULONG Data;
BOOL MappedAsDataFile; BOOLEAN MappedAsDataFile;
if(!ResourceDataEntry) if(!ResourceDataEntry)
return STATUS_RESOURCE_DATA_NOT_FOUND; return STATUS_RESOURCE_DATA_NOT_FOUND;

View file

@ -42,7 +42,7 @@ NTSTATUS LdrpAttachThread (VOID);
#define VALUE_BUFFER_SIZE 256 #define VALUE_BUFFER_SIZE 256
BOOL FASTCALL BOOLEAN FASTCALL
ReadCompatibilitySetting(HANDLE Key, LPWSTR Value, PKEY_VALUE_PARTIAL_INFORMATION ValueInfo, DWORD *Buffer) ReadCompatibilitySetting(HANDLE Key, LPWSTR Value, PKEY_VALUE_PARTIAL_INFORMATION ValueInfo, DWORD *Buffer)
{ {
UNICODE_STRING ValueName; UNICODE_STRING ValueName;
@ -105,7 +105,7 @@ LoadImageFileExecutionOptions(PPEB Peb)
BOOL FASTCALL BOOLEAN FASTCALL
LoadCompatibilitySettings(PPEB Peb) LoadCompatibilitySettings(PPEB Peb)
{ {
NTSTATUS Status; NTSTATUS Status;

View file

@ -55,7 +55,7 @@ extern PLDR_MODULE ExeModule;
/* PROTOTYPES ****************************************************************/ /* PROTOTYPES ****************************************************************/
static NTSTATUS LdrFindEntryForName(PUNICODE_STRING Name, PLDR_MODULE *Module, BOOL Ref); static NTSTATUS LdrFindEntryForName(PUNICODE_STRING Name, PLDR_MODULE *Module, BOOLEAN Ref);
static PVOID LdrFixupForward(PCHAR ForwardName); static PVOID LdrFixupForward(PCHAR ForwardName);
static PVOID LdrGetExportByName(PVOID BaseAddress, PUCHAR SymbolName, USHORT Hint); static PVOID LdrGetExportByName(PVOID BaseAddress, PUCHAR SymbolName, USHORT Hint);
static NTSTATUS LdrpLoadModule(IN PWSTR SearchPath OPTIONAL, static NTSTATUS LdrpLoadModule(IN PWSTR SearchPath OPTIONAL,
@ -64,7 +64,7 @@ static NTSTATUS LdrpLoadModule(IN PWSTR SearchPath OPTIONAL,
OUT PLDR_MODULE *Module, OUT PLDR_MODULE *Module,
OUT PVOID *BaseAddress OPTIONAL); OUT PVOID *BaseAddress OPTIONAL);
static NTSTATUS LdrpAttachProcess(VOID); static NTSTATUS LdrpAttachProcess(VOID);
static VOID LdrpDetachProcess(BOOL UnloadAll); static VOID LdrpDetachProcess(BOOLEAN UnloadAll);
/* FUNCTIONS *****************************************************************/ /* FUNCTIONS *****************************************************************/
@ -84,7 +84,7 @@ LdrpLoadUserModuleSymbols(PLDR_MODULE LdrModule)
#endif /* DBG || KDBG */ #endif /* DBG || KDBG */
BOOL BOOLEAN
LdrMappedAsDataFile(PVOID *BaseAddress) LdrMappedAsDataFile(PVOID *BaseAddress)
{ {
if (0 != ((DWORD_PTR) *BaseAddress & (PAGE_SIZE - 1))) if (0 != ((DWORD_PTR) *BaseAddress & (PAGE_SIZE - 1)))
@ -96,7 +96,7 @@ LdrMappedAsDataFile(PVOID *BaseAddress)
return FALSE; return FALSE;
} }
static inline LONG LdrpDecrementLoadCount(PLDR_MODULE Module, BOOL Locked) static inline LONG LdrpDecrementLoadCount(PLDR_MODULE Module, BOOLEAN Locked)
{ {
LONG LoadCount; LONG LoadCount;
if (!Locked) if (!Locked)
@ -115,7 +115,7 @@ static inline LONG LdrpDecrementLoadCount(PLDR_MODULE Module, BOOL Locked)
return LoadCount; return LoadCount;
} }
static inline LONG LdrpIncrementLoadCount(PLDR_MODULE Module, BOOL Locked) static inline LONG LdrpIncrementLoadCount(PLDR_MODULE Module, BOOLEAN Locked)
{ {
LONG LoadCount; LONG LoadCount;
if (!Locked) if (!Locked)
@ -134,7 +134,7 @@ static inline LONG LdrpIncrementLoadCount(PLDR_MODULE Module, BOOL Locked)
return LoadCount; return LoadCount;
} }
static inline VOID LdrpAcquireTlsSlot(PLDR_MODULE Module, ULONG Size, BOOL Locked) static inline VOID LdrpAcquireTlsSlot(PLDR_MODULE Module, ULONG Size, BOOLEAN Locked)
{ {
if (!Locked) if (!Locked)
{ {
@ -168,7 +168,7 @@ static inline VOID LdrpTlsCallback(PLDR_MODULE Module, ULONG dwReason)
} }
} }
static BOOL LdrpCallDllEntry(PLDR_MODULE Module, DWORD dwReason, PVOID lpReserved) static BOOLEAN LdrpCallDllEntry(PLDR_MODULE Module, DWORD dwReason, PVOID lpReserved)
{ {
if (!(Module->Flags & IMAGE_DLL) || if (!(Module->Flags & IMAGE_DLL) ||
Module->EntryPoint == 0) Module->EntryPoint == 0)
@ -561,7 +561,7 @@ static NTSTATUS
LdrpMapDllImageFile(IN PWSTR SearchPath OPTIONAL, LdrpMapDllImageFile(IN PWSTR SearchPath OPTIONAL,
IN PUNICODE_STRING DllName, IN PUNICODE_STRING DllName,
OUT PUNICODE_STRING FullDosName, OUT PUNICODE_STRING FullDosName,
IN BOOL MapAsDataFile, IN BOOLEAN MapAsDataFile,
OUT PHANDLE SectionHandle) OUT PHANDLE SectionHandle)
{ {
WCHAR SearchPathBuffer[MAX_PATH]; WCHAR SearchPathBuffer[MAX_PATH];
@ -834,7 +834,7 @@ LdrFindEntryForAddress(PVOID Address,
static NTSTATUS static NTSTATUS
LdrFindEntryForName(PUNICODE_STRING Name, LdrFindEntryForName(PUNICODE_STRING Name,
PLDR_MODULE *Module, PLDR_MODULE *Module,
BOOL Ref) BOOLEAN Ref)
{ {
PLIST_ENTRY ModuleListHead; PLIST_ENTRY ModuleListHead;
PLIST_ENTRY Entry; PLIST_ENTRY Entry;
@ -1338,7 +1338,7 @@ static NTSTATUS
LdrpGetOrLoadModule(PWCHAR SerachPath, LdrpGetOrLoadModule(PWCHAR SerachPath,
PCHAR Name, PCHAR Name,
PLDR_MODULE* Module, PLDR_MODULE* Module,
BOOL Load) BOOLEAN Load)
{ {
UNICODE_STRING DllName; UNICODE_STRING DllName;
NTSTATUS Status; NTSTATUS Status;
@ -1717,7 +1717,7 @@ LdrFixupImports(IN PWSTR SearchPath OPTIONAL,
} }
else else
{ {
BOOL WrongForwarder; BOOLEAN WrongForwarder;
WrongForwarder = FALSE; WrongForwarder = FALSE;
if (ImportedModule->Flags & IMAGE_NOT_AT_BASE) if (ImportedModule->Flags & IMAGE_NOT_AT_BASE)
{ {
@ -1997,7 +1997,7 @@ LdrpLoadModule(IN PWSTR SearchPath OPTIONAL,
ULONG ViewSize; ULONG ViewSize;
PVOID ImageBase; PVOID ImageBase;
PIMAGE_NT_HEADERS NtHeaders; PIMAGE_NT_HEADERS NtHeaders;
BOOL MappedAsDataFile; BOOLEAN MappedAsDataFile;
if (Module == NULL) if (Module == NULL)
{ {
@ -2130,7 +2130,7 @@ LdrpLoadModule(IN PWSTR SearchPath OPTIONAL,
static NTSTATUS static NTSTATUS
LdrpUnloadModule(PLDR_MODULE Module, LdrpUnloadModule(PLDR_MODULE Module,
BOOL Unload) BOOLEAN Unload)
{ {
PIMAGE_IMPORT_MODULE_DIRECTORY ImportModuleDirectory; PIMAGE_IMPORT_MODULE_DIRECTORY ImportModuleDirectory;
PIMAGE_BOUND_IMPORT_DESCRIPTOR BoundImportDescriptor; PIMAGE_BOUND_IMPORT_DESCRIPTOR BoundImportDescriptor;
@ -2400,7 +2400,7 @@ LdrGetProcedureAddress (IN PVOID BaseAddress,
* The loader lock must be held on enty. * The loader lock must be held on enty.
*/ */
static VOID static VOID
LdrpDetachProcess(BOOL UnloadAll) LdrpDetachProcess(BOOLEAN UnloadAll)
{ {
PLIST_ENTRY ModuleListHead; PLIST_ENTRY ModuleListHead;
PLIST_ENTRY Entry; PLIST_ENTRY Entry;
@ -2499,7 +2499,7 @@ LdrpAttachProcess(VOID)
PLIST_ENTRY ModuleListHead; PLIST_ENTRY ModuleListHead;
PLIST_ENTRY Entry; PLIST_ENTRY Entry;
PLDR_MODULE Module; PLDR_MODULE Module;
BOOL Result; BOOLEAN Result;
NTSTATUS Status = STATUS_SUCCESS; NTSTATUS Status = STATUS_SUCCESS;
DPRINT("LdrpAttachProcess() called for %wZ\n", DPRINT("LdrpAttachProcess() called for %wZ\n",