Ros-diffs September 2016

ros-diffs@reactos.org

18 participants
342 discussions

[dchapyshev] 72870: [NTOS:FSRTL] Handle failure case

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Fri Sep 30 17:33:19 2016 New Revision: 72870 URL: http://svn.reactos.org/svn/reactos?rev=72870&view=rev Log: [NTOS:FSRTL] Handle failure case Modified: trunk/reactos/ntoskrnl/fsrtl/name.c Modified: trunk/reactos/ntoskrnl/fsrtl/name.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/name.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/name.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/name.c [iso-8859-1] Fri Sep 30 17:33:19 2016 @@ -294,7 +294,13 @@ if (!NT_SUCCESS(Status)) RtlRaiseStatus(Status); /* Upcase the second string too */ - RtlUpcaseUnicodeString(&UpcaseName2, Name2, TRUE); + Status = RtlUpcaseUnicodeString(&UpcaseName2, Name2, TRUE); + if (!NT_SUCCESS(Status)) + { + RtlFreeUnicodeString(&UpcaseName1); + RtlRaiseStatus(Status); + } + Name1 = &UpcaseName1; Name2 = &UpcaseName2;

8 years, 2 months

[tfaber] 72869: [NTOS:MM] - Get rid of MiNonPagedSystemSize, which is misleading because MmNumberOfSystemPtes can change throughout the startup process, thus invalidating this size variable - Corre...

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Sep 30 15:58:23 2016 New Revision: 72869 URL: http://svn.reactos.org/svn/reactos?rev=72869&view=rev Log: [NTOS:MM] - Get rid of MiNonPagedSystemSize, which is misleading because MmNumberOfSystemPtes can change throughout the startup process, thus invalidating this size variable - Correctly reserve the system PTE space and nonpaged pool expansion space in MiInitSystemMemoryAreas Should fix the remaining "Bad PTE" bug checks when running out of kernel address space. CORE-11533 #resolve CORE-11160 CORE-10611 CORE-11926 CORE-11873 CORE-11554 #comment This should be fixed with r72869, please retest. Modified: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/mminit.c trunk/reactos/ntoskrnl/mm/amd64/init.c trunk/reactos/ntoskrnl/mm/mminit.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/i386/init… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] Fri Sep 30 15:58:23 2016 @@ -245,6 +245,7 @@ PMMPTE StartPde, EndPde, PointerPte, LastPte; MMPTE TempPde, TempPte; PVOID NonPagedPoolExpansionVa; + SIZE_T NonPagedSystemSize; KIRQL OldIrql; PMMPFN Pfn1; ULONG Flags; @@ -298,9 +299,9 @@ // nonpaged pool expansion (above) and the system PTEs. Note that it is // then aligned to a PDE boundary (4MB). // - MiNonPagedSystemSize = (MmNumberOfSystemPtes + 1) * PAGE_SIZE; + NonPagedSystemSize = (MmNumberOfSystemPtes + 1) * PAGE_SIZE; MmNonPagedSystemStart = (PVOID)((ULONG_PTR)MmNonPagedPoolStart - - MiNonPagedSystemSize); + NonPagedSystemSize); MmNonPagedSystemStart = (PVOID)((ULONG_PTR)MmNonPagedSystemStart & ~(PDE_MAPPED_VA - 1)); Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Fri Sep 30 15:58:23 2016 @@ -527,7 +527,6 @@ extern PFN_NUMBER MmMaximumNonPagedPoolInPages; extern PFN_NUMBER MmSizeOfPagedPoolInPages; extern PVOID MmNonPagedSystemStart; -extern SIZE_T MiNonPagedSystemSize; extern PVOID MmNonPagedPoolStart; extern PVOID MmNonPagedPoolExpansionStart; extern PVOID MmNonPagedPoolEnd; Modified: trunk/reactos/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mminit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] Fri Sep 30 15:58:23 2016 @@ -94,7 +94,6 @@ // http://www.ditii.com/2007/09/28/windows-memory-management-x86-virtual-addre… // PVOID MmNonPagedSystemStart; -SIZE_T MiNonPagedSystemSize; PVOID MmNonPagedPoolStart; PVOID MmNonPagedPoolExpansionStart; PVOID MmNonPagedPoolEnd = MI_NONPAGED_POOL_END; Modified: trunk/reactos/ntoskrnl/mm/amd64/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/amd64/init.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/amd64/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/amd64/init.c [iso-8859-1] Fri Sep 30 15:58:23 2016 @@ -370,14 +370,15 @@ MiBuildSystemPteSpace(VOID) { PMMPTE PointerPte; - - /* Use the default numer of system PTEs */ + SIZE_T NonPagedSystemSize; + + /* Use the default number of system PTEs */ MmNumberOfSystemPtes = MI_NUMBER_SYSTEM_PTES; - MiNonPagedSystemSize = (MmNumberOfSystemPtes + 1) * PAGE_SIZE; + NonPagedSystemSize = (MmNumberOfSystemPtes + 1) * PAGE_SIZE; /* Put system PTEs at the start of the system VA space */ MiSystemPteSpaceStart = MmNonPagedSystemStart; - MiSystemPteSpaceEnd = (PUCHAR)MiSystemPteSpaceStart + MiNonPagedSystemSize; + MiSystemPteSpaceEnd = (PUCHAR)MiSystemPteSpaceStart + NonPagedSystemSize; /* Map the PPEs and PDEs for the system PTEs */ MiMapPPEs(MiSystemPteSpaceStart, MiSystemPteSpaceEnd); Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=7… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] Fri Sep 30 15:58:23 2016 @@ -88,8 +88,11 @@ // ReactOS requires a memory area to keep the initial NP area off-bounds MiCreateArm3StaticMemoryArea(MmNonPagedPoolStart, MmSizeOfNonPagedPoolInBytes, FALSE); - // System NP - MiCreateArm3StaticMemoryArea(MmNonPagedSystemStart, MiNonPagedSystemSize, FALSE); + // System PTE space + MiCreateArm3StaticMemoryArea(MmNonPagedSystemStart, (MmNumberOfSystemPtes + 1) * PAGE_SIZE, FALSE); + + // Nonpaged pool expansion space + MiCreateArm3StaticMemoryArea(MmNonPagedPoolExpansionStart, (ULONG_PTR)MmNonPagedPoolEnd - (ULONG_PTR)MmNonPagedPoolExpansionStart, FALSE); // System view space MiCreateArm3StaticMemoryArea(MiSystemViewStart, MmSystemViewSize, FALSE);

8 years, 2 months

[akhaldi] 72868: [DNSAPI_APITEST] Add more tests for DnsQuery_A/W. By Peter Hater. ROSTESTS-242

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Sep 30 15:23:25 2016 New Revision: 72868 URL: http://svn.reactos.org/svn/reactos?rev=72868&view=rev Log: [DNSAPI_APITEST] Add more tests for DnsQuery_A/W. By Peter Hater. ROSTESTS-242 Modified: trunk/rostests/apitests/dnsapi/CMakeLists.txt trunk/rostests/apitests/dnsapi/DnsQuery.c Modified: trunk/rostests/apitests/dnsapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/dnsapi/CMakeList… ============================================================================== --- trunk/rostests/apitests/dnsapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/dnsapi/CMakeLists.txt [iso-8859-1] Fri Sep 30 15:23:25 2016 @@ -6,5 +6,5 @@ add_executable(dnsapi_apitest ${SOURCE}) target_link_libraries(dnsapi_apitest wine) set_module_type(dnsapi_apitest win32cui) -add_importlibs(dnsapi_apitest ws2_32 dnsapi msvcrt kernel32 ntdll) +add_importlibs(dnsapi_apitest ws2_32 dnsapi iphlpapi msvcrt kernel32 ntdll) add_cd_file(TARGET dnsapi_apitest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/apitests/dnsapi/DnsQuery.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/dnsapi/DnsQuery.… ============================================================================== --- trunk/rostests/apitests/dnsapi/DnsQuery.c [iso-8859-1] (original) +++ trunk/rostests/apitests/dnsapi/DnsQuery.c [iso-8859-1] Fri Sep 30 15:23:25 2016 @@ -10,6 +10,7 @@ #include <stdio.h> #include <windns.h> #include <apitest.h> +#include <iphlpapi.h> void TestHostName(void) @@ -17,22 +18,40 @@ DNS_STATUS dns_status; char host_name[255]; - char domain_name[255]; char test_name[255]; PDNS_RECORD dp; WCHAR host_nameW[255]; WCHAR test_nameW[255]; - DWORD size = sizeof(host_name); - - GetComputerNameEx(ComputerNameDnsHostname, host_name, &size); - size = sizeof(domain_name); - GetComputerNameEx(ComputerNameDnsDomain, domain_name, &size); - if (strlen(domain_name)) - { - strcat(host_name, "."); - strcat(host_name, domain_name); - } - mbstowcs(host_nameW, host_name, 255); + PFIXED_INFO network_info; + ULONG network_info_blen = 0; + DWORD network_info_result; + + network_info_result = GetNetworkParams(NULL, &network_info_blen); + network_info = (PFIXED_INFO)HeapAlloc(GetProcessHeap(), 0, (size_t)network_info_blen); + if (NULL == network_info) + { + skip("Not enough memory. Can't continue!\n"); + return; + } + + network_info_result = GetNetworkParams(network_info, &network_info_blen); + if (network_info_result != ERROR_SUCCESS) + { + HeapFree(GetProcessHeap(), 0, network_info); + skip("Can't get network info. Some results may be wrong.\n"); + return; + } + else + { + strcpy(host_name, network_info->HostName); + if (strlen(network_info->DomainName)) + { + strcat(host_name, "."); + strcat(host_name, network_info->DomainName); + } + HeapFree(GetProcessHeap(), 0, network_info); + mbstowcs(host_nameW, host_name, 255); + } //DnsQuery_A: //NULL @@ -40,7 +59,11 @@ dns_status = DnsQuery_A(NULL, DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == ERROR_INVALID_PARAMETER, "DnsQuery_A failed with error %lu\n", dns_status); ok(dp == InvalidPointer, "dp = %p\n", dp); - + + //NULL dp + dns_status = DnsQuery_A(host_name, DNS_TYPE_A, DNS_QUERY_STANDARD, 0, NULL, 0); + ok(dns_status == ERROR_INVALID_PARAMETER, "DnsQuery_A failed with error %lu\n", dns_status); + //Testing HostName dp = InvalidPointer; dns_status = DnsQuery_A(host_name, DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); @@ -260,6 +283,10 @@ ok(dp == InvalidPointer, "dp = %p\n", dp); } if (dp != InvalidPointer) DnsRecordListFree(dp, DnsFreeRecordList); + + //NULL dp + dns_status = DnsQuery_W(host_nameW, DNS_TYPE_A, DNS_QUERY_STANDARD, 0, NULL, 0); + ok(dns_status == ERROR_INVALID_PARAMETER, "DnsQuery_W failed with error %lu\n", dns_status); //Testing HostName dns_status = DnsQuery_W(host_nameW, DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0);

8 years, 2 months

[akhaldi] 72867: [ADNS][DNSAPI][MSWSOCK] Several fixes and improvements to DnsQuery and co, detailed in CORE-11394. This also fixes CORE-7441, many tests in dnsapi:DnsQuery, ws2_32:getaddrinfo and ...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Sep 30 15:19:29 2016 New Revision: 72867 URL: http://svn.reactos.org/svn/reactos?rev=72867&view=rev Log: [ADNS][DNSAPI][MSWSOCK] Several fixes and improvements to DnsQuery and co, detailed in CORE-11394. This also fixes CORE-7441, many tests in dnsapi:DnsQuery, ws2_32:getaddrinfo and more. Brought to you by Peter Hater. Modified: trunk/reactos/dll/win32/dnsapi/CMakeLists.txt trunk/reactos/dll/win32/dnsapi/dnsapi/query.c trunk/reactos/dll/win32/mswsock/CMakeLists.txt trunk/reactos/dll/win32/mswsock/mswhelper.c trunk/reactos/dll/win32/mswsock/nsplookup.c trunk/reactos/sdk/lib/3rdparty/adns/src/adns.h trunk/reactos/sdk/lib/3rdparty/adns/src/setup.c Modified: trunk/reactos/dll/win32/dnsapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dnsapi/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/dnsapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dnsapi/CMakeLists.txt [iso-8859-1] Fri Sep 30 15:19:29 2016 @@ -24,6 +24,6 @@ set_module_type(dnsapi win32dll) target_link_libraries(dnsapi adns) -add_importlibs(dnsapi user32 ws2_32 iphlpapi msvcrt kernel32 ntdll) +add_importlibs(dnsapi advapi32 user32 ws2_32 iphlpapi msvcrt kernel32 ntdll) add_pch(dnsapi dnsapi/precomp.h SOURCE) add_cd_file(TARGET dnsapi DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/dnsapi/dnsapi/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dnsapi/dnsapi/qu… ============================================================================== --- trunk/reactos/dll/win32/dnsapi/dnsapi/query.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dnsapi/dnsapi/query.c [iso-8859-1] Fri Sep 30 15:19:29 2016 @@ -9,6 +9,9 @@ */ #include "precomp.h" +#include <winreg.h> +#include <iphlpapi.h> +#include <strsafe.h> #define NDEBUG #include <debug.h> @@ -31,17 +34,63 @@ * Reserved -- Response as it appears on the wire. Optional. */ -char -*xstrsave(const char *str) -{ - char *p; - - p = RtlAllocateHeap(RtlGetProcessHeap(), 0, strlen(str) + 1); - - if(p) - strcpy(p, str); - - return p; +static PCHAR +DnsWToC(const WCHAR *WideString) +{ + PCHAR AnsiString; + int AnsiLen = WideCharToMultiByte(CP_ACP, + 0, + WideString, + -1, + NULL, + 0, + NULL, + 0); + if (AnsiLen == 0) + return NULL; + AnsiString = RtlAllocateHeap(RtlGetProcessHeap(), 0, AnsiLen); + if (AnsiString == NULL) + { + return NULL; + } + WideCharToMultiByte(CP_ACP, + 0, + WideString, + -1, + AnsiString, + AnsiLen, + NULL, + 0); + + return AnsiString; +} + +static PWCHAR +DnsCToW(const CHAR *NarrowString) +{ + PWCHAR WideString; + int WideLen = MultiByteToWideChar(CP_ACP, + 0, + NarrowString, + -1, + NULL, + 0); + if (WideLen == 0) + return NULL; + WideLen *= sizeof(WCHAR); + WideString = RtlAllocateHeap(RtlGetProcessHeap(), 0, WideLen); + if (WideString == NULL) + { + return NULL; + } + MultiByteToWideChar(CP_ACP, + 0, + NarrowString, + -1, + WideString, + WideLen); + + return WideString; } DNS_STATUS WINAPI @@ -52,141 +101,491 @@ PDNS_RECORD *QueryResultSet, PVOID *Reserved) { - adns_state astate; - int quflags = adns_qf_search; - int adns_error; - adns_answer *answer; - LPSTR CurrentName; - unsigned i, CNameLoop; + UINT i; + PWCHAR Buffer; + DNS_STATUS Status; + PDNS_RECORD QueryResultWide; + PDNS_RECORD ConvertedRecord = 0, LastRecord = 0; if (Name == NULL) return ERROR_INVALID_PARAMETER; - - *QueryResultSet = 0; - - switch(Type) - { + if (QueryResultSet == NULL) + return ERROR_INVALID_PARAMETER; + + Buffer = DnsCToW(Name); + + Status = DnsQuery_W(Buffer, Type, Options, Servers, &QueryResultWide, Reserved); + + while (Status == ERROR_SUCCESS && QueryResultWide) + { + switch (QueryResultWide->wType) + { case DNS_TYPE_A: - adns_error = adns_init(&astate, adns_if_noenv | adns_if_noerrprint | adns_if_noserverwarn, 0); - - if(adns_error != adns_s_ok) - return DnsIntTranslateAdnsToDNS_STATUS(adns_error); - - if (Servers) - { - for(i = 0; i < Servers->AddrCount; i++) - { - adns_addserver(astate, *((struct in_addr *)&Servers->AddrArray[i])); - } - } - - /* - * adns doesn't resolve chained CNAME records (a CNAME which points to - * another CNAME pointing to another... pointing to an A record), according - * to a mailing list thread the authors believe that chained CNAME records - * are invalid and the DNS entries should be fixed. That's a nice academic - * standpoint, but there certainly are chained CNAME records out there, - * even some fairly major ones (at the time of this writing - * download.mozilla.org is a chained CNAME). Everyone else seems to resolve - * these fine, so we should too. So we loop here to try to resolve CNAME - * chains ourselves. Of course, there must be a limit to protect against - * CNAME loops. - */ - -#define CNAME_LOOP_MAX 16 - - CurrentName = (LPSTR) Name; - - for (CNameLoop = 0; CNameLoop < CNAME_LOOP_MAX; CNameLoop++) - { - adns_error = adns_synchronous(astate, CurrentName, adns_r_addr, quflags, &answer); - - if(adns_error != adns_s_ok) - { - adns_finish(astate); - - if (CurrentName != Name) - RtlFreeHeap(RtlGetProcessHeap(), 0, CurrentName); - - return DnsIntTranslateAdnsToDNS_STATUS(adns_error); - } - - if(answer && answer->rrs.addr) - { - if (CurrentName != Name) - RtlFreeHeap(RtlGetProcessHeap(), 0, CurrentName); - - *QueryResultSet = (PDNS_RECORD)RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(DNS_RECORD)); - - if (NULL == *QueryResultSet) - { - adns_finish( astate ); - return ERROR_OUTOFMEMORY; - } - - (*QueryResultSet)->pNext = NULL; - (*QueryResultSet)->wType = Type; - (*QueryResultSet)->wDataLength = sizeof(DNS_A_DATA); - (*QueryResultSet)->Data.A.IpAddress = answer->rrs.addr->addr.inet.sin_addr.s_addr; - - adns_finish(astate); - - (*QueryResultSet)->pName = xstrsave( Name ); - - return NULL != (*QueryResultSet)->pName ? ERROR_SUCCESS : ERROR_OUTOFMEMORY; - } - - if (NULL == answer || adns_s_prohibitedcname != answer->status || NULL == answer->cname) - { - adns_finish(astate); - - if (CurrentName != Name) - RtlFreeHeap(RtlGetProcessHeap(), 0, CurrentName); - - return ERROR_FILE_NOT_FOUND; - } - - if (CurrentName != Name) - RtlFreeHeap(RtlGetProcessHeap(), 0, CurrentName); - - CurrentName = xstrsave(answer->cname); - - if (!CurrentName) - { - adns_finish(astate); - return ERROR_OUTOFMEMORY; - } - } - - adns_finish(astate); - RtlFreeHeap(RtlGetProcessHeap(), 0, CurrentName); - return ERROR_FILE_NOT_FOUND; - - default: - return ERROR_OUTOFMEMORY; /* XXX arty: find a better error code. */ - } -} - -static PCHAR -DnsWToC(const WCHAR *WideString) -{ - int chars = wcstombs(NULL, WideString, 0); - PCHAR out = RtlAllocateHeap(RtlGetProcessHeap(), 0, chars + 1); - - wcstombs(out, WideString, chars + 1); - - return out; -} - -static PWCHAR -DnsCToW(const CHAR *NarrowString) -{ - int chars = mbstowcs(NULL, NarrowString, 0); - PWCHAR out = RtlAllocateHeap(RtlGetProcessHeap(), 0, (chars + 1) * sizeof(WCHAR)); - - mbstowcs(out, NarrowString, chars + 1); - - return out; + case DNS_TYPE_WKS: + ConvertedRecord = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(DNS_RECORD)); + ConvertedRecord->pName = DnsWToC((PWCHAR)QueryResultWide->pName); + ConvertedRecord->wType = QueryResultWide->wType; + ConvertedRecord->wDataLength = QueryResultWide->wDataLength; + memcpy(&ConvertedRecord->Data, &QueryResultWide->Data, QueryResultWide->wDataLength); + break; + + case DNS_TYPE_CNAME: + case DNS_TYPE_PTR: + case DNS_TYPE_NS: + case DNS_TYPE_MB: + case DNS_TYPE_MD: + case DNS_TYPE_MF: + case DNS_TYPE_MG: + case DNS_TYPE_MR: + ConvertedRecord = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(DNS_RECORD)); + ConvertedRecord->pName = DnsWToC((PWCHAR)QueryResultWide->pName); + ConvertedRecord->wType = QueryResultWide->wType; + ConvertedRecord->wDataLength = sizeof(DNS_PTR_DATA); + ConvertedRecord->Data.PTR.pNameHost = DnsWToC((PWCHAR)QueryResultWide->Data.PTR.pNameHost); + break; + + case DNS_TYPE_MINFO: + ConvertedRecord = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(DNS_RECORD)); + ConvertedRecord->pName = DnsWToC((PWCHAR)QueryResultWide->pName); + ConvertedRecord->wType = QueryResultWide->wType; + ConvertedRecord->wDataLength = sizeof(DNS_MINFO_DATA); + ConvertedRecord->Data.MINFO.pNameMailbox = DnsWToC((PWCHAR)QueryResultWide->Data.MINFO.pNameMailbox); + ConvertedRecord->Data.MINFO.pNameErrorsMailbox = DnsWToC((PWCHAR)QueryResultWide->Data.MINFO.pNameErrorsMailbox); + break; + + case DNS_TYPE_MX: + ConvertedRecord = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(DNS_RECORD)); + ConvertedRecord->pName = DnsWToC((PWCHAR)QueryResultWide->pName); + ConvertedRecord->wType = QueryResultWide->wType; + ConvertedRecord->wDataLength = sizeof(DNS_MX_DATA); + ConvertedRecord->Data.MX.pNameExchange = DnsWToC((PWCHAR)QueryResultWide->Data.MX.pNameExchange); + ConvertedRecord->Data.MX.wPreference = QueryResultWide->Data.MX.wPreference; + break; + + case DNS_TYPE_HINFO: + ConvertedRecord = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(DNS_TXT_DATA) + QueryResultWide->Data.TXT.dwStringCount); + ConvertedRecord->pName = DnsWToC((PWCHAR)QueryResultWide->pName); + ConvertedRecord->wType = QueryResultWide->wType; + ConvertedRecord->wDataLength = sizeof(DNS_TXT_DATA) + (sizeof(PCHAR) * QueryResultWide->Data.TXT.dwStringCount); + ConvertedRecord->Data.TXT.dwStringCount = QueryResultWide->Data.TXT.dwStringCount; + + for (i = 0; i < ConvertedRecord->Data.TXT.dwStringCount; i++) + ConvertedRecord->Data.TXT.pStringArray[i] = DnsWToC((PWCHAR)QueryResultWide->Data.TXT.pStringArray[i]); + + break; + + case DNS_TYPE_NULL: + ConvertedRecord = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(DNS_NULL_DATA) + QueryResultWide->Data.Null.dwByteCount); + ConvertedRecord->pName = DnsWToC((PWCHAR)QueryResultWide->pName); + ConvertedRecord->wType = QueryResultWide->wType; + ConvertedRecord->wDataLength = sizeof(DNS_NULL_DATA) + QueryResultWide->Data.Null.dwByteCount; + ConvertedRecord->Data.Null.dwByteCount = QueryResultWide->Data.Null.dwByteCount; + memcpy(&ConvertedRecord->Data.Null.Data, &QueryResultWide->Data.Null.Data, QueryResultWide->Data.Null.dwByteCount); + break; + } + + if (LastRecord) + { + LastRecord->pNext = ConvertedRecord; + LastRecord = LastRecord->pNext; + } + else + { + LastRecord = *QueryResultSet = ConvertedRecord; + } + + QueryResultWide = QueryResultWide->pNext; + } + + if (LastRecord) + LastRecord->pNext = 0; + + /* The name */ + RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); + /* The result*/ + if (QueryResultWide) DnsIntFreeRecordList(QueryResultWide); + + return Status; +} + +WCHAR +*xstrsave(const WCHAR *str) +{ + WCHAR *p; + size_t len = 0; + + /* FIXME: how much instead of MAX_PATH? */ + StringCbLengthW(str, MAX_PATH, &len); + len+=sizeof(WCHAR); + + p = RtlAllocateHeap(RtlGetProcessHeap(), 0, len); + + if (p) + StringCbCopyW(p, len, str); + + return p; +} + +CHAR +*xstrsaveA(const CHAR *str) +{ + CHAR *p; + size_t len = 0; + + /* FIXME: how much instead of MAX_PATH? */ + StringCbLengthA(str, MAX_PATH, &len); + len++; + + p = RtlAllocateHeap(RtlGetProcessHeap(), 0, len); + + if (p) + StringCbCopyA(p, len, str); + + return p; +} + +HANDLE +OpenNetworkDatabase(LPCWSTR Name) +{ + PWSTR ExpandedPath; + PWSTR DatabasePath; + INT ErrorCode; + HKEY DatabaseKey; + DWORD RegType; + DWORD RegSize = 0; + size_t StringLength; + HANDLE ret; + + ExpandedPath = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR)); + if (!ExpandedPath) + return INVALID_HANDLE_VALUE; + + /* Open the database path key */ + ErrorCode = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"System\\CurrentControlSet\\Services\\Tcpip\\Parameters", + 0, + KEY_READ, + &DatabaseKey); + if (ErrorCode == NO_ERROR) + { + /* Read the actual path */ + ErrorCode = RegQueryValueExW(DatabaseKey, + L"DatabasePath", + NULL, + &RegType, + NULL, + &RegSize); + + DatabasePath = HeapAlloc(GetProcessHeap(), 0, RegSize); + if (!DatabasePath) + { + HeapFree(GetProcessHeap(), 0, ExpandedPath); + return INVALID_HANDLE_VALUE; + } + + /* Read the actual path */ + ErrorCode = RegQueryValueExW(DatabaseKey, + L"DatabasePath", + NULL, + &RegType, + (LPBYTE)DatabasePath, + &RegSize); + + /* Close the key */ + RegCloseKey(DatabaseKey); + + /* Expand the name */ + ExpandEnvironmentStringsW(DatabasePath, ExpandedPath, MAX_PATH); + + HeapFree(GetProcessHeap(), 0, DatabasePath); + } + else + { + /* Use defalt path */ + GetSystemDirectoryW(ExpandedPath, MAX_PATH); + StringCchLength(ExpandedPath, MAX_PATH, &StringLength); + if (ExpandedPath[StringLength - 1] != L'\\') + { + /* It isn't, so add it ourselves */ + StringCchCat(ExpandedPath, MAX_PATH, L"\\"); + } + StringCchCat(ExpandedPath, MAX_PATH, L"DRIVERS\\ETC\\"); + } + + /* Make sure that the path is backslash-terminated */ + StringCchLength(ExpandedPath, MAX_PATH, &StringLength); + if (ExpandedPath[StringLength - 1] != L'\\') + { + /* It isn't, so add it ourselves */ + StringCchCat(ExpandedPath, MAX_PATH, L"\\"); + } + + /* Add the database name */ + StringCchCat(ExpandedPath, MAX_PATH, Name); + + /* Return a handle to the file */ + ret = CreateFileW(ExpandedPath, + FILE_READ_DATA, + FILE_SHARE_READ, + NULL, + OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, + NULL); + + HeapFree(GetProcessHeap(), 0, ExpandedPath); + return ret; +} + +/* This function is far from perfect but it works enough */ +IP4_ADDRESS +CheckForCurrentHostname(CONST CHAR * Name, PFIXED_INFO network_info) +{ + PCHAR TempName; + DWORD AdapterAddressesSize, Status; + IP4_ADDRESS ret = 0, Address; + PIP_ADAPTER_ADDRESSES Addresses = NULL, pip; + BOOL Found = FALSE; + + if (network_info->DomainName) + { + size_t StringLength; + size_t TempSize = 2; + StringCchLengthA(network_info->HostName, sizeof(network_info->HostName), &StringLength); + TempSize += StringLength; + StringCchLengthA(network_info->DomainName, sizeof(network_info->DomainName), &StringLength); + TempSize += StringLength; + TempName = RtlAllocateHeap(RtlGetProcessHeap(), 0, TempSize); + StringCchCopyA(TempName, TempSize, network_info->HostName); + StringCchCatA(TempName, TempSize, "."); + StringCchCatA(TempName, TempSize, network_info->DomainName); + } + else + { + TempName = RtlAllocateHeap(RtlGetProcessHeap(), 0, 1); + TempName[0] = 0; + } + Found = !stricmp(Name, network_info->HostName) || !stricmp(Name, TempName); + RtlFreeHeap(RtlGetProcessHeap(), 0, TempName); + if (!Found) + { + return 0; + } + /* get adapter info */ + AdapterAddressesSize = 0; + GetAdaptersAddresses(AF_INET, + GAA_FLAG_SKIP_FRIENDLY_NAME | GAA_FLAG_SKIP_DNS_SERVER | + GAA_FLAG_SKIP_ANYCAST | GAA_FLAG_SKIP_MULTICAST, + NULL, + Addresses, + &AdapterAddressesSize); + if (!AdapterAddressesSize) + { + return 0; + } + Addresses = RtlAllocateHeap(RtlGetProcessHeap(), 0, AdapterAddressesSize); + Status = GetAdaptersAddresses(AF_INET, + GAA_FLAG_SKIP_FRIENDLY_NAME | GAA_FLAG_SKIP_DNS_SERVER | + GAA_FLAG_SKIP_ANYCAST | GAA_FLAG_SKIP_MULTICAST, + NULL, + Addresses, + &AdapterAddressesSize); + if (Status) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, Addresses); + return 0; + } + for (pip = Addresses; pip != NULL; pip = pip->Next) { + Address = ((LPSOCKADDR_IN)pip->FirstUnicastAddress->Address.lpSockaddr)->sin_addr.S_un.S_addr; + if (Address != ntohl(INADDR_LOOPBACK)) + break; + } + if (Address && Address != ntohl(INADDR_LOOPBACK)) + { + ret = Address; + } + RtlFreeHeap(RtlGetProcessHeap(), 0, Addresses); + return ret; +} + +BOOL +ParseV4Address(LPCSTR AddressString, + OUT PDWORD pAddress) +{ + CHAR * cp = (CHAR *)AddressString; + DWORD val, base; + unsigned char c; + DWORD parts[4], *pp = parts; + if (!AddressString) + return FALSE; + if (!isdigit(*cp)) return FALSE; + +again: + /* + * Collect number up to ``.''. + * Values are specified as for C: + * 0x=hex, 0=octal, other=decimal. + */ + val = 0; base = 10; + if (*cp == '0') { + if (*++cp == 'x' || *cp == 'X') + base = 16, cp++; + else + base = 8; + } + while ((c = *cp)) { + if (isdigit(c)) { + val = (val * base) + (c - '0'); + cp++; + continue; + } + if (base == 16 && isxdigit(c)) { + val = (val << 4) + (c + 10 - (islower(c) ? 'a' : 'A')); + cp++; + continue; + } + break; + } + if (*cp == '.') { + /* + * Internet format: + * a.b.c.d + */ + if (pp >= parts + 4) return FALSE; + *pp++ = val; + cp++; + goto again; + } + /* + * Check for trailing characters. + */ + if (*cp && *cp > ' ') return FALSE; + + *pp++ = val; + /* + * Concoct the address according to + * the number of parts specified. + */ + if ((DWORD)(pp - parts) != 4) return FALSE; + if (parts[0] > 0xff || parts[1] > 0xff || parts[2] > 0xff || parts[3] > 0xff) return FALSE; + val = (parts[3] << 24) | (parts[2] << 16) | (parts[1] << 8) | parts[0]; + + if (pAddress) + *pAddress = val; + + return TRUE; +} + +/* This function is far from perfect but it works enough */ +IP4_ADDRESS +FindEntryInHosts(CONST CHAR * name) +{ + BOOL Found = FALSE; + HANDLE HostsFile; + CHAR HostsDBData[BUFSIZ] = { 0 }; + PCHAR AddressStr, DnsName = NULL, AddrTerm, NameSt, NextLine, ThisLine, Comment; + UINT ValidData = 0; + DWORD ReadSize; + DWORD Address; + + /* Open the network database */ + HostsFile = OpenNetworkDatabase(L"hosts"); + if (HostsFile == INVALID_HANDLE_VALUE) + { + WSASetLastError(WSANO_RECOVERY); + return 0; + } + + while (!Found && ReadFile(HostsFile, + HostsDBData + ValidData, + sizeof(HostsDBData) - ValidData, + &ReadSize, + NULL)) + { + ValidData += ReadSize; + ReadSize = 0; + NextLine = ThisLine = HostsDBData; + + /* Find the beginning of the next line */ + while ((NextLine < HostsDBData + ValidData) && + (*NextLine != '\r') && + (*NextLine != '\n')) + { + NextLine++; + } + + /* Zero and skip, so we can treat what we have as a string */ + if (NextLine > HostsDBData + ValidData) + break; + + *NextLine = 0; + NextLine++; + + Comment = strchr(ThisLine, '#'); + if (Comment) + *Comment = 0; /* Terminate at comment start */ + + AddressStr = ThisLine; + /* Find the first space separating the IP address from the DNS name */ + AddrTerm = strchr(ThisLine, ' '); + if (AddrTerm) + { + /* Terminate the address string */ + *AddrTerm = 0; + + /* Find the last space before the DNS name */ + NameSt = strrchr(ThisLine, ' '); + + /* If there is only one space (the one we removed above), then just use the address terminator */ + if (!NameSt) + NameSt = AddrTerm; + + /* Move from the space to the first character of the DNS name */ + NameSt++; + + DnsName = NameSt; + + if (!stricmp(name, DnsName) || !stricmp(name, AddressStr)) + { + Found = TRUE; + break; + } + } + + /* Get rid of everything we read so far */ + while (NextLine <= HostsDBData + ValidData && + isspace(*NextLine)) + { + NextLine++; + } + + if (HostsDBData + ValidData - NextLine <= 0) + break; + + memmove(HostsDBData, NextLine, HostsDBData + ValidData - NextLine); + ValidData -= NextLine - HostsDBData; + } + + CloseHandle(HostsFile); + + if (!Found) + { + WSASetLastError(WSANO_DATA); + return 0; + } + + if (strstr(AddressStr, ":")) + { + WSASetLastError(WSAEINVAL); + return 0; + } + + if (!ParseV4Address(AddressStr, &Address)) + { + WSASetLastError(WSAEINVAL); + return 0; + } + + return Address; } DNS_STATUS WINAPI @@ -197,107 +596,297 @@ PDNS_RECORD *QueryResultSet, PVOID *Reserved) { - UINT i; - PCHAR Buffer; - DNS_STATUS Status; - PDNS_RECORD QueryResultWide; - PDNS_RECORD ConvertedRecord = 0, LastRecord = 0; + adns_state astate; + int quflags = (Options & DNS_QUERY_NO_RECURSION) == 0 ? adns_qf_search : 0; + int adns_error; + adns_answer *answer; + LPSTR CurrentName; + unsigned i, CNameLoop; + PFIXED_INFO network_info; + ULONG network_info_blen = 0; + DWORD network_info_result; + PIP_ADDR_STRING pip; + IP4_ADDRESS Address; + struct in_addr addr; + PCHAR HostWithDomainName; + PCHAR AnsiName; + size_t NameLen = 0; if (Name == NULL) return ERROR_INVALID_PARAMETER; - - Buffer = DnsWToC(Name); - - Status = DnsQuery_A(Buffer, Type, Options, Servers, &QueryResultWide, Reserved); - - while(Status == ERROR_SUCCESS && QueryResultWide) - { - switch(QueryResultWide->wType) - { - case DNS_TYPE_A: - case DNS_TYPE_WKS: - ConvertedRecord = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(DNS_RECORD)); - ConvertedRecord->pName = (PCHAR)DnsCToW(QueryResultWide->pName); - ConvertedRecord->wType = QueryResultWide->wType; - ConvertedRecord->wDataLength = QueryResultWide->wDataLength; - memcpy(ConvertedRecord, QueryResultWide, QueryResultWide->wDataLength); - break; - - case DNS_TYPE_CNAME: - case DNS_TYPE_PTR: - case DNS_TYPE_NS: - case DNS_TYPE_MB: - case DNS_TYPE_MD: - case DNS_TYPE_MF: - case DNS_TYPE_MG: - case DNS_TYPE_MR: - ConvertedRecord = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(DNS_RECORD)); - ConvertedRecord->pName = (PCHAR)DnsCToW(QueryResultWide->pName); - ConvertedRecord->wType = QueryResultWide->wType; - ConvertedRecord->wDataLength = sizeof(DNS_PTR_DATA); - ConvertedRecord->Data.PTR.pNameHost = (PCHAR)DnsCToW(QueryResultWide->Data.PTR.pNameHost); - break; - - case DNS_TYPE_MINFO: - ConvertedRecord = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(DNS_RECORD)); - ConvertedRecord->pName = (PCHAR)DnsCToW(QueryResultWide->pName); - ConvertedRecord->wType = QueryResultWide->wType; - ConvertedRecord->wDataLength = sizeof(DNS_MINFO_DATA); - ConvertedRecord->Data.MINFO.pNameMailbox = (PCHAR)DnsCToW(QueryResultWide->Data.MINFO.pNameMailbox); - ConvertedRecord->Data.MINFO.pNameErrorsMailbox = (PCHAR)DnsCToW(QueryResultWide->Data.MINFO.pNameErrorsMailbox); - break; - - case DNS_TYPE_MX: - ConvertedRecord = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(DNS_RECORD)); - ConvertedRecord->pName = (PCHAR)DnsCToW(QueryResultWide->pName); - ConvertedRecord->wType = QueryResultWide->wType; - ConvertedRecord->wDataLength = sizeof(DNS_MX_DATA); - ConvertedRecord->Data.MX.pNameExchange = (PCHAR)DnsCToW( QueryResultWide->Data.MX.pNameExchange); - ConvertedRecord->Data.MX.wPreference = QueryResultWide->Data.MX.wPreference; - break; - - case DNS_TYPE_HINFO: - ConvertedRecord = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(DNS_TXT_DATA) + QueryResultWide->Data.TXT.dwStringCount); - ConvertedRecord->pName = (PCHAR)DnsCToW( QueryResultWide->pName ); - ConvertedRecord->wType = QueryResultWide->wType; - ConvertedRecord->wDataLength = sizeof(DNS_TXT_DATA) + (sizeof(PWCHAR) * QueryResultWide->Data.TXT.dwStringCount); - ConvertedRecord->Data.TXT.dwStringCount = QueryResultWide->Data.TXT.dwStringCount; - - for(i = 0; i < ConvertedRecord->Data.TXT.dwStringCount; i++) - ConvertedRecord->Data.TXT.pStringArray[i] = (PCHAR)DnsCToW(QueryResultWide->Data.TXT.pStringArray[i]); - - break; - - case DNS_TYPE_NULL: - ConvertedRecord = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(DNS_NULL_DATA) + QueryResultWide->Data.Null.dwByteCount); - ConvertedRecord->pName = (PCHAR)DnsCToW(QueryResultWide->pName); - ConvertedRecord->wType = QueryResultWide->wType; - ConvertedRecord->wDataLength = sizeof(DNS_NULL_DATA) + QueryResultWide->Data.Null.dwByteCount; - ConvertedRecord->Data.Null.dwByteCount = QueryResultWide->Data.Null.dwByteCount; - memcpy(&ConvertedRecord->Data.Null.Data, &QueryResultWide->Data.Null.Data, QueryResultWide->Data.Null.dwByteCount); - break; - } - - if(LastRecord) - { - LastRecord->pNext = ConvertedRecord; - LastRecord = LastRecord->pNext; - } - else - { - LastRecord = *QueryResultSet = ConvertedRecord; - } - - QueryResultWide = QueryResultWide->pNext; - } - - if (LastRecord) - LastRecord->pNext = 0; - - /* The name */ - RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - - return Status; + if (QueryResultSet == NULL) + return ERROR_INVALID_PARAMETER; + if ((Options & DNS_QUERY_WIRE_ONLY) != 0 && (Options & DNS_QUERY_NO_WIRE_QUERY) != 0) + return ERROR_INVALID_PARAMETER; + + *QueryResultSet = 0; + + switch (Type) + { + case DNS_TYPE_A: + /* FIXME: how much instead of MAX_PATH? */ + NameLen = WideCharToMultiByte(CP_ACP, + 0, + Name, + -1, + NULL, + 0, + NULL, + 0); + AnsiName = RtlAllocateHeap(RtlGetProcessHeap(), 0, NameLen); + if (NULL == AnsiName) + { + return ERROR_OUTOFMEMORY; + } + WideCharToMultiByte(CP_ACP, + 0, + Name, + -1, + AnsiName, + NameLen, + NULL, + 0); + NameLen--; + /* Is it an IPv4 address? */ + if (ParseV4Address(AnsiName, &Address)) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, AnsiName); + *QueryResultSet = (PDNS_RECORD)RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(DNS_RECORD)); + + if (NULL == *QueryResultSet) + { + return ERROR_OUTOFMEMORY; + } + + (*QueryResultSet)->pNext = NULL; + (*QueryResultSet)->wType = Type; + (*QueryResultSet)->wDataLength = sizeof(DNS_A_DATA); + (*QueryResultSet)->Data.A.IpAddress = Address; + + (*QueryResultSet)->pName = (LPSTR)xstrsave(Name); + + return (*QueryResultSet)->pName ? ERROR_SUCCESS : ERROR_OUTOFMEMORY; + } + + /* Check allowed characters + * According to RFC a-z,A-Z,0-9,-,_, but can't start or end with - or _ + */ + if (AnsiName[0] == '-' || AnsiName[0] == '_' || AnsiName[NameLen - 1] == '-' || + AnsiName[NameLen - 1] == '_' || strstr(AnsiName, "..") != NULL) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, AnsiName); + return ERROR_INVALID_NAME; + } + i = 0; + while (i < NameLen) + { + if (!((AnsiName[i] >= 'a' && AnsiName[i] <= 'z') || + (AnsiName[i] >= 'A' && AnsiName[i] <= 'Z') || + (AnsiName[i] >= '0' && AnsiName[i] <= '9') || + AnsiName[i] == '-' || AnsiName[i] == '_' || AnsiName[i] == '.')) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, AnsiName); + return ERROR_INVALID_NAME; + } + i++; + } + + if ((Options & DNS_QUERY_NO_HOSTS_FILE) == 0) + { + if ((Address = FindEntryInHosts(AnsiName)) != 0) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, AnsiName); + *QueryResultSet = (PDNS_RECORD)RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(DNS_RECORD)); + + if (NULL == *QueryResultSet) + { + return ERROR_OUTOFMEMORY; + } + + (*QueryResultSet)->pNext = NULL; + (*QueryResultSet)->wType = Type; + (*QueryResultSet)->wDataLength = sizeof(DNS_A_DATA); + (*QueryResultSet)->Data.A.IpAddress = Address; + + (*QueryResultSet)->pName = (LPSTR)xstrsave(Name); + + return (*QueryResultSet)->pName ? ERROR_SUCCESS : ERROR_OUTOFMEMORY; + } + } + + network_info_result = GetNetworkParams(NULL, &network_info_blen); + network_info = (PFIXED_INFO)RtlAllocateHeap(RtlGetProcessHeap(), 0, (size_t)network_info_blen); + if (NULL == network_info) + { + return ERROR_OUTOFMEMORY; + } + + network_info_result = GetNetworkParams(network_info, &network_info_blen); + if (network_info_result != ERROR_SUCCESS) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, network_info); + return network_info_result; + } + + if ((Address = CheckForCurrentHostname(NameLen != 0 ? AnsiName : network_info->HostName, network_info)) != 0) + { + size_t TempLen = 2, StringLength = 0; + RtlFreeHeap(RtlGetProcessHeap(), 0, AnsiName); + StringCchLengthA(network_info->HostName, sizeof(network_info->HostName), &StringLength); + TempLen += StringLength; + StringCchLengthA(network_info->DomainName, sizeof(network_info->DomainName), &StringLength); + TempLen += StringLength; + HostWithDomainName = (PCHAR)RtlAllocateHeap(RtlGetProcessHeap(), 0, TempLen); + StringCchCopyA(HostWithDomainName, TempLen, network_info->HostName); + if (network_info->DomainName) + { + StringCchCatA(HostWithDomainName, TempLen, "."); + StringCchCatA(HostWithDomainName, TempLen, network_info->DomainName); + } + RtlFreeHeap(RtlGetProcessHeap(), 0, network_info); + *QueryResultSet = (PDNS_RECORD)RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(DNS_RECORD)); + + if (NULL == *QueryResultSet) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, HostWithDomainName); + return ERROR_OUTOFMEMORY; + } + + (*QueryResultSet)->pNext = NULL; + (*QueryResultSet)->wType = Type; + (*QueryResultSet)->wDataLength = sizeof(DNS_A_DATA); + (*QueryResultSet)->Data.A.IpAddress = Address; + + (*QueryResultSet)->pName = (LPSTR)DnsCToW(HostWithDomainName); + + RtlFreeHeap(RtlGetProcessHeap(), 0, HostWithDomainName); + return (*QueryResultSet)->pName ? ERROR_SUCCESS : ERROR_OUTOFMEMORY; + } + + if ((Options & DNS_QUERY_NO_WIRE_QUERY) != 0) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, AnsiName); + RtlFreeHeap(RtlGetProcessHeap(), 0, network_info); + return ERROR_FILE_NOT_FOUND; + } + + adns_error = adns_init(&astate, adns_if_noenv | adns_if_noerrprint | adns_if_noserverwarn, 0); + for (pip = &(network_info->DnsServerList); pip; pip = pip->Next) + { + addr.s_addr = inet_addr(pip->IpAddress.String); + if ((addr.s_addr != INADDR_ANY) && (addr.s_addr != INADDR_NONE)) + adns_addserver(astate, addr); + } + if (network_info->DomainName) + { + adns_ccf_search(astate, "LOCALDOMAIN", -1, network_info->DomainName); + } + RtlFreeHeap(RtlGetProcessHeap(), 0, network_info); + + if (adns_error != adns_s_ok) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, AnsiName); + return DnsIntTranslateAdnsToDNS_STATUS(adns_error); + } + + if (Servers) + { + for (i = 0; i < Servers->AddrCount; i++) + { + adns_addserver(astate, *((struct in_addr *)&Servers->AddrArray[i])); + } + } + + /* + * adns doesn't resolve chained CNAME records (a CNAME which points to + * another CNAME pointing to another... pointing to an A record), according + * to a mailing list thread the authors believe that chained CNAME records + * are invalid and the DNS entries should be fixed. That's a nice academic + * standpoint, but there certainly are chained CNAME records out there, + * even some fairly major ones (at the time of this writing + * download.mozilla.org is a chained CNAME). Everyone else seems to resolve + * these fine, so we should too. So we loop here to try to resolve CNAME + * chains ourselves. Of course, there must be a limit to protect against + * CNAME loops. + */ + +#define CNAME_LOOP_MAX 16 + + CurrentName = AnsiName; + + for (CNameLoop = 0; CNameLoop < CNAME_LOOP_MAX; CNameLoop++) + { + adns_error = adns_synchronous(astate, CurrentName, adns_r_addr, quflags, &answer); + + if (adns_error != adns_s_ok) + { + adns_finish(astate); + + if (CurrentName != AnsiName) + RtlFreeHeap(RtlGetProcessHeap(), 0, CurrentName); + + RtlFreeHeap(RtlGetProcessHeap(), 0, AnsiName); + return DnsIntTranslateAdnsToDNS_STATUS(adns_error); + } + + if (answer && answer->rrs.addr) + { + if (CurrentName != AnsiName) + RtlFreeHeap(RtlGetProcessHeap(), 0, CurrentName); + + RtlFreeHeap(RtlGetProcessHeap(), 0, AnsiName); + *QueryResultSet = (PDNS_RECORD)RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(DNS_RECORD)); + + if (NULL == *QueryResultSet) + { + adns_finish(astate); + return ERROR_OUTOFMEMORY; + } + + (*QueryResultSet)->pNext = NULL; + (*QueryResultSet)->wType = Type; + (*QueryResultSet)->wDataLength = sizeof(DNS_A_DATA); + (*QueryResultSet)->Data.A.IpAddress = answer->rrs.addr->addr.inet.sin_addr.s_addr; + + adns_finish(astate); + + (*QueryResultSet)->pName = (LPSTR)xstrsave(Name); + + return (*QueryResultSet)->pName ? ERROR_SUCCESS : ERROR_OUTOFMEMORY; + } + + if (NULL == answer || adns_s_prohibitedcname != answer->status || NULL == answer->cname) + { + adns_finish(astate); + + if (CurrentName != AnsiName) + RtlFreeHeap(RtlGetProcessHeap(), 0, CurrentName); + + RtlFreeHeap(RtlGetProcessHeap(), 0, AnsiName); + return ERROR_FILE_NOT_FOUND; + } + + if (CurrentName != AnsiName) + RtlFreeHeap(RtlGetProcessHeap(), 0, CurrentName); + + CurrentName = (LPSTR)xstrsaveA(answer->cname); + + if (!CurrentName) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, AnsiName); + adns_finish(astate); + return ERROR_OUTOFMEMORY; + } + } + + adns_finish(astate); + RtlFreeHeap(RtlGetProcessHeap(), 0, AnsiName); + RtlFreeHeap(RtlGetProcessHeap(), 0, CurrentName); + return ERROR_FILE_NOT_FOUND; + + default: + return ERROR_OUTOFMEMORY; /* XXX arty: find a better error code. */ + } } DNS_STATUS WINAPI Modified: trunk/reactos/dll/win32/mswsock/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mswsock/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/mswsock/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mswsock/CMakeLists.txt [iso-8859-1] Fri Sep 30 15:19:29 2016 @@ -15,7 +15,7 @@ mswsock.rc ${CMAKE_CURRENT_BINARY_DIR}/mswsock.def) -set_module_type(mswsock win32dll) -add_importlibs(mswsock ws2_32 dnsapi msvcrt kernel32) +set_module_type(mswsock win32dll UNICODE) +add_importlibs(mswsock ws2_32 advapi32 dnsapi msvcrt kernel32) add_pch(mswsock precomp.h SOURCE) add_cd_file(TARGET mswsock DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/mswsock/mswhelper.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mswsock/mswhelpe… ============================================================================== --- trunk/reactos/dll/win32/mswsock/mswhelper.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mswsock/mswhelper.c [iso-8859-1] Fri Sep 30 15:19:29 2016 @@ -263,8 +263,7 @@ /* addr_list */ RtlZeroMemory(lst, sizeof(lst)); - if (ip4addr != 0) - lst[0] = (void*)&ip4addr; + lst[0] = (void*)&ip4addr; phe->h_addr_list = (char**)(mswBufferEndPtr(mswBuf) - bytesOfs); Modified: trunk/reactos/dll/win32/mswsock/nsplookup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mswsock/nsplooku… ============================================================================== --- trunk/reactos/dll/win32/mswsock/nsplookup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mswsock/nsplookup.c [iso-8859-1] Fri Sep 30 15:19:29 2016 @@ -10,6 +10,7 @@ #include <svcguid.h> #include <iptypes.h> #include <strsafe.h> +#include <winreg.h> #include "mswhelper.h" @@ -459,177 +460,20 @@ return ERROR_SUCCESS; } -/* This function is far from perfect but it works enough */ -IP4_ADDRESS -FindEntryInHosts(IN CONST WCHAR FAR* wname) -{ - BOOL Found = FALSE; - HANDLE HostsFile; - CHAR HostsDBData[BUFSIZ] = {0}; - PCHAR SystemDirectory = HostsDBData; - PCHAR HostsLocation = "\\drivers\\etc\\hosts"; - PCHAR AddressStr, DnsName = NULL, AddrTerm, NameSt, NextLine, ThisLine, Comment; - UINT SystemDirSize = sizeof(HostsDBData) - 1, ValidData = 0; - DWORD ReadSize; - DWORD Address; - CHAR name[MAX_HOSTNAME_LEN + 1]; - - wcstombs(name, wname, MAX_HOSTNAME_LEN); - - /* We assume that the parameters are valid */ - if (!GetSystemDirectoryA(SystemDirectory, SystemDirSize)) - { - WSASetLastError(WSANO_RECOVERY); - //WS_DbgPrint(MIN_TRACE, ("Could not get windows system directory.\n")); - return 0; /* Can't get system directory */ - } - - strncat(SystemDirectory, HostsLocation, SystemDirSize); - - HostsFile = CreateFileA(SystemDirectory, - GENERIC_READ, - FILE_SHARE_READ, - NULL, - OPEN_EXISTING, - FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, - NULL); - if (HostsFile == INVALID_HANDLE_VALUE) - { - WSASetLastError(WSANO_RECOVERY); - return 0; - } - - while (!Found && ReadFile(HostsFile, - HostsDBData + ValidData, - sizeof(HostsDBData) - ValidData, - &ReadSize, - NULL)) - { - ValidData += ReadSize; - ReadSize = 0; - NextLine = ThisLine = HostsDBData; - - /* Find the beginning of the next line */ - while ((NextLine < HostsDBData + ValidData) && - (*NextLine != '\r') && - (*NextLine != '\n')) - { - NextLine++; - } - - /* Zero and skip, so we can treat what we have as a string */ - if (NextLine > HostsDBData + ValidData) - break; - - *NextLine = 0; - NextLine++; - - Comment = strchr(ThisLine, '#'); - if (Comment) - *Comment = 0; /* Terminate at comment start */ - - AddressStr = ThisLine; - /* Find the first space separating the IP address from the DNS name */ - AddrTerm = strchr(ThisLine, ' '); - if (AddrTerm) - { - /* Terminate the address string */ - *AddrTerm = 0; - - /* Find the last space before the DNS name */ - NameSt = strrchr(ThisLine, ' '); - - /* If there is only one space (the one we removed above), then just use the address terminator */ - if (!NameSt) - NameSt = AddrTerm; - - /* Move from the space to the first character of the DNS name */ - NameSt++; - - DnsName = NameSt; - - if (!strcmp(name, DnsName)) - { - Found = TRUE; - break; - } - } - - /* Get rid of everything we read so far */ - while (NextLine <= HostsDBData + ValidData && - isspace (*NextLine)) - { - NextLine++; - } - - if (HostsDBData + ValidData - NextLine <= 0) - break; - - //WS_DbgPrint(MAX_TRACE,("About to move %d chars\n", - // HostsDBData + ValidData - NextLine)); - - memmove(HostsDBData, NextLine, HostsDBData + ValidData - NextLine); - ValidData -= NextLine - HostsDBData; - //WS_DbgPrint(MAX_TRACE,("Valid bytes: %d\n", ValidData)); - } - - CloseHandle(HostsFile); - - if (!Found) - { - //WS_DbgPrint(MAX_TRACE,("Not found\n")); - WSASetLastError(WSANO_DATA); - return 0; - } - - if (strstr(AddressStr, ":")) - { - //DbgPrint("AF_INET6 NOT SUPPORTED!\n"); - WSASetLastError(WSAEINVAL); - return 0; - } - - Address = inet_addr(AddressStr); - if (Address == INADDR_NONE) - { - WSASetLastError(WSAEINVAL); - return 0; - } - - return Address; -} - INT NSP_GetHostByNameHeapAllocW(_In_ WCHAR* name, _In_ GUID* lpProviderId, _Out_ PWSHOSTINFOINTERN hostinfo) { HANDLE hHeap = GetProcessHeap(); - enum addr_type - { - GH_INVALID, - GH_IPV6, - GH_IPV4, - GH_RFC1123_DNS - }; - typedef enum addr_type addr_type; - addr_type addr; - INT ret = 0; - WCHAR* found = 0; DNS_STATUS dns_status = {0}; /* include/WinDNS.h -- look up DNS_RECORD on MSDN */ PDNS_RECORD dp; PDNS_RECORD curr; - WCHAR* tmpHostnameW; - CHAR* tmpHostnameA; - IP4_ADDRESS address; INT result = ERROR_SUCCESS; /* needed to be cleaned up if != NULL */ - tmpHostnameW = NULL; dp = NULL; - - addr = GH_INVALID; if (name == NULL) { @@ -637,131 +481,49 @@ goto cleanup; } - /* Hostname "" / "localhost" - - convert to "computername" */ - if ((wcscmp(L"", name) == 0) /*|| - (wcsicmp(L"localhost", name) == 0)*/) - { - ret = NSP_GetHostNameHeapAllocW(&tmpHostnameW); - if (ret != ERROR_SUCCESS) - { - result = ret; - goto cleanup; - } - name = tmpHostnameW; - } - - /* Is it an IPv6 address? */ - found = wcschr(name, L':'); - if (found != NULL) - { - addr = GH_IPV6; - goto act; - } - - /* Is it an IPv4 address? */ - if (!iswalpha(name[0])) - { - addr = GH_IPV4; - goto act; - } - - addr = GH_RFC1123_DNS; - -/* Broken out in case we want to get fancy later */ -act: - switch (addr) - { - case GH_IPV6: - WSASetLastError(ERROR_CALL_NOT_IMPLEMENTED); - result = ERROR_CALL_NOT_IMPLEMENTED; - goto cleanup; - break; - - case GH_INVALID: - WSASetLastError(WSAEFAULT); - result = ERROR_INVALID_PARAMETER; - goto cleanup; - break; - - /* Note: If passed an IP address, MSDN says that gethostbyname() - treats it as an unknown host. - This is different from the unix implementation. Use inet_addr() - */ - case GH_IPV4: - case GH_RFC1123_DNS: - /* DNS_TYPE_A: include/WinDNS.h */ - /* DnsQuery -- lib/dnsapi/dnsapi/query.c */ - - /* Look for the DNS name in the hosts file */ - if ((address = FindEntryInHosts(name)) != 0) - { - hostinfo->hostnameW = StrCpyHeapAllocW(hHeap, name); - hostinfo->addr4 = address; - result = ERROR_SUCCESS; - goto cleanup; - } - - tmpHostnameA = StrW2AHeapAlloc(hHeap, name); - dns_status = DnsQuery(tmpHostnameA, - DNS_TYPE_A, - DNS_QUERY_STANDARD, - /* extra dns servers */ 0, - &dp, - 0); - HeapFree(hHeap, 0, tmpHostnameA); - - if ((dns_status != 0) || (dp == NULL)) - { - result = WSAHOST_NOT_FOUND; - goto cleanup; - } - - //ASSERT(dp->wType == DNS_TYPE_A); - //ASSERT(dp->wDataLength == sizeof(DNS_A_DATA)); - curr = dp; - while ((curr->pNext != NULL) || (curr->wType != DNS_TYPE_A)) - { - curr = curr->pNext; - } - - if (curr->wType != DNS_TYPE_A) - { - result = WSASERVICE_NOT_FOUND; - goto cleanup; - } - - //WS_DbgPrint(MID_TRACE,("populating hostent\n")); - //WS_DbgPrint(MID_TRACE,("pName is (%s)\n", curr->pName)); - //populate_hostent(p->Hostent, - // (PCHAR)curr->pName, - // curr->Data.A.IpAddress); - hostinfo->hostnameW = StrA2WHeapAlloc(hHeap, curr->pName); - hostinfo->addr4 = curr->Data.A.IpAddress; - result = ERROR_SUCCESS; + /* DNS_TYPE_A: include/WinDNS.h */ + /* DnsQuery -- lib/dnsapi/dnsapi/query.c */ + dns_status = DnsQuery(name, + DNS_TYPE_A, + DNS_QUERY_STANDARD, + /* extra dns servers */ 0, + &dp, + 0); + + if (dns_status == ERROR_INVALID_NAME) + { + WSASetLastError(WSAEFAULT); + result = ERROR_INVALID_PARAMETER; goto cleanup; - - //WS_DbgPrint(MID_TRACE,("Called DnsQuery, but host not found. Err: %i\n", - // dns_status)); - //WSASetLastError(WSAHOST_NOT_FOUND); - //return NULL; - - break; - - default: - result = WSANO_RECOVERY; - goto cleanup; - break; - } - - result = WSANO_RECOVERY; + } + + if ((dns_status != 0) || (dp == NULL)) + { + result = WSAHOST_NOT_FOUND; + goto cleanup; + } + + //ASSERT(dp->wType == DNS_TYPE_A); + //ASSERT(dp->wDataLength == sizeof(DNS_A_DATA)); + curr = dp; + while ((curr->pNext != NULL) || (curr->wType != DNS_TYPE_A)) + { + curr = curr->pNext; + } + + if (curr->wType != DNS_TYPE_A) + { + result = WSASERVICE_NOT_FOUND; + goto cleanup; + } + + hostinfo->hostnameW = StrCpyHeapAllocW(hHeap, curr->pName); + hostinfo->addr4 = curr->Data.A.IpAddress; + result = ERROR_SUCCESS; cleanup: if (dp != NULL) DnsRecordListFree(dp, DnsFreeRecordList); - - if (tmpHostnameW != NULL) - HeapFree(hHeap, 0, tmpHostnameW); return result; } @@ -825,6 +587,99 @@ return TRUE; } +HANDLE +WSAAPI +OpenNetworkDatabase(_In_ LPCWSTR Name) +{ + PWSTR ExpandedPath; + PWSTR DatabasePath; + INT ErrorCode; + HKEY DatabaseKey; + DWORD RegType; + DWORD RegSize = 0; + size_t StringLength; + HANDLE ret; + + ExpandedPath = HeapAlloc(GetProcessHeap(), 0, MAX_PATH*sizeof(WCHAR)); + if (!ExpandedPath) + return INVALID_HANDLE_VALUE; + + /* Open the database path key */ + ErrorCode = RegOpenKeyEx(HKEY_LOCAL_MACHINE, + L"System\\CurrentControlSet\\Services\\Tcpip\\Parameters", + 0, + KEY_READ, + &DatabaseKey); + if (ErrorCode == NO_ERROR) + { + /* Read the actual path */ + ErrorCode = RegQueryValueEx(DatabaseKey, + L"DatabasePath", + NULL, + &RegType, + NULL, + &RegSize); + + DatabasePath = HeapAlloc(GetProcessHeap(), 0, RegSize); + if (!DatabasePath) + { + HeapFree(GetProcessHeap(), 0, ExpandedPath); + return INVALID_HANDLE_VALUE; + } + + /* Read the actual path */ + ErrorCode = RegQueryValueEx(DatabaseKey, + L"DatabasePath", + NULL, + &RegType, + (LPBYTE)DatabasePath, + &RegSize); + + /* Close the key */ + RegCloseKey(DatabaseKey); + + /* Expand the name */ + ExpandEnvironmentStrings(DatabasePath, ExpandedPath, MAX_PATH); + + HeapFree(GetProcessHeap(), 0, DatabasePath); + } + else + { + /* Use defalt path */ + GetSystemDirectory(ExpandedPath, MAX_PATH); + StringCchLength(ExpandedPath, MAX_PATH, &StringLength); + if (ExpandedPath[StringLength - 1] != L'\\') + { + /* It isn't, so add it ourselves */ + StringCchCat(ExpandedPath, MAX_PATH, L"\\"); + } + StringCchCat(ExpandedPath, MAX_PATH, L"DRIVERS\\ETC\\"); + } + + /* Make sure that the path is backslash-terminated */ + StringCchLength(ExpandedPath, MAX_PATH, &StringLength); + if (ExpandedPath[StringLength - 1] != L'\\') + { + /* It isn't, so add it ourselves */ + StringCchCat(ExpandedPath, MAX_PATH, L"\\"); + } + + /* Add the database name */ + StringCchCat(ExpandedPath, MAX_PATH, Name); + + /* Return a handle to the file */ + ret = CreateFile(ExpandedPath, + FILE_READ_DATA, + FILE_SHARE_READ, + NULL, + OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, + NULL); + + HeapFree(GetProcessHeap(), 0, ExpandedPath); + return ret; +} + INT NSP_GetServiceByNameHeapAllocW(_In_ WCHAR* nameW, _In_ GUID* lpProviderId, @@ -833,14 +688,11 @@ BOOL Found = FALSE; HANDLE ServicesFile; CHAR ServiceDBData[BUFSIZ * sizeof(WCHAR)] = {0}; - PWCHAR SystemDirectory = (PWCHAR)ServiceDBData; /* Reuse this stack space */ - PWCHAR ServicesFileLocation = L"\\drivers\\etc\\services"; PCHAR ThisLine = 0, NextLine = 0, ServiceName = 0, PortNumberStr = 0, ProtocolStr = 0, Comment = 0, EndValid; PCHAR Aliases[WS2_INTERNAL_MAX_ALIAS] = {0}; PCHAR* AliasPtr; - UINT i = 0, - SystemDirSize = (sizeof(ServiceDBData) / sizeof(WCHAR)) - 1; + UINT i = 0; DWORD ReadSize = 0; HANDLE hHeap; PCHAR nameA = NULL; @@ -872,23 +724,7 @@ StringCbCopyA(nameServiceA, i + 1, nameA); nameServiceA[i] = '\0'; - if (!GetSystemDirectoryW(SystemDirectory, SystemDirSize)) - { - /* Can't get system directory */ - res = WSANO_RECOVERY; - goto End; - } - - wcsncat(SystemDirectory, ServicesFileLocation, SystemDirSize); - - ServicesFile = CreateFileW(SystemDirectory, - GENERIC_READ, - FILE_SHARE_READ, - NULL, - OPEN_EXISTING, - FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, - NULL); - + ServicesFile = OpenNetworkDatabase(L"services"); if (ServicesFile == INVALID_HANDLE_VALUE) { return WSANO_RECOVERY; Modified: trunk/reactos/sdk/lib/3rdparty/adns/src/adns.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/adns/src/… ============================================================================== --- trunk/reactos/sdk/lib/3rdparty/adns/src/adns.h [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/3rdparty/adns/src/adns.h [iso-8859-1] Fri Sep 30 15:19:29 2016 @@ -368,6 +368,7 @@ /* ReactOS addition */ ADNS_API void adns_addserver(adns_state state, struct in_addr server); +ADNS_API void adns_ccf_search(adns_state ads, const char *fn, int lno, const char *buf); ADNS_API int adns_init_strcfg(adns_state *newstate_r, adns_initflags flags, FILE *diagfile /*0=>discard*/, const char *configtext); Modified: trunk/reactos/sdk/lib/3rdparty/adns/src/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/adns/src/… ============================================================================== --- trunk/reactos/sdk/lib/3rdparty/adns/src/setup.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/3rdparty/adns/src/setup.c [iso-8859-1] Fri Sep 30 15:19:29 2016 @@ -571,18 +571,6 @@ #ifdef ADNS_JGAA_WIN32 #define SECURE_PATH_LEN (MAX_PATH - 64) char PathBuf[MAX_PATH]; - struct in_addr addr; -#ifdef __REACTOS__ - PFIXED_INFO network_info; - ULONG network_info_blen = 0; -#else - #define ADNS_PFIXED_INFO_BLEN (2048) - PFIXED_INFO network_info = (PFIXED_INFO)_alloca(ADNS_PFIXED_INFO_BLEN); - ULONG network_info_blen = ADNS_PFIXED_INFO_BLEN; -#endif /* __REACTOS__ */ - DWORD network_info_result; - PIP_ADDR_STRING pip; - const char *network_err_str = ""; #endif r= init_begin(&ads, flags, diagfile ? diagfile : stderr); @@ -606,36 +594,6 @@ GetWindowsDirectory(PathBuf, SECURE_PATH_LEN); strcat(PathBuf,"\\System32\\Drivers\\etc\\resolv-adns.conf"); readconfig(ads,PathBuf,0); -#ifdef __REACTOS__ - network_info_result = GetNetworkParams(NULL, &network_info_blen); - network_info = (PFIXED_INFO)malloc((size_t)network_info_blen); -#endif - network_info_result = GetNetworkParams(network_info, &network_info_blen); - if (network_info_result != ERROR_SUCCESS){ - switch(network_info_result) { - case ERROR_BUFFER_OVERFLOW: network_err_str = "ERROR_BUFFER_OVERFLOW"; break; - case ERROR_INVALID_PARAMETER: network_err_str = "ERROR_INVALID_PARAMETER"; break; - case ERROR_NO_DATA: network_err_str = "ERROR_NO_DATA"; break; - case ERROR_NOT_SUPPORTED: network_err_str = "ERROR_NOT_SUPPORTED"; break;} - adns__diag(ads,-1,0,"GetNetworkParams() failed with error [%d] %s", - network_info_result,network_err_str); - } - else { - for(pip = &(network_info->DnsServerList); pip; pip = pip->Next) { - addr.s_addr = inet_addr(pip->IpAddress.String); - if ((addr.s_addr != INADDR_ANY) && (addr.s_addr != INADDR_NONE)) - addserver(ads, addr); -#ifdef __REACTOS__ - if (network_info->DomainName) - ccf_search(ads, "LOCALDOMAIN", -1, network_info->DomainName); - else - ccf_search(ads, "LOCALDOMAIN", -1, ""); -#endif - } - } -#ifdef __REACTOS__ - if (network_info) free(network_info); -#endif #else readconfig(ads,"/etc/resolv.conf",1); readconfig(ads,"/etc/resolv-adns.conf",0); @@ -753,3 +711,6 @@ void adns_addserver(adns_state ads, struct in_addr addr) { addserver(ads, addr); } +void adns_ccf_search(adns_state ads, const char *fn, int lno, const char *buf) { + ccf_search(ads, fn, lno, buf); +}

8 years, 2 months

[janderwald] 72866: - fix bugs in USBAudioSelectAudioStreamingInterface

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri Sep 30 09:57:42 2016 New Revision: 72866 URL: http://svn.reactos.org/svn/reactos?rev=72866&view=rev Log: - fix bugs in USBAudioSelectAudioStreamingInterface Modified: trunk/reactos/drivers/usb/usbaudio/pin.c Modified: trunk/reactos/drivers/usb/usbaudio/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbaudio/pin.c… ============================================================================== --- trunk/reactos/drivers/usb/usbaudio/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbaudio/pin.c [iso-8859-1] Fri Sep 30 09:57:42 2016 @@ -209,9 +209,6 @@ /* now prepare interface urb */ UsbBuildSelectInterfaceRequest(Urb, GET_SELECT_INTERFACE_REQUEST_SIZE(InterfaceDescriptor->bNumEndpoints), DeviceExtension->ConfigurationHandle, InterfaceDescriptor->bInterfaceNumber, InterfaceDescriptor->bAlternateSetting); - /* copy interface information */ - RtlCopyMemory(&Urb->UrbSelectInterface.Interface, DeviceExtension->InterfaceInfo, DeviceExtension->InterfaceInfo->Length); - /* now select the interface */ Status = SubmitUrbSync(DeviceExtension->LowerDevice, Urb); @@ -220,8 +217,23 @@ /* did it succeeed */ if (NT_SUCCESS(Status)) { - /* update configuration info */ - ASSERT(Urb->UrbSelectInterface.Interface.Length == DeviceExtension->InterfaceInfo->Length); + /* free old interface info */ + if (DeviceExtension->InterfaceInfo) + { + /* free old info */ + FreeFunction(DeviceExtension->InterfaceInfo); + } + + /* alloc interface info */ + DeviceExtension->InterfaceInfo = AllocFunction(Urb->UrbSelectInterface.Interface.Length); + if (DeviceExtension->InterfaceInfo == NULL) + { + /* no memory */ + FreeFunction(Urb); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* copy interface info */ RtlCopyMemory(DeviceExtension->InterfaceInfo, &Urb->UrbSelectInterface.Interface, Urb->UrbSelectInterface.Interface.Length); PinContext->InterfaceDescriptor = InterfaceDescriptor; } @@ -254,7 +266,7 @@ /* get pin context */ PinContext = Pin->Context; - DbgBreakPoint(); + MaximumPacketSize = GetMaxPacketSizeForInterface(PinContext->DeviceExtension->ConfigurationDescriptor, PinContext->InterfaceDescriptor, Pin->DataFlow); /* calculate buffer size 8 irps * 10 iso packets * max packet size */ @@ -286,6 +298,7 @@ /* add to object bag*/ KsAddItemToObjectBag(Pin->Bag, Irp, IoFreeIrp); + /* FIXME select correct pipe handle */ Status = UsbAudioAllocCaptureUrbIso(PinContext->DeviceExtension->InterfaceInfo->Pipes[0].PipeHandle, MaximumPacketSize, &PinContext->Buffer[MaximumPacketSize * 10 * Index],

8 years, 2 months

[janderwald] 72865: [USBAUDIO] - implement GetMaxPacketSizeForInterface, UsbAudioAllocCaptureUrbIso, InitCapturePin

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Sep 29 22:19:34 2016 New Revision: 72865 URL: http://svn.reactos.org/svn/reactos?rev=72865&view=rev Log: [USBAUDIO] - implement GetMaxPacketSizeForInterface, UsbAudioAllocCaptureUrbIso, InitCapturePin Modified: trunk/reactos/drivers/usb/usbaudio/pin.c trunk/reactos/drivers/usb/usbaudio/usbaudio.h Modified: trunk/reactos/drivers/usb/usbaudio/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbaudio/pin.c… ============================================================================== --- trunk/reactos/drivers/usb/usbaudio/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbaudio/pin.c [iso-8859-1] Thu Sep 29 22:19:34 2016 @@ -8,6 +8,90 @@ */ #include "usbaudio.h" + +NTSTATUS +GetMaxPacketSizeForInterface( + IN PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor, + IN PUSB_INTERFACE_DESCRIPTOR InterfaceDescriptor, + KSPIN_DATAFLOW DataFlow) +{ + PUSB_COMMON_DESCRIPTOR CommonDescriptor; + PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor; + + /* loop descriptors */ + CommonDescriptor = (PUSB_COMMON_DESCRIPTOR)((ULONG_PTR)InterfaceDescriptor + InterfaceDescriptor->bLength); + ASSERT(InterfaceDescriptor->bNumEndpoints > 0); + while (CommonDescriptor) + { + if (CommonDescriptor->bDescriptorType == USB_ENDPOINT_DESCRIPTOR_TYPE) + { + EndpointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR)CommonDescriptor; + return EndpointDescriptor->wMaxPacketSize; + } + + if (CommonDescriptor->bDescriptorType == USB_INTERFACE_DESCRIPTOR_TYPE) + { + /* reached next interface descriptor */ + break; + } + + if ((ULONG_PTR)CommonDescriptor + CommonDescriptor->bLength >= ((ULONG_PTR)ConfigurationDescriptor + ConfigurationDescriptor->wTotalLength)) + break; + + CommonDescriptor = (PUSB_COMMON_DESCRIPTOR)((ULONG_PTR)CommonDescriptor + CommonDescriptor->bLength); + } + + /* default to 100 */ + return 100; +} + +NTSTATUS +UsbAudioAllocCaptureUrbIso( + IN USBD_PIPE_HANDLE PipeHandle, + IN ULONG MaxPacketSize, + IN PVOID Buffer, + IN ULONG BufferLength, + OUT PURB * OutUrb) +{ + PURB Urb; + ULONG PacketCount; + ULONG UrbSize; + ULONG Index; + + /* calculate packet count */ + PacketCount = BufferLength / MaxPacketSize; + + /* calculate urb size*/ + UrbSize = GET_ISO_URB_SIZE(PacketCount); + + /* allocate urb */ + Urb = AllocFunction(UrbSize); + if (!Urb) + { + /* no memory */ + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* init urb */ + Urb->UrbIsochronousTransfer.Hdr.Function = URB_FUNCTION_ISOCH_TRANSFER; + Urb->UrbIsochronousTransfer.Hdr.Length = UrbSize; + Urb->UrbIsochronousTransfer.PipeHandle = PipeHandle; + Urb->UrbIsochronousTransfer.TransferFlags = USBD_TRANSFER_DIRECTION_IN | USBD_START_ISO_TRANSFER_ASAP; + Urb->UrbIsochronousTransfer.TransferBufferLength = BufferLength; + Urb->UrbIsochronousTransfer.TransferBuffer = Buffer; + Urb->UrbIsochronousTransfer.NumberOfPackets = PacketCount; + + for (Index = 0; Index < PacketCount; Index++) + { + Urb->UrbIsochronousTransfer.IsoPacket[Index].Offset = Index * MaxPacketSize; + } + + *OutUrb = Urb; + return STATUS_SUCCESS; + +} + + NTSTATUS UsbAudioSetFormat( @@ -83,6 +167,7 @@ NTSTATUS USBAudioSelectAudioStreamingInterface( + IN PPIN_CONTEXT PinContext, IN PDEVICE_EXTENSION DeviceExtension, IN PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor) { @@ -98,7 +183,7 @@ return STATUS_INVALID_PARAMETER; } - /* select the first interface with audio streaming and non zero num of endpoints */ + /* FIXME selects the first interface with audio streaming and non zero num of endpoints */ while (InterfaceDescriptor != NULL) { if (InterfaceDescriptor->bInterfaceSubClass == 0x02 /* AUDIO_STREAMING */ && InterfaceDescriptor->bNumEndpoints > 0) @@ -126,9 +211,6 @@ /* copy interface information */ RtlCopyMemory(&Urb->UrbSelectInterface.Interface, DeviceExtension->InterfaceInfo, DeviceExtension->InterfaceInfo->Length); - - /* set configuration handle */ - Urb->UrbSelectInterface.ConfigurationHandle = DeviceExtension->ConfigurationHandle; /* now select the interface */ Status = SubmitUrbSync(DeviceExtension->LowerDevice, Urb); @@ -141,6 +223,7 @@ /* update configuration info */ ASSERT(Urb->UrbSelectInterface.Interface.Length == DeviceExtension->InterfaceInfo->Length); RtlCopyMemory(DeviceExtension->InterfaceInfo, &Urb->UrbSelectInterface.Interface, Urb->UrbSelectInterface.Interface.Length); + PinContext->InterfaceDescriptor = InterfaceDescriptor; } /* free urb */ @@ -153,11 +236,76 @@ IN PKSPIN Pin) { NTSTATUS Status; + ULONG Index; + ULONG BufferSize; + ULONG MaximumPacketSize; + PIRP Irp; + PURB Urb; + PPIN_CONTEXT PinContext; + PIO_STACK_LOCATION IoStack; /* set sample rate */ Status = UsbAudioSetFormat(Pin); - - /* TODO: init pin */ + if (!NT_SUCCESS(Status)) + { + /* failed */ + return Status; + } + + /* get pin context */ + PinContext = Pin->Context; + DbgBreakPoint(); + MaximumPacketSize = GetMaxPacketSizeForInterface(PinContext->DeviceExtension->ConfigurationDescriptor, PinContext->InterfaceDescriptor, Pin->DataFlow); + + /* calculate buffer size 8 irps * 10 iso packets * max packet size */ + BufferSize = 8 * 10 * MaximumPacketSize; + + /* allocate pin capture buffer */ + PinContext->Buffer = AllocFunction(BufferSize); + if (!PinContext->Buffer) + { + /* no memory */ + return STATUS_INSUFFICIENT_RESOURCES; + } + KsAddItemToObjectBag(Pin->Bag, PinContext->Buffer, ExFreePool); + + /* init irps */ + for (Index = 0; Index < 8; Index++) + { + /* allocate irp */ + Irp = IoAllocateIrp(PinContext->DeviceExtension->LowerDevice->StackSize, FALSE); + if (!Irp) + { + /* no memory */ + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* insert into irp list */ + InsertTailList(&PinContext->IrpListHead, &Irp->Tail.Overlay.ListEntry); + + /* add to object bag*/ + KsAddItemToObjectBag(Pin->Bag, Irp, IoFreeIrp); + + Status = UsbAudioAllocCaptureUrbIso(PinContext->DeviceExtension->InterfaceInfo->Pipes[0].PipeHandle, + MaximumPacketSize, + &PinContext->Buffer[MaximumPacketSize * 10 * Index], + MaximumPacketSize * 10, + &Urb); + + if (NT_SUCCESS(Status)) + { + /* get next stack location */ + IoStack = IoGetNextIrpStackLocation(Irp); + + /* store urb */ + IoStack->Parameters.Others.Argument1 = Urb; + } + else + { + /* failed */ + return Status; + } + } return Status; } @@ -202,12 +350,13 @@ /* init pin context */ PinContext->DeviceExtension = FilterContext->DeviceExtension; PinContext->LowerDevice = FilterContext->LowerDevice; + InitializeListHead(&PinContext->IrpListHead); /* store pin context*/ Pin->Context = PinContext; /* select streaming interface */ - Status = USBAudioSelectAudioStreamingInterface(PinContext->DeviceExtension, PinContext->DeviceExtension->ConfigurationDescriptor); + Status = USBAudioSelectAudioStreamingInterface(PinContext, PinContext->DeviceExtension, PinContext->DeviceExtension->ConfigurationDescriptor); if (!NT_SUCCESS(Status)) { /* failed */ Modified: trunk/reactos/drivers/usb/usbaudio/usbaudio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbaudio/usbau… ============================================================================== --- trunk/reactos/drivers/usb/usbaudio/usbaudio.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbaudio/usbaudio.h [iso-8859-1] Thu Sep 29 22:19:34 2016 @@ -119,8 +119,12 @@ typedef struct { - PDEVICE_EXTENSION DeviceExtension; /* device extension */ - PDEVICE_OBJECT LowerDevice; /* lower device*/ + PDEVICE_EXTENSION DeviceExtension; /* device extension */ + PDEVICE_OBJECT LowerDevice; /* lower device*/ + LIST_ENTRY IrpListHead; /* irp list*/ + PUCHAR Buffer; /* iso buffer*/ + ULONG BufferSize; /* iso buffer size */ + PUSB_INTERFACE_DESCRIPTOR InterfaceDescriptor; /* interface descriptor */ }PIN_CONTEXT, *PPIN_CONTEXT;

8 years, 2 months

[dreimer] 72864: [RAPPS_NEW] When Internet connection is down. Rapps does not generate any msg by Rama Teja Gampa + GIT -> SVN Patch manual translation + Bitrot fixes + Tabs -> Spaces fixes CORE-10...

by dreimer＠svn.reactos.org

Author: dreimer Date: Thu Sep 29 21:31:11 2016 New Revision: 72864 URL: http://svn.reactos.org/svn/reactos?rev=72864&view=rev Log: [RAPPS_NEW] When Internet connection is down. Rapps does not generate any msg by Rama Teja Gampa + GIT -> SVN Patch manual translation + Bitrot fixes + Tabs -> Spaces fixes CORE-10980 #resolve #comment Committed, thx ^^ Modified: trunk/reactos/base/applications/rapps_new/lang/bg-BG.rc trunk/reactos/base/applications/rapps_new/lang/cs-CZ.rc trunk/reactos/base/applications/rapps_new/lang/de-DE.rc trunk/reactos/base/applications/rapps_new/lang/en-US.rc trunk/reactos/base/applications/rapps_new/lang/es-ES.rc trunk/reactos/base/applications/rapps_new/lang/fr-FR.rc trunk/reactos/base/applications/rapps_new/lang/he-IL.rc trunk/reactos/base/applications/rapps_new/lang/it-IT.rc trunk/reactos/base/applications/rapps_new/lang/ja-JP.rc trunk/reactos/base/applications/rapps_new/lang/no-NO.rc trunk/reactos/base/applications/rapps_new/lang/pl-PL.rc trunk/reactos/base/applications/rapps_new/lang/pt-BR.rc trunk/reactos/base/applications/rapps_new/lang/ro-RO.rc trunk/reactos/base/applications/rapps_new/lang/ru-RU.rc trunk/reactos/base/applications/rapps_new/lang/sk-SK.rc trunk/reactos/base/applications/rapps_new/lang/sq-AL.rc trunk/reactos/base/applications/rapps_new/lang/sv-SE.rc trunk/reactos/base/applications/rapps_new/lang/tr-TR.rc trunk/reactos/base/applications/rapps_new/lang/uk-UA.rc trunk/reactos/base/applications/rapps_new/lang/zh-CN.rc trunk/reactos/base/applications/rapps_new/lang/zh-TW.rc trunk/reactos/base/applications/rapps_new/loaddlg.cpp trunk/reactos/base/applications/rapps_new/resource.h Modified: trunk/reactos/base/applications/rapps_new/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/bg-BG.rc [iso-8859-1] Thu Sep 29 21:31:11 2016 @@ -201,6 +201,7 @@ IDS_APP_REG_REMOVE "Ð£Ð²ÐµÑÐµÐ½ Ð»Ð¸ ÑÑÐµ, ÑÐµ Ð¸ÑÐºÐ°ÑÐµ Ð´Ð° Ð¸Ð·ÑÑÐ¸ÐµÑÐµ Ð´Ð°Ð½Ð½Ð¸ÑÐµ Ð·Ð° ÑÐ»Ð¾Ð¶ÐµÐ½Ð¾ÑÐ¾ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð¾Ñ ÑÐµÐ³Ð¸ÑÑÑÑÐ°?" IDS_INFORMATION "Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ" IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" + IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" IDS_UNABLE_TO_REMOVE "ÐÑÐµÐ¼Ð°ÑÐ²Ð°Ð½ÐµÑÐ¾ Ð½Ð° Ð´Ð°Ð½Ð½Ð¸ÑÐµ Ð·Ð° Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸ÐµÑÐ¾ Ð¾Ñ ÑÐµÐ³Ð¸ÑÑÑÑÐ° Ðµ Ð½ÐµÐ²ÑÐ·Ð¼Ð¾Ð¶Ð½Ð¾!" IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." Modified: trunk/reactos/base/applications/rapps_new/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/cs-CZ.rc [iso-8859-1] Thu Sep 29 21:31:11 2016 @@ -202,6 +202,7 @@ IDS_APP_REG_REMOVE "UrÄitÄ odstranit data instalovanÃ©ho programu z registru?" IDS_INFORMATION "Informace" IDS_UNABLE_TO_DOWNLOAD "Soubor se nepodaÅilo stÃ¡hnout! Adresa nenalezena!" + IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" IDS_UNABLE_TO_REMOVE "NepodaÅilo se odstranit data programu z registru!" IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." Modified: trunk/reactos/base/applications/rapps_new/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/de-DE.rc [iso-8859-1] Thu Sep 29 21:31:11 2016 @@ -196,7 +196,8 @@ IDS_CHOOSE_FOLDER_ERROR "Sie haben ein nicht existierendes Verzeichnis angegeben! Neu anlegen?" IDS_APP_REG_REMOVE "Sind Sie sich sicher, dass Sie die Daten dieses Programms aus der Registry entfernen mÃ¶chten?" IDS_INFORMATION "Informationen" - IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" + IDS_UNABLE_TO_DOWNLOAD "Paket konnte nicht geladen werden! Addresse wurde nicht gefunden!" + IDS_UNABLE_TO_DOWNLOAD2 "Paket konnte nicht geladen werden! PrÃ¼fen Sie Ihre Internetverbindung!" IDS_UNABLE_TO_REMOVE "Konnte die Daten nicht aus der Registry lÃ¶schen!" IDS_CERT_DOES_NOT_MATCH "ÃberprÃ¼fung des SSL-Zertifikats fehlgeschlagen." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." Modified: trunk/reactos/base/applications/rapps_new/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/en-US.rc [iso-8859-1] Thu Sep 29 21:31:11 2016 @@ -197,6 +197,7 @@ IDS_APP_REG_REMOVE "Are you sure you want to delete the data on the installed program from the registry?" IDS_INFORMATION "Information" IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" + IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" IDS_UNABLE_TO_REMOVE "Unable to remove data on the program from the registry!" IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." Modified: trunk/reactos/base/applications/rapps_new/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/es-ES.rc [iso-8859-1] Thu Sep 29 21:31:11 2016 @@ -200,6 +200,7 @@ IDS_APP_REG_REMOVE "Â¿EstÃ¡ seguro de querer borrar del Registro los datos de instalaciÃ³n del programa?" IDS_INFORMATION "InformaciÃ³n" IDS_UNABLE_TO_DOWNLOAD "No se pudo descargar el paquete. No se ha encontrado la direcciÃ³n de Internet." + IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" IDS_UNABLE_TO_REMOVE "No se pudieron borrar del Registro los datos de instalaciÃ³n del programa." IDS_CERT_DOES_NOT_MATCH "Ha fallado la comprobaciÃ³n del certificado SSL." IDS_INTEG_CHECK_TITLE "Verificando integridad del paquete..." Modified: trunk/reactos/base/applications/rapps_new/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/fr-FR.rc [iso-8859-1] Thu Sep 29 21:31:11 2016 @@ -197,6 +197,7 @@ IDS_APP_REG_REMOVE "Ãtes-vous sÃ»r de vouloir supprimer du registre les donnÃ©es du programme installÃ© ?" IDS_INFORMATION "Information" IDS_UNABLE_TO_DOWNLOAD "Impossible de tÃ©lÃ©charger le paquet : adresse introuvable !" + IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" IDS_UNABLE_TO_REMOVE "Impossible de supprimer du registre les donnÃ©es du programme !" IDS_CERT_DOES_NOT_MATCH "La vÃ©rification du certificat SSL a Ã©chouÃ©." IDS_INTEG_CHECK_TITLE "VÃ©rification de l'intÃ©gritÃ© du paquet..." Modified: trunk/reactos/base/applications/rapps_new/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/he-IL.rc [iso-8859-1] Thu Sep 29 21:31:11 2016 @@ -199,6 +199,7 @@ IDS_APP_REG_REMOVE "Are you sure you want to delete the data on the installed program from the registry?" IDS_INFORMATION "××××¢" IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" + IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" IDS_UNABLE_TO_REMOVE "Unable to remove data on the program from the registry!" IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." Modified: trunk/reactos/base/applications/rapps_new/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/it-IT.rc [iso-8859-1] Thu Sep 29 21:31:11 2016 @@ -197,6 +197,7 @@ IDS_APP_REG_REMOVE "Sicuro di voler cancellare dal registro i dati sui programmi installati?" IDS_INFORMATION "Informazioni" IDS_UNABLE_TO_DOWNLOAD "Impossibile scaricare il pacchetto! Indirizzo non trovato!" + IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" IDS_UNABLE_TO_REMOVE "Impossibile cancellare i dati dal registro!" IDS_CERT_DOES_NOT_MATCH "Verifica del certificato SSL fallita." IDS_INTEG_CHECK_TITLE "Verifica integrità pacchetto..." Modified: trunk/reactos/base/applications/rapps_new/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/ja-JP.rc [iso-8859-1] Thu Sep 29 21:31:11 2016 @@ -197,6 +197,7 @@ IDS_APP_REG_REMOVE "ã¬ã¸ã¹ããªããã¤ã³ã¹ãã¼ã«ãããããã°ã©ã ã«é¢ãããã¼ã¿ãåé¤ãã¦ãããããã§ãã?" IDS_INFORMATION "æå ±" IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" + IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" IDS_UNABLE_TO_REMOVE "ã¬ã¸ã¹ããªãããã®ããã°ã©ã ã«é¢ãããã¼ã¿ãåé¤ã§ãã¾ãã!" IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." Modified: trunk/reactos/base/applications/rapps_new/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/no-NO.rc [iso-8859-1] Thu Sep 29 21:31:11 2016 @@ -197,6 +197,7 @@ IDS_APP_REG_REMOVE "Are you sure you want to delete the data on the installed program from the registry?" IDS_INFORMATION "Information" IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" + IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" IDS_UNABLE_TO_REMOVE "Unable to remove data on the program from the registry!" IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." Modified: trunk/reactos/base/applications/rapps_new/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/pl-PL.rc [iso-8859-1] Thu Sep 29 21:31:11 2016 @@ -205,6 +205,7 @@ IDS_APP_REG_REMOVE "Czy na pewno chcesz usunÄÄ wpis tego programu z rejestru?" IDS_INFORMATION "Informacja" IDS_UNABLE_TO_DOWNLOAD "Nie moÅ¼na pobraÄ pakietu! Nie znaleziono adresu!" + IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" IDS_UNABLE_TO_REMOVE "Nie moÅ¼na byÅo usunÄÄ wpisu z rejestru!" IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." Modified: trunk/reactos/base/applications/rapps_new/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/pt-BR.rc [iso-8859-1] Thu Sep 29 21:31:11 2016 @@ -199,6 +199,7 @@ IDS_APP_REG_REMOVE "VocÃª tem certeza que deseja apagar as informaÃ§Ãµes do programa instalado do registro?" IDS_INFORMATION "InformaÃ§Ãµes" IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" + IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" IDS_UNABLE_TO_REMOVE "NÃ£o foi possÃvel remover as informaÃ§Ãµes do programa do registro!" IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." Modified: trunk/reactos/base/applications/rapps_new/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/ro-RO.rc [iso-8859-1] Thu Sep 29 21:31:11 2016 @@ -203,6 +203,7 @@ IDS_APP_REG_REMOVE "Sigur doriÈi sÄ ÈtergeÈi datele din registru pentru aceastÄ aplicaÈe?" IDS_INFORMATION "InformaÈie" IDS_UNABLE_TO_DOWNLOAD "Pachetul nu poate fi descÄrcat! Adresa nu este gÄsitÄ!" + IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" IDS_UNABLE_TO_REMOVE "Nu se pot elimina datele din registru pentru acest program!" IDS_CERT_DOES_NOT_MATCH "Verificarea certificatului SSL a eÈuat." IDS_INTEG_CHECK_TITLE "Se verificÄ integritatea pachetuluiâ¦" Modified: trunk/reactos/base/applications/rapps_new/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/ru-RU.rc [iso-8859-1] Thu Sep 29 21:31:11 2016 @@ -197,6 +197,7 @@ IDS_APP_REG_REMOVE "ÐÑ Ð´ÐµÐ¹ÑÑÐ²Ð¸ÑÐµÐ»ÑÐ½Ð¾ ÑÐ¾ÑÐ¸ÑÐµ ÑÐ´Ð°Ð»Ð¸ÑÑ Ð´Ð°Ð½Ð½ÑÐµ Ð¾Ð± ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ð¾Ð¹ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ Ð¸Ð· ÑÐµÐµÑÑÑÐ°?" IDS_INFORMATION "ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ" IDS_UNABLE_TO_DOWNLOAD "ÐÐµ ÑÐ´Ð°Ð»Ð¾ÑÑ ÑÐºÐ°ÑÐ°ÑÑ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ! ÐÐµ Ð½Ð°Ð¹Ð´ÐµÐ½ Ð°Ð´ÑÐµÑ!" + IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" IDS_UNABLE_TO_REMOVE "ÐÐµ ÑÐ´Ð°Ð»Ð¾ÑÑ ÑÐ´Ð°Ð»Ð¸ÑÑ Ð´Ð°Ð½Ð½ÑÐµ Ð¾ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ Ð¸Ð· ÑÐµÐµÑÑÑÐ°!" IDS_CERT_DOES_NOT_MATCH "ÐÑÐ¸Ð±ÐºÐ° Ð¿ÑÐ¾Ð²ÐµÑÐºÐ¸ SSL ÑÐµÑÑÐ¸ÑÐ¸ÐºÐ°ÑÐ°." IDS_INTEG_CHECK_TITLE "ÐÑÐ¾Ð²ÐµÑÐºÐ° ÑÐµÐ»Ð¾ÑÑÐ½Ð¾ÑÑÐ¸ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ..." Modified: trunk/reactos/base/applications/rapps_new/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/sk-SK.rc [iso-8859-1] Thu Sep 29 21:31:11 2016 @@ -202,6 +202,7 @@ IDS_APP_REG_REMOVE "Naozaj chcete vymazaÅ¥ Ãºdaje o nainÅ¡talovanom programe z registrov?" IDS_INFORMATION "InformÃ¡cie" IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" + IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" IDS_UNABLE_TO_REMOVE "Nie je moÅ¾nÃ© odstrÃ¡niÅ¥ z registrov Ãºdaje o programe!" IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." Modified: trunk/reactos/base/applications/rapps_new/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/sq-AL.rc [iso-8859-1] Thu Sep 29 21:31:11 2016 @@ -201,6 +201,7 @@ IDS_APP_REG_REMOVE "Jeni te sigurt qe do ti fshini informacionet e programit te instaluar nga regjistri?" IDS_INFORMATION "Informacione" IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" + IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" IDS_UNABLE_TO_REMOVE "E pamundur te fshihen informacionet e programit nga regjistri!" IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." Modified: trunk/reactos/base/applications/rapps_new/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/sv-SE.rc [iso-8859-1] Thu Sep 29 21:31:11 2016 @@ -204,6 +204,7 @@ IDS_APP_REG_REMOVE "Ãr du sÃ¤ker pÃ¥ att du vill ta bort data det installerade programmets data frÃ¥n registret?" IDS_INFORMATION "Information" IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" + IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" IDS_UNABLE_TO_REMOVE "Det gick ej att ta bort programmets data frÃ¥n registret!" IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." Modified: trunk/reactos/base/applications/rapps_new/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/tr-TR.rc [iso-8859-1] Thu Sep 29 21:31:11 2016 @@ -199,6 +199,7 @@ IDS_APP_REG_REMOVE "Kurulan izlencenin giriÅini deÄer defterinden silmek istediÄinizden emin misiniz?" IDS_INFORMATION "Bilgi" IDS_UNABLE_TO_DOWNLOAD "Paket indirilemez! Adres bulunamadÄ±!" + IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" IDS_UNABLE_TO_REMOVE "Ä°zlencenin giriÅi deÄer defterinden silinemiyor." IDS_CERT_DOES_NOT_MATCH "SSL onay belgesi doÄrulamasÄ± baÅarÄ±sÄ±z." IDS_INTEG_CHECK_TITLE "Paket bÃ¼tÃ¼nlÃ¼ÄÃ¼ doÄrulanÄ±yor..." Modified: trunk/reactos/base/applications/rapps_new/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/uk-UA.rc [iso-8859-1] Thu Sep 29 21:31:11 2016 @@ -205,6 +205,7 @@ IDS_APP_REG_REMOVE "ÐÐ¸ Ð´ÑÐ¹ÑÐ½Ð¾ ÑÐ¾ÑÐµÑÐµ Ð²Ð¸Ð´Ð°Ð»Ð¸ÑÐ¸ Ð´Ð°Ð½Ñ Ð¿ÑÐ¾ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ñ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ñ Ð· ÑÐµÑÑÑÑÑ?" IDS_INFORMATION "ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÑÑ" IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" + IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" IDS_UNABLE_TO_REMOVE "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸ÑÐ¸ Ð´Ð°Ð½Ñ Ð¿ÑÐ¾ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ñ Ð· ÑÐµÑÑÑÑÑ!" IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." Modified: trunk/reactos/base/applications/rapps_new/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/zh-CN.rc [iso-8859-1] Thu Sep 29 21:31:11 2016 @@ -199,6 +199,7 @@ IDS_APP_REG_REMOVE "æ¨ç¡®å®è¦ä»æ³¨åè¡¨å é¤è¯¥ç¨åºçæ°æ®åï¼" IDS_INFORMATION "ä¿¡æ¯" IDS_UNABLE_TO_DOWNLOAD "æ æ³ä¸è½½è¯¥è½¯ä»¶å ï¼æ¾ä¸å°ç½ç»çå°å ï¼" + IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" IDS_UNABLE_TO_REMOVE "æ æ³ä»æ³¨åè¡¨å é¤è¯¥ç¨åºçæ°æ®ï¼" IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." Modified: trunk/reactos/base/applications/rapps_new/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/lang/zh-TW.rc [iso-8859-1] Thu Sep 29 21:31:11 2016 @@ -199,6 +199,7 @@ IDS_APP_REG_REMOVE "æ¨ç¢ºå®è¦å¾ç»éæªåªé¤è©²ç¨å¼çè³æåï¼" IDS_INFORMATION "è³è¨" IDS_UNABLE_TO_DOWNLOAD "ç¡æ³ä¸è¼å!æ¾ä¸å°çä½å!" + IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" IDS_UNABLE_TO_REMOVE "ç¡æ³å¾ç»éæªåªé¤è©²ç¨å¼çè³æï¼" IDS_CERT_DOES_NOT_MATCH "SSL æèé©èå¤±æã" IDS_INTEG_CHECK_TITLE "é©èå¥è£è»é«çå®æ´æ§..." Modified: trunk/reactos/base/applications/rapps_new/loaddlg.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/loaddlg.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/loaddlg.cpp [iso-8859-1] Thu Sep 29 21:31:11 2016 @@ -348,7 +348,15 @@ hFile = InternetOpenUrlW(hOpen, AppInfo->szUrlDownload, NULL, 0, INTERNET_FLAG_PRAGMA_NOCACHE|INTERNET_FLAG_KEEP_CONNECTION, 0); if (!hFile) - goto end; + { + WCHAR szMsgText[MAX_STR_LEN]; + + if (!LoadStringW(hInst, IDS_UNABLE_TO_DOWNLOAD2, szMsgText, sizeof(szMsgText) / sizeof(WCHAR))) + goto end; + + MessageBoxW(hMainWnd, szMsgText, NULL, MB_OK | MB_ICONERROR); + goto end; + } if (!HttpQueryInfoW(hFile, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &dwStatus, &dwStatusLen, NULL)) goto end; Modified: trunk/reactos/base/applications/rapps_new/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/resource.h [iso-8859-1] Thu Sep 29 21:31:11 2016 @@ -97,11 +97,12 @@ #define IDS_INFORMATION 117 #define IDS_UNABLE_TO_REMOVE 118 #define IDS_UNABLE_TO_DOWNLOAD 119 -#define IDS_CERT_DOES_NOT_MATCH 120 -#define IDS_INTEG_CHECK_TITLE 121 -#define IDS_INTEG_CHECK_FAIL 122 -#define IDS_INTERRUPTED_DOWNLOAD 123 -#define IDS_UNABLE_TO_WRITE 124 +#define IDS_UNABLE_TO_DOWNLOAD2 120 +#define IDS_CERT_DOES_NOT_MATCH 121 +#define IDS_INTEG_CHECK_TITLE 122 +#define IDS_INTEG_CHECK_FAIL 123 +#define IDS_INTERRUPTED_DOWNLOAD 124 +#define IDS_UNABLE_TO_WRITE 125 /* Tooltips */ #define IDS_TOOLTIP_INSTALL 200

8 years, 2 months

[dreimer] 72863: [RAPPS] Translate missing string

by dreimer＠svn.reactos.org

Author: dreimer Date: Thu Sep 29 21:25:36 2016 New Revision: 72863 URL: http://svn.reactos.org/svn/reactos?rev=72863&view=rev Log: [RAPPS] Translate missing string Modified: trunk/reactos/base/applications/rapps/lang/de-DE.rc Modified: trunk/reactos/base/applications/rapps/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/de-DE.rc [iso-8859-1] Thu Sep 29 21:25:36 2016 @@ -196,7 +196,7 @@ IDS_CHOOSE_FOLDER_ERROR "Sie haben ein nicht existierendes Verzeichnis angegeben! Neu anlegen?" IDS_APP_REG_REMOVE "Sind Sie sich sicher, dass Sie die Daten dieses Programms aus der Registry entfernen mÃ¶chten?" IDS_INFORMATION "Informationen" - IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" + IDS_UNABLE_TO_DOWNLOAD "Paket konnte nicht geladen werden! Addresse wurde nicht gefunden!" IDS_UNABLE_TO_REMOVE "Konnte die Daten nicht aus der Registry lÃ¶schen!" IDS_CERT_DOES_NOT_MATCH "ÃberprÃ¼fung des SSL-Zertifikats fehlgeschlagen." IDS_INTEG_CHECK_TITLE "Verifying package integrity..."

8 years, 2 months

[dreimer] 72862: [ROSAPPS] Russian translation update by Sergey Stopkin ROSAPPS-333 #resolve #comment Committed, thx ^^

by dreimer＠svn.reactos.org

Author: dreimer Date: Thu Sep 29 21:02:07 2016 New Revision: 72862 URL: http://svn.reactos.org/svn/reactos?rev=72862&view=rev Log: [ROSAPPS] Russian translation update by Sergey Stopkin ROSAPPS-333 #resolve #comment Committed, thx ^^ Added: trunk/rosapps/applications/cmdutils/arping/lang/ru-RU.rc (with props) trunk/rosapps/applications/screensavers/blankscr/lang/ru-RU.rc (with props) trunk/rosapps/applications/screensavers/butterflies/lang/ru-RU.rc (with props) trunk/rosapps/applications/screensavers/circles/lang/ru-RU.rc (with props) trunk/rosapps/applications/screensavers/cylfrac/lang/ru-RU.rc (with props) trunk/rosapps/applications/screensavers/matrix/lang/ru-RU.rc (with props) trunk/rosapps/applications/screensavers/mazescr/lang/ru-RU.rc (with props) trunk/rosapps/applications/sysutils/systeminfo/lang/ru-RU.rc (with props) Modified: trunk/rosapps/applications/cmdutils/arping/arping.rc trunk/rosapps/applications/screensavers/blankscr/lang/uk-UA.rc trunk/rosapps/applications/screensavers/blankscr/scrnsave.rc trunk/rosapps/applications/screensavers/butterflies/rsrc.rc trunk/rosapps/applications/screensavers/circles/circles.rc trunk/rosapps/applications/screensavers/cylfrac/cylfrac.rc trunk/rosapps/applications/screensavers/matrix/rsrc.rc trunk/rosapps/applications/screensavers/mazescr/maze.rc trunk/rosapps/applications/sysutils/ctm/lang/ru-RU.rc Modified: trunk/rosapps/applications/cmdutils/arping/arping.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/arpi… ============================================================================== --- trunk/rosapps/applications/cmdutils/arping/arping.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/cmdutils/arping/arping.rc [iso-8859-1] Thu Sep 29 21:02:07 2016 @@ -13,3 +13,6 @@ #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif +#ifdef LANGUAGE_RU_RU + #include "lang/ru-RU.rc" +#endif Added: trunk/rosapps/applications/cmdutils/arping/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/arpi… ============================================================================== --- trunk/rosapps/applications/cmdutils/arping/lang/ru-RU.rc (added) +++ trunk/rosapps/applications/cmdutils/arping/lang/ru-RU.rc [iso-8859-1] Thu Sep 29 21:02:07 2016 @@ -0,0 +1,33 @@ +/* + * PROJECT: ReactOS + * LICENSE: Public Domain + * FILE: applications/cmdutils/arping/lang/ru-RU.rc + * PURPOSE: Russian Language File for arping + * TRANSLATOR: Sergey Stopkin + */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_USAGE "\nÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ: arping [-t] [-n ÑÐ¸ÑÐ»Ð¾] -s ip-Ð¸ÑÑÐ¾ÑÐ½Ð¸ÐºÐ° ÑÐ·ÐµÐ»-Ð½Ð°Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ\n\n\ +ÐÐ¿ÑÐ¸Ð¸:\n\ + -t ÐÑÐ¿ÑÐ°Ð²ÐºÐ° Ð¿Ð°ÐºÐµÑÐ¾Ð² Ð½Ð° ÑÐºÐ°Ð·Ð°Ð½Ð½ÑÐ¹ ÑÐ·ÐµÐ» Ð´Ð¾ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ Ð¿ÑÐµÑÑÐ²Ð°Ð½Ð¸Ñ.\n\ + ÐÐ»Ñ Ð¿ÑÐµÑÑÐ²Ð°Ð½Ð¸Ñ - Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐ¹ÑÐµ Control-C.\n\ + -n ÑÐ¸ÑÐ»Ð¾ Ð§Ð¸ÑÐ»Ð¾ Ð¾ÑÐ¿ÑÐ°Ð²Ð»ÑÐµÐ¼ÑÑ Ð·Ð°Ð¿ÑÐ¾ÑÐ¾Ð²\n\ + -s ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ IP Ð¸ÑÑÐ¾ÑÐ½Ð¸ÐºÐ°.\n\n\0" + IDS_BAD_OPTION_FORMAT "ÐÐµÐ²ÐµÑÐ½ÑÐ¹ ÑÐ¾ÑÐ¼Ð°Ñ Ð¾Ð¿ÑÐ¸Ð¸ %1.\n\0" + IDS_BAD_OPTION "ÐÐµÐ²ÐµÑÐ½Ð°Ñ Ð¾Ð¿ÑÐ¸Ñ %1.\n\0" + IDS_BAD_PARAMETER "ÐÐµÐ²ÐµÑÐ½ÑÐ¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ %1.\n\0" + IDS_DEST_MUST_BE_SPECIFIED "ÐÐ¼Ñ Ð¸Ð»Ð¸ IP Ð°Ð´ÑÐµÑ ÑÐ·Ð»Ð° Ð½Ð°Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ Ð´Ð¾Ð»Ð¶Ð½Ð¾ Ð±ÑÑÑ ÑÐºÐ°Ð·Ð°Ð½Ð¾.\n\0" + IDS_COULD_NOT_INIT_WINSOCK "ÐÐµ ÑÐ´Ð°ÐµÑÑÑ Ð¸Ð½Ð¸ÑÐ¸Ð°Ð»Ð¸Ð·Ð¸ÑÐ¾Ð²Ð°ÑÑ winsock dll.\n\0" + IDS_UNKNOWN_HOST "ÐÐµÐ¸Ð·Ð²ÐµÑÑÐ½ÑÐ¹ ÑÐ¾ÑÑ %1.\n\0" + IDS_SRC_MUST_BE_SPECIFIED "IP Ð°Ð´ÑÐµÑ ÑÐ·Ð»Ð° Ð½Ð°Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±ÑÑÑ ÑÐºÐ°Ð·Ð°Ð½.\n\0" + IDS_BAD_VALUE_OPTION_N "ÐÐµÐ²ÐµÑÐ½Ð¾Ðµ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ Ð¾Ð¿ÑÐ¸Ð¸ -n, Ð´Ð¸Ð°Ð¿Ð°Ð·Ð¾Ð½ Ð´Ð¾ÑÑÑÐ¿Ð½ÑÑ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ð¹ Ð¾Ñ 1 Ð´Ð¾ %1!u!.\n\0" + IDS_ARPING_TO_FROM "ARPING %1 Ð¸Ð· %2\n\0" + IDS_MS "Ð¼Ñ\0" + IDS_1MS "1Ð¼Ñ\0" + IDS_REPLY_FROM "Unicast Ð¾ÑÐ²ÐµÑ Ð¾Ñ %1 [%2] %3%4\n\0" + IDS_ARPING_STATISTICS "ÐÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¾ %1!u! Ð·Ð°Ð¿ÑÐ¾ÑÐ¾Ð²\n\ +ÐÐ¾Ð»ÑÑÐµÐ½Ð¾ %2!u! Ð¾ÑÐ²ÐµÑÐ¾Ð²\n\0" +END Propchange: trunk/rosapps/applications/cmdutils/arping/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/screensavers/blankscr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/blankscr/lang/ru-RU.rc (added) +++ trunk/rosapps/applications/screensavers/blankscr/lang/ru-RU.rc [iso-8859-1] Thu Sep 29 21:02:07 2016 @@ -0,0 +1,15 @@ +/* + * PROJECT: ReactOS Default ScreenSaver + * LICENSE: Public Domain + * FILE: applications/screensavers/blankscr/lang/ru-RU.rc + * PURPOSE: Russian Language File for Blank Screen ScreenSaver + * TRANSLATOR: Sergey Stopkin + */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "ÐÐ°ÑÑÐ°Ð²ÐºÐ° ""ÐÑÑÑÐ¾Ð¹ ÑÐºÑÐ°Ð½""" + IDS_TEXT "ÐÑÐ° Ð·Ð°ÑÑÐ°Ð²ÐºÐ° Ð½Ðµ Ð¸Ð¼ÐµÐµÑ Ð½Ð°ÑÑÑÐ°Ð¸Ð²Ð°ÐµÐ¼ÑÑ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¾Ð²." +END Propchange: trunk/rosapps/applications/screensavers/blankscr/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/screensavers/blankscr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/blankscr/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/blankscr/lang/uk-UA.rc [iso-8859-1] Thu Sep 29 21:02:07 2016 @@ -1,7 +1,7 @@ /* * PROJECT: Default ScreenSaver * LICENSE: Public Domain - * FILE: base/applications/screensavers/scrnsave/lang/uk-UA.rc + * FILE: rosapps/applications/screensavers/blankscr/lang/uk-UA.rc * PURPOSE: Ukraianian Language File for Default ScreenSaver * TRANSLATOR: Artem Reznikov */ Modified: trunk/rosapps/applications/screensavers/blankscr/scrnsave.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/blankscr/scrnsave.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/blankscr/scrnsave.rc [iso-8859-1] Thu Sep 29 21:02:07 2016 @@ -47,6 +47,9 @@ #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 Added: trunk/rosapps/applications/screensavers/butterflies/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/lang/ru-RU.rc (added) +++ trunk/rosapps/applications/screensavers/butterflies/lang/ru-RU.rc [iso-8859-1] Thu Sep 29 21:02:07 2016 @@ -0,0 +1,34 @@ +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +IDD_DLG_SCREEN DIALOGEX DISCARDABLE 0, 0, 172, 57 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "ÐÐ°ÑÐ°Ð¼ÐµÑÑÑ Ð·Ð°ÑÑÐ°Ð²ÐºÐ¸ ""ÐÐ°Ð±Ð¾ÑÐºÐ¸""" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK",IDOK,7,35,50,14 + PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°",IDCANCEL,61,35,50,14 + CONTROL "ÐÑÐ°ÑÐµÐ½Ð¸Ðµ Ð±Ð°Ð±Ð¾ÑÐµÐº",ROTATE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,56,15,70,8 + PUSHBUTTON "Ð Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ",IDABOUT,115,35,50,14 +END + +IDD_DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 149, 79 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK",IDOK,48,58,56,14 + CTEXT "ÐÐ°ÑÑÐ°Ð²ÐºÐ° ""ÐÐ°Ð±Ð¾ÑÐºÐ¸""",IDC_STATIC,7,7,135,9 + CTEXT "ÐÐ²ÑÐ¾Ñ Ð´ÐµÐ¼Ð¾: NeHe ",IDC_STATIC,7,20,135,8 + CTEXT "http://nehe.gamedev.net",WEBPAGE1,7,29,135,8,SS_NOTIFY | + NOT WS_GROUP + CTEXT "ÐÐ²ÑÐ¾Ñ Ð·Ð°ÑÑÐ°Ð²ÐºÐ¸: tHaPuTeR",IDC_STATIC,7,38,135,8,NOT + WS_GROUP + CTEXT "http://www.thaputer.com",WEBPAGE2,7,47,135,8,SS_NOTIFY | + NOT WS_GROUP +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "ÐÐ°ÑÑÐ°Ð²ÐºÐ° ""ÐÐ°Ð±Ð¾ÑÐºÐ¸""" +END Propchange: trunk/rosapps/applications/screensavers/butterflies/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/screensavers/butterflies/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/rsrc.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/butterflies/rsrc.rc [iso-8859-1] Thu Sep 29 21:02:07 2016 @@ -30,6 +30,9 @@ #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 Modified: trunk/rosapps/applications/screensavers/circles/circles.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/circles/circles.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/circles/circles.rc [iso-8859-1] Thu Sep 29 21:02:07 2016 @@ -36,6 +36,9 @@ #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 Added: trunk/rosapps/applications/screensavers/circles/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/circles/lang/ru-RU.rc (added) +++ trunk/rosapps/applications/screensavers/circles/lang/ru-RU.rc [iso-8859-1] Thu Sep 29 21:02:07 2016 @@ -0,0 +1,15 @@ +/* + * PROJECT: ReactOS Default ScreenSaver + * LICENSE: Public Domain + * FILE: applications/screensavers/blankscr/lang/ru-RU.rc + * PURPOSE: Russian Language File for Circle ScreenSaver + * TRANSLATOR: Sergey Stopkin + */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "ÐÐ°ÑÑÐ°Ð²ÐºÐ° ""ÐÑÑÐ³Ð¸""" + IDS_TEXT "ÐÑÐ° Ð·Ð°ÑÑÐ°Ð²ÐºÐ° Ð½Ðµ Ð¸Ð¼ÐµÐµÑ Ð½Ð°ÑÑÑÐ°Ð¸Ð²Ð°ÐµÐ¼ÑÑ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¾Ð²." +END Propchange: trunk/rosapps/applications/screensavers/circles/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/screensavers/cylfrac/cylfrac.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/cylfrac/cylfrac.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/cylfrac/cylfrac.rc [iso-8859-1] Thu Sep 29 21:02:07 2016 @@ -48,6 +48,9 @@ #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 Added: trunk/rosapps/applications/screensavers/cylfrac/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/cylfrac/lang/ru-RU.rc (added) +++ trunk/rosapps/applications/screensavers/cylfrac/lang/ru-RU.rc [iso-8859-1] Thu Sep 29 21:02:07 2016 @@ -0,0 +1,16 @@ +/* + * PROJECT: Cylinders fractal ScreenSaver + * LICENSE: Public Domain + * FILE: applications/screensavers/cylfrac/lang/ru-RU.rc + * PURPOSE: Russian Language File for Cylinders fractal ScreenSaver + * TRANSLATOR: Sergey Stopkin + */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "ÐÐ°ÑÑÐ°Ð²ÐºÐ° ""Cylinders fractal""" + IDS_TITLE "Ð Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ" + IDS_TEXT "Cylinders fractal Ð¾Ñ unC0Rr.\nÐ¡Ð¿ÐµÑÐ¸Ð°Ð»ÑÐ½Ð¾ Ð´Ð»Ñ ReactOS." +END Propchange: trunk/rosapps/applications/screensavers/cylfrac/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/screensavers/matrix/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/matrix/lang/ru-RU.rc (added) +++ trunk/rosapps/applications/screensavers/matrix/lang/ru-RU.rc [iso-8859-1] Thu Sep 29 21:02:07 2016 @@ -0,0 +1,61 @@ +/* + * PROJECT: Matrix ScreenSaver + * LICENSE: Public Domain + * FILE: applications/screensavers/matrix/lang/ru-RU.rc + * PURPOSE: Russian Language File for Matrix ScreenSaver + * TRANSLATOR: Sergey Stopkin + */ + +#include "resource.h" + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +IDD_CONFIG DIALOGEX DISCARDABLE 0, 0, 340, 183 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "ÐÐ°ÑÐ°Ð¼ÐµÑÑÑ Ð·Ð°ÑÑÐ°Ð²ÐºÐ¸ ""ÐÐ°ÑÑÐ¸ÑÐ°""" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Ð¡ÐºÐ¾ÑÐ¾ÑÑÑ Ð´ÐµÐºÐ¾Ð´Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ñ",IDC_STATIC,7,7,128,36 + LTEXT "ÐÐµÐ´Ð»ÐµÐ½Ð½ÐµÐµ",IDC_STATIC,13,24,22,8 + CONTROL "Slider1",IDC_SLIDER1,"msctls_trackbar32",TBS_AUTOTICKS | + TBS_BOTH | WS_TABSTOP,38,17,62,22 + LTEXT "ÐÑÑÑÑÐµÐµ",IDC_STATIC,104,24,20,8 + GROUPBOX "ÐÐ»Ð¾ÑÐ½Ð¾ÑÑÑ &ÑÐ¸ÑÑÐ°",IDC_STATIC,7,50,128,36 + LTEXT "ÐÐµÐ½ÑÑÐµ",IDC_STATIC,13,67,19,8 + CONTROL "Slider1",IDC_SLIDER2,"msctls_trackbar32",TBS_AUTOTICKS | + TBS_BOTH | WS_TABSTOP,38,60,62,22 + LTEXT "ÐÐ¾Ð»ÑÑÐµ",IDC_STATIC,104,67,23,8 + GROUPBOX "Ð¡ÐºÐ¾ÑÐ¾ÑÑÑ Ð¿Ð¾ÐºÐ°Ð·Ð° ÑÐ¾Ð¾Ð±&ÑÐµÐ½Ð¸Ð¹",IDC_MSGSPEEDGRP,7,93,127,36 + LTEXT "ÐÐµÐ´Ð»ÐµÐ½Ð½ÐµÐµ",IDC_STATIC,13,110,22,8 + CONTROL "Slider3",IDC_SLIDER3,"msctls_trackbar32",TBS_AUTOTICKS | + TBS_BOTH | WS_TABSTOP,38,103,62,22 + LTEXT "ÐÑÑÑÑÐµÐµ",IDC_STATIC,104,110,22,8 + GROUPBOX "&Ð Ð°Ð·Ð¼ÐµÑ ÑÑÐ¸ÑÑÐ°",IDC_STATIC,7,137,127,36 + LTEXT "ÐÐµÐ½ÑÑÐµ",IDC_STATIC,13,153,24,8 + CONTROL "Slider3",IDC_SLIDER4,"msctls_trackbar32",TBS_AUTOTICKS | + TBS_BOTH | WS_TABSTOP,38,146,62,22 + LTEXT "ÐÐ¾Ð»ÑÑÐµ",IDC_STATIC,104,153,25,8 + GROUPBOX "&ÐÐ°ÐºÐ¾Ð´Ð¸ÑÐ¾Ð²Ð°Ð½Ð½ÑÐµ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ñ",IDC_STATIC,145,7,188,142 + COMBOBOX IDC_COMBO1,153,22,172,62,CBS_DROPDOWN | WS_VSCROLL | + WS_TABSTOP + CONTROL "",IDC_PREVIEW,"Static",SS_LEFTNOWORDWRAP | + SS_CENTERIMAGE | WS_GROUP,154,39,116,72 + PUSHBUTTON "&ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ",IDC_ADD,280,41,44,18 + PUSHBUTTON "&Ð£Ð´Ð°Ð»Ð¸ÑÑ",IDC_REMOVE,280,66,44,18 + CONTROL "Ð¡Ð»ÑÑÐ°Ð¹Ð½ÑÐµ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ñ",IDC_RANDOM,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,151,134,85,10 + DEFPUSHBUTTON "OK",IDOK,222,162,50,14 + PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°",IDCANCEL,283,162,50,14 + LTEXT "&ÐÐ¼Ñ ÑÑÐ¸ÑÑÐ°:",IDC_STATIC,151,118,38,8 + COMBOBOX IDC_COMBO2,195,116,130,71,CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP + CONTROL "&ÐÐ¸ÑÐ½Ð¾Ðµ Ð½Ð°ÑÐµÑÑÐ°Ð½Ð¸Ðµ",IDC_BOLD,"Button",BS_AUTOCHECKBOX | + BS_MULTILINE | WS_TABSTOP,247,134,46,10 + CTEXT "ÐÐ°ÑÑÐ°Ð²ÐºÐ° ""ÐÐ°ÑÑÐ¸ÑÐ°"" www.catch22.org.uk",IDC_ABOUT,140, + 158,75,18 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "ÐÐ°ÑÑÐ°Ð²ÐºÐ° ""ÐÐ°ÑÑÐ¸ÑÐ°""" +END Propchange: trunk/rosapps/applications/screensavers/matrix/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/screensavers/matrix/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/matrix/rsrc.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/matrix/rsrc.rc [iso-8859-1] Thu Sep 29 21:02:07 2016 @@ -42,6 +42,9 @@ #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 Added: trunk/rosapps/applications/screensavers/mazescr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/mazescr/lang/ru-RU.rc (added) +++ trunk/rosapps/applications/screensavers/mazescr/lang/ru-RU.rc [iso-8859-1] Thu Sep 29 21:02:07 2016 @@ -0,0 +1,53 @@ +/* + * PROJECT: ReactOS Default ScreenSaver + * LICENSE: Public Domain + * FILE: applications/screensavers/mazescr/lang/ru-RU.rc + * PURPOSE: Russian Language File for Maze ScreenSaver + * TRANSLATOR: Sergey Stopkin + */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +IDD_DLG_SCREEN DIALOGEX DISCARDABLE 0, 0, 276, 112 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Maze ScreenSaver Settings" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ÐÐ°ÐºÑÐ¸Ð¼Ð°Ð»ÑÐ½ÑÐ¹ ÑÐ°Ð·Ð¼ÐµÑ:",IDC_STATIC,7,7,90,12,SS_CENTERIMAGE + CONTROL "Slider1",IDC_SLIDER_SIZE,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,101,7,140,12 + CTEXT "Static",IDC_TEXT_SIZE,245,7,24,12,SS_CENTERIMAGE,WS_EX_STATICEDGE + LTEXT "ÐÐ°Ð´ÐµÑÐ¶ÐºÐ° Ð¿ÐµÑÐµÐ´ Ð²ÑÐ±Ð¾ÑÐ¾Ð¼:",IDC_STATIC,7,28,90,12,SS_CENTERIMAGE + CONTROL "Slider2",IDC_SLIDER_PRESD,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,101,28,140,12 + CTEXT "Static",IDC_TEXT_PRESD,245,28,24,12,SS_CENTERIMAGE,WS_EX_STATICEDGE + LTEXT "ÐÐ°Ð´ÐµÑÐ¶ÐºÐ° Ð¿Ð¾ÑÐ»Ðµ Ð²ÑÐ±Ð¾ÑÐ°:",IDC_STATIC,7,49,90,12,SS_CENTERIMAGE + CONTROL "Slider3",IDC_SLIDER_POSTSD,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,101,49,140,12 + CTEXT "Static",IDC_TEXT_POSTSD,245,49,24,12,SS_CENTERIMAGE,WS_EX_STATICEDGE + LTEXT "ÐÐ°Ð´ÐµÑÐ¶ÐºÐ° Ð²ÑÐ±Ð¾ÑÐ°:",IDC_STATIC,7,70,90,12,SS_CENTERIMAGE + CONTROL "Slider4",IDC_SLIDER_SD,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,101,70,140,12 + CTEXT "Static",IDC_TEXT_SD,245,70,24,12,SS_CENTERIMAGE,WS_EX_STATICEDGE + DEFPUSHBUTTON "OK",IDOK,59,91,50,14 + PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°",IDCANCEL,113,91,50,14 + PUSHBUTTON "Ð Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ",IDABOUT,167,91,50,14 +END + +IDD_DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 229, 121 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Ð Ð·Ð°ÑÑÐ°Ð²ÐºÐµ ""ÐÐ°Ð±Ð¸ÑÐ¸Ð½Ñ""" +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Maze ScreenSaver 1.0",IDC_STATIC,7,7,215,9 + LTEXT "[06-21-85] Martin Weiss - Original Code",IDC_STATIC,7,20,215,8 + LTEXT "[01-29-88] Dave Lemke - Hacked for X11",IDC_STATIC,7,29,215,8 + LTEXT "[10-04-88] Richard Hess - UnHacked for X11",IDC_STATIC,7,38,215,8 + LTEXT "[03-03-93] Jim Randell - UnHacked for X11",IDC_STATIC,7,47,215,8 + LTEXT "[03-07-93] Jamie Zawinski - Cleanup and Code tidiness",IDC_STATIC,7,56,215,8 + LTEXT "[10-08-94] Ge van Geldorp - Ported to Windows",IDC_STATIC,7,65,215,8 + LTEXT "[08-15-03] Ge van Geldorp - Ported to ReactOS",IDC_STATIC,7,74,215,8 + CTEXT "R.I.P. Ge van Geldorp, we miss you!",IDC_STATIC,7,87,215,10,SS_SUNKEN + DEFPUSHBUTTON "OK",IDOK,87,100,56,14 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "ÐÐ°ÑÑÐ°Ð²ÐºÐ° ""ÐÐ°Ð±Ð¸ÑÐ¸Ð½Ñ""" +END Propchange: trunk/rosapps/applications/screensavers/mazescr/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/screensavers/mazescr/maze.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/mazescr/maze.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/mazescr/maze.rc [iso-8859-1] Thu Sep 29 21:02:07 2016 @@ -27,6 +27,9 @@ #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif +#ifdef LANGUAGE_RU_RU + #include "lang/ru-RU.rc" +#endif #ifdef LANGUAGE_ZH_CN #include "lang/zh-CN.rc" #endif Modified: trunk/rosapps/applications/sysutils/ctm/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/ctm/… ============================================================================== --- trunk/rosapps/applications/sysutils/ctm/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/ctm/lang/ru-RU.rc [iso-8859-1] Thu Sep 29 21:02:07 2016 @@ -11,7 +11,7 @@ IDS_COLUMN_PID "PID " IDS_COLUMN_CPU "Ð¦Ð" IDS_COLUMN_MEM "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ Ð¿Ð°Ð¼ÑÑÐ¸" - IDS_COLUMN_MEM_UNIT "ÐÐ" + IDS_COLUMN_MEM_UNIT "ÐÐ" IDS_COLUMN_PF "ÐÑÐ¸Ð±Ð¾Ðº ÑÑÑÐ°Ð½Ð¸ÑÑ" IDS_IDLE_PROCESS "ÐÐµÐ·Ð´ÐµÐ¹ÑÑÐ²Ð¸Ðµ ÑÐ¸ÑÑÐµÐ¼Ñ" Added: trunk/rosapps/applications/sysutils/systeminfo/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/ru-RU.rc (added) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/ru-RU.rc [iso-8859-1] Thu Sep 29 21:02:07 2016 @@ -0,0 +1,80 @@ +/* + * PROJECT: System Information + * LICENSE: GPL - See COPYING in the top level directory + * FILE: rosapps/sysutils/systeminfo/lang/ru-RU.rc + * PURPOSE: Russian Language File for systeminfo + * TRANSLATOR: Sergey Stopkin + */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + +IDS_USAGE, "SYSTEMINFO [/S ÑÐ¸ÑÑÐµÐ¼Ð° [/U Ð¸Ð¼ÑÐÐ¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ [/P [Ð¿Ð°ÑÐ¾Ð»Ñ]]]] [/FO ÑÐ¾ÑÐ¼Ð°Ñ] [/NH]\n\n\ +ÐÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ:\n\ + ÐÑÐ° ÑÑÐ¸Ð»Ð¸ÑÐ° ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¾Ð¹ ÑÑÑÐ¾ÐºÐ¸ Ð¿ÑÐµÐ´Ð¾ÑÑÐ°Ð²Ð»ÑÐµÑ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¾ÑÑ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÑ\n\ + Ð·Ð°Ð¿ÑÐ°ÑÐ¸Ð²Ð°ÑÑ Ð¾ÑÐ½Ð¾Ð²Ð½ÑÑ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð¾ ÐºÐ¾Ð½ÑÐ¸Ð³ÑÑÐ°ÑÐ¸Ð¸ ÑÐ¸ÑÑÐµÐ¼Ñ.\n\n\ +Ð¡Ð¿Ð¸ÑÐ¾Ðº Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¾Ð²:\n\ + /S ÑÐ¸ÑÑÐµÐ¼Ð° ÐÐ¿ÑÐµÐ´ÐµÐ»ÑÐµÑ ÑÐ´Ð°Ð»ÐµÐ½Ð½ÑÑ ÑÐ¸ÑÑÐµÐ¼Ñ Ð´Ð»Ñ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ñ.\n\n\ + /U [Ð´Ð¾Ð¼ÐµÐ½\\]Ð¿Ð¾Ð»ÑÐ·. ÐÐ¿ÑÐµÐ´ÐµÐ»ÑÐµÑ ÐºÐ¾Ð½ÑÐµÐºÑÑ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ, Ð¿Ð¾Ð´ ÐºÐ¾ÑÐ¾ÑÑÐ¼\n\ + Ð²ÑÐ¿Ð¾Ð»Ð½ÑÐµÑÑÑ Ð´Ð°Ð½Ð½Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°.\n\n\ + /P [password] ÐÐ°Ð´Ð°ÐµÑ Ð¿Ð°ÑÐ¾Ð»Ñ Ð´Ð»Ñ Ð´Ð°Ð½Ð½Ð¾Ð³Ð¾ ÐºÐ¾Ð½ÑÐµÐºÑÑÐ° Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ.\n\ + ÐÐ°Ð¿ÑÐ°ÑÐ¸Ð²Ð°ÐµÑ Ð²Ð²Ð¾Ð´ Ð¿Ð°ÑÐ¾Ð»Ñ, ÐµÑÐ»Ð¸ Ð¾Ð½ Ð½Ðµ Ð±ÑÐ» Ð·Ð°Ð´Ð°Ð½.\n\n\ + /FO ÑÐ¾ÑÐ¼Ð°Ñ ÐÐ¿ÑÐµÐ´ÐµÐ»ÑÐµÑ ÑÐ¾ÑÐ¼Ð°Ñ, Ð² ÐºÐ¾ÑÐ¾ÑÐ¾Ð¼ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶Ð°ÑÑÑÑ\n\ + Ð²ÑÑÐ¾Ð´Ð½ÑÐµ Ð´Ð°Ð½Ð½ÑÐµ.\n\ + ÐÐ¾Ð¿ÑÑÑÐ¸Ð¼ÑÐµ ÑÐ¾ÑÐ¼Ð°ÑÑ: ""TABLE"", ""LIST"", ""CSV"".\n\n\ + /NH Ð£ÐºÐ°Ð·ÑÐ²Ð°ÐµÑ, ÑÑÐ¾ ""ÐÐ°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº ÑÑÐ¾Ð»Ð±ÑÐ°""\n\ + Ð½Ðµ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶Ð°ÑÑÑÑ Ð² Ð²ÑÐ²Ð¾Ð´Ðµ.\n\ + ÐÐ¾Ð¿ÑÑÐºÐ°ÐµÑÑÑ Ð´Ð»Ñ ÑÐ¾ÑÐ¼Ð°ÑÐ¾Ð² ""TABLE"" Ð¸ ""CSV"".\n\n\ + /? ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ ÑÑÑ ÑÐ¿ÑÐ°Ð²ÐºÑ/Ð¿ÑÐ¸Ð¼ÐµÑÑ.\n\n\ +ÐÑÐ¸Ð¼ÐµÑÑ:\n\ + SYSTEMINFO\n\ + SYSTEMINFO /?\n\ + SYSTEMINFO /S ÑÐ¸ÑÑÐµÐ¼Ð°\n\ + SYSTEMINFO /S ÑÐ¸ÑÑÐµÐ¼Ð° /U user\n\ + SYSTEMINFO /S ÑÐ¸ÑÑÐµÐ¼Ð° /U Ð´Ð¾Ð¼ÐµÐ½\\Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ /P Ð¿Ð°ÑÐ¾Ð»Ñ /FO TABLE\n\ + SYSTEMINFO /S ÑÐ¸ÑÑÐµÐ¼Ð° /FO LIST\n\ + SYSTEMINFO /S ÑÐ¸ÑÑÐµÐ¼Ð° /FO CSV /NH\n" + +IDS_HOST_NAME, "ÐÐ¼Ñ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐ°" +IDS_OS_NAME, "ÐÐ¼Ñ ÐÐ¡" +IDS_OS_VERSION, "ÐÐµÑÑÐ¸Ñ ÐÐ¡" +IDS_BUILD, "Ð¡Ð±Ð¾ÑÐºÐ°" +IDS_OS_BUILD_TYPE, "Ð¢Ð¸Ð¿ ÑÐ±Ð¾ÑÐºÐ¸ ÐÐ¡" +IDS_REG_OWNER, "ÐÐ°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð½ÑÐ¹ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ" +IDS_REG_ORG, "ÐÐ°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¾ÑÐ³Ð°Ð½Ð¸Ð·Ð°ÑÐ¸Ñ" +IDS_PRODUCT_ID, "ID Ð¿ÑÐ¾Ð´ÑÐºÑÐ°" +IDS_INST_DATE, "ÐÐ°ÑÐ° ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸" +IDS_UP_TIME, "ÐÑÐµÐ¼Ñ ÑÐ°Ð±Ð¾ÑÑ ÑÐ¸ÑÑÐµÐ¼Ñ" +IDS_UP_TIME_FORMAT, "%u Ð´Ð½ÐµÐ¹, %u ÑÐ°ÑÐ¾Ð², %u Ð¼Ð¸Ð½ÑÑ, %u ÑÐµÐºÑÐ½Ð´" +IDS_SYS_MANUFACTURER, "ÐÑÐ¾Ð¸Ð·Ð²Ð¾Ð´Ð¸ÑÐµÐ»Ñ ÑÐ¸ÑÑÐµÐ¼Ñ" +IDS_SYS_MODEL, "ÐÐ¾Ð´ÐµÐ»Ñ ÑÐ¸ÑÑÐµÐ¼Ñ" +IDS_SYS_TYPE, "Ð¢Ð¸Ð¿ ÑÐ¸ÑÑÐµÐ¼Ñ" +IDS_PROCESSORS, "ÐÑÐ¾ÑÐµÑÑÐ¾Ñ(-Ñ)" +IDS_PROCESSORS_FORMAT, "%u Ð¿ÑÐ¾ÑÐµÑÑÐ¾Ñ(-Ð¾Ð²) ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾." +IDS_BIOS_DATE, "ÐÐ°ÑÐ° BIOS" +IDS_BIOS_VERSION, "ÐÐµÑÑÐ¸Ñ BIOS" +IDS_ROS_DIR, "ÐÐ°Ð¿ÐºÐ° ReactOS" +IDS_SYS_DIR, "Ð¡Ð¸ÑÑÐµÐ¼Ð½Ð°Ñ Ð¿Ð°Ð¿ÐºÐ°" +IDS_BOOT_DEV, "ÐÐ°Ð³ÑÑÐ·Ð¾ÑÐ½Ð¾Ðµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾" +IDS_SYS_LOCALE, "Ð¯Ð·ÑÐº ÑÐ¸ÑÑÐµÐ¼Ñ" +IDS_INPUT_LOCALE, "Ð¯Ð·ÑÐº Ð²Ð²Ð¾Ð´Ð°" +IDS_TIME_ZONE, "Ð§Ð°ÑÐ¾Ð²Ð¾Ð¹ Ð¿Ð¾ÑÑ" +IDS_TOTAL_PHYS_MEM, "ÐÑÐµÐ³Ð¾ ÑÐ¸Ð·Ð¸ÑÐµÑÐºÐ¾Ð¹ Ð¿Ð°Ð¼ÑÑÐ¸" +IDS_AVAIL_PHISICAL_MEM, "ÐÐ¾ÑÑÑÐ¿Ð½Ð¾ ÑÐ¸Ð·Ð¸ÑÐµÑÐºÐ¾Ð¹ Ð¿Ð°Ð¼ÑÑÐ¸" +IDS_VIRT_MEM_MAX, "ÐÐ¸ÑÑÑÐ°Ð»ÑÐ½Ð°Ñ Ð¿Ð°Ð¼ÑÑÑ: ÐÐ°ÐºÑ. ÑÐ°Ð·Ð¼ÐµÑ" +IDS_VIRT_MEM_AVAIL, "ÐÐ¸ÑÑÑÐ°Ð»ÑÐ½Ð°Ñ Ð¿Ð°Ð¼ÑÑÑ: ÐÐ¾ÑÑÑÐ¿Ð½Ð¾" +IDS_VIRT_MEM_INUSE, "ÐÐ¸ÑÑÑÐ°Ð»ÑÐ½Ð°Ñ Ð¿Ð°Ð¼ÑÑÑ: ÐÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÑÑÑ" +IDS_PAGEFILE_LOC, "Ð Ð°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ ÑÐ°Ð¹Ð»Ð° Ð¿Ð¾Ð´ÐºÐ°ÑÐºÐ¸" +IDS_DOMAIN, "ÐÐ¾Ð¼ÐµÐ½" +IDS_NETWORK_CARDS, "Ð¡ÐµÑÐµÐ²Ð°Ñ ÐºÐ°ÑÑÐ°(-Ñ)" +IDS_NETWORK_CARDS_FORMAT, "%u Ð£ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾." +IDS_CONNECTION_NAME, "ÐÐ¼Ñ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ" +IDS_STATUS, "Ð¡ÑÐ°ÑÑÑ" +IDS_MEDIA_DISCONNECTED, "ÐÐ¾ÑÐ¸ÑÐµÐ»Ñ Ð¾ÑÐºÐ»ÑÑÐµÐ½" +IDS_DHCP_ENABLED, "DHCP Ð Ð°Ð·ÑÐµÑÐµÐ½" +IDS_NO, "ÐÐµÑ" +IDS_IP_ADDRESSES, "IP Ð°Ð´ÑÐµÑ(-Ð°)" + +END Propchange: trunk/rosapps/applications/sysutils/systeminfo/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native

8 years, 2 months

[dreimer] 72861: [PING] Russian translation update by Sergey Stopkin + lil build fix by me CORE-12019 #resolve #comment Committed, thx ^^ Beware of " in string blocks though, these are "" then

by dreimer＠svn.reactos.org

Author: dreimer Date: Thu Sep 29 20:59:03 2016 New Revision: 72861 URL: http://svn.reactos.org/svn/reactos?rev=72861&view=rev Log: [PING] Russian translation update by Sergey Stopkin + lil build fix by me CORE-12019 #resolve #comment Committed, thx ^^ Beware of " in string blocks though, these are "" then Modified: trunk/reactos/base/applications/network/ping/lang/ru-RU.rc Modified: trunk/reactos/base/applications/network/ping/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ping/lang/ru-RU.rc [iso-8859-1] Thu Sep 29 20:59:03 2016 @@ -13,47 +13,46 @@ [-w <ÑÐ°Ð¹Ð¼-Ð°ÑÑ>] [-4] [-6] ÐºÐ¾Ð½ÐµÑÐ½ÑÐ¹_ÑÐ·ÐµÐ»\n\ \n\ ÐÐ°ÑÐ°Ð¼ÐµÑÑÑ:\n\ - -t Ping the specified host until stopped.\n\ - To see statistics and continue - type Control-Break;\n\ - To stop - type Control-C.\n\ - -a Resolve addresses to hostnames.\n\ - -n <ÑÐ¸ÑÐ»Ð¾> Ð§Ð¸ÑÐ»Ð¾ Ð¾ÑÐ¿ÑÐ°Ð²Ð»ÑÐµÐ¼ÑÑ Ð·Ð°Ð¿ÑÐ¾ÑÐ¾Ð² ÑÑÐ¾-Ð·Ð°Ð¿ÑÐ¾ÑÐ¾Ð².\n\ + -t ÐÑÐ¾Ð²ÐµÑÐºÐ° ÑÐ²ÑÐ·Ð¸ Ñ ÑÐºÐ°Ð·Ð°Ð½Ð½ÑÐ¼ ÑÐ·Ð»Ð¾Ð¼ Ð´Ð¾ Ð¿ÑÐµÐºÑÐ°ÑÐµÐ½Ð¸Ñ.\n\ + ÐÐ»Ñ Ð¿ÑÐ¾ÑÐ¼Ð¾ÑÑÐ° ÑÑÐ°ÑÐ¸ÑÑÐ¸ÐºÐ¸ Ð¸ Ð¿ÑÐ¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ñ Ð¿ÑÐ¾Ð²ÐµÑÐºÐ¸ Ð½Ð°Ð¶Ð¼Ð¸ÑÐµ Control-Break;\n\ + ÐÐ»Ñ Ð¿ÑÐµÐºÑÐ°ÑÐµÐ½Ð¸Ñ Ð½Ð°Ð¶Ð¼Ð¸ÑÐµ Control-C.\n\ + -a ÐÐ¿ÑÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ðµ Ð¸Ð¼ÐµÐ½ ÑÐ·Ð»Ð¾Ð² Ð¿Ð¾ Ð°Ð´ÑÐµÑÐ°Ð¼.\n\ + -n <ÑÐ¸ÑÐ»Ð¾> Ð§Ð¸ÑÐ»Ð¾ Ð¾ÑÐ¿ÑÐ°Ð²Ð»ÑÐµÐ¼ÑÑ ÑÑÐ¾-Ð·Ð°Ð¿ÑÐ¾ÑÐ¾Ð².\n\ -l <ÑÐ°Ð·Ð¼ÐµÑ> Ð Ð°Ð·Ð¼ÐµÑ Ð±ÑÑÐµÑÐ° Ð¾ÑÐ¿ÑÐ°Ð²ÐºÐ¸.\n\ - -f Set Don't Fragment flag in packet (IPv4-only).\n\ - -i TTL Time To Live.\n\ - -v TOS Type Of Service (IPv4-only. This setting has been deprecated\n\ - and has no effect on the type of service field in the IP\n\ - Header).\n\ + -f Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ ÑÐ»Ð°Ð³ ""ÐÐµ ÑÑÐ°Ð³Ð¼ÐµÐ½ÑÐ¸ÑÐ¾Ð²Ð°ÑÑ"" Ð´Ð»Ñ IP Ð¿Ð°ÐºÐµÑÐ° (ÑÐ¾Ð»ÑÐºÐ¾ IPv4).\n\ + -i TTL ÐÐ°Ð´Ð°Ð½Ð¸Ðµ ÑÑÐ¾ÐºÐ° Ð¶Ð¸Ð·Ð½Ð¸ Ð¿Ð°ÐºÐµÑÐ° (TTL).\n\ + -v TOS Ð¢Ð¸Ð¿ Ð¾Ð±ÑÐ»ÑÐ¶Ð¸Ð²Ð°Ð½Ð¸Ñ (ÑÐ¾Ð»ÑÐºÐ¾ IPv4. ÐÑÐ¾Ñ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ ÑÐ²Ð»ÑÐµÑÑÑ ÑÑÑÐ°ÑÐµÐ²ÑÐ¸Ð¼\n\ + Ð¸ Ð½Ðµ Ð²Ð»Ð¸ÑÐµÑ Ð½Ð° Ð¿Ð¾Ð»Ðµ TOS Ð² Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²ÐºÐµ IP).\n\ -w <ÑÐ°Ð¹Ð¼-Ð°ÑÑ> Ð¢Ð°Ð¹Ð¼-Ð°ÑÑ Ð´Ð»Ñ ÐºÐ°Ð¶Ð´Ð¾Ð³Ð¾ Ð¾ÑÐ²ÐµÑÐ° (Ð² Ð¼Ð¸Ð»Ð»Ð¸ÑÐµÐºÑÐ½Ð´Ð°Ñ).\n\ - -4 Force using IPv4.\n\ - -6 Force using IPv6.\n\ + -4 ÐÑÐ¸Ð½ÑÐ´Ð¸ÑÐµÐ»ÑÐ½Ð¾Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ Ð¿ÑÐ¾ÑÐ¾ÐºÐ¾Ð»Ð° IPv4.\n\ + -6 ÐÑÐ¸Ð½ÑÐ´Ð¸ÑÐµÐ»ÑÐ½Ð¾Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ Ð¿ÑÐ¾ÑÐ¾ÐºÐ¾Ð»Ð° IPv6.\n\ \n" IDS_CTRL_BREAK "Control-Break\n" IDS_CTRL_C "Control-C\n" IDS_NO_RESOURCES "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð²ÑÐ´ÐµÐ»Ð¸ÑÑ ÑÑÐµÐ±ÑÐµÐ¼ÑÑ Ð¿Ð°Ð¼ÑÑÑ.\n" - IDS_MISSING_ADDRESS "IP address must be specified.\n" - IDS_MISSING_VALUE "Value must be supplied for option %1.\n" + IDS_MISSING_ADDRESS "ÐÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼Ð¾ ÑÐºÐ°Ð·Ð°ÑÑ Ð°Ð´ÑÐµÑ IP.\n" + IDS_MISSING_VALUE "ÐÐ»Ñ Ð¾Ð¿ÑÐ¸Ð¸ %1 Ð´Ð¾Ð»Ð¶Ð½Ð¾ Ð±ÑÑÑ ÑÐºÐ°Ð·Ð°Ð½Ð¾ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ.\n" IDS_BAD_OPTION "ÐÐµÐ²ÐµÑÐ½Ð°Ñ Ð¾Ð¿ÑÐ¸Ñ %1.\n" IDS_BAD_PARAMETER "ÐÐµÐ²ÐµÑÐ½ÑÐ¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ %1.\n" IDS_BAD_VALUE "ÐÐµÐ´Ð¾Ð¿ÑÑÑÐ¸Ð¼Ð¾Ðµ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ° %1, Ð´Ð¾Ð¿ÑÑÑÐ¸Ð¼ÑÐ¹ Ð´Ð¸Ð°Ð¿Ð°Ð·Ð¾Ð½ Ñ %2!d! Ð¿Ð¾ %3!u!.\n" - IDS_WRONG_FAMILY "The option %1 is only supported for %2.\n" - IDS_UNKNOWN_HOST "Ping could not find host %1. Please check the name and try again.\n" + IDS_WRONG_FAMILY "ÐÐ¿ÑÐ¸Ñ %1 Ð´Ð¾ÑÑÑÐ¿Ð½Ð° ÑÐ¾Ð»ÑÐºÐ¾ Ð´Ð»Ñ %2.\n" + IDS_UNKNOWN_HOST "Ping Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð½Ð°Ð¹ÑÐ¸ ÑÐ·ÐµÐ» %1. ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, Ð¿ÑÐ¾Ð²ÐµÑÑÑÐµ Ð¸Ð¼Ñ Ð¸ Ð¿Ð¾Ð²ÑÐ¾ÑÐ¸ÑÐµ Ð¿Ð¾Ð¿ÑÑÐºÑ.\n" IDS_PINGING_ADDRESS "\nÐÐ±Ð¼ÐµÐ½ Ð¿Ð°ÐºÐµÑÐ°Ð¼Ð¸ Ñ %1 %0" IDS_PINGING_HOSTNAME "\nÐÐ±Ð¼ÐµÐ½ Ð¿Ð°ÐºÐµÑÐ°Ð¼Ð¸ Ñ %1 [%2] %0" IDS_SOURCE_ADDRESS "from %1!s! %0" IDS_PING_SIZE "Ð¿Ð¾ %1!d! Ð±Ð°Ð¹ÑÐ° Ð´Ð°Ð½Ð½ÑÑ:\n\n" IDS_REPLY_FROM "ÐÑÐ²ÐµÑ Ð¾Ñ %1: %0" IDS_REPLY_BYTES "ÑÐ¸ÑÐ»Ð¾ Ð±Ð°Ð¹Ñ=%1!d! %0" - IDS_REPLY_TIME_MS "Ð²ÑÐµÐ¼Ñ=%1!d!ms %0" - IDS_REPLY_TIME_0MS "Ð²ÑÐµÐ¼Ñ<1ms %0" + IDS_REPLY_TIME_MS "Ð²ÑÐµÐ¼Ñ=%1!d!Ð¼Ñ %0" + IDS_REPLY_TIME_0MS "Ð²ÑÐµÐ¼Ñ<1Ð¼Ñ %0" IDS_REPLY_TTL "TTL=%1!d!\n" - IDS_REPLY_STATUS "Echo reply returned %1.\n" - IDS_DEST_HOST_UNREACHABLE "Destination host unreachable.\n" - IDS_DEST_NET_UNREACHABLE "Destination net unreachable.\n" + IDS_REPLY_STATUS "ÐÑÐ²ÐµÑ Ð¾Ñ %1.\n" + IDS_DEST_HOST_UNREACHABLE "ÐÐ°Ð´Ð°Ð½Ð½ÑÐ¹ ÑÐ·ÐµÐ» Ð½ÐµÐ´Ð¾ÑÑÑÐ¿ÐµÐ½.\n" + IDS_DEST_NET_UNREACHABLE "ÐÐ°Ð´Ð°Ð½Ð½Ð°Ñ ÑÐµÑÑ Ð½ÐµÐ´Ð¾ÑÑÑÐ¿Ð½Ð°.\n" IDS_REQUEST_TIMED_OUT "ÐÑÐµÐ²ÑÑÐµÐ½ Ð¸Ð½ÑÐµÑÐ²Ð°Ð» Ð¾Ð¶Ð¸Ð´Ð°Ð½Ð¸Ñ Ð´Ð»Ñ Ð·Ð°Ð¿ÑÐ¾ÑÐ°.\n" - IDS_TTL_EXPIRED "TTL expired in transit.\n" - IDS_TRANSMIT_FAILED "PING: transmit failed. (Error %1!u!)\n" + IDS_TTL_EXPIRED "ÐÑÐµÐ²ÑÑÐµÐ½ ÑÑÐ¾Ðº Ð¶Ð¸Ð·Ð½Ð¸ (TTL) Ð¿ÑÐ¸ Ð¿ÐµÑÐµÐ´Ð°ÑÐµ Ð¿Ð°ÐºÐµÑÐ°.\n" + IDS_TRANSMIT_FAILED "PING: ÑÐ±Ð¾Ð¹ Ð¿ÐµÑÐµÐ´Ð°ÑÐ¸. (ÐÑÐ¸Ð±ÐºÐ° %1!u!)\n" IDS_STATISTICS "\n\ Ð¡ÑÐ°ÑÐ¸ÑÑÐ¸ÐºÐ° Ping Ð´Ð»Ñ %1!s!:\n\ @@ -62,5 +61,5 @@ IDS_APPROXIMATE_RTT "ÐÑÐ¸Ð±Ð»Ð¸Ð·Ð¸ÑÐµÐ»ÑÐ½Ð¾Ðµ Ð²ÑÐµÐ¼Ñ Ð¿ÑÐ¸ÐµÐ¼Ð°-Ð¿ÐµÑÐµÐ´Ð°ÑÐ¸ Ð² Ð¼Ñ:\n\ ÐÐ¸Ð½Ð¸Ð¼Ð°Ð»ÑÐ½Ð¾Ðµ = %1!u!ms, ÐÐ°ÐºÑÐ¸Ð¼Ð°Ð»ÑÐ½Ð¾Ðµ = %2!u!ms, Ð¡ÑÐµÐ´Ð½ÐµÐµ = %3!u!ms\n" - IDS_WINSOCK_FAIL "Failed to initialize WinSock: %1!d!\n" + IDS_WINSOCK_FAIL "ÐÐµ ÑÐ´Ð°Ð»Ð¾ÑÑ Ð¸Ð½Ð¸ÑÐ¸Ð°Ð»Ð¸Ð·Ð¸ÑÐ¾Ð²Ð°ÑÑ WinSock: %1!d!\n" END

8 years, 2 months

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 2016