From 82cd2aad07fa2fea6e572a38cee03465eb71eec6 Mon Sep 17 00:00:00 2001
From: Sylvain Petreolle <spetreolle@yahoo.fr>
Date: Tue, 8 Jun 2010 20:24:15 +0000
Subject: [PATCH] Merge RtlIpv4StringToAddressW fix from network branch.

svn path=/trunk/; revision=47699
---
 reactos/dll/win32/ws2_32_new/src/addrinfo.c | 2 +-
 reactos/include/ndk/rtlfuncs.h              | 6 +++---
 reactos/lib/rtl/network.c                   | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/reactos/dll/win32/ws2_32_new/src/addrinfo.c b/reactos/dll/win32/ws2_32_new/src/addrinfo.c
index cfdb4f130dd..7bc55caf522 100644
--- a/reactos/dll/win32/ws2_32_new/src/addrinfo.c
+++ b/reactos/dll/win32/ws2_32_new/src/addrinfo.c
@@ -91,7 +91,7 @@ ParseV4Address(IN PCWSTR AddressString,
     LPWSTR Ip = 0;
 
     /* Do the conversion, don't accept wildcard */
-    RtlIpv4StringToAddressW((LPWSTR)AddressString, 0, Ip, (IN_ADDR *)&Address);
+    RtlIpv4StringToAddressW((LPWSTR)AddressString, 0, &Ip, (IN_ADDR *)&Address);
 
     /* Return the address and success */
     *pAddress = Address;
diff --git a/reactos/include/ndk/rtlfuncs.h b/reactos/include/ndk/rtlfuncs.h
index d0f3f06d701..731d2386b46 100644
--- a/reactos/include/ndk/rtlfuncs.h
+++ b/reactos/include/ndk/rtlfuncs.h
@@ -3185,9 +3185,9 @@ NTSYSAPI
 NTSTATUS
 NTAPI
 RtlIpv4StringToAddressW(
-    IN PWCHAR String,
-    IN UCHAR Strict,
-    OUT PWCHAR Terminator,
+    IN PCWSTR String,
+    IN BOOLEAN Strict,
+    OUT LPWSTR *Terminator,
     OUT struct in_addr *Addr
 );
 
diff --git a/reactos/lib/rtl/network.c b/reactos/lib/rtl/network.c
index 356d3510fc4..e8b0d6b9fd5 100644
--- a/reactos/lib/rtl/network.c
+++ b/reactos/lib/rtl/network.c
@@ -103,9 +103,9 @@ RtlIpv4StringToAddressExA(IN PCHAR AddressString,
 */
 NTSTATUS
 NTAPI
-RtlIpv4StringToAddressW(IN PWCHAR String,
-                        IN UCHAR Strict,
-                        OUT PWCHAR Terminator,
+RtlIpv4StringToAddressW(IN PCWSTR String,
+                        IN BOOLEAN Strict,
+                        OUT LPWSTR *Terminator,
                         OUT struct in_addr *Addr)
 {
     UNIMPLEMENTED;