Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-04 08:25:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

[NDK][RTL]

Browse source 
- Fix RtlIpv* function prototypes, and add missing ones. Patch by Mark Jansen
CORE-6490

svn path=/trunk/; revision=67029
This commit is contained in:
Thomas Faber 2015-04-04 07:38:39 +00:00
parent 1e9cbe5aab
commit cc33924d4a
2 changed files with 106 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

97
reactos/include/ndk/rtlfuncs.h
View file

@ -3993,6 +3993,41 @@ RtlComputeCrc32(
//
// Network Functions
//
NTSYSAPI
PSTR
NTAPI
RtlIpv4AddressToStringA(
_In_ const struct in_addr *Addr,
_Out_writes_(16) PCHAR S
);
NTSYSAPI
PWSTR
NTAPI
RtlIpv4AddressToStringW(
_In_ const struct in_addr *Addr,
_Out_writes_(16) PWCHAR S
);
NTSYSAPI
NTSTATUS
NTAPI
RtlIpv4AddressToStringExA(
_In_ const struct in_addr *Address,
_In_ USHORT Port,
_Out_writes_to_(*AddressStringLength, *AddressStringLength) PCHAR AddressString,
_Inout_ PULONG AddressStringLength
);
NTSTATUS
NTAPI
RtlIpv4AddressToStringExW(
_In_ const struct in_addr *Address,
_In_ USHORT Port,
_Out_writes_to_(*AddressStringLength, *AddressStringLength) PWCHAR AddressString,
_Inout_ PULONG AddressStringLength
);
NTSYSAPI
NTSTATUS
NTAPI
@ -4033,12 +4068,50 @@ RtlIpv4StringToAddressExW(
_Out_ PUSHORT Port
);
NTSYSAPI
PSTR
NTAPI
RtlIpv6AddressToStringA(
_In_ const struct in6_addr *Addr,
_Out_writes_(46) PSTR S
);
NTSYSAPI
PWSTR
NTAPI
RtlIpv6AddressToStringW(
_In_ const struct in6_addr *Addr,
_Out_writes_(46) PWSTR S
);
NTSYSAPI
NTSTATUS
NTAPI
RtlIpv6AddressToStringExA(
_In_ const struct in6_addr *Address,
_In_ ULONG ScopeId,
_In_ USHORT Port,
_Out_writes_to_(*AddressStringLength, *AddressStringLength) PSTR AddressString,
_Inout_ PULONG AddressStringLength
);
NTSYSAPI
NTSTATUS
NTAPI
RtlIpv6AddressToStringExW(
_In_ const struct in6_addr *Address,
_In_ ULONG ScopeId,
_In_ USHORT Port,
_Out_writes_to_(*AddressStringLength, *AddressStringLength) PWCHAR AddressString,
_Inout_ PULONG AddressStringLength
);
NTSYSAPI
NTSTATUS
NTAPI
RtlIpv6StringToAddressA(
_In_ PCHAR Name,
_Out_ PCHAR *Terminator,
_In_ PCSTR String,
_Out_ PCSTR *Terminator,
_Out_ struct in6_addr *Addr
);
@ -4046,8 +4119,8 @@ NTSYSAPI
NTSTATUS
NTAPI
RtlIpv6StringToAddressW(
_In_ PWCHAR Name,
_Out_ PCHAR *Terminator,
_In_ PCWSTR String,
_Out_ PCWSTR *Terminator,
_Out_ struct in6_addr *Addr
);
@ -4055,20 +4128,20 @@ NTSYSAPI
NTSTATUS
NTAPI
RtlIpv6StringToAddressExA(
_In_ PCHAR AddressString,
_In_ struct in6_addr *Address,
_In_ PULONG ScopeId,
_In_ PUSHORT Port
_In_ PCSTR AddressString,
_Out_ struct in6_addr *Address,
_Out_ PULONG ScopeId,
_Out_ PUSHORT Port
);
NTSYSAPI
NTSTATUS
NTAPI
RtlIpv6StringToAddressExW(
_In_ PWCHAR AddressName,
_In_ struct in6_addr *Address,
_In_ PULONG ScopeId,
_In_ PUSHORT Port
_In_ PCWSTR AddressString,
_Out_ struct in6_addr *Address,
_Out_ PULONG ScopeId,
_Out_ PUSHORT Port
);

42
reactos/lib/rtl/network.c
View file

@ -102,9 +102,9 @@ Done:
/*
* @implemented
*/
LPSTR
PSTR
NTAPI
RtlIpv4AddressToStringA(IN struct in_addr *Addr,
RtlIpv4AddressToStringA(IN const struct in_addr *Addr,
OUT PCHAR S)
{
INT Length;
@ -124,7 +124,7 @@ RtlIpv4AddressToStringA(IN struct in_addr *Addr,
*/
NTSTATUS
NTAPI
RtlIpv4AddressToStringExA(IN struct in_addr *Address,
RtlIpv4AddressToStringExA(IN const struct in_addr *Address,
IN USHORT Port,
OUT PCHAR AddressString,
IN OUT PULONG AddressStringLength)
@ -156,9 +156,9 @@ RtlIpv4AddressToStringExA(IN struct in_addr *Address,
/*
* @implemented
*/
LPWSTR
PWSTR
NTAPI
RtlIpv4AddressToStringW(IN struct in_addr *Addr,
RtlIpv4AddressToStringW(IN const struct in_addr *Addr,
OUT PWCHAR S)
{
INT Length;
@ -177,7 +177,7 @@ RtlIpv4AddressToStringW(IN struct in_addr *Addr,
*/
NTSTATUS
NTAPI
RtlIpv4AddressToStringExW(IN struct in_addr *Address,
RtlIpv4AddressToStringExW(IN const struct in_addr *Address,
IN USHORT Port,
OUT PWCHAR AddressString,
IN OUT PULONG AddressStringLength)
@ -388,13 +388,13 @@ RtlIpv4StringToAddressExW(
/*
* @unimplemented
*/
NTSTATUS
PSTR
NTAPI
RtlIpv6AddressToStringA(IN struct in6_addr *Addr,
RtlIpv6AddressToStringA(IN const struct in6_addr *Addr,
OUT PCHAR S)
{
UNIMPLEMENTED;
return STATUS_NOT_IMPLEMENTED;
return NULL;
}
/*
@ -402,9 +402,9 @@ RtlIpv6AddressToStringA(IN struct in6_addr *Addr,
*/
NTSTATUS
NTAPI
RtlIpv6AddressToStringExA(IN struct in6_addr *Address,
RtlIpv6AddressToStringExA(IN const struct in6_addr *Address,
IN ULONG ScopeId,
IN ULONG Port,
IN USHORT Port,
OUT PCHAR AddressString,
IN OUT PULONG AddressStringLength)
{
@ -415,13 +415,13 @@ RtlIpv6AddressToStringExA(IN struct in6_addr *Address,
/*
* @unimplemented
*/
NTSTATUS
PWSTR
NTAPI
RtlIpv6AddressToStringW(IN struct in6_addr *Addr,
RtlIpv6AddressToStringW(IN const struct in6_addr *Addr,
OUT PWCHAR S)
{
UNIMPLEMENTED;
return STATUS_NOT_IMPLEMENTED;
return NULL;
}
/*
@ -429,7 +429,7 @@ RtlIpv6AddressToStringW(IN struct in6_addr *Addr,
*/
NTSTATUS
NTAPI
RtlIpv6AddressToStringExW(IN struct in6_addr *Address,
RtlIpv6AddressToStringExW(IN const struct in6_addr *Address,
IN ULONG ScopeId,
IN USHORT Port,
IN OUT PWCHAR AddressString,
@ -444,8 +444,8 @@ RtlIpv6AddressToStringExW(IN struct in6_addr *Address,
*/
NTSTATUS
NTAPI
RtlIpv6StringToAddressA(IN PCHAR Name,
OUT PCHAR *Terminator,
RtlIpv6StringToAddressA(IN PCSTR Name,
OUT PCSTR *Terminator,
OUT struct in6_addr *Addr)
{
UNIMPLEMENTED;
@ -457,7 +457,7 @@ RtlIpv6StringToAddressA(IN PCHAR Name,
*/
NTSTATUS
NTAPI
RtlIpv6StringToAddressExA(IN PCHAR AddressString,
RtlIpv6StringToAddressExA(IN PCSTR AddressString,
OUT struct in6_addr *Address,
OUT PULONG ScopeId,
OUT PUSHORT Port)
@ -471,8 +471,8 @@ RtlIpv6StringToAddressExA(IN PCHAR AddressString,
*/
NTSTATUS
NTAPI
RtlIpv6StringToAddressW(IN PWCHAR Name,
OUT PCHAR *Terminator,
RtlIpv6StringToAddressW(IN PCWSTR Name,
OUT PCWSTR *Terminator,
OUT struct in6_addr *Addr)
{
UNIMPLEMENTED;
@ -484,7 +484,7 @@ RtlIpv6StringToAddressW(IN PWCHAR Name,
*/
NTSTATUS
NTAPI
RtlIpv6StringToAddressExW(IN PWCHAR AddressName,
RtlIpv6StringToAddressExW(IN PCWSTR AddressName,
OUT struct in6_addr *Address,
OUT PULONG ScopeId,
OUT PUSHORT Port)