[ros-diffs] [reactos] 01/01: [NETID] Fix validation of host and domain names and show proper error messages.

[Eric Kohl]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b9426a3f0e15e43ddeef9…

commit b9426a3f0e15e43ddeef94234c7074cf5f8dfaca
Author:     Eric Kohl <eric.kohl(a)reactos.org>
AuthorDate: Sun Jan 26 21:00:12 2020 +0100
Commit:     Eric Kohl <eric.kohl(a)reactos.org>
CommitDate: Sun Jan 26 21:00:12 2020 +0100

    [NETID] Fix validation of host and domain names and show proper error messages.
---
 dll/win32/netid/lang/bg-BG.rc |   9 ++-
 dll/win32/netid/lang/cs-CZ.rc |   9 ++-
 dll/win32/netid/lang/de-DE.rc |   9 ++-
 dll/win32/netid/lang/el-GR.rc |   9 ++-
 dll/win32/netid/lang/en-US.rc |  11 +++-
 dll/win32/netid/lang/es-ES.rc |   9 ++-
 dll/win32/netid/lang/fr-FR.rc |   9 ++-
 dll/win32/netid/lang/he-IL.rc |  11 +++-
 dll/win32/netid/lang/id-ID.rc |   9 ++-
 dll/win32/netid/lang/it-IT.rc |   9 ++-
 dll/win32/netid/lang/ja-JP.rc |   9 ++-
 dll/win32/netid/lang/nl-NL.rc |   9 ++-
 dll/win32/netid/lang/no-NO.rc |   9 ++-
 dll/win32/netid/lang/pl-PL.rc |   9 ++-
 dll/win32/netid/lang/pt-PT.rc |  11 +++-
 dll/win32/netid/lang/ro-RO.rc |  11 +++-
 dll/win32/netid/lang/ru-RU.rc |   9 ++-
 dll/win32/netid/lang/sk-SK.rc |   9 ++-
 dll/win32/netid/lang/sq-AL.rc |  11 +++-
 dll/win32/netid/lang/tr-TR.rc |  11 +++-
 dll/win32/netid/lang/uk-UA.rc |   9 ++-
 dll/win32/netid/lang/zh-CN.rc |  11 +++-
 dll/win32/netid/lang/zh-TW.rc |   7 ++-
 dll/win32/netid/netid.c       | 132 +++++++++++++++++++++++++++++++++---------
 24 files changed, 284 insertions(+), 67 deletions(-)

diff --git a/dll/win32/netid/lang/bg-BG.rc b/dll/win32/netid/lang/bg-BG.rc
index caa853c4594..3c4bf1c6a19 100644
--- a/dll/win32/netid/lang/bg-BG.rc
+++ b/dll/win32/netid/lang/bg-BG.rc
@@ -64,13 +64,20 @@ BEGIN
     4 "Смяна името на компютъра"
     5 "Работна група"
     6 "Имение:"
+    7 "The domain name ""%1"" does not conform to Internet
Domain Name Service specifications, although it is a legal ReactOS name. You must use
ReactOS DNS server for non-standard names."
+    8 "The domain name ""%1"" is not properly formatted. Periods
(.) are used to separate domains. Each domain is limited to 63 characters. Example:
domain-1.reactos.org."
+    10 "The new computer name ""%1"" is too long. The name may
not be longer than 63 characters."
+    11 "The new computer name entered is not properly formatted. Standard names may
contain letters (a-z, A-Z), numbers (0-9), and hyphens (-), but no spaces or periods (.).
The name may not consist entirely of digits."
     22 "Добре дошли в работна група %1."
     23 "Добре дошли в имение %1."
     24 "Трябва да презапуснете компютъра, за да влязат промените в действие."
     25 "Можете да смените името и членството на компютъра. Възможно е промените
могат да повлияят на достъпа до мрежовите източници."
     1021 "Забележка: Само управниците могат да променят опознавателите на
компютъра."
     1022 "Забележка: Опознавателят на компютъра не може да бъде сменен,
защото:"
-    1030 "Новото име на компютъра „%s“ съдържа непозволени знаци. Някои от
непозволените знаци са ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : '
"" , . < > / и ?"
+    1029 "The new computer name ""%1"" is a number. The name may
not be a number."
+    1030 "Новото име на компютъра „%1“ съдържа непозволени знаци. Някои от
непозволените знаци са ` ~ ! @ # $ %% ^ & * ( ) = + [ ] { } \\ | ; : '
"" , < > / и ?"
+    1031 "The first domain of the domain name ""%1"" is a
number. The first domain may not be a number."
+    1032 "The domain name ""%1"" contains characters which are
not allowed. Standard DNS names may contain letters (a-z, A-Z), numbers (0-9), and
hyphens, but no spaces. Periods (.) are used to separate domains. Example:
domain-1.reactos.org."
     3210 "&По&дробности >>"
     3220 "<< &По&дробности"
     4000 "Сведения"
diff --git a/dll/win32/netid/lang/cs-CZ.rc b/dll/win32/netid/lang/cs-CZ.rc
index bef09aecf51..714f62b8583 100644
--- a/dll/win32/netid/lang/cs-CZ.rc
+++ b/dll/win32/netid/lang/cs-CZ.rc
@@ -69,13 +69,20 @@ BEGIN
     4 "Změna názvu počítače"
     5 "Pracovní skupina:"
     6 "Doména:"
+    7 "The domain name ""%1"" does not conform to Internet
Domain Name Service specifications, although it is a legal ReactOS name. You must use
ReactOS DNS server for non-standard names."
+    8 "The domain name ""%1"" is not properly formatted. Periods
(.) are used to separate domains. Each domain is limited to 63 characters. Example:
domain-1.reactos.org."
+    10 "The new computer name ""%1"" is too long. The name may
not be longer than 63 characters."
+    11 "The new computer name entered is not properly formatted. Standard names may
contain letters (a-z, A-Z), numbers (0-9), and hyphens (-), but no spaces or periods (.).
The name may not consist entirely of digits."
     22 "Vítejte v pracovní skupině %1."
     23 "Vítejte v doméně %1."
     24 "Aby se změny mohly projevit, musí být počítač restartován."
     25 "Lze změnit název a členství tohoto počítače. Změny mohou mít vliv na přístup
k síťovým prostředkům."
     1021 "Poznámka: Identifikaci tohoto počítače mohou změnit pouze
administrátoři."
     1022 "Poznámka: Identifikace počítače nemůže být změněna z následujících
důvodů:"
-    1030 "Nový název počítače ""%s"" obsahuje nepovolené znaky.
Mezi nepovolené znaky patří ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : '
"" , . < > / ?"
+    1029 "The new computer name ""%1"" is a number. The name may
not be a number."
+    1030 "Nový název počítače ""%1"" obsahuje nepovolené znaky.
Mezi nepovolené znaky patří ` ~ ! @ # $ %% ^ & * ( ) = + [ ] { } \\ | ; : '
"" , < > / ?"
+    1031 "The first domain of the domain name ""%1"" is a
number. The first domain may not be a number."
+    1032 "The domain name ""%1"" contains characters which are
not allowed. Standard DNS names may contain letters (a-z, A-Z), numbers (0-9), and
hyphens, but no spaces. Periods (.) are used to separate domains. Example:
domain-1.reactos.org."
     3210 "&Detaily >>"
     3220 "<< &Detaily"
     4000 "Informace"
diff --git a/dll/win32/netid/lang/de-DE.rc b/dll/win32/netid/lang/de-DE.rc
index 3dbeacfa291..5c3e24c60f9 100644
--- a/dll/win32/netid/lang/de-DE.rc
+++ b/dll/win32/netid/lang/de-DE.rc
@@ -72,13 +72,20 @@ BEGIN
     4 "Computernamen ändern"
     5 "Arbeitsgruppe:"
     6 "Domäne:"
+    7 "Der Domänenname ""%1"" enspricht nicht den
Internet-DNS-Richtlinien, obwohl er ein gültiger ReactOS-Name ist. Verwenden Sie den
ReactOS DNS-Server für nicht standardmäßige Namen."
+    8 "Der Domänenname ""%1"" ist nicht richtig formatiert.
Domänen werden mit einem Punkt (.) abgetrennt. Jede Domäne ist auf 63 Zeichen begrenzt.
Beispiel: domain-1.reactos.org."
+    10 "Der neue Computername ""%1"" ist zu lang. Der Name darf
nicht länger als 63 Zeichen sein."
+    11 "Der neue Computername wurde nicht ordnungsgemäß formatiert. Standardnamen
dürfen Buchstaben (a-z, A-Z), Zahlen (0-9) und Bindestriche (-), aber keine Leerzeichen
oder Punkte (.) enthalten. Der Name darf nicht ausschließlich aus Ziffern bestehen."
     22 "Willkommen in der Arbeitsgruppe %1"
     23 "Willkommen in der Domäne %1"
     24 "Sie müssen den Computer neu starten, damit die Änderungen wirksam
werden."
     25 "Sie können den Namen und die Zugehörigkeit dieses Computers ändern.
Änderungen können sich auf den Zugriff auf Netzwerkressourcen auswirken."
     1021 "Hinweis: Nur Administratoren können die Identifikation des Computers
ändern."
     1022 "Hinweis: Die Identifikation des Computers kann aus folgendem Grund nicht
geändert werden:"
-    1030 "Der Computername ""%s"" enthält unerlaubte Zeichen.
Unerlaubte Zeichen sind ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : '
"" , . < > / und ?"
+    1029 "Der neue Computername ""%1"" ist eine Zahl. Der Name
darf keine Zahl sein."
+    1030 "Der neue Computername ""%s"" enthält nicht erlaubte
Zeichen. Nicht erlaubte Zeichen sind: ` ~ ! @ # $ %% ^ & * ( ) = + [ ] { } \\ | ; :
' "" , < > / und ?"
+    1031 "Die erste Domäne des Domänennamens ""%1"" ist eine
Zahl. Die erste Domäne darf keine Zahl sein."
+    1032 "Der Domänenname ""%1"" enthält nicht erlaubte Zeichen.
Standard DNS-Namen dürfen Buchstaben (a-z, A-Z), Zahlen (0-9) und Bindestriche, aber keine
Leerzeichen enthalten. Domänen werden mit einem Punkt (.) getrennt. Beispiel:
domain-1.reactos.org."
     3210 "&Details >>"
     3220 "<< &Details"
     4000 "Information"
diff --git a/dll/win32/netid/lang/el-GR.rc b/dll/win32/netid/lang/el-GR.rc
index 96dd6c890cf..564cc0093fa 100644
--- a/dll/win32/netid/lang/el-GR.rc
+++ b/dll/win32/netid/lang/el-GR.rc
@@ -64,13 +64,20 @@ BEGIN
     4 "Computer Name Changes"
     5 "Workgroup:"
     6 "Domain:"
+    7 "The domain name ""%1"" does not conform to Internet
Domain Name Service specifications, although it is a legal ReactOS name. You must use
ReactOS DNS server for non-standard names."
+    8 "The domain name ""%1"" is not properly formatted. Periods
(.) are used to separate domains. Each domain is limited to 63 characters. Example:
domain-1.reactos.org."
+    10 "The new computer name ""%1"" is too long. The name may
not be longer than 63 characters."
+    11 "The new computer name entered is not properly formatted. Standard names may
contain letters (a-z, A-Z), numbers (0-9), and hyphens (-), but no spaces or periods (.).
The name may not consist entirely of digits."
     22 "Welcome to the %1 workgroup."
     23 "Welcome to the %1 domain."
     24 "You must restart this computer for the changes to take effect."
     25 "You can change the name and the membership of this computer. Changes may
affect access to network resources."
     1021 "Note: Only Administrators can change the identification of this
computer."
     1022 "Note: The identification of the computer cannot be changed because:"
-    1030 "The new computer name ""%s"" contains characters which
are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = +
_ [ ] { } \\ | ; : ' "" , . < > / and ?"
+    1029 "The new computer name ""%1"" is a number. The name may
not be a number."
+    1030 "The new computer name ""%1"" contains characters which
are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = +
[ ] { } \\ | ; : ' "" , < > / and ?"
+    1031 "The first domain of the domain name ""%1"" is a
number. The first domain may not be a number."
+    1032 "The domain name ""%1"" contains characters which are
not allowed. Standard DNS names may contain letters (a-z, A-Z), numbers (0-9), and
hyphens, but no spaces. Periods (.) are used to separate domains. Example:
domain-1.reactos.org."
     3210 "&Details >>"
     3220 "<< &Details"
     4000 "Information"
diff --git a/dll/win32/netid/lang/en-US.rc b/dll/win32/netid/lang/en-US.rc
index bcc915c88d3..0dd535d3dd5 100644
--- a/dll/win32/netid/lang/en-US.rc
+++ b/dll/win32/netid/lang/en-US.rc
@@ -64,15 +64,20 @@ BEGIN
     4 "Computer Name Changes"
     5 "Workgroup:"
     6 "Domain:"
+    7 "The domain name ""%1"" does not conform to Internet
Domain Name Service specifications, although it is a legal ReactOS name. You must use
ReactOS DNS server for non-standard names."
+    8 "The domain name ""%1"" is not properly formatted. Periods
(.) are used to separate domains. Each domain is limited to 63 characters. Example:
domain-1.reactos.org."
+    10 "The new computer name ""%1"" is too long. The name may
not be longer than 63 characters."
+    11 "The new computer name entered is not properly formatted. Standard names may
contain letters (a-z, A-Z), numbers (0-9), and hyphens (-), but no spaces or periods (.).
The name may not consist entirely of digits."
     22 "Welcome to the %1 workgroup."
     23 "Welcome to the %1 domain."
     24 "You must restart this computer for the changes to take effect."
     25 "You can change the name and the membership of this computer. Changes may
affect access to network resources."
     1021 "Note: Only Administrators can change the identification of this
computer."
     1022 "Note: The identification of the computer cannot be changed because:"
-    1030 "The new computer name ""%s"" contains characters which
are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = +
_ [ ] { } \\ | ; : ' "" , . < > / and ?"
-    /* Windows allows using these characters, although it displays a warning message.
-       Forbidding the use of these characters means incompatibility with Windows. */
+    1029 "The new computer name ""%1"" is a number. The name may
not be a number."
+    1030 "The new computer name ""%1"" contains characters which
are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = +
[ ] { } \\ | ; : ' "" , < > / and ?"
+    1031 "The first domain of the domain name ""%1"" is a
number. The first domain may not be a number."
+    1032 "The domain name ""%1"" contains characters which are
not allowed. Standard DNS names may contain letters (a-z, A-Z), numbers (0-9), and
hyphens, but no spaces. Periods (.) are used to separate domains. Example:
domain-1.reactos.org."
     3210 "&Details >>"
     3220 "<< &Details"
     4000 "Information"
diff --git a/dll/win32/netid/lang/es-ES.rc b/dll/win32/netid/lang/es-ES.rc
index 7c4c19f23aa..16361d40802 100644
--- a/dll/win32/netid/lang/es-ES.rc
+++ b/dll/win32/netid/lang/es-ES.rc
@@ -66,13 +66,20 @@ BEGIN
     4 "Cambios en el nombre del equipo"
     5 "Grupo de trabajo:"
     6 "Dominio:"
+    7 "The domain name ""%1"" does not conform to Internet
Domain Name Service specifications, although it is a legal ReactOS name. You must use
ReactOS DNS server for non-standard names."
+    8 "The domain name ""%1"" is not properly formatted. Periods
(.) are used to separate domains. Each domain is limited to 63 characters. Example:
domain-1.reactos.org."
+    10 "The new computer name ""%1"" is too long. The name may
not be longer than 63 characters."
+    11 "The new computer name entered is not properly formatted. Standard names may
contain letters (a-z, A-Z), numbers (0-9), and hyphens (-), but no spaces or periods (.).
The name may not consist entirely of digits."
     22 "Bienvenido al grupo de trabajo %1."
     23 "Bienvenido al dominio %1."
     24 "Debe reiniciar el equipo para que los cambios tengan efecto."
     25 "Puede cambiar el nombre y la pertenencia de este grupo. Los cambios pueden
afectar el acceso a los recursos de red."
     1021 "Nota: Sólo los Administradores pueden cambiar la identificación de este
equipo."
     1022 "Nota: La identificación de este equipo no puede ser cambiada
porque:"
-    1030 "El nuevo nombre de equipo ""%s"" contiene caracteres
no permitidos. Estos caracteres no permitidos incluyen ` ~ ! @ # $ %% ^ & * ( ) = + _
[ ] { } \\ | ; : ' "" , . < > / y ?"
+    1029 "The new computer name ""%1"" is a number. The name may
not be a number."
+    1030 "El nuevo nombre de equipo ""%1"" contiene caracteres
no permitidos. Estos caracteres no permitidos incluyen ` ~ ! @ # $ %% ^ & * ( ) = + [
] { } \\ | ; : ' "" , < > / y ?"
+    1031 "The first domain of the domain name ""%1"" is a
number. The first domain may not be a number."
+    1032 "The domain name ""%1"" contains characters which are
not allowed. Standard DNS names may contain letters (a-z, A-Z), numbers (0-9), and
hyphens, but no spaces. Periods (.) are used to separate domains. Example:
domain-1.reactos.org."
     3210 "&Detalles >>"
     3220 "<< &Detalles"
     4000 "Información"
diff --git a/dll/win32/netid/lang/fr-FR.rc b/dll/win32/netid/lang/fr-FR.rc
index 77145903236..9ba338a0563 100644
--- a/dll/win32/netid/lang/fr-FR.rc
+++ b/dll/win32/netid/lang/fr-FR.rc
@@ -64,13 +64,20 @@ BEGIN
     4 "Changement du nom de l'ordinateur"
     5 "Groupe de travail :"
     6 "Domaine :"
+    7 "The domain name ""%1"" does not conform to Internet
Domain Name Service specifications, although it is a legal ReactOS name. You must use
ReactOS DNS server for non-standard names."
+    8 "The domain name ""%1"" is not properly formatted. Periods
(.) are used to separate domains. Each domain is limited to 63 characters. Example:
domain-1.reactos.org."
+    10 "The new computer name ""%1"" is too long. The name may
not be longer than 63 characters."
+    11 "The new computer name entered is not properly formatted. Standard names may
contain letters (a-z, A-Z), numbers (0-9), and hyphens (-), but no spaces or periods (.).
The name may not consist entirely of digits."
     22 "Bienvenue dans le groupe de travail %1."
     23 "Bienvenue dans le domaine %1."
     24 "Vous devez redémarrer votre ordinateur pour que les changements soient pris
en compte."
     25 "You can change the name and the membership of this computer. Changes may
affect access to network resources."
     1021 "Note : Seuls les administrateurs peuvent modifier l'identification de
cet ordinateur."
     1022 "Note : L'identification de l'ordinateur ne peut pas être modifiée
car :"
-    1030 "The new computer name ""%s"" contains characters which
are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = +
_ [ ] { } \\ | ; : ' "" , . < > / and ?"
+    1029 "The new computer name ""%1"" is a number. The name may
not be a number."
+    1030 "The new computer name ""%1"" contains characters which
are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = +
[ ] { } \\ | ; : ' "" , < > / and ?"
+    1031 "The first domain of the domain name ""%1"" is a
number. The first domain may not be a number."
+    1032 "The domain name ""%1"" contains characters which are
not allowed. Standard DNS names may contain letters (a-z, A-Z), numbers (0-9), and
hyphens, but no spaces. Periods (.) are used to separate domains. Example:
domain-1.reactos.org."
     3210 "&Détails >>"
     3220 "<< &Détails"
     4000 "Information"
diff --git a/dll/win32/netid/lang/he-IL.rc b/dll/win32/netid/lang/he-IL.rc
index 7ce74e2d859..2ec81df9dd2 100644
--- a/dll/win32/netid/lang/he-IL.rc
+++ b/dll/win32/netid/lang/he-IL.rc
@@ -64,15 +64,20 @@ BEGIN
     4 "Computer Name Changes"
     5 "קבוצת עבודה:"
     6 "מתחם:"
+    7 "The domain name ""%1"" does not conform to Internet
Domain Name Service specifications, although it is a legal ReactOS name. You must use
ReactOS DNS server for non-standard names."
+    8 "The domain name ""%1"" is not properly formatted. Periods
(.) are used to separate domains. Each domain is limited to 63 characters. Example:
domain-1.reactos.org."
+    10 "The new computer name ""%1"" is too long. The name may
not be longer than 63 characters."
+    11 "The new computer name entered is not properly formatted. Standard names may
contain letters (a-z, A-Z), numbers (0-9), and hyphens (-), but no spaces or periods (.).
The name may not consist entirely of digits."
     22 "ברוך הבא לקבוצת העבודה 1%"
     23 "ברוך הבא למתחם 1%"
     24 "You must restart this computer for the changes to take effect."
     25 "You can change the name and the membership of this computer. Changes may
affect access to network resources."
     1021 "Note: Only Administrators can change the identification of this
computer."
     1022 "Note: The identification of the computer cannot be changed because:"
-    1030 "The new computer name ""%s"" contains characters which
are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = +
_ [ ] { } \\ | ; : ' "" , . < > / and ?"
-    /* Windows allows using these characters, although it displays a warning message.
-       Forbidding the use of these characters means incompatibility with Windows. */
+    1029 "The new computer name ""%1"" is a number. The name may
not be a number."
+    1030 "The new computer name ""%1"" contains characters which
are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = +
[ ] { } \\ | ; : ' "" , < > / and ?"
+    1031 "The first domain of the domain name ""%1"" is a
number. The first domain may not be a number."
+    1032 "The domain name ""%1"" contains characters which are
not allowed. Standard DNS names may contain letters (a-z, A-Z), numbers (0-9), and
hyphens, but no spaces. Periods (.) are used to separate domains. Example:
domain-1.reactos.org."
     3210 "&Details >>"
     3220 "<< &Details"
     4000 "מידע"
diff --git a/dll/win32/netid/lang/id-ID.rc b/dll/win32/netid/lang/id-ID.rc
index e81b762bdd7..446fe427115 100644
--- a/dll/win32/netid/lang/id-ID.rc
+++ b/dll/win32/netid/lang/id-ID.rc
@@ -64,13 +64,20 @@ BEGIN
     4 "Ubah Nama Komputer"
     5 "Workgroup:"
     6 "Domain:"
+    7 "The domain name ""%1"" does not conform to Internet
Domain Name Service specifications, although it is a legal ReactOS name. You must use
ReactOS DNS server for non-standard names."
+    8 "The domain name ""%1"" is not properly formatted. Periods
(.) are used to separate domains. Each domain is limited to 63 characters. Example:
domain-1.reactos.org."
+    10 "The new computer name ""%1"" is too long. The name may
not be longer than 63 characters."
+    11 "The new computer name entered is not properly formatted. Standard names may
contain letters (a-z, A-Z), numbers (0-9), and hyphens (-), but no spaces or periods (.).
The name may not consist entirely of digits."
     22 "Welcome to the %1 workgroup."
     23 "Welcome to the %1 domain."
     24 "You must restart this computer for the changes to take effect."
     25 "You can change the name and the membership of this computer. Changes may
affect access to network resources."
     1021 "Note: Only Administrators can change the identification of this
computer."
     1022 "Note: The identification of the computer cannot be changed because:"
-    1030 "The new computer name ""%s"" contains characters which
are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = +
_ [ ] { } \\ | ; : ' "" , . < > / and ?"
+    1029 "The new computer name ""%1"" is a number. The name may
not be a number."
+    1030 "The new computer name ""%1"" contains characters which
are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = +
[ ] { } \\ | ; : ' "" , < > / and ?"
+    1031 "The first domain of the domain name ""%1"" is a
number. The first domain may not be a number."
+    1032 "The domain name ""%1"" contains characters which are
not allowed. Standard DNS names may contain letters (a-z, A-Z), numbers (0-9), and
hyphens, but no spaces. Periods (.) are used to separate domains. Example:
domain-1.reactos.org."
     3210 "&Rincian >>"
     3220 "<< &Rincian"
     4000 "Informasi"
diff --git a/dll/win32/netid/lang/it-IT.rc b/dll/win32/netid/lang/it-IT.rc
index 02b452b0957..568a105fa39 100644
--- a/dll/win32/netid/lang/it-IT.rc
+++ b/dll/win32/netid/lang/it-IT.rc
@@ -66,13 +66,20 @@ BEGIN
     4 "Modifiche al nome del Computer "
     5 "Gruppo di lavoro:"
     6 "Dominio:"
+    7 "The domain name ""%1"" does not conform to Internet
Domain Name Service specifications, although it is a legal ReactOS name. You must use
ReactOS DNS server for non-standard names."
+    8 "The domain name ""%1"" is not properly formatted. Periods
(.) are used to separate domains. Each domain is limited to 63 characters. Example:
domain-1.reactos.org."
+    10 "The new computer name ""%1"" is too long. The name may
not be longer than 63 characters."
+    11 "The new computer name entered is not properly formatted. Standard names may
contain letters (a-z, A-Z), numbers (0-9), and hyphens (-), but no spaces or periods (.).
The name may not consist entirely of digits."
     22 "Benvenuto al gruppo di lavoro %1."
     23 "Benvenuto al dominio %1."
     24 "Il computer deve essere riavviato per rendere operative queste
modifiche."
     25 "Potete modificare il nome e il dominio di questo computer. Le modifiche
potrebbero influenzare l'accesso alle risorse di rete."
     1021 "Nota: Solo gli Amministratori possono cambiare l'identificazione di
questo computer."
     1022 "Nota: L'identificazione di questo computer non può essere cambiata
perchè:"
-    1030 "Il nuovo nome del computer ""%s"" contiene dei
caratteri non permessi. I caratteri vietati sono `? ~ ! @ # $ %% ^ & * ( ) = + _ [ ] {
} \\ | ; : ' "" , . < > / "
+    1029 "The new computer name ""%1"" is a number. The name may
not be a number."
+    1030 "Il nuovo nome del computer ""%1"" contiene dei
caratteri non permessi. I caratteri vietati sono `? ~ ! @ # $ %% ^ & * ( ) = + [ ] { }
\\ | ; : ' "" , < > / "
+    1031 "The first domain of the domain name ""%1"" is a
number. The first domain may not be a number."
+    1032 "The domain name ""%1"" contains characters which are
not allowed. Standard DNS names may contain letters (a-z, A-Z), numbers (0-9), and
hyphens, but no spaces. Periods (.) are used to separate domains. Example:
domain-1.reactos.org."
     3210 "&Dettagli >>"
     3220 "<< &Dettagli"
     4000 "Informazioni"
diff --git a/dll/win32/netid/lang/ja-JP.rc b/dll/win32/netid/lang/ja-JP.rc
index 400219a3c80..74c93c30520 100644
--- a/dll/win32/netid/lang/ja-JP.rc
+++ b/dll/win32/netid/lang/ja-JP.rc
@@ -64,13 +64,20 @@ BEGIN
     4 "コンピュータ名の変更"
     5 "ワークグループ:"
     6 "ドメイン:"
+    7 "The domain name ""%1"" does not conform to Internet
Domain Name Service specifications, although it is a legal ReactOS name. You must use
ReactOS DNS server for non-standard names."
+    8 "The domain name ""%1"" is not properly formatted. Periods
(.) are used to separate domains. Each domain is limited to 63 characters. Example:
domain-1.reactos.org."
+    10 "The new computer name ""%1"" is too long. The name may
not be longer than 63 characters."
+    11 "The new computer name entered is not properly formatted. Standard names may
contain letters (a-z, A-Z), numbers (0-9), and hyphens (-), but no spaces or periods (.).
The name may not consist entirely of digits."
     22 "%1 ワークグループへようこそ。"
     23 "%1 ドメインへようこそ。"
     24 "変更を有効にするには、コンピュータを再起動してください。"
     25 "このコンピュータの名前とメンバシップを変更できます。変更するとネットワーク リソースへのアクセスに影響する可能性があります。"
     1021 "注意: このコンピュータの ID を変更できるのは管理者のみです。"
     1022 "注意: 次の理由により、このコンピュータの ID を変更できません:"
-    1030 "新しいコンピュータ名 ""%s"" には、使用できないな文字が含まれています。使用できない文字は ` ~ !
@ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / ?
です。"
+    1029 "The new computer name ""%1"" is a number. The name may
not be a number."
+    1030 "新しいコンピュータ名 ""%1"" には、使用できないな文字が含まれています。使用できない文字は ` ~ !
@ # $ %% ^ & * ( ) = + [ ] { } \\ | ; : ' "" , < > / ? です。"
+    1031 "The first domain of the domain name ""%1"" is a
number. The first domain may not be a number."
+    1032 "The domain name ""%1"" contains characters which are
not allowed. Standard DNS names may contain letters (a-z, A-Z), numbers (0-9), and
hyphens, but no spaces. Periods (.) are used to separate domains. Example:
domain-1.reactos.org."
     3210 "詳細(&D) >>"
     3220 "<< 詳細(&D)"
     4000 "情報"
diff --git a/dll/win32/netid/lang/nl-NL.rc b/dll/win32/netid/lang/nl-NL.rc
index a7a32f0e97d..92427acd5cd 100644
--- a/dll/win32/netid/lang/nl-NL.rc
+++ b/dll/win32/netid/lang/nl-NL.rc
@@ -64,13 +64,20 @@ BEGIN
     4 "Computernaam Wijzigingen"
     5 "Werkgroep:"
     6 "Domein:"
+    7 "The domain name ""%1"" does not conform to Internet
Domain Name Service specifications, although it is a legal ReactOS name. You must use
ReactOS DNS server for non-standard names."
+    8 "The domain name ""%1"" is not properly formatted. Periods
(.) are used to separate domains. Each domain is limited to 63 characters. Example:
domain-1.reactos.org."
+    10 "The new computer name ""%1"" is too long. The name may
not be longer than 63 characters."
+    11 "The new computer name entered is not properly formatted. Standard names may
contain letters (a-z, A-Z), numbers (0-9), and hyphens (-), but no spaces or periods (.).
The name may not consist entirely of digits."
     22 "Welkom bij de werkgoep %1."
     23 "Welkom bij het domein %1."
     24 "U moet de computer herstarten om de wijzigingen van kracht te laten
gaan."
     25 "You can change the name and the membership of this computer. Changes may
affect access to network resources."
     1021 "Let op: Alleen Administrators mogen de indentificatie van deze computer
aanpassen."
     1022 "Let op: De indentificatie van deze computer kan niet gewijzigd worden
omdat:"
-    1030 "The new computer name ""%s"" contains characters which
are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = +
_ [ ] { } \\ | ; : ' "" , . < > / and ?"
+    1029 "The new computer name ""%1"" is a number. The name may
not be a number."
+    1030 "The new computer name ""%1"" contains characters which
are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = +
[ ] { } \\ | ; : ' "" , < > / and ?"
+    1031 "The first domain of the domain name ""%1"" is a
number. The first domain may not be a number."
+    1032 "The domain name ""%1"" contains characters which are
not allowed. Standard DNS names may contain letters (a-z, A-Z), numbers (0-9), and
hyphens, but no spaces. Periods (.) are used to separate domains. Example:
domain-1.reactos.org."
     3210 "&Details >>"
     3220 "<< &Details"
     4000 "Information"
diff --git a/dll/win32/netid/lang/no-NO.rc b/dll/win32/netid/lang/no-NO.rc
index e596ebec6e1..93685752283 100644
--- a/dll/win32/netid/lang/no-NO.rc
+++ b/dll/win32/netid/lang/no-NO.rc
@@ -64,13 +64,20 @@ BEGIN
     4 "Endring i datamaskinnavn"
     5 "Arbeidsgruppe:"
     6 "Domene:"
+    7 "The domain name ""%1"" does not conform to Internet
Domain Name Service specifications, although it is a legal ReactOS name. You must use
ReactOS DNS server for non-standard names."
+    8 "The domain name ""%1"" is not properly formatted. Periods
(.) are used to separate domains. Each domain is limited to 63 characters. Example:
domain-1.reactos.org."
+    10 "The new computer name ""%1"" is too long. The name may
not be longer than 63 characters."
+    11 "The new computer name entered is not properly formatted. Standard names may
contain letters (a-z, A-Z), numbers (0-9), and hyphens (-), but no spaces or periods (.).
The name may not consist entirely of digits."
     22 "Velkommen til %1 arbeidsgruppen."
     23 "Velkommen til %1 domene."
     24 "Du må starte denne datamaskinen på nytt for at endringene skal tre i
kraft."
     25 "You can change the name and the membership of this computer. Changes may
affect access to network resources."
     1021 "OBS: Bare administratorer kan endre identifisering for denne
datamaskinen."
     1022 "OBS: Identifisering for datamaskinen kunne ikke endres fordi:"
-    1030 "The new computer name ""%s"" contains characters which
are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = +
_ [ ] { } \\ | ; : ' "" , . < > / and ?"
+    1029 "The new computer name ""%1"" is a number. The name may
not be a number."
+    1030 "The new computer name ""%1"" contains characters which
are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = +
[ ] { } \\ | ; : ' "" , < > / and ?"
+    1031 "The first domain of the domain name ""%1"" is a
number. The first domain may not be a number."
+    1032 "The domain name ""%1"" contains characters which are
not allowed. Standard DNS names may contain letters (a-z, A-Z), numbers (0-9), and
hyphens, but no spaces. Periods (.) are used to separate domains. Example:
domain-1.reactos.org."
     3210 "&Detaljer >>"
     3220 "<< &Detaljer"
     4000 "Information"
diff --git a/dll/win32/netid/lang/pl-PL.rc b/dll/win32/netid/lang/pl-PL.rc
index b0661df5eaf..12c75f93ab5 100644
--- a/dll/win32/netid/lang/pl-PL.rc
+++ b/dll/win32/netid/lang/pl-PL.rc
@@ -72,13 +72,20 @@ BEGIN
     4 "Zmiana nazwy komputera"
     5 "Grupa Robocza:"
     6 "Domena:"
+    7 "The domain name ""%1"" does not conform to Internet
Domain Name Service specifications, although it is a legal ReactOS name. You must use
ReactOS DNS server for non-standard names."
+    8 "The domain name ""%1"" is not properly formatted. Periods
(.) are used to separate domains. Each domain is limited to 63 characters. Example:
domain-1.reactos.org."
+    10 "The new computer name ""%1"" is too long. The name may
not be longer than 63 characters."
+    11 "The new computer name entered is not properly formatted. Standard names may
contain letters (a-z, A-Z), numbers (0-9), and hyphens (-), but no spaces or periods (.).
The name may not consist entirely of digits."
     22 "Witamy w grupie roboczej %1."
     23 "Witamy w domenie %1."
     24 "Musisz zrestartować komputer aby zmiany odniosły skutek."
     25 "Możesz zmienić nazwę i członkostwo tego komputera. Zmiany mogą mieć wpływ na
dostęp do zasobów sieciowych."
     1021 "Uwaga: Tylko Administratorzy mogą zmieniać identyfikator tego
komputera."
     1022 "Uwaga: Identyfikator tego komputera nie został zmieniony, powód:"
-    1030 "Nowa nazwa komputera ""%s"" zawiera niedozwolone
znaki. Do niedozwolonych znaków należą ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; :
' "" , . < > / oraz ?"
+    1029 "The new computer name ""%1"" is a number. The name may
not be a number."
+    1030 "Nowa nazwa komputera ""%1"" zawiera niedozwolone
znaki. Do niedozwolonych znaków należą ` ~ ! @ # $ %% ^ & * ( ) = + [ ] { } \\ | ; :
' "" , < > / oraz ?"
+    1031 "The first domain of the domain name ""%1"" is a
number. The first domain may not be a number."
+    1032 "The domain name ""%1"" contains characters which are
not allowed. Standard DNS names may contain letters (a-z, A-Z), numbers (0-9), and
hyphens, but no spaces. Periods (.) are used to separate domains. Example:
domain-1.reactos.org."
     3210 "&Szczegóły >>"
     3220 "<< &Szczegóły"
     4000 "Informacja"
diff --git a/dll/win32/netid/lang/pt-PT.rc b/dll/win32/netid/lang/pt-PT.rc
index 6e2c1d7582a..c42c506c265 100644
--- a/dll/win32/netid/lang/pt-PT.rc
+++ b/dll/win32/netid/lang/pt-PT.rc
@@ -69,15 +69,20 @@ BEGIN
     4 "Alterar o nome do computador"
     5 "Grupo de trabalho:"
     6 "Domínio:"
+    7 "The domain name ""%1"" does not conform to Internet
Domain Name Service specifications, although it is a legal ReactOS name. You must use
ReactOS DNS server for non-standard names."
+    8 "The domain name ""%1"" is not properly formatted. Periods
(.) are used to separate domains. Each domain is limited to 63 characters. Example:
domain-1.reactos.org."
+    10 "The new computer name ""%1"" is too long. The name may
not be longer than 63 characters."
+    11 "The new computer name entered is not properly formatted. Standard names may
contain letters (a-z, A-Z), numbers (0-9), and hyphens (-), but no spaces or periods (.).
The name may not consist entirely of digits."
     22 "Bem-vindo ao grupo de trabalho %1."
     23 "Bem-vindo ao domínio %1."
     24 "Tem de reiniciar o computador para que as alterações entrem em vigor."
     25 "Pode alterar o nome e a participação deste computador em domínios. Tais
alterações podem afectar o acesso aos recursos da rede."
     1021 "Nota: Somente administradores podem alterar a identificação deste
computador."
     1022 "Nota: A identificação do computador não pode ser alterada porque:"
-    1030 "O novo nome do computador ""%s"" contém caracteres que
não são permitidos. Caracteres que não são permitidos incluem ` ~ ! @ # $ %% ^ & * ( )
= + _ [ ] { } \\ | ; : ' "" , . < > / e ?"
-    /* Windows allows using these characters, although it displays a warning message.
-       Forbidding the use of these characters means incompatibility with Windows. */
+    1029 "The new computer name ""%1"" is a number. The name may
not be a number."
+    1030 "O novo nome do computador ""%1"" contém caracteres que
não são permitidos. Caracteres que não são permitidos incluem ` ~ ! @ # $ %% ^ & * ( )
= + [ ] { } \\ | ; : ' "" , < > / e ?"
+    1031 "The first domain of the domain name ""%1"" is a
number. The first domain may not be a number."
+    1032 "The domain name ""%1"" contains characters which are
not allowed. Standard DNS names may contain letters (a-z, A-Z), numbers (0-9), and
hyphens, but no spaces. Periods (.) are used to separate domains. Example:
domain-1.reactos.org."
     3210 "&Detalhes >>"
     3220 "<< &Detalhes"
     4000 "Informação"
diff --git a/dll/win32/netid/lang/ro-RO.rc b/dll/win32/netid/lang/ro-RO.rc
index 9490496e9dd..2ba7e8e124a 100644
--- a/dll/win32/netid/lang/ro-RO.rc
+++ b/dll/win32/netid/lang/ro-RO.rc
@@ -70,15 +70,20 @@ BEGIN
     4 "Schimbarea identității calculatorului"
     5 "Grup de lucru:"
     6 "Domeniu:"
+    7 "The domain name ""%1"" does not conform to Internet
Domain Name Service specifications, although it is a legal ReactOS name. You must use
ReactOS DNS server for non-standard names."
+    8 "The domain name ""%1"" is not properly formatted. Periods
(.) are used to separate domains. Each domain is limited to 63 characters. Example:
domain-1.reactos.org."
+    10 "The new computer name ""%1"" is too long. The name may
not be longer than 63 characters."
+    11 "The new computer name entered is not properly formatted. Standard names may
contain letters (a-z, A-Z), numbers (0-9), and hyphens (-), but no spaces or periods (.).
The name may not consist entirely of digits."
     22 "Bun venit în grupul de lucru „%1”."
     23 "Bun venit în domeniul „%1”."
     24 "Repornirea calculatorului este necesară pentru a aplica schimbările
aduse."
     25 "Puteți schimba numele și apartenența acestui calculator la un domeniu sau
grup de lucru. Schimbările pot afecta accesul la resursele rețelei."
     1021 "Notă: Doar administratorii pot schimba identitatea calculatorului."
     1022 "Notă: Identitatea calculatorului nu poate fi schimbată deoarece:"
-    1030 "Noul nume „%s” conține caractere nepermise. Caracterele nepermise sunt ` ~
! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / și
?"
-    /* Windows allows using these characters, although it displays a warning message.
-       Forbidding the use of these characters means incompatibility with Windows. */
+    1029 "The new computer name ""%1"" is a number. The name may
not be a number."
+    1030 "Noul nume „%1” conține caractere nepermise. Caracterele nepermise sunt ` ~
! @ # $ %% ^ & * ( ) = + [ ] { } \\ | ; : ' "" , < > / și ?"
+    1031 "The first domain of the domain name ""%1"" is a
number. The first domain may not be a number."
+    1032 "The domain name ""%1"" contains characters which are
not allowed. Standard DNS names may contain letters (a-z, A-Z), numbers (0-9), and
hyphens, but no spaces. Periods (.) are used to separate domains. Example:
domain-1.reactos.org."
     3210 "&Detalii >>"
     3220 "<< &Detalii"
     4000 "Informație"
diff --git a/dll/win32/netid/lang/ru-RU.rc b/dll/win32/netid/lang/ru-RU.rc
index a1cced0a679..4ad76873ff0 100644
--- a/dll/win32/netid/lang/ru-RU.rc
+++ b/dll/win32/netid/lang/ru-RU.rc
@@ -64,13 +64,20 @@ BEGIN
     4 "Изменение имени компьютера"
     5 "Рабочая группа:"
     6 "Домен:"
+    7 "The domain name ""%1"" does not conform to Internet
Domain Name Service specifications, although it is a legal ReactOS name. You must use
ReactOS DNS server for non-standard names."
+    8 "The domain name ""%1"" is not properly formatted. Periods
(.) are used to separate domains. Each domain is limited to 63 characters. Example:
domain-1.reactos.org."
+    10 "The new computer name ""%1"" is too long. The name may
not be longer than 63 characters."
+    11 "The new computer name entered is not properly formatted. Standard names may
contain letters (a-z, A-Z), numbers (0-9), and hyphens (-), but no spaces or periods (.).
The name may not consist entirely of digits."
     22 "Добро пожаловать в рабочую группу %1."
     23 "Добро пожаловать в домен %1."
     24 "Необходимо перезапустить компьютер для того, чтобы эти изменения вступили в
силу."
     25 "Можно изменить имя и принадлежность этого компьютера. Изменения могут
повлиять на доступ к сетевым ресурсам."
     1021 "Примечание: только администраторы могут изменить идентификацию этого
компьютера."
     1022 "Примечание: идентификация этого компьютера не может быть изменена, потому
что:"
-    1030 "Новое имя компьютера ""%s"" содержит запрещенные
знаки. Запрещенные знаки ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : '
"" , . < > / и ?"
+    1029 "The new computer name ""%1"" is a number. The name may
not be a number."
+    1030 "Новое имя компьютера ""%1"" содержит запрещенные
знаки. Запрещенные знаки ` ~ ! @ # $ %% ^ & * ( ) = + [ ] { } \\ | ; : '
"" , < > / и ?"
+    1031 "The first domain of the domain name ""%1"" is a
number. The first domain may not be a number."
+    1032 "The domain name ""%1"" contains characters which are
not allowed. Standard DNS names may contain letters (a-z, A-Z), numbers (0-9), and
hyphens, but no spaces. Periods (.) are used to separate domains. Example:
domain-1.reactos.org."
     3210 "&Подробно >>"
     3220 "<< &Подробно"
     4000 "Информация"
diff --git a/dll/win32/netid/lang/sk-SK.rc b/dll/win32/netid/lang/sk-SK.rc
index 8039d8d3f36..e2e963ccd32 100644
--- a/dll/win32/netid/lang/sk-SK.rc
+++ b/dll/win32/netid/lang/sk-SK.rc
@@ -71,13 +71,20 @@ BEGIN
     4 "Zmena názvu počítača"
     5 "Pracovná skupina:"
     6 "Doména:"
+    7 "The domain name ""%1"" does not conform to Internet
Domain Name Service specifications, although it is a legal ReactOS name. You must use
ReactOS DNS server for non-standard names."
+    8 "The domain name ""%1"" is not properly formatted. Periods
(.) are used to separate domains. Each domain is limited to 63 characters. Example:
domain-1.reactos.org."
+    10 "The new computer name ""%1"" is too long. The name may
not be longer than 63 characters."
+    11 "The new computer name entered is not properly formatted. Standard names may
contain letters (a-z, A-Z), numbers (0-9), and hyphens (-), but no spaces or periods (.).
The name may not consist entirely of digits."
     22 "Vitajte v pracovnej skupine %1."
     23 "Vitajte v doméne %1."
     24 "Aby sa prejavili vykonané zmeny, musíte reštartovať počítač."
     25 "You can change the name and the membership of this computer. Changes may
affect access to network resources."
     1021 "Poznámka: Iba správcovia môžu zmeniť identifikáciu tohto počítača."
     1022 "Poznámka: Identifikácia počítača nemôže byť zmenená, lebo:"
-    1030 "The new computer name ""%s"" contains characters which
are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = +
_ [ ] { } \\ | ; : ' "" , . < > / and ?"
+    1029 "The new computer name ""%1"" is a number. The name may
not be a number."
+    1030 "The new computer name ""%1"" contains characters which
are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = +
[ ] { } \\ | ; : ' "" , < > / and ?"
+    1031 "The first domain of the domain name ""%1"" is a
number. The first domain may not be a number."
+    1032 "The domain name ""%1"" contains characters which are
not allowed. Standard DNS names may contain letters (a-z, A-Z), numbers (0-9), and
hyphens, but no spaces. Periods (.) are used to separate domains. Example:
domain-1.reactos.org."
     3210 "&Podrobnosti >>"
     3220 "<< &Podrobnosti"
     4000 "Information"
diff --git a/dll/win32/netid/lang/sq-AL.rc b/dll/win32/netid/lang/sq-AL.rc
index 5aae53786c1..bb839c8d448 100644
--- a/dll/win32/netid/lang/sq-AL.rc
+++ b/dll/win32/netid/lang/sq-AL.rc
@@ -68,15 +68,20 @@ BEGIN
     4 "Emri Kompjuterit Ndryshon"
     5 "GrupPune:"
     6 "Domain:"
+    7 "The domain name ""%1"" does not conform to Internet
Domain Name Service specifications, although it is a legal ReactOS name. You must use
ReactOS DNS server for non-standard names."
+    8 "The domain name ""%1"" is not properly formatted. Periods
(.) are used to separate domains. Each domain is limited to 63 characters. Example:
domain-1.reactos.org."
+    10 "The new computer name ""%1"" is too long. The name may
not be longer than 63 characters."
+    11 "The new computer name entered is not properly formatted. Standard names may
contain letters (a-z, A-Z), numbers (0-9), and hyphens (-), but no spaces or periods (.).
The name may not consist entirely of digits."
     22 "Mirësivine tek %1 grupipunës."
     23 "Mirësivine tek %1 domain."
     24 "Ju duhet të rinisni këtë kompjuter që ndryshimet të hyjnë në fuqi."
     25 "Ju mund të ndryshoni emrin dhe anëtarësimin e këtij kompjuteri. Ndryshimet
mund të ndikojnë në hyrjet e burimeve në rrjet."
     1021 "Shenime: Vetëm Administratorët mund të ndryshojnë identifikimin e këtij
kompjuteri."
     1022 "Shenim: Identifikimi i kompjuterit nuk mund të ndryshohet sepse:"
-    1030 "Emri i ri kompjuterik ""%s"" përmban karaktere të
cilat nuk janë të lejuara. Karakterët të cilat nuk janë të lejuar përfshijnë ` ~ ! @ # $
%% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / and ?"
-    /* Windows allows using these characters, although it displays a warning message.
-       Forbidding the use of these characters means incompatibility with Windows. */
+    1029 "The new computer name ""%1"" is a number. The name may
not be a number."
+    1030 "Emri i ri kompjuterik ""%1"" përmban karaktere të
cilat nuk janë të lejuara. Karakterët të cilat nuk janë të lejuar përfshijnë ` ~ ! @ # $
%% ^ & * ( ) = + [ ] { } \\ | ; : ' "" , < > / and ?"
+    1031 "The first domain of the domain name ""%1"" is a
number. The first domain may not be a number."
+    1032 "The domain name ""%1"" contains characters which are
not allowed. Standard DNS names may contain letters (a-z, A-Z), numbers (0-9), and
hyphens, but no spaces. Periods (.) are used to separate domains. Example:
domain-1.reactos.org."
     3210 "&Detaje >>"
     3220 "<< &Detaje"
     4000 "Informacion"
diff --git a/dll/win32/netid/lang/tr-TR.rc b/dll/win32/netid/lang/tr-TR.rc
index e8fe17cca4d..1a8cc14017c 100644
--- a/dll/win32/netid/lang/tr-TR.rc
+++ b/dll/win32/netid/lang/tr-TR.rc
@@ -66,15 +66,20 @@ BEGIN
     4 "Bilgisayar Adı Değişiklikleri"
     5 "Çalışma Takımı:"
     6 "Etki Alanı:"
+    7 "The domain name ""%1"" does not conform to Internet
Domain Name Service specifications, although it is a legal ReactOS name. You must use
ReactOS DNS server for non-standard names."
+    8 "The domain name ""%1"" is not properly formatted. Periods
(.) are used to separate domains. Each domain is limited to 63 characters. Example:
domain-1.reactos.org."
+    10 "The new computer name ""%1"" is too long. The name may
not be longer than 63 characters."
+    11 "The new computer name entered is not properly formatted. Standard names may
contain letters (a-z, A-Z), numbers (0-9), and hyphens (-), but no spaces or periods (.).
The name may not consist entirely of digits."
     22 "%1 çalışma takımına hoş geldiniz."
     23 "%1 etki alanına hoş geldiniz."
     24 "Değişikliklerin etkili olması için bu bilgisayarı yeniden
başlatmalısınız."
     25 "Bu bilgisayarın adını ve üyeliğini değiştirebilirsiniz. Değişiklikler, ağ
kaynaklarına erişimi etkileyebilir."
     1021 "Önemli: Bu bilgisayarın kimliğini yalnızca yöneticiler
değiştirebilir."
     1022 "Önemli: Bilgisayarın kimliği şundan dolayı değiştirilemedi:"
-    1030 """%s"" yeni bilgisayar adı izin verilmeyen damgalar
içeriyor. İzin verilmeyen damgalar; `, ~, !, @, #, $, %%, ^, &, *, (, ), =, +, _, [,
], {, }, \\, |, ;, :, ', "", ,, ., <, >, /, ve ?'ni kapsar."
-    /* Windows allows using these characters, although it displays a warning message.
-       Forbidding the use of these characters means incompatibility with Windows. */
+    1029 "The new computer name ""%1"" is a number. The name may
not be a number."
+    1030 """%1"" yeni bilgisayar adı izin verilmeyen damgalar
içeriyor. İzin verilmeyen damgalar; `, ~, !, @, #, $, %%, ^, &, *, (, ), =, +, [, ],
{, }, \\, |, ;, :, ', "", ,, <, >, /, ve ?'ni kapsar."
+    1031 "The first domain of the domain name ""%1"" is a
number. The first domain may not be a number."
+    1032 "The domain name ""%1"" contains characters which are
not allowed. Standard DNS names may contain letters (a-z, A-Z), numbers (0-9), and
hyphens, but no spaces. Periods (.) are used to separate domains. Example:
domain-1.reactos.org."
     3210 "&Ayrıntılar >>"
     3220 "<< &Ayrıntılar"
     4000 "Bilgi"
diff --git a/dll/win32/netid/lang/uk-UA.rc b/dll/win32/netid/lang/uk-UA.rc
index 15eeaf827da..0b7d0bc7ff5 100644
--- a/dll/win32/netid/lang/uk-UA.rc
+++ b/dll/win32/netid/lang/uk-UA.rc
@@ -72,13 +72,20 @@ BEGIN
     4 "Зміна імені комп'ютера"
     5 "Робоча група:"
     6 "Домен:"
+    7 "The domain name ""%1"" does not conform to Internet
Domain Name Service specifications, although it is a legal ReactOS name. You must use
ReactOS DNS server for non-standard names."
+    8 "The domain name ""%1"" is not properly formatted. Periods
(.) are used to separate domains. Each domain is limited to 63 characters. Example:
domain-1.reactos.org."
+    10 "The new computer name ""%1"" is too long. The name may
not be longer than 63 characters."
+    11 "The new computer name entered is not properly formatted. Standard names may
contain letters (a-z, A-Z), numbers (0-9), and hyphens (-), but no spaces or periods (.).
The name may not consist entirely of digits."
     22 "Вас вітає робоча група %1."
     23 "Вас вітає домен %1."
     24 "Слід перезапустити комп'ютер, щоб ці зміни набрали сили."
     25 "Можна знінити ім'я і членство цього комп'ютера. Зміни можуть
вплинути на доступ до мережних ресурсів."
     1021 "Примітка: змінити ідентифікацію цього комп'ютера можуть лише
адміністратори."
     1022 "Примітка: змінити ідентифікацію цього комп'ютера неможливо,
оскільки:"
-    1030 "Нове ім'я комп'ютера ""%s"" містить
недопустимі символи. До недопустимих символів належать ` ~ ! @ # $ %% ^ & * ( ) = + _
[ ] { } \\ | ; : ' "" , . < > / та ?"
+    1029 "The new computer name ""%1"" is a number. The name may
not be a number."
+    1030 "Нове ім'я комп'ютера ""%1"" містить
недопустимі символи. До недопустимих символів належать ` ~ ! @ # $ %% ^ & * ( ) = + [
] { } \\ | ; : ' "" , < > / та ?"
+    1031 "The first domain of the domain name ""%1"" is a
number. The first domain may not be a number."
+    1032 "The domain name ""%1"" contains characters which are
not allowed. Standard DNS names may contain letters (a-z, A-Z), numbers (0-9), and
hyphens, but no spaces. Periods (.) are used to separate domains. Example:
domain-1.reactos.org."
     3210 "&Подробиці >>"
     3220 "<< &Подробиці"
     4000 "Інформація"
diff --git a/dll/win32/netid/lang/zh-CN.rc b/dll/win32/netid/lang/zh-CN.rc
index 61a2d0c6160..3259168559a 100644
--- a/dll/win32/netid/lang/zh-CN.rc
+++ b/dll/win32/netid/lang/zh-CN.rc
@@ -67,15 +67,20 @@ BEGIN
     4 "计算机名称更改"
     5 "工作组:"
     6 "域:"
+    7 "The domain name ""%1"" does not conform to Internet
Domain Name Service specifications, although it is a legal ReactOS name. You must use
ReactOS DNS server for non-standard names."
+    8 "The domain name ""%1"" is not properly formatted. Periods
(.) are used to separate domains. Each domain is limited to 63 characters. Example:
domain-1.reactos.org."
+    10 "The new computer name ""%1"" is too long. The name may
not be longer than 63 characters."
+    11 "The new computer name entered is not properly formatted. Standard names may
contain letters (a-z, A-Z), numbers (0-9), and hyphens (-), but no spaces or periods (.).
The name may not consist entirely of digits."
     22 "欢迎到 %1 工作组。"
     23 "欢迎到域 %1。"
     24 "您必须重新启动该计算机以使更改生效。"
     25 "您可以更改名称和这台计算机的会员。更改可能会影响对网络资源的访问。"
     1021 "注意: 只有管理员才可以更改此计算机的标识。"
     1022 "注意: 不能更改计算机的标识，因为:"
-    1030 "新的计算机名称 ""%s"" 包含不允许使用的字符。不允许使用的字符包括 ` ~ ! @ # $ %% ^
& * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / and ?"
-    /* Windows allows using these characters, although it displays a warning message.
-       Forbidding the use of these characters means incompatibility with Windows. */
+    1029 "The new computer name ""%1"" is a number. The name may
not be a number."
+    1030 "新的计算机名称 ""%1"" 包含不允许使用的字符。不允许使用的字符包括 ` ~ ! @ # $ %% ^
& * ( ) = + [ ] { } \\ | ; : ' "" , < > / and ?"
+    1031 "The first domain of the domain name ""%1"" is a
number. The first domain may not be a number."
+    1032 "The domain name ""%1"" contains characters which are
not allowed. Standard DNS names may contain letters (a-z, A-Z), numbers (0-9), and
hyphens, but no spaces. Periods (.) are used to separate domains. Example:
domain-1.reactos.org."
     3210 "详细信息(&D) >>"
     3220 "<< 详细信息(&D)"
     4000 "信息"
diff --git a/dll/win32/netid/lang/zh-TW.rc b/dll/win32/netid/lang/zh-TW.rc
index a67d6a015cf..32039757e2e 100644
--- a/dll/win32/netid/lang/zh-TW.rc
+++ b/dll/win32/netid/lang/zh-TW.rc
@@ -73,9 +73,10 @@ BEGIN
     25 "您可以更改名稱和這部電腦的會員。更改可能會影響對網路資源的訪問。"
     1021 "注意: 只有管理員纔可以更改此電腦的標識。"
     1022 "注意: 不能更改電腦的標識，因為:"
-    1030 "新的電腦名稱 ""%s"" 包含不允許使用的字元。不允許使用的字元包括 ` ~ ! @ # $ %% ^
& * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / and ?"
-    /* Windows allows using these characters, although it displays a warning message.
-       Forbidding the use of these characters means incompatibility with Windows. */
+    1029 "The new computer name ""%1"" is a number. The name may
not be a number."
+    1030 "新的電腦名稱 ""%1"" 包含不允許使用的字元。不允許使用的字元包括 ` ~ ! @ # $ %% ^
& * ( ) = + [ ] { } \\ | ; : ' "" , < > / and ?"
+    1031 "The first domain of the domain name ""%1"" is a
number. The first domain may not be a number."
+    1032 "The domain name ""%1"" contains characters which are
not allowed. Standard DNS names may contain letters (a-z, A-Z), numbers (0-9), and
hyphens, but no spaces. Periods (.) are used to separate domains. Example:
domain-1.reactos.org."
     3210 "詳細資訊(&D) >>"
     3220 "<< 詳細資訊(&D)"
     4000 "資訊"
diff --git a/dll/win32/netid/netid.c b/dll/win32/netid/netid.c
index bab3a34c15f..10f92fcad80 100644
--- a/dll/win32/netid/netid.c
+++ b/dll/win32/netid/netid.c
@@ -15,19 +15,20 @@
 #include <winuser.h>
 #include <winreg.h>
 #include <windns.h>
-#include <tchar.h>
 #include <lm.h>
 #include <prsht.h>
 
 #include "resource.h"
 
 
-#define MAX_COMPUTERDESCRIPTION_LENGTH 256
+#define MAX_COMPUTERDESCRIPTION_LENGTH 255
+#define MAX_HOSTNAME_LENGTH             63
+#define MAX_DOMAINNAME_LENGTH          255
 
 typedef struct _NETIDDATA
 {
-    WCHAR szHostName[256];
-    WCHAR szDomainName[256];
+    WCHAR szHostName[MAX_HOSTNAME_LENGTH + 1];
+    WCHAR szDomainName[MAX_DOMAINNAME_LENGTH + 1];
     WCHAR szComputerName[MAX_COMPUTERNAME_LENGTH + 1];
     BOOL bHostNameChanged;
     BOOL bDomainNameChanged;
@@ -37,6 +38,34 @@ typedef struct _NETIDDATA
 
 static HINSTANCE hDllInstance;
 
+static
+INT
+FormatMessageBox(
+    HWND hDlg,
+    UINT uType,
+    DWORD dwMessage,
+    ...)
+{
+    WCHAR szTitle[256], szMessage[256], szText[512];
+    va_list args = NULL;
+
+    LoadStringW(hDllInstance, 4, szTitle, ARRAYSIZE(szTitle));
+
+    LoadStringW(hDllInstance, dwMessage, szMessage, ARRAYSIZE(szMessage));
+
+    va_start(args, dwMessage);
+    FormatMessageW(FORMAT_MESSAGE_FROM_STRING,
+                   szMessage,
+                   0,
+                   0,
+                   szText,
+                   ARRAYSIZE(szText),
+                   &args);
+    va_end(args);
+
+    return MessageBoxW(hDlg, szText, szTitle, uType);
+}
+
 static
 BOOL
 GetComputerNames(
@@ -102,11 +131,32 @@ IsValidDomainName(
     WCHAR szDomainName[256];
     DWORD dwError;
 
-    GetDlgItemTextW(hDlg, uId, szDomainName, ARRAYSIZE(szDomainName));
+    if (GetDlgItemTextW(hDlg, uId, szDomainName, ARRAYSIZE(szDomainName)) == 0)
+        return TRUE;
+
     dwError = DnsValidateName_W(szDomainName, DnsNameDomain);
     if (dwError != ERROR_SUCCESS)
     {
-        /* FIXME: Show error message */
+        switch (dwError)
+        {
+            case DNS_ERROR_NON_RFC_NAME:
+                if (FormatMessageBox(hDlg, MB_YESNO | MB_ICONWARNING, 7, szDomainName) ==
IDYES)
+                    return TRUE;
+                break;
+
+            case ERROR_INVALID_NAME:
+                FormatMessageBox(hDlg, MB_OK | MB_ICONERROR, 8, szDomainName);
+                break;
+
+            case DNS_ERROR_NUMERIC_NAME:
+                FormatMessageBox(hDlg, MB_OK | MB_ICONERROR, 1031, szDomainName);
+                break;
+
+            case DNS_ERROR_INVALID_NAME_CHAR:
+                FormatMessageBox(hDlg, MB_OK | MB_ICONERROR, 1032, szDomainName);
+                break;
+        }
+
         return FALSE;
     }
 
@@ -192,27 +242,35 @@ IsValidComputerName(
     HWND hDlg,
     UINT uId)
 {
-    WCHAR szMsgText[512], szText[256], s[256];
-    int i;
+    WCHAR szHostName[256];
+    DWORD dwError;
 
-    GetWindowText(GetDlgItem(hDlg, uId), s, ARRAYSIZE(s));
+    GetWindowText(GetDlgItem(hDlg, uId), szHostName, ARRAYSIZE(szHostName));
 
-    for (i = 0; i <= wcslen(s); i++)
+    dwError = DnsValidateName_W(szHostName, DnsNameHostnameLabel);
+    if (dwError != ERROR_SUCCESS)
     {
-        if (s[i] == L'!' || s[i] == L'@' || s[i] == L'#' || s[i]
== L'$'
-            || s[i] == L'^' || s[i] == L'&' || s[i] == L'\\'
|| s[i] == L'|'
-            || s[i] == L')' || s[i] == L'(' || s[i] == L'{' ||
s[i] == L'"'
-            || s[i] == L'}' || s[i] == L'~' || s[i] == L'/' ||
s[i] == L'\''
-            || s[i] == L'=' || s[i] == L':' || s[i] == L';' ||
s[i] == L'+'
-            || s[i] == L'<' || s[i] == L'>' || s[i] == L'?'
|| s[i] == L'['
-            || s[i] == L']' || s[i] == L'`' || s[i] == L'%' ||
s[i] == L'_'
-            || s[i] == L'.')
+        switch (dwError)
         {
-            LoadStringW(hDllInstance, 1030, szText, ARRAYSIZE(szText));
-            swprintf(szMsgText, szText, s);
-            MessageBoxW(hDlg, szMsgText, NULL, MB_OK | MB_ICONERROR);
-            return FALSE;
+            case DNS_ERROR_NON_RFC_NAME:
+                if (FormatMessageBox(hDlg, MB_YESNO | MB_ICONWARNING, 10, szHostName) ==
IDYES)
+                    return TRUE;
+                break;
+
+            case ERROR_INVALID_NAME:
+                FormatMessageBox(hDlg, MB_OK | MB_ICONERROR, 11);
+                return FALSE;
+
+            case DNS_ERROR_NUMERIC_NAME:
+                FormatMessageBox(hDlg, MB_OK | MB_ICONERROR, 1029, szHostName);
+                break;
+
+            case DNS_ERROR_INVALID_NAME_CHAR:
+                FormatMessageBox(hDlg, MB_OK | MB_ICONERROR, 1030, szHostName);
+                break;
         }
+
+        return FALSE;
     }
 
     return TRUE;
@@ -227,7 +285,7 @@ SetFullComputerName(
 {
     WCHAR szFullComputerName[512];
 
-    swprintf(szFullComputerName, L"%s.%s", pNetIdData->szHostName,
pNetIdData->szDomainName);
+    wsprintf(szFullComputerName, L"%s.%s", pNetIdData->szHostName,
pNetIdData->szDomainName);
     SetDlgItemText(hDlg, uId, szFullComputerName);
 }
 
@@ -243,10 +301,28 @@ UpdateFullComputerName(
 
     GetWindowText(GetDlgItem(hDlg, 1002), szHostName, ARRAYSIZE(szHostName));
 
-    swprintf(szFullComputerName, L"%s.%s", szHostName,
pNetIdData->szDomainName);
+    wsprintf(szFullComputerName, L"%s.%s", szHostName,
pNetIdData->szDomainName);
     SetDlgItemText(hDlg, uId, szFullComputerName);
 }
 
+static
+VOID
+UpdateNetbiosName(
+    HWND hDlg,
+    UINT uId,
+    PNETIDDATA pNetIdData)
+{
+    WCHAR szHostName[256];
+    DWORD dwSize;
+
+    GetWindowText(GetDlgItem(hDlg, 1002), szHostName, ARRAYSIZE(szHostName));
+
+    dwSize = ARRAYSIZE(pNetIdData->szComputerName);
+    DnsHostnameToComputerNameW(szHostName,
+                               pNetIdData->szComputerName,
+                               &dwSize);
+}
+
 static
 VOID
 NetworkDlg_OnInitDialog(
@@ -254,15 +330,14 @@ NetworkDlg_OnInitDialog(
     PNETIDDATA pNetIdData)
 {
     LPWKSTA_INFO_101 wki = NULL;
-    TCHAR MsgText[MAX_PATH * 2];
+    WCHAR MsgText[MAX_PATH * 2];
     LPWSTR JoinName = NULL;
     NETSETUP_JOIN_STATUS JoinStatus;
 
-    if (LoadString(hDllInstance, 25, MsgText, sizeof(MsgText) / sizeof(TCHAR)))
+    if (LoadStringW(hDllInstance, 25, MsgText, ARRAYSIZE(MsgText)))
         SetDlgItemText(hDlg, 1017, MsgText);
 
-//    SendMessage(GetDlgItem(hDlg, 1002), EM_SETLIMITTEXT, MAX_COMPUTERNAME_LENGTH, 0);
-
+    SendMessage(GetDlgItem(hDlg, 1002), EM_SETLIMITTEXT, MAX_HOSTNAME_LENGTH, 0);
     SetDlgItemText(hDlg, 1002, pNetIdData->szHostName);
     SetFullComputerName(hDlg, 1001, pNetIdData);
 
@@ -399,6 +474,7 @@ NetworkPropDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam)
                     if (HIWORD(wParam) == EN_CHANGE)
                     {
                         UpdateFullComputerName(hDlg, 1001, pNetIdData);
+                        UpdateNetbiosName(hDlg, 1001, pNetIdData);
                         pNetIdData->bHostNameChanged = TRUE;
                         EnableWindow(GetDlgItem(hDlg, IDOK), TRUE);
                     }