Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 65787: [WHOAMI] Add preliminary version of whoami utility by Ismael Ferreras Morezuelas (with some changes by me). CORE-8533
by akhaldi＠svn.reactos.org 21 Dec '14

21 Dec '14

Author: akhaldi Date: Sun Dec 21 23:10:46 2014 New Revision: 65787 URL: http://svn.reactos.org/svn/reactos?rev=65787&view=rev Log: [WHOAMI] Add preliminary version of whoami utility by Ismael Ferreras Morezuelas (with some changes by me). CORE-8533 Added: trunk/reactos/base/applications/cmdutils/whoami/ trunk/reactos/base/applications/cmdutils/whoami/CMakeLists.txt (with props) trunk/reactos/base/applications/cmdutils/whoami/lang/ trunk/reactos/base/applications/cmdutils/whoami/lang/en-US.rc (with props) trunk/reactos/base/applications/cmdutils/whoami/lang/es-ES.rc (with props) trunk/reactos/base/applications/cmdutils/whoami/resource.h (with props) trunk/reactos/base/applications/cmdutils/whoami/whoami.c (with props) trunk/reactos/base/applications/cmdutils/whoami/whoami.rc (with props) Modified: trunk/reactos/base/applications/cmdutils/CMakeLists.txt 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 Dec 21 23:10:46 2014 @@ -12,6 +12,7 @@ add_subdirectory(sort) add_subdirectory(taskkill) add_subdirectory(tree) +add_subdirectory(whoami) add_subdirectory(wmic) add_subdirectory(wscript) add_subdirectory(xcopy) Added: trunk/reactos/base/applications/cmdutils/whoami/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/whoami/CMakeLists.txt (added) +++ trunk/reactos/base/applications/cmdutils/whoami/CMakeLists.txt [iso-8859-1] Sun Dec 21 23:10:46 2014 @@ -0,0 +1,5 @@ + +add_executable(whoami whoami.c whoami.rc) +set_module_type(whoami win32cui UNICODE) +add_importlibs(whoami user32 secur32 advapi32 msvcrt kernel32) +add_cd_file(TARGET whoami DESTINATION reactos/system32 FOR all) Propchange: trunk/reactos/base/applications/cmdutils/whoami/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/whoami/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/whoami/lang/en-US.rc (added) +++ trunk/reactos/base/applications/cmdutils/whoami/lang/en-US.rc [iso-8859-1] Sun Dec 21 23:10:46 2014 @@ -0,0 +1,56 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE +BEGIN + IDS_USER_HEADER "USER INFORMATION" + IDS_GROU_HEADER "GROUP INFORMATION" + IDS_PRIV_HEADER "PRIVILEGES INFORMATION" + IDS_COL_USER_NAME "User Name" + IDS_COL_GROUP_NAME "Group Name" + IDS_COL_TYPE "Type" + IDS_COL_SID "SID" + IDS_COL_ATTRIB "Attributes" + IDS_COL_PRIV_NAME "Privilege Name" + IDS_COL_DESCRIPTION "Description" + IDS_COL_STATE "State" + IDS_TP_WELL_KNOWN_GROUP "Well-known group" + IDS_TP_ALIAS "Alias" + IDS_TP_LABEL "Label" + + /* [!] important note from the programmer: the program tries to remove + the last ', ' after concatenating, so keep than in mind when translating. + + you can test your translation of these attributes by using 'whoami /groups' */ + + IDS_ATTR_GROUP_MANDATORY "Mandatory group, " + IDS_ATTR_GROUP_ENABLED_BY_DEFAULT "Enabled by default, " + IDS_ATTR_GROUP_ENABLED "Enabled group, " + IDS_ATTR_GROUP_OWNER "Group owner, " + IDS_UNKNOWN_DESCRIPTION "???" + IDS_STATE_ENABLED "Enabled" + IDS_STATE_DISABLED "Disabled" + IDS_ERROR_UPN "ERROR: Unable to get User Principal Name (UPN) as the current logged-on user\nis not a domain user.\n" + IDS_ERROR_FQDN "ERROR: Unable to get Fully Qualified Distinguished Name (FQDN) as the current\nlogged-on user is not a domain user.\n" + IDS_ERROR_VALUEXPECTED "ERROR: Invalid syntax. Value expected for '/fo'.\nType ""WHOAMI /?"" for usage.\n" + IDS_ERROR_VALUENOTALLOWED "ERROR: Invalid syntax. '%s' value is not allowed for '/fo' option.\nType ""WHOAMI /?"" for usage.\n" + IDS_ERROR_1TIMES "ERROR: Invalid syntax. '%s' option is not allowed more than '1' time(s).\nType ""WHOAMI /?"" for usage.\n" + IDS_ERROR_INVALIDSYNTAX "ERROR: Invalid syntax.\nType ""WHOAMI /?"" for usage.\n" + IDS_ERROR_INVALIDARG "ERROR: Invalid argument/option - '%s'.\nType ""WHOAMI /?"" for usage.\n" + IDS_ERROR_NH_LIST "ERROR: /NH switch cannot be used with the LIST format.\nType ""WHOAMI /?"" for usage.\n" + IDS_HELP "DESCRIPTION:\n\ + Display user, group and privileges information for the local logged-on user.\n\ + If no arguments are provided, displays the current domain and user name.\n\ + \n\ + Available output formats for the '/fo' option are 'csv', 'list' and 'table'.\n\ + Use '/nh' to hide headers. By default the data is displayed in a table.\n\ + \n\ + SYNTAX:\n\ + whoami [/upn | /fqdn | /logonid] \n\ + whoami {[/user] [/groups] [/priv]} [/fo <Format>] [/nh] \n\ + whoami /all [/fo <Format>] [/nh] \n\ + \n\ + EXAMPLES: \n\ + whoami /groups /priv /nh /fo csv \n\ + whoami /logonid \n\ + whoami \n" +END Propchange: trunk/reactos/base/applications/cmdutils/whoami/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/whoami/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/whoami/lang/es-ES.rc (added) +++ trunk/reactos/base/applications/cmdutils/whoami/lang/es-ES.rc [iso-8859-1] Sun Dec 21 23:10:46 2014 @@ -0,0 +1,58 @@ +/* Spanish translation by Swyter */ +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_USER_HEADER "INFORMACIÃN DE USUARIO" + IDS_GROU_HEADER "INFORMACIÃN DE GRUPO" + IDS_PRIV_HEADER "INFORMACIÃN DE PRIVILEGIOS" + IDS_COL_USER_NAME "Nombre de usuario" + IDS_COL_GROUP_NAME "Nombre de grupo" + IDS_COL_TYPE "Tipo" + IDS_COL_SID "SID" + IDS_COL_ATTRIB "Atributos" + IDS_COL_PRIV_NAME "Nombre de privilegio" + IDS_COL_DESCRIPTION "DescripciÃ³n" + IDS_COL_STATE "Estado" + IDS_TP_WELL_KNOWN_GROUP "Grupo conocido" + IDS_TP_ALIAS "Alias" + IDS_TP_LABEL "Etiqueta" + + /* [!] important note from the programmer: the program tries to remove + the last ', ' after concatenating, so keep than in mind when translating. + + you can test your translation of these attributes by using 'whoami /groups' */ + + IDS_ATTR_GROUP_MANDATORY "Grupo obligatorio, " + IDS_ATTR_GROUP_ENABLED_BY_DEFAULT "Habilitado de manera predeterminada, " + IDS_ATTR_GROUP_ENABLED "Grupo habilitado, " + IDS_ATTR_GROUP_OWNER "Propietario de grupo, " + IDS_UNKNOWN_DESCRIPTION "Â¿?" + IDS_STATE_ENABLED "Habilitada" + IDS_STATE_DISABLED "Deshabilitado" + IDS_ERROR_UPN "ERROR: no se puede obtener el nombre principal de usuario (UPN) porque el\nusuario que ha iniciado sesiÃ³n no es un usuario de dominio.\n" + IDS_ERROR_FQDN "ERROR: no se puede obtener el nombre distintivo completo (FQDN) porque el usuario\nque ha iniciado sesiÃ³n no es un usuario de dominio.\n" + IDS_ERROR_VALUEXPECTED "ERROR: Sintaxis no vÃ¡lida. Se esperaba un valor para ""/fo"".\nEscriba ""WHOAMI /?"" para su uso.\n" + IDS_ERROR_VALUENOTALLOWED "ERROR: Sintaxis no vÃ¡lida. El valor ""%s"" no estÃ¡ permitido para la opciÃ³n ""/fo"".\nEscriba ""WHOAMI /?"" para su uso.\n" + IDS_ERROR_1TIMES "ERROR: Sintaxis no vÃ¡lida. La opciÃ³n ""%s"" no estÃ¡ permitida mÃ¡s de ""1"" veces.\nEscriba ""WHOAMI /?"" para su uso.\n" + IDS_ERROR_INVALIDSYNTAX "ERROR: sintaxis no vÃ¡lida.\nEscriba ""WHOAMI /?"" para obtener detalles de uso.\n" + IDS_ERROR_INVALIDARG "ERROR: Argumento u opciÃ³n no vÃ¡lido - ""%s"".\nEscriba ""WHOAMI /?"" para su uso.\n" + IDS_ERROR_NH_LIST "ERROR: no se puede usar el modificador /NH con el formato LIST.\nEscriba ""WHOAMI /?"" para obtener detalles de uso.\n" + IDS_HELP "DESCRIPCIÃN:\n\ + Muestra informaciÃ³n sobre el usuario local, sus privilegios y grupos.\n\ + Si no se aÃ±aden argumentos se mostrarÃ¡ el usuario y dominio actual.\n\ + \n\ + Los formatos disponibles para '/fo' son 'csv', 'list' y 'table'.\n\ + Por defecto los datos se muestran en una tabla (opciÃ³n 'table').\n\ + Puedes utilizar '/nh' para ocultar los encabezados. \n\ + \n\ + SINTAXIS:\n\ + whoami [/upn | /fqdn | /logonid] \n\ + whoami {[/user] [/groups] [/priv]} [/fo <Formato>] [/nh] \n\ + whoami /all [/fo <Formato>] [/nh] \n\ + \n\ + EJEMPLOS: \n\ + whoami /groups /priv /nh /fo csv \n\ + whoami /logonid \n\ + whoami \n" +END Propchange: trunk/reactos/base/applications/cmdutils/whoami/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/whoami/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/whoami/resource.h (added) +++ trunk/reactos/base/applications/cmdutils/whoami/resource.h [iso-8859-1] Sun Dec 21 23:10:46 2014 @@ -0,0 +1,39 @@ +#pragma once + +#define IDS_USER_HEADER 0 +#define IDS_GROU_HEADER 1 +#define IDS_PRIV_HEADER 2 + +#define IDS_COL_USER_NAME 3 +#define IDS_COL_GROUP_NAME 4 +#define IDS_COL_TYPE 5 +#define IDS_COL_SID 6 +#define IDS_COL_ATTRIB 7 +#define IDS_COL_PRIV_NAME 8 +#define IDS_COL_DESCRIPTION 9 +#define IDS_COL_STATE 10 + +#define IDS_TP_WELL_KNOWN_GROUP 11 +#define IDS_TP_ALIAS 12 +#define IDS_TP_LABEL 13 + +#define IDS_ATTR_GROUP_MANDATORY 14 +#define IDS_ATTR_GROUP_ENABLED_BY_DEFAULT 15 +#define IDS_ATTR_GROUP_ENABLED 16 +#define IDS_ATTR_GROUP_OWNER 17 + +#define IDS_UNKNOWN_DESCRIPTION 18 + +#define IDS_STATE_ENABLED 19 +#define IDS_STATE_DISABLED 20 + +#define IDS_ERROR_UPN 21 +#define IDS_ERROR_FQDN 22 +#define IDS_ERROR_VALUEXPECTED 23 +#define IDS_ERROR_VALUENOTALLOWED 24 +#define IDS_ERROR_1TIMES 25 +#define IDS_ERROR_INVALIDSYNTAX 26 +#define IDS_ERROR_INVALIDARG 27 +#define IDS_ERROR_NH_LIST 28 + +#define IDS_HELP 29 Propchange: trunk/reactos/base/applications/cmdutils/whoami/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/whoami/whoami.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/whoami/whoami.c (added) +++ trunk/reactos/base/applications/cmdutils/whoami/whoami.c [iso-8859-1] Sun Dec 21 23:10:46 2014 @@ -0,0 +1,899 @@ +/* + * PROJECT: ReactOS Whoami + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/cmdutils/whoami/whoami.c + * PURPOSE: Displays information about the current local user, groups and privileges. + * PROGRAMMERS: Ismael Ferreras Morezuelas (swyterzone+ros(a)gmail.com) + */ + + +#define SECURITY_WIN32 +#include <security.h> +#include <sddl.h> + +#include <strsafe.h> + +#include "resource.h" + +BOOL NoHeader = FALSE; +UINT NoHeaderArgCount = 0; +UINT PrintFormatArgCount = 0; + +enum +{ + undefined, + table, + list, + csv +} PrintFormat = undefined; + + +BOOL GetArgument(WCHAR* arg, int argc, WCHAR* argv[]) +{ + int i; + + if (!arg) + goto BailOut; + + for (i = 1; i < argc; i++) + { + if (wcsicmp(argv[i], arg) == 0) + return TRUE; + } + + BailOut: + return FALSE; +} + +/* blanking out the accepted modifiers will make filtering easier later on */ +void BlankArgument(int argc, WCHAR* argv[]) +{ + argv[argc] = L""; +} + +/* helper functions; let's keep it tidy to avoid redundancies */ + +LPWSTR WhoamiGetUser(EXTENDED_NAME_FORMAT NameFormat) +{ + LPWSTR UsrBuf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, MAX_PATH); + ULONG UsrSiz = MAX_PATH; + + if (UsrBuf && GetUserNameExW(NameFormat, UsrBuf, &UsrSiz)) + { + CharLowerW(UsrBuf); + return UsrBuf; + } + + return NULL; +} + +BOOL WhoamiFree(VOID* Buffer) +{ + return HeapFree(GetProcessHeap(), 0, Buffer); +} + + +VOID* WhoamiGetTokenInfo(TOKEN_INFORMATION_CLASS TokenType) +{ + HANDLE hToken = 0; + DWORD dwLength = 0; + VOID* pTokenInfo = 0; + + if (OpenProcessToken(GetCurrentProcess(), TOKEN_READ, &hToken)) + { + GetTokenInformation(hToken, + TokenType, + NULL, + dwLength, + &dwLength); + + if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + pTokenInfo = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwLength); + if (pTokenInfo == NULL) + { + wprintf(L"ERROR: not enough memory to allocate the token structure.\r\n"); + exit(1); + } + } + + if (!GetTokenInformation(hToken, TokenType, + (LPVOID)pTokenInfo, + dwLength, + &dwLength)) + { + wprintf(L"ERROR 0x%x: could not get token information.\r\n", GetLastError()); + exit(1); + } + + CloseHandle(hToken); + } + + return pTokenInfo; +} + +LPWSTR WhoamiLoadRcString(INT ResId) +{ + #define RC_STRING_MAX_SIZE 850 + static WCHAR TmpBuffer[RC_STRING_MAX_SIZE]; + + LoadStringW(GetModuleHandleW(NULL), ResId, TmpBuffer, RC_STRING_MAX_SIZE); + + return TmpBuffer; +} + +void WhoamiPrintHeader(int HeaderId) +{ + PWSTR Header = WhoamiLoadRcString(HeaderId); + DWORD Length = wcslen(Header); + + if (NoHeader || PrintFormat == csv) + return; + + wprintf(L"\n%s\n", Header); + + while (Length--) + wprintf(L"-"); + + _putws(L"\n"); +} + +typedef struct +{ + UINT Rows; + UINT Cols; + LPWSTR Content[1]; +} WhoamiTable; + +/* create and prepare a new table for printing */ +WhoamiTable *WhoamiAllocTable(UINT Rows, UINT Cols) +{ + WhoamiTable *pTable = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(WhoamiTable) + sizeof(LPWSTR) * Rows * Cols); + + // wprintf(L"DEBUG: Allocating %dx%d elem table for printing.\r\n\r\n", Rows, Cols); + + if (!pTable) + { + wprintf(L"ERROR: Not enough memory for displaying the table."); + exit(1); + } + + pTable->Rows = Rows; + pTable->Cols = Cols; + + return pTable; +} + +/* allocate and fill a new entry in the table */ +void WhoamiSetTable(WhoamiTable *pTable, WCHAR *Entry, UINT Row, UINT Col) +{ + LPWSTR Target = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + 1 + wcslen(Entry) * sizeof(Entry[0])); + + // wprintf(L"DEBUG: Setting table value '%lp' '%ls' for %lu %lu.\n", entry, entry, row, col); + + if (!Target) + exit(1); + + wcscpy(Target, Entry); + + pTable->Content[Row * pTable->Cols + Col] = Target; +} + +/* fill a new entry in the table */ +void WhoamiSetTableDyn(WhoamiTable *pTable, WCHAR *Entry, UINT Row, UINT Col) +{ + pTable->Content[Row * pTable->Cols + Col] = Entry; +} + +/* print and deallocate the table */ +void WhoamiPrintTable(WhoamiTable *pTable) +{ + UINT i, j; + UINT CurRow, CurCol; + UINT *ColLength; + + + if (!pTable) + { + wprintf(L"ERROR: The table passed for display is empty."); + exit(1); + } + + /* if we are going to print a *list* or *table*; take note of the total + column size, as we will need it later on when printing them in a tabular + fashion, according to their windows counterparts */ + + if (PrintFormat != csv) + { + ColLength = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(UINT) * pTable->Cols); + + if (PrintFormat == list) + { + for (j = 0; j < pTable->Cols; j++) + if (pTable->Content[j]) + { + UINT ThisLength = wcslen(pTable->Content[j]); + + /* now that we're here, seize the opportunity and add those pesky ":" */ + pTable->Content[j][ThisLength++] = L':'; + pTable->Content[j][ThisLength] = UNICODE_NULL; + + ColLength[0] = max(ThisLength, ColLength[0]); + } + } + else + { + for (j = 0; j < pTable->Cols; j++) + for (i = 0; i < pTable->Rows; i++) + if (pTable->Content[i * pTable->Cols + j]) + { + UINT ThisLength = wcslen(pTable->Content[i * pTable->Cols + j]); + ColLength[j] = max(ThisLength, ColLength[j]); + } + } + } + + switch (PrintFormat) + { + case csv: + { + for (i = 0; i < pTable->Rows; i++) + { + if (!pTable->Content[i * pTable->Cols]) + continue; + + /* if the user especified /nh then skip the column labels */ + if (NoHeader && i == 0) + continue; + + for (j = 0; j < pTable->Cols; j++) + { + if (pTable->Content[i * pTable->Cols + j]) + { + wprintf(L"\"%s\"%s", + pTable->Content[i * pTable->Cols + j], + (j+1 < pTable->Cols ? L"," : L"")); + } + } + wprintf(L"\n"); + } + + break; + + } + + case list: + { + UINT FinalRow = 0; + + /* fixme: we need to do two passes to find out which entry is the last one shown, or not null this is not exactly optimal */ + for (CurRow = 1; CurRow < pTable->Rows; CurRow++) + { + /* if the first member of this row isn't available, then forget it */ + if (!pTable->Content[CurRow * pTable->Cols]) + continue; + + FinalRow = CurRow; + } + + for (CurRow = 1; CurRow < pTable->Rows; CurRow++) + { + /* if the first member of this row isn't available, then forget it */ + if (!pTable->Content[CurRow * pTable->Cols]) + continue; + + /* if the user especified /nh then skip the column labels */ + if (NoHeader && i == 0) + continue; + + for (CurCol = 0; CurCol < pTable->Cols; CurCol++) + { + wprintf(L"%-*s %s\n", + ColLength[0], + pTable->Content[CurCol], + pTable->Content[CurRow * pTable->Cols + CurCol]); + } + + /* don't add two carriage returns at the very end */ + if (CurRow != FinalRow) + wprintf(L"\n"); + } + + break; + } + + + case table: + default: + { + for (i = 0; i < pTable->Rows; i++) + { + /* if the first member of this row isn't available, then forget it */ + if (!pTable->Content[i * pTable->Cols]) + continue; + + /* if the user especified /nh then skip the column labels too */ + if (NoHeader && i == 0) + continue; + + for (j = 0; j < pTable->Cols; j++) + { + if (pTable->Content[i * pTable->Cols + j]) + { + wprintf(L"%-*s ", ColLength[j], pTable->Content[i * pTable->Cols + j]); + } + } + wprintf(L"\n"); + + /* add the cute underline thingie for the table header */ + if (i == 0) + { + for (j = 0; j < pTable->Cols; j++) + { + DWORD Length = ColLength[j]; + + while (Length--) + wprintf(L"="); + + /* a spacing between all the columns except for the last one */ + if (pTable->Cols != (i + 1)) + wprintf(L" "); + } + + wprintf(L"\n"); + } + } + + } + } + + /* fixme: when many tables are displayed in a single run we + have to sandwich carriage returns in between. */ + // if (!final_entry) + wprintf(L"\n"); + + for (i = 0; i < pTable->Rows; i++) + for (j = 0; j < pTable->Cols; j++) + WhoamiFree(pTable->Content[i * pTable->Cols + j]); + + WhoamiFree(pTable); +} + +int WhoamiLogonId(void) +{ + PTOKEN_GROUPS pGroupInfo = (PTOKEN_GROUPS) WhoamiGetTokenInfo(TokenGroups); + DWORD dwIndex = 0; + LPWSTR pSidStr = 0; + PSID pSid = 0; + + if (pGroupInfo) + { + /* lets see if we can find the logon SID in that list, should be there */ + for (dwIndex = 0; dwIndex < pGroupInfo->GroupCount; dwIndex++) + { + if ((pGroupInfo->Groups[dwIndex].Attributes & SE_GROUP_LOGON_ID) == SE_GROUP_LOGON_ID) + { + pSid = pGroupInfo->Groups[dwIndex].Sid; + } + } + + if (!pSid || !ConvertSidToStringSidW(pSid, &pSidStr)) + { + wprintf(L"ERROR: Couldn't convert the logon SID to a string.\n"); + return 1; + } + else + { + /* let's show our converted logon SID */ + wprintf(L"%s\n", pSidStr); + } + } + + /* cleanup our allocations */ + if (pSidStr) + LocalFree(pSidStr); + + if (pGroupInfo) + WhoamiFree(pGroupInfo); + + return 0; +} + +int WhoamiUser(void) +{ + PTOKEN_USER pUserInfo = (PTOKEN_USER) WhoamiGetTokenInfo(TokenUser); + LPWSTR pUserStr = WhoamiGetUser(NameSamCompatible); + LPWSTR pSidStr = NULL; + + if (pUserInfo && pUserStr) + { + WhoamiTable *UserTable = WhoamiAllocTable(2, 2); + + WhoamiPrintHeader(IDS_USER_HEADER); + + /* set the column labels */ + WhoamiSetTable(UserTable, WhoamiLoadRcString(IDS_COL_USER_NAME), 0, 0); + WhoamiSetTable(UserTable, WhoamiLoadRcString(IDS_COL_SID), 0, 1); + + ConvertSidToStringSidW(pUserInfo->User.Sid, &pSidStr); + + /* set the values for our single row of data */ + WhoamiSetTable(UserTable, pUserStr, 1, 0); + WhoamiSetTable(UserTable, pSidStr, 1, 1); + + WhoamiPrintTable(UserTable); + } + else + { + return 1; + } + + /* cleanup our allocations */ + if (pSidStr) + LocalFree(pSidStr); + + if (pUserInfo) + WhoamiFree(pUserInfo); + + if (pUserStr) + WhoamiFree(pUserStr); + + return 0; +} + +int WhoamiGroups(void) +{ + DWORD dwIndex = 0; + LPWSTR pSidStr = 0; + + static WCHAR szGroupName[255] = {0}; + static WCHAR szDomainName[255] = {0}; + + DWORD cchGroupName = _countof(szGroupName); + DWORD cchDomainName = _countof(szGroupName); + + SID_NAME_USE Use = 0; + BYTE SidNameUseStr[12] = + { + /* SidTypeUser */ -1, + /* SidTypeGroup */ -1, + /* SidTypeDomain */ -1, + /* SidTypeUser */ -1, + /* SidTypeAlias */ IDS_TP_ALIAS, + /* SidTypeWellKnownGroup */ IDS_TP_WELL_KNOWN_GROUP, + /* SidTypeDeletedAccount */ -1, + /* SidTypeInvalid */ -1, + /* SidTypeUnknown */ -1, + /* SidTypeComputer */ -1, + /* SidTypeLabel */ IDS_TP_LABEL + }; + + PTOKEN_GROUPS pGroupInfo = (PTOKEN_GROUPS)WhoamiGetTokenInfo(TokenGroups); + + if (pGroupInfo) + { + /* the header is the first (0) row, so we start in the second one (1) */ + UINT PrintingRow = 1; + + WhoamiTable *GroupTable = WhoamiAllocTable(pGroupInfo->GroupCount + 1, 4); + + WhoamiPrintHeader(IDS_GROU_HEADER); + + WhoamiSetTable(GroupTable, WhoamiLoadRcString(IDS_COL_GROUP_NAME), 0, 0); + WhoamiSetTable(GroupTable, WhoamiLoadRcString(IDS_COL_TYPE), 0, 1); + WhoamiSetTable(GroupTable, WhoamiLoadRcString(IDS_COL_SID), 0, 2); + WhoamiSetTable(GroupTable, WhoamiLoadRcString(IDS_COL_ATTRIB), 0, 3); + + for (dwIndex = 0; dwIndex < pGroupInfo->GroupCount; dwIndex++) + { + LookupAccountSidW(NULL, + pGroupInfo->Groups[dwIndex].Sid, + (LPWSTR)&szGroupName, + &cchGroupName, + (LPWSTR)&szDomainName, + &cchDomainName, + &Use); + + /* the original tool seems to limit the list to these kind of SID items */ + if ((Use == SidTypeWellKnownGroup || Use == SidTypeAlias || + Use == SidTypeLabel) && !(pGroupInfo->Groups[dwIndex].Attributes & SE_GROUP_LOGON_ID)) + { + wchar_t tmpBuffer[666]; + + /* looks like windows treats 0x60 as 0x7 for some reason, let's just nod and call it a day: + 0x60 is SE_GROUP_INTEGRITY | SE_GROUP_INTEGRITY_ENABLED + 0x07 is SE_GROUP_MANDATORY | SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_ENABLED */ + + if (pGroupInfo->Groups[dwIndex].Attributes == 0x60) + pGroupInfo->Groups[dwIndex].Attributes = 0x07; + + /* 1- format it as DOMAIN\GROUP if the domain exists, or just GROUP if not */ + _snwprintf((LPWSTR)&tmpBuffer, + 666, + L"%s%s%s", + szDomainName, + cchDomainName ? L"\\" : L"", + szGroupName); + + WhoamiSetTable(GroupTable, tmpBuffer, PrintingRow, 0); + + /* 2- let's find out the group type by using a simple lookup table for lack of a better method */ + WhoamiSetTable(GroupTable, WhoamiLoadRcString(SidNameUseStr[Use]), PrintingRow, 1); + + /* 3- turn that SID into text-form */ + ConvertSidToStringSidW(pGroupInfo->Groups[dwIndex].Sid, &pSidStr); + + WhoamiSetTable(GroupTable, pSidStr, PrintingRow, 2); + + LocalFree(pSidStr); + + /* 4- reuse that buffer for appending the attributes in text-form at the very end */ + ZeroMemory(tmpBuffer, 666); + + if (pGroupInfo->Groups[dwIndex].Attributes & SE_GROUP_MANDATORY) + StringCchCat(tmpBuffer, 666, WhoamiLoadRcString(IDS_ATTR_GROUP_MANDATORY)); + if (pGroupInfo->Groups[dwIndex].Attributes & SE_GROUP_ENABLED_BY_DEFAULT) + StringCchCat(tmpBuffer, 666, WhoamiLoadRcString(IDS_ATTR_GROUP_ENABLED_BY_DEFAULT)); + if (pGroupInfo->Groups[dwIndex].Attributes & SE_GROUP_ENABLED) + StringCchCat(tmpBuffer, 666, WhoamiLoadRcString(IDS_ATTR_GROUP_ENABLED)); + if (pGroupInfo->Groups[dwIndex].Attributes & SE_GROUP_OWNER) + StringCchCat(tmpBuffer, 666, WhoamiLoadRcString(IDS_ATTR_GROUP_OWNER)); + + /* remove the last comma (', ' which is 2 wchars) of the buffer, let's keep it simple */ + tmpBuffer[max(wcslen(tmpBuffer) - 2, 0)] = UNICODE_NULL; + + WhoamiSetTable(GroupTable, tmpBuffer, PrintingRow, 3); + + PrintingRow++; + } + + /* reset the buffers so that we can reuse them */ + ZeroMemory(szGroupName, 255); + ZeroMemory(szDomainName, 255); + + cchGroupName = 255; + cchDomainName = 255; + } + + WhoamiPrintTable(GroupTable); + } + else + { + return 1; + } + + /* cleanup our allocations */ + if (pGroupInfo) + WhoamiFree((LPVOID)pGroupInfo); + + return 0; +} + +int WhoamiPriv(void) +{ + PTOKEN_PRIVILEGES pPrivInfo = (PTOKEN_PRIVILEGES) WhoamiGetTokenInfo(TokenPrivileges); + + if (pPrivInfo) + { + DWORD dwResult = 0, dwIndex = 0; + + WhoamiTable *PrivTable = WhoamiAllocTable(pPrivInfo->PrivilegeCount + 1, 3); + + WhoamiPrintHeader(IDS_PRIV_HEADER); + + WhoamiSetTable(PrivTable, WhoamiLoadRcString(IDS_COL_PRIV_NAME), 0, 0); + WhoamiSetTable(PrivTable, WhoamiLoadRcString(IDS_COL_DESCRIPTION), 0, 1); + WhoamiSetTable(PrivTable, WhoamiLoadRcString(IDS_COL_STATE), 0, 2); + + for (dwIndex = 0; dwIndex < pPrivInfo->PrivilegeCount; dwIndex++) + { + PWSTR PrivName = NULL, DispName = NULL; + DWORD PrivNameSize = 0, DispNameSize = 0; + BOOL ret = FALSE; + + ret = LookupPrivilegeNameW(NULL, + &pPrivInfo->Privileges[dwIndex].Luid, + NULL, + &PrivNameSize); + + PrivName = HeapAlloc(GetProcessHeap(), 0, ++PrivNameSize*sizeof(WCHAR)); + + LookupPrivilegeNameW(NULL, + &pPrivInfo->Privileges[dwIndex].Luid, + PrivName, + &PrivNameSize); + + WhoamiSetTableDyn(PrivTable, PrivName, dwIndex + 1, 0); + + ret = LookupPrivilegeDisplayNameW(NULL, PrivName, NULL, &DispNameSize, &dwResult); + + if (!ret || GetLastError() == ERROR_NO_SUCH_PRIVILEGE) + { + DispName = HeapAlloc(GetProcessHeap(), 0, ++DispNameSize * sizeof(WCHAR)); + + LookupPrivilegeDisplayNameW(NULL, PrivName, DispName, &DispNameSize, &dwResult); + + //wprintf(L"DispName: %d %x '%s'\n", DispNameSize, GetLastError(), DispName); + + WhoamiSetTableDyn(PrivTable, DispName, dwIndex + 1, 1); + } + else + { + WhoamiSetTable(PrivTable, WhoamiLoadRcString(IDS_UNKNOWN_DESCRIPTION), dwIndex + 1, 1); + } + + if (pPrivInfo->Privileges[dwIndex].Attributes & SE_PRIVILEGE_ENABLED) + WhoamiSetTable(PrivTable, WhoamiLoadRcString(IDS_STATE_ENABLED), dwIndex + 1, 2); + else + WhoamiSetTable(PrivTable, WhoamiLoadRcString(IDS_STATE_DISABLED), dwIndex + 1, 2); + } + + WhoamiPrintTable(PrivTable); + } + else + { + return 1; + } + + /* cleanup our allocations */ + if (pPrivInfo) + WhoamiFree(pPrivInfo); + + return 0; +} + +int wmain(int argc, WCHAR* argv[]) +{ + INT i; + BYTE WamBit = 0; + + #define WAM_USER 1<<0 + #define WAM_GROUPS 1<<1 + #define WAM_PRIV 1<<2 + + + /* * * * * * * * * * * * * * * * + * A: no parameters whatsoever */ + + if (argc == 1) + { + /* if there's no arguments just choose the simple path and display the user's identity in lowercase */ + LPWSTR UserBuffer = WhoamiGetUser(NameSamCompatible); + + if (UserBuffer) + { + wprintf(L"%s\n", UserBuffer); + WhoamiFree(UserBuffer); + return 0; + } + else + { + return 1; + } + } + + /* first things first-- let's detect and manage both printing modifiers (/fo and /nh) */ + for (i = 1; i < argc; i++) + { + if (wcsicmp(argv[i], L"/nh") == 0) + { + NoHeaderArgCount++; + + if (NoHeader != TRUE) + { + NoHeader = TRUE; + // wprintf(L"Headers disabled!\n"); + BlankArgument(i, argv); + } + } + } + + for (i = 1; i < argc; i++) + { + if (wcsicmp(argv[i], L"/fo") == 0) + { + if ((i + 1) < argc) + { + // wprintf(L"exists another param after /fo\n"); + + PrintFormatArgCount++; + + if (wcsicmp(argv[i + 1], L"table") == 0 && PrintFormat != table) + { + PrintFormat = table; + // wprintf(L"Changed to table format\n"); + BlankArgument(i, argv); + BlankArgument(i + 1, argv); + } + else if (wcsicmp(argv[i + 1], L"list") == 0 && PrintFormat != list) + { + PrintFormat = list; + // wprintf(L"Changed to list format\n"); + BlankArgument(i, argv); + BlankArgument(i + 1, argv); + + /* looks like you can't use the "/fo list /nh" options together + for some stupid reason */ + if (PrintFormat == list && NoHeader == TRUE) + { + wprintf(WhoamiLoadRcString(IDS_ERROR_NH_LIST)); + return 1; + } + } + else if (wcsicmp(argv[i + 1], L"csv") == 0 && PrintFormat != csv) + { + PrintFormat = csv; + // wprintf(L"Changed to csv format\n"); + BlankArgument(i, argv); + BlankArgument(i + 1, argv); + } + /* /nh or /fo after /fo isn't parsed as a value */ + else if (wcsicmp(argv[i + 1], L"/nh") == 0 || wcsicmp(argv[i + 1], L"/fo") == 0 + + /* same goes for the other named options, not ideal, but works */ + || wcsicmp(argv[i + 1], L"/priv") == 0 + || wcsicmp(argv[i + 1], L"/groups") == 0 + || wcsicmp(argv[i + 1], L"/user") == 0 + || wcsicmp(argv[i + 1], L"/all") == 0 + || wcsicmp(argv[i + 1], L"") == 0) + { + goto FoValueExpected; + } + else + { + wprintf(WhoamiLoadRcString(IDS_ERROR_VALUENOTALLOWED), argv[i + 1]); + return 1; + } + } + else + { + FoValueExpected: + + wprintf(WhoamiLoadRcString(IDS_ERROR_VALUEXPECTED)); + return 1; + } + } + } + + if (NoHeaderArgCount >= 2) + { + wprintf(WhoamiLoadRcString(IDS_ERROR_1TIMES), L"/nh"); + return 1; + } + /* special case when there's just a /nh as argument; it outputs nothing */ + else if (NoHeaderArgCount == 1 && argc == 2) + { + return 0; + } + + if (PrintFormatArgCount >= 2) + { + wprintf(WhoamiLoadRcString(IDS_ERROR_1TIMES), L"/fo"); + return 1; + } + /* if there's just /fo <format>... call it invalid */ + else if (PrintFormatArgCount == 1 && argc == 3) + { + goto InvalidSyntax; + } + + /* * * * * * * * * * * * * * + * B: one single parameter */ + + if (argc == 2) + { + /* now let's try to parse the triumvirate of simpler, single (1) arguments... plus help */ + if (wcsicmp(argv[1], L"/?") == 0) + { + wprintf(WhoamiLoadRcString(IDS_HELP)); + return 0; + } + + else if (wcsicmp(argv[1], L"/upn") == 0) + { + LPWSTR UserBuffer = WhoamiGetUser(NameUserPrincipal); + + if (UserBuffer) + { + wprintf(L"%s\n", UserBuffer); + WhoamiFree(UserBuffer); + return 0; + } + else + { + wprintf(WhoamiLoadRcString(IDS_ERROR_UPN)); + return 1; + } + } + + else if (wcsicmp(argv[1], L"/fqdn") == 0) + { + LPWSTR UserBuffer = WhoamiGetUser(NameFullyQualifiedDN); + + if (UserBuffer) + { + wprintf(L"%s\n", UserBuffer); + WhoamiFree(UserBuffer); + return 0; + } + else + { + wprintf(WhoamiLoadRcString(IDS_ERROR_FQDN)); + return 1; + } + } + + else if (wcsicmp(argv[1], L"/logonid") == 0) + { + return WhoamiLogonId(); + } + } + + /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * C: One main parameter with extra tasty modifiers to play with */ + + /* sometimes is just easier to whitelist for lack of a better method */ + for (i=1; i<argc; i++) + { + if ((wcsicmp(argv[i], L"/user") != 0) && + (wcsicmp(argv[i], L"/groups") != 0) && + (wcsicmp(argv[i], L"/priv") != 0) && + (wcsicmp(argv[i], L"/all") != 0) && + (wcsicmp(argv[i], L"") != 0)) + { + wprintf(WhoamiLoadRcString(IDS_ERROR_INVALIDARG), argv[i]); + return 1; + } + } + + if (GetArgument(L"/user", argc, argv)) + { + WamBit |= WAM_USER; + } + + if (GetArgument(L"/groups", argc, argv)) + { + WamBit |= WAM_GROUPS; + } + + if (GetArgument(L"/priv", argc, argv)) + { + WamBit |= WAM_PRIV; + } + + if (GetArgument(L"/all", argc, argv)) + { + /* one can't have it /all and any of the other options at the same time */ + if ((WamBit & (WAM_USER | WAM_GROUPS | WAM_PRIV)) == 0) + { + WamBit |= (WAM_USER | WAM_GROUPS | WAM_PRIV); + } + else + { + goto InvalidSyntax; + } + } + + if (WamBit & WAM_USER) + { + WhoamiUser(); + } + if (WamBit & WAM_GROUPS) + { + WhoamiGroups(); + } + if (WamBit & WAM_PRIV) + { + WhoamiPriv(); + } + + return 0; + +InvalidSyntax: + wprintf(WhoamiLoadRcString(IDS_ERROR_INVALIDSYNTAX)); + return 1; +} Propchange: trunk/reactos/base/applications/cmdutils/whoami/whoami.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/whoami/whoami.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/whoami/whoami.rc (added) +++ trunk/reactos/base/applications/cmdutils/whoami/whoami.rc [iso-8859-1] Sun Dec 21 23:10:46 2014 @@ -0,0 +1,22 @@ +#include <windef.h> + +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define REACTOS_STR_FILE_DESCRIPTION "whoami: display information about logged-on users" +#define REACTOS_STR_INTERNAL_NAME "whoami" +#define REACTOS_STR_ORIGINAL_FILENAME "whoami.exe" +#define REACTOS_STR_COMPANY_NAME "Ismael Ferreras Morezuelas" + +#include <reactos/version.rc> + +/* UTF-8 */ +#pragma code_page(65001) + +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif +#ifdef LANGUAGE_ES_ES + #include "lang/es-ES.rc" +#endif Propchange: trunk/reactos/base/applications/cmdutils/whoami/whoami.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 65786: [TREE] Attempt to fix some style & formatting crimes. Improve header inclusions. CORE-8529
by akhaldi＠svn.reactos.org 21 Dec '14

21 Dec '14

Author: akhaldi Date: Sun Dec 21 18:48:33 2014 New Revision: 65786 URL: http://svn.reactos.org/svn/reactos?rev=65786&view=rev Log: [TREE] Attempt to fix some style & formatting crimes. Improve header inclusions. CORE-8529 Modified: trunk/reactos/base/applications/cmdutils/tree/CMakeLists.txt trunk/reactos/base/applications/cmdutils/tree/tree.c trunk/reactos/base/applications/cmdutils/tree/tree.rc Modified: trunk/reactos/base/applications/cmdutils/tree/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/tree/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/tree/CMakeLists.txt [iso-8859-1] Sun Dec 21 18:48:33 2014 @@ -2,5 +2,5 @@ add_executable(tree tree.c tree.rc) set_module_type(tree win32cui UNICODE) set_target_properties(tree PROPERTIES SUFFIX ".com") -add_importlibs(tree msvcrt kernel32 user32) +add_importlibs(tree user32 msvcrt kernel32) add_cd_file(TARGET tree DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/cmdutils/tree/tree.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/tree/tree.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/tree/tree.c [iso-8859-1] Sun Dec 21 18:48:33 2014 @@ -1,23 +1,27 @@ ï»¿/* - * PROJECT: ReactOS - * LICENSE: GNU GPLv2 only as published by the Free Software Foundation - * PURPOSE: Implements tree.com functionality similar to Windows - * PROGRAMMERS: Asif Bahrainwala (asif_bahrainwala(a)hotmail.com) + * PROJECT: ReactOS + * LICENSE: GNU GPLv2 only as published by the Free Software Foundation + * PURPOSE: Implements tree.com functionality similar to Windows + * PROGRAMMERS: Asif Bahrainwala (asif_bahrainwala(a)hotmail.com) */ #include <stdio.h> -//#include <stdarg.h> -#include <windows.h> +#include <stdlib.h> +#include <windef.h> +#include <winbase.h> +#include <winuser.h> #include "resource.h" #define STR_MAX 2048 -static void DrawTree(const wchar_t* strPath, const WIN32_FIND_DATA *arrFolder, const size_t szArr, UINT width, const wchar_t *prevLine, BOOL drawfolder); static void GetDirectoryStructure(wchar_t* strPath, UINT width, const wchar_t* prevLine); -BOOL bShowFiles = FALSE; //if this flag is set to true, files will also be listed -BOOL bUseAscii = FALSE; //if this flag is true, ASCII characters will be used instead of UNICODE ones +/* if this flag is set to true, files will also be listed */ +BOOL bShowFiles = FALSE; + +/* if this flag is true, ASCII characters will be used instead of UNICODE ones */ +BOOL bUseAscii = FALSE; /* * This takes strings from a resource string table @@ -50,28 +54,28 @@ BOOL ret = FALSE; WIN32_FIND_DATA FindFileData; HANDLE hFind = NULL; - static wchar_t strPath[STR_MAX]= L""; + static wchar_t strPath[STR_MAX] = L""; ZeroMemory(strPath, sizeof(strPath)); - wcscat(strPath,strPath1); - wcscat(strPath,L"\\*."); - - hFind=FindFirstFile(strPath, &FindFileData); + wcscat(strPath, strPath1); + wcscat(strPath, L"\\*."); + + hFind = FindFirstFile(strPath, &FindFileData); do { if (FindFileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { - if(wcscmp(FindFileData.cFileName, L".")==0 || - wcscmp(FindFileData.cFileName, L"..")==0 ) + if (wcscmp(FindFileData.cFileName, L".") == 0 || + wcscmp(FindFileData.cFileName, L"..") == 0 ) { continue; } - ret=TRUE; //found subfolder + ret = TRUE; //found subfolder break; } } - while(FindNextFile(hFind, &FindFileData)); + while (FindNextFile(hFind, &FindFileData)); FindClose(hFind); return ret; @@ -96,50 +100,57 @@ * @return * void */ -static void DrawTree(const wchar_t* strPath, const WIN32_FIND_DATA *arrFolder, const size_t szArr, UINT width, const wchar_t *prevLine, BOOL drawfolder) +static void DrawTree(const wchar_t* strPath, + const WIN32_FIND_DATA *arrFolder, + const size_t szArr, + UINT width, + const wchar_t *prevLine, + BOOL drawfolder) { BOOL bHasSubFolder = HasSubFolder(strPath); UINT i = 0; - //this will format the spaces required for correct formatting - for(i = 0; i < szArr; ++i) + /* this will format the spaces required for correct formatting */ + for (i = 0; i < szArr; ++i) { wchar_t *consoleOut = (wchar_t*)malloc(sizeof(wchar_t) * STR_MAX); - UINT j=0; + UINT j = 0; static wchar_t str[STR_MAX]; - // As we do not seem to have the _s functions properly set up, use the non-secure version for now + /* As we do not seem to have the _s functions properly set up, use the non-secure version for now */ //wcscpy_s(consoleOut, STR_MAX, L""); //wcscpy_s(str, STR_MAX, L""); wcscpy(consoleOut, L""); wcscpy(str, L""); - for(j=0;j<width-1;++j) - { - //if the previous line has 'â' or 'â' then the current line will add 'â' to continue the connecting line - if((BYTE)prevLine[j] == 195 || (BYTE)prevLine[j] == 179 || (BYTE)prevLine[j] == L'+' || (BYTE)prevLine[j] == L'|') + for (j = 0; j < width - 1; ++j) + { + /* if the previous line has 'â' or 'â' then the current line will + add 'â' to continue the connecting line */ + if ((BYTE)prevLine[j] == 195 || (BYTE)prevLine[j] == 179 || + (BYTE)prevLine[j] == L'+' || (BYTE)prevLine[j] == L'|') { if (bUseAscii) { - wchar_t a[]={179,0}; - wcscat(consoleOut,a); - } - else - { - wcscat(consoleOut,L"|"); + wchar_t a[] = {179, 0}; + wcscat(consoleOut, a); + } + else + { + wcscat(consoleOut, L"|"); } } else { - wcscat(consoleOut,L" "); - } - } - - if(szArr - 1 != i) - { - if(drawfolder) - { - // will add 'ââââFolder name + wcscat(consoleOut, L" "); + } + } + + if (szArr - 1 != i) + { + if (drawfolder) + { + /* will add 'ââââFolder name */ if (bUseAscii) wsprintf(str, L"+---%s", (wchar_t*)arrFolder[i].cFileName); else @@ -147,9 +158,10 @@ } else { - if(bHasSubFolder) - { - // will add 'â FileNamw' //thie line is added to connect the belowfolder sub structure + if (bHasSubFolder) + { + /* will add 'â FileNamw' //thie line is added to connect + the belowfolder sub structure */ if (bUseAscii) wsprintf(str,L"| %s", (wchar_t*)arrFolder[i].cFileName); else @@ -157,16 +169,16 @@ } else { - // will add ' FileNamw' + /* will add ' FileNamw' */ wsprintf(str,L" %s", (wchar_t*)arrFolder[i].cFileName); } } } else { - if(drawfolder) - { - // 'ââââFolder name' + if (drawfolder) + { + /* 'ââââFolder name' */ if (bUseAscii) wsprintf(str, L"\\---%s", (wchar_t*)arrFolder[i].cFileName); else @@ -174,18 +186,18 @@ } else { - if(bHasSubFolder) - { - // 'â FileName' + if (bHasSubFolder) + { + /* 'â FileName' */ if (bUseAscii) - wsprintf(str,L"| %s", (wchar_t*)arrFolder[i].cFileName); + wsprintf(str, L"| %s", (wchar_t*)arrFolder[i].cFileName); else - wsprintf(str,L"%c %s", 179, (wchar_t*)arrFolder[i].cFileName); - } - else - { - // ' FileName' - wsprintf(str,L" %s", (wchar_t*)arrFolder[i].cFileName); + wsprintf(str, L"%c %s", 179, (wchar_t*)arrFolder[i].cFileName); + } + else + { + /* ' FileName' */ + wsprintf(str, L" %s", (wchar_t*)arrFolder[i].cFileName); } } } @@ -193,15 +205,15 @@ wcscat(consoleOut, str); wprintf(L"%s\n", consoleOut); - if(drawfolder) + if (drawfolder) { wchar_t *str = (wchar_t*)malloc(STR_MAX * sizeof(wchar_t)); - ZeroMemory(str, STR_MAX*sizeof(wchar_t)); + ZeroMemory(str, STR_MAX * sizeof(wchar_t)); wcscat(str, strPath); wcscat(str, L"\\"); wcscat(str, arrFolder[i].cFileName); - GetDirectoryStructure(str, width+4, consoleOut); + GetDirectoryStructure(str, width + 4, consoleOut); free(str); } @@ -223,75 +235,76 @@ * @return * void */ -static void GetDirectoryStructure(wchar_t* strPath, UINT width, const wchar_t* prevLine) -{ - WIN32_FIND_DATA FindFileData; - HANDLE hFind = NULL; - //DWORD err = 0; - //will fill up with names of all sub folders - WIN32_FIND_DATA *arrFolder = NULL; - UINT arrFoldersz = 0; - //will fill up with names of all sub folders - WIN32_FIND_DATA *arrFile = NULL; - UINT arrFilesz = 0; - - ZeroMemory(&FindFileData,sizeof(FindFileData)); - - { - static wchar_t tmp[STR_MAX]=L""; - ZeroMemory(tmp,sizeof(tmp)); - wcscat(tmp,strPath); - wcscat(tmp,L"\\*.*"); - - hFind=FindFirstFile(tmp, &FindFileData); - - //err = GetLastError(); - } - - if(hFind == INVALID_HANDLE_VALUE) - return; - - do - { - if (FindFileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) - { - if(wcscmp(FindFileData.cFileName, L".")==0 || - wcscmp(FindFileData.cFileName, L"..")==0 ) - continue; - - ++arrFoldersz; - arrFolder=(WIN32_FIND_DATA*)realloc(arrFolder, arrFoldersz * sizeof(FindFileData)); - - if(arrFolder == NULL) - exit(-1); - - arrFolder[arrFoldersz - 1] = FindFileData; - - } - else - { - ++arrFilesz; - arrFile=(WIN32_FIND_DATA*)realloc(arrFile, arrFilesz * sizeof(FindFileData)); - - if(arrFile == NULL) - exit(-1); - - arrFile[arrFilesz - 1] = FindFileData; - } - } - while(FindNextFile(hFind, &FindFileData)); - - FindClose(hFind); - - if(bShowFiles) - { - DrawTree(strPath, arrFile, arrFilesz, width, prevLine, FALSE); //will free(arrFile) - } - - DrawTree(strPath, arrFolder, arrFoldersz, width, prevLine, TRUE); //will free(arrFile) - - free(arrFolder); - free(arrFile); +static void +GetDirectoryStructure(wchar_t* strPath, UINT width, const wchar_t* prevLine) +{ + WIN32_FIND_DATA FindFileData; + HANDLE hFind = NULL; + //DWORD err = 0; + /* will fill up with names of all sub folders */ + WIN32_FIND_DATA *arrFolder = NULL; + UINT arrFoldersz = 0; + /* will fill up with names of all sub folders */ + WIN32_FIND_DATA *arrFile = NULL; + UINT arrFilesz = 0; + + ZeroMemory(&FindFileData, sizeof(FindFileData)); + + { + static wchar_t tmp[STR_MAX] = L""; + ZeroMemory(tmp, sizeof(tmp)); + wcscat(tmp, strPath); + wcscat(tmp, L"\\*.*"); + hFind = FindFirstFile(tmp, &FindFileData); + //err = GetLastError(); + } + + if (hFind == INVALID_HANDLE_VALUE) + return; + + do + { + if (FindFileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + { + if (wcscmp(FindFileData.cFileName, L".") == 0 || + wcscmp(FindFileData.cFileName, L"..") == 0) + continue; + + ++arrFoldersz; + arrFolder = (WIN32_FIND_DATA*)realloc(arrFolder, arrFoldersz * sizeof(FindFileData)); + + if (arrFolder == NULL) + exit(-1); + + arrFolder[arrFoldersz - 1] = FindFileData; + + } + else + { + ++arrFilesz; + arrFile = (WIN32_FIND_DATA*)realloc(arrFile, arrFilesz * sizeof(FindFileData)); + + if(arrFile == NULL) + exit(-1); + + arrFile[arrFilesz - 1] = FindFileData; + } + } + while (FindNextFile(hFind, &FindFileData)); + + FindClose(hFind); + + if (bShowFiles) + { + /* will free(arrFile) */ + DrawTree(strPath, arrFile, arrFilesz, width, prevLine, FALSE); + } + + /* will free(arrFile) */ + DrawTree(strPath, arrFolder, arrFoldersz, width, prevLine, TRUE); + + free(arrFolder); + free(arrFile); } /** @@ -304,37 +317,43 @@ int wmain( int argc, wchar_t *argv[]) { DWORD dwSerial = 0; - wchar_t t=0; + wchar_t t = 0; wchar_t *strPath = NULL; DWORD sz = 0; - //wchar_t *context = NULL ; + //wchar_t *context = NULL; wchar_t *driveLetter = NULL; int i; - - for(i = 1; i < argc; ++i) //parse the command line + + /* parse the command line */ + for (i = 1; i < argc; ++i) { if (argv[i][0] == L'-' || argv[i][0] == L'/') { switch (towlower(argv[i][1])) { - case L'?': - PrintResourceString(IDS_USAGE); //will print help and exit after - return 0; - case L'f': - bShowFiles=TRUE; //if set to true, will populate all the files within the folder structure - break; - case L'a': - bUseAscii=TRUE; - break; - default:break; + case L'?': + /* will print help and exit after */ + PrintResourceString(IDS_USAGE); + return 0; + case L'f': + /* if set to true, will populate all the files within the folder structure */ + bShowFiles = TRUE; + break; + case L'a': + bUseAscii = TRUE; + break; + default: + break; } } else { - //this must be path to some folder - BOOL b=SetCurrentDirectoryW(argv[i]); //will set the current directory for this executable - if(b==FALSE) + /* this must be path to some folder */ + + /* will set the current directory for this executable */ + BOOL b = SetCurrentDirectoryW(argv[i]); + if (b == FALSE) { PrintResourceString(IDS_NO_SUBDIRECTORIES); return 1; @@ -345,27 +364,31 @@ PrintResourceString(IDS_FOLDER_PATH); GetVolumeInformation(NULL, NULL, 0, &dwSerial, NULL, NULL, NULL, 0); - PrintResourceString(IDS_VOL_SERIAL, dwSerial >> 16, dwSerial & 0xffff); - - sz = GetCurrentDirectory(1, &t); //get the buffer size - strPath = (wchar_t*)malloc(sizeof(wchar_t) * sz); //must not return before calling delete[] - - GetCurrentDirectory(sz, strPath); //get the current directory - - - driveLetter = (wchar_t*)malloc(sizeof(wchar_t) * sz); //get the drive letter , must not return before calling delete[] - - // As we do not seem to have the _s functions properly set up, use the non-secure version for now + PrintResourceString(IDS_VOL_SERIAL, dwSerial >> 16, dwSerial & 0xffff); + + /* get the buffer size */ + sz = GetCurrentDirectory(1, &t); + /* must not return before calling delete[] */ + strPath = (wchar_t*)malloc(sizeof(wchar_t) * sz); + + /* get the current directory */ + GetCurrentDirectory(sz, strPath); + + /* get the drive letter , must not return before calling delete[] */ + driveLetter = (wchar_t*)malloc(sizeof(wchar_t) * sz); + + /* As we do not seem to have the _s functions properly set up, use the non-secure version for now */ //wcscpy_s(driveLetter,sz,strPath); //wcstok_s(driveLetter,L":", &context); //parse for the drive letter - wcscpy(driveLetter,strPath); + wcscpy(driveLetter, strPath); wcstok(driveLetter, L":"); - wprintf(L"%s:.\n",driveLetter); + wprintf(L"%s:.\n", driveLetter); free(driveLetter); - GetDirectoryStructure(strPath, 1, L" "); //get the sub directories within this current folder + /* get the sub directories within this current folder */ + GetDirectoryStructure(strPath, 1, L" "); free(strPath); wprintf(L"\n"); Modified: trunk/reactos/base/applications/cmdutils/tree/tree.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/tree/tree.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/tree/tree.rc [iso-8859-1] Sun Dec 21 18:48:33 2014 @@ -1,13 +1,12 @@ #include <windef.h> -#include <winuser.h> #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Tree Walk Utility" -#define REACTOS_STR_INTERNAL_NAME "tree" -#define REACTOS_STR_ORIGINAL_FILENAME "tree.com" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Tree Walk Utility" +#define REACTOS_STR_INTERNAL_NAME "tree" +#define REACTOS_STR_ORIGINAL_FILENAME "tree.com" #include <reactos/version.rc> /* UTF-8 */

1 0

[akhaldi] 65785: [NTDLL_WINETEST] Properly enable back the LdrAddRefDll tests. CORE-8102
by akhaldi＠svn.reactos.org 21 Dec '14

21 Dec '14

Author: akhaldi Date: Sun Dec 21 18:00:03 2014 New Revision: 65785 URL: http://svn.reactos.org/svn/reactos?rev=65785&view=rev Log: [NTDLL_WINETEST] Properly enable back the LdrAddRefDll tests. CORE-8102 Modified: trunk/rostests/winetests/ntdll/rtl.c Modified: trunk/rostests/winetests/ntdll/rtl.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/rtl.c?rev… ============================================================================== --- trunk/rostests/winetests/ntdll/rtl.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/rtl.c [iso-8859-1] Sun Dec 21 18:00:03 2014 @@ -1504,14 +1504,6 @@ return; } -#ifndef __REACTOS__ - if (!winetest_interactive) - { - skip("Skipping LdrAddRefDll tests. See CORE-8102\n"); - return; - } -#endif - mod = LoadLibraryA("comctl32.dll"); ok(mod != NULL, "got %p\n", mod); ret = FreeLibrary(mod);

1 0

[akhaldi] 65784: [NTDLL_WINETEST] Temporarily enable LdrAddRefDll tests in light of CORE-8102.
by akhaldi＠svn.reactos.org 21 Dec '14

21 Dec '14

Author: akhaldi Date: Sun Dec 21 17:16:15 2014 New Revision: 65784 URL: http://svn.reactos.org/svn/reactos?rev=65784&view=rev Log: [NTDLL_WINETEST] Temporarily enable LdrAddRefDll tests in light of CORE-8102. Modified: trunk/rostests/winetests/ntdll/rtl.c Modified: trunk/rostests/winetests/ntdll/rtl.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/rtl.c?rev… ============================================================================== --- trunk/rostests/winetests/ntdll/rtl.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/rtl.c [iso-8859-1] Sun Dec 21 17:16:15 2014 @@ -1504,7 +1504,7 @@ return; } -#ifdef __REACTOS__ +#ifndef __REACTOS__ if (!winetest_interactive) { skip("Skipping LdrAddRefDll tests. See CORE-8102\n");

1 0

[pschweitzer] 65783: [SHELL32] Update French translation
by pschweitzer＠svn.reactos.org 21 Dec '14

21 Dec '14

Author: pschweitzer Date: Sun Dec 21 13:26:31 2014 New Revision: 65783 URL: http://svn.reactos.org/svn/reactos?rev=65783&view=rev Log: [SHELL32] Update French translation Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] Sun Dec 21 13:26:31 2014 @@ -116,11 +116,11 @@ LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "Cette version de ReactOS est enregistrÃ©e Ã :", IDC_STATIC, 35, 115, 180, 10 + LTEXT "Cette version de ReactOS est enregistrÃ©e Ã :", IDC_STATIC, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ - LTEXT "MÃ©moire physique installÃ©e:", IDC_STATIC, 35, 152, 130, 10 + LTEXT "MÃ©moire physique installÃ©e :", IDC_STATIC, 35, 152, 130, 10 LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 @@ -130,7 +130,7 @@ STYLE DS_SHELLFONT | WS_CHILD FONT 8, "MS Shell Dlg" BEGIN - LTEXT "ReactOS est une rÃ©alisation de:", IDC_STATIC, 0, 0, 180, 10 + LTEXT "ReactOS est une rÃ©alisation de :", IDC_STATIC, 0, 0, 180, 10 LISTBOX IDC_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 END @@ -156,20 +156,20 @@ ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Type de la cible:", 14004, 8, 38, 68, 10 + LTEXT "Type de la cible :", 14004, 8, 38, 68, 10 EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Localisation de la cible:", 14006, 8, 55, 68, 10 + LTEXT "Localisation de la cible :", 14006, 8, 55, 68, 10 EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Cible:", 14008, 8, 71, 68, 10 + LTEXT "&Cible :", 14008, 8, 71, 68, 10 EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "&DÃ©marrer dans:", 14010, 8, 98, 68, 10 + LTEXT "&DÃ©marrer dans :", 14010, 8, 98, 68, 10 EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "&Touche de raccourci:", 14014, 8, 117, 68, 10 + LTEXT "&Touche de raccourci :", 14014, 8, 117, 68, 10 CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "&ExÃ©cuter:", 14016, 8, 136, 68, 10 + LTEXT "&ExÃ©cuter :", 14016, 8, 136, 68, 10 COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "C&ommentaire:", 14018, 8, 154, 68, 10 + LTEXT "C&ommentaire :", 14018, 8, 154, 68, 10 EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL PUSHBUTTON "Trouver la cible...", 14020, 9, 172, 70, 14, ES_LEFT PUSHBUTTON "&Changer d'icÃ´ne...", 14021, 84, 172, 70, 14, ES_LEFT @@ -196,26 +196,26 @@ BEGIN ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT - LTEXT "Type de fichier:", 14004, 8, 40, 55, 10 + LTEXT "Type de fichier :", 14004, 8, 40, 55, 10 CONTROL "Dossier", 14005, "edit", ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL, 68, 40, 160, 10 LTEXT "", -1, 8, 31, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Localisation:", 14008, 8, 56, 55, 10 + LTEXT "Localisation :", 14008, 8, 56, 55, 10 EDITTEXT 14009, 68, 56, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP - LTEXT "Taille:", 14010, 8, 72, 55, 10 + LTEXT "Taille :", 14010, 8, 72, 55, 10 EDITTEXT 14011, 68, 72, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Size on disk:", 140101, 8, 88, 55, 10 + LTEXT "Taille sur le disque :", 140101, 8, 88, 55, 10 EDITTEXT 14012, 68, 88, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Contient:", 14026, 8, 104, 55, 10 + LTEXT "Contient :", 14026, 8, 104, 55, 10 EDITTEXT 14027, 68, 104, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 120, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "CrÃ©Ã©:", 14014, 8, 128, 55, 10 + LTEXT "CrÃ©Ã© :", 14014, 8, 128, 55, 10 EDITTEXT 14015, 68, 128, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 144, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Attributs:", 14020, 8, 152, 46, 10 + LTEXT "Attributs :", 14020, 8, 152, 46, 10 AUTOCHECKBOX "Lectu&re-seule", 14021, 56, 152, 70, 10 AUTOCHECKBOX "Cac&hÃ©", 14022, 56, 166, 70, 10 AUTOCHECKBOX "&Archive", 14023, 56, 180, 70, 10 - PUSHBUTTON "A&dvanced...", 14028, 158, 150, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "A&vancÃ©...", 14028, 158, 150, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END IDD_FILE_PROPERTIES DIALOGEX 0, 0, 240, 205 @@ -230,14 +230,14 @@ CONTROL "Fichier", 14005, "edit", ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP, 68, 35, 160, 10 LTEXT "Ouvrir avec :", 14006, 8, 53, 50, 10 ICON "", 14025, 68, 52, 11, 10, NOT WS_VISIBLE - PUSHBUTTON "&Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Changer...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP EDITTEXT 14007, 68, 53, 90, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Localisation :", 14008, 8, 75, 45, 10 EDITTEXT 14009, 68, 75, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "Taille :", 14010, 8, 91, 45, 10 EDITTEXT 14011, 68, 91, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Size on disk:", 140112, 8, 107, 55, 10 + LTEXT "Taille sur le disque :", 140112, 8, 107, 55, 10 EDITTEXT 14012, 68, 107, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "", -1, 8, 123, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "CrÃ©Ã© :", 14014, 8, 131, 45, 10 @@ -251,7 +251,7 @@ AUTOCHECKBOX "Lectu&re-seule", 14021, 58, 189, 67, 10 AUTOCHECKBOX "Cac&hÃ©", 14022, 126, 189, 50, 10 AUTOCHECKBOX "&Archive", 14023, 181, 189, 49, 10 - PUSHBUTTON "A&dvanced...", 14028, 180, 185, 50, 15, WS_TABSTOP + PUSHBUTTON "A&vancÃ©...", 14028, 180, 185, 50, 15, WS_TABSTOP END IDD_FILE_VERSION DIALOGEX 0, 0, 235, 215 @@ -261,9 +261,9 @@ BEGIN LTEXT "Version du fichier : ", 14000, 10, 10, 55, 10 EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER - LTEXT "Description: ", 14002, 10, 27, 45, 10 + LTEXT "Description : ", 14002, 10, 27, 45, 10 EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER - LTEXT "Copyright: ", 14004, 10, 46, 66, 10 + LTEXT "Copyright : ", 14004, 10, 46, 66, 10 EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER GROUPBOX "Autres informations de version : ", 14006, 6, 70, 222, 115 LTEXT "Nom de l'Ã©lÃ©ment : ", 14007, 13, 82, 50, 10 @@ -280,21 +280,21 @@ ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14000, 40, 11, 190, 14, ES_LEFT | WS_BORDER | WS_GROUP | ES_AUTOHSCROLL LTEXT "", -1, 8, 32, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Type:", -1, 8, 38, 95, 10 + LTEXT "Type :", -1, 8, 38, 95, 10 EDITTEXT 14001, 110, 38, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "SystÃ¨me de fichiers:", -1, 8, 51, 95, 10 + LTEXT "SystÃ¨me de fichiers :", -1, 8, 51, 95, 10 EDITTEXT 14002, 110, 51, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "", -1, 8, 64, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE CONTROL "", 14013, "Static", SS_SUNKEN | SS_OWNERDRAW, 8, 69, 10, 10 - LTEXT "Espace utilisÃ©:", -1, 25, 69, 80, 10 + LTEXT "Espace utilisÃ© :", -1, 25, 69, 80, 10 EDITTEXT 14003, 110, 69, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT 14004, 197, 69, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL CONTROL "", 14014, "Static", SS_SUNKEN | SS_OWNERDRAW, 8, 82, 10, 10 - LTEXT "Espace libre:", -1, 25, 82, 80, 10 + LTEXT "Espace libre :", -1, 25, 82, 80, 10 EDITTEXT 14005, 110, 82, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT 14006, 197, 82, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 97, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "CapacitÃ©:", -1, 25, 103, 80, 10 + LTEXT "CapacitÃ© :", -1, 25, 103, 80, 10 EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30 @@ -371,7 +371,7 @@ LTEXT "Choisissez le programme que vous dÃ©sirez utiliser pour ouvrir ce fichier :", -1, 44, 12, 211, 10 LTEXT "Fichier : ", 14001, 44, 25, 188, 10 GROUPBOX "&Programmes", -1, 7, 42, 249, 187 - CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 + CONTROL "Programmes", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 AUTOCHECKBOX "Toujours utiliser le progr&amme sÃ©lectionnÃ© pour ouvrir ce type de fichier", 14003, 20, 193, 225, 10 PUSHBUTTON "Parcourir...", 14004, 198, 207, 50, 14 DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14 @@ -380,12 +380,12 @@ IDD_FILE_COPY DIALOGEX 0, 0, 264, 45 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Copying..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - PUSHBUTTON "Cancel", 14002, 195, 14, 60, 16 +CAPTION "En cours de copie..." +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + PUSHBUTTON "Annuler", 14002, 195, 14, 60, 16 CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 - LTEXT "File", 14001, 8, 6, 169, 10 + LTEXT "Fichier", 14001, 8, 6, 169, 10 END IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 @@ -608,16 +608,16 @@ IDD_NOOPEN DIALOGEX 0, 0, 240, 75 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Caution" +CAPTION "Attention" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 - LTEXT "This file could either be used by the operating system or by\n\ -another application. Modifying this file might damage your\n\ -system or make it less functional.\n\n\ -Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 - DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 - PUSHBUTTON "No", IDNO, 180, 55, 50, 14 + LTEXT "Ce fichier peut Ãªtre utilisÃ© par le systÃ¨me ou par\n\ +une autre application. Modifier ce fichier peut endommager votre\n\ +systÃ¨me ou le rendre moins fonctionnel.\n\n\ +Ãtes-vous sÃ»r de vouloir ouvrir ce fichier ?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Oui", IDYES, 125, 55, 50, 14 + PUSHBUTTON "Non", IDNO, 180, 55, 50, 14 END STRINGTABLE @@ -695,10 +695,10 @@ IDS_LOGOFF_PROMPT "Voulez-vous vous dÃ©connecter ?" /* Run File dialog */ - IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" - IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" - IDS_RUNDLG_BROWSE_CAPTION "Browse" - IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_RUNDLG_ERROR "Impossible d'afficher la boÃ®te de dialogue pour l'exÃ©cution d'un fichier (erreur interne)" + IDS_RUNDLG_BROWSE_ERROR "Impossible d'afficher la boÃ®te de dialogue pour la recherche de fichier (erreur interne)" + IDS_RUNDLG_BROWSE_CAPTION "Parcourir" + IDS_RUNDLG_BROWSE_FILTER "Fichiers exÃ©cutables (*.exe)\0*.exe\0Tous les fichiers (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Menu DÃ©marrer\\Programmes" @@ -739,8 +739,8 @@ /* Open With */ IDS_OPEN_WITH "Ouvrir avec" IDS_OPEN_WITH_CHOOSE "Choisir le programme..." - IDS_OPEN_WITH_RECOMMENDED "Recommended Programs:" - IDS_OPEN_WITH_OTHER "Other Programs:" + IDS_OPEN_WITH_RECOMMENDED "Programmes recommandÃ©s :" + IDS_OPEN_WITH_OTHER "Auttres programmes :" IDS_SHELL_ABOUT_AUTHORS "&Auteurs" IDS_SHELL_ABOUT_BACK "< PrÃ©cÃ©dent" @@ -792,7 +792,7 @@ IDS_FILE_DETAILSADV "Les fichiers avec l'extension '%s' sont de type '%s'. Pour modifier les paramÃ¨tres qui concernent tous les fichiers '%s', cliquez sur AvancÃ©." IDS_FILE_TYPES "FileTypes" IDS_COLUMN_EXTENSION "Extensions" - IDS_BYTES_FORMAT "bytes" - IDS_UNKNOWN_APP "Unknown application" - IDS_EXE_DESCRIPTION "Description:" -END + IDS_BYTES_FORMAT "octets" + IDS_UNKNOWN_APP "Application inconnue" + IDS_EXE_DESCRIPTION "Description :" +END

1 0

[ekohl] 65782: [CMD] Implement CTRL+Left (jump to previous word) and CRTL+Right (jump to next word) edit keys. CORE-5626 #resolve
by ekohl＠svn.reactos.org 21 Dec '14

21 Dec '14

Author: ekohl Date: Sun Dec 21 12:36:24 2014 New Revision: 65782 URL: http://svn.reactos.org/svn/reactos?rev=65782&view=rev Log: [CMD] Implement CTRL+Left (jump to previous word) and CRTL+Right (jump to next word) edit keys. CORE-5626 #resolve Modified: trunk/reactos/base/shell/cmd/cmdinput.c Modified: trunk/reactos/base/shell/cmd/cmdinput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmdinput.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/cmdinput.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmdinput.c [iso-8859-1] Sun Dec 21 12:36:24 2014 @@ -137,6 +137,7 @@ INT current = 0; /*the position of the cursor in the string (str)*/ INT charcount = 0;/*chars in the string (str)*/ INPUT_RECORD ir; + DWORD dwControlKeyState; #ifdef FEATURE_UNIX_FILENAME_COMPLETION WORD wLastKey = 0; #endif @@ -185,7 +186,9 @@ bReturn = FALSE; ConInKey (&ir); - if (ir.Event.KeyEvent.dwControlKeyState & + dwControlKeyState = ir.Event.KeyEvent.dwControlKeyState; + + if (dwControlKeyState & (RIGHT_ALT_PRESSED |LEFT_ALT_PRESSED| RIGHT_CTRL_PRESSED|LEFT_CTRL_PRESSED) ) { @@ -194,7 +197,7 @@ #ifdef FEATURE_HISTORY case 'K': /*add the current command line to the history*/ - if (ir.Event.KeyEvent.dwControlKeyState & + if (dwControlKeyState & (LEFT_CTRL_PRESSED|RIGHT_CTRL_PRESSED)) { if (str[0]) @@ -210,7 +213,7 @@ case 'D': /*delete current history entry*/ - if (ir.Event.KeyEvent.dwControlKeyState & + if (dwControlKeyState & (LEFT_CTRL_PRESSED|RIGHT_CTRL_PRESSED)) { ClearCommandLine (str, maxlen, orgx, orgy); @@ -481,59 +484,137 @@ break; case VK_LEFT: - /* move cursor left */ - if (current > 0) - { - current--; - if (GetCursorX () == 0) - { - SetCursorXY ((SHORT)(maxx - 1), (SHORT)(GetCursorY () - 1)); - curx = maxx - 1; - cury--; + if (dwControlKeyState & (RIGHT_CTRL_PRESSED | LEFT_CTRL_PRESSED)) + { + /* move cursor to the previous word */ + if (current > 0) + { + while (current > 0 && str[current - 1] == _T(' ')) + { + current--; + if (curx == 0) + { + cury--; + curx = maxx -1; + } + else + { + curx--; + } + } + + while (current > 0 && str[current -1] != _T(' ')) + { + current--; + if (curx == 0) + { + cury--; + curx = maxx -1; + } + else + { + curx--; + } + } + + SetCursorXY(curx, cury); + } + } + else + { + /* move cursor left */ + if (current > 0) + { + current--; + if (GetCursorX () == 0) + { + SetCursorXY ((SHORT)(maxx - 1), (SHORT)(GetCursorY () - 1)); + curx = maxx - 1; + cury--; + } + else + { + SetCursorXY ((SHORT)(GetCursorX () - 1), GetCursorY ()); + curx--; + } } else { - SetCursorXY ((SHORT)(GetCursorX () - 1), GetCursorY ()); - curx--; + MessageBeep (-1); + } + } + break; + + case VK_RIGHT: + if (dwControlKeyState & (RIGHT_CTRL_PRESSED | LEFT_CTRL_PRESSED)) + { + /* move cursor to the next word */ + if (current != charcount) + { + while (current != charcount && str[current] != _T(' ')) + { + current++; + if (curx == maxx - 1) + { + cury++; + curx = 0; + } + else + { + curx++; + } + } + + while (current != charcount && str[current] == _T(' ')) + { + current++; + if (curx == maxx - 1) + { + cury++; + curx = 0; + } + else + { + curx++; + } + } + + SetCursorXY(curx, cury); } } else { - MessageBeep (-1); - } - break; - - case VK_RIGHT: - /* move cursor right */ - if (current != charcount) - { - current++; - if (GetCursorX () == maxx - 1) - { - SetCursorXY (0, (SHORT)(GetCursorY () + 1)); - curx = 0; - cury++; - } + /* move cursor right */ + if (current != charcount) + { + current++; + if (GetCursorX () == maxx - 1) + { + SetCursorXY (0, (SHORT)(GetCursorY () + 1)); + curx = 0; + cury++; + } + else + { + SetCursorXY ((SHORT)(GetCursorX () + 1), GetCursorY ()); + curx++; + } + } +#ifdef FEATURE_HISTORY else { - SetCursorXY ((SHORT)(GetCursorX () + 1), GetCursorY ()); - curx++; - } - } -#ifdef FEATURE_HISTORY - else - { - LPCTSTR last = PeekHistory(-1); - if (last && charcount < (INT)_tcslen (last)) - { - PreviousChar = last[current]; - ConOutChar(PreviousChar); - GetCursorXY(&curx, &cury); - str[current++] = PreviousChar; - charcount++; - } - } -#endif + LPCTSTR last = PeekHistory(-1); + if (last && charcount < (INT)_tcslen (last)) + { + PreviousChar = last[current]; + ConOutChar(PreviousChar); + GetCursorXY(&curx, &cury); + str[current++] = PreviousChar; + charcount++; + } + } +#endif + } break; default:

1 0

[pschweitzer] 65781: [MSPAINT] Update French translation
by pschweitzer＠svn.reactos.org 21 Dec '14

21 Dec '14

Author: pschweitzer Date: Sun Dec 21 10:04:55 2014 New Revision: 65781 URL: http://svn.reactos.org/svn/reactos?rev=65781&view=rev Log: [MSPAINT] Update French translation Modified: trunk/reactos/base/applications/mspaint/lang/fr-FR.rc Modified: trunk/reactos/base/applications/mspaint/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/fr-FR.rc [iso-8859-1] Sun Dec 21 10:04:55 2014 @@ -58,7 +58,7 @@ POPUP "&Image" BEGIN MENUITEM "Retourner/Faire pivoter...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "Agrandir/Pencher...\tCtrl+W", IDM_IMAGESTRETCHSKEW MENUITEM "Rogner", IDM_IMAGECROP MENUITEM "Inverser les couleurs\tCtrl+I", IDM_IMAGEINVERTCOLORS MENUITEM "Attributs...\tCtrl+E", IDM_IMAGEATTRIBUTES @@ -149,26 +149,26 @@ IDD_STRETCHSKEW DIALOGEX 100, 100, 225, 150 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" -CAPTION "Stretch and skew image" -BEGIN - GROUPBOX "Stretch", IDD_STRETCHSKEWGROUPSTRETCH, 6, 6, 158, 66 +CAPTION "Agrandir et pencher l'image" +BEGIN + GROUPBOX "Agrandissement", IDD_STRETCHSKEWGROUPSTRETCH, 6, 6, 158, 66 ICON IDI_HORZSTRETCH, IDD_STRETCHSKEWICONHSTRETCH, 12, 18, 32, 32 - LTEXT "Horizontal:", IDD_STRETCHSKEWTEXTHSTRETCH, 45, 24, 40, 10 + LTEXT "Horizontal :", IDD_STRETCHSKEWTEXTHSTRETCH, 45, 24, 40, 10 EDITTEXT IDD_STRETCHSKEWEDITHSTRETCH, 90, 23, 32, 12 LTEXT "%", IDD_STRETCHSKEWTEXTHPERCENT, 125, 24, 15, 10 ICON IDI_VERTSTRETCH, IDD_STRETCHSKEWICONVSTRETCH, 12, 43, 32, 32 - LTEXT "Vertical:", IDD_STRETCHSKEWTEXTVSTRETCH, 45, 49, 40, 10 + LTEXT "Vertical :", IDD_STRETCHSKEWTEXTVSTRETCH, 45, 49, 40, 10 EDITTEXT IDD_STRETCHSKEWEDITVSTRETCH, 90, 48, 32, 12 LTEXT "%", IDD_STRETCHSKEWTEXTVPERCENT, 125, 49, 15, 10 - GROUPBOX "Skew", IDD_STRETCHSKEWGROUPSKEW, 6, 76, 158, 66 + GROUPBOX "Penchement", IDD_STRETCHSKEWGROUPSKEW, 6, 76, 158, 66 ICON IDI_HORZSKEW, IDD_STRETCHSKEWICONHSKEW, 12, 88, 32, 32 - LTEXT "Horizontal:", IDD_STRETCHSKEWTEXTHSKEW, 45, 94, 40, 10 + LTEXT "Horizontal :", IDD_STRETCHSKEWTEXTHSKEW, 45, 94, 40, 10 EDITTEXT IDD_STRETCHSKEWEDITHSKEW, 90, 93, 32, 12 - LTEXT "degrees", IDD_STRETCHSKEWTEXTHDEG, 125, 94, 30, 10 + LTEXT "degrÃ©s", IDD_STRETCHSKEWTEXTHDEG, 125, 94, 30, 10 ICON IDI_VERTSKEW, IDD_STRETCHSKEWICONVSKEW, 12, 113, 32, 32 - LTEXT "Vertical:", IDD_STRETCHSKEWTEXTVSKEW, 45, 119, 40, 10 + LTEXT "Vertical :", IDD_STRETCHSKEWTEXTVSKEW, 45, 119, 40, 10 EDITTEXT IDD_STRETCHSKEWEDITVSKEW, 90, 118, 32, 12 - LTEXT "degrees", IDD_STRETCHSKEWTEXTVDEG, 125, 119, 30, 10 + LTEXT "degrÃ©s", IDD_STRETCHSKEWTEXTVDEG, 125, 119, 30, 10 DEFPUSHBUTTON "OK", IDOK, 170, 8, 48, 14 PUSHBUTTON "Annuler", IDCANCEL, 170, 24, 48, 14 END @@ -202,8 +202,8 @@ IDS_SAVEFILTER "Bitmap 24 bit (*.bmp;*.dib)\1*.bmp;*.dib\1" IDS_FILESIZE "%d octets" IDS_PRINTRES "%d x %d pixels par mÃ¨tre" - IDS_INTNUMBERS "Please enter integral numbers only!" - IDS_PERCENTAGE "The percentage must be between 1 and 500." - IDS_ANGLE "The angle must be between -89 and 89." - IDS_LOADERRORTEXT "The file %s could not be loaded." -END + IDS_INTNUMBERS "Veuillez entrer des nombres entiers uniquement !" + IDS_PERCENTAGE "Le pourcentage doit Ãªtre entre 1 et 500." + IDS_ANGLE "L'angle doit Ãªtre entre -89 et 89." + IDS_LOADERRORTEXT "Le fichier %s n'a pas pu Ãªtre chargÃ©." +END

1 0

[gadamopoulos] 65780: [EXPLORER] * Fix the fallback case when BCM_GETIDEALSIZE doesn't work. * Take into account the size of the borders of the start button twice. Now the caption has enough space ...
by gadamopoulos＠svn.reactos.org 20 Dec '14

20 Dec '14

Author: gadamopoulos Date: Sat Dec 20 22:11:35 2014 New Revision: 65780 URL: http://svn.reactos.org/svn/reactos?rev=65780&view=rev Log: [EXPLORER] * Fix the fallback case when BCM_GETIDEALSIZE doesn't work. * Take into account the size of the borders of the start button twice. Now the caption has enough space and doesn't hide part of the border and more importantly the button is vertically aligned to the tasks buttons. Modified: trunk/reactos/base/shell/explorer/traywnd.cpp Modified: trunk/reactos/base/shell/explorer/traywnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traywn… ============================================================================== --- trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] Sat Dec 20 22:11:35 2014 @@ -102,8 +102,8 @@ if (m_ImageList == NULL || !SendMessageW(BCM_GETIDEALSIZE, 0, (LPARAM) &Size)) { - Size.cx = GetSystemMetrics(SM_CXEDGE); - Size.cy = GetSystemMetrics(SM_CYEDGE); + Size.cx = 2 * GetSystemMetrics(SM_CXEDGE); + Size.cy = 2 * GetSystemMetrics(SM_CYEDGE); if (hbmStart == NULL) {

1 0

[dreimer] 65779: [TRANSLATION] Turkish Translation Update by Erdem Ersoy CORE-7861 #resolve #comment Committed, thx for helping ^^
by dreimer＠svn.reactos.org 20 Dec '14

20 Dec '14

Author: dreimer Date: Sat Dec 20 22:02:26 2014 New Revision: 65779 URL: http://svn.reactos.org/svn/reactos?rev=65779&view=rev Log: [TRANSLATION] Turkish Translation Update by Erdem Ersoy CORE-7861 #resolve #comment Committed, thx for helping ^^ Modified: trunk/reactos/base/applications/mspaint/lang/tr-TR.rc trunk/reactos/dll/win32/rasdlg/lang/tr-TR.rc trunk/reactos/dll/win32/tapiui/lang/tr-TR.rc Modified: trunk/reactos/base/applications/mspaint/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/tr-TR.rc [iso-8859-1] Sat Dec 20 22:02:26 2014 @@ -211,7 +211,7 @@ IDS_FILESIZE "%d Ã§oklu" IDS_PRINTRES "TÃ¼m metrekarelerde %d*%d nokta" IDS_INTNUMBERS "LÃ¼tfen yalnÄ±zca tam sayÄ± giriniz." - IDS_PERCENTAGE "YÃ¼zde 1 ilÃ¢ 500 olmalÄ±dÄ±r." - IDS_ANGLE "AÃ§Ä± -89 ilÃ¢ 89 olmalÄ±dÄ±r." + IDS_PERCENTAGE "YÃ¼zde 1'den 500'e dek olmalÄ±dÄ±r." + IDS_ANGLE "AÃ§Ä± -89'dan 89'a dek olmalÄ±dÄ±r." IDS_LOADERRORTEXT "%s kÃ¼tÃ¼ÄÃ¼ yÃ¼klenemedi." END Modified: trunk/reactos/dll/win32/rasdlg/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasdlg/lang/tr-T… ============================================================================== --- trunk/reactos/dll/win32/rasdlg/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rasdlg/lang/tr-TR.rc [iso-8859-1] Sat Dec 20 22:02:26 2014 @@ -230,7 +230,7 @@ LTEXT "&Åifre:", 1112, 8, 79, 88, 8 EDITTEXT 1103, 103, 76, 154, 14, ES_PASSWORD | ES_AUTOHSCROLL CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN, 8, 97, 248, 1 - AUTOCHECKBOX "&AÅaÄÄ±daki KullanÄ±cÄ±lar Ä°Ã§in Bu KulanÄ±cÄ± AdÄ±nÄ± ve Åifreyi Kaydet:", 1101, 14, 105, 239, 13, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP + AUTOCHECKBOX "&AÅaÄÄ±daki KullanÄ±cÄ±lar Ä°Ã§in Bu KulanÄ±cÄ± AdÄ±nÄ± ve Åifreyi Sakla:", 1101, 14, 105, 239, 13, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP AUTORADIOBUTTON "Ya&lnÄ±zca Ben", 1622, 26, 120, 226, 11, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP AUTORADIOBUTTON "&Bu BilgisayarÄ± Kullanan TÃ¼m KiÅiler", 1623, 26, 134, 229, 11, BS_LEFT | BS_TOP | BS_MULTILINE CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 8, 149, 248, 1 @@ -253,7 +253,7 @@ LTEXT "&Etki AlanÄ±:", 1110, 9, 99, 91, 8 EDITTEXT 1102, 102, 95, 154, 14, ES_UPPERCASE | ES_AUTOHSCROLL CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN, 9, 116, 247, 1 - AUTOCHECKBOX "&AÅaÄÄ±daki KullanÄ±cÄ±lar Ä°Ã§in Bu KulanÄ±cÄ± AdÄ±nÄ± ve Åifreyi Kaydet:", 1101, 12, 123, 243, 13, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP + AUTOCHECKBOX "&AÅaÄÄ±daki KullanÄ±cÄ±lar Ä°Ã§in Bu KulanÄ±cÄ± AdÄ±nÄ± ve Åifreyi Sakla:", 1101, 12, 123, 243, 13, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP AUTORADIOBUTTON "Ya&lnÄ±zca Ben", 1622, 25, 137, 229, 11, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP AUTORADIOBUTTON "&Bu BilgisayarÄ± Kullanan TÃ¼m KiÅiler", 1623, 25, 151, 230, 11, BS_LEFT | BS_TOP | BS_MULTILINE CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 9, 167, 247, 1 @@ -276,7 +276,7 @@ LTEXT "&Etki AlanÄ±:", 1110, 10, 100, 92, 8 EDITTEXT 1102, 104, 95, 154, 14, ES_UPPERCASE | ES_AUTOHSCROLL CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN, 11, 116, 247, 1 - AUTOCHECKBOX "&AÅaÄÄ±daki KullanÄ±cÄ±lar Ä°Ã§in Bu KulanÄ±cÄ± AdÄ±nÄ± ve Åifreyi Kaydet:", 1101, 16, 124, 239, 13, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP + AUTOCHECKBOX "&AÅaÄÄ±daki KullanÄ±cÄ±lar Ä°Ã§in Bu KulanÄ±cÄ± AdÄ±nÄ± ve Åifreyi Sakla:", 1101, 16, 124, 239, 13, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP AUTORADIOBUTTON "Ya&lnÄ±zca Ben", 1622, 29, 139, 225, 11, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP AUTORADIOBUTTON "&Bu BilgisayarÄ± Kullanan TÃ¼m KiÅiler", 1623, 29, 152, 225, 11, BS_LEFT | BS_TOP | BS_MULTILINE CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 10, 167, 247, 1 @@ -300,7 +300,7 @@ LTEXT "&Åifre:", 1112, 10, 81, 92, 8 EDITTEXT 1103, 104, 77, 154, 14, ES_PASSWORD | ES_AUTOHSCROLL CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN, 10, 97, 247, 1 - AUTOCHECKBOX "&AÅaÄÄ±daki KullanÄ±cÄ±lar Ä°Ã§in Bu KulanÄ±cÄ± AdÄ±nÄ± ve Åifreyi Kaydet:", 1101, 12, 103, 243, 13, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP + AUTOCHECKBOX "&AÅaÄÄ±daki KullanÄ±cÄ±lar Ä°Ã§in Bu KulanÄ±cÄ± AdÄ±nÄ± ve Åifreyi Sakla:", 1101, 12, 103, 243, 13, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP AUTORADIOBUTTON "Ya&lnÄ±zca Ben", 1622, 24, 117, 229, 11, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP AUTORADIOBUTTON "&Bu BilgisayarÄ± Kullanan TÃ¼m KiÅiler", 1623, 24, 132, 229, 11, BS_LEFT | BS_TOP | BS_MULTILINE CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 10, 147, 247, 1 @@ -529,7 +529,7 @@ BEGIN LTEXT "Bu baÄlantÄ± iÃ§in istediÄiniz bir ad yazÄ±nÄ±z:", -1, 8, 4, 190, 8 EDITTEXT 1114, 8, 17, 190, 12, ES_AUTOHSCROLL - LTEXT "Onu AÄ BaÄlantÄ±larÄ± dizini iÃ§ine kaydetmek iÃ§in Bitir'e tÄ±klayÄ±nÄ±z.", -1, 8, 38, 193, 8 + LTEXT "Onu AÄ BaÄlantÄ±larÄ± dizini iÃ§ine saklamak iÃ§in Bitir'e tÄ±klayÄ±nÄ±z.", -1, 8, 38, 193, 8 LTEXT "Bu baÄlantÄ±yÄ± daha sonra dÃ¼zenlemek iÃ§in onu seÃ§iniz, KÃ¼tÃ¼k seÃ§kesine tÄ±klayÄ±nÄ±z, sonra HusÃ»siyetler'e tÄ±klayÄ±nÄ±z.", -1, 8, 58, 193, 16 END @@ -825,7 +825,7 @@ AUTOCHECKBOX "&Veri SÄ±kÄ±ÅtÄ±rmasÄ±nÄ± Gerektir", 1363, 27, 65, 184, 10, BS_TOP | BS_MULTILINE | WS_GROUP AUTOCHECKBOX "&GÃ¼Ã§lÃ¼ Veri SÄ±kÄ±ÅtÄ±rmasÄ±nÄ± Gerektir", 1364, 41, 80, 172, 10, BS_TOP | BS_MULTILINE AUTOCHECKBOX "&Ä°ki YÃ¶nlÃ¼ Kimlik DoÄrulamasÄ±nÄ± Kullan", 1362, 17, 95, 194, 10, BS_TOP | BS_MULTILINE - PUSHBUTTON "&Åifreyi Kaydetme", 1369, 59, 117, 80, 14, WS_GROUP + PUSHBUTTON "&Åifreyi Saklama", 1369, 59, 117, 80, 14, WS_GROUP PUSHBUTTON "G&eliÅmiÅ...", 1368, 142, 117, 80, 14, NOT WS_VISIBLE | WS_DISABLED AUTOCHECKBOX "&Ãevirmeden Ãnce KÃ¼tÃ¼k ve YazdÄ±rma PaylaÅÄ±mÄ±nÄ± AlgÄ±la", 1365, 7, 198, 218, 10, BS_TOP | BS_MULTILINE | NOT WS_VISIBLE | WS_DISABLED END @@ -842,7 +842,7 @@ AUTOCHECKBOX "&Veri SÄ±kÄ±ÅtÄ±rmasÄ±nÄ± Gerektir", 1363, 33, 67, 165, 10, WS_GROUP AUTOCHECKBOX "&GÃ¼Ã§lÃ¼ Veri SÄ±kÄ±ÅtÄ±rmasÄ±nÄ± Gerektir", 1364, 48, 79, 152, 10 AUTOCHECKBOX "Å&imdiki KulanÄ±cÄ± AdÄ±nÄ± ve Åifreyi Kullan", 1366, 31, 91, 165, 10 - PUSHBUTTON "&Åifreyi Kaydetme", 1369, 6, 114, 100, 14, WS_GROUP + PUSHBUTTON "&Åifreyi Saklama", 1369, 6, 114, 100, 14, WS_GROUP PUSHBUTTON "G&eliÅmiÅ...", 1368, 109, 114, 60, 14, NOT WS_VISIBLE | WS_DISABLED AUTOCHECKBOX "&Ãevirmeden Ãnce KÃ¼tÃ¼k ve YazdÄ±rma PaylaÅÄ±mÄ±nÄ± AlgÄ±la", 1365, 14, 134, 193, 10, NOT WS_VISIBLE | WS_DISABLED END @@ -886,7 +886,7 @@ EDITTEXT 1394, 66, 46, 143, 14, ES_AUTOHSCROLL LTEXT "&Åifre:", 1397, 8, 70, 49, 8, NOT WS_GROUP EDITTEXT 1393, 66, 64, 143, 14, ES_PASSWORD | ES_AUTOHSCROLL - AUTOCHECKBOX "Å&ifreyi Kaydet", 1391, 66, 84, 143, 10 + AUTOCHECKBOX "Å&ifreyi Sakla", 1391, 66, 84, 143, 10 CONTROL "", 1398, "STATIC", SS_ETCHEDHORZ | WS_GROUP, 7, 98, 200, 1 DEFPUSHBUTTON "Tamam", 1, 81, 104, 60, 14, WS_GROUP PUSHBUTTON "Ä°ptal", 2, 145, 104, 60, 14 @@ -904,7 +904,7 @@ EDITTEXT 1393, 97, 87, 115, 14, ES_PASSWORD | ES_AUTOHSCROLL LTEXT "&Etki AlanÄ±:", 1395, 7, 108, 53, 8, NOT WS_GROUP EDITTEXT 1392, 97, 105, 115, 14, ES_UPPERCASE | ES_AUTOHSCROLL - AUTOCHECKBOX "K&ullanÄ±cÄ± AdÄ±nÄ± ve Åifreyi Kaydet", 1391, 85, 125, 123, 10, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "K&ullanÄ±cÄ± AdÄ±nÄ± ve Åifreyi Sakla", 1391, 85, 125, 123, 10, BS_TOP | BS_MULTILINE DEFPUSHBUTTON "Tamam", 1, 87, 146, 60, 14, WS_GROUP PUSHBUTTON "Ä°ptal", 2, 151, 146, 60, 14 CONTROL "", 1398, "STATIC", SS_ETCHEDHORZ | WS_GROUP, 7, 140, 205, 1 @@ -1405,7 +1405,7 @@ LTEXT "&Åifre:", 1112, 11, 81, 90, 8 EDITTEXT 1103, 104, 77, 154, 14, ES_PASSWORD | ES_AUTOHSCROLL CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN, 10, 98, 248, 1 - AUTOCHECKBOX "&AÅaÄÄ±daki KullanÄ±cÄ±lar Ä°Ã§in Bu KullanÄ±cÄ± AdÄ±nÄ± ve Åifreyi Kaydet:", 1101, 14, 105, 242, 13, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP + AUTOCHECKBOX "&AÅaÄÄ±daki KullanÄ±cÄ±lar Ä°Ã§in Bu KullanÄ±cÄ± AdÄ±nÄ± ve Åifreyi Sakla:", 1101, 14, 105, 242, 13, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP AUTORADIOBUTTON "&YalnÄ±zca Ben", 1622, 26, 119, 225, 11, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP AUTORADIOBUTTON "&Bu BilgisayarÄ± Kullanan TÃ¼m KiÅiler", 1623, 26, 133, 225, 11, BS_LEFT | BS_TOP | BS_MULTILINE CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 10, 149, 248, 1 @@ -1434,7 +1434,7 @@ LTEXT "&Etki AlanÄ±:", 1110, 10, 104, 92, 8 EDITTEXT 1102, 104, 101, 154, 14, ES_UPPERCASE | ES_AUTOHSCROLL CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN, 10, 121, 248, 1 - AUTOCHECKBOX "&AÅaÄÄ±daki KullanÄ±cÄ±lar Ä°Ã§in Bu KullanÄ±cÄ± AdÄ±nÄ± ve Åifreyi Kaydet:", 1101, 12, 127, 242, 13, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP + AUTOCHECKBOX "&AÅaÄÄ±daki KullanÄ±cÄ±lar Ä°Ã§in Bu KullanÄ±cÄ± AdÄ±nÄ± ve Åifreyi Sakla:", 1101, 12, 127, 242, 13, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP AUTORADIOBUTTON "&YalnÄ±zca Ben", 1622, 24, 141, 227, 11, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP AUTORADIOBUTTON "&Bu BilgisayarÄ± Kullanan TÃ¼m KiÅiler", 1623, 24, 155, 230, 11, BS_LEFT | BS_TOP | BS_MULTILINE CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 10, 170, 248, 1 @@ -1771,45 +1771,45 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Select the check box next to each device you want to use for incoming connections.", -1, 10, 4, 299, 10 - LTEXT "&Connection devices:", -1, 10, 16, 275, 8 + LTEXT "Gelen baÄlantÄ±lar iÃ§in kullanmak istediÄiniz tÃ¼m aygÄ±tlarÄ±n bitiÅiÄindeki kutucuklarÄ± imleyiniz.", -1, 10, 4, 299, 10 + LTEXT "&BaÄlantÄ± AygÄ±tlarÄ±:", -1, 10, 16, 275, 8 CONTROL "", 7011, "SYSLISTVIEW32", WS_BORDER | WS_GROUP | WS_TABSTOP | 0x0000440D, 10, 26, 297, 87 - PUSHBUTTON "P&roperties", 7013, 243, 120, 65, 14, WS_GROUP + PUSHBUTTON "&HusÃ»siyetler", 7013, 243, 120, 65, 14, WS_GROUP END 7051 DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Select the check box next to each type of networking software that should be enabled for incoming connections.", -1, 10, 1, 288, 20 - LTEXT "Networking &software:", -1, 10, 24, 274, 8 + LTEXT "Gelen baÄlantÄ±lar iÃ§in etkinleÅtirilmesi gereken tÃ¼m aÄ yazÄ±lÄ±mÄ± tÃ¼rlerinin bitiÅiÄindeki kutucuklarÄ± imleyiniz.", -1, 10, 1, 288, 20 + LTEXT "&AÄ YazÄ±lÄ±mÄ±:", -1, 10, 24, 274, 8 CONTROL "", 7036, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000440D, 10, 34, 286, 33 - PUSHBUTTON "&Install...", 7037, 108, 71, 60, 14, WS_GROUP - PUSHBUTTON "&Uninstall", 7038, 172, 71, 60, 14, WS_GROUP - PUSHBUTTON "&Properties", 7039, 236, 71, 60, 14, WS_GROUP - LTEXT "<protocol description>", 7040, 21, 105, 273, 38 - LTEXT "Description:", -1, 21, 95, 275, 8 + PUSHBUTTON "&Kur...", 7037, 108, 71, 60, 14, WS_GROUP + PUSHBUTTON "Ka&ldÄ±r", 7038, 172, 71, 60, 14, WS_GROUP + PUSHBUTTON "&HusÃ»siyetler", 7039, 236, 71, 60, 14, WS_GROUP + LTEXT "<Ä°letiÅim KÃ¢idesi TanÄ±mÄ±>", 7040, 21, 105, 273, 38 + LTEXT "TanÄ±m:", -1, 21, 95, 275, 8 END 7052 DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Virtual private connections to your computer through the Internet are possible only if your computer has a known name or IP address on the Internet.", -1, 10, 4, 290, 20 - AUTORADIOBUTTON "&Allow virtual private connections", 7053, 29, 63, 265, 10, BS_TOP | BS_MULTILINE | WS_GROUP - AUTORADIOBUTTON "&Do not allow virtual private connections", 7054, 29, 78, 265, 10, BS_TOP | BS_MULTILINE | NOT WS_TABSTOP - LTEXT "Do you want to allow virtual private connections to this computer?", -1, 17, 49, 275, 8 - LTEXT " If you allow VPN connections, ReactOS will modify the Internet Connection Firewall to allow your computer to send and receive VPN packets.", -1, 10, 25, 293, 25 + LTEXT "UmÃ»mÃ® AÄ boyunca bilgisayarÄ±nÄ±za farazÃ® ÅahsÃ® baÄlantÄ±lar ancak bilgisayarÄ±nÄ±zÄ±n UmÃ»mÃ® AÄ'da bilinen bir adÄ± veyÃ¢ IP adresi varsa olasÄ±dÄ±r.", -1, 10, 4, 290, 20 + AUTORADIOBUTTON "&FarazÃ® ÅahsÃ® BaÄlantÄ±lara Ä°zin Ver", 7053, 29, 63, 265, 10, BS_TOP | BS_MULTILINE | WS_GROUP + AUTORADIOBUTTON "F&arazÃ® ÅahsÃ® BaÄlantÄ±lara Ä°zin Verme", 7054, 29, 78, 265, 10, BS_TOP | BS_MULTILINE | NOT WS_TABSTOP + LTEXT "Bu bilgisayara ÅahsÃ® farazÃ® baÄlantÄ±lara izin vermek istiyor musunuz?", -1, 17, 49, 275, 8 + LTEXT "VPN baÄlantÄ±larÄ±na izin verirseniz ReactOS, VPN paketlerini gÃ¶ndermeye ve almaya bilgisayarÄ±nÄ±za izin vermek iÃ§in UmÃ»mÃ® AÄ BaÄlantÄ± GÃ¼venlik DuvarÄ±'nÄ± deÄiÅtirecektir.", -1, 10, 25, 293, 25 END 7055 DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Device for this connection:", -1, 23, 24, 275, 8 + LTEXT "&Bu BaÄlantÄ± Ä°Ã§in AygÄ±t:", -1, 23, 24, 275, 8 COMBOBOX 7056, 22, 36, 275, 125, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP - LTEXT "Devices other than the one you select will not be affected and may be used for other purposes.", -1, 10, 4, 275, 17 - PUSHBUTTON "&Properties", 7061, 232, 53, 65, 14, WS_GROUP + LTEXT "SeÃ§tiÄinizden baÅka aygÄ±tlar etkilenmeyecektir ve baÅka amaÃ§lar iÃ§in kullanÄ±labilir.", -1, 10, 4, 275, 17 + PUSHBUTTON "&HusÃ»siyetler", 7061, 232, 53, 65, 14, WS_GROUP END 7379 DIALOGEX 0, 0, 317, 143 @@ -1820,23 +1820,23 @@ 19900 DIALOGEX 0, 0, 156, 44 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION -CAPTION "Dial-Up Networking" +CAPTION "Ãevirmeli AÄ" FONT 8, "MS Shell Dlg" BEGIN ICON 563, 19901, 10, 10, 18, 20 - LTEXT "Waiting for services to start...", 19902, 34, 16, 120, 8 + LTEXT "Servisleri baÅlatmak iÃ§in bekleniyor...", 19902, 34, 16, 120, 8 END STRINGTABLE BEGIN - 187 "&No, do not dial\0" - 188 "You (or a program) have requested information from %1. Which connection do you want to use?\0" - 189 "Add Alternate Phone Number\0" - 190 "Dial only first available device\0" - 191 "Dial all devices\0" - 192 "Dial devices only as needed\0" - 193 "Enter a user name and password with access to the remote network domain.\0" - 194 "Network Address Translation (NAT) is currently installed as a routing protocol,\nand must be removed before enabling Internet Connection Sharing.\nTo remove Network Address Translation, open the Routing and Remote Access Manager\nsnapin and expand the router's entry in the left pane.\nDelete the Network Address Translation routing protocol from the list of IP\nrouting protocols.\0" + 187 "&HayÄ±r, Ãevirme\0" + 188 "Siz (ya da bir izlence) %1'den bilgi istemiÅ. Hangi baÄlantÄ±yÄ± kullanmak istersiniz?\0" + 189 "BaÅka Telefon NumarasÄ± Ekle\0" + 190 "YalnÄ±zca Birinci Var Olan AygÄ±tÄ± Ãevir\0" + 191 "TÃ¼m AygÄ±tlarÄ± Ãevir\0" + 192 "YalnÄ±zca Gerekli Olan AygÄ±tlarÄ± Ãevir\0" + 193 "Uzak aÄ etki alanÄ±na eriÅimi olan bir kullanÄ±cÄ± adÄ± ve Åifre giriniz.\0" + 194 "AÄ Adresi Ãevirimi (NAT) bir yÃ¶nlendirme iletiÅim kÃ¢idesi olarak Åimdilik yÃ¼klÃ¼\nve UmÃ»mÃ® AÄ BaÄlantÄ± PaylaÅÄ±mÄ±'nÄ± etkinleÅtirmeden Ã¶nce kaldÄ±rÄ±lmalÄ±dÄ±r.\nAÄ Adresi Ãevirimi'ni silmek iÃ§in YÃ¶nlendirme ve Uzaktan EriÅim YÃ¶neticisi ek bileÅenini aÃ§Ä±nÄ±z\nve sol bÃ¶lmede yÃ¶nlendiricinin giriÅini geniÅletiniz.\nIP yÃ¶nlendirme iletiÅim kÃ¢idelerinin dizelgesinden AÄ Adresi Ãevirimi yÃ¶nlendirme\niletiÅim kÃ¢idesini siliniz.\0" 195 "The area code must contain only the digits 0 to 9.\0" 196 "The entry name must contain at least one non-blank character and cannot begin with a period. Choose a different name.\0" 197 "You must choose a value from %1 to %2 for this field.\0" Modified: trunk/reactos/dll/win32/tapiui/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/lang/tr-T… ============================================================================== --- trunk/reactos/dll/win32/tapiui/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/tapiui/lang/tr-TR.rc [iso-8859-1] Sat Dec 20 22:02:26 2014 @@ -337,9 +337,9 @@ 9 "Alan Kodu" 10 "Ãn Ekler" 11 "KÃ¢ide" - 12 "GirdiÄiniz damga geÃ§ersiz.\n\nGeÃ§erli damgalar; 0 ilÃ¢ 9, *, #, ve virgÃ¼ldÃ¼r." - 13 "GirdiÄiniz damga geÃ§ersiz.\n\nGeÃ§erli damgalar; 0 ilÃ¢ 9, *, #, boÅluk ve virgÃ¼ldÃ¼r." - 14 "GirdiÄiniz damga geÃ§ersiz.\n\nGeÃ§erli damgalar; 0 ilÃ¢ 9'dur." + 12 "GirdiÄiniz damga geÃ§ersiz.\n\nGeÃ§erli damgalar; 0'dan 9'a dek, *, #, ve virgÃ¼ldÃ¼r." + 13 "GirdiÄiniz damga geÃ§ersiz.\n\nGeÃ§erli damgalar; 0'dan 9'a dek, *, #, boÅluk ve virgÃ¼ldÃ¼r." + 14 "GirdiÄiniz damga geÃ§ersiz.\n\nGeÃ§erli damgalar; 0'dan 9'a dektir." 15 "GirdiÄiniz damga geÃ§ersiz." 16 "Ãevir: %1" 17 "Ãevir: %1 ve alan kodu." @@ -362,7 +362,7 @@ 34 "Bir ya da daha Ã§ok, boÅluklarla ya da virgÃ¼llerle ayrÄ±lan Ã¶n ek giriniz." 35 "BasamaklarÄ± Belirle" 36 "Ãevrilmek iÃ§in * ve # iÃ§inde olmak Ã¼zere bir ya da daha Ã§ok basamak giriniz." - 37 "GeÃ§ersiz bir damga girmeye Ã§alÄ±ÅtÄ±nÄ±z.\n\nGeÃ§erli damgalar, 0 ilÃ¢ 9 ve boÅluktur." + 37 "GeÃ§ersiz bir damga girmeye Ã§alÄ±ÅtÄ±nÄ±z.\n\nGeÃ§erli damgalar, 0'dan 9'a dek ve boÅluktur." 38 "%1!d! sÃ¢niye bekleyiniz." 39 "EriÅim numarasÄ±nÄ± Ã§eviriniz." 40 "Hesap numarasÄ±nÄ± Ã§eviriniz." @@ -401,7 +401,7 @@ 73 "Bu kÃ¢idenin uyguladÄ±ÄÄ± Ã¶n ekleri girmelisiniz." 74 "&Basamaklar:" 75 "&Ãn Ekler:" - 76 "GeÃ§ersiz bir damga girmeye Ã§alÄ±ÅtÄ±nÄ±z.\n\nGeÃ§erli damgalar; 0 ilÃ¢ 9, boÅluk ve virgÃ¼ldÃ¼r." + 76 "GeÃ§ersiz bir damga girmeye Ã§alÄ±ÅtÄ±nÄ±z.\n\nGeÃ§erli damgalar; 0'dan 9'a dek, boÅluk ve virgÃ¼ldÃ¼r." 77 "Silmeyi DoÄrula" 78 "Bu konumu silmeyi istediÄinizden emin misiniz?" 79 "Bu arama kartÄ±nÄ± silmek istediÄinizden emin misiniz?" @@ -412,7 +412,7 @@ 84 "DoÄrulamayÄ± Ä°ptal Et" 85 "Konumum" 86 "<Kurulum iÃ§in hizmet saÄlayÄ±cÄ±sÄ± yok.>" - 87 "GirdiÄiniz damga geÃ§ersiz.\n\nGeÃ§erli damgalar; 0 ilÃ¢ 9, A ilÃ¢ D, *, #, +, !, boÅluk ve virgÃ¼ldÃ¼r." + 87 "GirdiÄiniz damga geÃ§ersiz.\n\nGeÃ§erli damgalar; 0'dan 9'a dek, A'dan D'ye dek, *, #, +, !, boÅluk ve virgÃ¼ldÃ¼r." 88 "Bu konum iÃ§in uluslararasÄ± taÅÄ±yÄ±cÄ± kodu girmelisiniz." 89 "Bu konum iÃ§in taÅÄ±yÄ±cÄ± kodu girmelisiniz." 90 "Bu sayfa, bilgisayarÄ±nÄ±zda telefon aramalarÄ±nÄ± veyÃ¢ baÅka Ã§oklu ortam baÄlantÄ±larÄ±nÄ± yapmaya veyÃ¢ izlemeye Ã§alÄ±ÅÄ±yor.\nSÃ¼rdÃ¼rmek iÃ§in ona izin vermek istiyor musunuz?"

1 0

[ekohl] 65778: [USETUP] Start implementing the recovery console: CLS, EXIT and HELP have been implemented. I also added a DUMPSECTOR command that enables us to dump disk sectors to the screen. For ...
by ekohl＠svn.reactos.org 20 Dec '14

20 Dec '14

Author: ekohl Date: Sat Dec 20 21:58:22 2014 New Revision: 65778 URL: http://svn.reactos.org/svn/reactos?rev=65778&view=rev Log: [USETUP] Start implementing the recovery console: CLS, EXIT and HELP have been implemented. I also added a DUMPSECTOR command that enables us to dump disk sectors to the screen. For example "DUMPSECTOR 0 63" dumps disk 0 sector 63 to the screen. Added: trunk/reactos/base/setup/usetup/cmdcons.c (with props) trunk/reactos/base/setup/usetup/cmdcons.h (with props) Modified: trunk/reactos/base/setup/usetup/CMakeLists.txt trunk/reactos/base/setup/usetup/interface/consup.c trunk/reactos/base/setup/usetup/interface/consup.h trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/native/utils/console.c trunk/reactos/base/setup/usetup/usetup.h Modified: trunk/reactos/base/setup/usetup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/CMakeLis… ============================================================================== --- trunk/reactos/base/setup/usetup/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/CMakeLists.txt [iso-8859-1] Sat Dec 20 21:58:22 2014 @@ -18,6 +18,7 @@ bootsup.c cabinet.c chkdsk.c + cmdcons.c drivesup.c filesup.c filequeue.c Added: trunk/reactos/base/setup/usetup/cmdcons.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/cmdcons.… ============================================================================== --- trunk/reactos/base/setup/usetup/cmdcons.c (added) +++ trunk/reactos/base/setup/usetup/cmdcons.c [iso-8859-1] Sat Dec 20 21:58:22 2014 @@ -0,0 +1,978 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS text-mode setup + * FILE: subsys/system/usetup/cmdcons.c + * PURPOSE: Recovery console + * PROGRAMMER: Eric Kohl + */ + +#include "usetup.h" + +#define NDEBUG +#include <debug.h> + + +//#define FEATURE_HISTORY + +typedef struct _CONSOLE_STATE +{ + SHORT maxx; + SHORT maxy; + BOOLEAN bInsert; + BOOLEAN bExit; +} CONSOLE_STATE, *PCONSOLE_STATE; + +typedef struct tagCOMMAND +{ + LPSTR name; + INT flags; + INT (*func)(PCONSOLE_STATE, LPSTR); +} COMMAND, *LPCOMMAND; + + +static +INT +CommandCls( + PCONSOLE_STATE State, + LPSTR param); + +static +INT +CommandDumpSector( + PCONSOLE_STATE State, + LPSTR param); + +static +INT +CommandExit( + PCONSOLE_STATE State, + LPSTR param); + +static +INT +CommandHelp( + PCONSOLE_STATE State, + LPSTR param); + +COMMAND +Commands[] = +{ + {"cls", 0, CommandCls}, + {"dumpsector", 0, CommandDumpSector}, + {"exit", 0, CommandExit}, + {"help", 0, CommandHelp}, + {NULL, 0, NULL} +}; + + +static +VOID +freep( + LPSTR *p) +{ + LPSTR *q; + + if (!p) + return; + + q = p; + while (*q) + RtlFreeHeap(ProcessHeap, 0, *q++); + + RtlFreeHeap(ProcessHeap, 0, p); +} + + +static +VOID +StripQuotes( + LPSTR in) +{ + LPSTR out = in; + + for (; *in; in++) + { + if (*in != '"') + *out++ = *in; + } + + *out = '\0'; +} + + +BOOL +add_entry( + LPINT ac, + LPSTR **arg, + LPCSTR entry) +{ + LPSTR q; + LPSTR *oldarg; + + q = RtlAllocateHeap(ProcessHeap, 0, strlen(entry) + 1); + if (q == NULL) + return FALSE; + + strcpy(q, entry); + oldarg = *arg; + *arg = RtlReAllocateHeap(ProcessHeap, 0, oldarg, (*ac + 2) * sizeof(LPSTR)); + if (*arg == NULL) + { + RtlFreeHeap(ProcessHeap, 0, q); + *arg = oldarg; + return FALSE; + } + + /* save new entry */ + (*arg)[*ac] = q; + (*arg)[++(*ac)] = NULL; + + return TRUE; +} + +static +LPSTR * +split( + LPSTR s, + LPINT args) +{ + LPSTR *arg; + LPSTR start; + LPSTR q; + INT ac; + INT_PTR len; + BOOL bQuoted; + + arg = RtlAllocateHeap(ProcessHeap, 0 , sizeof(LPTSTR)); + if (arg == NULL) + return NULL; + + *arg = NULL; + + ac = 0; + while (*s) + { + bQuoted = FALSE; + + /* skip leading spaces */ + while (*s && (isspace(*s) || iscntrl(*s))) + ++s; + + start = s; + + /* the first character can be '/' */ + if (*s == '/') + s++; + + /* skip to next word delimiter or start of next option */ + while (isprint(*s)) + { + /* if quote (") then set bQuoted */ + bQuoted ^= (*s == '\"'); + + /* Check if we have unquoted text */ + if (!bQuoted) + { + /* check for separators */ + if (isspace(*s) || (*s == '/')) + { + /* Make length at least one character */ + if (s == start) + s++; + break; + } + } + + s++; + } + + /* a word was found */ + if (s != start) + { + len = s - start; + q = RtlAllocateHeap(ProcessHeap, 0, len + 1); + if (q == NULL) + { + freep(arg); + return NULL; + } + + memcpy(q, start, len); + q[len] = '\0'; + + StripQuotes(q); + + if (!add_entry(&ac, &arg, q)) + { + RtlFreeHeap(ProcessHeap, 0, q); + freep(arg); + return NULL; + } + + RtlFreeHeap(ProcessHeap, 0, q); + } + } + + *args = ac; + + return arg; +} + + +static +INT +CommandCls( + PCONSOLE_STATE State, + LPSTR param) +{ +#if 0 + HANDLE hOutput; + COORD coPos; + DWORD dwWritten; + +#if 0 + if (!strncmp(param, "/?", 2)) + { + ConOutResPaging(TRUE,STRING_CLS_HELP); + return 0; + } +#endif + + coPos.X = 0; + coPos.Y = 0; + + hOutput = GetStdHandle(STD_OUTPUT_HANDLE); + FillConsoleOutputAttribute(hOutput, csbi.wAttributes, + State->maxx * State->maxy, + coPos, &dwWritten); + FillConsoleOutputCharacter(hOutput, ' ', + State->maxx * State->maxy, + coPos, &dwWritten); + SetConsoleCursorPosition(hOutput, coPos); +#endif + + CONSOLE_ClearScreen(); + CONSOLE_SetCursorXY(0, 0); + + return 0; +} + + +void HexDump(PUCHAR buffer, ULONG size) +{ + ULONG offset = 0; + PUCHAR ptr; + + while (offset < (size & ~15)) + { + ptr = (PUCHAR)((ULONG_PTR)buffer + offset); + CONSOLE_ConOutPrintf("%04lx %02hx %02hx %02hx %02hx %02hx %02hx %02hx %02hx %02hx %02hx %02hx %02hx %02hx %02hx %02hx %02hx\n", + offset, + ptr[0], + ptr[1], + ptr[2], + ptr[3], + ptr[4], + ptr[5], + ptr[6], + ptr[7], + ptr[8], + ptr[9], + ptr[10], + ptr[11], + ptr[12], + ptr[13], + ptr[14], + ptr[15]); + offset += 16; + } + + if (offset < size) + { + ptr = (PUCHAR)((ULONG_PTR)buffer + offset); + CONSOLE_ConOutPrintf("%04lx ", offset); + while (offset < size) + { + CONSOLE_ConOutPrintf(" %02hx", *ptr); + offset++; + ptr++; + } + + CONSOLE_ConOutPrintf("\n"); + } + + CONSOLE_ConOutPrintf("\n"); +} + +static +INT +CommandDumpSector( + PCONSOLE_STATE State, + LPSTR param) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + UNICODE_STRING PathName; + HANDLE hDisk = NULL; + DISK_GEOMETRY DiskGeometry; + NTSTATUS Status; + + LPTSTR *argv = NULL; + INT argc = 0; + WCHAR DriveName[40]; + ULONG ulDrive; +// ULONG ulSector; + LARGE_INTEGER Sector, SectorCount, Offset; + PUCHAR Buffer = NULL; + + DPRINT1("param: %s\n", param); + + if (!strncmp(param, "/?", 2)) + { + CONSOLE_ConOutPrintf("DUMPSECT DiskNumber Sector\n\nDumps a disk sector to the screen.\n\n"); + return 0; + } + + argv = split(param, &argc); + + DPRINT1("argc: %d\n", argc); + DPRINT1("argv: %p\n", argv); + + if (argc != 2) + { + goto done; + } + + DPRINT1("Device: %s\n", argv[0]); + DPRINT1("Sector: %s\n", argv[1]); + + ulDrive = strtoul(argv[0], NULL, 0); +// ulSector = strtoul(argv[1], NULL, 0); + Sector.QuadPart = _atoi64(argv[1]); + + /* Build full drive name */ +// swprintf(DriveName, L"\\\\.\\PHYSICALDRIVE%lu", ulDrive); + swprintf(DriveName, L"\\Device\\Harddisk%lu\\Partition0", ulDrive); + + RtlInitUnicodeString(&PathName, + DriveName); + + InitializeObjectAttributes(&ObjectAttributes, + &PathName, + OBJ_CASE_INSENSITIVE | OBJ_INHERIT, + NULL, + NULL); + + Status = NtOpenFile(&hDisk, + GENERIC_READ | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE | FILE_RANDOM_ACCESS); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtCreateFile failed (Status 0x%08lx)\n", Status); + goto done; + } + + Status = NtDeviceIoControlFile(hDisk, + NULL, + NULL, + NULL, + &IoStatusBlock, + IOCTL_DISK_GET_DRIVE_GEOMETRY, + NULL, + 0, + &DiskGeometry, + sizeof(DISK_GEOMETRY)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtDeviceIoControlFile failed (Status 0x%08lx)\n", Status); + goto done; + } + + DPRINT1("Drive number: %lu\n", ulDrive); + DPRINT1("Cylinders: %I64u\nMediaType: %x\nTracksPerCylinder: %lu\n" + "SectorsPerTrack: %lu\nBytesPerSector: %lu\n\n", + DiskGeometry.Cylinders.QuadPart, + DiskGeometry.MediaType, + DiskGeometry.TracksPerCylinder, + DiskGeometry.SectorsPerTrack, + DiskGeometry.BytesPerSector); + + DPRINT1("Sector: %I64u\n", Sector.QuadPart); + + SectorCount.QuadPart = DiskGeometry.Cylinders.QuadPart * + DiskGeometry.TracksPerCylinder, + DiskGeometry.SectorsPerTrack; + if (Sector.QuadPart >= SectorCount.QuadPart) + { + CONSOLE_ConOutPrintf("Invalid sector number! Valid range: [0 - %I64u]\n", SectorCount.QuadPart - 1); + goto done; + } + + Buffer = RtlAllocateHeap(ProcessHeap, 0, DiskGeometry.BytesPerSector); + if (Buffer == NULL) + { + DPRINT1("Buffer allocation failed\n"); + goto done; + } + + + Offset.QuadPart = Sector.QuadPart * DiskGeometry.BytesPerSector; + DPRINT1("Offset: %I64u\n", Offset.QuadPart); + + Status = NtReadFile(hDisk, + NULL, + NULL, + NULL, + &IoStatusBlock, + Buffer, + DiskGeometry.BytesPerSector, + &Offset, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtReadFile failed (Status 0x%08lx)\n", Status); + goto done; + } + + HexDump(Buffer, DiskGeometry.BytesPerSector); + +done: + if (Buffer != NULL) + RtlFreeHeap(ProcessHeap, 0, Buffer); + + if (hDisk != NULL) + NtClose(hDisk); + + freep(argv); + + return 0; +} + + +static +INT +CommandExit( + PCONSOLE_STATE State, + LPSTR param) +{ +#if 0 + if (!strncmp(param, "/?", 2)) + { + ConOutResPaging(TRUE,STRING_EXIT_HELP); + /* Just make sure */ + bExit = FALSE; + /* Dont exit */ + return 0; + } +#endif + + State->bExit = TRUE; + + return 0; +} + + +static +INT +CommandHelp( + PCONSOLE_STATE State, + LPSTR param) +{ + CONSOLE_ConOutPrintf("CLS\n"); + CONSOLE_ConOutPrintf("DUMPSECTOR\n"); + CONSOLE_ConOutPrintf("EXIT\n"); + CONSOLE_ConOutPrintf("HELP\n"); + CONSOLE_ConOutPrintf("\n"); + + return 0; +} + + +static +VOID +ClearCommandLine( + LPSTR str, + INT maxlen, + SHORT orgx, + SHORT orgy) +{ + INT count; + + CONSOLE_SetCursorXY(orgx, orgy); + for (count = 0; count < (INT)strlen(str); count++) + CONSOLE_ConOutChar(' '); + memset(str, 0, maxlen); + CONSOLE_SetCursorXY(orgx, orgy); +} + + +static +BOOL +ReadCommand( + PCONSOLE_STATE State, + LPSTR str, + INT maxlen) +{ + SHORT orgx; /* origin x/y */ + SHORT orgy; + SHORT curx; /*current x/y cursor position*/ + SHORT cury; + SHORT tempscreen; + INT count; /*used in some for loops*/ + INT current = 0; /*the position of the cursor in the string (str)*/ + INT charcount = 0;/*chars in the string (str)*/ + INPUT_RECORD ir; + CHAR ch; + BOOL bReturn = FALSE; + BOOL bCharInput; +#ifdef FEATURE_HISTORY + //BOOL bContinue=FALSE;/*is TRUE the second case will not be executed*/ + CHAR PreviousChar; +#endif + + + CONSOLE_GetCursorXY(&orgx, &orgy); + curx = orgx; + cury = orgy; + + memset(str, 0, maxlen * sizeof(CHAR)); + + CONSOLE_SetCursorType(State->bInsert, TRUE); + + do + { + bReturn = FALSE; + CONSOLE_ConInKey(&ir); + + if (ir.Event.KeyEvent.dwControlKeyState & + (RIGHT_ALT_PRESSED |LEFT_ALT_PRESSED| + RIGHT_CTRL_PRESSED|LEFT_CTRL_PRESSED) ) + { + switch (ir.Event.KeyEvent.wVirtualKeyCode) + { +#ifdef FEATURE_HISTORY + case 'K': + /*add the current command line to the history*/ + if (ir.Event.KeyEvent.dwControlKeyState & + (LEFT_CTRL_PRESSED|RIGHT_CTRL_PRESSED)) + { + if (str[0]) + History(0,str); + + ClearCommandLine (str, maxlen, orgx, orgy); + current = charcount = 0; + curx = orgx; + cury = orgy; + //bContinue=TRUE; + break; + } + + case 'D': + /*delete current history entry*/ + if (ir.Event.KeyEvent.dwControlKeyState & + (LEFT_CTRL_PRESSED|RIGHT_CTRL_PRESSED)) + { + ClearCommandLine (str, maxlen, orgx, orgy); + History_del_current_entry(str); + current = charcount = strlen (str); + ConOutPrintf("%s", str); + GetCursorXY(&curx, &cury); + //bContinue=TRUE; + break; + } + +#endif /*FEATURE_HISTORY*/ + } + } + + bCharInput = FALSE; + + switch (ir.Event.KeyEvent.wVirtualKeyCode) + { + case VK_BACK: + /* <BACKSPACE> - delete character to left of cursor */ + if (current > 0 && charcount > 0) + { + if (current == charcount) + { + /* if at end of line */ + str[current - 1] = L'\0'; + if (CONSOLE_GetCursorX () != 0) + { + CONSOLE_ConOutPrintf("\b \b"); + curx--; + } + else + { + CONSOLE_SetCursorXY((SHORT)(State->maxx - 1), (SHORT)(CONSOLE_GetCursorY () - 1)); + CONSOLE_ConOutChar(' '); + CONSOLE_SetCursorXY((SHORT)(State->maxx - 1), (SHORT)(CONSOLE_GetCursorY () - 1)); + cury--; + curx = State->maxx - 1; + } + } + else + { + for (count = current - 1; count < charcount; count++) + str[count] = str[count + 1]; + if (CONSOLE_GetCursorX () != 0) + { + CONSOLE_SetCursorXY ((SHORT)(CONSOLE_GetCursorX () - 1), CONSOLE_GetCursorY ()); + curx--; + } + else + { + CONSOLE_SetCursorXY ((SHORT)(State->maxx - 1), (SHORT)(CONSOLE_GetCursorY () - 1)); + cury--; + curx = State->maxx - 1; + } + CONSOLE_GetCursorXY(&curx, &cury); + CONSOLE_ConOutPrintf("%s ", &str[current - 1]); + CONSOLE_SetCursorXY(curx, cury); + } + charcount--; + current--; + } + break; + + case VK_INSERT: + /* toggle insert/overstrike mode */ + State->bInsert ^= TRUE; + CONSOLE_SetCursorType(State->bInsert, TRUE); + break; + + case VK_DELETE: + /* delete character under cursor */ + if (current != charcount && charcount > 0) + { + for (count = current; count < charcount; count++) + str[count] = str[count + 1]; + charcount--; + CONSOLE_GetCursorXY(&curx, &cury); + CONSOLE_ConOutPrintf("%s ", &str[current]); + CONSOLE_SetCursorXY(curx, cury); + } + break; + + case VK_HOME: + /* goto beginning of string */ + if (current != 0) + { + CONSOLE_SetCursorXY(orgx, orgy); + curx = orgx; + cury = orgy; + current = 0; + } + break; + + case VK_END: + /* goto end of string */ + if (current != charcount) + { + CONSOLE_SetCursorXY(orgx, orgy); + CONSOLE_ConOutPrintf("%s", str); + CONSOLE_GetCursorXY(&curx, &cury); + current = charcount; + } + break; + + case 'M': + case 'C': + /* ^M does the same as return */ + bCharInput = TRUE; + if (!(ir.Event.KeyEvent.dwControlKeyState & + (RIGHT_CTRL_PRESSED|LEFT_CTRL_PRESSED))) + { + break; + } + + case VK_RETURN: + /* end input, return to main */ +#ifdef FEATURE_HISTORY + /* add to the history */ + if (str[0]) + History (0, str); +#endif + str[charcount++] = '\n'; + str[charcount] = '\0'; + CONSOLE_ConOutChar('\n'); + bReturn = TRUE; + break; + + case VK_ESCAPE: + /* clear str Make this callable! */ + ClearCommandLine (str, maxlen, orgx, orgy); + curx = orgx; + cury = orgy; + current = charcount = 0; + break; + +#ifdef FEATURE_HISTORY + case VK_F3: + History_move_to_bottom(); +#endif + case VK_UP: +#ifdef FEATURE_HISTORY + /* get previous command from buffer */ + ClearCommandLine (str, maxlen, orgx, orgy); + History (-1, str); + current = charcount = strlen (str); + if (((charcount + orgx) / maxx) + orgy > maxy - 1) + orgy += maxy - ((charcount + orgx) / maxx + orgy + 1); + CONSOLE_ConOutPrintf("%s", str); + CONSOLE_GetCursorXY(&curx, &cury); +#endif + break; + + case VK_DOWN: +#ifdef FEATURE_HISTORY + /* get next command from buffer */ + ClearCommandLine (str, maxlen, orgx, orgy); + History (1, str); + current = charcount = strlen (str); + if (((charcount + orgx) / maxx) + orgy > maxy - 1) + orgy += maxy - ((charcount + orgx) / maxx + orgy + 1); + CONSOLE_ConOutPrintf("%s", str); + CONSOLE_GetCursorXY(&curx, &cury); +#endif + break; + + case VK_LEFT: + /* move cursor left */ + if (current > 0) + { + current--; + if (CONSOLE_GetCursorX() == 0) + { + CONSOLE_SetCursorXY((SHORT)(State->maxx - 1), (SHORT)(CONSOLE_GetCursorY () - 1)); + curx = State->maxx - 1; + cury--; + } + else + { + CONSOLE_SetCursorXY((SHORT)(CONSOLE_GetCursorX () - 1), CONSOLE_GetCursorY ()); + curx--; + } + } + break; + + case VK_RIGHT: + /* move cursor right */ + if (current != charcount) + { + current++; + if (CONSOLE_GetCursorX() == State->maxx - 1) + { + CONSOLE_SetCursorXY(0, (SHORT)(CONSOLE_GetCursorY () + 1)); + curx = 0; + cury++; + } + else + { + CONSOLE_SetCursorXY((SHORT)(CONSOLE_GetCursorX () + 1), CONSOLE_GetCursorY ()); + curx++; + } + } +#ifdef FEATURE_HISTORY + else + { + LPCSTR last = PeekHistory(-1); + if (last && charcount < (INT)strlen (last)) + { + PreviousChar = last[current]; + CONSOLE_ConOutChar(PreviousChar); + CONSOLE_GetCursorXY(&curx, &cury); + str[current++] = PreviousChar; + charcount++; + } + } +#endif + break; + + default: + /* This input is just a normal char */ + bCharInput = TRUE; + + } + + ch = ir.Event.KeyEvent.uChar.UnicodeChar; + if (ch >= 32 && (charcount != (maxlen - 2)) && bCharInput) + { + /* insert character into string... */ + if (State->bInsert && current != charcount) + { + /* If this character insertion will cause screen scrolling, + * adjust the saved origin of the command prompt. */ + tempscreen = strlen(str + current) + curx; + if ((tempscreen % State->maxx) == (State->maxx - 1) && + (tempscreen / State->maxx) + cury == (State->maxy - 1)) + { + orgy--; + cury--; + } + + for (count = charcount; count > current; count--) + str[count] = str[count - 1]; + str[current++] = ch; + if (curx == State->maxx - 1) + curx = 0, cury++; + else + curx++; + CONSOLE_ConOutPrintf("%s", &str[current - 1]); + CONSOLE_SetCursorXY(curx, cury); + charcount++; + } + else + { + if (current == charcount) + charcount++; + str[current++] = ch; + if (CONSOLE_GetCursorX () == State->maxx - 1 && CONSOLE_GetCursorY () == State->maxy - 1) + orgy--, cury--; + if (CONSOLE_GetCursorX () == State->maxx - 1) + curx = 0, cury++; + else + curx++; + CONSOLE_ConOutChar(ch); + } + } + } + while (!bReturn); + + CONSOLE_SetCursorType(State->bInsert, TRUE); + + return TRUE; +} + + +static +BOOL +IsDelimiter( + CHAR c) +{ + return (c == '/' || c == '=' || c == '\0' || isspace(c)); +} + + +static +VOID +DoCommand( + PCONSOLE_STATE State, + LPSTR line) +{ + CHAR com[MAX_PATH]; /* the first word in the command */ + LPSTR cp = com; +// LPSTR cstart; + LPSTR rest = line; /* pointer to the rest of the command line */ +// INT cl; + LPCOMMAND cmdptr; + + DPRINT1("DoCommand: (\'%s\')\n", line); + + /* Skip over initial white space */ + while (isspace(*rest)) + rest++; + +// cstart = rest; + + /* Anything to do ? */ + if (*rest) + { + /* Copy over 1st word as lower case */ + while (!IsDelimiter(*rest)) + *cp++ = tolower(*rest++); + + /* Terminate first word */ + *cp = '\0'; + + /* Skip over whitespace to rest of line */ + while (isspace (*rest)) + rest++; + + /* Scan internal command table */ + for (cmdptr = Commands; ; cmdptr++) + { + /* If end of table execute ext cmd */ + if (cmdptr->name == NULL) + { + CONSOLE_ConOutPuts("Unknown command. Enter HELP to get a list of commands."); + break; + } + + if (strcmp(com, cmdptr->name) == 0) + { + cmdptr->func(State, rest); + break; + } + +#if 0 + /* The following code handles the case of commands like CD which + * are recognised even when the command name and parameter are + * not space separated. + * + * e.g dir.. + * cd\freda + */ + + /* Get length of command name */ + cl = strlen(cmdptr->name); + + if ((cmdptr->flags & CMD_SPECIAL) && + (!strncmp (cmdptr->name, com, cl)) && + (strchr("\\.-", *(com + cl)))) + { + /* OK its one of the specials...*/ + + /* Call with new rest */ + cmdptr->func(State, cstart + cl); + break; + } +#endif + } + } +} + + +VOID +RecoveryConsole(VOID) +{ + CHAR szInputBuffer[256]; + CONSOLE_SCREEN_BUFFER_INFO csbi; + CONSOLE_STATE State; + + GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &csbi); + + /* get screen size */ + State.maxx = csbi.dwSize.X; + State.maxy = csbi.dwSize.Y; + State.bInsert = TRUE; + State.bExit = FALSE; + + CONSOLE_ClearScreen(); + CONSOLE_SetCursorXY(0, 0); + + CONSOLE_ConOutPrintf("ReactOS Recovery Console\n\nEnter HELP to get a list of commands.\n\n"); + + while (!State.bExit) + { + /* Prompt */ + CONSOLE_ConOutPrintf(">"); + + ReadCommand(&State, szInputBuffer, 256); +DPRINT1("%s\n", szInputBuffer); + + DoCommand(&State, szInputBuffer); + +// Cmd = ParseCommand(NULL); +// if (!Cmd) +// continue; + +// ExecuteCommand(Cmd); +// FreeCommand(Cmd); + } +} + +/* EOF */ Propchange: trunk/reactos/base/setup/usetup/cmdcons.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/setup/usetup/cmdcons.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/cmdcons.… ============================================================================== --- trunk/reactos/base/setup/usetup/cmdcons.h (added) +++ trunk/reactos/base/setup/usetup/cmdcons.h [iso-8859-1] Sat Dec 20 21:58:22 2014 @@ -0,0 +1,12 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS text-mode setup + * FILE: subsys/system/usetup/cmdcons.h + * PURPOSE: Recovery console + * PROGRAMMER: Eric Kohl + */ + +VOID +RecoveryConsole(VOID); + +/* EOF */ Propchange: trunk/reactos/base/setup/usetup/cmdcons.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/setup/usetup/interface/consup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/consup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/consup.c [iso-8859-1] Sat Dec 20 21:58:22 2014 @@ -134,6 +134,19 @@ return FlushConsoleInputBuffer(StdInput); } +VOID +CONSOLE_GetCursorXY( + PSHORT x, + PSHORT y) +{ + CONSOLE_SCREEN_BUFFER_INFO csbi; + + GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &csbi); + + *x = csbi.dwCursorPosition.X; + *y = csbi.dwCursorPosition.Y; +} + SHORT CONSOLE_GetCursorX(VOID) { Modified: trunk/reactos/base/setup/usetup/interface/consup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/consup.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/consup.h [iso-8859-1] Sat Dec 20 21:58:22 2014 @@ -79,6 +79,11 @@ BOOL CONSOLE_Flush(VOID); +VOID +CONSOLE_GetCursorXY( + PSHORT x, + PSHORT y); + SHORT CONSOLE_GetCursorX(VOID); Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Sat Dec 20 21:58:22 2014 @@ -30,6 +30,7 @@ #include "bootsup.h" #include "chkdsk.h" +#include "cmdcons.h" #include "format.h" #include "drivesup.h" #include "settings.h" @@ -989,7 +990,7 @@ } else if (toupper(Ir->Event.KeyEvent.uChar.AsciiChar) == 'R') /* R */ { - return INTRO_PAGE; + return RECOVERY_PAGE; } else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_ESCAPE)) /* ESC */ @@ -4133,7 +4134,7 @@ CONSOLE_SetCursorType(TRUE, FALSE); Page = START_PAGE; - while (Page != REBOOT_PAGE) + while (Page != REBOOT_PAGE && Page != RECOVERY_PAGE) { CONSOLE_ClearScreen(); CONSOLE_Flush(); @@ -4281,10 +4282,14 @@ Page = QuitPage(&Ir); break; + case RECOVERY_PAGE: case REBOOT_PAGE: break; } } + + if (Page == RECOVERY_PAGE) + RecoveryConsole(); FreeConsole(); Modified: trunk/reactos/base/setup/usetup/native/utils/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/native/u… ============================================================================== --- trunk/reactos/base/setup/usetup/native/utils/console.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/native/utils/console.c [iso-8859-1] Sat Dec 20 21:58:22 2014 @@ -285,19 +285,44 @@ COORD *pCoord; PCHAR pText; NTSTATUS Status; - ULONG i; +// ULONG i; + + UNICODE_STRING UnicodeString; + OEM_STRING OemString; + ULONG OemLength; + + UnicodeString.Length = nLength * sizeof(WCHAR); + UnicodeString.MaximumLength = nLength * sizeof(WCHAR); + UnicodeString.Buffer = (LPWSTR)lpCharacter; + + OemLength = RtlUnicodeStringToOemSize(&UnicodeString); + Buffer = (CHAR*)RtlAllocateHeap(ProcessHeap, 0, - nLength + sizeof(COORD)); + OemLength + sizeof(COORD)); +// nLength + sizeof(COORD)); + if (Buffer== NULL) + return FALSE; + pCoord = (COORD *)Buffer; pText = (PCHAR)(pCoord + 1); *pCoord = dwWriteCoord; + OemString.Length = 0; + OemString.MaximumLength = OemLength; + OemString.Buffer = pText; + + Status = RtlUnicodeStringToOemString(&OemString, + &UnicodeString, + FALSE); + if (!NT_SUCCESS(Status)) + goto done; + /* FIXME: use real unicode->oem conversion */ - for (i = 0; i < nLength; i++) - pText[i] = (CHAR)lpCharacter[i]; +// for (i = 0; i < nLength; i++) +// pText[i] = (CHAR)lpCharacter[i]; Status = NtDeviceIoControlFile(hConsoleOutput, NULL, @@ -310,6 +335,7 @@ Buffer, nLength + sizeof(COORD)); +done: RtlFreeHeap(ProcessHeap, 0, Buffer); if (!NT_SUCCESS(Status)) return FALSE; Modified: trunk/reactos/base/setup/usetup/usetup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.h… ============================================================================== --- trunk/reactos/base/setup/usetup/usetup.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/usetup.h [iso-8859-1] Sat Dec 20 21:58:22 2014 @@ -153,6 +153,7 @@ QUIT_PAGE, FLUSH_PAGE, REBOOT_PAGE, /* virtual page */ + RECOVERY_PAGE, /* virtual page */ } PAGE_NUMBER, *PPAGE_NUMBER; #endif

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