Ros-diffs September 2017

ros-diffs@reactos.org

17 participants
284 discussions

[ekohl] 75970: [NETAPI] Add proper client implementations for NetQueryDisplayInformation() and NetGetDisplayInformationIndex().

by ekohl＠svn.reactos.org

Author: ekohl Date: Tue Sep 26 07:32:49 2017 New Revision: 75970 URL: http://svn.reactos.org/svn/reactos?rev=75970&view=rev Log: [NETAPI] Add proper client implementations for NetQueryDisplayInformation() and NetGetDisplayInformationIndex(). Added: trunk/reactos/dll/win32/netapi32/display.c (with props) Removed: trunk/reactos/dll/win32/netapi32/access.c Modified: trunk/reactos/dll/win32/netapi32/CMakeLists.txt trunk/reactos/dll/win32/netapi32/netapi32.spec Modified: trunk/reactos/dll/win32/netapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/netapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/CMakeLists.txt [iso-8859-1] Tue Sep 26 07:32:49 2017 @@ -14,9 +14,9 @@ ${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl/wkssvc.idl) list(APPEND SOURCE - access.c apibuf.c browser.c + display.c dssetup.c group.c local_group.c Removed: trunk/reactos/dll/win32/netapi32/access.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/access.… ============================================================================== --- trunk/reactos/dll/win32/netapi32/access.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/access.c (removed) @@ -1,248 +0,0 @@ -/* - * Copyright 2002 Andriy Palamarchuk - * - * netapi32 access functions - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "netapi32.h" - -WINE_DEFAULT_DEBUG_CHANNEL(netapi32); - -/************************************************************ - * ACCESS_QueryAdminDisplayInformation - * - * Creates a buffer with information for the Admin User - */ -static void ACCESS_QueryAdminDisplayInformation(PNET_DISPLAY_USER *buf, PDWORD pdwSize) -{ - static const WCHAR sAdminUserName[] = { - 'A','d','m','i','n','i','s','t','r','a','t','o','r',0}; - - /* sizes of the field buffers in WCHARS */ - int name_sz, comment_sz, full_name_sz; - PNET_DISPLAY_USER usr; - - /* set up buffer */ - name_sz = lstrlenW(sAdminUserName) + 1; - comment_sz = 1; - full_name_sz = 1; - - *pdwSize = sizeof(NET_DISPLAY_USER); - *pdwSize += (name_sz + comment_sz + full_name_sz) * sizeof(WCHAR); - NetApiBufferAllocate(*pdwSize, (LPVOID *) buf); - - usr = *buf; - usr->usri1_name = (LPWSTR) ((PBYTE) usr + sizeof(NET_DISPLAY_USER)); - usr->usri1_comment = (LPWSTR) ( - ((PBYTE) usr->usri1_name) + name_sz * sizeof(WCHAR)); - usr->usri1_full_name = (LPWSTR) ( - ((PBYTE) usr->usri1_comment) + comment_sz * sizeof(WCHAR)); - - /* set data */ - lstrcpyW(usr->usri1_name, sAdminUserName); - usr->usri1_comment[0] = 0; - usr->usri1_flags = UF_SCRIPT | UF_NORMAL_ACCOUNT | UF_DONT_EXPIRE_PASSWD; - usr->usri1_full_name[0] = 0; - usr->usri1_user_id = DOMAIN_USER_RID_ADMIN; - usr->usri1_next_index = 0; -} - -/************************************************************ - * ACCESS_QueryGuestDisplayInformation - * - * Creates a buffer with information for the Guest User - */ -static void ACCESS_QueryGuestDisplayInformation(PNET_DISPLAY_USER *buf, PDWORD pdwSize) -{ - static const WCHAR sGuestUserName[] = { - 'G','u','e','s','t',0 }; - - /* sizes of the field buffers in WCHARS */ - int name_sz, comment_sz, full_name_sz; - PNET_DISPLAY_USER usr; - - /* set up buffer */ - name_sz = lstrlenW(sGuestUserName) + 1; - comment_sz = 1; - full_name_sz = 1; - - *pdwSize = sizeof(NET_DISPLAY_USER); - *pdwSize += (name_sz + comment_sz + full_name_sz) * sizeof(WCHAR); - NetApiBufferAllocate(*pdwSize, (LPVOID *) buf); - - usr = *buf; - usr->usri1_name = (LPWSTR) ((PBYTE) usr + sizeof(NET_DISPLAY_USER)); - usr->usri1_comment = (LPWSTR) ( - ((PBYTE) usr->usri1_name) + name_sz * sizeof(WCHAR)); - usr->usri1_full_name = (LPWSTR) ( - ((PBYTE) usr->usri1_comment) + comment_sz * sizeof(WCHAR)); - - /* set data */ - lstrcpyW(usr->usri1_name, sGuestUserName); - usr->usri1_comment[0] = 0; - usr->usri1_flags = UF_ACCOUNTDISABLE | UF_SCRIPT | UF_NORMAL_ACCOUNT | - UF_DONT_EXPIRE_PASSWD; - usr->usri1_full_name[0] = 0; - usr->usri1_user_id = DOMAIN_USER_RID_GUEST; - usr->usri1_next_index = 0; -} - -/************************************************************ - * Copies NET_DISPLAY_USER record. - */ -static void ACCESS_CopyDisplayUser(const NET_DISPLAY_USER *dest, LPWSTR *dest_buf, - PNET_DISPLAY_USER src) -{ - LPWSTR str = *dest_buf; - - src->usri1_name = str; - lstrcpyW(src->usri1_name, dest->usri1_name); - str = (LPWSTR) ( - ((PBYTE) str) + (lstrlenW(str) + 1) * sizeof(WCHAR)); - - src->usri1_comment = str; - lstrcpyW(src->usri1_comment, dest->usri1_comment); - str = (LPWSTR) ( - ((PBYTE) str) + (lstrlenW(str) + 1) * sizeof(WCHAR)); - - src->usri1_flags = dest->usri1_flags; - - src->usri1_full_name = str; - lstrcpyW(src->usri1_full_name, dest->usri1_full_name); - str = (LPWSTR) ( - ((PBYTE) str) + (lstrlenW(str) + 1) * sizeof(WCHAR)); - - src->usri1_user_id = dest->usri1_user_id; - src->usri1_next_index = dest->usri1_next_index; - *dest_buf = str; -} - -/************************************************************ - * NetQueryDisplayInformation (NETAPI32.@) - * - * The buffer structure: - * - array of fixed size record of the level type - * - strings, referenced by the record of the level type - */ -NET_API_STATUS WINAPI -NetQueryDisplayInformation( - LPCWSTR ServerName, DWORD Level, DWORD Index, DWORD EntriesRequested, - DWORD PreferredMaximumLength, LPDWORD ReturnedEntryCount, - PVOID *SortedBuffer) -{ - TRACE("(%s, %d, %d, %d, %d, %p, %p)\n", debugstr_w(ServerName), - Level, Index, EntriesRequested, PreferredMaximumLength, - ReturnedEntryCount, SortedBuffer); - - if(!NETAPI_IsLocalComputer(ServerName)) - { - FIXME("Only implemented on local computer, but requested for " - "remote server %s\n", debugstr_w(ServerName)); - return ERROR_ACCESS_DENIED; - } - - switch (Level) - { - case 1: - { - /* current record */ - PNET_DISPLAY_USER inf; - /* current available strings buffer */ - LPWSTR str; - PNET_DISPLAY_USER admin, guest; - DWORD admin_size, guest_size; - LPWSTR name = NULL; - DWORD dwSize; - - /* sizes of the field buffers in WCHARS */ - int name_sz, comment_sz, full_name_sz; - - /* number of the records, returned in SortedBuffer - 3 - for current user, Administrator and Guest users - */ - int records = 3; - - FIXME("Level %d partially implemented\n", Level); - *ReturnedEntryCount = records; - comment_sz = 1; - full_name_sz = 1; - - /* get data */ - dwSize = UNLEN + 1; - NetApiBufferAllocate(dwSize * sizeof(WCHAR), (LPVOID *) &name); - if (!GetUserNameW(name, &dwSize)) - { - NetApiBufferFree(name); - return ERROR_ACCESS_DENIED; - } - name_sz = dwSize; - ACCESS_QueryAdminDisplayInformation(&admin, &admin_size); - ACCESS_QueryGuestDisplayInformation(&guest, &guest_size); - - /* set up buffer */ - dwSize = sizeof(NET_DISPLAY_USER) * records; - dwSize += (name_sz + comment_sz + full_name_sz) * sizeof(WCHAR); - - NetApiBufferAllocate(dwSize + - admin_size - sizeof(NET_DISPLAY_USER) + - guest_size - sizeof(NET_DISPLAY_USER), - SortedBuffer); - inf = *SortedBuffer; - str = (LPWSTR) ((PBYTE) inf + sizeof(NET_DISPLAY_USER) * records); - inf->usri1_name = str; - str = (LPWSTR) ( - ((PBYTE) str) + name_sz * sizeof(WCHAR)); - inf->usri1_comment = str; - str = (LPWSTR) ( - ((PBYTE) str) + comment_sz * sizeof(WCHAR)); - inf->usri1_full_name = str; - str = (LPWSTR) ( - ((PBYTE) str) + full_name_sz * sizeof(WCHAR)); - - /* set data */ - lstrcpyW(inf->usri1_name, name); - NetApiBufferFree(name); - inf->usri1_comment[0] = 0; - inf->usri1_flags = - UF_SCRIPT | UF_NORMAL_ACCOUNT | UF_DONT_EXPIRE_PASSWD; - inf->usri1_full_name[0] = 0; - inf->usri1_user_id = 0; - inf->usri1_next_index = 0; - - inf++; - ACCESS_CopyDisplayUser(admin, &str, inf); - NetApiBufferFree(admin); - - inf++; - ACCESS_CopyDisplayUser(guest, &str, inf); - NetApiBufferFree(guest); - break; - } - - case 2: - case 3: - { - FIXME("Level %d is not implemented\n", Level); - break; - } - - default: - TRACE("Invalid level %d is specified\n", Level); - return ERROR_INVALID_LEVEL; - } - return NERR_Success; -} Added: trunk/reactos/dll/win32/netapi32/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/display… ============================================================================== --- trunk/reactos/dll/win32/netapi32/display.c (added) +++ trunk/reactos/dll/win32/netapi32/display.c [iso-8859-1] Tue Sep 26 07:32:49 2017 @@ -0,0 +1,208 @@ +/* + * PROJECT: NetAPI DLL + * LICENSE: GPL-2.0 (https://spdx.org/licenses/GPL-2.0) + * PURPOSE: SAM service interface code + * COPYRIGHT: Copyright 2017 Eric Kohl (eric.kohl(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include "netapi32.h" + +WINE_DEFAULT_DEBUG_CHANNEL(netapi32); + +/* FUNCTIONS *****************************************************************/ + +/* PUBLIC FUNCTIONS **********************************************************/ + +NET_API_STATUS +WINAPI +NetQueryDisplayInformation( + _In_ LPCWSTR ServerName, + _In_ DWORD Level, + _In_ DWORD Index, + _In_ DWORD EntriesRequested, + _In_ DWORD PreferredMaximumLength, + _Out_ LPDWORD ReturnedEntryCount, + _Out_ PVOID *SortedBuffer) +{ + UNICODE_STRING ServerNameString; + SAM_HANDLE ServerHandle = NULL; + SAM_HANDLE DomainHandle = NULL; + DOMAIN_DISPLAY_INFORMATION DisplayInformation; + DWORD LocalTotalBytesAvailable; + DWORD LocalTotalBytesReturned; + DWORD LocalReturnedEntryCount; + PVOID LocalSortedBuffer; + NET_API_STATUS ApiStatus = NERR_Success; + NTSTATUS Status; + + TRACE("NetQueryDisplayInformation(%s, %ld, %ld, %ld, %ld, %p, %p)\n", + debugstr_w(ServerName), Level, Index, EntriesRequested, + PreferredMaximumLength, ReturnedEntryCount, SortedBuffer); + + *ReturnedEntryCount = 0; + *SortedBuffer = NULL; + + switch (Level) + { + case 1: + DisplayInformation = DomainDisplayUser; + break; + + case 2: + DisplayInformation = DomainDisplayMachine; + break; + + case 3: + DisplayInformation = DomainDisplayGroup; + break; + + default: + return ERROR_INVALID_LEVEL; + } + + if (ServerName != NULL) + RtlInitUnicodeString(&ServerNameString, ServerName); + + /* Connect to the SAM Server */ + Status = SamConnect((ServerName != NULL) ? &ServerNameString : NULL, + &ServerHandle, + SAM_SERVER_CONNECT | SAM_SERVER_LOOKUP_DOMAIN, + NULL); + if (!NT_SUCCESS(Status)) + { + ERR("SamConnect failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Open the Account Domain */ + Status = OpenAccountDomain(ServerHandle, + (ServerName != NULL) ? &ServerNameString : NULL, + DOMAIN_LIST_ACCOUNTS, + &DomainHandle); + if (!NT_SUCCESS(Status)) + { + ERR("OpenAccountDomain failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Query the information */ + Status = SamQueryDisplayInformation(DomainHandle, + DisplayInformation, + Index, + EntriesRequested, + PreferredMaximumLength, + &LocalTotalBytesAvailable, + &LocalTotalBytesReturned, + &LocalReturnedEntryCount, + &LocalSortedBuffer); + if (!NT_SUCCESS(Status)) + { + ERR("SamQueryDisplayInformation failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* FIXME */ + +done: + if (DomainHandle != NULL) + SamCloseHandle(DomainHandle); + + if (ServerHandle != NULL) + SamCloseHandle(ServerHandle); + + return ApiStatus; +} + + +NET_API_STATUS +WINAPI +NetGetDisplayInformationIndex( + _In_ LPCWSTR ServerName, + _In_ DWORD Level, + _In_ LPCWSTR Prefix, + _Out_ LPDWORD Index) +{ + UNICODE_STRING ServerNameString, PrefixString; + SAM_HANDLE ServerHandle = NULL; + SAM_HANDLE DomainHandle = NULL; + DOMAIN_DISPLAY_INFORMATION DisplayInformation; + NET_API_STATUS ApiStatus = NERR_Success; + NTSTATUS Status; + + TRACE("NetGetDisplayInformationIndex(%s %ld %s %p)\n", + debugstr_w(ServerName), Level, debugstr_w(Prefix), Index); + + switch (Level) + { + case 1: + DisplayInformation = DomainDisplayUser; + break; + + case 2: + DisplayInformation = DomainDisplayMachine; + break; + + case 3: + DisplayInformation = DomainDisplayGroup; + break; + + default: + return ERROR_INVALID_LEVEL; + } + + if (ServerName != NULL) + RtlInitUnicodeString(&ServerNameString, ServerName); + + /* Connect to the SAM Server */ + Status = SamConnect((ServerName != NULL) ? &ServerNameString : NULL, + &ServerHandle, + SAM_SERVER_CONNECT | SAM_SERVER_LOOKUP_DOMAIN, + NULL); + if (!NT_SUCCESS(Status)) + { + ERR("SamConnect failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Open the Account Domain */ + Status = OpenAccountDomain(ServerHandle, + (ServerName != NULL) ? &ServerNameString : NULL, + DOMAIN_LIST_ACCOUNTS, + &DomainHandle); + if (!NT_SUCCESS(Status)) + { + ERR("OpenAccountDomain failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + RtlInitUnicodeString(&PrefixString, Prefix); + + /* Get the index */ + Status = SamGetDisplayEnumerationIndex(DomainHandle, + DisplayInformation, + &PrefixString, + Index); + if (!NT_SUCCESS(Status)) + { + ERR("SamGetDisplayEnumerationIndex failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + } + +done: + if (DomainHandle != NULL) + SamCloseHandle(DomainHandle); + + if (ServerHandle != NULL) + SamCloseHandle(ServerHandle); + + return ApiStatus; +} + +/* EOF */ Propchange: trunk/reactos/dll/win32/netapi32/display.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/netapi32/netapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netapi3… ============================================================================== --- trunk/reactos/dll/win32/netapi32/netapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/netapi32.spec [iso-8859-1] Tue Sep 26 07:32:49 2017 @@ -149,7 +149,7 @@ @ stdcall NetFileGetInfo(wstr long long ptr) @ stdcall NetGetAnyDCName(wstr wstr ptr) @ stdcall NetGetDCName(wstr wstr ptr) -@ stub NetGetDisplayInformationIndex +@ stdcall NetGetDisplayInformationIndex(wstr long wstr ptr) @ stdcall NetGetJoinInformation(wstr ptr ptr) @ stdcall NetGetJoinableOUs(wstr wstr wstr wstr ptr ptr) @ stdcall NetGroupAdd(wstr long ptr ptr)

6 years, 11 months

[pschweitzer] 75969: [KERNEL32] W2K3ify GetVolumeInformationA(). Also fix a regression brought by GetVolumeInformationW() rewrite (yay, winetests!).

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Tue Sep 26 06:18:07 2017 New Revision: 75969 URL: http://svn.reactos.org/svn/reactos?rev=75969&view=rev Log: [KERNEL32] W2K3ify GetVolumeInformationA(). Also fix a regression brought by GetVolumeInformationW() rewrite (yay, winetests!). Modified: trunk/reactos/dll/win32/kernel32/client/file/volume.c Modified: trunk/reactos/dll/win32/kernel32/client/file/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/volume.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/volume.c [iso-8859-1] Tue Sep 26 06:18:07 2017 @@ -85,124 +85,113 @@ OUT LPSTR lpFileSystemNameBuffer OPTIONAL, IN DWORD nFileSystemNameSize) { - UNICODE_STRING FileSystemNameU; - UNICODE_STRING VolumeNameU = { 0, 0, NULL }; - ANSI_STRING VolumeName; - ANSI_STRING FileSystemName; - PWCHAR RootPathNameW; - BOOL Result; - - if (!(RootPathNameW = FilenameA2W(lpRootPathName, FALSE))) - return FALSE; - - if (lpVolumeNameBuffer) - { - VolumeNameU.MaximumLength = (USHORT)nVolumeNameSize * sizeof(WCHAR); - VolumeNameU.Buffer = RtlAllocateHeap (RtlGetProcessHeap (), - 0, - VolumeNameU.MaximumLength); - if (VolumeNameU.Buffer == NULL) - { - goto FailNoMem; - } - } - - if (lpFileSystemNameBuffer) - { - FileSystemNameU.Length = 0; - FileSystemNameU.MaximumLength = (USHORT)nFileSystemNameSize * sizeof(WCHAR); - FileSystemNameU.Buffer = RtlAllocateHeap (RtlGetProcessHeap (), - 0, - FileSystemNameU.MaximumLength); - if (FileSystemNameU.Buffer == NULL) - { - if (VolumeNameU.Buffer != NULL) - { - RtlFreeHeap(RtlGetProcessHeap(), - 0, - VolumeNameU.Buffer); - } - -FailNoMem: - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - } - - Result = GetVolumeInformationW (RootPathNameW, - lpVolumeNameBuffer ? VolumeNameU.Buffer : NULL, - nVolumeNameSize, - lpVolumeSerialNumber, - lpMaximumComponentLength, - lpFileSystemFlags, - lpFileSystemNameBuffer ? FileSystemNameU.Buffer : NULL, - nFileSystemNameSize); - - if (Result) - { - if (lpVolumeNameBuffer) - { - VolumeNameU.Length = wcslen(VolumeNameU.Buffer) * sizeof(WCHAR); - VolumeName.Length = 0; - VolumeName.MaximumLength = (USHORT)nVolumeNameSize; - VolumeName.Buffer = lpVolumeNameBuffer; - } - - if (lpFileSystemNameBuffer) - { - FileSystemNameU.Length = wcslen(FileSystemNameU.Buffer) * sizeof(WCHAR); - FileSystemName.Length = 0; - FileSystemName.MaximumLength = (USHORT)nFileSystemNameSize; - FileSystemName.Buffer = lpFileSystemNameBuffer; - } - - /* convert unicode strings to ansi (or oem) */ - if (bIsFileApiAnsi) - { - if (lpVolumeNameBuffer) - { - RtlUnicodeStringToAnsiString (&VolumeName, - &VolumeNameU, - FALSE); - } - if (lpFileSystemNameBuffer) - { - RtlUnicodeStringToAnsiString (&FileSystemName, - &FileSystemNameU, - FALSE); - } - } - else - { - if (lpVolumeNameBuffer) - { - RtlUnicodeStringToOemString (&VolumeName, - &VolumeNameU, - FALSE); - } - if (lpFileSystemNameBuffer) - { - RtlUnicodeStringToOemString (&FileSystemName, - &FileSystemNameU, - FALSE); - } - } - } - - if (lpVolumeNameBuffer) - { - RtlFreeHeap (RtlGetProcessHeap (), - 0, - VolumeNameU.Buffer); - } - if (lpFileSystemNameBuffer) - { - RtlFreeHeap (RtlGetProcessHeap (), - 0, - FileSystemNameU.Buffer); - } - - return Result; + BOOL Ret; + NTSTATUS Status; + PUNICODE_STRING RootPathNameU; + ANSI_STRING VolumeName, FileSystemName; + UNICODE_STRING VolumeNameU, FileSystemNameU; + + /* If no root path provided, default to \ */ + if (lpRootPathName == NULL) + { + lpRootPathName = "\\"; + } + + /* Convert root path to unicode */ + RootPathNameU = Basep8BitStringToStaticUnicodeString(lpRootPathName); + if (RootPathNameU == NULL) + { + return FALSE; + } + + /* Init all our STRINGS (U/A) */ + VolumeNameU.Buffer = NULL; + VolumeNameU.MaximumLength = 0; + FileSystemNameU.Buffer = NULL; + FileSystemNameU.MaximumLength = 0; + + VolumeName.Buffer = lpVolumeNameBuffer; + VolumeName.MaximumLength = nVolumeNameSize + 1; + FileSystemName.Buffer = lpFileSystemNameBuffer; + FileSystemName.MaximumLength = nFileSystemNameSize + 1; + + /* Assume failure for now */ + Ret = FALSE; + + /* If caller wants volume name, allocate a buffer to receive it */ + if (lpVolumeNameBuffer != NULL) + { + VolumeNameU.MaximumLength = sizeof(WCHAR) * (nVolumeNameSize + 1); + VolumeNameU.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, + VolumeNameU.MaximumLength); + if (VolumeNameU.Buffer == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto CleanAndQuit; + } + } + + /* If caller wants file system name, allocate a buffer to receive it */ + if (lpFileSystemNameBuffer != NULL) + { + FileSystemNameU.MaximumLength = sizeof(WCHAR) * (nVolumeNameSize + 1); + FileSystemNameU.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, + FileSystemNameU.MaximumLength); + if (FileSystemNameU.Buffer == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto CleanAndQuit; + } + } + + /* Call W */ + Ret = GetVolumeInformationW(RootPathNameU->Buffer, VolumeNameU.Buffer, + nVolumeNameSize, lpVolumeSerialNumber, + lpMaximumComponentLength, lpFileSystemFlags, + FileSystemNameU.Buffer, nFileSystemNameSize); + /* If it succeed, convert back to ANSI */ + if (Ret) + { + if (lpVolumeNameBuffer != NULL) + { + RtlInitUnicodeString(&VolumeNameU, VolumeNameU.Buffer); + Status = RtlUnicodeStringToAnsiString(&VolumeName, &VolumeNameU, FALSE); + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + Ret = FALSE; + + goto CleanAndQuit; + } + } + + if (lpFileSystemNameBuffer != NULL) + { + RtlInitUnicodeString(&FileSystemNameU, FileSystemNameU.Buffer); + Status = RtlUnicodeStringToAnsiString(&FileSystemName, &FileSystemNameU, FALSE); + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + Ret = FALSE; + + goto CleanAndQuit; + } + } + } + + /* Clean and quit */ +CleanAndQuit: + if (VolumeNameU.Buffer != NULL) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, VolumeNameU.Buffer); + } + + if (FileSystemNameU.Buffer != NULL) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, FileSystemNameU.Buffer); + } + + return Ret; } /*

6 years, 11 months

[hbelusca] 75968: [TIMEOUT]: Implement the TIMEOUT utility (found on Win2k3 and upwards). This is an improved "pause" command, with elapsed time count display. Based from a patch by Lee Schröder, w...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Sep 25 23:31:44 2017 New Revision: 75968 URL: http://svn.reactos.org/svn/reactos?rev=75968&view=rev Log: [TIMEOUT]: Implement the TIMEOUT utility (found on Win2k3 and upwards). This is an improved "pause" command, with elapsed time count display. Based from a patch by Lee Schröder, with modifications by myself. CORE-10044 #resolve Added: trunk/reactos/base/applications/cmdutils/timeout/ trunk/reactos/base/applications/cmdutils/timeout/CMakeLists.txt (with props) trunk/reactos/base/applications/cmdutils/timeout/lang/ trunk/reactos/base/applications/cmdutils/timeout/lang/en-US.rc (with props) trunk/reactos/base/applications/cmdutils/timeout/lang/fr-FR.rc (with props) trunk/reactos/base/applications/cmdutils/timeout/resource.h (with props) trunk/reactos/base/applications/cmdutils/timeout/timeout.c (with props) trunk/reactos/base/applications/cmdutils/timeout/timeout.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] Mon Sep 25 23:31:44 2017 @@ -18,6 +18,7 @@ add_subdirectory(schtasks) add_subdirectory(sort) add_subdirectory(taskkill) +add_subdirectory(timeout) add_subdirectory(tree) add_subdirectory(whoami) add_subdirectory(wmic) Added: trunk/reactos/base/applications/cmdutils/timeout/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/timeout/CMakeLists.txt (added) +++ trunk/reactos/base/applications/cmdutils/timeout/CMakeLists.txt [iso-8859-1] Mon Sep 25 23:31:44 2017 @@ -0,0 +1,8 @@ + +include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils) + +add_executable(timeout timeout.c timeout.rc) +set_module_type(timeout win32cui UNICODE) +target_link_libraries(timeout conutils ${PSEH_LIB}) +add_importlibs(timeout msvcrt kernel32) +add_cd_file(TARGET timeout DESTINATION reactos/system32 FOR all) Propchange: trunk/reactos/base/applications/cmdutils/timeout/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/timeout/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/timeout/lang/en-US.rc (added) +++ trunk/reactos/base/applications/cmdutils/timeout/lang/en-US.rc [iso-8859-1] Mon Sep 25 23:31:44 2017 @@ -0,0 +1,33 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE +BEGIN + IDS_USAGE "ReactOS Timeout Utility\n\ +\n\ +TIMEOUT [/?] [/T] delay [/NOBREAK]\n\ +\n\ +Description:\n\ + This tool waits until a specified time period (in seconds) has elapsed,\n\ + or until any key is pressed. A parameter to ignore the key press is also\n\ + accepted.\n\ +\n\ +Parameters:\n\ + /? Display this help screen.\n\ +\n\ + /T delay Specify the number of seconds to wait (-1 to 99999).\n\ + A value of -1 means the program will wait until a key is pressed.\n\ + Note that the ""/T"" specification is optional, you can just\n\ + specify the delay value without it.\n\ +\n\ + /NOBREAK Ignore all keyboard input except for Ctrl+C.\n\ +" + IDS_ERROR_OUT_OF_RANGE "ERROR: The timer value must be within range (-1 to 99999).\n" + IDS_ERROR_INVALID_HANDLE_VALUE "ERROR: Unable to get the standard handle for the console (error %lu).\n" + IDS_ERROR_READ_INPUT "ERROR: Unable to read the console input (error %lu).\n" + IDS_ERROR_NO_TIMER_VALUE "ERROR: The timer value must be specified (-1 to 99999).\n" + IDS_ERROR_ONE_TIME "ERROR: Only one timer value is needed.\n" + IDS_NOBREAK_INPUT "Press Ctrl+C to quit..." + IDS_USER_INPUT "Press any key to continue..." + IDS_NOBREAK_INPUT_COUNT "Waiting for %d second(s), press Ctrl+C to quit..." + IDS_USER_INPUT_COUNT "Waiting for %d second(s), press any key to continue..." +END Propchange: trunk/reactos/base/applications/cmdutils/timeout/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/timeout/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/timeout/lang/fr-FR.rc (added) +++ trunk/reactos/base/applications/cmdutils/timeout/lang/fr-FR.rc [iso-8859-1] Mon Sep 25 23:31:44 2017 @@ -0,0 +1,34 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_USAGE "ReactOS Timeout Utility\n\ +\n\ +TIMEOUT [/?] [/T] dÃ©lai [/NOBREAK]\n\ +\n\ +Description :\n\ + Cet outil permet d'attendre jusqu'Ã ce qu'un dÃ©lai (en secondes) s'Ã©coule,\n\ + ou bien jusqu'Ã ce qu'une touche de clavier soit pressÃ©e. Un paramÃ¨tre\n\ + permettant d'ignorer l'appui de touche de clavier est acceptÃ©.\n\ +\n\ +Liste de paramÃ¨tres :\n\ + /? Affiche cet Ã©cran d'aide.\n\ +\n\ + /T dÃ©lai SpÃ©cifie le dÃ©lai d'attente en secondes (entre -1 et 99999).\n\ + La valeur -1 signifie que le programme attend jusqu'Ã ce qu'une\n\ + touche soit pressÃ©e.\n\ + Veuillez noter que la spÃ©cification ""/T"" est optionnelle, vous\n\ + pouvez spÃ©cifier la valeur de dÃ©lai sans celle-ci.\n\ +\n\ + /NOBREAK Ignore toute frappe de clavier, sauf pour Ctrl+C.\n\ +" + IDS_ERROR_OUT_OF_RANGE "ERREUR: Le dÃ©lai d'attente doit Ãªtre compris dans la plage (entre -1 et 99999).\n" + IDS_ERROR_INVALID_HANDLE_VALUE "ERREUR: Impossible d'obtenir le handle standard pour la console (erreur %lu).\n" + IDS_ERROR_READ_INPUT "ERREUR: Impossible de lire l'entrÃ©e de console (erreur %lu).\n" + IDS_ERROR_NO_TIMER_VALUE "ERREUR: Le dÃ©lai d'attente doit Ãªtre spÃ©cifiÃ© (entre -1 et 99999).\n" + IDS_ERROR_ONE_TIME "ERREUR: Une seule valeur de dÃ©lai est nÃ©cessaire.\n" + IDS_NOBREAK_INPUT "Appuyez sur Ctrl+C pour quitter..." + IDS_USER_INPUT "Appuyez sur une touche pour continuer..." + IDS_NOBREAK_INPUT_COUNT "Attendre %d seconde(s), appuyez sur Ctrl+C pour quitter..." + IDS_USER_INPUT_COUNT "Attendre %d seconde(s), appuyez sur une touche pour continuer..." +END Propchange: trunk/reactos/base/applications/cmdutils/timeout/lang/fr-FR.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/timeout/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/timeout/resource.h (added) +++ trunk/reactos/base/applications/cmdutils/timeout/resource.h [iso-8859-1] Mon Sep 25 23:31:44 2017 @@ -0,0 +1,12 @@ +#pragma once + +#define IDS_USAGE 0 +#define IDS_ERROR_OUT_OF_RANGE 1 +#define IDS_ERROR_INVALID_HANDLE_VALUE 2 +#define IDS_ERROR_READ_INPUT 3 +#define IDS_ERROR_NO_TIMER_VALUE 4 +#define IDS_ERROR_ONE_TIME 5 +#define IDS_NOBREAK_INPUT 6 +#define IDS_USER_INPUT 7 +#define IDS_NOBREAK_INPUT_COUNT 8 +#define IDS_USER_INPUT_COUNT 9 Propchange: trunk/reactos/base/applications/cmdutils/timeout/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/timeout/timeout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/timeout/timeout.c (added) +++ trunk/reactos/base/applications/cmdutils/timeout/timeout.c [iso-8859-1] Mon Sep 25 23:31:44 2017 @@ -0,0 +1,332 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Timeout utility + * FILE: base/applications/cmdutils/timeout/timeout.c + * PURPOSE: An enhanced alternative to the Pause command. + * PROGRAMMERS: Lee Schroeder (spaceseel at gmail dot com) + * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + */ + +#include <stdio.h> +#include <stdlib.h> + +#include <windef.h> +#include <winbase.h> +#include <wincon.h> +#include <winuser.h> + +#include <conutils.h> + +#include "resource.h" + +VOID PrintError(DWORD dwError) +{ + if (dwError == ERROR_SUCCESS) + return; + + ConMsgPuts(StdErr, FORMAT_MESSAGE_FROM_SYSTEM, + NULL, dwError, LANG_USER_DEFAULT); + ConPuts(StdErr, L"\n"); +} + +BOOL +WINAPI +CtrlCIntercept(DWORD dwCtrlType) +{ + switch (dwCtrlType) + { + case CTRL_C_EVENT: + ConPuts(StdOut, L"\n"); + SetConsoleCtrlHandler(NULL, FALSE); + ExitProcess(EXIT_FAILURE); + return TRUE; + } + return FALSE; +} + +INT InputWait(BOOL bNoBreak, INT timerValue) +{ + INT Status = EXIT_SUCCESS; + HANDLE hInput; + BOOL bUseTimer = (timerValue != -1); + DWORD dwStartTime; + LONG timeElapsed; + DWORD dwWaitState; + INPUT_RECORD InputRecords[5]; + ULONG NumRecords, i; + BOOL DisplayMsg = TRUE; + UINT WaitMsgId = (bNoBreak ? IDS_NOBREAK_INPUT : IDS_USER_INPUT); + UINT WaitCountMsgId = (bNoBreak ? IDS_NOBREAK_INPUT_COUNT : IDS_USER_INPUT_COUNT); + + /* Retrieve the current input handle */ + hInput = ConStreamGetOSHandle(StdIn); + if (hInput == INVALID_HANDLE_VALUE) + { + ConResPrintf(StdErr, IDS_ERROR_INVALID_HANDLE_VALUE, GetLastError()); + return EXIT_FAILURE; + } + + /* Start a new wait if we use the timer */ + if (bUseTimer) + dwStartTime = GetTickCount(); + + /* If /NOBREAK is used, monitor for Ctrl-C input */ + if (bNoBreak) + SetConsoleCtrlHandler(CtrlCIntercept, TRUE); + + /* Initially flush the console input queue to remove any pending events */ + if (!GetNumberOfConsoleInputEvents(hInput, &NumRecords) || + !FlushConsoleInputBuffer(hInput)) + { + /* A problem happened, bail out */ + PrintError(GetLastError()); + Status = EXIT_FAILURE; + goto Quit; + } + + ConPuts(StdOut, L"\n"); + + /* If the timer is not used, just show the message */ + if (!bUseTimer) + { + ConPuts(StdOut, L"\r"); + ConResPuts(StdOut, WaitMsgId); + } + + while (TRUE) + { + /* Decrease the timer if we use it */ + if (bUseTimer) + { + /* + * Compute how much time the previous operations took. + * This allows us in particular to take account for any time + * elapsed if something slowed down, or if the console has been + * paused in the meantime. + */ + timeElapsed = GetTickCount() - dwStartTime; + if (timeElapsed >= 1000) + { + /* Increase dwStartTime by steps of 1 second */ + timeElapsed /= 1000; + dwStartTime += (1000 * timeElapsed); + + if (timeElapsed <= timerValue) + timerValue -= timeElapsed; + else + timerValue = 0; + + DisplayMsg = TRUE; + } + + if (DisplayMsg) + { + ConPuts(StdOut, L"\r"); + ConResPrintf(StdOut, WaitCountMsgId, timerValue); + ConPuts(StdOut, L" \b"); + + DisplayMsg = FALSE; + } + + /* Stop when the timer reaches zero */ + if (timerValue <= 0) + break; + } + + /* If /NOBREAK is used, only allow Ctrl-C input which is handled by the console handler */ + if (bNoBreak) + { + if (bUseTimer) + { + /* We use the timer: wait a little bit before updating it */ + Sleep(100); + } + else + { + /* No timer is used: wait indefinitely */ + Sleep(INFINITE); + } + + continue; + } + + /* /NOBREAK is not used, check for user key presses */ + + /* + * If the timer is used, use a passive wait of maximum 1 second + * while monitoring for incoming console input events, so that + * we are still able to display the timing count. + * Indeed, ReadConsoleInputW() indefinitely waits until an input + * event appears. ReadConsoleInputW() is however used to retrieve + * the input events where there are some, as well as for waiting + * indefinitely in case we do not use the timer. + */ + if (bUseTimer) + { + /* Wait a maximum of 1 second for input events */ + timeElapsed = GetTickCount() - dwStartTime; + if (timeElapsed < 1000) + dwWaitState = WaitForSingleObject(hInput, 1000 - timeElapsed); + else + dwWaitState = WAIT_TIMEOUT; + + /* Check whether the input handle has been signaled, or a timeout happened */ + if (dwWaitState == WAIT_TIMEOUT) + continue; + if (dwWaitState != WAIT_OBJECT_0) + { + /* An error happened, bail out */ + PrintError(GetLastError()); + Status = EXIT_FAILURE; + break; + } + + /* Be sure there is someting in the console input queue */ + if (!PeekConsoleInputW(hInput, InputRecords, ARRAYSIZE(InputRecords), &NumRecords)) + { + /* An error happened, bail out */ + ConResPrintf(StdErr, IDS_ERROR_READ_INPUT, GetLastError()); + Status = EXIT_FAILURE; + break; + } + + if (NumRecords == 0) + continue; + } + + /* + * Some events have been detected, pop them out from the input queue. + * In case we do not use the timer, wait indefinitely until an input + * event appears. + */ + if (!ReadConsoleInputW(hInput, InputRecords, ARRAYSIZE(InputRecords), &NumRecords)) + { + /* An error happened, bail out */ + ConResPrintf(StdErr, IDS_ERROR_READ_INPUT, GetLastError()); + Status = EXIT_FAILURE; + break; + } + + /* Check the input events for a key press */ + for (i = 0; i < NumRecords; ++i) + { + /* Ignore any non-key event */ + if (InputRecords[i].EventType != KEY_EVENT) + continue; + + /* Ignore any system key event */ + if ((InputRecords[i].Event.KeyEvent.wVirtualKeyCode == VK_CONTROL) || + // (InputRecords[i].Event.KeyEvent.dwControlKeyState & (LEFT_ALT_PRESSED | RIGHT_ALT_PRESSED )) || + // (InputRecords[i].Event.KeyEvent.dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)) || + (InputRecords[i].Event.KeyEvent.wVirtualKeyCode == VK_MENU)) + { + continue; + } + + /* This is a non-system key event, stop waiting */ + goto Stop; + } + } + +Stop: + ConPuts(StdOut, L"\n"); + +Quit: + if (bNoBreak) + SetConsoleCtrlHandler(NULL, FALSE); + + return Status; +} + +int wmain(int argc, WCHAR* argv[]) +{ + INT timerValue = -1; + PWCHAR pszNext; + BOOL bDisableInput = FALSE, fTimerFlags = 0; + int index = 0; + + /* Initialize the Console Standard Streams */ + ConInitStdStreams(); + + if (argc == 1) + { + ConResPrintf(StdOut, IDS_USAGE); + return EXIT_SUCCESS; + } + + /* Parse the command line for options */ + for (index = 1; index < argc; index++) + { + if (argv[index][0] == L'-' || argv[index][0] == L'/') + { + switch (towupper(argv[index][1])) + { + case L'?': /* Help */ + { + ConResPrintf(StdOut, IDS_USAGE); + return EXIT_SUCCESS; + } + + case L'T': /* Timer */ + { + /* Consecutive /T switches are invalid */ + if (fTimerFlags & 2) + { + ConResPrintf(StdErr, IDS_ERROR_ONE_TIME); + return EXIT_FAILURE; + } + + /* Remember that a /T switch has been encountered */ + fTimerFlags |= 2; + + /* Go to the next (timer) value */ + continue; + } + } + + /* This flag is used to ignore any keyboard keys but Ctrl-C */ + if (_wcsicmp(&argv[index][1], L"NOBREAK") == 0) + { + bDisableInput = TRUE; + + /* Go to next value */ + continue; + } + } + + /* The timer value can also be specified without the /T switch */ + + /* Only one timer value is supported */ + if (fTimerFlags & 1) + { + ConResPrintf(StdErr, IDS_ERROR_ONE_TIME); + return EXIT_FAILURE; + } + + timerValue = wcstol(argv[index], &pszNext, 10); + if (*pszNext) + { + ConResPrintf(StdErr, IDS_ERROR_OUT_OF_RANGE); + return EXIT_FAILURE; + } + + /* Remember that the timer value has been set */ + fTimerFlags |= 1; + } + + /* A timer value is mandatory in order to continue */ + if (!(fTimerFlags & 1)) + { + ConResPrintf(StdErr, IDS_ERROR_NO_TIMER_VALUE); + return EXIT_FAILURE; + } + + /* Make sure the timer value is within range */ + if ((timerValue < -1) || (timerValue > 99999)) + { + ConResPrintf(StdErr, IDS_ERROR_OUT_OF_RANGE); + return EXIT_FAILURE; + } + + return InputWait(bDisableInput, timerValue); +} Propchange: trunk/reactos/base/applications/cmdutils/timeout/timeout.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/timeout/timeout.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/timeout/timeout.rc (added) +++ trunk/reactos/base/applications/cmdutils/timeout/timeout.rc [iso-8859-1] Mon Sep 25 23:31:44 2017 @@ -0,0 +1,21 @@ +#include <windef.h> +// #include <winuser.h> + +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Timeout Utility" +#define REACTOS_STR_INTERNAL_NAME "timeout" +#define REACTOS_STR_ORIGINAL_FILENAME "timeout.exe" +#include <reactos/version.rc> + +/* UTF-8 */ +#pragma code_page(65001) + +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif +#ifdef LANGUAGE_FR_FR + #include "lang/fr-FR.rc" +#endif Propchange: trunk/reactos/base/applications/cmdutils/timeout/timeout.rc ------------------------------------------------------------------------------ svn:eol-style = native

6 years, 11 months

[pschweitzer] 75967: [KERNEL32] - Implement IsThisARootDirectory() - Reimplement GetVolumeInformationW() to make it w2k3 compliant. This fixes a few winetests and makes fsutil fsinfo ntfsinfo work ...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon Sep 25 21:33:56 2017 New Revision: 75967 URL: http://svn.reactos.org/svn/reactos?rev=75967&view=rev Log: [KERNEL32] - Implement IsThisARootDirectory() - Reimplement GetVolumeInformationW() to make it w2k3 compliant. This fixes a few winetests and makes fsutil fsinfo ntfsinfo work in ROS :-) Modified: trunk/reactos/dll/win32/kernel32/client/file/volume.c Modified: trunk/reactos/dll/win32/kernel32/client/file/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/volume.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/volume.c [iso-8859-1] Mon Sep 25 21:33:56 2017 @@ -7,6 +7,7 @@ * Erik Bos, Alexandre Julliard : * GetLogicalDriveStringsA, * GetLogicalDriveStringsW, GetLogicalDrives + * Pierre Schweitzer (pierre(a)reactos.org) * UPDATE HISTORY: * Created 01/11/98 */ @@ -204,9 +205,76 @@ return Result; } -#define FS_VOLUME_BUFFER_SIZE (MAX_PATH * sizeof(WCHAR) + sizeof(FILE_FS_VOLUME_INFORMATION)) - -#define FS_ATTRIBUTE_BUFFER_SIZE (MAX_PATH * sizeof(WCHAR) + sizeof(FILE_FS_ATTRIBUTE_INFORMATION)) +/* + * @implemented + */ +static BOOL +IsThisARootDirectory(IN HANDLE VolumeHandle, + IN PUNICODE_STRING NtPathName) +{ + NTSTATUS Status; + IO_STATUS_BLOCK IoStatusBlock; + struct + { + FILE_NAME_INFORMATION; + WCHAR Buffer[MAX_PATH]; + } FileNameInfo; + + /* If we have a handle, query the name */ + if (VolumeHandle) + { + Status = NtQueryInformationFile(VolumeHandle, &IoStatusBlock, &FileNameInfo, sizeof(FileNameInfo), FileNameInformation); + if (!NT_SUCCESS(Status)) + { + return FALSE; + } + + /* Check we properly end with a \ */ + if (FileNameInfo.FileName[FileNameInfo.FileNameLength / sizeof(WCHAR) - 1] != L'\\') + { + return FALSE; + } + } + + /* If we have a path */ + if (NtPathName != NULL) + { + HANDLE LinkHandle; + WCHAR Buffer[512]; + ULONG ReturnedLength; + UNICODE_STRING LinkTarget; + OBJECT_ATTRIBUTES ObjectAttributes; + + NtPathName->Length -= sizeof(WCHAR); + + InitializeObjectAttributes(&ObjectAttributes, NtPathName, + OBJ_CASE_INSENSITIVE, + NULL, NULL); + + /* Try to see whether that's a symbolic name */ + Status = NtOpenSymbolicLinkObject(&LinkHandle, SYMBOLIC_LINK_QUERY, &ObjectAttributes); + NtPathName->Length += sizeof(WCHAR); + if (!NT_SUCCESS(Status)) + { + return FALSE; + } + + /* If so, query the target */ + LinkTarget.Buffer = Buffer; + LinkTarget.Length = 0; + LinkTarget.MaximumLength = sizeof(Buffer); + + Status = NtQuerySymbolicLinkObject(LinkHandle, &LinkTarget, &ReturnedLength); + NtClose(LinkHandle); + /* A root directory (NtName) is a symbolic link */ + if (!NT_SUCCESS(Status)) + { + return FALSE; + } + } + + return TRUE; +} /* * @implemented @@ -222,104 +290,223 @@ OUT LPWSTR lpFileSystemNameBuffer OPTIONAL, IN DWORD nFileSystemNameSize) { - PFILE_FS_VOLUME_INFORMATION FileFsVolume; - PFILE_FS_ATTRIBUTE_INFORMATION FileFsAttribute; - IO_STATUS_BLOCK IoStatusBlock; - WCHAR RootPathName[MAX_PATH]; - UCHAR Buffer[max(FS_VOLUME_BUFFER_SIZE, FS_ATTRIBUTE_BUFFER_SIZE)]; - - HANDLE hFile; - NTSTATUS errCode; - - FileFsVolume = (PFILE_FS_VOLUME_INFORMATION)Buffer; - FileFsAttribute = (PFILE_FS_ATTRIBUTE_INFORMATION)Buffer; - - TRACE("FileFsVolume %p\n", FileFsVolume); - TRACE("FileFsAttribute %p\n", FileFsAttribute); - - if (!lpRootPathName || !wcscmp(lpRootPathName, L"")) - { - GetCurrentDirectoryW (MAX_PATH, RootPathName); - } - else - { - wcsncpy (RootPathName, lpRootPathName, 3); - } - RootPathName[3] = 0; - - hFile = InternalOpenDirW(RootPathName, FALSE); - if (hFile == INVALID_HANDLE_VALUE) - { - return FALSE; - } - - TRACE("hFile: %p\n", hFile); - errCode = NtQueryVolumeInformationFile(hFile, - &IoStatusBlock, - FileFsVolume, - FS_VOLUME_BUFFER_SIZE, - FileFsVolumeInformation); - if ( !NT_SUCCESS(errCode) ) - { - WARN("Status: %x\n", errCode); - CloseHandle(hFile); - BaseSetLastNTError (errCode); - return FALSE; - } - - if (lpVolumeSerialNumber) - *lpVolumeSerialNumber = FileFsVolume->VolumeSerialNumber; - - if (lpVolumeNameBuffer) - { - if (nVolumeNameSize * sizeof(WCHAR) >= FileFsVolume->VolumeLabelLength + sizeof(WCHAR)) - { - memcpy(lpVolumeNameBuffer, - FileFsVolume->VolumeLabel, - FileFsVolume->VolumeLabelLength); - lpVolumeNameBuffer[FileFsVolume->VolumeLabelLength / sizeof(WCHAR)] = 0; - } - else - { - CloseHandle(hFile); - SetLastError(ERROR_MORE_DATA); - return FALSE; - } - } - - errCode = NtQueryVolumeInformationFile (hFile, - &IoStatusBlock, - FileFsAttribute, - FS_ATTRIBUTE_BUFFER_SIZE, - FileFsAttributeInformation); - CloseHandle(hFile); - if (!NT_SUCCESS(errCode)) - { - WARN("Status: %x\n", errCode); - BaseSetLastNTError (errCode); - return FALSE; - } - - if (lpFileSystemFlags) - *lpFileSystemFlags = FileFsAttribute->FileSystemAttributes; - if (lpMaximumComponentLength) - *lpMaximumComponentLength = FileFsAttribute->MaximumComponentNameLength; - if (lpFileSystemNameBuffer) - { - if (nFileSystemNameSize * sizeof(WCHAR) >= FileFsAttribute->FileSystemNameLength + sizeof(WCHAR)) - { - memcpy(lpFileSystemNameBuffer, - FileFsAttribute->FileSystemName, - FileFsAttribute->FileSystemNameLength); - lpFileSystemNameBuffer[FileFsAttribute->FileSystemNameLength / sizeof(WCHAR)] = 0; - } - else - { - SetLastError(ERROR_MORE_DATA); - return FALSE; - } - } - return TRUE; + BOOL Ret; + NTSTATUS Status; + HANDLE VolumeHandle; + LPCWSTR RootPathName; + UNICODE_STRING NtPathName; + IO_STATUS_BLOCK IoStatusBlock; + OBJECT_ATTRIBUTES ObjectAttributes; + PFILE_FS_VOLUME_INFORMATION VolumeInfo; + PFILE_FS_ATTRIBUTE_INFORMATION VolumeAttr; + ULONG OldMode, VolumeInfoSize, VolumeAttrSize; + + /* If no root path provided, default to \ */ + if (lpRootPathName == NULL) + { + RootPathName = L"\\"; + } + else + { + RootPathName = lpRootPathName; + } + + /* Convert to NT name */ + if (!RtlDosPathNameToNtPathName_U(RootPathName, &NtPathName, NULL, NULL)) + { + SetLastError(ERROR_PATH_NOT_FOUND); + return FALSE; + } + + /* Check we really end with a backslash */ + if (NtPathName.Buffer[(NtPathName.Length / sizeof(WCHAR)) - 1] != L'\\') + { + RtlFreeHeap(RtlGetProcessHeap(), 0, NtPathName.Buffer); + BaseSetLastNTError(STATUS_OBJECT_NAME_INVALID); + return FALSE; + } + + /* Try to open the received path */ + InitializeObjectAttributes(&ObjectAttributes, &NtPathName, + OBJ_CASE_INSENSITIVE, + NULL, NULL); + + /* No errors to the user */ + RtlSetThreadErrorMode(RTL_SEM_FAILCRITICALERRORS, &OldMode); + Status = NtOpenFile(&VolumeHandle, SYNCHRONIZE, &ObjectAttributes, &IoStatusBlock, 0, FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT | FILE_OPEN_FOR_BACKUP_INTENT); + RtlSetThreadErrorMode(OldMode, NULL); + if (!NT_SUCCESS(Status)) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, NtPathName.Buffer); + BaseSetLastNTError(Status); + return FALSE; + } + + /* Check whether that's a root directory */ + if (!IsThisARootDirectory(VolumeHandle, &NtPathName)) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, NtPathName.Buffer); + NtClose(VolumeHandle); + SetLastError(ERROR_DIR_NOT_ROOT); + return FALSE; + } + + RtlFreeHeap(RtlGetProcessHeap(), 0, NtPathName.Buffer); + + /* Assume we don't need to query FileFsVolumeInformation */ + VolumeInfo = NULL; + /* If user wants volume name, allocate a buffer to query it */ + if (lpVolumeNameBuffer != NULL) + { + VolumeInfoSize = nVolumeNameSize + sizeof(FILE_FS_VOLUME_INFORMATION); + } + /* If user just wants the serial number, allocate a dummy buffer */ + else if (lpVolumeSerialNumber != NULL) + { + VolumeInfoSize = MAX_PATH * sizeof(WCHAR) + sizeof(FILE_FS_VOLUME_INFORMATION); + } + /* Otherwise, nothing to query */ + else + { + VolumeInfoSize = 0; + } + + /* If we're to query, allocate a big enough buffer */ + if (VolumeInfoSize != 0) + { + VolumeInfo = RtlAllocateHeap(RtlGetProcessHeap(), 0, VolumeInfoSize); + if (VolumeInfo == NULL) + { + NtClose(VolumeHandle); + BaseSetLastNTError(STATUS_NO_MEMORY); + return FALSE; + } + } + + /* Assume we don't need to query FileFsAttributeInformation */ + VolumeAttr = NULL; + /* If user wants filesystem name, allocate a buffer to query it */ + if (lpFileSystemNameBuffer != NULL) + { + VolumeAttrSize = nFileSystemNameSize + sizeof(FILE_FS_ATTRIBUTE_INFORMATION); + } + /* If user just wants max compo len or flags, allocate a dummy buffer */ + else if (lpMaximumComponentLength != NULL || lpFileSystemFlags != NULL) + { + VolumeAttrSize = MAX_PATH * sizeof(WCHAR) + sizeof(FILE_FS_ATTRIBUTE_INFORMATION); + } + else + { + VolumeAttrSize = 0; + } + + /* If we're to query, allocate a big enough buffer */ + if (VolumeAttrSize != 0) + { + VolumeAttr = RtlAllocateHeap(RtlGetProcessHeap(), 0, VolumeAttrSize); + if (VolumeAttr == NULL) + { + if (VolumeInfo != NULL) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, VolumeInfo); + } + + NtClose(VolumeHandle); + BaseSetLastNTError(STATUS_NO_MEMORY); + return FALSE; + } + } + + /* Assume we'll fail */ + Ret = FALSE; + + /* If we're to query FileFsVolumeInformation, do it now! */ + if (VolumeInfo != NULL) + { + Status = NtQueryVolumeInformationFile(VolumeHandle, &IoStatusBlock, VolumeInfo, VolumeInfoSize, FileFsVolumeInformation); + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + goto CleanAndQuit; + } + } + + /* If we're to query FileFsAttributeInformation, do it now! */ + if (VolumeAttr != NULL) + { + Status = NtQueryVolumeInformationFile(VolumeHandle, &IoStatusBlock, VolumeAttr, VolumeAttrSize, FileFsAttributeInformation); + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + goto CleanAndQuit; + } + } + + /* If user wants volume name */ + if (lpVolumeNameBuffer != NULL) + { + /* Check its buffer can hold it (+ 0) */ + if (VolumeInfo->VolumeLabelLength >= nVolumeNameSize) + { + SetLastError(ERROR_BAD_LENGTH); + goto CleanAndQuit; + } + + /* Copy and zero */ + RtlCopyMemory(lpVolumeNameBuffer, VolumeInfo->VolumeLabel, VolumeInfo->VolumeLabelLength); + lpVolumeNameBuffer[VolumeInfo->VolumeLabelLength / sizeof(WCHAR)] = UNICODE_NULL; + } + + /* If user wants wants serial number, return it */ + if (lpVolumeSerialNumber != NULL) + { + *lpVolumeSerialNumber = VolumeInfo->VolumeSerialNumber; + } + + /* If user wants filesystem name */ + if (lpFileSystemNameBuffer != NULL) + { + /* Check its buffer can hold it (+ 0) */ + if (VolumeAttr->FileSystemNameLength >= nFileSystemNameSize) + { + SetLastError(ERROR_BAD_LENGTH); + goto CleanAndQuit; + } + + /* Copy and zero */ + RtlCopyMemory(lpFileSystemNameBuffer, VolumeAttr->FileSystemName, VolumeAttr->FileSystemNameLength); + lpFileSystemNameBuffer[VolumeAttr->FileSystemNameLength / sizeof(WCHAR)] = UNICODE_NULL; + } + + /* If user wants wants max compo len, return it */ + if (lpMaximumComponentLength != NULL) + { + *lpMaximumComponentLength = VolumeAttr->MaximumComponentNameLength; + } + + /* If user wants wants FS flags, return them */ + if (lpFileSystemFlags != NULL) + { + *lpFileSystemFlags = VolumeAttr->FileSystemAttributes; + } + + /* We did it! */ + Ret = TRUE; + +CleanAndQuit: + NtClose(VolumeHandle); + + if (VolumeInfo != NULL) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, VolumeInfo); + } + + if (VolumeAttr != NULL) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, VolumeAttr); + } + + return Ret; } /*

6 years, 11 months

[pschweitzer] 75966: [FSUTIL] - Modify OpenVolume so that it can restrict volume opening to a NTFS volume (broken on ROS...) - Implement fsutil fsinfo ntfsinfo

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon Sep 25 18:59:54 2017 New Revision: 75966 URL: http://svn.reactos.org/svn/reactos?rev=75966&view=rev Log: [FSUTIL] - Modify OpenVolume so that it can restrict volume opening to a NTFS volume (broken on ROS...) - Implement fsutil fsinfo ntfsinfo Modified: trunk/reactos/base/applications/cmdutils/fsutil/common.c trunk/reactos/base/applications/cmdutils/fsutil/dirty.c trunk/reactos/base/applications/cmdutils/fsutil/fsinfo.c trunk/reactos/base/applications/cmdutils/fsutil/fsutil.h trunk/reactos/base/applications/cmdutils/fsutil/volume.c Modified: trunk/reactos/base/applications/cmdutils/fsutil/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/common.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/fsutil/common.c [iso-8859-1] Mon Sep 25 18:59:54 2017 @@ -47,14 +47,12 @@ } HANDLE OpenVolume(const TCHAR * Volume, - BOOLEAN AllowRemote) + BOOLEAN AllowRemote, + BOOLEAN NtfsOnly) { UINT Type; HANDLE hVolume; TCHAR VolumeID[PATH_MAX]; - - /* Create full name */ - _stprintf(VolumeID, _T("\\\\.\\%s"), Volume); /* Get volume type */ if (!AllowRemote && Volume[1] == L':') @@ -66,6 +64,28 @@ return INVALID_HANDLE_VALUE; } } + + /* Get filesystem type */ + if (NtfsOnly) + { + TCHAR FileSystem[MAX_PATH + 1]; + + _stprintf(VolumeID, _T("\\\\.\\%s\\"), Volume); + if (!GetVolumeInformation(VolumeID, NULL, 0, NULL, NULL, NULL, FileSystem, MAX_PATH + 1)) + { + PrintErrorMessage(GetLastError()); + return INVALID_HANDLE_VALUE; + } + + if (_tcscmp(FileSystem, _T("NTFS")) != 0) + { + _ftprintf(stderr, _T("FSUTIL needs a NTFS device\n")); + return INVALID_HANDLE_VALUE; + } + } + + /* Create full name */ + _stprintf(VolumeID, _T("\\\\.\\%s"), Volume); /* Open the volume */ hVolume = CreateFile(VolumeID, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, Modified: trunk/reactos/base/applications/cmdutils/fsutil/dirty.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/dirty.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/fsutil/dirty.c [iso-8859-1] Mon Sep 25 18:59:54 2017 @@ -34,7 +34,7 @@ } /* Get a handle for the volume */ - Volume = OpenVolume(argv[1], FALSE); + Volume = OpenVolume(argv[1], FALSE, FALSE); if (Volume == INVALID_HANDLE_VALUE) { return 1; @@ -72,7 +72,7 @@ } /* Get a handle for the volume */ - Volume = OpenVolume(argv[1], FALSE); + Volume = OpenVolume(argv[1], FALSE, FALSE); if (Volume == INVALID_HANDLE_VALUE) { return 1; Modified: trunk/reactos/base/applications/cmdutils/fsutil/fsinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/fsinfo.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/fsutil/fsinfo.c [iso-8859-1] Mon Sep 25 18:59:54 2017 @@ -12,6 +12,7 @@ static HandlerProc DrivesMain; static HandlerProc DriveTypeMain; static HandlerProc VolumeInfoMain; +static HandlerProc NtfsInfoMain; static HandlerProc StatisticsMain; static HandlerItem HandlersList[] = { @@ -19,6 +20,7 @@ { DrivesMain, _T("drives"), _T("Enumerates the drives") }, { DriveTypeMain, _T("drivetype"), _T("Provides the type of a drive") }, { VolumeInfoMain, _T("volumeinfo"), _T("Provides informations about a volume") }, + { NtfsInfoMain, _T("ntfsinfo"), _T("Displays informations about a NTFS volume") }, { StatisticsMain, _T("statistics"), _T("Displays volume statistics") }, }; @@ -154,6 +156,68 @@ HANDLE_FLAG(Flags, FILE_DAX_VOLUME, _T("Is a direct access volume\n")); #undef HANDLE_FLAGS + + return 0; +} + +static int +NtfsInfoMain(int argc, const TCHAR *argv[]) +{ + HANDLE Volume; + DWORD BytesRead; + struct + { + NTFS_VOLUME_DATA_BUFFER; + NTFS_EXTENDED_VOLUME_DATA; + } Data; + + /* We need a volume (letter or GUID) */ + if (argc < 2) + { + _ftprintf(stderr, _T("Usage: fsutil fsinfo ntfsinfo <volume>\n")); + _ftprintf(stderr, _T("\tFor example: fsutil fsinfo ntfsinfo c:\n")); + return 1; + } + + /* Get a handle for the volume */ + Volume = OpenVolume(argv[1], FALSE, TRUE); + if (Volume == INVALID_HANDLE_VALUE) + { + return 1; + } + + /* And query the NTFS data */ + if (DeviceIoControl(Volume, FSCTL_GET_NTFS_VOLUME_DATA, NULL, 0, &Data, + sizeof(Data), &BytesRead, NULL) == FALSE) + { + PrintErrorMessage(GetLastError()); + CloseHandle(Volume); + return 1; + } + + /* We no longer need the volume */ + CloseHandle(Volume); + + /* Dump data */ + _ftprintf(stdout, _T("NTFS volume serial number:\t\t0x%0.16I64x\n"), Data.VolumeSerialNumber.QuadPart); + /* Only print version if extended structure was returned */ + if (BytesRead > sizeof(NTFS_VOLUME_DATA_BUFFER)) + { + _ftprintf(stdout, _T("Version:\t\t\t\t%u.%u\n"), Data.MajorVersion, Data.MinorVersion); + } + _ftprintf(stdout, _T("Number of sectors:\t\t\t0x%0.16I64x\n"), Data.NumberSectors.QuadPart); + _ftprintf(stdout, _T("Total number of clusters:\t\t0x%0.16I64x\n"), Data.TotalClusters.QuadPart); + _ftprintf(stdout, _T("Free clusters:\t\t\t\t0x%0.16I64x\n"), Data.FreeClusters.QuadPart); + _ftprintf(stdout, _T("Total number of reserved clusters:\t0x%0.16I64x\n"), Data.TotalReserved.QuadPart); + _ftprintf(stdout, _T("Bytes per sector:\t\t\t%d\n"), Data.BytesPerSector); + _ftprintf(stdout, _T("Bytes per cluster:\t\t\t%d\n"), Data.BytesPerCluster); + _ftprintf(stdout, _T("Bytes per file record segment:\t\t%d\n"), Data.BytesPerFileRecordSegment); + _ftprintf(stdout, _T("Clusters per file record segment:\t%d\n"), Data.ClustersPerFileRecordSegment); + _ftprintf(stdout, _T("MFT valid data length:\t\t\t0x%0.16I64x\n"), Data.MftValidDataLength.QuadPart); + _ftprintf(stdout, _T("MFT start LCN:\t\t\t\t0x%0.16I64x\n"), Data.MftStartLcn.QuadPart); + _ftprintf(stdout, _T("MFT2 start LCN:\t\t\t\t0x%0.16I64x\n"), Data.Mft2StartLcn.QuadPart); + _ftprintf(stdout, _T("MFT zone start:\t\t\t\t0x%0.16I64x\n"), Data.MftZoneStart.QuadPart); + _ftprintf(stdout, _T("MFT zone end:\t\t\t\t0x%0.16I64x\n"), Data.MftZoneEnd.QuadPart); return 0; } @@ -477,7 +541,7 @@ } /* Get a handle for the volume */ - Volume = OpenVolume(argv[1], FALSE); + Volume = OpenVolume(argv[1], FALSE, FALSE); if (Volume == INVALID_HANDLE_VALUE) { return 1; Modified: trunk/reactos/base/applications/cmdutils/fsutil/fsutil.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/fsutil.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/fsutil/fsutil.h [iso-8859-1] Mon Sep 25 18:59:54 2017 @@ -22,7 +22,8 @@ void (*UsageHelper)(const TCHAR *)); HANDLE OpenVolume(const TCHAR * Volume, - BOOLEAN AllowRemote); + BOOLEAN AllowRemote, + BOOLEAN NtfsOnly); void PrintDefaultUsage(const TCHAR * Command, const TCHAR * SubCommand, Modified: trunk/reactos/base/applications/cmdutils/fsutil/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/volume.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/fsutil/volume.c [iso-8859-1] Mon Sep 25 18:59:54 2017 @@ -50,7 +50,7 @@ } /* Get a handle for the volume */ - Volume = OpenVolume(argv[1], FALSE); + Volume = OpenVolume(argv[1], FALSE, FALSE); if (Volume == INVALID_HANDLE_VALUE) { return 1;

6 years, 11 months

[mjansen] 75965: [WINED3D] Silence a noisy DPRINT that makes Test KVM AHK abort. CORE-13829

by mjansen＠svn.reactos.org

Author: mjansen Date: Sun Sep 24 21:32:18 2017 New Revision: 75965 URL: http://svn.reactos.org/svn/reactos?rev=75965&view=rev Log: [WINED3D] Silence a noisy DPRINT that makes Test KVM AHK abort. CORE-13829 Modified: trunk/reactos/dll/directx/wine/wined3d/palette.c Modified: trunk/reactos/dll/directx/wine/wined3d/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/p… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/palette.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/palette.c [iso-8859-1] Sun Sep 24 21:32:18 2017 @@ -85,7 +85,15 @@ void CDECL wined3d_palette_apply_to_dc(const struct wined3d_palette *palette, HDC dc) { if (SetDIBColorTable(dc, 0, 256, palette->colors) != 256) +#ifdef __REACTOS__ + { + static int warn_once; + if (!warn_once++) + ERR("Failed to set DIB color table. (Only printing once)\n"); + } +#else ERR("Failed to set DIB color table.\n"); +#endif } HRESULT CDECL wined3d_palette_set_entries(struct wined3d_palette *palette,

6 years, 11 months

[hbelusca] 75964: [MORE]: Remove an unused library import (user32).

by hbelusca＠svn.reactos.org

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

6 years, 11 months

[hbelusca] 75963: [CHCP][CMD]: Make the CHCP command a standalone executable, for backwards compatibility with Windows etc. This allows the user to be able to replace it with a 3rd-party one. CORE-...

by hbelusca＠svn.reactos.org

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

6 years, 11 months

[tfaber] 75962: [MBEDTLS] - Disable the use of SSE2 instruction. ROS supports CPUs that do not support these. CORE-13826 #resolve CORE-10338

by tfaber＠svn.reactos.org

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

6 years, 11 months

[pschweitzer] 75961: [FASTFAT] Implement statistics counting for non cached read/write operations.

by pschweitzer＠svn.reactos.org

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

6 years, 11 months

← Newer
1
2
3
4
5
6
7
8
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2017