From fa0cd2cd47c7d03ccd0bf34d071d9cc83b8cbdb5 Mon Sep 17 00:00:00 2001
From: Johannes Anderwald <johannes.anderwald@reactos.org>
Date: Wed, 15 Oct 2008 17:20:55 +0000
Subject: [PATCH] - Implement Advanced Status IP Information Dialog - Import
 language strings from netcfgx - Add icon group (32x32) - ncpa is now a
 candidate for deletion

svn path=/trunk/; revision=36762
---
 reactos/dll/win32/netshell/lanconnectui.c   |   1 -
 reactos/dll/win32/netshell/lang/bg-BG.rc    |   2 +
 reactos/dll/win32/netshell/lang/cs-CZ.rc    |   2 +
 reactos/dll/win32/netshell/lang/da-DK.rc    |   2 +
 reactos/dll/win32/netshell/lang/de-DE.rc    |   2 +
 reactos/dll/win32/netshell/lang/el-GR.rc    |   2 +
 reactos/dll/win32/netshell/lang/en-US.rc    |   2 +
 reactos/dll/win32/netshell/lang/es-ES.rc    |   2 +
 reactos/dll/win32/netshell/lang/fr-FR.rc    |   2 +
 reactos/dll/win32/netshell/lang/hu-HU.rc    |   2 +
 reactos/dll/win32/netshell/lang/id-ID.rc    |   2 +
 reactos/dll/win32/netshell/lang/it-IT.rc    |   2 +
 reactos/dll/win32/netshell/lang/ja-JP.rc    |   2 +
 reactos/dll/win32/netshell/lang/nl-NL.rc    |   2 +
 reactos/dll/win32/netshell/lang/no-NO.rc    |   2 +
 reactos/dll/win32/netshell/lang/pl-PL.rc    |   2 +
 reactos/dll/win32/netshell/lang/ru-RU.rc    |   2 +
 reactos/dll/win32/netshell/lang/sk-SK.rc    |   2 +
 reactos/dll/win32/netshell/lang/sv-SE.rc    |   2 +
 reactos/dll/win32/netshell/lang/uk-UA.rc    |   2 +
 reactos/dll/win32/netshell/lang/zh-CN.rc    |   2 +
 reactos/dll/win32/netshell/lanstatusui.c    | 140 +++++++++++++-------
 reactos/dll/win32/netshell/netshell.rbuild  |   1 +
 reactos/dll/win32/netshell/precomp.h        |   2 +-
 reactos/dll/win32/netshell/res/neterror.ico | Bin 1406 -> 3638 bytes
 reactos/dll/win32/netshell/res/netidle.ico  | Bin 1406 -> 3638 bytes
 reactos/dll/win32/netshell/res/netoff.ico   | Bin 1406 -> 3638 bytes
 reactos/dll/win32/netshell/res/netrec.ico   | Bin 1406 -> 3638 bytes
 reactos/dll/win32/netshell/res/nettrans.ico | Bin 1406 -> 3638 bytes
 reactos/dll/win32/netshell/res/nettrrec.ico | Bin 1406 -> 3638 bytes
 reactos/dll/win32/netshell/resource.h       |   2 +
 31 files changed, 139 insertions(+), 47 deletions(-)

diff --git a/reactos/dll/win32/netshell/lanconnectui.c b/reactos/dll/win32/netshell/lanconnectui.c
index 674cd4da2d1..4c9b41ed149 100644
--- a/reactos/dll/win32/netshell/lanconnectui.c
+++ b/reactos/dll/win32/netshell/lanconnectui.c
@@ -284,7 +284,6 @@ ShowNetworkComponentProperties(
 
     pItem = (PNET_ITEM)lvItem.lParam;
     pNCfgComp = (INetCfgComponent*) pItem->pNCfgComp;
-
     hr = INetCfgComponent_RaisePropertyUi(pNCfgComp, GetParent(hwndDlg), NCRP_QUERY_PROPERTY_UI, (IUnknown*)This);
     if (SUCCEEDED(hr))
     {
diff --git a/reactos/dll/win32/netshell/lang/bg-BG.rc b/reactos/dll/win32/netshell/lang/bg-BG.rc
index 6e550fcb703..45beb541a8a 100644
--- a/reactos/dll/win32/netshell/lang/bg-BG.rc
+++ b/reactos/dll/win32/netshell/lang/bg-BG.rc
@@ -101,4 +101,6 @@ BEGIN
 	IDS_FORMAT_GBIT             "%u ÃÁ/ñ"
 	IDS_DURATION_DAY            "%d äåí %s"
 	IDS_DURATION_DAYS           "%d äíè %s"
+	IDS_ASSIGNED_DHCP           "Çàäàäåíî îò DHCP"
+	IDS_ASSIGNED_MANUAL         "Ðú÷íî íàñòðîåíî"
 END
diff --git a/reactos/dll/win32/netshell/lang/cs-CZ.rc b/reactos/dll/win32/netshell/lang/cs-CZ.rc
index 26fec213e23..b3ecf07a017 100644
--- a/reactos/dll/win32/netshell/lang/cs-CZ.rc
+++ b/reactos/dll/win32/netshell/lang/cs-CZ.rc
@@ -98,5 +98,7 @@ BEGIN
 	IDS_FORMAT_GBIT             "%u GBit/s"
 	IDS_DURATION_DAY            "%d Day %s"
 	IDS_DURATION_DAYS           "%d Days %s"
+	IDS_ASSIGNED_DHCP           "Pøiøazeno DHCP"
+	IDS_ASSIGNED_MANUAL         "Ruènì nastaveno"
 END
 
diff --git a/reactos/dll/win32/netshell/lang/da-DK.rc b/reactos/dll/win32/netshell/lang/da-DK.rc
index 306f2047333..657918b9396 100644
--- a/reactos/dll/win32/netshell/lang/da-DK.rc
+++ b/reactos/dll/win32/netshell/lang/da-DK.rc
@@ -98,6 +98,8 @@ BEGIN
 	IDS_FORMAT_GBIT             "%u GBit/s"
 	IDS_DURATION_DAY            "%d Day %s"
 	IDS_DURATION_DAYS           "%d Days %s"
+	IDS_ASSIGNED_DHCP           "Assigned by DHCP"
+	IDS_ASSIGNED_MANUAL         "Manually configured"
 END
 
 
diff --git a/reactos/dll/win32/netshell/lang/de-DE.rc b/reactos/dll/win32/netshell/lang/de-DE.rc
index a3be4309274..bc466e3cc20 100644
--- a/reactos/dll/win32/netshell/lang/de-DE.rc
+++ b/reactos/dll/win32/netshell/lang/de-DE.rc
@@ -101,4 +101,6 @@ BEGIN
 	IDS_FORMAT_GBIT             "%u GBit/s"
 	IDS_DURATION_DAY            "%d Tag %s"
 	IDS_DURATION_DAYS           "%d Tage %s"
+	IDS_ASSIGNED_DHCP           "Von DHCP zugewiesen"
+	IDS_ASSIGNED_MANUAL         "Manuell konfiguriert"
 END
diff --git a/reactos/dll/win32/netshell/lang/el-GR.rc b/reactos/dll/win32/netshell/lang/el-GR.rc
index 8682901cde4..8dd4faffbf7 100644
--- a/reactos/dll/win32/netshell/lang/el-GR.rc
+++ b/reactos/dll/win32/netshell/lang/el-GR.rc
@@ -98,5 +98,7 @@ BEGIN
 	IDS_FORMAT_GBIT             "%u GBit/s"
 	IDS_DURATION_DAY            "%d Day %s"
 	IDS_DURATION_DAYS           "%d Days %s"
+	IDS_ASSIGNED_DHCP           "Ïñßóôçêå áðü ôï DHCP"
+	IDS_ASSIGNED_MANUAL         "Ïñßóôçêå ÷åéñïêßíçôá"
 END
 
diff --git a/reactos/dll/win32/netshell/lang/en-US.rc b/reactos/dll/win32/netshell/lang/en-US.rc
index ad7460cfd20..73b3b2f9c83 100644
--- a/reactos/dll/win32/netshell/lang/en-US.rc
+++ b/reactos/dll/win32/netshell/lang/en-US.rc
@@ -100,5 +100,7 @@ BEGIN
 	IDS_FORMAT_GBIT             "%u GBit/s"
 	IDS_DURATION_DAY            "%d Day %s"
 	IDS_DURATION_DAYS           "%d Days %s"
+	IDS_ASSIGNED_DHCP           "Assigned by DHCP"
+	IDS_ASSIGNED_MANUAL         "Manually configured"
 END
 
diff --git a/reactos/dll/win32/netshell/lang/es-ES.rc b/reactos/dll/win32/netshell/lang/es-ES.rc
index cf6c92d0ee3..ace64aaadb6 100644
--- a/reactos/dll/win32/netshell/lang/es-ES.rc
+++ b/reactos/dll/win32/netshell/lang/es-ES.rc
@@ -94,5 +94,7 @@ BEGIN
 	IDS_FORMAT_GBIT             "%u GBit/s"
 	IDS_DURATION_DAY            "%d Día %s"
 	IDS_DURATION_DAYS           "%d Días %s"
+	IDS_ASSIGNED_DHCP           "Asignado por DHCP"
+	IDS_ASSIGNED_MANUAL         "Configurado manualmente"
 END
 
diff --git a/reactos/dll/win32/netshell/lang/fr-FR.rc b/reactos/dll/win32/netshell/lang/fr-FR.rc
index 051d136c54d..663ae61ac99 100644
--- a/reactos/dll/win32/netshell/lang/fr-FR.rc
+++ b/reactos/dll/win32/netshell/lang/fr-FR.rc
@@ -98,4 +98,6 @@ BEGIN
 	IDS_FORMAT_GBIT             "%u GBit/s"
 	IDS_DURATION_DAY            "%d Day %s"
 	IDS_DURATION_DAYS           "%d Days %s"
+	IDS_ASSIGNED_DHCP           "Assignée par DHCP"
+	IDS_ASSIGNED_MANUAL         "Configurée manuellement"
 END
diff --git a/reactos/dll/win32/netshell/lang/hu-HU.rc b/reactos/dll/win32/netshell/lang/hu-HU.rc
index 38ce845fa8d..8b228365f77 100644
--- a/reactos/dll/win32/netshell/lang/hu-HU.rc
+++ b/reactos/dll/win32/netshell/lang/hu-HU.rc
@@ -99,4 +99,6 @@ BEGIN
 	IDS_FORMAT_GBIT             "%u GBit/s"
 	IDS_DURATION_DAY            "%d Day %s"
 	IDS_DURATION_DAYS           "%d Days %s"
+	IDS_ASSIGNED_DHCP           "Assigned by DHCP"
+	IDS_ASSIGNED_MANUAL         "Manually configured"
 END
diff --git a/reactos/dll/win32/netshell/lang/id-ID.rc b/reactos/dll/win32/netshell/lang/id-ID.rc
index 6633bc72652..973dbe7137c 100644
--- a/reactos/dll/win32/netshell/lang/id-ID.rc
+++ b/reactos/dll/win32/netshell/lang/id-ID.rc
@@ -98,4 +98,6 @@ BEGIN
 	IDS_FORMAT_GBIT             "%u GBit/s"
 	IDS_DURATION_DAY            "%d Day %s"
 	IDS_DURATION_DAYS           "%d Days %s"
+	IDS_ASSIGNED_DHCP           "Assigned by DHCP"
+	IDS_ASSIGNED_MANUAL         "Manually configured"
 END
diff --git a/reactos/dll/win32/netshell/lang/it-IT.rc b/reactos/dll/win32/netshell/lang/it-IT.rc
index 8d1f1ea4a08..131d1be17db 100644
--- a/reactos/dll/win32/netshell/lang/it-IT.rc
+++ b/reactos/dll/win32/netshell/lang/it-IT.rc
@@ -104,5 +104,7 @@ BEGIN
 	IDS_FORMAT_GBIT             "%u GBit/s"
 	IDS_DURATION_DAY            "%d Day %s"
 	IDS_DURATION_DAYS           "%d Days %s"
+	IDS_ASSIGNED_DHCP           "Assegnato da DHCP"
+	IDS_ASSIGNED_MANUAL         "Configurato manualmente"
 END
 
diff --git a/reactos/dll/win32/netshell/lang/ja-JP.rc b/reactos/dll/win32/netshell/lang/ja-JP.rc
index 1373dd82066..fb2a60ff2d9 100644
--- a/reactos/dll/win32/netshell/lang/ja-JP.rc
+++ b/reactos/dll/win32/netshell/lang/ja-JP.rc
@@ -98,4 +98,6 @@ BEGIN
 	IDS_FORMAT_GBIT             "%u GBit/s"
 	IDS_DURATION_DAY            "%d Day %s"
 	IDS_DURATION_DAYS           "%d Days %s"
+	IDS_ASSIGNED_DHCP           "Assigned by DHCP"
+	IDS_ASSIGNED_MANUAL         "Manually configured"
 END
diff --git a/reactos/dll/win32/netshell/lang/nl-NL.rc b/reactos/dll/win32/netshell/lang/nl-NL.rc
index c9dadd6c047..c4880bd0af6 100644
--- a/reactos/dll/win32/netshell/lang/nl-NL.rc
+++ b/reactos/dll/win32/netshell/lang/nl-NL.rc
@@ -98,6 +98,8 @@ BEGIN
 	IDS_FORMAT_GBIT             "%u GBit/s"
 	IDS_DURATION_DAY            "%d Day %s"
 	IDS_DURATION_DAYS           "%d Days %s"
+	IDS_ASSIGNED_DHCP           "Assigned by DHCP"
+	IDS_ASSIGNED_MANUAL         "Manually configured"
 END
 
 
diff --git a/reactos/dll/win32/netshell/lang/no-NO.rc b/reactos/dll/win32/netshell/lang/no-NO.rc
index 5133247bcea..a759863d6d1 100644
--- a/reactos/dll/win32/netshell/lang/no-NO.rc
+++ b/reactos/dll/win32/netshell/lang/no-NO.rc
@@ -103,5 +103,7 @@ BEGIN
 	IDS_FORMAT_GBIT             "%u GBit/s"
 	IDS_DURATION_DAY            "%d dag %s"
 	IDS_DURATION_DAYS           "%d dager %s"
+	IDS_ASSIGNED_DHCP           "Tilordnet av DHCP"
+	IDS_ASSIGNED_MANUAL         "Manuelt konfigurert"
 END
 
diff --git a/reactos/dll/win32/netshell/lang/pl-PL.rc b/reactos/dll/win32/netshell/lang/pl-PL.rc
index 4df92061d43..bd09608632b 100644
--- a/reactos/dll/win32/netshell/lang/pl-PL.rc
+++ b/reactos/dll/win32/netshell/lang/pl-PL.rc
@@ -99,5 +99,7 @@ BEGIN
 	IDS_FORMAT_GBIT             "%u GBit/s"
 	IDS_DURATION_DAY            "%d Day %s"
 	IDS_DURATION_DAYS           "%d Days %s"
+	IDS_ASSIGNED_DHCP           "Przydzielony przez DHCP"
+	IDS_ASSIGNED_MANUAL         "Ustawiony rêcznie"
 END
 
diff --git a/reactos/dll/win32/netshell/lang/ru-RU.rc b/reactos/dll/win32/netshell/lang/ru-RU.rc
index c5ace57f7cf..d9441d39f0e 100644
--- a/reactos/dll/win32/netshell/lang/ru-RU.rc
+++ b/reactos/dll/win32/netshell/lang/ru-RU.rc
@@ -99,4 +99,6 @@ BEGIN
 	IDS_FORMAT_GBIT             "%u ÃÁàéò/s"
 	IDS_DURATION_DAY            "%d Äåíü %s"
 	IDS_DURATION_DAYS           "%d Äíåé %s"
+	IDS_ASSIGNED_DHCP           "Ïðèñâîåí DHCP"
+	IDS_ASSIGNED_MANUAL         "Íàñòðîåí âðó÷íóþ"
 END
diff --git a/reactos/dll/win32/netshell/lang/sk-SK.rc b/reactos/dll/win32/netshell/lang/sk-SK.rc
index 388a0930dc4..dfd73347535 100644
--- a/reactos/dll/win32/netshell/lang/sk-SK.rc
+++ b/reactos/dll/win32/netshell/lang/sk-SK.rc
@@ -105,4 +105,6 @@ BEGIN
 	IDS_FORMAT_GBIT             "%u GBitov/s"
 	IDS_DURATION_DAY            "%d deò %s"
 	IDS_DURATION_DAYS           "%d dní %s"
+	IDS_ASSIGNED_DHCP           "Pridelená DHCP serverom"
+	IDS_ASSIGNED_MANUAL         "Nakonfigurovaná manuálne"
 END
diff --git a/reactos/dll/win32/netshell/lang/sv-SE.rc b/reactos/dll/win32/netshell/lang/sv-SE.rc
index 1b7fc205c60..bff057fac09 100644
--- a/reactos/dll/win32/netshell/lang/sv-SE.rc
+++ b/reactos/dll/win32/netshell/lang/sv-SE.rc
@@ -99,4 +99,6 @@ BEGIN
 	IDS_FORMAT_GBIT             "%u GBit/s"
 	IDS_DURATION_DAY            "%d Day %s"
 	IDS_DURATION_DAYS           "%d Days %s"
+	IDS_ASSIGNED_DHCP           "Assigned by DHCP"
+	IDS_ASSIGNED_MANUAL         "Manually configured"
 END
diff --git a/reactos/dll/win32/netshell/lang/uk-UA.rc b/reactos/dll/win32/netshell/lang/uk-UA.rc
index d17dad4b921..faf3414c416 100644
--- a/reactos/dll/win32/netshell/lang/uk-UA.rc
+++ b/reactos/dll/win32/netshell/lang/uk-UA.rc
@@ -101,4 +101,6 @@ BEGIN
 	IDS_FORMAT_GBIT             "%u GBit/s"
 	IDS_DURATION_DAY            "%d Day %s"
 	IDS_DURATION_DAYS           "%d Days %s"
+	IDS_ASSIGNED_DHCP           "Íàäàíî DHCP"
+	IDS_ASSIGNED_MANUAL         "Íàëàøòîâàíî âðó÷íó"
 END
diff --git a/reactos/dll/win32/netshell/lang/zh-CN.rc b/reactos/dll/win32/netshell/lang/zh-CN.rc
index 0e07625af57..284994f7cea 100644
--- a/reactos/dll/win32/netshell/lang/zh-CN.rc
+++ b/reactos/dll/win32/netshell/lang/zh-CN.rc
@@ -98,4 +98,6 @@ BEGIN
 	IDS_FORMAT_GBIT             "%u GBit/s"
 	IDS_DURATION_DAY            "%d Day %s"
 	IDS_DURATION_DAYS           "%d Days %s"
+	IDS_ASSIGNED_DHCP           "Assigned by DHCP"
+	IDS_ASSIGNED_MANUAL         "Manually configured"
 END
diff --git a/reactos/dll/win32/netshell/lanstatusui.c b/reactos/dll/win32/netshell/lanstatusui.c
index 851c14c6e67..24bb0289225 100644
--- a/reactos/dll/win32/netshell/lanstatusui.c
+++ b/reactos/dll/win32/netshell/lanstatusui.c
@@ -30,8 +30,12 @@ typedef struct
     HWND hwndDlg;               /* status dialog window */
     DWORD dwAdapterIndex;
     UINT_PTR nIDEvent;
+    UINT DHCPEnabled;
     DWORD dwInOctets;
     DWORD dwOutOctets;
+    DWORD IpAddress;
+    DWORD SubnetMask;
+    DWORD Gateway;
     UINT uID;
     UINT Status;
 }LANSTATUSUI_CONTEXT;
@@ -260,10 +264,7 @@ VOID
 InitializeLANStatusUiDlg(HWND hwndDlg, LANSTATUSUI_CONTEXT * pContext)
 {
     WCHAR szBuffer[MAX_PATH] = {0};
-    NETCON_PROPERTIES * pProperties = NULL;
-    DWORD dwSize, dwAdapterIndex, dwResult;
-    LPOLESTR pStr;
-    IP_ADAPTER_INFO * pAdapterInfo;
+    NETCON_PROPERTIES * pProperties;
 
     if (INetConnection_GetProperties(pContext->pNet, &pProperties) != NOERROR)
         return;
@@ -279,52 +280,13 @@ InitializeLANStatusUiDlg(HWND hwndDlg, LANSTATUSUI_CONTEXT * pContext)
 
     SendDlgItemMessageW(hwndDlg, IDC_STATUS, WM_SETTEXT, 0, (LPARAM)szBuffer);
 
-    if (FAILED(StringFromCLSID(&pProperties->guidId, &pStr)))
-    {
-        NcFreeNetconProperties(pProperties);
-        return;
-    }
-    NcFreeNetconProperties(pProperties);
-
-    /* get the IfTable */
-    dwSize = 0;
-    dwResult = GetAdaptersInfo(NULL, &dwSize); 
-    if (dwResult!= ERROR_BUFFER_OVERFLOW)
-    {
-        CoTaskMemFree(pStr);
-        return;
-    }
-
-    pAdapterInfo = (PIP_ADAPTER_INFO)CoTaskMemAlloc(dwSize);
-    if (!pAdapterInfo)
-    {
-        CoTaskMemFree(pAdapterInfo);
-        CoTaskMemFree(pStr);
-        return;
-    }
-
-    if (GetAdaptersInfo(pAdapterInfo, &dwSize) != NO_ERROR)
-    {
-        CoTaskMemFree(pAdapterInfo);
-        CoTaskMemFree(pStr);
-        return;
-    }
-
-    if (!GetAdapterIndexFromNetCfgInstanceId(pAdapterInfo, pStr, &dwAdapterIndex))
-    {
-        CoTaskMemFree(pAdapterInfo);
-        CoTaskMemFree(pStr);
-        return;
-    }
-    CoTaskMemFree(pStr);
-    pContext->dwAdapterIndex = dwAdapterIndex;
     pContext->dwInOctets = 0;
     pContext->dwOutOctets = 0;
 
     /* update adapter info */
     pContext->Status = -1;
     UpdateLanStatus(hwndDlg, pContext);
-    CoTaskMemFree(pAdapterInfo);
+    NcFreeNetconProperties(pProperties);
 }
 
 INT_PTR
@@ -336,8 +298,11 @@ LANStatusUiAdvancedDlg(
     LPARAM lParam
 )
 {
+    WCHAR szBuffer[100] = {0};
     PROPSHEETPAGE *page;
     LANSTATUSUI_CONTEXT * pContext;
+    DWORD dwIpAddr;
+
 
     switch(uMsg)
     {
@@ -345,6 +310,31 @@ LANStatusUiAdvancedDlg(
             page = (PROPSHEETPAGE*)lParam;
             pContext = (LANSTATUSUI_CONTEXT*)page->lParam;
             SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pContext);
+            if (pContext->DHCPEnabled)
+                LoadStringW(netshell_hInstance, IDS_ASSIGNED_DHCP, szBuffer, sizeof(szBuffer)/sizeof(WCHAR));
+            else
+                LoadStringW(netshell_hInstance, IDS_ASSIGNED_MANUAL, szBuffer, sizeof(szBuffer)/sizeof(WCHAR));
+
+            szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0';
+            SendDlgItemMessageW(hwndDlg, IDC_DETAILSTYPE, WM_SETTEXT, 0, (LPARAM)szBuffer);
+
+
+            dwIpAddr = ntohl(pContext->IpAddress);
+            swprintf(szBuffer, L"%u.%u.%u.%u", FIRST_IPADDRESS(dwIpAddr), SECOND_IPADDRESS(dwIpAddr),
+                     THIRD_IPADDRESS(dwIpAddr), FOURTH_IPADDRESS(dwIpAddr));
+            SendDlgItemMessageW(hwndDlg, IDC_DETAILSIP, WM_SETTEXT, 0, (LPARAM)szBuffer);
+
+            dwIpAddr = ntohl(pContext->SubnetMask);
+            swprintf(szBuffer, L"%u.%u.%u.%u", FIRST_IPADDRESS(dwIpAddr), SECOND_IPADDRESS(dwIpAddr),
+                     THIRD_IPADDRESS(dwIpAddr), FOURTH_IPADDRESS(dwIpAddr));
+            SendDlgItemMessageW(hwndDlg, IDC_DETAILSSUBNET, WM_SETTEXT, 0, (LPARAM)szBuffer);
+
+            dwIpAddr = ntohl(pContext->Gateway);
+            swprintf(szBuffer, L"%u.%u.%u.%u", FIRST_IPADDRESS(dwIpAddr), SECOND_IPADDRESS(dwIpAddr),
+                     THIRD_IPADDRESS(dwIpAddr), FOURTH_IPADDRESS(dwIpAddr));
+            SendDlgItemMessageW(hwndDlg, IDC_DETAILSGATEWAY, WM_SETTEXT, 0, (LPARAM)szBuffer);
+
+
             return TRUE;
         default:
             break;
@@ -405,6 +395,65 @@ LANStatusUiDlg(
     return FALSE;
 }
 
+VOID
+InitializePropertyDialog(
+    LANSTATUSUI_CONTEXT * pContext,
+    NETCON_PROPERTIES * pProperties)
+{
+    DWORD dwSize, dwAdapterIndex, dwResult;
+    LPOLESTR pStr;
+    IP_ADAPTER_INFO * pAdapterInfo, *pCurAdapter;
+
+    if (FAILED(StringFromCLSID(&pProperties->guidId, &pStr)))
+    {
+        return;
+    }
+
+    /* get the IfTable */
+    dwSize = 0;
+    dwResult = GetAdaptersInfo(NULL, &dwSize); 
+    if (dwResult!= ERROR_BUFFER_OVERFLOW)
+    {
+        CoTaskMemFree(pStr);
+        return;
+    }
+
+    pAdapterInfo = (PIP_ADAPTER_INFO)CoTaskMemAlloc(dwSize);
+    if (!pAdapterInfo)
+    {
+        CoTaskMemFree(pAdapterInfo);
+        CoTaskMemFree(pStr);
+        return;
+    }
+
+    if (GetAdaptersInfo(pAdapterInfo, &dwSize) != NO_ERROR)
+    {
+        CoTaskMemFree(pAdapterInfo);
+        CoTaskMemFree(pStr);
+        return;
+    }
+
+    if (!GetAdapterIndexFromNetCfgInstanceId(pAdapterInfo, pStr, &dwAdapterIndex))
+    {
+        CoTaskMemFree(pAdapterInfo);
+        CoTaskMemFree(pStr);
+        return;
+    }
+
+    pCurAdapter = pAdapterInfo;
+    while(pCurAdapter->Index != dwAdapterIndex)
+        pCurAdapter = pCurAdapter->Next;
+
+
+    pContext->IpAddress = inet_addr(pCurAdapter->IpAddressList.IpAddress.String);
+    pContext->SubnetMask = inet_addr(pCurAdapter->IpAddressList.IpMask.String);
+    pContext->Gateway = inet_addr(pCurAdapter->GatewayList.IpAddress.String);
+    pContext->DHCPEnabled = pCurAdapter->DhcpEnabled;
+    CoTaskMemFree(pStr);
+    CoTaskMemFree(pAdapterInfo);
+    pContext->dwAdapterIndex = dwAdapterIndex;
+}
+
 VOID
 ShowStatusPropertyDialog(
     LANSTATUSUI_CONTEXT * pContext,
@@ -428,7 +477,7 @@ ShowStatusPropertyDialog(
             pinfo.pszCaption = pProperties->pszwName;
             pinfo.dwFlags |= PSH_PROPTITLE;
         }
-
+        InitializePropertyDialog(pContext, pProperties);
         if (pProperties->MediaType == NCM_LAN && pProperties->Status == NCS_CONNECTED)
         {
             hppages[0] = InitializePropertySheetPage(MAKEINTRESOURCEW(IDD_LAN_NETSTATUS), LANStatusUiDlg, (LPARAM)pContext, NULL);
@@ -449,6 +498,7 @@ ShowStatusPropertyDialog(
         {
             ShowNetConnectionProperties(pContext->pNet, pContext->hwndDlg);
         }
+
         NcFreeNetconProperties(pProperties);
     }
 }
diff --git a/reactos/dll/win32/netshell/netshell.rbuild b/reactos/dll/win32/netshell/netshell.rbuild
index 6e9f8e83f2c..474472e69ef 100644
--- a/reactos/dll/win32/netshell/netshell.rbuild
+++ b/reactos/dll/win32/netshell/netshell.rbuild
@@ -17,6 +17,7 @@
 	<library>uuid</library>
 	<library>advapi32</library>
 	<library>setupapi</library>
+	<library>ws2_32</library>
 	<library>comctl32</library>
 	<pch>precomp.h</pch>
 	<file>netshell.c</file>
diff --git a/reactos/dll/win32/netshell/precomp.h b/reactos/dll/win32/netshell/precomp.h
index 511c03bffac..66613ac8cca 100644
--- a/reactos/dll/win32/netshell/precomp.h
+++ b/reactos/dll/win32/netshell/precomp.h
@@ -14,7 +14,7 @@
 #define COBJMACROS
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
-
+#include <winsock2.h>
 #include <windows.h>
 
 #include <shlguid.h>
diff --git a/reactos/dll/win32/netshell/res/neterror.ico b/reactos/dll/win32/netshell/res/neterror.ico
index 47c686285588083bdb9586d9b55a0ee645839700..c80f6b7c97da2cc513e07106127a25b970329313 100644
GIT binary patch
literal 3638
zcmeHKT})eL7=GG9J<yiZo}R7zbhHHu1)W8uEyLBKwUk;MJwqxKSr=TEdFe72mYHbG
zjEN@0=$(nWMA@I3E!nlkI~VmrT_}<{FNi;owou0HVtv1!p21pNcj1f|Jjr{$^L@|z
zzTf-3=j1sppn@7kBM2OhR0HjFXSd7q^Bi!R)?74YE^JvvehmGp!cca}=kth0m+;Pk
z0pezH`SJqxw7!hw)Y~}!)+;!9atRK{H7qPF;PBxuG47FIvww)!PQ3xG_D6hhbQ05p
zUK~1<K{lI(*ZV!bxq1~x1|}g0pJQ}11*_>aLZNxgy!k2;iQlOHdA$G92&SfP;MlQ6
z)Ye{v%k?wX*VoB!5e*HOFf{ZlS}gBDTXlx&o1?hv(COxI{P;3rv1PnF6~V!S%Q$f&
zi%4V<g7F-3xg1id6s}zP1+%A)lK&4#XVx${m_j)GJF2yxK-}>etj!-Golb+}uEAjV
z39YSjRL2tK`2)F|H<4Xkg~f7-&YQv5*mX49KF0KP8XnKL7#{u;6B9QeieF%LZ4E25
z=gP_oGGsd41!S^osMegp%!?7^hzHK%EY-4$_VjqZqgv)E?^k8dVS8b_1OIgg_#z&t
ztEysq^SS~K)bE(=8)~6>TYykK+|l}EZ*3D>V3_E7wE3Za<5Mq;^B$4#T+L`m8W|a|
z@8v~-5Z}FLEHoAiIrj4Vh3DOFSH!G-`f=y3h9_vwnQWHF9vOW2+3uhpG*9>v32k^^
zH2Pq>o|oeV!TU^SXQM&n`JF7kD0+Ce+bxK^yg!v-HQ6-6eqQcZG0VohP=z4$DE#d#
z#r_sfK^Hm?t!T(d8(%Myw}%qFWc;m7_80L?XYFMDWQxwB&`DZgU^$9;?$p^&3pyL!
zH&f72rm;*{H|s3ZV5YN7gYTxZOsD@XtyOfEY3}{hTHxG$)Z1BV`nKk>*KZsD&kk5D
zb#?wCwyLn4mxWor>h+S8Om-2H$#~rFXBjH-PN%G-qUiHUlFQZBwwn+PTCH-1O8iEZ
zfk0Q6T5Yqjc%v~GOeW<D6pyWWuUFYW9_P5eKBqGrmRB4O7GH@Mi<&M7et#&$;u*qW
zr?aJn#or4*KHg2}?2N_CW;LOm(A?bE7zoJmm3W>vne6uZ`ko$+Gn?IRwc2bBg(OL<
zmE$Y%y+s%dk`#+^gjlSjL$7C@WA#_!*|$}O&ld==*QcqerbZN%c!d>&a(-v=8z}eO
z>(yvjFS@%0L5?rw3$5D3D^Hh=DwUuio_e9tDDfq{+=_qT>8#38d$)?e2Y%zIg44Nq
zZ+5@&E-<%pzVxi6@s;>e|H^avi^Vhhntp8*4KyO3la1Y1FeUDeF@Fo1yBhuIVE7xt
CklNe;

delta 29
fcmdlc^N&k}fq@YS1q2wtAcK{GL5yLeN){^sK(PbZ

diff --git a/reactos/dll/win32/netshell/res/netidle.ico b/reactos/dll/win32/netshell/res/netidle.ico
index 1cc82bb664ffe6a895537452e78f5d743e109a3c..fbbdd17da96deb173f8c3a1d427dbc9755bc3230 100644
GIT binary patch
literal 3638
zcmeHI!A`<J5PjW(MQklpK7f<)3%tU~$l0?V^rBZ16Ava3gYjS@Cf>Yj_zZ6H1tfd}
zfsk+|*4ge(DGQ<DXwpfh)0sE(c6ORf0Sf}95=aWT%>&2uR;?<(R{-89c0#U9kztGS
zq|~j*tUbaoM62_Jhx1eX3<mhPyFl;d9^>&CqtOVjS7+!xKjO1_iTQkv_v;2`vl)iN
zA-+0IOs7*!CKGgT8u%tZlWYRn1pdbaL@cUbQP3i^?>dnL+6U+B>j^)I#OHWmM-nI^
zA<FiV=XrJ@Buyawy@UL|T~_%Zzf!7H$d@$4qU#TZq@nyA^DCD4{GwvfUB)chk6E-I
zvvAwGU7$u0t?iaZ*%<q>P4PuSe+id+wn|zj<voiWIV_Sx^JIILhmzTB0@(z1n*c9n
zwq`ZQ*_ybkH@Vv9j<YLn=I`qJKA$YD@0;~$xZ}_tAQs2rdrB+0cEyw3Y^vXc7mM7$
z`uybi>3A^`&r7naS*ZH$IG^r$uDg6!y{z7U9na-f&ot}P@Z|ThtnGJA!_B)Ux%peD
zNyv$Ap7pYS*WFaV4L9#<)~DfSe!5Tp{z&?$g-KnH!|o%goS%#>-@^s$t*Q_B15#|V
A>i_@%

delta 29
fcmdlc^N&k}fq@YS1q2wtAcK{GL5yLeN){^sK(PbZ

diff --git a/reactos/dll/win32/netshell/res/netoff.ico b/reactos/dll/win32/netshell/res/netoff.ico
index b38da3d0ea69f5823307f7f2160b152eb40fbeb8..0d3bb295e2a967fe4d5b3465fb05777b38aae1e5 100644
GIT binary patch
literal 3638
zcmeHKL2DC16n>MPw7WZTv)N=fW*bUQBI4O|Pu8A27Ck6}y%vNV1dCJ@1S@zE&no>H
z-mKJfARhb!At5waFVXnk&dg?#wcQ>S_JhgHo9}(^@m}Cf0>GdIz7Gf+9+m;F;HlG*
z_Mr{%3h%C>NiKBF(2uaek}dNwo6TTz^BcUrw}sq$_<VE(4|ZNaxBCSSpFe``ts8j%
z6`t%rg~4C|{eB;|x4*-?-8*n{GKGU@kKxVEZJ10Z@bd0WI6eIZ<M9}Jy&inn--Xd=
z1jFGF4(@NkN3;tR9Vj~RZ*)K?tndUNE=h1V0T=a30`B^r$6OA|pSxbjJeP}RoB(Z>
z*s+s<yR1|~f6;Q*EX#7zcrC}S1`TIb=W99b%k8$)5)`H>gwjWX!o)(9W&Ea~D6!D_
zMUA4ggzO?_QBjngMp1SeMRi@5O~Wz8UV2gogQJ^0TvKEHMxN$u2iFEJJ!gTVp+PZJ
zoV+=E?fP4snLjTyZ;y|E6f;-%xY&yh{AV3lQ3F?wL2gcrq>?OOT>$5DF01K``USe0
z<)g?mKztDR2-mGtD1RQm*kIE8eh@SozAyE8d>k9;J*j61t<U2<PY-R{Nzd?!!AFM4
z{1@TZ*YOoWNd3HnR6ptSc-yYk!mx?Y)T(;G<oD+|QlH1KDF}g&DbxLkW9l8{U*xsJ
zoS%0fisom})B5>cmM@oeKHB3r40SK0K94uQU&e$8L){ChU*_xevw5u5GHW%px|TfN
uto3jD^Z4ajm-Tu4vVXpff3bkpCv-K}S@))oI$OAB)@%yaxeI@E5dHv3AJans

delta 29
fcmdlc^N&k}fq@YS1q2wtAcK{GL5yLeN){^sK(PbZ

diff --git a/reactos/dll/win32/netshell/res/netrec.ico b/reactos/dll/win32/netshell/res/netrec.ico
index fc214f36b7c2ec17d2b660106617574d765d36cc..5aaffe27e6e913bf59890091a5340291c44a00a9 100644
GIT binary patch
literal 3638
zcmeHJL2DC16#h25vq@LuCgWz^v}?>s`~{wb7Lj7lJ;#H+=&=F8gVG{Z4}ulEh-a1j
z0KtogVh<Md9LR5o3DF4lP+Z^a%rwhx=#rC{{ow7J_r7^=-aNva00v5^)j+7=9s{n@
zs@;}$uL8Uz-!(GD7U4E%pTL?CtIQ{gB7A<liLXaTczF9dcJ`j&UFQbAzv-g)`~lu}
zI~Wd!7z_q@ac3Q$wr^qo=_4Hf9^>`>O?-LQL2v6OCX)$X-QB=+Iz_+V$NRl5{`?%`
z<Mukn<1vnZ{lI86!v59<J`nef@)syNP;}t`b%32h*1*mw&<qh^4JSsZZ0P-x2J^!h
zzV?S!j8G<GY}vZ(d7c$AktP&&WvO=FT9*4kcI#5BMRq`-EGqsY<DA<8W2VkutyX!!
zPS3wkFE#m!u5yK!uawI(JFqF7+pgwKkzM51Wvg<5Rq`m=-BGMosd>3e{*#3KC0@+g
zHpv=^p0lvX&=5IPo?_1GrWCs9K+%E4I-m!$*6C>N*E-EN)FhYl+;JA=)B6{-eP5p}
zwC|_m^LWRx6L1`TPoYJwMfqek^Wx|6K>Vyw9ohbg^YeLmYY}f4hJ2I)*$Ww;<Q1LZ
zXANjHJWtd@kDMI@+4{4*X(n&v`}KM=2In$9kC&CnuVHXrCzMLfCg-l3<iwizrL%a~
z<-DvgFFubC0y}=-<^8kg=kcccKOj4t{VnG4>HFr}^!CR%z-p9~tRLn9W^zdTV>y9&
PNRs5lIwIehq7L{6CU)lw

delta 29
fcmdlc^N&k}fq@YS1q2wtAcK{GL5yLeN){^sK(PbZ

diff --git a/reactos/dll/win32/netshell/res/nettrans.ico b/reactos/dll/win32/netshell/res/nettrans.ico
index 7c5431fae797e3f7489c25685e4278f2159a193c..b3f647f20e94874b67aca12aabeb2d1a32ccad85 100644
GIT binary patch
literal 3638
zcmeHIJ#Q015Pj#n^V(p1_F|hO@mCe`3#gD1p(uhnwJD&1GM11iK#5SGK>{Qi6k0&}
z0SFq3h=xcYN=yC?#+JcIq=+yxx4ZUYBQCCJ?n&d>nKv`LJ7>)T4pJx-K*->x53JCt
z*;Mv^26#-q3uJN#yB&&StT~aI`x%eNcz<sb9}f?4=gLKF@7~9k7q{`UbqTL_+vxRr
zcy?<O-EJ4}w$}0J+6JCHxQnA71MIb1`0%iW{Tr7t91ijH`c;fZBXl|)e0tu-&u=}v
z+1kKhFu>9Guju#tc-vmbYpVO1_ykD@k`Da84)_zOGx(=9XofKSayCL$+c5EphF=LI
zRE$3qk|07=$oH3JEtkv5(C0E$w$sJbdAY3OL3ZO@qd|6+Kvi^p;Clp$cTN3LsYLc<
z|9s)p8E?s)a>=V_>h-Bz<!sM8Yj~HdbA5AceOzFbJX&_PHEYz&yxbxGu_eEV=Q-OX
zStBuX79JS}TtnAM=B#N-qLU6J9ayXbW-uE)n{E6?&+=tG$<;j1W*6mW;}^9n`lZnG
zyfT{~$A_Vao|fo&5n*WV$(n1$@j)PEO+(5sG<{&r`6uDi>0&XJs@0?n0?x6)`4+Ed
z{xm}I=?I+9eNbnpM7@aP|G1xY95I19e;n`Xmz4K)9M_$s3zZ+oPj5oKstJ+Lt1lsR
z{zAOue1*T}$ME!5uuv}Bd-FPLu|mxAu4{jN)qlH29B;>-Y)x-}gafROZJGDOJ%BAH
P-u6w`<72r06urT3!|Uj{

delta 29
fcmdlc^N&k}fq@YS1q2wtAcK{GL5yLeN){^sK(PbZ

diff --git a/reactos/dll/win32/netshell/res/nettrrec.ico b/reactos/dll/win32/netshell/res/nettrrec.ico
index dbac3f9edd97f3cd6e618bfe237f043046ce1daf..8c7420827c196d71d62fd5041a828c011f5c4ec6 100644
GIT binary patch
literal 3638
zcmeHIv2GJV5PfIwoo(*czP-e*T_HXKDG`eJ0qRsVw24FqN`!zCS|nPEd;o%mBBCJ@
zD5WKTgE0~qi4+mX%<k;vSPKq!6gSd%ZsyI5XJ0V`MCc&TLDI*)7`RSf)2Z`M`oJ@a
z-5{4!I2=(P%Wh=N+D}=Qc=zxQKAfH5=<y?*zr2rE`!}&zEHIzX@%CU3&!0TN#rH3G
z|8yTGcW+^}T46Su;p2-#{P?=S>x0`^E|<9Y_8D&u_wb40t+WiZ4E)~=s7l<NsxP9%
zANH(li4UJI&r%~}W#r=~(Ikm+jg;Ef<H2B{jp8<2?8jNB(AzE_<WKU+gnVv8U8Fu$
zu8ZpW{;o^)|JPg>nX>94e$_?%s*4|6#szjLB6@rzs5imBJf`?%O@9*3dv;2?OX~M5
zJXaK>pi?sKo@GK>X&Go4*qi~sn7s`<__((rK9o)F_Ia<jDIVr;>W}17$UYy1^-Z`j
zi9Id$yd=i>ce3SPO?aAWJr>d07|#P+uKyQ2j<c-O8IQG2Q?98C*Ei#_6|RpW#{^wH
z%Z012<37RRzrQa{i-MV;Q=6C}&(VZ;<pz5Gv&@k}T-f?1y#CfGDvFFmxUlshp67qY
z(?}QYrEyGLtknlxtl`01H^#%a)@SGMCOph<_UZOpImJ#{*Y!BMr!>Ho`uuwA>btx|
J_pd5{@CybK#bW>f

delta 29
fcmdlc^N&k}fq@YS1q2wtAcK{GL5yLeN){^sK(PbZ

diff --git a/reactos/dll/win32/netshell/resource.h b/reactos/dll/win32/netshell/resource.h
index a4d2b8e5869..03b8f27ee4a 100644
--- a/reactos/dll/win32/netshell/resource.h
+++ b/reactos/dll/win32/netshell/resource.h
@@ -78,4 +78,6 @@
 #define IDS_FORMAT_GBIT             10203
 #define IDS_DURATION_DAY            10204
 #define IDS_DURATION_DAYS           10205
+#define IDS_ASSIGNED_DHCP           10206
+#define IDS_ASSIGNED_MANUAL         10207