[0.4.3] * Update the release type.

svn path=/branches/ros-branch-0_4_3/; revision=73222
[0.4.3] * Merge shell32 fixes by Giannis in r73128. CORE-12106
2025-10-06 08:22:58 +02:00 · 2016-11-13 10:38:42 +00:00 · 2016-11-05 11:07:31 +00:00 · 2016-11-04 09:33:03 +00:00 · 2016-11-04 09:30:13 +00:00 · 2016-11-04 09:17:52 +00:00
77 changed files with 1037 additions and 879 deletions
--- a/reactos/base/applications/mscutils/eventvwr/eventvwr.c
+++ b/reactos/base/applications/mscutils/eventvwr/eventvwr.c
@@ -29,9 +29,9 @@
 #include "eventvwr.h"
 #include "evtdetctl.h"

+#include <sddl.h> // For ConvertSidToStringSidW
 #include <shellapi.h>
 #include <shlwapi.h>
-#include <strsafe.h>

 // #include "resource.h"

@@ -306,6 +306,10 @@ GetMessageStringFromDll(
    if (hLibrary == NULL)
        return NULL;

+    /* Sanitize dwFlags */
+    dwFlags &= ~FORMAT_MESSAGE_FROM_STRING;
+    dwFlags |= FORMAT_MESSAGE_FROM_HMODULE;
+
    _SEH2_TRY
    {
        /*
@@ -319,7 +323,7 @@ GetMessageStringFromDll(
                                      FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_MAX_WIDTH_MASK, */
                                      hLibrary,
                                      dwMessageId,
-                                      MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+                                      LANG_USER_DEFAULT,
                                      (LPWSTR)&lpMsgBuf,
                                      nSize,
                                      Arguments);
@@ -350,10 +354,10 @@ GetMessageStringFromDll(
                dwLength = FormatMessageW(dwFlags,
                                          hLibrary,
                                          dwMessageId,
-                                          MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+                                          LANG_USER_DEFAULT,
                                          (LPWSTR)&lpMsgBuf,
                                          nSize,
-                                          Arguments);
+                                          NULL /* Arguments */);
            }
        }
        _SEH2_END;
@@ -409,7 +413,7 @@ GetMessageStringFromDllList(
    szDll = wcstok(szMessageDllList, EVENT_DLL_SEPARATOR);
    while ((szDll != NULL) && !Success)
    {
-        // Uses MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT)
+        // Uses LANG_USER_DEFAULT
        lpMsgBuf = GetMessageStringFromDll(szDll,
                                           dwFlags,
                                           dwMessageId,
@@ -1261,7 +1265,8 @@ BOOL
 GetEventUserName(IN PEVENTLOGRECORD pelr,
                 OUT PWCHAR pszUser) // TODO: Add IN DWORD BufLen
 {
-    PSID lpSid;
+    PSID pSid;
+    PWSTR StringSid;
    WCHAR szName[1024];
    WCHAR szDomain[1024];
    SID_NAME_USE peUse;
@@ -1269,13 +1274,19 @@ GetEventUserName(IN PEVENTLOGRECORD pelr,
    DWORD cchDomain = ARRAYSIZE(szDomain);

    /* Point to the SID */
-    lpSid = (PSID)((LPBYTE)pelr + pelr->UserSidOffset);
+    pSid = (PSID)((LPBYTE)pelr + pelr->UserSidOffset);

    /* User SID */
    if (pelr->UserSidLength > 0)
    {
+        /*
+         * Try to retrieve the user account name and domain name corresponding
+         * to the SID. If it cannot be retrieved, try to convert the SID to a
+         * string-form. It should not be bigger than the user-provided buffer
+         * 'pszUser', otherwise we return an error.
+         */
        if (LookupAccountSidW(NULL, // FIXME: Use computer name? From the particular event?
-                              lpSid,
+                              pSid,
                              szName,
                              &cchName,
                              szDomain,
@@ -1285,6 +1296,27 @@ GetEventUserName(IN PEVENTLOGRECORD pelr,
            StringCchCopyW(pszUser, MAX_PATH, szName);
            return TRUE;
        }
+        else if (ConvertSidToStringSidW(pSid, &StringSid))
+        {
+            BOOL Success;
+
+            /* Copy the string only if the user-provided buffer is small enough */
+            if (wcslen(StringSid) + 1 <= MAX_PATH) // + 1 for NULL-terminator
+            {
+                StringCchCopyW(pszUser, MAX_PATH, StringSid);
+                Success = TRUE;
+            }
+            else
+            {
+                SetLastError(ERROR_NOT_ENOUGH_MEMORY);
+                Success = FALSE;
+            }
+
+            /* Free the allocated buffer */
+            LocalFree(StringSid);
+
+            return Success;
+        }
    }

    return FALSE;
@@ -1672,7 +1704,8 @@ Cleanup:
                        sizeof(szStatusText),
                        szStatusBarTemplate,
                        EventLog->LogName,
-                        dwTotalRecords);
+                        dwTotalRecords,
+                        ListView_GetItemCount(hwndListView));
    }
    else
    {
--- a/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc
+++ b/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc
@@ -131,7 +131,7 @@ BEGIN
    IDS_COPYRIGHT "Copyright (C) 2007 Marc Piulachs (marc.piulachs@codexchange.net)"
    IDS_APP_TITLE "Преглед на събития"
    IDS_APP_TITLE_EX "%s - %s Log on \\\\"
-    IDS_STATUS_MSG "%s has %lu event(s)"
+    IDS_STATUS_MSG "%s has %lu event(s) (listed: %lu)"
    IDS_LOADING_WAIT "Зареждане на събитията. Почакайте..."
    IDS_NO_ITEMS "There are no items to show in this view." // "No events in this log."
    IDS_EVENTLOG_SYSTEM "System Logs"
--- a/reactos/base/applications/mscutils/eventvwr/lang/cs-CZ.rc
+++ b/reactos/base/applications/mscutils/eventvwr/lang/cs-CZ.rc
@@ -131,7 +131,7 @@ BEGIN
    IDS_COPYRIGHT "Copyright (C) 2007 Marc Piulachs (marc.piulachs@codexchange.net)"
    IDS_APP_TITLE "Prohlížeč událostí"
    IDS_APP_TITLE_EX "%s - Protkol %s na \\\\"
-    IDS_STATUS_MSG "Počet událostí v protokolu %s: %lu"
+    IDS_STATUS_MSG "Počet událostí v protokolu %s: %lu (listed: %lu)"
    IDS_LOADING_WAIT "Načítám protokol událostí. Prosím čekejte..."
    IDS_NO_ITEMS "There are no items to show in this view." // "No events in this log."
    IDS_EVENTLOG_SYSTEM "System Logs"
--- a/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc
+++ b/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc
@@ -133,7 +133,7 @@ BEGIN
    IDS_COPYRIGHT "Copyright (C) 2007 Marc Piulachs (marc.piulachs@codexchange.net)"
    IDS_APP_TITLE "Ereignisanzeige"
    IDS_APP_TITLE_EX "%s - %s Log on \\\\"
-    IDS_STATUS_MSG "%s has %lu event(s)"
+    IDS_STATUS_MSG "%s has %lu event(s) (listed: %lu)"
    IDS_LOADING_WAIT "Ereignis-Protokolle werden geladen. Bitte warten..."
    IDS_NO_ITEMS "There are no items to show in this view." // "No events in this log."
    IDS_EVENTLOG_SYSTEM "System Logs"
--- a/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc
+++ b/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc
@@ -133,7 +133,7 @@ BEGIN
    IDS_COPYRIGHT "Copyright (C) 2007 Marc Piulachs (marc.piulachs@codexchange.net)"
    IDS_APP_TITLE "Event Viewer"
    IDS_APP_TITLE_EX "%s - %s Log on \\\\"
-    IDS_STATUS_MSG "%s has %lu event(s)"
+    IDS_STATUS_MSG "%s has %lu event(s) (listed: %lu)"
    IDS_LOADING_WAIT "Γίνεται φόρτωση των Logs συμβάντων. Παρακαλώ περιμένετε..."
    IDS_NO_ITEMS "There are no items to show in this view." // "No events in this log."
    IDS_EVENTLOG_SYSTEM "System Logs"
--- a/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc
+++ b/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc
@@ -139,7 +139,7 @@ BEGIN
    IDS_COPYRIGHT "Copyright (C) 2007 Marc Piulachs (marc.piulachs@codexchange.net)"
    IDS_APP_TITLE "Event Viewer"
    IDS_APP_TITLE_EX "%s - %s Log on \\\\"
-    IDS_STATUS_MSG "%s has %lu event(s)"
+    IDS_STATUS_MSG "%s has %lu event(s) (listed: %lu)"
    IDS_LOADING_WAIT "Loading Event Logs. Please wait..."
    IDS_NO_ITEMS "There are no items to show in this view." // "No events in this log."
    IDS_EVENTLOG_SYSTEM "System Logs"
--- a/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc
+++ b/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc
@@ -133,7 +133,7 @@ BEGIN
    IDS_COPYRIGHT "Copyright (C) 2007 Marc Piulachs (marc.piulachs@codexchange.net)"
    IDS_APP_TITLE "Visor de eventos"
    IDS_APP_TITLE_EX "%s - Registro de %s en \\\\"
-    IDS_STATUS_MSG "%s tiene %lu evento(s)"
+    IDS_STATUS_MSG "%s tiene %lu evento(s) (listed: %lu)"
    IDS_LOADING_WAIT "Recuperando eventos. Espere un momento..."
    IDS_NO_ITEMS "There are no items to show in this view." // "No events in this log."
    IDS_EVENTLOG_SYSTEM "System Logs"
--- a/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc
+++ b/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc
@@ -133,7 +133,7 @@ BEGIN
    IDS_COPYRIGHT "Copyright (C) 2007 Marc Piulachs (marc.piulachs@codexchange.net)"
    IDS_APP_TITLE "Visionneuse d'événements"
    IDS_APP_TITLE_EX "%s - Journal %s sur \\\\"
-    IDS_STATUS_MSG "%s contient %lu événement(s)"
+    IDS_STATUS_MSG "%s contient %lu événement(s) (listés : %lu)"
    IDS_LOADING_WAIT "Chargement des journaux d'événements. Veuillez patienter..."
    IDS_NO_ITEMS "Aucun élément à afficher dans cet aperçu." // "No events in this log."
    IDS_EVENTLOG_SYSTEM "Journaux système"
--- a/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc
+++ b/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc
@@ -133,7 +133,7 @@ BEGIN
    IDS_COPYRIGHT "Copyright (C) 2007 Marc Piulachs (marc.piulachs@codexchange.net)"
    IDS_APP_TITLE "יומן האירועים"
    IDS_APP_TITLE_EX "%s - %s Log on \\\\"
-    IDS_STATUS_MSG "%s has %lu event(s)"
+    IDS_STATUS_MSG "%s has %lu event(s) (listed: %lu)"
    IDS_LOADING_WAIT "טוען יומני אירועים, נא להמתין..."
    IDS_NO_ITEMS "There are no items to show in this view." // "No events in this log."
    IDS_EVENTLOG_SYSTEM "System Logs"
--- a/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc
+++ b/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc
@@ -133,7 +133,7 @@ BEGIN
    IDS_COPYRIGHT "Copyright (C) 2007 Marc Piulachs (marc.piulachs@codexchange.net)"
    IDS_APP_TITLE "Visualizzatore eventi"
    IDS_APP_TITLE_EX "%s - %s Log on \\\\"
-    IDS_STATUS_MSG "%s has %lu event(s)"
+    IDS_STATUS_MSG "%s has %lu event(s) (listed: %lu)"
    IDS_LOADING_WAIT "Caricamento eventi in corso. Attendere..."
    IDS_NO_ITEMS "There are no items to show in this view." // "No events in this log."
    IDS_EVENTLOG_SYSTEM "System Logs"
--- a/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc
+++ b/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc
@@ -133,7 +133,7 @@ BEGIN
    IDS_COPYRIGHT "Copyright (C) 2007 Marc Piulachs (marc.piulachs@codexchange.net)"
    IDS_APP_TITLE "イベント ビューア"
    IDS_APP_TITLE_EX "%s - %s Log on \\\\"
-    IDS_STATUS_MSG "%s has %lu event(s)"
+    IDS_STATUS_MSG "%s has %lu event(s) (listed: %lu)"
    IDS_LOADING_WAIT "イベント ログを読み込んでいます。 お待ちください..."
    IDS_NO_ITEMS "There are no items to show in this view." // "No events in this log."
    IDS_EVENTLOG_SYSTEM "System Logs"
--- a/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc
+++ b/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc
@@ -133,7 +133,7 @@ BEGIN
    IDS_COPYRIGHT "Copyright (C) 2007 Marc Piulachs (marc.piulachs@codexchange.net)"
    IDS_APP_TITLE "이벤트 뷰어"
    IDS_APP_TITLE_EX "%s - %s Log on \\\\"
-    IDS_STATUS_MSG "%s has %lu event(s)"
+    IDS_STATUS_MSG "%s has %lu event(s) (listed: %lu)"
    IDS_LOADING_WAIT "이벤트 로그 로딩중. 기다려주세요..."
    IDS_NO_ITEMS "There are no items to show in this view." // "No events in this log."
    IDS_EVENTLOG_SYSTEM "System Logs"
--- a/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc
+++ b/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc
@@ -131,7 +131,7 @@ BEGIN
    IDS_COPYRIGHT "Copyright (C) 2007 Marc Piulachs (marc.piulachs@codexchange.net)"
    IDS_APP_TITLE "Hendelseliste"
    IDS_APP_TITLE_EX "%s - %s Log on \\\\"
-    IDS_STATUS_MSG "%s has %lu event(s)"
+    IDS_STATUS_MSG "%s has %lu event(s) (listed: %lu)"
    IDS_LOADING_WAIT "Laster Hendelseliste. Venligst vent..."
    IDS_NO_ITEMS "There are no items to show in this view." // "No events in this log."
    IDS_EVENTLOG_SYSTEM "System Logs"
--- a/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc
+++ b/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc
@@ -135,7 +135,7 @@ BEGIN
    IDS_COPYRIGHT "Copyright (C) 2007 Marc Piulachs (marc.piulachs@codexchange.net)"
    IDS_APP_TITLE "Podgląd zdarzeń"
    IDS_APP_TITLE_EX "%s - %s Log na \\\\"
-    IDS_STATUS_MSG "%s posiada %lu zdarzeń"
+    IDS_STATUS_MSG "%s posiada %lu zdarzeń (listed: %lu)"
    IDS_LOADING_WAIT "Ładowanie logów zdarzeń. Proszę czekać..."
    IDS_NO_ITEMS "There are no items to show in this view." // "No events in this log."
    IDS_EVENTLOG_SYSTEM "System Logs"
--- a/reactos/base/applications/mscutils/eventvwr/lang/pt-BR.rc
+++ b/reactos/base/applications/mscutils/eventvwr/lang/pt-BR.rc
@@ -133,7 +133,7 @@ BEGIN
    IDS_COPYRIGHT "Copyright (C) 2007 Marc Piulachs (marc.piulachs@codexchange.net)"
    IDS_APP_TITLE "Visualizador de Eventos"
    IDS_APP_TITLE_EX "%s - %s Log on \\\\"
-    IDS_STATUS_MSG "%s has %lu event(s)"
+    IDS_STATUS_MSG "%s has %lu event(s) (listed: %lu)"
    IDS_LOADING_WAIT "Carregando Registros de Eventos. Por favor aguarde..."
    IDS_NO_ITEMS "There are no items to show in this view." // "No events in this log."
    IDS_EVENTLOG_SYSTEM "System Logs"
--- a/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc
+++ b/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc
@@ -136,7 +136,7 @@ BEGIN
    IDS_COPYRIGHT "Drept de autor (C) 2007 Marc Piulachs (marc.piulachs@codexchange.net)"
    IDS_APP_TITLE "Observator de evenimente"
    IDS_APP_TITLE_EX "%s - %s autentificat pe \\\\"
-    IDS_STATUS_MSG "%s are %lu eveniment(e)"
+    IDS_STATUS_MSG "%s are %lu eveniment(e) (listed: %lu)"
    IDS_LOADING_WAIT "Se încarcă jurnalul de evenimentele. Așteptați…"
    IDS_NO_ITEMS "There are no items to show in this view." // "No events in this log."
    IDS_EVENTLOG_SYSTEM "System Logs"
--- a/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc
+++ b/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc
@@ -133,7 +133,7 @@ BEGIN
    IDS_COPYRIGHT "Авторские права (С) 2007 Марк Пиулачс (marc.piulachs@codexchange.net)"
    IDS_APP_TITLE "Просмотр событий"
    IDS_APP_TITLE_EX "%s - %s журнал на \\\\"
-    IDS_STATUS_MSG "%s содержит %lu событие (ий)"
+    IDS_STATUS_MSG "%s содержит %lu событие(ий) (listed: %lu)"
    IDS_LOADING_WAIT "Идет загрузка. Подождите..."
    IDS_NO_ITEMS "Нет элементов для отображения в этом представлении." // "No events in this log."
    IDS_EVENTLOG_SYSTEM "Системный журнал"
--- a/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc
+++ b/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc
@@ -136,7 +136,7 @@ BEGIN
    IDS_COPYRIGHT "Autorské práva (C) 2007 Marc Piulachs (marc.piulachs@codexchange.net)"
    IDS_APP_TITLE "Zobrazovač udalostí"
    IDS_APP_TITLE_EX "%s - %s Log on \\\\"
-    IDS_STATUS_MSG "%s has %lu event(s)"
+    IDS_STATUS_MSG "%s has %lu event(s) (listed: %lu)"
    IDS_LOADING_WAIT "Nahrávam záznamy s udalosťami. Počkajte, prosím..."
    IDS_NO_ITEMS "There are no items to show in this view." // "No events in this log."
    IDS_EVENTLOG_SYSTEM "System Logs"
--- a/reactos/base/applications/mscutils/eventvwr/lang/sq-AL.rc
+++ b/reactos/base/applications/mscutils/eventvwr/lang/sq-AL.rc
@@ -139,7 +139,7 @@ BEGIN
    IDS_COPYRIGHT "Copyright (C) 2007 Marc Piulachs (marc.piulachs@codexchange.net)"
    IDS_APP_TITLE "Shikues ngjarjesh"
    IDS_APP_TITLE_EX "%s - %s Log on \\\\"
-    IDS_STATUS_MSG "%s has %lu event(s)"
+    IDS_STATUS_MSG "%s has %lu event(s) (listed: %lu)"
    IDS_LOADING_WAIT "Ngarkim loget e ngjarjeve. Ju lutem prisni..."
    IDS_NO_ITEMS "There are no items to show in this view." // "No events in this log."
    IDS_EVENTLOG_SYSTEM "System Logs"
--- a/reactos/base/applications/mscutils/eventvwr/lang/sv-SE.rc
+++ b/reactos/base/applications/mscutils/eventvwr/lang/sv-SE.rc
@@ -133,7 +133,7 @@ BEGIN
    IDS_COPYRIGHT "Copyright (C) 2007 Marc Piulachs (marc.piulachs@codexchange.net)"
    IDS_APP_TITLE "Händelselogg"
    IDS_APP_TITLE_EX "%s - %s Log on \\\\"
-    IDS_STATUS_MSG "%s has %lu event(s)"
+    IDS_STATUS_MSG "%s has %lu event(s) (listed: %lu)"
    IDS_LOADING_WAIT "Laddar in Händelseloggen. Vänligen vänta..."
    IDS_NO_ITEMS "There are no items to show in this view." // "No events in this log."
    IDS_EVENTLOG_SYSTEM "System Logs"
--- a/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc
+++ b/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc
@@ -139,7 +139,7 @@ BEGIN
    IDS_COPYRIGHT "Telif Hakkı: 2007 - Marc Piulachs (marc.piulachs@codexchange.net)"
    IDS_APP_TITLE "Olay Görüntüleyicisi"
    IDS_APP_TITLE_EX "%s - %s Oturum Aç \\\\"
-    IDS_STATUS_MSG "%s -> %lu olay var."
+    IDS_STATUS_MSG "%s -> %lu olay var (listed: %lu)"
    IDS_LOADING_WAIT "Olay kayıtları yükleniyor. Lütfen bekleyiniz..."
    IDS_NO_ITEMS "Bu görünümde görüntülenecek bir öğe bile yok." // "No events in this log."
    IDS_EVENTLOG_SYSTEM "Dizge Kayıtları"
--- a/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc
+++ b/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc
@@ -133,7 +133,7 @@ BEGIN
    IDS_COPYRIGHT "Copyright (C) 2007 Marc Piulachs (marc.piulachs@codexchange.net)"
    IDS_APP_TITLE "Оглядач подій"
    IDS_APP_TITLE_EX "%s - %s Log on \\\\"
-    IDS_STATUS_MSG "%s has %lu event(s)"
+    IDS_STATUS_MSG "%s has %lu event(s) (listed: %lu)"
    IDS_LOADING_WAIT "Завантаження Звіту подій. Будь ласка, зачекайте..."
    IDS_NO_ITEMS "There are no items to show in this view." // "No events in this log."
    IDS_EVENTLOG_SYSTEM "System Logs"
--- a/reactos/base/applications/mscutils/eventvwr/lang/zh-CN.rc
+++ b/reactos/base/applications/mscutils/eventvwr/lang/zh-CN.rc
@@ -133,7 +133,7 @@ BEGIN
    IDS_COPYRIGHT "版权所有 (C) 2007 Marc Piulachs (marc.piulachs@codexchange.net)"
    IDS_APP_TITLE "事件查看器"
    IDS_APP_TITLE_EX "%s - %s Log on \\\\"
-    IDS_STATUS_MSG "%s has %lu event(s)"
+    IDS_STATUS_MSG "%s has %lu event(s) (listed: %lu)"
    IDS_LOADING_WAIT "正在载入日志。请稍候..."
    IDS_NO_ITEMS "There are no items to show in this view." // "No events in this log."
    IDS_EVENTLOG_SYSTEM "System Logs"
--- a/reactos/base/applications/mscutils/eventvwr/lang/zh-TW.rc
+++ b/reactos/base/applications/mscutils/eventvwr/lang/zh-TW.rc
@@ -133,7 +133,7 @@ BEGIN
    IDS_COPYRIGHT "版權所有 (C) 2007 Marc Piulachs (marc.piulachs@codexchange.net)"
    IDS_APP_TITLE "事件檢視器"
    IDS_APP_TITLE_EX "%s - %s Log on \\\\"
-    IDS_STATUS_MSG "%s has %lu event(s)"
+    IDS_STATUS_MSG "%s has %lu event(s) (listed: %lu)"
    IDS_LOADING_WAIT "正在載入日誌。 請稍候..."
    IDS_NO_ITEMS "There are no items to show in this view." // "No events in this log."
    IDS_EVENTLOG_SYSTEM "System Logs"
--- a/reactos/base/applications/wordpad/res/formatbar.bmp
+++ b/reactos/base/applications/wordpad/res/formatbar.bmp
--- a/reactos/base/applications/wordpad/res/toolbar.bmp
+++ b/reactos/base/applications/wordpad/res/toolbar.bmp
--- a/reactos/base/shell/explorer/res/bmp/158-rc1.bmp
+++ b/reactos/base/shell/explorer/res/bmp/158-rc1.bmp
--- a/reactos/base/shell/explorer/res/bmp/158-rc2.bmp
+++ b/reactos/base/shell/explorer/res/bmp/158-rc2.bmp
--- a/reactos/base/shell/explorer/res/bmp/158-rc3.bmp
+++ b/reactos/base/shell/explorer/res/bmp/158-rc3.bmp
--- a/reactos/base/shell/explorer/res/bmp/158.bmp
+++ b/reactos/base/shell/explorer/res/bmp/158.bmp
--- a/reactos/base/system/regsvr32/regsvr32.c
+++ b/reactos/base/system/regsvr32/regsvr32.c
@@ -258,7 +258,7 @@ int WINAPI _tWinMain(
 	LPCSTR lpFuncName;
 	LPWSTR lpwDllCmdLine;
 	BOOL bUnregister,bSilent,bConsole,bInstall,bNoRegister;
-	UINT nDllCount;
+	UINT nDllCount, fuOldErrorMode;
 	HMODULE hDll;
 	DLLREGISTER fnDllRegister;
 	DLLINSTALL fnDllInstall;
@@ -386,9 +386,11 @@ int WINAPI _tWinMain(
 		if (*argv[i] != _T('/')) {
 			lptDllName = argv[i];

+			fuOldErrorMode = SetErrorMode(SEM_FAILCRITICALERRORS);
 			// Everything is all setup, so load the dll now
 			hDll = LoadLibraryEx(lptDllName,0,LOAD_WITH_ALTERED_SEARCH_PATH);
 			if (hDll) {
+				SetErrorMode(fuOldErrorMode);
 				if (!bNoRegister) {
 					// Get the address of DllRegisterServer or DllUnregisterServer
 					fnDllRegister = (DLLREGISTER)GetProcAddress(hDll,lpFuncName);
@@ -463,6 +465,7 @@ int WINAPI _tWinMain(
 			else {
 				// The dll could not be loaded; display an error message
 				dwErr = GetLastError();
+				SetErrorMode(fuOldErrorMode);
 				lptMsgBuffer = (LPTSTR)malloc((_tcslen(DllNotLoaded) + 2 + _tcslen(lptDllName) + 1) * sizeof(TCHAR));
 				_stprintf(lptMsgBuffer,DllNotLoaded,lptDllName,dwErr);
 				DisplayMessage(bConsole,bSilent,lptMsgBuffer,ModuleTitle,MB_ICONEXCLAMATION);
--- a/reactos/dll/win32/netcfgx/lang/bg-BG.rc
+++ b/reactos/dll/win32/netcfgx/lang/bg-BG.rc
@@ -10,18 +10,18 @@ BEGIN
    GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX
    CONTROL "Из&ползване на следния IP адрес:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
    LTEXT "IP адрес:", -1, 14, 75, 135, 8
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 150, 75 - 2, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
    LTEXT "Мрежова маска:", -1, 14, 90, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 150, 90 - 2, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12
    LTEXT "Разпределител (gateway):", -1, 14, 105, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 150, 105 - 2, 80, 12
+    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
    CONTROL "Самополучаване на адреса на DNS сървъра", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 139, 210, 12
    GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX
    CONTROL "Из&ползване на следните адреси за DNS сървър", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 152, 12
    LTEXT "Предпочитан DNS сървър:", -1, 14, 171, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 150, 171 - 2, 80, 12
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 171 - 2, 85, 12
    LTEXT "Заместващ DNS сървър:", -1, 14, 186, 135, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 150, 186 - 2, 80, 12
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 186 - 2, 85, 12
    PUSHBUTTON "Раз&ширени", IDC_ADVANCED, 186, 209, 50, 14, WS_TABSTOP
 END

@@ -35,15 +35,15 @@ BEGIN
    GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX
    CONTROL "На&строено от потребителя", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12
    LTEXT "Адрес за IP:", -1, 14, 75, 135, 8
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 150, 75, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
    LTEXT "Под&мрежова маска:", -1, 14, 95, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 150, 95, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
    LTEXT "&Подразбиран разпределител:", -1, 14, 115, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 150, 115, 80, 12
+    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
    LTEXT "Пре&дпочитан DNS:", -1, 14, 150, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 150, 150, 80, 12
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
    LTEXT "За&местващ DNS:", -1, 14, 165, 180, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 150, 165, 80, 12
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END

 IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 247
@@ -112,10 +112,10 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TCP/IP адрес"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 100, 15, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
    LTEXT "IP адрес:", -1, 5, 15, 70, 12
    LTEXT "Подмрежова маска:", -1, 5, 30, 70, 12
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 96, 30, 85, 12
    DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
    PUSHBUTTON "Отказ", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
@@ -125,7 +125,7 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TCP/IP адрес на разпределя"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 100, 15, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
    LTEXT "Разпределител:", -1, 5, 15, 70, 12
    CHECKBOX "Автоматични мерни единици", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
    LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
@@ -139,7 +139,7 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "NDS сървър за TCP/IP"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 5, 25, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 5, 25, 85, 12
    LTEXT "DNS сървър:", -1, 5, 10, 120, 12
    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
    PUSHBUTTON "Отказ", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
--- a/reactos/dll/win32/netcfgx/lang/cs-CZ.rc
+++ b/reactos/dll/win32/netcfgx/lang/cs-CZ.rc
@@ -16,18 +16,18 @@ BEGIN
    GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX
    CONTROL "&Použít následující IP adresu:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
    LTEXT "IP adresa:", -1, 14, 75, 135, 8
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 150, 75 - 2, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
    LTEXT "Maska podsítě:", -1, 14, 90, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 150, 90 - 2, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12
    LTEXT "Výchozí brána:", -1, 14, 105, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 150, 105 - 2, 80, 12
+    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
    CONTROL "Získat adresy DNS serverů automaticky", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 139, 210, 12
    GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX
    CONTROL "&Použít následující adresy DNS serverů", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 152, 12
    LTEXT "Upřednostňovaný DNS server:", -1, 14, 171, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 150, 171 - 2, 80, 12
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 171 - 2, 85, 12
    LTEXT "Záložní DNS server:", -1, 14, 186, 135, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 150, 186 - 2, 80, 12
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 186 - 2, 85, 12
    PUSHBUTTON "&Rozšířené", IDC_ADVANCED, 186, 209, 50, 14, WS_TABSTOP
 END

@@ -41,15 +41,15 @@ BEGIN
    GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX
    CONTROL "&Uživatelské nastavení", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12
    LTEXT "&IP adresa:", -1, 14, 75, 135, 8
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 150, 75, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
    LTEXT "&Maska podsítě:", -1, 14, 95, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 150, 95, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
    LTEXT "&Výchozí brána:", -1, 14, 115, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 150, 115, 80, 12
+    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
    LTEXT "&Preferovaný DNS server:", -1, 14, 150, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 150, 150, 80, 12
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
    LTEXT "&Alternativní DNS server:", -1, 14, 165, 180, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 150, 165, 80, 12
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END

 IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 247
@@ -118,10 +118,10 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TCP/IP adresa"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 100, 15, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
    LTEXT "IP adresa:", -1, 5, 15, 70, 12
    LTEXT "Maska podsítě:", -1, 5, 30, 70, 12
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 96, 30, 85, 12
    DEFPUSHBUTTON "OK", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
    PUSHBUTTON "Storno", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
@@ -131,7 +131,7 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TCP/IP adresa brány"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 100, 15, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
    LTEXT "Brána:", -1, 5, 15, 70, 12
    CHECKBOX "Automatická metrika", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
    LTEXT "&Metrika:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
@@ -145,7 +145,7 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TCP/IP DNS Server"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 5, 25, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 5, 25, 85, 12
    LTEXT "DNS server:", -1, 5, 10, 120, 12
    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
    PUSHBUTTON "Storno", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
--- a/reactos/dll/win32/netcfgx/lang/da-DK.rc
+++ b/reactos/dll/win32/netcfgx/lang/da-DK.rc
@@ -10,18 +10,18 @@ BEGIN
    GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX
    CONTROL "&Brug følge IP Adresse:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
    LTEXT "IP Adresse:", -1, 14, 75, 135, 8
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 150, 75 - 2, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
    LTEXT "Subnet maske:", -1, 14, 90, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 150, 90 - 2, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12
    LTEXT "Standard gateway:", -1, 14, 105, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 150, 105 - 2, 80, 12
+    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
    CONTROL "Tildel automatisk en DNS server adresse.", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 139, 210, 12
    GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX
    CONTROL "&Brug følgende DNS Server Adresse:", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 152, 12
    LTEXT "Fortrukket DNS server:", -1, 14, 171, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 150, 171 - 2, 80, 12
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 171 - 2, 85, 12
    LTEXT "Alternativ DNS server:", -1, 14, 186, 135, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 150, 186 - 2, 80, 12
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 186 - 2, 85, 12
    PUSHBUTTON "&Avanceret", IDC_ADVANCED, 186, 209, 50, 14, WS_TABSTOP
 END

@@ -35,15 +35,15 @@ BEGIN
    GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX
    CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12
    LTEXT "&IP address:", -1, 14, 75, 135, 8
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 150, 75, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
    LTEXT "S&ubnet mask:", -1, 14, 95, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 150, 95, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
    LTEXT "&Default gateway:", -1, 14, 115, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 150, 115, 80, 12
+    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
    LTEXT "&Preferred DNS server:", -1, 14, 150, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 150, 150, 80, 12
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
    LTEXT "&Alternate DNS server:", -1, 14, 165, 180, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 150, 165, 80, 12
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END

 IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 247
@@ -112,10 +112,10 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TCP/IP Address"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 100, 15, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
    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
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 96, 30, 85, 12
    DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
    PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
@@ -125,7 +125,7 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TCP/IP Gateway Address"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 100, 15, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
    LTEXT "Gateway:", -1, 5, 15, 70, 12
    CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
    LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
@@ -139,7 +139,7 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TCP/IP DNS Server"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 5, 25, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 5, 25, 85, 12
    LTEXT "DNS server:", -1, 5, 10, 120, 12
    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
    PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
--- a/reactos/dll/win32/netcfgx/lang/de-DE.rc
+++ b/reactos/dll/win32/netcfgx/lang/de-DE.rc
@@ -10,18 +10,18 @@ BEGIN
    GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX
    CONTROL "Folgende IP-&Adresse verwenden:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
    LTEXT "&IP-Adresse:", -1, 14, 75, 135, 8
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 150, 75 - 2, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
    LTEXT "S&ubnetzmaske:", -1, 14, 90, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 150, 90 - 2, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12
    LTEXT "&Standardgateway:", -1, 14, 105, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 150, 105 - 2, 80, 12
+    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
    CONTROL "D&NS-Serveradresse automatisch beziehen", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 139, 210, 12
    GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX
    CONTROL "Folgende DNS-Serveradressen &verwenden:", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 152, 12
    LTEXT "&Bevorzugter DNS-Server:", -1, 14, 171, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 150, 171 - 2, 80, 12
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 171 - 2, 85, 12
    LTEXT "A&lternativer DNS-Server:", -1, 14, 186, 135, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 150, 186 - 2, 80, 12
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 186 - 2, 85, 12
    PUSHBUTTON "&Erweitert...", IDC_ADVANCED, 186, 209, 50, 14, WS_TABSTOP
 END

@@ -35,15 +35,15 @@ BEGIN
    GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX
    CONTROL "B&enutzerdefiniert", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12
    LTEXT "&IP-Adresse:", -1, 14, 75, 135, 8
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 150, 75, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
    LTEXT "S&ubnetzmaske:", -1, 14, 95, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 150, 95, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
    LTEXT "&Standardgateway:", -1, 14, 115, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 150, 115, 80, 12
+    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
    LTEXT "&Bevorzugter DNS-Server:", -1, 14, 150, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 150, 150, 80, 12
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
    LTEXT "A&lternativer DNS-Server:", -1, 14, 165, 180, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 150, 165, 80, 12
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END

 IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 247
@@ -112,10 +112,10 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TCP/IP-Adresse"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 100, 15, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
    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
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 96, 30, 85, 12
    DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
    PUSHBUTTON "Abbrechen", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
@@ -125,7 +125,7 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TCP/IP-Gateway"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 100, 15, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
    LTEXT "Gateway:", -1, 5, 15, 70, 12
    CHECKBOX "Automatische Metrik", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
    LTEXT "&Metrik:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
@@ -139,7 +139,7 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TCP/IP-DNS-Server"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 5, 25, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 5, 25, 85, 12
    LTEXT "DNS-Server:", -1, 5, 10, 120, 12
    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
    PUSHBUTTON "Abbrechen", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
--- a/reactos/dll/win32/netcfgx/lang/el-GR.rc
+++ b/reactos/dll/win32/netcfgx/lang/el-GR.rc
@@ -10,18 +10,18 @@ BEGIN
    GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX
    CONTROL "&Use the following IP address:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
    LTEXT "Διεύθυνση IP:", -1, 14, 75, 135, 8
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 150, 75 - 2, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
    LTEXT "Subnet mask:", -1, 14, 90, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 150, 90 - 2, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12
    LTEXT "Default gateway:", -1, 14, 105, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 150, 105 - 2, 80, 12
+    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
    CONTROL "Να γίνεται εύρεση της διεύθυνσης του DNS διακομιστή αυτόματα", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 139, 210, 12
    GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX
    CONTROL "&Χρήση των παρακάτω διευθύσεων DNS διακομιστών", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 152, 12
    LTEXT "Προτιμητέος DNS διακομιστής:", -1, 14, 171, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 150, 171 - 2, 80, 12
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 171 - 2, 85, 12
    LTEXT "Επιπλέον DNS διακομιστής:", -1, 14, 186, 135, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 150, 186 - 2, 80, 12
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 186 - 2, 85, 12
    PUSHBUTTON "&Για Προχωρημένους", IDC_ADVANCED, 186, 209, 50, 14, WS_TABSTOP
 END

@@ -35,15 +35,15 @@ BEGIN
    GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX
    CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12
    LTEXT "&IP address:", -1, 14, 75, 135, 8
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 150, 75, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
    LTEXT "S&ubnet mask:", -1, 14, 95, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 150, 95, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
    LTEXT "&Default gateway:", -1, 14, 115, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 150, 115, 80, 12
+    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
    LTEXT "&Preferred DNS server:", -1, 14, 150, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 150, 150, 80, 12
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
    LTEXT "&Alternate DNS server:", -1, 14, 165, 180, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 150, 165, 80, 12
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END

 IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 247
@@ -112,10 +112,10 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TCP/IP Address"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 100, 15, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
    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
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 96, 30, 85, 12
    DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
    PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
@@ -125,7 +125,7 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TCP/IP Gateway Address"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 100, 15, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
    LTEXT "Gateway:", -1, 5, 15, 70, 12
    CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
    LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
@@ -139,7 +139,7 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TCP/IP DNS Server"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 5, 25, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 5, 25, 85, 12
    LTEXT "DNS server:", -1, 5, 10, 120, 12
    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
    PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
--- a/reactos/dll/win32/netcfgx/lang/en-US.rc
+++ b/reactos/dll/win32/netcfgx/lang/en-US.rc
@@ -10,18 +10,18 @@ BEGIN
    GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX
    CONTROL "&Use the following IP address:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
    LTEXT "IP address:", -1, 14, 75, 135, 8
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 150, 75 - 2, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
    LTEXT "Subnet mask:", -1, 14, 90, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 150, 90 - 2, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12
    LTEXT "Default gateway:", -1, 14, 105, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 150, 105 - 2, 80, 12
+    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
    CONTROL "Obtain the DNS server address automatically", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 139, 210, 12
    GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX
    CONTROL "&Use the following DNS server addresses:", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 152, 12
    LTEXT "Preferred DNS server:", -1, 14, 171, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 150, 171 - 2, 80, 12
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 171 - 2, 85, 12
    LTEXT "Alternate DNS server:", -1, 14, 186, 135, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 150, 186 - 2, 80, 12
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 186 - 2, 85, 12
    PUSHBUTTON "&Advanced", IDC_ADVANCED, 186, 209, 50, 14, WS_TABSTOP
 END

@@ -35,15 +35,15 @@ BEGIN
    GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX
    CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12
    LTEXT "&IP address:", -1, 14, 75, 135, 8
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 150, 75, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
    LTEXT "S&ubnet mask:", -1, 14, 95, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 150, 95, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
    LTEXT "&Default gateway:", -1, 14, 115, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 150, 115, 80, 12
+    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
    LTEXT "&Preferred DNS server:", -1, 14, 150, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 150, 150, 80, 12
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
    LTEXT "&Alternate DNS server:", -1, 14, 165, 180, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 150, 165, 80, 12
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END

 IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 247
@@ -112,10 +112,10 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TCP/IP Address"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 100, 15, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
    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
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 96, 30, 85, 12
    DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
    PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
@@ -125,7 +125,7 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TCP/IP Gateway Address"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 100, 15, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
    LTEXT "Gateway:", -1, 5, 15, 70, 12
    CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
    LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
@@ -139,7 +139,7 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TCP/IP DNS Server"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 5, 25, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 5, 25, 85, 12
    LTEXT "DNS server:", -1, 5, 10, 120, 12
    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
    PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
--- a/reactos/dll/win32/netcfgx/lang/fr-FR.rc
+++ b/reactos/dll/win32/netcfgx/lang/fr-FR.rc
@@ -10,18 +10,18 @@ BEGIN
    GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX
    CONTROL "&Utiliser l'adresse IP suivante :", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
    LTEXT "Adresse IP :", -1, 14, 75, 135, 8
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 150, 75 - 2, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
    LTEXT "Masque de sous réseau :", -1, 14, 90, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 150, 90 - 2, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12
    LTEXT "Passerelle par défaut :", -1, 14, 105, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 150, 105 - 2, 80, 12
+    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
    CONTROL "Obtenir automatiquement l'adresse du serveur DNS", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 139, 210, 12
    GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX
    CONTROL "&Utiliser les adresses de serveur DNS suivantes", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 152, 12
    LTEXT "Serveur DNS primaire :", -1, 14, 171, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 150, 171 - 2, 80, 12
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 171 - 2, 85, 12
    LTEXT "Serveur DNS secondaire :", -1, 14, 186, 135, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 150, 186 - 2, 80, 12
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 186 - 2, 85, 12
    PUSHBUTTON "&Avancé", IDC_ADVANCED, 186, 209, 50, 14, WS_TABSTOP
 END

@@ -35,15 +35,15 @@ BEGIN
    GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX
    CONTROL "Utili&sateur configuré", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12
    LTEXT "Adresse &IP :", -1, 14, 75, 135, 8
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 150, 75, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
    LTEXT "Masque de so&us-réseau :", -1, 14, 95, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 150, 95, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
    LTEXT "Passerelle par &défaut :", -1, 14, 115, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 150, 115, 80, 12
+    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
    LTEXT "Serveur DNS &préféré :", -1, 14, 150, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 150, 150, 80, 12
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
    LTEXT "Serveur DNS &alternatif :", -1, 14, 165, 180, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 150, 165, 80, 12
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END

 IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 247
@@ -112,10 +112,10 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Adresse TCP/IP"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 100, 15, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
    LTEXT "Adresse IP:", -1, 5, 15, 70, 12
    LTEXT "Masque de sous-réseau:", -1, 5, 30, 70, 12
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 96, 30, 85, 12
    DEFPUSHBUTTON "Ajouter", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
    PUSHBUTTON "Annuler", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
@@ -125,7 +125,7 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Adresse de passerelle TCP/IP"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 100, 15, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
    LTEXT "Passerelle :", -1, 5, 15, 70, 12
    CHECKBOX "Métrique automatique", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
    LTEXT "Métrique :", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
@@ -139,7 +139,7 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Serveur DNS TCP/IP"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 5, 25, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 5, 25, 85, 12
    LTEXT "Serveur DNS :", -1, 5, 10, 120, 12
    PUSHBUTTON "Ajouter", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
    PUSHBUTTON "Annuler", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
--- a/reactos/dll/win32/netcfgx/lang/he-IL.rc
+++ b/reactos/dll/win32/netcfgx/lang/he-IL.rc
@@ -10,18 +10,18 @@ BEGIN
    GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX
    CONTROL "השתמש בכתובת הIP הבאה:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
    LTEXT "כתובת IP:", -1, 14, 75, 135, 8
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 150, 75 - 2, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
    LTEXT "מסכת רשת משנה:", -1, 14, 90, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 150, 90 - 2, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12
    LTEXT "שער ברירת מחדל:", -1, 14, 105, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 150, 105 - 2, 80, 12
+    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
    CONTROL "השג כתובת שרת DNS באופן אוטומטי.", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 139, 210, 12
    GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX
    CONTROL "השתמש בכתובות שרתי הDNS הבאים:", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 152, 12
    LTEXT "שרת DNS מועדף:", -1, 14, 171, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 150, 171 - 2, 80, 12
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 171 - 2, 85, 12
    LTEXT "שרת DNS חלופי:", -1, 14, 186, 135, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 150, 186 - 2, 80, 12
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 186 - 2, 85, 12
    PUSHBUTTON "מתקדם", IDC_ADVANCED, 186, 209, 50, 14, WS_TABSTOP
 END

@@ -35,15 +35,15 @@ BEGIN
    GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX
    CONTROL "הגדרת משתמש", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12
    LTEXT "כתובת IP:", -1, 14, 75, 135, 8
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 150, 75, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
    LTEXT "מסכת רשת משנה:", -1, 14, 95, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 150, 95, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
    LTEXT "שער ברירת מחדל:", -1, 14, 115, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 150, 115, 80, 12
+    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
    LTEXT "שרת DNS מועדף:", -1, 14, 150, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 150, 150, 80, 12
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
    LTEXT "שרת DNS חלופי:", -1, 14, 165, 180, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 150, 165, 80, 12
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END

 IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 247
@@ -112,10 +112,10 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "כתובת TCP/IP"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 100, 15, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
    LTEXT "כתובת IP:", -1, 5, 15, 70, 12
    LTEXT "מסכת רשת משנה:", -1, 5, 30, 70, 12
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 96, 30, 85, 12
    DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
    PUSHBUTTON "ביטול", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
@@ -125,7 +125,7 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "כתובת שער TCP/IP"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 100, 15, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
    LTEXT "שער:", -1, 5, 15, 70, 12
    CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
    LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
@@ -139,7 +139,7 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "שרת DNS של TCP/IP"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 5, 25, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 5, 25, 85, 12
    LTEXT "שרת DNS:", -1, 5, 10, 120, 12
    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
    PUSHBUTTON "ביטול", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
--- a/reactos/dll/win32/netcfgx/lang/hu-HU.rc
+++ b/reactos/dll/win32/netcfgx/lang/hu-HU.rc
@@ -10,18 +10,18 @@ BEGIN
    GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX
    CONTROL "A &következõ IP-cím használata:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
    LTEXT "IP cím:", -1, 14, 75, 135, 8
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 150, 75 - 2, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
    LTEXT "Alhálózati maszk:", -1, 14, 90, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 150, 90 - 2, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12
    LTEXT "Alapértelmezett átjáró:", -1, 14, 105, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 150, 105 - 2, 80, 12
+    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
    CONTROL "A DNS-kiszolgáló címének automatikus lekérése", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 139, 210, 12
    GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX
    CONTROL "A kö&vetkezõ DNS-kiszolgálók használata", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 152, 12
    LTEXT "Elsõdleges DNS-kiszolgáló:", -1, 14, 171, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 150, 171 - 2, 80, 12
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 171 - 2, 85, 12
    LTEXT "Másodlagos DNS-kiszolgáló:", -1, 14, 186, 135, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 150, 186 - 2, 80, 12
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 186 - 2, 85, 12
    PUSHBUTTON "&Haladóknak", IDC_ADVANCED, 186, 209, 50, 14, WS_TABSTOP
 END

@@ -35,15 +35,15 @@ BEGIN
    GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX
    CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12
    LTEXT "&IP address:", -1, 14, 75, 135, 8
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 150, 75, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
    LTEXT "S&ubnet mask:", -1, 14, 95, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 150, 95, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
    LTEXT "&Default gateway:", -1, 14, 115, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 150, 115, 80, 12
+    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
    LTEXT "&Preferred DNS server:", -1, 14, 150, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 150, 150, 80, 12
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
    LTEXT "&Alternate DNS server:", -1, 14, 165, 180, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 150, 165, 80, 12
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END

 IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 247
@@ -112,10 +112,10 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TCP/IP Address"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 100, 15, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
    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
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 96, 30, 85, 12
    DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
    PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
@@ -125,7 +125,7 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TCP/IP Gateway Address"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 100, 15, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
    LTEXT "Gateway:", -1, 5, 15, 70, 12
    CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
    LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
@@ -139,7 +139,7 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TCP/IP DNS Server"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 5, 25, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 5, 25, 85, 12
    LTEXT "DNS server:", -1, 5, 10, 120, 12
    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
    PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
--- a/reactos/dll/win32/netcfgx/lang/id-ID.rc
+++ b/reactos/dll/win32/netcfgx/lang/id-ID.rc
@@ -10,18 +10,18 @@ BEGIN
    GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX
    CONTROL "&Gunakan alamat IP berikut:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
    LTEXT "Alamat IP:", -1, 14, 75, 135, 8
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 150, 75 - 2, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
    LTEXT "Subnet mask:", -1, 14, 90, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 150, 90 - 2, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12
    LTEXT "Gateway standar:", -1, 14, 105, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 150, 105 - 2, 80, 12
+    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
    CONTROL "Peroleh alamat serverO DNS secara otomatis", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 139, 210, 12
    GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX
    CONTROL "&Gunakan alamat server DNS berikut", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 152, 12
    LTEXT "Server DNS Disukai:", -1, 14, 171, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 150, 171 - 2, 80, 12
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 171 - 2, 85, 12
    LTEXT "Server DNS alternatif:", -1, 14, 186, 135, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 150, 186 - 2, 80, 12
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 186 - 2, 85, 12
    PUSHBUTTON "&Lanjutan", IDC_ADVANCED, 186, 209, 50, 14, WS_TABSTOP
 END

@@ -35,15 +35,15 @@ BEGIN
    GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX
    CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12
    LTEXT "&IP address:", -1, 14, 75, 135, 8
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 150, 75, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
    LTEXT "S&ubnet mask:", -1, 14, 95, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 150, 95, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
    LTEXT "&Default gateway:", -1, 14, 115, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 150, 115, 80, 12
+    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
    LTEXT "&Preferred DNS server:", -1, 14, 150, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 150, 150, 80, 12
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
    LTEXT "&Alternate DNS server:", -1, 14, 165, 180, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 150, 165, 80, 12
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END

 IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 247
@@ -112,10 +112,10 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TCP/IP Address"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 100, 15, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
    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
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 96, 30, 85, 12
    DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
    PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
@@ -125,7 +125,7 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TCP/IP Gateway Address"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 100, 15, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
    LTEXT "Gateway:", -1, 5, 15, 70, 12
    CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
    LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
@@ -139,7 +139,7 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TCP/IP DNS Server"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 5, 25, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 5, 25, 85, 12
    LTEXT "DNS server:", -1, 5, 10, 120, 12
    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
    PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
--- a/reactos/dll/win32/netcfgx/lang/it-IT.rc
+++ b/reactos/dll/win32/netcfgx/lang/it-IT.rc
@@ -10,18 +10,18 @@ BEGIN
    GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX
    CONTROL "&Usa il seguente indirizzo IP:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
    LTEXT "Indirizzo IP:", -1, 14, 75, 135, 8
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 150, 75 - 2, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
    LTEXT "Subnet mask:", -1, 14, 90, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 150, 90 - 2, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12
    LTEXT "Default gateway:", -1, 14, 105, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 150, 105 - 2, 80, 12
+    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
    CONTROL "Ottieni automaticamente l'indirizzo dei server DNS", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 139, 210, 12
    GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX
    CONTROL "&Usa i seguenti indirizzi DNS", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 152, 12
    LTEXT "Server DNS preferito:", -1, 14, 171, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 150, 171 - 2, 80, 12
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 171 - 2, 85, 12
    LTEXT "Server DNS alternativo:", -1, 14, 186, 135, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 150, 186 - 2, 80, 12
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 186 - 2, 85, 12
    PUSHBUTTON "&Avanzata", IDC_ADVANCED, 186, 209, 50, 14, WS_TABSTOP
 END

@@ -35,15 +35,15 @@ BEGIN
    GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX
    CONTROL "Configurato dall'&utente", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12
    LTEXT "&Indirizzo IP:", -1, 14, 75, 135, 8
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 150, 75, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
    LTEXT "S&ubnet mask:", -1, 14, 95, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 150, 95, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
    LTEXT "&Default gateway:", -1, 14, 115, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 150, 115, 80, 12
+    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
    LTEXT "&DNS server preferenziale:", -1, 14, 150, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 150, 150, 80, 12
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
    LTEXT "DNS server alternativo:", -1, 14, 165, 180, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 150, 165, 80, 12
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END

 IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 247
@@ -112,10 +112,10 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Indirizzo TCP/IP"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 100, 15, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
    LTEXT "Indirizzo IP:", -1, 5, 15, 70, 12
    LTEXT "Subnet mask:", -1, 5, 30, 70, 12
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 96, 30, 85, 12
    DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
    PUSHBUTTON "Annulla", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
@@ -125,7 +125,7 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Indirizzo TCP/IP Gateway"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 100, 15, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
    LTEXT "Gateway:", -1, 5, 15, 70, 12
    CHECKBOX "Metriche automatiche", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
    LTEXT "&Metrica:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
@@ -139,7 +139,7 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TCP/IP DNS Server"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 5, 25, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 5, 25, 85, 12
    LTEXT "DNS server:", -1, 5, 10, 120, 12
    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
    PUSHBUTTON "Annulla", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
--- a/reactos/dll/win32/netcfgx/lang/ja-JP.rc
+++ b/reactos/dll/win32/netcfgx/lang/ja-JP.rc
@@ -10,18 +10,18 @@ BEGIN
    GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX
    CONTROL "次の IP アドレスを使う(&U):", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
    LTEXT "IP アドレス:", -1, 14, 75, 135, 8
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 150, 75 - 2, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
    LTEXT "サブネット マスク:", -1, 14, 90, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 150, 90 - 2, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12
    LTEXT "デフォルト ゲートウェイ:", -1, 14, 105, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 150, 105 - 2, 80, 12
+    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
    CONTROL "DNS サーバーのアドレスを自動的に取得する", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 139, 210, 12
    GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX
    CONTROL "次の DNS サーバーのアドレスを使う(&U)", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 152, 12
    LTEXT "優先 DNS サーバー:", -1, 14, 171, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 150, 171 - 2, 80, 12
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 171 - 2, 85, 12
    LTEXT "代替 DNS サーバー:", -1, 14, 186, 135, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 150, 186 - 2, 80, 12
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 186 - 2, 85, 12
    PUSHBUTTON "詳細設定(&A)", IDC_ADVANCED, 186, 209, 50, 14, WS_TABSTOP
 END

@@ -35,15 +35,15 @@ BEGIN
    GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX
    CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12
    LTEXT "&IP address:", -1, 14, 75, 135, 8
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 150, 75, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
    LTEXT "S&ubnet mask:", -1, 14, 95, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 150, 95, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
    LTEXT "&Default gateway:", -1, 14, 115, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 150, 115, 80, 12
+    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
    LTEXT "&Preferred DNS server:", -1, 14, 150, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 150, 150, 80, 12
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
    LTEXT "&Alternate DNS server:", -1, 14, 165, 180, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 150, 165, 80, 12
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END

 IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 247
@@ -112,10 +112,10 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TCP/IP Address"
 FONT 9, "MS UI Gothic"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 100, 15, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
    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
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 96, 30, 85, 12
    DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
    PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
@@ -125,7 +125,7 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TCP/IP Gateway Address"
 FONT 9, "MS UI Gothic"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 100, 15, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
    LTEXT "Gateway:", -1, 5, 15, 70, 12
    CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
    LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
@@ -139,7 +139,7 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TCP/IP DNS Server"
 FONT 9, "MS UI Gothic"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 5, 25, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 5, 25, 85, 12
    LTEXT "DNS server:", -1, 5, 10, 120, 12
    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
    PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
--- a/reactos/dll/win32/netcfgx/lang/nl-NL.rc
+++ b/reactos/dll/win32/netcfgx/lang/nl-NL.rc
@@ -10,18 +10,18 @@ BEGIN
    GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX
    CONTROL "&Een IP-adres opgeven:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
    LTEXT "IP-adres:", -1, 14, 75, 135, 8
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 150, 75 - 2, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
    LTEXT "Subnetmasker:", -1, 14, 90, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 150, 90 - 2, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12
    LTEXT "Standaardgateway:", -1, 14, 105, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 150, 105 - 2, 80, 12
+    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
    CONTROL "DNS-serveradres automatisch verkrijgen", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 139, 210, 12
    GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX
    CONTROL "De volgende DNS-serveradressen gebruiken:", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 152, 12
    LTEXT "Voorkeurs-DNS-server:", -1, 14, 171, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 150, 171 - 2, 80, 12
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 171 - 2, 85, 12
    LTEXT "Alternatieve-DNS-server:", -1, 14, 186, 135, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 150, 186 - 2, 80, 12
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 186 - 2, 85, 12
    PUSHBUTTON "&Geavanceerd", IDC_ADVANCED, 186, 209, 50, 14, WS_TABSTOP
 END

@@ -35,15 +35,15 @@ BEGIN
    GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX
    CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12
    LTEXT "&IP address:", -1, 14, 75, 135, 8
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 150, 75, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
    LTEXT "S&ubnet mask:", -1, 14, 95, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 150, 95, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
    LTEXT "&Default gateway:", -1, 14, 115, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 150, 115, 80, 12
+    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
    LTEXT "&Preferred DNS server:", -1, 14, 150, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 150, 150, 80, 12
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
    LTEXT "&Alternate DNS server:", -1, 14, 165, 180, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 150, 165, 80, 12
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END

 IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 247
@@ -112,10 +112,10 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TCP/IP Address"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 100, 15, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
    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
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 96, 30, 85, 12
    DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
    PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
@@ -125,7 +125,7 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TCP/IP Gateway Address"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 100, 15, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
    LTEXT "Gateway:", -1, 5, 15, 70, 12
    CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
    LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
@@ -139,7 +139,7 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TCP/IP DNS Server"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 5, 25, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 5, 25, 85, 12
    LTEXT "DNS server:", -1, 5, 10, 120, 12
    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
    PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
--- a/reactos/dll/win32/netcfgx/lang/no-NO.rc
+++ b/reactos/dll/win32/netcfgx/lang/no-NO.rc
@@ -10,18 +10,18 @@ BEGIN
    GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX
    CONTROL "&Bruk følgende IP addresse:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
    LTEXT "IP addresse:", -1, 14, 75, 135, 8
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 150, 75 - 2, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
    LTEXT "Subnet maske:", -1, 14, 90, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 150, 90 - 2, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12
    LTEXT "Standard gateway:", -1, 14, 105, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 150, 105 - 2, 80, 12
+    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
    CONTROL "Motta DNS server addresse automatisk", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 139, 210, 12
    GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX
    CONTROL "&Bruk følgende DNS server addresser", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 152, 12
    LTEXT "Forvalgt DNS server:", -1, 14, 171, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 150, 171 - 2, 80, 12
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 171 - 2, 85, 12
    LTEXT "Alternativ DNS server:", -1, 14, 186, 135, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 150, 186 - 2, 80, 12
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 186 - 2, 85, 12
    PUSHBUTTON "&Avansert", IDC_ADVANCED, 186, 209, 50, 14, WS_TABSTOP
 END

@@ -35,15 +35,15 @@ BEGIN
    GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX
    CONTROL "B&ruker konfigurert", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12
    LTEXT "&IP addresse:", -1, 14, 75, 135, 8
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 150, 75, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
    LTEXT "S&ubnet maske:", -1, 14, 95, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 150, 95, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
    LTEXT "&Standard gateway:", -1, 14, 115, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 150, 115, 80, 12
+    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
    LTEXT "&Valgt DNS server:", -1, 14, 150, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 150, 150, 80, 12
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
    LTEXT "&Alternativ DNS server:", -1, 14, 165, 180, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 150, 165, 80, 12
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END

 IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 247
@@ -112,10 +112,10 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TCP/IP adresse"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 100, 15, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
    LTEXT "IP adresse:", -1, 5, 15, 70, 12
    LTEXT "Subnet maske:", -1, 5, 30, 70, 12
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 96, 30, 85, 12
    DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
    PUSHBUTTON "Avbryt", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
@@ -125,7 +125,7 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TCP/IP Gateway Adresse"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 100, 15, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
    LTEXT "Gateway:", -1, 5, 15, 70, 12
    CHECKBOX "Automatisk metrisk", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
    LTEXT "&Metrisk:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
@@ -139,7 +139,7 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TCP/IP DNS Server"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 5, 25, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 5, 25, 85, 12
    LTEXT "DNS server:", -1, 5, 10, 120, 12
    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
    PUSHBUTTON "Avbryt", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
--- a/reactos/dll/win32/netcfgx/lang/pl-PL.rc
+++ b/reactos/dll/win32/netcfgx/lang/pl-PL.rc
@@ -17,18 +17,18 @@ BEGIN
    GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX
    CONTROL "&Użyj następującego adresu IP:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
    LTEXT "Adres IP:", -1, 14, 75, 135, 8
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 150, 75 - 2, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
    LTEXT "Maska podsieci:", -1, 14, 90, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 150, 90 - 2, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12
    LTEXT "Brama domyślna:", -1, 14, 105, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 150, 105 - 2, 80, 12
+    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
    CONTROL "Pobierz adresy serwerów DNS automatycznie", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 139, 210, 12
    GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX
    CONTROL "&Użyj poniższych adresów serwera DNS", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 152, 12
    LTEXT "Pierwszy serwer DNS:", -1, 14, 171, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 150, 171 - 2, 80, 12
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 171 - 2, 85, 12
    LTEXT "Alternatywny serwer DNS:", -1, 14, 186, 135, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 150, 186 - 2, 80, 12
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 186 - 2, 85, 12
    PUSHBUTTON "&Zaawansowane", IDC_ADVANCED, 186, 209, 50, 14, WS_TABSTOP
 END

@@ -42,15 +42,15 @@ BEGIN
    GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX
    CONTROL "&Ustawienia konfigurowane przez użytkownika", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12
    LTEXT "Adres &IP:", -1, 14, 75, 135, 8
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 150, 75, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
    LTEXT "&Maska podsieci:", -1, 14, 95, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 150, 95, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
    LTEXT "&Brama domyślna:", -1, 14, 115, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 150, 115, 80, 12
+    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
    LTEXT "&Preferowany serwer DNS:", -1, 14, 150, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 150, 150, 80, 12
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
    LTEXT "&Alternatywny serwer DNS:", -1, 14, 165, 180, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 150, 165, 80, 12
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END

 IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 247
@@ -119,10 +119,10 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Adres TCP/IP"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 100, 15, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
    LTEXT "Adres IP:", -1, 5, 15, 70, 12
    LTEXT "Maska podsieci:", -1, 5, 30, 70, 12
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 96, 30, 85, 12
    DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
    PUSHBUTTON "Anuluj", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
@@ -132,7 +132,7 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Adres bramy TCP/IP"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 100, 15, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
    LTEXT "Brama:", -1, 5, 15, 70, 12
    CHECKBOX "Metryka automatyczna", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
    LTEXT "&Metryka:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
@@ -146,7 +146,7 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Serwer DNS TCP/IP"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 5, 25, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 5, 25, 85, 12
    LTEXT "Serwer DNS:", -1, 5, 10, 120, 12
    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
    PUSHBUTTON "Anuluj", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
--- a/reactos/dll/win32/netcfgx/lang/ro-RO.rc
+++ b/reactos/dll/win32/netcfgx/lang/ro-RO.rc
@@ -16,18 +16,18 @@ BEGIN
    GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX
    CONTROL "Folosește adresa ur&mătoare:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
    LTEXT "Adresă I&P:", -1, 14, 75, 135, 8
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 150, 75 - 2, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
    LTEXT "Mas&că de subrețea:", -1, 14, 90, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 150, 90 - 2, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12
    LTEXT "S&erver „poartă” implicit:", -1, 14, 105, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 150, 105 - 2, 80, 12
+    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
    CONTROL "Obține a&utomat adresa serverului DNS", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 139, 210, 12
    GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX
    CONTROL "Folosește adresa &DNS următoare", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 152, 12
    LTEXT "Server DNS p&referat:", -1, 14, 171, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 150, 171 - 2, 80, 12
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 171 - 2, 85, 12
    LTEXT "Server DNS &alternativ:", -1, 14, 186, 135, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 150, 186 - 2, 80, 12
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 186 - 2, 85, 12
    PUSHBUTTON "A&vansate", IDC_ADVANCED, 186, 209, 50, 14, WS_TABSTOP
 END

@@ -41,15 +41,15 @@ BEGIN
    GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX
    CONTROL "Configurată &manual", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 90, 12
    LTEXT "Adresă I&P:", -1, 14, 75, 135, 8
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 150, 75, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
    LTEXT "Mască de su&brețea:", -1, 14, 95, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 150, 95, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
    LTEXT "Server „p&oartă” implicit:", -1, 14, 115, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 150, 115, 80, 12
+    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
    LTEXT "Server &DNS preferat:", -1, 14, 150, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 150, 150, 80, 12
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
    LTEXT "Server DNS &alternativ:", -1, 14, 165, 180, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 150, 165, 80, 12
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END

 IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 247
@@ -118,10 +118,10 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Adresa TCP/IP"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 100, 15, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
    LTEXT "Adresă I&P:", -1, 5, 15, 70, 12
    LTEXT "Mască de su&brețea:", -1, 5, 30, 70, 12
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 96, 30, 85, 12
    DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
    PUSHBUTTON "A&nulează", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
@@ -131,7 +131,7 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Server „poartă” TCP/IP"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 100, 15, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
    LTEXT "Adresa „porții”:", -1, 5, 15, 70, 12
    CHECKBOX "Metrică stabilită a&utomat", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
    LTEXT "&Metrică:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
@@ -145,7 +145,7 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Server DNS TCP/IP"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 5, 25, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 5, 25, 85, 12
    LTEXT "Server &DNS:", -1, 5, 10, 120, 12
    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
    PUSHBUTTON "A&nulează", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
--- a/reactos/dll/win32/netcfgx/lang/ru-RU.rc
+++ b/reactos/dll/win32/netcfgx/lang/ru-RU.rc
@@ -10,18 +10,18 @@ BEGIN
    GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX
    CONTROL "&Использовать следующий IP-адрес:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 140, 12
    LTEXT "IP-адрес:", -1, 14, 75, 135, 8
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 150, 75 - 2, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
    LTEXT "Маска подсети:", -1, 14, 90, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 150, 90 - 2, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12
    LTEXT "Шлюз по умолчанию:", -1, 14, 105, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 150, 105 - 2, 80, 12
+    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
    CONTROL "Получать адрес DNS-сервера автоматически", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 139, 210, 12
    GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX
    CONTROL "&Использовать следующие адреса DNS-серверов:", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 185, 12
    LTEXT "Предпочитаемый DNS-сервер:", -1, 14, 171, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 150, 171 - 2, 80, 12
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 171 - 2, 85, 12
    LTEXT "Альтернативный DNS-сервер:", -1, 14, 186, 135, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 150, 186 - 2, 80, 12
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 186 - 2, 85, 12
    PUSHBUTTON "&Дополнительно", IDC_ADVANCED, 162, 209, 74, 14, WS_TABSTOP
 END

@@ -35,15 +35,15 @@ BEGIN
    GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX
    CONTROL "Настраиваем&ый пользователем", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 130, 12
    LTEXT "IP-&адрес:", -1, 14, 75, 135, 8
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 150, 75, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
    LTEXT "Ма&ска подсети:", -1, 14, 95, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 150, 95, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
    LTEXT "&Основной шлюз:", -1, 14, 115, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 150, 115, 80, 12
+    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
    LTEXT "Пр&едпочитаемый DNS-сервер:", -1, 14, 150, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 150, 150, 80, 12
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
    LTEXT "Ал&ьтернативный DNS-сервер:", -1, 14, 165, 180, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 150, 165, 80, 12
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END

 IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 247
@@ -112,10 +112,10 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TCP/IP адрес"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 100, 15, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
    LTEXT "IP адрес:", -1, 5, 15, 70, 12
    LTEXT "Маска подсети:", -1, 5, 30, 70, 12
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 96, 30, 85, 12
    DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
    PUSHBUTTON "Отмена", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
@@ -125,7 +125,7 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Адрес TCP/IP шлюза"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 100, 15, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
    LTEXT "Шлюз:", -1, 5, 15, 70, 12
    CHECKBOX "Автоматическая метрика", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
    LTEXT "&Метрика:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
@@ -139,7 +139,7 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TCP/IP DNS сервер"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 5, 25, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 5, 25, 85, 12
    LTEXT "DNS сервер:", -1, 5, 10, 120, 12
    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
    PUSHBUTTON "Отмена", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
--- a/reactos/dll/win32/netcfgx/lang/sk-SK.rc
+++ b/reactos/dll/win32/netcfgx/lang/sk-SK.rc
@@ -10,18 +10,18 @@ BEGIN
    GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX
    CONTROL "&Use the following IP address:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
    LTEXT "Adresa IP:", -1, 14, 75, 135, 8
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 150, 75 - 2, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
    LTEXT "Maska podsiete:", -1, 14, 90, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 150, 90 - 2, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12
    LTEXT "Predvolená brána:", -1, 14, 105, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 150, 105 - 2, 80, 12
+    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
    CONTROL "Obtain the DNS server address automatically", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 139, 210, 12
    GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX
    CONTROL "&Use the following DNS server addresses", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 152, 12
    LTEXT "Preferovaný DNS server:", -1, 14, 171, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 150, 171 - 2, 80, 12
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 171 - 2, 85, 12
    LTEXT "Alternatívny DNS server:", -1, 14, 186, 135, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 150, 186 - 2, 80, 12
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 186 - 2, 85, 12
    PUSHBUTTON "&Advanced", IDC_ADVANCED, 186, 209, 50, 14, WS_TABSTOP
 END

@@ -35,15 +35,15 @@ BEGIN
    GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX
    CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12
    LTEXT "Adresa &IP:", -1, 14, 75, 135, 8
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 150, 75, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
    LTEXT "S&ubnet mask:", -1, 14, 95, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 150, 95, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
    LTEXT "&Default gateway:", -1, 14, 115, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 150, 115, 80, 12
+    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
    LTEXT "&Preferred DNS server:", -1, 14, 150, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 150, 150, 80, 12
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
    LTEXT "&Alternate DNS server:", -1, 14, 165, 180, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 150, 165, 80, 12
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END

 IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 247
@@ -112,10 +112,10 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Adresa TCP/IP"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 100, 15, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
    LTEXT "Adresa IP:", -1, 5, 15, 70, 12
    LTEXT "Maska podsiete:", -1, 5, 30, 70, 12
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 96, 30, 85, 12
    DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
    PUSHBUTTON "Zrušiť", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
@@ -125,7 +125,7 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TCP/IP adresa brány" //TCP/IP Gateway Address
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 100, 15, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
    LTEXT "Brána:", -1, 5, 15, 70, 12
    CHECKBOX "Automatická metrika", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
    LTEXT "&Metrika:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
@@ -139,7 +139,7 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TCP/IP DNS Server"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 5, 25, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 5, 25, 85, 12
    LTEXT "DNS server:", -1, 5, 10, 120, 12
    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
    PUSHBUTTON "Zrušiť", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
--- a/reactos/dll/win32/netcfgx/lang/sq-AL.rc
+++ b/reactos/dll/win32/netcfgx/lang/sq-AL.rc
@@ -15,18 +15,18 @@ BEGIN
    GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX
    CONTROL "&Përdor adresën e mëposhtme IP'së:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
    LTEXT "Adresa IP:", -1, 14, 75, 135, 8
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 150, 75 - 2, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
    LTEXT "Subnet mask:", -1, 14, 90, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 150, 90 - 2, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12
    LTEXT "Gateway parazgjedhur:", -1, 14, 105, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 150, 105 - 2, 80, 12
+    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
    CONTROL "Merr adresën e serverit DNS automatikisht", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 139, 210, 12
    GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX
    CONTROL "&Përdorni adresen DNS të server-it të mëposhtme", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 152, 12
    LTEXT "DNS'ja serverit e preferuar:", -1, 14, 171, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 150, 171 - 2, 80, 12
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 171 - 2, 85, 12
    LTEXT "Alterno DNS'në e server-it:", -1, 14, 186, 135, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 150, 186 - 2, 80, 12
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 186 - 2, 85, 12
    PUSHBUTTON "&Përparuar", IDC_ADVANCED, 186, 209, 50, 14, WS_TABSTOP
 END

@@ -40,15 +40,15 @@ BEGIN
    GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX
    CONTROL "Përdorue&si konfiguruar", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12
    LTEXT "Adresa &IP:", -1, 14, 75, 135, 8
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 150, 75, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
    LTEXT "S&ubnet mask:", -1, 14, 95, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 150, 95, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
    LTEXT "Gateway Parazgjedhur:", -1, 14, 115, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 150, 115, 80, 12
+    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
    LTEXT "DNS'ja serverit e &preferuar:", -1, 14, 150, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 150, 150, 80, 12
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
    LTEXT "&Alterno DNS'në e server-it:", -1, 14, 165, 180, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 150, 165, 80, 12
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END

 IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 247
@@ -117,10 +117,10 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Adresa TCP/IP"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 100, 15, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
    LTEXT "Adresa IP:", -1, 5, 15, 70, 12
    LTEXT "Subnet mask:", -1, 5, 30, 70, 12
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 96, 30, 85, 12
    DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
    PUSHBUTTON "Anulo", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
@@ -130,7 +130,7 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TCP/IP Gateway Adresë"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 100, 15, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
    LTEXT "Gateway:", -1, 5, 15, 70, 12
    CHECKBOX "Automatik metrik", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
    LTEXT "&Metrik:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
@@ -144,7 +144,7 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TCP/IP DNS Server"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 5, 25, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 5, 25, 85, 12
    LTEXT "DNS server:", -1, 5, 10, 120, 12
    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
    PUSHBUTTON "Anulo", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
--- a/reactos/dll/win32/netcfgx/lang/sv-SE.rc
+++ b/reactos/dll/win32/netcfgx/lang/sv-SE.rc
@@ -10,18 +10,18 @@ BEGIN
    GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX
    CONTROL "&Använd följande IP-adress:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
    LTEXT "IP-adress:", -1, 14, 75, 135, 8
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 150, 75 - 2, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
    LTEXT "Nätmask:", -1, 14, 90, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 150, 90 - 2, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12
    LTEXT "Standard-gateway:", -1, 14, 105, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 150, 105 - 2, 80, 12
+    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
    CONTROL "Erhåll adress till DNS-server automatiskt", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 139, 210, 12
    GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX
    CONTROL "&Använd följande adress till DNS-server:", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 152, 12
    LTEXT "Önskad DNS-server:", -1, 14, 171, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 150, 171 - 2, 80, 12
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 171 - 2, 85, 12
    LTEXT "Alternativ DNS-server:", -1, 14, 186, 135, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 150, 186 - 2, 80, 12
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 186 - 2, 85, 12
    PUSHBUTTON "&Avancerat", IDC_ADVANCED, 186, 209, 50, 14, WS_TABSTOP
 END

@@ -35,15 +35,15 @@ BEGIN
    GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX
    CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12
    LTEXT "&IP address:", -1, 14, 75, 135, 8
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 150, 75, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
    LTEXT "S&ubnet mask:", -1, 14, 95, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 150, 95, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
    LTEXT "&Default gateway:", -1, 14, 115, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 150, 115, 80, 12
+    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
    LTEXT "&Preferred DNS server:", -1, 14, 150, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 150, 150, 80, 12
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
    LTEXT "&Alternate DNS server:", -1, 14, 165, 180, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 150, 165, 80, 12
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END

 IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 247
@@ -112,10 +112,10 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TCP/IP Address"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 100, 15, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
    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
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 96, 30, 85, 12
    DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
    PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
@@ -125,7 +125,7 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TCP/IP Gateway Address"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 100, 15, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
    LTEXT "Gateway:", -1, 5, 15, 70, 12
    CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
    LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
@@ -139,7 +139,7 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TCP/IP DNS Server"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 5, 25, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 5, 25, 85, 12
    LTEXT "DNS server:", -1, 5, 10, 120, 12
    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
    PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
--- a/reactos/dll/win32/netcfgx/lang/tr-TR.rc
+++ b/reactos/dll/win32/netcfgx/lang/tr-TR.rc
@@ -12,18 +12,18 @@ BEGIN
    GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX
    CONTROL "&Aşağıdaki IP Adresini Kullan:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
    LTEXT "IP Adresi:", -1, 14, 75, 135, 8
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 150, 75 - 2, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
    LTEXT "Alt Ağ Maskesi:", -1, 14, 90, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 150, 90 - 2, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12
    LTEXT "Ön Tanımlı Geçit:", -1, 14, 105, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 150, 105 - 2, 80, 12
+    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
    CONTROL "DNS Sunucusu Adresini Kendiliğinden Al", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 139, 210, 12
    GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX
    CONTROL "A&şağıdaki DNS Sunucusu Adreslerini Kullan", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 152, 12
    LTEXT "Yeğlenen DNS Sunucusu:", -1, 14, 171, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 150, 171 - 2, 80, 12
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 171 - 2, 85, 12
    LTEXT "Başka DNS Sunucusu:", -1, 14, 186, 135, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 150, 186 - 2, 80, 12
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 186 - 2, 85, 12
    PUSHBUTTON "&Gelişmiş", IDC_ADVANCED, 186, 209, 50, 14, WS_TABSTOP
 END

@@ -37,15 +37,15 @@ BEGIN
    GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX
    CONTROL "K&ullanıcının Yapılandırdığı", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12
    LTEXT "&IP Adresi:", -1, 14, 75, 135, 8
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 150, 75, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
    LTEXT "&Alt Ağ Maskesi:", -1, 14, 95, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 150, 95, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
    LTEXT "&Ön Tanımlı Geçit:", -1, 14, 115, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 150, 115, 80, 12
+    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
    LTEXT "&Yeğlenen DNS Sunucusu:", -1, 14, 150, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 150, 150, 80, 12
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
    LTEXT "&Başka DNS Sunucusu:", -1, 14, 165, 180, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 150, 165, 80, 12
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END

 IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 247
@@ -114,10 +114,10 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TCP/IP Addresi"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 100, 15, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
    LTEXT "IP Adresi:", -1, 5, 15, 70, 12
    LTEXT "Alt Ağ Maskesi:", -1, 5, 30, 70, 12
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 96, 30, 85, 12
    DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
    PUSHBUTTON "İptal", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
@@ -127,7 +127,7 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TCP/IP Geçit Adresi"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 100, 15, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
    LTEXT "Geçit:", -1, 5, 15, 70, 12
    CHECKBOX "Kendiliğinden Ölçü", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
    LTEXT "&Ölçü:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
@@ -141,7 +141,7 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TCP/IP DNS Sunucusu"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 5, 25, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 5, 25, 85, 12
    LTEXT "DNS Sunucusu:", -1, 5, 10, 120, 12
    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
    PUSHBUTTON "İptal", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
--- a/reactos/dll/win32/netcfgx/lang/uk-UA.rc
+++ b/reactos/dll/win32/netcfgx/lang/uk-UA.rc
@@ -10,18 +10,18 @@ BEGIN
    GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX
    CONTROL "&Використовувати наступну IP-адресу:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
    LTEXT "IP-адреса:", -1, 14, 75, 135, 8
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 150, 75 - 2, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
    LTEXT "Маска підмережі:", -1, 14, 90, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 150, 90 - 2, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12
    LTEXT "Шлюз за замовчуванням:", -1, 14, 105, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 150, 105 - 2, 80, 12
+    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
    CONTROL "Отримувати адресу DNS-сервера автоматично", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 139, 210, 12
    GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX
    CONTROL "В&икористовувати наступні адреси DNS-серверів", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 152, 12
    LTEXT "Основний DNS-сервер:", -1, 14, 171, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 150, 171 - 2, 80, 12
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 171 - 2, 85, 12
    LTEXT "Альтернативний DNS-сервер:", -1, 14, 186, 135, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 150, 186 - 2, 80, 12
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 186 - 2, 85, 12
    PUSHBUTTON "&Додатково", IDC_ADVANCED, 186, 209, 50, 14, WS_TABSTOP
 END

@@ -35,15 +35,15 @@ BEGIN
    GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX
    CONTROL "Н&алаштована користувачем", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 120, 12
    LTEXT "&IP-адреса:", -1, 14, 75, 135, 8
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 150, 75, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
    LTEXT "Ма&ска підмережі:", -1, 14, 95, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 150, 95, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
    LTEXT "&Шлюз за замовчуванням:", -1, 14, 115, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 150, 115, 80, 12
+    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
    LTEXT "&Основний DNS-сервер:", -1, 14, 150, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 150, 150, 80, 12
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
    LTEXT "&Альтернативний DNS-сервер:", -1, 14, 165, 180, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 150, 165, 80, 12
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END

 IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 247
@@ -112,10 +112,10 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TCP/IP Адреса"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 100, 15, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
    LTEXT "IP-адреса:", -1, 5, 15, 70, 12
    LTEXT "Маска підмережі:", -1, 5, 30, 70, 12
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 96, 30, 85, 12
    DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
    PUSHBUTTON "Скасувати", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
@@ -125,7 +125,7 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Адреса TCP/IP шлюза"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 100, 15, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
    LTEXT "Шлюз:", -1, 5, 15, 70, 12
    CHECKBOX "Автоматична метрика", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
    LTEXT "&Метрика:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
@@ -139,7 +139,7 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TCP/IP DNS Сервер"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 5, 25, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 5, 25, 85, 12
    LTEXT "DNS сервер:", -1, 5, 10, 120, 12
    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
    PUSHBUTTON "Скасувати", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
--- a/reactos/dll/win32/netcfgx/lang/zh-CN.rc
+++ b/reactos/dll/win32/netcfgx/lang/zh-CN.rc
@@ -18,18 +18,18 @@ BEGIN
    GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX
    CONTROL "使用下列的IP 地址(&U):", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
    LTEXT "IP 地址:", -1, 14, 75, 135, 8
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 150, 75 - 2, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
    LTEXT "子网掩码:", -1, 14, 90, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 150, 90 - 2, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12
    LTEXT "网关:", -1, 14, 105, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 150, 105 - 2, 80, 12
+    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
    CONTROL "自动获得 DNS 服务器地址", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 139, 210, 12
    GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX
    CONTROL "使用以下的 DNS 伺服器位址(&U)", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 152, 12
    LTEXT "首选的 DNS 服务器:", -1, 14, 171, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 150, 171 - 2, 80, 12
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 171 - 2, 85, 12
    LTEXT " DNS 服务器:", -1, 14, 186, 135, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 150, 186 - 2, 80, 12
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 186 - 2, 85, 12
    PUSHBUTTON "高级(&A)", IDC_ADVANCED, 186, 209, 50, 14, WS_TABSTOP
 END

@@ -43,15 +43,15 @@ BEGIN
    GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX
    CONTROL "用户配置(&S)", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12
    LTEXT "IP 地址(&I):", -1, 14, 75, 135, 8
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 150, 75, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
    LTEXT "子网掩码(&U):", -1, 14, 95, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 150, 95, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
    LTEXT "网关(&D):", -1, 14, 115, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 150, 115, 80, 12
+    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
    LTEXT "首选的 DNS 服务器(&P):", -1, 14, 150, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 150, 150, 80, 12
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
    LTEXT "备用的 DNS 服务器(&A):", -1, 14, 165, 180, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 150, 165, 80, 12
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END

 IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 247
@@ -120,10 +120,10 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TCP/IP 地址"
 FONT 9, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 100, 15, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
    LTEXT "IP 地址:", -1, 5, 15, 70, 12
    LTEXT "子网掩码:", -1, 5, 30, 70, 12
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 96, 30, 85, 12
    DEFPUSHBUTTON "确定", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
    PUSHBUTTON "取消", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
@@ -133,7 +133,7 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TCP/IP 网关地址"
 FONT 9, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 100, 15, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
    LTEXT "网关:", -1, 5, 15, 70, 12
    CHECKBOX "自动跃点计数", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
    LTEXT "公制(&M):", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
@@ -147,7 +147,7 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TCP/IP DNS Server"
 FONT 9, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 5, 25, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 5, 25, 85, 12
    LTEXT "DNS 服务器:", -1, 5, 10, 120, 12
    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
    PUSHBUTTON "取消", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
--- a/reactos/dll/win32/netcfgx/lang/zh-TW.rc
+++ b/reactos/dll/win32/netcfgx/lang/zh-TW.rc
@@ -18,18 +18,18 @@ BEGIN
    GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX
    CONTROL "使用下列的IP 地址(&U):", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12
    LTEXT "IP 地址:", -1, 14, 75, 135, 8
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 150, 75 - 2, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12
    LTEXT "子網掩碼:", -1, 14, 90, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 150, 90 - 2, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12
    LTEXT "閘道器:", -1, 14, 105, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 150, 105 - 2, 80, 12
+    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12
    CONTROL "自動獲得 DNS 伺服器地址", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 139, 210, 12
    GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX
    CONTROL "使用以下的 DNS 伺服器位址(&U)", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 152, 12
    LTEXT "首選的 DNS 伺服器:", -1, 14, 171, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 150, 171 - 2, 80, 12
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 171 - 2, 85, 12
    LTEXT " DNS 伺服器:", -1, 14, 186, 135, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 150, 186 - 2, 80, 12
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 186 - 2, 85, 12
    PUSHBUTTON "高階(&A)", IDC_ADVANCED, 186, 209, 50, 14, WS_TABSTOP
 END

@@ -43,15 +43,15 @@ BEGIN
    GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX
    CONTROL "使用者配置(&S)", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12
    LTEXT "IP 地址(&I):", -1, 14, 75, 135, 8
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 150, 75, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12
    LTEXT "子網掩碼(&U):", -1, 14, 95, 135, 8
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 150, 95, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12
    LTEXT "閘道器(&D):", -1, 14, 115, 135, 8
-    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 150, 115, 80, 12
+    CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12
    LTEXT "首選的 DNS 伺服器(&P):", -1, 14, 150, 135, 8
-    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 150, 150, 80, 12
+    CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12
    LTEXT "備用的 DNS 伺服器(&A):", -1, 14, 165, 180, 8
-    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 150, 165, 80, 12
+    CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12
 END

 IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 247
@@ -120,10 +120,10 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TCP/IP 地址"
 FONT 9, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 100, 15, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
    LTEXT "IP 地址:", -1, 5, 15, 70, 12
    LTEXT "子網掩碼:", -1, 5, 30, 70, 12
-    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12
+    CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 96, 30, 85, 12
    DEFPUSHBUTTON "確定", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
    PUSHBUTTON "取消", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
@@ -133,7 +133,7 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TCP/IP 閘道器地址"
 FONT 9, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 100, 15, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12
    LTEXT "閘道器:", -1, 5, 15, 70, 12
    CHECKBOX "自動躍點計數", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
    LTEXT "公制(&M):", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
@@ -147,7 +147,7 @@ STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TCP/IP DNS Server"
 FONT 9, "MS Shell Dlg"
 BEGIN
-    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 5, 25, 80, 12
+    CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 5, 25, 85, 12
    LTEXT "DNS 伺服器:", -1, 5, 10, 120, 12
    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
    PUSHBUTTON "取消", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
--- a/reactos/dll/win32/rpcrt4/rpc_transport.c
+++ b/reactos/dll/win32/rpcrt4/rpc_transport.c
@@ -458,7 +458,6 @@ static RPC_STATUS rpcrt4_ncacn_np_handoff(RpcConnection *old_conn, RpcConnection

  /* Store the local computer name as the NetworkAddr for ncacn_np as long as
   * we don't support named pipes over the network. */
-  FIXME("Using local computer name as NetworkAddr\n");
  new_conn->NetworkAddr = HeapAlloc(GetProcessHeap(), 0, len);
  if (!GetComputerNameA(new_conn->NetworkAddr, &len))
  {
--- a/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp
+++ b/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp
@@ -358,6 +358,8 @@ HRESULT WINAPI CDrivesFolder::BindToStorage(PCUIDLIST_RELATIVE pidl, LPBC pbcRes

 HRESULT WINAPI CDrivesFolder::CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1, PCUIDLIST_RELATIVE pidl2)
 {
+    HRESULT hres;
+
    if (!pidl1 || !pidl2)
    {
        ERR("Got null pidl pointer (%Ix %p %p)!\n", lParam, pidl1, pidl2);
@@ -365,7 +367,7 @@ HRESULT WINAPI CDrivesFolder::CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1
    }

    if (_ILIsSpecialFolder(pidl1) || _ILIsSpecialFolder(pidl2))
-        m_regFolder->CompareIDs(lParam, pidl1, pidl2);
+        return m_regFolder->CompareIDs(lParam, pidl1, pidl2);

    if (!_ILIsDrive(pidl1) || !_ILIsDrive(pidl2) || LOWORD(lParam) >= MYCOMPUTERSHELLVIEWCOLUMNS)
        return E_INVALIDARG;
@@ -379,10 +381,12 @@ HRESULT WINAPI CDrivesFolder::CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1
        case 0:        /* name */
        {
            result = stricmp(pszDrive1, pszDrive2);
-            return MAKE_COMPARE_HRESULT(result);
+            hres = MAKE_COMPARE_HRESULT(result);
+            break;
        }
        case 1:        /* Type */
        {
+            /* We want to return immediately because SHELL32_CompareDetails also compares children. */
            return SHELL32_CompareDetails(this, lParam, pidl1, pidl2);
        }
        case 2:       /* Size */
@@ -406,10 +410,17 @@ HRESULT WINAPI CDrivesFolder::CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1
            else /* Size available */
                Diff.QuadPart = Drive1Available.QuadPart - Drive2Available.QuadPart;

-            return MAKE_COMPARE_HRESULT(Diff.QuadPart);
+            hres = MAKE_COMPARE_HRESULT(Diff.QuadPart);
+            break;
        }
+        default:
+            return E_INVALIDARG;
    }
-    return E_INVALIDARG;
+
+    if (HRESULT_CODE(hres) == 0)
+        return SHELL32_CompareChildren(this, lParam, pidl1, pidl2);
+
+    return hres;
 }

 /**************************************************************************
--- a/reactos/dll/win32/shell32/folders/CFSFolder.cpp
+++ b/reactos/dll/win32/shell32/folders/CFSFolder.cpp
@@ -344,6 +344,10 @@ HRESULT WINAPI CFSFolder::CompareIDs(LPARAM lParam,
        case 4: /* Attributes */
            return SHELL32_CompareDetails(this, lParam, pidl1, pidl2);
    }
+
+    if (result == 0)
+        return SHELL32_CompareChildren(this, lParam, pidl1, pidl2);
+
    return MAKE_COMPARE_HRESULT(result);
 }

--- a/reactos/dll/win32/shell32/folders/CRegFolder.cpp
+++ b/reactos/dll/win32/shell32/folders/CRegFolder.cpp
@@ -282,21 +282,24 @@ HRESULT WINAPI CRegFolder::CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1, P
        return E_INVALIDARG;
    }

-    BOOL bIsGuidFolder1 = _ILIsSpecialFolder(pidl1);
-    BOOL bIsGuidFolder2 = _ILIsSpecialFolder(pidl2);
+    GUID const *clsid1 = _ILGetGUIDPointer (pidl1);
+    GUID const *clsid2 = _ILGetGUIDPointer (pidl2);

-    if (!bIsGuidFolder1 && !bIsGuidFolder2)
+    if (!clsid1 && !clsid2)
    {
        ERR("Got no guid pidl!\n");
        return E_INVALIDARG;
    }
-    else if (bIsGuidFolder1 && bIsGuidFolder2)
+    else if (clsid1 && clsid2)
    {
+        if (memcmp(clsid1, clsid2, sizeof(GUID)) == 0)
+            return SHELL32_CompareChildren(this, lParam, pidl1, pidl2);
+
        return SHELL32_CompareDetails(this, lParam, pidl1, pidl2);
    }

    /* Guid folders come first compared to everything else */
-    return MAKE_COMPARE_HRESULT(bIsGuidFolder1 ? -1 : 1);
+    return MAKE_COMPARE_HRESULT(clsid1 ? -1 : 1);
 }

 HRESULT WINAPI CRegFolder::CreateViewObject(HWND hwndOwner, REFIID riid, LPVOID *ppvOut)
--- a/reactos/dll/win32/shell32/shfldr.h
+++ b/reactos/dll/win32/shell32/shfldr.h
@@ -53,6 +53,8 @@ HRESULT SHELL32_GetFSItemAttributes(IShellFolder * psf, LPCITEMIDLIST pidl, LPDW

 HRESULT SHELL32_CompareDetails(IShellFolder2* isf, LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2);

+HRESULT SHELL32_CompareChildren(IShellFolder2* psf, LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2);
+
 HRESULT SHELL32_CoCreateInitSF (LPCITEMIDLIST pidlRoot, LPCWSTR pathRoot,
                LPCITEMIDLIST pidlChild, const GUID* clsid, int csidl, REFIID riid, LPVOID *ppvOut);
                
--- a/reactos/dll/win32/shell32/shlfolder.cpp
+++ b/reactos/dll/win32/shell32/shlfolder.cpp
@@ -435,6 +435,29 @@ HRESULT SHELL32_GetFSItemAttributes(IShellFolder * psf, LPCITEMIDLIST pidl, LPDW
    return S_OK;
 }

+HRESULT SHELL32_CompareChildren(IShellFolder2* psf, LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2)
+{
+    PUIDLIST_RELATIVE nextpidl1 = ILGetNext (pidl1);
+    PUIDLIST_RELATIVE nextpidl2 = ILGetNext (pidl2);
+
+    bool isEmpty1 = _ILIsDesktop(nextpidl1);
+    bool isEmpty2 = _ILIsDesktop(nextpidl2);
+    if (isEmpty1 || isEmpty2)
+        return MAKE_COMPARE_HRESULT(isEmpty2 - isEmpty1);
+
+    PITEMID_CHILD firstpidl = ILCloneFirst (pidl1);
+    if (!firstpidl)
+        return E_OUTOFMEMORY;
+
+    CComPtr<IShellFolder> psf2;
+    HRESULT hr = psf->BindToObject(firstpidl, 0, IID_PPV_ARG(IShellFolder, &psf2));
+    ILFree(firstpidl);
+    if (FAILED(hr))
+        return MAKE_COMPARE_HRESULT(0);
+
+    return psf2->CompareIDs(lParam, nextpidl1, nextpidl2);
+}
+
 HRESULT SHELL32_CompareDetails(IShellFolder2* isf, LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2)
 {
    SHELLDETAILS sd;
@@ -458,6 +481,8 @@ HRESULT SHELL32_CompareDetails(IShellFolder2* isf, LPARAM lParam, LPCITEMIDLIST
        return MAKE_COMPARE_HRESULT(1);

    int ret = wcsicmp(wszItem1, wszItem2);
+    if (ret == 0)
+        return SHELL32_CompareChildren(isf, lParam, pidl1, pidl2);

    return MAKE_COMPARE_HRESULT(ret);
 }
--- a/reactos/drivers/filesystems/fastfat/rw.c
+++ b/reactos/drivers/filesystems/fastfat/rw.c
@@ -656,11 +656,6 @@ VfatRead(
    }

    Buffer = VfatGetUserBuffer(IrpContext->Irp, BooleanFlagOn(IrpContext->Irp->Flags, IRP_PAGING_IO));
-    Status = VfatLockUserBuffer(IrpContext->Irp, Length, IoWriteAccess);
-    if (!NT_SUCCESS(Status))
-    {
-        goto ByeBye;
-    }

    if (!(IrpContext->Irp->Flags & (IRP_NOCACHE|IRP_PAGING_IO)) &&
        !(Fcb->Flags & (FCB_IS_PAGE_FILE|FCB_IS_VOLUME)))
@@ -711,6 +706,12 @@ VfatRead(
    else
    {
        // non cached read
+        Status = VfatLockUserBuffer(IrpContext->Irp, Length, IoWriteAccess);
+        if (!NT_SUCCESS(Status))
+        {
+            goto ByeBye;
+        }
+
        if (ByteOffset.QuadPart + Length > ROUND_UP_64(Fcb->RFCB.FileSize.QuadPart, BytesPerSector))
        {
            Length = (ULONG)(ROUND_UP_64(Fcb->RFCB.FileSize.QuadPart, BytesPerSector) - ByteOffset.QuadPart);
@@ -921,12 +922,6 @@ VfatWrite(
    }

    Buffer = VfatGetUserBuffer(IrpContext->Irp, BooleanFlagOn(IrpContext->Irp->Flags, IRP_PAGING_IO));
-    Status = VfatLockUserBuffer(IrpContext->Irp, Length, IoReadAccess);
-    if (!NT_SUCCESS(Status))
-    {
-        Status = STATUS_INVALID_USER_BUFFER;
-        goto ByeBye;
-    }

    if (!(Fcb->Flags & (FCB_IS_FAT|FCB_IS_VOLUME)) &&
        !(IrpContext->Irp->Flags & IRP_PAGING_IO) &&
@@ -987,6 +982,12 @@ VfatWrite(
    else
    {
        // non cached write
+        Status = VfatLockUserBuffer(IrpContext->Irp, Length, IoReadAccess);
+        if (!NT_SUCCESS(Status))
+        {
+            Status = STATUS_INVALID_USER_BUFFER;
+            goto ByeBye;
+        }

        if (ByteOffset.QuadPart > OldFileSize.QuadPart)
        {
--- a/reactos/drivers/storage/class/disk/disk.c
+++ b/reactos/drivers/storage/class/disk/disk.c
@@ -4283,7 +4283,7 @@ diskMatched:
    DeviceExtension->DiskGeometry->Geometry.SectorsPerTrack = sectorsPerTrack;
    DeviceExtension->DiskGeometry->Geometry.TracksPerCylinder = tracksPerCylinder;
    DeviceExtension->DiskGeometry->Geometry.Cylinders.QuadPart = (LONGLONG)cylinders;
-    DeviceExtension->DiskGeometry->DiskSize.QuadPart = cylinders * tracksPerCylinder * sectorsPerTrack *
+    DeviceExtension->DiskGeometry->DiskSize.QuadPart = (LONGLONG)cylinders * tracksPerCylinder * sectorsPerTrack *
                                                       DeviceExtension->DiskGeometry->Geometry.BytesPerSector;

    DebugPrint((3,
--- a/reactos/drivers/usb/usbehci/usb_request.cpp
+++ b/reactos/drivers/usb/usbehci/usb_request.cpp
@@ -601,6 +601,7 @@ CUSBRequest::InitDescriptor(
        //
        // get address
        //
+        *(volatile char *)TransferBuffer; // HACK for CORE-9224
        Address = MmGetPhysicalAddress(TransferBuffer);

        //
--- a/reactos/drivers/usb/usbohci/usb_request.cpp
+++ b/reactos/drivers/usb/usbohci/usb_request.cpp
@@ -771,6 +771,7 @@ CUSBRequest::BuildIsochronousEndpoint(
        //
        // get physical page
        //
+        *(volatile char *)Buffer; // HACK for CORE-9224
        Page = MmGetPhysicalAddress(Buffer).LowPart;

        //
@@ -1087,6 +1088,7 @@ CUSBRequest::InitDescriptor(
    //
    // store physical address of buffer
    //
+    *(volatile char *)TransferBuffer; // HACK for CORE-9224
    CurrentDescriptor->BufferPhysical = MmGetPhysicalAddress(TransferBuffer).LowPart;
    CurrentDescriptor->LastPhysicalByteAddress = CurrentDescriptor->BufferPhysical + TransferBufferLength - 1; 

@@ -1503,6 +1505,7 @@ CUSBRequest::BuildControlTransferDescriptor(
        //
        // store physical address of buffer
        //
+        *(volatile char *)MmGetMdlVirtualAddress(m_TransferBufferMDL); // HACK for CORE-9224
        DataDescriptor->BufferPhysical = MmGetPhysicalAddress(MmGetMdlVirtualAddress(m_TransferBufferMDL)).LowPart;
        DataDescriptor->LastPhysicalByteAddress = DataDescriptor->BufferPhysical + m_TransferBufferLength - 1;

--- a/reactos/ntoskrnl/fsrtl/dbcsname.c
+++ b/reactos/ntoskrnl/fsrtl/dbcsname.c
@@ -160,14 +160,9 @@ NTAPI
 FsRtlIsDbcsInExpression(IN PANSI_STRING Expression,
                        IN PANSI_STRING Name)
 {
-    USHORT Offset, Position, BackTrackingPosition, OldBackTrackingPosition;
-    USHORT BackTrackingBuffer[16], OldBackTrackingBuffer[16] = {0};
-    PUSHORT BackTrackingSwap, BackTracking = BackTrackingBuffer, OldBackTracking = OldBackTrackingBuffer;
-    USHORT ExpressionPosition, NamePosition = 0, MatchingChars = 1;
-    USHORT NameChar = 0, ExpressionChar;
-    BOOLEAN EndOfName = FALSE;
-    BOOLEAN Result;
-    BOOLEAN DontSkipDot;
+    SHORT StarFound = -1, DosStarFound = -1;
+    PUSHORT BackTracking = NULL, DosBackTracking = NULL;
+    USHORT ExpressionPosition = 0, NamePosition = 0, MatchingChars, LastDot;
    PAGED_CODE();

    ASSERT(Name->Length);
@@ -237,180 +232,170 @@ FsRtlIsDbcsInExpression(IN PANSI_STRING Expression,
        }
    }

-    /* Name parsing loop */
-    for (; !EndOfName; MatchingChars = BackTrackingPosition)
+    while (NamePosition < Name->Length && ExpressionPosition < Expression->Length)
    {
-        /* Reset positions */
-        OldBackTrackingPosition = BackTrackingPosition = 0;
-
-        if (NamePosition >= Name->Length)
+        /* Basic check to test if chars are equal */
+        if ((Expression->Buffer[ExpressionPosition] == Name->Buffer[NamePosition]))
        {
-            EndOfName = TRUE;
-            if (OldBackTracking[MatchingChars - 1] == Expression->Length * 2)
-                break;
+            NamePosition++;
+            ExpressionPosition++;
        }
-        else
+        /* Check cases that eat one char */
+        else if (Expression->Buffer[ExpressionPosition] == '?')
        {
-            /* If lead byte present */
-            if (FsRtlIsLeadDbcsCharacter(Name->Buffer[NamePosition]))
+            NamePosition++;
+            ExpressionPosition++;
+        }
+        /* Test star */
+        else if (Expression->Buffer[ExpressionPosition] == '*')
+        {
+            /* Skip contigous stars */
+            while (ExpressionPosition + 1 < Expression->Length && Expression->Buffer[ExpressionPosition + 1] == '*')
            {
-                NameChar = Name->Buffer[NamePosition] +
-                           (0x100 * Name->Buffer[NamePosition + 1]);
-                NamePosition += sizeof(USHORT);
+                ExpressionPosition++;
+            }
+
+            /* Save star position */
+            if (!BackTracking)
+            {
+                BackTracking = ExAllocatePoolWithTag(PagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE,
+                                                     Expression->Length * sizeof(USHORT), 'nrSF');
+            }
+            BackTracking[++StarFound] = ExpressionPosition++;
+
+            /* If star is at the end, then eat all rest and leave */
+            if (ExpressionPosition == Expression->Length)
+            {
+                NamePosition = Name->Length;
+                break;
+            }
+            /* Allow null matching */
+            else if (Expression->Buffer[ExpressionPosition] != '?' &&
+                     Expression->Buffer[ExpressionPosition] != Name->Buffer[NamePosition])
+            {
+                NamePosition++;
+            }
+        }
+        /* Check DOS_STAR */
+        else if (Expression->Buffer[ExpressionPosition] == ANSI_DOS_STAR)
+        {
+            /* Skip contigous stars */
+            while (ExpressionPosition + 1 < Expression->Length && Expression->Buffer[ExpressionPosition + 1] == ANSI_DOS_STAR)
+            {
+                ExpressionPosition++;
+            }
+
+            /* Look for last dot */
+            MatchingChars = 0;
+            LastDot = (USHORT)-1;
+            while (MatchingChars < Name->Length)
+            {
+                if (Name->Buffer[MatchingChars] == '.')
+                {
+                    LastDot = MatchingChars;
+                    if (LastDot > NamePosition)
+                        break;
+                }
+
+                MatchingChars++;
+            }
+
+            /* If we don't have dots or we didn't find last yet
+             * start eating everything
+             */
+            if (MatchingChars != Name->Length || LastDot == (USHORT)-1)
+            {
+                if (!DosBackTracking) DosBackTracking = ExAllocatePoolWithTag(PagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE,
+                                                                              Expression->Length * sizeof(USHORT), 'nrSF');
+                DosBackTracking[++DosStarFound] = ExpressionPosition++;
+
+                /* Not the same char, start exploring */
+                if (Expression->Buffer[ExpressionPosition] != Name->Buffer[NamePosition])
+                    NamePosition++;
            }
            else
            {
-                NameChar = Name->Buffer[NamePosition];
-                NamePosition += sizeof(UCHAR);
+                /* Else, if we are at last dot, eat it - otherwise, null match */
+                if (Name->Buffer[NamePosition] == '.')
+                    NamePosition++;
+
+                 ExpressionPosition++;
            }
        }
-
-        while (MatchingChars > OldBackTrackingPosition)
+        /* Check DOS_DOT */
+        else if (Expression->Buffer[ExpressionPosition] == ANSI_DOS_DOT)
        {
-            ExpressionPosition = (OldBackTracking[OldBackTrackingPosition++] + 1) / 2;
-
-            /* Expression parsing loop */
-            for (Offset = 0; ExpressionPosition < Expression->Length; )
+            /* We only match dots */
+            if (Name->Buffer[NamePosition] == '.')
            {
-                ExpressionPosition += Offset;
+                NamePosition++;
+            }
+            /* Try to explore later on for null matching */
+            else if (ExpressionPosition + 1 < Expression->Length &&
+                     Name->Buffer[NamePosition] == Expression->Buffer[ExpressionPosition + 1])
+            {
+                NamePosition++;
+            }
+            ExpressionPosition++;
+        }
+        /* Check DOS_QM */
+        else if (Expression->Buffer[ExpressionPosition] == ANSI_DOS_QM)
+        {
+            /* We match everything except dots */
+            if (Name->Buffer[NamePosition] != '.')
+            {
+                NamePosition++;
+            }
+            ExpressionPosition++;
+        }
+        /* If nothing match, try to backtrack */
+        else if (StarFound >= 0)
+        {
+            ExpressionPosition = BackTracking[StarFound--];
+        }
+        else if (DosStarFound >= 0)
+        {
+            ExpressionPosition = DosBackTracking[DosStarFound--];
+        }
+        /* Otherwise, fail */
+        else
+        {
+            break;
+        }

-                if (ExpressionPosition == Expression->Length)
-                {
-                    BackTracking[BackTrackingPosition++] = Expression->Length * 2;
-                    break;
-                }
-
-                /* If buffer too small */
-                if (BackTrackingPosition > RTL_NUMBER_OF(BackTrackingBuffer) - 1)
-                {
-                    /* Allocate memory for BackTracking */
-                    BackTracking = ExAllocatePoolWithTag(PagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE,
-                                                         (Expression->Length + 1) * sizeof(USHORT) * 2,
-                                                         'nrSF');
-                    /* Copy old buffer content */
-                    RtlCopyMemory(BackTracking,
-                                  BackTrackingBuffer,
-                                  RTL_NUMBER_OF(BackTrackingBuffer) * sizeof(USHORT));
-
-                    /* Allocate memory for OldBackTracking */
-                    OldBackTracking = ExAllocatePoolWithTag(PagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE,
-                                                            (Expression->Length + 1) * sizeof(USHORT) * 2,
-                                                            'nrSF');
-                    /* Copy old buffer content */
-                    RtlCopyMemory(OldBackTracking,
-                                  OldBackTrackingBuffer,
-                                  RTL_NUMBER_OF(OldBackTrackingBuffer) * sizeof(USHORT));
-                }
-
-                /* If lead byte present */
-                if (FsRtlIsLeadDbcsCharacter(Expression->Buffer[ExpressionPosition]))
-                {
-                    ExpressionChar = Expression->Buffer[ExpressionPosition] +
-                                     (0x100 * Expression->Buffer[ExpressionPosition + 1]);
-                    Offset = sizeof(USHORT);
-                }
-                else
-                {
-                    ExpressionChar = Expression->Buffer[ExpressionPosition];
-                    Offset = sizeof(UCHAR);
-                }
-
-                /* Basic check to test if chars are equal */
-                if (ExpressionChar == NameChar && !EndOfName)
-                {
-                    BackTracking[BackTrackingPosition++] = (ExpressionPosition + Offset) * 2;
-                }
-                /* Check cases that eat one char */
-                else if (ExpressionChar == '?' && !EndOfName)
-                {
-                    BackTracking[BackTrackingPosition++] = (ExpressionPosition + Offset) * 2;
-                }
-                /* Test star */
-                else if (ExpressionChar == '*')
-                {
-                    BackTracking[BackTrackingPosition++] = ExpressionPosition * 2;
-                    BackTracking[BackTrackingPosition++] = (ExpressionPosition * 2) + 1;
-                    continue;
-                }
-                /* Check DOS_STAR */
-                else if (ExpressionChar == ANSI_DOS_STAR)
-                {
-                    /* Look for last dot */
-                    DontSkipDot = TRUE;
-                    if (!EndOfName && NameChar == '.')
-                    {
-                        for (Position = NamePosition; Position < Name->Length; )
-                        {
-                            /* If lead byte not present */
-                            if (!FsRtlIsLeadDbcsCharacter(Name->Buffer[Position]))
-                            {
-                                if (Name->Buffer[Position] == '.')
-                                {
-                                    DontSkipDot = FALSE;
-                                    break;
-                                }
-
-                                Position += sizeof(UCHAR);
-                            }
-                            else
-                            {
-                                Position += sizeof(USHORT);
-                            }
-                        }
-                    }
-
-                    if (EndOfName || NameChar != '.' || !DontSkipDot)
-                        BackTracking[BackTrackingPosition++] = ExpressionPosition * 2;
-
-                    BackTracking[BackTrackingPosition++] = (ExpressionPosition * 2) + 1;
-                    continue;
-                }
-                /* Check DOS_DOT */
-                else if (ExpressionChar == DOS_DOT)
-                {
-                    if (EndOfName) continue;
-
-                    if (NameChar == '.')
-                        BackTracking[BackTrackingPosition++] = (ExpressionPosition + Offset) * 2;
-                }
-                /* Check DOS_QM */
-                else if (ExpressionChar == ANSI_DOS_QM)
-                {
-                    if (EndOfName || NameChar == '.') continue;
-
-                    BackTracking[BackTrackingPosition++] = (ExpressionPosition + Offset) * 2;
-                }
-
-                /* Leave from loop */
+        /* Under certain circumstances, expression is over, but name isn't
+         * and we can backtrack, then, backtrack */
+        if (ExpressionPosition == Expression->Length &&
+            NamePosition != Name->Length && StarFound >= 0)
+        {
+            ExpressionPosition = BackTracking[StarFound--];
+        }
+    }
+    /* If we have nullable matching wc at the end of the string, eat them */
+    if (ExpressionPosition != Expression->Length && NamePosition == Name->Length)
+    {
+        while (ExpressionPosition < Expression->Length)
+        {
+            if (Expression->Buffer[ExpressionPosition] != ANSI_DOS_DOT &&
+                Expression->Buffer[ExpressionPosition] != '*' &&
+                Expression->Buffer[ExpressionPosition] != ANSI_DOS_STAR)
+            {
                break;
            }
-
-            for (Position = 0; MatchingChars > OldBackTrackingPosition && Position < BackTrackingPosition; Position++)
-            {
-                while (MatchingChars > OldBackTrackingPosition &&
-                       BackTracking[Position] > OldBackTracking[OldBackTrackingPosition])
-                {
-                    ++OldBackTrackingPosition;
-                }
-            }
+            ExpressionPosition++;
        }
-
-        /* Swap pointers */
-        BackTrackingSwap = BackTracking;
-        BackTracking = OldBackTracking;
-        OldBackTracking = BackTrackingSwap;
    }

-    /* Store result value */
-    Result = (OldBackTracking[MatchingChars - 1] == Expression->Length * 2);
-
-    /* Frees the memory if necessary */
-    if (BackTracking != BackTrackingBuffer && BackTracking != OldBackTrackingBuffer)
+    if (BackTracking)
+    {
        ExFreePoolWithTag(BackTracking, 'nrSF');
-    if (OldBackTracking != BackTrackingBuffer && OldBackTracking != OldBackTrackingBuffer)
-        ExFreePoolWithTag(OldBackTracking, 'nrSF');
+    }
+    if (DosBackTracking)
+    {
+        ExFreePoolWithTag(DosBackTracking, 'nrSF');
+    }

-    return Result;
+    return (ExpressionPosition == Expression->Length && NamePosition == Name->Length);
 }

 /*++
--- a/reactos/ntoskrnl/fsrtl/name.c
+++ b/reactos/ntoskrnl/fsrtl/name.c
@@ -23,14 +23,13 @@ FsRtlIsNameInExpressionPrivate(IN PUNICODE_STRING Expression,
                               IN BOOLEAN IgnoreCase,
                               IN PWCHAR UpcaseTable OPTIONAL)
 {
-    USHORT Offset, Position, BackTrackingPosition, OldBackTrackingPosition;
-    USHORT BackTrackingBuffer[16], OldBackTrackingBuffer[16] = {0};
-    PUSHORT BackTrackingSwap, BackTracking = BackTrackingBuffer, OldBackTracking = OldBackTrackingBuffer;
+    SHORT StarFound = -1, DosStarFound = -1;
+    USHORT BackTrackingBuffer[5], DosBackTrackingBuffer[5];
+    PUSHORT BackTracking = BackTrackingBuffer, DosBackTracking = DosBackTrackingBuffer;
+    SHORT BackTrackingSize = RTL_NUMBER_OF(BackTrackingBuffer);
+    SHORT DosBackTrackingSize = RTL_NUMBER_OF(DosBackTrackingBuffer);
    UNICODE_STRING IntExpression;
-    USHORT ExpressionPosition, NamePosition = 0, MatchingChars = 1;
-    BOOLEAN EndOfName = FALSE;
-    BOOLEAN Result;
-    BOOLEAN DontSkipDot;
+    USHORT ExpressionPosition = 0, NamePosition = 0, MatchingChars, LastDot;
    WCHAR CompareChar;
    PAGED_CODE();

@@ -38,7 +37,7 @@ FsRtlIsNameInExpressionPrivate(IN PUNICODE_STRING Expression,
    if (!Name->Length || !Expression->Length)
    {
        /* Return TRUE if both strings are empty, otherwise FALSE */
-        if (!Name->Length && !Expression->Length)
+        if (Name->Length == 0 && Expression->Length == 0)
            return TRUE;
        else
            return FALSE;
@@ -104,144 +103,193 @@ FsRtlIsNameInExpressionPrivate(IN PUNICODE_STRING Expression,
        }
    }

-    /* Name parsing loop */
-    for (; !EndOfName; MatchingChars = BackTrackingPosition, NamePosition++)
+    while ((NamePosition < Name->Length / sizeof(WCHAR)) &&
+           (ExpressionPosition < Expression->Length / sizeof(WCHAR)))
    {
-        /* Reset positions */
-        OldBackTrackingPosition = BackTrackingPosition = 0;
-
-        if (NamePosition >= Name->Length / sizeof(WCHAR))
+        /* Basic check to test if chars are equal */
+        CompareChar = IgnoreCase ? UpcaseTable[Name->Buffer[NamePosition]] :
+                                   Name->Buffer[NamePosition];
+        if (Expression->Buffer[ExpressionPosition] == CompareChar)
        {
-            EndOfName = TRUE;
-            if (OldBackTracking[MatchingChars - 1] == Expression->Length * 2)
-                break;
+            NamePosition++;
+            ExpressionPosition++;
        }
-
-        while (MatchingChars > OldBackTrackingPosition)
+        /* Check cases that eat one char */
+        else if (Expression->Buffer[ExpressionPosition] == L'?')
        {
-            ExpressionPosition = (OldBackTracking[OldBackTrackingPosition++] + 1) / 2;
-
-            /* Expression parsing loop */
-            for (Offset = 0; ExpressionPosition < Expression->Length; Offset = sizeof(WCHAR))
+            NamePosition++;
+            ExpressionPosition++;
+        }
+        /* Test star */
+        else if (Expression->Buffer[ExpressionPosition] == L'*')
+        {
+            /* Skip contigous stars */
+            while ((ExpressionPosition + 1 < (USHORT)(Expression->Length / sizeof(WCHAR))) &&
+                   (Expression->Buffer[ExpressionPosition + 1] == L'*'))
            {
-                ExpressionPosition += Offset;
+                ExpressionPosition++;
+            }

-                if (ExpressionPosition == Expression->Length)
+            /* Save star position */
+            StarFound++;
+            if (StarFound >= BackTrackingSize)
+            {
+                ASSERT(BackTracking == BackTrackingBuffer);
+
+                BackTrackingSize = Expression->Length / sizeof(WCHAR);
+                BackTracking = ExAllocatePoolWithTag(PagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE,
+                                                     BackTrackingSize * sizeof(USHORT),
+                                                     'nrSF');
+                RtlCopyMemory(BackTracking, BackTrackingBuffer, sizeof(BackTrackingBuffer));
+
+            }
+            BackTracking[StarFound] = ExpressionPosition++;
+
+            /* If star is at the end, then eat all rest and leave */
+            if (ExpressionPosition == Expression->Length / sizeof(WCHAR))
+            {
+                NamePosition = Name->Length / sizeof(WCHAR);
+                break;
+            }
+
+            /* Allow null matching */
+            if (Expression->Buffer[ExpressionPosition] != L'?' &&
+                     Expression->Buffer[ExpressionPosition] != Name->Buffer[NamePosition])
+            {
+                NamePosition++;
+            }
+        }
+        /* Check DOS_STAR */
+        else if (Expression->Buffer[ExpressionPosition] == DOS_STAR)
+        {
+            /* Skip contigous stars */
+            while ((ExpressionPosition + 1 < (USHORT)(Expression->Length / sizeof(WCHAR))) &&
+                   (Expression->Buffer[ExpressionPosition + 1] == DOS_STAR))
+            {
+                ExpressionPosition++;
+            }
+
+            /* Look for last dot */
+            MatchingChars = 0;
+            LastDot = (USHORT)-1;
+            while (MatchingChars < Name->Length / sizeof(WCHAR))
+            {
+                if (Name->Buffer[MatchingChars] == L'.')
                {
-                    BackTracking[BackTrackingPosition++] = Expression->Length * 2;
-                    break;
+                    LastDot = MatchingChars;
+                    if (LastDot > NamePosition)
+                        break;
                }

-                /* If buffer too small */
-                if (BackTrackingPosition > RTL_NUMBER_OF(BackTrackingBuffer) - 1)
-                {
-                    /* Allocate memory for BackTracking */
-                    BackTracking = ExAllocatePoolWithTag(PagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE,
-                                                         (Expression->Length + sizeof(WCHAR)) * sizeof(USHORT),
-                                                         'nrSF');
-                    /* Copy old buffer content */
-                    RtlCopyMemory(BackTracking,
-                                  BackTrackingBuffer,
-                                  RTL_NUMBER_OF(BackTrackingBuffer) * sizeof(USHORT));
+                MatchingChars++;
+            }

-                    /* Allocate memory for OldBackTracking */
-                    OldBackTracking = ExAllocatePoolWithTag(PagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE,
-                                                            (Expression->Length + sizeof(WCHAR)) * sizeof(USHORT),
+            /* If we don't have dots or we didn't find last yet
+             * start eating everything
+             */
+            if (MatchingChars != Name->Length || LastDot == (USHORT)-1)
+            {
+                DosStarFound++;
+                if (DosStarFound >= DosBackTrackingSize)
+                {
+                    ASSERT(DosBackTracking == DosBackTrackingBuffer);
+
+                    DosBackTrackingSize = Expression->Length / sizeof(WCHAR);
+                    DosBackTracking = ExAllocatePoolWithTag(PagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE,
+                                                            DosBackTrackingSize * sizeof(USHORT),
                                                            'nrSF');
-                    /* Copy old buffer content */
-                    RtlCopyMemory(OldBackTracking,
-                                  OldBackTrackingBuffer,
-                                  RTL_NUMBER_OF(OldBackTrackingBuffer) * sizeof(USHORT));
+                    RtlCopyMemory(DosBackTracking, DosBackTrackingBuffer, sizeof(DosBackTrackingBuffer));
                }
+                DosBackTracking[DosStarFound] = ExpressionPosition++;

-                /* Basic check to test if chars are equal */
-                CompareChar = IgnoreCase ? UpcaseTable[Name->Buffer[NamePosition]] :
-                                           Name->Buffer[NamePosition];
-                if (Expression->Buffer[ExpressionPosition / sizeof(WCHAR)] == CompareChar && !EndOfName)
-                {
-                    BackTracking[BackTrackingPosition++] = (ExpressionPosition + sizeof(WCHAR)) * 2;
-                }
-                /* Check cases that eat one char */
-                else if (Expression->Buffer[ExpressionPosition / sizeof(WCHAR)] == L'?' && !EndOfName)
-                {
-                    BackTracking[BackTrackingPosition++] = (ExpressionPosition + sizeof(WCHAR)) * 2;
-                }
-                /* Test star */
-                else if (Expression->Buffer[ExpressionPosition / sizeof(WCHAR)] == L'*')
-                {
-                    BackTracking[BackTrackingPosition++] = ExpressionPosition * 2;
-                    BackTracking[BackTrackingPosition++] = (ExpressionPosition * 2) + 3;
-                    continue;
-                }
-                /* Check DOS_STAR */
-                else if (Expression->Buffer[ExpressionPosition / sizeof(WCHAR)] == DOS_STAR)
-                {
-                    /* Look for last dot */
-                    DontSkipDot = TRUE;
-                    if (!EndOfName && Name->Buffer[NamePosition] == '.')
-                    {
-                        for (Position = NamePosition - 1; Position < Name->Length; Position++)
-                        {
-                            if (Name->Buffer[Position] == L'.')
-                            {
-                                DontSkipDot = FALSE;
-                                break;
-                            }
-                        }
-                    }
-
-                    if (EndOfName || Name->Buffer[NamePosition] != L'.' || !DontSkipDot)
-                        BackTracking[BackTrackingPosition++] = ExpressionPosition * 2;
-
-                    BackTracking[BackTrackingPosition++] = (ExpressionPosition * 2) + 3;
-                    continue;
-                }
-                /* Check DOS_DOT */
-                else if (Expression->Buffer[ExpressionPosition / sizeof(WCHAR)] == DOS_DOT)
-                {
-                    if (EndOfName) continue;
-
-                    if (Name->Buffer[NamePosition] == L'.')
-                        BackTracking[BackTrackingPosition++] = (ExpressionPosition + sizeof(WCHAR)) * 2;
-                }
-                /* Check DOS_QM */
-                else if (Expression->Buffer[ExpressionPosition / sizeof(WCHAR)] == DOS_QM)
-                {
-                    if (EndOfName || Name->Buffer[NamePosition] == L'.') continue;
-
-                    BackTracking[BackTrackingPosition++] = (ExpressionPosition + sizeof(WCHAR)) * 2;
-                }
-
-                /* Leave from loop */
-                break;
+                /* Not the same char, start exploring */
+                if (Expression->Buffer[ExpressionPosition] != Name->Buffer[NamePosition])
+                    NamePosition++;
            }
-
-            for (Position = 0; MatchingChars > OldBackTrackingPosition && Position < BackTrackingPosition; Position++)
+            else
            {
-                while (MatchingChars > OldBackTrackingPosition &&
-                       BackTracking[Position] > OldBackTracking[OldBackTrackingPosition])
-                {
-                    ++OldBackTrackingPosition;
-                }
+                /* Else, if we are at last dot, eat it - otherwise, null match */
+                if (Name->Buffer[NamePosition] == '.')
+                    NamePosition++;
+
+                 ExpressionPosition++;
            }
        }
+        /* Check DOS_DOT */
+        else if (Expression->Buffer[ExpressionPosition] == DOS_DOT)
+        {
+            /* We only match dots */
+            if (Name->Buffer[NamePosition] == L'.')
+            {
+                NamePosition++;
+            }
+            /* Try to explore later on for null matching */
+            else if ((ExpressionPosition + 1 < (USHORT)(Expression->Length / sizeof(WCHAR))) &&
+                     (Name->Buffer[NamePosition] == Expression->Buffer[ExpressionPosition + 1]))
+            {
+                NamePosition++;
+            }
+            ExpressionPosition++;
+        }
+        /* Check DOS_QM */
+        else if (Expression->Buffer[ExpressionPosition] == DOS_QM)
+        {
+            /* We match everything except dots */
+            if (Name->Buffer[NamePosition] != L'.')
+            {
+                NamePosition++;
+            }
+            ExpressionPosition++;
+        }
+        /* If nothing match, try to backtrack */
+        else if (StarFound >= 0)
+        {
+            ExpressionPosition = BackTracking[StarFound--];
+        }
+        else if (DosStarFound >= 0)
+        {
+            ExpressionPosition = DosBackTracking[DosStarFound--];
+        }
+        /* Otherwise, fail */
+        else
+        {
+            break;
+        }

-        /* Swap pointers */
-        BackTrackingSwap = BackTracking;
-        BackTracking = OldBackTracking;
-        OldBackTracking = BackTrackingSwap;
+        /* Under certain circumstances, expression is over, but name isn't
+         * and we can backtrack, then, backtrack */
+        if (ExpressionPosition == Expression->Length / sizeof(WCHAR) &&
+            NamePosition != Name->Length / sizeof(WCHAR) &&
+            StarFound >= 0)
+        {
+            ExpressionPosition = BackTracking[StarFound--];
+        }
+    }
+    /* If we have nullable matching wc at the end of the string, eat them */
+    if (ExpressionPosition != Expression->Length / sizeof(WCHAR) && NamePosition == Name->Length / sizeof(WCHAR))
+    {
+        while (ExpressionPosition < Expression->Length / sizeof(WCHAR))
+        {
+            if (Expression->Buffer[ExpressionPosition] != DOS_DOT &&
+                Expression->Buffer[ExpressionPosition] != L'*' &&
+                Expression->Buffer[ExpressionPosition] != DOS_STAR)
+            {
+                break;
+            }
+            ExpressionPosition++;
+        }
    }

-    /* Store result value */
-    Result = (OldBackTracking[MatchingChars - 1] == (Expression->Length * 2));
-
-    /* Frees the memory if necessary */
-    if (BackTracking != BackTrackingBuffer && BackTracking != OldBackTrackingBuffer)
+    if (BackTracking != BackTrackingBuffer)
+    {
        ExFreePoolWithTag(BackTracking, 'nrSF');
-    if (OldBackTracking != BackTrackingBuffer && OldBackTracking != OldBackTrackingBuffer)
-        ExFreePoolWithTag(OldBackTracking, 'nrSF');
+    }
+    if (DosBackTracking != DosBackTrackingBuffer)
+    {
+        ExFreePoolWithTag(DosBackTracking, 'nrSF');
+    }

-    return Result;
+    return (ExpressionPosition == Expression->Length / sizeof(WCHAR) && NamePosition == Name->Length / sizeof(WCHAR));
 }

 /* PUBLIC FUNCTIONS **********************************************************/
--- a/reactos/ntoskrnl/fstub/fstubex.c
+++ b/reactos/ntoskrnl/fstub/fstubex.c
@@ -963,8 +963,12 @@ FstubReadPartitionTableEFI(IN PDISK_INFORMATION Disk,
    ULONG NumberOfEntries;
    PEFI_PARTITION_HEADER EfiHeader;
    EFI_PARTITION_ENTRY PartitionEntry;
+#if 0
    BOOLEAN UpdatedPartitionTable = FALSE;
    ULONGLONG SectorsForPartitions, PartitionEntryLBA;
+#else
+    ULONGLONG PartitionEntryLBA;
+#endif
    PDRIVE_LAYOUT_INFORMATION_EX DriveLayoutEx = NULL;
    ULONG i, PartitionCount, PartitionIndex, PartitionsPerSector;
    PAGED_CODE();
@@ -996,6 +1000,7 @@ FstubReadPartitionTableEFI(IN PDISK_INFORMATION Disk,
        return STATUS_INSUFFICIENT_RESOURCES;
    }

+#if 0
    if (!ReadBackupTable)
    {
        /* If we weren't ask to read backup table,
@@ -1015,6 +1020,7 @@ FstubReadPartitionTableEFI(IN PDISK_INFORMATION Disk,
            UpdatedPartitionTable = TRUE;
        }
    }
+#endif

    DriveLayoutEx->PartitionStyle = PARTITION_STYLE_GPT;
    /* Translate LBA -> Offset */
@@ -1083,12 +1089,14 @@ FstubReadPartitionTableEFI(IN PDISK_INFORMATION Disk,
    }
    DriveLayoutEx->PartitionCount = PartitionCount;

+#if 0
    /* If we updated partition table using backup table, rewrite partition table */
    if (UpdatedPartitionTable)
    {
        IoWritePartitionTableEx(Disk->DeviceObject,
                                DriveLayoutEx);
    }
+#endif

    /* Finally, return read data */
    *DriveLayout = DriveLayoutEx;
@@ -2501,6 +2509,10 @@ IoWritePartitionTableEx(IN PDEVICE_OBJECT DeviceObject,
                                                             DriveLayout->PartitionEntry);
                    }
                }
+                else
+                {
+                    Status = STATUS_INVALID_PARAMETER;
+                }
            }
            break;

--- a/reactos/sdk/include/reactos/version.cmake
+++ b/reactos/sdk/include/reactos/version.cmake
@@ -17,12 +17,12 @@ endmacro()
 string(TIMESTAMP KERNEL_VERSION_BUILD %Y%m%d UTC)

 set(KERNEL_VERSION_MAJOR "0")
-set(KERNEL_VERSION_MINOR "5")
-set(KERNEL_VERSION_PATCH_LEVEL "0")
+set(KERNEL_VERSION_MINOR "4")
+set(KERNEL_VERSION_PATCH_LEVEL "3")
 set(COPYRIGHT_YEAR "2016")

 # KERNEL_VERSION_BUILD_TYPE is "SVN" or "" (for the release)
-set(KERNEL_VERSION_BUILD_TYPE "SVN")
+set(KERNEL_VERSION_BUILD_TYPE "")

 # KERNEL_VERSION_RELEASE_TYPE is "RC1", "RC2" or "" (for the final one)
 set(KERNEL_VERSION_RELEASE_TYPE "")
--- a/reactos/subsystems/mvdm/dos/command.S
+++ b/reactos/subsystems/mvdm/dos/command.S
@@ -17,7 +17,7 @@
 #include "asmxtras.inc"
 #include <isvbop.inc>

-// #define NDEBUG
+#define NDEBUG

 /* DEFINES ********************************************************************/

--- a/reactos/win32ss/gdi/eng/device.c
+++ b/reactos/win32ss/gdi/eng/device.c
@@ -30,6 +30,132 @@ InitDeviceImpl(VOID)
    return STATUS_SUCCESS;
 }

+BOOLEAN
+EngpPopulateDeviceModeList(
+    _Inout_ PGRAPHICS_DEVICE pGraphicsDevice,
+    _In_ PDEVMODEW pdmDefault)
+{
+    PWSTR pwsz;
+    PLDEVOBJ pldev;
+    PDEVMODEINFO pdminfo;
+    PDEVMODEW pdm, pdmEnd;
+    ULONG i, cModes = 0;
+    BOOLEAN bModeMatch = FALSE;
+
+    ASSERT(pGraphicsDevice->pdevmodeInfo == NULL);
+    ASSERT(pGraphicsDevice->pDevModeList == NULL);
+
+    pwsz = pGraphicsDevice->pDiplayDrivers;
+
+    /* Loop through the driver names
+     * This is a REG_MULTI_SZ string */
+    for (; *pwsz; pwsz += wcslen(pwsz) + 1)
+    {
+        TRACE("trying driver: %ls\n", pwsz);
+        /* Try to load the display driver */
+        pldev = EngLoadImageEx(pwsz, LDEV_DEVICE_DISPLAY);
+        if (!pldev)
+        {
+            ERR("Could not load driver: '%ls'\n", pwsz);
+            continue;
+        }
+
+        /* Get the mode list from the driver */
+        pdminfo = LDEVOBJ_pdmiGetModes(pldev, pGraphicsDevice->DeviceObject);
+        if (!pdminfo)
+        {
+            ERR("Could not get mode list for '%ls'\n", pwsz);
+            continue;
+        }
+
+        /* Attach the mode info to the device */
+        pdminfo->pdmiNext = pGraphicsDevice->pdevmodeInfo;
+        pGraphicsDevice->pdevmodeInfo = pdminfo;
+
+        /* Loop all DEVMODEs */
+        pdmEnd = (DEVMODEW*)((PCHAR)pdminfo->adevmode + pdminfo->cbdevmode);
+        for (pdm = pdminfo->adevmode;
+             (pdm + 1 <= pdmEnd) && (pdm->dmSize != 0);
+             pdm = (DEVMODEW*)((PCHAR)pdm + pdm->dmSize + pdm->dmDriverExtra))
+        {
+            /* Count this DEVMODE */
+            cModes++;
+
+            /* Some drivers like the VBox driver don't fill the dmDeviceName
+               with the name of the display driver. So fix that here. */
+            wcsncpy(pdm->dmDeviceName, pwsz, CCHDEVICENAME);
+            pdm->dmDeviceName[CCHDEVICENAME - 1] = 0;
+        }
+
+        // FIXME: release the driver again until it's used?
+    }
+
+    if (!pGraphicsDevice->pdevmodeInfo || cModes == 0)
+    {
+        ERR("No devmodes\n");
+        return FALSE;
+    }
+
+    /* Allocate an index buffer */
+    pGraphicsDevice->cDevModes = cModes;
+    pGraphicsDevice->pDevModeList = ExAllocatePoolWithTag(PagedPool,
+                                                          cModes * sizeof(DEVMODEENTRY),
+                                                          GDITAG_GDEVICE);
+    if (!pGraphicsDevice->pDevModeList)
+    {
+        ERR("No devmode list\n");
+        return FALSE;
+    }
+
+    TRACE("Looking for mode %lux%lux%lu(%lu Hz)\n",
+        pdmDefault->dmPelsWidth,
+        pdmDefault->dmPelsHeight,
+        pdmDefault->dmBitsPerPel,
+        pdmDefault->dmDisplayFrequency);
+
+    /* Loop through all DEVMODEINFOs */
+    for (pdminfo = pGraphicsDevice->pdevmodeInfo, i = 0;
+         pdminfo;
+         pdminfo = pdminfo->pdmiNext)
+    {
+        /* Calculate End of the DEVMODEs */
+        pdmEnd = (DEVMODEW*)((PCHAR)pdminfo->adevmode + pdminfo->cbdevmode);
+
+        /* Loop through the DEVMODEs */
+        for (pdm = pdminfo->adevmode;
+             (pdm + 1 <= pdmEnd) && (pdm->dmSize != 0);
+             pdm = (PDEVMODEW)((PCHAR)pdm + pdm->dmSize + pdm->dmDriverExtra))
+        {
+            TRACE("    %S has mode %lux%lux%lu(%lu Hz)\n",
+                  pdm->dmDeviceName,
+                  pdm->dmPelsWidth,
+                  pdm->dmPelsHeight,
+                  pdm->dmBitsPerPel,
+                  pdm->dmDisplayFrequency);
+            /* Compare with the default entry */
+            if (!bModeMatch &&
+                pdm->dmBitsPerPel == pdmDefault->dmBitsPerPel &&
+                pdm->dmPelsWidth == pdmDefault->dmPelsWidth &&
+                pdm->dmPelsHeight == pdmDefault->dmPelsHeight)
+            {
+                pGraphicsDevice->iDefaultMode = i;
+                pGraphicsDevice->iCurrentMode = i;
+                TRACE("Found default entry: %lu '%ls'\n", i, pdm->dmDeviceName);
+                if (pdm->dmDisplayFrequency == pdmDefault->dmDisplayFrequency)
+                {
+                    /* Uh oh, even the display frequency matches. */
+                    bModeMatch = TRUE;
+                }
+            }
+
+            /* Initialize the entry */
+            pGraphicsDevice->pDevModeList[i].dwFlags = 0;
+            pGraphicsDevice->pDevModeList[i].pdm = pdm;
+            i++;
+        }
+    }
+    return TRUE;
+}

 PGRAPHICS_DEVICE
 NTAPI
@@ -44,13 +170,9 @@ EngpRegisterGraphicsDevice(
    PFILE_OBJECT pFileObject;
    NTSTATUS Status;
    PWSTR pwsz;
-    ULONG i, cj, cModes = 0;
+    ULONG cj;
    SIZE_T cjWritten;
    BOOL bEnable = TRUE;
-    PDEVMODEINFO pdminfo;
-    PDEVMODEW pdm, pdmEnd;
-    PLDEVOBJ pldev;
-    BOOLEAN bModeMatch = FALSE;

    TRACE("EngpRegisterGraphicsDevice(%wZ)\n", pustrDeviceName);

@@ -124,116 +246,14 @@ EngpRegisterGraphicsDevice(
    // FIXME: initialize state flags
    pGraphicsDevice->StateFlags = 0;

-    /* Loop through the driver names
-     * This is a REG_MULTI_SZ string */
-    for (; *pwsz; pwsz += wcslen(pwsz) + 1)
+    /* Create the mode list */
+    pGraphicsDevice->pDevModeList = NULL;
+    if (!EngpPopulateDeviceModeList(pGraphicsDevice, pdmDefault))
    {
-        TRACE("trying driver: %ls\n", pwsz);
-        /* Try to load the display driver */
-        pldev = EngLoadImageEx(pwsz, LDEV_DEVICE_DISPLAY);
-        if (!pldev)
-        {
-            ERR("Could not load driver: '%ls'\n", pwsz);
-            continue;
-        }
-
-        /* Get the mode list from the driver */
-        pdminfo = LDEVOBJ_pdmiGetModes(pldev, pDeviceObject);
-        if (!pdminfo)
-        {
-            ERR("Could not get mode list for '%ls'\n", pwsz);
-            continue;
-        }
-
-        /* Attach the mode info to the device */
-        pdminfo->pdmiNext = pGraphicsDevice->pdevmodeInfo;
-        pGraphicsDevice->pdevmodeInfo = pdminfo;
-
-        /* Loop all DEVMODEs */
-        pdmEnd = (DEVMODEW*)((PCHAR)pdminfo->adevmode + pdminfo->cbdevmode);
-        for (pdm = pdminfo->adevmode;
-             (pdm + 1 <= pdmEnd) && (pdm->dmSize != 0);
-             pdm = (DEVMODEW*)((PCHAR)pdm + pdm->dmSize + pdm->dmDriverExtra))
-        {
-            /* Count this DEVMODE */
-            cModes++;
-
-            /* Some drivers like the VBox driver don't fill the dmDeviceName
-               with the name of the display driver. So fix that here. */
-            wcsncpy(pdm->dmDeviceName, pwsz, CCHDEVICENAME);
-            pdm->dmDeviceName[CCHDEVICENAME - 1] = 0;
-        }
-
-        // FIXME: release the driver again until it's used?
-    }
-
-    if (!pGraphicsDevice->pdevmodeInfo || cModes == 0)
-    {
-        ERR("No devmodes\n");
        ExFreePoolWithTag(pGraphicsDevice, GDITAG_GDEVICE);
        return NULL;
    }

-    /* Allocate an index buffer */
-    pGraphicsDevice->cDevModes = cModes;
-    pGraphicsDevice->pDevModeList = ExAllocatePoolWithTag(PagedPool,
-                                                          cModes * sizeof(DEVMODEENTRY),
-                                                          GDITAG_GDEVICE);
-    if (!pGraphicsDevice->pDevModeList)
-    {
-        ERR("No devmode list\n");
-        ExFreePoolWithTag(pGraphicsDevice, GDITAG_GDEVICE);
-        return NULL;
-    }
-
-    TRACE("Looking for mode %lux%lux%lu(%lu Hz)\n",
-        pdmDefault->dmPelsWidth,
-        pdmDefault->dmPelsHeight,
-        pdmDefault->dmBitsPerPel,
-        pdmDefault->dmDisplayFrequency);
-
-    /* Loop through all DEVMODEINFOs */
-    for (pdminfo = pGraphicsDevice->pdevmodeInfo, i = 0;
-         pdminfo;
-         pdminfo = pdminfo->pdmiNext)
-    {
-        /* Calculate End of the DEVMODEs */
-        pdmEnd = (DEVMODEW*)((PCHAR)pdminfo->adevmode + pdminfo->cbdevmode);
-
-        /* Loop through the DEVMODEs */
-        for (pdm = pdminfo->adevmode;
-             (pdm + 1 <= pdmEnd) && (pdm->dmSize != 0);
-             pdm = (PDEVMODEW)((PCHAR)pdm + pdm->dmSize + pdm->dmDriverExtra))
-        {
-            TRACE("    %S has mode %lux%lux%lu(%lu Hz)\n",
-                  pdm->dmDeviceName,
-                  pdm->dmPelsWidth,
-                  pdm->dmPelsHeight,
-                  pdm->dmBitsPerPel,
-                  pdm->dmDisplayFrequency);
-            /* Compare with the default entry */
-            if (!bModeMatch &&
-                pdm->dmBitsPerPel == pdmDefault->dmBitsPerPel &&
-                pdm->dmPelsWidth == pdmDefault->dmPelsWidth &&
-                pdm->dmPelsHeight == pdmDefault->dmPelsHeight)
-            {
-                pGraphicsDevice->iDefaultMode = i;
-                pGraphicsDevice->iCurrentMode = i;
-                TRACE("Found default entry: %lu '%ls'\n", i, pdm->dmDeviceName);
-                if (pdm->dmDisplayFrequency == pdmDefault->dmDisplayFrequency)
-                {
-                    /* Uh oh, even the display frequency matches. */
-                    bModeMatch = TRUE;
-                }
-            }
-
-            /* Initialize the entry */
-            pGraphicsDevice->pDevModeList[i].dwFlags = 0;
-            pGraphicsDevice->pDevModeList[i].pdm = pdm;
-            i++;
-        }
-     }
-
    /* Lock loader */
    EngAcquireSemaphore(ghsemGraphicsDeviceList);

@@ -250,12 +270,11 @@ EngpRegisterGraphicsDevice(

    /* Unlock loader */
    EngReleaseSemaphore(ghsemGraphicsDeviceList);
-    TRACE("Prepared %lu modes for %ls\n", cModes, pGraphicsDevice->pwszDescription);
+    TRACE("Prepared %lu modes for %ls\n", pGraphicsDevice->cDevModes, pGraphicsDevice->pwszDescription);

    return pGraphicsDevice;
 }

-
 PGRAPHICS_DEVICE
 NTAPI
 EngpFindGraphicsDevice(
--- a/reactos/win32ss/gdi/eng/device.h
+++ b/reactos/win32ss/gdi/eng/device.h
@@ -3,6 +3,11 @@

 #define TAG_GDEV 'gdev'

+VOID
+NTAPI
+PDEVOBJ_vRefreshModeList(
+    PPDEVOBJ ppdev);
+
 extern PGRAPHICS_DEVICE gpPrimaryGraphicsDevice;
 extern PGRAPHICS_DEVICE gpVgaGraphicsDevice;

@@ -29,6 +34,11 @@ EngpRegisterGraphicsDevice(
    _In_ PUNICODE_STRING pustrDescription,
    _In_ PDEVMODEW pdmDefault);

+BOOLEAN
+EngpPopulateDeviceModeList(
+    _Inout_ PGRAPHICS_DEVICE pGraphicsDevice,
+    _In_ PDEVMODEW pdmDefault);
+
 INIT_FUNCTION
 NTSTATUS
 NTAPI
--- a/reactos/win32ss/gdi/eng/pdevobj.c
+++ b/reactos/win32ss/gdi/eng/pdevobj.c
@@ -251,6 +251,45 @@ PDEVOBJ_pSurface(
    return ppdev->pSurface;
 }

+VOID
+NTAPI
+PDEVOBJ_vRefreshModeList(
+    PPDEVOBJ ppdev)
+{
+    PGRAPHICS_DEVICE pGraphicsDevice;
+    PDEVMODEINFO pdminfo, pdmiNext;
+    DEVMODEW dmDefault;
+
+    /* Lock the PDEV */
+    EngAcquireSemaphore(ppdev->hsemDevLock);
+
+    pGraphicsDevice = ppdev->pGraphicsDevice;
+
+    /* Remember our default mode */
+    dmDefault = *pGraphicsDevice->pDevModeList[pGraphicsDevice->iDefaultMode].pdm;
+
+    /* Clear out the modes */
+    for (pdminfo = pGraphicsDevice->pdevmodeInfo;
+         pdminfo;
+         pdminfo = pdmiNext)
+    {
+        pdmiNext = pdminfo->pdmiNext;
+        ExFreePoolWithTag(pdminfo, GDITAG_DEVMODE);
+    }
+    pGraphicsDevice->pdevmodeInfo = NULL;
+    ExFreePoolWithTag(pGraphicsDevice->pDevModeList, GDITAG_GDEVICE);
+    pGraphicsDevice->pDevModeList = NULL;
+
+    /* Now re-populate the list */
+    if (!EngpPopulateDeviceModeList(pGraphicsDevice, &dmDefault))
+    {
+        DPRINT1("FIXME: EngpPopulateDeviceModeList failed, we just destroyed a perfectly good mode list\n");
+    }
+
+    /* Unlock PDEV */
+    EngReleaseSemaphore(ppdev->hsemDevLock);
+}
+
 PDEVMODEW
 NTAPI
 PDEVOBJ_pdmMatchDevMode(
--- a/reactos/win32ss/user/ntuser/display.c
+++ b/reactos/win32ss/user/ntuser/display.c
@@ -463,20 +463,28 @@ UserEnumDisplaySettings(
    PGRAPHICS_DEVICE pGraphicsDevice;
    PDEVMODEENTRY pdmentry;
    ULONG i, iFoundMode;
+    PPDEVOBJ ppdev;

    TRACE("Enter UserEnumDisplaySettings('%wZ', %lu)\n",
          pustrDevice, iModeNum);

    /* Ask GDI for the GRAPHICS_DEVICE */
    pGraphicsDevice = EngpFindGraphicsDevice(pustrDevice, 0, 0);
+    ppdev = EngpGetPDEV(pustrDevice);

-    if (!pGraphicsDevice)
+    if (!pGraphicsDevice || !ppdev)
    {
        /* No device found */
        ERR("No device found!\n");
        return STATUS_INVALID_PARAMETER_1;
    }

+    /* let's politely ask the driver for an updated mode list,
+       just in case there's something new in there (vbox) */
+
+    PDEVOBJ_vRefreshModeList(ppdev);
+    PDEVOBJ_vRelease(ppdev);
+
    iFoundMode = 0;
    for (i = 0; i < pGraphicsDevice->cDevModes; i++)
    {
--- a/reactos/win32ss/user/user32/CMakeLists.txt
+++ b/reactos/win32ss/user/user32/CMakeLists.txt
@@ -64,16 +64,8 @@ list(APPEND SOURCE
    ${CMAKE_CURRENT_BINARY_DIR}/user32_stubs.c
    include/user32.h)

-if(ARCH STREQUAL "i386")
-    list(APPEND ASM_SOURCE
-        windows/wndproc_fixup.S)
-endif()
-
-add_asm_files(user32_asm ${ASM_SOURCE})
-
 add_library(user32 SHARED
    ${SOURCE}
-    ${user32_asm}
    user32.rc
    ${CMAKE_CURRENT_BINARY_DIR}/user32.def)

--- a/reactos/win32ss/user/user32/windows/message.c
+++ b/reactos/win32ss/user/user32/windows/message.c
@@ -14,21 +14,6 @@
 WINE_DEFAULT_DEBUG_CHANNEL(user32);


-#ifdef __i386__
-/* For bad applications which provide bad (non stdcall) WndProc */
-extern
-LRESULT
-__cdecl
-CALL_EXTERN_WNDPROC(
-     WNDPROC WndProc,
-     HWND hWnd,
-     UINT Msg,
-     WPARAM wParam,
-     LPARAM lParam);
-#else
-#  define CALL_EXTERN_WNDPROC(proc, h, m, w, l) proc(h, m, w, l)
-#endif
-
 /* From wine: */
 /* flag for messages that contain pointers */
 /* 32 messages per entry, messages 0..31 map to bits 0..31 */
@@ -1463,7 +1448,15 @@ IntCallWindowProcW(BOOL IsAnsiProc,

      if (PreResult) goto Exit;

-      Result = CALL_EXTERN_WNDPROC(WndProc, AnsiMsg.hwnd, AnsiMsg.message, AnsiMsg.wParam, AnsiMsg.lParam);
+      _SEH2_TRY // wine does this.
+      {
+         Result = WndProc(AnsiMsg.hwnd, AnsiMsg.message, AnsiMsg.wParam, AnsiMsg.lParam);
+      }
+      _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
+      {
+         ERR("Exception when calling Ansi WndProc %p Msg %d pti %p Wndpti %p\n",WndProc,Msg,GetW32ThreadInfo(),pWnd->head.pti);
+      }
+      _SEH2_END;

      if (Hook && MsgOverride)
      {
@@ -1504,7 +1497,15 @@ IntCallWindowProcW(BOOL IsAnsiProc,

      if (PreResult) goto Exit;

-      Result = CALL_EXTERN_WNDPROC(WndProc, hWnd, Msg, wParam, lParam);
+      _SEH2_TRY
+      {
+         Result = WndProc(hWnd, Msg, wParam, lParam);
+      }
+      _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
+      {
+         ERR("Exception when calling unicode WndProc %p Msg %d pti %p Wndpti %p\n",WndProc, Msg,GetW32ThreadInfo(),pWnd->head.pti);
+      }
+      _SEH2_END;

      if (Hook && MsgOverride)
      {
@@ -1584,7 +1585,15 @@ IntCallWindowProcA(BOOL IsAnsiProc,

      if (PreResult) goto Exit;

-      Result = CALL_EXTERN_WNDPROC(WndProc, hWnd, Msg, wParam, lParam);
+      _SEH2_TRY
+      {
+         Result = WndProc(hWnd, Msg, wParam, lParam);
+      }
+      _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
+      {
+         ERR("Exception when calling Ansi WndProc %p Msg %d pti %p Wndpti %p\n",WndProc,Msg,GetW32ThreadInfo(),pWnd->head.pti);
+      }
+      _SEH2_END;

      if (Hook && MsgOverride)
      {
@@ -1632,7 +1641,16 @@ IntCallWindowProcA(BOOL IsAnsiProc,

      if (PreResult) goto Exit;

-      Result = CALL_EXTERN_WNDPROC(WndProc, UnicodeMsg.hwnd, UnicodeMsg.message, UnicodeMsg.wParam, UnicodeMsg.lParam);
+      _SEH2_TRY
+      {
+         Result = WndProc(UnicodeMsg.hwnd, UnicodeMsg.message,
+                          UnicodeMsg.wParam, UnicodeMsg.lParam);
+      }
+      _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
+      {
+         ERR("Exception when calling unicode WndProc %p Msg %d pti %p Wndpti %p\n",WndProc, Msg,GetW32ThreadInfo(),pWnd->head.pti);
+      }
+      _SEH2_END;

      if (Hook && MsgOverride)
      {
--- a/reactos/win32ss/user/user32/windows/wndproc_fixup.S
+++ b/reactos/win32ss/user/user32/windows/wndproc_fixup.S
@@ -1,58 +0,0 @@
-/*
- * COPYRIGHT:       See COPYING in the top level directory
- * PROJECT:         ReactOS user32.dll
- * FILE:            win32ss/user/user32/windows/wndproc_fixup.S
- * PURPOSE:         Messages
- * PROGRAMMER:      Jérôme Gardou jerome.gardou@reactos.org
- * LICENCE :        LGPL, copyright Alexandre Julliard
- */
-
-#include <asm.inc>
-#include <ks386.inc>
-
-/* Some applications provide invalid callbacks which don't follow the stdcall convention */
-
-.code
-
-/* 
- * LRESULT
- * __cdecl 
- * CALL_EXTERN_WNDPROC(
- *     WNDPROC WndProc,
- *     HWND hWnd,
- *     UINT Msg,
- *     WPARAM wParam,
- *     LPARAM lParam);
- */
-PUBLIC _CALL_EXTERN_WNDPROC
-FUNC _CALL_EXTERN_WNDPROC
-    FPO 0, 0, 0, 0, 0, FRAME_FPO
-
-    push ebp
-    mov ebp, esp
-
-    push edi
-    push esi
-    push ebp
-
-    sub esp, 12
-
-    push dword ptr [ebp + 24]
-    push dword ptr [ebp + 20]
-    push dword ptr [ebp + 16]
-    push dword ptr [ebp + 12]
-    mov eax, dword ptr [ebp + 8]
-
-    call eax
-
-    lea esp, dword ptr [ebp - 12]
-    pop ebx
-    pop esi
-    pop edi
-
-    leave
-    ret
-
-ENDFUNC
-
-END
Author	SHA1	Message	Date
Amine Khaldi	75d3ae1a35	[0.4.3] * Update the release type. svn path=/branches/ros-branch-0_4_3/; revision=73222	2016-11-13 10:38:42 +00:00
Amine Khaldi	bd884f3120	[0.4.3] * Merge shell32 fixes by Giannis in r73128. CORE-12106 svn path=/branches/ros-branch-0_4_3/; revision=73131	2016-11-05 11:07:31 +00:00
Amine Khaldi	a6c23e1508	[0.4.3] * Merge FstubReadPartitionTableEFI() fix by Pierre in r73112. CORE-12261 svn path=/branches/ros-branch-0_4_3/; revision=73119	2016-11-04 09:33:03 +00:00
Amine Khaldi	341f08fe62	[0.4.3] * Merge netcfgx changes by Doug in r73117. CORE-12094 svn path=/branches/ros-branch-0_4_3/; revision=73118	2016-11-04 09:30:13 +00:00
Amine Khaldi	2aa1dbe28e	[0.4.3] * Merge IoWritePartitionTableEx() fix by Pierre in r73114. CORE-12261 svn path=/branches/ros-branch-0_4_3/; revision=73116	2016-11-04 09:17:52 +00:00
Amine Khaldi	51f682c062	[0.4.3] * Merge disk size computing overflow fix by Vort in r73113. CORE-12261 svn path=/branches/ros-branch-0_4_3/; revision=73115	2016-11-04 09:16:15 +00:00
Thomas Faber	8d7855228e	[0.4.3] - Merge the fastfat fix for Chrome committed in r73072 CORE-12132 svn path=/branches/ros-branch-0_4_3/; revision=73086	2016-10-30 20:32:02 +00:00
Thomas Faber	d85d2f10e7	[0.4.3] - Revert r72839 & r72835 to avoid the FsRtlIsNameInExpressionPrivate crash from CORE-12121 svn path=/branches/ros-branch-0_4_3/; revision=73081	2016-10-30 18:11:13 +00:00
Amine Khaldi	950ecabf98	[0.4.3] * Merge rpcrt4 noisy fixme removal by Pierre in r73075. svn path=/branches/ros-branch-0_4_3/; revision=73080	2016-10-30 17:19:18 +00:00
Amine Khaldi	4a8ee0589c	[0.4.3] * Merge regsvr32 fix by Mark in r73077. CORE-12209 svn path=/branches/ros-branch-0_4_3/; revision=73079	2016-10-30 17:16:53 +00:00
Amine Khaldi	9c1e755a35	[0.4.3] * Merge eventvwr improvements by Hermès in r73043. CORE-11637 svn path=/branches/ros-branch-0_4_3/; revision=73073	2016-10-29 20:41:45 +00:00
Amine Khaldi	5450d07447	[0.4.3] * Apply the patch that allows us to dynamically change the resolution by resizing in VirtualBox. CORE-6742 svn path=/branches/ros-branch-0_4_3/; revision=73069	2016-10-29 18:25:32 +00:00
Thomas Faber	29accff111	[0.4.3] - Update start menu banner svn path=/branches/ros-branch-0_4_3/; revision=73067	2016-10-29 18:11:47 +00:00
Amine Khaldi	836872de4b	[0.4.3] Add a hack by Thomas to avoid MmGetPhysicalAddress failures during USB transfers. CORE-9224 svn path=/branches/ros-branch-0_4_3/; revision=73066	2016-10-29 18:07:53 +00:00
Amine Khaldi	f8267425bd	[0.4.3] * Disable COMMAND.COM debugging messages. CORE-10710 svn path=/branches/ros-branch-0_4_3/; revision=73065	2016-10-29 18:00:23 +00:00
Amine Khaldi	d7dcbcd3fd	[0.4.3] * Apply the Wordpad related hack from CORE-5823 by Jared Smudde. svn path=/branches/ros-branch-0_4_3/; revision=73064	2016-10-29 17:59:09 +00:00
Amine Khaldi	e1a776f958	[WIN32SS/USER32] Mask exceptions from WndProc, essentially reverting r72495. CORE-11915 svn path=/branches/ros-branch-0_4_3/; revision=73063	2016-10-29 17:57:53 +00:00
Amine Khaldi	5026076e31	[0.4.3] Update the version number. svn path=/branches/ros-branch-0_4_3/; revision=73057	2016-10-28 21:32:23 +00:00
Ziliang Guo	d043f2969e	[0.4.3] Mark branch builds as release candidates. svn path=/branches/ros-branch-0_4_3/; revision=73056	2016-10-28 21:06:03 +00:00