February 2016 - Wine-commits

Lauri Kenttä : po: Improve Finnish translation.
by Alexandre Julliard 17 Feb '16

17 Feb '16

Module: wine Branch: master Commit: 2fba04444a34a8cc090bd2658a83b17d74d6270b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fba04444a34a8cc090bd2658… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Tue Feb 16 20:12:51 2016 +0200 po: Improve Finnish translation. "Invalid X" might mean that "X is faulty" or that "X does not fit here". Sometimes the same message is used for both kinds of errors. Change phrases like "viallinen X" to "X ei kelpaa" to fix this. (Also, "X ei kelpaa" is generally better Finnish.) Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 306 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 153 insertions(+), 153 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2fba04444a34a8cc090bd…

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 17 Feb '16

17 Feb '16

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

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

17 Feb '16

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

Nikolay Sivov : dwrite: Update to IDWriteTextLayout3.
by Alexandre Julliard 17 Feb '16

17 Feb '16

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 : dwrite: Implement InvalidateLayout().
by Alexandre Julliard 17 Feb '16

17 Feb '16

Module: wine Branch: master Commit: 5753e22d21aa2e322e74447a4146da99d83f6f73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5753e22d21aa2e322e74447a4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 17 00:19:39 2016 +0300 dwrite: Implement InvalidateLayout(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 7 +++++-- dlls/dwrite/tests/analyzer.c | 2 +- dlls/dwrite/tests/layout.c | 35 ++++++++++++++++++++++++++++++++++- 3 files changed, 40 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index aa77d91..a2e1308 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -3586,8 +3586,11 @@ static HRESULT WINAPI dwritetextlayout2_GetFontFallback(IDWriteTextLayout3 *ifac static HRESULT WINAPI dwritetextlayout3_InvalidateLayout(IDWriteTextLayout3 *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout3(iface); - FIXME("(%p): stub\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + This->recompute = RECOMPUTE_EVERYTHING; + return S_OK; } static HRESULT WINAPI dwritetextlayout3_SetLineSpacing(IDWriteTextLayout3 *iface, DWRITE_LINE_SPACING const *spacing) diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 07e00af..043d7a1 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -27,7 +27,7 @@ #include "initguid.h" #include "windows.h" -#include "dwrite_2.h" +#include "dwrite_3.h" #include "wine/test.h" diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 0fe9151..c8fe6d2 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -25,7 +25,7 @@ #include <limits.h> #include "windows.h" -#include "dwrite_2.h" +#include "dwrite_3.h" #include "wine/test.h" @@ -4853,6 +4853,38 @@ todo_wine IDWriteFactory_Release(factory); } +static void test_InvalidateLayout(void) +{ + static const WCHAR strW[] = {'a',0}; + IDWriteTextLayout3 *layout3; + IDWriteTextLayout *layout; + IDWriteTextFormat *format; + IDWriteFactory *factory; + HRESULT hr; + + factory = create_factory(); + + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0f, enusW, &format); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateTextLayout(factory, strW, 1, format, 1000.0f, 1000.0f, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteTextLayout_QueryInterface(layout, &IID_IDWriteTextLayout3, (void**)&layout3); + if (hr == S_OK) { + hr = IDWriteTextLayout3_InvalidateLayout(layout3); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteTextLayout3_Release(layout3); + } + else + win_skip("IDWriteTextLayout3::InvalidateLayout() is not supported.\n"); + + IDWriteTextLayout_Release(layout); + IDWriteTextFormat_Release(format); + IDWriteFactory_Release(factory); +} + START_TEST(layout) { IDWriteFactory *factory; @@ -4900,6 +4932,7 @@ START_TEST(layout) test_SetLastLineWrapping(); test_SetOpticalAlignment(); test_SetUnderline(); + test_InvalidateLayout(); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite: Update to IDWriteTextFormat1.
by Alexandre Julliard 17 Feb '16

17 Feb '16

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

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

17 Feb '16

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

Vincent Povirk : gdiplus: Fix GdipWidenPath transform for non-pixel pens.
by Alexandre Julliard 17 Feb '16

17 Feb '16

Module: wine Branch: master Commit: 6a6aa3134da847e7b91005ae2e6de5999d9e2574 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a6aa3134da847e7b91005ae2… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Feb 16 16:10:22 2016 -0600 gdiplus: Fix GdipWidenPath transform for non-pixel pens. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphicspath.c | 5 ++++- dlls/gdiplus/tests/graphicspath.c | 8 ++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 49dbf6c..58e99a2 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -2074,7 +2074,7 @@ GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix, status = GdipClonePath(path, &flat_path); if (status == Ok) - status = GdipFlattenPath(flat_path, matrix, flatness); + status = GdipFlattenPath(flat_path, pen->unit == UnitPixel ? matrix : NULL, flatness); if (status == Ok && !init_path_list(&points, 314.0, 22.0)) status = OutOfMemory; @@ -2147,6 +2147,9 @@ GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix, GdipDeletePath(flat_path); + if (status == Ok && pen->unit != UnitPixel) + status = GdipTransformPath(path, matrix); + return status; } diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 81670a4..24619e5 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -1056,10 +1056,10 @@ static path_test_t widenline_path[] = { }; 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*/ + {5.0, 0.0, PathPointTypeStart, 0, 0}, /*0*/ + {50.0, 0.0, PathPointTypeLine, 0, 0}, /*1*/ + {50.0, 20.0, PathPointTypeLine, 0, 0}, /*2*/ + {5.0, 20.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0} /*3*/ }; static void test_widen(void)

1 0

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

17 Feb '16

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

Nikolay Sivov : ws2_32/tests: Use todo_wine_if() in tests.
by Alexandre Julliard 17 Feb '16

17 Feb '16

Module: wine Branch: master Commit: 944a0228f56f006bdc0ec50776c730db4972e7c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=944a0228f56f006bdc0ec5077… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 17 02:11:01 2016 +0300 ws2_32/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/ws2_32/tests/sock.c | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 4f11cce..d5e01c8 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1591,17 +1591,10 @@ todo_wine "SO_PROTOCOL_INFO[A/W] comparison failed\n"); /* Remove IF when WSAEnumProtocols support IPV6 data */ - if (prottest[i].family == AF_INET6) - { - todo_wine + todo_wine_if (prottest[i].family == AF_INET6) ok(infoA.iAddressFamily == prottest[i].family, "socket family invalid, expected %d received %d\n", prottest[i].family, infoA.iAddressFamily); - } - else - { - ok(infoA.iAddressFamily == prottest[i].family, "socket family invalid, expected %d received %d\n", - prottest[i].family, infoA.iAddressFamily); - } ok(infoA.iSocketType == prottest[i].type, "socket type invalid, expected %d received %d\n", + ok(infoA.iSocketType == prottest[i].type, "socket type invalid, expected %d received %d\n", prottest[i].type, infoA.iSocketType); ok(infoA.iProtocol == prottest[i].proto, "socket protocol invalid, expected %d received %d\n", prottest[i].proto, infoA.iProtocol); @@ -2798,27 +2791,15 @@ static void test_WSAEnumNetworkEvents(void) "Test[%d]: WSAEnumNetworkEvents failed\n", i); if (i >= 1 && j == 0) /* FD_WRITE is SET on first try for UDP and connected TCP */ { - if (i == 0) /* Remove when fixed */ - { - todo_wine + todo_wine_if (i == 0) /* Remove when fixed */ ok (net_events.lNetworkEvents == FD_WRITE, "Test[%d]: expected 2, got %d\n", i, net_events.lNetworkEvents); - } - else - ok (net_events.lNetworkEvents == FD_WRITE, "Test[%d]: expected 2, got %d\n", - i, net_events.lNetworkEvents); } else { - if (i != 0) /* Remove when fixed */ - { - todo_wine + todo_wine_if (i != 0) /* Remove when fixed */ ok (net_events.lNetworkEvents == 0, "Test[%d]: expected 0, got %d\n", i, net_events.lNetworkEvents); - } - else - ok (net_events.lNetworkEvents == 0, "Test[%d]: expected 0, got %d\n", - i, net_events.lNetworkEvents); } for (k = 0; k < FD_MAX_EVENTS; k++) {

1 0