Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 75964: [MORE]: Remove an unused library import (user32).
by hbelusca＠svn.reactos.org 24 Sep '17

24 Sep '17

Author: hbelusca Date: Sun Sep 24 19:02:29 2017 New Revision: 75964 URL: http://svn.reactos.org/svn/reactos?rev=75964&view=rev Log: [MORE]: Remove an unused library import (user32). Modified: trunk/reactos/base/applications/cmdutils/more/CMakeLists.txt Modified: trunk/reactos/base/applications/cmdutils/more/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/more/CMakeLists.txt [iso-8859-1] Sun Sep 24 19:02:29 2017 @@ -6,6 +6,6 @@ add_executable(more more.c more.rc) set_module_type(more win32cui UNICODE) target_link_libraries(more conutils ${PSEH_LIB}) -add_importlibs(more advapi32 user32 msvcrt kernel32) +add_importlibs(more advapi32 msvcrt kernel32) set_target_properties(more PROPERTIES SUFFIX ".com") add_cd_file(TARGET more DESTINATION reactos/system32 FOR all)

1 0

[hbelusca] 75963: [CHCP][CMD]: Make the CHCP command a standalone executable, for backwards compatibility with Windows etc. This allows the user to be able to replace it with a 3rd-party one. CORE-...
by hbelusca＠svn.reactos.org 24 Sep '17

24 Sep '17

Author: hbelusca Date: Sun Sep 24 19:00:47 2017 New Revision: 75963 URL: http://svn.reactos.org/svn/reactos?rev=75963&view=rev Log: [CHCP][CMD]: Make the CHCP command a standalone executable, for backwards compatibility with Windows etc. This allows the user to be able to replace it with a 3rd-party one. CORE-10295 #resolve CORE-9444 Added: trunk/reactos/base/applications/cmdutils/chcp/ trunk/reactos/base/applications/cmdutils/chcp/CMakeLists.txt (with props) trunk/reactos/base/applications/cmdutils/chcp/chcp.c - copied, changed from r75962, trunk/reactos/base/shell/cmd/chcp.c trunk/reactos/base/applications/cmdutils/chcp/chcp.rc (with props) trunk/reactos/base/applications/cmdutils/chcp/lang/ trunk/reactos/base/applications/cmdutils/chcp/lang/cs-CZ.rc (with props) trunk/reactos/base/applications/cmdutils/chcp/lang/de-DE.rc (with props) trunk/reactos/base/applications/cmdutils/chcp/lang/el-GR.rc (with props) trunk/reactos/base/applications/cmdutils/chcp/lang/en-US.rc (with props) trunk/reactos/base/applications/cmdutils/chcp/lang/es-ES.rc (with props) trunk/reactos/base/applications/cmdutils/chcp/lang/fr-FR.rc (with props) trunk/reactos/base/applications/cmdutils/chcp/lang/hu-HU.rc (with props) trunk/reactos/base/applications/cmdutils/chcp/lang/id-ID.rc (with props) trunk/reactos/base/applications/cmdutils/chcp/lang/it-IT.rc (with props) trunk/reactos/base/applications/cmdutils/chcp/lang/ja-JP.rc (with props) trunk/reactos/base/applications/cmdutils/chcp/lang/no-NO.rc (with props) trunk/reactos/base/applications/cmdutils/chcp/lang/pl-PL.rc (with props) trunk/reactos/base/applications/cmdutils/chcp/lang/ro-RO.rc (with props) trunk/reactos/base/applications/cmdutils/chcp/lang/ru-RU.rc (with props) trunk/reactos/base/applications/cmdutils/chcp/lang/sk-SK.rc (with props) trunk/reactos/base/applications/cmdutils/chcp/lang/sq-AL.rc (with props) trunk/reactos/base/applications/cmdutils/chcp/lang/sv-SE.rc (with props) trunk/reactos/base/applications/cmdutils/chcp/lang/tr-TR.rc (with props) trunk/reactos/base/applications/cmdutils/chcp/lang/uk-UA.rc (with props) trunk/reactos/base/applications/cmdutils/chcp/lang/zh-CN.rc (with props) trunk/reactos/base/applications/cmdutils/chcp/lang/zh-TW.rc (with props) trunk/reactos/base/applications/cmdutils/chcp/resource.h (with props) Removed: trunk/reactos/base/shell/cmd/chcp.c Modified: trunk/reactos/base/applications/cmdutils/CMakeLists.txt trunk/reactos/base/shell/cmd/CMakeLists.txt trunk/reactos/base/shell/cmd/cmd.h trunk/reactos/base/shell/cmd/cmdtable.c trunk/reactos/base/shell/cmd/config.h trunk/reactos/base/shell/cmd/lang/cs-CZ.rc trunk/reactos/base/shell/cmd/lang/de-DE.rc trunk/reactos/base/shell/cmd/lang/el-GR.rc trunk/reactos/base/shell/cmd/lang/en-US.rc trunk/reactos/base/shell/cmd/lang/es-ES.rc trunk/reactos/base/shell/cmd/lang/fr-FR.rc trunk/reactos/base/shell/cmd/lang/hu-HU.rc trunk/reactos/base/shell/cmd/lang/id-ID.rc trunk/reactos/base/shell/cmd/lang/it-IT.rc trunk/reactos/base/shell/cmd/lang/ja-JP.rc trunk/reactos/base/shell/cmd/lang/no-NO.rc trunk/reactos/base/shell/cmd/lang/pl-PL.rc trunk/reactos/base/shell/cmd/lang/ro-RO.rc trunk/reactos/base/shell/cmd/lang/ru-RU.rc trunk/reactos/base/shell/cmd/lang/sk-SK.rc trunk/reactos/base/shell/cmd/lang/sq-AL.rc trunk/reactos/base/shell/cmd/lang/sv-SE.rc trunk/reactos/base/shell/cmd/lang/tr-TR.rc trunk/reactos/base/shell/cmd/lang/uk-UA.rc trunk/reactos/base/shell/cmd/lang/zh-CN.rc trunk/reactos/base/shell/cmd/lang/zh-TW.rc trunk/reactos/base/shell/cmd/resource.h Modified: trunk/reactos/base/applications/cmdutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/CMakeLists.txt [iso-8859-1] Sun Sep 24 19:00:47 2017 @@ -1,4 +1,5 @@ add_subdirectory(at) +add_subdirectory(chcp) add_subdirectory(clip) add_subdirectory(comp) add_subdirectory(cscript) Added: trunk/reactos/base/applications/cmdutils/chcp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/chcp/CMakeLists.txt (added) +++ trunk/reactos/base/applications/cmdutils/chcp/CMakeLists.txt [iso-8859-1] Sun Sep 24 19:00:47 2017 @@ -0,0 +1,9 @@ + +include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils) + +add_executable(chcp chcp.c chcp.rc) +set_module_type(chcp win32cui UNICODE) +target_link_libraries(chcp conutils ${PSEH_LIB}) +add_importlibs(chcp msvcrt kernel32) +set_target_properties(chcp PROPERTIES SUFFIX ".com") +add_cd_file(TARGET chcp DESTINATION reactos/system32 FOR all) Propchange: trunk/reactos/base/applications/cmdutils/chcp/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Copied: trunk/reactos/base/applications/cmdutils/chcp/chcp.c (from r75962, trunk/reactos/base/shell/cmd/chcp.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/shell/cmd/chcp.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/chcp/chcp.c [iso-8859-1] Sun Sep 24 19:00:47 2017 @@ -1,93 +1,95 @@ /* - * CHCP.C - chcp internal command. + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Change CodePage Command + * FILE: base/applications/cmdutils/chcp/chcp.c + * PURPOSE: Displays or changes the active console input and output codepages. + * PROGRAMMERS: Eric Kohl + * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + */ +/* + * CHCP.C - chcp internal command. * + * 23-Dec-1998 (Eric Kohl) + * Started. * - * History: - * - * 23-Dec-1998 (Eric Kohl) - * Started. - * - * 02-Apr-2005 (Magnus Olsen <magnus(a)greatlord.com>) - * Remove all hardcoded strings in En.rc + * 02-Apr-2005 (Magnus Olsen <magnus(a)greatlord.com>) + * Remove all hardcoded strings in En.rc */ -#include "precomp.h" +#include <stdio.h> +#include <stdlib.h> -#ifdef INCLUDE_CMD_CHCP +#include <windef.h> +#include <winbase.h> +#include <wincon.h> -INT CommandChcp(LPTSTR param) +#include <conutils.h> + +#include "resource.h" + +// INT CommandChcp(LPTSTR cmd, LPTSTR param) +int wmain(int argc, WCHAR* argv[]) { - LPTSTR *arg; - INT args; - UINT uNewCodePage; + UINT uOldCodePage, uNewCodePage; + + /* Initialize the Console Standard Streams */ + ConInitStdStreams(); /* Print help */ - if (!_tcsncmp(param, _T("/?"), 2)) + if (argc > 1 && wcscmp(argv[1], L"/?") == 0) { - ConOutResPaging(TRUE,STRING_CHCP_HELP); + ConResPuts(StdOut, STRING_CHCP_HELP); return 0; } - nErrorLevel = 0; - - /* Get parameters */ - arg = split(param, &args, FALSE, FALSE); - - if (args == 0) + if (argc == 1) { /* Display the active code page number */ - ConOutResPrintf(STRING_CHCP_ERROR1, OutputCodePage); - freep(arg); + ConResPrintf(StdOut, STRING_CHCP_ERROR1, GetConsoleOutputCP()); return 0; } - if (args >= 2) + if (argc > 2) { /* Too many parameters */ - ConErrResPrintf(STRING_ERROR_INVALID_PARAM_FORMAT, param); - freep(arg); - nErrorLevel = 1; + ConResPrintf(StdErr, STRING_ERROR_INVALID_PARAM_FORMAT, argv[2]); return 1; } - uNewCodePage = (UINT)_ttoi(arg[0]); + uNewCodePage = (UINT)_wtoi(argv[1]); if (uNewCodePage == 0) { - ConErrResPrintf(STRING_ERROR_INVALID_PARAM_FORMAT, arg[0]); - freep(arg); - nErrorLevel = 1; + ConResPrintf(StdErr, STRING_ERROR_INVALID_PARAM_FORMAT, argv[1]); return 1; } - freep(arg); - - // TODO: In case of failure of SetConsoleCP or SetConsoleOutputCP, - // restore the old code page! + /* + * Save the original console codepage to be restored in case + * SetConsoleCP() or SetConsoleOutputCP() fails. + */ + uOldCodePage = GetConsoleCP(); /* * Try changing the console input codepage. If it works then also change * the console output codepage, and refresh our local codepage cache. */ - if (!SetConsoleCP(uNewCodePage)) + if (SetConsoleCP(uNewCodePage)) { - ConErrResPuts(STRING_CHCP_ERROR4); - } - else - { - SetConsoleOutputCP(uNewCodePage); - - /* Update our local codepage cache */ - InputCodePage = GetConsoleCP(); - OutputCodePage = GetConsoleOutputCP(); - - InitLocale(); - - /* Display the active code page number */ - ConOutResPrintf(STRING_CHCP_ERROR1, OutputCodePage); + if (SetConsoleOutputCP(uNewCodePage)) + { + /* Display the active code page number */ + ConResPrintf(StdOut, STRING_CHCP_ERROR1, GetConsoleOutputCP()); + return 0; + } + else + { + /* Failure, restore the original console codepage */ + SetConsoleCP(uOldCodePage); + } } - return 0; + /* An error happened, display an error and bail out */ + ConResPuts(StdErr, STRING_CHCP_ERROR4); + return 1; } - -#endif /* INCLUDE_CMD_CHCP */ Added: trunk/reactos/base/applications/cmdutils/chcp/chcp.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/chcp/chcp.rc (added) +++ trunk/reactos/base/applications/cmdutils/chcp/chcp.rc [iso-8859-1] Sun Sep 24 19:00:47 2017 @@ -0,0 +1,77 @@ +#include <windef.h> + +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Change CodePage Command" +#define REACTOS_STR_INTERNAL_NAME "chcp" +#define REACTOS_STR_ORIGINAL_FILENAME "chcp.com" +#include <reactos/version.rc> + +/* UTF-8 */ +#pragma code_page(65001) + +#ifdef LANGUAGE_CS_CZ + #include "lang/cs-CZ.rc" +#endif +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.rc" +#endif +#ifdef LANGUAGE_EL_GR + #include "lang/el-GR.rc" +#endif +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif +#ifdef LANGUAGE_ES_ES + #include "lang/es-ES.rc" +#endif +#ifdef LANGUAGE_FR_FR + #include "lang/fr-FR.rc" +#endif +#ifdef LANGUAGE_HU_HU + #include "lang/hu-HU.rc" +#endif +#ifdef LANGUAGE_ID_ID + #include "lang/id-ID.rc" +#endif +#ifdef LANGUAGE_IT_IT + #include "lang/it-IT.rc" +#endif +#ifdef LANGUAGE_NB_NO + #include "lang/no-NO.rc" +#endif +#ifdef LANGUAGE_JA_JP + #include "lang/ja-JP.rc" +#endif +#ifdef LANGUAGE_PL_PL + #include "lang/pl-PL.rc" +#endif +#ifdef LANGUAGE_RO_RO + #include "lang/ro-RO.rc" +#endif +#ifdef LANGUAGE_RU_RU + #include "lang/ru-RU.rc" +#endif +#ifdef LANGUAGE_SK_SK + #include "lang/sk-SK.rc" +#endif +#ifdef LANGUAGE_SV_SE + #include "lang/sv-SE.rc" +#endif +#ifdef LANGUAGE_SQ_AL + #include "lang/sq-AL.rc" +#endif +#ifdef LANGUAGE_TR_TR + #include "lang/tr-TR.rc" +#endif +#ifdef LANGUAGE_UK_UA + #include "lang/uk-UA.rc" +#endif +#ifdef LANGUAGE_ZH_CN + #include "lang/zh-CN.rc" +#endif +#ifdef LANGUAGE_ZH_TW + #include "lang/zh-TW.rc" +#endif Propchange: trunk/reactos/base/applications/cmdutils/chcp/chcp.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/chcp/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/chcp/lang/cs-CZ.rc (added) +++ trunk/reactos/base/applications/cmdutils/chcp/lang/cs-CZ.rc [iso-8859-1] Sun Sep 24 19:00:47 2017 @@ -0,0 +1,17 @@ +/* FILE: base/shell/cmd/lang/cs-CZ.rc + * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com) + * UPDATED: 2015-04-12 + */ + +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + STRING_CHCP_HELP "Displays or sets the active code page number.\n\n\ +CHCP [nnn]\n\n\ + nnn Specifies the active code page number.\n\n\ +Type CHCP without a parameter to display the active code page number.\n" + STRING_CHCP_ERROR1 "AktivnÃ znakovÃ¡ strÃ¡nka: %u\n" + STRING_CHCP_ERROR4 "NeplatnÃ¡ znakovÃ¡ strÃ¡nka\n" + STRING_ERROR_INVALID_PARAM_FORMAT "NeplatnÃ½ formÃ¡t parametru - %s\n" +END Propchange: trunk/reactos/base/applications/cmdutils/chcp/lang/cs-CZ.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/chcp/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/chcp/lang/de-DE.rc (added) +++ trunk/reactos/base/applications/cmdutils/chcp/lang/de-DE.rc [iso-8859-1] Sun Sep 24 19:00:47 2017 @@ -0,0 +1,14 @@ +/* German language file by Klemens Friedl <frik85> 2005-06-03 */ + +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + STRING_CHCP_HELP "Zeigt die aktuelle Codepage an oder wechselt diese.\n\n\ +CHCP [nnn]\n\n\ + nnn Codepage angeben.\n\n\ +Der Befehl CHCP ohne Parameter zeigt die Nummer der aktuellen Codepage an." + STRING_CHCP_ERROR1 "Aktive Codepage: %u\n" + STRING_CHCP_ERROR4 "UngÃ¼ltige Codepage\n" + STRING_ERROR_INVALID_PARAM_FORMAT "UngÃ¼ltiges Parameterformat - %s\n" +END Propchange: trunk/reactos/base/applications/cmdutils/chcp/lang/de-DE.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/chcp/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/chcp/lang/el-GR.rc (added) +++ trunk/reactos/base/applications/cmdutils/chcp/lang/el-GR.rc [iso-8859-1] Sun Sep 24 19:00:47 2017 @@ -0,0 +1,17 @@ +/* + * ÎÏÏÎ¹ÎºÎ® ÎÎºÎ´Î¿ÏÎ· - ÎÎ¼Î¹ÏÎµÎ»Î®Ï. + * ÎÎ»Î»Î·Î½Î¹ÎºÎ® Î¼ÎµÏÎ¬ÏÏÎ±ÏÎ· - ÎÏÏÏÏÎ¿Î»Î¿Ï ÎÎ»ÎµÎ¾Î¹Î¬Î´Î·Ï + */ + +LANGUAGE LANG_GREEK, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + STRING_CHCP_HELP "ÎÎ¼ÏÎ±Î½Î¯Î¶ÎµÎ¹ Î® Î¿ÏÎ¯Î¶ÎµÎ¹ ÏÎ¿Î½ Î±ÏÎ¹Î¸Î¼Ï ÏÎ·Ï ÎµÎ½ÎµÏÎ³Î¿Ï ÎºÏÎ´Î¹ÎºÎ¿ÏÎµÎ»Î¯Î´Î±Ï.\n\n\ +CHCP [nnn]\n\n\ + nnn ÎÎ±Î¸Î¿ÏÎ¯Î¶ÎµÎ¹ ÎÎ½Î±Î½ Î±ÏÎ¹Î¸Î¼Ï ÎºÏÎ´Î¹ÎºÎ¿ÏÎµÎ»Î¯Î´Î±Ï.\n\n\ +Î Î»Î·ÎºÏÏÎ¿Î»Î¿Î³Î®ÏÏÎµ CHCP ÏÏÏÎ¯Ï ÏÎ±ÏÎ¬Î¼ÎµÏÏÎ¿, Î³Î¹Î± Î½Î± ÎµÎ¼ÏÎ±Î½Î¹ÏÏÎµÎ¯ Î¿ ÏÏÎÏÏÎ½ Î±ÏÎ¹Î¸Î¼ÏÏ ÎºÏÎ´Î¹ÎºÎ¿ÏÎµÎ»Î¯Î´Î±Ï.\n" + STRING_CHCP_ERROR1 "Active code page: %u\n" + STRING_CHCP_ERROR4 "Invalid code page\n" + STRING_ERROR_INVALID_PARAM_FORMAT "ÎÎ· ÎÎ³ÎºÏÏÎ¿ ÏÎ¿ÏÎ¼Î¬ ÏÎ±ÏÎ±Î¼ÎÏÏÎ¿Ï - %s\n" +END Propchange: trunk/reactos/base/applications/cmdutils/chcp/lang/el-GR.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/chcp/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/chcp/lang/en-US.rc (added) +++ trunk/reactos/base/applications/cmdutils/chcp/lang/en-US.rc [iso-8859-1] Sun Sep 24 19:00:47 2017 @@ -0,0 +1,12 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE +BEGIN + STRING_CHCP_HELP "Displays or sets the active code page number.\n\n\ +CHCP [nnn]\n\n\ + nnn Specifies the active code page number.\n\n\ +Type CHCP without a parameter to display the active code page number.\n" + STRING_CHCP_ERROR1 "Active code page: %u\n" + STRING_CHCP_ERROR4 "Invalid code page\n" + STRING_ERROR_INVALID_PARAM_FORMAT "Invalid parameter format - %s\n" +END Propchange: trunk/reactos/base/applications/cmdutils/chcp/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/chcp/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/chcp/lang/es-ES.rc (added) +++ trunk/reactos/base/applications/cmdutils/chcp/lang/es-ES.rc [iso-8859-1] Sun Sep 24 19:00:47 2017 @@ -0,0 +1,14 @@ +/* Spanish translation by HUMA2000, Jose Pedro FernÃ¡ndez Pascual e Ismael Ferreras Morezuelas (Swyter) */ + +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + STRING_CHCP_HELP "Muestra o configura el nÃºmero de pÃ¡gina de cÃ³digo activa.\n\n\ +CHCP [nnn]\n\n\ + nnn Especifica el nÃºmero de pÃ¡gina de cÃ³digo activa.\n\n\ +Escribe CHCP sin ningÃºn parÃ¡metro para mostrar el cÃ³digo de pÃ¡gina activo.\n" + STRING_CHCP_ERROR1 "PÃ¡gina codificaciÃ³n activa: %u\n" + STRING_CHCP_ERROR4 "CÃ³digo de pÃ¡gina invÃ¡lido\n" + STRING_ERROR_INVALID_PARAM_FORMAT "Formato de parÃ¡metro errÃ³neo - %s\n" +END Propchange: trunk/reactos/base/applications/cmdutils/chcp/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/chcp/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/chcp/lang/fr-FR.rc (added) +++ trunk/reactos/base/applications/cmdutils/chcp/lang/fr-FR.rc [iso-8859-1] Sun Sep 24 19:00:47 2017 @@ -0,0 +1,14 @@ +/* French translation by Sylvain PÃ©trÃ©olle, Pierre Schweitzer */ + +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + STRING_CHCP_HELP "Affiche ou change la page de codes active.\n\n\ +CHCP [nnn]\n\n\ + nnn Indique la page de codes.\n\n\ +Taper CHCP sans paramÃ¨tre pour afficher la page de codes active." + STRING_CHCP_ERROR1 "Page de codes actuelle : %u\n" + STRING_CHCP_ERROR4 "Page de codes invalide \n" + STRING_ERROR_INVALID_PARAM_FORMAT "Format de paramÃ¨tre incorrect - %s\n" +END Propchange: trunk/reactos/base/applications/cmdutils/chcp/lang/fr-FR.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/chcp/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/chcp/lang/hu-HU.rc (added) +++ trunk/reactos/base/applications/cmdutils/chcp/lang/hu-HU.rc [iso-8859-1] Sun Sep 24 19:00:47 2017 @@ -0,0 +1,14 @@ +/* Hungarian translation by Robert Horvath (talley at cubeclub.hu) 2005 */ + +LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + STRING_CHCP_HELP "MegjelenÃti vagy megvÃ¡ltoztatja az aktÃv kÃ³dlapot.\n\n\ +CHCP [nnn]\n\n\ + nnn A hasznÃ¡lni kÃvÃ¡nt kÃ³dlap szÃ¡ma.\n\n\ +Ãrd be a CHCP paramÃ©terek nÃ©lkÃ¼l, hogy megjelenÃtse az aktÃv kÃ³dlapot.\n" + STRING_CHCP_ERROR1 "AktÃv kÃ³dlap: %u\n" + STRING_CHCP_ERROR4 "ÃrvÃ©nytelen kÃ³dlap\n" + STRING_ERROR_INVALID_PARAM_FORMAT "ÃrvÃ©nytelen paramÃ©ter megadÃ¡s - %s\n" +END Propchange: trunk/reactos/base/applications/cmdutils/chcp/lang/hu-HU.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/chcp/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/chcp/lang/id-ID.rc (added) +++ trunk/reactos/base/applications/cmdutils/chcp/lang/id-ID.rc [iso-8859-1] Sun Sep 24 19:00:47 2017 @@ -0,0 +1,14 @@ +/* Indonesian language file by Zaenal Mutaqin <ade999 at gmail dot com> 2007-02-15 */ + +LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + STRING_CHCP_HELP "Menampilkan atau menyetel nomor halaman kode aktif.\n\n\ +CHCP [nnn]\n\n\ + nnn Menetapkan nomor halaman kode yang aktif.\n\n\ +Ketik CHCP tanpa parameter untuk menampilkan nomor halaman kode yang aktif.\n" + STRING_CHCP_ERROR1 "Halaman kode aktif: %u\n" + STRING_CHCP_ERROR4 "Halaman kode tidak benar\n" + STRING_ERROR_INVALID_PARAM_FORMAT "Format parameter tidak benar - %s\n" +END Propchange: trunk/reactos/base/applications/cmdutils/chcp/lang/id-ID.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/chcp/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/chcp/lang/it-IT.rc (added) +++ trunk/reactos/base/applications/cmdutils/chcp/lang/it-IT.rc [iso-8859-1] Sun Sep 24 19:00:47 2017 @@ -0,0 +1,12 @@ +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + STRING_CHCP_HELP "Visualizza o attiva il numero di tabella dei codici.\n\n\ +CHCP [nnn]\n\n\ + nnn Indica il numero di tabella dei codici.\n\n\ +Scrivi CHCP senza parametri per visualizzare il numero attuale.\n" + STRING_CHCP_ERROR1 "Tabella dei codici attiva: %u\n" + STRING_CHCP_ERROR4 "Tabella dei codici non valida\n" + STRING_ERROR_INVALID_PARAM_FORMAT "Formato dei parametri non valido - %s\n" +END Propchange: trunk/reactos/base/applications/cmdutils/chcp/lang/it-IT.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/chcp/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/chcp/lang/ja-JP.rc (added) +++ trunk/reactos/base/applications/cmdutils/chcp/lang/ja-JP.rc [iso-8859-1] Sun Sep 24 19:00:47 2017 @@ -0,0 +1,12 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + STRING_CHCP_HELP "ç¾å¨ã®ã³ã¼ã ãã¼ã¸çªå·ãè¡¨ç¤ºã¾ãã¯è¨å®ãã¾ãã\n\n\ +CHCP [nnn]\n\n\ + nnn ã³ã¼ã ãã¼ã¸çªå·ãæå®ãã¾ãã\n\n\ +ç¾å¨ã®ã³ã¼ã ãã¼ã¸çªå·ãè¡¨ç¤ºããã¨ãã¯ããã©ã¡ã¼ã¿ãæå®ããã« CHCP ã¨å¥åãã¦ãã ããã\n" + STRING_CHCP_ERROR1 "ç¾å¨ã®ã³ã¼ã ãã¼ã¸: %u\n" + STRING_CHCP_ERROR4 "ç¡å¹ãªã³ã¼ã ãã¼ã¸ã§ã\n" + STRING_ERROR_INVALID_PARAM_FORMAT "ç¡å¹ãªãã©ã¡ã¼ã¿ã®æ¸å¼ã§ãã - %s\n" +END Propchange: trunk/reactos/base/applications/cmdutils/chcp/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/chcp/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/chcp/lang/no-NO.rc (added) +++ trunk/reactos/base/applications/cmdutils/chcp/lang/no-NO.rc [iso-8859-1] Sun Sep 24 19:00:47 2017 @@ -0,0 +1,12 @@ +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + STRING_CHCP_HELP "Viser eller velger aktive tegntabellnummer.\n\n\ +CHCP [nnn]\n\n\ + nnn Spesifisere aktive tegntabellnummer.\n\n\ +Skriv CHCP uten parametrer for Ã¥ vise aktiv tegntabellnummer.\n" + STRING_CHCP_ERROR1 "Aktiv tegntabell: %u\n" + STRING_CHCP_ERROR4 "Ugyldig tegntabell\n" + STRING_ERROR_INVALID_PARAM_FORMAT "Ugyldig parameter format - %s\n" +END Propchange: trunk/reactos/base/applications/cmdutils/chcp/lang/no-NO.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/chcp/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/chcp/lang/pl-PL.rc (added) +++ trunk/reactos/base/applications/cmdutils/chcp/lang/pl-PL.rc [iso-8859-1] Sun Sep 24 19:00:47 2017 @@ -0,0 +1,21 @@ +/* + * Translated by Caemyr - Olaf Siejka (Jan, 2008) + * Updated by niski - Maciej Bialas (Mar, 2010) + * Use ReactOS forum PM or IRC to contact me + * http://www.reactos.org + * IRC: irc.freenode.net #reactos-pl; + * UTF-8 conversion by Caemyr (May, 2011) + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + STRING_CHCP_HELP "WyÅwietla lub ustawia numer aktywnej strony kodowej.\n\n\ +CHCP [nnn]\n\n\ + nnn Numer strony kodowej.\n\n\ +Wpisz CHCP bez parametru, by wyÅwietliÄ numer aktywnej strony kodowej.\n" + STRING_CHCP_ERROR1 "Aktywna strona kodowa nr: %u\n" + STRING_CHCP_ERROR4 "NiewÅaÅciwy numer strony kodowej\n" + STRING_ERROR_INVALID_PARAM_FORMAT "NiewÅaÅciwy format parametru - %s\n" +END Propchange: trunk/reactos/base/applications/cmdutils/chcp/lang/pl-PL.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/chcp/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/chcp/lang/ro-RO.rc (added) +++ trunk/reactos/base/applications/cmdutils/chcp/lang/ro-RO.rc [iso-8859-1] Sun Sep 24 19:00:47 2017 @@ -0,0 +1,13 @@ +/* Ètefan Fulea (stefan dot fulea at mail dot md) */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL +STRINGTABLE +BEGIN + STRING_CHCP_HELP "AfiÈeazÄ sau stabileÈte numÄrul codificÄrii curente de paginÄ.\n\n\ +CHCP [nnn]\n\n\ + nnn NumÄrul codificÄrii de paginÄ specificat.\n\n\ +TastaÈi CHCP fÄrÄ argumente pentru a afiÈa numÄrul codificÄrii curente.\n" + STRING_CHCP_ERROR1 "Codificarea curentÄ a paginilor: %u\n" + STRING_CHCP_ERROR4 "Codificare de paginÄ nevalidÄ\n" + STRING_ERROR_INVALID_PARAM_FORMAT "Formatul argumentului este eronat - %s\n" +END Propchange: trunk/reactos/base/applications/cmdutils/chcp/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/chcp/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/chcp/lang/ru-RU.rc (added) +++ trunk/reactos/base/applications/cmdutils/chcp/lang/ru-RU.rc [iso-8859-1] Sun Sep 24 19:00:47 2017 @@ -0,0 +1,14 @@ +/* Russian translation by Andrey Korotaev (unC0Rr(a)inbox.ru) & Aleksey Bragin (aleksey(a)reactos.org) & Kudratov Olimjon (olim98(a)bk.ru)*/ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + STRING_CHCP_HELP "ÐÑÐ²Ð¾Ð´ Ð¸Ð»Ð¸ ÑÐ¼ÐµÐ½Ð° ÑÐµÐºÑÑÐµÐ³Ð¾ Ð½Ð¾Ð¼ÐµÑÐ° ÐºÐ¾Ð´Ð¾Ð²Ð¾Ð¹ ÑÑÑÐ°Ð½Ð¸ÑÑ.\n\n\ +CHCP [nnn]\n\n\ + nnn ÐÐ¾Ð¼ÐµÑ ÐºÐ¾Ð´Ð¾Ð²Ð¾Ð¹ ÑÑÑÐ°Ð½Ð¸ÑÑ.\n\n\ +ÐÐ¾Ð¼Ð°Ð½Ð´Ð° CHCP Ð±ÐµÐ· Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ° Ð²ÑÐ²Ð¾Ð´Ð¸Ñ ÑÐµÐºÑÑÐ¸Ð¹ Ð½Ð¾Ð¼ÐµÑ ÐºÐ¾Ð´Ð¾Ð²Ð¾Ð¹ ÑÑÑÐ°Ð½Ð¸ÑÑ.\n" + STRING_CHCP_ERROR1 "Ð¢ÐµÐºÑÑÐ°Ñ ÐºÐ¾Ð´Ð¾Ð²Ð°Ñ ÑÑÑÐ°Ð½Ð¸ÑÐ°: %u\n" + STRING_CHCP_ERROR4 "ÐÐµÐ²ÐµÑÐ½Ð°Ñ ÐºÐ¾Ð´Ð¾Ð²Ð°Ñ ÑÑÑÐ°Ð½Ð¸ÑÐ°\n" + STRING_ERROR_INVALID_PARAM_FORMAT "ÐÐµÐ²ÐµÑÐ½ÑÐ¹ ÑÐ¾ÑÐ¼Ð°Ñ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ° - %s\n" +END Propchange: trunk/reactos/base/applications/cmdutils/chcp/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/chcp/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/chcp/lang/sk-SK.rc (added) +++ trunk/reactos/base/applications/cmdutils/chcp/lang/sk-SK.rc [iso-8859-1] Sun Sep 24 19:00:47 2017 @@ -0,0 +1,18 @@ +/* Slovak translation for CMD + * TRANSLATOR: MÃ¡rio KaÄmÃ¡r /Mario Kacmar/ aka Kario (kario(a)szm.sk) + * DATE OF TR: 21-03-2009 + * LastChange: 10-08-2010 + */ + +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + STRING_CHCP_HELP "Displays or sets the active code page number.\n\n\ +CHCP [nnn]\n\n\ + nnn Specifies the active code page number.\n\n\ +Type CHCP without a parameter to display the active code page number.\n" + STRING_CHCP_ERROR1 "Active code page: %u\n" + STRING_CHCP_ERROR4 "Invalid code page\n" + STRING_ERROR_INVALID_PARAM_FORMAT "Invalid parameter format - %s\n" +END Propchange: trunk/reactos/base/applications/cmdutils/chcp/lang/sk-SK.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/chcp/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/chcp/lang/sq-AL.rc (added) +++ trunk/reactos/base/applications/cmdutils/chcp/lang/sq-AL.rc [iso-8859-1] Sun Sep 24 19:00:47 2017 @@ -0,0 +1,16 @@ +/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani(a)gmail.com) + * DATE OF TR: 29-11-2013 +*/ + +LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + STRING_CHCP_HELP "Shfaq ose cakto kodin dhe numrin e faqes aktive.\n\n\ +CHCP [nnn]\n\n\ + nnn Specifikon kodin dhe numrin aktiv te faqes.\n\n\ +Shkruaj CHCP pa anjÃ« parameter pÃ«r tÃ« shfaqur kodin dhe numrin e faqes aktive.\n" + STRING_CHCP_ERROR1 "Faqja Active e Kodit: %u\n" + STRING_CHCP_ERROR4 "Invalid code page\n" + STRING_ERROR_INVALID_PARAM_FORMAT "Parametrat e formatit invalid - %s\n" +END Propchange: trunk/reactos/base/applications/cmdutils/chcp/lang/sq-AL.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/chcp/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/chcp/lang/sv-SE.rc (added) +++ trunk/reactos/base/applications/cmdutils/chcp/lang/sv-SE.rc [iso-8859-1] Sun Sep 24 19:00:47 2017 @@ -0,0 +1,12 @@ +LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + STRING_CHCP_HELP "Visar eller vÃ¤ljer aktiv teckentabell.\n\n\ +CHCP [nnn]\n\n\ + nnn Anger nummer pÃ¥ teckentabell.\n\n\ +Skriv CHCP utan parametrar fÃ¶r att visa aktiv teckentabellnummer.\n" + STRING_CHCP_ERROR1 "Aktiv tegntabell: %u\n" + STRING_CHCP_ERROR4 "Ugyldig tegntabell\n" + STRING_ERROR_INVALID_PARAM_FORMAT "Ugyldig parameter format - %s\n" +END Propchange: trunk/reactos/base/applications/cmdutils/chcp/lang/sv-SE.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/chcp/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/chcp/lang/tr-TR.rc (added) +++ trunk/reactos/base/applications/cmdutils/chcp/lang/tr-TR.rc [iso-8859-1] Sun Sep 24 19:00:47 2017 @@ -0,0 +1,14 @@ +/* TRANSLATOR: 2015 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ + +LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + STRING_CHCP_HELP "Etkin kod sayfasÄ± numarasÄ±nÄ± gÃ¶rÃ¼ntÃ¼ler ya da ayarlar.\n\n\ +CHCP [nnn]\n\n\ + nnn Etkin kod sayfasÄ± numarasÄ±nÄ± belirtir.\n\n\ +Etkin kod sayfasÄ± numarasÄ±nÄ± gÃ¶rÃ¼ntÃ¼lemek iÃ§in bir deÄiÅken olmadan CHCP yaz.\n" + STRING_CHCP_ERROR1 "Etkin kod sayfasÄ±: %u\n" + STRING_CHCP_ERROR4 "GeÃ§ersiz kod sayfasÄ±\n" + STRING_ERROR_INVALID_PARAM_FORMAT "GeÃ§ersiz deÄiÅken biÃ§imi - %s\n" +END Propchange: trunk/reactos/base/applications/cmdutils/chcp/lang/tr-TR.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/chcp/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/chcp/lang/uk-UA.rc (added) +++ trunk/reactos/base/applications/cmdutils/chcp/lang/uk-UA.rc [iso-8859-1] Sun Sep 24 19:00:47 2017 @@ -0,0 +1,20 @@ +/* + * PROJECT: Command-line interface + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/shell/cmd/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for Command-line interface + * TRANSLATORS: Artem Reznikov, Igor Paliychuk + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + STRING_CHCP_HELP "ÐÐ¸Ð²iÐ´ Ð°Ð±Ð¾ Ð·Ð¼iÐ½Ð° Ð¿Ð¾ÑÐ¾ÑÐ½Ð¾Ð³Ð¾ Ð½Ð¾Ð¼ÐµÑÐ° ÐºÐ¾Ð´Ð¾Ð²Ð¾Ñ ÑÑÐ¾ÑiÐ½ÐºÐ¸.\n\n\ +CHCP [nnn]\n\n\ + nnn ÐÐ°Ð´Ð°Ñ Ð½Ð¾Ð¼ÐµÑ ÐºÐ¾Ð´Ð¾Ð²Ð¾Ñ ÑÑÐ¾ÑiÐ½ÐºÐ¸.\n\n\ +ÐÐ¾Ð¼Ð°Ð½Ð´Ð° CHCP Ð±ÐµÐ· Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ° Ð²Ð¸Ð²Ð¾Ð´Ð¸ÑÑ Ð¿Ð¾ÑÐ¾ÑÐ½Ð¸Ð¹ Ð½Ð¾Ð¼ÐµÑ ÐºÐ¾Ð´Ð¾Ð²Ð¾Ñ ÑÑÐ¾ÑiÐ½ÐºÐ¸.\n" + STRING_CHCP_ERROR1 "ÐÐ¾ÑÐ¾ÑÐ½Ð° ÐºÐ¾Ð´Ð¾Ð²Ð° ÑÑÐ¾ÑiÐ½ÐºÐ°: %u\n" + STRING_CHCP_ERROR4 "ÐÐ¾Ð¼Ð¸Ð»ÐºÐ¾Ð²Ð° ÐºÐ¾Ð´Ð¾Ð²Ð° ÑÑÐ¾ÑiÐ½ÐºÐ°\n" + STRING_ERROR_INVALID_PARAM_FORMAT "ÐÐµÐ²iÑÐ½Ð¸Ð¹ ÑÐ¾ÑÐ¼Ð°Ñ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ° - %s\n" +END Propchange: trunk/reactos/base/applications/cmdutils/chcp/lang/uk-UA.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/chcp/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/chcp/lang/zh-CN.rc (added) +++ trunk/reactos/base/applications/cmdutils/chcp/lang/zh-CN.rc [iso-8859-1] Sun Sep 24 19:00:47 2017 @@ -0,0 +1,14 @@ +/* Simplified Chinese translation by Song Fuchang (0xfc) <sfc_0(a)yahoo.com.cn> 2011 */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +STRINGTABLE +BEGIN + STRING_CHCP_HELP "æ¾ç¤ºæè®¾ç½®æ´»å¨çä»£ç é¡µã\n\n\ +CHCP [nnn]\n\n\ + nnn æå®æ´»å¨çä»£ç é¡µã\n\n\ +ä¸å¸¦åæ°æ§è¡ CHCP å°ä¼æ¾ç¤ºå½åæ´»å¨çä»£ç é¡µã\n" + STRING_CHCP_ERROR1 "æ´»å¨ä»£ç é¡µï¼%u\n" + STRING_CHCP_ERROR4 "æ æä»£ç é¡µ\n" + STRING_ERROR_INVALID_PARAM_FORMAT "æ æçåæ°æ ¼å¼ - %s\n" +END Propchange: trunk/reactos/base/applications/cmdutils/chcp/lang/zh-CN.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/chcp/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/chcp/lang/zh-TW.rc (added) +++ trunk/reactos/base/applications/cmdutils/chcp/lang/zh-TW.rc [iso-8859-1] Sun Sep 24 19:00:47 2017 @@ -0,0 +1,14 @@ +/* Traditional Chinese translation by Henry Tang Ih 2016 (henrytang2(a)hotmail.com) */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL + +STRINGTABLE +BEGIN + STRING_CHCP_HELP "é¡¯ç¤ºæè¨å®æ´»åçå§ç¢¼è¡¨ã\n\n\ +CHCP [nnn]\n\n\ + nnn æå®æ´»åçå§ç¢¼è¡¨ã\n\n\ +ä¸å¸¶åæ¸å·è¡ CHCP å°æé¡¯ç¤ºç¶åæ´»åçå§ç¢¼è¡¨ã\n" + STRING_CHCP_ERROR1 "æ´»åå§ç¢¼è¡¨ï¼%u\n" + STRING_CHCP_ERROR4 "ç¡æå§ç¢¼è¡¨\n" + STRING_ERROR_INVALID_PARAM_FORMAT "ç¡æçåæ¸æ ¼å¼ - %s\n" +END Propchange: trunk/reactos/base/applications/cmdutils/chcp/lang/zh-TW.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/chcp/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/chcp/resource.h (added) +++ trunk/reactos/base/applications/cmdutils/chcp/resource.h [iso-8859-1] Sun Sep 24 19:00:47 2017 @@ -0,0 +1,10 @@ +#pragma once + +#define RC_STRING_MAX_SIZE 3072 + +#define STRING_ERROR_INVALID_PARAM_FORMAT 107 + +#define STRING_CHCP_ERROR1 302 +#define STRING_CHCP_ERROR4 305 + +#define STRING_CHCP_HELP 605 Propchange: trunk/reactos/base/applications/cmdutils/chcp/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/shell/cmd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/CMakeLists.… ============================================================================== --- trunk/reactos/base/shell/cmd/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/CMakeLists.txt [iso-8859-1] Sun Sep 24 19:00:47 2017 @@ -12,7 +12,6 @@ batch.c beep.c call.c - chcp.c choice.c cls.c cmd.c Removed: trunk/reactos/base/shell/cmd/chcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/chcp.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/chcp.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/chcp.c (removed) @@ -1,93 +0,0 @@ -/* - * CHCP.C - chcp internal command. - * - * - * History: - * - * 23-Dec-1998 (Eric Kohl) - * Started. - * - * 02-Apr-2005 (Magnus Olsen <magnus(a)greatlord.com>) - * Remove all hardcoded strings in En.rc - */ - -#include "precomp.h" - -#ifdef INCLUDE_CMD_CHCP - -INT CommandChcp(LPTSTR param) -{ - LPTSTR *arg; - INT args; - UINT uNewCodePage; - - /* Print help */ - if (!_tcsncmp(param, _T("/?"), 2)) - { - ConOutResPaging(TRUE,STRING_CHCP_HELP); - return 0; - } - - nErrorLevel = 0; - - /* Get parameters */ - arg = split(param, &args, FALSE, FALSE); - - if (args == 0) - { - /* Display the active code page number */ - ConOutResPrintf(STRING_CHCP_ERROR1, OutputCodePage); - freep(arg); - return 0; - } - - if (args >= 2) - { - /* Too many parameters */ - ConErrResPrintf(STRING_ERROR_INVALID_PARAM_FORMAT, param); - freep(arg); - nErrorLevel = 1; - return 1; - } - - uNewCodePage = (UINT)_ttoi(arg[0]); - - if (uNewCodePage == 0) - { - ConErrResPrintf(STRING_ERROR_INVALID_PARAM_FORMAT, arg[0]); - freep(arg); - nErrorLevel = 1; - return 1; - } - - freep(arg); - - // TODO: In case of failure of SetConsoleCP or SetConsoleOutputCP, - // restore the old code page! - - /* - * Try changing the console input codepage. If it works then also change - * the console output codepage, and refresh our local codepage cache. - */ - if (!SetConsoleCP(uNewCodePage)) - { - ConErrResPuts(STRING_CHCP_ERROR4); - } - else - { - SetConsoleOutputCP(uNewCodePage); - - /* Update our local codepage cache */ - InputCodePage = GetConsoleCP(); - OutputCodePage = GetConsoleOutputCP(); - - InitLocale(); - - /* Display the active code page number */ - ConOutResPrintf(STRING_CHCP_ERROR1, OutputCodePage); - } - - return 0; -} - -#endif /* INCLUDE_CMD_CHCP */ Modified: trunk/reactos/base/shell/cmd/cmd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.h?rev=7… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] Sun Sep 24 19:00:47 2017 @@ -85,10 +85,6 @@ /* Prototypes for CALL.C */ INT cmd_call (LPTSTR); - - -/* Prototypes for CHCP.C */ -INT CommandChcp (LPTSTR); /* Prototypes for CHOICE.C */ Modified: trunk/reactos/base/shell/cmd/cmdtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmdtable.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/cmdtable.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmdtable.c [iso-8859-1] Sun Sep 24 19:00:47 2017 @@ -55,10 +55,6 @@ #ifdef INCLUDE_CMD_CHDIR {_T("cd"), CMD_SPECIAL, cmd_chdir}, {_T("chdir"), CMD_SPECIAL, cmd_chdir}, -#endif - -#ifdef INCLUDE_CMD_CHCP - {_T("chcp"), 0, CommandChcp}, #endif #ifdef INCLUDE_CMD_CHOICE Modified: trunk/reactos/base/shell/cmd/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/config.h?re… ============================================================================== --- trunk/reactos/base/shell/cmd/config.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/config.h [iso-8859-1] Sun Sep 24 19:00:47 2017 @@ -51,7 +51,6 @@ #endif #define INCLUDE_CMD_ASSOC #define INCLUDE_CMD_ATTRIB -#define INCLUDE_CMD_CHCP #define INCLUDE_CMD_CHDIR #define INCLUDE_CMD_CHOICE #define INCLUDE_CMD_CLS Modified: trunk/reactos/base/shell/cmd/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/cs-CZ.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/cs-CZ.rc [iso-8859-1] Sun Sep 24 19:00:47 2017 @@ -52,10 +52,6 @@ /D Will change current drive and current directory.\n\n\ Type CD drive: to display the current directory on the specified drive.\n\ Type CD without a parameter to display the current drive and directory.\n" - STRING_CHCP_HELP "Displays or sets the active code page number.\n\n\ -CHCP [nnn]\n\n\ - nnn Specifies the active code page number.\n\n\ -Type CHCP without a parameter to display the active code page number.\n" STRING_CHOICE_HELP "Waits for the user to choose one of a set of choices.\n\n\ CHOICE [/C[:]choices][/N][/S][/T[:]c,nn][text]\n\n\ /C[:]choices Specifies allowable keys. Default is YN.\n\ @@ -474,8 +470,6 @@ STRING_ALIAS_ERROR "Po rozÅ¡ÃÅenÃ aliasÅ¯ je pÅÃkaz pÅÃliÅ¡ dlouhÃ½!\n" STRING_ASSOC_ERROR "Pro pÅÃponu %s nebyly nalezeny Å¾Ã¡dnÃ© asociace\n" STRING_BATCH_ERROR "Chyba pÅi otevÃrÃ¡nÃ dÃ¡vkovÃ©ho souboru\n" - STRING_CHCP_ERROR1 "AktivnÃ znakovÃ¡ strÃ¡nka: %u\n" - STRING_CHCP_ERROR4 "NeplatnÃ¡ znakovÃ¡ strÃ¡nka\n" STRING_CHOICE_ERROR "NeplatnÃ¡ volba. OÄekÃ¡vanÃ½ formÃ¡t: /C[:]volby" STRING_CHOICE_ERROR_TXT "NeplatnÃ¡ volba. OÄekÃ¡vanÃ½ formÃ¡t: /T[:]c,nn" STRING_CHOICE_ERROR_OPTION "NeplatnÃ¡ volba: %s" Modified: trunk/reactos/base/shell/cmd/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/de-DE.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/de-DE.rc [iso-8859-1] Sun Sep 24 19:00:47 2017 @@ -49,10 +49,6 @@ Geben Sie CD Laufwerk: ein, um das aktuelle Verzeichnis auf dem angegebenen\n\ Laufwerk anzuzeigen.\n\ Mit CD ohne Parameter wird das aktuelle Laufwerk und Verzeichnis angezeigt." - STRING_CHCP_HELP "Zeigt die aktuelle Codepage an oder wechselt diese.\n\n\ -CHCP [nnn]\n\n\ - nnn Codepage angeben.\n\n\ -Der Befehl CHCP ohne Parameter zeigt die Nummer der aktuellen Codepage an." STRING_CHOICE_HELP "Wartet auf Auswahl einer Option durch den Benutzer.\n\n\ CHOICE [/C[:]optionen][/N][/S][/T[:]c,nn][text]\n\n\ /C[:]optionen Die erlaubten Tasten festlegen. Standard-Tasten sind Y und N.\n\ @@ -468,8 +464,6 @@ STRING_ALIAS_ERROR "Die Befehlszeile ist zu lange nach der Alias-Erweiterung!\n" STRING_ASSOC_ERROR "Dateizuordnung fÃ¼r Erweiterung %s nicht gefunden\n" STRING_BATCH_ERROR "Es trat ein Fehler auf, wÃ¤hrend die Batchdatei geÃ¶ffnet wurde.\n" - STRING_CHCP_ERROR1 "Aktive Codepage: %u\n" - STRING_CHCP_ERROR4 "UngÃ¼ltige Codepage\n" STRING_CHOICE_ERROR "UngÃ¼ltige Option. Erwartetes Format: /C[:]Optionen" STRING_CHOICE_ERROR_TXT "UngÃ¼ltige Option. Erwartetes Format: /T[:]c,nn" STRING_CHOICE_ERROR_OPTION "UngÃ¼ltige Option: %s" Modified: trunk/reactos/base/shell/cmd/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/el-GR.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/el-GR.rc [iso-8859-1] Sun Sep 24 19:00:47 2017 @@ -52,10 +52,6 @@ /D ÎÎ»Î»Î±Î³Î® ÏÎ·Ï ÏÏÎÏÎ¿ÏÏÎ±Ï Î¼Î¿Î½Î¬Î´Î±Ï Î´Î¯ÏÎºÎ¿Ï ÏÎÏÎ±Î½ ÏÎ·Ï Î±Î»Î»Î±Î³Î®Ï ÏÏÎÏÎ¿Î½ÏÎ¿Ï ÎºÎ±ÏÎ±Î»ÏÎ³Î¿Ï Î³Î¹Î± Î¼Î¹Î± Î¼Î¿Î½Î¬Î´Î± Î´Î¯ÏÎºÎ¿Ï.\n\n\ Î Î»Î·ÎºÏÏÎ¿Î»Î¿Î³Î®ÏÏÎµ CD Î´Î¯ÏÎºÎ¿Ï:, Î³Î¹Î± Î½Î± ÎµÎ¼ÏÎ±Î½Î¯ÏÎµÏÎµ ÏÎ¿Î½ ÏÏÎÏÎ¿Î½ÏÎ± ÎºÎ±ÏÎ¬Î»Î¿Î³Î¿ ÏÏÎ· ÏÏÎ³ÎºÎµÎºÏÎ¹Î¼ÎÎ½Î· Î¼Î¿Î½Î¬Î´Î± Î´Î¯ÏÎºÎ¿Ï.\n\ Î Î»Î·ÎºÏÏÎ¿Î»Î¿Î³Î®ÏÏÎµ CD ÏÏÏÎ¹Ï ÏÎ±ÏÎ¬Î¼ÎµÏÏÎ¿, Î³Î¹Î± Î½Î± ÎµÎ¼ÏÎ±Î½Î¯ÏÎµÏÎµ ÏÎ¿Î½ ÏÏÎÏÎ¿Î½ÏÎ± ÎºÎ±ÏÎ¬Î»Î¿Î³Î¿ ÏÏÎ·Î½ ÏÏÎÏÎ¿ÏÏÎ± Î¼Î¿Î½Î¬Î´Î± Î´Î¯ÏÎºÎ¿Ï.\n" - STRING_CHCP_HELP "ÎÎ¼ÏÎ±Î½Î¯Î¶ÎµÎ¹ Î® Î¿ÏÎ¯Î¶ÎµÎ¹ ÏÎ¿Î½ Î±ÏÎ¹Î¸Î¼Ï ÏÎ·Ï ÎµÎ½ÎµÏÎ³Î¿Ï ÎºÏÎ´Î¹ÎºÎ¿ÏÎµÎ»Î¯Î´Î±Ï.\n\n\ -CHCP [nnn]\n\n\ - nnn ÎÎ±Î¸Î¿ÏÎ¯Î¶ÎµÎ¹ ÎÎ½Î±Î½ Î±ÏÎ¹Î¸Î¼Ï ÎºÏÎ´Î¹ÎºÎ¿ÏÎµÎ»Î¯Î´Î±Ï.\n\n\ -Î Î»Î·ÎºÏÏÎ¿Î»Î¿Î³Î®ÏÏÎµ CHCP ÏÏÏÎ¯Ï ÏÎ±ÏÎ¬Î¼ÎµÏÏÎ¿, Î³Î¹Î± Î½Î± ÎµÎ¼ÏÎ±Î½Î¹ÏÏÎµÎ¯ Î¿ ÏÏÎÏÏÎ½ Î±ÏÎ¹Î¸Î¼ÏÏ ÎºÏÎ´Î¹ÎºÎ¿ÏÎµÎ»Î¯Î´Î±Ï.\n" STRING_CHOICE_HELP "ÎÎ½Î±Î¼ÎÎ½ÎµÎ¹ Î±ÏÏ ÏÎ¿Î½ ÏÏÎ®ÏÏÎ· Î½Î± ÎµÏÎ¹Î»ÎÎ¾ÎµÎ¹ Î¼Î¯Î± Î±ÏÏ ÏÎµÏ ÎµÏÎ¹Î»Î¿Î³ÏÎ½.\n\n\ CHOICE [/C[:]ÎµÏÎ¹Î»Î¿Î³ÎÏ][/N][/S][/T[:]c,nn][ÎºÎµÎ¯Î¼ÎµÎ½Î¿]\n\n\ /C[:]ÎµÏÎ¹Î»Î¿Î³ÎÏ Î ÏÎ¿ÏÎ´Î¹Î¿ÏÎ¯Î¶ÎµÎ¹ ÎµÏÎ¹ÏÏÎµÏÏÎ¼ÎµÎ½Î± ÎºÎ»ÎµÎ¹Î´Î¹Î¬. Î¤Î¿ ÏÏÎ¿ÎºÎ±Î¸Î¿ÏÎ¹ÏÎ¼ÎÎ½Î¿ ÎµÎ¯Î½Î±Î¹ ÏÎ¿ YN.\n\ @@ -473,8 +469,6 @@ STRING_ALIAS_ERROR "Command line too long after alias expansion!\n" STRING_ASSOC_ERROR "File association not found for extension %s\n" STRING_BATCH_ERROR "Error opening batch file\n" - STRING_CHCP_ERROR1 "Active code page: %u\n" - STRING_CHCP_ERROR4 "Invalid code page\n" STRING_CHOICE_ERROR "ÎÎ· ÎÎ³ÎºÏÏÎ· ÎµÏÎ¹Î»Î¿Î³Î®. Expected format: /C[:]options" STRING_CHOICE_ERROR_TXT "ÎÎ· ÎÎ³ÎºÏÏÎ· ÎµÏÎ¹Î»Î¿Î³Î®. Expected format: /T[:]c,nn" STRING_CHOICE_ERROR_OPTION "Illegal Option: %s" Modified: trunk/reactos/base/shell/cmd/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/en-US.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/en-US.rc [iso-8859-1] Sun Sep 24 19:00:47 2017 @@ -47,10 +47,6 @@ /D Will change current drive and current directory.\n\n\ Type CD drive: to display the current directory on the specified drive.\n\ Type CD without a parameter to display the current drive and directory.\n" - STRING_CHCP_HELP "Displays or sets the active code page number.\n\n\ -CHCP [nnn]\n\n\ - nnn Specifies the active code page number.\n\n\ -Type CHCP without a parameter to display the active code page number.\n" STRING_CHOICE_HELP "Waits for the user to choose one of a set of choices.\n\n\ CHOICE [/C[:]choices][/N][/S][/T[:]c,nn][text]\n\n\ /C[:]choices Specifies allowable keys. Default is YN.\n\ @@ -469,8 +465,6 @@ STRING_ALIAS_ERROR "Command line too long after alias expansion!\n" STRING_ASSOC_ERROR "File association not found for extension %s\n" STRING_BATCH_ERROR "Error opening batch file\n" - STRING_CHCP_ERROR1 "Active code page: %u\n" - STRING_CHCP_ERROR4 "Invalid code page\n" STRING_CHOICE_ERROR "Invalid option. Expected format: /C[:]options" STRING_CHOICE_ERROR_TXT "Invalid option. Expected format: /T[:]c,nn" STRING_CHOICE_ERROR_OPTION "Illegal Option: %s" Modified: trunk/reactos/base/shell/cmd/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/es-ES.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/es-ES.rc [iso-8859-1] Sun Sep 24 19:00:47 2017 @@ -49,10 +49,6 @@ /D Cambiara la unidad y el directorio actual.\n\n\ Escribe CD unidad: para mostrar el directorio actual en la unidad especificada.\n\ Escribe CD sin ningun parÃ¡metro para mostrar la unidad y el directorio actual.\n" - STRING_CHCP_HELP "Muestra o configura el nÃºmero de pÃ¡gina de cÃ³digo activa.\n\n\ -CHCP [nnn]\n\n\ - nnn Especifica el nÃºmero de pÃ¡gina de cÃ³digo activa.\n\n\ -Escribe CHCP sin ningÃºn parÃ¡metro para mostrar el cÃ³digo de pÃ¡gina activo.\n" STRING_CHOICE_HELP "Espera a que el usuario elija entre un nÃºmero de opciones.\n\n\ CHOICE [/C[:]choices][/N][/S][/T[:]c,nn][text]\n\n\ /C[:]choices Especifica las teclas admitidas. Por defecto son SN.\n\ @@ -471,8 +467,6 @@ STRING_ALIAS_ERROR "Â¡LÃnea de comandos demasiado larga tras la expansiÃ³n del alias!\n" STRING_ASSOC_ERROR "No se ha encontrado ninguna asociaciÃ³n de archivos para la extensiÃ³n %s\n" STRING_BATCH_ERROR "Error abriendo el archivo por lotes\n" - STRING_CHCP_ERROR1 "PÃ¡gina codificaciÃ³n activa: %u\n" - STRING_CHCP_ERROR4 "CÃ³digo de pÃ¡gina invÃ¡lido\n" STRING_CHOICE_ERROR "OpciÃ³n invÃ¡lida. Se esperaba el formato: /C[:]options" STRING_CHOICE_ERROR_TXT "OpciÃ³n invÃ¡lida. Se esperaba el formato: /T[:]c,nn" STRING_CHOICE_ERROR_OPTION "OpciÃ³n ilegal: %s" Modified: trunk/reactos/base/shell/cmd/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/fr-FR.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/fr-FR.rc [iso-8859-1] Sun Sep 24 19:00:47 2017 @@ -49,10 +49,6 @@ /D Changera le lecteur et le rÃ©pertoire courant.\n\n\ Taper CD lecteur: pour afficher le rÃ©pertoire courant sur le disque indiquÃ©.\n\ Taper CD sans paramÃ¨tre pour afficher le rÃ©pertoire courant du disque actuel.\n" - STRING_CHCP_HELP "Affiche ou change la page de codes active.\n\n\ -CHCP [nnn]\n\n\ - nnn Indique la page de codes .\n\n\ -Taper CHCP sans paramÃ¨tre pour afficher la page de codes active." STRING_CHOICE_HELP "Demande Ã l'utilisateur de choisir parmi plusieurs choix.\n\n\ CHOICE [/C[:]choix][/N][/S][/T[:]c,nn][texte]\n\n\ /C[:]choix SpÃ©cifier les touches disponibles. Choix par dÃ©faut: ON.\n\ @@ -483,8 +479,6 @@ STRING_ALIAS_ERROR "Ligne de commande trop longue aprÃ¨s remplacement de l'alias!\n" STRING_ASSOC_ERROR "File association not found for extension %s\n" STRING_BATCH_ERROR "Erreur Ã l'ouverture du fichier batch\n" - STRING_CHCP_ERROR1 "Page de codes actuelle : %u\n" - STRING_CHCP_ERROR4 "Page de codes invalide \n" STRING_CHOICE_ERROR "Option invalide. Format attendu : /C[:]options" STRING_CHOICE_ERROR_TXT "Option invalide. Format attendu : /T[:]c,nn" STRING_CHOICE_ERROR_OPTION "Option invalide : %s" Modified: trunk/reactos/base/shell/cmd/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/hu-HU.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/hu-HU.rc [iso-8859-1] Sun Sep 24 19:00:47 2017 @@ -47,10 +47,6 @@ /D MegvÃ¡ltoztatja az aktuÃ¡lis mappÃ¡t Ã©s meghajtÃ³t is.\n\n\ Ãrd be, hogy 'CD meghajtÃ³:' hogy ki Ãrja az aktuÃ¡lis mappÃ¡t.\n\ Ãrd be a CD-t paramÃ©terek nÃ©lkÃ¼l, hogy megjelenÃtse az aktuÃ¡lis meghajtÃ³t Ã©s mappÃ¡t (ugyanaz mint az elÃµzÃµ).\n" - STRING_CHCP_HELP "MegjelenÃti vagy megvÃ¡ltoztatja az aktÃv kÃ³dlapot.\n\n\ -CHCP [nnn]\n\n\ - nnn A hasznÃ¡lni kÃvÃ¡nt kÃ³dlap szÃ¡ma.\n\n\ -Ãrd be a CHCP paramÃ©terek nÃ©lkÃ¼l, hogy megjelenÃtse az aktÃv kÃ³dlapot.\n" STRING_CHOICE_HELP "VÃ¡r a felhasznÃ¡lÃ³ra, hogy vÃ¡lasszon a felkÃnÃ¡lt lehetÃµsÃ©gek kÃ¶zÃ¼l.\n\n\ CHOICE [/C[:]vÃ¡lasztÃ¡si lehetÃµsÃ©gek][/N][/S][/T[:]c,nn][szÃ¶veg]\n\n\ /C[:]vÃ¡lasztÃ¡si lehetÃµsÃ©gek Megengedett billentyÃ»k. AlapÃ©rtelmezett: YN. <-- Yes->Igen\n\ @@ -453,8 +449,6 @@ STRING_ALIAS_ERROR "A parancssor tÃºl hosszÃº az alias kibontÃ¡sakor!\n" STRING_ASSOC_ERROR "File association not found for extension %s\n" STRING_BATCH_ERROR "Hiba a batch Ã¡llomÃ¡ny megnyitÃ¡sakor\n" - STRING_CHCP_ERROR1 "AktÃv kÃ³dlap: %u\n" - STRING_CHCP_ERROR4 "ÃrvÃ©nytelen kÃ³dlap\n" STRING_CHOICE_ERROR "ÃrvÃ©nytelen paramÃ©ter. VÃ¡rt formÃ¡tum: /C[:]vÃ¡lasztÃ¡si lehetÃµsÃ©gek" STRING_CHOICE_ERROR_TXT "ÃrvÃ©nytelen paramÃ©ter. VÃ¡rt formÃ¡tum: /T[:]v,nn" STRING_CHOICE_ERROR_OPTION "ÃrvÃ©nytelen paramÃ©ter: %s" Modified: trunk/reactos/base/shell/cmd/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/id-ID.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/id-ID.rc [iso-8859-1] Sun Sep 24 19:00:47 2017 @@ -49,10 +49,6 @@ /D Akan mengubah drive dan direktori saat ini.\n\n\ Ketik CD drive: untuk menampilkan direktori saat ini pada drive tertentu.\n\ Ketik CD tanpa parameter untuk menampilkan drive dan direktori saat ini.\n" - STRING_CHCP_HELP "Menampilkan atau menyetel nomor halaman kode aktif.\n\n\ -CHCP [nnn]\n\n\ - nnn Menetapkan nomor halaman kode yang aktif.\n\n\ -Ketik CHCP tanpa parameter untuk menampilkan nomor halaman kode yang aktif.\n" STRING_CHOICE_HELP "Menunggu pengguna untuk memilih satu dari set pilihan.\n\n\ CHOICE [/C[:]pilihan][/N][/S][/T[:]c,nn][text]\n\n\ /C[:]pilihan Menetapkan tombol yang dibolehkan. Standarnya YT.\n\ @@ -468,8 +464,6 @@ STRING_ALIAS_ERROR "Baris perintah terlalu panjang setelah ekspansi alias!\n" STRING_ASSOC_ERROR "File association not found for extension %s\n" STRING_BATCH_ERROR "Kesalaham membuka file batch\n" - STRING_CHCP_ERROR1 "Halaman kode aktif: %u\n" - STRING_CHCP_ERROR4 "Halaman kode tidak benar\n" STRING_CHOICE_ERROR "Opsi tidak benar. Format diharapkan: /C[:]options" STRING_CHOICE_ERROR_TXT "Opsi tidak benar. Format diharapkan: /T[:]c,nn" STRING_CHOICE_ERROR_OPTION "Opsi tidak benar: %s" Modified: trunk/reactos/base/shell/cmd/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/it-IT.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/it-IT.rc [iso-8859-1] Sun Sep 24 19:00:47 2017 @@ -46,10 +46,6 @@ /D Cambia il disco e la cartella corrente.\n\n\ Scrivi CD disco: per visualizzare la cartella corrente del disco indicato.\n\ Scrivi CD senza parametri per visualizzare il disco e la cartella corrente.\n" - STRING_CHCP_HELP "Visualizza o attiva il numero di tabella dei codici.\n\n\ -CHCP [nnn]\n\n\ - nnn Indica il numero di tabella dei codici.\n\n\ -Scrivi CHCP senza parametri per visualizzare il numero attuale.\n" STRING_CHOICE_HELP "Aspetta che l'utente scelga una delle scelte disponibili.\n\n\ CHOICE [/C[:]scelta][/N][/S][/T[:]c,nn][testo]\n\n\ /C[:]scelta Indica i tasti ammessi. Sono predefiniti YN.\n\ @@ -479,8 +475,6 @@ STRING_ALIAS_ERROR "Linea di comando troppo lunga dopo l'espansione degli alias!\n" STRING_ASSOC_ERROR "File association not found for extension %s\n" STRING_BATCH_ERROR "Errore durante l'apertura di un batch\n" - STRING_CHCP_ERROR1 "Tabella dei codici attiva: %u\n" - STRING_CHCP_ERROR4 "Tabella dei codici non valida\n" STRING_CHOICE_ERROR "Opzione non valida. Formato atteso: /C[:]opzioni" STRING_CHOICE_ERROR_TXT "Opzione non valida. Formato atteso: /T[:]c,nn" STRING_CHOICE_ERROR_OPTION "Opzione non valida: %s" Modified: trunk/reactos/base/shell/cmd/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ja-JP.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ja-JP.rc [iso-8859-1] Sun Sep 24 19:00:47 2017 @@ -47,10 +47,6 @@ /D ç¾å¨ã®ãã©ã¤ãã¨ãã£ã¬ã¯ããªã®ä¸¡æ¹ãå¤æ´ãã¾ãã\n\n\ CD ãã©ã¤ã: ã¨å¥åããã¨æå®ããããã©ã¤ãã®ç¾å¨ã®ãã£ã¬ã¯ããªãè¡¨ç¤ºããã¾ãã\n\ ãã©ã¡ã¼ã¿ãæå®ããªãã§ CD ã¨å¥åããã¨ãç¾å¨ã®ãã©ã¤ãã¨ãã£ã¬ã¯ããªãè¡¨ç¤ºããã¾ãã\n" - STRING_CHCP_HELP "ç¾å¨ã®ã³ã¼ã ãã¼ã¸çªå·ãè¡¨ç¤ºã¾ãã¯è¨å®ãã¾ãã\n\n\ -CHCP [nnn]\n\n\ - nnn ã³ã¼ã ãã¼ã¸çªå·ãæå®ãã¾ãã\n\n\ -ç¾å¨ã®ã³ã¼ã ãã¼ã¸çªå·ãè¡¨ç¤ºããã¨ãã¯ããã©ã¡ã¼ã¿ãæå®ããã« CHCP ã¨å¥åãã¦ãã ããã\n" STRING_CHOICE_HELP "ã¦ã¼ã¶ã¼ãé¸æè¢ããä¸ã¤ãé¸æããã®ãå¾ã¡ã¾ãã\n\n\ CHOICE [/C[:]é¸æè¢][/N][/S][/T[:]c,nn][æåå]\n\n\ /C[:]é¸æè¢ è¨±ããããã¼å¥åãæå®ãã¾ããããã©ã«ãã¯ YN ã§ãã\n\ @@ -476,8 +472,6 @@ STRING_ALIAS_ERROR "ã¨ã¤ãªã¢ã¹å±éå¾ã®ã³ãã³ã ã©ã¤ã³ãé·ããã¾ã!\n" STRING_ASSOC_ERROR "File association not found for extension %s\n" STRING_BATCH_ERROR "ããã ãã¡ã¤ã«ãéãã¨ãã«ã¨ã©ã¼ãçºçãã¾ããã\n" - STRING_CHCP_ERROR1 "ç¾å¨ã®ã³ã¼ã ãã¼ã¸: %u\n" - STRING_CHCP_ERROR4 "ç¡å¹ãªã³ã¼ã ãã¼ã¸ã§ã\n" STRING_CHOICE_ERROR "ç¡å¹ãªãªãã·ã§ã³ã§ããæå¾ãããæ¸å¼: /C[:]ãªãã·ã§ã³" STRING_CHOICE_ERROR_TXT "ç¡å¹ãªãªãã·ã§ã³ã§ããæå¾ãããæ¸å¼: /T[:]c,nn" STRING_CHOICE_ERROR_OPTION "ç¡å¹ãªãªãã·ã§ã³ã§ã: %s" Modified: trunk/reactos/base/shell/cmd/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/no-NO.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/no-NO.rc [iso-8859-1] Sun Sep 24 19:00:47 2017 @@ -47,10 +47,6 @@ /D Vil endre gjeldende stasjon og gjeldende mappe.\n\n\ Tast CD stasjon: for Ã¥ vise gjeldende mappe pÃ¥ spesifiserte stasjon.\n\ Tast CD uten parametere for Ã¥ vise gjeldende stasjon og mappe.\n" - STRING_CHCP_HELP "Viser eller velger aktive tegntabellnummer.\n\n\ -CHCP [nnn]\n\n\ - nnn Spesifisere aktive tegntabellnummer.\n\n\ -Skriv CHCP uten parametrer for Ã¥ vise aktiv tegntabellnummer.\n" STRING_CHOICE_HELP "Venter pÃ¥ at bruker skal velge ett av alternativene.\n\n\ CHOICE [/C[:]valg][/N][/S][/T[:]c,nn][tekst]\n\n\ /C[:]Valg Spesifisere tillatte nÃ¸kler. Standard er JN.\n\ @@ -467,8 +463,6 @@ STRING_ALIAS_ERROR "Kommando linje for lang etter alias utvidelse!\n" STRING_ASSOC_ERROR "Fil association ble ikke funnet for utvidelsen %s\n" STRING_BATCH_ERROR "Feil ved Ã¥pning av satsvis fil\n" - STRING_CHCP_ERROR1 "Aktiv tegntabell: %u\n" - STRING_CHCP_ERROR4 "Ugyldig tegntabell\n" STRING_CHOICE_ERROR "Ugyldig valg. Forventet format: /C[:]valg" STRING_CHOICE_ERROR_TXT "Ugyldig valg. Forventet format: /T[:]c,nn" STRING_CHOICE_ERROR_OPTION "Ulovlig operasjon: %s" Modified: trunk/reactos/base/shell/cmd/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/pl-PL.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/pl-PL.rc [iso-8859-1] Sun Sep 24 19:00:47 2017 @@ -56,10 +56,6 @@ /D UmoÅ¼liwia zmianÄ napÄdu.\n\n\ Wpisz CD [napÄd:], by wyÅwietliÄ bieÅ¼Äcy katalog na danym napÄdzie.\n\ Wpisz CD bez Å¼adnych parametrÃ³w, by wyÅwietliÄ bieÅ¼Äcy napÄd i katalog.\n" - STRING_CHCP_HELP "WyÅwietla lub ustawia numer aktywnej strony kodowej.\n\n\ -CHCP [nnn]\n\n\ - nnn Numer strony kodowej.\n\n\ -Wpisz CHCP bez parametru, by wyÅwietliÄ numer aktywnej strony kodowej.\n" STRING_CHOICE_HELP "WyÅwietla opcje jakimi dysponuje uÅ¼ytkownik i oczekuje na wybÃ³r jednej z nich.\n\n\ CHOICE [/C[:]opcje][/N][/S][/T[:]c,nn][tekst]\n\n\ /C[:]opcje Wyznacza klawisze wyÅwietlane jako wybÃ³r. DomyÅlne: TN.\n\ @@ -473,8 +469,6 @@ STRING_ALIAS_ERROR "Linia poleceÅ zbyt dÅuga po rozszerzeniu aliasa!\n" STRING_ASSOC_ERROR "File association not found for extension %s\n" STRING_BATCH_ERROR "BÅÄd podczas otwierania pliku wsadowego\n" - STRING_CHCP_ERROR1 "Aktywna strona kodowa nr: %u\n" - STRING_CHCP_ERROR4 "NiewÅaÅciwy numer strony kodowej\n" STRING_CHOICE_ERROR "Parametr niepoprawny. Poprawna forma: /C[:]opcja" STRING_CHOICE_ERROR_TXT "Parametr niepoprawny. Poprawna forma: /T[:]c,nn" STRING_CHOICE_ERROR_OPTION "ZÅy parametr: %s" Modified: trunk/reactos/base/shell/cmd/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ro-RO.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ro-RO.rc [iso-8859-1] Sun Sep 24 19:00:47 2017 @@ -49,10 +49,6 @@ TastaÈi CD fÄrÄ argumente pentru a afiÈa unitatea Èi directorul curent.\n\ TastaÈi CD unitate: pentru a afiÈa conÈinutul directorului curent\n\ al unitÄÈii specificate.\n" - STRING_CHCP_HELP "AfiÈeazÄ sau stabileÈte numÄrul codificÄrii curente de paginÄ.\n\n\ -CHCP [nnn]\n\n\ - nnn NumÄrul codificÄrii de paginÄ specificat.\n\n\ -TastaÈi CHCP fÄrÄ argumente pentru a afiÈa numÄrul codificÄrii curente.\n" STRING_CHOICE_HELP "Cere utilizatorului sÄ aleagÄ una din mai multe opÈiuni.\n\n\ CHOICE [/C[:]opÈiuni][/N][/S][/T[:]implicit,nn][text]\n\n\ /C[:]opÈiuni SpecificÄ tastele permise. Implicit sunt D Èi N.\n\ @@ -500,8 +496,6 @@ STRING_ALIAS_ERROR "Linia de comandÄ devine prea lungÄ dupÄ extinderea alias!\n" STRING_ASSOC_ERROR "Nu poate fi gÄsitÄ nici o aplicaÈie asociatÄ extensiei Â«%sÂ»\n" STRING_BATCH_ERROR "Eroare la deschiderea fiÈierului de comenzi\n" - STRING_CHCP_ERROR1 "Codificarea curentÄ a paginilor: %u\n" - STRING_CHCP_ERROR4 "Codificare de paginÄ nevalidÄ\n" STRING_CHOICE_ERROR "OpÈiune eronatÄ. VedeÈi formatul: /C[:]opÈiuni" STRING_CHOICE_ERROR_TXT "OpÈiune eronatÄ. VedeÈi formatul: /T[:]implicit,nn" STRING_CHOICE_ERROR_OPTION "OpÈiune eronatÄ: %s" Modified: trunk/reactos/base/shell/cmd/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ru-RU.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ru-RU.rc [iso-8859-1] Sun Sep 24 19:00:47 2017 @@ -49,10 +49,6 @@ /D ÐÐ´Ð½Ð¾Ð²ÑÐµÐ¼ÐµÐ½Ð½Ð°Ñ ÑÐ¼ÐµÐ½Ð° ÑÐµÐºÑÑÐ¸Ñ Ð´Ð¸ÑÐºÐ° Ð¸ ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ð°.\n\n\ ÐÐ¾Ð¼Ð°Ð½Ð´Ð° CD Ð´Ð¸ÑÐº: Ð¾ÑÐ¾Ð±ÑÐ°Ð¶Ð°ÐµÑ Ð¸Ð¼Ñ ÑÐµÐºÑÑÐµÐ³Ð¾ ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ð° ÑÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð³Ð¾ Ð´Ð¸ÑÐºÐ°.\n\ ÐÐ¾Ð¼Ð°Ð½Ð´Ð° CD Ð±ÐµÐ· Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¾Ð² Ð¾ÑÐ¾Ð±ÑÐ°Ð¶Ð°ÐµÑ Ð¸Ð¼ÐµÐ½Ð° ÑÐµÐºÑÑÐ¸Ñ Ð´Ð¸ÑÐºÐ° Ð¸ ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ð°.\n" - STRING_CHCP_HELP "ÐÑÐ²Ð¾Ð´ Ð¸Ð»Ð¸ ÑÐ¼ÐµÐ½Ð° ÑÐµÐºÑÑÐµÐ³Ð¾ Ð½Ð¾Ð¼ÐµÑÐ° ÐºÐ¾Ð´Ð¾Ð²Ð¾Ð¹ ÑÑÑÐ°Ð½Ð¸ÑÑ.\n\n\ -CHCP [nnn]\n\n\ - nnn ÐÐ¾Ð¼ÐµÑ ÐºÐ¾Ð´Ð¾Ð²Ð¾Ð¹ ÑÑÑÐ°Ð½Ð¸ÑÑ.\n\n\ -ÐÐ¾Ð¼Ð°Ð½Ð´Ð° CHCP Ð±ÐµÐ· Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ° Ð²ÑÐ²Ð¾Ð´Ð¸Ñ ÑÐµÐºÑÑÐ¸Ð¹ Ð½Ð¾Ð¼ÐµÑ ÐºÐ¾Ð´Ð¾Ð²Ð¾Ð¹ ÑÑÑÐ°Ð½Ð¸ÑÑ.\n" STRING_CHOICE_HELP "ÐÐ´ÐµÑ, Ð¿Ð¾ÐºÐ° Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ð½Ðµ Ð²ÑÐ±ÐµÑÐµÑ Ð¾Ð´Ð¸Ð½ Ð¸Ð· ÑÐºÐ°Ð·Ð°Ð½Ð½ÑÑ Ð² ÑÐ¿Ð¸ÑÐºÐµ ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¾Ð².\n\n\ CHOICE [/C[:]ÑÐ¿Ð¸ÑÐ¾Ðº_ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¾Ð²][/N][/S][/T[:]c,nn][ÑÐµÐºÑÑ]\n\n\ /C[:]ÑÐ¿Ð¸ÑÐ¾Ðº_ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¾Ð² Ð£ÐºÐ°Ð·ÑÐ²Ð°ÐµÑ Ð´Ð¾Ð¿ÑÑÑÐ¸Ð¼ÑÐµ ÑÐ¸Ð¼Ð²Ð¾Ð»Ñ. ÐÐ¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ ÑÑÐ¾ YN.\n\ @@ -479,8 +475,6 @@ STRING_ALIAS_ERROR "ÐÐ¾Ð¼Ð°Ð½Ð´Ð½Ð°Ñ ÑÑÑÐ¾ÐºÐ° ÑÐ»Ð¸ÑÐºÐ¾Ð¼ Ð´Ð»Ð¸Ð½Ð½Ð°Ñ Ð¿Ð¾ÑÐ»Ðµ ÑÐ°Ð·Ð²ÐµÑÑÑÐ²Ð°Ð½Ð¸Ñ Ð¿ÑÐµÐ²Ð´Ð¾Ð½Ð¸Ð¼Ð¾Ð²!\n" STRING_ASSOC_ERROR "ÐÐµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ ÑÐ°Ð¹Ð»Ð¾Ð²ÑÑ Ð°ÑÑÐ¾ÑÐ¸Ð°ÑÐ¸Ð¹ Ð´Ð»Ñ ÑÐ°ÑÑÐ¸ÑÐµÐ½Ð¸Ñ %s\n" STRING_BATCH_ERROR "ÐÑÐ¸Ð±ÐºÐ° Ð¾ÑÐºÑÑÑÐ¸Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ð°\n" - STRING_CHCP_ERROR1 "Ð¢ÐµÐºÑÑÐ°Ñ ÐºÐ¾Ð´Ð¾Ð²Ð°Ñ ÑÑÑÐ°Ð½Ð¸ÑÐ°: %u\n" - STRING_CHCP_ERROR4 "ÐÐµÐ²ÐµÑÐ½Ð°Ñ ÐºÐ¾Ð´Ð¾Ð²Ð°Ñ ÑÑÑÐ°Ð½Ð¸ÑÐ°\n" STRING_CHOICE_ERROR "ÐÐµÐ²ÐµÑÐ½ÑÐ¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ. ÐÐ¶Ð¸Ð´Ð°ÐµÑÑÑ ÑÐ¾ÑÐ¼Ð°Ñ: /C[:]Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÑ" STRING_CHOICE_ERROR_TXT "ÐÐµÐ²ÐµÑÐ½ÑÐ¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ. ÐÐ¶Ð¸Ð´Ð°ÐµÑÑÑ ÑÐ¾ÑÐ¼Ð°Ñ: /T[:]c,nn" STRING_CHOICE_ERROR_OPTION "ÐÐµÐ²ÐµÑÐ½ÑÐ¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ: %s" Modified: trunk/reactos/base/shell/cmd/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/sk-SK.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/sk-SK.rc [iso-8859-1] Sun Sep 24 19:00:47 2017 @@ -53,10 +53,6 @@ /D Will change current drive and current directory.\n\n\ Type CD drive: to display the current directory on the specified drive.\n\ Type CD without a parameter to display the current drive and directory.\n" - STRING_CHCP_HELP "Displays or sets the active code page number.\n\n\ -CHCP [nnn]\n\n\ - nnn Specifies the active code page number.\n\n\ -Type CHCP without a parameter to display the active code page number.\n" STRING_CHOICE_HELP "Waits for the user to choose one of a set of choices.\n\n\ CHOICE [/C[:]choices][/N][/S][/T[:]c,nn][text]\n\n\ /C[:]choices Specifies allowable keys. Default is YN.\n\ @@ -475,8 +471,6 @@ STRING_ALIAS_ERROR "Command line too long after alias expansion!\n" STRING_ASSOC_ERROR "File association not found for extension %s\n" STRING_BATCH_ERROR "Error opening batch file\n" - STRING_CHCP_ERROR1 "Active code page: %u\n" - STRING_CHCP_ERROR4 "Invalid code page\n" STRING_CHOICE_ERROR "Invalid option. Expected format: /C[:]options" STRING_CHOICE_ERROR_TXT "Invalid option. Expected format: /T[:]c,nn" STRING_CHOICE_ERROR_OPTION "Illegal Option: %s" Modified: trunk/reactos/base/shell/cmd/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/sq-AL.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/sq-AL.rc [iso-8859-1] Sun Sep 24 19:00:47 2017 @@ -51,10 +51,6 @@ /D Do tÃ« ndryshojÃ« drivin aktual dhe dosjen aktuale.\n\n\ Shkruaj CD drive: pÃ«r tÃ« shfaqur dosjen aktuale nÃ« harddiskun e specifikuar.\n\ Shkruaj CD pa asnjÃ« parameter pÃ«r tÃ« shfaque harddikun aktual dhe dosjet e tij.\n" - STRING_CHCP_HELP "Shfaq ose cakto kodin dhe numrin e faqes aktive.\n\n\ -CHCP [nnn]\n\n\ - nnn Specifikon kodin dhe numrin aktiv te faqes.\n\n\ -Shkruaj CHCP pa anjÃ« parameter pÃ«r tÃ« shfaqur kodin dhe numrin e faqes aktive.\n" STRING_CHOICE_HELP "Pret pÃ«r pÃ«rdoruesit pÃ«r tÃ« zgjedhur njÃ« nga njÃ« sÃ«rÃ« zgjedhjesh.\n\n\ CHOICE [/C[:]zgjedhje][/N][/S][/T[:]c,nn][tekst]\n\n\ /C[:]zgjedhje PÃ«rcakton Ã§elÃ«sat e lejueshme. Parazgjedhuri Ã«shtÃ« YN.\n\ @@ -473,8 +469,6 @@ STRING_ALIAS_ERROR "Rreshti i komandÃ«s shumÃ« gjatÃ« pas pseudonimit!\n" STRING_ASSOC_ERROR "Dokumentit perkates nuk u gjet pÃ«r zgjatjen %s\n" STRING_BATCH_ERROR "Gabim gjatÃ« hapjes sÃ« dokumentit batch\n" - STRING_CHCP_ERROR1 "Faqja Active e Kodit: %u\n" - STRING_CHCP_ERROR4 "Invalid code page\n" STRING_CHOICE_ERROR "Opsione invalide. Format i pritshem: /C[:]opsione" STRING_CHOICE_ERROR_TXT "Opsione invalide. Format i pritshem: /T[:]c,nn" STRING_CHOICE_ERROR_OPTION "Illegal Option: %s" Modified: trunk/reactos/base/shell/cmd/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/sv-SE.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/sv-SE.rc [iso-8859-1] Sun Sep 24 19:00:47 2017 @@ -47,10 +47,6 @@ /D Vill Ã¤ndra aktuell enhet och aktuell mapp.\n\n\ Skriv CD enhet: fÃ¶r att visa aktuell mapp pÃ¥ specificerad enhet.\n\ Skriv CD uten parametere fÃ¶r att visa aktuell enhet och mapp.\n" - STRING_CHCP_HELP "Visar eller vÃ¤ljer aktiv teckentabell.\n\n\ -CHCP [nnn]\n\n\ - nnn Anger nummer pÃ¥ teckentabell.\n\n\ -Skriv CHCP utan parametrar fÃ¶r att visa aktiv teckentabellnummer.\n" STRING_CHOICE_HELP "VÃ¤ntar pÃ¥ att anvÃ¤ndaren skall ange ett av alternativen.\n\n\ CHOICE [/C[:]val][/N][/S][/T[:]c,nn][text]\n\n\ /C[:]Val Anger lista med alternativ. Standard Ã¤r JN.\n\ @@ -467,8 +463,6 @@ STRING_ALIAS_ERROR "Kommando linje for lang etter alias utvidelse!\n" STRING_ASSOC_ERROR "Fil association ble inte funnet for utvidelsen %s\n" STRING_BATCH_ERROR "Feil ved Ã¥pning av satsvis fil\n" - STRING_CHCP_ERROR1 "Aktiv tegntabell: %u\n" - STRING_CHCP_ERROR4 "Ugyldig tegntabell\n" STRING_CHOICE_ERROR "Ugyldig val. Forventet format: /C[:]val" STRING_CHOICE_ERROR_TXT "Ugyldig val. Forventet format: /T[:]c,nn" STRING_CHOICE_ERROR_OPTION "Ulovlig operasjon: %s" Modified: trunk/reactos/base/shell/cmd/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/tr-TR.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/tr-TR.rc [iso-8859-1] Sun Sep 24 19:00:47 2017 @@ -49,10 +49,6 @@ /D Åimdiki sÃ¼rÃ¼cÃ¼yÃ¼ ve Åimdiki dizini deÄiÅtirecek.\n\n\ CD sÃ¼rÃ¼cÃ¼ yaz: Belirtilen sÃ¼rÃ¼cÃ¼ Ã¼zerinde Åimdiki dizini gÃ¶rÃ¼ntÃ¼lemek iÃ§in.\n\ Åimdiki sÃ¼rÃ¼cÃ¼yÃ¼ ve dizini gÃ¶rÃ¼ntÃ¼lemek iÃ§in bir deÄiÅken olmadan CD yaz.\n" - STRING_CHCP_HELP "Etkin kod sayfasÄ± numarasÄ±nÄ± gÃ¶rÃ¼ntÃ¼ler ya da ayarlar.\n\n\ -CHCP [nnn]\n\n\ - nnn Etkin kod sayfasÄ± numarasÄ±nÄ± belirtir.\n\n\ -Etkin kod sayfasÄ± numarasÄ±nÄ± gÃ¶rÃ¼ntÃ¼lemek iÃ§in bir deÄiÅken olmadan CHCP yaz.\n" STRING_CHOICE_HELP "Bir takÄ±m seÃ§enekten birini seÃ§mek iÃ§in kullanÄ±cÄ±yÄ± bekler.\n\n\ CHOICE [/C[:]seÃ§enekler][/N][/S][/T[:]c,nn][metin]\n\n\ /C[:]seÃ§enekler Ä°zin verilebilir dÃ¼Ämeleri belirtir. Ãn tanÄ±mlÄ± YN'dir.\n\ @@ -474,8 +470,6 @@ STRING_ALIAS_ERROR "BaÅka ad aÃ§Ä±lÄ±mÄ±ndan sonra komut yatacÄ± Ã§ok uzun!\n" STRING_ASSOC_ERROR "%s uzantÄ±sÄ± iÃ§in kÃ¼tÃ¼k iliÅkilendirmesi bulunamadÄ±.\n" STRING_BATCH_ERROR "Toplu iÅ kÃ¼tÃ¼ÄÃ¼nÃ¼ aÃ§ma yanlÄ±ÅlÄ±ÄÄ±\n" - STRING_CHCP_ERROR1 "Etkin kod sayfasÄ±: %u\n" - STRING_CHCP_ERROR4 "GeÃ§ersiz kod sayfasÄ±\n" STRING_CHOICE_ERROR "GeÃ§ersiz seÃ§enek. Beklenen biÃ§im: /C[:]seÃ§enekler" STRING_CHOICE_ERROR_TXT "GeÃ§ersiz seÃ§enek. Beklenen biÃ§im: /T[:]c,nn" STRING_CHOICE_ERROR_OPTION "GeÃ§ersiz seÃ§enek: %s" Modified: trunk/reactos/base/shell/cmd/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/uk-UA.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/uk-UA.rc [iso-8859-1] Sun Sep 24 19:00:47 2017 @@ -55,10 +55,6 @@ /D ÐÐ´Ð½Ð¾ÑÐ°ÑÐ½Ð° Ð·Ð¼iÐ½Ð° Ð¿Ð¾ÑÐ¾ÑÐ½Ð¾Ð³Ð¾ Ð´Ð¸ÑÐºÑ ÑÐ° ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ñ.\n\n\ ÐÐ¾Ð¼Ð°Ð½Ð´Ð° CD Ð´Ð¸ÑÐº: Ð²iÐ´Ð¾Ð±ÑÐ°Ð¶Ð°Ñ iÐ¼'Ñ Ð¿Ð¾ÑÐ¾ÑÐ½Ð¾Ð³Ð¾ ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ñ Ð²ÐºÐ°Ð·Ð°Ð½Ð¾Ð³Ð¾ Ð´Ð¸ÑÐºÑ.\n\ ÐÐ¾Ð¼Ð°Ð½Ð´Ð° CD Ð±ÐµÐ· Ð¿Ð°ÑÐ°Ð¼ÐµÑÑiÐ² Ð²iÐ´Ð¾Ð±ÑÐ°Ð¶Ð°Ñ iÐ¼ÐµÐ½Ð° Ð¿Ð¾ÑÐ¾ÑÐ½Ð¸Ñ Ð´Ð¸ÑÐºÑ ÑÐ° ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ñ.\n" - STRING_CHCP_HELP "ÐÐ¸Ð²iÐ´ Ð°Ð±Ð¾ Ð·Ð¼iÐ½Ð° Ð¿Ð¾ÑÐ¾ÑÐ½Ð¾Ð³Ð¾ Ð½Ð¾Ð¼ÐµÑÐ° ÐºÐ¾Ð´Ð¾Ð²Ð¾Ñ ÑÑÐ¾ÑiÐ½ÐºÐ¸.\n\n\ -CHCP [nnn]\n\n\ - nnn ÐÐ°Ð´Ð°Ñ Ð½Ð¾Ð¼ÐµÑ ÐºÐ¾Ð´Ð¾Ð²Ð¾Ñ ÑÑÐ¾ÑiÐ½ÐºÐ¸.\n\n\ -ÐÐ¾Ð¼Ð°Ð½Ð´Ð° CHCP Ð±ÐµÐ· Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ° Ð²Ð¸Ð²Ð¾Ð´Ð¸ÑÑ Ð¿Ð¾ÑÐ¾ÑÐ½Ð¸Ð¹ Ð½Ð¾Ð¼ÐµÑ ÐºÐ¾Ð´Ð¾Ð²Ð¾Ñ ÑÑÐ¾ÑiÐ½ÐºÐ¸.\n" STRING_CHOICE_HELP "ÐÑiÐºÑÑ, Ð¿Ð¾ÐºÐ¸ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°Ñ Ð½Ðµ Ð¾Ð±ÐµÑÐµ Ð¾Ð´Ð¸Ð½ Ð· Ð²ÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ð² ÑÐ¿Ð¸ÑÐºÑ ÑÐ¸Ð¼Ð²Ð¾Ð»iÐ².\n\n\ CHOICE [/C[:]ÑÐ¿Ð¸ÑÐ¾Ðº_ÑÐ¸Ð¼Ð²Ð¾Ð»iÐ²][/N][/S][/T[:]c,nn][ÑÐµÐºÑÑ]\n\n\ /C[:]ÑÐ¿Ð¸ÑÐ¾Ðº_ÑÐ¸Ð¼Ð²Ð¾Ð»iÐ² ÐÐ°Ð´Ð°Ñ Ð´Ð¾Ð¿ÑÑÑÐ¸Ð¼i ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¸. ÐÐ¾ Ð·Ð°Ð¼Ð¾Ð²ÑÑÐ²Ð°Ð½Ð½Ñ ÑÐµ YN.\n\ @@ -479,8 +475,6 @@ STRING_ALIAS_ERROR "ÐÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¸Ð¹ ÑÑÐ´Ð¾Ðº Ð·Ð°Ð½Ð°Ð´ÑÐ¾ Ð´Ð¾Ð²Ð³Ð¸Ð¹ Ð¿iÑÐ»Ñ ÑÐ¾Ð·Ð³Ð¾ÑÑÐ°Ð½Ð½Ñ Ð¿ÑÐµÐ²Ð´Ð¾Ð½iÐ¼iÐ²!\n" STRING_ASSOC_ERROR "ÐÐµ Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ ÑÐ°Ð¹Ð»Ð¾Ð²Ð¾Ñ Ð°ÑÐ¾ÑiÐ°ÑiÑ Ð´Ð»Ñ ÑÐ¾Ð·ÑÐ¸ÑÐµÐ½Ð½Ñ %s\n" STRING_BATCH_ERROR "ÐÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð²iÐ´ÐºÑÐ¸ÑÑÑ Ð¿Ð°ÐºÐµÑÐ½Ð¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ñ\n" - STRING_CHCP_ERROR1 "ÐÐ¾ÑÐ¾ÑÐ½Ð° ÐºÐ¾Ð´Ð¾Ð²Ð° ÑÑÐ¾ÑiÐ½ÐºÐ°: %u\n" - STRING_CHCP_ERROR4 "ÐÐ¾Ð¼Ð¸Ð»ÐºÐ¾Ð²Ð° ÐºÐ¾Ð´Ð¾Ð²Ð° ÑÑÐ¾ÑiÐ½ÐºÐ°\n" STRING_CHOICE_ERROR "ÐÐµÐ²iÑÐ½Ð¸Ð¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ. ÐÑiÐºÑÑÑÑÑÑ ÑÐ¾ÑÐ¼Ð°Ñ: /C[:]Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¸" STRING_CHOICE_ERROR_TXT "ÐÐµÐ²iÑÐ½Ð¸Ð¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ. ÐÑiÐºÑÑÑÑÑÑ ÑÐ¾ÑÐ¼Ð°Ñ: /T[:]c,nn" STRING_CHOICE_ERROR_OPTION "ÐÐµÐ²iÑÐ½Ð¸Ð¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ: %s" Modified: trunk/reactos/base/shell/cmd/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/zh-CN.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/zh-CN.rc [iso-8859-1] Sun Sep 24 19:00:47 2017 @@ -47,10 +47,6 @@ /D å°ä¼æ¹åå½åé©±å¨å¨åå½åç®å½ã\n\n\ æ§è¡ CD é©±å¨å¨: æ¾ç¤ºæå®é©±å¨å¨ä¸çå½åç®å½ã\n\ ä¸å¸¦åæ°æ§è¡ CD æ¾ç¤ºå½åé©±å¨å¨åç®å½ã\n" - STRING_CHCP_HELP "æ¾ç¤ºæè®¾ç½®æ´»å¨çä»£ç é¡µã\n\n\ -CHCP [nnn]\n\n\ - nnn æå®æ´»å¨çä»£ç é¡µã\n\n\ -ä¸å¸¦åæ°æ§è¡ CHCP å°ä¼æ¾ç¤ºå½åæ´»å¨çä»£ç é¡µã\n" STRING_CHOICE_HELP "çå¾ç¨æ·å¨ä¸ç»éé¡¹ä¸ååºä¸ä¸ªéæ©ã\n\n\ CHOICE [/C[:]éé¡¹][/N][/S][/T[:]c,nn][ææ¬]\n\n\ /C[:]éé¡¹ æå®åè®¸çéé¡¹ãé»è®¤ä¸º YNã\n\ @@ -438,8 +434,6 @@ STRING_ALIAS_ERROR "å«åå±å¼åçå½ä»¤è¡å¤ªé¿ï¼\n" STRING_ASSOC_ERROR "æ©å±å %s çæä»¶å³èæªæ¾å°ï¼\n" STRING_BATCH_ERROR "æå¼æ¹å¤çæä»¶æ¶åºé\n" - STRING_CHCP_ERROR1 "æ´»å¨ä»£ç é¡µï¼%u\n" - STRING_CHCP_ERROR4 "æ æä»£ç é¡µ\n" STRING_CHOICE_ERROR "æ æéé¡¹ãææçæ ¼å¼ï¼/C[:]éé¡¹" STRING_CHOICE_ERROR_TXT "æ æéé¡¹ãææçæ ¼å¼ï¼/T[:]c,nn" STRING_CHOICE_ERROR_OPTION "éæ³éé¡¹ï¼%s" Modified: trunk/reactos/base/shell/cmd/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/zh-TW.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/zh-TW.rc [iso-8859-1] Sun Sep 24 19:00:47 2017 @@ -47,10 +47,6 @@ /D å°ææ¹è®ç¶åé©åå¨åç¶åç®éã\n\n\ å·è¡ CD é©åå¨: é¡¯ç¤ºæå®é©åå¨ä¸çç¶åç®éã\n\ ä¸å¸¶åæ¸å·è¡ CD é¡¯ç¤ºç¶åé©åå¨åç®éã\n" - STRING_CHCP_HELP "é¡¯ç¤ºæè¨å®æ´»åçå§ç¢¼è¡¨ã\n\n\ -CHCP [nnn]\n\n\ - nnn æå®æ´»åçå§ç¢¼è¡¨ã\n\n\ -ä¸å¸¶åæ¸å·è¡ CHCP å°æé¡¯ç¤ºç¶åæ´»åçå§ç¢¼è¡¨ã\n" STRING_CHOICE_HELP "çå¾ä½¿ç¨èå¨ä¸çµé¸é ä¸ååºä¸åé¸æã\n\n\ CHOICE [/C[:]é¸é ][/N][/S][/T[:]c,nn][æå]\n\n\ /C[:]é¸é æå®åè¨±çé¸é ãé»èªçº YNã\n\ @@ -438,8 +434,6 @@ STRING_ALIAS_ERROR "å¥åå±éå¾çå½ä»¤åå¤ªé·ï¼\n" STRING_ASSOC_ERROR "å¯æªå %s çæªæ¡éè¯æªæ¾å°ï¼\n" STRING_BATCH_ERROR "éåæ¹èçæªæ¡æåºé¯\n" - STRING_CHCP_ERROR1 "æ´»åå§ç¢¼è¡¨ï¼%u\n" - STRING_CHCP_ERROR4 "ç¡æå§ç¢¼è¡¨\n" STRING_CHOICE_ERROR "ç¡æé¸é ãææçæ ¼å¼ï¼/C[:]é¸é " STRING_CHOICE_ERROR_TXT "ç¡æé¸é ãææçæ ¼å¼ï¼/T[:]c,nn" STRING_CHOICE_ERROR_OPTION "éæ³é¸é ï¼%s" Modified: trunk/reactos/base/shell/cmd/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/resource.h?… ============================================================================== --- trunk/reactos/base/shell/cmd/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/resource.h [iso-8859-1] Sun Sep 24 19:00:47 2017 @@ -21,8 +21,6 @@ #define STRING_ALIAS_ERROR 300 #define STRING_BATCH_ERROR 301 -#define STRING_CHCP_ERROR1 302 -#define STRING_CHCP_ERROR4 305 #define STRING_CHOICE_ERROR 306 #define STRING_CHOICE_ERROR_TXT 307 #define STRING_CHOICE_ERROR_OPTION 308 @@ -74,7 +72,6 @@ #define STRING_BEEP_HELP 602 #define STRING_CALL_HELP 603 #define STRING_CD_HELP 604 -#define STRING_CHCP_HELP 605 #define STRING_CHOICE_HELP 606 #define STRING_CLS_HELP 607 #define STRING_CMD_HELP1 608

1 0

[tfaber] 75962: [MBEDTLS] - Disable the use of SSE2 instruction. ROS supports CPUs that do not support these. CORE-13826 #resolve CORE-10338
by tfaber＠svn.reactos.org 24 Sep '17

24 Sep '17

Author: tfaber Date: Sun Sep 24 13:11:18 2017 New Revision: 75962 URL: http://svn.reactos.org/svn/reactos?rev=75962&view=rev Log: [MBEDTLS] - Disable the use of SSE2 instruction. ROS supports CPUs that do not support these. CORE-13826 #resolve CORE-10338 Modified: trunk/reactos/sdk/include/reactos/libs/mbedtls/config.h Modified: trunk/reactos/sdk/include/reactos/libs/mbedtls/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/m… ============================================================================== --- trunk/reactos/sdk/include/reactos/libs/mbedtls/config.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/libs/mbedtls/config.h [iso-8859-1] Sun Sep 24 13:11:18 2017 @@ -92,7 +92,7 @@ * * Uncomment if the CPU supports SSE2 (IA-32 specific). */ -#define MBEDTLS_HAVE_SSE2 /* swyter: disable this if you want to support platforms < Pentium 4 */ +//#define MBEDTLS_HAVE_SSE2 /* We want to run on older hardware. TODO: This should be checked at runtime. */ /** * \def MBEDTLS_HAVE_TIME

1 0

[pschweitzer] 75961: [FASTFAT] Implement statistics counting for non cached read/write operations.
by pschweitzer＠svn.reactos.org 24 Sep '17

24 Sep '17

Author: pschweitzer Date: Sun Sep 24 12:35:37 2017 New Revision: 75961 URL: http://svn.reactos.org/svn/reactos?rev=75961&view=rev Log: [FASTFAT] Implement statistics counting for non cached read/write operations. Modified: trunk/reactos/drivers/filesystems/fastfat/rw.c Modified: trunk/reactos/drivers/filesystems/fastfat/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/rw.c [iso-8859-1] Sun Sep 24 12:35:37 2017 @@ -722,6 +722,9 @@ Length = (ULONG)(ROUND_UP_64(Fcb->RFCB.FileSize.QuadPart, BytesPerSector) - ByteOffset.QuadPart); } + vfatAddToStat(IrpContext->DeviceExt, Fat.NonCachedReads, 1); + vfatAddToStat(IrpContext->DeviceExt, Fat.NonCachedReadBytes, Length); + Status = VfatReadFileData(IrpContext, Length, ByteOffset, &ReturnedLength); if (NT_SUCCESS(Status)) { @@ -1003,6 +1006,9 @@ CcZeroData(IrpContext->FileObject, &OldFileSize, &ByteOffset, TRUE); } + vfatAddToStat(IrpContext->DeviceExt, Fat.NonCachedWrites, 1); + vfatAddToStat(IrpContext->DeviceExt, Fat.NonCachedWriteBytes, Length); + Status = VfatWriteFileData(IrpContext, Length, ByteOffset); if (NT_SUCCESS(Status)) {

1 0

[akhaldi] 75960: [WS2_32_WINETEST] Sync with Wine Staging 2.16. CORE-13762
by akhaldi＠svn.reactos.org 24 Sep '17

24 Sep '17

Author: akhaldi Date: Sun Sep 24 11:36:21 2017 New Revision: 75960 URL: http://svn.reactos.org/svn/reactos?rev=75960&view=rev Log: [WS2_32_WINETEST] Sync with Wine Staging 2.16. CORE-13762 Modified: trunk/rostests/winetests/ws2_32/sock.c Modified: trunk/rostests/winetests/ws2_32/sock.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ws2_32/sock.c?r… ============================================================================== --- trunk/rostests/winetests/ws2_32/sock.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ws2_32/sock.c [iso-8859-1] Sun Sep 24 11:36:21 2017 @@ -72,7 +72,13 @@ static void (WINAPI *pfreeaddrinfo)(struct addrinfo *); static int (WINAPI *pgetaddrinfo)(LPCSTR,LPCSTR,const struct addrinfo *,struct addrinfo **); static void (WINAPI *pFreeAddrInfoW)(PADDRINFOW); +static void (WINAPI *pFreeAddrInfoExW)(ADDRINFOEXW *ai); static int (WINAPI *pGetAddrInfoW)(LPCWSTR,LPCWSTR,const ADDRINFOW *,PADDRINFOW *); +static int (WINAPI *pGetAddrInfoExW)(const WCHAR *name, const WCHAR *servname, DWORD namespace, + GUID *namespace_id, const ADDRINFOEXW *hints, ADDRINFOEXW **result, + struct timeval *timeout, OVERLAPPED *overlapped, + LPLOOKUPSERVICE_COMPLETION_ROUTINE completion_routine, HANDLE *handle); +static int (WINAPI *pGetAddrInfoExOverlappedResult)(OVERLAPPED *overlapped); static PCSTR (WINAPI *pInetNtop)(INT,LPVOID,LPSTR,ULONG); static PCWSTR(WINAPI *pInetNtopW)(INT,LPVOID,LPWSTR,ULONG); static int (WINAPI *pInetPtonA)(INT,LPCSTR,LPVOID); @@ -1234,7 +1240,10 @@ pfreeaddrinfo = (void *)GetProcAddress(hws2_32, "freeaddrinfo"); pgetaddrinfo = (void *)GetProcAddress(hws2_32, "getaddrinfo"); pFreeAddrInfoW = (void *)GetProcAddress(hws2_32, "FreeAddrInfoW"); + pFreeAddrInfoExW = (void *)GetProcAddress(hws2_32, "FreeAddrInfoExW"); pGetAddrInfoW = (void *)GetProcAddress(hws2_32, "GetAddrInfoW"); + pGetAddrInfoExW = (void *)GetProcAddress(hws2_32, "GetAddrInfoExW"); + pGetAddrInfoExOverlappedResult = (void *)GetProcAddress(hws2_32, "GetAddrInfoExOverlappedResult"); pInetNtop = (void *)GetProcAddress(hws2_32, "inet_ntop"); pInetNtopW = (void *)GetProcAddress(hws2_32, "InetNtopW"); pInetPtonA = (void *)GetProcAddress(hws2_32, "inet_pton"); @@ -1654,7 +1663,7 @@ ok(k == 99, "Expected 99, got %d\n", k); } } - else /* <= 2003 the tests differ between TCP and UDP, UDP silenty accepts */ + else /* <= 2003 the tests differ between TCP and UDP, UDP silently accepts */ { SetLastError(0xdeadbeef); k = 99; @@ -3613,6 +3622,7 @@ struct sockaddr_in addr; struct timeval select_timeout; + memset(&readfds, 0, sizeof(readfds)); FD_ZERO(&readfds); FD_SET(par->s, &readfds); select_timeout.tv_sec=5; @@ -4785,7 +4795,7 @@ } ok(memcmp(he->h_addr_list[0], loopback, he->h_length) == 0, - "gethostbyname(\"localhost\") returned %d.%d.%d.%d\n", + "gethostbyname(\"localhost\") returned %u.%u.%u.%u\n", he->h_addr_list[0][0], he->h_addr_list[0][1], he->h_addr_list[0][2], he->h_addr_list[0][3]); } @@ -4809,7 +4819,7 @@ if (he->h_addr_list[0][0] == 127) { ok(memcmp(he->h_addr_list[0], magic_loopback, he->h_length) == 0, - "gethostbyname(\"%s\") returned %d.%d.%d.%d not 127.12.34.56\n", + "gethostbyname(\"%s\") returned %u.%u.%u.%u not 127.12.34.56\n", name, he->h_addr_list[0][0], he->h_addr_list[0][1], he->h_addr_list[0][2], he->h_addr_list[0][3]); } @@ -6871,7 +6881,6 @@ memset(&ov, 0, sizeof(ov)); completion_called = 0; iret = WSARecv(dest, bufs, 1, NULL, &flags, &ov, io_completion); - todo_wine ok(iret == SOCKET_ERROR && GetLastError() == WSAEINVAL, "WSARecv failed - %d error %d\n", iret, GetLastError()); ok(!completion_called, "completion called\n"); @@ -7382,11 +7391,124 @@ ok(result2 == NULL, "got %p\n", result2); } +static void test_GetAddrInfoExW(void) +{ + static const WCHAR empty[] = {0}; + static const WCHAR localhost[] = {'l','o','c','a','l','h','o','s','t',0}; + static const WCHAR winehq[] = {'t','e','s','t','.','w','i','n','e','h','q','.','o','r','g',0}; + ADDRINFOEXW *result; + OVERLAPPED overlapped; + HANDLE event; + int ret; + + if (!pGetAddrInfoExW || !pGetAddrInfoExOverlappedResult) + { + win_skip("GetAddrInfoExW and/or GetAddrInfoExOverlappedResult not present\n"); + return; + } + + event = WSACreateEvent(); + + result = (ADDRINFOEXW *)0xdeadbeef; + WSASetLastError(0xdeadbeef); + ret = pGetAddrInfoExW(NULL, NULL, NS_DNS, NULL, NULL, &result, NULL, NULL, NULL, NULL); + ok(ret == WSAHOST_NOT_FOUND, "got %d expected WSAHOST_NOT_FOUND\n", ret); + ok(WSAGetLastError() == WSAHOST_NOT_FOUND, "expected 11001, got %d\n", WSAGetLastError()); + ok(result == NULL, "got %p\n", result); + + result = NULL; + WSASetLastError(0xdeadbeef); + ret = pGetAddrInfoExW(empty, NULL, NS_DNS, NULL, NULL, &result, NULL, NULL, NULL, NULL); + ok(!ret, "GetAddrInfoExW failed with %d\n", WSAGetLastError()); + ok(result != NULL, "GetAddrInfoW failed\n"); + ok(WSAGetLastError() == 0, "expected 0, got %d\n", WSAGetLastError()); + pFreeAddrInfoExW(result); + + result = NULL; + ret = pGetAddrInfoExW(localhost, NULL, NS_DNS, NULL, NULL, &result, NULL, NULL, NULL, NULL); + ok(!ret, "GetAddrInfoExW failed with %d\n", WSAGetLastError()); + pFreeAddrInfoExW(result); + + result = (void*)0xdeadbeef; + memset(&overlapped, 0xcc, sizeof(overlapped)); + overlapped.hEvent = event; + ResetEvent(event); + ret = pGetAddrInfoExW(localhost, NULL, NS_DNS, NULL, NULL, &result, NULL, &overlapped, NULL, NULL); + ok(ret == ERROR_IO_PENDING, "GetAddrInfoExW failed with %d\n", WSAGetLastError()); + ok(!result, "result != NULL\n"); + ok(WaitForSingleObject(event, 1000) == WAIT_OBJECT_0, "wait failed\n"); + ret = pGetAddrInfoExOverlappedResult(&overlapped); + ok(!ret, "overlapped result is %d\n", ret); + pFreeAddrInfoExW(result); + + result = (void*)0xdeadbeef; + memset(&overlapped, 0xcc, sizeof(overlapped)); + ResetEvent(event); + overlapped.hEvent = event; + WSASetLastError(0xdeadbeef); + ret = pGetAddrInfoExW(winehq, NULL, NS_DNS, NULL, NULL, &result, NULL, &overlapped, NULL, NULL); + ok(ret == ERROR_IO_PENDING, "GetAddrInfoExW failed with %d\n", WSAGetLastError()); + ok(WSAGetLastError() == ERROR_IO_PENDING, "expected 11001, got %d\n", WSAGetLastError()); + ret = overlapped.Internal; + ok(ret == WSAEINPROGRESS || ret == ERROR_SUCCESS, "overlapped.Internal = %u\n", ret); + ok(WaitForSingleObject(event, 1000) == WAIT_OBJECT_0, "wait failed\n"); + ret = pGetAddrInfoExOverlappedResult(&overlapped); + ok(!ret, "overlapped result is %d\n", ret); + ok(overlapped.hEvent == event, "hEvent changed %p\n", overlapped.hEvent); + ok(overlapped.Internal == ERROR_SUCCESS, "overlapped.Internal = %lx\n", overlapped.Internal); + ok(overlapped.Pointer == &result, "overlapped.Pointer != &result\n"); + ok(result != NULL, "result == NULL\n"); + ok(!result->ai_blob, "ai_blob != NULL\n"); + ok(!result->ai_bloblen, "ai_bloblen != 0\n"); + ok(!result->ai_provider, "ai_provider = %s\n", wine_dbgstr_guid(result->ai_provider)); + pFreeAddrInfoExW(result); + + result = (void*)0xdeadbeef; + memset(&overlapped, 0xcc, sizeof(overlapped)); + ResetEvent(event); + overlapped.hEvent = event; + ret = pGetAddrInfoExW(NULL, NULL, NS_DNS, NULL, NULL, &result, NULL, &overlapped, NULL, NULL); + todo_wine + ok(ret == WSAHOST_NOT_FOUND, "got %d expected WSAHOST_NOT_FOUND\n", ret); + todo_wine + ok(WSAGetLastError() == WSAHOST_NOT_FOUND, "expected 11001, got %d\n", WSAGetLastError()); + ok(result == NULL, "got %p\n", result); + ret = WaitForSingleObject(event, 0); + todo_wine_if(ret != WAIT_TIMEOUT) /* Remove when abowe todo_wines are fixed */ + ok(ret == WAIT_TIMEOUT, "wait failed\n"); + + WSACloseEvent(event); +} + +static void verify_ipv6_addrinfo(ADDRINFOA *result, const char *expectedIp) +{ + SOCKADDR_IN6 *sockaddr6; + char ipBuffer[256]; + const char *ret; + + ok(result->ai_family == AF_INET6, "ai_family == %d\n", result->ai_family); + ok(result->ai_addrlen >= sizeof(struct sockaddr_in6), "ai_addrlen == %d\n", (int)result->ai_addrlen); + ok(result->ai_addr != NULL, "ai_addr == NULL\n"); + + if (result->ai_addr != NULL) + { + sockaddr6 = (SOCKADDR_IN6 *)result->ai_addr; + ok(sockaddr6->sin6_family == AF_INET6, "ai_addr->sin6_family == %d\n", sockaddr6->sin6_family); + ok(sockaddr6->sin6_port == 0, "ai_addr->sin6_port == %d\n", sockaddr6->sin6_port); + + ZeroMemory(ipBuffer, sizeof(ipBuffer)); + ret = pInetNtop(AF_INET6, &sockaddr6->sin6_addr, ipBuffer, sizeof(ipBuffer)); + ok(ret != NULL, "inet_ntop failed (%d)\n", WSAGetLastError()); + ok(strcmp(ipBuffer, expectedIp) == 0, "ai_addr->sin6_addr == '%s' (expected '%s')\n", ipBuffer, expectedIp); + } +} + static void test_getaddrinfo(void) { int i, ret; ADDRINFOA *result, *result2, *p, hint; - CHAR name[256]; + SOCKADDR_IN *sockaddr; + CHAR name[256], *ip; DWORD size = sizeof(name); if (!pgetaddrinfo || !pfreeaddrinfo) @@ -7515,6 +7637,88 @@ ok(ret == WSAHOST_NOT_FOUND, "got %d expected WSAHOST_NOT_FOUND\n", ret); ok(WSAGetLastError() == WSAHOST_NOT_FOUND, "expected 11001, got %d\n", WSAGetLastError()); ok(result == NULL, "got %p\n", result); + + /* Test IPv4 address conversion */ + result = NULL; + ret = pgetaddrinfo("192.168.1.253", NULL, NULL, &result); + ok(!ret, "getaddrinfo failed with %d\n", ret); + ok(result->ai_family == AF_INET, "ai_family == %d\n", result->ai_family); + ok(result->ai_addrlen >= sizeof(struct sockaddr_in), "ai_addrlen == %d\n", (int)result->ai_addrlen); + ok(result->ai_addr != NULL, "ai_addr == NULL\n"); + sockaddr = (SOCKADDR_IN *)result->ai_addr; + ok(sockaddr->sin_family == AF_INET, "ai_addr->sin_family == %d\n", sockaddr->sin_family); + ok(sockaddr->sin_port == 0, "ai_addr->sin_port == %d\n", sockaddr->sin_port); + + ip = inet_ntoa(sockaddr->sin_addr); + ok(strcmp(ip, "192.168.1.253") == 0, "sockaddr->ai_addr == '%s'\n", ip); + pfreeaddrinfo(result); + + /* Test IPv4 address conversion with port */ + result = NULL; + hint.ai_flags = AI_NUMERICHOST; + ret = pgetaddrinfo("192.168.1.253:1024", NULL, &hint, &result); + hint.ai_flags = 0; + ok(ret == WSAHOST_NOT_FOUND, "getaddrinfo returned unexpected result: %d\n", ret); + ok(result == NULL, "expected NULL, got %p\n", result); + + /* Test IPv6 address conversion */ + result = NULL; + SetLastError(0xdeadbeef); + ret = pgetaddrinfo("2a00:2039:dead:beef:cafe::6666", NULL, NULL, &result); + + if (result != NULL) + { + ok(!ret, "getaddrinfo failed with %d\n", ret); + verify_ipv6_addrinfo(result, "2a00:2039:dead:beef:cafe::6666"); + pfreeaddrinfo(result); + + /* Test IPv6 address conversion with brackets */ + result = NULL; + ret = pgetaddrinfo("[beef::cafe]", NULL, NULL, &result); + ok(!ret, "getaddrinfo failed with %d\n", ret); + verify_ipv6_addrinfo(result, "beef::cafe"); + pfreeaddrinfo(result); + + /* Test IPv6 address conversion with brackets and hints */ + memset(&hint, 0, sizeof(ADDRINFOA)); + hint.ai_flags = AI_NUMERICHOST; + hint.ai_family = AF_INET6; + result = NULL; + ret = pgetaddrinfo("[beef::cafe]", NULL, &hint, &result); + ok(!ret, "getaddrinfo failed with %d\n", ret); + verify_ipv6_addrinfo(result, "beef::cafe"); + pfreeaddrinfo(result); + + memset(&hint, 0, sizeof(ADDRINFOA)); + hint.ai_flags = AI_NUMERICHOST; + hint.ai_family = AF_INET; + result = NULL; + ret = pgetaddrinfo("[beef::cafe]", NULL, &hint, &result); + ok(ret == WSAHOST_NOT_FOUND, "getaddrinfo failed with %d\n", ret); + + /* Test IPv6 address conversion with brackets and port */ + result = NULL; + ret = pgetaddrinfo("[beef::cafe]:10239", NULL, NULL, &result); + ok(!ret, "getaddrinfo failed with %d\n", ret); + verify_ipv6_addrinfo(result, "beef::cafe"); + pfreeaddrinfo(result); + + /* Test IPv6 address conversion with unmatched brackets */ + result = NULL; + hint.ai_flags = AI_NUMERICHOST; + ret = pgetaddrinfo("[beef::cafe", NULL, &hint, &result); + ok(ret == WSAHOST_NOT_FOUND, "getaddrinfo failed with %d\n", ret); + + ret = pgetaddrinfo("beef::cafe]", NULL, &hint, &result); + ok(ret == WSAHOST_NOT_FOUND, "getaddrinfo failed with %d\n", ret); + } + else + { + ok(ret == WSAHOST_NOT_FOUND, "getaddrinfo failed with %d\n", ret); + win_skip("getaddrinfo does not support IPV6\n"); + } + + hint.ai_flags = 0; for (i = 0;i < (sizeof(hinttests) / sizeof(hinttests[0]));i++) { @@ -7619,12 +7823,15 @@ goto end; } + bytesReturned = 0xdeadbeef; iret = WSAIoctl(connector, SIO_GET_EXTENSION_FUNCTION_POINTER, &connectExGuid, sizeof(connectExGuid), &pConnectEx, sizeof(pConnectEx), &bytesReturned, NULL, NULL); if (iret) { win_skip("WSAIoctl failed to get ConnectEx with ret %d + errno %d\n", iret, WSAGetLastError()); goto end; } + + ok(bytesReturned == sizeof(pConnectEx), "expected sizeof(pConnectEx), got %u\n", bytesReturned); bret = pConnectEx(INVALID_SOCKET, (struct sockaddr*)&address, addrlen, NULL, 0, &bytesReturned, &overlapped); ok(bret == FALSE && WSAGetLastError() == WSAENOTSOCK, "ConnectEx on invalid socket " @@ -7756,22 +7963,14 @@ address.sin_port = htons(1); bret = pConnectEx(connector, (struct sockaddr*)&address, addrlen, NULL, 0, &bytesReturned, &overlapped); - ok(bret == FALSE && GetLastError(), "ConnectEx to bad destination failed: " + ok(bret == FALSE && GetLastError() == ERROR_IO_PENDING, "ConnectEx to bad destination failed: " "returned %d + errno %d\n", bret, GetLastError()); - - if (GetLastError() == ERROR_IO_PENDING) - { - dwret = WaitForSingleObject(overlapped.hEvent, 15000); - ok(dwret == WAIT_OBJECT_0, "Waiting for connect event failed with %d + errno %d\n", dwret, GetLastError()); - - bret = GetOverlappedResult((HANDLE)connector, &overlapped, &bytesReturned, FALSE); - ok(bret == FALSE && GetLastError() == ERROR_CONNECTION_REFUSED, - "Connecting to a disconnected host returned error %d - %d\n", bret, WSAGetLastError()); - } - else { - ok(GetLastError() == WSAECONNREFUSED, - "Connecting to a disconnected host returned error %d - %d\n", bret, WSAGetLastError()); - } + dwret = WaitForSingleObject(overlapped.hEvent, 15000); + ok(dwret == WAIT_OBJECT_0, "Waiting for connect event failed with %d + errno %d\n", dwret, GetLastError()); + + bret = GetOverlappedResult((HANDLE)connector, &overlapped, &bytesReturned, FALSE); + ok(bret == FALSE && GetLastError() == ERROR_CONNECTION_REFUSED, + "Connecting to a disconnected host returned error %d - %d\n", bret, WSAGetLastError()); end: if (overlapped.hEvent) @@ -9852,6 +10051,11 @@ io_port = CreateIoCompletionPort((HANDLE)dest, previous_port, 236, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); + + io_info.Flags = FILE_SKIP_COMPLETION_PORT_ON_SUCCESS; + status = pNtSetInformationFile((HANDLE)src, &io, &io_info, sizeof(io_info), FileIoCompletionNotificationInformation); + ok(status == STATUS_SUCCESS || broken(status == STATUS_INVALID_INFO_CLASS) /* XP */, + "expected STATUS_SUCCESS, got %08x\n", status); io_info.Flags = FILE_SKIP_COMPLETION_PORT_ON_SUCCESS; status = pNtSetInformationFile((HANDLE)dest, &io, &io_info, sizeof(io_info), FileIoCompletionNotificationInformation); @@ -10559,6 +10763,7 @@ test_ipv6only(); test_TransmitFile(); test_GetAddrInfoW(); + test_GetAddrInfoExW(); test_getaddrinfo(); test_AcceptEx(); test_ConnectEx();

1 0

[akhaldi] 75959: [REG_WINETEST] Sync with Wine Staging 2.16. CORE-13762
by akhaldi＠svn.reactos.org 24 Sep '17

24 Sep '17

Author: akhaldi Date: Sun Sep 24 11:33:35 2017 New Revision: 75959 URL: http://svn.reactos.org/svn/reactos?rev=75959&view=rev Log: [REG_WINETEST] Sync with Wine Staging 2.16. CORE-13762 Modified: trunk/rostests/winetests/reg/reg.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/reg/reg.c?rev=7…

1 0

[akhaldi] 75958: [REG] Sync with Wine Staging 2.16. CORE-13762 39e0e81 reg: Null-terminate incomplete REG_EXPAND_SZ and REG_MULTI_SZ Unicode data. 82fc4c8 reg: Close any open registry keys before s...
by akhaldi＠svn.reactos.org 24 Sep '17

24 Sep '17

Author: akhaldi Date: Sun Sep 24 11:33:04 2017 New Revision: 75958 URL: http://svn.reactos.org/svn/reactos?rev=75958&view=rev Log: [REG] Sync with Wine Staging 2.16. CORE-13762 39e0e81 reg: Null-terminate incomplete REG_EXPAND_SZ and REG_MULTI_SZ Unicode data. 82fc4c8 reg: Close any open registry keys before starting the key deletion process. 5de883c reg: Use the correct return codes during the import operation. 56e58e4 reg: Delete registry keys via the state machine. d90f2a5 reg: Delete registry values via the state machine. db98cc4 reg: Handle unknown registry data types in the state machine. 32d5368 reg: Import hex data via the state machine. f1874c1 reg: Import REG_DWORD data via the state machine. 038f1c6 reg: Parse data types and import REG_SZ data via the state machine. 0565934 reg: Parse key names and value names in the state machine. 3e87a70 reg: Introduce a partial state machine for importing Windows 3.1 registry data. aa386af reg: Add initial support for the import operation. f2fbbec reg: Rename reg.h to resource.h. c6c95a0 reg: Compile with msvcrt. 8c253c4 reg: Make some variables 'static const'. 337e0f4 reg: Avoid an uninitialized variable warning. 8abec73 reg: Dynamically allocate memory for the value name buffer when deleting all registry values in a specified key. e7ea838 reg: Use a helper function to resize a memory buffer. a1bc33a reg: Use a helper function to free allocated memory. a6e28cc reg: Use a helper function to allocate memory and die on failure. 90da210 reg: Account for sizeof(WCHAR) when resizing the value name buffer during the query operation. fb22f6c reg: Avoid using RegQueryInfoKey() to enumerate subkeys and values in the query operation. Added: trunk/reactos/base/applications/cmdutils/reg/import.c (with props) trunk/reactos/base/applications/cmdutils/reg/resource.h (with props) Modified: trunk/reactos/base/applications/cmdutils/reg/CMakeLists.txt trunk/reactos/base/applications/cmdutils/reg/lang/bg-BG.rc trunk/reactos/base/applications/cmdutils/reg/lang/cs-CZ.rc trunk/reactos/base/applications/cmdutils/reg/lang/da-DK.rc trunk/reactos/base/applications/cmdutils/reg/lang/de-DE.rc trunk/reactos/base/applications/cmdutils/reg/lang/en-US.rc trunk/reactos/base/applications/cmdutils/reg/lang/es-ES.rc trunk/reactos/base/applications/cmdutils/reg/lang/fr-FR.rc trunk/reactos/base/applications/cmdutils/reg/lang/it-IT.rc trunk/reactos/base/applications/cmdutils/reg/lang/ja-JP.rc trunk/reactos/base/applications/cmdutils/reg/lang/ko-KR.rc trunk/reactos/base/applications/cmdutils/reg/lang/lt-LT.rc trunk/reactos/base/applications/cmdutils/reg/lang/nl-NL.rc trunk/reactos/base/applications/cmdutils/reg/lang/no-NO.rc trunk/reactos/base/applications/cmdutils/reg/lang/pl-PL.rc trunk/reactos/base/applications/cmdutils/reg/lang/pt-PT.rc trunk/reactos/base/applications/cmdutils/reg/lang/ro-RO.rc trunk/reactos/base/applications/cmdutils/reg/lang/ru-RU.rc trunk/reactos/base/applications/cmdutils/reg/lang/sl-SI.rc trunk/reactos/base/applications/cmdutils/reg/lang/sq-AL.rc trunk/reactos/base/applications/cmdutils/reg/lang/sv-SE.rc trunk/reactos/base/applications/cmdutils/reg/lang/tr-TR.rc trunk/reactos/base/applications/cmdutils/reg/lang/uk-UA.rc trunk/reactos/base/applications/cmdutils/reg/lang/zh-CN.rc trunk/reactos/base/applications/cmdutils/reg/lang/zh-TW.rc trunk/reactos/base/applications/cmdutils/reg/reg.c trunk/reactos/base/applications/cmdutils/reg/reg.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/base/applications/cmdutils/reg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/CMakeLists.txt [iso-8859-1] Sun Sep 24 11:33:04 2017 @@ -2,7 +2,7 @@ remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) -add_executable(reg reg.c reg.rc) +add_executable(reg import.c reg.c reg.rc) set_module_type(reg win32cui UNICODE) target_link_libraries(reg wine) add_importlibs(reg advapi32 advapi32_vista user32 msvcrt kernel32 ntdll) Added: trunk/reactos/base/applications/cmdutils/reg/import.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/import.c (added) +++ trunk/reactos/base/applications/cmdutils/reg/import.c [iso-8859-1] Sun Sep 24 11:33:04 2017 @@ -0,0 +1,1042 @@ +/* + * Copyright 2017 Hugh McMaster + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <windef.h> +#include <winbase.h> +#include <winreg.h> +#include <stdio.h> + +#include <wine/unicode.h> +#include <wine/debug.h> + +#include "reg.h" + +WINE_DEFAULT_DEBUG_CHANNEL(reg); + +static WCHAR *GetWideString(const char *strA) +{ + if (strA) + { + WCHAR *strW; + int len = MultiByteToWideChar(CP_ACP, 0, strA, -1, NULL, 0); + + strW = heap_xalloc(len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, strA, -1, strW, len); + return strW; + } + return NULL; +} + +static WCHAR *GetWideStringN(const char *strA, int size, DWORD *len) +{ + if (strA) + { + WCHAR *strW; + *len = MultiByteToWideChar(CP_ACP, 0, strA, size, NULL, 0); + + strW = heap_xalloc(*len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, strA, size, strW, *len); + return strW; + } + *len = 0; + return NULL; +} + +static WCHAR *(*get_line)(FILE *); + +/* parser definitions */ +enum parser_state +{ + HEADER, /* parsing the registry file version header */ + PARSE_WIN31_LINE, /* parsing a Windows 3.1 registry line */ + LINE_START, /* at the beginning of a registry line */ + KEY_NAME, /* parsing a key name */ + DELETE_KEY, /* deleting a registry key */ + DEFAULT_VALUE_NAME, /* parsing a default value name */ + QUOTED_VALUE_NAME, /* parsing a double-quoted value name */ + DATA_START, /* preparing for data parsing operations */ + DELETE_VALUE, /* deleting a registry value */ + DATA_TYPE, /* parsing the registry data type */ + STRING_DATA, /* parsing REG_SZ data */ + DWORD_DATA, /* parsing DWORD data */ + HEX_DATA, /* parsing REG_BINARY, REG_NONE, REG_EXPAND_SZ or REG_MULTI_SZ data */ + EOL_BACKSLASH, /* preparing to parse multiple lines of hex data */ + HEX_MULTILINE, /* parsing multiple lines of hex data */ + UNKNOWN_DATA, /* parsing an unhandled or invalid data type */ + SET_VALUE, /* adding a value to the registry */ + NB_PARSER_STATES +}; + +struct parser +{ + FILE *file; /* pointer to a registry file */ + WCHAR two_wchars[2]; /* first two characters from the encoding check */ + BOOL is_unicode; /* parsing Unicode or ASCII data */ + short int reg_version; /* registry file version */ + HKEY hkey; /* current registry key */ + WCHAR *key_name; /* current key name */ + WCHAR *value_name; /* value name */ + DWORD parse_type; /* generic data type for parsing */ + DWORD data_type; /* data type */ + void *data; /* value data */ + DWORD data_size; /* size of the data (in bytes) */ + BOOL backslash; /* TRUE if the current line contains a backslash */ + enum parser_state state; /* current parser state */ +}; + +typedef WCHAR *(*parser_state_func)(struct parser *parser, WCHAR *pos); + +/* parser state machine functions */ +static WCHAR *header_state(struct parser *parser, WCHAR *pos); +static WCHAR *parse_win31_line_state(struct parser *parser, WCHAR *pos); +static WCHAR *line_start_state(struct parser *parser, WCHAR *pos); +static WCHAR *key_name_state(struct parser *parser, WCHAR *pos); +static WCHAR *delete_key_state(struct parser *parser, WCHAR *pos); +static WCHAR *default_value_name_state(struct parser *parser, WCHAR *pos); +static WCHAR *quoted_value_name_state(struct parser *parser, WCHAR *pos); +static WCHAR *data_start_state(struct parser *parser, WCHAR *pos); +static WCHAR *delete_value_state(struct parser *parser, WCHAR *pos); +static WCHAR *data_type_state(struct parser *parser, WCHAR *pos); +static WCHAR *string_data_state(struct parser *parser, WCHAR *pos); +static WCHAR *dword_data_state(struct parser *parser, WCHAR *pos); +static WCHAR *hex_data_state(struct parser *parser, WCHAR *pos); +static WCHAR *eol_backslash_state(struct parser *parser, WCHAR *pos); +static WCHAR *hex_multiline_state(struct parser *parser, WCHAR *pos); +static WCHAR *unknown_data_state(struct parser *parser, WCHAR *pos); +static WCHAR *set_value_state(struct parser *parser, WCHAR *pos); + +static const parser_state_func parser_funcs[NB_PARSER_STATES] = +{ + header_state, /* HEADER */ + parse_win31_line_state, /* PARSE_WIN31_LINE */ + line_start_state, /* LINE_START */ + key_name_state, /* KEY_NAME */ + delete_key_state, /* DELETE_KEY */ + default_value_name_state, /* DEFAULT_VALUE_NAME */ + quoted_value_name_state, /* QUOTED_VALUE_NAME */ + data_start_state, /* DATA_START */ + delete_value_state, /* DELETE_VALUE */ + data_type_state, /* DATA_TYPE */ + string_data_state, /* STRING_DATA */ + dword_data_state, /* DWORD_DATA */ + hex_data_state, /* HEX_DATA */ + eol_backslash_state, /* EOL_BACKSLASH */ + hex_multiline_state, /* HEX_MULTILINE */ + unknown_data_state, /* UNKNOWN_DATA */ + set_value_state, /* SET_VALUE */ +}; + +/* set the new parser state and return the previous one */ +static inline enum parser_state set_state(struct parser *parser, enum parser_state state) +{ + enum parser_state ret = parser->state; + parser->state = state; + return ret; +} + +/****************************************************************************** + * Converts a hex representation of a DWORD into a DWORD. + */ +static BOOL convert_hex_to_dword(WCHAR *str, DWORD *dw) +{ + WCHAR *p, *end; + int count = 0; + + while (*str == ' ' || *str == '\t') str++; + if (!*str) goto error; + + p = str; + while (isxdigitW(*p)) + { + count++; + p++; + } + if (count > 8) goto error; + + end = p; + while (*p == ' ' || *p == '\t') p++; + if (*p && *p != ';') goto error; + + *end = 0; + *dw = strtoulW(str, &end, 16); + return TRUE; + +error: + return FALSE; +} + +/****************************************************************************** + * Converts comma-separated hex data into a binary string and modifies + * the input parameter to skip the concatenating backslash, if found. + * + * Returns TRUE or FALSE to indicate whether parsing was successful. + */ +static BOOL convert_hex_csv_to_hex(struct parser *parser, WCHAR **str) +{ + size_t size; + BYTE *d; + WCHAR *s; + + parser->backslash = FALSE; + + /* The worst case is 1 digit + 1 comma per byte */ + size = ((lstrlenW(*str) + 1) / 2) + parser->data_size; + parser->data = heap_xrealloc(parser->data, size); + + s = *str; + d = (BYTE *)parser->data + parser->data_size; + + while (*s) + { + WCHAR *end; + unsigned long wc; + + wc = strtoulW(s, &end, 16); + if (wc > 0xff) return FALSE; + + if (s == end && wc == 0) + { + while (*end == ' ' || *end == '\t') end++; + if (*end == '\\') + { + parser->backslash = TRUE; + *str = end + 1; + return TRUE; + } + else if (*end == ';') + return TRUE; + return FALSE; + } + + *d++ = wc; + parser->data_size++; + + if (*end && *end != ',') + { + while (*end == ' ' || *end == '\t') end++; + if (*end && *end != ';') return FALSE; + return TRUE; + } + + if (*end) end++; + s = end; + } + + return TRUE; +} + +/****************************************************************************** + * Parses the data type of the registry value being imported and modifies + * the input parameter to skip the string representation of the data type. + * + * Returns TRUE or FALSE to indicate whether a data type was found. + */ +static BOOL parse_data_type(struct parser *parser, WCHAR **line) +{ + struct data_type { const WCHAR *tag; int len; int type; int parse_type; }; + + static const WCHAR quote[] = {'"'}; + static const WCHAR hex[] = {'h','e','x',':'}; + static const WCHAR dword[] = {'d','w','o','r','d',':'}; + static const WCHAR hexp[] = {'h','e','x','('}; + + static const struct data_type data_types[] = { + /* tag len type parse type */ + { quote, 1, REG_SZ, REG_SZ }, + { hex, 4, REG_BINARY, REG_BINARY }, + { dword, 6, REG_DWORD, REG_DWORD }, + { hexp, 4, -1, REG_BINARY }, /* REG_NONE, REG_EXPAND_SZ, REG_MULTI_SZ */ + { NULL, 0, 0, 0 } + }; + + const struct data_type *ptr; + + for (ptr = data_types; ptr->tag; ptr++) + { + if (strncmpW(ptr->tag, *line, ptr->len)) + continue; + + parser->parse_type = ptr->parse_type; + parser->data_type = ptr->parse_type; + *line += ptr->len; + + if (ptr->type == -1) + { + WCHAR *end; + DWORD val; + + if (!**line || tolowerW((*line)[1]) == 'x') + return FALSE; + + /* "hex(xx):" is special */ + val = wcstoul(*line, &end, 16); + if (*end != ')' || *(end + 1) != ':' || (val == ~0u && errno == ERANGE)) + return FALSE; + + parser->data_type = val; + *line = end + 2; + } + return TRUE; + } + return FALSE; +} + +/****************************************************************************** + * Replaces escape sequences with their character equivalents and + * null-terminates the string on the first non-escaped double quote. + * + * Assigns a pointer to the remaining unparsed data in the line. + * Returns TRUE or FALSE to indicate whether a closing double quote was found. + */ +static BOOL unescape_string(WCHAR *str, WCHAR **unparsed) +{ + int str_idx = 0; /* current character under analysis */ + int val_idx = 0; /* the last character of the unescaped string */ + int len = lstrlenW(str); + BOOL ret; + + for (str_idx = 0; str_idx < len; str_idx++, val_idx++) + { + if (str[str_idx] == '\\') + { + str_idx++; + switch (str[str_idx]) + { + case 'n': + str[val_idx] = '\n'; + break; + case 'r': + str[val_idx] = '\r'; + break; + case '0': + str[val_idx] = '\0'; + break; + case '\\': + case '"': + str[val_idx] = str[str_idx]; + break; + default: + if (!str[str_idx]) return FALSE; + output_message(STRING_ESCAPE_SEQUENCE, str[str_idx]); + str[val_idx] = str[str_idx]; + break; + } + } + else if (str[str_idx] == '"') + break; + else + str[val_idx] = str[str_idx]; + } + + ret = (str[str_idx] == '"'); + *unparsed = str + str_idx + 1; + str[val_idx] = '\0'; + return ret; +} + +static HKEY parse_key_name(WCHAR *key_name, WCHAR **key_path) +{ + if (!key_name) return 0; + + *key_path = strchrW(key_name, '\\'); + if (*key_path) (*key_path)++; + + return path_get_rootkey(key_name); +} + +static void close_key(struct parser *parser) +{ + if (parser->hkey) + { + heap_free(parser->key_name); + parser->key_name = NULL; + + RegCloseKey(parser->hkey); + parser->hkey = NULL; + } +} + +static LONG open_key(struct parser *parser, WCHAR *path) +{ + HKEY key_class; + WCHAR *key_path; + LONG res; + + close_key(parser); + + /* Get the registry class */ + if (!path || !(key_class = parse_key_name(path, &key_path))) + return ERROR_INVALID_PARAMETER; + + res = RegCreateKeyExW(key_class, key_path, 0, NULL, REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS, NULL, &parser->hkey, NULL); + + if (res == ERROR_SUCCESS) + { + parser->key_name = heap_xalloc((lstrlenW(path) + 1) * sizeof(WCHAR)); + lstrcpyW(parser->key_name, path); + } + else + parser->hkey = NULL; + + return res; +} + +static void free_parser_data(struct parser *parser) +{ + if (parser->parse_type == REG_DWORD || parser->parse_type == REG_BINARY) + heap_free(parser->data); + + parser->data = NULL; + parser->data_size = 0; +} + +static void prepare_hex_string_data(struct parser *parser) +{ + if (parser->data_type == REG_EXPAND_SZ || parser->data_type == REG_MULTI_SZ) + { + if (parser->is_unicode) + { + WCHAR *data = parser->data; + DWORD len = parser->data_size / sizeof(WCHAR); + + if (data[len - 1] != 0) + { + data[len] = 0; + parser->data_size += sizeof(WCHAR); + } + } + else + { + BYTE *data = parser->data; + + if (data[parser->data_size - 1] != 0) + { + data[parser->data_size] = 0; + parser->data_size++; + } + + parser->data = GetWideStringN(parser->data, parser->data_size, &parser->data_size); + parser->data_size *= sizeof(WCHAR); + heap_free(data); + } + } +} + +enum reg_versions { + REG_VERSION_31, + REG_VERSION_40, + REG_VERSION_50, + REG_VERSION_FUZZY, + REG_VERSION_INVALID +}; + +static enum reg_versions parse_file_header(const WCHAR *s) +{ + static const WCHAR header_31[] = {'R','E','G','E','D','I','T',0}; + static const WCHAR header_40[] = {'R','E','G','E','D','I','T','4',0}; + static const WCHAR header_50[] = {'W','i','n','d','o','w','s',' ', + 'R','e','g','i','s','t','r','y',' ','E','d','i','t','o','r',' ', + 'V','e','r','s','i','o','n',' ','5','.','0','0',0}; + + while (*s == ' ' || *s == '\t') s++; + + if (!strcmpW(s, header_31)) + return REG_VERSION_31; + + if (!strcmpW(s, header_40)) + return REG_VERSION_40; + + if (!strcmpW(s, header_50)) + return REG_VERSION_50; + + /* The Windows version accepts registry file headers beginning with "REGEDIT" and ending + * with other characters, as long as "REGEDIT" appears at the start of the line. For example, + * "REGEDIT 4", "REGEDIT9" and "REGEDIT4FOO" are all treated as valid file headers. + * In all such cases, however, the contents of the registry file are not imported. + */ + if (!strncmpW(s, header_31, 7)) /* "REGEDIT" without NUL */ + return REG_VERSION_FUZZY; + + return REG_VERSION_INVALID; +} + +/* handler for parser HEADER state */ +static WCHAR *header_state(struct parser *parser, WCHAR *pos) +{ + WCHAR *line, *header; + + if (!(line = get_line(parser->file))) + return NULL; + + if (!parser->is_unicode) + { + header = heap_xalloc((lstrlenW(line) + 3) * sizeof(WCHAR)); + header[0] = parser->two_wchars[0]; + header[1] = parser->two_wchars[1]; + lstrcpyW(header + 2, line); + parser->reg_version = parse_file_header(header); + heap_free(header); + } + else parser->reg_version = parse_file_header(line); + + switch (parser->reg_version) + { + case REG_VERSION_31: + set_state(parser, PARSE_WIN31_LINE); + break; + case REG_VERSION_40: + case REG_VERSION_50: + set_state(parser, LINE_START); + break; + default: + get_line(NULL); /* Reset static variables */ + return NULL; + } + + return line; +} + +/* handler for parser PARSE_WIN31_LINE state */ +static WCHAR *parse_win31_line_state(struct parser *parser, WCHAR *pos) +{ + WCHAR *line, *value; + static WCHAR hkcr[] = {'H','K','E','Y','_','C','L','A','S','S','E','S','_','R','O','O','T'}; + unsigned int key_end = 0; + + if (!(line = get_line(parser->file))) + return NULL; + + if (strncmpW(line, hkcr, ARRAY_SIZE(hkcr))) + return line; + + /* get key name */ + while (line[key_end] && !isspaceW(line[key_end])) key_end++; + + value = line + key_end; + while (*value == ' ' || *value == '\t') value++; + + if (*value == '=') value++; + if (*value == ' ') value++; /* at most one space is skipped */ + + line[key_end] = 0; + + if (open_key(parser, line) != ERROR_SUCCESS) + { + output_message(STRING_OPEN_KEY_FAILED, line); + return line; + } + + parser->value_name = NULL; + parser->data_type = REG_SZ; + parser->data = value; + parser->data_size = (lstrlenW(value) + 1) * sizeof(WCHAR); + + set_state(parser, SET_VALUE); + return value; +} + +/* handler for parser LINE_START state */ +static WCHAR *line_start_state(struct parser *parser, WCHAR *pos) +{ + WCHAR *line, *p; + + if (!(line = get_line(parser->file))) + return NULL; + + for (p = line; *p; p++) + { + switch (*p) + { + case '[': + set_state(parser, KEY_NAME); + return p + 1; + case '@': + set_state(parser, DEFAULT_VALUE_NAME); + return p; + case '"': + set_state(parser, QUOTED_VALUE_NAME); + return p + 1; + case ' ': + case '\t': + break; + default: + return p; + } + } + + return p; +} + +/* handler for parser KEY_NAME state */ +static WCHAR *key_name_state(struct parser *parser, WCHAR *pos) +{ + WCHAR *p = pos, *key_end; + + if (*p == ' ' || *p == '\t' || !(key_end = strrchrW(p, ']'))) + goto done; + + *key_end = 0; + + if (*p == '-') + { + set_state(parser, DELETE_KEY); + return p + 1; + } + else if (open_key(parser, p) != ERROR_SUCCESS) + output_message(STRING_OPEN_KEY_FAILED, p); + +done: + set_state(parser, LINE_START); + return p; +} + +/* handler for parser DELETE_KEY state */ +static WCHAR *delete_key_state(struct parser *parser, WCHAR *pos) +{ + WCHAR *p = pos; + + close_key(parser); + + if (*p == 'H' || *p == 'h') + { + HKEY root; + WCHAR *path; + + root = parse_key_name(p, &path); + + if (root && path && *path) + RegDeleteTreeW(root, path); + } + + set_state(parser, LINE_START); + return p; +} + +/* handler for parser DEFAULT_VALUE_NAME state */ +static WCHAR *default_value_name_state(struct parser *parser, WCHAR *pos) +{ + heap_free(parser->value_name); + parser->value_name = NULL; + + set_state(parser, DATA_START); + return pos + 1; +} + +/* handler for parser QUOTED_VALUE_NAME state */ +static WCHAR *quoted_value_name_state(struct parser *parser, WCHAR *pos) +{ + WCHAR *val_name = pos, *p; + + if (parser->value_name) + { + heap_free(parser->value_name); + parser->value_name = NULL; + } + + if (!unescape_string(val_name, &p)) + goto invalid; + + /* copy the value name in case we need to parse multiple lines and the buffer is overwritten */ + parser->value_name = heap_xalloc((lstrlenW(val_name) + 1) * sizeof(WCHAR)); + lstrcpyW(parser->value_name, val_name); + + set_state(parser, DATA_START); + return p; + +invalid: + set_state(parser, LINE_START); + return val_name; +} + +/* handler for parser DATA_START state */ +static WCHAR *data_start_state(struct parser *parser, WCHAR *pos) +{ + WCHAR *p = pos; + unsigned int len; + + while (*p == ' ' || *p == '\t') p++; + if (*p != '=') goto invalid; + p++; + while (*p == ' ' || *p == '\t') p++; + + /* trim trailing whitespace */ + len = strlenW(p); + while (len > 0 && (p[len - 1] == ' ' || p[len - 1] == '\t')) len--; + p[len] = 0; + + if (*p == '-') + set_state(parser, DELETE_VALUE); + else + set_state(parser, DATA_TYPE); + return p; + +invalid: + set_state(parser, LINE_START); + return p; +} + +/* handler for parser DELETE_VALUE state */ +static WCHAR *delete_value_state(struct parser *parser, WCHAR *pos) +{ + WCHAR *p = pos + 1; + + while (*p == ' ' || *p == '\t') p++; + if (*p && *p != ';') goto done; + + RegDeleteValueW(parser->hkey, parser->value_name); + +done: + set_state(parser, LINE_START); + return p; +} + +/* handler for parser DATA_TYPE state */ +static WCHAR *data_type_state(struct parser *parser, WCHAR *pos) +{ + WCHAR *line = pos; + + if (!parse_data_type(parser, &line)) + { + set_state(parser, LINE_START); + return line; + } + + switch (parser->parse_type) + { + case REG_SZ: + set_state(parser, STRING_DATA); + break; + case REG_DWORD: + set_state(parser, DWORD_DATA); + break; + case REG_BINARY: /* all hex data types, including undefined */ + set_state(parser, HEX_DATA); + break; + default: + set_state(parser, UNKNOWN_DATA); + } + + return line; +} + +/* handler for parser STRING_DATA state */ +static WCHAR *string_data_state(struct parser *parser, WCHAR *pos) +{ + WCHAR *line; + + parser->data = pos; + + if (!unescape_string(parser->data, &line)) + goto invalid; + + while (*line == ' ' || *line == '\t') line++; + if (*line && *line != ';') goto invalid; + + parser->data_size = (lstrlenW(parser->data) + 1) * sizeof(WCHAR); + + set_state(parser, SET_VALUE); + return line; + +invalid: + free_parser_data(parser); + set_state(parser, LINE_START); + return line; +} + +/* handler for parser DWORD_DATA state */ +static WCHAR *dword_data_state(struct parser *parser, WCHAR *pos) +{ + WCHAR *line = pos; + + parser->data = heap_xalloc(sizeof(DWORD)); + + if (!convert_hex_to_dword(line, parser->data)) + goto invalid; + + parser->data_size = sizeof(DWORD); + + set_state(parser, SET_VALUE); + return line; + +invalid: + free_parser_data(parser); + set_state(parser, LINE_START); + return line; +} + +/* handler for parser HEX_DATA state */ +static WCHAR *hex_data_state(struct parser *parser, WCHAR *pos) +{ + WCHAR *line = pos; + + if (!convert_hex_csv_to_hex(parser, &line)) + goto invalid; + + if (parser->backslash) + { + set_state(parser, EOL_BACKSLASH); + return line; + } + + prepare_hex_string_data(parser); + + set_state(parser, SET_VALUE); + return line; + +invalid: + free_parser_data(parser); + set_state(parser, LINE_START); + return line; +} + +/* handler for parser EOL_BACKSLASH state */ +static WCHAR *eol_backslash_state(struct parser *parser, WCHAR *pos) +{ + WCHAR *p = pos; + + while (*p == ' ' || *p == '\t') p++; + if (*p && *p != ';') goto invalid; + + set_state(parser, HEX_MULTILINE); + return pos; + +invalid: + free_parser_data(parser); + set_state(parser, LINE_START); + return p; +} + +/* handler for parser HEX_MULTILINE state */ +static WCHAR *hex_multiline_state(struct parser *parser, WCHAR *pos) +{ + WCHAR *line; + + if (!(line = get_line(parser->file))) + { + prepare_hex_string_data(parser); + set_state(parser, SET_VALUE); + return pos; + } + + while (*line == ' ' || *line == '\t') line++; + if (!*line || *line == ';') return line; + + if (!isxdigitW(*line)) goto invalid; + + set_state(parser, HEX_DATA); + return line; + +invalid: + free_parser_data(parser); + set_state(parser, LINE_START); + return line; +} + +/* handler for parser UNKNOWN_DATA state */ +static WCHAR *unknown_data_state(struct parser *parser, WCHAR *pos) +{ + FIXME("Unknown registry data type [0x%x]\n", parser->data_type); + + set_state(parser, LINE_START); + return pos; +} + +/* handler for parser SET_VALUE state */ +static WCHAR *set_value_state(struct parser *parser, WCHAR *pos) +{ + RegSetValueExW(parser->hkey, parser->value_name, 0, parser->data_type, + parser->data, parser->data_size); + + free_parser_data(parser); + + if (parser->reg_version == REG_VERSION_31) + set_state(parser, PARSE_WIN31_LINE); + else + set_state(parser, LINE_START); + + return pos; +} + +#define REG_VAL_BUF_SIZE 4096 + +static WCHAR *get_lineA(FILE *fp) +{ + static WCHAR *lineW; + static size_t size; + static char *buf, *next; + char *line; + + heap_free(lineW); + + if (!fp) goto cleanup; + + if (!size) + { + size = REG_VAL_BUF_SIZE; + buf = heap_xalloc(size); + *buf = 0; + next = buf; + } + line = next; + + while (next) + { + char *p = strpbrk(line, "\r\n"); + if (!p) + { + size_t len, count; + len = strlen(next); + memmove(buf, next, len + 1); + if (size - len < 3) + { + size *= 2; + buf = heap_xrealloc(buf, size); + } + if (!(count = fread(buf + len, 1, size - len - 1, fp))) + { + next = NULL; + lineW = GetWideString(buf); + return lineW; + } + buf[len + count] = 0; + next = buf; + line = buf; + continue; + } + next = p + 1; + if (*p == '\r' && *(p + 1) == '\n') next++; + *p = 0; + lineW = GetWideString(line); + return lineW; + } + +cleanup: + lineW = NULL; + if (size) heap_free(buf); + size = 0; + return NULL; +} + +static WCHAR *get_lineW(FILE *fp) +{ + static size_t size; + static WCHAR *buf, *next; + WCHAR *line; + + if (!fp) goto cleanup; + + if (!size) + { + size = REG_VAL_BUF_SIZE; + buf = heap_xalloc(size * sizeof(WCHAR)); + *buf = 0; + next = buf; + } + line = next; + + while (next) + { + static const WCHAR line_endings[] = {'\r','\n',0}; + WCHAR *p = strpbrkW(line, line_endings); + if (!p) + { + size_t len, count; + len = strlenW(next); + memmove(buf, next, (len + 1) * sizeof(WCHAR)); + if (size - len < 3) + { + size *= 2; + buf = heap_xrealloc(buf, size * sizeof(WCHAR)); + } + if (!(count = fread(buf + len, sizeof(WCHAR), size - len - 1, fp))) + { + next = NULL; + return buf; + } + buf[len + count] = 0; + next = buf; + line = buf; + continue; + } + next = p + 1; + if (*p == '\r' && *(p + 1) == '\n') next++; + *p = 0; + return line; + } + +cleanup: + if (size) heap_free(buf); + size = 0; + return NULL; +} + +int reg_import(const WCHAR *filename) +{ + FILE *fp; + static const WCHAR rb_mode[] = {'r','b',0}; + BYTE s[2]; + struct parser parser; + WCHAR *pos; + + fp = _wfopen(filename, rb_mode); + if (!fp) + { + output_message(STRING_FILE_NOT_FOUND, filename); + return 1; + } + + if (fread(s, sizeof(WCHAR), 1, fp) != 1) + goto error; + + parser.is_unicode = (s[0] == 0xff && s[1] == 0xfe); + get_line = parser.is_unicode ? get_lineW : get_lineA; + + parser.file = fp; + parser.two_wchars[0] = s[0]; + parser.two_wchars[1] = s[1]; + parser.reg_version = -1; + parser.hkey = NULL; + parser.key_name = NULL; + parser.value_name = NULL; + parser.parse_type = 0; + parser.data_type = 0; + parser.data = NULL; + parser.data_size = 0; + parser.backslash = FALSE; + parser.state = HEADER; + + pos = parser.two_wchars; + + /* parser main loop */ + while (pos) + pos = (parser_funcs[parser.state])(&parser, pos); + + if (parser.reg_version == REG_VERSION_INVALID) + goto error; + + heap_free(parser.value_name); + close_key(&parser); + + fclose(fp); + return 0; + +error: + fclose(fp); + return 1; +} Propchange: trunk/reactos/base/applications/cmdutils/reg/import.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cmdutils/reg/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/bg-BG.rc [iso-8859-1] Sun Sep 24 11:33:04 2017 @@ -33,4 +33,8 @@ STRING_REG_HELP, "Type ""REG /?"" for help.\n" STRING_FUNC_HELP, "Type ""REG %1 /?"" for help.\n" STRING_VALUE_NOT_SET, "(value not set)" + STRING_IMPORT_USAGE, "REG IMPORT file.reg\n" + STRING_FILE_NOT_FOUND, "reg: The file '%1' was not found.\n" + STRING_OPEN_KEY_FAILED, "reg: Unable to open the registry key '%1'.\n" + STRING_ESCAPE_SEQUENCE, "reg: Unrecognized escape sequence [\\%1!c!]\n" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/cs-CZ.rc [iso-8859-1] Sun Sep 24 11:33:04 2017 @@ -38,4 +38,8 @@ STRING_REG_HELP, "Type ""REG /?"" for help.\n" STRING_FUNC_HELP, "Type ""REG %1 /?"" for help.\n" STRING_VALUE_NOT_SET, "(value not set)" + STRING_IMPORT_USAGE, "REG IMPORT file.reg\n" + STRING_FILE_NOT_FOUND, "reg: The file '%1' was not found.\n" + STRING_OPEN_KEY_FAILED, "reg: Unable to open the registry key '%1'.\n" + STRING_ESCAPE_SEQUENCE, "reg: Unrecognized escape sequence [\\%1!c!]\n" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/da-DK.rc [iso-8859-1] Sun Sep 24 11:33:04 2017 @@ -33,4 +33,8 @@ STRING_REG_HELP, "Type ""REG /?"" for help.\n" STRING_FUNC_HELP, "Type ""REG %1 /?"" for help.\n" STRING_VALUE_NOT_SET, "(value not set)" + STRING_IMPORT_USAGE, "REG IMPORT file.reg\n" + STRING_FILE_NOT_FOUND, "reg: The file '%1' was not found.\n" + STRING_OPEN_KEY_FAILED, "reg: Unable to open the registry key '%1'.\n" + STRING_ESCAPE_SEQUENCE, "reg: Unrecognized escape sequence [\\%1!c!]\n" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/de-DE.rc [iso-8859-1] Sun Sep 24 11:33:04 2017 @@ -33,4 +33,8 @@ STRING_REG_HELP, "Type ""REG /?"" for help.\n" STRING_FUNC_HELP, "Type ""REG %1 /?"" for help.\n" STRING_VALUE_NOT_SET, "(value not set)" + STRING_IMPORT_USAGE, "REG IMPORT file.reg\n" + STRING_FILE_NOT_FOUND, "reg: The file '%1' was not found.\n" + STRING_OPEN_KEY_FAILED, "reg: Unable to open the registry key '%1'.\n" + STRING_ESCAPE_SEQUENCE, "reg: Unrecognized escape sequence [\\%1!c!]\n" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/en-US.rc [iso-8859-1] Sun Sep 24 11:33:04 2017 @@ -33,4 +33,8 @@ STRING_REG_HELP, "Type ""REG /?"" for help.\n" STRING_FUNC_HELP, "Type ""REG %1 /?"" for help.\n" STRING_VALUE_NOT_SET, "(value not set)" + STRING_IMPORT_USAGE, "REG IMPORT file.reg\n" + STRING_FILE_NOT_FOUND, "reg: The file '%1' was not found.\n" + STRING_OPEN_KEY_FAILED, "reg: Unable to open the registry key '%1'.\n" + STRING_ESCAPE_SEQUENCE, "reg: Unrecognized escape sequence [\\%1!c!]\n" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/es-ES.rc [iso-8859-1] Sun Sep 24 11:33:04 2017 @@ -33,4 +33,8 @@ STRING_REG_HELP, "Type ""REG /?"" for help.\n" STRING_FUNC_HELP, "Type ""REG %1 /?"" for help.\n" STRING_VALUE_NOT_SET, "(value not set)" + STRING_IMPORT_USAGE, "REG IMPORT file.reg\n" + STRING_FILE_NOT_FOUND, "reg: The file '%1' was not found.\n" + STRING_OPEN_KEY_FAILED, "reg: Unable to open the registry key '%1'.\n" + STRING_ESCAPE_SEQUENCE, "reg: Unrecognized escape sequence [\\%1!c!]\n" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/fr-FR.rc [iso-8859-1] Sun Sep 24 11:33:04 2017 @@ -33,4 +33,8 @@ STRING_REG_HELP, "Type ""REG /?"" for help.\n" STRING_FUNC_HELP, "Type ""REG %1 /?"" for help.\n" STRING_VALUE_NOT_SET, "(value not set)" + STRING_IMPORT_USAGE, "REG IMPORT file.reg\n" + STRING_FILE_NOT_FOUND, "reg: The file '%1' was not found.\n" + STRING_OPEN_KEY_FAILED, "reg: Unable to open the registry key '%1'.\n" + STRING_ESCAPE_SEQUENCE, "reg: Unrecognized escape sequence [\\%1!c!]\n" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/it-IT.rc [iso-8859-1] Sun Sep 24 11:33:04 2017 @@ -33,4 +33,8 @@ STRING_REG_HELP, "Type ""REG /?"" for help.\n" STRING_FUNC_HELP, "Type ""REG %1 /?"" for help.\n" STRING_VALUE_NOT_SET, "(value not set)" + STRING_IMPORT_USAGE, "REG IMPORT file.reg\n" + STRING_FILE_NOT_FOUND, "reg: The file '%1' was not found.\n" + STRING_OPEN_KEY_FAILED, "reg: Unable to open the registry key '%1'.\n" + STRING_ESCAPE_SEQUENCE, "reg: Unrecognized escape sequence [\\%1!c!]\n" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/ja-JP.rc [iso-8859-1] Sun Sep 24 11:33:04 2017 @@ -33,4 +33,8 @@ STRING_REG_HELP, "Type ""REG /?"" for help.\n" STRING_FUNC_HELP, "Type ""REG %1 /?"" for help.\n" STRING_VALUE_NOT_SET, "(value not set)" + STRING_IMPORT_USAGE, "REG IMPORT file.reg\n" + STRING_FILE_NOT_FOUND, "reg: The file '%1' was not found.\n" + STRING_OPEN_KEY_FAILED, "reg: Unable to open the registry key '%1'.\n" + STRING_ESCAPE_SEQUENCE, "reg: Unrecognized escape sequence [\\%1!c!]\n" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/ko-KR.rc [iso-8859-1] Sun Sep 24 11:33:04 2017 @@ -33,4 +33,8 @@ STRING_REG_HELP, "Type ""REG /?"" for help.\n" STRING_FUNC_HELP, "Type ""REG %1 /?"" for help.\n" STRING_VALUE_NOT_SET, "(value not set)" + STRING_IMPORT_USAGE, "REG IMPORT file.reg\n" + STRING_FILE_NOT_FOUND, "reg: The file '%1' was not found.\n" + STRING_OPEN_KEY_FAILED, "reg: Unable to open the registry key '%1'.\n" + STRING_ESCAPE_SEQUENCE, "reg: Unrecognized escape sequence [\\%1!c!]\n" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/lt-LT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/lt-LT.rc [iso-8859-1] Sun Sep 24 11:33:04 2017 @@ -33,4 +33,8 @@ STRING_REG_HELP, "Type ""REG /?"" for help.\n" STRING_FUNC_HELP, "Type ""REG %1 /?"" for help.\n" STRING_VALUE_NOT_SET, "(value not set)" + STRING_IMPORT_USAGE, "REG IMPORT file.reg\n" + STRING_FILE_NOT_FOUND, "reg: The file '%1' was not found.\n" + STRING_OPEN_KEY_FAILED, "reg: Unable to open the registry key '%1'.\n" + STRING_ESCAPE_SEQUENCE, "reg: Unrecognized escape sequence [\\%1!c!]\n" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/nl-NL.rc [iso-8859-1] Sun Sep 24 11:33:04 2017 @@ -33,4 +33,8 @@ STRING_REG_HELP, "Type ""REG /?"" for help.\n" STRING_FUNC_HELP, "Type ""REG %1 /?"" for help.\n" STRING_VALUE_NOT_SET, "(value not set)" + STRING_IMPORT_USAGE, "REG IMPORT file.reg\n" + STRING_FILE_NOT_FOUND, "reg: The file '%1' was not found.\n" + STRING_OPEN_KEY_FAILED, "reg: Unable to open the registry key '%1'.\n" + STRING_ESCAPE_SEQUENCE, "reg: Unrecognized escape sequence [\\%1!c!]\n" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/no-NO.rc [iso-8859-1] Sun Sep 24 11:33:04 2017 @@ -33,4 +33,8 @@ STRING_REG_HELP, "Type ""REG /?"" for help.\n" STRING_FUNC_HELP, "Type ""REG %1 /?"" for help.\n" STRING_VALUE_NOT_SET, "(value not set)" + STRING_IMPORT_USAGE, "REG IMPORT file.reg\n" + STRING_FILE_NOT_FOUND, "reg: The file '%1' was not found.\n" + STRING_OPEN_KEY_FAILED, "reg: Unable to open the registry key '%1'.\n" + STRING_ESCAPE_SEQUENCE, "reg: Unrecognized escape sequence [\\%1!c!]\n" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/pl-PL.rc [iso-8859-1] Sun Sep 24 11:33:04 2017 @@ -33,4 +33,8 @@ STRING_REG_HELP, "Type ""REG /?"" for help.\n" STRING_FUNC_HELP, "Type ""REG %1 /?"" for help.\n" STRING_VALUE_NOT_SET, "(value not set)" + STRING_IMPORT_USAGE, "REG IMPORT file.reg\n" + STRING_FILE_NOT_FOUND, "reg: The file '%1' was not found.\n" + STRING_OPEN_KEY_FAILED, "reg: Unable to open the registry key '%1'.\n" + STRING_ESCAPE_SEQUENCE, "reg: Unrecognized escape sequence [\\%1!c!]\n" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/pt-PT.rc [iso-8859-1] Sun Sep 24 11:33:04 2017 @@ -33,4 +33,8 @@ STRING_REG_HELP, "Type ""REG /?"" for help.\n" STRING_FUNC_HELP, "Type ""REG %1 /?"" for help.\n" STRING_VALUE_NOT_SET, "(value not set)" + STRING_IMPORT_USAGE, "REG IMPORT file.reg\n" + STRING_FILE_NOT_FOUND, "reg: The file '%1' was not found.\n" + STRING_OPEN_KEY_FAILED, "reg: Unable to open the registry key '%1'.\n" + STRING_ESCAPE_SEQUENCE, "reg: Unrecognized escape sequence [\\%1!c!]\n" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/ro-RO.rc [iso-8859-1] Sun Sep 24 11:33:04 2017 @@ -39,4 +39,8 @@ STRING_REG_HELP, "TastaÈi Â«REG /?Â» pentru mai multe informaÈii.\n" STRING_FUNC_HELP, "TastaÈi Â«REG %1 /?Â» pentru mai multe informaÈii.\n" STRING_VALUE_NOT_SET, "(valoare nealocatÄ)" + STRING_IMPORT_USAGE, "REG IMPORT file.reg\n" + STRING_FILE_NOT_FOUND, "reg: The file '%1' was not found.\n" + STRING_OPEN_KEY_FAILED, "reg: Unable to open the registry key '%1'.\n" + STRING_ESCAPE_SEQUENCE, "reg: Unrecognized escape sequence [\\%1!c!]\n" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/ru-RU.rc [iso-8859-1] Sun Sep 24 11:33:04 2017 @@ -33,4 +33,8 @@ STRING_REG_HELP, "ÐÐ²ÐµÐ´Ð¸ÑÐµ ""REG /?"" Ð´Ð»Ñ Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¸Ñ ÑÐ¿ÑÐ°Ð²ÐºÐ¸ Ð¿Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ..\n" STRING_FUNC_HELP, "ÐÐ²ÐµÐ´Ð¸ÑÐµ ""REG %1 /?"" Ð´Ð»Ñ Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¸Ñ ÑÐ¿ÑÐ°Ð²ÐºÐ¸ Ð¿Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ..\n" STRING_VALUE_NOT_SET, "(Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ Ð½Ðµ ÑÐºÐ°Ð·Ð°Ð½Ð¾)" + STRING_IMPORT_USAGE, "REG IMPORT file.reg\n" + STRING_FILE_NOT_FOUND, "reg: The file '%1' was not found.\n" + STRING_OPEN_KEY_FAILED, "reg: Unable to open the registry key '%1'.\n" + STRING_ESCAPE_SEQUENCE, "reg: Unrecognized escape sequence [\\%1!c!]\n" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/sl-SI.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/sl-SI.rc [iso-8859-1] Sun Sep 24 11:33:04 2017 @@ -33,4 +33,8 @@ STRING_REG_HELP, "Type ""REG /?"" for help.\n" STRING_FUNC_HELP, "Type ""REG %1 /?"" for help.\n" STRING_VALUE_NOT_SET, "(value not set)" + STRING_IMPORT_USAGE, "REG IMPORT file.reg\n" + STRING_FILE_NOT_FOUND, "reg: The file '%1' was not found.\n" + STRING_OPEN_KEY_FAILED, "reg: Unable to open the registry key '%1'.\n" + STRING_ESCAPE_SEQUENCE, "reg: Unrecognized escape sequence [\\%1!c!]\n" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/sq-AL.rc [iso-8859-1] Sun Sep 24 11:33:04 2017 @@ -37,4 +37,8 @@ STRING_REG_HELP, "Type ""REG /?"" for help.\n" STRING_FUNC_HELP, "Type ""REG %1 /?"" for help.\n" STRING_VALUE_NOT_SET, "(value not set)" + STRING_IMPORT_USAGE, "REG IMPORT file.reg\n" + STRING_FILE_NOT_FOUND, "reg: The file '%1' was not found.\n" + STRING_OPEN_KEY_FAILED, "reg: Unable to open the registry key '%1'.\n" + STRING_ESCAPE_SEQUENCE, "reg: Unrecognized escape sequence [\\%1!c!]\n" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/sv-SE.rc [iso-8859-1] Sun Sep 24 11:33:04 2017 @@ -33,4 +33,8 @@ STRING_REG_HELP, "Type ""REG /?"" for help.\n" STRING_FUNC_HELP, "Type ""REG %1 /?"" for help.\n" STRING_VALUE_NOT_SET, "(value not set)" + STRING_IMPORT_USAGE, "REG IMPORT file.reg\n" + STRING_FILE_NOT_FOUND, "reg: The file '%1' was not found.\n" + STRING_OPEN_KEY_FAILED, "reg: Unable to open the registry key '%1'.\n" + STRING_ESCAPE_SEQUENCE, "reg: Unrecognized escape sequence [\\%1!c!]\n" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/tr-TR.rc [iso-8859-1] Sun Sep 24 11:33:04 2017 @@ -35,4 +35,8 @@ STRING_REG_HELP, "YardÄ±m iÃ§in ""REG /?"" yazÄ±nÄ±z.\n" STRING_FUNC_HELP, "YardÄ±m iÃ§in ""REG %1 /?"" yazÄ±nÄ±z.\n" STRING_VALUE_NOT_SET, "(DeÄer belirlenmemiÅ.)" + STRING_IMPORT_USAGE, "REG IMPORT file.reg\n" + STRING_FILE_NOT_FOUND, "reg: The file '%1' was not found.\n" + STRING_OPEN_KEY_FAILED, "reg: Unable to open the registry key '%1'.\n" + STRING_ESCAPE_SEQUENCE, "reg: Unrecognized escape sequence [\\%1!c!]\n" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/uk-UA.rc [iso-8859-1] Sun Sep 24 11:33:04 2017 @@ -33,4 +33,8 @@ STRING_REG_HELP, "Type ""REG /?"" for help.\n" STRING_FUNC_HELP, "Type ""REG %1 /?"" for help.\n" STRING_VALUE_NOT_SET, "(value not set)" + STRING_IMPORT_USAGE, "REG IMPORT file.reg\n" + STRING_FILE_NOT_FOUND, "reg: The file '%1' was not found.\n" + STRING_OPEN_KEY_FAILED, "reg: Unable to open the registry key '%1'.\n" + STRING_ESCAPE_SEQUENCE, "reg: Unrecognized escape sequence [\\%1!c!]\n" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/zh-CN.rc [iso-8859-1] Sun Sep 24 11:33:04 2017 @@ -35,4 +35,8 @@ STRING_REG_HELP, "Type ""REG /?"" for help.\n" STRING_FUNC_HELP, "Type ""REG %1 /?"" for help.\n" STRING_VALUE_NOT_SET, "(value not set)" + STRING_IMPORT_USAGE, "REG IMPORT file.reg\n" + STRING_FILE_NOT_FOUND, "reg: The file '%1' was not found.\n" + STRING_OPEN_KEY_FAILED, "reg: Unable to open the registry key '%1'.\n" + STRING_ESCAPE_SEQUENCE, "reg: Unrecognized escape sequence [\\%1!c!]\n" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/zh-TW.rc [iso-8859-1] Sun Sep 24 11:33:04 2017 @@ -35,4 +35,8 @@ STRING_REG_HELP, "Type ""REG /?"" for help.\n" STRING_FUNC_HELP, "Type ""REG %1 /?"" for help.\n" STRING_VALUE_NOT_SET, "(value not set)" + STRING_IMPORT_USAGE, "REG IMPORT file.reg\n" + STRING_FILE_NOT_FOUND, "reg: The file '%1' was not found.\n" + STRING_OPEN_KEY_FAILED, "reg: Unable to open the registry key '%1'.\n" + STRING_ESCAPE_SEQUENCE, "reg: Unrecognized escape sequence [\\%1!c!]\n" } Modified: trunk/reactos/base/applications/cmdutils/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/reg.c [iso-8859-1] Sun Sep 24 11:33:04 2017 @@ -25,10 +25,7 @@ #include <shlwapi.h> #include <wine/unicode.h> #include <wine/debug.h> -#include <errno.h> #include "reg.h" - -#define ARRAY_SIZE(A) (sizeof(A)/sizeof(*A)) WINE_DEFAULT_DEBUG_CHANNEL(reg); @@ -84,6 +81,40 @@ {REG_MULTI_SZ, type_multi_sz}, }; +void *heap_xalloc(size_t size) +{ + void *buf = HeapAlloc(GetProcessHeap(), 0, size); + if (!buf) + { + ERR("Out of memory!\n"); + exit(1); + } + return buf; +} + +void *heap_xrealloc(void *buf, size_t size) +{ + void *new_buf; + + if (buf) + new_buf = HeapReAlloc(GetProcessHeap(), 0, buf, size); + else + new_buf = HeapAlloc(GetProcessHeap(), 0, size); + + if (!new_buf) + { + ERR("Out of memory!\n"); + exit(1); + } + + return new_buf; +} + +BOOL heap_free(void *buf) +{ + return HeapFree(GetProcessHeap(), 0, buf); +} + static void output_writeconsole(const WCHAR *str, DWORD wlen) { DWORD count, ret; @@ -99,12 +130,11 @@ * one in that case. */ len = WideCharToMultiByte(GetConsoleOutputCP(), 0, str, wlen, NULL, 0, NULL, NULL); - msgA = HeapAlloc(GetProcessHeap(), 0, len * sizeof(char)); - if (!msgA) return; + msgA = heap_xalloc(len); WideCharToMultiByte(GetConsoleOutputCP(), 0, str, wlen, msgA, len, NULL, NULL); WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), msgA, len, &count, FALSE); - HeapFree(GetProcessHeap(), 0, msgA); + heap_free(msgA); } } @@ -125,7 +155,7 @@ LocalFree(str); } -static void __cdecl output_message(unsigned int id, ...) +void __cdecl output_message(unsigned int id, ...) { WCHAR fmt[1024]; __ms_va_list va_args; @@ -188,7 +218,7 @@ (input_path[length] == 0 || input_path[length] == '\\')); } -static HKEY path_get_rootkey(const WCHAR *path) +HKEY path_get_rootkey(const WCHAR *path) { DWORD i; @@ -246,7 +276,7 @@ case REG_EXPAND_SZ: { *reg_count = (lstrlenW(data) + 1) * sizeof(WCHAR); - out_data = HeapAlloc(GetProcessHeap(),0,*reg_count); + out_data = heap_xalloc(*reg_count); lstrcpyW((LPWSTR)out_data,data); break; } @@ -256,13 +286,13 @@ { LPWSTR rest; unsigned long val; - val = strtoulW(data, &rest, (tolowerW(data[1]) == 'x') ? 16 : 10); - if (*rest || data[0] == '-' || (val == ~0u && errno == ERANGE) || val > ~0u) { + val = wcstoul(data, &rest, (tolowerW(data[1]) == 'x') ? 16 : 10); + if (*rest || data[0] == '-' || (val == ~0u && errno == ERANGE)) { output_message(STRING_MISSING_INTEGER); break; } *reg_count = sizeof(DWORD); - out_data = HeapAlloc(GetProcessHeap(),0,*reg_count); + out_data = heap_xalloc(*reg_count); ((LPDWORD)out_data)[0] = val; break; } @@ -271,7 +301,7 @@ BYTE hex0, hex1; int i = 0, destByteIndex = 0, datalen = lstrlenW(data); *reg_count = ((datalen + datalen % 2) / 2) * sizeof(BYTE); - out_data = HeapAlloc(GetProcessHeap(), 0, *reg_count); + out_data = heap_xalloc(*reg_count); if(datalen % 2) { hex1 = hexchar_to_byte(data[i++]); @@ -290,7 +320,7 @@ break; no_hex_data: /* cleanup, print error */ - HeapFree(GetProcessHeap(), 0, out_data); + heap_free(out_data); output_message(STRING_MISSING_HEXDATA); out_data = NULL; break; @@ -298,7 +328,7 @@ case REG_MULTI_SZ: { int i, destindex, len = strlenW(data); - WCHAR *buffer = HeapAlloc(GetProcessHeap(), 0, (len + 2) * sizeof(WCHAR)); + WCHAR *buffer = heap_xalloc((len + 2) * sizeof(WCHAR)); for (i = 0, destindex = 0; i < len; i++, destindex++) { @@ -314,7 +344,7 @@ if (destindex && !buffer[destindex - 1] && (!buffer[destindex] || destindex == 1)) { - HeapFree(GetProcessHeap(), 0, buffer); + heap_free(buffer); output_message(STRING_INVALID_STRING); return NULL; } @@ -402,7 +432,7 @@ } RegSetValueExW(key, value_name, 0, reg_type, reg_data, reg_count); - HeapFree(GetProcessHeap(),0,reg_data); + heap_free(reg_data); } RegCloseKey(key); @@ -454,40 +484,35 @@ if (value_all) { - LPWSTR szValue; - DWORD maxValue; - DWORD count; + DWORD max_value_len = 256, value_len; + WCHAR *value_name; LONG rc; - rc = RegQueryInfoKeyW(key, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, &maxValue, NULL, NULL, NULL); - if (rc != ERROR_SUCCESS) - { - RegCloseKey(key); - output_message(STRING_GENERAL_FAILURE); - return 1; - } - maxValue++; - szValue = HeapAlloc(GetProcessHeap(),0,maxValue*sizeof(WCHAR)); + value_name = heap_xalloc(max_value_len * sizeof(WCHAR)); while (1) { - count = maxValue; - rc = RegEnumValueW(key, 0, szValue, &count, NULL, NULL, NULL, NULL); + value_len = max_value_len; + rc = RegEnumValueW(key, 0, value_name, &value_len, NULL, NULL, NULL, NULL); if (rc == ERROR_SUCCESS) { - rc = RegDeleteValueW(key, szValue); + rc = RegDeleteValueW(key, value_name); if (rc != ERROR_SUCCESS) { - HeapFree(GetProcessHeap(), 0, szValue); + heap_free(value_name); RegCloseKey(key); output_message(STRING_VALUEALL_FAILED, key_name); return 1; } } + else if (rc == ERROR_MORE_DATA) + { + max_value_len *= 2; + value_name = heap_xrealloc(value_name, max_value_len * sizeof(WCHAR)); + } else break; } - HeapFree(GetProcessHeap(), 0, szValue); + heap_free(value_name); } else if (value_name || value_empty) { @@ -513,16 +538,16 @@ { case REG_SZ: case REG_EXPAND_SZ: - buffer = HeapAlloc(GetProcessHeap(), 0, size_bytes); + buffer = heap_xalloc(size_bytes); strcpyW(buffer, (WCHAR *)src); break; case REG_NONE: case REG_BINARY: { WCHAR *ptr; - WCHAR fmt[] = {'%','0','2','X',0}; - - buffer = HeapAlloc(GetProcessHeap(), 0, (size_bytes * 2 + 1) * sizeof(WCHAR)); + static const WCHAR fmt[] = {'%','0','2','X',0}; + + buffer = heap_xalloc((size_bytes * 2 + 1) * sizeof(WCHAR)); ptr = buffer; for (i = 0; i < size_bytes; i++) ptr += sprintfW(ptr, fmt, src[i]); @@ -533,9 +558,9 @@ case REG_DWORD_BIG_ENDIAN: { const int zero_x_dword = 10; - WCHAR fmt[] = {'0','x','%','x',0}; - - buffer = HeapAlloc(GetProcessHeap(), 0, (zero_x_dword + 1) * sizeof(WCHAR)); + static const WCHAR fmt[] = {'0','x','%','x',0}; + + buffer = heap_xalloc((zero_x_dword + 1) * sizeof(WCHAR)); sprintfW(buffer, fmt, *(DWORD *)src); break; } @@ -548,13 +573,13 @@ if (size_bytes <= two_wchars) { - buffer = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)); + buffer = heap_xalloc(sizeof(WCHAR)); *buffer = 0; return buffer; } tmp_size = size_bytes - two_wchars; /* exclude both null terminators */ - buffer = HeapAlloc(GetProcessHeap(), 0, tmp_size * 2 + sizeof(WCHAR)); + buffer = heap_xalloc(tmp_size * 2 + sizeof(WCHAR)); len = tmp_size / sizeof(WCHAR); for (i = 0, destindex = 0; i < len; i++, destindex++) @@ -588,10 +613,10 @@ static void output_value(const WCHAR *value_name, DWORD type, BYTE *data, DWORD data_size) { - WCHAR fmt[] = {' ',' ',' ',' ','%','1',0}; + static const WCHAR fmt[] = {' ',' ',' ',' ','%','1',0}; + static const WCHAR newlineW[] = {'\n',0}; WCHAR defval[32]; WCHAR *reg_data; - WCHAR newlineW[] = {'\n',0}; if (value_name && value_name[0]) output_string(fmt, value_name); @@ -606,7 +631,7 @@ { reg_data = reg_data_to_wchar(type, data, data_size); output_string(fmt, reg_data); - HeapFree(GetProcessHeap(), 0, reg_data); + heap_free(reg_data); } else { @@ -619,25 +644,23 @@ static WCHAR *build_subkey_path(WCHAR *path, DWORD path_len, WCHAR *subkey_name, DWORD subkey_len) { WCHAR *subkey_path; - WCHAR fmt[] = {'%','s','\\','%','s',0}; - - subkey_path = HeapAlloc(GetProcessHeap(), 0, (path_len + subkey_len + 2) * sizeof(WCHAR)); - if (!subkey_path) - { - ERR("Failed to allocate memory for subkey_path\n"); - return NULL; - } + static const WCHAR fmt[] = {'%','s','\\','%','s',0}; + + subkey_path = heap_xalloc((path_len + subkey_len + 2) * sizeof(WCHAR)); sprintfW(subkey_path, fmt, path, subkey_name); + return subkey_path; } static unsigned int num_values_found = 0; +#define MAX_SUBKEY_LEN 257 + static int query_value(HKEY key, WCHAR *value_name, WCHAR *path, BOOL recurse) { LONG rc; - DWORD num_subkeys, max_subkey_len, subkey_len; - DWORD max_data_bytes, data_size; + DWORD max_data_bytes = 2048, data_size; + DWORD subkey_len; DWORD type, path_len, i; BYTE *data; WCHAR fmt[] = {'%','1','\n',0}; @@ -645,23 +668,20 @@ WCHAR *subkey_name, *subkey_path; HKEY subkey; - rc = RegQueryInfoKeyW(key, NULL, NULL, NULL, &num_subkeys, &max_subkey_len, - NULL, NULL, NULL, &max_data_bytes, NULL, NULL); - if (rc) - { - ERR("RegQueryInfoKey failed: %d\n", rc); - return 1; - } - - data = HeapAlloc(GetProcessHeap(), 0, max_data_bytes); - if (!data) - { - ERR("Failed to allocate memory for data\n"); - return 1; - } - - data_size = max_data_bytes; - rc = RegQueryValueExW(key, value_name, NULL, &type, data, &data_size); + data = heap_xalloc(max_data_bytes); + + for (;;) + { + data_size = max_data_bytes; + rc = RegQueryValueExW(key, value_name, NULL, &type, data, &data_size); + if (rc == ERROR_MORE_DATA) + { + max_data_bytes = data_size; + data = heap_xrealloc(data, max_data_bytes); + } + else break; + } + if (rc == ERROR_SUCCESS) { output_string(fmt, path); @@ -670,7 +690,7 @@ num_values_found++; } - HeapFree(GetProcessHeap(), 0, data); + heap_free(data); if (!recurse) { @@ -687,19 +707,14 @@ return 0; } - max_subkey_len++; - subkey_name = HeapAlloc(GetProcessHeap(), 0, max_subkey_len * sizeof(WCHAR)); - if (!subkey_name) - { - ERR("Failed to allocate memory for subkey_name\n"); - return 1; - } + subkey_name = heap_xalloc(MAX_SUBKEY_LEN * sizeof(WCHAR)); path_len = strlenW(path); - for (i = 0; i < num_subkeys; i++) - { - subkey_len = max_subkey_len; + i = 0; + for (;;) + { + subkey_len = MAX_SUBKEY_LEN; rc = RegEnumKeyExW(key, i, subkey_name, &subkey_len, NULL, NULL, NULL, NULL); if (rc == ERROR_SUCCESS) { @@ -709,20 +724,22 @@ query_value(subkey, value_name, subkey_path, recurse); RegCloseKey(subkey); } - HeapFree(GetProcessHeap(), 0, subkey_path); - } - } - - HeapFree(GetProcessHeap(), 0, subkey_name); + heap_free(subkey_path); + i++; + } + else break; + } + + heap_free(subkey_name); return 0; } static int query_all(HKEY key, WCHAR *path, BOOL recurse) { LONG rc; - DWORD num_subkeys, max_subkey_len, subkey_len; - DWORD num_values, max_value_len, value_len; - DWORD max_data_bytes, data_size; + DWORD max_value_len = 256, value_len; + DWORD max_data_bytes = 2048, data_size; + DWORD subkey_len; DWORD i, type, path_len; WCHAR fmt[] = {'%','1','\n',0}; WCHAR fmt_path[] = {'%','1','\\','%','2','\n',0}; @@ -731,60 +748,52 @@ BYTE *data; HKEY subkey; - rc = RegQueryInfoKeyW(key, NULL, NULL, NULL, &num_subkeys, &max_subkey_len, NULL, - &num_values, &max_value_len, &max_data_bytes, NULL, NULL); - if (rc) - { - ERR("RegQueryInfoKey failed: %d\n", rc); - return 1; - } - output_string(fmt, path); - max_value_len++; - value_name = HeapAlloc(GetProcessHeap(), 0, max_value_len * sizeof(WCHAR)); - if (!value_name) - { - ERR("Failed to allocate memory for value_name\n"); - return 1; - } - - data = HeapAlloc(GetProcessHeap(), 0, max_data_bytes); - if (!data) - { - HeapFree(GetProcessHeap(), 0, value_name); - ERR("Failed to allocate memory for data\n"); - return 1; - } - - for (i = 0; i < num_values; i++) + value_name = heap_xalloc(max_value_len * sizeof(WCHAR)); + data = heap_xalloc(max_data_bytes); + + i = 0; + for (;;) { value_len = max_value_len; data_size = max_data_bytes; rc = RegEnumValueW(key, i, value_name, &value_len, NULL, &type, data, &data_size); if (rc == ERROR_SUCCESS) + { output_value(value_name, type, data, data_size); - } - - HeapFree(GetProcessHeap(), 0, data); - HeapFree(GetProcessHeap(), 0, value_name); - - if (num_values || recurse) + i++; + } + else if (rc == ERROR_MORE_DATA) + { + if (data_size > max_data_bytes) + { + max_data_bytes = data_size; + data = heap_xrealloc(data, max_data_bytes); + } + else + { + max_value_len *= 2; + value_name = heap_xrealloc(value_name, max_value_len * sizeof(WCHAR)); + } + } + else break; + } + + heap_free(data); + heap_free(value_name); + + if (i || recurse) output_string(newlineW); - max_subkey_len++; - subkey_name = HeapAlloc(GetProcessHeap(), 0, max_subkey_len * sizeof(WCHAR)); - if (!subkey_name) - { - ERR("Failed to allocate memory for subkey_name\n"); - return 1; - } + subkey_name = heap_xalloc(MAX_SUBKEY_LEN * sizeof(WCHAR)); path_len = strlenW(path); - for (i = 0; i < num_subkeys; i++) - { - subkey_len = max_subkey_len; + i = 0; + for (;;) + { + subkey_len = MAX_SUBKEY_LEN; rc = RegEnumKeyExW(key, i, subkey_name, &subkey_len, NULL, NULL, NULL, NULL); if (rc == ERROR_SUCCESS) { @@ -796,15 +805,17 @@ query_all(subkey, subkey_path, recurse); RegCloseKey(subkey); } - HeapFree(GetProcessHeap(), 0, subkey_path); + heap_free(subkey_path); } else output_string(fmt_path, path, subkey_name); - } - } - - HeapFree(GetProcessHeap(), 0, subkey_name); - - if (num_subkeys && !recurse) + i++; + } + else break; + } + + heap_free(subkey_name); + + if (i && !recurse) output_string(newlineW); return 0; @@ -855,13 +866,13 @@ if (!path) { - long_key = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)); + long_key = heap_xalloc((len + 1) * sizeof(WCHAR)); strcpyW(long_key, root_rels[i].long_name); return long_key; } len += strlenW(path) + 1; /* add one for the backslash */ - long_key = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)); + long_key = heap_xalloc((len + 1) * sizeof(WCHAR)); sprintfW(long_key, fmt, root_rels[i].long_name, path); return long_key; } @@ -900,32 +911,38 @@ enum operations { REG_ADD, REG_DELETE, + REG_IMPORT, REG_QUERY, REG_INVALID }; -static const WCHAR addW[] = {'a','d','d',0}; -static const WCHAR deleteW[] = {'d','e','l','e','t','e',0}; -static const WCHAR queryW[] = {'q','u','e','r','y',0}; - static enum operations get_operation(const WCHAR *str, int *op_help) { - if (!lstrcmpiW(str, addW)) - { - *op_help = STRING_ADD_USAGE; - return REG_ADD; - } - - if (!lstrcmpiW(str, deleteW)) - { - *op_help = STRING_DELETE_USAGE; - return REG_DELETE; - } - - if (!lstrcmpiW(str, queryW)) - { - *op_help = STRING_QUERY_USAGE; - return REG_QUERY; + struct op_info { const WCHAR *op; int id; int help_id; }; + + static const WCHAR add[] = {'a','d','d',0}; + static const WCHAR delete[] = {'d','e','l','e','t','e',0}; + static const WCHAR import[] = {'i','m','p','o','r','t',0}; + static const WCHAR query[] = {'q','u','e','r','y',0}; + + static const struct op_info op_array[] = + { + { add, REG_ADD, STRING_ADD_USAGE }, + { delete, REG_DELETE, STRING_DELETE_USAGE }, + { import, REG_IMPORT, STRING_IMPORT_USAGE }, + { query, REG_QUERY, STRING_QUERY_USAGE }, + { NULL, -1, 0 } + }; + + const struct op_info *ptr; + + for (ptr = op_array; ptr->op; ptr++) + { + if (!lstrcmpiW(str, ptr->op)) + { + *op_help = ptr->help_id; + return ptr->id; + } } return REG_INVALID; @@ -966,7 +983,7 @@ if (argc > 2) show_op_help = is_help_switch(argvW[2]); - if (argc == 2 || (show_op_help && argc > 3)) + if (argc == 2 || ((show_op_help || op == REG_IMPORT) && argc > 3)) { output_message(STRING_INVALID_SYNTAX); output_message(STRING_FUNC_HELP, struprW(argvW[1])); @@ -977,6 +994,9 @@ output_message(op_help); return 0; } + + if (op == REG_IMPORT) + return reg_import(argvW[2]); if (!parse_registry_key(argvW[2], &root, &path, &key_name)) return 1; @@ -1061,7 +1081,7 @@ ret = reg_add(root, path, value_name, value_empty, type, separator, data, force); else if (op == REG_DELETE) ret = reg_delete(root, path, key_name, value_name, value_empty, value_all, force); - else if (op == REG_QUERY) + else ret = reg_query(root, path, key_name, value_name, value_empty, recurse); return ret; } Modified: trunk/reactos/base/applications/cmdutils/reg/reg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/reg.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/reg.h [iso-8859-1] Sun Sep 24 11:33:04 2017 @@ -1,7 +1,5 @@ /* - * REG.EXE - Wine-compatible reg program. - * - * Copyright 2008 Andrew Riedi + * Copyright 2017 Hugh McMaster * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,39 +16,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma once +#ifndef __REG_H__ +#define __REG_H__ -//#include <windef.h> +#include "resource.h" -/* Translation IDs. */ -#define STRING_USAGE 101 -#define STRING_ADD_USAGE 102 -#define STRING_DELETE_USAGE 103 -#define STRING_QUERY_USAGE 104 -#define STRING_SUCCESS 105 -#define STRING_INVALID_KEY 106 -#define STRING_INVALID_CMDLINE 107 -#define STRING_NO_REMOTE 108 -#define STRING_CANNOT_FIND 109 -#define STRING_UNSUPPORTED_TYPE 110 -#define STRING_MISSING_INTEGER 111 -#define STRING_MISSING_HEXDATA 112 -#define STRING_UNHANDLED_TYPE 113 -#define STRING_OVERWRITE_VALUE 114 -#define STRING_YESNO 115 -#define STRING_YES 116 -#define STRING_NO 117 -#define STRING_CANCELLED 118 -#define STRING_DEFAULT_VALUE 119 -#define STRING_DELETE_VALUE 120 -#define STRING_DELETE_VALUEALL 121 -#define STRING_DELETE_SUBKEY 122 -#define STRING_INVALID_STRING 123 -#define STRING_VALUEALL_FAILED 124 -#define STRING_GENERAL_FAILURE 125 -#define STRING_MATCHES_FOUND 126 -#define STRING_INVALID_SYNTAX 127 -#define STRING_INVALID_OPTION 128 -#define STRING_REG_HELP 129 -#define STRING_FUNC_HELP 130 -#define STRING_VALUE_NOT_SET 131 +#define ARRAY_SIZE(A) (sizeof(A)/sizeof(*A)) + +/* reg.c */ +void *heap_xalloc(size_t size); +void *heap_xrealloc(void *buf, size_t size); +BOOL heap_free(void *buf); +void __cdecl output_message(unsigned int id, ...); +HKEY path_get_rootkey(const WCHAR *path); + +/* import.c */ +int reg_import(const WCHAR *filename); + +#endif /* __REG_H__ */ Added: trunk/reactos/base/applications/cmdutils/reg/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/resource.h (added) +++ trunk/reactos/base/applications/cmdutils/reg/resource.h [iso-8859-1] Sun Sep 24 11:33:04 2017 @@ -0,0 +1,60 @@ +/* + * REG.EXE - Wine-compatible reg program. + * + * Copyright 2008 Andrew Riedi + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma once + +//#include <windef.h> + +/* Translation IDs. */ +#define STRING_USAGE 101 +#define STRING_ADD_USAGE 102 +#define STRING_DELETE_USAGE 103 +#define STRING_QUERY_USAGE 104 +#define STRING_SUCCESS 105 +#define STRING_INVALID_KEY 106 +#define STRING_INVALID_CMDLINE 107 +#define STRING_NO_REMOTE 108 +#define STRING_CANNOT_FIND 109 +#define STRING_UNSUPPORTED_TYPE 110 +#define STRING_MISSING_INTEGER 111 +#define STRING_MISSING_HEXDATA 112 +#define STRING_UNHANDLED_TYPE 113 +#define STRING_OVERWRITE_VALUE 114 +#define STRING_YESNO 115 +#define STRING_YES 116 +#define STRING_NO 117 +#define STRING_CANCELLED 118 +#define STRING_DEFAULT_VALUE 119 +#define STRING_DELETE_VALUE 120 +#define STRING_DELETE_VALUEALL 121 +#define STRING_DELETE_SUBKEY 122 +#define STRING_INVALID_STRING 123 +#define STRING_VALUEALL_FAILED 124 +#define STRING_GENERAL_FAILURE 125 +#define STRING_MATCHES_FOUND 126 +#define STRING_INVALID_SYNTAX 127 +#define STRING_INVALID_OPTION 128 +#define STRING_REG_HELP 129 +#define STRING_FUNC_HELP 130 +#define STRING_VALUE_NOT_SET 131 +#define STRING_IMPORT_USAGE 132 +#define STRING_FILE_NOT_FOUND 133 +#define STRING_OPEN_KEY_FAILED 134 +#define STRING_ESCAPE_SEQUENCE 135 Propchange: trunk/reactos/base/applications/cmdutils/reg/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Sep 24 11:33:04 2017 @@ -227,7 +227,7 @@ ReactOS shares the following programs with Winehq. reactos/base/applications/cmdutils/cscript # Synced to WineStaging-2.9 -reactos/base/applications/cmdutils/reg # Synced to WineStaging-2.9 +reactos/base/applications/cmdutils/reg # Synced to WineStaging-2.16 reactos/base/applications/cmdutils/schtasks # Synced to WineStaging-2.9 reactos/base/applications/cmdutils/taskkill # Synced to WineStaging-2.9 reactos/base/applications/cmdutils/wmic # Synced to WineStaging-2.9

1 0

[akhaldi] 75957: [PSDK] Update winreg.h. CORE-13762
by akhaldi＠svn.reactos.org 24 Sep '17

24 Sep '17

Author: akhaldi Date: Sun Sep 24 11:32:16 2017 New Revision: 75957 URL: http://svn.reactos.org/svn/reactos?rev=75957&view=rev Log: [PSDK] Update winreg.h. CORE-13762 Modified: trunk/reactos/sdk/include/psdk/winreg.h Modified: trunk/reactos/sdk/include/psdk/winreg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/winreg.h?… ============================================================================== --- trunk/reactos/sdk/include/psdk/winreg.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/winreg.h [iso-8859-1] Sun Sep 24 11:32:16 2017 @@ -7,13 +7,16 @@ #include <reason.h> -#define HKEY_CLASSES_ROOT ((HKEY)0x80000000) -#define HKEY_CURRENT_USER ((HKEY)0x80000001) -#define HKEY_LOCAL_MACHINE ((HKEY)0x80000002) -#define HKEY_USERS ((HKEY)0x80000003) -#define HKEY_PERFORMANCE_DATA ((HKEY)0x80000004) -#define HKEY_CURRENT_CONFIG ((HKEY)0x80000005) -#define HKEY_DYN_DATA ((HKEY)0x80000006) +#define HKEY_CLASSES_ROOT ((HKEY)(LONG_PTR)(LONG)0x80000000) +#define HKEY_CURRENT_USER ((HKEY)(LONG_PTR)(LONG)0x80000001) +#define HKEY_LOCAL_MACHINE ((HKEY)(LONG_PTR)(LONG)0x80000002) +#define HKEY_USERS ((HKEY)(LONG_PTR)(LONG)0x80000003) +#define HKEY_PERFORMANCE_DATA ((HKEY)(LONG_PTR)(LONG)0x80000004) +#define HKEY_CURRENT_CONFIG ((HKEY)(LONG_PTR)(LONG)0x80000005) +#define HKEY_DYN_DATA ((HKEY)(LONG_PTR)(LONG)0x80000006) +#define HKEY_PERFORMANCE_TEXT ((HKEY)(LONG_PTR)(LONG)0x80000050) +#define HKEY_PERFORMANCE_NLSTEXT ((HKEY)(LONG_PTR)(LONG)0x80000060) + #define REG_OPTION_VOLATILE 1 #define REG_OPTION_NON_VOLATILE 0 #define REG_CREATED_NEW_KEY 1

1 0

[akhaldi] 75956: [XMLLITE_WINETEST] Addendum to r75951.
by akhaldi＠svn.reactos.org 24 Sep '17

24 Sep '17

Author: akhaldi Date: Sun Sep 24 11:27:47 2017 New Revision: 75956 URL: http://svn.reactos.org/svn/reactos?rev=75956&view=rev Log: [XMLLITE_WINETEST] Addendum to r75951. Modified: trunk/rostests/winetests/xmllite/writer.c Modified: trunk/rostests/winetests/xmllite/writer.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/xmllite/writer.… ============================================================================== --- trunk/rostests/winetests/xmllite/writer.c [iso-8859-1] (original) +++ trunk/rostests/winetests/xmllite/writer.c [iso-8859-1] Sun Sep 24 11:27:47 2017 @@ -394,7 +394,7 @@ ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); /* TODO: WriteSurrogateCharEntity */ - /* ???TODO: WriteWhitespace */ + /* ÙÙÙTODO: WriteWhitespace */ hr = IXmlWriter_Flush(writer); ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr);

1 0

[akhaldi] 75955: [FREETYPE] Update to v2.8.1. CORE-13825
by akhaldi＠svn.reactos.org 24 Sep '17

24 Sep '17

Author: akhaldi Date: Sun Sep 24 11:20:15 2017 New Revision: 75955 URL: http://svn.reactos.org/svn/reactos?rev=75955&view=rev Log: [FREETYPE] Update to v2.8.1. CORE-13825 Modified: trunk/reactos/media/doc/3rd Party Files.txt trunk/reactos/sdk/lib/3rdparty/freetype/ChangeLog trunk/reactos/sdk/lib/3rdparty/freetype/README trunk/reactos/sdk/lib/3rdparty/freetype/devel/ftoption.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/config/ftoption.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/freetype.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/ftautoh.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/fterrdef.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/fterrors.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/ftglyph.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/ftimage.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/ftlcdfil.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/ftmac.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/ftmm.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/ftoutln.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/internal/ftcalc.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/internal/ftobjs.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/tttags.h trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afblue.c trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afblue.dat trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afblue.h trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afcjk.c trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afhints.c trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/aflatin.c trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/aflatin2.c trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afloader.c trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afmodule.c trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afscript.h trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afshaper.c trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afstyles.h trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftbitmap.c trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftcalc.c trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftglyph.c trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftlcdfil.c trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftmac.c trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftmm.c trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftobjs.c trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftoutln.c trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftrfork.c trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftsynth.c trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftutil.c trunk/reactos/sdk/lib/3rdparty/freetype/src/bdf/bdfdrivr.c trunk/reactos/sdk/lib/3rdparty/freetype/src/bdf/bdflib.c trunk/reactos/sdk/lib/3rdparty/freetype/src/cache/ftcbasic.c trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cf2blues.c trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cf2blues.h trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cf2fixed.h trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cf2font.c trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cf2ft.c trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cf2hints.c trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cf2intrp.c trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cffgload.c trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cffload.c trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cffparse.c trunk/reactos/sdk/lib/3rdparty/freetype/src/gxvalid/README trunk/reactos/sdk/lib/3rdparty/freetype/src/pcf/README trunk/reactos/sdk/lib/3rdparty/freetype/src/pcf/pcfdrivr.c trunk/reactos/sdk/lib/3rdparty/freetype/src/pcf/pcfread.c trunk/reactos/sdk/lib/3rdparty/freetype/src/pfr/pfrobjs.c trunk/reactos/sdk/lib/3rdparty/freetype/src/psaux/psconv.c trunk/reactos/sdk/lib/3rdparty/freetype/src/psaux/t1decode.c trunk/reactos/sdk/lib/3rdparty/freetype/src/psnames/psmodule.c trunk/reactos/sdk/lib/3rdparty/freetype/src/psnames/pstables.h trunk/reactos/sdk/lib/3rdparty/freetype/src/raster/ftrend1.c trunk/reactos/sdk/lib/3rdparty/freetype/src/sfnt/pngshim.c trunk/reactos/sdk/lib/3rdparty/freetype/src/sfnt/sfobjs.c trunk/reactos/sdk/lib/3rdparty/freetype/src/sfnt/ttcmap.c trunk/reactos/sdk/lib/3rdparty/freetype/src/sfnt/ttcmap.h trunk/reactos/sdk/lib/3rdparty/freetype/src/sfnt/ttkern.c trunk/reactos/sdk/lib/3rdparty/freetype/src/sfnt/ttpost.c trunk/reactos/sdk/lib/3rdparty/freetype/src/sfnt/ttsbit.c trunk/reactos/sdk/lib/3rdparty/freetype/src/smooth/ftgrays.c trunk/reactos/sdk/lib/3rdparty/freetype/src/smooth/ftsmooth.c trunk/reactos/sdk/lib/3rdparty/freetype/src/tools/glnames.py trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttgload.c trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttgxvar.c trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttinterp.c trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttinterp.h trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttobjs.c trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttpload.c trunk/reactos/sdk/lib/3rdparty/freetype/src/type1/t1load.c trunk/reactos/sdk/lib/3rdparty/freetype/src/type1/t1objs.c trunk/reactos/sdk/lib/3rdparty/freetype/src/type42/t42objs.c trunk/reactos/sdk/lib/3rdparty/freetype/src/winfonts/winfnt.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/media/doc/3rd Party Files.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/3rd%20Party%20Fi… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/ChangeLog URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/README URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/devel/ftoption.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/config/ftoption.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/freetype.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/ftautoh.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/fterrdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/fterrors.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/ftglyph.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/ftimage.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/ftlcdfil.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/ftmac.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/ftmm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/ftoutln.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/internal/ftcalc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/internal/ftobjs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/tttags.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afblue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afblue.dat URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afblue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afcjk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afhints.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/aflatin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/aflatin2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afloader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afmodule.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afscript.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afshaper.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afstyles.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftbitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftcalc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftglyph.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftlcdfil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftmac.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftmm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftoutln.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftrfork.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftsynth.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/bdf/bdfdrivr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/bdf/bdflib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cache/ftcbasic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cf2blues.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cf2blues.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cf2fixed.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cf2font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cf2ft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cf2hints.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cf2intrp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cffgload.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cffload.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cffparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/gxvalid/README URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/pcf/README URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/pcf/pcfdrivr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/pcf/pcfread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/pfr/pfrobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/psaux/psconv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/psaux/t1decode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/psnames/psmodule.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/psnames/pstables.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/raster/ftrend1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/sfnt/pngshim.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/sfnt/sfobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/sfnt/ttcmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/sfnt/ttcmap.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/sfnt/ttkern.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/sfnt/ttpost.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/sfnt/ttsbit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/smooth/ftgrays.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/smooth/ftsmooth.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/tools/glnames.py URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttgload.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttgxvar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttinterp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttinterp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttpload.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/type1/t1load.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/type1/t1objs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/type42/t42objs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/winfonts/winfnt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/…

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs