wine-commits February 2017

wine-commits@winehq.org

2 participants
838 discussions

Alistair Leslie-Hughes : dpnet: Use registry lookup in EnumServiceProviders.
by Alexandre Julliard 13 Feb '17

13 Feb '17

Module: wine Branch: master Commit: e21c573295a4fa8b00388b2c05d7c0a37bd6b161 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e21c573295a4fa8b00388b2c0… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Feb 9 06:45:42 2017 +0000 dpnet: Use registry lookup in EnumServiceProviders. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/peer.c | 118 +++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 90 insertions(+), 28 deletions(-) diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c index d7144df..461d610 100644 --- a/dlls/dpnet/peer.c +++ b/dlls/dpnet/peer.c @@ -126,63 +126,125 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_Initialize(IDirectPlay8Peer *iface, return DPN_OK; } -static HRESULT WINAPI IDirectPlay8PeerImpl_EnumServiceProviders(IDirectPlay8Peer *iface, - const GUID * const pguidServiceProvider, const GUID * const pguidApplication, - DPN_SERVICE_PROVIDER_INFO * const pSPInfoBuffer, DWORD * const pcbEnumData, - DWORD * const pcReturned, const DWORD dwFlags) +static HRESULT enum_services_providers(const GUID * const service, DPN_SERVICE_PROVIDER_INFO * const info_buffer, + DWORD * const buf_size, DWORD * const returned) { - static const WCHAR dp_providerW[] = {'D','i','r','e','c','t','P','l','a','y','8',' ','T','C','P','/','I','P',' ', - 'S','e','r','v','i','c','e',' ','P','r','o','v','i','d','e','r','\0'}; + static const WCHAR serviceproviders[] = {'S','O','F','T','W','A','R','E','\\','M','i','c','r','o','s','o','f','t','\\', + 'D','i','r','e','c','t','P','l','a','y','8','\\', + 'S','e','r','v','i','c','e',' ','P','r','o','v','i','d','e','r','s',0}; + static const WCHAR friendly[] = {'F','r','i','e','n','d','l','y',' ','N','a','m','e',0}; static const WCHAR dp_adapterW[] = {'L','o','c','a','l',' ','A','r','e','a',' ','C','o','n','n','e','c','t','i','o','n', - ' ','-',' ','I','P','v','4','\0'}; - + ' ','-',' ','I','P','v','4',0}; static const GUID adapter_guid = {0x4ce725f6, 0xd3c0, 0xdade, {0xba, 0x6f, 0x11, 0xf9, 0x65, 0xbc, 0x42, 0x99}}; - DWORD req_size; - - TRACE("(%p)->(%p,%p,%p,%p,%p,%x): stub\n", iface, pguidServiceProvider, pguidApplication, pSPInfoBuffer, - pcbEnumData, pcReturned, dwFlags); - - if(!pcReturned || !pcbEnumData) + DWORD req_size = 0; + LONG res; + HKEY key = NULL; + LONG next_key; + DWORD index = 0; + WCHAR provider[MAX_PATH]; + DWORD size; + + if(!returned || !buf_size) return E_POINTER; - if(!pguidServiceProvider) + *returned = 0; + + if(!service) { - req_size = sizeof(DPN_SERVICE_PROVIDER_INFO) + sizeof(dp_providerW); + res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, serviceproviders, 0, KEY_READ, &key); + if(res == ERROR_FILE_NOT_FOUND) + return DPNERR_DOESNOTEXIST; + + next_key = RegEnumKeyW( key, index, provider, MAX_PATH); + while(next_key == ERROR_SUCCESS) + { + res = RegGetValueW(key, provider, friendly, RRF_RT_REG_SZ, NULL, NULL, &size); + if(res == ERROR_SUCCESS) + { + req_size += sizeof(DPN_SERVICE_PROVIDER_INFO) + size; + + (*returned)++; + } + + index++; + next_key = RegEnumKeyW( key, index, provider, MAX_PATH ); + } + } - else if(IsEqualGUID(pguidServiceProvider, &CLSID_DP8SP_TCPIP)) + else if(IsEqualGUID(service, &CLSID_DP8SP_TCPIP)) { req_size = sizeof(DPN_SERVICE_PROVIDER_INFO) + sizeof(dp_adapterW); } else { FIXME("Application requested a provider we don't handle (yet)\n"); - *pcReturned = 0; return DPNERR_DOESNOTEXIST; } - if(*pcbEnumData < req_size) + if(*buf_size < req_size) { - *pcbEnumData = req_size; + RegCloseKey(key); + + *buf_size = req_size; return DPNERR_BUFFERTOOSMALL; } - pSPInfoBuffer->pwszName = (LPWSTR)(pSPInfoBuffer + 1); - - if(!pguidServiceProvider) + if(!service) { - lstrcpyW(pSPInfoBuffer->pwszName, dp_providerW); - pSPInfoBuffer->guid = CLSID_DP8SP_TCPIP; + int offset = 0; + int count = 0; + char *infoend = ((char *)info_buffer + (sizeof(DPN_SERVICE_PROVIDER_INFO) * (*returned))); + + index = 0; + next_key = RegEnumKeyW( key, index, provider, MAX_PATH); + while(next_key == ERROR_SUCCESS) + { + res = RegGetValueW(key, provider, friendly, RRF_RT_REG_SZ, NULL, NULL, &size); + if(res == ERROR_SUCCESS) + { + info_buffer[count].guid = CLSID_DP8SP_TCPIP; + info_buffer[count].pwszName = (LPWSTR)(infoend + offset); + + RegGetValueW(key, provider, friendly, RRF_RT_REG_SZ, NULL, info_buffer[count].pwszName, &size); + + offset += size; + count++; + } + + index++; + next_key = RegEnumKeyW(key, index, provider, MAX_PATH); + } } else { - lstrcpyW(pSPInfoBuffer->pwszName, dp_adapterW); - pSPInfoBuffer->guid = adapter_guid; + info_buffer->pwszName = (LPWSTR)(info_buffer + 1); + lstrcpyW(info_buffer->pwszName, dp_adapterW); + info_buffer->guid = adapter_guid; + *returned = 1; } - *pcReturned = 1; + RegCloseKey(key); + return DPN_OK; } +static HRESULT WINAPI IDirectPlay8PeerImpl_EnumServiceProviders(IDirectPlay8Peer *iface, + const GUID * const pguidServiceProvider, const GUID * const pguidApplication, + DPN_SERVICE_PROVIDER_INFO * const pSPInfoBuffer, DWORD * const pcbEnumData, + DWORD * const pcReturned, const DWORD dwFlags) +{ + TRACE("(%p)->(%s,%s,%p,%p,%p,%x)\n", iface, debugstr_guid(pguidServiceProvider), debugstr_guid(pguidApplication), + pSPInfoBuffer, pcbEnumData, pcReturned, dwFlags); + + if(dwFlags) + FIXME("Unhandled flags %x\n", dwFlags); + + if(pguidApplication) + FIXME("Application guid %s is currently being ignored\n", debugstr_guid(pguidApplication)); + + return enum_services_providers(pguidServiceProvider, pSPInfoBuffer, pcbEnumData, pcReturned); +} + static HRESULT WINAPI IDirectPlay8PeerImpl_CancelAsyncOperation(IDirectPlay8Peer *iface, const DPNHANDLE hAsyncHandle, const DWORD dwFlags) {

1 0

Jacob Lifshay : kernel32: Fix improper escaping of quotes in command line.
by Alexandre Julliard 13 Feb '17

13 Feb '17

Module: wine Branch: master Commit: c7ad47e9b29971509d8ea76e918b6f623ca52a17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7ad47e9b29971509d8ea76e9… Author: Jacob Lifshay <programmerjake(a)gmail.com> Date: Thu Feb 9 16:26:36 2017 -0800 kernel32: Fix improper escaping of quotes in command line. Signed-off-by: Jacob Lifshay <programmerjake(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 70c38eb..5b8a3d3 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -745,6 +745,10 @@ static void update_library_argv0( const WCHAR *argv0 ) * resulting in an odd number of '\' followed by a '"' * '\"' -> '\\\"' * '\\"' -> '\\\\\"' + * - '\'s are followed by the closing '"' must be doubled, + * resulting in an even number of '\' followed by a '"' + * ' \' -> '" \\"' + * ' \\' -> '" \\\\"' * - '\'s that are not followed by a '"' can be left as is * 'a\b' == 'a\b' * 'a\\b' == 'a\\b' @@ -787,7 +791,7 @@ static BOOL build_command_line( WCHAR **argv ) } len+=(a-*arg)+1 /* for the separating space */; if (has_space) - len+=2; /* for the quotes */ + len+=2+bcount; /* for the quotes and doubling of '\' preceding the closing quote */ } if (!(rupp->CommandLine.Buffer = RtlAllocateHeap( GetProcessHeap(), 0, len * sizeof(WCHAR)))) @@ -800,6 +804,7 @@ static BOOL build_command_line( WCHAR **argv ) { BOOL has_space,has_quote; WCHAR* a; + int bcount; /* Check for quotes and spaces in this argument */ has_space=has_quote=FALSE; @@ -821,9 +826,7 @@ static BOOL build_command_line( WCHAR **argv ) /* Now transfer it to the command line */ if (has_space) *p++='"'; - if (has_quote) { - int bcount; - + if (has_quote || has_space) { bcount=0; a=*arg; while (*a!='\0') { @@ -849,8 +852,14 @@ static BOOL build_command_line( WCHAR **argv ) WCHAR* x = *arg; while ((*p=*x++)) p++; } - if (has_space) + if (has_space) { + int i; + + /* Double all the '\' preceding the closing quote */ + for (i=0;i<bcount;i++) + *p++='\\'; *p++='"'; + } *p++=' '; } if (p > rupp->CommandLine.Buffer)

1 0

Gerald Pfeifer : services/tests: Add #include <stdarg.h> to service.c.
by Alexandre Julliard 13 Feb '17

13 Feb '17

Module: wine Branch: master Commit: f353e42561ad8dc984cf6d636aee6b0f3b17729b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f353e42561ad8dc984cf6d636… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Feb 10 21:57:18 2017 +0100 services/tests: Add #include <stdarg.h> to service.c. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/tests/service.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/programs/services/tests/service.c b/programs/services/tests/service.c index 0e9bcd7..9841949 100644 --- a/programs/services/tests/service.c +++ b/programs/services/tests/service.c @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdarg.h> + #include <windef.h> #include <winsvc.h> #include <stdio.h>

1 0

André Hentschel : iphlpapi/tests: Add tests for GetUnicastIpAddressEntry.
by Alexandre Julliard 13 Feb '17

13 Feb '17

Module: wine Branch: master Commit: eaa5450ccd2abfb1b2946bb668cbfe45b7a50945 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaa5450ccd2abfb1b2946bb66… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 10 18:31:36 2017 +0100 iphlpapi/tests: Add tests for GetUnicastIpAddressEntry. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/tests/iphlpapi.c | 113 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 113 insertions(+) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index e4a5864..e0701a3 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -75,6 +75,7 @@ static DWORD (WINAPI *pGetTcpTable)(PMIB_TCPTABLE,PDWORD,BOOL); static DWORD (WINAPI *pGetUdpTable)(PMIB_UDPTABLE,PDWORD,BOOL); static DWORD (WINAPI *pGetPerAdapterInfo)(ULONG,PIP_PER_ADAPTER_INFO,PULONG); static DWORD (WINAPI *pGetAdaptersAddresses)(ULONG,ULONG,PVOID,PIP_ADAPTER_ADDRESSES,PULONG); +static DWORD (WINAPI *pGetUnicastIpAddressEntry)(MIB_UNICASTIPADDRESS_ROW*); static DWORD (WINAPI *pNotifyAddrChange)(PHANDLE,LPOVERLAPPED); static BOOL (WINAPI *pCancelIPChangeNotify)(LPOVERLAPPED); static DWORD (WINAPI *pGetExtendedTcpTable)(PVOID,PDWORD,BOOL,ULONG,TCP_TABLE_CLASS,ULONG); @@ -123,6 +124,7 @@ static void loadIPHlpApi(void) pGetUdpTable = (void *)GetProcAddress(hLibrary, "GetUdpTable"); pGetPerAdapterInfo = (void *)GetProcAddress(hLibrary, "GetPerAdapterInfo"); pGetAdaptersAddresses = (void *)GetProcAddress(hLibrary, "GetAdaptersAddresses"); + pGetUnicastIpAddressEntry = (void *)GetProcAddress(hLibrary, "GetUnicastIpAddressEntry"); pNotifyAddrChange = (void *)GetProcAddress(hLibrary, "NotifyAddrChange"); pCancelIPChangeNotify = (void *)GetProcAddress(hLibrary, "CancelIPChangeNotify"); pGetExtendedTcpTable = (void *)GetProcAddress(hLibrary, "GetExtendedTcpTable"); @@ -1965,6 +1967,116 @@ static void test_GetIfTable2(void) pFreeMibTable( table ); } +static void test_GetUnicastIpAddressEntry(void) +{ + IP_ADAPTER_ADDRESSES *aa, *ptr; + MIB_UNICASTIPADDRESS_ROW row; + DWORD ret, size; + + if (!pGetUnicastIpAddressEntry) + { + win_skip( "GetUnicastIpAddressEntry not available\n" ); + return; + } + + ret = pGetUnicastIpAddressEntry( NULL ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + + memset( &row, 0, sizeof(row) ); + ret = pGetUnicastIpAddressEntry( &row ); + todo_wine ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + + memset( &row, 0, sizeof(row) ); + row.Address.Ipv4.sin_family = AF_INET; + row.Address.Ipv4.sin_port = 0; + row.Address.Ipv4.sin_addr.S_un.S_addr = 0x01020304; + ret = pGetUnicastIpAddressEntry( &row ); + ok( ret == ERROR_FILE_NOT_FOUND, "got %u\n", ret ); + + memset( &row, 0, sizeof(row) ); + row.InterfaceIndex = 123; + ret = pGetUnicastIpAddressEntry( &row ); + todo_wine ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + + memset( &row, 0, sizeof(row) ); + row.InterfaceIndex = get_interface_index(); + row.Address.Ipv4.sin_family = AF_INET; + row.Address.Ipv4.sin_port = 0; + row.Address.Ipv4.sin_addr.S_un.S_addr = 0x01020304; + ret = pGetUnicastIpAddressEntry( &row ); + ok( ret == ERROR_NOT_FOUND, "got %u\n", ret ); + + memset( &row, 0, sizeof(row) ); + row.InterfaceIndex = 123; + row.Address.Ipv4.sin_family = AF_INET; + row.Address.Ipv4.sin_port = 0; + row.Address.Ipv4.sin_addr.S_un.S_addr = 0x01020304; + ret = pGetUnicastIpAddressEntry( &row ); + ok( ret == ERROR_FILE_NOT_FOUND, "got %u\n", ret ); + + ret = pGetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_INTERFACES, NULL, NULL, &size); + ok(ret == ERROR_BUFFER_OVERFLOW, "expected ERROR_BUFFER_OVERFLOW, got %u\n", ret); + if (ret != ERROR_BUFFER_OVERFLOW) return; + + ptr = HeapAlloc(GetProcessHeap(), 0, size); + ret = pGetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_INTERFACES, NULL, ptr, &size); + ok(!ret, "expected ERROR_SUCCESS got %u\n", ret); + + for (aa = ptr; !ret && aa; aa = aa->Next) + { + IP_ADAPTER_UNICAST_ADDRESS *ua; + + ua = aa->FirstUnicastAddress; + while (ua) + { + /* test with luid */ + memset( &row, 0, sizeof(row) ); + memcpy(&row.InterfaceLuid, &aa->Luid, sizeof(aa->Luid)); + memcpy(&row.Address, ua->Address.lpSockaddr, ua->Address.iSockaddrLength); + ret = pGetUnicastIpAddressEntry( &row ); + ok( ret == NO_ERROR, "got %u\n", ret ); + + /* test with index */ + memset( &row, 0, sizeof(row) ); + row.InterfaceIndex = S(U(*aa)).IfIndex; + memcpy(&row.Address, ua->Address.lpSockaddr, ua->Address.iSockaddrLength); + ret = pGetUnicastIpAddressEntry( &row ); + ok( ret == NO_ERROR, "got %u\n", ret ); + if (ret == NO_ERROR) + { + ok(row.InterfaceLuid.Info.Reserved == aa->Luid.Info.Reserved, "Expected %d, got %d\n", + aa->Luid.Info.Reserved, row.InterfaceLuid.Info.Reserved); + ok(row.InterfaceLuid.Info.NetLuidIndex == aa->Luid.Info.NetLuidIndex, "Expected %d, got %d\n", + aa->Luid.Info.NetLuidIndex, row.InterfaceLuid.Info.NetLuidIndex); + ok(row.InterfaceLuid.Info.IfType == aa->Luid.Info.IfType, "Expected %d, got %d\n", + aa->Luid.Info.IfType, row.InterfaceLuid.Info.IfType); + ok(row.InterfaceIndex == S(U(*aa)).IfIndex, "Expected %d, got %d\n", + S(U(*aa)).IfIndex, row.InterfaceIndex); + ok(row.PrefixOrigin == ua->PrefixOrigin, "Expected %d, got %d\n", + ua->PrefixOrigin, row.PrefixOrigin); + ok(row.SuffixOrigin == ua->SuffixOrigin, "Expected %d, got %d\n", + ua->SuffixOrigin, row.SuffixOrigin); + ok(row.ValidLifetime == ua->ValidLifetime, "Expected %d, got %d\n", + ua->ValidLifetime, row.ValidLifetime); + ok(row.PreferredLifetime == ua->PreferredLifetime, "Expected %d, got %d\n", + ua->PreferredLifetime, row.PreferredLifetime); + ok(row.OnLinkPrefixLength == ua->OnLinkPrefixLength, "Expected %d, got %d\n", + ua->OnLinkPrefixLength, row.OnLinkPrefixLength); + ok(row.SkipAsSource == 0, "Expected 0, got %d\n", row.SkipAsSource); + ok(row.DadState == ua->DadState, "Expected %d, got %d\n", ua->DadState, row.DadState); + if (row.Address.si_family == AF_INET6) + ok(row.ScopeId.Value == row.Address.Ipv6.sin6_scope_id, "Expected %d, got %d\n", + row.Address.Ipv6.sin6_scope_id, row.ScopeId.Value); + else + ok(row.ScopeId.Value == 0, "Expected 0, got %d\n", row.ScopeId.Value); + ok(row.CreationTimeStamp.QuadPart, "CreationTimeStamp is 0\n"); + } + ua = ua->Next; + } + } + HeapFree(GetProcessHeap(), 0, ptr); +} + START_TEST(iphlpapi) { @@ -1989,6 +2101,7 @@ START_TEST(iphlpapi) test_interface_identifier_conversion(); test_GetIfEntry2(); test_GetIfTable2(); + test_GetUnicastIpAddressEntry(); freeIPHlpApi(); } }

1 0

André Hentschel : iphlpapi: Add GetUnicastIpAddressEntry implementation.
by Alexandre Julliard 13 Feb '17

13 Feb '17

Module: wine Branch: master Commit: ccdbceeefc196999a698fc1842d4f1bff651ec22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccdbceeefc196999a698fc184… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 10 18:30:13 2017 +0100 iphlpapi: Add GetUnicastIpAddressEntry implementation. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 67 +++++++++++++++++++++++++++++++++++++++++++ include/netioapi.h | 17 +++++++++++ include/ws2def.h | 13 +++++++++ include/ws2ipdef.h | 7 +++++ 5 files changed, 105 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 500267c..1a1f8f7 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -147,7 +147,7 @@ @ stub GetUdpStatsFromStack @ stdcall GetUdpTable( ptr ptr long ) @ stub GetUdpTableFromStack -#@ stub GetUnicastIpAddressEntry +@ stdcall GetUnicastIpAddressEntry( ptr ) #@ stub GetUnicastIpAddressTable @ stdcall GetUniDirectionalAdapterInfo( ptr ptr ) @ stdcall Icmp6CreateFile() diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 1daf54d..12767c3 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2467,6 +2467,73 @@ DWORD WINAPI GetExtendedUdpTable(PVOID pUdpTable, PDWORD pdwSize, BOOL bOrder, return ret; } +DWORD WINAPI GetUnicastIpAddressEntry(MIB_UNICASTIPADDRESS_ROW *row) +{ + IP_ADAPTER_ADDRESSES *aa, *ptr; + ULONG size = 0; + DWORD ret; + + TRACE("%p\n", row); + + if (!row) + return ERROR_INVALID_PARAMETER; + + ret = GetAdaptersAddresses(row->Address.si_family, 0, NULL, NULL, &size); + if (ret != ERROR_BUFFER_OVERFLOW) + return ret; + if (!(ptr = HeapAlloc(GetProcessHeap(), 0, size))) + return ERROR_OUTOFMEMORY; + if ((ret = GetAdaptersAddresses(row->Address.si_family, 0, NULL, ptr, &size))) + { + HeapFree(GetProcessHeap(), 0, ptr); + return ret; + } + + ret = ERROR_FILE_NOT_FOUND; + for (aa = ptr; aa; aa = aa->Next) + { + IP_ADAPTER_UNICAST_ADDRESS *ua; + + if (aa->u.s.IfIndex != row->InterfaceIndex && + memcmp(&aa->Luid, &row->InterfaceLuid, sizeof(row->InterfaceLuid))) + continue; + ret = ERROR_NOT_FOUND; + + ua = aa->FirstUnicastAddress; + while (ua) + { + SOCKADDR_INET *uaaddr = (SOCKADDR_INET *)ua->Address.lpSockaddr; + + if ((row->Address.si_family == WS_AF_INET6 && + !memcmp(&row->Address.Ipv6.sin6_addr, &uaaddr->Ipv6.sin6_addr, sizeof(uaaddr->Ipv6.sin6_addr))) || + (row->Address.si_family == WS_AF_INET && + row->Address.Ipv4.sin_addr.S_un.S_addr == uaaddr->Ipv4.sin_addr.S_un.S_addr)) + { + memcpy(&row->InterfaceLuid, &aa->Luid, sizeof(aa->Luid)); + row->InterfaceIndex = aa->u.s.IfIndex; + row->PrefixOrigin = ua->PrefixOrigin; + row->SuffixOrigin = ua->SuffixOrigin; + row->ValidLifetime = ua->ValidLifetime; + row->PreferredLifetime = ua->PreferredLifetime; + row->OnLinkPrefixLength = ua->OnLinkPrefixLength; + row->SkipAsSource = 0; + row->DadState = ua->DadState; + if (row->Address.si_family == WS_AF_INET6) + row->ScopeId.u.Value = row->Address.Ipv6.sin6_scope_id; + else + row->ScopeId.u.Value = 0; + NtQuerySystemTime(&row->CreationTimeStamp); + HeapFree(GetProcessHeap(), 0, ptr); + return NO_ERROR; + } + ua = ua->Next; + } + } + HeapFree(GetProcessHeap(), 0, ptr); + + return ret; +} + /****************************************************************** * GetUniDirectionalAdapterInfo (IPHLPAPI.@) * diff --git a/include/netioapi.h b/include/netioapi.h index 0357431..0e777c7 100644 --- a/include/netioapi.h +++ b/include/netioapi.h @@ -82,6 +82,22 @@ typedef struct _MIB_IF_TABLE2 MIB_IF_ROW2 Table[1]; } MIB_IF_TABLE2, *PMIB_IF_TABLE2; +typedef struct _MIB_UNICASTIPADDRESS_ROW +{ + SOCKADDR_INET Address; + NET_LUID InterfaceLuid; + NET_IFINDEX InterfaceIndex; + NL_PREFIX_ORIGIN PrefixOrigin; + NL_SUFFIX_ORIGIN SuffixOrigin; + ULONG ValidLifetime; + ULONG PreferredLifetime; + UINT8 OnLinkPrefixLength; + BOOLEAN SkipAsSource; + NL_DAD_STATE DadState; + SCOPE_ID ScopeId; + LARGE_INTEGER CreationTimeStamp; +} MIB_UNICASTIPADDRESS_ROW, *PMIB_UNICASTIPADDRESS_ROW; + DWORD WINAPI ConvertInterfaceGuidToLuid(const GUID*,NET_LUID*); DWORD WINAPI ConvertInterfaceIndexToLuid(NET_IFINDEX,NET_LUID*); DWORD WINAPI ConvertInterfaceLuidToGuid(const NET_LUID*,GUID*); @@ -92,5 +108,6 @@ DWORD WINAPI ConvertInterfaceNameToLuidA(const char*,NET_LUID*); DWORD WINAPI ConvertInterfaceNameToLuidW(const WCHAR*,NET_LUID*); void WINAPI FreeMibTable(void*); DWORD WINAPI GetIfEntry2(MIB_IF_ROW2*); +DWORD WINAPI GetUnicastIpAddressEntry(MIB_UNICASTIPADDRESS_ROW*); #endif /* __WINE_NETIOAPI_H */ diff --git a/include/ws2def.h b/include/ws2def.h index cbd6f74..fa21c06 100644 --- a/include/ws2def.h +++ b/include/ws2def.h @@ -27,6 +27,8 @@ #define WS(x) x #endif +typedef USHORT ADDRESS_FAMILY; + #ifndef __CSADDR_DEFINED__ #define __CSADDR_DEFINED__ @@ -78,6 +80,17 @@ typedef enum { ScopeLevelGlobal = 14 } SCOPE_LEVEL; +typedef struct +{ + union { + struct { + ULONG Zone : 28; + ULONG Level : 4; + } DUMMYSTRUCTNAME; + ULONG Value; + } DUMMYUNIONNAME; +} SCOPE_ID, *PSCOPE_ID; + typedef struct _WSABUF { ULONG len; diff --git a/include/ws2ipdef.h b/include/ws2ipdef.h index ca47caa..e13cf6e 100644 --- a/include/ws2ipdef.h +++ b/include/ws2ipdef.h @@ -135,6 +135,13 @@ typedef struct WS(sockaddr_in6_pair) PSOCKADDR_IN6 DestinationAddress; } SOCKADDR_IN6_PAIR, *PSOCKADDR_IN6_PAIR; +typedef union _SOCKADDR_INET +{ + SOCKADDR_IN Ipv4; + SOCKADDR_IN6 Ipv6; + ADDRESS_FAMILY si_family; +} SOCKADDR_INET, *PSOCKADDR_INET; + /* * Multicast group information */

1 0

Michael Müller : server: Give all access rights when opening an object with MAXIMUM_ALLOWED.
by Alexandre Julliard 13 Feb '17

13 Feb '17

Module: wine Branch: master Commit: 0e49e0541fa4bfbf11224173a8ead006dcb41e08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e49e0541fa4bfbf11224173a… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Feb 10 18:12:06 2017 +0100 server: Give all access rights when opening an object with MAXIMUM_ALLOWED. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 38 ++++++++++++++++++++++++++++++++++++++ server/handle.c | 1 + 2 files changed, 39 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 3250544..c31dfbe 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -6414,6 +6414,43 @@ static void test_pseudo_tokens(void) "Expected ERROR_NO_TOKEN, got %u\n", GetLastError()); } +static void test_maximum_allowed(void) +{ + HANDLE (WINAPI *pCreateEventExA)(SECURITY_ATTRIBUTES *, LPCSTR, DWORD, DWORD); + char buffer_sd[SECURITY_DESCRIPTOR_MIN_LENGTH], buffer_acl[256]; + SECURITY_DESCRIPTOR *sd = (SECURITY_DESCRIPTOR *)&buffer_sd; + SECURITY_ATTRIBUTES sa; + ACL *acl = (ACL *)&buffer_acl; + HMODULE hkernel32 = GetModuleHandleA("kernel32.dll"); + ACCESS_MASK mask; + HANDLE handle; + BOOL ret; + + pCreateEventExA = (void *)GetProcAddress(hkernel32, "CreateEventExA"); + if (!pCreateEventExA) + { + win_skip("CreateEventExA is not available\n"); + return; + } + + ret = InitializeSecurityDescriptor(sd, SECURITY_DESCRIPTOR_REVISION); + ok(ret, "InitializeSecurityDescriptor failed with %u\n", GetLastError()); + ret = InitializeAcl(acl, 256, ACL_REVISION); + ok(ret, "InitializeAcl failed with %u\n", GetLastError()); + ret = SetSecurityDescriptorDacl(sd, TRUE, acl, FALSE); + ok(ret, "SetSecurityDescriptorDacl failed with %u\n", GetLastError()); + + sa.nLength = sizeof(SECURITY_ATTRIBUTES); + sa.lpSecurityDescriptor = sd; + sa.bInheritHandle = FALSE; + + handle = pCreateEventExA(&sa, NULL, 0, MAXIMUM_ALLOWED | 0x4); + ok(handle != NULL, "CreateEventExA failed with error %u\n", GetLastError()); + mask = get_obj_access(handle); + ok(mask == EVENT_ALL_ACCESS, "Expected %x, got %x\n", EVENT_ALL_ACCESS, mask); + CloseHandle(handle); +} + START_TEST(security) { init(); @@ -6461,4 +6498,5 @@ START_TEST(security) test_system_security_access(); test_GetSidIdentifierAuthority(); test_pseudo_tokens(); + test_maximum_allowed(); } diff --git a/server/handle.c b/server/handle.c index 37fba69..3f42352 100644 --- a/server/handle.c +++ b/server/handle.c @@ -272,6 +272,7 @@ static obj_handle_t alloc_handle_entry( struct process *process, void *ptr, obj_handle_t alloc_handle_no_access_check( struct process *process, void *ptr, unsigned int access, unsigned int attr ) { struct object *obj = ptr; + if (access & MAXIMUM_ALLOWED) access = GENERIC_ALL; access = obj->ops->map_access( obj, access ) & ~RESERVED_ALL; return alloc_handle_entry( process, ptr, access, attr ); }

1 0

Peter Hater : comctl32/propsheet: Added PSM_INSERTPAGE implementation.
by Alexandre Julliard 13 Feb '17

13 Feb '17

Module: wine Branch: master Commit: a6661ba9ad70dcde95272b48c8dba9d30005056f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6661ba9ad70dcde95272b48c… Author: Peter Hater <7element(a)mail.bg> Date: Sun Feb 12 21:16:31 2017 +0300 comctl32/propsheet: Added PSM_INSERTPAGE implementation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/propsheet.c | 108 +++++++++++++++++++++++++--------------- dlls/comctl32/tests/propsheet.c | 18 +++---- 2 files changed, 77 insertions(+), 49 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index f575e16..caf7181 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -32,7 +32,6 @@ * - Wizard 97 header resizing * - Enforcing of minimal wizard size * - Messages: - * o PSM_INSERTPAGE * o PSM_RECALCPAGESIZES * o PSM_SETHEADERSUBTITLE * o PSM_SETHEADERTITLE @@ -2244,70 +2243,111 @@ static LRESULT PROPSHEET_QuerySiblings(HWND hwndDlg, return msgResult; } - /****************************************************************************** - * PROPSHEET_AddPage + * PROPSHEET_InsertPage */ -static BOOL PROPSHEET_AddPage(HWND hwndDlg, - HPROPSHEETPAGE hpage) +static BOOL PROPSHEET_InsertPage(HWND hwndDlg, HPROPSHEETPAGE hpageInsertAfter, HPROPSHEETPAGE hpage) { - PropPageInfo * ppi; - PropSheetInfo * psInfo = GetPropW(hwndDlg, PropSheetInfoStr); + PropSheetInfo *psInfo = GetPropW(hwndDlg, PropSheetInfoStr); + PropPageInfo *ppi, *prev_ppi = psInfo->proppage; HWND hwndTabControl = GetDlgItem(hwndDlg, IDC_TABCONTROL); - TCITEMW item; LPCPROPSHEETPAGEW ppsp = (LPCPROPSHEETPAGEW)hpage; + TCITEMW item; + int index; - TRACE("hpage %p\n", hpage); - /* - * Allocate and fill in a new PropPageInfo entry. - */ - ppi = ReAlloc(psInfo->proppage, sizeof(PropPageInfo) * (psInfo->nPages + 1)); + TRACE("hwndDlg %p, hpageInsertAfter %p, hpage %p\n", hwndDlg, hpageInsertAfter, hpage); + + if (IS_INTRESOURCE(hpageInsertAfter)) + index = LOWORD(hpageInsertAfter); + else + { + index = PROPSHEET_GetPageIndex(hpageInsertAfter, psInfo, -1); + if (index < 0) + { + TRACE("Could not find page to insert after!\n"); + return FALSE; + } + index++; + } + + if (index > psInfo->nPages) + index = psInfo->nPages; + + ppi = Alloc(sizeof(PropPageInfo) * (psInfo->nPages + 1)); if (!ppi) return FALSE; + /* + * Fill in a new PropPageInfo entry. + */ + if (index > 0) + memcpy(ppi, prev_ppi, index * sizeof(PropPageInfo)); + memset(&ppi[index], 0, sizeof(PropPageInfo)); + if (index < psInfo->nPages) + memcpy(&ppi[index + 1], &prev_ppi[index], (psInfo->nPages - index) * sizeof(PropPageInfo)); psInfo->proppage = ppi; - if (!PROPSHEET_CollectPageInfo(ppsp, psInfo, psInfo->nPages, FALSE)) - return FALSE; - psInfo->proppage[psInfo->nPages].hpage = hpage; + if (!PROPSHEET_CollectPageInfo(ppsp, psInfo, index, FALSE)) + { + psInfo->proppage = prev_ppi; + Free(ppi); + return FALSE; + } + + psInfo->proppage[index].hpage = hpage; if (ppsp->dwFlags & PSP_PREMATURE) { /* Create the page but don't show it */ - if(!PROPSHEET_CreatePage(hwndDlg, psInfo->nPages, psInfo, ppsp)) - return FALSE; + if (!PROPSHEET_CreatePage(hwndDlg, index, psInfo, ppsp)) + { + psInfo->proppage = prev_ppi; + Free(ppi); + return FALSE; + } } + Free(prev_ppi); + psInfo->nPages++; + if (index <= psInfo->active_page) + psInfo->active_page++; + /* * Add a new tab to the tab control. */ item.mask = TCIF_TEXT; - item.pszText = (LPWSTR) psInfo->proppage[psInfo->nPages].pszText; + item.pszText = (LPWSTR) psInfo->proppage[index].pszText; item.cchTextMax = MAX_TABTEXT_LENGTH; if (psInfo->hImageList) - { SendMessageW(hwndTabControl, TCM_SETIMAGELIST, 0, (LPARAM)psInfo->hImageList); - } - if ( psInfo->proppage[psInfo->nPages].hasIcon ) + if (psInfo->proppage[index].hasIcon) { item.mask |= TCIF_IMAGE; - item.iImage = psInfo->nPages; + item.iImage = index; } - SendMessageW(hwndTabControl, TCM_INSERTITEMW, psInfo->nPages + 1, - (LPARAM)&item); - - psInfo->nPages++; + SendMessageW(hwndTabControl, TCM_INSERTITEMW, index, (LPARAM)&item); /* If it is the only page - show it */ - if(psInfo->nPages == 1) + if (psInfo->nPages == 1) PROPSHEET_SetCurSel(hwndDlg, 0, 1, 0); + return TRUE; } /****************************************************************************** + * PROPSHEET_AddPage + */ +static BOOL PROPSHEET_AddPage(HWND hwndDlg, HPROPSHEETPAGE hpage) +{ + PropSheetInfo * psInfo = GetPropW(hwndDlg, PropSheetInfoStr); + TRACE("hwndDlg %p, hpage %p\n", hwndDlg, hpage); + return PROPSHEET_InsertPage(hwndDlg, UlongToPtr(psInfo->nPages), hpage); +} + +/****************************************************************************** * PROPSHEET_RemovePage */ static BOOL PROPSHEET_RemovePage(HWND hwndDlg, @@ -2461,18 +2501,6 @@ static void PROPSHEET_SetWizButtons(HWND hwndDlg, DWORD dwFlags) } /****************************************************************************** - * PROPSHEET_InsertPage - */ -static BOOL PROPSHEET_InsertPage(HWND hwndDlg, HPROPSHEETPAGE hpageInsertAfter, HPROPSHEETPAGE hpage) -{ - if (IS_INTRESOURCE(hpageInsertAfter)) - FIXME("(%p, %d, %p): stub\n", hwndDlg, LOWORD(hpageInsertAfter), hpage); - else - FIXME("(%p, %p, %p): stub\n", hwndDlg, hpageInsertAfter, hpage); - return FALSE; -} - -/****************************************************************************** * PROPSHEET_SetHeaderTitleW */ static void PROPSHEET_SetHeaderTitleW(HWND hwndDlg, int iPageIndex, LPCWSTR pszHeaderTitle) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 1c284ff..7547e79 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -935,7 +935,7 @@ static void test_PSM_INSERTPAGE(void) /* add pages one by one */ ret = SendMessageA(hdlg, PSM_INSERTPAGE, 5, (LPARAM)hpsp[1]); - todo_wine ok(ret == TRUE, "got %d\n", ret); + ok(ret == TRUE, "got %d\n", ret); /* try with invalid values */ ret = SendMessageA(hdlg, PSM_INSERTPAGE, 0, 0); @@ -954,34 +954,34 @@ if (0) tab = (HWND)SendMessageA(hdlg, PSM_GETTABCONTROL, 0, 0); r = SendMessageA(tab, TCM_GETITEMCOUNT, 0, 0); - todo_wine ok(r == 2, "got %d\n", r); + ok(r == 2, "got %d\n", r); ret = SendMessageA(hdlg, PSM_INSERTPAGE, (WPARAM)hpsp[1], (LPARAM)hpsp[2]); - todo_wine ok(ret == TRUE, "got %d\n", ret); + ok(ret == TRUE, "got %d\n", ret); r = SendMessageA(tab, TCM_GETITEMCOUNT, 0, 0); - todo_wine ok(r == 3, "got %d\n", r); + ok(r == 3, "got %d\n", r); /* add property sheet page that can't be created */ ret = SendMessageA(hdlg, PSM_INSERTPAGE, 1, (LPARAM)hpsp[3]); - todo_wine ok(ret == TRUE, "got %d\n", ret); + ok(ret == TRUE, "got %d\n", ret); r = SendMessageA(tab, TCM_GETITEMCOUNT, 0, 0); - todo_wine ok(r == 4, "got %d\n", r); + ok(r == 4, "got %d\n", r); /* select page that can't be created */ ret = SendMessageA(hdlg, PSM_SETCURSEL, 1, 0); - todo_wine ok(ret == TRUE, "got %d\n", ret); + ok(ret == TRUE, "got %d\n", ret); r = SendMessageA(tab, TCM_GETITEMCOUNT, 0, 0); - todo_wine ok(r == 3, "got %d\n", r); + ok(r == 3, "got %d\n", r); /* test PSP_PREMATURE flag with incorrect property sheet page */ ret = SendMessageA(hdlg, PSM_INSERTPAGE, 0, (LPARAM)hpsp[4]); ok(ret == FALSE, "got %d\n", ret); r = SendMessageA(tab, TCM_GETITEMCOUNT, 0, 0); - todo_wine ok(r == 3, "got %d\n", r); + ok(r == 3, "got %d\n", r); DestroyPropertySheetPage(hpsp[4]); DestroyWindow(hdlg);

1 0

Nikolay Sivov : advapi32: Fix trace format of InitiateSystemShutdownEx().
by Alexandre Julliard 13 Feb '17

13 Feb '17

Module: wine Branch: master Commit: 28d9215961e381b93a742d88c6e64ff0713ab67e URL: http://source.winehq.org/git/wine.git/?a=commit;h=28d9215961e381b93a742d88c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 12 21:13:53 2017 +0300 advapi32: Fix trace format of InitiateSystemShutdownEx(). 'Reason' argument is a set of flags Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/advapi.c b/dlls/advapi32/advapi.c index def40e5..1c528ef 100644 --- a/dlls/advapi32/advapi.c +++ b/dlls/advapi32/advapi.c @@ -231,7 +231,7 @@ BOOL WINAPI InitiateSystemShutdownExA( LPSTR lpMachineName, LPSTR lpMessage, DWORD dwTimeout, BOOL bForceAppsClosed, BOOL bRebootAfterShutdown, DWORD dwReason) { - FIXME("%s %s %d %d %d %d\n", debugstr_a(lpMachineName), + FIXME("%s %s %d %d %d %#x\n", debugstr_a(lpMachineName), debugstr_a(lpMessage), dwTimeout, bForceAppsClosed, bRebootAfterShutdown, dwReason); return TRUE; @@ -246,7 +246,7 @@ BOOL WINAPI InitiateSystemShutdownExW( LPWSTR lpMachineName, LPWSTR lpMessage, DWORD dwTimeout, BOOL bForceAppsClosed, BOOL bRebootAfterShutdown, DWORD dwReason) { - FIXME("%s %s %d %d %d %d\n", debugstr_w(lpMachineName), + FIXME("%s %s %d %d %d %#x\n", debugstr_w(lpMachineName), debugstr_w(lpMessage), dwTimeout, bForceAppsClosed, bRebootAfterShutdown, dwReason); return TRUE;

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 13 Feb '17

13 Feb '17

Module: wine Branch: master Commit: 9135c03f4f892f292ecb284a13f80efd92ae06f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9135c03f4f892f292ecb284a1… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Sat Feb 11 08:55:15 2017 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/lt.po b/po/lt.po index 7e399ed..f8e5688 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-02-10 21:23+0300\n" +"PO-Revision-Date: 2017-02-11 08:54+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -9353,10 +9353,8 @@ msgid "Confidentiality Required" msgstr "Reikalingas slaptumas" #: wldap32.rc:46 -#, fuzzy -#| msgid "Shutdown in progress.\n" msgid "SASL Bind in Progress" -msgstr "Vyksta sistemos stabdymas.\n" +msgstr "Vyksta SASL saistymas" #: wldap32.rc:48 msgid "No Such Attribute"

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 13 Feb '17

13 Feb '17

Module: wine Branch: master Commit: 8e8919fe60fed7a59ef54d94cbf9b10725c7f8f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e8919fe60fed7a59ef54d94c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 12 21:12:59 2017 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/po/ru.po b/po/ru.po index 0dec23c..25a4e97 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-02-02 09:41+0300\n" +"PO-Revision-Date: 2017-02-11 02:32+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -9352,10 +9352,8 @@ msgid "Confidentiality Required" msgstr "Требуется конфиденциальность" #: wldap32.rc:46 -#, fuzzy -#| msgid "Shutdown in progress.\n" msgid "SASL Bind in Progress" -msgstr "Система подготавливается к отключению.\n" +msgstr "Выполняется привязка с помощью SASL" #: wldap32.rc:48 msgid "No Such Attribute" @@ -11945,17 +11943,11 @@ msgstr "Не удалось переименовать выбранное зна #: regedit.rc:220 msgid "" "The keys and values contained in %1 were successfully added to the registry." -msgstr "" +msgstr "Ключи и значения из «%1» были успешно добавлены в реестр." #: regedit.rc:221 -#, fuzzy -#| msgid "" -#| "Unable to rename the key '%1'.\n" -#| "The specified key name already exists." msgid "Unable to import %1. The specified file is not a valid registry file." -msgstr "" -"Не удалось переименовать ключ «%1».\n" -"Ключ с указанным именем уже существует." +msgstr "Не удалось импортировать «%1». Некорректный файл реестра." #: regedit.rc:373 msgid ""

1 0

← Newer
1
...
49
50
51
52
53
54
55
...
84
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2017