[ros-diffs] [janderwald] 36715: - Replace IDOK with IDC_OK as this creates problems - Add NULL pointer checks - Misc bugfixes

Author: janderwald
Date: Sat Oct 11 07:38:03 2008
New Revision: 36715

URL: http://svn.reactos.org/svn/reactos?rev=36715&view=rev
Log:
- Replace IDOK with IDC_OK as this creates problems
- Add NULL pointer checks
- Misc bugfixes

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

Modified: trunk/reactos/dll/win32/netcfgx/inetcfgcomp_iface.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/inetcfgc…
==============================================================================
--- trunk/reactos/dll/win32/netcfgx/inetcfgcomp_iface.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netcfgx/inetcfgcomp_iface.c [iso-8859-1] Sat Oct 11 07:38:03
2008
@@ -7,6 +7,7 @@
     LONG  ref;
     NetCfgComponentItem * pItem;
     INetCfgComponentPropertyUi * pProperty;
+    INetCfgComponentControl * pNCCC;
     INetCfg * pNCfg;
 }INetCfgComponentImpl;
 
@@ -324,8 +325,7 @@
 CreateNotificationObject(
     INetCfgComponentImpl * This,
     INetCfgComponent * iface,
-    IUnknown  *pUnk,
-    INetCfgComponentPropertyUi ** pOut)
+    IUnknown  *pUnk)
 {
     WCHAR szName[150];
     HKEY hKey;
@@ -419,7 +419,9 @@
         INetCfgComponentPropertyUi_Release(pNCCPU);
         return hr;
     }
-    *pOut = pNCCPU;
+    This->pProperty = pNCCPU;
+    This->pNCCC = pNCCC;
+
     return S_OK;
 }
 
@@ -441,7 +443,7 @@
 
     if (!This->pProperty)
     {
-         hr = CreateNotificationObject(This,iface, pUnk, &This->pProperty);
+         hr = CreateNotificationObject(This,iface, pUnk);
          if (FAILED(hr))
              return hr;
          if (dwFlags == NCRP_QUERY_PROPERTY_UI)
@@ -450,6 +452,7 @@
 
     dwDefPages = 0;
     Pages = 0;
+
     hr = INetCfgComponentPropertyUi_MergePropPages(This->pProperty, &dwDefPages,
(BYTE**)&hppages, &Pages, hwndParent, NULL);
     if (FAILED(hr) || !Pages)
     {
@@ -464,15 +467,18 @@
     pinfo.pszCaption = This->pItem->szDisplayName;
 
     iResult = PropertySheetW(&pinfo);
+
     CoTaskMemFree(hppages);
     if (iResult < 0)
     {
-        INetCfgComponentPropertyUi_CancelProperties(This->pProperty);
+        //FIXME
+        INetCfgComponentControl_CancelChanges(This->pNCCC);
         return E_ABORT;
     }
     else
     {
-        INetCfgComponentPropertyUi_ApplyProperties(This->pProperty);
+        //FIXME
+        INetCfgComponentControl_ApplyRegistryChanges(This->pNCCC);
         return S_OK;
     }
 }
@@ -522,9 +528,6 @@
 
     INetCfgComponent_Release((INetCfgComponent*)This);
     return S_OK;
-
-
-    return S_OK;
 }
 
 

Modified: trunk/reactos/dll/win32/netcfgx/lang/bg-BG.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/bg-…
==============================================================================
--- trunk/reactos/dll/win32/netcfgx/lang/bg-BG.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netcfgx/lang/bg-BG.rc [iso-8859-1] Sat Oct 11 07:38:03 2008
@@ -118,7 +118,7 @@
     LTEXT "IP address:", -1, 5, 15, 70, 12
     LTEXT "Subnet mask:", -1, 5, 30, 70, 12
     CONTROL "",IDC_SUBNETMASK,"SysIPAddress32", WS_TABSTOP, 100, 30,
80, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -132,7 +132,7 @@
     CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12,
BS_AUTOCHECKBOX | WS_TABSTOP
     LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
     EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
-    PUSHBUTTON "", IDOK, 50, 60, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
 END
 
@@ -143,7 +143,7 @@
 BEGIN
     CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 5, 25, 80, 12
     LTEXT "DNS server:", -1, 5, 10, 120, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -154,7 +154,7 @@
 BEGIN
     EDITTEXT IDC_SUFFIX, 5, 25, 190, 12, WS_TABSTOP
     LTEXT "Domain suffix:", -1, 5, 10, 120, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -182,7 +182,7 @@
     CONTROL "", IDC_IP_LIST, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 211, 62,
72, 75
     PUSHBUTTON "Add", IDC_IP_ADD, 215, 141, 50, 14, WS_TABSTOP
     PUSHBUTTON "Remove", IDC_IP_DEL, 215, 161, 50, 14, WS_TABSTOP
-    PUSHBUTTON "OK", IDOK, 150, 190, 50, 14, WS_TABSTOP
+    PUSHBUTTON "OK", IDC_OK, 150, 190, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP
 END
 
@@ -193,7 +193,7 @@
 BEGIN
     EDITTEXT IDC_PORT_VAL, 5, 30, 70, 12, WS_TABSTOP | ES_NUMBER
     LTEXT "", IDC_PORT_DESC, 5, 15, 40, 12
-    PUSHBUTTON "OK", IDOK, 120, 15, 50, 14, WS_TABSTOP
+    PUSHBUTTON "OK", IDC_OK, 120, 15, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP
 END
 

Modified: trunk/reactos/dll/win32/netcfgx/lang/cs-CZ.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/cs-…
==============================================================================
--- trunk/reactos/dll/win32/netcfgx/lang/cs-CZ.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netcfgx/lang/cs-CZ.rc [iso-8859-1] Sat Oct 11 07:38:03 2008
@@ -118,7 +118,7 @@
     LTEXT "IP address:", -1, 5, 15, 70, 12
     LTEXT "Subnet mask:", -1, 5, 30, 70, 12
     CONTROL "",IDC_SUBNETMASK,"SysIPAddress32", WS_TABSTOP, 100, 30,
80, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -132,7 +132,7 @@
     CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12,
BS_AUTOCHECKBOX | WS_TABSTOP
     LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
     EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
-    PUSHBUTTON "", IDOK, 50, 60, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
 END
 
@@ -143,7 +143,7 @@
 BEGIN
     CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 5, 25, 80, 12
     LTEXT "DNS server:", -1, 5, 10, 120, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -154,7 +154,7 @@
 BEGIN
     EDITTEXT IDC_SUFFIX, 5, 25, 190, 12, WS_TABSTOP
     LTEXT "Domain suffix:", -1, 5, 10, 120, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -182,7 +182,7 @@
     CONTROL "", IDC_IP_LIST, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 211, 62,
72, 75
     PUSHBUTTON "Add", IDC_IP_ADD, 215, 141, 50, 14, WS_TABSTOP
     PUSHBUTTON "Remove", IDC_IP_DEL, 215, 161, 50, 14, WS_TABSTOP
-    PUSHBUTTON "OK", IDOK, 150, 190, 50, 14, WS_TABSTOP
+    PUSHBUTTON "OK", IDC_OK, 150, 190, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP
 END
 
@@ -193,7 +193,7 @@
 BEGIN
     EDITTEXT IDC_PORT_VAL, 5, 30, 70, 12, WS_TABSTOP | ES_NUMBER
     LTEXT "", IDC_PORT_DESC, 5, 15, 40, 12
-    PUSHBUTTON "OK", IDOK, 120, 15, 50, 14, WS_TABSTOP
+    PUSHBUTTON "OK", IDC_OK, 120, 15, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP
 END
 

Modified: trunk/reactos/dll/win32/netcfgx/lang/da-DK.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/da-…
==============================================================================
--- trunk/reactos/dll/win32/netcfgx/lang/da-DK.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netcfgx/lang/da-DK.rc [iso-8859-1] Sat Oct 11 07:38:03 2008
@@ -117,7 +117,7 @@
     LTEXT "IP address:", -1, 5, 15, 70, 12
     LTEXT "Subnet mask:", -1, 5, 30, 70, 12
     CONTROL "",IDC_SUBNETMASK,"SysIPAddress32", WS_TABSTOP, 100, 30,
80, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -131,7 +131,7 @@
     CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12,
BS_AUTOCHECKBOX | WS_TABSTOP
     LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
     EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
-    PUSHBUTTON "", IDOK, 50, 60, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
 END
 
@@ -142,7 +142,7 @@
 BEGIN
     CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 5, 25, 80, 12
     LTEXT "DNS server:", -1, 5, 10, 120, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -153,7 +153,7 @@
 BEGIN
     EDITTEXT IDC_SUFFIX, 5, 25, 190, 12, WS_TABSTOP
     LTEXT "Domain suffix:", -1, 5, 10, 120, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -181,7 +181,7 @@
     CONTROL "", IDC_IP_LIST, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 211, 62,
72, 75
     PUSHBUTTON "Add", IDC_IP_ADD, 215, 141, 50, 14, WS_TABSTOP
     PUSHBUTTON "Remove", IDC_IP_DEL, 215, 161, 50, 14, WS_TABSTOP
-    PUSHBUTTON "OK", IDOK, 150, 190, 50, 14, WS_TABSTOP
+    PUSHBUTTON "OK", IDC_OK, 150, 190, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP
 END
 
@@ -192,7 +192,7 @@
 BEGIN
     EDITTEXT IDC_PORT_VAL, 5, 30, 70, 12, WS_TABSTOP | ES_NUMBER
     LTEXT "", IDC_PORT_DESC, 5, 15, 40, 12
-    PUSHBUTTON "OK", IDOK, 120, 15, 50, 14, WS_TABSTOP
+    PUSHBUTTON "OK", IDC_OK, 120, 15, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP
 END
 

Modified: trunk/reactos/dll/win32/netcfgx/lang/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/de-…
==============================================================================
--- trunk/reactos/dll/win32/netcfgx/lang/de-DE.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netcfgx/lang/de-DE.rc [iso-8859-1] Sat Oct 11 07:38:03 2008
@@ -117,7 +117,7 @@
     LTEXT "IP-Adresse:", -1, 5, 15, 70, 12
     LTEXT "Subnetzmaske:", -1, 5, 30, 70, 12
     CONTROL "",IDC_SUBNETMASK,"SysIPAddress32", WS_TABSTOP, 100, 30,
80, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Abbrechen", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -131,7 +131,7 @@
     CHECKBOX "Automatische Metrik", IDC_USEMETRIC, 15, 30, 190, 12,
BS_AUTOCHECKBOX | WS_TABSTOP
     LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
     EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
-    PUSHBUTTON "", IDOK, 50, 60, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
     PUSHBUTTON "Abbrechen", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
 END
 
@@ -142,7 +142,7 @@
 BEGIN
     CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 5, 25, 80, 12
     LTEXT "DNS-Server:", -1, 5, 10, 120, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Abbrechen", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -153,7 +153,7 @@
 BEGIN
     EDITTEXT IDC_SUFFIX, 5, 25, 190, 12, WS_TABSTOP
     LTEXT "Domänensuffix:", -1, 5, 10, 120, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Abbrechen", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -181,7 +181,7 @@
     CONTROL "", IDC_IP_LIST, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 211, 62,
72, 75
     PUSHBUTTON "Hinzufügen...", IDC_IP_ADD, 215, 141, 50, 14, WS_TABSTOP
     PUSHBUTTON "Entfernen", IDC_IP_DEL, 215, 161, 50, 14, WS_TABSTOP
-    PUSHBUTTON "OK", IDOK, 150, 190, 50, 14, WS_TABSTOP
+    PUSHBUTTON "OK", IDC_OK, 150, 190, 50, 14, WS_TABSTOP
     PUSHBUTTON "Abbrechen", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP
 END
 
@@ -192,7 +192,7 @@
 BEGIN
     EDITTEXT IDC_PORT_VAL, 5, 30, 70, 12, WS_TABSTOP | ES_NUMBER
     LTEXT "", IDC_PORT_DESC, 5, 15, 40, 12
-    PUSHBUTTON "OK", IDOK, 120, 15, 50, 14, WS_TABSTOP
+    PUSHBUTTON "OK", IDC_OK, 120, 15, 50, 14, WS_TABSTOP
     PUSHBUTTON "Abbrechen", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP
 END
 

Modified: trunk/reactos/dll/win32/netcfgx/lang/el-GR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/el-…
==============================================================================
--- trunk/reactos/dll/win32/netcfgx/lang/el-GR.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netcfgx/lang/el-GR.rc [iso-8859-1] Sat Oct 11 07:38:03 2008
@@ -117,7 +117,7 @@
     LTEXT "IP address:", -1, 5, 15, 70, 12
     LTEXT "Subnet mask:", -1, 5, 30, 70, 12
     CONTROL "",IDC_SUBNETMASK,"SysIPAddress32", WS_TABSTOP, 100, 30,
80, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -131,7 +131,7 @@
     CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12,
BS_AUTOCHECKBOX | WS_TABSTOP
     LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
     EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
-    PUSHBUTTON "", IDOK, 50, 60, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
 END
 
@@ -142,7 +142,7 @@
 BEGIN
     CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 5, 25, 80, 12
     LTEXT "DNS server:", -1, 5, 10, 120, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -153,7 +153,7 @@
 BEGIN
     EDITTEXT IDC_SUFFIX, 5, 25, 190, 12, WS_TABSTOP
     LTEXT "Domain suffix:", -1, 5, 10, 120, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -181,7 +181,7 @@
     CONTROL "", IDC_IP_LIST, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 211, 62,
72, 75
     PUSHBUTTON "Add", IDC_IP_ADD, 215, 141, 50, 14, WS_TABSTOP
     PUSHBUTTON "Remove", IDC_IP_DEL, 215, 161, 50, 14, WS_TABSTOP
-    PUSHBUTTON "OK", IDOK, 150, 190, 50, 14, WS_TABSTOP
+    PUSHBUTTON "OK", IDC_OK, 150, 190, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP
 END
 
@@ -192,7 +192,7 @@
 BEGIN
     EDITTEXT IDC_PORT_VAL, 5, 30, 70, 12, WS_TABSTOP | ES_NUMBER
     LTEXT "", IDC_PORT_DESC, 5, 15, 40, 12
-    PUSHBUTTON "OK", IDOK, 120, 15, 50, 14, WS_TABSTOP
+    PUSHBUTTON "OK", IDC_OK, 120, 15, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP
 END
 

Modified: trunk/reactos/dll/win32/netcfgx/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/en-…
==============================================================================
--- trunk/reactos/dll/win32/netcfgx/lang/en-US.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netcfgx/lang/en-US.rc [iso-8859-1] Sat Oct 11 07:38:03 2008
@@ -117,7 +117,7 @@
     LTEXT "IP address:", -1, 5, 15, 70, 12
     LTEXT "Subnet mask:", -1, 5, 30, 70, 12
     CONTROL "",IDC_SUBNETMASK,"SysIPAddress32", WS_TABSTOP, 100, 30,
80, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -131,7 +131,7 @@
     CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12,
BS_AUTOCHECKBOX | WS_TABSTOP
     LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
     EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
-    PUSHBUTTON "", IDOK, 50, 60, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
 END
 
@@ -142,7 +142,7 @@
 BEGIN
     CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 5, 25, 80, 12
     LTEXT "DNS server:", -1, 5, 10, 120, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -153,7 +153,7 @@
 BEGIN
     EDITTEXT IDC_SUFFIX, 5, 25, 190, 12, WS_TABSTOP
     LTEXT "Domain suffix:", -1, 5, 10, 120, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -181,7 +181,7 @@
     CONTROL "", IDC_IP_LIST, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 211, 62,
72, 75
     PUSHBUTTON "Add", IDC_IP_ADD, 215, 141, 50, 14, WS_TABSTOP
     PUSHBUTTON "Remove", IDC_IP_DEL, 215, 161, 50, 14, WS_TABSTOP
-    PUSHBUTTON "OK", IDOK, 150, 190, 50, 14, WS_TABSTOP
+    PUSHBUTTON "OK", IDC_OK, 150, 190, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP
 END
 
@@ -192,7 +192,7 @@
 BEGIN
     EDITTEXT IDC_PORT_VAL, 5, 30, 70, 12, WS_TABSTOP | ES_NUMBER
     LTEXT "", IDC_PORT_DESC, 5, 15, 40, 12
-    PUSHBUTTON "OK", IDOK, 120, 15, 50, 14, WS_TABSTOP
+    PUSHBUTTON "OK", IDC_OK, 120, 15, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP
 END
 

Modified: trunk/reactos/dll/win32/netcfgx/lang/es-ES.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/es-…
==============================================================================
--- trunk/reactos/dll/win32/netcfgx/lang/es-ES.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netcfgx/lang/es-ES.rc [iso-8859-1] Sat Oct 11 07:38:03 2008
@@ -117,7 +117,7 @@
     LTEXT "IP address:", -1, 5, 15, 70, 12
     LTEXT "Subnet mask:", -1, 5, 30, 70, 12
     CONTROL "",IDC_SUBNETMASK,"SysIPAddress32", WS_TABSTOP, 100, 30,
80, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -131,7 +131,7 @@
     CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12,
BS_AUTOCHECKBOX | WS_TABSTOP
     LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
     EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
-    PUSHBUTTON "", IDOK, 50, 60, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
 END
 
@@ -142,7 +142,7 @@
 BEGIN
     CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 5, 25, 80, 12
     LTEXT "DNS server:", -1, 5, 10, 120, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -153,7 +153,7 @@
 BEGIN
     EDITTEXT IDC_SUFFIX, 5, 25, 190, 12, WS_TABSTOP
     LTEXT "Domain suffix:", -1, 5, 10, 120, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -181,7 +181,7 @@
     CONTROL "", IDC_IP_LIST, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 211, 62,
72, 75
     PUSHBUTTON "Add", IDC_IP_ADD, 215, 141, 50, 14, WS_TABSTOP
     PUSHBUTTON "Remove", IDC_IP_DEL, 215, 161, 50, 14, WS_TABSTOP
-    PUSHBUTTON "OK", IDOK, 150, 190, 50, 14, WS_TABSTOP
+    PUSHBUTTON "OK", IDC_OK, 150, 190, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP
 END
 
@@ -192,7 +192,7 @@
 BEGIN
     EDITTEXT IDC_PORT_VAL, 5, 30, 70, 12, WS_TABSTOP | ES_NUMBER
     LTEXT "", IDC_PORT_DESC, 5, 15, 40, 12
-    PUSHBUTTON "OK", IDOK, 120, 15, 50, 14, WS_TABSTOP
+    PUSHBUTTON "OK", IDC_OK, 120, 15, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP
 END
 

Modified: trunk/reactos/dll/win32/netcfgx/lang/fr-FR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/fr-…
==============================================================================
--- trunk/reactos/dll/win32/netcfgx/lang/fr-FR.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netcfgx/lang/fr-FR.rc [iso-8859-1] Sat Oct 11 07:38:03 2008
@@ -117,7 +117,7 @@
     LTEXT "IP address:", -1, 5, 15, 70, 12
     LTEXT "Subnet mask:", -1, 5, 30, 70, 12
     CONTROL "",IDC_SUBNETMASK,"SysIPAddress32", WS_TABSTOP, 100, 30,
80, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -131,7 +131,7 @@
     CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12,
BS_AUTOCHECKBOX | WS_TABSTOP
     LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
     EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
-    PUSHBUTTON "", IDOK, 50, 60, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
 END
 
@@ -142,7 +142,7 @@
 BEGIN
     CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 5, 25, 80, 12
     LTEXT "DNS server:", -1, 5, 10, 120, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -153,7 +153,7 @@
 BEGIN
     EDITTEXT IDC_SUFFIX, 5, 25, 190, 12, WS_TABSTOP
     LTEXT "Domain suffix:", -1, 5, 10, 120, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -181,7 +181,7 @@
     CONTROL "", IDC_IP_LIST, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 211, 62,
72, 75
     PUSHBUTTON "Add", IDC_IP_ADD, 215, 141, 50, 14, WS_TABSTOP
     PUSHBUTTON "Remove", IDC_IP_DEL, 215, 161, 50, 14, WS_TABSTOP
-    PUSHBUTTON "OK", IDOK, 150, 190, 50, 14, WS_TABSTOP
+    PUSHBUTTON "OK", IDC_OK, 150, 190, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP
 END
 
@@ -192,7 +192,7 @@
 BEGIN
     EDITTEXT IDC_PORT_VAL, 5, 30, 70, 12, WS_TABSTOP | ES_NUMBER
     LTEXT "", IDC_PORT_DESC, 5, 15, 40, 12
-    PUSHBUTTON "OK", IDOK, 120, 15, 50, 14, WS_TABSTOP
+    PUSHBUTTON "OK", IDC_OK, 120, 15, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP
 END
 

Modified: trunk/reactos/dll/win32/netcfgx/lang/hu-HU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/hu-…
==============================================================================
--- trunk/reactos/dll/win32/netcfgx/lang/hu-HU.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netcfgx/lang/hu-HU.rc [iso-8859-1] Sat Oct 11 07:38:03 2008
@@ -117,7 +117,7 @@
     LTEXT "IP address:", -1, 5, 15, 70, 12
     LTEXT "Subnet mask:", -1, 5, 30, 70, 12
     CONTROL "",IDC_SUBNETMASK,"SysIPAddress32", WS_TABSTOP, 100, 30,
80, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -131,7 +131,7 @@
     CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12,
BS_AUTOCHECKBOX | WS_TABSTOP
     LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
     EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
-    PUSHBUTTON "", IDOK, 50, 60, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
 END
 
@@ -142,7 +142,7 @@
 BEGIN
     CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 5, 25, 80, 12
     LTEXT "DNS server:", -1, 5, 10, 120, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -153,7 +153,7 @@
 BEGIN
     EDITTEXT IDC_SUFFIX, 5, 25, 190, 12, WS_TABSTOP
     LTEXT "Domain suffix:", -1, 5, 10, 120, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -181,7 +181,7 @@
     CONTROL "", IDC_IP_LIST, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 211, 62,
72, 75
     PUSHBUTTON "Add", IDC_IP_ADD, 215, 141, 50, 14, WS_TABSTOP
     PUSHBUTTON "Remove", IDC_IP_DEL, 215, 161, 50, 14, WS_TABSTOP
-    PUSHBUTTON "OK", IDOK, 150, 190, 50, 14, WS_TABSTOP
+    PUSHBUTTON "OK", IDC_OK, 150, 190, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP
 END
 
@@ -192,7 +192,7 @@
 BEGIN
     EDITTEXT IDC_PORT_VAL, 5, 30, 70, 12, WS_TABSTOP | ES_NUMBER
     LTEXT "", IDC_PORT_DESC, 5, 15, 40, 12
-    PUSHBUTTON "OK", IDOK, 120, 15, 50, 14, WS_TABSTOP
+    PUSHBUTTON "OK", IDC_OK, 120, 15, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP
 END
 

Modified: trunk/reactos/dll/win32/netcfgx/lang/id-ID.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/id-…
==============================================================================
--- trunk/reactos/dll/win32/netcfgx/lang/id-ID.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netcfgx/lang/id-ID.rc [iso-8859-1] Sat Oct 11 07:38:03 2008
@@ -117,7 +117,7 @@
     LTEXT "IP address:", -1, 5, 15, 70, 12
     LTEXT "Subnet mask:", -1, 5, 30, 70, 12
     CONTROL "",IDC_SUBNETMASK,"SysIPAddress32", WS_TABSTOP, 100, 30,
80, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -131,7 +131,7 @@
     CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12,
BS_AUTOCHECKBOX | WS_TABSTOP
     LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
     EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
-    PUSHBUTTON "", IDOK, 50, 60, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
 END
 
@@ -142,7 +142,7 @@
 BEGIN
     CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 5, 25, 80, 12
     LTEXT "DNS server:", -1, 5, 10, 120, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -153,7 +153,7 @@
 BEGIN
     EDITTEXT IDC_SUFFIX, 5, 25, 190, 12, WS_TABSTOP
     LTEXT "Domain suffix:", -1, 5, 10, 120, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -181,7 +181,7 @@
     CONTROL "", IDC_IP_LIST, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 211, 62,
72, 75
     PUSHBUTTON "Add", IDC_IP_ADD, 215, 141, 50, 14, WS_TABSTOP
     PUSHBUTTON "Remove", IDC_IP_DEL, 215, 161, 50, 14, WS_TABSTOP
-    PUSHBUTTON "OK", IDOK, 150, 190, 50, 14, WS_TABSTOP
+    PUSHBUTTON "OK", IDC_OK, 150, 190, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP
 END
 
@@ -192,7 +192,7 @@
 BEGIN
     EDITTEXT IDC_PORT_VAL, 5, 30, 70, 12, WS_TABSTOP | ES_NUMBER
     LTEXT "", IDC_PORT_DESC, 5, 15, 40, 12
-    PUSHBUTTON "OK", IDOK, 120, 15, 50, 14, WS_TABSTOP
+    PUSHBUTTON "OK", IDC_OK, 120, 15, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP
 END
 

Modified: trunk/reactos/dll/win32/netcfgx/lang/it-IT.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/it-…
==============================================================================
--- trunk/reactos/dll/win32/netcfgx/lang/it-IT.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netcfgx/lang/it-IT.rc [iso-8859-1] Sat Oct 11 07:38:03 2008
@@ -117,7 +117,7 @@
     LTEXT "IP address:", -1, 5, 15, 70, 12
     LTEXT "Subnet mask:", -1, 5, 30, 70, 12
     CONTROL "",IDC_SUBNETMASK,"SysIPAddress32", WS_TABSTOP, 100, 30,
80, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -131,7 +131,7 @@
     CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12,
BS_AUTOCHECKBOX | WS_TABSTOP
     LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
     EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
-    PUSHBUTTON "", IDOK, 50, 60, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
 END
 
@@ -142,7 +142,7 @@
 BEGIN
     CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 5, 25, 80, 12
     LTEXT "DNS server:", -1, 5, 10, 120, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -153,7 +153,7 @@
 BEGIN
     EDITTEXT IDC_SUFFIX, 5, 25, 190, 12, WS_TABSTOP
     LTEXT "Domain suffix:", -1, 5, 10, 120, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -181,7 +181,7 @@
     CONTROL "", IDC_IP_LIST, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 211, 62,
72, 75
     PUSHBUTTON "Add", IDC_IP_ADD, 215, 141, 50, 14, WS_TABSTOP
     PUSHBUTTON "Remove", IDC_IP_DEL, 215, 161, 50, 14, WS_TABSTOP
-    PUSHBUTTON "OK", IDOK, 150, 190, 50, 14, WS_TABSTOP
+    PUSHBUTTON "OK", IDC_OK, 150, 190, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP
 END
 
@@ -192,7 +192,7 @@
 BEGIN
     EDITTEXT IDC_PORT_VAL, 5, 30, 70, 12, WS_TABSTOP | ES_NUMBER
     LTEXT "", IDC_PORT_DESC, 5, 15, 40, 12
-    PUSHBUTTON "OK", IDOK, 120, 15, 50, 14, WS_TABSTOP
+    PUSHBUTTON "OK", IDC_OK, 120, 15, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP
 END
 

Modified: trunk/reactos/dll/win32/netcfgx/lang/ja-JP.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/ja-…
==============================================================================
--- trunk/reactos/dll/win32/netcfgx/lang/ja-JP.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netcfgx/lang/ja-JP.rc [iso-8859-1] Sat Oct 11 07:38:03 2008
@@ -117,7 +117,7 @@
     LTEXT "IP address:", -1, 5, 15, 70, 12
     LTEXT "Subnet mask:", -1, 5, 30, 70, 12
     CONTROL "",IDC_SUBNETMASK,"SysIPAddress32", WS_TABSTOP, 100, 30,
80, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -131,7 +131,7 @@
     CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12,
BS_AUTOCHECKBOX | WS_TABSTOP
     LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
     EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
-    PUSHBUTTON "", IDOK, 50, 60, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
 END
 
@@ -142,7 +142,7 @@
 BEGIN
     CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 5, 25, 80, 12
     LTEXT "DNS server:", -1, 5, 10, 120, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -153,7 +153,7 @@
 BEGIN
     EDITTEXT IDC_SUFFIX, 5, 25, 190, 12, WS_TABSTOP
     LTEXT "Domain suffix:", -1, 5, 10, 120, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -181,7 +181,7 @@
     CONTROL "", IDC_IP_LIST, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 211, 62,
72, 75
     PUSHBUTTON "Add", IDC_IP_ADD, 215, 141, 50, 14, WS_TABSTOP
     PUSHBUTTON "Remove", IDC_IP_DEL, 215, 161, 50, 14, WS_TABSTOP
-    PUSHBUTTON "OK", IDOK, 150, 190, 50, 14, WS_TABSTOP
+    PUSHBUTTON "OK", IDC_OK, 150, 190, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP
 END
 
@@ -192,7 +192,7 @@
 BEGIN
     EDITTEXT IDC_PORT_VAL, 5, 30, 70, 12, WS_TABSTOP | ES_NUMBER
     LTEXT "", IDC_PORT_DESC, 5, 15, 40, 12
-    PUSHBUTTON "OK", IDOK, 120, 15, 50, 14, WS_TABSTOP
+    PUSHBUTTON "OK", IDC_OK, 120, 15, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP
 END
 

Modified: trunk/reactos/dll/win32/netcfgx/lang/nl-NL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/nl-…
==============================================================================
--- trunk/reactos/dll/win32/netcfgx/lang/nl-NL.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netcfgx/lang/nl-NL.rc [iso-8859-1] Sat Oct 11 07:38:03 2008
@@ -117,7 +117,7 @@
     LTEXT "IP address:", -1, 5, 15, 70, 12
     LTEXT "Subnet mask:", -1, 5, 30, 70, 12
     CONTROL "",IDC_SUBNETMASK,"SysIPAddress32", WS_TABSTOP, 100, 30,
80, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -131,7 +131,7 @@
     CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12,
BS_AUTOCHECKBOX | WS_TABSTOP
     LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
     EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
-    PUSHBUTTON "", IDOK, 50, 60, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
 END
 
@@ -142,7 +142,7 @@
 BEGIN
     CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 5, 25, 80, 12
     LTEXT "DNS server:", -1, 5, 10, 120, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -153,7 +153,7 @@
 BEGIN
     EDITTEXT IDC_SUFFIX, 5, 25, 190, 12, WS_TABSTOP
     LTEXT "Domain suffix:", -1, 5, 10, 120, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -181,7 +181,7 @@
     CONTROL "", IDC_IP_LIST, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 211, 62,
72, 75
     PUSHBUTTON "Add", IDC_IP_ADD, 215, 141, 50, 14, WS_TABSTOP
     PUSHBUTTON "Remove", IDC_IP_DEL, 215, 161, 50, 14, WS_TABSTOP
-    PUSHBUTTON "OK", IDOK, 150, 190, 50, 14, WS_TABSTOP
+    PUSHBUTTON "OK", IDC_OK, 150, 190, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP
 END
 
@@ -192,7 +192,7 @@
 BEGIN
     EDITTEXT IDC_PORT_VAL, 5, 30, 70, 12, WS_TABSTOP | ES_NUMBER
     LTEXT "", IDC_PORT_DESC, 5, 15, 40, 12
-    PUSHBUTTON "OK", IDOK, 120, 15, 50, 14, WS_TABSTOP
+    PUSHBUTTON "OK", IDC_OK, 120, 15, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP
 END
 

Modified: trunk/reactos/dll/win32/netcfgx/lang/no-NO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/no-…
==============================================================================
--- trunk/reactos/dll/win32/netcfgx/lang/no-NO.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netcfgx/lang/no-NO.rc [iso-8859-1] Sat Oct 11 07:38:03 2008
@@ -117,7 +117,7 @@
     LTEXT "IP address:", -1, 5, 15, 70, 12
     LTEXT "Subnet mask:", -1, 5, 30, 70, 12
     CONTROL "",IDC_SUBNETMASK,"SysIPAddress32", WS_TABSTOP, 100, 30,
80, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -131,7 +131,7 @@
     CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12,
BS_AUTOCHECKBOX | WS_TABSTOP
     LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
     EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
-    PUSHBUTTON "", IDOK, 50, 60, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
 END
 
@@ -142,7 +142,7 @@
 BEGIN
     CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 5, 25, 80, 12
     LTEXT "DNS server:", -1, 5, 10, 120, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -153,7 +153,7 @@
 BEGIN
     EDITTEXT IDC_SUFFIX, 5, 25, 190, 12, WS_TABSTOP
     LTEXT "Domain suffix:", -1, 5, 10, 120, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -181,7 +181,7 @@
     CONTROL "", IDC_IP_LIST, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 211, 62,
72, 75
     PUSHBUTTON "Add", IDC_IP_ADD, 215, 141, 50, 14, WS_TABSTOP
     PUSHBUTTON "Remove", IDC_IP_DEL, 215, 161, 50, 14, WS_TABSTOP
-    PUSHBUTTON "OK", IDOK, 150, 190, 50, 14, WS_TABSTOP
+    PUSHBUTTON "OK", IDC_OK, 150, 190, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP
 END
 
@@ -192,7 +192,7 @@
 BEGIN
     EDITTEXT IDC_PORT_VAL, 5, 30, 70, 12, WS_TABSTOP | ES_NUMBER
     LTEXT "", IDC_PORT_DESC, 5, 15, 40, 12
-    PUSHBUTTON "OK", IDOK, 120, 15, 50, 14, WS_TABSTOP
+    PUSHBUTTON "OK", IDC_OK, 120, 15, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP
 END
 

Modified: trunk/reactos/dll/win32/netcfgx/lang/pl-PL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/pl-…
==============================================================================
--- trunk/reactos/dll/win32/netcfgx/lang/pl-PL.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netcfgx/lang/pl-PL.rc [iso-8859-1] Sat Oct 11 07:38:03 2008
@@ -117,7 +117,7 @@
     LTEXT "IP address:", -1, 5, 15, 70, 12
     LTEXT "Subnet mask:", -1, 5, 30, 70, 12
     CONTROL "",IDC_SUBNETMASK,"SysIPAddress32", WS_TABSTOP, 100, 30,
80, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -131,7 +131,7 @@
     CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12,
BS_AUTOCHECKBOX | WS_TABSTOP
     LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
     EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
-    PUSHBUTTON "", IDOK, 50, 60, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
 END
 
@@ -142,7 +142,7 @@
 BEGIN
     CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 5, 25, 80, 12
     LTEXT "DNS server:", -1, 5, 10, 120, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -153,7 +153,7 @@
 BEGIN
     EDITTEXT IDC_SUFFIX, 5, 25, 190, 12, WS_TABSTOP
     LTEXT "Domain suffix:", -1, 5, 10, 120, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -181,7 +181,7 @@
     CONTROL "", IDC_IP_LIST, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 211, 62,
72, 75
     PUSHBUTTON "Add", IDC_IP_ADD, 215, 141, 50, 14, WS_TABSTOP
     PUSHBUTTON "Remove", IDC_IP_DEL, 215, 161, 50, 14, WS_TABSTOP
-    PUSHBUTTON "OK", IDOK, 150, 190, 50, 14, WS_TABSTOP
+    PUSHBUTTON "OK", IDC_OK, 150, 190, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP
 END
 
@@ -192,7 +192,7 @@
 BEGIN
     EDITTEXT IDC_PORT_VAL, 5, 30, 70, 12, WS_TABSTOP | ES_NUMBER
     LTEXT "", IDC_PORT_DESC, 5, 15, 40, 12
-    PUSHBUTTON "OK", IDOK, 120, 15, 50, 14, WS_TABSTOP
+    PUSHBUTTON "OK", IDC_OK, 120, 15, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP
 END
 

Modified: trunk/reactos/dll/win32/netcfgx/lang/ru-RU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/ru-…
==============================================================================
--- trunk/reactos/dll/win32/netcfgx/lang/ru-RU.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netcfgx/lang/ru-RU.rc [iso-8859-1] Sat Oct 11 07:38:03 2008
@@ -117,7 +117,7 @@
     LTEXT "IP àäðåñ:", -1, 5, 15, 70, 12
     LTEXT "Ìàñêà ïîäñåòè:", -1, 5, 30, 70, 12
     CONTROL "",IDC_SUBNETMASK,"SysIPAddress32", WS_TABSTOP, 100, 30,
80, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Îòìåíà", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -131,7 +131,7 @@
     CHECKBOX "Àâòîìàòè÷åñêàÿ ìåòðèêà", IDC_USEMETRIC, 15, 30, 190, 12,
BS_AUTOCHECKBOX | WS_TABSTOP
     LTEXT "&Ìåòðèêà:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
     EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
-    PUSHBUTTON "", IDOK, 50, 60, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
     PUSHBUTTON "Îòìåíà", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
 END
 
@@ -142,7 +142,7 @@
 BEGIN
     CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 5, 25, 80, 12
     LTEXT "DNS ñåðâåð:", -1, 5, 10, 120, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Îòìåíà", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -153,7 +153,7 @@
 BEGIN
     EDITTEXT IDC_SUFFIX, 5, 25, 190, 12, WS_TABSTOP
     LTEXT "Domain suffix:", -1, 5, 10, 120, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Îòìåíà", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -181,7 +181,7 @@
     CONTROL "", IDC_IP_LIST, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 211, 62,
72, 75
     PUSHBUTTON "Äîáàâèòü", IDC_IP_ADD, 215, 141, 50, 14, WS_TABSTOP
     PUSHBUTTON "Óäàëèòü", IDC_IP_DEL, 215, 161, 50, 14, WS_TABSTOP
-    PUSHBUTTON "OK", IDOK, 150, 190, 50, 14, WS_TABSTOP
+    PUSHBUTTON "OK", IDC_OK, 150, 190, 50, 14, WS_TABSTOP
     PUSHBUTTON "Îòìåíà", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP
 END
 
@@ -192,7 +192,7 @@
 BEGIN
     EDITTEXT IDC_PORT_VAL, 5, 30, 70, 12, WS_TABSTOP | ES_NUMBER
     LTEXT "", IDC_PORT_DESC, 5, 15, 40, 12
-    PUSHBUTTON "OK", IDOK, 120, 15, 50, 14, WS_TABSTOP
+    PUSHBUTTON "OK", IDC_OK, 120, 15, 50, 14, WS_TABSTOP
     PUSHBUTTON "Îòìåíà", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP
 END
 

Modified: trunk/reactos/dll/win32/netcfgx/lang/sk-SK.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/sk-…
==============================================================================
--- trunk/reactos/dll/win32/netcfgx/lang/sk-SK.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netcfgx/lang/sk-SK.rc [iso-8859-1] Sat Oct 11 07:38:03 2008
@@ -117,7 +117,7 @@
     LTEXT "IP address:", -1, 5, 15, 70, 12
     LTEXT "Subnet mask:", -1, 5, 30, 70, 12
     CONTROL "",IDC_SUBNETMASK,"SysIPAddress32", WS_TABSTOP, 100, 30,
80, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -131,7 +131,7 @@
     CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12,
BS_AUTOCHECKBOX | WS_TABSTOP
     LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
     EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
-    PUSHBUTTON "", IDOK, 50, 60, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
 END
 
@@ -142,7 +142,7 @@
 BEGIN
     CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 5, 25, 80, 12
     LTEXT "DNS server:", -1, 5, 10, 120, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -153,7 +153,7 @@
 BEGIN
     EDITTEXT IDC_SUFFIX, 5, 25, 190, 12, WS_TABSTOP
     LTEXT "Domain suffix:", -1, 5, 10, 120, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -181,7 +181,7 @@
     CONTROL "", IDC_IP_LIST, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 211, 62,
72, 75
     PUSHBUTTON "Add", IDC_IP_ADD, 215, 141, 50, 14, WS_TABSTOP
     PUSHBUTTON "Remove", IDC_IP_DEL, 215, 161, 50, 14, WS_TABSTOP
-    PUSHBUTTON "OK", IDOK, 150, 190, 50, 14, WS_TABSTOP
+    PUSHBUTTON "OK", IDC_OK, 150, 190, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP
 END
 
@@ -192,7 +192,7 @@
 BEGIN
     EDITTEXT IDC_PORT_VAL, 5, 30, 70, 12, WS_TABSTOP | ES_NUMBER
     LTEXT "", IDC_PORT_DESC, 5, 15, 40, 12
-    PUSHBUTTON "OK", IDOK, 120, 15, 50, 14, WS_TABSTOP
+    PUSHBUTTON "OK", IDC_OK, 120, 15, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP
 END
 

Modified: trunk/reactos/dll/win32/netcfgx/lang/sv-SE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/sv-…
==============================================================================
--- trunk/reactos/dll/win32/netcfgx/lang/sv-SE.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netcfgx/lang/sv-SE.rc [iso-8859-1] Sat Oct 11 07:38:03 2008
@@ -118,7 +118,7 @@
     LTEXT "IP address:", -1, 5, 15, 70, 12
     LTEXT "Subnet mask:", -1, 5, 30, 70, 12
     CONTROL "",IDC_SUBNETMASK,"SysIPAddress32", WS_TABSTOP, 100, 30,
80, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -132,7 +132,7 @@
     CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12,
BS_AUTOCHECKBOX | WS_TABSTOP
     LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
     EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
-    PUSHBUTTON "", IDOK, 50, 60, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
 END
 
@@ -143,7 +143,7 @@
 BEGIN
     CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 5, 25, 80, 12
     LTEXT "DNS server:", -1, 5, 10, 120, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -154,7 +154,7 @@
 BEGIN
     EDITTEXT IDC_SUFFIX, 5, 25, 190, 12, WS_TABSTOP
     LTEXT "Domain suffix:", -1, 5, 10, 120, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -182,7 +182,7 @@
     CONTROL "", IDC_IP_LIST, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 211, 62,
72, 75
     PUSHBUTTON "Add", IDC_IP_ADD, 215, 141, 50, 14, WS_TABSTOP
     PUSHBUTTON "Remove", IDC_IP_DEL, 215, 161, 50, 14, WS_TABSTOP
-    PUSHBUTTON "OK", IDOK, 150, 190, 50, 14, WS_TABSTOP
+    PUSHBUTTON "OK", IDC_OK, 150, 190, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP
 END
 
@@ -193,7 +193,7 @@
 BEGIN
     EDITTEXT IDC_PORT_VAL, 5, 30, 70, 12, WS_TABSTOP | ES_NUMBER
     LTEXT "", IDC_PORT_DESC, 5, 15, 40, 12
-    PUSHBUTTON "OK", IDOK, 120, 15, 50, 14, WS_TABSTOP
+    PUSHBUTTON "OK", IDC_OK, 120, 15, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP
 END
 

Modified: trunk/reactos/dll/win32/netcfgx/lang/uk-UA.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/uk-…
==============================================================================
--- trunk/reactos/dll/win32/netcfgx/lang/uk-UA.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netcfgx/lang/uk-UA.rc [iso-8859-1] Sat Oct 11 07:38:03 2008
@@ -117,7 +117,7 @@
     LTEXT "IP address:", -1, 5, 15, 70, 12
     LTEXT "Subnet mask:", -1, 5, 30, 70, 12
     CONTROL "",IDC_SUBNETMASK,"SysIPAddress32", WS_TABSTOP, 100, 30,
80, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -131,7 +131,7 @@
     CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12,
BS_AUTOCHECKBOX | WS_TABSTOP
     LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
     EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
-    PUSHBUTTON "", IDOK, 50, 60, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
 END
 
@@ -142,7 +142,7 @@
 BEGIN
     CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 5, 25, 80, 12
     LTEXT "DNS server:", -1, 5, 10, 120, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -153,7 +153,7 @@
 BEGIN
     EDITTEXT IDC_SUFFIX, 5, 25, 190, 12, WS_TABSTOP
     LTEXT "Domain suffix:", -1, 5, 10, 120, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -181,7 +181,7 @@
     CONTROL "", IDC_IP_LIST, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 211, 62,
72, 75
     PUSHBUTTON "Add", IDC_IP_ADD, 215, 141, 50, 14, WS_TABSTOP
     PUSHBUTTON "Remove", IDC_IP_DEL, 215, 161, 50, 14, WS_TABSTOP
-    PUSHBUTTON "OK", IDOK, 150, 190, 50, 14, WS_TABSTOP
+    PUSHBUTTON "OK", IDC_OK, 150, 190, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP
 END
 
@@ -192,7 +192,7 @@
 BEGIN
     EDITTEXT IDC_PORT_VAL, 5, 30, 70, 12, WS_TABSTOP | ES_NUMBER
     LTEXT "", IDC_PORT_DESC, 5, 15, 40, 12
-    PUSHBUTTON "OK", IDOK, 120, 15, 50, 14, WS_TABSTOP
+    PUSHBUTTON "OK", IDC_OK, 120, 15, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP
 END
 

Modified: trunk/reactos/dll/win32/netcfgx/lang/zh-CN.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/zh-…
==============================================================================
--- trunk/reactos/dll/win32/netcfgx/lang/zh-CN.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netcfgx/lang/zh-CN.rc [iso-8859-1] Sat Oct 11 07:38:03 2008
@@ -117,7 +117,7 @@
     LTEXT "IP address:", -1, 5, 15, 70, 12
     LTEXT "Subnet mask:", -1, 5, 30, 70, 12
     CONTROL "",IDC_SUBNETMASK,"SysIPAddress32", WS_TABSTOP, 100, 30,
80, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -131,7 +131,7 @@
     CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12,
BS_AUTOCHECKBOX | WS_TABSTOP
     LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
     EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
-    PUSHBUTTON "", IDOK, 50, 60, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
 END
 
@@ -142,7 +142,7 @@
 BEGIN
     CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 5, 25, 80, 12
     LTEXT "DNS server:", -1, 5, 10, 120, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -153,7 +153,7 @@
 BEGIN
     EDITTEXT IDC_SUFFIX, 5, 25, 190, 12, WS_TABSTOP
     LTEXT "Domain suffix:", -1, 5, 10, 120, 12
-    PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP
+    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -181,7 +181,7 @@
     CONTROL "", IDC_IP_LIST, "SysListView32", LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 211, 62,
72, 75
     PUSHBUTTON "Add", IDC_IP_ADD, 215, 141, 50, 14, WS_TABSTOP
     PUSHBUTTON "Remove", IDC_IP_DEL, 215, 161, 50, 14, WS_TABSTOP
-    PUSHBUTTON "OK", IDOK, 150, 190, 50, 14, WS_TABSTOP
+    PUSHBUTTON "OK", IDC_OK, 150, 190, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP
 END
 
@@ -192,7 +192,7 @@
 BEGIN
     EDITTEXT IDC_PORT_VAL, 5, 30, 70, 12, WS_TABSTOP | ES_NUMBER
     LTEXT "", IDC_PORT_DESC, 5, 15, 40, 12
-    PUSHBUTTON "OK", IDOK, 120, 15, 50, 14, WS_TABSTOP
+    PUSHBUTTON "OK", IDC_OK, 120, 15, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP
 END
 

Modified: trunk/reactos/dll/win32/netcfgx/netcfg_iface.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/netcfg_i…
==============================================================================
--- trunk/reactos/dll/win32/netcfgx/netcfg_iface.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netcfgx/netcfg_iface.c [iso-8859-1] Sat Oct 11 07:38:03 2008
@@ -681,7 +681,4 @@
 
     INetCfg_Release((INetCfg*)This);
     return S_OK;
-
-
-    return S_OK;
-}
+}

Modified: trunk/reactos/dll/win32/netcfgx/resource.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/resource…
==============================================================================
--- trunk/reactos/dll/win32/netcfgx/resource.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netcfgx/resource.h [iso-8859-1] Sat Oct 11 07:38:03 2008
@@ -39,6 +39,7 @@
 #define IDC_METRIC          2009
 #define IDC_METRICTXT       2010
 #define IDC_USEMETRIC       2011
+#define IDC_OK              2012
 
 #define IDC_DNSADDRLIST     3000
 #define IDC_DNSADDRUP       3001

Modified: trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/tcpipcon…
==============================================================================
--- trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c [iso-8859-1] Sat Oct 11 07:38:03
2008
@@ -179,7 +179,7 @@
                 EndDialog(hwndDlg, FALSE);
                 break;
             }
-            else if (LOWORD(wParam) == IDOK)
+            else if (LOWORD(wParam) == IDC_OK)
             {
                 pPort = (TcpipPortSettings*)GetWindowLongPtr(hwndDlg, DWLP_USER);
                 Num = GetDlgItemInt(hwndDlg, IDC_PORT_VAL, NULL, TRUE);
@@ -225,7 +225,7 @@
     LPWSTR pCur;
     INT iItem;
 
-    if (!_wtoi(pData))
+    if (!pData || !_wtoi(pData))
     {
         SendDlgItemMessageW(hwndDlg, AllowButton, BM_SETCHECK, BST_CHECKED, 0);
         EnableWindow(GetDlgItem(hwndDlg, AddButton), FALSE);
@@ -453,15 +453,18 @@
             }
             switch(LOWORD(wParam))
             {
-                case IDOK:
+                case IDC_OK:
                     pContext = (TcpipConfNotifyImpl*)GetWindowLongPtr(hwndDlg,
DWLP_USER);
                     pFilter = StoreTcpipFilterSettings(hwndDlg);
                     if (pFilter)
                     {
-                       
CoTaskMemFree(pContext->pCurrentConfig->pFilter->szTCPAllowedPorts);
-                       
CoTaskMemFree(pContext->pCurrentConfig->pFilter->szUDPAllowedPorts);
-                       
CoTaskMemFree(pContext->pCurrentConfig->pFilter->szRawIPAllowedProtocols);
-                        CoTaskMemFree(pContext->pCurrentConfig->pFilter);
+                        if (pContext->pCurrentConfig->pFilter)
+                        {
+                           
CoTaskMemFree(pContext->pCurrentConfig->pFilter->szTCPAllowedPorts);
+                           
CoTaskMemFree(pContext->pCurrentConfig->pFilter->szUDPAllowedPorts);
+                           
CoTaskMemFree(pContext->pCurrentConfig->pFilter->szRawIPAllowedProtocols);
+                            CoTaskMemFree(pContext->pCurrentConfig->pFilter);
+                        }
                         pContext->pCurrentConfig->pFilter = pFilter;
                     }
                     EndDialog(hwndDlg, (INT_PTR)TRUE);
@@ -722,9 +725,9 @@
                 if (LoadStringW(netcfgx_hInstance, IDS_ADD, szBuffer,
sizeof(szBuffer)/sizeof(WCHAR)))
                 {
                     szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0';
-                    SendDlgItemMessageW(hwndDlg, IDOK, WM_SETTEXT, 0, (LPARAM)szBuffer);
-                }
-                EnableWindow(GetDlgItem(hwndDlg, IDOK), FALSE);
+                    SendDlgItemMessageW(hwndDlg, IDC_OK, WM_SETTEXT, 0,
(LPARAM)szBuffer);
+                }
+                EnableWindow(GetDlgItem(hwndDlg, IDC_OK), FALSE);
                 SendDlgItemMessageW(hwndDlg, IDC_USEMETRIC, BM_SETCHECK, BST_CHECKED,
0);
             }
             else
@@ -732,7 +735,7 @@
                 if (LoadStringW(netcfgx_hInstance, IDS_MOD, szBuffer,
sizeof(szBuffer)/sizeof(WCHAR)))
                 {
                     szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0';
-                    SendDlgItemMessageW(hwndDlg, IDOK, WM_SETTEXT, 0, (LPARAM)szBuffer);
+                    SendDlgItemMessageW(hwndDlg, IDC_OK, WM_SETTEXT, 0,
(LPARAM)szBuffer);
                 }
                 SendDlgItemMessageW(hwndDlg, IDC_IPADDR, WM_SETTEXT, 0,
(LPARAM)pGwSettings->szIP);
                 if (pGwSettings->Metric)
@@ -774,7 +777,7 @@
                 EndDialog(hwndDlg, FALSE);
                 break;
             }
-            else if (LOWORD(wParam) == IDOK)
+            else if (LOWORD(wParam) == IDC_OK)
             {
                 if (SendDlgItemMessageW(hwndDlg, IDC_IPADDR, IPM_GETADDRESS, 0,
(LPARAM)&dwIpAddr) == 4)
                 {
@@ -813,7 +816,7 @@
                 if (lpnmipa->hdr.idFrom == IDC_IPADDR)
                 {
                     if (SendDlgItemMessageW(hwndDlg, IDC_IPADDR, IPM_GETADDRESS, 0,
(LPARAM)&dwIpAddr) == 4)
-                        EnableWindow(GetDlgItem(hwndDlg, IDOK), TRUE);
+                        EnableWindow(GetDlgItem(hwndDlg, IDC_OK), TRUE);
                 }
             }
             break;
@@ -885,16 +888,16 @@
                 if (LoadStringW(netcfgx_hInstance, IDS_ADD, szBuffer,
sizeof(szBuffer)/sizeof(WCHAR)))
                 {
                     szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0';
-                    SendDlgItemMessageW(hwndDlg, IDOK, WM_SETTEXT, 0, (LPARAM)szBuffer);
-                }
-                EnableWindow(GetDlgItem(hwndDlg, IDOK), FALSE);
+                    SendDlgItemMessageW(hwndDlg, IDC_OK, WM_SETTEXT, 0,
(LPARAM)szBuffer);
+                }
+                EnableWindow(GetDlgItem(hwndDlg, IDC_OK), FALSE);
             }
             else
             {
                 if (LoadStringW(netcfgx_hInstance, IDS_MOD, szBuffer,
sizeof(szBuffer)/sizeof(WCHAR)))
                 {
                     szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0';
-                    SendDlgItemMessageW(hwndDlg, IDOK, WM_SETTEXT, 0, (LPARAM)szBuffer);
+                    SendDlgItemMessageW(hwndDlg, IDC_OK, WM_SETTEXT, 0,
(LPARAM)szBuffer);
                 }
                 SendDlgItemMessageW(hwndDlg, IDC_IPADDR, WM_SETTEXT, 0,
(LPARAM)pIpSettings->szIP);
                 SendDlgItemMessageW(hwndDlg, IDC_SUBNETMASK, WM_SETTEXT, 0,
(LPARAM)pIpSettings->szMask);
@@ -914,13 +917,13 @@
                             SendDlgItemMessageW(hwndDlg, IDC_SUBNETMASK, IPM_SETADDRESS,
0, (LPARAM)MAKEIPADDRESS(255, 255, 0, 0));
                         else if (dwIpAddr <= MAKEIPADDRESS(223, 255, 255, 255))
                             SendDlgItemMessageW(hwndDlg, IDC_SUBNETMASK, IPM_SETADDRESS,
0, (LPARAM)MAKEIPADDRESS(255, 255, 255, 0));
-                        EnableWindow(GetDlgItem(hwndDlg, IDOK), TRUE);
+                        EnableWindow(GetDlgItem(hwndDlg, IDC_OK), TRUE);
                      }
                 }
             }
             break;
         case WM_COMMAND:
-            if (LOWORD(wParam) == IDOK)
+            if (LOWORD(wParam) == IDC_OK)
             {
                 pIpSettings = (TcpipIpSettings*)GetWindowLongPtr(hwndDlg, DWLP_USER);
                 SendDlgItemMessageW(hwndDlg, IDC_IPADDR, WM_GETTEXT, 16,
(LPARAM)pIpSettings->szIP);
@@ -990,7 +993,7 @@
                 if (LoadStringW(netcfgx_hInstance, IDS_MOD, szBuffer,
sizeof(szBuffer)/sizeof(WCHAR)))
                 {
                     szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0';
-                    SendDlgItemMessageW(hwndDlg, IDOK, WM_SETTEXT, 0, (LPARAM)szBuffer);
+                    SendDlgItemMessageW(hwndDlg, IDC_OK, WM_SETTEXT, 0,
(LPARAM)szBuffer);
                 }
                 CoTaskMemFree(pSettings->Suffix);
                 pSettings->Suffix = NULL;
@@ -1000,7 +1003,7 @@
                 if (LoadStringW(netcfgx_hInstance, IDS_ADD, szBuffer,
sizeof(szBuffer)/sizeof(WCHAR)))
                 {
                     szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0';
-                    SendDlgItemMessageW(hwndDlg, IDOK, WM_SETTEXT, 0, (LPARAM)szBuffer);
+                    SendDlgItemMessageW(hwndDlg, IDC_OK, WM_SETTEXT, 0,
(LPARAM)szBuffer);
                 }
             }
             SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pSettings);
@@ -1011,7 +1014,7 @@
                EndDialog(hwndDlg, FALSE);
                break;
            }
-           else if (LOWORD(wParam) == IDOK)
+           else if (LOWORD(wParam) == IDC_OK)
            {
                lLength = SendDlgItemMessageW(hwndDlg, IDC_SUFFIX, WM_GETTEXTLENGTH, 0,
0);
                if (lLength)
@@ -1463,19 +1466,19 @@
                 if (LoadStringW(netcfgx_hInstance, IDS_MOD, szBuffer,
sizeof(szBuffer)/sizeof(WCHAR)))
                 {
                     szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0';
-                    SendDlgItemMessageW(hwndDlg, IDOK, WM_SETTEXT, 0, (LPARAM)szBuffer);
+                    SendDlgItemMessageW(hwndDlg, IDC_OK, WM_SETTEXT, 0,
(LPARAM)szBuffer);
                 }
                 SendDlgItemMessageW(hwndDlg, IDC_IPADDR, WM_SETTEXT, 0,
(LPARAM)pSettings->szIP);
-                EnableWindow(GetDlgItem(hwndDlg, IDOK), TRUE);
+                EnableWindow(GetDlgItem(hwndDlg, IDC_OK), TRUE);
             }
             else
             {
                 if (LoadStringW(netcfgx_hInstance, IDS_ADD, szBuffer,
sizeof(szBuffer)/sizeof(WCHAR)))
                 {
                     szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0';
-                    SendDlgItemMessageW(hwndDlg, IDOK, WM_SETTEXT, 0, (LPARAM)szBuffer);
-                }
-                EnableWindow(GetDlgItem(hwndDlg, IDOK), FALSE);
+                    SendDlgItemMessageW(hwndDlg, IDC_OK, WM_SETTEXT, 0,
(LPARAM)szBuffer);
+                }
+                EnableWindow(GetDlgItem(hwndDlg, IDC_OK), FALSE);
             }
             return TRUE;
         case WM_COMMAND:
@@ -1484,7 +1487,7 @@
                 EndDialog(hwndDlg, FALSE);
                 break;
             }
-            else if (LOWORD(wParam) == IDOK)
+            else if (LOWORD(wParam) == IDC_OK)
             {
                 pSettings = (TcpipDnsSettings*)GetWindowLongPtr(hwndDlg, DWLP_USER);
                 SendDlgItemMessageW(hwndDlg, IDC_IPADDR, WM_GETTEXT, 16,
(LPARAM)pSettings->szIP);
@@ -1511,7 +1514,7 @@
                 if (lpnmipa->hdr.idFrom == IDC_IPADDR)
                 {
                     if (SendDlgItemMessageW(hwndDlg, IDC_IPADDR, IPM_GETADDRESS, 0,
(LPARAM)&dwIpAddr) == 4)
-                        EnableWindow(GetDlgItem(hwndDlg, IDOK), TRUE);
+                        EnableWindow(GetDlgItem(hwndDlg, IDC_OK), TRUE);
                 }
             }
             break;
@@ -1544,7 +1547,8 @@
     }
     SendDlgItemMessageW(hwndDlg, IDC_DNSADDRLIST, LB_SETCURSEL, 0, 0);
 
-
+    if (!This->pCurrentConfig->pDNS)
+        return;
 
     if (This->pCurrentConfig->pDNS->RegisterAdapterName)
         SendDlgItemMessageW(hwndDlg, IDC_REGSUFFIX, BM_SETCHECK, BST_CHECKED, 0);
@@ -1563,6 +1567,8 @@
     if (!This->pCurrentConfig->pDNS->szSearchList ||
(wcslen(This->pCurrentConfig->pDNS->szSearchList) == 0))
     {
         SendDlgItemMessageW(hwndDlg, IDC_PRIMSUFFIX, BM_SETCHECK, BST_CHECKED, 0);
+        EnableWindow(GetDlgItem(hwndDlg, IDC_DNSSUFFIXADD), FALSE);
+
         return;
     }
 
@@ -2044,11 +2050,17 @@
 {
     PROPSHEETHEADERW pinfo;
     HPROPSHEETPAGE hppages[3];
-
+    WCHAR szBuffer[100];
 
     hppages[0] = InitializePropertySheetPage(MAKEINTRESOURCEW(IDD_TCPIP_ADVIP_DLG),
TcpipAdvancedIpDlg, (LPARAM)This, NULL);
     hppages[1] = InitializePropertySheetPage(MAKEINTRESOURCEW(IDD_TCPIP_ADVDNS_DLG),
TcpipAdvancedDnsDlg, (LPARAM)This, NULL);
     hppages[2] = InitializePropertySheetPage(MAKEINTRESOURCEW(IDD_TCPIP_ADVOPT_DLG),
TcpipAdvancedOptDlg, (LPARAM)This, NULL);
+
+
+    if (LoadStringW(netcfgx_hInstance, IDS_TCPIP, szBuffer,
sizeof(szBuffer)/sizeof(WCHAR)))
+        szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0';
+    else
+        szBuffer[0] = L'\0';
 
     ZeroMemory(&pinfo, sizeof(PROPSHEETHEADERW));
     pinfo.dwSize = sizeof(PROPSHEETHEADERW);
@@ -2056,6 +2068,7 @@
     pinfo.u3.phpage = hppages;
     pinfo.nPages = 3;
     pinfo.hwndParent = hDlg;
+    pinfo.pszCaption = szBuffer;
 
     StoreTcpipBasicSettings(hwndDlg, This, FALSE);
     PropertySheetW(&pinfo);
@@ -2303,9 +2316,9 @@
     }
     else
     {
+        SendDlgItemMessageW(hwndDlg, IDC_FIXEDDNS, BM_SETCHECK, BST_CHECKED, 0);
         if (pCurSettings->Ns)
         {
-            SendDlgItemMessageW(hwndDlg, IDC_FIXEDDNS, BM_SETCHECK, BST_CHECKED, 0);
             SendDlgItemMessageW(hwndDlg, IDC_DNS1, IPM_SETADDRESS, 0,
(LPARAM)pCurSettings->Ns->IpAddress);
             if (pCurSettings->Ns->Next)
             {
@@ -2488,6 +2501,7 @@
                             EnableWindow(GetDlgItem(hwndDlg, IDC_DNS1), TRUE);
                             EnableWindow(GetDlgItem(hwndDlg, IDC_DNS2), TRUE);
                         }
+                        break;
                     case IDC_ADVANCED:
                         LaunchAdvancedTcpipSettings(GetParent(hwndDlg), hwndDlg,
(TcpipConfNotifyImpl*)GetWindowLongPtr(hwndDlg, DWLP_USER));
                         break;
@@ -2603,7 +2617,6 @@
     return S_OK;
 }
 
-static
 HRESULT
 LoadDNSSettings(
     TcpipConfNotifyImpl * This)
@@ -2659,7 +2672,6 @@
     return S_OK;
 }
 
-static
 LPWSTR
 LoadTcpFilterSettingsFromRegistry(HKEY hKey, LPCWSTR szName, LPDWORD Size)
 {
@@ -2682,7 +2694,6 @@
     return pData;
 }
 
-static
 HRESULT
 LoadFilterSettings(
     TcpipConfNotifyImpl * This)
@@ -2719,8 +2730,9 @@
     swprintf(szBuffer,
L"SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters\\Interfaces\\%s",
pStr);
     CoTaskMemFree(pStr);
     if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szBuffer, 0, KEY_READ, &hKey) !=
ERROR_SUCCESS)
-        return E_FAIL;
-
+    {
+        return S_OK;
+    }
     pFilter->szTCPAllowedPorts = LoadTcpFilterSettingsFromRegistry(hKey,
L"TCPAllowedPorts", &pFilter->TCPSize);
     pFilter->szUDPAllowedPorts = LoadTcpFilterSettingsFromRegistry(hKey,
L"UDPAllowedPorts", &pFilter->UDPSize);
     pFilter->szRawIPAllowedProtocols = LoadTcpFilterSettingsFromRegistry(hKey,
L"RawIPAllowedProtocols", &pFilter->IPSize);
@@ -2796,33 +2808,17 @@
         return E_FAIL;
     }
 
-    if (GetPerAdapterInfo(pCurrentAdapter->Index, NULL, &uLength) !=
ERROR_BUFFER_OVERFLOW)
-        return E_FAIL;
-
-    pPerInfo = (PIP_PER_ADAPTER_INFO)CoTaskMemAlloc(uLength);
-    if (!pPerInfo)
-    {
-        CoTaskMemFree(pInfo);
-        return E_OUTOFMEMORY;
-    }
-
-    if (GetPerAdapterInfo(pCurrentAdapter->Index, pPerInfo, &uLength) != NOERROR)
-    {
-        CoTaskMemFree(pInfo);
-        CoTaskMemFree(pPerInfo);
-        return E_FAIL;
-    }
-
     pCurSettings = CoTaskMemAlloc(sizeof(TcpipSettings));
     if (!pCurSettings)
     {
         CoTaskMemFree(pInfo);
-        CoTaskMemFree(pPerInfo);
         return E_FAIL;
     }
 
     ZeroMemory(pCurSettings, sizeof(TcpipSettings));
     This->pCurrentConfig = pCurSettings;
+    pCurSettings->DhcpEnabled = pCurrentAdapter->DhcpEnabled;
+    pCurSettings->Index = pCurrentAdapter->Index;
 
     if (!pCurrentAdapter->DhcpEnabled)
     {
@@ -2830,14 +2826,23 @@
         CopyIpAddrString(&pCurrentAdapter->GatewayList, &pCurSettings->Gw,
METRIC, NULL); //FIXME
     }
 
-    if (!pPerInfo->AutoconfigActive)
-    {
-        CopyIpAddrString(&pPerInfo->DnsServerList, &pCurSettings->Ns,
IPADDR, NULL);
-    }
-
-    pCurSettings->AutoconfigActive = pPerInfo->AutoconfigActive;
-    pCurSettings->DhcpEnabled = pCurrentAdapter->DhcpEnabled;
-    pCurSettings->Index = pCurrentAdapter->Index;
+    if (GetPerAdapterInfo(pCurrentAdapter->Index, NULL, &uLength) ==
ERROR_BUFFER_OVERFLOW)
+    {
+        pPerInfo = (PIP_PER_ADAPTER_INFO)CoTaskMemAlloc(uLength);
+        if (pPerInfo)
+        {
+            if (GetPerAdapterInfo(pCurrentAdapter->Index, pPerInfo, &uLength) ==
NOERROR)
+            {
+                if (!pPerInfo->AutoconfigActive)
+                {
+                    CopyIpAddrString(&pPerInfo->DnsServerList,
&pCurSettings->Ns, IPADDR, NULL);
+                }
+                pCurSettings->AutoconfigActive = pPerInfo->AutoconfigActive;
+            }
+            CoTaskMemFree(pInfo);
+        }
+    }
+
 
     if (FAILED(LoadFilterSettings(This)))
         return E_FAIL;
@@ -2846,7 +2851,6 @@
         return E_FAIL;
 
     CoTaskMemFree(pInfo);
-    CoTaskMemFree(pPerInfo);
 
     return S_OK;
 }
@@ -3088,15 +3092,19 @@
     //MessageBoxW(NULL, L"INetCfgComponentControl_fnApplyRegistryChanges",
NULL, MB_OK);
 
 
-    if (RegOpenKeyExW(hKey,
L"SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters", 0, KEY_WRITE,
&hKey) == ERROR_SUCCESS)
-    {
-        RegSetValueExW(hKey, L"UseDomainNameDevolution", 0, REG_DWORD,
(LPBYTE)&This->pCurrentConfig->pDNS->UseDomainNameDevolution,
sizeof(DWORD));
-        RegSetValueExW(hKey, L"SearchList", 0, REG_SZ,
(LPBYTE)This->pCurrentConfig->pDNS->szSearchList,
+    if (RegCreateKeyExW(hKey,
L"SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters", 0, NULL, 0,
KEY_WRITE, NULL, &hKey, NULL) == ERROR_SUCCESS)
+    {
+        if (This->pCurrentConfig->pDNS)
+        {
+            RegSetValueExW(hKey, L"UseDomainNameDevolution", 0, REG_DWORD,
(LPBYTE)&This->pCurrentConfig->pDNS->UseDomainNameDevolution,
sizeof(DWORD));
+            RegSetValueExW(hKey, L"SearchList", 0, REG_SZ,
(LPBYTE)This->pCurrentConfig->pDNS->szSearchList,
                        (wcslen(This->pCurrentConfig->pDNS->szSearchList)+1) *
sizeof(WCHAR));
-
-        RegSetValueExW(hKey, L"EnableSecurityFilters", 0, REG_DWORD, 
+        }
+        if (This->pCurrentConfig->pFilter)
+        {
+            RegSetValueExW(hKey, L"EnableSecurityFilters", 0, REG_DWORD, 
                      
(LPBYTE)&This->pCurrentConfig->pFilter->EnableSecurityFilters,
sizeof(DWORD));
-
+        }
         RegCloseKey(hKey);
     }
 
@@ -3106,24 +3114,30 @@
     swprintf(szBuffer,
L"SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters\\Interfaces\\%s",
pStr);
     CoTaskMemFree(pStr);
 
-    if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szBuffer, 0, KEY_WRITE, &hKey) ==
ERROR_SUCCESS)
-    {
-        RegSetValueExW(hKey, L"RegisterAdapterName", 0, REG_DWORD,
(LPBYTE)&This->pCurrentConfig->pDNS->RegisterAdapterName, sizeof(DWORD));
-        RegSetValueExW(hKey, L"RegistrationEnabled", 0, REG_DWORD,
(LPBYTE)&This->pCurrentConfig->pDNS->RegistrationEnabled, sizeof(DWORD));
-        RegSetValueExW(hKey, L"Domain", 0, REG_SZ,
(LPBYTE)This->pCurrentConfig->pDNS->szDomain,
+    if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, szBuffer, 0, NULL, 0, KEY_WRITE, NULL,
&hKey, NULL) == ERROR_SUCCESS)
+    {
+        if (This->pCurrentConfig->pDNS)
+        {
+            RegSetValueExW(hKey, L"RegisterAdapterName", 0, REG_DWORD,
(LPBYTE)&This->pCurrentConfig->pDNS->RegisterAdapterName, sizeof(DWORD));
+            RegSetValueExW(hKey, L"RegistrationEnabled", 0, REG_DWORD,
(LPBYTE)&This->pCurrentConfig->pDNS->RegistrationEnabled, sizeof(DWORD));
+            RegSetValueExW(hKey, L"Domain", 0, REG_SZ,
(LPBYTE)This->pCurrentConfig->pDNS->szDomain,
                        (wcslen(This->pCurrentConfig->pDNS->szDomain)+1) *
sizeof(WCHAR));
-
-        RegSetValueExW(hKey, L"TCPAllowedPorts", 0, REG_MULTI_SZ, 
+        }
+
+        if (This->pCurrentConfig->pFilter)
+        {
+            RegSetValueExW(hKey, L"TCPAllowedPorts", 0, REG_MULTI_SZ, 
                       
(LPBYTE)This->pCurrentConfig->pFilter->szTCPAllowedPorts,
                         This->pCurrentConfig->pFilter->TCPSize);
 
-        RegSetValueExW(hKey, L"UDPAllowedPorts", 0, REG_MULTI_SZ, 
+            RegSetValueExW(hKey, L"UDPAllowedPorts", 0, REG_MULTI_SZ, 
                       
(LPBYTE)This->pCurrentConfig->pFilter->szUDPAllowedPorts,
                         This->pCurrentConfig->pFilter->UDPSize);
 
-        RegSetValueExW(hKey, L"RawIPAllowedProtocols", 0, REG_MULTI_SZ, 
+            RegSetValueExW(hKey, L"RawIPAllowedProtocols", 0, REG_MULTI_SZ, 
                       
(LPBYTE)This->pCurrentConfig->pFilter->szRawIPAllowedProtocols,
                         This->pCurrentConfig->pFilter->IPSize);
+        }
 
         RegSetValueExW(hKey, L"EnableDHCP", 0, REG_DWORD,
(LPBYTE)&This->pCurrentConfig->DhcpEnabled, sizeof(DWORD));
         if (This->pCurrentConfig->DhcpEnabled)