[RTL/NDK/NTDLL]

- Fix calling convention of RtlSetProcessIsCritical and RtlSetThreadIsCritical (they are __cdecl!)
[NDK]
- Add missing extern "C"

svn path=/trunk/; revision=61568
This commit is contained in:
Timo Kreuzer 2014-01-07 20:23:44 +00:00
parent d3872b419c
commit 0a7344aca7
5 changed files with 30 additions and 22 deletions

View file

@ -846,7 +846,7 @@
@ stdcall RtlSetLastWin32ErrorAndNtStatusFromNtStatus(long) @ stdcall RtlSetLastWin32ErrorAndNtStatusFromNtStatus(long)
@ stdcall RtlSetMemoryStreamSize(ptr int64) @ stdcall RtlSetMemoryStreamSize(ptr int64)
@ stdcall RtlSetOwnerSecurityDescriptor(ptr ptr long) @ stdcall RtlSetOwnerSecurityDescriptor(ptr ptr long)
@ stdcall RtlSetProcessIsCritical(long ptr long) @ cdecl RtlSetProcessIsCritical(long ptr long)
;@ stdcall RtlSetProperties ; RtlSetProperties ;@ stdcall RtlSetProperties ; RtlSetProperties
;@ stdcall RtlSetPropertyClassId ; 4.0 only ;@ stdcall RtlSetPropertyClassId ; 4.0 only
;@ stdcall RtlSetPropertyNames ; 4.0 only ;@ stdcall RtlSetPropertyNames ; 4.0 only
@ -856,7 +856,7 @@
@ stdcall RtlSetSecurityObject(long ptr ptr ptr ptr) @ stdcall RtlSetSecurityObject(long ptr ptr ptr ptr)
@ stdcall RtlSetSecurityObjectEx(long ptr ptr long ptr ptr) @ stdcall RtlSetSecurityObjectEx(long ptr ptr long ptr ptr)
@ stdcall RtlSetThreadErrorMode(long ptr) @ stdcall RtlSetThreadErrorMode(long ptr)
@ stdcall RtlSetThreadIsCritical(long ptr long) @ cdecl RtlSetThreadIsCritical(long ptr long)
@ stdcall RtlSetThreadPoolStartFunc(ptr ptr) @ stdcall RtlSetThreadPoolStartFunc(ptr ptr)
@ stdcall RtlSetTimeZoneInformation(ptr) @ stdcall RtlSetTimeZoneInformation(ptr)
;@ stdcall RtlSetTimer ;@ stdcall RtlSetTimer

View file

@ -26,6 +26,10 @@ Author:
#include <arch/mmtypes.h> #include <arch/mmtypes.h>
#include <extypes.h> #include <extypes.h>
#ifdef __cplusplus
extern "C" {
#endif
// //
// Page-Rounding Macros // Page-Rounding Macros
// //
@ -1037,4 +1041,8 @@ extern POBJECT_TYPE NTSYSAPI MmSectionObjectType;
#endif // !NTOS_MODE_USER #endif // !NTOS_MODE_USER
#ifdef __cplusplus
} // extern "C"
#endif
#endif // _MMTYPES_H #endif // _MMTYPES_H

View file

@ -2564,7 +2564,7 @@ RtlRemoteCall(
NTSYSAPI NTSYSAPI
NTSTATUS NTSTATUS
NTAPI __cdecl
RtlSetProcessIsCritical( RtlSetProcessIsCritical(
_In_ BOOLEAN NewValue, _In_ BOOLEAN NewValue,
_Out_opt_ PBOOLEAN OldValue, _Out_opt_ PBOOLEAN OldValue,
@ -2573,7 +2573,7 @@ RtlSetProcessIsCritical(
NTSYSAPI NTSYSAPI
NTSTATUS NTSTATUS
NTAPI __cdecl
RtlSetThreadIsCritical( RtlSetThreadIsCritical(
_In_ BOOLEAN NewValue, _In_ BOOLEAN NewValue,
_Out_opt_ PBOOLEAN OldValue, _Out_opt_ PBOOLEAN OldValue,
@ -4244,7 +4244,7 @@ RtlFinalReleaseOutOfProcessMemoryStream(
NTSYSAPI NTSYSAPI
HRESULT HRESULT
NTAPI NTAPI
RtlQueryInterfaceMemoryStream( RtlQueryInterfaceMemoryStream(
_In_ struct IStream *This, _In_ struct IStream *This,
_In_ REFIID RequestedIid, _In_ REFIID RequestedIid,
_Outptr_ PVOID *ResultObject _Outptr_ PVOID *ResultObject
@ -4253,21 +4253,21 @@ RtlQueryInterfaceMemoryStream(
NTSYSAPI NTSYSAPI
ULONG ULONG
NTAPI NTAPI
RtlAddRefMemoryStream( RtlAddRefMemoryStream(
_In_ struct IStream *This _In_ struct IStream *This
); );
NTSYSAPI NTSYSAPI
ULONG ULONG
NTAPI NTAPI
RtlReleaseMemoryStream( RtlReleaseMemoryStream(
_In_ struct IStream *This _In_ struct IStream *This
); );
NTSYSAPI NTSYSAPI
HRESULT HRESULT
NTAPI NTAPI
RtlReadMemoryStream( RtlReadMemoryStream(
_In_ struct IStream *This, _In_ struct IStream *This,
_Out_writes_bytes_(Length) PVOID Buffer, _Out_writes_bytes_(Length) PVOID Buffer,
_In_ ULONG Length, _In_ ULONG Length,
@ -4277,7 +4277,7 @@ RtlReadMemoryStream(
NTSYSAPI NTSYSAPI
HRESULT HRESULT
NTAPI NTAPI
RtlReadOutOfProcessMemoryStream( RtlReadOutOfProcessMemoryStream(
_In_ struct IStream *This, _In_ struct IStream *This,
_Out_writes_bytes_(Length) PVOID Buffer, _Out_writes_bytes_(Length) PVOID Buffer,
_In_ ULONG Length, _In_ ULONG Length,
@ -4287,7 +4287,7 @@ RtlReadOutOfProcessMemoryStream(
NTSYSAPI NTSYSAPI
HRESULT HRESULT
NTAPI NTAPI
RtlSeekMemoryStream( RtlSeekMemoryStream(
_In_ struct IStream *This, _In_ struct IStream *This,
_In_ LARGE_INTEGER RelativeOffset, _In_ LARGE_INTEGER RelativeOffset,
_In_ ULONG Origin, _In_ ULONG Origin,
@ -4297,7 +4297,7 @@ RtlSeekMemoryStream(
NTSYSAPI NTSYSAPI
HRESULT HRESULT
NTAPI NTAPI
RtlCopyMemoryStreamTo( RtlCopyMemoryStreamTo(
_In_ struct IStream *This, _In_ struct IStream *This,
_In_ struct IStream *Target, _In_ struct IStream *Target,
_In_ ULARGE_INTEGER Length, _In_ ULARGE_INTEGER Length,
@ -4308,7 +4308,7 @@ RtlCopyMemoryStreamTo(
NTSYSAPI NTSYSAPI
HRESULT HRESULT
NTAPI NTAPI
RtlCopyOutOfProcessMemoryStreamTo( RtlCopyOutOfProcessMemoryStreamTo(
_In_ struct IStream *This, _In_ struct IStream *This,
_In_ struct IStream *Target, _In_ struct IStream *Target,
_In_ ULARGE_INTEGER Length, _In_ ULARGE_INTEGER Length,
@ -4319,7 +4319,7 @@ RtlCopyOutOfProcessMemoryStreamTo(
NTSYSAPI NTSYSAPI
HRESULT HRESULT
NTAPI NTAPI
RtlStatMemoryStream( RtlStatMemoryStream(
_In_ struct IStream *This, _In_ struct IStream *This,
_Out_ struct tagSTATSTG *Stats, _Out_ struct tagSTATSTG *Stats,
_In_ ULONG Flags _In_ ULONG Flags
@ -4329,7 +4329,7 @@ RtlStatMemoryStream(
NTSYSAPI NTSYSAPI
HRESULT HRESULT
NTAPI NTAPI
RtlWriteMemoryStream( RtlWriteMemoryStream(
_In_ struct IStream *This, _In_ struct IStream *This,
_In_reads_bytes_(Length) CONST VOID *Buffer, _In_reads_bytes_(Length) CONST VOID *Buffer,
_In_ ULONG Length, _In_ ULONG Length,
@ -4339,7 +4339,7 @@ RtlWriteMemoryStream(
NTSYSAPI NTSYSAPI
HRESULT HRESULT
NTAPI NTAPI
RtlSetMemoryStreamSize( RtlSetMemoryStreamSize(
_In_ struct IStream *This, _In_ struct IStream *This,
_In_ ULARGE_INTEGER NewSize _In_ ULARGE_INTEGER NewSize
); );
@ -4347,7 +4347,7 @@ RtlSetMemoryStreamSize(
NTSYSAPI NTSYSAPI
HRESULT HRESULT
NTAPI NTAPI
RtlCommitMemoryStream( RtlCommitMemoryStream(
_In_ struct IStream *This, _In_ struct IStream *This,
_In_ ULONG CommitFlags _In_ ULONG CommitFlags
); );
@ -4355,14 +4355,14 @@ RtlCommitMemoryStream(
NTSYSAPI NTSYSAPI
HRESULT HRESULT
NTAPI NTAPI
RtlRevertMemoryStream( RtlRevertMemoryStream(
_In_ struct IStream *This _In_ struct IStream *This
); );
NTSYSAPI NTSYSAPI
HRESULT HRESULT
NTAPI NTAPI
RtlLockMemoryStreamRegion( RtlLockMemoryStreamRegion(
_In_ struct IStream *This, _In_ struct IStream *This,
_In_ ULARGE_INTEGER Offset, _In_ ULARGE_INTEGER Offset,
_In_ ULARGE_INTEGER Length, _In_ ULARGE_INTEGER Length,
@ -4372,7 +4372,7 @@ RtlLockMemoryStreamRegion(
NTSYSAPI NTSYSAPI
HRESULT HRESULT
NTAPI NTAPI
RtlUnlockMemoryStreamRegion( RtlUnlockMemoryStreamRegion(
_In_ struct IStream *This, _In_ struct IStream *This,
_In_ ULARGE_INTEGER Offset, _In_ ULARGE_INTEGER Offset,
_In_ ULARGE_INTEGER Length, _In_ ULARGE_INTEGER Length,
@ -4382,7 +4382,7 @@ RtlUnlockMemoryStreamRegion(
NTSYSAPI NTSYSAPI
HRESULT HRESULT
NTAPI NTAPI
RtlCloneMemoryStream( RtlCloneMemoryStream(
_In_ struct IStream *This, _In_ struct IStream *This,
_Outptr_ struct IStream **ResultStream _Outptr_ struct IStream **ResultStream
); );

View file

@ -357,7 +357,7 @@ RtlEncodeSystemPointer(IN PVOID Pointer)
* http://www.geoffchappell.com/studies/windows/win32/ntdll/api/rtl/peb/setprocessiscritical.htm * http://www.geoffchappell.com/studies/windows/win32/ntdll/api/rtl/peb/setprocessiscritical.htm
*/ */
NTSTATUS NTSTATUS
NTAPI __cdecl
RtlSetProcessIsCritical(IN BOOLEAN NewValue, RtlSetProcessIsCritical(IN BOOLEAN NewValue,
OUT PBOOLEAN OldValue OPTIONAL, OUT PBOOLEAN OldValue OPTIONAL,
IN BOOLEAN NeedBreaks) IN BOOLEAN NeedBreaks)

View file

@ -158,7 +158,7 @@ RtlpFreeUserStack(IN HANDLE Process,
* @implemented * @implemented
*/ */
NTSTATUS NTSTATUS
NTAPI __cdecl
RtlSetThreadIsCritical(IN BOOLEAN NewValue, RtlSetThreadIsCritical(IN BOOLEAN NewValue,
OUT PBOOLEAN OldValue OPTIONAL, OUT PBOOLEAN OldValue OPTIONAL,
IN BOOLEAN NeedBreaks) IN BOOLEAN NeedBreaks)