[ros-diffs] [reactos] 01/01: [APPWIZ] CORE-5737: Move focus before SW_HIDE (#5536)

[Katayama Hirofumi MZ]

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

commit a6d264e4f0c47379ad2b9caf7dc411c9bf94da48
Author:     Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
AuthorDate: Mon Aug 7 09:48:50 2023 +0900
Commit:     GitHub <noreply(a)github.com>
CommitDate: Mon Aug 7 09:48:50 2023 +0900

    [APPWIZ] CORE-5737: Move focus before SW_HIDE (#5536)
    
    Arrow keys were not working.
    - Move focus before SW_HIDE.
    - Swap ID_DWL_INSTALL and IDCANCEL controls.
    CORE-5737
---
 dll/cpl/appwiz/addons.c      | 10 ++++++++--
 dll/cpl/appwiz/lang/bg-BG.rc |  4 ++--
 dll/cpl/appwiz/lang/cs-CZ.rc |  4 ++--
 dll/cpl/appwiz/lang/de-DE.rc |  4 ++--
 dll/cpl/appwiz/lang/el-GR.rc |  4 ++--
 dll/cpl/appwiz/lang/en-US.rc |  4 ++--
 dll/cpl/appwiz/lang/es-ES.rc |  4 ++--
 dll/cpl/appwiz/lang/et-EE.rc |  4 ++--
 dll/cpl/appwiz/lang/fr-FR.rc |  4 ++--
 dll/cpl/appwiz/lang/he-IL.rc |  4 ++--
 dll/cpl/appwiz/lang/hu-HU.rc |  4 ++--
 dll/cpl/appwiz/lang/id-ID.rc |  4 ++--
 dll/cpl/appwiz/lang/it-IT.rc |  4 ++--
 dll/cpl/appwiz/lang/ja-JP.rc |  4 ++--
 dll/cpl/appwiz/lang/no-NO.rc |  4 ++--
 dll/cpl/appwiz/lang/pl-PL.rc |  4 ++--
 dll/cpl/appwiz/lang/pt-BR.rc |  4 ++--
 dll/cpl/appwiz/lang/pt-PT.rc |  4 ++--
 dll/cpl/appwiz/lang/ro-RO.rc |  4 ++--
 dll/cpl/appwiz/lang/ru-RU.rc |  4 ++--
 dll/cpl/appwiz/lang/sk-SK.rc |  4 ++--
 dll/cpl/appwiz/lang/sq-AL.rc |  4 ++--
 dll/cpl/appwiz/lang/tr-TR.rc |  4 ++--
 dll/cpl/appwiz/lang/uk-UA.rc |  4 ++--
 dll/cpl/appwiz/lang/zh-CN.rc |  4 ++--
 dll/cpl/appwiz/lang/zh-HK.rc |  4 ++--
 dll/cpl/appwiz/lang/zh-TW.rc |  4 ++--
 27 files changed, 60 insertions(+), 54 deletions(-)

diff --git a/dll/cpl/appwiz/addons.c b/dll/cpl/appwiz/addons.c
index d2170688408..5fdfc999f1e 100644
--- a/dll/cpl/appwiz/addons.c
+++ b/dll/cpl/appwiz/addons.c
@@ -393,10 +393,16 @@ static DWORD WINAPI download_proc(PVOID arg)
 
 static INT_PTR CALLBACK installer_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
lParam)
 {
-    HWND hwndInstallButton;
+    HWND hwndProgress, hwndInstallButton;
     switch(msg) {
     case WM_INITDIALOG:
-        ShowWindow(GetDlgItem(hwnd, ID_DWL_PROGRESS), SW_HIDE);
+        hwndProgress = GetDlgItem(hwnd, ID_DWL_PROGRESS);
+
+        /* CORE-5737: Move focus before SW_HIDE */
+        if (hwndProgress == GetFocus())
+            SendMessageW(hwnd, WM_NEXTDLGCTL, 0, FALSE);
+
+        ShowWindow(hwndProgress, SW_HIDE);
         install_dialog = hwnd;
         return TRUE;
 
diff --git a/dll/cpl/appwiz/lang/bg-BG.rc b/dll/cpl/appwiz/lang/bg-BG.rc
index b472e7b75de..2ca81ca7306 100644
--- a/dll/cpl/appwiz/lang/bg-BG.rc
+++ b/dll/cpl/appwiz/lang/bg-BG.rc
@@ -61,8 +61,8 @@ BEGIN
     CONTROL "ReactOS could not find a Wine Gecko package which is needed for
applications embedding HTML to work correctly. ReactOS can automatically download and
install it for you.",
           ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65
     CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10,
40, 240, 12
-    DEFPUSHBUTTON "&Install", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP |
WS_TABSTOP
-    PUSHBUTTON "Cancel", IDCANCEL, 144, 76, 50, 14, WS_GROUP | WS_TABSTOP
+    DEFPUSHBUTTON "&Install", ID_DWL_INSTALL, 144, 76, 50, 14
+    PUSHBUTTON "Cancel", IDCANCEL, 200, 76, 50, 14
 END
 
 STRINGTABLE
diff --git a/dll/cpl/appwiz/lang/cs-CZ.rc b/dll/cpl/appwiz/lang/cs-CZ.rc
index 60e7acd2dd4..e03f52666b2 100644
--- a/dll/cpl/appwiz/lang/cs-CZ.rc
+++ b/dll/cpl/appwiz/lang/cs-CZ.rc
@@ -66,8 +66,8 @@ BEGIN
     CONTROL "ReactOS nenalezl balíček Wine Gecko nutný k tomu, aby aplikace
zapouzdřující HTML fungovaly správně. ReactOS jej může automaticky stáhnout a
nainstalovat.",
           ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65
     CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10,
40, 240, 12
-    DEFPUSHBUTTON "&Instalovat", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP
| WS_TABSTOP
-    PUSHBUTTON "Storno", IDCANCEL, 144, 76, 50, 14, WS_GROUP | WS_TABSTOP
+    DEFPUSHBUTTON "&Instalovat", ID_DWL_INSTALL, 144, 76, 50, 14
+    PUSHBUTTON "Storno", IDCANCEL, 200, 76, 50, 14
 END
 
 STRINGTABLE
diff --git a/dll/cpl/appwiz/lang/de-DE.rc b/dll/cpl/appwiz/lang/de-DE.rc
index 7a1b2508e15..07f78bc33f5 100644
--- a/dll/cpl/appwiz/lang/de-DE.rc
+++ b/dll/cpl/appwiz/lang/de-DE.rc
@@ -61,8 +61,8 @@ BEGIN
     CONTROL "ReactOS konnte kein Gecko-Paket finden, welches für die korrekte
Ausführung von Anwendungen mit eingebettetem HTML benötigt wird. ReactOS kann es
automatisch für Sie herunterladen und installieren.",
           ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65
     CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10,
40, 240, 12
-    DEFPUSHBUTTON "&Installieren", ID_DWL_INSTALL, 200, 76, 50, 14,
WS_GROUP | WS_TABSTOP
-    PUSHBUTTON "Abbrechen", IDCANCEL, 144, 76, 50, 14, WS_GROUP | WS_TABSTOP
+    DEFPUSHBUTTON "&Installieren", ID_DWL_INSTALL, 144, 76, 50, 14
+    PUSHBUTTON "Abbrechen", IDCANCEL, 200, 76, 50, 14
 END
 
 STRINGTABLE
diff --git a/dll/cpl/appwiz/lang/el-GR.rc b/dll/cpl/appwiz/lang/el-GR.rc
index 8669a85588d..6d1b0fcb7d8 100644
--- a/dll/cpl/appwiz/lang/el-GR.rc
+++ b/dll/cpl/appwiz/lang/el-GR.rc
@@ -61,8 +61,8 @@ BEGIN
     CONTROL "ReactOS could not find a Wine Gecko package which is needed for
applications embedding HTML to work correctly. ReactOS can automatically download and
install it for you.",
           ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65
     CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10,
40, 240, 12
-    DEFPUSHBUTTON "&Install", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP |
WS_TABSTOP
-    PUSHBUTTON "Cancel", IDCANCEL, 144, 76, 50, 14, WS_GROUP | WS_TABSTOP
+    DEFPUSHBUTTON "&Install", ID_DWL_INSTALL, 144, 76, 50, 14
+    PUSHBUTTON "Cancel", IDCANCEL, 200, 76, 50, 14
 END
 
 STRINGTABLE
diff --git a/dll/cpl/appwiz/lang/en-US.rc b/dll/cpl/appwiz/lang/en-US.rc
index 29c51714a0c..1c4be80aef3 100644
--- a/dll/cpl/appwiz/lang/en-US.rc
+++ b/dll/cpl/appwiz/lang/en-US.rc
@@ -61,8 +61,8 @@ BEGIN
     CONTROL "ReactOS could not find a Wine Gecko package which is needed for
applications embedding HTML to work correctly. ReactOS can automatically download and
install it for you.",
           ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65
     CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10,
40, 240, 12
-    DEFPUSHBUTTON "&Install", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP |
WS_TABSTOP
-    PUSHBUTTON "Cancel", IDCANCEL, 144, 76, 50, 14, WS_GROUP | WS_TABSTOP
+    DEFPUSHBUTTON "&Install", ID_DWL_INSTALL, 144, 76, 50, 14
+    PUSHBUTTON "Cancel", IDCANCEL, 200, 76, 50, 14
 END
 
 STRINGTABLE
diff --git a/dll/cpl/appwiz/lang/es-ES.rc b/dll/cpl/appwiz/lang/es-ES.rc
index 23cb4c36f58..5f59afb626c 100644
--- a/dll/cpl/appwiz/lang/es-ES.rc
+++ b/dll/cpl/appwiz/lang/es-ES.rc
@@ -71,8 +71,8 @@ BEGIN
     CONTROL "ReactOS no pudo encontrar el paquete de Wine Gecko, necesario para que
las aplicaciones con HTML embebido funcionen correctamente.\n\nReactOS puede ayudar a
descargarlo de forma automática y fácil.",
           ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65
     CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10,
40, 240, 12
-    DEFPUSHBUTTON "&Instalar", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP |
WS_TABSTOP
-    PUSHBUTTON "&Cancelar", IDCANCEL, 144, 76, 50, 14, WS_GROUP |
WS_TABSTOP
+    DEFPUSHBUTTON "&Instalar", ID_DWL_INSTALL, 144, 76, 50, 14
+    PUSHBUTTON "&Cancelar", IDCANCEL, 200, 76, 50, 14
 END
 
 STRINGTABLE
diff --git a/dll/cpl/appwiz/lang/et-EE.rc b/dll/cpl/appwiz/lang/et-EE.rc
index 4d9825e3ec9..a17534fb4e8 100644
--- a/dll/cpl/appwiz/lang/et-EE.rc
+++ b/dll/cpl/appwiz/lang/et-EE.rc
@@ -68,8 +68,8 @@ BEGIN
     CONTROL "ReactOS ei leidnud Wine Gecko paketti, mille abil saavad rakendused
HTMLi korralikult kasutada. ReactOS saab selle automaatselt paigaldada ja alla
laadida.",
           ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65
     CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10,
40, 240, 12
-    DEFPUSHBUTTON "&Paigalda", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP |
WS_TABSTOP
-    PUSHBUTTON "&Loobu", IDCANCEL, 144, 76, 50, 14, WS_GROUP | WS_TABSTOP
+    DEFPUSHBUTTON "&Paigalda", ID_DWL_INSTALL, 144, 76, 50, 14
+    PUSHBUTTON "&Loobu", IDCANCEL, 200, 76, 50, 14
 END
 
 STRINGTABLE
diff --git a/dll/cpl/appwiz/lang/fr-FR.rc b/dll/cpl/appwiz/lang/fr-FR.rc
index c304ac8f323..731283c04f2 100644
--- a/dll/cpl/appwiz/lang/fr-FR.rc
+++ b/dll/cpl/appwiz/lang/fr-FR.rc
@@ -61,8 +61,8 @@ BEGIN
     CONTROL "ReactOS n'a trouvé aucun paquet Wine Gecko nécessaire pour pouvoir
exécuter correctement les applications incluant du code HTML. ReactOS est capable de
télécharger et d'installer automatiquement le paquet pour vous.",
           ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65
     CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10,
40, 240, 12
-    DEFPUSHBUTTON "&Installer", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP |
WS_TABSTOP
-    PUSHBUTTON "Annuler", IDCANCEL, 144, 76, 50, 14, WS_GROUP | WS_TABSTOP
+    DEFPUSHBUTTON "&Installer", ID_DWL_INSTALL, 144, 76, 50, 14
+    PUSHBUTTON "Annuler", IDCANCEL, 200, 76, 50, 14
 END
 
 STRINGTABLE
diff --git a/dll/cpl/appwiz/lang/he-IL.rc b/dll/cpl/appwiz/lang/he-IL.rc
index c0a1628ba01..01a4ce72301 100644
--- a/dll/cpl/appwiz/lang/he-IL.rc
+++ b/dll/cpl/appwiz/lang/he-IL.rc
@@ -62,8 +62,8 @@ BEGIN
     CONTROL "ReactOS could not find a Wine Gecko package which is needed for
applications embedding HTML to work correctly. ReactOS can automatically download and
install it for you.",
           ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65
     CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10,
40, 240, 12
-    DEFPUSHBUTTON "&Install", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP |
WS_TABSTOP
-    PUSHBUTTON "Cancel", IDCANCEL, 144, 76, 50, 14, WS_GROUP | WS_TABSTOP
+    DEFPUSHBUTTON "&Install", ID_DWL_INSTALL, 144, 76, 50, 14
+    PUSHBUTTON "Cancel", IDCANCEL, 200, 76, 50, 14
 END
 
 STRINGTABLE
diff --git a/dll/cpl/appwiz/lang/hu-HU.rc b/dll/cpl/appwiz/lang/hu-HU.rc
index c2f868fafd3..ed58f785006 100644
--- a/dll/cpl/appwiz/lang/hu-HU.rc
+++ b/dll/cpl/appwiz/lang/hu-HU.rc
@@ -65,8 +65,8 @@ BEGIN
     CONTROL "A ReactOS nem találja a Wine Gecko csomagot, ami a HTML-t beágyazó
alkalmazások működéséhez szükséges. Ezt a ReactOS automatikusan le tudja tölteni és
telepíteni.",
           ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65
     CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10,
40, 240, 12
-    DEFPUSHBUTTON "&Telepítés", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP |
WS_TABSTOP
-    PUSHBUTTON "Mégse", IDCANCEL, 144, 76, 50, 14, WS_GROUP | WS_TABSTOP
+    DEFPUSHBUTTON "&Telepítés", ID_DWL_INSTALL, 144, 76, 50, 14
+    PUSHBUTTON "Mégse", IDCANCEL, 200, 76, 50, 14
 END
 
 STRINGTABLE
diff --git a/dll/cpl/appwiz/lang/id-ID.rc b/dll/cpl/appwiz/lang/id-ID.rc
index 2992561f292..83e4a0f7931 100644
--- a/dll/cpl/appwiz/lang/id-ID.rc
+++ b/dll/cpl/appwiz/lang/id-ID.rc
@@ -61,8 +61,8 @@ BEGIN
     CONTROL "ReactOS tidak bisa menemukan paket Wine Gecko yang dibutuhkan untuk
aplikasi pengimplementasi HTML bekerja dengan baik. ReactOS bisa secara otomatis mengunduh
dan memasang unduk anda.",
           ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65
     CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10,
40, 240, 12
-    DEFPUSHBUTTON "&Pasang", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP |
WS_TABSTOP
-    PUSHBUTTON "Batal", IDCANCEL, 144, 76, 50, 14, WS_GROUP | WS_TABSTOP
+    DEFPUSHBUTTON "&Pasang", ID_DWL_INSTALL, 144, 76, 50, 14
+    PUSHBUTTON "Batal", IDCANCEL, 200, 76, 50, 14
 END
 
 STRINGTABLE
diff --git a/dll/cpl/appwiz/lang/it-IT.rc b/dll/cpl/appwiz/lang/it-IT.rc
index ed400f1523c..ab8e9cddf4c 100644
--- a/dll/cpl/appwiz/lang/it-IT.rc
+++ b/dll/cpl/appwiz/lang/it-IT.rc
@@ -61,8 +61,8 @@ BEGIN
     CONTROL "ReactOS non ha trovato il pacchetto Wine Gecko necessario per il
corretto funzionamento delle applicazioni che incorporano HTML. ReactOS puo scaricarlo e
installarlo automaticamente.",
           ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65
     CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10,
40, 240, 12
-    DEFPUSHBUTTON "&Installa", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP |
WS_TABSTOP
-    PUSHBUTTON "Annulla", IDCANCEL, 144, 76, 50, 14, WS_GROUP | WS_TABSTOP
+    DEFPUSHBUTTON "&Installa", ID_DWL_INSTALL, 144, 76, 50, 14
+    PUSHBUTTON "Annulla", IDCANCEL, 200, 76, 50, 14
 END
 
 STRINGTABLE
diff --git a/dll/cpl/appwiz/lang/ja-JP.rc b/dll/cpl/appwiz/lang/ja-JP.rc
index a8e93c6b894..6455621ba13 100644
--- a/dll/cpl/appwiz/lang/ja-JP.rc
+++ b/dll/cpl/appwiz/lang/ja-JP.rc
@@ -61,8 +61,8 @@ BEGIN
     CONTROL "ReactOSは、HTMLを埋め込んだアプリを正しく動作させるために必要なWine
Geckoパッケージを発見できませんでした。ReactOSはそれを自動的にダウンロード・インストールできます。",
           ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65
     CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10,
40, 240, 12
-    DEFPUSHBUTTON "インストール(&I)", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP |
WS_TABSTOP
-    PUSHBUTTON "キャンセル", IDCANCEL, 144, 76, 50, 14, WS_GROUP | WS_TABSTOP
+    DEFPUSHBUTTON "インストール(&I)", ID_DWL_INSTALL, 144, 76, 50, 14
+    PUSHBUTTON "キャンセル", IDCANCEL, 200, 76, 50, 14
 END
 
 STRINGTABLE
diff --git a/dll/cpl/appwiz/lang/no-NO.rc b/dll/cpl/appwiz/lang/no-NO.rc
index 7719769826b..dc5c660ba6d 100644
--- a/dll/cpl/appwiz/lang/no-NO.rc
+++ b/dll/cpl/appwiz/lang/no-NO.rc
@@ -61,8 +61,8 @@ BEGIN
     CONTROL "ReactOS could not find a Wine Gecko package which is needed for
applications embedding HTML to work correctly. ReactOS can automatically download and
install it for you.",
           ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65
     CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10,
40, 240, 12
-    DEFPUSHBUTTON "&Install", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP |
WS_TABSTOP
-    PUSHBUTTON "Cancel", IDCANCEL, 144, 76, 50, 14, WS_GROUP | WS_TABSTOP
+    DEFPUSHBUTTON "&Install", ID_DWL_INSTALL, 144, 76, 50, 14
+    PUSHBUTTON "Cancel", IDCANCEL, 200, 76, 50, 14
 END
 
 STRINGTABLE
diff --git a/dll/cpl/appwiz/lang/pl-PL.rc b/dll/cpl/appwiz/lang/pl-PL.rc
index bdd2a0cf284..248269f30a8 100644
--- a/dll/cpl/appwiz/lang/pl-PL.rc
+++ b/dll/cpl/appwiz/lang/pl-PL.rc
@@ -72,8 +72,8 @@ BEGIN
     CONTROL "System ReactOS nie mógł odnaleźć pakietu Wine Gecko, który jest
potrzebny dla aplikacji osadzających kod HTML, aby mogły poprawnie działać. System ReactOS
może automatycznie pobrać i zainstalować ten pakiet dla Ciebie.",
           ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 35
     CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10,
48, 240, 12
-    DEFPUSHBUTTON "&Instaluj", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP |
WS_TABSTOP
-    PUSHBUTTON "Anuluj", IDCANCEL, 144, 76, 50, 14, WS_GROUP | WS_TABSTOP
+    DEFPUSHBUTTON "&Instaluj", ID_DWL_INSTALL, 144, 76, 50, 14
+    PUSHBUTTON "Anuluj", IDCANCEL, 200, 76, 50, 14
 END
 
 STRINGTABLE
diff --git a/dll/cpl/appwiz/lang/pt-BR.rc b/dll/cpl/appwiz/lang/pt-BR.rc
index e3165c75d30..c21d9eaeb58 100644
--- a/dll/cpl/appwiz/lang/pt-BR.rc
+++ b/dll/cpl/appwiz/lang/pt-BR.rc
@@ -63,8 +63,8 @@ BEGIN
     CONTROL "ReactOS could not find a Wine Gecko package which is needed for
applications embedding HTML to work correctly. ReactOS can automatically download and
install it for you.",
           ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65
     CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10,
40, 240, 12
-    DEFPUSHBUTTON "&Install", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP |
WS_TABSTOP
-    PUSHBUTTON "Cancel", IDCANCEL, 144, 76, 50, 14, WS_GROUP | WS_TABSTOP
+    DEFPUSHBUTTON "&Install", ID_DWL_INSTALL, 144, 76, 50, 14
+    PUSHBUTTON "Cancel", IDCANCEL, 200, 76, 50, 14
 END
 
 STRINGTABLE
diff --git a/dll/cpl/appwiz/lang/pt-PT.rc b/dll/cpl/appwiz/lang/pt-PT.rc
index 4e03e1cc06f..d0cf672158a 100644
--- a/dll/cpl/appwiz/lang/pt-PT.rc
+++ b/dll/cpl/appwiz/lang/pt-PT.rc
@@ -63,8 +63,8 @@ BEGIN
     CONTROL "O ReactOS não consegue encontrar o pacote Wine Gecko que é necessário
para que as aplicações HTML funcionem correctamente. O ReactOS pode fazer o download
automático e instalar por si.",
           ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65
     CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10,
40, 240, 12
-    DEFPUSHBUTTON "&Instalar", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP |
WS_TABSTOP
-    PUSHBUTTON "Cancelar", IDCANCEL, 144, 76, 50, 14, WS_GROUP | WS_TABSTOP
+    DEFPUSHBUTTON "&Instalar", ID_DWL_INSTALL, 144, 76, 50, 14
+    PUSHBUTTON "Cancelar", IDCANCEL, 200, 76, 50, 14
 END
 
 STRINGTABLE
diff --git a/dll/cpl/appwiz/lang/ro-RO.rc b/dll/cpl/appwiz/lang/ro-RO.rc
index 7de4688abb6..adfa7b3447e 100644
--- a/dll/cpl/appwiz/lang/ro-RO.rc
+++ b/dll/cpl/appwiz/lang/ro-RO.rc
@@ -69,8 +69,8 @@ BEGIN
     CONTROL "Pachetul Wine Gecko, necesar pentru funcționarea corectă a aplicațiilor
cu HTML încorporat, nu este există local. ReactOS permite totuși descărcarea și instalarea
automată a acestuia.",
           ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65
     CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10,
40, 240, 12
-    DEFPUSHBUTTON "Instalea&ză", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP
| WS_TABSTOP
-    PUSHBUTTON "A&nulează", IDCANCEL, 144, 76, 50, 14, WS_GROUP |
WS_TABSTOP
+    DEFPUSHBUTTON "Instalea&ză", ID_DWL_INSTALL, 144, 76, 50, 14
+    PUSHBUTTON "A&nulează", IDCANCEL, 200, 76, 50, 14
 END
 
 STRINGTABLE
diff --git a/dll/cpl/appwiz/lang/ru-RU.rc b/dll/cpl/appwiz/lang/ru-RU.rc
index 25a825bd639..75fafc51b51 100644
--- a/dll/cpl/appwiz/lang/ru-RU.rc
+++ b/dll/cpl/appwiz/lang/ru-RU.rc
@@ -61,8 +61,8 @@ BEGIN
     CONTROL "ReactOS не может найти Wine Gecko пакет, который необходим для
приложений с поддержкой HTML, чтобы работать правильно. ReactOS может автоматически
загрузить и установить его для вас.",
           ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65
     CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10,
40, 240, 12
-    DEFPUSHBUTTON "&Установить", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP
| WS_TABSTOP
-    PUSHBUTTON "Отмена", IDCANCEL, 144, 76, 50, 14, WS_GROUP | WS_TABSTOP
+    DEFPUSHBUTTON "&Установить", ID_DWL_INSTALL, 144, 76, 50, 14
+    PUSHBUTTON "Отмена", IDCANCEL, 200, 76, 50, 14
 END
 
 STRINGTABLE
diff --git a/dll/cpl/appwiz/lang/sk-SK.rc b/dll/cpl/appwiz/lang/sk-SK.rc
index 1e85530000e..aaca7a01487 100644
--- a/dll/cpl/appwiz/lang/sk-SK.rc
+++ b/dll/cpl/appwiz/lang/sk-SK.rc
@@ -65,8 +65,8 @@ BEGIN
     CONTROL "ReactOS could not find a Wine Gecko package which is needed for
applications embedding HTML to work correctly. ReactOS can automatically download and
install it for you.",
           ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65
     CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10,
40, 240, 12
-    DEFPUSHBUTTON "&Install", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP |
WS_TABSTOP
-    PUSHBUTTON "Cancel", IDCANCEL, 144, 76, 50, 14, WS_GROUP | WS_TABSTOP
+    DEFPUSHBUTTON "&Install", ID_DWL_INSTALL, 144, 76, 50, 14
+    PUSHBUTTON "Cancel", IDCANCEL, 200, 76, 50, 14
 END
 
 STRINGTABLE
diff --git a/dll/cpl/appwiz/lang/sq-AL.rc b/dll/cpl/appwiz/lang/sq-AL.rc
index f0598c3aef3..b6dbbc3aa5d 100644
--- a/dll/cpl/appwiz/lang/sq-AL.rc
+++ b/dll/cpl/appwiz/lang/sq-AL.rc
@@ -65,8 +65,8 @@ BEGIN
     CONTROL "ReactOS nuk mund të gjej një paketë Wine Gecko e cila është e nevojshme
për aplikimet e ngulura HTML të funksionoj në rregull. ReactOS mund ta shkarkoje
automatikisht dhe ta instalojë për ju.",
           ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65
     CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10,
40, 240, 12
-    DEFPUSHBUTTON "&Instalo", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP |
WS_TABSTOP
-    PUSHBUTTON "Anulo", IDCANCEL, 144, 76, 50, 14, WS_GROUP | WS_TABSTOP
+    DEFPUSHBUTTON "&Instalo", ID_DWL_INSTALL, 144, 76, 50, 14
+    PUSHBUTTON "Anulo", IDCANCEL, 200, 76, 50, 14
 END
 
 STRINGTABLE
diff --git a/dll/cpl/appwiz/lang/tr-TR.rc b/dll/cpl/appwiz/lang/tr-TR.rc
index f9d5e06ce50..745f690df08 100644
--- a/dll/cpl/appwiz/lang/tr-TR.rc
+++ b/dll/cpl/appwiz/lang/tr-TR.rc
@@ -63,8 +63,8 @@ BEGIN
     CONTROL "ReactOS, HTML gömülü uygulamaların düzgün çalışması için gereken bir
Wine Gecko paketi bulamadı. ReactOS, sizin için onu, otomatik indirebilir ve
kurabilir.",
           ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65
     CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10,
40, 240, 12
-    DEFPUSHBUTTON "&Kur", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP |
WS_TABSTOP
-    PUSHBUTTON "İptal", IDCANCEL, 144, 76, 50, 14, WS_GROUP | WS_TABSTOP
+    DEFPUSHBUTTON "&Kur", ID_DWL_INSTALL, 144, 76, 50, 14
+    PUSHBUTTON "İptal", IDCANCEL, 200, 76, 50, 14
 END
 
 STRINGTABLE
diff --git a/dll/cpl/appwiz/lang/uk-UA.rc b/dll/cpl/appwiz/lang/uk-UA.rc
index bdcdc9d45ba..bebed612638 100644
--- a/dll/cpl/appwiz/lang/uk-UA.rc
+++ b/dll/cpl/appwiz/lang/uk-UA.rc
@@ -69,8 +69,8 @@ BEGIN
     CONTROL "ReactOS не може знайти Wine Gecko пакет, який необхідний для додатків з
підтримкою HTML, щоб вони працювали правильно. ReactOS може автоматично завантажити та
встановити його для вас.",
           ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65
     CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10,
40, 240, 12
-    DEFPUSHBUTTON "&Встановити", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP
| WS_TABSTOP
-    PUSHBUTTON "Скасувати", IDCANCEL, 144, 76, 50, 14, WS_GROUP | WS_TABSTOP
+    DEFPUSHBUTTON "&Встановити", ID_DWL_INSTALL, 144, 76, 50, 14
+    PUSHBUTTON "Скасувати", IDCANCEL, 200, 76, 50, 14
 END
 
 STRINGTABLE
diff --git a/dll/cpl/appwiz/lang/zh-CN.rc b/dll/cpl/appwiz/lang/zh-CN.rc
index a1b57cfbbf1..c3b99c5dc7a 100644
--- a/dll/cpl/appwiz/lang/zh-CN.rc
+++ b/dll/cpl/appwiz/lang/zh-CN.rc
@@ -70,8 +70,8 @@ BEGIN
     CONTROL "ReactOS 无法找到使内嵌 HTML 的应用程序正常工作的 Wine Gecko 包。ReactOS
能为您自动下载并安装。",
           ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65
     CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10,
40, 240, 12
-    DEFPUSHBUTTON "安装(&I)", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP |
WS_TABSTOP
-    PUSHBUTTON "取消", IDCANCEL, 144, 76, 50, 14, WS_GROUP | WS_TABSTOP
+    DEFPUSHBUTTON "安装(&I)", ID_DWL_INSTALL, 144, 76, 50, 14
+    PUSHBUTTON "取消", IDCANCEL, 200, 76, 50, 14
 END
 
 STRINGTABLE
diff --git a/dll/cpl/appwiz/lang/zh-HK.rc b/dll/cpl/appwiz/lang/zh-HK.rc
index 5f32adf1dbd..1baeb03850c 100644
--- a/dll/cpl/appwiz/lang/zh-HK.rc
+++ b/dll/cpl/appwiz/lang/zh-HK.rc
@@ -69,8 +69,8 @@ BEGIN
     CONTROL "ReactOS 找不到使內嵌 HTML 的應用程式正常工作的 Wine Gecko 套件。\nReactOS
能為您自動下載並安裝。",
           ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65
     CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10,
40, 240, 12
-    DEFPUSHBUTTON "安裝(&I)", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP |
WS_TABSTOP
-    PUSHBUTTON "取消", IDCANCEL, 144, 76, 50, 14, WS_GROUP | WS_TABSTOP
+    DEFPUSHBUTTON "安裝(&I)", ID_DWL_INSTALL, 144, 76, 50, 14
+    PUSHBUTTON "取消", IDCANCEL, 200, 76, 50, 14
 END
 
 STRINGTABLE
diff --git a/dll/cpl/appwiz/lang/zh-TW.rc b/dll/cpl/appwiz/lang/zh-TW.rc
index 413ae7285bd..a4bd7485c1f 100644
--- a/dll/cpl/appwiz/lang/zh-TW.rc
+++ b/dll/cpl/appwiz/lang/zh-TW.rc
@@ -70,8 +70,8 @@ BEGIN
     CONTROL "ReactOS 無法找到使內嵌 HTML 的應用程式正常工作的 Wine Gecko 套件。\nReactOS
能為您自動下載並安裝。",
           ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65
     CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10,
40, 240, 12
-    DEFPUSHBUTTON "安裝(&I)", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP |
WS_TABSTOP
-    PUSHBUTTON "取消", IDCANCEL, 144, 76, 50, 14, WS_GROUP | WS_TABSTOP
+    DEFPUSHBUTTON "安裝(&I)", ID_DWL_INSTALL, 144, 76, 50, 14
+    PUSHBUTTON "取消", IDCANCEL, 200, 76, 50, 14
 END
 
 STRINGTABLE