wine-commits February 2016

wine-commits@winehq.org

2 participants
755 discussions

Sebastian Lackner : vcomp/tests: Reenable architecture dependent tests.
by Alexandre Julliard 10 Feb '16

10 Feb '16

Module: wine Branch: master Commit: a77e14714e495ecc63654374d53585a227b4c67f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a77e14714e495ecc63654374d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Feb 10 07:46:45 2016 +0100 vcomp/tests: Reenable architecture dependent tests. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp/tests/vcomp.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index 4f030d3..914b55f 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -1406,13 +1406,15 @@ static void test_atomic_integer32(void) { p_vcomp_atomic_mul_i4, 0x11223344, -0x77665544, 0xecccdf0 }, { p_vcomp_atomic_or_i4, 0x11223344, 0x77665544, 0x77667744 }, { p_vcomp_atomic_shl_i4, 0x11223344, 3, -0x76ee65e0 }, - /* { p_vcomp_atomic_shl_i4, 0x11223344, 35, -0x76ee65e0 }, */ /* depends on Architecture */ { p_vcomp_atomic_shl_i4, -0x11223344, 3, 0x76ee65e0 }, { p_vcomp_atomic_shr_i4, 0x11223344, 3, 0x2244668 }, - /* { p_vcomp_atomic_shr_i4, 0x11223344, 35, 0x2244668 }, */ /* depends on Architecture */ { p_vcomp_atomic_shr_i4, -0x11223344, 3, -0x2244669 }, { p_vcomp_atomic_sub_i4, 0x11223344, 0x77665544, -0x66442200 }, { p_vcomp_atomic_xor_i4, 0x11223344, 0x77665544, 0x66446600 }, +#if defined(__i386__) || defined(__x86_64__) + { p_vcomp_atomic_shl_i4, 0x11223344, 35, -0x76ee65e0 }, + { p_vcomp_atomic_shr_i4, 0x11223344, 35, 0x2244668 }, +#endif }; struct { @@ -1424,8 +1426,10 @@ static void test_atomic_integer32(void) { p_vcomp_atomic_div_ui4, 0x77665544, 0x11223344, 6 }, { p_vcomp_atomic_div_ui4, 0x77665544, 0xeeddccbc, 0 }, { p_vcomp_atomic_shr_ui4, 0x11223344, 3, 0x2244668 }, - /* { p_vcomp_atomic_shr_ui4, 0x11223344, 35, 0x2244668 }, */ /* depends on Architecture */ { p_vcomp_atomic_shr_ui4, 0xeeddccbc, 3, 0x1ddbb997 }, +#if defined(__i386__) || defined(__x86_64__) + { p_vcomp_atomic_shr_ui4, 0x11223344, 35, 0x2244668 }, +#endif }; int i;

1 0

Andrew Eikum : xaudio2: Handle openal source allocation failure.
by Alexandre Julliard 10 Feb '16

10 Feb '16

Module: wine Branch: master Commit: ecadabe25b11bbd2bb41facf40dfc592e12632ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecadabe25b11bbd2bb41facf4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Feb 9 10:39:23 2016 -0600 xaudio2: Handle openal source allocation failure. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 32bc1c8..6d766a1 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -32,6 +32,7 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(xaudio2); +WINE_DECLARE_DEBUG_CHANNEL(winediag); static ALCdevice *(ALC_APIENTRY *palcLoopbackOpenDeviceSOFT)(const ALCchar*); static void (ALC_APIENTRY *palcRenderSamplesSOFT)(ALCdevice*, ALCvoid*, ALCsizei); @@ -1415,11 +1416,21 @@ static HRESULT WINAPI IXAudio2Impl_CreateSourceVoice(IXAudio2 *iface, hr = XA2SRC_SetOutputVoices(&src->IXAudio2SourceVoice_iface, pSendList); if(FAILED(hr)){ + HeapFree(GetProcessHeap(), 0, src->fmt); src->in_use = FALSE; return hr; } alGenSources(1, &src->al_src); + if(!src->al_src){ + static int once = 0; + if(!once++) + ERR_(winediag)("OpenAL ran out of sources, consider increasing its source limit.\n"); + HeapFree(GetProcessHeap(), 0, src->fmt); + src->in_use = FALSE; + return E_OUTOFMEMORY; + } + alGenBuffers(XAUDIO2_MAX_QUEUED_BUFFERS, src->al_bufs); alSourcePlay(src->al_src);

1 0

Henri Verbeet : wined3d: Use wined3d_texture_get_pitch() in wined3d_volume_upload_data().
by Alexandre Julliard 10 Feb '16

10 Feb '16

Module: wine Branch: master Commit: 0706019a079900e3c5167f923334368f7e108eda URL: http://source.winehq.org/git/wine.git/?a=commit;h=0706019a079900e3c5167f923… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 9 21:30:00 2016 +0100 wined3d: Use wined3d_texture_get_pitch() in wined3d_volume_upload_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/volume.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 9931057..16b6555 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -76,7 +76,7 @@ void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wine dst_row_pitch = width * format->conv_byte_count; dst_slice_pitch = dst_row_pitch * height; - wined3d_volume_get_pitch(volume, &src_row_pitch, &src_slice_pitch); + wined3d_texture_get_pitch(volume->container, volume->texture_level, &src_row_pitch, &src_slice_pitch); converted_mem = HeapAlloc(GetProcessHeap(), 0, dst_slice_pitch * depth); format->convert(data->addr, converted_mem, src_row_pitch, src_slice_pitch,

1 0

Henri Verbeet : wined3d: Use wined3d_texture_get_pitch() in texture3d_sub_resource_upload_data().
by Alexandre Julliard 10 Feb '16

10 Feb '16

Module: wine Branch: master Commit: a945266d259c0e57e181a6b8ff7ccb04452fc429 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a945266d259c0e57e181a6b8f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 9 21:29:59 2016 +0100 wined3d: Use wined3d_texture_get_pitch() in texture3d_sub_resource_upload_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 06abb38..8b414a6 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1167,7 +1167,7 @@ static void texture3d_sub_resource_upload_data(struct wined3d_resource *sub_reso struct wined3d_const_bo_address addr; unsigned int row_pitch, slice_pitch; - wined3d_volume_get_pitch(volume, &row_pitch, &slice_pitch); + wined3d_texture_get_pitch(volume->container, volume->texture_level, &row_pitch, &slice_pitch); if (row_pitch != data->row_pitch || slice_pitch != data->slice_pitch) FIXME("Ignoring row/slice pitch (%u/%u).\n", data->row_pitch, data->slice_pitch);

1 0

Stefan Dösinger : wined3d: Introduce wined3d_texture_get_pitch().
by Alexandre Julliard 10 Feb '16

10 Feb '16

Module: wine Branch: master Commit: 65c04ce0409d870bc42ef466027120388abdb83c URL: http://source.winehq.org/git/wine.git/?a=commit;h=65c04ce0409d870bc42ef4660… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Feb 9 21:29:58 2016 +0100 wined3d: Introduce wined3d_texture_get_pitch(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 17 ++--------------- dlls/wined3d/texture.c | 25 ++++++++++++++++++++++++- dlls/wined3d/volume.c | 3 +-- dlls/wined3d/wined3d_private.h | 3 +++ 4 files changed, 30 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0444148..bd8cf45 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1887,11 +1887,7 @@ DWORD CDECL wined3d_surface_get_pitch(const struct wined3d_surface *surface) TRACE("surface %p.\n", surface); - if (surface->container->row_pitch) - return surface->container->row_pitch; - - wined3d_format_calculate_pitch(surface->resource.format, surface->resource.device->surface_alignment, - surface->resource.width, surface->resource.height, &row_pitch, &slice_pitch); + wined3d_texture_get_pitch(surface->container, surface->texture_level, &row_pitch, &slice_pitch); TRACE("Returning %u.\n", row_pitch); @@ -1950,16 +1946,7 @@ HRESULT wined3d_surface_update_desc(struct wined3d_surface *surface, const struc surface->resource.format = texture_resource->format; surface->resource.multisample_type = texture_resource->multisample_type; surface->resource.multisample_quality = texture_resource->multisample_quality; - if (surface->container->row_pitch) - { - surface->resource.size = height * surface->container->row_pitch; - } - else - { - /* User memory surfaces don't have the regular surface alignment. */ - wined3d_format_calculate_pitch(texture_resource->format, 1, width, height, - &surface->container->row_pitch, &surface->resource.size); - } + surface->resource.size = surface->container->slice_pitch; /* The format might be changed to a format that needs conversion. * If the surface didn't use PBOs previously but could now, don't diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 0a084de..06abb38 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -499,6 +499,24 @@ void * CDECL wined3d_texture_get_parent(const struct wined3d_texture *texture) return texture->resource.parent; } +void wined3d_texture_get_pitch(const struct wined3d_texture *texture, + unsigned int level, unsigned int *row_pitch, unsigned int *slice_pitch) +{ + const struct wined3d_resource *resource = &texture->resource; + unsigned int width = max(1, texture->resource.width >> level); + unsigned int height = max(1, texture->resource.height >> level); + + if (texture->row_pitch) + { + *row_pitch = texture->row_pitch; + *slice_pitch = texture->slice_pitch; + return; + } + + wined3d_format_calculate_pitch(resource->format, resource->device->surface_alignment, + width, height, row_pitch, slice_pitch); +} + DWORD CDECL wined3d_texture_set_lod(struct wined3d_texture *texture, DWORD lod) { DWORD old = texture->lod; @@ -645,7 +663,12 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT texture->resource.height = height; texture->user_memory = mem; - texture->row_pitch = pitch; + if ((texture->row_pitch = pitch)) + texture->slice_pitch = height * pitch; + else + /* User memory surfaces don't have the regular surface alignment. */ + wined3d_format_calculate_pitch(format, 1, width, height, + &texture->row_pitch, &texture->slice_pitch); return wined3d_surface_update_desc(surface, gl_info); } diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 733b468..9931057 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -42,8 +42,7 @@ BOOL volume_prepare_system_memory(struct wined3d_volume *volume) void wined3d_volume_get_pitch(const struct wined3d_volume *volume, UINT *row_pitch, UINT *slice_pitch) { - wined3d_format_calculate_pitch(volume->resource.format, volume->resource.device->surface_alignment, - volume->resource.width, volume->resource.height, row_pitch, slice_pitch); + wined3d_texture_get_pitch(volume->container, volume->texture_level, row_pitch, slice_pitch); } /* This call just uploads data, the caller is responsible for binding the diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 443f763..470db1f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2366,6 +2366,7 @@ struct wined3d_texture void *user_memory; unsigned int row_pitch; + unsigned int slice_pitch; /* May only be accessed from the command stream worker thread. */ struct wined3d_texture_async @@ -2400,6 +2401,8 @@ void wined3d_texture_bind(struct wined3d_texture *texture, void wined3d_texture_bind_and_dirtify(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; void wined3d_texture_force_reload(struct wined3d_texture *texture) DECLSPEC_HIDDEN; +void wined3d_texture_get_pitch(const struct wined3d_texture *texture, + unsigned int level, unsigned int *row_pitch, unsigned int *slice_pitch) DECLSPEC_HIDDEN; void wined3d_texture_load(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; void wined3d_texture_prepare_texture(struct wined3d_texture *texture,

1 0

Henri Verbeet : wined3d: Use wined3d_format_calculate_pitch() in surface_download_data().
by Alexandre Julliard 10 Feb '16

10 Feb '16

Module: wine Branch: master Commit: a95524b8f3abfaa28fc21055d95d4a087a9b6d69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a95524b8f3abfaa28fc21055d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 9 21:29:57 2016 +0100 wined3d: Use wined3d_format_calculate_pitch() in surface_download_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1860258..0444148 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1329,19 +1329,17 @@ static void surface_download_data(struct wined3d_surface *surface, const struct } else { - void *mem; + unsigned int src_row_pitch, src_slice_pitch, dst_pitch = 0; GLenum gl_format = format->glFormat; GLenum gl_type = format->glType; - int src_pitch = 0; - int dst_pitch = 0; + void *mem; if (surface->flags & SFLAG_NONPOW2) { - unsigned char alignment = surface->resource.device->surface_alignment; - src_pitch = format->byte_count * surface->pow2Width; dst_pitch = wined3d_surface_get_pitch(surface); - src_pitch = (src_pitch + alignment - 1) & ~(alignment - 1); - mem = HeapAlloc(GetProcessHeap(), 0, src_pitch * surface->pow2Height); + wined3d_format_calculate_pitch(format, surface->resource.device->surface_alignment, + surface->pow2Width, surface->pow2Height, &src_row_pitch, &src_slice_pitch); + mem = HeapAlloc(GetProcessHeap(), 0, src_slice_pitch); } else { @@ -1426,11 +1424,11 @@ static void surface_download_data(struct wined3d_surface *surface, const struct * won't be released, and doesn't have to be re-read. */ src_data = mem; dst_data = data.addr; - TRACE("(%p) : Repacking the surface data from pitch %d to pitch %d\n", surface, src_pitch, dst_pitch); + TRACE("Repacking the surface data from pitch %u to pitch %u.\n", src_row_pitch, dst_pitch); for (y = 0; y < surface->resource.height; ++y) { memcpy(dst_data, src_data, dst_pitch); - src_data += src_pitch; + src_data += src_row_pitch; dst_data += dst_pitch; }

1 0

Henri Verbeet : wined3d: Handle slice pitch and alignment as well in wined3d_format_calculate_pitch ().
by Alexandre Julliard 10 Feb '16

10 Feb '16

Module: wine Branch: master Commit: a0beaa4006b0261587204fdecc08ba0bd941567d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0beaa4006b0261587204fdec… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 9 21:29:56 2016 +0100 wined3d: Handle slice pitch and alignment as well in wined3d_format_calculate_pitch(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 6 +++++- dlls/wined3d/surface.c | 41 ++++++++++++++++------------------- dlls/wined3d/utils.c | 49 +++++++++++++++++++++--------------------- dlls/wined3d/volume.c | 22 ++----------------- dlls/wined3d/wined3d_private.h | 3 ++- 5 files changed, 53 insertions(+), 68 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a0beaa4006b0261587204…

1 0

Henri Verbeet : ddraw: Use the correct height when calculating the linear size in ddraw_surface_init ().
by Alexandre Julliard 10 Feb '16

10 Feb '16

Module: wine Branch: master Commit: 1b106fe830debcd9a3e7924aef469d924d2254b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b106fe830debcd9a3e7924ae… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 9 21:29:55 2016 +0100 ddraw: Use the correct height when calculating the linear size in ddraw_surface_init(). This fixes a regression introduced by commit 7d45318aeac41e2efabb9ddfbf95ecbea103e67d. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 3286b97..ff2c85b 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6292,10 +6292,15 @@ void ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, if (format_is_compressed(&desc->u4.ddpfPixelFormat)) { + unsigned int texture_level, row_pitch; + + texture_level = desc->ddsCaps.dwCaps & DDSCAPS_MIPMAP ? sub_resource_idx % desc->u2.dwMipMapCount : 0; + row_pitch = wined3d_surface_get_pitch(wined3d_surface); + if (desc->dwFlags & DDSD_LPSURFACE) desc->u1.dwLinearSize = ~0u; else - desc->u1.dwLinearSize = wined3d_surface_get_pitch(wined3d_surface) * ((desc->dwHeight + 3) / 4); + desc->u1.dwLinearSize = row_pitch * ((max(1, desc->dwHeight >> texture_level) + 3) / 4); desc->dwFlags |= DDSD_LINEARSIZE; desc->dwFlags &= ~(DDSD_LPSURFACE | DDSD_PITCH); }

1 0

Nikolay Sivov : gdi32: Fix otmfsSelection to have bold style set in case of bold simulation.
by Alexandre Julliard 10 Feb '16

10 Feb '16

Module: wine Branch: master Commit: c98f40e2272ca8aa20453ea307dca70124fccc8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c98f40e2272ca8aa20453ea30… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 9 22:43:10 2016 +0300 gdi32: Fix otmfsSelection to have bold style set in case of bold simulation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 2 ++ dlls/gdi32/tests/font.c | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 1a488df..9fa520f 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7850,6 +7850,8 @@ static BOOL get_outline_text_metrics(GdiFont *font) font->potm->otmfsSelection = pOS2->fsSelection; if (font->fake_italic) font->potm->otmfsSelection |= 1; + if (font->fake_bold) + font->potm->otmfsSelection |= 1 << 5; font->potm->otmfsType = pOS2->fsType; font->potm->otmsCharSlopeRise = pHori->caret_Slope_Rise; font->potm->otmsCharSlopeRun = pHori->caret_Slope_Run; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index c56eb81..d1896a3 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2144,9 +2144,22 @@ static void test_GetOutlineTextMetrics(void) LPSTR unset_ptr; UINT fsSelection; - /* check fsSelection field with oblique simulation */ + /* check fsSelection field with bold simulation */ memset(&lf, 0, sizeof(lf)); + strcpy(lf.lfFaceName, "Wingdings"); + lf.lfCharSet = SYMBOL_CHARSET; + + /* regular face */ + fsSelection = get_font_fsselection(&lf); + ok((fsSelection & (1 << 5)) == 0, "got 0x%x\n", fsSelection); + /* face with bold simulation */ + lf.lfWeight = FW_BOLD; + fsSelection = get_font_fsselection(&lf); + ok((fsSelection & (1 << 5)) != 0, "got 0x%x\n", fsSelection); + + /* check fsSelection field with oblique simulation */ + memset(&lf, 0, sizeof(lf)); strcpy(lf.lfFaceName, "Tahoma"); lf.lfHeight = -13; lf.lfWeight = FW_NORMAL;

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 10 Feb '16

10 Feb '16

Module: wine Branch: master Commit: 90eb26015ee60443711320cbe716c17e05b03b48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90eb26015ee60443711320cbe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 9 23:20:58 2016 +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 | 50 ++++++++++++-------------------------------------- 1 file changed, 12 insertions(+), 38 deletions(-) diff --git a/po/ru.po b/po/ru.po index f2dd095..d5cf6f9 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: 2016-01-26 15:30+0300\n" +"PO-Revision-Date: 2016-02-09 23:19+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -11573,70 +11573,46 @@ msgid "The operation completed successfully\n" msgstr "Операция успешно завершена\n" #: reg.rc:35 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "reg: Invalid key name\n" -msgstr "Ошибка: неправильное имя раздела\n" +msgstr "reg: неверное имя раздела\n" #: reg.rc:36 -#, fuzzy -#| msgid "Error: Invalid command line parameters\n" msgid "reg: Invalid command line parameters\n" -msgstr "Ошибка: неправильные параметры командной строки\n" +msgstr "reg: неверные параметры командной строки\n" #: reg.rc:37 -#, fuzzy -#| msgid "Error: Unable to access remote machine\n" msgid "reg: Unable to access remote machine\n" -msgstr "Ошибка: не удалось получить доступ к удалённому компьютеру\n" +msgstr "reg: не удалось получить доступ к удалённому компьютеру\n" #: reg.rc:38 -#, fuzzy -#| msgid "" -#| "Error: The system was unable to find the specified registry key or value\n" msgid "" "reg: The system was unable to find the specified registry key or value\n" -msgstr "Ошибка: не удалось найти указанный раздел реестра или значение\n" +msgstr "reg: не удалось найти указанный раздел реестра или значение\n" #: reg.rc:39 -#, fuzzy -#| msgid "Error: Unsupported type\n" msgid "reg: Unsupported registry data type [%1]\n" -msgstr "Ошибка: тип не поддерживается\n" +msgstr "reg: тип данных [%1] не поддерживается\n" #: reg.rc:40 -#, fuzzy -#| msgid "" -#| "uninstaller: The option '--remove' must be followed by an application " -#| "GUID\n" msgid "reg: The option [/d] must be followed by a valid integer\n" -msgstr "" -"uninstaller: за опцией «--remove» должен следовать GUID идентификатор " -"приложения\n" +msgstr "reg: за опцией [/d] должно следовать целое число\n" #: reg.rc:41 -#, fuzzy -#| msgid "" -#| "uninstaller: The option '--remove' must be followed by an application " -#| "GUID\n" msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgstr "" -"uninstaller: за опцией «--remove» должен следовать GUID идентификатор " -"приложения\n" +"reg: за опцией [/d] должно следовать число в шестнадцатеричном формате\n" #: reg.rc:42 msgid "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n" -msgstr "" +msgstr "reg: тип данных не поддерживается [/t 0x%1!x!, /d %2]\n" #: reg.rc:43 -#, fuzzy -#| msgid "The specified file already exists. Do you want to replace it?" msgid "The registry value '%1' already exists. Do you want to overwrite it?" -msgstr "Указанный файл уже существует. Вы хотите заменить его?" +msgstr "Значение «%1» уже существует. Вы хотите заменить его?" #: reg.rc:47 msgid "The registry operation was cancelled\n" -msgstr "" +msgstr "Операция с реестром была отменена\n" #: regedit.rc:34 msgid "&Registry" @@ -13773,12 +13749,10 @@ msgid "Configuration error" msgstr "Ошибка настройки" #: wineconsole.rc:42 -#, fuzzy -#| msgid "Screen buffer size must be greater or equal to the window's one" msgid "" "The size of the screen buffer must be greater than or equal to the size of " "the window." -msgstr "Размер буфера экрана должен быть не менее буфера окна" +msgstr "Размер буфера экрана должен быть не меньше размера окна." #: wineconsole.rc:37 msgid "Each character is %1!u! pixels wide and %2!u! pixels high"

1 0

← Newer
1
...
48
49
50
51
52
53
54
...
76
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 2016