Use native BOOLEAN instead of win32k BOOL
Modified: trunk/reactos/include/ntdll/ldr.h
Modified: trunk/reactos/lib/ntdll/ldr/res.c
Modified: trunk/reactos/lib/ntdll/ldr/startup.c
Modified: trunk/reactos/lib/ntdll/ldr/utils.c
_____
Modified: trunk/reactos/include/ntdll/ldr.h
--- trunk/reactos/include/ntdll/ldr.h 2005-01-16 11:02:12 UTC (rev
13075)
+++ trunk/reactos/include/ntdll/ldr.h 2005-01-16 11:29:03 UTC (rev
13076)
@@ -102,7 +102,7 @@
PIMAGE_NT_HEADERS NTHeaders);
NTSTATUS LdrMapNTDllForProcess(HANDLE ProcessHandle,
PHANDLE NTDllSectionHandle);
-BOOL LdrMappedAsDataFile(PVOID *BaseAddress);
+BOOLEAN LdrMappedAsDataFile(PVOID *BaseAddress);
NTSTATUS STDCALL
LdrDisableThreadCalloutsForDll(IN PVOID BaseAddress);
_____
Modified: trunk/reactos/lib/ntdll/ldr/res.c
--- trunk/reactos/lib/ntdll/ldr/res.c 2005-01-16 11:02:12 UTC (rev
13075)
+++ trunk/reactos/lib/ntdll/ldr/res.c 2005-01-16 11:29:03 UTC (rev
13076)
@@ -110,7 +110,7 @@
int j, pos = 0;
LCID UserLCID, SystemLCID;
LANGID UserLangID, SystemLangID;
- BOOL MappedAsDataFile;
+ BOOLEAN MappedAsDataFile;
MappedAsDataFile = LdrMappedAsDataFile(&BaseAddress);
DPRINT("LdrFindResource_U(%08x, %08x, %d, %08x)\n", BaseAddress,
ResourceInfo, Level, ResourceDataEntry);
@@ -280,7 +280,7 @@
ULONG DataSize;
ULONG Offset = 0;
ULONG Data;
- BOOL MappedAsDataFile;
+ BOOLEAN MappedAsDataFile;
if(!ResourceDataEntry)
return STATUS_RESOURCE_DATA_NOT_FOUND;
_____
Modified: trunk/reactos/lib/ntdll/ldr/startup.c
--- trunk/reactos/lib/ntdll/ldr/startup.c 2005-01-16 11:02:12 UTC
(rev 13075)
+++ trunk/reactos/lib/ntdll/ldr/startup.c 2005-01-16 11:29:03 UTC
(rev 13076)
@@ -42,7 +42,7 @@
#define VALUE_BUFFER_SIZE 256
-BOOL FASTCALL
+BOOLEAN FASTCALL
ReadCompatibilitySetting(HANDLE Key, LPWSTR Value,
PKEY_VALUE_PARTIAL_INFORMATION ValueInfo, DWORD *Buffer)
{
UNICODE_STRING ValueName;
@@ -105,7 +105,7 @@
-BOOL FASTCALL
+BOOLEAN FASTCALL
LoadCompatibilitySettings(PPEB Peb)
{
NTSTATUS Status;
_____
Modified: trunk/reactos/lib/ntdll/ldr/utils.c
--- trunk/reactos/lib/ntdll/ldr/utils.c 2005-01-16 11:02:12 UTC (rev
13075)
+++ trunk/reactos/lib/ntdll/ldr/utils.c 2005-01-16 11:29:03 UTC (rev
13076)
@@ -55,7 +55,7 @@
/* 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 LdrGetExportByName(PVOID BaseAddress, PUCHAR SymbolName,
USHORT Hint);
static NTSTATUS LdrpLoadModule(IN PWSTR SearchPath OPTIONAL,
@@ -64,7 +64,7 @@
OUT PLDR_MODULE *Module,
OUT PVOID *BaseAddress OPTIONAL);
static NTSTATUS LdrpAttachProcess(VOID);
-static VOID LdrpDetachProcess(BOOL UnloadAll);
+static VOID LdrpDetachProcess(BOOLEAN UnloadAll);
/* FUNCTIONS
*****************************************************************/
@@ -84,7 +84,7 @@
#endif /* DBG || KDBG */
-BOOL
+BOOLEAN
LdrMappedAsDataFile(PVOID *BaseAddress)
{
if (0 != ((DWORD_PTR) *BaseAddress & (PAGE_SIZE - 1)))
@@ -96,7 +96,7 @@
return FALSE;
}
-static inline LONG LdrpDecrementLoadCount(PLDR_MODULE Module, BOOL
Locked)
+static inline LONG LdrpDecrementLoadCount(PLDR_MODULE Module, BOOLEAN
Locked)
{
LONG LoadCount;
if (!Locked)
@@ -115,7 +115,7 @@
return LoadCount;
}
-static inline LONG LdrpIncrementLoadCount(PLDR_MODULE Module, BOOL
Locked)
+static inline LONG LdrpIncrementLoadCount(PLDR_MODULE Module, BOOLEAN
Locked)
{
LONG LoadCount;
if (!Locked)
@@ -134,7 +134,7 @@
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)
{
@@ -168,7 +168,7 @@
}
}
-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) ||
Module->EntryPoint == 0)
@@ -561,7 +561,7 @@
LdrpMapDllImageFile(IN PWSTR SearchPath OPTIONAL,
IN PUNICODE_STRING DllName,
OUT PUNICODE_STRING FullDosName,
- IN BOOL MapAsDataFile,
+ IN BOOLEAN MapAsDataFile,
OUT PHANDLE SectionHandle)
{
WCHAR SearchPathBuffer[MAX_PATH];
@@ -834,7 +834,7 @@
static NTSTATUS
LdrFindEntryForName(PUNICODE_STRING Name,
PLDR_MODULE *Module,
- BOOL Ref)
+ BOOLEAN Ref)
{
PLIST_ENTRY ModuleListHead;
PLIST_ENTRY Entry;
@@ -1338,7 +1338,7 @@
LdrpGetOrLoadModule(PWCHAR SerachPath,
PCHAR Name,
PLDR_MODULE* Module,
- BOOL Load)
+ BOOLEAN Load)
{
UNICODE_STRING DllName;
NTSTATUS Status;
@@ -1717,7 +1717,7 @@
}
else
{
- BOOL WrongForwarder;
+ BOOLEAN WrongForwarder;
WrongForwarder = FALSE;
if (ImportedModule->Flags & IMAGE_NOT_AT_BASE)
{
@@ -1997,7 +1997,7 @@
ULONG ViewSize;
PVOID ImageBase;
PIMAGE_NT_HEADERS NtHeaders;
- BOOL MappedAsDataFile;
+ BOOLEAN MappedAsDataFile;
if (Module == NULL)
{
@@ -2130,7 +2130,7 @@
static NTSTATUS
LdrpUnloadModule(PLDR_MODULE Module,
- BOOL Unload)
+ BOOLEAN Unload)
{
PIMAGE_IMPORT_MODULE_DIRECTORY ImportModuleDirectory;
PIMAGE_BOUND_IMPORT_DESCRIPTOR BoundImportDescriptor;
@@ -2400,7 +2400,7 @@
* The loader lock must be held on enty.
*/
static VOID
-LdrpDetachProcess(BOOL UnloadAll)
+LdrpDetachProcess(BOOLEAN UnloadAll)
{
PLIST_ENTRY ModuleListHead;
PLIST_ENTRY Entry;
@@ -2499,7 +2499,7 @@
PLIST_ENTRY ModuleListHead;
PLIST_ENTRY Entry;
PLDR_MODULE Module;
- BOOL Result;
+ BOOLEAN Result;
NTSTATUS Status = STATUS_SUCCESS;
DPRINT("LdrpAttachProcess() called for %wZ\n",