[ros-diffs] [janderwald] 37036: - Fix multiple bugs in details status dialog

Author: janderwald
Date: Tue Oct 28 04:14:06 2008
New Revision: 37036

URL: http://svn.reactos.org/svn/reactos?rev=37036&view=rev
Log:
- Fix multiple bugs in details status dialog

Modified:
    trunk/reactos/dll/win32/netshell/lang/bg-BG.rc
    trunk/reactos/dll/win32/netshell/lang/cs-CZ.rc
    trunk/reactos/dll/win32/netshell/lang/da-DK.rc
    trunk/reactos/dll/win32/netshell/lang/de-DE.rc
    trunk/reactos/dll/win32/netshell/lang/el-GR.rc
    trunk/reactos/dll/win32/netshell/lang/en-US.rc
    trunk/reactos/dll/win32/netshell/lang/es-ES.rc
    trunk/reactos/dll/win32/netshell/lang/fr-FR.rc
    trunk/reactos/dll/win32/netshell/lang/hu-HU.rc
    trunk/reactos/dll/win32/netshell/lang/id-ID.rc
    trunk/reactos/dll/win32/netshell/lang/it-IT.rc
    trunk/reactos/dll/win32/netshell/lang/ja-JP.rc
    trunk/reactos/dll/win32/netshell/lang/nl-NL.rc
    trunk/reactos/dll/win32/netshell/lang/no-NO.rc
    trunk/reactos/dll/win32/netshell/lang/pl-PL.rc
    trunk/reactos/dll/win32/netshell/lang/ru-RU.rc
    trunk/reactos/dll/win32/netshell/lang/sk-SK.rc
    trunk/reactos/dll/win32/netshell/lang/sv-SE.rc
    trunk/reactos/dll/win32/netshell/lang/uk-UA.rc
    trunk/reactos/dll/win32/netshell/lang/zh-CN.rc
    trunk/reactos/dll/win32/netshell/lanstatusui.c

Modified: trunk/reactos/dll/win32/netshell/lang/bg-BG.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/bg-...
==============================================================================
--- trunk/reactos/dll/win32/netshell/lang/bg-BG.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netshell/lang/bg-BG.rc [iso-8859-1] Tue Oct 28 04:14:06 2008
@@ -69,7 +69,7 @@
 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

Modified: trunk/reactos/dll/win32/netshell/lang/cs-CZ.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/cs-...
==============================================================================
--- trunk/reactos/dll/win32/netshell/lang/cs-CZ.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netshell/lang/cs-CZ.rc [iso-8859-1] Tue Oct 28 04:14:06 2008
@@ -68,7 +68,7 @@
 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

Modified: trunk/reactos/dll/win32/netshell/lang/da-DK.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/da-...
==============================================================================
--- trunk/reactos/dll/win32/netshell/lang/da-DK.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netshell/lang/da-DK.rc [iso-8859-1] Tue Oct 28 04:14:06 2008
@@ -68,7 +68,7 @@
 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

Modified: trunk/reactos/dll/win32/netshell/lang/de-DE.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/de-...
==============================================================================
--- trunk/reactos/dll/win32/netshell/lang/de-DE.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netshell/lang/de-DE.rc [iso-8859-1] Tue Oct 28 04:14:06 2008
@@ -69,7 +69,7 @@
 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

Modified: trunk/reactos/dll/win32/netshell/lang/el-GR.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/el-...
==============================================================================
--- trunk/reactos/dll/win32/netshell/lang/el-GR.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netshell/lang/el-GR.rc [iso-8859-1] Tue Oct 28 04:14:06 2008
@@ -68,7 +68,7 @@
 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

Modified: trunk/reactos/dll/win32/netshell/lang/en-US.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/en-...
==============================================================================
--- trunk/reactos/dll/win32/netshell/lang/en-US.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netshell/lang/en-US.rc [iso-8859-1] Tue Oct 28 04:14:06 2008
@@ -69,7 +69,7 @@
 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

Modified: trunk/reactos/dll/win32/netshell/lang/es-ES.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/es-...
==============================================================================
--- trunk/reactos/dll/win32/netshell/lang/es-ES.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netshell/lang/es-ES.rc [iso-8859-1] Tue Oct 28 04:14:06 2008
@@ -63,7 +63,7 @@
 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

Modified: trunk/reactos/dll/win32/netshell/lang/fr-FR.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/fr-...
==============================================================================
--- trunk/reactos/dll/win32/netshell/lang/fr-FR.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netshell/lang/fr-FR.rc [iso-8859-1] Tue Oct 28 04:14:06 2008
@@ -68,7 +68,7 @@
 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

Modified: trunk/reactos/dll/win32/netshell/lang/hu-HU.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/hu-...
==============================================================================
--- trunk/reactos/dll/win32/netshell/lang/hu-HU.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netshell/lang/hu-HU.rc [iso-8859-1] Tue Oct 28 04:14:06 2008
@@ -69,7 +69,7 @@
 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

Modified: trunk/reactos/dll/win32/netshell/lang/id-ID.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/id-...
==============================================================================
--- trunk/reactos/dll/win32/netshell/lang/id-ID.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netshell/lang/id-ID.rc [iso-8859-1] Tue Oct 28 04:14:06 2008
@@ -68,7 +68,7 @@
 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

Modified: trunk/reactos/dll/win32/netshell/lang/it-IT.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/it-...
==============================================================================
--- trunk/reactos/dll/win32/netshell/lang/it-IT.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netshell/lang/it-IT.rc [iso-8859-1] Tue Oct 28 04:14:06 2008
@@ -73,7 +73,7 @@
 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

Modified: trunk/reactos/dll/win32/netshell/lang/ja-JP.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/ja-...
==============================================================================
--- trunk/reactos/dll/win32/netshell/lang/ja-JP.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netshell/lang/ja-JP.rc [iso-8859-1] Tue Oct 28 04:14:06 2008
@@ -68,7 +68,7 @@
 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

Modified: trunk/reactos/dll/win32/netshell/lang/nl-NL.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/nl-...
==============================================================================
--- trunk/reactos/dll/win32/netshell/lang/nl-NL.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netshell/lang/nl-NL.rc [iso-8859-1] Tue Oct 28 04:14:06 2008
@@ -68,7 +68,7 @@
 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

Modified: trunk/reactos/dll/win32/netshell/lang/no-NO.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/no-...
==============================================================================
--- trunk/reactos/dll/win32/netshell/lang/no-NO.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netshell/lang/no-NO.rc [iso-8859-1] Tue Oct 28 04:14:06 2008
@@ -72,7 +72,7 @@
 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

Modified: trunk/reactos/dll/win32/netshell/lang/pl-PL.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/pl-...
==============================================================================
--- trunk/reactos/dll/win32/netshell/lang/pl-PL.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netshell/lang/pl-PL.rc [iso-8859-1] Tue Oct 28 04:14:06 2008
@@ -69,7 +69,7 @@
 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

Modified: trunk/reactos/dll/win32/netshell/lang/ru-RU.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/ru-...
==============================================================================
--- trunk/reactos/dll/win32/netshell/lang/ru-RU.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netshell/lang/ru-RU.rc [iso-8859-1] Tue Oct 28 04:14:06 2008
@@ -69,7 +69,7 @@
 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

Modified: trunk/reactos/dll/win32/netshell/lang/sk-SK.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/sk-...
==============================================================================
--- trunk/reactos/dll/win32/netshell/lang/sk-SK.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netshell/lang/sk-SK.rc [iso-8859-1] Tue Oct 28 04:14:06 2008
@@ -74,7 +74,7 @@
 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

Modified: trunk/reactos/dll/win32/netshell/lang/sv-SE.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/sv-...
==============================================================================
--- trunk/reactos/dll/win32/netshell/lang/sv-SE.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netshell/lang/sv-SE.rc [iso-8859-1] Tue Oct 28 04:14:06 2008
@@ -69,7 +69,7 @@
 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

Modified: trunk/reactos/dll/win32/netshell/lang/uk-UA.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/uk-...
==============================================================================
--- trunk/reactos/dll/win32/netshell/lang/uk-UA.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netshell/lang/uk-UA.rc [iso-8859-1] Tue Oct 28 04:14:06 2008
@@ -71,7 +71,7 @@
 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

Modified: trunk/reactos/dll/win32/netshell/lang/zh-CN.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/zh-...
==============================================================================
--- trunk/reactos/dll/win32/netshell/lang/zh-CN.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netshell/lang/zh-CN.rc [iso-8859-1] Tue Oct 28 04:14:06 2008
@@ -68,7 +68,7 @@
 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

Modified: trunk/reactos/dll/win32/netshell/lanstatusui.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lanstatu...
==============================================================================
--- trunk/reactos/dll/win32/netshell/lanstatusui.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netshell/lanstatusui.c [iso-8859-1] Tue Oct 28 04:14:06 2008
@@ -336,7 +336,7 @@
         {
             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 @@
         {
             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 @@
     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 @@

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 @@
 #endif
             CoTaskMemFree(pAdapterInfo);
             break;
+        case WM_COMMAND:
+            if (LOWORD(wParam) == IDC_CLOSE)
+            {
+                EndDialog(hwndDlg, FALSE);
+                break;
+            }
     }
     return FALSE;
 }