diff --git a/reactos/dll/win32/netshell/lang/bg-BG.rc b/reactos/dll/win32/netshell/lang/bg-BG.rc index 990a2ae89c7..5df597d7064 100644 --- a/reactos/dll/win32/netshell/lang/bg-BG.rc +++ b/reactos/dll/win32/netshell/lang/bg-BG.rc @@ -69,7 +69,7 @@ BEGIN END IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Network Connection Details" FONT 8, "MS Shell Dlg" BEGIN diff --git a/reactos/dll/win32/netshell/lang/cs-CZ.rc b/reactos/dll/win32/netshell/lang/cs-CZ.rc index 1ee4842ba96..01a1e64700d 100644 --- a/reactos/dll/win32/netshell/lang/cs-CZ.rc +++ b/reactos/dll/win32/netshell/lang/cs-CZ.rc @@ -68,7 +68,7 @@ BEGIN END IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Network Connection Details" FONT 8, "MS Shell Dlg" BEGIN diff --git a/reactos/dll/win32/netshell/lang/da-DK.rc b/reactos/dll/win32/netshell/lang/da-DK.rc index 2cf64a4966f..d28274a9b7b 100644 --- a/reactos/dll/win32/netshell/lang/da-DK.rc +++ b/reactos/dll/win32/netshell/lang/da-DK.rc @@ -68,7 +68,7 @@ BEGIN END IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Network Connection Details" FONT 8, "MS Shell Dlg" BEGIN diff --git a/reactos/dll/win32/netshell/lang/de-DE.rc b/reactos/dll/win32/netshell/lang/de-DE.rc index 4d1fd057f1b..7b86e1bee03 100644 --- a/reactos/dll/win32/netshell/lang/de-DE.rc +++ b/reactos/dll/win32/netshell/lang/de-DE.rc @@ -69,7 +69,7 @@ BEGIN END IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Network Connection Details" FONT 8, "MS Shell Dlg" BEGIN diff --git a/reactos/dll/win32/netshell/lang/el-GR.rc b/reactos/dll/win32/netshell/lang/el-GR.rc index a5d731b9fad..7eb9f0baa4a 100644 --- a/reactos/dll/win32/netshell/lang/el-GR.rc +++ b/reactos/dll/win32/netshell/lang/el-GR.rc @@ -68,7 +68,7 @@ BEGIN END IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Network Connection Details" FONT 8, "MS Shell Dlg" BEGIN diff --git a/reactos/dll/win32/netshell/lang/en-US.rc b/reactos/dll/win32/netshell/lang/en-US.rc index b9e369ef61e..d46f007ec6e 100644 --- a/reactos/dll/win32/netshell/lang/en-US.rc +++ b/reactos/dll/win32/netshell/lang/en-US.rc @@ -69,7 +69,7 @@ BEGIN END IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Network Connection Details" FONT 8, "MS Shell Dlg" BEGIN diff --git a/reactos/dll/win32/netshell/lang/es-ES.rc b/reactos/dll/win32/netshell/lang/es-ES.rc index 63af8a01ae3..2cf82a57560 100644 --- a/reactos/dll/win32/netshell/lang/es-ES.rc +++ b/reactos/dll/win32/netshell/lang/es-ES.rc @@ -63,7 +63,7 @@ BEGIN END IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Network Connection Details" FONT 8, "MS Shell Dlg" BEGIN diff --git a/reactos/dll/win32/netshell/lang/fr-FR.rc b/reactos/dll/win32/netshell/lang/fr-FR.rc index ddfda855668..13188f3fc89 100644 --- a/reactos/dll/win32/netshell/lang/fr-FR.rc +++ b/reactos/dll/win32/netshell/lang/fr-FR.rc @@ -68,7 +68,7 @@ BEGIN END IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Network Connection Details" FONT 8, "MS Shell Dlg" BEGIN diff --git a/reactos/dll/win32/netshell/lang/hu-HU.rc b/reactos/dll/win32/netshell/lang/hu-HU.rc index e4643445413..c3153aea0e4 100644 --- a/reactos/dll/win32/netshell/lang/hu-HU.rc +++ b/reactos/dll/win32/netshell/lang/hu-HU.rc @@ -69,7 +69,7 @@ BEGIN END IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Network Connection Details" FONT 8, "MS Shell Dlg" BEGIN diff --git a/reactos/dll/win32/netshell/lang/id-ID.rc b/reactos/dll/win32/netshell/lang/id-ID.rc index e555ac7ed95..488b9886139 100644 --- a/reactos/dll/win32/netshell/lang/id-ID.rc +++ b/reactos/dll/win32/netshell/lang/id-ID.rc @@ -68,7 +68,7 @@ BEGIN END IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Network Connection Details" FONT 8, "MS Shell Dlg" BEGIN diff --git a/reactos/dll/win32/netshell/lang/it-IT.rc b/reactos/dll/win32/netshell/lang/it-IT.rc index 7dce9bfda50..481cbc3ecc8 100644 --- a/reactos/dll/win32/netshell/lang/it-IT.rc +++ b/reactos/dll/win32/netshell/lang/it-IT.rc @@ -73,7 +73,7 @@ BEGIN END IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Network Connection Details" FONT 8, "MS Shell Dlg" BEGIN diff --git a/reactos/dll/win32/netshell/lang/ja-JP.rc b/reactos/dll/win32/netshell/lang/ja-JP.rc index 41586c80409..d42efdc6a78 100644 --- a/reactos/dll/win32/netshell/lang/ja-JP.rc +++ b/reactos/dll/win32/netshell/lang/ja-JP.rc @@ -68,7 +68,7 @@ BEGIN END IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Network Connection Details" FONT 8, "MS Shell Dlg" BEGIN diff --git a/reactos/dll/win32/netshell/lang/nl-NL.rc b/reactos/dll/win32/netshell/lang/nl-NL.rc index e96a830aa85..c37465fe8b6 100644 --- a/reactos/dll/win32/netshell/lang/nl-NL.rc +++ b/reactos/dll/win32/netshell/lang/nl-NL.rc @@ -68,7 +68,7 @@ BEGIN END IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Network Connection Details" FONT 8, "MS Shell Dlg" BEGIN diff --git a/reactos/dll/win32/netshell/lang/no-NO.rc b/reactos/dll/win32/netshell/lang/no-NO.rc index 3042245d057..5409581b9e2 100644 --- a/reactos/dll/win32/netshell/lang/no-NO.rc +++ b/reactos/dll/win32/netshell/lang/no-NO.rc @@ -72,7 +72,7 @@ BEGIN END IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Network Connection Details" FONT 8, "MS Shell Dlg" BEGIN diff --git a/reactos/dll/win32/netshell/lang/pl-PL.rc b/reactos/dll/win32/netshell/lang/pl-PL.rc index 04eeae89095..74ab1bdae83 100644 --- a/reactos/dll/win32/netshell/lang/pl-PL.rc +++ b/reactos/dll/win32/netshell/lang/pl-PL.rc @@ -69,7 +69,7 @@ BEGIN END IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Network Connection Details" FONT 8, "MS Shell Dlg" BEGIN diff --git a/reactos/dll/win32/netshell/lang/ru-RU.rc b/reactos/dll/win32/netshell/lang/ru-RU.rc index 80f2b34ed82..4f4f7fdb051 100644 --- a/reactos/dll/win32/netshell/lang/ru-RU.rc +++ b/reactos/dll/win32/netshell/lang/ru-RU.rc @@ -69,7 +69,7 @@ BEGIN END IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Network Connection Details" FONT 8, "MS Shell Dlg" BEGIN diff --git a/reactos/dll/win32/netshell/lang/sk-SK.rc b/reactos/dll/win32/netshell/lang/sk-SK.rc index 11bb32ecdfd..e205371028c 100644 --- a/reactos/dll/win32/netshell/lang/sk-SK.rc +++ b/reactos/dll/win32/netshell/lang/sk-SK.rc @@ -74,7 +74,7 @@ BEGIN END IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Network Connection Details" FONT 8, "MS Shell Dlg" BEGIN diff --git a/reactos/dll/win32/netshell/lang/sv-SE.rc b/reactos/dll/win32/netshell/lang/sv-SE.rc index db65eef9647..c6afd14a302 100644 --- a/reactos/dll/win32/netshell/lang/sv-SE.rc +++ b/reactos/dll/win32/netshell/lang/sv-SE.rc @@ -69,7 +69,7 @@ BEGIN END IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Network Connection Details" FONT 8, "MS Shell Dlg" BEGIN diff --git a/reactos/dll/win32/netshell/lang/uk-UA.rc b/reactos/dll/win32/netshell/lang/uk-UA.rc index 0a0eecbad2c..0b9b84dc99f 100644 --- a/reactos/dll/win32/netshell/lang/uk-UA.rc +++ b/reactos/dll/win32/netshell/lang/uk-UA.rc @@ -71,7 +71,7 @@ BEGIN END IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Network Connection Details" FONT 8, "MS Shell Dlg" BEGIN diff --git a/reactos/dll/win32/netshell/lang/zh-CN.rc b/reactos/dll/win32/netshell/lang/zh-CN.rc index cb98d3d6ba5..b0de6087275 100644 --- a/reactos/dll/win32/netshell/lang/zh-CN.rc +++ b/reactos/dll/win32/netshell/lang/zh-CN.rc @@ -68,7 +68,7 @@ BEGIN END IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Network Connection Details" FONT 8, "MS Shell Dlg" BEGIN diff --git a/reactos/dll/win32/netshell/lanstatusui.c b/reactos/dll/win32/netshell/lanstatusui.c index 84f52f7a7ca..e3e6aaca0ee 100644 --- a/reactos/dll/win32/netshell/lanstatusui.c +++ b/reactos/dll/win32/netshell/lanstatusui.c @@ -336,7 +336,7 @@ AddIPAddressToListView( { ZeroMemory(&li, sizeof(LVITEMW)); li.mask = LVIF_TEXT; - li.iItem = ListView_GetItemCount(hDlgCtrl); + li.iItem = Index; li.iSubItem = 0; li.pszText = L""; li.iItem = SendMessageW(hDlgCtrl, LVM_INSERTITEMW, 0, (LPARAM)&li); @@ -346,7 +346,7 @@ AddIPAddressToListView( { li.pszText = szBuffer; li.iSubItem = 1; - li.iItem = ListView_GetItemCount(hDlgCtrl); + li.iItem = Index++; SendMessageW(hDlgCtrl, LVM_SETITEMW, 0, (LPARAM)&li); } SubIndex++; @@ -365,7 +365,7 @@ InsertItemToListView( ZeroMemory(&li, sizeof(LVITEMW)); li.mask = LVIF_TEXT; li.iItem = ListView_GetItemCount(hDlgCtrl); - if (LoadStringW(netshell_hInstance, IDS_PHYSICAL_ADDRESS, szBuffer, sizeof(szBuffer)/sizeof(WCHAR))) + if (LoadStringW(netshell_hInstance, ResId, szBuffer, sizeof(szBuffer)/sizeof(WCHAR))) { li.pszText = szBuffer; return (INT)SendMessageW(hDlgCtrl, LVM_INSERTITEMW, 0, (LPARAM)&li); @@ -444,7 +444,7 @@ LANStatusUiDetailsDlg( li.iItem = InsertItemToListView(hDlgCtrl, IDS_DEF_GATEWAY); if (li.iItem >= 0) - if (MultiByteToWideChar(CP_ACP, 0, pCurAdapter->DhcpServer.IpAddress.String, -1, szBuffer, sizeof(szBuffer)/sizeof(WCHAR))) + if (MultiByteToWideChar(CP_ACP, 0, pCurAdapter->GatewayList.IpAddress.String, -1, szBuffer, sizeof(szBuffer)/sizeof(WCHAR))) SendMessageW(hDlgCtrl, LVM_SETITEMW, 0, (LPARAM)&li); #if 0 @@ -478,6 +478,12 @@ LANStatusUiDetailsDlg( #endif CoTaskMemFree(pAdapterInfo); break; + case WM_COMMAND: + if (LOWORD(wParam) == IDC_CLOSE) + { + EndDialog(hwndDlg, FALSE); + break; + } } return FALSE; }