Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-05 09:20:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

[DDK][NDK][RTL][WS2_32_NEW]

Browse source 
- Add missing and improve existing declarations of RtlIpv4StringToAddress*

svn path=/trunk/; revision=61707
This commit is contained in:
Thomas Faber 2014-01-19 14:56:13 +00:00
parent bccb083ae2
commit 57883c7aef
4 changed files with 52 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
reactos/dll/win32/ws2_32_new/src/addrinfo.c
View file

@ -87,15 +87,18 @@ WINAPI
ParseV4Address(IN PCWSTR AddressString, ParseV4Address(IN PCWSTR AddressString,
OUT PDWORD pAddress) OUT PDWORD pAddress)
{ {
DWORD Address; IN_ADDR Address;
LPWSTR Ip = 0; PCWSTR Terminator;
NTSTATUS Status;
/* Do the conversion, don't accept wildcard */ *pAddress = 0;
RtlIpv4StringToAddressW((LPWSTR)AddressString, 0, &Ip, (IN_ADDR *)&Address); Status = RtlIpv4StringToAddressW(AddressString, FALSE, &Terminator, &Address);
/* Return the address and success */ if (!NT_SUCCESS(Status))
*pAddress = Address;
return FALSE; return FALSE;
*pAddress = Address.S_un.S_addr;
return TRUE;
} }
static static

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

@ -3991,16 +3991,46 @@ RtlComputeCrc32(
// //
// Network Functions // Network Functions
// //
NTSYSAPI
NTSTATUS
NTAPI
RtlIpv4StringToAddressA(
_In_ PCSTR String,
_In_ BOOLEAN Strict,
_Out_ PCSTR *Terminator,
_Out_ struct in_addr *Addr
);
NTSYSAPI NTSYSAPI
NTSTATUS NTSTATUS
NTAPI NTAPI
RtlIpv4StringToAddressW( RtlIpv4StringToAddressW(
_In_ PCWSTR String, _In_ PCWSTR String,
_In_ BOOLEAN Strict, _In_ BOOLEAN Strict,
_Out_ LPWSTR *Terminator, _Out_ PCWSTR *Terminator,
_Out_ struct in_addr *Addr _Out_ struct in_addr *Addr
); );
NTSYSAPI
NTSTATUS
NTAPI
RtlIpv4StringToAddressExA(
_In_ PCSTR AddressString,
_In_ BOOLEAN Strict,
_Out_ struct in_addr *Address,
_Out_ PUSHORT Port
);
NTSYSAPI
NTSTATUS
NTAPI
RtlIpv4StringToAddressExW(
_In_ PCWSTR AddressString,
_In_ BOOLEAN Strict,
_Out_ struct in_addr *Address,
_Out_ PUSHORT Port
);
NTSYSAPI NTSYSAPI
NTSTATUS NTSTATUS
NTAPI NTAPI

6
reactos/include/psdk/mstcpip.h
View file

@ -1340,7 +1340,7 @@ NTSYSAPI
LONG LONG
NTAPI NTAPI
RtlIpv4StringToAddressA( RtlIpv4StringToAddressA(
_In_ PCSTR S, _In_ PCSTR String,
_In_ BOOLEAN Strict, _In_ BOOLEAN Strict,
_Out_ PCSTR *Terminator, _Out_ PCSTR *Terminator,
_Out_ struct in_addr *Addr); _Out_ struct in_addr *Addr);
@ -1358,9 +1358,9 @@ NTSYSAPI
LONG LONG
NTAPI NTAPI
RtlIpv4StringToAddressW( RtlIpv4StringToAddressW(
_In_ PCWSTR S, _In_ PCWSTR String,
_In_ BOOLEAN Strict, _In_ BOOLEAN Strict,
_Out_ LPCWSTR *Terminator, _Out_ PCWSTR *Terminator,
_Out_ struct in_addr *Addr); _Out_ struct in_addr *Addr);
NTSYSAPI NTSYSAPI

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

@ -135,9 +135,9 @@ RtlIpv4AddressToStringExW(IN struct in_addr *Address,
*/ */
NTSTATUS NTSTATUS
NTAPI NTAPI
RtlIpv4StringToAddressA(IN PCHAR String, RtlIpv4StringToAddressA(IN PCSTR String,
IN BOOLEAN Strict, IN BOOLEAN Strict,
OUT PCHAR *Terminator, OUT PCSTR *Terminator,
OUT struct in_addr *Addr) OUT struct in_addr *Addr)
{ {
UNIMPLEMENTED; UNIMPLEMENTED;
@ -149,10 +149,10 @@ RtlIpv4StringToAddressA(IN PCHAR String,
*/ */
NTSTATUS NTSTATUS
NTAPI NTAPI
RtlIpv4StringToAddressExA(IN PCHAR AddressString, RtlIpv4StringToAddressExA(IN PCSTR AddressString,
IN BOOLEAN Strict, IN BOOLEAN Strict,
OUT struct in_addr *Address, OUT struct in_addr *Address,
IN PUSHORT Port) OUT PUSHORT Port)
{ {
UNIMPLEMENTED; UNIMPLEMENTED;
return STATUS_NOT_IMPLEMENTED; return STATUS_NOT_IMPLEMENTED;
@ -165,7 +165,7 @@ NTSTATUS
NTAPI NTAPI
RtlIpv4StringToAddressW(IN PCWSTR String, RtlIpv4StringToAddressW(IN PCWSTR String,
IN BOOLEAN Strict, IN BOOLEAN Strict,
OUT LPWSTR *Terminator, OUT PCWSTR *Terminator,
OUT struct in_addr *Addr) OUT struct in_addr *Addr)
{ {
UNIMPLEMENTED; UNIMPLEMENTED;
@ -177,7 +177,7 @@ RtlIpv4StringToAddressW(IN PCWSTR String,
*/ */
NTSTATUS NTSTATUS
NTAPI NTAPI
RtlIpv4StringToAddressExW(IN PWCHAR AddressString, RtlIpv4StringToAddressExW(IN PCWSTR AddressString,
IN BOOLEAN Strict, IN BOOLEAN Strict,
OUT struct in_addr *Address, OUT struct in_addr *Address,
OUT PUSHORT Port) OUT PUSHORT Port)