diff --git a/reactos/dll/win32/netcfgx/inetcfgcomp_iface.c b/reactos/dll/win32/netcfgx/inetcfgcomp_iface.c
index 2a9fa9b3fb4..738558a38a3 100644
--- a/reactos/dll/win32/netcfgx/inetcfgcomp_iface.c
+++ b/reactos/dll/win32/netcfgx/inetcfgcomp_iface.c
@@ -7,6 +7,7 @@ typedef struct
     LONG  ref;
     NetCfgComponentItem * pItem;
     INetCfgComponentPropertyUi * pProperty;
+    INetCfgComponentControl * pNCCC;
     INetCfg * pNCfg;
 }INetCfgComponentImpl;
 
@@ -324,8 +325,7 @@ HRESULT
 CreateNotificationObject(
     INetCfgComponentImpl * This,
     INetCfgComponent * iface,
-    IUnknown  *pUnk,
-    INetCfgComponentPropertyUi ** pOut)
+    IUnknown  *pUnk)
 {
     WCHAR szName[150];
     HKEY hKey;
@@ -419,7 +419,9 @@ CreateNotificationObject(
         INetCfgComponentPropertyUi_Release(pNCCPU);
         return hr;
     }
-    *pOut = pNCCPU;
+    This->pProperty = pNCCPU;
+    This->pNCCC = pNCCC;
+
     return S_OK;
 }
 
@@ -441,7 +443,7 @@ INetCfgComponent_fnRaisePropertyUi(
 
     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 @@ INetCfgComponent_fnRaisePropertyUi(
 
     dwDefPages = 0;
     Pages = 0;
+
     hr = INetCfgComponentPropertyUi_MergePropPages(This->pProperty, &dwDefPages, (BYTE**)&hppages, &Pages, hwndParent, NULL);
     if (FAILED(hr) || !Pages)
     {
@@ -464,15 +467,18 @@ INetCfgComponent_fnRaisePropertyUi(
     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_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv, N
 
     INetCfgComponent_Release((INetCfgComponent*)This);
     return S_OK;
-
-
-    return S_OK;
 }
 
 
diff --git a/reactos/dll/win32/netcfgx/lang/bg-BG.rc b/reactos/dll/win32/netcfgx/lang/bg-BG.rc
index 16f891982c6..b5a971585a0 100644
--- a/reactos/dll/win32/netcfgx/lang/bg-BG.rc
+++ b/reactos/dll/win32/netcfgx/lang/bg-BG.rc
@@ -118,7 +118,7 @@ BEGIN
     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 @@ BEGIN
     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 @@ FONT 8, "MS Shell Dlg"
 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 @@ FONT 8, "MS Shell Dlg"
 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 @@ BEGIN
     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 @@ FONT 8, "MS Shell Dlg"
 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
 
diff --git a/reactos/dll/win32/netcfgx/lang/cs-CZ.rc b/reactos/dll/win32/netcfgx/lang/cs-CZ.rc
index bb7349854ca..6f5733cbe5b 100644
--- a/reactos/dll/win32/netcfgx/lang/cs-CZ.rc
+++ b/reactos/dll/win32/netcfgx/lang/cs-CZ.rc
@@ -118,7 +118,7 @@ BEGIN
     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 @@ BEGIN
     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 @@ FONT 8, "MS Shell Dlg"
 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 @@ FONT 8, "MS Shell Dlg"
 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 @@ BEGIN
     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 @@ FONT 8, "MS Shell Dlg"
 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
 
diff --git a/reactos/dll/win32/netcfgx/lang/da-DK.rc b/reactos/dll/win32/netcfgx/lang/da-DK.rc
index 24570c2261a..042695ab697 100644
--- a/reactos/dll/win32/netcfgx/lang/da-DK.rc
+++ b/reactos/dll/win32/netcfgx/lang/da-DK.rc
@@ -117,7 +117,7 @@ BEGIN
     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 @@ BEGIN
     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 @@ FONT 8, "MS Shell Dlg"
 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 @@ FONT 8, "MS Shell Dlg"
 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 @@ BEGIN
     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 @@ FONT 8, "MS Shell Dlg"
 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
 
diff --git a/reactos/dll/win32/netcfgx/lang/de-DE.rc b/reactos/dll/win32/netcfgx/lang/de-DE.rc
index 22eef1b6170..f0a31d0b450 100644
--- a/reactos/dll/win32/netcfgx/lang/de-DE.rc
+++ b/reactos/dll/win32/netcfgx/lang/de-DE.rc
@@ -117,7 +117,7 @@ BEGIN
     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 @@ BEGIN
     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 @@ FONT 8, "MS Shell Dlg"
 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 @@ FONT 8, "MS Shell Dlg"
 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 @@ BEGIN
     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 @@ FONT 8, "MS Shell Dlg"
 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
 
diff --git a/reactos/dll/win32/netcfgx/lang/el-GR.rc b/reactos/dll/win32/netcfgx/lang/el-GR.rc
index e2be553adf7..629f28098ea 100644
--- a/reactos/dll/win32/netcfgx/lang/el-GR.rc
+++ b/reactos/dll/win32/netcfgx/lang/el-GR.rc
@@ -117,7 +117,7 @@ BEGIN
     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 @@ BEGIN
     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 @@ FONT 8, "MS Shell Dlg"
 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 @@ FONT 8, "MS Shell Dlg"
 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 @@ BEGIN
     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 @@ FONT 8, "MS Shell Dlg"
 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
 
diff --git a/reactos/dll/win32/netcfgx/lang/en-US.rc b/reactos/dll/win32/netcfgx/lang/en-US.rc
index 55d2b2b0d33..628765fc86f 100644
--- a/reactos/dll/win32/netcfgx/lang/en-US.rc
+++ b/reactos/dll/win32/netcfgx/lang/en-US.rc
@@ -117,7 +117,7 @@ BEGIN
     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 @@ BEGIN
     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 @@ FONT 8, "MS Shell Dlg"
 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 @@ FONT 8, "MS Shell Dlg"
 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 @@ BEGIN
     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 @@ FONT 8, "MS Shell Dlg"
 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
 
diff --git a/reactos/dll/win32/netcfgx/lang/es-ES.rc b/reactos/dll/win32/netcfgx/lang/es-ES.rc
index fae04dafee0..1b2f132381e 100644
--- a/reactos/dll/win32/netcfgx/lang/es-ES.rc
+++ b/reactos/dll/win32/netcfgx/lang/es-ES.rc
@@ -117,7 +117,7 @@ BEGIN
     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 @@ BEGIN
     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 @@ FONT 8, "MS Shell Dlg"
 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 @@ FONT 8, "MS Shell Dlg"
 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 @@ BEGIN
     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 @@ FONT 8, "MS Shell Dlg"
 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
 
diff --git a/reactos/dll/win32/netcfgx/lang/fr-FR.rc b/reactos/dll/win32/netcfgx/lang/fr-FR.rc
index 3e4af17412b..fdc5fb1cb12 100644
--- a/reactos/dll/win32/netcfgx/lang/fr-FR.rc
+++ b/reactos/dll/win32/netcfgx/lang/fr-FR.rc
@@ -117,7 +117,7 @@ BEGIN
     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 @@ BEGIN
     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 @@ FONT 8, "MS Shell Dlg"
 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 @@ FONT 8, "MS Shell Dlg"
 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 @@ BEGIN
     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 @@ FONT 8, "MS Shell Dlg"
 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
 
diff --git a/reactos/dll/win32/netcfgx/lang/hu-HU.rc b/reactos/dll/win32/netcfgx/lang/hu-HU.rc
index 1d98f75387e..57c2c773665 100644
--- a/reactos/dll/win32/netcfgx/lang/hu-HU.rc
+++ b/reactos/dll/win32/netcfgx/lang/hu-HU.rc
@@ -117,7 +117,7 @@ BEGIN
     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 @@ BEGIN
     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 @@ FONT 8, "MS Shell Dlg"
 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 @@ FONT 8, "MS Shell Dlg"
 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 @@ BEGIN
     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 @@ FONT 8, "MS Shell Dlg"
 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
 
diff --git a/reactos/dll/win32/netcfgx/lang/id-ID.rc b/reactos/dll/win32/netcfgx/lang/id-ID.rc
index 931f979b8ad..53a1998ec1d 100644
--- a/reactos/dll/win32/netcfgx/lang/id-ID.rc
+++ b/reactos/dll/win32/netcfgx/lang/id-ID.rc
@@ -117,7 +117,7 @@ BEGIN
     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 @@ BEGIN
     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 @@ FONT 8, "MS Shell Dlg"
 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 @@ FONT 8, "MS Shell Dlg"
 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 @@ BEGIN
     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 @@ FONT 8, "MS Shell Dlg"
 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
 
diff --git a/reactos/dll/win32/netcfgx/lang/it-IT.rc b/reactos/dll/win32/netcfgx/lang/it-IT.rc
index 15e0cde4c30..63ba6187772 100644
--- a/reactos/dll/win32/netcfgx/lang/it-IT.rc
+++ b/reactos/dll/win32/netcfgx/lang/it-IT.rc
@@ -117,7 +117,7 @@ BEGIN
     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 @@ BEGIN
     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 @@ FONT 8, "MS Shell Dlg"
 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 @@ FONT 8, "MS Shell Dlg"
 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 @@ BEGIN
     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 @@ FONT 8, "MS Shell Dlg"
 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
 
diff --git a/reactos/dll/win32/netcfgx/lang/ja-JP.rc b/reactos/dll/win32/netcfgx/lang/ja-JP.rc
index 2866ccc6e5f..f171efdbf1a 100644
--- a/reactos/dll/win32/netcfgx/lang/ja-JP.rc
+++ b/reactos/dll/win32/netcfgx/lang/ja-JP.rc
@@ -117,7 +117,7 @@ BEGIN
     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 @@ BEGIN
     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 @@ FONT 8, "MS Shell Dlg"
 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 @@ FONT 8, "MS Shell Dlg"
 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 @@ BEGIN
     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 @@ FONT 8, "MS Shell Dlg"
 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
 
diff --git a/reactos/dll/win32/netcfgx/lang/nl-NL.rc b/reactos/dll/win32/netcfgx/lang/nl-NL.rc
index 5f48ef2cba1..2d502038f82 100644
--- a/reactos/dll/win32/netcfgx/lang/nl-NL.rc
+++ b/reactos/dll/win32/netcfgx/lang/nl-NL.rc
@@ -117,7 +117,7 @@ BEGIN
     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 @@ BEGIN
     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 @@ FONT 8, "MS Shell Dlg"
 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 @@ FONT 8, "MS Shell Dlg"
 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 @@ BEGIN
     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 @@ FONT 8, "MS Shell Dlg"
 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
 
diff --git a/reactos/dll/win32/netcfgx/lang/no-NO.rc b/reactos/dll/win32/netcfgx/lang/no-NO.rc
index e56143f98fe..304e3772c8a 100644
--- a/reactos/dll/win32/netcfgx/lang/no-NO.rc
+++ b/reactos/dll/win32/netcfgx/lang/no-NO.rc
@@ -117,7 +117,7 @@ BEGIN
     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 @@ BEGIN
     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 @@ FONT 8, "MS Shell Dlg"
 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 @@ FONT 8, "MS Shell Dlg"
 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 @@ BEGIN
     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 @@ FONT 8, "MS Shell Dlg"
 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
 
diff --git a/reactos/dll/win32/netcfgx/lang/pl-PL.rc b/reactos/dll/win32/netcfgx/lang/pl-PL.rc
index 213fc882cf8..9040297102b 100644
--- a/reactos/dll/win32/netcfgx/lang/pl-PL.rc
+++ b/reactos/dll/win32/netcfgx/lang/pl-PL.rc
@@ -117,7 +117,7 @@ BEGIN
     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 @@ BEGIN
     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 @@ FONT 8, "MS Shell Dlg"
 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 @@ FONT 8, "MS Shell Dlg"
 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 @@ BEGIN
     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 @@ FONT 8, "MS Shell Dlg"
 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
 
diff --git a/reactos/dll/win32/netcfgx/lang/ru-RU.rc b/reactos/dll/win32/netcfgx/lang/ru-RU.rc
index d784b8a10b2..54e3223938c 100644
--- a/reactos/dll/win32/netcfgx/lang/ru-RU.rc
+++ b/reactos/dll/win32/netcfgx/lang/ru-RU.rc
@@ -117,7 +117,7 @@ BEGIN
     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 @@ BEGIN
     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 @@ FONT 8, "MS Shell Dlg"
 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 @@ FONT 8, "MS Shell Dlg"
 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 @@ BEGIN
     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 @@ FONT 8, "MS Shell Dlg"
 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
 
diff --git a/reactos/dll/win32/netcfgx/lang/sk-SK.rc b/reactos/dll/win32/netcfgx/lang/sk-SK.rc
index 0fc45b3ac05..a84a8065dbd 100644
--- a/reactos/dll/win32/netcfgx/lang/sk-SK.rc
+++ b/reactos/dll/win32/netcfgx/lang/sk-SK.rc
@@ -117,7 +117,7 @@ BEGIN
     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 @@ BEGIN
     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 @@ FONT 8, "MS Shell Dlg"
 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 @@ FONT 8, "MS Shell Dlg"
 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 @@ BEGIN
     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 @@ FONT 8, "MS Shell Dlg"
 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
 
diff --git a/reactos/dll/win32/netcfgx/lang/sv-SE.rc b/reactos/dll/win32/netcfgx/lang/sv-SE.rc
index e7c28e305ba..6fceb2a47b9 100644
--- a/reactos/dll/win32/netcfgx/lang/sv-SE.rc
+++ b/reactos/dll/win32/netcfgx/lang/sv-SE.rc
@@ -118,7 +118,7 @@ BEGIN
     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 @@ BEGIN
     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 @@ FONT 8, "MS Shell Dlg"
 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 @@ FONT 8, "MS Shell Dlg"
 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 @@ BEGIN
     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 @@ FONT 8, "MS Shell Dlg"
 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
 
diff --git a/reactos/dll/win32/netcfgx/lang/uk-UA.rc b/reactos/dll/win32/netcfgx/lang/uk-UA.rc
index 3424fc73cb9..19675b11c2b 100644
--- a/reactos/dll/win32/netcfgx/lang/uk-UA.rc
+++ b/reactos/dll/win32/netcfgx/lang/uk-UA.rc
@@ -117,7 +117,7 @@ BEGIN
     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 @@ BEGIN
     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 @@ FONT 8, "MS Shell Dlg"
 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 @@ FONT 8, "MS Shell Dlg"
 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 @@ BEGIN
     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 @@ FONT 8, "MS Shell Dlg"
 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
 
diff --git a/reactos/dll/win32/netcfgx/lang/zh-CN.rc b/reactos/dll/win32/netcfgx/lang/zh-CN.rc
index ec285a0bdc8..4231b824c69 100644
--- a/reactos/dll/win32/netcfgx/lang/zh-CN.rc
+++ b/reactos/dll/win32/netcfgx/lang/zh-CN.rc
@@ -117,7 +117,7 @@ BEGIN
     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 @@ BEGIN
     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 @@ FONT 8, "MS Shell Dlg"
 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 @@ FONT 8, "MS Shell Dlg"
 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 @@ BEGIN
     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 @@ FONT 8, "MS Shell Dlg"
 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
 
diff --git a/reactos/dll/win32/netcfgx/netcfg_iface.c b/reactos/dll/win32/netcfgx/netcfg_iface.c
index fc5bce3d8f3..c7412c68bea 100644
--- a/reactos/dll/win32/netcfgx/netcfg_iface.c
+++ b/reactos/dll/win32/netcfgx/netcfg_iface.c
@@ -681,7 +681,4 @@ HRESULT WINAPI INetCfg_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID *
 
     INetCfg_Release((INetCfg*)This);
     return S_OK;
-
-
-    return S_OK;
 }
diff --git a/reactos/dll/win32/netcfgx/resource.h b/reactos/dll/win32/netcfgx/resource.h
index e98cc332f84..ebab5b8ffe1 100644
--- a/reactos/dll/win32/netcfgx/resource.h
+++ b/reactos/dll/win32/netcfgx/resource.h
@@ -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
diff --git a/reactos/dll/win32/netcfgx/tcpipconf_notify.c b/reactos/dll/win32/netcfgx/tcpipconf_notify.c
index 1f3fbb05f2e..024e03f4001 100644
--- a/reactos/dll/win32/netcfgx/tcpipconf_notify.c
+++ b/reactos/dll/win32/netcfgx/tcpipconf_notify.c
@@ -179,7 +179,7 @@ TcpipFilterPortDlg(
                 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 @@ InitFilterListBox(LPWSTR pData, HWND hwndDlg, HWND hDlgCtrl, UINT AllowButton, U
     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 @@ TcpipFilterSettingsDlg(
             }
             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 @@ TcpipAdvGwDlg(
                 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);
                 }
-                EnableWindow(GetDlgItem(hwndDlg, IDOK), FALSE);
+                EnableWindow(GetDlgItem(hwndDlg, IDC_OK), FALSE);
                 SendDlgItemMessageW(hwndDlg, IDC_USEMETRIC, BM_SETCHECK, BST_CHECKED, 0);
             }
             else
@@ -732,7 +735,7 @@ TcpipAdvGwDlg(
                 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 @@ TcpipAdvGwDlg(
                 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 @@ TcpipAdvGwDlg(
                 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 @@ TcpipAddIpDlg(
                 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);
                 }
-                EnableWindow(GetDlgItem(hwndDlg, IDOK), FALSE);
+                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 @@ TcpipAddIpDlg(
                             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 @@ TcpipAddSuffixDlg(
                 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 @@ TcpipAddSuffixDlg(
                 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 @@ TcpipAddSuffixDlg(
                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 @@ TcpipAddDNSDlg(
                 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);
+                    SendDlgItemMessageW(hwndDlg, IDC_OK, WM_SETTEXT, 0, (LPARAM)szBuffer);
                 }
-                EnableWindow(GetDlgItem(hwndDlg, IDOK), FALSE);
+                EnableWindow(GetDlgItem(hwndDlg, IDC_OK), FALSE);
             }
             return TRUE;
         case WM_COMMAND:
@@ -1484,7 +1487,7 @@ TcpipAddDNSDlg(
                 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 @@ TcpipAddDNSDlg(
                 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 @@ InitializeTcpipAdvancedDNSDlg(
     }
     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 @@ InitializeTcpipAdvancedDNSDlg(
     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,18 +2050,25 @@ LaunchAdvancedTcpipSettings(
 {
     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);
     pinfo.dwFlags = PSH_NOCONTEXTHELP | PSH_PROPTITLE | PSH_NOAPPLYNOW;
     pinfo.u3.phpage = hppages;
     pinfo.nPages = 3;
     pinfo.hwndParent = hDlg;
+    pinfo.pszCaption = szBuffer;
 
     StoreTcpipBasicSettings(hwndDlg, This, FALSE);
     PropertySheetW(&pinfo);
@@ -2303,9 +2316,9 @@ InitializeTcpipBasicDlgCtrls(
     }
     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 @@ TcpipBasicDlg(
                             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 @@ INetCfgComponentPropertyUi_fnSetContext(
     return S_OK;
 }
 
-static
 HRESULT
 LoadDNSSettings(
     TcpipConfNotifyImpl * This)
@@ -2659,7 +2672,6 @@ LoadDNSSettings(
     return S_OK;
 }
 
-static
 LPWSTR
 LoadTcpFilterSettingsFromRegistry(HKEY hKey, LPCWSTR szName, LPDWORD Size)
 {
@@ -2682,7 +2694,6 @@ LoadTcpFilterSettingsFromRegistry(HKEY hKey, LPCWSTR szName, LPDWORD Size)
     return pData;
 }
 
-static
 HRESULT
 LoadFilterSettings(
     TcpipConfNotifyImpl * This)
@@ -2719,8 +2730,9 @@ LoadFilterSettings(
     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 @@ InitializeTcpipBasicDlg(TcpipConfNotifyImpl * This)
         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 @@ InitializeTcpipBasicDlg(TcpipConfNotifyImpl * This)
         CopyIpAddrString(&pCurrentAdapter->GatewayList, &pCurSettings->Gw, METRIC, NULL); //FIXME
     }
 
-    if (!pPerInfo->AutoconfigActive)
+    if (GetPerAdapterInfo(pCurrentAdapter->Index, NULL, &uLength) == ERROR_BUFFER_OVERFLOW)
     {
-        CopyIpAddrString(&pPerInfo->DnsServerList, &pCurSettings->Ns, IPADDR, NULL);
+        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);
+        }
     }
 
-    pCurSettings->AutoconfigActive = pPerInfo->AutoconfigActive;
-    pCurSettings->DhcpEnabled = pCurrentAdapter->DhcpEnabled;
-    pCurSettings->Index = pCurrentAdapter->Index;
 
     if (FAILED(LoadFilterSettings(This)))
         return E_FAIL;
@@ -2846,7 +2851,6 @@ InitializeTcpipBasicDlg(TcpipConfNotifyImpl * This)
         return E_FAIL;
 
     CoTaskMemFree(pInfo);
-    CoTaskMemFree(pPerInfo);
 
     return S_OK;
 }
@@ -3088,15 +3092,19 @@ INetCfgComponentControl_fnApplyRegistryChanges(
     //MessageBoxW(NULL, L"INetCfgComponentControl_fnApplyRegistryChanges", NULL, MB_OK);
 
 
-    if (RegOpenKeyExW(hKey, L"SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters", 0, KEY_WRITE, &hKey) == ERROR_SUCCESS)
+    if (RegCreateKeyExW(hKey, L"SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters", 0, NULL, 0, KEY_WRITE, NULL, &hKey, NULL) == 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 (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 @@ INetCfgComponentControl_fnApplyRegistryChanges(
     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)
+    if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, szBuffer, 0, NULL, 0, KEY_WRITE, NULL, &hKey, NULL) == 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 (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)