From 71d93bc857e87b5b31b4c799fdd3545aefa4f1dc Mon Sep 17 00:00:00 2001
From: Johannes Anderwald <johannes.anderwald@reactos.org>
Date: Fri, 17 Oct 2008 19:03:11 +0000
Subject: [PATCH] * Fix retrieval of automatic DNS settings 1/2

svn path=/trunk/; revision=36796
---
 reactos/dll/win32/iphlpapi/iphlpapi_main.c   | 2 +-
 reactos/dll/win32/netcfgx/tcpipconf_notify.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/reactos/dll/win32/iphlpapi/iphlpapi_main.c b/reactos/dll/win32/iphlpapi/iphlpapi_main.c
index 92699740346..0f3c04b16bb 100644
--- a/reactos/dll/win32/iphlpapi/iphlpapi_main.c
+++ b/reactos/dll/win32/iphlpapi/iphlpapi_main.c
@@ -1542,7 +1542,7 @@ DWORD WINAPI GetPerAdapterInfo(ULONG IfIndex, PIP_PER_ADAPTER_INFO pPerAdapterIn
 
   if(RegQueryValueExW(hkey, L"DHCPNameServer", NULL, NULL, NULL, &dwSize) == ERROR_SUCCESS)
   {
-    pPerAdapterInfo->AutoconfigEnabled = TRUE;
+    pPerAdapterInfo->AutoconfigActive = TRUE;
   }
 
   RegCloseKey(hkey);
diff --git a/reactos/dll/win32/netcfgx/tcpipconf_notify.c b/reactos/dll/win32/netcfgx/tcpipconf_notify.c
index 2e444a0130a..ad1089032cd 100644
--- a/reactos/dll/win32/netcfgx/tcpipconf_notify.c
+++ b/reactos/dll/win32/netcfgx/tcpipconf_notify.c
@@ -2364,6 +2364,11 @@ CopyIpAddrString(
         }
         ZeroMemory(pNew, sizeof(IP_ADDR));
         pNew->IpAddress = GetIpAddressFromStringA(pCurrent->IpAddress.String);
+        if (!pNew->IpAddress)
+        {
+            CoTaskMemFree(pNew);
+            return E_FAIL;
+        }
 
        if (Type == SUBMASK)
        {