Sync trunk (r47699)

svn path=/branches/header-work/; revision=47700

diff --git a/dll/win32/ws2_32_new/src/addrinfo.c b/dll/win32/ws2_32_new/src/addrinfo.c
index cfdb4f1..7bc55ca 100644 (file)
--- a/dll/win32/ws2_32_new/src/addrinfo.c
+++ b/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/include/ndk/rtlfuncs.h b/include/ndk/rtlfuncs.h
index d0f3f06..731d238 100644 (file)
--- a/include/ndk/rtlfuncs.h
+++ b/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/lib/rtl/network.c b/lib/rtl/network.c
index 356d351..e8b0d6b 100644 (file)
--- a/lib/rtl/network.c
+++ b/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;