https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6b9122b5f55388a5f81c9fcd7ba7ac16f8634639
commit 6b9122b5f55388a5f81c9fcd7ba7ac16f8634639
Author: Eric Kohl <eric.k...@reactos.org>
AuthorDate: Sun Mar 2 09:53:06 2025 +0100
Commit: Eric Kohl <eric.k...@reactos.org>
CommitDate: Sun Mar 2 09:53:06 2025 +0100
[NETSHELL][SYSSETUP] Move network installer code to the network setup
wizard pages
- Add a new page to the network setup wizard that installs the required
network components in a background thread.
- Remove the network setup code from syssetup.dll.
TODO: Move the network setup code for the LiveCD.
---
dll/shellext/netshell/lang/bg-BG.rc | 12 ++
dll/shellext/netshell/lang/cs-CZ.rc | 12 ++
dll/shellext/netshell/lang/da-DK.rc | 12 ++
dll/shellext/netshell/lang/de-DE.rc | 12 ++
dll/shellext/netshell/lang/el-GR.rc | 12 ++
dll/shellext/netshell/lang/en-US.rc | 12 ++
dll/shellext/netshell/lang/es-ES.rc | 12 ++
dll/shellext/netshell/lang/fr-FR.rc | 12 ++
dll/shellext/netshell/lang/he-IL.rc | 12 ++
dll/shellext/netshell/lang/hi-IN.rc | 12 ++
dll/shellext/netshell/lang/hu-HU.rc | 12 ++
dll/shellext/netshell/lang/id-ID.rc | 12 ++
dll/shellext/netshell/lang/it-IT.rc | 12 ++
dll/shellext/netshell/lang/ja-JP.rc | 12 ++
dll/shellext/netshell/lang/nl-NL.rc | 12 ++
dll/shellext/netshell/lang/no-NO.rc | 12 ++
dll/shellext/netshell/lang/pl-PL.rc | 12 ++
dll/shellext/netshell/lang/pt-PT.rc | 12 ++
dll/shellext/netshell/lang/ro-RO.rc | 12 ++
dll/shellext/netshell/lang/ru-RU.rc | 12 ++
dll/shellext/netshell/lang/sk-SK.rc | 12 ++
dll/shellext/netshell/lang/sq-AL.rc | 12 ++
dll/shellext/netshell/lang/sv-SE.rc | 12 ++
dll/shellext/netshell/lang/tr-TR.rc | 12 ++
dll/shellext/netshell/lang/uk-UA.rc | 12 ++
dll/shellext/netshell/lang/zh-CN.rc | 12 ++
dll/shellext/netshell/lang/zh-HK.rc | 12 ++
dll/shellext/netshell/lang/zh-TW.rc | 12 ++
dll/shellext/netshell/resource.h | 17 ++-
dll/shellext/netshell/setup.cpp | 212 +++++++++++++++++++++++++-----------
dll/win32/syssetup/install.c | 15 ---
31 files changed, 497 insertions(+), 83 deletions(-)
diff --git a/dll/shellext/netshell/lang/bg-BG.rc
b/dll/shellext/netshell/lang/bg-BG.rc
index 592a2702763..a2a827116ed 100644
--- a/dll/shellext/netshell/lang/bg-BG.rc
+++ b/dll/shellext/netshell/lang/bg-BG.rc
@@ -76,6 +76,16 @@ BEGIN
PUSHBUTTON "&Затваряне", IDC_CLOSE, 120, 155, 60, 14
END
+IDD_NETWORKINITPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20
+ LTEXT "Please wait while ReactOS installs networking components.",
IDC_STATIC, 53, 7, 240, 20
+ CONTROL "", IDC_INSTALL_PROGRESS, "msctls_progress32", PBS_SMOOTH |
WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 58, 275, 11
+END
+
IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CAPTION "ReactOS Setup"
@@ -165,6 +175,8 @@ END
STRINGTABLE
BEGIN
+ IDS_NETWORKINITTITLE "Network Install"
+ IDS_NETWORKINITSUBTITLE "Installs reqired networking components."
IDS_NETWORKSETTINGSTITLE "Network Settings"
IDS_NETWORKSETTINGSSUBTITLE "Installs network software used to connect to
other networks, computers, and the Internet."
IDS_NETWORKCOMPONENTTITLE "Network Components"
diff --git a/dll/shellext/netshell/lang/cs-CZ.rc
b/dll/shellext/netshell/lang/cs-CZ.rc
index d8c18c17d9a..139b9aa9070 100644
--- a/dll/shellext/netshell/lang/cs-CZ.rc
+++ b/dll/shellext/netshell/lang/cs-CZ.rc
@@ -76,6 +76,16 @@ BEGIN
PUSHBUTTON "&zavřít", IDC_CLOSE, 120, 155, 60, 14
END
+IDD_NETWORKINITPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20
+ LTEXT "Please wait while ReactOS installs networking components.",
IDC_STATIC, 53, 7, 240, 20
+ CONTROL "", IDC_INSTALL_PROGRESS, "msctls_progress32", PBS_SMOOTH |
WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 58, 275, 11
+END
+
IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CAPTION "Instalátor ReactOS"
@@ -165,6 +175,8 @@ END
STRINGTABLE
BEGIN
+ IDS_NETWORKINITTITLE "Network Install"
+ IDS_NETWORKINITSUBTITLE "Installs reqired networking components."
IDS_NETWORKSETTINGSTITLE "Síťová nastavení"
IDS_NETWORKSETTINGSSUBTITLE "Instaluje síťový software používaný k
připojení k dalším sítím, počítačům a k Internetu."
IDS_NETWORKCOMPONENTTITLE "Síťové součásti"
diff --git a/dll/shellext/netshell/lang/da-DK.rc
b/dll/shellext/netshell/lang/da-DK.rc
index 557b5f61bca..1e7333af036 100644
--- a/dll/shellext/netshell/lang/da-DK.rc
+++ b/dll/shellext/netshell/lang/da-DK.rc
@@ -76,6 +76,16 @@ BEGIN
PUSHBUTTON "&Close", IDC_CLOSE, 120, 155, 60, 14
END
+IDD_NETWORKINITPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20
+ LTEXT "Please wait while ReactOS installs networking components.",
IDC_STATIC, 53, 7, 240, 20
+ CONTROL "", IDC_INSTALL_PROGRESS, "msctls_progress32", PBS_SMOOTH |
WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 58, 275, 11
+END
+
IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CAPTION "ReactOS Setup"
@@ -165,6 +175,8 @@ END
STRINGTABLE
BEGIN
+ IDS_NETWORKINITTITLE "Network Install"
+ IDS_NETWORKINITSUBTITLE "Installs reqired networking components."
IDS_NETWORKSETTINGSTITLE "Network Settings"
IDS_NETWORKSETTINGSSUBTITLE "Installs network software used to connect to
other networks, computers, and the Internet."
IDS_NETWORKCOMPONENTTITLE "Network Components"
diff --git a/dll/shellext/netshell/lang/de-DE.rc
b/dll/shellext/netshell/lang/de-DE.rc
index cfb2da5f0b5..c942a6f26ab 100644
--- a/dll/shellext/netshell/lang/de-DE.rc
+++ b/dll/shellext/netshell/lang/de-DE.rc
@@ -76,6 +76,16 @@ BEGIN
PUSHBUTTON "&Schließen", IDC_CLOSE, 120, 155, 60, 14
END
+IDD_NETWORKINITPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20
+ LTEXT "Bitte warten Sie, während ReactOS Netzwerkkomponenten
installiert.", IDC_STATIC, 53, 7, 240, 20
+ CONTROL "", IDC_INSTALL_PROGRESS, "msctls_progress32", PBS_SMOOTH |
WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 58, 275, 11
+END
+
IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CAPTION "ReactOS Setup"
@@ -165,6 +175,8 @@ END
STRINGTABLE
BEGIN
+ IDS_NETWORKINITTITLE "Netzwerkinstallation"
+ IDS_NETWORKINITSUBTITLE "Netzwerkkomponenten werden instaliert."
IDS_NETWORKSETTINGSTITLE "Netzwerkeinstellungen"
IDS_NETWORKSETTINGSSUBTITLE "Die Installation von Netzwerksoftware
ermöglicht das Herstellen von Verbindungen mit anderen Computern, Netzwerken
und dem Internet."
IDS_NETWORKCOMPONENTTITLE "Netzwerkkomponenten"
diff --git a/dll/shellext/netshell/lang/el-GR.rc
b/dll/shellext/netshell/lang/el-GR.rc
index 42cce6e4c83..06818522d74 100644
--- a/dll/shellext/netshell/lang/el-GR.rc
+++ b/dll/shellext/netshell/lang/el-GR.rc
@@ -76,6 +76,16 @@ BEGIN
PUSHBUTTON "&Close", IDC_CLOSE, 120, 155, 60, 14
END
+IDD_NETWORKINITPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20
+ LTEXT "Please wait while ReactOS installs networking components.",
IDC_STATIC, 53, 7, 240, 20
+ CONTROL "", IDC_INSTALL_PROGRESS, "msctls_progress32", PBS_SMOOTH |
WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 58, 275, 11
+END
+
IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CAPTION "ReactOS Setup"
@@ -165,6 +175,8 @@ END
STRINGTABLE
BEGIN
+ IDS_NETWORKINITTITLE "Network Install"
+ IDS_NETWORKINITSUBTITLE "Installs reqired networking components."
IDS_NETWORKSETTINGSTITLE "Network Settings"
IDS_NETWORKSETTINGSSUBTITLE "Installs network software used to connect to
other networks, computers, and the Internet."
IDS_NETWORKCOMPONENTTITLE "Network Components"
diff --git a/dll/shellext/netshell/lang/en-US.rc
b/dll/shellext/netshell/lang/en-US.rc
index 3b9ac61b58b..6191d836647 100644
--- a/dll/shellext/netshell/lang/en-US.rc
+++ b/dll/shellext/netshell/lang/en-US.rc
@@ -76,6 +76,16 @@ BEGIN
PUSHBUTTON "&Close", IDC_CLOSE, 120, 155, 60, 14
END
+IDD_NETWORKINITPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20
+ LTEXT "Please wait while ReactOS installs networking components.",
IDC_STATIC, 53, 7, 240, 20
+ CONTROL "", IDC_INSTALL_PROGRESS, "msctls_progress32", PBS_SMOOTH |
WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 58, 275, 11
+END
+
IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CAPTION "ReactOS Setup"
@@ -165,6 +175,8 @@ END
STRINGTABLE
BEGIN
+ IDS_NETWORKINITTITLE "Network Install"
+ IDS_NETWORKINITSUBTITLE "Installs reqired networking components."
IDS_NETWORKSETTINGSTITLE "Network Settings"
IDS_NETWORKSETTINGSSUBTITLE "Installs network software used to connect to
other networks, computers, and the Internet."
IDS_NETWORKCOMPONENTTITLE "Network Components"
diff --git a/dll/shellext/netshell/lang/es-ES.rc
b/dll/shellext/netshell/lang/es-ES.rc
index 5b79c156d3b..410797605b3 100644
--- a/dll/shellext/netshell/lang/es-ES.rc
+++ b/dll/shellext/netshell/lang/es-ES.rc
@@ -84,6 +84,16 @@ BEGIN
PUSHBUTTON "&Cerrar", IDC_CLOSE, 120, 155, 60, 14
END
+IDD_NETWORKINITPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20
+ LTEXT "Please wait while ReactOS installs networking components.",
IDC_STATIC, 53, 7, 240, 20
+ CONTROL "", IDC_INSTALL_PROGRESS, "msctls_progress32", PBS_SMOOTH |
WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 58, 275, 11
+END
+
IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CAPTION "Instalador de ReactOS"
@@ -173,6 +183,8 @@ END
STRINGTABLE
BEGIN
+ IDS_NETWORKINITTITLE "Network Install"
+ IDS_NETWORKINITSUBTITLE "Installs reqired networking components."
IDS_NETWORKSETTINGSTITLE "Configuración de red"
IDS_NETWORKSETTINGSSUBTITLE "Instala aplicaciones de red necesarias para
conectarse a otras redes, equipos, y la Internet."
IDS_NETWORKCOMPONENTTITLE "Componetes de red"
diff --git a/dll/shellext/netshell/lang/fr-FR.rc
b/dll/shellext/netshell/lang/fr-FR.rc
index 092aa710e62..6b8a3c88887 100644
--- a/dll/shellext/netshell/lang/fr-FR.rc
+++ b/dll/shellext/netshell/lang/fr-FR.rc
@@ -76,6 +76,16 @@ BEGIN
PUSHBUTTON "Fermer", IDC_CLOSE, 120, 155, 60, 14
END
+IDD_NETWORKINITPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20
+ LTEXT "Please wait while ReactOS installs networking components.",
IDC_STATIC, 53, 7, 240, 20
+ CONTROL "", IDC_INSTALL_PROGRESS, "msctls_progress32", PBS_SMOOTH |
WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 58, 275, 11
+END
+
IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CAPTION "Installation de ReactOS"
@@ -165,6 +175,8 @@ END
STRINGTABLE
BEGIN
+ IDS_NETWORKINITTITLE "Network Install"
+ IDS_NETWORKINITSUBTITLE "Installs reqired networking components."
IDS_NETWORKSETTINGSTITLE "Paramètres réseau"
IDS_NETWORKSETTINGSSUBTITLE "Installe les logiciels réseau utilisés pour
se connecter à d'autres réseaux, ordinateurs et à l'Internet."
IDS_NETWORKCOMPONENTTITLE "Composants réseau"
diff --git a/dll/shellext/netshell/lang/he-IL.rc
b/dll/shellext/netshell/lang/he-IL.rc
index ea668baa15f..d71b7cbccd8 100644
--- a/dll/shellext/netshell/lang/he-IL.rc
+++ b/dll/shellext/netshell/lang/he-IL.rc
@@ -76,6 +76,16 @@ BEGIN
PUSHBUTTON "סגור", IDC_CLOSE, 120, 155, 60, 14
END
+IDD_NETWORKINITPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20
+ LTEXT "Please wait while ReactOS installs networking components.",
IDC_STATIC, 53, 7, 240, 20
+ CONTROL "", IDC_INSTALL_PROGRESS, "msctls_progress32", PBS_SMOOTH |
WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 58, 275, 11
+END
+
IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CAPTION "ReactOS Setup"
@@ -165,6 +175,8 @@ END
STRINGTABLE
BEGIN
+ IDS_NETWORKINITTITLE "Network Install"
+ IDS_NETWORKINITSUBTITLE "Installs reqired networking components."
IDS_NETWORKSETTINGSTITLE "Network Settings"
IDS_NETWORKSETTINGSSUBTITLE "Installs network software used to connect to
other networks, computers, and the Internet."
IDS_NETWORKCOMPONENTTITLE "Network Components"
diff --git a/dll/shellext/netshell/lang/hi-IN.rc
b/dll/shellext/netshell/lang/hi-IN.rc
index 698f640db12..fbb4edf6738 100644
--- a/dll/shellext/netshell/lang/hi-IN.rc
+++ b/dll/shellext/netshell/lang/hi-IN.rc
@@ -82,6 +82,16 @@ BEGIN
PUSHBUTTON "&बंद करे", IDC_CLOSE, 120, 155, 60, 14
END
+IDD_NETWORKINITPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20
+ LTEXT "Please wait while ReactOS installs networking components.",
IDC_STATIC, 53, 7, 240, 20
+ CONTROL "", IDC_INSTALL_PROGRESS, "msctls_progress32", PBS_SMOOTH |
WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 58, 275, 11
+END
+
IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CAPTION "रिऐक्ट ओएस सेटअप"
@@ -171,6 +181,8 @@ END
STRINGTABLE
BEGIN
+ IDS_NETWORKINITTITLE "Network Install"
+ IDS_NETWORKINITSUBTITLE "Installs reqired networking components."
IDS_NETWORKSETTINGSTITLE "नेटवर्क सेटिंग"
IDS_NETWORKSETTINGSSUBTITLE "अन्य नेटवर्क, कंप्यूटर और इंटरनेट से कनेक्ट
करने के लिए उपयोग किया जाने वाला नेटवर्क सॉफ़्टवेयर इंस्टॉल करता है।"
IDS_NETWORKCOMPONENTTITLE "नेटवर्क कम्पोनेन्ट"
diff --git a/dll/shellext/netshell/lang/hu-HU.rc
b/dll/shellext/netshell/lang/hu-HU.rc
index 599ac84ce3b..d93157c2de2 100644
--- a/dll/shellext/netshell/lang/hu-HU.rc
+++ b/dll/shellext/netshell/lang/hu-HU.rc
@@ -76,6 +76,16 @@ BEGIN
PUSHBUTTON "&Bezárás", IDC_CLOSE, 120, 155, 60, 14
END
+IDD_NETWORKINITPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20
+ LTEXT "Please wait while ReactOS installs networking components.",
IDC_STATIC, 53, 7, 240, 20
+ CONTROL "", IDC_INSTALL_PROGRESS, "msctls_progress32", PBS_SMOOTH |
WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 58, 275, 11
+END
+
IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CAPTION "ReactOS telepítő"
@@ -165,6 +175,8 @@ END
STRINGTABLE
BEGIN
+ IDS_NETWORKINITTITLE "Network Install"
+ IDS_NETWORKINITSUBTITLE "Installs reqired networking components."
IDS_NETWORKSETTINGSTITLE "Hálózati beállítások"
IDS_NETWORKSETTINGSSUBTITLE "Hálózati szoftverek telepítése, melyek
segítségével más hálózatokhoz, számítógépekhez vagy az internethez lehet
csatlakozni."
IDS_NETWORKCOMPONENTTITLE "Hálózati összetevők"
diff --git a/dll/shellext/netshell/lang/id-ID.rc
b/dll/shellext/netshell/lang/id-ID.rc
index 063538fd644..d5dbb02a03c 100644
--- a/dll/shellext/netshell/lang/id-ID.rc
+++ b/dll/shellext/netshell/lang/id-ID.rc
@@ -76,6 +76,16 @@ BEGIN
PUSHBUTTON "&Close", IDC_CLOSE, 120, 155, 60, 14
END
+IDD_NETWORKINITPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20
+ LTEXT "Please wait while ReactOS installs networking components.",
IDC_STATIC, 53, 7, 240, 20
+ CONTROL "", IDC_INSTALL_PROGRESS, "msctls_progress32", PBS_SMOOTH |
WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 58, 275, 11
+END
+
IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CAPTION "ReactOS Setup"
@@ -165,6 +175,8 @@ END
STRINGTABLE
BEGIN
+ IDS_NETWORKINITTITLE "Network Install"
+ IDS_NETWORKINITSUBTITLE "Installs reqired networking components."
IDS_NETWORKSETTINGSTITLE "Network Settings"
IDS_NETWORKSETTINGSSUBTITLE "Installs network software used to connect to
other networks, computers, and the Internet."
IDS_NETWORKCOMPONENTTITLE "Network Components"
diff --git a/dll/shellext/netshell/lang/it-IT.rc
b/dll/shellext/netshell/lang/it-IT.rc
index abcbc962619..6ab9a353b31 100644
--- a/dll/shellext/netshell/lang/it-IT.rc
+++ b/dll/shellext/netshell/lang/it-IT.rc
@@ -76,6 +76,16 @@ BEGIN
PUSHBUTTON "&Close", IDC_CLOSE, 120, 155, 60, 14
END
+IDD_NETWORKINITPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20
+ LTEXT "Please wait while ReactOS installs networking components.",
IDC_STATIC, 53, 7, 240, 20
+ CONTROL "", IDC_INSTALL_PROGRESS, "msctls_progress32", PBS_SMOOTH |
WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 58, 275, 11
+END
+
IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CAPTION "ReactOS Setup"
@@ -165,6 +175,8 @@ END
STRINGTABLE
BEGIN
+ IDS_NETWORKINITTITLE "Network Install"
+ IDS_NETWORKINITSUBTITLE "Installs reqired networking components."
IDS_NETWORKSETTINGSTITLE "Network Settings"
IDS_NETWORKSETTINGSSUBTITLE "Installs network software used to connect to
other networks, computers, and the Internet."
IDS_NETWORKCOMPONENTTITLE "Network Components"
diff --git a/dll/shellext/netshell/lang/ja-JP.rc
b/dll/shellext/netshell/lang/ja-JP.rc
index 52fa74df0f9..5189dd2301f 100644
--- a/dll/shellext/netshell/lang/ja-JP.rc
+++ b/dll/shellext/netshell/lang/ja-JP.rc
@@ -76,6 +76,16 @@ BEGIN
PUSHBUTTON "閉じる(&C)", IDC_CLOSE, 120, 155, 60, 14
END
+IDD_NETWORKINITPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20
+ LTEXT "Please wait while ReactOS installs networking components.",
IDC_STATIC, 53, 7, 240, 20
+ CONTROL "", IDC_INSTALL_PROGRESS, "msctls_progress32", PBS_SMOOTH |
WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 58, 275, 11
+END
+
IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CAPTION "ReactOS セットアップ"
@@ -164,6 +174,8 @@ END
STRINGTABLE
BEGIN
+ IDS_NETWORKINITTITLE "Network Install"
+ IDS_NETWORKINITSUBTITLE "Installs reqired networking components."
IDS_NETWORKSETTINGSTITLE "ネットワークの設定"
IDS_NETWORKSETTINGSSUBTITLE "別のネットワーク、別のコンピュータ、そしてインターネットに接続するために使うネットワーク
ソフトウェアをインストールします。"
IDS_NETWORKCOMPONENTTITLE "ネットワーク コンポーネント"
diff --git a/dll/shellext/netshell/lang/nl-NL.rc
b/dll/shellext/netshell/lang/nl-NL.rc
index 9d580bf59e8..d92b5a331aa 100644
--- a/dll/shellext/netshell/lang/nl-NL.rc
+++ b/dll/shellext/netshell/lang/nl-NL.rc
@@ -76,6 +76,16 @@ BEGIN
PUSHBUTTON "&Close", IDC_CLOSE, 120, 155, 60, 14
END
+IDD_NETWORKINITPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20
+ LTEXT "Please wait while ReactOS installs networking components.",
IDC_STATIC, 53, 7, 240, 20
+ CONTROL "", IDC_INSTALL_PROGRESS, "msctls_progress32", PBS_SMOOTH |
WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 58, 275, 11
+END
+
IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CAPTION "ReactOS Setup"
@@ -165,6 +175,8 @@ END
STRINGTABLE
BEGIN
+ IDS_NETWORKINITTITLE "Network Install"
+ IDS_NETWORKINITSUBTITLE "Installs reqired networking components."
IDS_NETWORKSETTINGSTITLE "Network Settings"
IDS_NETWORKSETTINGSSUBTITLE "Installs network software used to connect to
other networks, computers, and the Internet."
IDS_NETWORKCOMPONENTTITLE "Network Components"
diff --git a/dll/shellext/netshell/lang/no-NO.rc
b/dll/shellext/netshell/lang/no-NO.rc
index b687747e32e..1bab98808b9 100644
--- a/dll/shellext/netshell/lang/no-NO.rc
+++ b/dll/shellext/netshell/lang/no-NO.rc
@@ -76,6 +76,16 @@ BEGIN
PUSHBUTTON "&Lukk", IDC_CLOSE, 120, 155, 60, 14
END
+IDD_NETWORKINITPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20
+ LTEXT "Please wait while ReactOS installs networking components.",
IDC_STATIC, 53, 7, 240, 20
+ CONTROL "", IDC_INSTALL_PROGRESS, "msctls_progress32", PBS_SMOOTH |
WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 58, 275, 11
+END
+
IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CAPTION "ReactOS Setup"
@@ -165,6 +175,8 @@ END
STRINGTABLE
BEGIN
+ IDS_NETWORKINITTITLE "Network Install"
+ IDS_NETWORKINITSUBTITLE "Installs reqired networking components."
IDS_NETWORKSETTINGSTITLE "Network Settings"
IDS_NETWORKSETTINGSSUBTITLE "Installs network software used to connect to
other networks, computers, and the Internet."
IDS_NETWORKCOMPONENTTITLE "Network Components"
diff --git a/dll/shellext/netshell/lang/pl-PL.rc
b/dll/shellext/netshell/lang/pl-PL.rc
index 5b110e2c82b..b7019c8d0be 100644
--- a/dll/shellext/netshell/lang/pl-PL.rc
+++ b/dll/shellext/netshell/lang/pl-PL.rc
@@ -78,6 +78,16 @@ BEGIN
PUSHBUTTON "&Zamknij", IDC_CLOSE, 120, 155, 60, 14
END
+IDD_NETWORKINITPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20
+ LTEXT "Please wait while ReactOS installs networking components.",
IDC_STATIC, 53, 7, 240, 20
+ CONTROL "", IDC_INSTALL_PROGRESS, "msctls_progress32", PBS_SMOOTH |
WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 58, 275, 11
+END
+
IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CAPTION "Instalator systemu ReactOS"
@@ -167,6 +177,8 @@ END
STRINGTABLE
BEGIN
+ IDS_NETWORKINITTITLE "Network Install"
+ IDS_NETWORKINITSUBTITLE "Installs reqired networking components."
IDS_NETWORKSETTINGSTITLE "Ustawienia sieciowe"
IDS_NETWORKSETTINGSSUBTITLE "Zainstalowanie oprogramowania sieciowego
pozwala na nawiązywanie połączeń z innymi komputerami, sieciami i Internetem."
IDS_NETWORKCOMPONENTTITLE "Składniki sieciowe"
diff --git a/dll/shellext/netshell/lang/pt-PT.rc
b/dll/shellext/netshell/lang/pt-PT.rc
index 945fa72cb37..e28ba575557 100644
--- a/dll/shellext/netshell/lang/pt-PT.rc
+++ b/dll/shellext/netshell/lang/pt-PT.rc
@@ -83,6 +83,16 @@ BEGIN
PUSHBUTTON "&Fechar", IDC_CLOSE, 120, 155, 60, 14
END
+IDD_NETWORKINITPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20
+ LTEXT "Please wait while ReactOS installs networking components.",
IDC_STATIC, 53, 7, 240, 20
+ CONTROL "", IDC_INSTALL_PROGRESS, "msctls_progress32", PBS_SMOOTH |
WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 58, 275, 11
+END
+
IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CAPTION "Programa de configuração do ReactOS"
@@ -172,6 +182,8 @@ END
STRINGTABLE
BEGIN
+ IDS_NETWORKINITTITLE "Network Install"
+ IDS_NETWORKINITSUBTITLE "Installs reqired networking components."
IDS_NETWORKSETTINGSTITLE "Definições de rede"
IDS_NETWORKSETTINGSSUBTITLE "Instala aplicações de rede necessárias para
ligar a outras redes, equipamentos, e à internet."
IDS_NETWORKCOMPONENTTITLE "Componentes de rede"
diff --git a/dll/shellext/netshell/lang/ro-RO.rc
b/dll/shellext/netshell/lang/ro-RO.rc
index 180844c682a..008a6d1f66f 100644
--- a/dll/shellext/netshell/lang/ro-RO.rc
+++ b/dll/shellext/netshell/lang/ro-RO.rc
@@ -85,6 +85,16 @@ BEGIN
PUSHBUTTON "Î&nchidere", IDC_CLOSE, 120, 155, 60, 14
END
+IDD_NETWORKINITPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20
+ LTEXT "Please wait while ReactOS installs networking components.",
IDC_STATIC, 53, 7, 240, 20
+ CONTROL "", IDC_INSTALL_PROGRESS, "msctls_progress32", PBS_SMOOTH |
WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 58, 275, 11
+END
+
IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CAPTION "Expert de instalare ReactOS"
@@ -174,6 +184,8 @@ END
STRINGTABLE
BEGIN
+ IDS_NETWORKINITTITLE "Network Install"
+ IDS_NETWORKINITSUBTITLE "Installs reqired networking components."
IDS_NETWORKSETTINGSTITLE "Setări de rețea"
IDS_NETWORKSETTINGSSUBTITLE "Instalarea software-ului de rețea permite
conectarea la alte computere, rețele şi la Internet."
IDS_NETWORKCOMPONENTTITLE "Componente de rețea"
diff --git a/dll/shellext/netshell/lang/ru-RU.rc
b/dll/shellext/netshell/lang/ru-RU.rc
index f62468d3a65..2b20b11ddee 100644
--- a/dll/shellext/netshell/lang/ru-RU.rc
+++ b/dll/shellext/netshell/lang/ru-RU.rc
@@ -76,6 +76,16 @@ BEGIN
PUSHBUTTON "&Закрыть", IDC_CLOSE, 120, 155, 60, 14
END
+IDD_NETWORKINITPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20
+ LTEXT "Please wait while ReactOS installs networking components.",
IDC_STATIC, 53, 7, 240, 20
+ CONTROL "", IDC_INSTALL_PROGRESS, "msctls_progress32", PBS_SMOOTH |
WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 58, 275, 11
+END
+
IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CAPTION "Установка ReactOS"
@@ -165,6 +175,8 @@ END
STRINGTABLE
BEGIN
+ IDS_NETWORKINITTITLE "Network Install"
+ IDS_NETWORKINITSUBTITLE "Installs reqired networking components."
IDS_NETWORKSETTINGSTITLE "Настройки сети"
IDS_NETWORKSETTINGSSUBTITLE "Устанавливает сетевое программное
обеспечение, необходимое для соединени с другими сетями, компьютерами или
Интернетом."
IDS_NETWORKCOMPONENTTITLE "Сетевые компоненты"
diff --git a/dll/shellext/netshell/lang/sk-SK.rc
b/dll/shellext/netshell/lang/sk-SK.rc
index 21f93eefd9c..a7f2671d3d0 100644
--- a/dll/shellext/netshell/lang/sk-SK.rc
+++ b/dll/shellext/netshell/lang/sk-SK.rc
@@ -78,6 +78,16 @@ BEGIN
PUSHBUTTON "&Zavrieť", IDC_CLOSE, 120, 155, 60, 14
END
+IDD_NETWORKINITPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20
+ LTEXT "Please wait while ReactOS installs networking components.",
IDC_STATIC, 53, 7, 240, 20
+ CONTROL "", IDC_INSTALL_PROGRESS, "msctls_progress32", PBS_SMOOTH |
WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 58, 275, 11
+END
+
IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CAPTION "ReactOS Setup"
@@ -167,6 +177,8 @@ END
STRINGTABLE
BEGIN
+ IDS_NETWORKINITTITLE "Network Install"
+ IDS_NETWORKINITSUBTITLE "Installs reqired networking components."
IDS_NETWORKSETTINGSTITLE "Network Settings"
IDS_NETWORKSETTINGSSUBTITLE "Installs network software used to connect to
other networks, computers, and the Internet."
IDS_NETWORKCOMPONENTTITLE "Network Components"
diff --git a/dll/shellext/netshell/lang/sq-AL.rc
b/dll/shellext/netshell/lang/sq-AL.rc
index 28f8071757a..43a5c07b798 100644
--- a/dll/shellext/netshell/lang/sq-AL.rc
+++ b/dll/shellext/netshell/lang/sq-AL.rc
@@ -78,6 +78,16 @@ BEGIN
PUSHBUTTON "&Mbyll", IDC_CLOSE, 125, 165, 62, 14
END
+IDD_NETWORKINITPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20
+ LTEXT "Please wait while ReactOS installs networking components.",
IDC_STATIC, 53, 7, 240, 20
+ CONTROL "", IDC_INSTALL_PROGRESS, "msctls_progress32", PBS_SMOOTH |
WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 58, 275, 11
+END
+
IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CAPTION "ReactOS Setup"
@@ -167,6 +177,8 @@ END
STRINGTABLE
BEGIN
+ IDS_NETWORKINITTITLE "Network Install"
+ IDS_NETWORKINITSUBTITLE "Installs reqired networking components."
IDS_NETWORKSETTINGSTITLE "Network Settings"
IDS_NETWORKSETTINGSSUBTITLE "Installs network software used to connect to
other networks, computers, and the Internet."
IDS_NETWORKCOMPONENTTITLE "Network Components"
diff --git a/dll/shellext/netshell/lang/sv-SE.rc
b/dll/shellext/netshell/lang/sv-SE.rc
index faecdb3a58d..62fd00d58c8 100644
--- a/dll/shellext/netshell/lang/sv-SE.rc
+++ b/dll/shellext/netshell/lang/sv-SE.rc
@@ -76,6 +76,16 @@ BEGIN
PUSHBUTTON "&Close", IDC_CLOSE, 120, 155, 60, 14
END
+IDD_NETWORKINITPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20
+ LTEXT "Please wait while ReactOS installs networking components.",
IDC_STATIC, 53, 7, 240, 20
+ CONTROL "", IDC_INSTALL_PROGRESS, "msctls_progress32", PBS_SMOOTH |
WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 58, 275, 11
+END
+
IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CAPTION "ReactOS Setup"
@@ -165,6 +175,8 @@ END
STRINGTABLE
BEGIN
+ IDS_NETWORKINITTITLE "Network Install"
+ IDS_NETWORKINITSUBTITLE "Installs reqired networking components."
IDS_NETWORKSETTINGSTITLE "Network Settings"
IDS_NETWORKSETTINGSSUBTITLE "Installs network software used to connect to
other networks, computers, and the Internet."
IDS_NETWORKCOMPONENTTITLE "Network Components"
diff --git a/dll/shellext/netshell/lang/tr-TR.rc
b/dll/shellext/netshell/lang/tr-TR.rc
index b4e553afb6e..94003f8cace 100644
--- a/dll/shellext/netshell/lang/tr-TR.rc
+++ b/dll/shellext/netshell/lang/tr-TR.rc
@@ -78,6 +78,16 @@ BEGIN
PUSHBUTTON "&Kapat", IDC_CLOSE, 120, 155, 60, 14
END
+IDD_NETWORKINITPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20
+ LTEXT "Please wait while ReactOS installs networking components.",
IDC_STATIC, 53, 7, 240, 20
+ CONTROL "", IDC_INSTALL_PROGRESS, "msctls_progress32", PBS_SMOOTH |
WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 58, 275, 11
+END
+
IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CAPTION "ReactOS Kur"
@@ -167,6 +177,8 @@ END
STRINGTABLE
BEGIN
+ IDS_NETWORKINITTITLE "Network Install"
+ IDS_NETWORKINITSUBTITLE "Installs reqired networking components."
IDS_NETWORKSETTINGSTITLE "Ağ Ayarları"
IDS_NETWORKSETTINGSSUBTITLE "Başka ağlara, bilgisayarlara ve İnternet'e
bağlanmak için kullanılacak ağ yazılımını kurar."
IDS_NETWORKCOMPONENTTITLE "Ağ Bileşenleri"
diff --git a/dll/shellext/netshell/lang/uk-UA.rc
b/dll/shellext/netshell/lang/uk-UA.rc
index 73851236c8f..c4a785b828e 100644
--- a/dll/shellext/netshell/lang/uk-UA.rc
+++ b/dll/shellext/netshell/lang/uk-UA.rc
@@ -82,6 +82,16 @@ BEGIN
PUSHBUTTON "&Закрити", IDC_CLOSE, 120, 155, 60, 14
END
+IDD_NETWORKINITPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20
+ LTEXT "Please wait while ReactOS installs networking components.",
IDC_STATIC, 53, 7, 240, 20
+ CONTROL "", IDC_INSTALL_PROGRESS, "msctls_progress32", PBS_SMOOTH |
WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 58, 275, 11
+END
+
IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CAPTION "Встановлення ReactOS"
@@ -171,6 +181,8 @@ END
STRINGTABLE
BEGIN
+ IDS_NETWORKINITTITLE "Network Install"
+ IDS_NETWORKINITSUBTITLE "Installs reqired networking components."
IDS_NETWORKSETTINGSTITLE "Налаштування мережі"
IDS_NETWORKSETTINGSSUBTITLE "Встановлює мережеве програмне забезпечення,
необхідне для з'єднання з іншими мережами, комп'ютерами або Інтернетом."
IDS_NETWORKCOMPONENTTITLE "Мережеві компоненти"
diff --git a/dll/shellext/netshell/lang/zh-CN.rc
b/dll/shellext/netshell/lang/zh-CN.rc
index 19ab0466641..6df6485fb26 100644
--- a/dll/shellext/netshell/lang/zh-CN.rc
+++ b/dll/shellext/netshell/lang/zh-CN.rc
@@ -84,6 +84,16 @@ BEGIN
PUSHBUTTON "关闭(&C)", IDC_CLOSE, 120, 155, 60, 14
END
+IDD_NETWORKINITPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20
+ LTEXT "Please wait while ReactOS installs networking components.",
IDC_STATIC, 53, 7, 240, 20
+ CONTROL "", IDC_INSTALL_PROGRESS, "msctls_progress32", PBS_SMOOTH |
WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 58, 275, 11
+END
+
IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CAPTION "ReactOS 安装程序"
@@ -173,6 +183,8 @@ END
STRINGTABLE
BEGIN
+ IDS_NETWORKINITTITLE "Network Install"
+ IDS_NETWORKINITSUBTITLE "Installs reqired networking components."
IDS_NETWORKSETTINGSTITLE "网络设置"
IDS_NETWORKSETTINGSSUBTITLE "安装用于连接其他网络、计算机和 Internet 的网络软件。"
IDS_NETWORKCOMPONENTTITLE "网络组件"
diff --git a/dll/shellext/netshell/lang/zh-HK.rc
b/dll/shellext/netshell/lang/zh-HK.rc
index f759809083c..c57c241fba7 100644
--- a/dll/shellext/netshell/lang/zh-HK.rc
+++ b/dll/shellext/netshell/lang/zh-HK.rc
@@ -84,6 +84,16 @@ BEGIN
PUSHBUTTON "關閉(&C)", IDC_CLOSE, 120, 155, 60, 14
END
+IDD_NETWORKINITPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20
+ LTEXT "Please wait while ReactOS installs networking components.",
IDC_STATIC, 53, 7, 240, 20
+ CONTROL "", IDC_INSTALL_PROGRESS, "msctls_progress32", PBS_SMOOTH |
WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 58, 275, 11
+END
+
IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CAPTION "ReactOS 安裝程式"
@@ -173,6 +183,8 @@ END
STRINGTABLE
BEGIN
+ IDS_NETWORKINITTITLE "Network Install"
+ IDS_NETWORKINITSUBTITLE "Installs reqired networking components."
IDS_NETWORKSETTINGSTITLE "網絡設定"
IDS_NETWORKSETTINGSSUBTITLE "安裝用於連接到其他網絡、電腦和互聯網的網絡軟件。"
IDS_NETWORKCOMPONENTTITLE "網絡元件"
diff --git a/dll/shellext/netshell/lang/zh-TW.rc
b/dll/shellext/netshell/lang/zh-TW.rc
index 225bf0c1691..fc09d3704ee 100644
--- a/dll/shellext/netshell/lang/zh-TW.rc
+++ b/dll/shellext/netshell/lang/zh-TW.rc
@@ -84,6 +84,16 @@ BEGIN
PUSHBUTTON "關閉(&C)", IDC_CLOSE, 120, 155, 60, 14
END
+IDD_NETWORKINITPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20
+ LTEXT "Please wait while ReactOS installs networking components.",
IDC_STATIC, 53, 7, 240, 20
+ CONTROL "", IDC_INSTALL_PROGRESS, "msctls_progress32", PBS_SMOOTH |
WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 58, 275, 11
+END
+
IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
CAPTION "ReactOS 安裝程式"
@@ -173,6 +183,8 @@ END
STRINGTABLE
BEGIN
+ IDS_NETWORKINITTITLE "Network Install"
+ IDS_NETWORKINITSUBTITLE "Installs reqired networking components."
IDS_NETWORKSETTINGSTITLE "網路設定"
IDS_NETWORKSETTINGSSUBTITLE "安裝用於連接到其他網路、電腦和網際網路的網路軟體。"
IDS_NETWORKCOMPONENTTITLE "網路元件"
diff --git a/dll/shellext/netshell/resource.h b/dll/shellext/netshell/resource.h
index 1519c473099..3d13418807a 100644
--- a/dll/shellext/netshell/resource.h
+++ b/dll/shellext/netshell/resource.h
@@ -52,6 +52,9 @@
#define IDC_CLOSE 1300
/* Network setup wizard pages */
+#define IDD_NETWORKINITPAGE 3400
+#define IDC_INSTALL_PROGRESS 3401
+
#define IDD_NETWORKSETTINGSPAGE 3500
#define IDC_NETWORK_TYPICAL 3501
#define IDC_NETWORK_CUSTOM 3502
@@ -115,12 +118,14 @@
#define IDS_PROPERTY 10309
#define IDS_VALUE 10310
-#define IDS_NETWORKSETTINGSTITLE 13050
-#define IDS_NETWORKSETTINGSSUBTITLE 13051
-#define IDS_NETWORKCOMPONENTTITLE 13052
-#define IDS_NETWORKCOMPONENTSUBTITLE 13053
-#define IDS_NETWORKDOMAINTITLE 13054
-#define IDS_NETWORKDOMAINSUBTITLE 13055
+#define IDS_NETWORKINITTITLE 13050
+#define IDS_NETWORKINITSUBTITLE 13051
+#define IDS_NETWORKSETTINGSTITLE 13052
+#define IDS_NETWORKSETTINGSSUBTITLE 13053
+#define IDS_NETWORKCOMPONENTTITLE 13054
+#define IDS_NETWORKCOMPONENTSUBTITLE 13055
+#define IDS_NETWORKDOMAINTITLE 13056
+#define IDS_NETWORKDOMAINSUBTITLE 13057
#define IDS_REACTOS_SETUP 13456
#define IDS_WZD_DOMAIN_NAME 13457
diff --git a/dll/shellext/netshell/setup.cpp b/dll/shellext/netshell/setup.cpp
index 800cb0b4c1f..1fb2a6021a8 100644
--- a/dll/shellext/netshell/setup.cpp
+++ b/dll/shellext/netshell/setup.cpp
@@ -15,10 +15,12 @@
typedef struct _NETWORKSETUPDATA
{
DWORD dwMagic;
- BOOL bTypicalNetworkSetup;
-
-
PSETUPDATA pSetupData;
+
+ /* settings page data */
+ BOOL bInitialSetupRun;
+ BOOL bTypicalNetworkSetup;
+ HWND hwndPage;
} NETWORKSETUPDATA, *PNETWORKSETUPDATA;
@@ -38,18 +40,19 @@ SetBoldText(
static
HRESULT
-InstallTypicalNetworkSettings(VOID)
+InstallNetworkComponent(
+ LPWSTR pszComponentName,
+ const GUID *pClassGuid)
{
INetCfg *pNetCfg = NULL;
INetCfgLock *pNetCfgLock = NULL;
- INetCfgComponent *pTcpipComponent = NULL;
- INetCfgComponent *pNicComponent = NULL;
- IEnumNetCfgComponent *pEnumNicComponents = NULL;
- WCHAR *pszNicName;
+ INetCfgClassSetup *pNetCfgClassSetup = NULL;
+ INetCfgComponent *pNetCfgComponent = NULL;
BOOL fWriteLocked = FALSE, fInitialized = FALSE;
+ OBO_TOKEN OboToken;
HRESULT hr;
- TRACE("InstallTypicalNetworkSettings()\n");
+ TRACE("InstallNetworkComponent()\n");
hr = CoInitialize(NULL);
if (hr != S_OK)
@@ -99,61 +102,47 @@ InstallTypicalNetworkSettings(VOID)
fInitialized = TRUE;
- /* Find the TCP/IP driver */
- hr = pNetCfg->FindComponent(L"ms_tcpip",
- &pTcpipComponent);
+ hr = pNetCfg->QueryNetCfgClass(pClassGuid,
+ IID_INetCfgClassSetup,
+ (PVOID*)&pNetCfgClassSetup);
+ if (hr != S_OK)
+ {
+ ERR("QueryNetCfgClass failed\n");
+ goto exit;
+ }
+
+ ZeroMemory(&OboToken, sizeof(OboToken));
+ OboToken.Type = OBO_USER;
+
+ TRACE("pNetCfgClassSetup->Install %p\n", &pNetCfgClassSetup->Install);
+ hr = pNetCfgClassSetup->Install(pszComponentName,
+ &OboToken,
+ 0, //NSF_PRIMARYINSTALL,
+ 0,
+ NULL,
+ NULL,
+ &pNetCfgComponent);
if (hr == S_OK)
{
- FIXME("Found the TCP/IP driver!\n");
+ if (pNetCfgComponent != NULL)
+ pNetCfgComponent->Release();
}
else
{
- ERR("Initialize failed\n");
+ ERR("Install failed\n");
goto exit;
}
- hr = pNetCfg->EnumComponents(&GUID_DEVCLASS_NET,
- &pEnumNicComponents);
+ hr = pNetCfg->Apply();
if (hr != S_OK)
{
- ERR("EnumComponents failed\n");
+ ERR("Apply failed\n");
goto exit;
}
- for (;;)
- {
- hr = pEnumNicComponents->Next(1,
- &pNicComponent,
- NULL);
- if (hr != S_OK)
- {
- TRACE("EnumNicComponents done!\n");
- break;
- }
-
- hr = pNicComponent->GetDisplayName(&pszNicName);
- if (hr == S_OK)
- {
- FIXME("NIC name: %S\n", pszNicName);
- CoTaskMemFree(pszNicName);
- }
-
- // FIXME Bind Tcpip to the NIC
-
- pNicComponent->Release();
- pNicComponent = NULL;
- }
-
- TRACE("Done!\n");
exit:
- if (pNicComponent != NULL)
- pNicComponent->Release();
-
- if (pEnumNicComponents != NULL)
- pEnumNicComponents->Release();
-
- if (pTcpipComponent != NULL)
- pTcpipComponent->Release();
+ if (pNetCfgClassSetup != NULL)
+ pNetCfgClassSetup->Release();
if (fInitialized)
pNetCfg->Uninitialize();
@@ -169,11 +158,111 @@ exit:
CoUninitialize();
- TRACE("InstallTypicalNetworkSettings() done!\n");
+ TRACE("InstallNetworkComponent() done!\n");
return hr;
}
+static
+DWORD
+WINAPI
+InstallThreadProc(
+ _In_ LPVOID lpParameter)
+{
+ PNETWORKSETUPDATA pNetworkSetupData = (PNETWORKSETUPDATA)lpParameter;
+
+ TRACE("InstallThreadProc()\n");
+
+ SendDlgItemMessage(pNetworkSetupData->hwndPage, IDC_INSTALL_PROGRESS,
PBM_SETRANGE, 0, MAKELPARAM(0, 1));
+ SendDlgItemMessage(pNetworkSetupData->hwndPage, IDC_INSTALL_PROGRESS,
PBM_SETPOS, 0, 0);
+
+ InstallNetworkComponent((LPWSTR)L"MS_TCPIP", &GUID_DEVCLASS_NETTRANS);
+ SendDlgItemMessage(pNetworkSetupData->hwndPage, IDC_INSTALL_PROGRESS,
PBM_SETPOS, 1, 0);
+
+ Sleep(500);
+
+ TRACE("Done\n");
+
+ /* Done */
+ pNetworkSetupData->bInitialSetupRun = TRUE;
+ PostMessage(pNetworkSetupData->hwndPage, WM_USER, 0, 0);
+
+ return 0;
+}
+
+static
+INT_PTR
+CALLBACK
+NetworkInitPageDlgProc(
+ HWND hwndDlg,
+ UINT uMsg,
+ WPARAM wParam,
+ LPARAM lParam)
+{
+ PNETWORKSETUPDATA pNetworkSetupData;
+ PSETUPDATA pSetupData;
+ LPNMHDR lpnm;
+
+ /* Retrieve pointer to the global setup data */
+ pNetworkSetupData = (PNETWORKSETUPDATA)GetWindowLongPtr(hwndDlg,
GWLP_USERDATA);
+ if ((pNetworkSetupData != NULL) &&
+ (pNetworkSetupData->dwMagic == NETWORK_SETUP_MAGIC))
+ pSetupData = pNetworkSetupData->pSetupData;
+
+ switch (uMsg)
+ {
+ case WM_INITDIALOG:
+ /* Save pointer to the global setup data */
+ pNetworkSetupData =
(PNETWORKSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam;
+ SetWindowLongPtr(hwndDlg, GWLP_USERDATA,
(DWORD_PTR)pNetworkSetupData);
+ pSetupData = pNetworkSetupData->pSetupData;
+
+ if (pSetupData->UnattendSetup)
+ {
+ //...
+ }
+ break;
+
+ case WM_DESTROY:
+ /* ATTENTION: Free pNetworkSetupData only in one of the page
functions!!! */
+ //...
+ break;
+
+ case WM_NOTIFY:
+ lpnm = (LPNMHDR)lParam;
+
+ switch (lpnm->code)
+ {
+ case PSN_SETACTIVE:
+ /* Disable the Back and Next buttons */
+ PropSheet_SetWizButtons(GetParent(hwndDlg), 0);
+ TRACE("Starting install thread!\n");
+ pNetworkSetupData->hwndPage = hwndDlg;
+ CreateThread(NULL, 0, InstallThreadProc,
(LPVOID)pNetworkSetupData, 0, NULL);
+ TRACE("Install thread done!\n");
+ break;
+
+ case PSN_WIZNEXT:
+ break;
+
+ case PSN_WIZBACK:
+ break;
+ }
+ break;
+
+ case WM_USER:
+ TRACE("WM_USER!\n");
+ /* Enable the Next button and press it */
+ PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT);
+ PropSheet_PressButton(GetParent(hwndDlg), PSBTN_NEXT);
+ break;
+
+ default:
+ break;
+ }
+
+ return FALSE;
+}
static
INT_PTR
@@ -226,13 +315,8 @@ NetworkSettingsPageDlgProc(
switch (lpnm->code)
{
case PSN_SETACTIVE:
- /* Enable the Back and Next buttons */
- PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK |
PSWIZB_NEXT);
- if (pSetupData->UnattendSetup)
- {
- SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT,
IDD_NETWORKCOMPONENTPAGE);
- return TRUE;
- }
+ /* Enable the Next button only */
+ PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT);
break;
case PSN_WIZNEXT:
@@ -243,8 +327,6 @@ NetworkSettingsPageDlgProc(
{
pNetworkSetupData->bTypicalNetworkSetup = TRUE;
- InstallTypicalNetworkSettings();
-
SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT,
IDD_NETWORKDOMAINPAGE);
return TRUE;
}
@@ -459,7 +541,7 @@ NetSetupRequestWizardPages(
{
PNETWORKSETUPDATA pNetworkSetupData;
PROPSHEETPAGE psp = {0};
- DWORD dwPageCount = 3;
+ DWORD dwPageCount = 4;
INT nPage = 0;
if (pPageCount == NULL)
@@ -483,12 +565,18 @@ NetSetupRequestWizardPages(
pNetworkSetupData->dwMagic = NETWORK_SETUP_MAGIC;
pNetworkSetupData->pSetupData = pSetupData;
-
/* Create the Network Settings page */
psp.dwSize = sizeof(PROPSHEETPAGE);
psp.hInstance = netshell_hInstance;
psp.lParam = (LPARAM)pNetworkSetupData;
+ psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE;
+ psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_NETWORKINITTITLE);
+ psp.pszHeaderSubTitle = MAKEINTRESOURCE(IDS_NETWORKINITSUBTITLE);
+ psp.pfnDlgProc = NetworkInitPageDlgProc;
+ psp.pszTemplate = MAKEINTRESOURCE(IDD_NETWORKINITPAGE);
+ pPages[nPage++] = CreatePropertySheetPage(&psp);
+
psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE;
psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_NETWORKSETTINGSTITLE);
psp.pszHeaderSubTitle = MAKEINTRESOURCE(IDS_NETWORKSETTINGSSUBTITLE);
diff --git a/dll/win32/syssetup/install.c b/dll/win32/syssetup/install.c
index 4d964fab68c..74b7148a096 100644
--- a/dll/win32/syssetup/install.c
+++ b/dll/win32/syssetup/install.c
@@ -1514,7 +1514,6 @@ InstallReactOS(VOID)
TOKEN_PRIVILEGES privs;
HKEY hKey;
HANDLE hHotkeyThread;
- BOOL ret;
InitializeSetupActionLog(FALSE);
LogItem(NULL, L"Installing ReactOS");
@@ -1583,20 +1582,6 @@ InstallReactOS(VOID)
if (!CommonInstall())
return 0;
- /* Install the TCP/IP protocol driver */
- ret = InstallNetworkComponent(L"MS_TCPIP");
- if (!ret && GetLastError() != ERROR_FILE_NOT_FOUND)
- {
- DPRINT("InstallNetworkComponent() failed with error 0x%lx\n",
GetLastError());
- }
- else
- {
- /* Start the TCP/IP protocol driver */
- SetupStartService(L"Tcpip", FALSE);
- SetupStartService(L"Dhcp", FALSE);
- SetupStartService(L"Dnscache", FALSE);
- }
-
InstallWizard();
InstallSecurity();
