[ros-diffs] [spetreolle] 47699: Merge RtlIpv4StringToAddressW fix from network branch.

Author: spetreolle
Date: Tue Jun  8 22:24:15 2010
New Revision: 47699

URL: http://svn.reactos.org/svn/reactos?rev=47699&view=rev
Log:
Merge RtlIpv4StringToAddressW fix from network branch.

Modified:
    trunk/reactos/dll/win32/ws2_32_new/src/addrinfo.c
    trunk/reactos/include/ndk/rtlfuncs.h
    trunk/reactos/lib/rtl/network.c

Modified: trunk/reactos/dll/win32/ws2_32_new/src/addrinfo.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/ad...
==============================================================================
--- trunk/reactos/dll/win32/ws2_32_new/src/addrinfo.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ws2_32_new/src/addrinfo.c [iso-8859-1] Tue Jun  8 22:24:15 2010
@@ -91,7 +91,7 @@
     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;

Modified: trunk/reactos/include/ndk/rtlfuncs.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev=...
==============================================================================
--- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original)
+++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Tue Jun  8 22:24:15 2010
@@ -3185,9 +3185,9 @@
 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
 );

Modified: trunk/reactos/lib/rtl/network.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/network.c?rev=47699...
==============================================================================
--- trunk/reactos/lib/rtl/network.c [iso-8859-1] (original)
+++ trunk/reactos/lib/rtl/network.c [iso-8859-1] Tue Jun  8 22:24:15 2010
@@ -103,9 +103,9 @@
 */
 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;