Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 23:42:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix and unify function prototypes for ntstrsafe functions taking variadic arguments.

Browse source
This commit is contained in:
Colin Finck 2019-08-19 17:38:05 +02:00
parent 331e331209
commit 46ed46c73f
No known key found for this signature in database
GPG key ID: 1BA74E70456BA1A9
1 changed files with 19 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

41
sdk/include/ddk/ntstrsafe.h
View file

@ -30,6 +30,7 @@
#endif #endif
#define NTSTRSAFEAPI static __inline NTSTATUS NTAPI #define NTSTRSAFEAPI static __inline NTSTATUS NTAPI
#define NTSTRSAFEVAPI static __inline NTSTATUS __cdecl
#define NTSTRSAFE_INLINE_API static __inline NTSTATUS NTAPI #define NTSTRSAFE_INLINE_API static __inline NTSTATUS NTAPI
#ifndef NTSTRSAFE_MAX_CCH #ifndef NTSTRSAFE_MAX_CCH
@ -1082,21 +1083,21 @@ RtlStringCbVPrintfW(
return RtlStringVPrintfWorkerW(pszDest, cchDest, pszFormat, argList); return RtlStringVPrintfWorkerW(pszDest, cchDest, pszFormat, argList);
} }
static __inline NTSTATUS NTSTRSAFEVAPI
RtlStringCchPrintfA( RtlStringCchPrintfA(
_Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest,
_In_ size_t cchDest, _In_ size_t cchDest,
_In_ _Printf_format_string_ NTSTRSAFE_PCSTR pszFormat, _In_ _Printf_format_string_ NTSTRSAFE_PCSTR pszFormat,
...); ...);
static __inline NTSTATUS NTSTRSAFEVAPI
RtlStringCchPrintfW( RtlStringCchPrintfW(
_Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest,
_In_ size_t cchDest, _In_ size_t cchDest,
_In_ _Printf_format_string_ NTSTRSAFE_PCWSTR pszFormat, _In_ _Printf_format_string_ NTSTRSAFE_PCWSTR pszFormat,
...); ...);
static __inline NTSTATUS NTSTRSAFEVAPI
RtlStringCchPrintfA( RtlStringCchPrintfA(
_Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest,
_In_ size_t cchDest, _In_ size_t cchDest,
@ -1121,7 +1122,7 @@ RtlStringCchPrintfA(
return Status; return Status;
} }
static __inline NTSTATUS NTSTRSAFEVAPI
RtlStringCchPrintfW( RtlStringCchPrintfW(
_Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest,
_In_ size_t cchDest, _In_ size_t cchDest,
@ -1145,21 +1146,21 @@ RtlStringCchPrintfW(
return Status; return Status;
} }
static __inline NTSTATUS NTSTRSAFEVAPI
RtlStringCbPrintfA( RtlStringCbPrintfA(
_Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, _Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest,
_In_ size_t cbDest, _In_ size_t cbDest,
_In_ _Printf_format_string_ NTSTRSAFE_PCSTR pszFormat, _In_ _Printf_format_string_ NTSTRSAFE_PCSTR pszFormat,
...); ...);
static __inline NTSTATUS NTSTRSAFEVAPI
RtlStringCbPrintfW( RtlStringCbPrintfW(
_Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, _Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest,
_In_ size_t cbDest, _In_ size_t cbDest,
_In_ _Printf_format_string_ NTSTRSAFE_PCWSTR pszFormat, _In_ _Printf_format_string_ NTSTRSAFE_PCWSTR pszFormat,
...); ...);
static __inline NTSTATUS NTSTRSAFEVAPI
RtlStringCbPrintfA( RtlStringCbPrintfA(
_Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, _Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest,
_In_ size_t cbDest, _In_ size_t cbDest,
@ -1184,7 +1185,7 @@ RtlStringCbPrintfA(
return Status; return Status;
} }
static __inline NTSTATUS NTSTRSAFEVAPI
RtlStringCbPrintfW( RtlStringCbPrintfW(
_Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, _Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest,
_In_ size_t cbDest, _In_ size_t cbDest,
@ -1209,7 +1210,7 @@ RtlStringCbPrintfW(
return Status; return Status;
} }
static __inline NTSTATUS NTSTRSAFEVAPI
RtlStringCchPrintfExA( RtlStringCchPrintfExA(
_Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest,
_In_ size_t cchDest, _In_ size_t cchDest,
@ -1219,7 +1220,7 @@ RtlStringCchPrintfExA(
_In_ _Printf_format_string_ NTSTRSAFE_PCSTR pszFormat, _In_ _Printf_format_string_ NTSTRSAFE_PCSTR pszFormat,
...); ...);
static __inline NTSTATUS NTSTRSAFEVAPI
RtlStringCchPrintfExW( RtlStringCchPrintfExW(
_Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest,
_In_ size_t cchDest, _In_ size_t cchDest,
@ -1229,7 +1230,7 @@ RtlStringCchPrintfExW(
_In_ _Printf_format_string_ NTSTRSAFE_PCWSTR pszFormat, _In_ _Printf_format_string_ NTSTRSAFE_PCWSTR pszFormat,
...); ...);
static __inline NTSTATUS NTSTRSAFEVAPI
RtlStringCchPrintfExA( RtlStringCchPrintfExA(
_Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest,
_In_ size_t cchDest, _In_ size_t cchDest,
@ -1257,7 +1258,7 @@ RtlStringCchPrintfExA(
return Status; return Status;
} }
static __inline NTSTATUS NTSTRSAFEVAPI
RtlStringCchPrintfExW( RtlStringCchPrintfExW(
_Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, _Out_writes_(cchDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest,
_In_ size_t cchDest, _In_ size_t cchDest,
@ -1285,7 +1286,7 @@ RtlStringCchPrintfExW(
return Status; return Status;
} }
static __inline NTSTATUS NTSTRSAFEVAPI
RtlStringCbPrintfExA( RtlStringCbPrintfExA(
_Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, _Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest,
_In_ size_t cbDest, _In_ size_t cbDest,
@ -1295,7 +1296,7 @@ RtlStringCbPrintfExA(
_In_ _Printf_format_string_ NTSTRSAFE_PCSTR pszFormat, _In_ _Printf_format_string_ NTSTRSAFE_PCSTR pszFormat,
...); ...);
static __inline NTSTATUS NTSTRSAFEVAPI
RtlStringCbPrintfExW( RtlStringCbPrintfExW(
_Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, _Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest,
_In_ size_t cbDest, _In_ size_t cbDest,
@ -1305,7 +1306,7 @@ RtlStringCbPrintfExW(
_In_ _Printf_format_string_ NTSTRSAFE_PCWSTR pszFormat, _In_ _Printf_format_string_ NTSTRSAFE_PCWSTR pszFormat,
...); ...);
static __inline NTSTATUS NTSTRSAFEVAPI
RtlStringCbPrintfExA( RtlStringCbPrintfExA(
_Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest, _Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PSTR pszDest,
_In_ size_t cbDest, _In_ size_t cbDest,
@ -1346,7 +1347,7 @@ RtlStringCbPrintfExA(
return Status; return Status;
} }
static __inline NTSTATUS NTSTRSAFEVAPI
RtlStringCbPrintfExW( RtlStringCbPrintfExW(
_Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest, _Out_writes_bytes_(cbDest) _Always_(_Post_z_) NTSTRSAFE_PWSTR pszDest,
_In_ size_t cbDest, _In_ size_t cbDest,
@ -3274,9 +3275,7 @@ RtlUnicodeStringValidateEx(
return RtlpUnicodeStringValidate(SourceString, dwFlags); return RtlpUnicodeStringValidate(SourceString, dwFlags);
} }
static NTSTRSAFEVAPI
NTSTATUS
__cdecl
RtlUnicodeStringPrintf( RtlUnicodeStringPrintf(
_In_ PUNICODE_STRING DestinationString, _In_ PUNICODE_STRING DestinationString,
_In_ NTSTRSAFE_PCWSTR pszFormat, _In_ NTSTRSAFE_PCWSTR pszFormat,
@ -3315,9 +3314,7 @@ RtlUnicodeStringPrintf(
return Status; return Status;
} }
static NTSTRSAFEVAPI
NTSTATUS
__cdecl
RtlUnicodeStringPrintfEx( RtlUnicodeStringPrintfEx(
_In_opt_ PUNICODE_STRING DestinationString, _In_opt_ PUNICODE_STRING DestinationString,
_In_opt_ PUNICODE_STRING RemainingString, _In_opt_ PUNICODE_STRING RemainingString,