February 2016 - Wine-Commits

Frédéric Delanoy : imagehlp/tests: Use todo_wine_if() in tests.
by Alexandre Julliard Feb. 17, 2016

Feb. 17, 2016

Module: wine Branch: master Commit: 70e2aa7fdb97a48ec6ac87defde462294bdb7050 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70e2aa7fdb97a48ec6ac87def… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Feb 17 10:55:20 2016 +0100 imagehlp/tests: Use todo_wine_if() in tests. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imagehlp/tests/image.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/imagehlp/tests/image.c b/dlls/imagehlp/tests/image.c index 48443f5..3416c10 100644 --- a/dlls/imagehlp/tests/image.c +++ b/dlls/imagehlp/tests/image.c @@ -186,10 +186,7 @@ static void check_updates(LPCSTR header, const struct expected_update_accum *exp { DWORD i; - if (expected->todo) - todo_wine ok(expected->cUpdates == got->cUpdates, "%s: expected %d updates, got %d\n", - header, expected->cUpdates, got->cUpdates); - else + todo_wine_if (expected->todo) ok(expected->cUpdates == got->cUpdates, "%s: expected %d updates, got %d\n", header, expected->cUpdates, got->cUpdates); for (i = 0; i < min(expected->cUpdates, got->cUpdates); i++)

1 0

Nikolay Sivov : usp10/tests: Use todo_wine_if() in tests.
by Alexandre Julliard Feb. 17, 2016

Feb. 17, 2016

Module: wine Branch: master Commit: e6e0bc4a06102a09ed48c6a6ab40ff7f84c6f9e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6e0bc4a06102a09ed48c6a6a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 17 02:22:21 2016 +0300 usp10/tests: Use todo_wine_if() in tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 6fab064..7881667 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -85,38 +85,28 @@ static inline void _test_items_ok(LPCWSTR string, DWORD cchString, winetest_win_skip("This test broken on this platform\n"); return; } - if (nItemsToDo) - todo_wine winetest_ok(outnItems == nItems, "Wrong number of items\n"); - else + todo_wine_if (nItemsToDo) winetest_ok(outnItems == nItems, "Wrong number of items\n"); for (x = 0; x <= outnItems; x++) { if (items[x].isBroken && broken(outpItems[x].iCharPos == items[x].broken_value[0])) winetest_win_skip("This test broken on this platform\n"); - else if (items[x].todo_flag[0]) - todo_wine winetest_ok(outpItems[x].iCharPos == items[x].iCharPos, "%i:Wrong CharPos\n",x); - else + else todo_wine_if (items[x].todo_flag[0]) winetest_ok(outpItems[x].iCharPos == items[x].iCharPos, "%i:Wrong CharPos (%i)\n",x,outpItems[x].iCharPos); if (items[x].isBroken && broken(outpItems[x].a.fRTL== items[x].broken_value[1])) winetest_win_skip("This test broken on this platform\n"); - else if (items[x].todo_flag[1]) - todo_wine winetest_ok(outpItems[x].a.fRTL == items[x].fRTL, "%i:Wrong fRTL\n",x); - else + else todo_wine_if (items[x].todo_flag[1]) winetest_ok(outpItems[x].a.fRTL == items[x].fRTL, "%i:Wrong fRTL(%i)\n",x,outpItems[x].a.fRTL); if (items[x].isBroken && broken(outpItems[x].a.fLayoutRTL == items[x].broken_value[2])) winetest_win_skip("This test broken on this platform\n"); - else if (items[x].todo_flag[2]) - todo_wine winetest_ok(outpItems[x].a.fLayoutRTL == items[x].fLayoutRTL, "%i:Wrong fLayoutRTL\n",x); - else + else todo_wine_if (items[x].todo_flag[2]) winetest_ok(outpItems[x].a.fLayoutRTL == items[x].fLayoutRTL, "%i:Wrong fLayoutRTL(%i)\n",x,outpItems[x].a.fLayoutRTL); if (items[x].isBroken && broken(outpItems[x].a.s.uBidiLevel == items[x].broken_value[3])) winetest_win_skip("This test broken on this platform\n"); - else if (items[x].todo_flag[3]) - todo_wine winetest_ok(outpItems[x].a.s.uBidiLevel == items[x].uBidiLevel, "%i:Wrong BidiLevel\n",x); - else + else todo_wine_if (items[x].todo_flag[3]) winetest_ok(outpItems[x].a.s.uBidiLevel == items[x].uBidiLevel, "%i:Wrong BidiLevel(%i)\n",x,outpItems[x].a.s.uBidiLevel); if (x != outnItems) winetest_ok(outpItems[x].a.eScript != SCRIPT_UNDEFINED, "%i: Undefined script\n",x); @@ -124,17 +114,13 @@ static inline void _test_items_ok(LPCWSTR string, DWORD cchString, { if (items[x].isBroken && broken(tags[x] == items[x].broken_value[4])) winetest_win_skip("This test broken on this platform\n"); - else if (items[x].todo_flag[4]) - todo_wine winetest_ok(tags[x] == items[x].scriptTag,"%i:Incorrect Script Tag %x != %x\n",x,tags[x],items[x].scriptTag); - else + else todo_wine_if (items[x].todo_flag[4]) winetest_ok(tags[x] == items[x].scriptTag,"%i:Incorrect Script Tag %x != %x\n",x,tags[x],items[x].scriptTag); } if (items[x].isBroken && broken(outpItems[x].a.s.fOverrideDirection == items[x].broken_value[5])) winetest_win_skip("This test broken on this platform\n"); - else if (items[x].todo_flag[5]) - todo_wine winetest_ok(outpItems[x].a.s.fOverrideDirection == items[x].fOverrideDirection, "%i:Wrong fOverrideDirection\n",x); - else + else todo_wine_if (items[x].todo_flag[5]) winetest_ok(outpItems[x].a.s.fOverrideDirection == items[x].fOverrideDirection, "%i:Wrong fOverrideDirection(%i)\n",x,outpItems[x].a.s.fOverrideDirection); } }

1 0

Nikolay Sivov : wininet/tests: Use todo_wine_if() in tests.
by Alexandre Julliard Feb. 17, 2016

Feb. 17, 2016

Module: wine Branch: master Commit: 1b06662f0b67c47b6aecdace36843e21df13b704 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b06662f0b67c47b6aecdace3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 17 02:17:30 2016 +0300 wininet/tests: Use todo_wine_if() in tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/internet.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 5636d4b..45907e4 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1503,16 +1503,12 @@ static void test_InternetErrorDlg(void) default: break; } - if(test_flags & FLAG_TODO) - todo_wine ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); - else + todo_wine_if(test_flags & FLAG_TODO) ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); /* Same thing with NULL hwnd */ res = InternetErrorDlg(NULL, req, i, flags, NULL); - if(test_flags & FLAG_TODO) - todo_wine ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); - else + todo_wine_if(test_flags & FLAG_TODO) ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); @@ -1521,9 +1517,7 @@ static void test_InternetErrorDlg(void) expected = ERROR_INVALID_PARAMETER; res = InternetErrorDlg(hwnd, NULL, i, flags, NULL); - if( test_flags & FLAG_TODO || i == ERROR_INTERNET_INCORRECT_PASSWORD) - todo_wine ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); - else + todo_wine_if( test_flags & FLAG_TODO || i == ERROR_INTERNET_INCORRECT_PASSWORD) ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); }

1 0

Nikolay Sivov : wmiutils/tests: Use todo_wine_if() in tests.
by Alexandre Julliard Feb. 17, 2016

Feb. 17, 2016

Module: wine Branch: master Commit: fd00c9db5ab7ee56ae817bb75e02d40d6bd0488a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd00c9db5ab7ee56ae817bb75… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 17 02:12:44 2016 +0300 wmiutils/tests: Use todo_wine_if() in tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmiutils/tests/path.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wmiutils/tests/path.c b/dlls/wmiutils/tests/path.c index 56bebb3..99907a3 100644 --- a/dlls/wmiutils/tests/path.c +++ b/dlls/wmiutils/tests/path.c @@ -140,8 +140,8 @@ static void test_IWbemPath_SetText(void) for (i = 0; i < sizeof(test)/sizeof(test[0]); i++) { hr = IWbemPath_SetText( path, test[i].mode, test[i].path ); - if (test[i].todo) todo_wine ok( hr == test[i].ret, "%u got %08x\n", i, hr ); - else ok( hr == test[i].ret, "%u got %08x\n", i, hr ); + todo_wine_if (test[i].todo) + ok( hr == test[i].ret, "%u got %08x\n", i, hr ); if (test[i].ret == S_OK) {

1 0

Nikolay Sivov : xaudio2_7/tests: Use todo_wine_if() in tests.
by Alexandre Julliard Feb. 17, 2016

Feb. 17, 2016

Module: wine Branch: master Commit: 05e39f6af8926a6e7bb73a705b8c0fcfad41f0df URL: http://source.winehq.org/git/wine.git/?a=commit;h=05e39f6af8926a6e7bb73a705… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 17 02:05:06 2016 +0300 xaudio2_7/tests: Use todo_wine_if() in tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/tests/xaudio2.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/xaudio2_7/tests/xaudio2.c b/dlls/xaudio2_7/tests/xaudio2.c index 0f045b8..0889163 100644 --- a/dlls/xaudio2_7/tests/xaudio2.c +++ b/dlls/xaudio2_7/tests/xaudio2.c @@ -864,9 +864,7 @@ static void test_xapo_creation_legacy(const char *module, unsigned int version) if(pCreateFX){ for(i = 0; i < sizeof(const_clsids) / sizeof(*const_clsids); ++i){ hr = pCreateFX(const_clsids[i].clsid, &fx_unk); - if(const_clsids[i].todo) - todo_wine ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(const_clsids[i].clsid), hr); - else + todo_wine_if(const_clsids[i].todo) ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(const_clsids[i].clsid), hr); if(SUCCEEDED(hr)){ IXAPO *xapo; @@ -952,9 +950,7 @@ static void test_xapo_creation_modern(const char *module) if(pCreateFX){ for(i = 0; i < sizeof(const_clsids) / sizeof(*const_clsids); ++i){ hr = pCreateFX(const_clsids[i].clsid, &fx_unk, NULL, 0); - if(const_clsids[i].todo) - todo_wine ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(const_clsids[i].clsid), hr); - else + todo_wine_if(const_clsids[i].todo) ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(const_clsids[i].clsid), hr); if(SUCCEEDED(hr)){ IXAPO *xapo;

1 0

Vincent Povirk : gdiplus/tests: Add test for matrix transform in GdipWidenPath.
by Alexandre Julliard Feb. 17, 2016

Feb. 17, 2016

Module: wine Branch: master Commit: 91352c5aa4edfe4169fe24fbb3bc934556f7bd22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91352c5aa4edfe4169fe24fbb… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Feb 16 16:10:21 2016 -0600 gdiplus/tests: Add test for matrix transform in GdipWidenPath. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/graphicspath.c | 93 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 400123c..81670a4 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -1055,6 +1055,13 @@ static path_test_t widenline_path[] = { {5.0, 15.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0} /*3*/ }; +static path_test_t widenline_wide_path[] = { + {5.0, 0.0, PathPointTypeStart, 0, 1}, /*0*/ + {50.0, 0.0, PathPointTypeLine, 0, 1}, /*1*/ + {50.0, 20.0, PathPointTypeLine, 0, 1}, /*2*/ + {5.0, 20.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 1} /*3*/ + }; + static void test_widen(void) { GpStatus status; @@ -1099,6 +1106,92 @@ static void test_widen(void) expect(Ok, status); ok_path(path, widenline_path, sizeof(widenline_path)/sizeof(path_test_t), FALSE); + /* horizontal 2x stretch */ + status = GdipResetPath(path); + expect(Ok, status); + status = GdipAddPathLine(path, 2.5, 10.0, 25.0, 10.0); + expect(Ok, status); + + status = GdipScaleMatrix(m, 2.0, 1.0, MatrixOrderAppend); + expect(Ok, status); + + status = GdipWidenPath(path, pen, m, 1.0); + expect(Ok, status); + ok_path(path, widenline_path, sizeof(widenline_path)/sizeof(path_test_t), FALSE); + + /* vertical 2x stretch */ + status = GdipResetPath(path); + expect(Ok, status); + status = GdipAddPathLine(path, 5.0, 5.0, 50.0, 5.0); + expect(Ok, status); + + status = GdipScaleMatrix(m, 0.5, 2.0, MatrixOrderAppend); + expect(Ok, status); + + status = GdipWidenPath(path, pen, m, 1.0); + expect(Ok, status); + ok_path(path, widenline_path, sizeof(widenline_path)/sizeof(path_test_t), FALSE); + + status = GdipScaleMatrix(m, 1.0, 0.5, MatrixOrderAppend); + expect(Ok, status); + + /* pen width in UnitWorld */ + GdipDeletePen(pen); + status = GdipCreatePen1(0xffffffff, 10.0, UnitWorld, &pen); + expect(Ok, status); + + status = GdipResetPath(path); + expect(Ok, status); + status = GdipAddPathLine(path, 5.0, 10.0, 50.0, 10.0); + expect(Ok, status); + + status = GdipWidenPath(path, pen, m, 1.0); + expect(Ok, status); + ok_path(path, widenline_path, sizeof(widenline_path)/sizeof(path_test_t), FALSE); + + /* horizontal 2x stretch */ + status = GdipResetPath(path); + expect(Ok, status); + status = GdipAddPathLine(path, 2.5, 10.0, 25.0, 10.0); + expect(Ok, status); + + status = GdipScaleMatrix(m, 2.0, 1.0, MatrixOrderAppend); + expect(Ok, status); + + status = GdipWidenPath(path, pen, m, 1.0); + expect(Ok, status); + ok_path(path, widenline_path, sizeof(widenline_path)/sizeof(path_test_t), FALSE); + + /* vertical 2x stretch */ + status = GdipResetPath(path); + expect(Ok, status); + status = GdipAddPathLine(path, 5.0, 5.0, 50.0, 5.0); + expect(Ok, status); + + status = GdipScaleMatrix(m, 0.5, 2.0, MatrixOrderAppend); + expect(Ok, status); + + status = GdipWidenPath(path, pen, m, 1.0); + expect(Ok, status); + ok_path(path, widenline_wide_path, sizeof(widenline_wide_path)/sizeof(path_test_t), FALSE); + + status = GdipScaleMatrix(m, 1.0, 0.5, MatrixOrderAppend); + expect(Ok, status); + + /* pen width in UnitInch */ + GdipDeletePen(pen); + status = GdipCreatePen1(0xffffffff, 10.0, UnitWorld, &pen); + expect(Ok, status); + + status = GdipResetPath(path); + expect(Ok, status); + status = GdipAddPathLine(path, 5.0, 10.0, 50.0, 10.0); + expect(Ok, status); + + status = GdipWidenPath(path, pen, m, 1.0); + expect(Ok, status); + ok_path(path, widenline_path, sizeof(widenline_path)/sizeof(path_test_t), FALSE); + GdipDeleteMatrix(m); GdipDeletePen(pen); GdipDeletePath(path);

1 0

Nikolay Sivov : dwrite: Update to IDWriteTextFormat1.
by Alexandre Julliard Feb. 17, 2016

Feb. 17, 2016

Module: wine Branch: master Commit: c51212e55becd1a725232694c6fd1646d24d6a8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c51212e55becd1a725232694c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 17 00:19:40 2016 +0300 dwrite: Update to IDWriteTextFormat1. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 373 ++++++++++++++++++++++++--------------------- dlls/dwrite/tests/layout.c | 20 +++ 2 files changed, 215 insertions(+), 178 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c51212e55becd1a725232…

1 0

Nikolay Sivov : dwrite: Update to IDWriteTextLayout3.
by Alexandre Julliard Feb. 17, 2016

Feb. 17, 2016

Module: wine Branch: master Commit: 9efd13503d349415172cfc224ea8f70fef6bdb78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9efd13503d349415172cfc224… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 17 00:19:38 2016 +0300 dwrite: Update to IDWriteTextLayout3. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/layout.c | 398 +++++++++++++++++++++++-------------------- 2 files changed, 217 insertions(+), 183 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9efd13503d349415172cf…

1 0

Nikolay Sivov : include: Some more definitions for dwrite_3.idl.
by Alexandre Julliard Feb. 17, 2016

Feb. 17, 2016

Module: wine Branch: master Commit: 169f8a53a9940c82473de2daedd2621092002557 URL: http://source.winehq.org/git/wine.git/?a=commit;h=169f8a53a9940c82473de2dae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 17 00:19:37 2016 +0300 include: Some more definitions for dwrite_3.idl. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dwrite_3.idl | 41 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/include/dwrite_3.idl b/include/dwrite_3.idl index 410e693..055c7f9 100644 --- a/include/dwrite_3.idl +++ b/include/dwrite_3.idl @@ -20,8 +20,8 @@ import "dwrite_2.idl"; interface IDWriteFontFaceReference; interface IDWriteFontFace3; -interface IDWriteFont3; interface IDWriteFontSet; +interface IDWriteFontDownloadQueue; typedef enum DWRITE_LOCALITY { @@ -45,6 +45,31 @@ typedef enum DWRITE_RENDERING_MODE1 [ local, object, + uuid(b06fe5b9-43ec-4393-881b-dbe4dc72fda7) +] +interface IDWriteFontDownloadListener : IUnknown +{ + void DownloadCompleted(IDWriteFontDownloadQueue *queue, IUnknown *context, HRESULT result); +} + +[ + local, + object, + uuid(b71e6052-5aea-4fa3-832e-f60d431f7e91) +] +interface IDWriteFontDownloadQueue : IUnknown +{ + HRESULT AddListener(IDWriteFontDownloadListener *listener, UINT32 *token); + HRESULT RemoveListener(UINT32 token); + BOOL IsEmpty(); + HRESULT BeginDownload(IUnknown *context); + HRESULT CancelDownload(); + UINT64 GetGenerationCount(); +} + +[ + local, + object, uuid(b7924baa-391b-412a-8c5c-e44cc2d867dc) ] interface IDWriteRenderingParams3 : IDWriteRenderingParams2 @@ -55,6 +80,20 @@ interface IDWriteRenderingParams3 : IDWriteRenderingParams2 [ local, object, + uuid(29748ed6-8c9c-4a6a-be0b-d912e8538944) +] +interface IDWriteFont3 : IDWriteFont2 +{ + HRESULT CreateFontFace(IDWriteFontFace3 **fontface); + BOOL Equals(IDWriteFont *font); + HRESULT GetFontFaceReference(IDWriteFontFaceReference **reference); + BOOL HasCharacter(UINT32 character); + DWRITE_LOCALITY GetLocality(); +} + +[ + local, + object, uuid(da20d8ef-812a-4c43-9802-62ec4abd7adf) ] interface IDWriteFontFamily1 : IDWriteFontFamily

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard Feb. 17, 2016

Feb. 17, 2016

Module: wine Branch: master Commit: 3bac3800b36eb51235c25d266e2e0c86d2b61bb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bac3800b36eb51235c25d266… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Tue Feb 16 20:13:07 2016 +0200 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 55 ++++++++++++++----------------------------------------- 1 file changed, 14 insertions(+), 41 deletions(-) diff --git a/po/fi.po b/po/fi.po index 9cce743..f08e5cd 100644 --- a/po/fi.po +++ b/po/fi.po @@ -11550,88 +11550,61 @@ msgid "The operation completed successfully\n" msgstr "Toiminnon suorittaminen onnistui\n" #: reg.rc:35 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "reg: Invalid key name\n" -msgstr "Virhe: Viallinen avaimen nimi\n" +msgstr "reg: Avaimen nimi ei kelpaa\n" #: reg.rc:36 -#, fuzzy -#| msgid "Error: Invalid command line parameters\n" msgid "reg: Invalid command line parameters\n" -msgstr "Virhe: Viallisia komentoriviparametreja\n" +msgstr "reg: Komentoriviparametrit eivät kelpaa\n" #: reg.rc:37 -#, fuzzy -#| msgid "Error: Unable to access remote machine\n" msgid "reg: Unable to access remote machine\n" -msgstr "Virhe: Ei pääsyä etäkoneelle\n" +msgstr "reg: Ei pääsyä etäkoneelle\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 "Virhe: Järjestelmä ei löytänyt annettua rekisteriavainta tai -arvoa\n" +msgstr "reg: Järjestelmä ei löytänyt annettua rekisteriavainta tai -arvoa\n" #: reg.rc:39 -#, fuzzy -#| msgid "Error: Unsupported type\n" msgid "reg: Unsupported registry data type [%1]\n" -msgstr "Virhe: Tyyppiä ei tueta\n" +msgstr "reg: Rekisterin tietotyypille [%1] ei ole tukea\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: Valitsinta '--remove' täytyy seurata ohjelman GUID\n" +msgstr "reg: Valitsinta [/d] täytyy seurata kelpo kokonaisluku\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: Valitsinta '--remove' täytyy seurata ohjelman GUID\n" +msgstr "reg: Valitsinta [/d] täytyy seurata kelpo heksadesimaaliarvo\n" #: reg.rc:42 msgid "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n" -msgstr "" +msgstr "reg: Käsittelemätön rekisterin tietotyyppi [/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 "Tiedosto on jo olemassa. Haluatko korvata sen?" +msgstr "Rekisterin arvo '%1' on jo olemassa. Haluatko korvata sen?" #: reg.rc:47 msgid "The registry operation was cancelled\n" -msgstr "" +msgstr "Rekisterin toimenpide peruttiin\n" #: reg.rc:48 regedit.rc:204 msgid "(Default)" msgstr "(Oletus)" #: reg.rc:49 -#, fuzzy -#| msgid "Are you sure you want to delete these values?" msgid "Are you sure you want to delete the registry value '%1'?" -msgstr "Haluatko varmasti tuhota nämä arvot?" +msgstr "Haluatko varmasti tuhota rekisteristä arvon '%1'?" #: reg.rc:50 -#, fuzzy -#| msgid "Are you sure you want to delete value '%s'?" msgid "Are you sure you want to delete all registry values in '%1'?" -msgstr "Haluatko varmasti tuhota arvon '%s'?" +msgstr "Haluatko varmasti tuhota kaikki rekisterin arvot kohteesta '%1'?" #: reg.rc:51 -#, fuzzy -#| msgid "Are you sure you want to delete '%1'?" msgid "Are you sure you want to delete the registry key '%1'?" -msgstr "Haluatko varmasti tuhota kohteen '%1'?" +msgstr "Haluatko varmasti tuhota rekisteriavaimen '%1'?" #: regedit.rc:34 msgid "&Registry" @@ -13757,7 +13730,7 @@ msgstr "Virhe asetuksissa" msgid "" "The size of the screen buffer must be greater than or equal to the size of " "the window." -msgstr "Näyttöpuskurin on oltava vähintään ikkunan kokoinen" +msgstr "Näyttöpuskurin on oltava vähintään ikkunan kokoinen." #: wineconsole.rc:37 msgid "Each character is %1!u! pixels wide and %2!u! pixels high"

1 0