July 2015 - Wine-Commits - list.winehq.org

Sebastian Lackner : ntdll: Avoid possible deadlock by using _exit() in NtTerminateProcess.
by Alexandre Julliard July 17, 2015

July 17, 2015

Module: wine Branch: master Commit: 4a1629c4117fda9eca63b6f56ea45771dc9734ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a1629c4117fda9eca63b6f56… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jul 17 06:46:47 2015 +0200 ntdll: Avoid possible deadlock by using _exit() in NtTerminateProcess. When threads are killed with SIGQUIT some locks can be in an undefined state, and it not safe to call exit handlers. --- dlls/ntdll/process.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index c69de5e..ca9462a 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -21,11 +21,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" + #include <stdarg.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <time.h> +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -60,7 +65,7 @@ NTSTATUS WINAPI NtTerminateProcess( HANDLE handle, LONG exit_code ) self = !ret && reply->self; } SERVER_END_REQ; - if (self && handle) exit( exit_code ); + if (self && handle) _exit( exit_code ); return ret; }

1 0

Sebastian Lackner : vcomp: Implement _vcomp_barrier.
by Alexandre Julliard July 17, 2015

July 17, 2015

Module: wine Branch: master Commit: e26a9fb4ad099e22ea478f5bf376373793a729a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e26a9fb4ad099e22ea478f5bf… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Jul 16 15:00:33 2015 +0200 vcomp: Implement _vcomp_barrier. --- dlls/vcomp/main.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 3830879..f085f7c 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -70,6 +70,10 @@ struct vcomp_team_data int nargs; void *wrapper; __ms_va_list valist; + + /* barrier */ + unsigned int barrier; + int barrier_count; }; #if defined(__i386__) @@ -256,7 +260,27 @@ void CDECL omp_set_num_threads(int num_threads) void CDECL _vcomp_barrier(void) { - TRACE("stub\n"); + struct vcomp_team_data *team_data = vcomp_init_thread_data()->team; + + TRACE("()\n"); + + if (!team_data) + return; + + EnterCriticalSection(&vcomp_section); + if (++team_data->barrier_count >= team_data->num_threads) + { + team_data->barrier++; + team_data->barrier_count = 0; + WakeAllConditionVariable(&team_data->cond); + } + else + { + unsigned int barrier = team_data->barrier; + while (team_data->barrier == barrier) + SleepConditionVariableCS(&team_data->cond, &vcomp_section, INFINITE); + } + LeaveCriticalSection(&vcomp_section); } void CDECL _vcomp_set_num_threads(int num_threads) @@ -342,6 +366,8 @@ void WINAPIV _vcomp_fork(BOOL ifval, int nargs, void *wrapper, ...) team_data.nargs = nargs; team_data.wrapper = wrapper; __ms_va_start(team_data.valist, wrapper); + team_data.barrier = 0; + team_data.barrier_count = 0; thread_data.team = &team_data; thread_data.thread_num = 0;

1 0

Sebastian Lackner : vcomp/tests: Add initial tests.
by Alexandre Julliard July 17, 2015

July 17, 2015

Module: wine Branch: master Commit: c0a664456e39eff20610c41715e996e17702a178 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0a664456e39eff20610c4171… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Jul 16 15:00:48 2015 +0200 vcomp/tests: Add initial tests. --- configure | 1 + configure.ac | 1 + dlls/vcomp/tests/Makefile.in | 4 + dlls/vcomp/tests/vcomp.c | 290 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 296 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c0a664456e39eff20610c…

1 0

Dan Kegel : vcomp/tests: Add additional tests for _vcomp_fork.
by Alexandre Julliard July 17, 2015

July 17, 2015

Module: wine Branch: master Commit: 9c9d60f02047e35e7efda484d59aecb48be8e412 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c9d60f02047e35e7efda484d… Author: Dan Kegel <dank(a)kegel.com> Date: Thu Jul 16 15:01:12 2015 +0200 vcomp/tests: Add additional tests for _vcomp_fork. --- dlls/vcomp/tests/vcomp.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index b084791..a9b975d 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -1,6 +1,7 @@ /* * Unit test suite for vcomp * + * Copyright 2012 Dan Kegel * Copyright 2015 Sebastian Lackner * * This library is free software; you can redistribute it and/or @@ -278,6 +279,69 @@ static void test_omp_get_num_threads(BOOL nested) pomp_set_nested(FALSE); } +static void CDECL fork_ptr_cb(LONG *a, LONG *b, LONG *c, LONG *d, LONG *e) +{ + InterlockedIncrement(a); + InterlockedIncrement(b); + InterlockedIncrement(c); + InterlockedIncrement(d); + InterlockedIncrement(e); +} + +static void CDECL fork_uintptr_cb(UINT_PTR a, UINT_PTR b, UINT_PTR c, UINT_PTR d, UINT_PTR e) +{ + ok(a == 1, "expected a == 1, got %p\n", (void *)a); + ok(b == MAXUINT_PTR - 2, "expected b == MAXUINT_PTR - 2, got %p\n", (void *)b); + ok(c == 3, "expected c == 3, got %p\n", (void *)c); + ok(d == MAXUINT_PTR - 4, "expected d == MAXUINT_PTR - 4, got %p\n", (void *)d); + ok(e == 5, "expected e == 5, got %p\n", (void *)e); +} + +static void CDECL fork_float_cb(float a, float b, float c, float d, float e) +{ + ok(1.4999 < a && a < 1.5001, "expected a == 1.5, got %f\n", a); + ok(2.4999 < b && b < 2.5001, "expected b == 2.5, got %f\n", b); + ok(3.4999 < c && c < 3.5001, "expected c == 3.5, got %f\n", c); + ok(4.4999 < d && d < 4.5001, "expected d == 4.5, got %f\n", d); + ok(5.4999 < e && e < 5.5001, "expected e == 5.5, got %f\n", e); +} + +static void test_vcomp_fork(void) +{ + LONG a, b, c, d, e; + int max_threads = pomp_get_max_threads(); + pomp_set_num_threads(4); + + a = 0; b = 1; c = 2; d = 3; e = 4; + p_vcomp_fork(FALSE, 5, fork_ptr_cb, &a, &b, &c, &d, &e); + ok(a == 1, "expected a == 1, got %d\n", a); + ok(b == 2, "expected b == 2, got %d\n", b); + ok(c == 3, "expected c == 3, got %d\n", c); + ok(d == 4, "expected d == 4, got %d\n", d); + ok(e == 5, "expected e == 5, got %d\n", e); + + a = 0; b = 1; c = 2; d = 3; e = 4; + p_vcomp_fork(TRUE, 5, fork_ptr_cb, &a, &b, &c, &d, &e); + ok(a == 4, "expected a == 4, got %d\n", a); + ok(b == 5, "expected b == 5, got %d\n", b); + ok(c == 6, "expected c == 6, got %d\n", c); + ok(d == 7, "expected d == 7, got %d\n", d); + ok(e == 8, "expected e == 8, got %d\n", e); + + p_vcomp_fork(TRUE, 5, fork_uintptr_cb, (UINT_PTR)1, (UINT_PTR)(MAXUINT_PTR - 2), + (UINT_PTR)3, (UINT_PTR)(MAXUINT_PTR - 4), (UINT_PTR)5); + + if (sizeof(int) < sizeof(void *)) + skip("skipping float test on x86_64\n"); + else + { + void (CDECL *func)(BOOL, int, void *, float, float, float, float, float) = (void *)p_vcomp_fork; + func(TRUE, 5, fork_float_cb, 1.5f, 2.5f, 3.5f, 4.5f, 5.5f); + } + + pomp_set_num_threads(max_threads); +} + START_TEST(vcomp) { if (!init_vcomp()) @@ -285,6 +349,7 @@ START_TEST(vcomp) test_omp_get_num_threads(FALSE); test_omp_get_num_threads(TRUE); + test_vcomp_fork(); release_vcomp(); }

1 0

Piotr Caban : msvcrt: Don' t call DeleteCriticalSection on static critical section.
by Alexandre Julliard July 16, 2015

July 16, 2015

Module: wine Branch: master Commit: 2294d3ba456921e83fa5970e0e62855614c9c30c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2294d3ba456921e83fa5970e0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 16 13:07:51 2015 +0200 msvcrt: Don't call DeleteCriticalSection on static critical section. --- dlls/msvcrt/file.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 241c337..44aa32e 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1197,8 +1197,6 @@ void msvcrt_free_io(void) for(i=0; i<sizeof(MSVCRT_fstream)/sizeof(MSVCRT_fstream[0]); i++) MSVCRT_free(MSVCRT_fstream[i]); - - DeleteCriticalSection(&MSVCRT_file_cs); } /*********************************************************************

1 0

Nikolay Sivov : dwrite/tests: Some tests for CreateGdiCompatibleTextLayout ().
by Alexandre Julliard July 16, 2015

July 16, 2015

Module: wine Branch: master Commit: a92390f707202352c12c6bc7f301bfe5c6bbbb15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a92390f707202352c12c6bc7f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 16 13:11:25 2015 +0300 dwrite/tests: Some tests for CreateGdiCompatibleTextLayout(). --- dlls/dwrite/tests/layout.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index a2a5d39..1494d59 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -785,6 +785,16 @@ static void test_CreateTextLayout(void) IDWriteFactory_Release(factory); } +static DWRITE_MATRIX layoutcreate_transforms[] = { + { 1.0, 0.0, 0.0, 1.0, 0.0, 0.0 }, + { 1.0, 0.0, 0.0, 1.0, 0.3, 0.2 }, + { 1.0, 0.0, 0.0, 1.0,-0.3,-0.2 }, + + { 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 }, + { 1.0, 0.0, 0.0, 0.0, 0.0, 0.0 }, + { 1.0, 2.0, 0.5, 1.0, 0.0, 0.0 }, +}; + static void test_CreateGdiCompatibleTextLayout(void) { static const WCHAR strW[] = {'s','t','r','i','n','g',0}; @@ -793,6 +803,7 @@ static void test_CreateGdiCompatibleTextLayout(void) IDWriteFactory *factory; FLOAT dimension; HRESULT hr; + int i; factory = create_factory(); @@ -839,6 +850,24 @@ static void test_CreateGdiCompatibleTextLayout(void) ok(dimension == 100.0, "got %f\n", dimension); IDWriteTextLayout_Release(layout); + + /* negative, zero ppdip */ + hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, strW, 1, format, 100.0, 100.0, -1.0, NULL, FALSE, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteTextLayout_Release(layout); + + hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, strW, 1, format, 100.0, 100.0, 0.0, NULL, FALSE, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteTextLayout_Release(layout); + + /* transforms */ + for (i = 0; i < sizeof(layoutcreate_transforms)/sizeof(layoutcreate_transforms[0]); i++) { + hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, strW, 1, format, 100.0, 100.0, 1.0, + &layoutcreate_transforms[i], FALSE, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteTextLayout_Release(layout); + } + IDWriteTextFormat_Release(format); IDWriteFactory_Release(factory); }

1 0

Huw Davies : wbemprox: Don't call CloseServiceHandle() with an invalid handle.
by Alexandre Julliard July 16, 2015

July 16, 2015

Module: wine Branch: master Commit: 125f3151cb30ebce6473368552be3bbc786ff18a URL: http://source.winehq.org/git/wine.git/?a=commit;h=125f3151cb30ebce647336855… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 16 11:56:08 2015 +0100 wbemprox: Don't call CloseServiceHandle() with an invalid handle. --- dlls/wbemprox/service.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wbemprox/service.c b/dlls/wbemprox/service.c index 95a21b5..b096c5c 100644 --- a/dlls/wbemprox/service.c +++ b/dlls/wbemprox/service.c @@ -69,11 +69,11 @@ static HRESULT control_service( const WCHAR *name, DWORD control, VARIANT *retva goto done; } if (!ControlService( service, control, &status )) error = map_error( GetLastError() ); + CloseServiceHandle( service ); done: set_variant( VT_UI4, error, NULL, retval ); - CloseServiceHandle( service ); - CloseServiceHandle( manager ); + if (manager) CloseServiceHandle( manager ); return S_OK; } @@ -183,11 +183,11 @@ static HRESULT start_service( const WCHAR *name, VARIANT *retval ) goto done; } if (!StartServiceW( service, 0, NULL )) error = map_error( GetLastError() ); + CloseServiceHandle( service ); done: set_variant( VT_UI4, error, NULL, retval ); - CloseServiceHandle( service ); - CloseServiceHandle( manager ); + if (manager) CloseServiceHandle( manager ); return S_OK; }

1 0

Daniel Lehman : msvcp90: Implement time_get<char> ctors and dtors ( Valgrind).
by Alexandre Julliard July 16, 2015

July 16, 2015

Module: wine Branch: master Commit: a38d2ee10d41324305b5f0062dad233b7cc45178 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a38d2ee10d41324305b5f0062… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Jun 22 17:45:28 2015 -0700 msvcp90: Implement time_get<char> ctors and dtors (Valgrind). --- dlls/msvcp90/locale.c | 84 +++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 65 insertions(+), 19 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index f9a42e6..5bd10eb 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -9665,38 +9665,79 @@ extern const vtable_ptr MSVCP_time_get_char_vtable; DEFINE_THISCALL_WRAPPER(time_get_char__Init, 8) void __thiscall time_get_char__Init(time_get_char *this, const _Locinfo *locinfo) { - FIXME("(%p %p) stub\n", this, locinfo); -} + const char *months; + const char *days; + int len; -/* ??0?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@IAE(a)PBDI@Z */ -/* ??0?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@IEAA(a)PEBD_K@Z */ -DEFINE_THISCALL_WRAPPER(time_get_char_ctor_name, 12) -time_get_char* __thiscall time_get_char_ctor_name(time_get_char *this, const char *name, unsigned int refs) -{ - FIXME("(%p %p %d) stub\n", this, name, refs); - this->facet.vtable = &MSVCP_time_get_char_vtable; - return NULL; + TRACE("(%p %p)\n", this, locinfo); + + days = _Locinfo__Getdays(locinfo); + len = strlen(days)+1; + this->days = MSVCRT_operator_new(len); + if(!this->days) + { + ERR("Out of memory\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + } + memcpy((char*)this->days, days, len); + + months = _Locinfo__Getmonths(locinfo); + len = strlen(months)+1; + this->months = MSVCRT_operator_new(len); + if(!this->months) + { + MSVCRT_operator_delete((char*)this->days); + + ERR("Out of memory\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + } + memcpy((char*)this->months, months, len); + + this->dateorder = _Locinfo__Getdateorder(locinfo); + _Locinfo__Getcvt(locinfo, &this->cvt); } /* ??0?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QAE(a)ABV_Locinfo@1(a)I@Z */ /* ??0?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QEAA(a)AEBV_Locinfo@1(a)_K@Z */ DEFINE_THISCALL_WRAPPER(time_get_char_ctor_locinfo, 12) time_get_char* __thiscall time_get_char_ctor_locinfo(time_get_char *this, - const _Locinfo *locinfo, unsigned int refs) + const _Locinfo *locinfo, MSVCP_size_t refs) { - FIXME("(%p %p %d) stub\n", this, locinfo, refs); + TRACE("(%p %p %lu)\n", this, locinfo, refs); + locale_facet_ctor_refs(&this->facet, refs); this->facet.vtable = &MSVCP_time_get_char_vtable; - return NULL; + time_get_char__Init(this, locinfo); + return this; +} + +/* ??0?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@IAE(a)PBDI@Z */ +/* ??0?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@IEAA(a)PEBD_K@Z */ +DEFINE_THISCALL_WRAPPER(time_get_char_ctor_name, 12) +time_get_char* __thiscall time_get_char_ctor_name(time_get_char *this, const char *name, MSVCP_size_t refs) +{ + _Locinfo locinfo; + + TRACE("(%p %s %lu)\n", this, name, refs); + + _Locinfo_ctor_cstr(&locinfo, name); + time_get_char_ctor_locinfo(this, &locinfo, refs); + _Locinfo_dtor(&locinfo); + return this; } /* ??0?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QAE(a)I@Z */ /* ??0?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QEAA(a)_K@Z */ DEFINE_THISCALL_WRAPPER(time_get_char_ctor_refs, 8) -time_get_char* __thiscall time_get_char_ctor_refs(time_get_char *this, unsigned int refs) +time_get_char* __thiscall time_get_char_ctor_refs(time_get_char *this, MSVCP_size_t refs) { - FIXME("(%p %d) stub\n", this, refs); - this->facet.vtable = &MSVCP_time_get_char_vtable; - return NULL; + _Locinfo locinfo; + + TRACE("(%p %lu)\n", this, refs); + + _Locinfo_ctor(&locinfo); + time_get_char_ctor_locinfo(this, &locinfo, refs); + _Locinfo_dtor(&locinfo); + return this; } /* ??_F?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QAEXXZ */ @@ -9712,7 +9753,10 @@ time_get_char* __thiscall time_get_char_ctor(time_get_char *this) DEFINE_THISCALL_WRAPPER(time_get_char__Tidy, 4) void __thiscall time_get_char__Tidy(time_get_char *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + + MSVCRT_operator_delete((char*)this->days); + MSVCRT_operator_delete((char*)this->months); } /* ??1?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@MAE(a)XZ */ @@ -9720,7 +9764,9 @@ void __thiscall time_get_char__Tidy(time_get_char *this) DEFINE_THISCALL_WRAPPER(time_get_char_dtor, 4) /* virtual */ void __thiscall time_get_char_dtor(time_get_char *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + + time_get_char__Tidy(this); } DEFINE_THISCALL_WRAPPER(time_get_char_vector_dtor, 8)

1 0

Nikolay Sivov : dwrite: Fix vector transformation in GetGlyphOrientationTransform().
by Alexandre Julliard July 16, 2015

July 16, 2015

Module: wine Branch: master Commit: 42ed6ddd303c01d54709ab9d4b8b69f1e1184b03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42ed6ddd303c01d54709ab9d4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 16 13:12:29 2015 +0300 dwrite: Fix vector transformation in GetGlyphOrientationTransform(). --- dlls/dwrite/analyzer.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 62893e6..eedb41d 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -1507,22 +1507,8 @@ static HRESULT WINAPI dwritetextanalyzer2_GetGlyphOrientationTransform(IDWriteTe /* shift components represent transform necessary to get from original point to rotated one in new coordinate system */ if ((originX != 0.0 || originY != 0.0) && angle != DWRITE_GLYPH_ORIENTATION_ANGLE_0_DEGREES) { - const DWRITE_MATRIX *p; - - switch (angle) { - case DWRITE_GLYPH_ORIENTATION_ANGLE_90_DEGREES: - angle = DWRITE_GLYPH_ORIENTATION_ANGLE_270_DEGREES; - break; - case DWRITE_GLYPH_ORIENTATION_ANGLE_270_DEGREES: - angle = DWRITE_GLYPH_ORIENTATION_ANGLE_90_DEGREES; - break; - default: - ; - } - - p = &transforms[angle]; - m->dx = originX - (p->m11 * originX + p->m12 * originY); - m->dy = originY - (p->m21 * originX + p->m22 * originY); + m->dx = originX - (m->m11 * originX + m->m21 * originY); + m->dy = originY - (m->m12 * originX + m->m22 * originY); } return S_OK;

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard July 16, 2015

July 16, 2015

Module: wine Branch: master Commit: 3cf58187e441a06a493dfcd3a84dfd7026fd13ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cf58187e441a06a493dfcd3a… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Wed Jul 15 21:32:32 2015 +0300 po: Update Finnish translation. --- po/fi.po | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/po/fi.po b/po/fi.po index 3c1a2ac..1b86d7a 100644 --- a/po/fi.po +++ b/po/fi.po @@ -13474,16 +13474,12 @@ msgid "Command history" msgstr "Komentohistoria" #: wineconsole.rc:69 -#, fuzzy -#| msgid "Buffer zone" msgid "&Buffer size:" -msgstr "Puskurivyöhyke" +msgstr "P&uskurin koko:" #: wineconsole.rc:72 -#, fuzzy -#| msgid "&Remove doubles" msgid "&Remove duplicates" -msgstr "&Poista toistuvat" +msgstr "P&oista toistuvat" #: wineconsole.rc:74 msgid "Popup menu" @@ -13495,25 +13491,19 @@ msgstr "&Control" #: wineconsole.rc:76 msgid "S&hift" -msgstr "&Shift" +msgstr "S&hift" #: wineconsole.rc:78 -#, fuzzy -#| msgid "&Close console" msgid "Console" -msgstr "&Sulje konsoli" +msgstr "Konsoli" #: wineconsole.rc:79 -#, fuzzy -#| msgid "Quick edit" msgid "&Quick Edit mode" -msgstr "Pikamuokkaus" +msgstr "Pika&muokkaustila" #: wineconsole.rc:80 -#, fuzzy -#| msgid "&Expert mode" msgid "&Insert mode" -msgstr "&Tehokäyttäjä" +msgstr "&Lisäystila" #: wineconsole.rc:88 msgid "&Font"

1 0