Merge trunk head (r43756)

[reactos.git] / reactos / lib / rtl / rtlp.h

diff --git a/reactos/lib/rtl/rtlp.h b/reactos/lib/rtl/rtlp.h
index ea0114d..156dd3c 100644 (file)
--- a/reactos/lib/rtl/rtlp.h
+++ b/reactos/lib/rtl/rtlp.h
@@ -32,10 +32,12 @@ extern VOID FASTCALL CHECK_PAGED_CODE_RTL(char *file, int line);
 #define ROUND_UP(n, align) \
     ROUND_DOWN(((ULONG)n) + (align) - 1, (align))
 
 #define ROUND_UP(n, align) \
     ROUND_DOWN(((ULONG)n) + (align) - 1, (align))
 

+#define RVA(m, b) ((PVOID)((ULONG_PTR)(b) + (ULONG_PTR)(m)))
+

 VOID
 NTAPI
 VOID
 NTAPI

-RtlpGetStackLimits(PULONG_PTR StackBase,
-                   PULONG_PTR StackLimit);
+RtlpGetStackLimits(PULONG_PTR LowLimit,
+                   PULONG_PTR HighLimit);

 
 PEXCEPTION_REGISTRATION_RECORD
 NTAPI
 
 PEXCEPTION_REGISTRATION_RECORD
 NTAPI


@@ -100,7 +102,7 @@ RtlLeaveHeapLock(PRTL_CRITICAL_SECTION CriticalSection);
 
 BOOLEAN
 NTAPI
 
 BOOLEAN
 NTAPI

-RtlpCheckForActiveDebugger(BOOLEAN Type);
+RtlpCheckForActiveDebugger(VOID);

 
 BOOLEAN
 NTAPI
 
 BOOLEAN
 NTAPI


@@ -141,28 +143,30 @@ RtlpCheckLogException(IN PEXCEPTION_RECORD ExceptionRecord,
                       IN PVOID ContextData,
                       IN ULONG Size);
 
                       IN PVOID ContextData,
                       IN ULONG Size);
 

-PVOID
-NTAPI
-RtlpGetExceptionAddress(VOID);
-

 VOID
 NTAPI
 RtlpCaptureContext(OUT PCONTEXT ContextRecord);
 
 VOID
 NTAPI
 RtlpCaptureContext(OUT PCONTEXT ContextRecord);
 

-/* i386/debug.S */
-NTSTATUS
-NTAPI
-DebugService(IN ULONG Service,
-             IN const void* Buffer,
-             IN ULONG Length,
-             IN PVOID Argument1,
-             IN PVOID Argument2);
+//
+// Debug Service calls
+//
+ULONG
+NTAPI
+DebugService(
+    IN ULONG Service,
+    IN PVOID Argument1,
+    IN PVOID Argument2,
+    IN PVOID Argument3,
+    IN PVOID Argument4
+);

 
 

-NTSTATUS
+VOID

 NTAPI
 NTAPI

-DebugService2(IN PVOID Argument1,
-              IN PVOID Argument2,
-              IN ULONG Service);
+DebugService2(
+    IN PVOID Argument1,
+    IN PVOID Argument2,
+    IN ULONG Service
+);

 
 /* Tags for the String Allocators */
 #define TAG_USTR        'RTSU'
 
 /* Tags for the String Allocators */
 #define TAG_USTR        'RTSU'