Fixes for GCC compilation, also fixed w32api definition of LUID Modified: branches/rox-u/reactos/ntoskrnl/ldr/rtl.c Modified: branches/rox-u/reactos/ntoskrnl/ps/psmgr.c Modified: branches/rox-u/reactos/ntoskrnl/se/luid.c Modified: branches/rox-u/reactos/w32api/include/winnt.h _____
Modified: branches/rox-u/reactos/ntoskrnl/ldr/rtl.c --- branches/rox-u/reactos/ntoskrnl/ldr/rtl.c 2005-06-21 17:16:25 UTC (rev 16207) +++ branches/rox-u/reactos/ntoskrnl/ldr/rtl.c 2005-06-21 18:44:20 UTC (rev 16208) @@ -17,8 +17,6 @@
/* FUNCTIONS ****************************************************************/
-#define RVA(m, b) ((ULONG)b + m) - NTSTATUS STDCALL LdrGetProcedureAddress (IN PVOID BaseAddress, IN PANSI_STRING Name, _____
Modified: branches/rox-u/reactos/ntoskrnl/ps/psmgr.c --- branches/rox-u/reactos/ntoskrnl/ps/psmgr.c 2005-06-21 17:16:25 UTC (rev 16207) +++ branches/rox-u/reactos/ntoskrnl/ps/psmgr.c 2005-06-21 18:44:20 UTC (rev 16208) @@ -173,7 +173,7 @@
ProcessObject, sizeof(EPROCESS), FALSE); - PsIdleProcess->Pcb.DirectoryTableBase.QuadPart = MmGetPageDirectory(); + PsIdleProcess->Pcb.DirectoryTableBase.QuadPart = (ULONG_PTR)MmGetPageDirectory(); strcpy(PsIdleProcess->ImageFileName, "Idle");
/* _____
Modified: branches/rox-u/reactos/ntoskrnl/se/luid.c --- branches/rox-u/reactos/ntoskrnl/se/luid.c 2005-06-21 17:16:25 UTC (rev 16207) +++ branches/rox-u/reactos/ntoskrnl/se/luid.c 2005-06-21 18:44:20 UTC (rev 16208) @@ -34,8 +34,7 @@
NTSTATUS ExpAllocateLocallyUniqueId(OUT LUID *LocallyUniqueId) { - LARGE_INTEGER NewLuid; - volatile LARGE_INTEGER PrevLuid; + LARGE_INTEGER NewLuid, PrevLuid;
/* atomically increment the luid */ do _____
Modified: branches/rox-u/reactos/w32api/include/winnt.h --- branches/rox-u/reactos/w32api/include/winnt.h 2005-06-21 17:16:25 UTC (rev 16207) +++ branches/rox-u/reactos/w32api/include/winnt.h 2005-06-21 18:44:20 UTC (rev 16208) @@ -2039,7 +2039,10 @@
#endif /* NONAMELESSUNION */ ULONGLONG QuadPart; } ULARGE_INTEGER, *PULARGE_INTEGER; -typedef LARGE_INTEGER LUID,*PLUID; +typedef struct _LUID { + DWORD LowPart; + LONG HighPart; +} LUID, *PLUID; #pragma pack(push,4) typedef struct _LUID_AND_ATTRIBUTES { LUID Luid;