mirror of
https://github.com/reactos/reactos.git
synced 2025-08-07 10:03:07 +00:00
- Fix multiple bugs in details status dialog
svn path=/trunk/; revision=37036
This commit is contained in:
parent
dfbb281b3a
commit
d48de02010
21 changed files with 30 additions and 24 deletions
|
@ -69,7 +69,7 @@ BEGIN
|
||||||
END
|
END
|
||||||
|
|
||||||
IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200
|
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"
|
CAPTION "Network Connection Details"
|
||||||
FONT 8, "MS Shell Dlg"
|
FONT 8, "MS Shell Dlg"
|
||||||
BEGIN
|
BEGIN
|
||||||
|
|
|
@ -68,7 +68,7 @@ BEGIN
|
||||||
END
|
END
|
||||||
|
|
||||||
IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200
|
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"
|
CAPTION "Network Connection Details"
|
||||||
FONT 8, "MS Shell Dlg"
|
FONT 8, "MS Shell Dlg"
|
||||||
BEGIN
|
BEGIN
|
||||||
|
|
|
@ -68,7 +68,7 @@ BEGIN
|
||||||
END
|
END
|
||||||
|
|
||||||
IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200
|
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"
|
CAPTION "Network Connection Details"
|
||||||
FONT 8, "MS Shell Dlg"
|
FONT 8, "MS Shell Dlg"
|
||||||
BEGIN
|
BEGIN
|
||||||
|
|
|
@ -69,7 +69,7 @@ BEGIN
|
||||||
END
|
END
|
||||||
|
|
||||||
IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200
|
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"
|
CAPTION "Network Connection Details"
|
||||||
FONT 8, "MS Shell Dlg"
|
FONT 8, "MS Shell Dlg"
|
||||||
BEGIN
|
BEGIN
|
||||||
|
|
|
@ -68,7 +68,7 @@ BEGIN
|
||||||
END
|
END
|
||||||
|
|
||||||
IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200
|
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"
|
CAPTION "Network Connection Details"
|
||||||
FONT 8, "MS Shell Dlg"
|
FONT 8, "MS Shell Dlg"
|
||||||
BEGIN
|
BEGIN
|
||||||
|
|
|
@ -69,7 +69,7 @@ BEGIN
|
||||||
END
|
END
|
||||||
|
|
||||||
IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200
|
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"
|
CAPTION "Network Connection Details"
|
||||||
FONT 8, "MS Shell Dlg"
|
FONT 8, "MS Shell Dlg"
|
||||||
BEGIN
|
BEGIN
|
||||||
|
|
|
@ -63,7 +63,7 @@ BEGIN
|
||||||
END
|
END
|
||||||
|
|
||||||
IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200
|
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"
|
CAPTION "Network Connection Details"
|
||||||
FONT 8, "MS Shell Dlg"
|
FONT 8, "MS Shell Dlg"
|
||||||
BEGIN
|
BEGIN
|
||||||
|
|
|
@ -68,7 +68,7 @@ BEGIN
|
||||||
END
|
END
|
||||||
|
|
||||||
IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200
|
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"
|
CAPTION "Network Connection Details"
|
||||||
FONT 8, "MS Shell Dlg"
|
FONT 8, "MS Shell Dlg"
|
||||||
BEGIN
|
BEGIN
|
||||||
|
|
|
@ -69,7 +69,7 @@ BEGIN
|
||||||
END
|
END
|
||||||
|
|
||||||
IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200
|
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"
|
CAPTION "Network Connection Details"
|
||||||
FONT 8, "MS Shell Dlg"
|
FONT 8, "MS Shell Dlg"
|
||||||
BEGIN
|
BEGIN
|
||||||
|
|
|
@ -68,7 +68,7 @@ BEGIN
|
||||||
END
|
END
|
||||||
|
|
||||||
IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200
|
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"
|
CAPTION "Network Connection Details"
|
||||||
FONT 8, "MS Shell Dlg"
|
FONT 8, "MS Shell Dlg"
|
||||||
BEGIN
|
BEGIN
|
||||||
|
|
|
@ -73,7 +73,7 @@ BEGIN
|
||||||
END
|
END
|
||||||
|
|
||||||
IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200
|
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"
|
CAPTION "Network Connection Details"
|
||||||
FONT 8, "MS Shell Dlg"
|
FONT 8, "MS Shell Dlg"
|
||||||
BEGIN
|
BEGIN
|
||||||
|
|
|
@ -68,7 +68,7 @@ BEGIN
|
||||||
END
|
END
|
||||||
|
|
||||||
IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200
|
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"
|
CAPTION "Network Connection Details"
|
||||||
FONT 8, "MS Shell Dlg"
|
FONT 8, "MS Shell Dlg"
|
||||||
BEGIN
|
BEGIN
|
||||||
|
|
|
@ -68,7 +68,7 @@ BEGIN
|
||||||
END
|
END
|
||||||
|
|
||||||
IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200
|
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"
|
CAPTION "Network Connection Details"
|
||||||
FONT 8, "MS Shell Dlg"
|
FONT 8, "MS Shell Dlg"
|
||||||
BEGIN
|
BEGIN
|
||||||
|
|
|
@ -72,7 +72,7 @@ BEGIN
|
||||||
END
|
END
|
||||||
|
|
||||||
IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200
|
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"
|
CAPTION "Network Connection Details"
|
||||||
FONT 8, "MS Shell Dlg"
|
FONT 8, "MS Shell Dlg"
|
||||||
BEGIN
|
BEGIN
|
||||||
|
|
|
@ -69,7 +69,7 @@ BEGIN
|
||||||
END
|
END
|
||||||
|
|
||||||
IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200
|
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"
|
CAPTION "Network Connection Details"
|
||||||
FONT 8, "MS Shell Dlg"
|
FONT 8, "MS Shell Dlg"
|
||||||
BEGIN
|
BEGIN
|
||||||
|
|
|
@ -69,7 +69,7 @@ BEGIN
|
||||||
END
|
END
|
||||||
|
|
||||||
IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200
|
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"
|
CAPTION "Network Connection Details"
|
||||||
FONT 8, "MS Shell Dlg"
|
FONT 8, "MS Shell Dlg"
|
||||||
BEGIN
|
BEGIN
|
||||||
|
|
|
@ -74,7 +74,7 @@ BEGIN
|
||||||
END
|
END
|
||||||
|
|
||||||
IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200
|
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"
|
CAPTION "Network Connection Details"
|
||||||
FONT 8, "MS Shell Dlg"
|
FONT 8, "MS Shell Dlg"
|
||||||
BEGIN
|
BEGIN
|
||||||
|
|
|
@ -69,7 +69,7 @@ BEGIN
|
||||||
END
|
END
|
||||||
|
|
||||||
IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200
|
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"
|
CAPTION "Network Connection Details"
|
||||||
FONT 8, "MS Shell Dlg"
|
FONT 8, "MS Shell Dlg"
|
||||||
BEGIN
|
BEGIN
|
||||||
|
|
|
@ -71,7 +71,7 @@ BEGIN
|
||||||
END
|
END
|
||||||
|
|
||||||
IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200
|
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"
|
CAPTION "Network Connection Details"
|
||||||
FONT 8, "MS Shell Dlg"
|
FONT 8, "MS Shell Dlg"
|
||||||
BEGIN
|
BEGIN
|
||||||
|
|
|
@ -68,7 +68,7 @@ BEGIN
|
||||||
END
|
END
|
||||||
|
|
||||||
IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200
|
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"
|
CAPTION "Network Connection Details"
|
||||||
FONT 8, "MS Shell Dlg"
|
FONT 8, "MS Shell Dlg"
|
||||||
BEGIN
|
BEGIN
|
||||||
|
|
|
@ -336,7 +336,7 @@ AddIPAddressToListView(
|
||||||
{
|
{
|
||||||
ZeroMemory(&li, sizeof(LVITEMW));
|
ZeroMemory(&li, sizeof(LVITEMW));
|
||||||
li.mask = LVIF_TEXT;
|
li.mask = LVIF_TEXT;
|
||||||
li.iItem = ListView_GetItemCount(hDlgCtrl);
|
li.iItem = Index;
|
||||||
li.iSubItem = 0;
|
li.iSubItem = 0;
|
||||||
li.pszText = L"";
|
li.pszText = L"";
|
||||||
li.iItem = SendMessageW(hDlgCtrl, LVM_INSERTITEMW, 0, (LPARAM)&li);
|
li.iItem = SendMessageW(hDlgCtrl, LVM_INSERTITEMW, 0, (LPARAM)&li);
|
||||||
|
@ -346,7 +346,7 @@ AddIPAddressToListView(
|
||||||
{
|
{
|
||||||
li.pszText = szBuffer;
|
li.pszText = szBuffer;
|
||||||
li.iSubItem = 1;
|
li.iSubItem = 1;
|
||||||
li.iItem = ListView_GetItemCount(hDlgCtrl);
|
li.iItem = Index++;
|
||||||
SendMessageW(hDlgCtrl, LVM_SETITEMW, 0, (LPARAM)&li);
|
SendMessageW(hDlgCtrl, LVM_SETITEMW, 0, (LPARAM)&li);
|
||||||
}
|
}
|
||||||
SubIndex++;
|
SubIndex++;
|
||||||
|
@ -365,7 +365,7 @@ InsertItemToListView(
|
||||||
ZeroMemory(&li, sizeof(LVITEMW));
|
ZeroMemory(&li, sizeof(LVITEMW));
|
||||||
li.mask = LVIF_TEXT;
|
li.mask = LVIF_TEXT;
|
||||||
li.iItem = ListView_GetItemCount(hDlgCtrl);
|
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;
|
li.pszText = szBuffer;
|
||||||
return (INT)SendMessageW(hDlgCtrl, LVM_INSERTITEMW, 0, (LPARAM)&li);
|
return (INT)SendMessageW(hDlgCtrl, LVM_INSERTITEMW, 0, (LPARAM)&li);
|
||||||
|
@ -444,7 +444,7 @@ LANStatusUiDetailsDlg(
|
||||||
|
|
||||||
li.iItem = InsertItemToListView(hDlgCtrl, IDS_DEF_GATEWAY);
|
li.iItem = InsertItemToListView(hDlgCtrl, IDS_DEF_GATEWAY);
|
||||||
if (li.iItem >= 0)
|
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);
|
SendMessageW(hDlgCtrl, LVM_SETITEMW, 0, (LPARAM)&li);
|
||||||
|
|
||||||
#if 0
|
#if 0
|
||||||
|
@ -478,6 +478,12 @@ LANStatusUiDetailsDlg(
|
||||||
#endif
|
#endif
|
||||||
CoTaskMemFree(pAdapterInfo);
|
CoTaskMemFree(pAdapterInfo);
|
||||||
break;
|
break;
|
||||||
|
case WM_COMMAND:
|
||||||
|
if (LOWORD(wParam) == IDC_CLOSE)
|
||||||
|
{
|
||||||
|
EndDialog(hwndDlg, FALSE);
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue