June 2017 - Wine-Commits - list.winehq.org

Henri Verbeet : d2d1: Implement d2d_rectangle_geometry_GetBounds().
by Alexandre Julliard June 2, 2017

June 2, 2017

Module: wine Branch: master Commit: 2485305b55a295662162d62f44ac947ae48a0b95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2485305b55a295662162d62f4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 2 17:56:33 2017 +0200 d2d1: Implement d2d_rectangle_geometry_GetBounds(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 12 ++++++++++ dlls/d2d1/geometry.c | 45 ++++++++++++++++++++++++------------- dlls/d2d1/render_target.c | 12 ---------- dlls/d2d1/tests/d2d1.c | 57 +++++++++++++++++++++++++++++++++++++++++++---- 4 files changed, 94 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2485305b55a295662162d…

1 0

Henri Verbeet : d2d1: Implement d2d_layer_GetSize().
by Alexandre Julliard June 2, 2017

June 2, 2017

Module: wine Branch: master Commit: bc47dc3f41bc0614a824439d77ba74963a7e2f2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc47dc3f41bc0614a824439d7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 2 17:56:32 2017 +0200 d2d1: Implement d2d_layer_GetSize(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 3 ++- dlls/d2d1/layer.c | 11 +++++++---- dlls/d2d1/render_target.c | 2 +- dlls/d2d1/tests/d2d1.c | 12 ++++++++++++ 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 12a230b..377adf6 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -242,9 +242,10 @@ struct d2d_layer LONG refcount; ID2D1Factory *factory; + D2D1_SIZE_F size; }; -HRESULT d2d_layer_create(ID2D1Factory *factory, struct d2d_layer **layer) DECLSPEC_HIDDEN; +HRESULT d2d_layer_create(ID2D1Factory *factory, const D2D1_SIZE_F *size, struct d2d_layer **layer) DECLSPEC_HIDDEN; struct d2d_mesh { diff --git a/dlls/d2d1/layer.c b/dlls/d2d1/layer.c index 0fcd185..25a331b 100644 --- a/dlls/d2d1/layer.c +++ b/dlls/d2d1/layer.c @@ -84,10 +84,11 @@ static void STDMETHODCALLTYPE d2d_layer_GetFactory(ID2D1Layer *iface, ID2D1Facto static D2D1_SIZE_F * STDMETHODCALLTYPE d2d_layer_GetSize(ID2D1Layer *iface, D2D1_SIZE_F *size) { - FIXME("iface %p, size %p stub!\n", iface, size); + struct d2d_layer *layer = impl_from_ID2D1Layer(iface); + + TRACE("iface %p, size %p.\n", iface, size); - size->width = 0; - size->height = 0; + *size = layer->size; return size; } @@ -100,7 +101,7 @@ static const struct ID2D1LayerVtbl d2d_layer_vtbl = d2d_layer_GetSize, }; -HRESULT d2d_layer_create(ID2D1Factory *factory, struct d2d_layer **layer) +HRESULT d2d_layer_create(ID2D1Factory *factory, const D2D1_SIZE_F *size, struct d2d_layer **layer) { if (!(*layer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**layer)))) return E_OUTOFMEMORY; @@ -108,6 +109,8 @@ HRESULT d2d_layer_create(ID2D1Factory *factory, struct d2d_layer **layer) (*layer)->ID2D1Layer_iface.lpVtbl = &d2d_layer_vtbl; (*layer)->refcount = 1; ID2D1Factory_AddRef((*layer)->factory = factory); + if (size) + (*layer)->size = *size; TRACE("Created layer %p.\n", *layer); diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index ecab51f..ec8e4d0 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -464,7 +464,7 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateLayer(ID2D1RenderTa TRACE("iface %p, size %p, layer %p.\n", iface, size, layer); - if (SUCCEEDED(hr = d2d_layer_create(render_target->factory, &object))) + if (SUCCEEDED(hr = d2d_layer_create(render_target->factory, size, &object))) *layer = &object->ID2D1Layer_iface; return hr; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 72903ef..6993dc6 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -4536,6 +4536,7 @@ static void test_layer(void) ID3D10Device1 *device; IDXGISurface *surface; ID2D1Layer *layer; + D2D1_SIZE_F size; ULONG refcount; HWND window; HRESULT hr; @@ -4561,6 +4562,17 @@ static void test_layer(void) ID2D1Layer_GetFactory(layer, &layer_factory); ok(layer_factory == factory, "Got unexpected layer factory %p, expected %p.\n", layer_factory, factory); ID2D1Factory_Release(layer_factory); + size = ID2D1Layer_GetSize(layer); + ok(size.width == 0.0f, "Got unexpected width %.8e.\n", size.width); + ok(size.height == 0.0f, "Got unexpected height %.8e.\n", size.height); + ID2D1Layer_Release(layer); + + set_size_f(&size, 800.0f, 600.0f); + hr = ID2D1RenderTarget_CreateLayer(rt, &size, &layer); + ok(SUCCEEDED(hr), "Failed to create layer, hr %#x.\n", hr); + size = ID2D1Layer_GetSize(layer); + ok(size.width == 800.0f, "Got unexpected width %.8e.\n", size.width); + ok(size.height == 600.0f, "Got unexpected height %.8e.\n", size.height); ID2D1Layer_Release(layer); ID2D1RenderTarget_Release(rt);

1 0

Alexandre Julliard : explorer: Don' t forward the system tray to the display driver in desktop mode.
by Alexandre Julliard June 2, 2017

June 2, 2017

Module: wine Branch: master Commit: 082e4981631189c5903f838a0bc23e137c1cce17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=082e4981631189c5903f838a0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 2 17:20:33 2017 +0200 explorer: Don't forward the system tray to the display driver in desktop mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/systray.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index ddfd67d..9e58ad4 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -565,7 +565,7 @@ static BOOL handle_incoming(HWND hwndSource, COPYDATASTRUCT *cds) buffer, buffer + cbMaskBits); } - /* try forward to x11drv first */ + /* try forwarding to the display driver first */ if (cds->dwData == NIM_ADD || !(icon = get_icon( nid.hWnd, nid.uID ))) { if (wine_notify_icon && ((ret = wine_notify_icon( cds->dwData, &nid )) != -1)) @@ -901,7 +901,7 @@ void initialize_systray( HMODULE graphics_driver, BOOL using_root, BOOL arg_enab WNDCLASSEXW class; static const WCHAR classname[] = {'S','h','e','l','l','_','T','r','a','y','W','n','d',0}; - wine_notify_icon = (void *)GetProcAddress( graphics_driver, "wine_notify_icon" ); + if (using_root) wine_notify_icon = (void *)GetProcAddress( graphics_driver, "wine_notify_icon" ); icon_cx = GetSystemMetrics( SM_CXSMICON ) + 2*ICON_BORDER; icon_cy = GetSystemMetrics( SM_CYSMICON ) + 2*ICON_BORDER;

1 0

Austin English : wmp: Add some ordinals.
by Alexandre Julliard June 2, 2017

June 2, 2017

Module: wine Branch: master Commit: 496677404953bf2b976e19508c8ab29b06ae5b6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=496677404953bf2b976e19508… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 25 17:48:29 2017 -0500 wmp: Add some ordinals. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/wmp.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wmp/wmp.spec b/dlls/wmp/wmp.spec index b16365d..377bbcc 100644 --- a/dlls/wmp/wmp.spec +++ b/dlls/wmp/wmp.spec @@ -1,3 +1,8 @@ +3000 stub @ +3002 stub @ +3003 stub @ +3004 stub @ + @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer()

1 0

Austin English : jsproxy: Label ordinals.
by Alexandre Julliard June 2, 2017

June 2, 2017

Module: wine Branch: master Commit: a79c6a8ab82069572234e638ecbe50a62d226d6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a79c6a8ab82069572234e638e… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 25 17:48:26 2017 -0500 jsproxy: Label ordinals. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jsproxy/jsproxy.spec | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/jsproxy/jsproxy.spec b/dlls/jsproxy/jsproxy.spec index 4a80c4d..51366e7 100644 --- a/dlls/jsproxy/jsproxy.spec +++ b/dlls/jsproxy/jsproxy.spec @@ -1,5 +1,6 @@ -@ stdcall InternetInitializeAutoProxyDll(long str str ptr ptr) JSPROXY_InternetInitializeAutoProxyDll -@ stub InternetInitializeExAutoProxyDll -@ stdcall InternetDeInitializeAutoProxyDll(str long) -@ stub InternetDeInitializeExAutoProxyDll -@ stdcall InternetGetProxyInfo(str long str long ptr ptr) +101 stdcall InternetInitializeAutoProxyDll(long str str ptr ptr) JSPROXY_InternetInitializeAutoProxyDll +102 stdcall InternetDeInitializeAutoProxyDll(str long) +103 stdcall InternetGetProxyInfo(str long str long ptr ptr) +104 stub InternetInitializeAutoProxyDllEx +105 stub InternetDeInitializeAutoProxyDllEx +106 stub InternetGetProxyInfoEx

1 0

Alistair Leslie-Hughes : include/mfapi.h: Add standard GUID defines.
by Alexandre Julliard June 2, 2017

June 2, 2017

Module: wine Branch: master Commit: b437c8e9390927748013bf2271e003572bd4b6c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b437c8e9390927748013bf227… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 31 04:37:57 2017 +0000 include/mfapi.h: Add standard GUID defines. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfapi.h | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/include/mfapi.h b/include/mfapi.h index 35641dd..1652531 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -23,10 +23,44 @@ #include <mmreg.h> #include <avrt.h> +#if !defined(MF_VERSION) +/* Default to Windows XP */ +#define MF_SDK_VERSION 0x0001 +#define MF_API_VERSION 0x0070 +#define MF_VERSION (MF_SDK_VERSION << 16 | MF_API_VERSION) +#endif + #define MFSTARTUP_NOSOCKET 0x1 #define MFSTARTUP_LITE (MFSTARTUP_NOSOCKET) #define MFSTARTUP_FULL 0 +#ifndef MAKEFOURCC +#define MAKEFOURCC(ch0, ch1, ch2, ch3) \ + ((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | \ + ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24 )) +#endif + +#define DEFINE_MEDIATYPE_GUID(name, format) \ + DEFINE_GUID(name, format, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); + +#ifndef DIRECT3D_VERSION +#define D3DFMT_X8R8G8B8 22 +#endif + +DEFINE_MEDIATYPE_GUID(MFVideoFormat_WMV3, MAKEFOURCC('W','M','V','3')); +DEFINE_MEDIATYPE_GUID(MFVideoFormat_RGB32, D3DFMT_X8R8G8B8); + + +DEFINE_GUID(MF_MT_AVG_BITRATE, 0x20332624, 0xfb0d, 0x4d9e, 0xbd, 0x0d, 0xcb, 0xf6, 0x78, 0x6c, 0x10, 0x2e); +DEFINE_GUID(MF_MT_FRAME_RATE, 0xc459a2e8, 0x3d2c, 0x4e44, 0xb1, 0x32, 0xfe, 0xe5, 0x15, 0x6c, 0x7b, 0xb0); +DEFINE_GUID(MF_MT_FRAME_SIZE, 0x1652c33d, 0xd6b2, 0x4012, 0xb8, 0x34, 0x72, 0x03, 0x08, 0x49, 0xa3, 0x7d); +DEFINE_GUID(MF_MT_INTERLACE_MODE, 0xe2724bb8, 0xe676, 0x4806, 0xb4, 0xb2, 0xa8, 0xd6, 0xef, 0xb4, 0x4c, 0xcd); +DEFINE_GUID(MF_MT_MAJOR_TYPE, 0x48eba18e, 0xf8c9, 0x4687, 0xbf, 0x11, 0x0a, 0x74, 0xc9, 0xf9, 0x6a, 0x8f); +DEFINE_GUID(MF_MT_PIXEL_ASPECT_RATIO, 0xc6376a1e, 0x8d0a, 0x4027, 0xbe, 0x45, 0x6d, 0x9a, 0x0a, 0xd3, 0x9b, 0xb6); +DEFINE_GUID(MF_MT_SUBTYPE, 0xf7e34c9a, 0x42e8, 0x4714, 0xb7, 0x4b, 0xcb, 0x29, 0xd7, 0x2c, 0x35, 0xe5); + +DEFINE_GUID(MFMediaType_Video, 0x73646976, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); + typedef unsigned __int64 MFWORKITEM_KEY; HRESULT WINAPI MFCancelWorkItem(MFWORKITEM_KEY key);

1 0

Owen Rudge : wsdapi: Create default XML context in WSDCreateDiscoveryPublisher if required.
by Alexandre Julliard June 2, 2017

June 2, 2017

Module: wine Branch: master Commit: 9c9180f60677f05824e10f604952a95699dcf5cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c9180f60677f05824e10f604… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue May 30 23:05:56 2017 +0100 wsdapi: Create default XML context in WSDCreateDiscoveryPublisher if required. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/discovery.c | 12 ++++++++-- dlls/wsdapi/tests/discovery.c | 51 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 2 deletions(-) diff --git a/dlls/wsdapi/discovery.c b/dlls/wsdapi/discovery.c index ea0f34b..c9ef9c2 100644 --- a/dlls/wsdapi/discovery.c +++ b/dlls/wsdapi/discovery.c @@ -360,10 +360,18 @@ HRESULT WINAPI WSDCreateDiscoveryPublisher(IWSDXMLContext *pContext, IWSDiscover obj->IWSDiscoveryPublisher_iface.lpVtbl = &publisher_vtbl; obj->ref = 1; - obj->xmlContext = pContext; - if (pContext != NULL) + if (pContext == NULL) { + if (FAILED(WSDXMLCreateContext(&obj->xmlContext))) + { + WARN("Unable to create XML context\n"); + return E_OUTOFMEMORY; + } + } + else + { + obj->xmlContext = pContext; IWSDXMLContext_AddRef(pContext); } diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c index ffe64b0..db5947d 100644 --- a/dlls/wsdapi/tests/discovery.c +++ b/dlls/wsdapi/tests/discovery.c @@ -162,6 +162,56 @@ static void CreateDiscoveryPublisher_tests(void) ok(ref == 0, "IWSDiscoveryPublisher_Release() has %d references, should have 0\n", ref); } +static void CreateDiscoveryPublisher_XMLContext_tests(void) +{ + IWSDiscoveryPublisher *publisher = NULL; + IWSDXMLContext *xmlContext, *returnedContext; + HRESULT rc; + int ref; + + /* Test creating an XML context and supplying it to WSDCreateDiscoveryPublisher */ + rc = WSDXMLCreateContext(&xmlContext); + ok(rc == S_OK, "WSDXMLCreateContext failed: %08x\n", rc); + + rc = WSDCreateDiscoveryPublisher(xmlContext, &publisher); + ok(rc == S_OK, "WSDCreateDiscoveryPublisher(xmlContext, &publisher) failed: %08x\n", rc); + ok(publisher != NULL, "WSDCreateDiscoveryPublisher(xmlContext, &publisher) failed: publisher == NULL\n"); + + rc = IWSDiscoveryPublisher_GetXMLContext(publisher, NULL); + ok(rc == E_INVALIDARG, "GetXMLContext returned unexpected value with NULL argument: %08x\n", rc); + + rc = IWSDiscoveryPublisher_GetXMLContext(publisher, &returnedContext); + ok(rc == S_OK, "GetXMLContext failed: %08x\n", rc); + + ok(xmlContext == returnedContext, "GetXMLContext returned unexpected value: returnedContext == %p\n", returnedContext); + + ref = IWSDXMLContext_Release(returnedContext); + ok(ref == 2, "IWSDXMLContext_Release() has %d references, should have 2\n", ref); + + ref = IWSDiscoveryPublisher_Release(publisher); + ok(ref == 0, "IWSDiscoveryPublisher_Release() has %d references, should have 0\n", ref); + + ref = IWSDXMLContext_Release(returnedContext); + ok(ref == 0, "IWSDXMLContext_Release() has %d references, should have 0\n", ref); + + /* Test using a default XML context */ + publisher = NULL; + returnedContext = NULL; + + rc = WSDCreateDiscoveryPublisher(NULL, &publisher); + ok(rc == S_OK, "WSDCreateDiscoveryPublisher(NULL, &publisher) failed: %08x\n", rc); + ok(publisher != NULL, "WSDCreateDiscoveryPublisher(NULL, &publisher) failed: publisher == NULL\n"); + + rc = IWSDiscoveryPublisher_GetXMLContext(publisher, &returnedContext); + ok(rc == S_OK, "GetXMLContext failed: %08x\n", rc); + + ref = IWSDXMLContext_Release(returnedContext); + ok(ref == 1, "IWSDXMLContext_Release() has %d references, should have 1\n", ref); + + ref = IWSDiscoveryPublisher_Release(publisher); + ok(ref == 0, "IWSDiscoveryPublisher_Release() has %d references, should have 0\n", ref); +} + static void Publish_tests(void) { IWSDiscoveryPublisher *publisher = NULL; @@ -231,6 +281,7 @@ START_TEST(discovery) CoInitialize(NULL); CreateDiscoveryPublisher_tests(); + CreateDiscoveryPublisher_XMLContext_tests(); Publish_tests(); CoUninitialize();

1 0

Owen Rudge : wsdapi: Implement AddNamespace.
by Alexandre Julliard June 2, 2017

June 2, 2017

Module: wine Branch: master Commit: bf2095326093da5bc91603c88a688cd7b0f5c68b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf2095326093da5bc91603c88… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue May 30 23:05:45 2017 +0100 wsdapi: Implement AddNamespace. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/Makefile.in | 2 +- dlls/wsdapi/tests/xml.c | 44 +++++------ dlls/wsdapi/xml.c | 189 +++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 209 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bf2095326093da5bc9160…

1 0

Ken Thomases : ntdll: On macOS, don't use clock_gettime() even if it' s available.
by Alexandre Julliard June 2, 2017

June 2, 2017

Module: wine Branch: master Commit: 27c71e09ad51ba6aa672a46379efd10b5959863f URL: http://source.winehq.org/git/wine.git/?a=commit;h=27c71e09ad51ba6aa672a4637… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Jun 1 14:48:05 2017 -0500 ntdll: On macOS, don't use clock_gettime() even if it's available. The problem is building against the 10.12 or later SDK but deploying to 10.11 or earlier. Support for clock_gettime() is new with 10.12 so configure finds it and the code uses it, but the symbol is weak linked and resolves to NULL when running on earlier versions. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/time.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 3ba3c68..12dbdc3 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -101,7 +101,12 @@ static ULONGLONG monotonic_counter(void) { struct timeval now; -#ifdef HAVE_CLOCK_GETTIME +#ifdef __APPLE__ + static mach_timebase_info_data_t timebase; + + if (!timebase.denom) mach_timebase_info( &timebase ); + return mach_absolute_time() * timebase.numer / timebase.denom / 100; +#elif defined(HAVE_CLOCK_GETTIME) struct timespec ts; #ifdef CLOCK_MONOTONIC_RAW if (!clock_gettime( CLOCK_MONOTONIC_RAW, &ts )) @@ -109,11 +114,6 @@ static ULONGLONG monotonic_counter(void) #endif if (!clock_gettime( CLOCK_MONOTONIC, &ts )) return ts.tv_sec * (ULONGLONG)TICKSPERSEC + ts.tv_nsec / 100; -#elif defined(__APPLE__) - static mach_timebase_info_data_t timebase; - - if (!timebase.denom) mach_timebase_info( &timebase ); - return mach_absolute_time() * timebase.numer / timebase.denom / 100; #endif gettimeofday( &now, 0 );

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard June 2, 2017

June 2, 2017

Module: wine Branch: master Commit: ebeefff87f48ceb4c6467376d9b32c971de158ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebeefff87f48ceb4c6467376d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 2 09:07: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 | 40 +++++++++++----------------------------- 1 file changed, 11 insertions(+), 29 deletions(-) diff --git a/po/ru.po b/po/ru.po index ed60d7a..03a2543 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-05-25 02:24+0300\n" +"PO-Revision-Date: 2017-06-02 09:06+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -11868,10 +11868,6 @@ msgid "Contains commands for accessing frequently used keys" msgstr "Содержит команды для доступа к часто используемым разделам" #: regedit.rc:165 -#, fuzzy -#| msgid "" -#| "Contains commands for displaying help and information about registry " -#| "editor" msgid "" "Contains commands for displaying Help and information about Registry Editor" msgstr "" @@ -12113,8 +12109,6 @@ msgid "regedit: The line contains invalid syntax.\n" msgstr "regedit: некорректный формат строки.\n" #: regedit.rc:189 -#, fuzzy -#| msgid "Quits the registry editor" msgid "Quits the Registry Editor" msgstr "Выход из редактора реестра" @@ -12131,10 +12125,8 @@ msgid "Shows or hides the status bar" msgstr "Показывает/скрывает строку состояния" #: regedit.rc:193 -#, fuzzy -#| msgid "Change position of split between two panes" msgid "Changes the position of the split between two panes" -msgstr "Перемещает разделитель между двумя панелями" +msgstr "Перемещение разделителя панелей" #: regedit.rc:194 msgid "Refreshes the window" @@ -12166,21 +12158,19 @@ msgstr "Изменяет значение параметра" #: regedit.rc:173 msgid "Adds a new key" -msgstr "Добавляет новый раздел" +msgstr "Добавление нового раздела" #: regedit.rc:174 msgid "Adds a new string value" -msgstr "Добавляет новый строковый параметр" +msgstr "Добавление строкового параметра" #: regedit.rc:175 msgid "Adds a new binary value" -msgstr "Добавляет новый двоичный параметр" +msgstr "Добавление двоичного параметра" #: regedit.rc:176 -#, fuzzy -#| msgid "Adds a new binary value" msgid "Adds a new 32-bit value" -msgstr "Добавляет новый двоичный параметр" +msgstr "Добавление 32-битного параметра" #: regedit.rc:179 msgid "Imports a text file into the registry" @@ -12195,10 +12185,8 @@ msgid "Prints all or part of the registry" msgstr "Печатает весь реестр или его часть" #: regedit.rc:183 -#, fuzzy -#| msgid "Registry Editor" msgid "Opens Registry Editor Help" -msgstr "Редактор реестра" +msgstr "Отображение справки по редактору реестра" #: regedit.rc:184 msgid "Displays program information, version number and copyright" @@ -12241,26 +12229,20 @@ msgid "Unable to query the registry key '%1'." msgstr "Не удалось прочитать ключ реестра «%1»." #: regedit.rc:172 -#, fuzzy -#| msgid "Modifies the value's data" msgid "Modifies the value's data in binary form" -msgstr "Изменяет значение параметра" +msgstr "Изменение значения параметра в двоичном виде" #: regedit.rc:177 msgid "Adds a new multi-string value" -msgstr "Добавляет новое многостроковое значение" +msgstr "Добавление многострочного параметра" #: regedit.rc:200 -#, fuzzy -#| msgid "Exports selected branch of the registry to a text file" msgid "Exports the selected branch of the registry to a text file" -msgstr "Экспортирует выделенную ветку реестра в текстовый файл" +msgstr "Экспортирует выбранную ветку реестра в текстовый файл" #: regedit.rc:178 -#, fuzzy -#| msgid "Adds a new string value" msgid "Adds a new expandable string value" -msgstr "Добавляет новый строковый параметр" +msgstr "Добавление расширяемого строкового параметра" #: regedit.rc:213 msgid "Confirm Key Delete"

1 0