From b2a6aff94f502a6eb96cd358989ec28d150ac41a Mon Sep 17 00:00:00 2001 From: Robert Naumann Date: Mon, 7 Dec 2015 23:21:49 +0000 Subject: [PATCH] [SYSSETUP] Set an owner name by default. Patch by Ismael Ferreras Morezuelas CORE-10476 svn path=/trunk/; revision=70291 --- reactos/dll/win32/syssetup/lang/bg-BG.rc | 1 + reactos/dll/win32/syssetup/lang/cs-CZ.rc | 1 + reactos/dll/win32/syssetup/lang/de-DE.rc | 1 + reactos/dll/win32/syssetup/lang/el-GR.rc | 1 + reactos/dll/win32/syssetup/lang/en-US.rc | 1 + reactos/dll/win32/syssetup/lang/es-ES.rc | 1 + reactos/dll/win32/syssetup/lang/et-EE.rc | 1 + reactos/dll/win32/syssetup/lang/fr-FR.rc | 1 + reactos/dll/win32/syssetup/lang/he-IL.rc | 1 + reactos/dll/win32/syssetup/lang/hu-HU.rc | 1 + reactos/dll/win32/syssetup/lang/id-ID.rc | 1 + reactos/dll/win32/syssetup/lang/it-IT.rc | 1 + reactos/dll/win32/syssetup/lang/ja-JP.rc | 1 + reactos/dll/win32/syssetup/lang/nl-NL.rc | 1 + reactos/dll/win32/syssetup/lang/no-NO.rc | 1 + reactos/dll/win32/syssetup/lang/pl-PL.rc | 1 + reactos/dll/win32/syssetup/lang/pt-BR.rc | 1 + reactos/dll/win32/syssetup/lang/ro-RO.rc | 1 + reactos/dll/win32/syssetup/lang/ru-RU.rc | 1 + reactos/dll/win32/syssetup/lang/sk-SK.rc | 1 + reactos/dll/win32/syssetup/lang/sq-AL.rc | 1 + reactos/dll/win32/syssetup/lang/tr-TR.rc | 1 + reactos/dll/win32/syssetup/lang/uk-UA.rc | 1 + reactos/dll/win32/syssetup/lang/zh-CN.rc | 1 + reactos/dll/win32/syssetup/resource.h | 1 + reactos/dll/win32/syssetup/wizard.c | 10 ++++++++++ 26 files changed, 35 insertions(+) diff --git a/reactos/dll/win32/syssetup/lang/bg-BG.rc b/reactos/dll/win32/syssetup/lang/bg-BG.rc index 73ef1726466..02fc82e87cc 100644 --- a/reactos/dll/win32/syssetup/lang/bg-BG.rc +++ b/reactos/dll/win32/syssetup/lang/bg-BG.rc @@ -155,6 +155,7 @@ BEGIN * Also check the IDD_COMPUTERPAGE dialog. */ IDS_ADMINISTRATOR_NAME "Administrator" + IDS_MACHINE_OWNER_NAME "Собственик" END STRINGTABLE diff --git a/reactos/dll/win32/syssetup/lang/cs-CZ.rc b/reactos/dll/win32/syssetup/lang/cs-CZ.rc index 9fe7ad2fbd3..0a4780d9a7c 100644 --- a/reactos/dll/win32/syssetup/lang/cs-CZ.rc +++ b/reactos/dll/win32/syssetup/lang/cs-CZ.rc @@ -161,6 +161,7 @@ BEGIN * Also check the IDD_COMPUTERPAGE dialog. */ IDS_ADMINISTRATOR_NAME "Administrator" + IDS_MACHINE_OWNER_NAME "Vlastník" END STRINGTABLE diff --git a/reactos/dll/win32/syssetup/lang/de-DE.rc b/reactos/dll/win32/syssetup/lang/de-DE.rc index f34f62a2488..931d00d2dc6 100644 --- a/reactos/dll/win32/syssetup/lang/de-DE.rc +++ b/reactos/dll/win32/syssetup/lang/de-DE.rc @@ -155,6 +155,7 @@ BEGIN * Also check the IDD_COMPUTERPAGE dialog. */ IDS_ADMINISTRATOR_NAME "Administrator" + IDS_MACHINE_OWNER_NAME "Besitzer" END STRINGTABLE diff --git a/reactos/dll/win32/syssetup/lang/el-GR.rc b/reactos/dll/win32/syssetup/lang/el-GR.rc index 487c2b47a0e..56224fa67a8 100644 --- a/reactos/dll/win32/syssetup/lang/el-GR.rc +++ b/reactos/dll/win32/syssetup/lang/el-GR.rc @@ -155,6 +155,7 @@ BEGIN * Also check the IDD_COMPUTERPAGE dialog. */ IDS_ADMINISTRATOR_NAME "Administrator" + IDS_MACHINE_OWNER_NAME "Κάτοχος" END STRINGTABLE diff --git a/reactos/dll/win32/syssetup/lang/en-US.rc b/reactos/dll/win32/syssetup/lang/en-US.rc index c74b90b671b..c9f803cbec7 100644 --- a/reactos/dll/win32/syssetup/lang/en-US.rc +++ b/reactos/dll/win32/syssetup/lang/en-US.rc @@ -174,6 +174,7 @@ BEGIN * Also check the IDD_COMPUTERPAGE dialog. */ IDS_ADMINISTRATOR_NAME "Administrator" + IDS_MACHINE_OWNER_NAME "Owner" END STRINGTABLE diff --git a/reactos/dll/win32/syssetup/lang/es-ES.rc b/reactos/dll/win32/syssetup/lang/es-ES.rc index 93c39d8cd47..8466b106fa4 100644 --- a/reactos/dll/win32/syssetup/lang/es-ES.rc +++ b/reactos/dll/win32/syssetup/lang/es-ES.rc @@ -156,6 +156,7 @@ BEGIN * Also check the IDD_COMPUTERPAGE dialog. */ IDS_ADMINISTRATOR_NAME "Administrator" + IDS_MACHINE_OWNER_NAME "Propietario" END STRINGTABLE diff --git a/reactos/dll/win32/syssetup/lang/et-EE.rc b/reactos/dll/win32/syssetup/lang/et-EE.rc index 2a54dacbced..8767b552315 100644 --- a/reactos/dll/win32/syssetup/lang/et-EE.rc +++ b/reactos/dll/win32/syssetup/lang/et-EE.rc @@ -155,6 +155,7 @@ BEGIN * Also check the IDD_COMPUTERPAGE dialog. */ IDS_ADMINISTRATOR_NAME "Administrator" + IDS_MACHINE_OWNER_NAME "Owner" END STRINGTABLE diff --git a/reactos/dll/win32/syssetup/lang/fr-FR.rc b/reactos/dll/win32/syssetup/lang/fr-FR.rc index aaa23b9a50b..25c2d53994b 100644 --- a/reactos/dll/win32/syssetup/lang/fr-FR.rc +++ b/reactos/dll/win32/syssetup/lang/fr-FR.rc @@ -155,6 +155,7 @@ BEGIN * Also check the IDD_COMPUTERPAGE dialog. */ IDS_ADMINISTRATOR_NAME "Administrator" + IDS_MACHINE_OWNER_NAME "Propriétaire" END STRINGTABLE diff --git a/reactos/dll/win32/syssetup/lang/he-IL.rc b/reactos/dll/win32/syssetup/lang/he-IL.rc index a3ca6a5c0d1..015e6ae3e2e 100644 --- a/reactos/dll/win32/syssetup/lang/he-IL.rc +++ b/reactos/dll/win32/syssetup/lang/he-IL.rc @@ -155,6 +155,7 @@ BEGIN * Also check the IDD_COMPUTERPAGE dialog. */ IDS_ADMINISTRATOR_NAME "Administrator" + IDS_MACHINE_OWNER_NAME "בעלים" END STRINGTABLE diff --git a/reactos/dll/win32/syssetup/lang/hu-HU.rc b/reactos/dll/win32/syssetup/lang/hu-HU.rc index e3661c6ea41..8282d950238 100644 --- a/reactos/dll/win32/syssetup/lang/hu-HU.rc +++ b/reactos/dll/win32/syssetup/lang/hu-HU.rc @@ -155,6 +155,7 @@ BEGIN * Also check the IDD_COMPUTERPAGE dialog. */ IDS_ADMINISTRATOR_NAME "Administrator" + IDS_MACHINE_OWNER_NAME "Tulajdonos" END STRINGTABLE diff --git a/reactos/dll/win32/syssetup/lang/id-ID.rc b/reactos/dll/win32/syssetup/lang/id-ID.rc index 023b9b9ed3a..da6f512f292 100644 --- a/reactos/dll/win32/syssetup/lang/id-ID.rc +++ b/reactos/dll/win32/syssetup/lang/id-ID.rc @@ -155,6 +155,7 @@ BEGIN * Also check the IDD_COMPUTERPAGE dialog. */ IDS_ADMINISTRATOR_NAME "Administrator" + IDS_MACHINE_OWNER_NAME "Owner" END STRINGTABLE diff --git a/reactos/dll/win32/syssetup/lang/it-IT.rc b/reactos/dll/win32/syssetup/lang/it-IT.rc index 4d8aacd0898..820a6ded286 100644 --- a/reactos/dll/win32/syssetup/lang/it-IT.rc +++ b/reactos/dll/win32/syssetup/lang/it-IT.rc @@ -155,6 +155,7 @@ IDS_REACTOS_SETUP "Installazione di ReactOS" * Also check the IDD_COMPUTERPAGE dialog. */ IDS_ADMINISTRATOR_NAME "Administrator" + IDS_MACHINE_OWNER_NAME "Proprietario" END STRINGTABLE diff --git a/reactos/dll/win32/syssetup/lang/ja-JP.rc b/reactos/dll/win32/syssetup/lang/ja-JP.rc index 847c7b59f5b..5d0c8f89a5c 100644 --- a/reactos/dll/win32/syssetup/lang/ja-JP.rc +++ b/reactos/dll/win32/syssetup/lang/ja-JP.rc @@ -155,6 +155,7 @@ BEGIN * Also check the IDD_COMPUTERPAGE dialog. */ IDS_ADMINISTRATOR_NAME "Administrator" + IDS_MACHINE_OWNER_NAME "所有者" END STRINGTABLE diff --git a/reactos/dll/win32/syssetup/lang/nl-NL.rc b/reactos/dll/win32/syssetup/lang/nl-NL.rc index a7094b22ed7..6eeb3385d9f 100644 --- a/reactos/dll/win32/syssetup/lang/nl-NL.rc +++ b/reactos/dll/win32/syssetup/lang/nl-NL.rc @@ -155,6 +155,7 @@ BEGIN * Also check the IDD_COMPUTERPAGE dialog. */ IDS_ADMINISTRATOR_NAME "Administrator" + IDS_MACHINE_OWNER_NAME "Eigenaar" END STRINGTABLE diff --git a/reactos/dll/win32/syssetup/lang/no-NO.rc b/reactos/dll/win32/syssetup/lang/no-NO.rc index 929aa38d046..e2da8bb6d08 100644 --- a/reactos/dll/win32/syssetup/lang/no-NO.rc +++ b/reactos/dll/win32/syssetup/lang/no-NO.rc @@ -155,6 +155,7 @@ BEGIN * Also check the IDD_COMPUTERPAGE dialog. */ IDS_ADMINISTRATOR_NAME "Administrator" + IDS_MACHINE_OWNER_NAME "Eier" END STRINGTABLE diff --git a/reactos/dll/win32/syssetup/lang/pl-PL.rc b/reactos/dll/win32/syssetup/lang/pl-PL.rc index 865d7f41a65..59ece3123a3 100644 --- a/reactos/dll/win32/syssetup/lang/pl-PL.rc +++ b/reactos/dll/win32/syssetup/lang/pl-PL.rc @@ -155,6 +155,7 @@ BEGIN * Also check the IDD_COMPUTERPAGE dialog. */ IDS_ADMINISTRATOR_NAME "Administrator" + IDS_MACHINE_OWNER_NAME "Właściciel" END STRINGTABLE diff --git a/reactos/dll/win32/syssetup/lang/pt-BR.rc b/reactos/dll/win32/syssetup/lang/pt-BR.rc index 2422ebb95b7..ae5dc023bac 100644 --- a/reactos/dll/win32/syssetup/lang/pt-BR.rc +++ b/reactos/dll/win32/syssetup/lang/pt-BR.rc @@ -155,6 +155,7 @@ BEGIN * Also check the IDD_COMPUTERPAGE dialog. */ IDS_ADMINISTRATOR_NAME "Administrator" + IDS_MACHINE_OWNER_NAME "Dono" END STRINGTABLE diff --git a/reactos/dll/win32/syssetup/lang/ro-RO.rc b/reactos/dll/win32/syssetup/lang/ro-RO.rc index 14e66c8a9b2..4f7198f9694 100644 --- a/reactos/dll/win32/syssetup/lang/ro-RO.rc +++ b/reactos/dll/win32/syssetup/lang/ro-RO.rc @@ -164,6 +164,7 @@ BEGIN * Also check the IDD_COMPUTERPAGE dialog. */ IDS_ADMINISTRATOR_NAME "Administrator" + IDS_MACHINE_OWNER_NAME "Owner" END STRINGTABLE diff --git a/reactos/dll/win32/syssetup/lang/ru-RU.rc b/reactos/dll/win32/syssetup/lang/ru-RU.rc index d9e9a595079..3b385372729 100644 --- a/reactos/dll/win32/syssetup/lang/ru-RU.rc +++ b/reactos/dll/win32/syssetup/lang/ru-RU.rc @@ -157,6 +157,7 @@ BEGIN * Also check the IDD_COMPUTERPAGE dialog. */ IDS_ADMINISTRATOR_NAME "Administrator" + IDS_MACHINE_OWNER_NAME "Владелец" END STRINGTABLE diff --git a/reactos/dll/win32/syssetup/lang/sk-SK.rc b/reactos/dll/win32/syssetup/lang/sk-SK.rc index 1f8ab84d139..463d158063c 100644 --- a/reactos/dll/win32/syssetup/lang/sk-SK.rc +++ b/reactos/dll/win32/syssetup/lang/sk-SK.rc @@ -161,6 +161,7 @@ BEGIN * Also check the IDD_COMPUTERPAGE dialog. */ IDS_ADMINISTRATOR_NAME "Administrator" + IDS_MACHINE_OWNER_NAME "Vlastník" END STRINGTABLE diff --git a/reactos/dll/win32/syssetup/lang/sq-AL.rc b/reactos/dll/win32/syssetup/lang/sq-AL.rc index ab59f7cac90..c6daf57c2cf 100644 --- a/reactos/dll/win32/syssetup/lang/sq-AL.rc +++ b/reactos/dll/win32/syssetup/lang/sq-AL.rc @@ -174,6 +174,7 @@ BEGIN * Also check the IDD_COMPUTERPAGE dialog. */ IDS_ADMINISTRATOR_NAME "Administratorër" + IDS_MACHINE_OWNER_NAME "Zotëruesi" END STRINGTABLE diff --git a/reactos/dll/win32/syssetup/lang/tr-TR.rc b/reactos/dll/win32/syssetup/lang/tr-TR.rc index 106b6e48fac..bec1f76b34f 100644 --- a/reactos/dll/win32/syssetup/lang/tr-TR.rc +++ b/reactos/dll/win32/syssetup/lang/tr-TR.rc @@ -155,6 +155,7 @@ BEGIN * Also check the IDD_COMPUTERPAGE dialog. */ IDS_ADMINISTRATOR_NAME "Yönetici" + IDS_MACHINE_OWNER_NAME "Sahip" END STRINGTABLE diff --git a/reactos/dll/win32/syssetup/lang/uk-UA.rc b/reactos/dll/win32/syssetup/lang/uk-UA.rc index 353b8f13591..1bb32efcf41 100644 --- a/reactos/dll/win32/syssetup/lang/uk-UA.rc +++ b/reactos/dll/win32/syssetup/lang/uk-UA.rc @@ -163,6 +163,7 @@ BEGIN * Also check the IDD_COMPUTERPAGE dialog. */ IDS_ADMINISTRATOR_NAME "Administrator" + IDS_MACHINE_OWNER_NAME "Власник" END STRINGTABLE diff --git a/reactos/dll/win32/syssetup/lang/zh-CN.rc b/reactos/dll/win32/syssetup/lang/zh-CN.rc index d79ba09d22f..17cb7d4548f 100644 --- a/reactos/dll/win32/syssetup/lang/zh-CN.rc +++ b/reactos/dll/win32/syssetup/lang/zh-CN.rc @@ -155,6 +155,7 @@ BEGIN * Also check the IDD_COMPUTERPAGE dialog. */ IDS_ADMINISTRATOR_NAME "Administrator" + IDS_MACHINE_OWNER_NAME "所有者" END STRINGTABLE diff --git a/reactos/dll/win32/syssetup/resource.h b/reactos/dll/win32/syssetup/resource.h index d356c77ea31..3ddf653beb6 100644 --- a/reactos/dll/win32/syssetup/resource.h +++ b/reactos/dll/win32/syssetup/resource.h @@ -102,6 +102,7 @@ #define IDS_TIMEOUT 3307 #define IDS_REASON_UNKNOWN 3308 #define IDS_ADMINISTRATOR_NAME 3309 +#define IDS_MACHINE_OWNER_NAME 3310 #define IDS_WZD_NAME 3450 #define IDS_WZD_SETCOMPUTERNAME 3451 diff --git a/reactos/dll/win32/syssetup/wizard.c b/reactos/dll/win32/syssetup/wizard.c index 44c1d46effc..c2e964f8717 100644 --- a/reactos/dll/win32/syssetup/wizard.c +++ b/reactos/dll/win32/syssetup/wizard.c @@ -5,6 +5,7 @@ * PURPOSE: GUI controls * PROGRAMMERS: Eric Kohl * Pierre Schweitzer + * Ismael Ferreras Morezuelas */ /* INCLUDES *****************************************************************/ @@ -454,11 +455,20 @@ OwnerPageDlgProc(HWND hwndDlg, { case WM_INITDIALOG: { + /* set a localized ('Owner') placeholder string as default */ + if (LoadStringW(hDllInstance, IDS_MACHINE_OWNER_NAME, OwnerName, _countof(OwnerName))) + { + SendDlgItemMessage(hwndDlg, IDC_OWNERNAME, WM_SETTEXT, 0, (LPARAM)OwnerName); + } + SendDlgItemMessage(hwndDlg, IDC_OWNERNAME, EM_LIMITTEXT, 50, 0); SendDlgItemMessage(hwndDlg, IDC_OWNERORGANIZATION, EM_LIMITTEXT, 50, 0); /* Set focus to owner name */ SetFocus(GetDlgItem(hwndDlg, IDC_OWNERNAME)); + + /* Select the default text to quickly overwrite it by typing */ + SendDlgItemMessage(hwndDlg, IDC_OWNERNAME, EM_SETSEL, 0, -1); } break;