Ros-diffs August 2017

ros-diffs@reactos.org

22 participants
262 discussions

[hbelusca] 75726: [ACPPAGE]: "Sync fail" with Mark Jansen's translation work in CORE-13693, sorry :(

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Aug 31 20:49:02 2017 New Revision: 75726 URL: http://svn.reactos.org/svn/reactos?rev=75726&view=rev Log: [ACPPAGE]: "Sync fail" with Mark Jansen's translation work in CORE-13693, sorry :( Modified: trunk/reactos/dll/shellext/acppage/CLayerUIPropPage.cpp trunk/reactos/dll/shellext/acppage/lang/bg-BG.rc trunk/reactos/dll/shellext/acppage/lang/cs-CZ.rc trunk/reactos/dll/shellext/acppage/lang/de-DE.rc trunk/reactos/dll/shellext/acppage/lang/en-US.rc trunk/reactos/dll/shellext/acppage/lang/es-ES.rc trunk/reactos/dll/shellext/acppage/lang/eu-ES.rc trunk/reactos/dll/shellext/acppage/lang/fr-FR.rc trunk/reactos/dll/shellext/acppage/lang/he-IL.rc trunk/reactos/dll/shellext/acppage/lang/hu-HU.rc trunk/reactos/dll/shellext/acppage/lang/id-ID.rc trunk/reactos/dll/shellext/acppage/lang/it-IT.rc trunk/reactos/dll/shellext/acppage/lang/nl-NL.rc trunk/reactos/dll/shellext/acppage/lang/no-NO.rc trunk/reactos/dll/shellext/acppage/lang/pl-PL.rc trunk/reactos/dll/shellext/acppage/lang/ro-RO.rc trunk/reactos/dll/shellext/acppage/lang/ru-RU.rc trunk/reactos/dll/shellext/acppage/lang/sk-SK.rc trunk/reactos/dll/shellext/acppage/lang/sq-AL.rc trunk/reactos/dll/shellext/acppage/lang/sv-SE.rc trunk/reactos/dll/shellext/acppage/lang/tr-TR.rc trunk/reactos/dll/shellext/acppage/lang/uk-UA.rc trunk/reactos/dll/shellext/acppage/lang/zh-CN.rc trunk/reactos/dll/shellext/acppage/lang/zh-TW.rc trunk/reactos/dll/shellext/acppage/resource.h Modified: trunk/reactos/dll/shellext/acppage/CLayerUIPropPage.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/CLaye… ============================================================================== --- trunk/reactos/dll/shellext/acppage/CLayerUIPropPage.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/CLayerUIPropPage.cpp [iso-8859-1] Thu Aug 31 20:49:02 2017 @@ -393,7 +393,7 @@ UpdateControls(hWnd); break; case IDC_EDITCOMPATIBILITYMODES: - if (DialogBoxParamW(g_hModule, MAKEINTRESOURCEW(IDD_EDITCOMPATIBILITYMODES), hWnd, EditModesProc, (LPARAM)this) == IDOK) + if (DialogBoxParam(g_hModule, MAKEINTRESOURCE(IDD_EDITCOMPATIBILITYMODES), hWnd, EditModesProc, (LPARAM)this) == IDOK) { UpdateControls(hWnd); } @@ -572,7 +572,7 @@ if (ComboHasData(hWnd)) { CComBSTR question, title; - title.LoadString(g_hModule, IDS_COMPAT_TITLE); + title.LoadString(g_hModule, IDS_TABTITLE); question.LoadString(g_hModule, IDS_YOU_DID_NOT_ADD); int result = MessageBoxW(hWnd, question, title, MB_YESNOCANCEL | MB_ICONQUESTION); switch (result) @@ -694,9 +694,10 @@ { PROPSHEETPAGEW psp = { 0 }; psp.dwSize = sizeof(psp); - psp.dwFlags = PSP_USEREFPARENT; + psp.dwFlags = PSP_USEREFPARENT | PSP_USETITLE; psp.hInstance = g_hModule; - psp.pszTemplate = MAKEINTRESOURCEW(IDD_ACPPAGESHEET); + psp.pszTemplate = MAKEINTRESOURCE(IDD_ACPPAGESHEET); + psp.pszTitle = MAKEINTRESOURCE(IDS_TABTITLE); psp.pfnDlgProc = PropDlgProc; psp.lParam = (LPARAM)this; psp.pcRefParent = (PUINT)&g_ModuleRefCnt; Modified: trunk/reactos/dll/shellext/acppage/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/bg-BG.rc [iso-8859-1] Thu Aug 31 20:49:02 2017 @@ -33,7 +33,7 @@ STRINGTABLE BEGIN - IDS_COMPAT_TITLE "Ð¡ÑÐ²Ð¼ÐµÑÑÐ¸Ð¼Ð¾ÑÑ" + IDS_TABTITLE "Compatibility" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" Modified: trunk/reactos/dll/shellext/acppage/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/cs-CZ.rc [iso-8859-1] Thu Aug 31 20:49:02 2017 @@ -38,7 +38,7 @@ STRINGTABLE BEGIN - IDS_COMPAT_TITLE "Kompatibilita" + IDS_TABTITLE "Compatibility" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" Modified: trunk/reactos/dll/shellext/acppage/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/de-DE.rc [iso-8859-1] Thu Aug 31 20:49:02 2017 @@ -33,7 +33,7 @@ STRINGTABLE BEGIN - IDS_COMPAT_TITLE "KompatibilitÃ¤t" + IDS_TABTITLE "KompatibilitÃ¤t" IDS_FAILED_NETWORK "KompatibilitÃ¤tsmodi kÃ¶nnen auf diesem Programm nicht angewendet werden, da es sich auf einem Netzlaufwerk befindet." IDS_FAILED_PROTECTED "KompatibilitÃ¤tsmodi kÃ¶nnen auf diesem Programm nicht angewendet werden, da es Teil von ReactOS ist." IDS_YOU_DID_NOT_ADD "Sie haben den Modus nicht hinzugefÃ¼gt, mÃ¶chten Sie ihn jetzt hinzufÃ¼gen?" Modified: trunk/reactos/dll/shellext/acppage/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/en-US.rc [iso-8859-1] Thu Aug 31 20:49:02 2017 @@ -11,7 +11,7 @@ COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED GROUPBOX "Display settings", -1, 7, 99, 210, 61, BS_GROUPBOX CHECKBOX "Run in 256 colors", IDC_CHKRUNIN256COLORS, 18, 114, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "Run in 640x480 screen resolution", IDC_CHKRUNIN640480RES, 18, 129, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "Run in 640x480 screenresolution", IDC_CHKRUNIN640480RES, 18, 129, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP CHECKBOX "Disable visual themes", IDC_CHKDISABLEVISUALTHEMES, 18, 144, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP PUSHBUTTON "E&dit compatibility modes...", IDC_EDITCOMPATIBILITYMODES, 117, 167, 100, 15 CONTROL "Learn more about <A>program compatibility</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10, WS_EX_NOPARENTNOTIFY @@ -33,7 +33,7 @@ STRINGTABLE BEGIN - IDS_COMPAT_TITLE "Compatibility" + IDS_TABTITLE "Compatibility" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" Modified: trunk/reactos/dll/shellext/acppage/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/es-ES.rc [iso-8859-1] Thu Aug 31 20:49:02 2017 @@ -35,7 +35,7 @@ STRINGTABLE BEGIN - IDS_COMPAT_TITLE "Compatibilidad" + IDS_TABTITLE "Compatibility" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" Modified: trunk/reactos/dll/shellext/acppage/lang/eu-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/eu-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/eu-ES.rc [iso-8859-1] Thu Aug 31 20:49:02 2017 @@ -33,7 +33,7 @@ STRINGTABLE BEGIN - IDS_COMPAT_TITLE "Konpatibilitatea" + IDS_TABTITLE "Compatibility" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" Modified: trunk/reactos/dll/shellext/acppage/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/fr-FR.rc [iso-8859-1] Thu Aug 31 20:49:02 2017 @@ -5,16 +5,16 @@ CAPTION "CompatibilitÃ©" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Si vous avez des difficultÃ©s Ã lancer ce programme sous ReactOS, sÃ©lectionnez le systÃ¨me d'exploitation que ReactOS montrera Ã l'application.\nCette fonctionnalitÃ© est en cours de dÃ©veloppement.", -1, 7, 7, 210, 31 + LTEXT "Si vous avez des difficultÃ©s Ã lancer ce programme sous ReactOS, sÃ©lectionner le systÃ¨me d'exploitation que ReactOS montrera Ã l'application.\nPlease note that this is a work in progress.", -1, 7, 7, 210, 31 GROUPBOX "Mode de compatibilitÃ©", IDC_COMPATGROUP, 7, 41, 210, 49 - CHECKBOX "Lancer ce programme en mode de compatibilitÃ© pour :", IDC_CHKRUNCOMPATIBILITY, 18, 57, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "Lancer ce programme en mode de compatibilitÃ© pour:", IDC_CHKRUNCOMPATIBILITY, 18, 57, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED GROUPBOX "RÃ©glages de l'Ã©cran", -1, 7, 99, 210, 61, BS_GROUPBOX CHECKBOX "Lancer en 256 colors", IDC_CHKRUNIN256COLORS, 18, 114, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "Lancer en rÃ©solution d'Ã©cran 640x480 ", IDC_CHKRUNIN640480RES, 18, 129, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "DÃ©sactiver les thÃ¨mes visuels", IDC_CHKDISABLEVISUALTHEMES, 18, 144, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP - PUSHBUTTON "Ã&diter les Modes de compatibilitÃ©", IDC_EDITCOMPATIBILITYMODES, 117, 167, 100, 15 - CONTROL "En savoir plus sur <A>la compatibilitÃ© des programmes</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10, WS_EX_NOPARENTNOTIFY + CHECKBOX "Lancer en resolution d'Ã©cran 640x480 ", IDC_CHKRUNIN640480RES, 18, 129, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "DÃ©sactiver les thÃ¨mes visuels", IDC_CHKDISABLEVISUALTHEMES, 18, 144, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP + PUSHBUTTON "E&diter les Modes de compatibilitÃ©", IDC_EDITCOMPATIBILITYMODES, 117, 167, 100, 15 + CONTROL "Learn more about <A>program compatibility</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10, WS_EX_NOPARENTNOTIFY END IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139 @@ -25,7 +25,7 @@ COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_BORDER PUSHBUTTON "&Ajouter...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED - PUSHBUTTON "&Ãditer...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED + PUSHBUTTON "&Editer...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED PUSHBUTTON "&Supprimer", IDC_DELETE, 162, 42, 60, 14, WS_DISABLED PUSHBUTTON "&OK", IDOK, 95, 116, 60, 14 PUSHBUTTON "&Annuler", IDCANCEL, 162, 116, 60, 14 @@ -33,8 +33,8 @@ STRINGTABLE BEGIN - IDS_COMPAT_TITLE "CompatibilitÃ©" - IDS_FAILED_NETWORK "Les modes de compatibilitÃ© ne peuvent pas Ãªtre appliquÃ©s sur ce programme car il se situe sur un lecteur rÃ©seau." - IDS_FAILED_PROTECTED "Les modes de compatibilitÃ© ne peuvent pas Ãªtre appliquÃ©s sur ce programme car il fait partie de ReactOS." - IDS_YOU_DID_NOT_ADD "Vous n'avez pas ajoutÃ© le mode, voulez-vous l'ajouter maintenant ?" + IDS_TABTITLE "Compatibility" + IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." + IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." + IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" END Modified: trunk/reactos/dll/shellext/acppage/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/he-IL.rc [iso-8859-1] Thu Aug 31 20:49:02 2017 @@ -35,7 +35,7 @@ STRINGTABLE BEGIN - IDS_COMPAT_TITLE "×ª×××××ª" + IDS_TABTITLE "Compatibility" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" Modified: trunk/reactos/dll/shellext/acppage/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/hu-HU.rc [iso-8859-1] Thu Aug 31 20:49:02 2017 @@ -35,7 +35,7 @@ STRINGTABLE BEGIN - IDS_COMPAT_TITLE "KompatibilitÃ¡s" + IDS_TABTITLE "Compatibility" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" Modified: trunk/reactos/dll/shellext/acppage/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/id-ID.rc [iso-8859-1] Thu Aug 31 20:49:02 2017 @@ -33,7 +33,7 @@ STRINGTABLE BEGIN - IDS_COMPAT_TITLE "Kompatibilitas" + IDS_TABTITLE "Compatibility" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" Modified: trunk/reactos/dll/shellext/acppage/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/it-IT.rc [iso-8859-1] Thu Aug 31 20:49:02 2017 @@ -35,7 +35,7 @@ STRINGTABLE BEGIN - IDS_COMPAT_TITLE "CompatibilitÃ " + IDS_TABTITLE "Compatibility" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" Modified: trunk/reactos/dll/shellext/acppage/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/nl-NL.rc [iso-8859-1] Thu Aug 31 20:49:02 2017 @@ -11,7 +11,7 @@ COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED GROUPBOX "Display settings", -1, 7, 99, 210, 61, BS_GROUPBOX CHECKBOX "Run in 256 colors", IDC_CHKRUNIN256COLORS, 18, 114, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "Run in 640x480 screen resolution", IDC_CHKRUNIN640480RES, 18, 129, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "Run in 640x480 screenresolution", IDC_CHKRUNIN640480RES, 18, 129, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP CHECKBOX "Disable visual themes", IDC_CHKDISABLEVISUALTHEMES, 18, 144, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP PUSHBUTTON "E&dit compatibility modes...", IDC_EDITCOMPATIBILITYMODES, 117, 167, 100, 15 CONTROL "Learn more about <A>program compatibility</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10, WS_EX_NOPARENTNOTIFY @@ -33,7 +33,7 @@ STRINGTABLE BEGIN - IDS_COMPAT_TITLE "Compatibiliteit" + IDS_TABTITLE "Compatibility" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" Modified: trunk/reactos/dll/shellext/acppage/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/no-NO.rc [iso-8859-1] Thu Aug 31 20:49:02 2017 @@ -33,7 +33,7 @@ STRINGTABLE BEGIN - IDS_COMPAT_TITLE "Kompaktibilitet" + IDS_TABTITLE "Compatibility" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" Modified: trunk/reactos/dll/shellext/acppage/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/pl-PL.rc [iso-8859-1] Thu Aug 31 20:49:02 2017 @@ -35,7 +35,7 @@ STRINGTABLE BEGIN - IDS_COMPAT_TITLE "ZgodnoÅÄ" + IDS_TABTITLE "Compatibility" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" Modified: trunk/reactos/dll/shellext/acppage/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/ro-RO.rc [iso-8859-1] Thu Aug 31 20:49:02 2017 @@ -35,7 +35,7 @@ STRINGTABLE BEGIN - IDS_COMPAT_TITLE "Compatibilitate" + IDS_TABTITLE "Compatibilitate" IDS_FAILED_NETWORK "Modurile de compatibilitate nu pot fi instituite pentru acest program deoarece rezidÄ pe o unitate de stocare Ã®n reÈea." IDS_FAILED_PROTECTED "Modurile de compatibilitate nu pot fi instituite pentru acest program deoarece este parte din ReactOS." IDS_YOU_DID_NOT_ADD "Nu aÈi specificat un mod. DoriÈi sÄ specificaÈi unul?" Modified: trunk/reactos/dll/shellext/acppage/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/ru-RU.rc [iso-8859-1] Thu Aug 31 20:49:02 2017 @@ -35,7 +35,7 @@ STRINGTABLE BEGIN - IDS_COMPAT_TITLE "Ð¡Ð¾Ð²Ð¼ÐµÑÑÐ¸Ð¼Ð¾ÑÑÑ" + IDS_TABTITLE "Ð¡Ð¾Ð²Ð¼ÐµÑÑÐ¸Ð¼Ð¾ÑÑÑ" IDS_FAILED_NETWORK "Ð ÐµÐ¶Ð¸Ð¼ ÑÐ¾Ð²Ð¼ÐµÑÑÐ¸Ð¼Ð¾ÑÑÐ¸ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½ Ð´Ð»Ñ ÑÑÐ¾Ð¹ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ, Ð¿Ð¾ÑÐ¾Ð¼Ñ ÑÑÐ¾ Ð¾Ð½Ð° Ð½Ð°ÑÐ¾Ð´Ð¸ÑÑÑ Ð½Ð° ÑÐµÑÐµÐ²Ð¾Ð¼ Ð´Ð¸ÑÐºÐµ." IDS_FAILED_PROTECTED "Ð ÐµÐ¶Ð¸Ð¼ ÑÐ¾Ð²Ð¼ÐµÑÑÐ¸Ð¼Ð¾ÑÑÐ¸ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½ Ð´Ð»Ñ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½ÑÐ¾Ð² ReactOS." IDS_YOU_DID_NOT_ADD "ÐÑ Ð½Ðµ Ð´Ð¾Ð±Ð°Ð²Ð¸Ð»Ð¸ ÑÐµÐ¶Ð¸Ð¼, Ð´Ð¾Ð±Ð°Ð²Ð¸ÑÑ ÐµÐ³Ð¾ ÑÐµÐ¹ÑÐ°Ñ?" Modified: trunk/reactos/dll/shellext/acppage/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/sk-SK.rc [iso-8859-1] Thu Aug 31 20:49:02 2017 @@ -40,7 +40,7 @@ STRINGTABLE BEGIN - IDS_COMPAT_TITLE "Kompatibilita" + IDS_TABTITLE "Compatibility" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" Modified: trunk/reactos/dll/shellext/acppage/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/sq-AL.rc [iso-8859-1] Thu Aug 31 20:49:02 2017 @@ -15,7 +15,7 @@ COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED GROUPBOX "Shfaq konfigurimet", -1, 7, 99, 210, 61, BS_GROUPBOX CHECKBOX "Ekzekuto ne 256 colors", IDC_CHKRUNIN256COLORS, 18, 114, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "Ekzekuto ne 640x480 screen resolution", IDC_CHKRUNIN640480RES, 18, 129, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "Ekzekuto ne 640x480 screenresolution", IDC_CHKRUNIN640480RES, 18, 129, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP CHECKBOX "Ãaktivizo themat vizuale", IDC_CHKDISABLEVISUALTHEMES, 18, 144, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP PUSHBUTTON "Modifiko mjetin e pajtueshmerise...", IDC_EDITCOMPATIBILITYMODES, 117, 167, 100, 15 CONTROL "Learn more about <A>program compatibility</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10, WS_EX_NOPARENTNOTIFY @@ -37,7 +37,7 @@ STRINGTABLE BEGIN - IDS_COMPAT_TITLE "PajtueshmÃ«ri" + IDS_TABTITLE "Compatibility" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" Modified: trunk/reactos/dll/shellext/acppage/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/sv-SE.rc [iso-8859-1] Thu Aug 31 20:49:02 2017 @@ -35,7 +35,7 @@ STRINGTABLE BEGIN - IDS_COMPAT_TITLE "Kompatibilitet" + IDS_TABTITLE "Compatibility" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" Modified: trunk/reactos/dll/shellext/acppage/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/tr-TR.rc [iso-8859-1] Thu Aug 31 20:49:02 2017 @@ -35,7 +35,7 @@ STRINGTABLE BEGIN - IDS_COMPAT_TITLE "Uyumluluk" + IDS_TABTITLE "Uyumluluk" IDS_FAILED_NETWORK "Bir aÄ sÃ¼rÃ¼cÃ¼sÃ¼ Ã¼zerinde olduÄundan bu izlencede uyumluluk kipleri ayarlanamaz." IDS_FAILED_PROTECTED "ReactOS'un bir parÃ§asÄ± olduÄundan bu izlencede uyumluluk kipleri ayarlanamaz." IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" Modified: trunk/reactos/dll/shellext/acppage/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/uk-UA.rc [iso-8859-1] Thu Aug 31 20:49:02 2017 @@ -41,7 +41,7 @@ STRINGTABLE BEGIN - IDS_COMPAT_TITLE "Ð¡ÑÐ¼ÑÑÐ½ÑÑÑÑ" + IDS_TABTITLE "Compatibility" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" Modified: trunk/reactos/dll/shellext/acppage/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/zh-CN.rc [iso-8859-1] Thu Aug 31 20:49:02 2017 @@ -35,7 +35,7 @@ STRINGTABLE BEGIN - IDS_COMPAT_TITLE "å¼å®¹æ§" + IDS_TABTITLE "Compatibility" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" Modified: trunk/reactos/dll/shellext/acppage/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/zh-TW.rc [iso-8859-1] Thu Aug 31 20:49:02 2017 @@ -35,7 +35,7 @@ STRINGTABLE BEGIN - IDS_COMPAT_TITLE "ç¸å®¹æ§" + IDS_TABTITLE "Compatibility" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" Modified: trunk/reactos/dll/shellext/acppage/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/resou… ============================================================================== --- trunk/reactos/dll/shellext/acppage/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/resource.h [iso-8859-1] Thu Aug 31 20:49:02 2017 @@ -20,7 +20,7 @@ #define IDS_DESCRIPTION 101 /* strings */ -#define IDS_COMPAT_TITLE 2000 +#define IDS_TABTITLE 2000 #define IDS_FAILED_NETWORK 2001 #define IDS_FAILED_PROTECTED 2002 #define IDS_YOU_DID_NOT_ADD 2003

7 years

[hbelusca] 75725: [ACPPAGE]: Improve the compatibility tab: - Use the tab title from the corresponding dialog resource caption string. - Fix some translations, and complete the french one. - Use Di...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Aug 31 20:38:38 2017 New Revision: 75725 URL: http://svn.reactos.org/svn/reactos?rev=75725&view=rev Log: [ACPPAGE]: Improve the compatibility tab: - Use the tab title from the corresponding dialog resource caption string. - Fix some translations, and complete the french one. - Use DialogBoxParamW and MAKEINTRESOURCEW (with W). Modified: trunk/reactos/dll/shellext/acppage/CLayerUIPropPage.cpp trunk/reactos/dll/shellext/acppage/lang/bg-BG.rc trunk/reactos/dll/shellext/acppage/lang/cs-CZ.rc trunk/reactos/dll/shellext/acppage/lang/de-DE.rc trunk/reactos/dll/shellext/acppage/lang/en-US.rc trunk/reactos/dll/shellext/acppage/lang/es-ES.rc trunk/reactos/dll/shellext/acppage/lang/eu-ES.rc trunk/reactos/dll/shellext/acppage/lang/fr-FR.rc trunk/reactos/dll/shellext/acppage/lang/he-IL.rc trunk/reactos/dll/shellext/acppage/lang/hu-HU.rc trunk/reactos/dll/shellext/acppage/lang/id-ID.rc trunk/reactos/dll/shellext/acppage/lang/it-IT.rc trunk/reactos/dll/shellext/acppage/lang/nl-NL.rc trunk/reactos/dll/shellext/acppage/lang/no-NO.rc trunk/reactos/dll/shellext/acppage/lang/pl-PL.rc trunk/reactos/dll/shellext/acppage/lang/ro-RO.rc trunk/reactos/dll/shellext/acppage/lang/ru-RU.rc trunk/reactos/dll/shellext/acppage/lang/sk-SK.rc trunk/reactos/dll/shellext/acppage/lang/sq-AL.rc trunk/reactos/dll/shellext/acppage/lang/sv-SE.rc trunk/reactos/dll/shellext/acppage/lang/tr-TR.rc trunk/reactos/dll/shellext/acppage/lang/uk-UA.rc trunk/reactos/dll/shellext/acppage/lang/zh-CN.rc trunk/reactos/dll/shellext/acppage/lang/zh-TW.rc trunk/reactos/dll/shellext/acppage/resource.h Modified: trunk/reactos/dll/shellext/acppage/CLayerUIPropPage.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/CLaye… ============================================================================== --- trunk/reactos/dll/shellext/acppage/CLayerUIPropPage.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/CLayerUIPropPage.cpp [iso-8859-1] Thu Aug 31 20:38:38 2017 @@ -393,7 +393,7 @@ UpdateControls(hWnd); break; case IDC_EDITCOMPATIBILITYMODES: - if (DialogBoxParam(g_hModule, MAKEINTRESOURCE(IDD_EDITCOMPATIBILITYMODES), hWnd, EditModesProc, (LPARAM)this) == IDOK) + if (DialogBoxParamW(g_hModule, MAKEINTRESOURCEW(IDD_EDITCOMPATIBILITYMODES), hWnd, EditModesProc, (LPARAM)this) == IDOK) { UpdateControls(hWnd); } @@ -572,7 +572,7 @@ if (ComboHasData(hWnd)) { CComBSTR question, title; - title.LoadString(g_hModule, IDS_TABTITLE); + title.LoadString(g_hModule, IDS_COMPAT_TITLE); question.LoadString(g_hModule, IDS_YOU_DID_NOT_ADD); int result = MessageBoxW(hWnd, question, title, MB_YESNOCANCEL | MB_ICONQUESTION); switch (result) @@ -694,10 +694,9 @@ { PROPSHEETPAGEW psp = { 0 }; psp.dwSize = sizeof(psp); - psp.dwFlags = PSP_USEREFPARENT | PSP_USETITLE; + psp.dwFlags = PSP_USEREFPARENT; psp.hInstance = g_hModule; - psp.pszTemplate = MAKEINTRESOURCE(IDD_ACPPAGESHEET); - psp.pszTitle = MAKEINTRESOURCE(IDS_TABTITLE); + psp.pszTemplate = MAKEINTRESOURCEW(IDD_ACPPAGESHEET); psp.pfnDlgProc = PropDlgProc; psp.lParam = (LPARAM)this; psp.pcRefParent = (PUINT)&g_ModuleRefCnt; Modified: trunk/reactos/dll/shellext/acppage/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/bg-BG.rc [iso-8859-1] Thu Aug 31 20:38:38 2017 @@ -33,7 +33,7 @@ STRINGTABLE BEGIN - IDS_TABTITLE "Compatibility" + IDS_COMPAT_TITLE "Ð¡ÑÐ²Ð¼ÐµÑÑÐ¸Ð¼Ð¾ÑÑ" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" Modified: trunk/reactos/dll/shellext/acppage/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/cs-CZ.rc [iso-8859-1] Thu Aug 31 20:38:38 2017 @@ -38,7 +38,7 @@ STRINGTABLE BEGIN - IDS_TABTITLE "Compatibility" + IDS_COMPAT_TITLE "Kompatibilita" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" Modified: trunk/reactos/dll/shellext/acppage/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/de-DE.rc [iso-8859-1] Thu Aug 31 20:38:38 2017 @@ -33,7 +33,7 @@ STRINGTABLE BEGIN - IDS_TABTITLE "KompatibilitÃ¤t" + IDS_COMPAT_TITLE "KompatibilitÃ¤t" IDS_FAILED_NETWORK "KompatibilitÃ¤tsmodi kÃ¶nnen auf diesem Programm nicht angewendet werden, da es sich auf einem Netzlaufwerk befindet." IDS_FAILED_PROTECTED "KompatibilitÃ¤tsmodi kÃ¶nnen auf diesem Programm nicht angewendet werden, da es Teil von ReactOS ist." IDS_YOU_DID_NOT_ADD "Sie haben den Modus nicht hinzugefÃ¼gt, mÃ¶chten Sie ihn jetzt hinzufÃ¼gen?" Modified: trunk/reactos/dll/shellext/acppage/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/en-US.rc [iso-8859-1] Thu Aug 31 20:38:38 2017 @@ -11,7 +11,7 @@ COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED GROUPBOX "Display settings", -1, 7, 99, 210, 61, BS_GROUPBOX CHECKBOX "Run in 256 colors", IDC_CHKRUNIN256COLORS, 18, 114, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "Run in 640x480 screenresolution", IDC_CHKRUNIN640480RES, 18, 129, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "Run in 640x480 screen resolution", IDC_CHKRUNIN640480RES, 18, 129, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP CHECKBOX "Disable visual themes", IDC_CHKDISABLEVISUALTHEMES, 18, 144, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP PUSHBUTTON "E&dit compatibility modes...", IDC_EDITCOMPATIBILITYMODES, 117, 167, 100, 15 CONTROL "Learn more about <A>program compatibility</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10, WS_EX_NOPARENTNOTIFY @@ -33,7 +33,7 @@ STRINGTABLE BEGIN - IDS_TABTITLE "Compatibility" + IDS_COMPAT_TITLE "Compatibility" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" Modified: trunk/reactos/dll/shellext/acppage/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/es-ES.rc [iso-8859-1] Thu Aug 31 20:38:38 2017 @@ -35,7 +35,7 @@ STRINGTABLE BEGIN - IDS_TABTITLE "Compatibility" + IDS_COMPAT_TITLE "Compatibilidad" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" Modified: trunk/reactos/dll/shellext/acppage/lang/eu-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/eu-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/eu-ES.rc [iso-8859-1] Thu Aug 31 20:38:38 2017 @@ -33,7 +33,7 @@ STRINGTABLE BEGIN - IDS_TABTITLE "Compatibility" + IDS_COMPAT_TITLE "Konpatibilitatea" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" Modified: trunk/reactos/dll/shellext/acppage/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/fr-FR.rc [iso-8859-1] Thu Aug 31 20:38:38 2017 @@ -5,16 +5,16 @@ CAPTION "CompatibilitÃ©" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Si vous avez des difficultÃ©s Ã lancer ce programme sous ReactOS, sÃ©lectionner le systÃ¨me d'exploitation que ReactOS montrera Ã l'application.\nPlease note that this is a work in progress.", -1, 7, 7, 210, 31 + LTEXT "Si vous avez des difficultÃ©s Ã lancer ce programme sous ReactOS, sÃ©lectionnez le systÃ¨me d'exploitation que ReactOS montrera Ã l'application.\nCette fonctionnalitÃ© est en cours de dÃ©veloppement.", -1, 7, 7, 210, 31 GROUPBOX "Mode de compatibilitÃ©", IDC_COMPATGROUP, 7, 41, 210, 49 - CHECKBOX "Lancer ce programme en mode de compatibilitÃ© pour:", IDC_CHKRUNCOMPATIBILITY, 18, 57, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "Lancer ce programme en mode de compatibilitÃ© pour :", IDC_CHKRUNCOMPATIBILITY, 18, 57, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED GROUPBOX "RÃ©glages de l'Ã©cran", -1, 7, 99, 210, 61, BS_GROUPBOX CHECKBOX "Lancer en 256 colors", IDC_CHKRUNIN256COLORS, 18, 114, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "Lancer en resolution d'Ã©cran 640x480 ", IDC_CHKRUNIN640480RES, 18, 129, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "DÃ©sactiver les thÃ¨mes visuels", IDC_CHKDISABLEVISUALTHEMES, 18, 144, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP - PUSHBUTTON "E&diter les Modes de compatibilitÃ©", IDC_EDITCOMPATIBILITYMODES, 117, 167, 100, 15 - CONTROL "Learn more about <A>program compatibility</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10, WS_EX_NOPARENTNOTIFY + CHECKBOX "Lancer en rÃ©solution d'Ã©cran 640x480 ", IDC_CHKRUNIN640480RES, 18, 129, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "DÃ©sactiver les thÃ¨mes visuels", IDC_CHKDISABLEVISUALTHEMES, 18, 144, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP + PUSHBUTTON "Ã&diter les Modes de compatibilitÃ©", IDC_EDITCOMPATIBILITYMODES, 117, 167, 100, 15 + CONTROL "En savoir plus sur <A>la compatibilitÃ© des programmes</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10, WS_EX_NOPARENTNOTIFY END IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139 @@ -25,7 +25,7 @@ COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_BORDER PUSHBUTTON "&Ajouter...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED - PUSHBUTTON "&Editer...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED + PUSHBUTTON "&Ãditer...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED PUSHBUTTON "&Supprimer", IDC_DELETE, 162, 42, 60, 14, WS_DISABLED PUSHBUTTON "&OK", IDOK, 95, 116, 60, 14 PUSHBUTTON "&Annuler", IDCANCEL, 162, 116, 60, 14 @@ -33,8 +33,8 @@ STRINGTABLE BEGIN - IDS_TABTITLE "Compatibility" - IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." - IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." - IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" + IDS_COMPAT_TITLE "CompatibilitÃ©" + IDS_FAILED_NETWORK "Les modes de compatibilitÃ© ne peuvent pas Ãªtre appliquÃ©s sur ce programme car il se situe sur un lecteur rÃ©seau." + IDS_FAILED_PROTECTED "Les modes de compatibilitÃ© ne peuvent pas Ãªtre appliquÃ©s sur ce programme car il fait partie de ReactOS." + IDS_YOU_DID_NOT_ADD "Vous n'avez pas ajoutÃ© le mode, voulez-vous l'ajouter maintenant ?" END Modified: trunk/reactos/dll/shellext/acppage/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/he-IL.rc [iso-8859-1] Thu Aug 31 20:38:38 2017 @@ -35,7 +35,7 @@ STRINGTABLE BEGIN - IDS_TABTITLE "Compatibility" + IDS_COMPAT_TITLE "×ª×××××ª" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" Modified: trunk/reactos/dll/shellext/acppage/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/hu-HU.rc [iso-8859-1] Thu Aug 31 20:38:38 2017 @@ -35,7 +35,7 @@ STRINGTABLE BEGIN - IDS_TABTITLE "Compatibility" + IDS_COMPAT_TITLE "KompatibilitÃ¡s" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" Modified: trunk/reactos/dll/shellext/acppage/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/id-ID.rc [iso-8859-1] Thu Aug 31 20:38:38 2017 @@ -33,7 +33,7 @@ STRINGTABLE BEGIN - IDS_TABTITLE "Compatibility" + IDS_COMPAT_TITLE "Kompatibilitas" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" Modified: trunk/reactos/dll/shellext/acppage/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/it-IT.rc [iso-8859-1] Thu Aug 31 20:38:38 2017 @@ -35,7 +35,7 @@ STRINGTABLE BEGIN - IDS_TABTITLE "Compatibility" + IDS_COMPAT_TITLE "CompatibilitÃ " IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" Modified: trunk/reactos/dll/shellext/acppage/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/nl-NL.rc [iso-8859-1] Thu Aug 31 20:38:38 2017 @@ -11,7 +11,7 @@ COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED GROUPBOX "Display settings", -1, 7, 99, 210, 61, BS_GROUPBOX CHECKBOX "Run in 256 colors", IDC_CHKRUNIN256COLORS, 18, 114, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "Run in 640x480 screenresolution", IDC_CHKRUNIN640480RES, 18, 129, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "Run in 640x480 screen resolution", IDC_CHKRUNIN640480RES, 18, 129, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP CHECKBOX "Disable visual themes", IDC_CHKDISABLEVISUALTHEMES, 18, 144, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP PUSHBUTTON "E&dit compatibility modes...", IDC_EDITCOMPATIBILITYMODES, 117, 167, 100, 15 CONTROL "Learn more about <A>program compatibility</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10, WS_EX_NOPARENTNOTIFY @@ -33,7 +33,7 @@ STRINGTABLE BEGIN - IDS_TABTITLE "Compatibility" + IDS_COMPAT_TITLE "Compatibiliteit" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" Modified: trunk/reactos/dll/shellext/acppage/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/no-NO.rc [iso-8859-1] Thu Aug 31 20:38:38 2017 @@ -33,7 +33,7 @@ STRINGTABLE BEGIN - IDS_TABTITLE "Compatibility" + IDS_COMPAT_TITLE "Kompaktibilitet" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" Modified: trunk/reactos/dll/shellext/acppage/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/pl-PL.rc [iso-8859-1] Thu Aug 31 20:38:38 2017 @@ -35,7 +35,7 @@ STRINGTABLE BEGIN - IDS_TABTITLE "Compatibility" + IDS_COMPAT_TITLE "ZgodnoÅÄ" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" Modified: trunk/reactos/dll/shellext/acppage/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/ro-RO.rc [iso-8859-1] Thu Aug 31 20:38:38 2017 @@ -35,7 +35,7 @@ STRINGTABLE BEGIN - IDS_TABTITLE "Compatibilitate" + IDS_COMPAT_TITLE "Compatibilitate" IDS_FAILED_NETWORK "Modurile de compatibilitate nu pot fi instituite pentru acest program deoarece rezidÄ pe o unitate de stocare Ã®n reÈea." IDS_FAILED_PROTECTED "Modurile de compatibilitate nu pot fi instituite pentru acest program deoarece este parte din ReactOS." IDS_YOU_DID_NOT_ADD "Nu aÈi specificat un mod. DoriÈi sÄ specificaÈi unul?" Modified: trunk/reactos/dll/shellext/acppage/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/ru-RU.rc [iso-8859-1] Thu Aug 31 20:38:38 2017 @@ -35,7 +35,7 @@ STRINGTABLE BEGIN - IDS_TABTITLE "Ð¡Ð¾Ð²Ð¼ÐµÑÑÐ¸Ð¼Ð¾ÑÑÑ" + IDS_COMPAT_TITLE "Ð¡Ð¾Ð²Ð¼ÐµÑÑÐ¸Ð¼Ð¾ÑÑÑ" IDS_FAILED_NETWORK "Ð ÐµÐ¶Ð¸Ð¼ ÑÐ¾Ð²Ð¼ÐµÑÑÐ¸Ð¼Ð¾ÑÑÐ¸ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½ Ð´Ð»Ñ ÑÑÐ¾Ð¹ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ, Ð¿Ð¾ÑÐ¾Ð¼Ñ ÑÑÐ¾ Ð¾Ð½Ð° Ð½Ð°ÑÐ¾Ð´Ð¸ÑÑÑ Ð½Ð° ÑÐµÑÐµÐ²Ð¾Ð¼ Ð´Ð¸ÑÐºÐµ." IDS_FAILED_PROTECTED "Ð ÐµÐ¶Ð¸Ð¼ ÑÐ¾Ð²Ð¼ÐµÑÑÐ¸Ð¼Ð¾ÑÑÐ¸ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½ Ð´Ð»Ñ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½ÑÐ¾Ð² ReactOS." IDS_YOU_DID_NOT_ADD "ÐÑ Ð½Ðµ Ð´Ð¾Ð±Ð°Ð²Ð¸Ð»Ð¸ ÑÐµÐ¶Ð¸Ð¼, Ð´Ð¾Ð±Ð°Ð²Ð¸ÑÑ ÐµÐ³Ð¾ ÑÐµÐ¹ÑÐ°Ñ?" Modified: trunk/reactos/dll/shellext/acppage/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/sk-SK.rc [iso-8859-1] Thu Aug 31 20:38:38 2017 @@ -40,7 +40,7 @@ STRINGTABLE BEGIN - IDS_TABTITLE "Compatibility" + IDS_COMPAT_TITLE "Kompatibilita" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" Modified: trunk/reactos/dll/shellext/acppage/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/sq-AL.rc [iso-8859-1] Thu Aug 31 20:38:38 2017 @@ -15,7 +15,7 @@ COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED GROUPBOX "Shfaq konfigurimet", -1, 7, 99, 210, 61, BS_GROUPBOX CHECKBOX "Ekzekuto ne 256 colors", IDC_CHKRUNIN256COLORS, 18, 114, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "Ekzekuto ne 640x480 screenresolution", IDC_CHKRUNIN640480RES, 18, 129, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "Ekzekuto ne 640x480 screen resolution", IDC_CHKRUNIN640480RES, 18, 129, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP CHECKBOX "Ãaktivizo themat vizuale", IDC_CHKDISABLEVISUALTHEMES, 18, 144, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP PUSHBUTTON "Modifiko mjetin e pajtueshmerise...", IDC_EDITCOMPATIBILITYMODES, 117, 167, 100, 15 CONTROL "Learn more about <A>program compatibility</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10, WS_EX_NOPARENTNOTIFY @@ -37,7 +37,7 @@ STRINGTABLE BEGIN - IDS_TABTITLE "Compatibility" + IDS_COMPAT_TITLE "PajtueshmÃ«ri" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" Modified: trunk/reactos/dll/shellext/acppage/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/sv-SE.rc [iso-8859-1] Thu Aug 31 20:38:38 2017 @@ -35,7 +35,7 @@ STRINGTABLE BEGIN - IDS_TABTITLE "Compatibility" + IDS_COMPAT_TITLE "Kompatibilitet" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" Modified: trunk/reactos/dll/shellext/acppage/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/tr-TR.rc [iso-8859-1] Thu Aug 31 20:38:38 2017 @@ -35,7 +35,7 @@ STRINGTABLE BEGIN - IDS_TABTITLE "Uyumluluk" + IDS_COMPAT_TITLE "Uyumluluk" IDS_FAILED_NETWORK "Bir aÄ sÃ¼rÃ¼cÃ¼sÃ¼ Ã¼zerinde olduÄundan bu izlencede uyumluluk kipleri ayarlanamaz." IDS_FAILED_PROTECTED "ReactOS'un bir parÃ§asÄ± olduÄundan bu izlencede uyumluluk kipleri ayarlanamaz." IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" Modified: trunk/reactos/dll/shellext/acppage/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/uk-UA.rc [iso-8859-1] Thu Aug 31 20:38:38 2017 @@ -41,7 +41,7 @@ STRINGTABLE BEGIN - IDS_TABTITLE "Compatibility" + IDS_COMPAT_TITLE "Ð¡ÑÐ¼ÑÑÐ½ÑÑÑÑ" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" Modified: trunk/reactos/dll/shellext/acppage/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/zh-CN.rc [iso-8859-1] Thu Aug 31 20:38:38 2017 @@ -35,7 +35,7 @@ STRINGTABLE BEGIN - IDS_TABTITLE "Compatibility" + IDS_COMPAT_TITLE "å¼å®¹æ§" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" Modified: trunk/reactos/dll/shellext/acppage/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/zh-TW.rc [iso-8859-1] Thu Aug 31 20:38:38 2017 @@ -35,7 +35,7 @@ STRINGTABLE BEGIN - IDS_TABTITLE "Compatibility" + IDS_COMPAT_TITLE "ç¸å®¹æ§" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" Modified: trunk/reactos/dll/shellext/acppage/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/resou… ============================================================================== --- trunk/reactos/dll/shellext/acppage/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/resource.h [iso-8859-1] Thu Aug 31 20:38:38 2017 @@ -20,7 +20,7 @@ #define IDS_DESCRIPTION 101 /* strings */ -#define IDS_TABTITLE 2000 +#define IDS_COMPAT_TITLE 2000 #define IDS_FAILED_NETWORK 2001 #define IDS_FAILED_PROTECTED 2002 #define IDS_YOU_DID_NOT_ADD 2003

7 years

[hbelusca] 75724: [SETUPLIB]: Addendum to r75720.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Aug 31 19:39:52 2017 New Revision: 75724 URL: http://svn.reactos.org/svn/reactos?rev=75724&view=rev Log: [SETUPLIB]: Addendum to r75720. Modified: branches/setup_improvements/base/setup/lib/settings.c branches/setup_improvements/base/setup/lib/settings.h Modified: branches/setup_improvements/base/setup/lib/settings.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/settings.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/settings.c [iso-8859-1] Thu Aug 31 19:39:52 2017 @@ -1178,7 +1178,7 @@ CreateKeyboardLayoutList( IN HINF InfFile, IN PCWSTR LanguageId, - OUT PWCHAR DefaultKBLayout) + OUT PWSTR DefaultKBLayout) { PGENERIC_LIST List; INFCONTEXT Context; Modified: branches/setup_improvements/base/setup/lib/settings.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/settings.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/settings.h [iso-8859-1] Thu Aug 31 19:39:52 2017 @@ -54,7 +54,7 @@ CreateKeyboardLayoutList( IN HINF InfFile, IN PCWSTR LanguageId, - OUT PWCHAR DefaultKBLayout); + OUT PWSTR DefaultKBLayout); PGENERIC_LIST CreateLanguageList(

7 years

[hbelusca] 75723: [USETUP]: Adjust some MUI & settings calls, following the commits r75719, r75720 and r75721.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Aug 31 18:49:39 2017 New Revision: 75723 URL: http://svn.reactos.org/svn/reactos?rev=75723&view=rev Log: [USETUP]: Adjust some MUI & settings calls, following the commits r75719, r75720 and r75721. Modified: branches/setup_improvements/base/setup/usetup/usetup.c branches/setup_improvements/base/setup/usetup/usetup.h Modified: branches/setup_improvements/base/setup/usetup/usetup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/usetup.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/usetup.c [iso-8859-1] Thu Aug 31 18:49:39 2017 @@ -400,13 +400,13 @@ UpdateKBLayout(VOID) { PGENERIC_LIST_ENTRY ListEntry; - LPCWSTR pszNewLayout; - - pszNewLayout = MUIDefaultKeyboardLayout(); + PCWSTR pszNewLayout; + + pszNewLayout = MUIDefaultKeyboardLayout(SelectedLanguageId); if (LayoutList == NULL) { - LayoutList = CreateKeyboardLayoutList(SetupInf, DefaultKBLayout); + LayoutList = CreateKeyboardLayoutList(SetupInf, SelectedLanguageId, DefaultKBLayout); if (LayoutList == NULL) { /* FIXME: Handle error! */ @@ -463,9 +463,10 @@ } } + SelectedLanguageId = DefaultLanguage; + USetupData.LanguageId = 0; + /* Load the font */ - USetupData.LanguageId = 0; - SelectedLanguageId = DefaultLanguage; SetConsoleCodePage(); UpdateKBLayout(); @@ -551,7 +552,7 @@ { NewLanguageId = (PWCHAR)GetListEntryUserData(GetCurrentListEntry(LanguageList)); - if (SelectedLanguageId != NewLanguageId) + if (wcscmp(SelectedLanguageId, NewLanguageId)) { /* Clear the language page */ MUIClearPage(LANGUAGE_PAGE); @@ -642,12 +643,15 @@ ComputerList = CreateComputerTypeList(SetupInf); DisplayList = CreateDisplayDriverList(SetupInf); KeyboardList = CreateKeyboardDriverList(SetupInf); - LayoutList = CreateKeyboardLayoutList(SetupInf, DefaultKBLayout); + LanguageList = CreateLanguageList(SetupInf, DefaultLanguage); /* new part */ + SelectedLanguageId = DefaultLanguage; wcscpy(SelectedLanguageId, USetupData.LocaleID); USetupData.LanguageId = (LANGID)(wcstol(SelectedLanguageId, NULL, 16) & 0xFFFF); + + LayoutList = CreateKeyboardLayoutList(SetupInf, SelectedLanguageId, DefaultKBLayout); /* first we hack LanguageList */ ListEntry = GetFirstListEntry(LanguageList); @@ -1078,7 +1082,7 @@ /* Initialize the keyboard layout list */ if (LayoutList == NULL) { - LayoutList = CreateKeyboardLayoutList(SetupInf, DefaultKBLayout); + LayoutList = CreateKeyboardLayoutList(SetupInf, SelectedLanguageId, DefaultKBLayout); if (LayoutList == NULL) { /* FIXME: report error */ @@ -4032,14 +4036,14 @@ /* Add keyboard layouts */ CONSOLE_SetStatusText(MUIGetString(STRING_ADDKBLAYOUTS)); - if (!AddKeyboardLayouts()) + if (!AddKeyboardLayouts(SelectedLanguageId)) { MUIDisplayError(ERROR_ADDING_KBLAYOUTS, Ir, POPUP_WAIT_ENTER); goto Cleanup; } /* Set GeoID */ - if (!SetGeoID(MUIGetGeoID())) + if (!SetGeoID(MUIGetGeoID(SelectedLanguageId))) { MUIDisplayError(ERROR_UPDATE_GEOID, Ir, POPUP_WAIT_ENTER); goto Cleanup; @@ -4049,7 +4053,7 @@ { /* Update keyboard layout settings */ CONSOLE_SetStatusText(MUIGetString(STRING_KEYBOARDSETTINGSUPDATE)); - if (!ProcessKeyboardLayoutRegistry(LayoutList)) + if (!ProcessKeyboardLayoutRegistry(LayoutList, SelectedLanguageId)) { MUIDisplayError(ERROR_UPDATE_KBSETTINGS, Ir, POPUP_WAIT_ENTER); goto Cleanup; @@ -4058,7 +4062,7 @@ /* Add codepage information to registry */ CONSOLE_SetStatusText(MUIGetString(STRING_CODEPAGEINFOUPDATE)); - if (!AddCodePage()) + if (!AddCodePage(SelectedLanguageId)) { MUIDisplayError(ERROR_ADDING_CODEPAGE, Ir, POPUP_WAIT_ENTER); goto Cleanup; Modified: branches/setup_improvements/base/setup/usetup/usetup.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/usetup.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/usetup.h [iso-8859-1] Thu Aug 31 18:49:39 2017 @@ -128,4 +128,10 @@ #define POPUP_WAIT_ANY_KEY 1 #define POPUP_WAIT_ENTER 2 +VOID +PopupError(IN PCCH Text, + IN PCCH Status, + IN PINPUT_RECORD Ir, + IN ULONG WaitEvent); + #endif /* _USETUP_PCH_ */

7 years

[hbelusca] 75722: [USETUP]: Adaptations 1: - Transform some do{}while() loops into while(){} ones, since the lists on which we work may only contain one single {NULL} element. - Modify MUIGetOEMCod...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Aug 31 18:31:52 2017 New Revision: 75722 URL: http://svn.reactos.org/svn/reactos?rev=75722&view=rev Log: [USETUP]: Adaptations 1: - Transform some do{}while() loops into while(){} ones, since the lists on which we work may only contain one single {NULL} element. - Modify MUIGetOEMCodePage() call after r75719. - Use PCWSTR where needed. Modified: branches/setup_improvements/base/setup/usetup/mui.c branches/setup_improvements/base/setup/usetup/mui.h Modified: branches/setup_improvements/base/setup/usetup/mui.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/mui.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/mui.c [iso-8859-1] Thu Aug 31 18:31:52 2017 @@ -30,13 +30,6 @@ #define NDEBUG #include <debug.h> -extern -VOID -PopupError(IN PCCH Text, - IN PCCH Status, - IN PINPUT_RECORD Ir, - IN ULONG WaitEvent); - static ULONG FindLanguageIndex(VOID) @@ -45,11 +38,12 @@ if (SelectedLanguageId == NULL) { - /* default to english */ - return 0; - } - - do + /* Default to en-US */ + return 0; // FIXME!! + // SelectedLanguageId = L"00000409"; + } + + while (ResourceList[lngIndex].MuiPages != NULL) { if (_wcsicmp(ResourceList[lngIndex].LanguageID, SelectedLanguageId) == 0) { @@ -57,7 +51,7 @@ } lngIndex++; - } while (ResourceList[lngIndex].MuiPages != NULL); + } return 0; } @@ -70,13 +64,13 @@ { ULONG lngIndex = 0; - do + while (ResourceList[lngIndex].MuiPages != NULL) { if (_wcsicmp(ResourceList[lngIndex].LanguageID, LanguageId) == 0) return TRUE; lngIndex++; - } while (ResourceList[lngIndex].MuiPages != NULL); + } return FALSE; } @@ -95,13 +89,13 @@ lngIndex = max(FindLanguageIndex(), 0); Pages = ResourceList[lngIndex].MuiPages; - do + while (Pages[muiIndex].MuiEntry != NULL) { if (Pages[muiIndex].Number == PageNumber) return Pages[muiIndex].MuiEntry; muiIndex++; - } while (Pages[muiIndex].MuiEntry != NULL); + } return NULL; } @@ -128,7 +122,7 @@ IN ULONG page) { const MUI_ENTRY * entry; - int index; + ULONG index; entry = FindMUIEntriesOfPage(page); if (!entry) @@ -141,7 +135,7 @@ } index = 0; - do + while (entry[index].Buffer != NULL) { CONSOLE_ClearStyledText(entry[index].X, entry[index].Y, @@ -149,7 +143,6 @@ strlen(entry[index].Buffer)); index++; } - while (entry[index].Buffer != NULL); } VOID @@ -157,7 +150,7 @@ IN ULONG page) { const MUI_ENTRY * entry; - int index; + ULONG index; entry = FindMUIEntriesOfPage(page); if (!entry) @@ -170,7 +163,7 @@ } index = 0; - do + while (entry[index].Buffer != NULL) { CONSOLE_SetStyledText(entry[index].X, entry[index].Y, @@ -179,7 +172,6 @@ index++; } - while (entry[index].Buffer != NULL); } VOID @@ -261,7 +253,7 @@ #if 0 ULONG lngIndex = 0; - do + while (ResourceList[lngIndex].MuiPages != NULL) { if (_wcsicmp(ResourceList[lngIndex].LanguageID, SelectedLanguageId) == 0) { @@ -272,9 +264,8 @@ lngIndex++; } - while (ResourceList[lngIndex].MuiPages != NULL); #else - wCodePage = (UINT)wcstoul(MUIGetOEMCodePage(), NULL, 10); + wCodePage = (UINT)wcstoul(MUIGetOEMCodePage(SelectedLanguageId), NULL, 10); SetConsoleOutputCP(wCodePage); #endif } Modified: branches/setup_improvements/base/setup/usetup/mui.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/mui.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/mui.h [iso-8859-1] Thu Aug 31 18:31:52 2017 @@ -28,8 +28,8 @@ typedef struct { - PWCHAR LanguageID; - PWCHAR LanguageDescriptor; + PCWSTR LanguageID; + PCWSTR LanguageDescriptor; const MUI_PAGE * MuiPages; const MUI_ERROR * MuiErrors; const MUI_STRING * MuiStrings;

7 years

[hbelusca] 75721: [REACTOS]: We don't need "SelectedLanguageId" anymore.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Aug 31 18:27:44 2017 New Revision: 75721 URL: http://svn.reactos.org/svn/reactos?rev=75721&view=rev Log: [REACTOS]: We don't need "SelectedLanguageId" anymore. Modified: branches/setup_improvements/base/setup/reactos/reactos.c branches/setup_improvements/base/setup/reactos/reactos.h Modified: branches/setup_improvements/base/setup/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/r… ============================================================================== --- branches/setup_improvements/base/setup/reactos/reactos.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/reactos/reactos.c [iso-8859-1] Thu Aug 31 18:27:44 2017 @@ -34,10 +34,7 @@ /* GLOBALS ******************************************************************/ HANDLE ProcessHeap; - BOOLEAN IsUnattendedSetup = FALSE; -PWCHAR SelectedLanguageId; - SETUPDATA SetupData; Modified: branches/setup_improvements/base/setup/reactos/reactos.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/r… ============================================================================== --- branches/setup_improvements/base/setup/reactos/reactos.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/reactos/reactos.h [iso-8859-1] Thu Aug 31 18:27:44 2017 @@ -123,7 +123,6 @@ extern HANDLE ProcessHeap; extern BOOLEAN IsUnattendedSetup; -extern PWCHAR SelectedLanguageId; typedef struct _IMGINFO {

7 years

[hbelusca] 75720: [SETUPLIB]: Change some function prototypes so that the usetup-specific "SelectedLanguageId" variable is not used in the library. Also, make AddEntriesFromInfSection(), DefaultPro...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Aug 31 18:27:07 2017 New Revision: 75720 URL: http://svn.reactos.org/svn/reactos?rev=75720&view=rev Log: [SETUPLIB]: Change some function prototypes so that the usetup-specific "SelectedLanguageId" variable is not used in the library. Also, make AddEntriesFromInfSection(), DefaultProcessEntry() and the typedef PPROCESS_ENTRY_ROUTINE private again. Modified: branches/setup_improvements/base/setup/lib/settings.c branches/setup_improvements/base/setup/lib/settings.h Modified: branches/setup_improvements/base/setup/lib/settings.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/settings.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/settings.c [iso-8859-1] Thu Aug 31 18:27:07 2017 @@ -212,8 +212,8 @@ static BOOLEAN GetComputerIdentifier( - PWSTR Identifier, - ULONG IdentifierLength) + OUT PWSTR Identifier, + IN ULONG IdentifierLength) { OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING KeyName; @@ -314,7 +314,23 @@ } -LONG +/* + * Return values: + * 0x00: Failure, stop the enumeration; + * 0x01: Add the entry and continue the enumeration; + * 0x02: Skip the entry but continue the enumeration. + */ +typedef UCHAR +(NTAPI *PPROCESS_ENTRY_ROUTINE)( + IN PWCHAR KeyName, + IN PWCHAR KeyValue, + IN PCHAR DisplayText, + IN SIZE_T DisplayTextSize, + OUT PVOID* UserData, + OUT PBOOLEAN Current, + IN PVOID Parameter OPTIONAL); + +static LONG AddEntriesFromInfSection( IN OUT PGENERIC_LIST List, IN HINF InfFile, @@ -384,7 +400,7 @@ return TotalCount; } -UCHAR +static UCHAR NTAPI DefaultProcessEntry( IN PWCHAR KeyName, @@ -418,7 +434,7 @@ PGENERIC_LIST CreateComputerTypeList( - HINF InfFile) + IN HINF InfFile) { PGENERIC_LIST List; INFCONTEXT Context; @@ -493,8 +509,8 @@ static BOOLEAN GetDisplayIdentifier( - PWSTR Identifier, - ULONG IdentifierLength) + OUT PWSTR Identifier, + IN ULONG IdentifierLength) { OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING KeyName; @@ -654,7 +670,7 @@ PGENERIC_LIST CreateDisplayDriverList( - HINF InfFile) + IN HINF InfFile) { PGENERIC_LIST List; INFCONTEXT Context; @@ -733,9 +749,9 @@ BOOLEAN ProcessComputerFiles( - HINF InfFile, - PGENERIC_LIST List, - PWCHAR *AdditionalSectionName) + IN HINF InfFile, + IN PGENERIC_LIST List, + OUT PWSTR* AdditionalSectionName) { PGENERIC_LIST_ENTRY Entry; static WCHAR SectionName[128]; @@ -758,8 +774,8 @@ BOOLEAN ProcessDisplayRegistry( - HINF InfFile, - PGENERIC_LIST List) + IN HINF InfFile, + IN PGENERIC_LIST List) { NTSTATUS Status; PGENERIC_LIST_ENTRY Entry; @@ -916,7 +932,7 @@ BOOLEAN ProcessLocaleRegistry( - PGENERIC_LIST List) + IN PGENERIC_LIST List) { PGENERIC_LIST_ENTRY Entry; PWCHAR LanguageId; @@ -1030,7 +1046,7 @@ PGENERIC_LIST CreateKeyboardDriverList( - HINF InfFile) + IN HINF InfFile) { PGENERIC_LIST List; INFCONTEXT Context; @@ -1110,8 +1126,8 @@ PGENERIC_LIST CreateLanguageList( - HINF InfFile, - WCHAR *DefaultLanguage) + IN HINF InfFile, + OUT PWSTR DefaultLanguage) { PGENERIC_LIST List; INFCONTEXT Context; @@ -1130,7 +1146,6 @@ return NULL; wcscpy(DefaultLanguage, KeyValue); - SelectedLanguageId = KeyValue; List = CreateGenericList(); if (List == NULL) @@ -1161,13 +1176,14 @@ PGENERIC_LIST CreateKeyboardLayoutList( - HINF InfFile, - WCHAR *DefaultKBLayout) + IN HINF InfFile, + IN PCWSTR LanguageId, + OUT PWCHAR DefaultKBLayout) { PGENERIC_LIST List; INFCONTEXT Context; PWCHAR KeyValue; - const MUI_LAYOUTS * LayoutsList; + const MUI_LAYOUTS* LayoutsList; ULONG uIndex = 0; /* Get default layout id */ @@ -1183,7 +1199,7 @@ if (List == NULL) return NULL; - LayoutsList = MUIGetLayoutsList(); + LayoutsList = MUIGetLayoutsList(LanguageId); do { @@ -1218,11 +1234,12 @@ BOOLEAN ProcessKeyboardLayoutRegistry( - PGENERIC_LIST List) + IN PGENERIC_LIST List, + IN PCWSTR LanguageId) { PGENERIC_LIST_ENTRY Entry; PWCHAR LayoutId; - const MUI_LAYOUTS * LayoutsList; + const MUI_LAYOUTS* LayoutsList; MUI_LAYOUTS NewLayoutsList[20]; ULONG uIndex; ULONG uOldPos = 0; @@ -1235,39 +1252,37 @@ if (LayoutId == NULL) return FALSE; - LayoutsList = MUIGetLayoutsList(); - - if (_wcsicmp(LayoutsList[0].LayoutID, LayoutId) != 0) - { - for (uIndex = 1; LayoutsList[uIndex].LangID != NULL; uIndex++) - { - if (_wcsicmp(LayoutsList[uIndex].LayoutID, LayoutId) == 0) - { - uOldPos = uIndex; - continue; - } - - NewLayoutsList[uIndex].LangID = LayoutsList[uIndex].LangID; - NewLayoutsList[uIndex].LayoutID = LayoutsList[uIndex].LayoutID; - } - - NewLayoutsList[uIndex].LangID = NULL; - NewLayoutsList[uIndex].LayoutID = NULL; - NewLayoutsList[uOldPos].LangID = LayoutsList[0].LangID; - NewLayoutsList[uOldPos].LayoutID = LayoutsList[0].LayoutID; - NewLayoutsList[0].LangID = LayoutsList[uOldPos].LangID; - NewLayoutsList[0].LayoutID = LayoutsList[uOldPos].LayoutID; - - return AddKbLayoutsToRegistry(NewLayoutsList); - } - - return TRUE; + LayoutsList = MUIGetLayoutsList(LanguageId); + + if (_wcsicmp(LayoutsList[0].LayoutID, LayoutId) == 0) + return TRUE; + + for (uIndex = 1; LayoutsList[uIndex].LangID != NULL; uIndex++) + { + if (_wcsicmp(LayoutsList[uIndex].LayoutID, LayoutId) == 0) + { + uOldPos = uIndex; + continue; + } + + NewLayoutsList[uIndex].LangID = LayoutsList[uIndex].LangID; + NewLayoutsList[uIndex].LayoutID = LayoutsList[uIndex].LayoutID; + } + + NewLayoutsList[uIndex].LangID = NULL; + NewLayoutsList[uIndex].LayoutID = NULL; + NewLayoutsList[uOldPos].LangID = LayoutsList[0].LangID; + NewLayoutsList[uOldPos].LayoutID = LayoutsList[0].LayoutID; + NewLayoutsList[0].LangID = LayoutsList[uOldPos].LangID; + NewLayoutsList[0].LayoutID = LayoutsList[uOldPos].LayoutID; + + return AddKbLayoutsToRegistry(NewLayoutsList); } #if 0 BOOLEAN ProcessKeyboardLayoutFiles( - PGENERIC_LIST List) + IN PGENERIC_LIST List) { return TRUE; } @@ -1275,7 +1290,7 @@ BOOLEAN SetGeoID( - PWCHAR Id) + IN PCWSTR Id) { NTSTATUS Status; OBJECT_ATTRIBUTES ObjectAttributes; @@ -1318,7 +1333,7 @@ BOOLEAN SetDefaultPagefile( - WCHAR Drive) + IN WCHAR Drive) { NTSTATUS Status; HANDLE KeyHandle; Modified: branches/setup_improvements/base/setup/lib/settings.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/settings.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/settings.h [iso-8859-1] Thu Aug 31 18:27:07 2017 @@ -27,97 +27,62 @@ #pragma once -/* - * Return values: - * 0x00: Failure, stop the enumeration; - * 0x01: Add the entry and continue the enumeration; - * 0x02: Skip the entry but continue the enumeration. - */ -typedef UCHAR -(NTAPI *PPROCESS_ENTRY_ROUTINE)( - IN PWCHAR KeyName, - IN PWCHAR KeyValue, - IN PCHAR DisplayText, - IN SIZE_T DisplayTextSize, - OUT PVOID* UserData, - OUT PBOOLEAN Current, - IN PVOID Parameter OPTIONAL); - -LONG -AddEntriesFromInfSection( - IN OUT PGENERIC_LIST List, - IN HINF InfFile, - IN PCWSTR SectionName, - IN PINFCONTEXT pContext, - IN PPROCESS_ENTRY_ROUTINE ProcessEntry, - IN PVOID Parameter OPTIONAL); - -UCHAR -NTAPI -DefaultProcessEntry( - IN PWCHAR KeyName, - IN PWCHAR KeyValue, - IN PCHAR DisplayText, - IN SIZE_T DisplayTextSize, - OUT PVOID* UserData, - OUT PBOOLEAN Current, - IN PVOID Parameter OPTIONAL); - - PGENERIC_LIST CreateComputerTypeList( - HINF InfFile); + IN HINF InfFile); PGENERIC_LIST CreateDisplayDriverList( - HINF InfFile); + IN HINF InfFile); BOOLEAN ProcessComputerFiles( - HINF InfFile, - PGENERIC_LIST List, - PWCHAR *AdditionalSectionName); + IN HINF InfFile, + IN PGENERIC_LIST List, + OUT PWSTR* AdditionalSectionName); BOOLEAN ProcessDisplayRegistry( - HINF InfFile, - PGENERIC_LIST List); + IN HINF InfFile, + IN PGENERIC_LIST List); PGENERIC_LIST CreateKeyboardDriverList( - HINF InfFile); + IN HINF InfFile); PGENERIC_LIST CreateKeyboardLayoutList( - HINF InfFile, - WCHAR *DefaultKBLayout); + IN HINF InfFile, + IN PCWSTR LanguageId, + OUT PWCHAR DefaultKBLayout); PGENERIC_LIST CreateLanguageList( - HINF InfFile, - WCHAR *DefaultLanguage); + IN HINF InfFile, + OUT PWSTR DefaultLanguage); ULONG GetDefaultLanguageIndex(VOID); BOOLEAN ProcessKeyboardLayoutRegistry( - PGENERIC_LIST List); + IN PGENERIC_LIST List, + IN PCWSTR LanguageId); BOOLEAN ProcessKeyboardLayoutFiles( - PGENERIC_LIST List); + IN PGENERIC_LIST List); BOOLEAN ProcessLocaleRegistry( - PGENERIC_LIST List); + IN PGENERIC_LIST List); BOOLEAN SetGeoID( - PWCHAR Id); + IN PCWSTR Id); BOOLEAN SetDefaultPagefile( - WCHAR Drive); + IN WCHAR Drive); /* EOF */

7 years

[hbelusca] 75719: [SETUPLIB]: Change some string pointer types & function prototypes so that the usetup-specific "SelectedLanguageId" variable is not used in the library.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Aug 31 18:25:38 2017 New Revision: 75719 URL: http://svn.reactos.org/svn/reactos?rev=75719&view=rev Log: [SETUPLIB]: Change some string pointer types & function prototypes so that the usetup-specific "SelectedLanguageId" variable is not used in the library. Modified: branches/setup_improvements/base/setup/lib/mui.c branches/setup_improvements/base/setup/lib/mui.h Modified: branches/setup_improvements/base/setup/lib/mui.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/mui.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/mui.c [iso-8859-1] Thu Aug 31 18:25:38 2017 @@ -40,72 +40,78 @@ static ULONG -FindLanguageIndex(VOID) +FindLanguageIndex( + IN PCWSTR LanguageId) { ULONG lngIndex = 0; - if (SelectedLanguageId == NULL) - { - /* default to english */ - return 0; - } - - do - { - if (_wcsicmp(LanguageList[lngIndex].LanguageID, SelectedLanguageId) == 0) + if (LanguageId == NULL) + { + /* Default to en-US */ + // return 0; // FIXME!! + LanguageId = L"00000409"; + } + + while (LanguageList[lngIndex].LanguageID != NULL) + { + if (_wcsicmp(LanguageList[lngIndex].LanguageID, LanguageId) == 0) { return lngIndex; } lngIndex++; - } while (LanguageList[lngIndex].LanguageID != NULL); + } return 0; } BOOLEAN IsLanguageAvailable( - PWCHAR LanguageId) + IN PCWSTR LanguageId) { ULONG lngIndex = 0; - do + while (LanguageList[lngIndex].LanguageID != NULL) { if (_wcsicmp(LanguageList[lngIndex].LanguageID, LanguageId) == 0) return TRUE; lngIndex++; - } while (LanguageList[lngIndex].LanguageID != NULL); + } return FALSE; } PCWSTR -MUIDefaultKeyboardLayout(VOID) -{ - ULONG lngIndex = max(FindLanguageIndex(), 0); +MUIDefaultKeyboardLayout( + IN PCWSTR LanguageId) +{ + ULONG lngIndex = max(FindLanguageIndex(LanguageId), 0); return LanguageList[lngIndex].MuiLayouts[0].LayoutID; } -PWCHAR -MUIGetOEMCodePage(VOID) -{ - ULONG lngIndex = max(FindLanguageIndex(), 0); +PCWSTR +MUIGetOEMCodePage( + IN PCWSTR LanguageId) +{ + ULONG lngIndex = max(FindLanguageIndex(LanguageId), 0); return LanguageList[lngIndex].OEMCPage; } -PWCHAR -MUIGetGeoID(VOID) -{ - ULONG lngIndex = max(FindLanguageIndex(), 0); +PCWSTR +MUIGetGeoID( + IN PCWSTR LanguageId) +{ + ULONG lngIndex = max(FindLanguageIndex(LanguageId), 0); return LanguageList[lngIndex].GeoID; } -const MUI_LAYOUTS * -MUIGetLayoutsList(VOID) -{ - ULONG lngIndex = max(FindLanguageIndex(), 0); +const MUI_LAYOUTS* +MUIGetLayoutsList( + IN PCWSTR LanguageId) +{ + ULONG lngIndex = max(FindLanguageIndex(LanguageId), 0); return LanguageList[lngIndex].MuiLayouts; } @@ -139,8 +145,7 @@ NULL, REG_OPTION_NON_VOLATILE, &Disposition); - - if(!NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { DPRINT1("NtCreateKey() failed (Status %lx)\n", Status); return FALSE; @@ -230,14 +235,13 @@ NULL, REG_OPTION_NON_VOLATILE, &Disposition); - - if(NT_SUCCESS(Status)) - NtClose(KeyHandle); - else + if (!NT_SUCCESS(Status)) { DPRINT1("NtCreateKey() failed (Status %lx)\n", Status); return FALSE; } + + NtClose(KeyHandle); KeyName.MaximumLength = sizeof(szKeyName); Status = RtlAppendUnicodeToString(&KeyName, L"\\Preload"); @@ -262,7 +266,6 @@ NULL, REG_OPTION_NON_VOLATILE, &Disposition); - if (!NT_SUCCESS(Status)) { DPRINT1("NtCreateKey() failed (Status %lx)\n", Status); @@ -283,8 +286,7 @@ NULL, REG_OPTION_NON_VOLATILE, &Disposition); - - if(!NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { DPRINT1("NtCreateKey() failed (Status %lx)\n", Status); NtClose(SubKeyHandle); @@ -292,7 +294,7 @@ return FALSE; } - do + while (MuiLayouts[uIndex].LangID != NULL) { if (uIndex > 19) break; @@ -355,7 +357,6 @@ uIndex++; } - while (MuiLayouts[uIndex].LangID != NULL); if (uIndex > 1) AddHotkeySettings(L"2", L"2", L"1"); @@ -368,20 +369,20 @@ } BOOLEAN -AddKeyboardLayouts(VOID) +AddKeyboardLayouts( + IN PCWSTR LanguageId) { ULONG lngIndex = 0; - do - { - if (_wcsicmp(LanguageList[lngIndex].LanguageID, SelectedLanguageId) == 0) + while (LanguageList[lngIndex].LanguageID != NULL) + { + if (_wcsicmp(LanguageList[lngIndex].LanguageID, LanguageId) == 0) { return AddKbLayoutsToRegistry(LanguageList[lngIndex].MuiLayouts); } lngIndex++; } - while (LanguageList[lngIndex].LanguageID != NULL); return FALSE; } @@ -494,7 +495,7 @@ return FALSE; } - do + while (MuiSubFonts[uIndex].FontName != NULL) { RtlInitUnicodeString(&ValueName, MuiSubFonts[uIndex].FontName); Status = NtSetValueKey(KeyHandle, @@ -512,7 +513,6 @@ uIndex++; } - while (MuiSubFonts[uIndex].FontName != NULL); NtClose(KeyHandle); @@ -520,12 +520,14 @@ } BOOLEAN -AddCodePage(VOID) +AddCodePage( + IN PCWSTR LanguageId) { ULONG lngIndex = 0; - do - { - if (_wcsicmp(LanguageList[lngIndex].LanguageID, SelectedLanguageId) == 0) + + while (LanguageList[lngIndex].LanguageID != NULL) + { + if (_wcsicmp(LanguageList[lngIndex].LanguageID, LanguageId) == 0) { if (AddCodepageToRegistry(LanguageList[lngIndex].ACPage, LanguageList[lngIndex].OEMCPage, @@ -542,7 +544,6 @@ lngIndex++; } - while (LanguageList[lngIndex].LanguageID != NULL); return FALSE; } Modified: branches/setup_improvements/base/setup/lib/mui.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/mui.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/mui.h [iso-8859-1] Thu Aug 31 18:25:38 2017 @@ -2,55 +2,57 @@ typedef struct { - PWCHAR FontName; - PWCHAR SubFontName; + PCWSTR FontName; + PCWSTR SubFontName; } MUI_SUBFONT; typedef struct { - PWCHAR LangID; // Language ID (like "0409") - PWCHAR LayoutID; // Layout ID (like "00000409") + PCWSTR LangID; // Language ID (like "0409") + PCWSTR LayoutID; // Layout ID (like "00000409") } MUI_LAYOUTS; typedef struct { - PWCHAR LanguageID; - PWCHAR ACPage; - PWCHAR OEMCPage; - PWCHAR MACCPage; - PWCHAR LanguageDescriptor; - PWCHAR GeoID; + PCWSTR LanguageID; + PCWSTR ACPage; + PCWSTR OEMCPage; + PCWSTR MACCPage; + PCWSTR LanguageDescriptor; + PCWSTR GeoID; const MUI_SUBFONT * MuiSubFonts; const MUI_LAYOUTS * MuiLayouts; } MUI_LANGUAGE; -// HACK HACK HACK!! -extern PWCHAR SelectedLanguageId; - - BOOLEAN IsLanguageAvailable( - PWCHAR LanguageId); + IN PCWSTR LanguageId); PCWSTR -MUIDefaultKeyboardLayout(VOID); +MUIDefaultKeyboardLayout( + IN PCWSTR LanguageId); -PWCHAR -MUIGetOEMCodePage(VOID); +PCWSTR +MUIGetOEMCodePage( + IN PCWSTR LanguageId); -PWCHAR -MUIGetGeoID(VOID); +PCWSTR +MUIGetGeoID( + IN PCWSTR LanguageId); -const MUI_LAYOUTS * -MUIGetLayoutsList(VOID); +const MUI_LAYOUTS* +MUIGetLayoutsList( + IN PCWSTR LanguageId); BOOLEAN AddKbLayoutsToRegistry( IN const MUI_LAYOUTS *MuiLayouts); BOOLEAN -AddCodePage(VOID); +AddKeyboardLayouts( + IN PCWSTR LanguageId); BOOLEAN -AddKeyboardLayouts(VOID); +AddCodePage( + IN PCWSTR LanguageId);

7 years

[ashaposhnikov] 75718: [RAPPS] Adjusted splitter values a bit. CORE-13163

by ashaposhnikov＠svn.reactos.org

Author: ashaposhnikov Date: Wed Aug 30 22:22:38 2017 New Revision: 75718 URL: http://svn.reactos.org/svn/reactos?rev=75718&view=rev Log: [RAPPS] Adjusted splitter values a bit. CORE-13163 Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp [iso-8859-1] Wed Aug 30 22:22:38 2017 @@ -789,9 +789,9 @@ m_HSplitter->m_HorizontalAlignment = UiAlign_Stretch; m_HSplitter->m_DynamicFirst = TRUE; m_HSplitter->m_Horizontal = TRUE; - m_HSplitter->m_Pos = 150; + m_HSplitter->m_Pos = INT_MAX; //set INT_MAX to use lowest possible position (m_MinSecond) m_HSplitter->m_MinFirst = 10; - m_HSplitter->m_MinSecond = 10; + m_HSplitter->m_MinSecond = 140; m_VSplitter->Second().Append(m_HSplitter); return m_HSplitter->Create(m_hWnd) != NULL; @@ -1533,7 +1533,6 @@ ImageList_Destroy(hImageListBuf); } - //if previous one was INSTALLED purge the list if (IS_INSTALLED_ENUM(EnumType)) { if (!bWasInInstalled)

7 years

[hbelusca] 75717: [SETUPLIB][USETUP]: Adjust MUI and settings code. - Re-enable settings code concerning language, keyboards & layout in the setuplib, and remove the old code in usetup. - Remove us...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Aug 30 19:00:17 2017 New Revision: 75717 URL: http://svn.reactos.org/svn/reactos?rev=75717&view=rev Log: [SETUPLIB][USETUP]: Adjust MUI and settings code. - Re-enable settings code concerning language, keyboards & layout in the setuplib, and remove the old code in usetup. - Remove useless code in setuplib's mui.c - Rename usetup's MUI "LanguageList" into "ResourceList" so as to avoid colliding with the "LanguageList" of setuplib. - Add the magic CMakeLists line "add_definitions(${I18N_DEFS})" that I forgot previously, that caused the "LanguageList" of setuplib to be empty! The code compiles and works during my tests. Removed: branches/setup_improvements/base/setup/usetup/settings.c branches/setup_improvements/base/setup/usetup/settings.h Modified: branches/setup_improvements/base/setup/lib/CMakeLists.txt branches/setup_improvements/base/setup/lib/mui.c branches/setup_improvements/base/setup/lib/mui.h branches/setup_improvements/base/setup/lib/muilanguages.h branches/setup_improvements/base/setup/lib/settings.c branches/setup_improvements/base/setup/lib/settings.h branches/setup_improvements/base/setup/lib/setuplib.h branches/setup_improvements/base/setup/usetup/CMakeLists.txt branches/setup_improvements/base/setup/usetup/mui.c branches/setup_improvements/base/setup/usetup/muilanguages.h branches/setup_improvements/base/setup/usetup/usetup.c Modified: branches/setup_improvements/base/setup/lib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/CMakeLists.txt [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/CMakeLists.txt [iso-8859-1] Wed Aug 30 19:00:17 2017 @@ -1,3 +1,5 @@ + +add_definitions(${I18N_DEFS}) include_directories(utils) Modified: branches/setup_improvements/base/setup/lib/mui.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/mui.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/mui.c [iso-8859-1] Wed Aug 30 19:00:17 2017 @@ -38,13 +38,6 @@ /* FUNCTIONS ****************************************************************/ -extern -VOID -PopupError(IN PCCH Text, - IN PCCH Status, - IN PINPUT_RECORD Ir, - IN ULONG WaitEvent); - static ULONG FindLanguageIndex(VOID) @@ -59,17 +52,16 @@ do { - if (_wcsicmp(LanguageList[lngIndex].LanguageID , SelectedLanguageId) == 0) + if (_wcsicmp(LanguageList[lngIndex].LanguageID, SelectedLanguageId) == 0) { return lngIndex; } lngIndex++; - } while (LanguageList[lngIndex].MuiPages != NULL); + } while (LanguageList[lngIndex].LanguageID != NULL); return 0; } - BOOLEAN IsLanguageAvailable( @@ -79,65 +71,29 @@ do { - if (_wcsicmp(LanguageList[lngIndex].LanguageID , LanguageId) == 0) + if (_wcsicmp(LanguageList[lngIndex].LanguageID, LanguageId) == 0) return TRUE; lngIndex++; - } while (LanguageList[lngIndex].MuiPages != NULL); + } while (LanguageList[lngIndex].LanguageID != NULL); return FALSE; } -static -const MUI_ENTRY * -FindMUIEntriesOfPage( - IN ULONG PageNumber) -{ - ULONG muiIndex = 0; - ULONG lngIndex; - const MUI_PAGE * Pages = NULL; - - lngIndex = max(FindLanguageIndex(), 0); - Pages = LanguageList[lngIndex].MuiPages; - - do - { - if (Pages[muiIndex].Number == PageNumber) - return Pages[muiIndex].MuiEntry; - - muiIndex++; - } while (Pages[muiIndex].MuiEntry != NULL); - - return NULL; -} - - -static -const MUI_ERROR * -FindMUIErrorEntries(VOID) -{ - ULONG lngIndex = max(FindLanguageIndex(), 0); - return LanguageList[lngIndex].MuiErrors; -} - - -static -const MUI_STRING * -FindMUIStringEntries(VOID) -{ - ULONG lngIndex = max(FindLanguageIndex(), 0); - return LanguageList[lngIndex].MuiStrings; -} - - -LPCWSTR +PCWSTR MUIDefaultKeyboardLayout(VOID) { ULONG lngIndex = max(FindLanguageIndex(), 0); return LanguageList[lngIndex].MuiLayouts[0].LayoutID; } +PWCHAR +MUIGetOEMCodePage(VOID) +{ + ULONG lngIndex = max(FindLanguageIndex(), 0); + return LanguageList[lngIndex].OEMCPage; +} PWCHAR MUIGetGeoID(VOID) @@ -146,7 +102,6 @@ return LanguageList[lngIndex].GeoID; } - const MUI_LAYOUTS * MUIGetLayoutsList(VOID) { @@ -155,146 +110,12 @@ } -VOID -MUIClearPage( - IN ULONG page) -{ - const MUI_ENTRY * entry; - int index; - - entry = FindMUIEntriesOfPage(page); - if (!entry) - { - PopupError("Error: Failed to find translated page", - NULL, - NULL, - POPUP_WAIT_NONE); - return; - } - - index = 0; - do - { - CONSOLE_ClearStyledText(entry[index].X, - entry[index].Y, - entry[index].Flags, - strlen(entry[index].Buffer)); - index++; - } - while (entry[index].Buffer != NULL); -} - - -VOID -MUIDisplayPage( - IN ULONG page) -{ - const MUI_ENTRY * entry; - int index; - - entry = FindMUIEntriesOfPage(page); - if (!entry) - { - PopupError("Error: Failed to find translated page", - NULL, - NULL, - POPUP_WAIT_NONE); - return; - } - - index = 0; - do - { - CONSOLE_SetStyledText(entry[index].X, - entry[index].Y, - entry[index].Flags, - entry[index].Buffer); - - index++; - } - while (entry[index].Buffer != NULL); -} - - -VOID -MUIDisplayError( - IN ULONG ErrorNum, - OUT PINPUT_RECORD Ir, - IN ULONG WaitEvent, - ...) -{ - const MUI_ERROR * entry; - CHAR Buffer[2048]; - va_list ap; - - if (ErrorNum >= ERROR_LAST_ERROR_CODE) - { - PopupError("Invalid error number provided", - "Press ENTER to continue", - Ir, - POPUP_WAIT_ENTER); - - return; - } - - entry = FindMUIErrorEntries(); - if (!entry) - { - PopupError("Error: Failed to find translated error message", - NULL, - NULL, - POPUP_WAIT_NONE); - return; - } - - va_start(ap, WaitEvent); - vsprintf(Buffer, entry[ErrorNum].ErrorText, ap); - va_end(ap); - - PopupError(Buffer, - entry[ErrorNum].ErrorStatus, - Ir, - WaitEvent); -} - - -LPSTR -MUIGetString( - ULONG Number) -{ - ULONG i; - const MUI_STRING * entry; - CHAR szErr[128]; - - entry = FindMUIStringEntries(); - if (entry) - { - for (i = 0; entry[i].Number != 0; i++) - { - if (entry[i].Number == Number) - { - return entry[i].String; - } - } - } - - sprintf(szErr, "Error: failed find string id %lu for language index %lu\n", Number, FindLanguageIndex()); - - PopupError(szErr, - NULL, - NULL, - POPUP_WAIT_NONE); - - return "<nostring>"; -} - - static BOOLEAN AddHotkeySettings( - IN LPCWSTR Hotkey, - IN LPCWSTR LangHotkey, - IN LPCWSTR LayoutHotkey) + IN PCWSTR Hotkey, + IN PCWSTR LangHotkey, + IN PCWSTR LayoutHotkey) { OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING KeyName; @@ -376,7 +197,6 @@ NtClose(KeyHandle); return TRUE; } - BOOLEAN AddKbLayoutsToRegistry( @@ -547,7 +367,6 @@ return TRUE; } - BOOLEAN AddKeyboardLayouts(VOID) { @@ -555,25 +374,24 @@ do { - if (_wcsicmp(LanguageList[lngIndex].LanguageID , SelectedLanguageId) == 0) + if (_wcsicmp(LanguageList[lngIndex].LanguageID, SelectedLanguageId) == 0) { return AddKbLayoutsToRegistry(LanguageList[lngIndex].MuiLayouts); } lngIndex++; } - while (LanguageList[lngIndex].MuiPages != NULL); + while (LanguageList[lngIndex].LanguageID != NULL); return FALSE; } - static BOOLEAN AddCodepageToRegistry( - IN LPCWSTR ACPage, - IN LPCWSTR OEMCPage, - IN LPCWSTR MACCPage) + IN PCWSTR ACPage, + IN PCWSTR OEMCPage, + IN PCWSTR MACCPage) { OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING KeyName; @@ -647,7 +465,6 @@ return TRUE; } - static BOOLEAN @@ -702,14 +519,13 @@ return TRUE; } - BOOLEAN AddCodePage(VOID) { ULONG lngIndex = 0; do { - if (_wcsicmp(LanguageList[lngIndex].LanguageID , SelectedLanguageId) == 0) + if (_wcsicmp(LanguageList[lngIndex].LanguageID, SelectedLanguageId) == 0) { if (AddCodepageToRegistry(LanguageList[lngIndex].ACPage, LanguageList[lngIndex].OEMCPage, @@ -726,30 +542,9 @@ lngIndex++; } - while (LanguageList[lngIndex].MuiPages != NULL); + while (LanguageList[lngIndex].LanguageID != NULL); return FALSE; } - -VOID -SetConsoleCodePage(VOID) -{ - ULONG lngIndex = 0; - UINT wCodePage; - - do - { - if (_wcsicmp(LanguageList[lngIndex].LanguageID , SelectedLanguageId) == 0) - { - wCodePage = (UINT) wcstoul(LanguageList[lngIndex].OEMCPage, NULL, 10); - SetConsoleOutputCP(wCodePage); - return; - } - - lngIndex++; - } - while (LanguageList[lngIndex].MuiPages != NULL); -} - /* EOF */ Modified: branches/setup_improvements/base/setup/lib/mui.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/mui.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/mui.h [iso-8859-1] Wed Aug 30 19:00:17 2017 @@ -24,12 +24,20 @@ const MUI_LAYOUTS * MuiLayouts; } MUI_LANGUAGE; + +// HACK HACK HACK!! +extern PWCHAR SelectedLanguageId; + + BOOLEAN IsLanguageAvailable( PWCHAR LanguageId); PCWSTR MUIDefaultKeyboardLayout(VOID); + +PWCHAR +MUIGetOEMCodePage(VOID); PWCHAR MUIGetGeoID(VOID); Modified: branches/setup_improvements/base/setup/lib/muilanguages.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/muilanguages.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/muilanguages.h [iso-8859-1] Wed Aug 30 19:00:17 2017 @@ -838,5 +838,5 @@ #ifdef LANGUAGE_ZU_ZU {L"00000435", L"1252", L"850", L"10000", L"Zulu", L"1", LatinFonts, zuZULayouts}, #endif - {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, + {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL} }; Modified: branches/setup_improvements/base/setup/lib/settings.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/settings.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/settings.c [iso-8859-1] Wed Aug 30 19:00:17 2017 @@ -29,6 +29,7 @@ #include "precomp.h" #include "genlist.h" #include "infsupp.h" +#include "mui.h" #include "registry.h" #include "settings.h" @@ -38,9 +39,7 @@ /* GLOBALS ******************************************************************/ -#if 0 // FIXME: Disabled for now because it uses MUI* functions from usetup -ULONG DefaultLanguageIndex = 0; -#endif +static ULONG DefaultLanguageIndex = 0; /* FUNCTIONS ****************************************************************/ @@ -1055,8 +1054,6 @@ } -#if 0 // FIXME: Disabled for now because it uses MUI* functions from usetup - ULONG GetDefaultLanguageIndex(VOID) { @@ -1267,8 +1264,6 @@ return TRUE; } -#endif - #if 0 BOOLEAN ProcessKeyboardLayoutFiles( Modified: branches/setup_improvements/base/setup/lib/settings.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/settings.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/settings.h [iso-8859-1] Wed Aug 30 19:00:17 2017 @@ -87,8 +87,6 @@ CreateKeyboardDriverList( HINF InfFile); -#if 0 // FIXME: Disabled for now because it uses MUI* functions from usetup - PGENERIC_LIST CreateKeyboardLayoutList( HINF InfFile, @@ -110,8 +108,6 @@ ProcessKeyboardLayoutFiles( PGENERIC_LIST List); -#endif - BOOLEAN ProcessLocaleRegistry( PGENERIC_LIST List); Modified: branches/setup_improvements/base/setup/lib/setuplib.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/setuplib.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/setuplib.h [iso-8859-1] Wed Aug 30 19:00:17 2017 @@ -41,6 +41,7 @@ #include "utils/osdetect.h" #include "utils/regutil.h" #include "registry.h" +#include "mui.h" #include "settings.h" Modified: branches/setup_improvements/base/setup/usetup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/CMakeLists.txt [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/CMakeLists.txt [iso-8859-1] Wed Aug 30 19:00:17 2017 @@ -27,7 +27,6 @@ mui.c partlist.c progress.c - settings.c usetup.c usetup.h) Modified: branches/setup_improvements/base/setup/usetup/mui.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/mui.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/mui.c [iso-8859-1] Wed Aug 30 19:00:17 2017 @@ -51,18 +51,19 @@ do { - if (_wcsicmp(LanguageList[lngIndex].LanguageID , SelectedLanguageId) == 0) + if (_wcsicmp(ResourceList[lngIndex].LanguageID, SelectedLanguageId) == 0) { return lngIndex; } lngIndex++; - } while (LanguageList[lngIndex].MuiPages != NULL); + } while (ResourceList[lngIndex].MuiPages != NULL); return 0; } +#if 0 BOOLEAN IsLanguageAvailable( PWCHAR LanguageId) @@ -71,14 +72,15 @@ do { - if (_wcsicmp(LanguageList[lngIndex].LanguageID , LanguageId) == 0) + if (_wcsicmp(ResourceList[lngIndex].LanguageID, LanguageId) == 0) return TRUE; lngIndex++; - } while (LanguageList[lngIndex].MuiPages != NULL); + } while (ResourceList[lngIndex].MuiPages != NULL); return FALSE; } +#endif static @@ -91,59 +93,33 @@ const MUI_PAGE * Pages = NULL; lngIndex = max(FindLanguageIndex(), 0); - Pages = LanguageList[lngIndex].MuiPages; - - do - { - if (Pages[muiIndex].Number == PageNumber) - return Pages[muiIndex].MuiEntry; - - muiIndex++; + Pages = ResourceList[lngIndex].MuiPages; + + do + { + if (Pages[muiIndex].Number == PageNumber) + return Pages[muiIndex].MuiEntry; + + muiIndex++; } while (Pages[muiIndex].MuiEntry != NULL); return NULL; } - static const MUI_ERROR * FindMUIErrorEntries(VOID) { ULONG lngIndex = max(FindLanguageIndex(), 0); - return LanguageList[lngIndex].MuiErrors; -} - + return ResourceList[lngIndex].MuiErrors; +} static const MUI_STRING * FindMUIStringEntries(VOID) { ULONG lngIndex = max(FindLanguageIndex(), 0); - return LanguageList[lngIndex].MuiStrings; -} - - -LPCWSTR -MUIDefaultKeyboardLayout(VOID) -{ - ULONG lngIndex = max(FindLanguageIndex(), 0); - return LanguageList[lngIndex].MuiLayouts[0].LayoutID; -} - - -PWCHAR -MUIGetGeoID(VOID) -{ - ULONG lngIndex = max(FindLanguageIndex(), 0); - return LanguageList[lngIndex].GeoID; -} - - -const MUI_LAYOUTS * -MUIGetLayoutsList(VOID) -{ - ULONG lngIndex = max(FindLanguageIndex(), 0); - return LanguageList[lngIndex].MuiLayouts; + return ResourceList[lngIndex].MuiStrings; } @@ -176,7 +152,6 @@ while (entry[index].Buffer != NULL); } - VOID MUIDisplayPage( IN ULONG page) @@ -206,7 +181,6 @@ } while (entry[index].Buffer != NULL); } - VOID MUIDisplayError( @@ -248,7 +222,6 @@ Ir, WaitEvent); } - LPSTR MUIGetString( @@ -280,468 +253,30 @@ return "<nostring>"; } - -static -BOOLEAN -AddHotkeySettings( - IN LPCWSTR Hotkey, - IN LPCWSTR LangHotkey, - IN LPCWSTR LayoutHotkey) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName; - UNICODE_STRING ValueName; - HANDLE KeyHandle; - ULONG Disposition; - NTSTATUS Status; - - RtlInitUnicodeString(&KeyName, - L".DEFAULT\\Keyboard Layout\\Toggle"); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - GetRootKeyByPredefKey(HKEY_USERS, NULL), - NULL); - - Status = NtCreateKey(&KeyHandle, - KEY_SET_VALUE, - &ObjectAttributes, - 0, - NULL, - REG_OPTION_NON_VOLATILE, - &Disposition); - - if(!NT_SUCCESS(Status)) - { - DPRINT1("NtCreateKey() failed (Status %lx)\n", Status); - return FALSE; - } - - RtlInitUnicodeString(&ValueName, - L"Hotkey"); - - Status = NtSetValueKey(KeyHandle, - &ValueName, - 0, - REG_SZ, - (PVOID)Hotkey, - (1 + 1) * sizeof(WCHAR)); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); - NtClose(KeyHandle); - return FALSE; - } - - RtlInitUnicodeString(&ValueName, - L"Language Hotkey"); - - Status = NtSetValueKey(KeyHandle, - &ValueName, - 0, - REG_SZ, - (PVOID)LangHotkey, - (1 + 1) * sizeof(WCHAR)); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); - NtClose(KeyHandle); - return FALSE; - } - - RtlInitUnicodeString(&ValueName, - L"Layout Hotkey"); - - Status = NtSetValueKey(KeyHandle, - &ValueName, - 0, - REG_SZ, - (PVOID)LayoutHotkey, - (1 + 1) * sizeof(WCHAR)); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); - NtClose(KeyHandle); - return FALSE; - } - - NtClose(KeyHandle); - return TRUE; -} - - -BOOLEAN -AddKbLayoutsToRegistry( - IN const MUI_LAYOUTS *MuiLayouts) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName; - UNICODE_STRING ValueName; - HANDLE KeyHandle; - HANDLE SubKeyHandle; - NTSTATUS Status; - ULONG Disposition; - ULONG uIndex = 0; - ULONG uCount = 0; - WCHAR szKeyName[48] = L".DEFAULT\\Keyboard Layout"; - WCHAR szValueName[3 + 1]; - WCHAR szLangID[8 + 1]; - - // Open the keyboard layout key - RtlInitUnicodeString(&KeyName, szKeyName); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - GetRootKeyByPredefKey(HKEY_USERS, NULL), - NULL); - - Status = NtCreateKey(&KeyHandle, - KEY_CREATE_SUB_KEY, - &ObjectAttributes, - 0, - NULL, - REG_OPTION_NON_VOLATILE, - &Disposition); - - if(NT_SUCCESS(Status)) - NtClose(KeyHandle); - else - { - DPRINT1("NtCreateKey() failed (Status %lx)\n", Status); - return FALSE; - } - - KeyName.MaximumLength = sizeof(szKeyName); - Status = RtlAppendUnicodeToString(&KeyName, L"\\Preload"); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("RtlAppend failed! (%lx)\n", Status); - DPRINT1("String is %wZ\n", &KeyName); - return FALSE; - } - - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - GetRootKeyByPredefKey(HKEY_USERS, NULL), - NULL); - - Status = NtCreateKey(&KeyHandle, - KEY_SET_VALUE, - &ObjectAttributes, - 0, - NULL, - REG_OPTION_NON_VOLATILE, - &Disposition); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtCreateKey() failed (Status %lx)\n", Status); - return FALSE; - } - - RtlInitUnicodeString(&KeyName, L".DEFAULT\\Keyboard Layout\\Substitutes"); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - GetRootKeyByPredefKey(HKEY_USERS, NULL), - NULL); - - Status = NtCreateKey(&SubKeyHandle, - KEY_SET_VALUE, - &ObjectAttributes, - 0, - NULL, - REG_OPTION_NON_VOLATILE, - &Disposition); - - if(!NT_SUCCESS(Status)) - { - DPRINT1("NtCreateKey() failed (Status %lx)\n", Status); - NtClose(SubKeyHandle); - NtClose(KeyHandle); - return FALSE; - } - - do - { - if (uIndex > 19) break; - - swprintf(szValueName, L"%u", uIndex + 1); - RtlInitUnicodeString(&ValueName, szValueName); - - swprintf(szLangID, L"0000%s", MuiLayouts[uIndex].LangID); - - if (_wcsicmp(szLangID, MuiLayouts[uIndex].LayoutID) == 0) +VOID +SetConsoleCodePage(VOID) +{ + UINT wCodePage; + +#if 0 + ULONG lngIndex = 0; + + do + { + if (_wcsicmp(ResourceList[lngIndex].LanguageID, SelectedLanguageId) == 0) { - Status = NtSetValueKey(KeyHandle, - &ValueName, - 0, - REG_SZ, - (PVOID)MuiLayouts[uIndex].LayoutID, - (wcslen(MuiLayouts[uIndex].LayoutID)+1) * sizeof(WCHAR)); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtSetValueKey() failed (Status = %lx, uIndex = %d)\n", Status, uIndex); - NtClose(SubKeyHandle); - NtClose(KeyHandle); - return FALSE; - } - } - else - { - swprintf(szLangID, L"d%03lu%s", uCount, MuiLayouts[uIndex].LangID); - Status = NtSetValueKey(KeyHandle, - &ValueName, - 0, - REG_SZ, - (PVOID)szLangID, - (wcslen(szLangID)+1) * sizeof(WCHAR)); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtSetValueKey() failed (Status = %lx, uIndex = %d)\n", Status, uIndex); - NtClose(SubKeyHandle); - NtClose(KeyHandle); - return FALSE; - } - - RtlInitUnicodeString(&ValueName, szLangID); - - Status = NtSetValueKey(SubKeyHandle, - &ValueName, - 0, - REG_SZ, - (PVOID)MuiLayouts[uIndex].LayoutID, - (wcslen(MuiLayouts[uIndex].LayoutID)+1) * sizeof(WCHAR)); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtSetValueKey() failed (Status = %lx, uIndex = %u)\n", Status, uIndex); - NtClose(SubKeyHandle); - NtClose(KeyHandle); - return FALSE; - } - - uCount++; - } - - uIndex++; - } - while (MuiLayouts[uIndex].LangID != NULL); - - if (uIndex > 1) - AddHotkeySettings(L"2", L"2", L"1"); - else - AddHotkeySettings(L"3", L"3", L"3"); - - NtClose(SubKeyHandle); - NtClose(KeyHandle); - return TRUE; -} - - -BOOLEAN -AddKeyboardLayouts(VOID) -{ - ULONG lngIndex = 0; - - do - { - if (_wcsicmp(LanguageList[lngIndex].LanguageID , SelectedLanguageId) == 0) - { - return AddKbLayoutsToRegistry(LanguageList[lngIndex].MuiLayouts); - } - - lngIndex++; - } - while (LanguageList[lngIndex].MuiPages != NULL); - - return FALSE; -} - - -static -BOOLEAN -AddCodepageToRegistry( - IN LPCWSTR ACPage, - IN LPCWSTR OEMCPage, - IN LPCWSTR MACCPage) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName; - UNICODE_STRING ValueName; - HANDLE KeyHandle; - NTSTATUS Status; - - // Open the nls codepage key - RtlInitUnicodeString(&KeyName, - L"SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage"); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - GetRootKeyByPredefKey(HKEY_LOCAL_MACHINE, NULL), - NULL); - Status = NtOpenKey(&KeyHandle, - KEY_WRITE, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtOpenKey() failed (Status %lx)\n", Status); - return FALSE; - } - - // Set ANSI codepage - RtlInitUnicodeString(&ValueName, L"ACP"); - Status = NtSetValueKey(KeyHandle, - &ValueName, - 0, - REG_SZ, - (PVOID)ACPage, - (wcslen(ACPage)+1) * sizeof(WCHAR)); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); - NtClose(KeyHandle); - return FALSE; - } - - // Set OEM codepage - RtlInitUnicodeString(&ValueName, L"OEMCP"); - Status = NtSetValueKey(KeyHandle, - &ValueName, - 0, - REG_SZ, - (PVOID)OEMCPage, - (wcslen(OEMCPage)+1) * sizeof(WCHAR)); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); - NtClose(KeyHandle); - return FALSE; - } - - // Set MAC codepage - RtlInitUnicodeString(&ValueName, L"MACCP"); - Status = NtSetValueKey(KeyHandle, - &ValueName, - 0, - REG_SZ, - (PVOID)MACCPage, - (wcslen(MACCPage)+1) * sizeof(WCHAR)); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); - NtClose(KeyHandle); - return FALSE; - } - - NtClose(KeyHandle); - - return TRUE; -} - - -static -BOOLEAN -AddFontsSettingsToRegistry( - IN const MUI_SUBFONT * MuiSubFonts) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName; - UNICODE_STRING ValueName; - HANDLE KeyHandle; - NTSTATUS Status; - ULONG uIndex = 0; - - RtlInitUnicodeString(&KeyName, - L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\FontSubstitutes"); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - GetRootKeyByPredefKey(HKEY_LOCAL_MACHINE, NULL), - NULL); - Status = NtOpenKey(&KeyHandle, - KEY_WRITE, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtOpenKey() failed (Status %lx)\n", Status); - return FALSE; - } - - do - { - RtlInitUnicodeString(&ValueName, MuiSubFonts[uIndex].FontName); - Status = NtSetValueKey(KeyHandle, - &ValueName, - 0, - REG_SZ, - (PVOID)MuiSubFonts[uIndex].SubFontName, - (wcslen(MuiSubFonts[uIndex].SubFontName)+1) * sizeof(WCHAR)); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtSetValueKey() failed (Status = %lx, uIndex = %d)\n", Status, uIndex); - NtClose(KeyHandle); - return FALSE; - } - - uIndex++; - } - while (MuiSubFonts[uIndex].FontName != NULL); - - NtClose(KeyHandle); - - return TRUE; -} - - -BOOLEAN -AddCodePage(VOID) -{ - ULONG lngIndex = 0; - do - { - if (_wcsicmp(LanguageList[lngIndex].LanguageID , SelectedLanguageId) == 0) - { - if (AddCodepageToRegistry(LanguageList[lngIndex].ACPage, - LanguageList[lngIndex].OEMCPage, - LanguageList[lngIndex].MACCPage)&& - AddFontsSettingsToRegistry(LanguageList[lngIndex].MuiSubFonts)) - { - return TRUE; - } - else - { - return FALSE; - } - } - - lngIndex++; - } - while (LanguageList[lngIndex].MuiPages != NULL); - - return FALSE; -} - - -VOID -SetConsoleCodePage(VOID) -{ - ULONG lngIndex = 0; - UINT wCodePage; - - do - { - if (_wcsicmp(LanguageList[lngIndex].LanguageID , SelectedLanguageId) == 0) - { - wCodePage = (UINT) wcstoul(LanguageList[lngIndex].OEMCPage, NULL, 10); + wCodePage = (UINT) wcstoul(ResourceList[lngIndex].OEMCPage, NULL, 10); SetConsoleOutputCP(wCodePage); return; } lngIndex++; } - while (LanguageList[lngIndex].MuiPages != NULL); + while (ResourceList[lngIndex].MuiPages != NULL); +#else + wCodePage = (UINT)wcstoul(MUIGetOEMCodePage(), NULL, 10); + SetConsoleOutputCP(wCodePage); +#endif } /* EOF */ Modified: branches/setup_improvements/base/setup/usetup/muilanguages.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/muilanguages.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/muilanguages.h [iso-8859-1] Wed Aug 30 19:00:17 2017 @@ -411,7 +411,7 @@ // #include "lang/zh-TW.h" // #endif -const MUI_LANGUAGE_RESOURCE LanguageList[] = +const MUI_LANGUAGE_RESOURCE ResourceList[] = { /* Lang ID, Language Name, Page strings, Error strings, Other strings */ #ifdef LANGUAGE_AF_ZA @@ -840,5 +840,5 @@ #ifdef LANGUAGE_ZU_ZU {L"00000435", L"Zulu", enUSPages, enUSErrorEntries, enUSStrings}, #endif - {NULL, NULL, NULL, NULL, NULL}, + {NULL, NULL, NULL, NULL, NULL} }; Removed: branches/setup_improvements/base/setup/usetup/settings.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/settings.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/settings.c (removed) @@ -1,259 +0,0 @@ -/* - * ReactOS kernel - * Copyright (C) 2004 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -/* COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS text-mode setup - * FILE: base/setup/usetup/settings.c - * PURPOSE: Device settings support functions - * PROGRAMMERS: Eric Kohl - * Colin Finck - */ - -/* INCLUDES *****************************************************************/ - -#include "usetup.h" - -#define NDEBUG -#include <debug.h> - -/* GLOBALS ******************************************************************/ - -ULONG DefaultLanguageIndex = 0; - -/* FUNCTIONS ****************************************************************/ - -ULONG -GetDefaultLanguageIndex(VOID) -{ - return DefaultLanguageIndex; -} - -typedef struct _LANG_ENTRY_PARAM -{ - ULONG uIndex; - PWCHAR DefaultLanguage; -} LANG_ENTRY_PARAM, *PLANG_ENTRY_PARAM; - -static UCHAR -NTAPI -ProcessLangEntry( - IN PWCHAR KeyName, - IN PWCHAR KeyValue, - IN PCHAR DisplayText, - IN SIZE_T DisplayTextSize, - OUT PVOID* UserData, - OUT PBOOLEAN Current, - IN PVOID Parameter OPTIONAL) -{ - PLANG_ENTRY_PARAM LangEntryParam = (PLANG_ENTRY_PARAM)Parameter; - - if (!IsLanguageAvailable(KeyName)) - { - /* The specified language is unavailable, skip the entry */ - return 2; - } - - *UserData = RtlAllocateHeap(ProcessHeap, 0, - (wcslen(KeyName) + 1) * sizeof(WCHAR)); - if (*UserData == NULL) - { - /* Failure, stop enumeration */ - DPRINT1("RtlAllocateHeap() failed\n"); - return 0; - } - - wcscpy((PWCHAR)*UserData, KeyName); - sprintf(DisplayText, "%S", KeyValue); - - *Current = FALSE; - - if (!_wcsicmp(KeyName, LangEntryParam->DefaultLanguage)) - DefaultLanguageIndex = LangEntryParam->uIndex; - - LangEntryParam->uIndex++; - - /* Add the entry */ - return 1; -} - -PGENERIC_LIST -CreateLanguageList( - HINF InfFile, - WCHAR *DefaultLanguage) -{ - PGENERIC_LIST List; - INFCONTEXT Context; - PWCHAR KeyValue; - - LANG_ENTRY_PARAM LangEntryParam; - - LangEntryParam.uIndex = 0; - LangEntryParam.DefaultLanguage = DefaultLanguage; - - /* Get default language id */ - if (!SetupFindFirstLineW(InfFile, L"NLS", L"DefaultLanguage", &Context)) - return NULL; - - if (!INF_GetData(&Context, NULL, &KeyValue)) - return NULL; - - wcscpy(DefaultLanguage, KeyValue); - SelectedLanguageId = KeyValue; - - List = CreateGenericList(); - if (List == NULL) - return NULL; - - if (AddEntriesFromInfSection(List, - InfFile, - L"Language", - &Context, - ProcessLangEntry, - &LangEntryParam) == -1) - { - DestroyGenericList(List, TRUE); - return NULL; - } - - /* Only one language available, make it the default one */ - if (LangEntryParam.uIndex == 1) - { - DefaultLanguageIndex = 0; - wcscpy(DefaultLanguage, - (PWSTR)GetListEntryUserData(GetFirstListEntry(List))); - } - - return List; -} - - -PGENERIC_LIST -CreateKeyboardLayoutList( - HINF InfFile, - WCHAR *DefaultKBLayout) -{ - PGENERIC_LIST List; - INFCONTEXT Context; - PWCHAR KeyValue; - const MUI_LAYOUTS * LayoutsList; - ULONG uIndex = 0; - - /* Get default layout id */ - if (!SetupFindFirstLineW(InfFile, L"NLS", L"DefaultLayout", &Context)) - return NULL; - - if (!INF_GetData(&Context, NULL, &KeyValue)) - return NULL; - - wcscpy(DefaultKBLayout, KeyValue); - - List = CreateGenericList(); - if (List == NULL) - return NULL; - - LayoutsList = MUIGetLayoutsList(); - - do - { - // NOTE: See https://svn.reactos.org/svn/reactos?view=revision&revision=68354 - if (AddEntriesFromInfSection(List, - InfFile, - L"KeyboardLayout", - &Context, - DefaultProcessEntry, - DefaultKBLayout) == -1) - { - DestroyGenericList(List, TRUE); - return NULL; - } - - uIndex++; - - } while (LayoutsList[uIndex].LangID != NULL); - - /* Check whether some keyboard layouts have been found */ - /* FIXME: Handle this case */ - if (GetNumberOfListEntries(List) == 0) - { - DPRINT1("No keyboard layouts have been found\n"); - DestroyGenericList(List, TRUE); - return NULL; - } - - return List; -} - - -BOOLEAN -ProcessKeyboardLayoutRegistry( - PGENERIC_LIST List) -{ - PGENERIC_LIST_ENTRY Entry; - PWCHAR LayoutId; - const MUI_LAYOUTS * LayoutsList; - MUI_LAYOUTS NewLayoutsList[20]; - ULONG uIndex; - ULONG uOldPos = 0; - - Entry = GetCurrentListEntry(List); - if (Entry == NULL) - return FALSE; - - LayoutId = (PWCHAR)GetListEntryUserData(Entry); - if (LayoutId == NULL) - return FALSE; - - LayoutsList = MUIGetLayoutsList(); - - if (_wcsicmp(LayoutsList[0].LayoutID, LayoutId) != 0) - { - for (uIndex = 1; LayoutsList[uIndex].LangID != NULL; uIndex++) - { - if (_wcsicmp(LayoutsList[uIndex].LayoutID, LayoutId) == 0) - { - uOldPos = uIndex; - continue; - } - - NewLayoutsList[uIndex].LangID = LayoutsList[uIndex].LangID; - NewLayoutsList[uIndex].LayoutID = LayoutsList[uIndex].LayoutID; - } - - NewLayoutsList[uIndex].LangID = NULL; - NewLayoutsList[uIndex].LayoutID = NULL; - NewLayoutsList[uOldPos].LangID = LayoutsList[0].LangID; - NewLayoutsList[uOldPos].LayoutID = LayoutsList[0].LayoutID; - NewLayoutsList[0].LangID = LayoutsList[uOldPos].LangID; - NewLayoutsList[0].LayoutID = LayoutsList[uOldPos].LayoutID; - - return AddKbLayoutsToRegistry(NewLayoutsList); - } - - return TRUE; -} - -#if 0 -BOOLEAN -ProcessKeyboardLayoutFiles( - PGENERIC_LIST List) -{ - return TRUE; -} -#endif - -/* EOF */ Removed: branches/setup_improvements/base/setup/usetup/settings.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/settings.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/settings.h (removed) @@ -1,51 +0,0 @@ -/* - * ReactOS kernel - * Copyright (C) 2004 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS text-mode setup - * FILE: base/setup/usetup/settings.h - * PURPOSE: Device settings support functions - * PROGRAMMERS: Eric Kohl - * Colin Finck - */ - -#pragma once - -PGENERIC_LIST -CreateKeyboardLayoutList( - HINF InfFile, - WCHAR *DefaultKBLayout); - -PGENERIC_LIST -CreateLanguageList( - HINF InfFile, - WCHAR *DefaultLanguage); - -ULONG -GetDefaultLanguageIndex(VOID); - -BOOLEAN -ProcessKeyboardLayoutRegistry( - PGENERIC_LIST List); - -BOOLEAN -ProcessKeyboardLayoutFiles( - PGENERIC_LIST List); - -/* EOF */ Modified: branches/setup_improvements/base/setup/usetup/usetup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/usetup.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/usetup.c [iso-8859-1] Wed Aug 30 19:00:17 2017 @@ -32,7 +32,6 @@ #include "chkdsk.h" #include "cmdcons.h" #include "format.h" -#include "settings.h" #define NDEBUG #include <debug.h>

7 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2017