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

Henri Verbeet : d2d1: Return S_OK on success in d2d_geometry_resolve_beziers().
by Alexandre Julliard Aug. 17, 2017

Aug. 17, 2017

Module: wine Branch: master Commit: 0ede13e1df395f81f6eda53a66aef05e7c3c14f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ede13e1df395f81f6eda53a6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 16 21:58:20 2017 +0200 d2d1: Return S_OK on success in d2d_geometry_resolve_beziers(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 31a3eda..e43477e 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -2285,7 +2285,7 @@ static HRESULT d2d_geometry_resolve_beziers(struct d2d_geometry *geometry) } } - return TRUE; + return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_geometry_sink_Close(ID2D1GeometrySink *iface)

1 0

Henri Verbeet : d2d1/tests: Add a test for bezier intersections.
by Alexandre Julliard Aug. 17, 2017

Aug. 17, 2017

Module: wine Branch: master Commit: 01d4767aed754983e70bf27e27c03105b5b00789 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01d4767aed754983e70bf27e2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 16 21:58:21 2017 +0200 d2d1/tests: Add a test for bezier intersections. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 164 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 164 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 2bb13bb..bb1b056 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -196,6 +196,19 @@ static void quadratic_to(ID2D1GeometrySink *sink, float x1, float y1, float x2, ID2D1GeometrySink_AddQuadraticBezier(sink, &quadratic); } +static void cubic_to(ID2D1GeometrySink *sink, float x1, float y1, float x2, float y2, float x3, float y3) +{ + D2D1_BEZIER_SEGMENT b; + + b.point1.x = x1; + b.point1.y = y1; + b.point2.x = x2; + b.point2.y = y2; + b.point3.x = x3; + b.point3.y = y3; + ID2D1GeometrySink_AddBezier(sink, &b); +} + static BOOL compare_float(float f, float g, unsigned int ulps) { int x = *(int *)&f; @@ -5545,6 +5558,156 @@ static void test_layer(void) DestroyWindow(window); } +static void test_bezier_intersect(void) +{ + D2D1_POINT_2F point = {0.0f, 0.0f}; + ID2D1SolidColorBrush *brush; + ID2D1PathGeometry *geometry; + IDXGISwapChain *swapchain; + ID2D1GeometrySink *sink; + ID2D1RenderTarget *rt; + ID3D10Device1 *device; + IDXGISurface *surface; + ID2D1Factory *factory; + D2D1_COLOR_F color; + ULONG refcount; + HWND window; + HRESULT hr; + BOOL match; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + window = create_window(); + swapchain = create_swapchain(device, window, TRUE); + hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); + ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); + rt = create_render_target(surface); + ok(!!rt, "Failed to create render target.\n"); + ID2D1RenderTarget_GetFactory(rt, &factory); + + ID2D1RenderTarget_SetDpi(rt, 192.0f, 48.0f); + ID2D1RenderTarget_SetAntialiasMode(rt, D2D1_ANTIALIAS_MODE_ALIASED); + set_color(&color, 0.890f, 0.851f, 0.600f, 1.0f); + hr = ID2D1RenderTarget_CreateSolidColorBrush(rt, &color, NULL, &brush); + ok(SUCCEEDED(hr), "Failed to create brush, hr %#x.\n", hr); + + hr = ID2D1Factory_CreatePathGeometry(factory, &geometry); + ok(SUCCEEDED(hr), "Failed to create path geometry, hr %#x.\n", hr); + hr = ID2D1PathGeometry_Open(geometry, &sink); + ok(SUCCEEDED(hr), "Failed to open geometry sink, hr %#x.\n", hr); + + set_point(&point, 160.0f, 720.0f); + ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED); + cubic_to(sink, 119.0f, 720.0f, 83.0f, 600.0f, 80.0f, 474.0f); + cubic_to(sink, 78.0f, 349.0f, 108.0f, 245.0f, 135.0f, 240.0f); + cubic_to(sink, 163.0f, 235.0f, 180.0f, 318.0f, 176.0f, 370.0f); + cubic_to(sink, 171.0f, 422.0f, 149.0f, 422.0f, 144.0f, 370.0f); + cubic_to(sink, 140.0f, 318.0f, 157.0f, 235.0f, 185.0f, 240.0f); + cubic_to(sink, 212.0f, 245.0f, 242.0f, 349.0f, 240.0f, 474.0f); + cubic_to(sink, 238.0f, 600.0f, 201.0f, 720.0f, 160.0f, 720.0f); + ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED); + + set_point(&point, 160.0f, 240.0f); + ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED); + line_to(sink, 240.0f, 240.0f); + line_to(sink, 240.0f, 720.0f); + line_to(sink, 160.0f, 720.0f); + ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED); + + hr = ID2D1GeometrySink_Close(sink); + ok(SUCCEEDED(hr), "Failed to close geometry sink, hr %#x.\n", hr); + ID2D1GeometrySink_Release(sink); + + ID2D1RenderTarget_BeginDraw(rt); + set_color(&color, 0.396f, 0.180f, 0.537f, 1.0f); + ID2D1RenderTarget_Clear(rt, &color); + ID2D1RenderTarget_FillGeometry(rt, (ID2D1Geometry *)geometry, (ID2D1Brush *)brush, NULL); + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); + ID2D1PathGeometry_Release(geometry); + + match = compare_figure(surface, 160, 120, 320, 240, 0xff652e89, 2048, + "aRQjIxRpYiIcHCJiXSwXFyxdWTQTEzRZVTsQEDtVUkIMDEJST0cKCkdPTUsICEtNSlEFBVFKSFUD" + "A1VIRlkBAVlGRFsBAVtEQlwCAlxCQFwEBFxAPl0FBV0+PF0HB108Ol4ICF46OV0KCl05N14LC143" + "Nl4MDF42NF8NDV80M14PD14zMV8QEF8xMF8REV8wL18SEl8vLWATE2AtLGAUFGAsK2EUFGErKWIV" + "FWIpKGIWFmIoJ2IXF2InJmIYGGImJWMYGGMlJGMZGWMkI2MaGmMjImQaGmQiIWQbG2QhIGQcHGQg" + "H2UcHGUfHmUdHWUeHWYdHWYdHGcdHWccG2ceHmcbGmgeHmgaGWgfH2gZGWgfH2gZGGkfH2kYF2kg" + "IGkXFmogIGoWFmogIGoWFWsgIGsVFGshIWsUE2whIWwTE2whIWwTEm0hIW0SEW4hIW4REW4hIW4R" + "EG8hIW8QD3AhIXAPD3AhIXAPDnEhIXEODnEhIXEODXIhIXINDHQgIHQMDHQgIHQMC3UgIHULC3Yf" + "H3YLCncfH3cKCngeHngKCXkeHnkJCXodHXoJCXscHHsJCHwcHHwICH0bG30IB38aGn8HB4ABGRmA" + "AQcHgQEYGIEBBwaEARYWhAEGBoUBFRWFAQYFiAETE4gBBQWKARERigEFBYwBDw+MAQUEkAEMDJAB" + "BASTAQkJkwEEBJwBnAEEA50BnQEDA50BnQEDA50BnQEDA50BnQEDAp4BngECAp4BngECAp4BngEC" + "Ap4BngECAp4BngECAZ8BnwEBAZ8BnwEBAZ8BnwEBAZ8BnwEBAZ8BnwEBAZ8BnwEBAZ8BnwGhAaAB" + "oAGgAaABoAGgAaABoAGgAaABoAGgAaABoAGgAaABoAGgAaABoAGgAaABoAGgAaABoAGgAaABoAGg" + "AaABoAGgAaABoAGgAaABoAGhAZ8BoQGfAZ8BAQGfAZ8BAQGfAZ8BAQGfAZ8BAQGfAZ8BAQKeAZ8B" + "AQKeAZ4BAgKeAZ4BAgKeAZ4BAgOdAZ4BAgOdAZ4BAgOdAZ0BAwScAZ0BAwScAZ0BAwScAZ0BAwSc" + "AZwBBAWbAZwBBAWbAZwBBAWbAZsBBQaaAZsBBQaaAZoBBgeZAZoBBgeZAZoBBgeZAZkBBwiYAZkB" + "BwiYAZgBCAmXAZgBCAmXAZgBCAmXAZcBCQqWAZcBCQqWAZYBCguVAZYBCguVAZUBCwyUAZUBCw2T" + "AZQBDA2TAZQBDA6SAZMBDQ6SAZMBDQ+RAZIBDg+RAZIBDhCQAZEBDxCQAZABEBGPAZABEBKOAY8B" + "ERONAY4BEhONAY4BEhSMAY0BExWLAYwBFBWLAYwBFBaKAYsBFReJAYoBFheJAYoBFhiIAYkBFxmH" + "AYgBGBqGAYcBGRuFAYYBGhuFAYUBGxyEAYUBGx2DAYQBHB6CAYMBHR+BAYIBHiCAAYEBHyF/gAEg" + "In5/ISJ+fiIjfX0jJHx8JCV7eyUmenomJ3l5Jyh4eCgpd3cpK3V2Kix0dSstc3QsLnJzLS9xci4w" + "cHAwMm5vMTNtbjI0bG0zNWtrNTdpajY4aGk3OmZnOTtlZjo8ZGQ8PmJjPT9hYj5BX2BAQl5eQkRc" + "XUNGWltFR1lZR0lXWEhLVVZKTVNUTE9RUk5RT1BQUk5OUlRMTFRWSkpWWUdIWFtFRVteQkNdYEBA" + "YGI+PmJlOztlaDg4aGs1NWtuMjJuci4vcXUrK3V6JiZ6fiIifoMBHR2DAYsBFRWLAZUBCwuVAQAA"); + todo_wine ok(match, "Figure does not match.\n"); + + hr = ID2D1Factory_CreatePathGeometry(factory, &geometry); + ok(SUCCEEDED(hr), "Failed to create path geometry, hr %#x.\n", hr); + hr = ID2D1PathGeometry_Open(geometry, &sink); + ok(SUCCEEDED(hr), "Failed to open geometry sink, hr %#x.\n", hr); + + set_point(&point, 240.0f, 720.0f); + ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED); + cubic_to(sink, 152.0f, 720.0f, 80.0f, 613.0f, 80.0f, 480.0f); + cubic_to(sink, 80.0f, 347.0f, 152.0f, 240.0f, 240.0f, 240.0f); + cubic_to(sink, 152.0f, 339.0f, 134.0f, 528.0f, 200.0f, 660.0f); + cubic_to(sink, 212.0f, 683.0f, 225.0f, 703.0f, 240.0f, 720.0f); + ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED); + + hr = ID2D1GeometrySink_Close(sink); + ok(SUCCEEDED(hr), "Failed to close geometry sink, hr %#x.\n", hr); + ID2D1GeometrySink_Release(sink); + + ID2D1RenderTarget_BeginDraw(rt); + ID2D1RenderTarget_Clear(rt, &color); + ID2D1RenderTarget_FillGeometry(rt, (ID2D1Geometry *)geometry, (ID2D1Brush *)brush, NULL); + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); + ID2D1PathGeometry_Release(geometry); + + match = compare_figure(surface, 160, 120, 320, 240, 0xff652e89, 2048, + "pQIZkgIrhAI5/QE/9gFH7wFO6wFS5wFW4gFb3gFf2wFi2AFl1gFn1AFp0gFszwFuzQFxywFyyQF1" + "xwF2xgF4xAF5xAF6wgF8wAF+vwF+vwF/vQGBAbwBggG7AYMBugGEAbkBhQG4AYYBtwGHAbcBiAG1" + "AYkBtAGKAbQBigGzAYsBswGMAbEBjQGxAY0BsQGOAa8BjwGvAZABrgGQAa4BkQGtAZEBrQGSAawB" + "kgGsAZMBqwGTAasBlAGrAZQBqgGVAakBlQGqAZUBqQGWAagBlwGoAZYBqAGXAagBlwGnAZgBpwGY" + "AaYBmQGmAZkBpgGZAaUBmgGlAZoBpQGaAaUBmgGkAZsBpAGbAaQBmwGkAZsBpAGcAaMBnAGjAZwB" + "owGcAaMBnAGjAZ0BogGdAaIBnQGiAZ4BoQGeAaEBngGiAZ4BoQGeAaEBnwGgAZ8BoQGeAaEBnwGh" + "AZ4BoQGfAaABnwGhAZ8BoAGgAaABnwGgAaABoAGfAaABoAGgAaABnwGgAaABoAGgAaABnwGgAaAB" + "oAGgAaABnwGhAZ8BoQGfAaABoAGgAaABoAGfAaEBnwGhAZ8BoQGfAaEBnwGhAZ8BoQGfAaABoAGg" + "AaABoAGgAaEBnwGhAZ8BoQGfAaEBnwGhAaABoAGgAaABoAGgAaABoAGgAaEBoAGgAaABoAGgAaAB" + "oQGgAaABoAGgAaABoQGfAaEBoAGhAZ8BoQGfAaIBnwGhAZ8BogGfAaEBnwGiAZ8BogGeAaIBnwGi" + "AZ4BogGfAaIBngGjAZ4BowGdAaMBngGjAZ4BowGdAaQBnQGkAZ0BpAGcAaUBnAGlAZwBpQGcAaUB" + "mwGmAZsBpgGbAaYBmwGmAZsBpgGbAacBmgGnAZkBqAGZAagBmQGpAZgBqQGZAagBmQGpAZgBqQGY" + "AaoBlwGqAZcBqwGWAasBlgGsAZUBrQGVAawBlQGtAZQBrgGUAa0BlAGuAZMBrwGTAa8BkgGwAZEB" + "sQGRAbEBkAGyAZABsgGPAbMBjwG0AY4BtAGNAbUBjQG2AYwBtgGLAbgBigG4AYoBuQGJAboBhwG7" + "AYcBvAGGAb0BhQG+AYQBvwGDAcABggHBAYIBwgGAAcMBf8QBfsYBfMgBe8gBesoBeMwBd80BddAB" + "c9EBcdQBb9YBbNkBatsBaN0BZeEBYuQBX+gBW+0BVvEBUvUBTvwBR4QCQIoCOZgCK6oCGQIA"); + todo_wine ok(match, "Figure does not match.\n"); + + ID2D1SolidColorBrush_Release(brush); + ID2D1RenderTarget_Release(rt); + refcount = ID2D1Factory_Release(factory); + ok(!refcount, "Factory has %u references left.\n", refcount); + IDXGISurface_Release(surface); + IDXGISwapChain_Release(swapchain); + ID3D10Device1_Release(device); + DestroyWindow(window); +} + START_TEST(d2d1) { test_clip(); @@ -5570,4 +5733,5 @@ START_TEST(d2d1) test_draw_geometry(); test_gdi_interop(); test_layer(); + test_bezier_intersect(); }

1 0

Henri Verbeet : d2d1: Implement bezier/bezier intersections.
by Alexandre Julliard Aug. 17, 2017

Aug. 17, 2017

Module: wine Branch: master Commit: 00fafb27e3f544ea5b4902c45bc746c9d56e1f05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00fafb27e3f544ea5b4902c45… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 16 21:58:24 2017 +0200 d2d1: Implement bezier/bezier intersections. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 141 ++++++++++++++++++++++++++++++++++++++++++++++--- dlls/d2d1/tests/d2d1.c | 8 +-- 2 files changed, 137 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=00fafb27e3f544ea5b490…

1 0

Rosanne DiMesio : Revise ratings hints
by Jeremy Newman Aug. 16, 2017

Aug. 16, 2017

Module: appdb Branch: master Commit: 64f4aef4e810c581be9235af94697256b1c33c32 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=64f4aef4e810c581be9235af… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Wed Aug 16 14:29:03 2017 -0500 Revise ratings hints Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- js/utils.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/js/utils.js b/js/utils.js index 26128a9..0fdcb92 100644 --- a/js/utils.js +++ b/js/utils.js @@ -119,11 +119,11 @@ $(document).ready(function() { var ratingdesc=[ "", - " Works flawlessly out of the box - no problems ", - " Works flawlessly with DLL overrides, third party software or other settings ", - " Works excellently for normal use;works fine in singleplayer but not multi ", - " Works but has issues for normal use ", - " Does not run or cannot be installed with Wine " + " Works as well as (or better than) on Windows out of the box ", + " Works as well as (or better than) on Windows with workarounds ", + " Works excellently for normal use, but has some problems ", + " Works, but has problems for normal use ", + " Problems are severe enough that the application cannot be used for the purpose it was designed for " ]; var ratingstyle =[ "",

1 0

Rosanne DiMesio : Add missing background colors for ratings hints
by Jeremy Newman Aug. 16, 2017

Aug. 16, 2017

Module: appdb Branch: master Commit: dfd849512a5be238f67c0178488da1396f3a6575 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=dfd849512a5be238f67c0178… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Wed Aug 16 14:28:05 2017 -0500 Add missing background colors for ratings hints Adds background colors for platinum, bronze, and garbage ratings. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- css/styles.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/css/styles.css b/css/styles.css index adfd3b4..aa4157c 100644 --- a/css/styles.css +++ b/css/styles.css @@ -483,8 +483,11 @@ hr .committed { font-style: italic; color: gray; } /* App Support status */ +.platinum { background-color: whitesmoke; } .gold { background-color: wheat; } .silver { background-color: silver; } +.bronze { background-color: goldenrod; } +.garbage { background-color: darkkhaki; } /* Rating Number */ .rating { font-family: Helvetica, Arial; font-size: 6pt; color: #333333; }

1 0

Rosanne DiMesio : Add two columns to testResults table
by Jeremy Newman Aug. 16, 2017

Aug. 16, 2017

Module: appdb Branch: master Commit: c0f7b6f62b4b72159d00e4ed852581cd6abefacf URL: http://source.winehq.org/git/appdb.git/?a=commit;h=c0f7b6f62b4b72159d00e4ed… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Wed Aug 16 11:26:03 2017 -0500 Add two columns to testResults table Adds usedWorkarounds and workarounds columns. First step toward fixing bug 16169. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- tables/alter.sql | 2 ++ tables/testResults.sql | 2 ++ 2 files changed, 4 insertions(+) diff --git a/tables/alter.sql b/tables/alter.sql index 457f8d9..f61f3fb 100644 --- a/tables/alter.sql +++ b/tables/alter.sql @@ -1,2 +1,4 @@ /* append to this file when changes are required to the live db */ /* it will be cleared when the changes go live */ + +ALTER TABLE testResults ADD COLUMN usedWorkaround ENUM("Yes", "No") DEFAULT NULL AFTER runs, ADD COLUMN workarounds TEXT DEFAULT NULL AFTER usedWorkaround; diff --git a/tables/testResults.sql b/tables/testResults.sql index 44a52ae..5d35a00 100644 --- a/tables/testResults.sql +++ b/tables/testResults.sql @@ -17,6 +17,8 @@ create table testResults ( staging tinyint(1) not null default '0', installs enum('Yes','No','No, but has workaround','N/A') NOT NULL default 'Yes', runs enum('Yes','No','Not Installable') NOT NULL default 'Yes', + usedWorkaround enum('Yes','No') default NULL, + workarounds text default NULL, testedRating enum('Platinum','Gold','Silver','Bronze','Garbage') NOT NULL, comments text, submitTime datetime NOT NULL,

1 0

Jeremy Newman : taking changes live
by Jeremy Newman Aug. 16, 2017

Aug. 16, 2017

Module: appdb Branch: master Commit: 425fb629980bd1da47ac56d87c1d518d7341770e URL: http://source.winehq.org/git/appdb.git/?a=commit;h=425fb629980bd1da47ac56d8… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Aug 16 11:32:09 2017 -0500 taking changes live --- tables/alter.sql | 1 - 1 file changed, 1 deletion(-) diff --git a/tables/alter.sql b/tables/alter.sql index f61f3fb..0e977b2 100644 --- a/tables/alter.sql +++ b/tables/alter.sql @@ -1,4 +1,3 @@ /* append to this file when changes are required to the live db */ /* it will be cleared when the changes go live */ -ALTER TABLE testResults ADD COLUMN usedWorkaround ENUM("Yes", "No") DEFAULT NULL AFTER runs, ADD COLUMN workarounds TEXT DEFAULT NULL AFTER usedWorkaround;

1 0

Rosanne DiMesio : Add Workarounds section to test report
by Jeremy Newman Aug. 16, 2017

Aug. 16, 2017

Module: appdb Branch: master Commit: 4a1506322966340d3ad42151ffa31f551e7e9f4c URL: http://source.winehq.org/git/appdb.git/?a=commit;h=4a1506322966340d3ad42151… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Wed Aug 16 11:26:57 2017 -0500 Add Workarounds section to test report Adds a yes/no question about whether workarounds were used and a textarea to enter details if yes. Prohibits Platinum ratings when workarounds are reported used. Fixes bug 16169. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/testData.php | 103 +++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 91 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=4a1506322966340d3ad4…

1 0

Hans Leidekker : bcrypt: Add a stub implementation of BCryptDecrypt.
by Alexandre Julliard Aug. 16, 2017

Aug. 16, 2017

Module: wine Branch: master Commit: 7148b9ecb4bf81ae82543f2cf4906173a6c90141 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7148b9ecb4bf81ae82543f2cf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 16 11:23:45 2017 +0200 bcrypt: Add a stub implementation of BCryptDecrypt. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt.spec | 2 +- dlls/bcrypt/bcrypt_main.c | 9 +++++++++ dlls/ncrypt/ncrypt.spec | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec index c96ed2a..4a53df6 100644 --- a/dlls/bcrypt/bcrypt.spec +++ b/dlls/bcrypt/bcrypt.spec @@ -5,7 +5,7 @@ @ stub BCryptConfigureContextFunction @ stub BCryptCreateContext @ stdcall BCryptCreateHash(ptr ptr ptr long ptr long long) -@ stub BCryptDecrypt +@ stdcall BCryptDecrypt(ptr ptr long ptr ptr long ptr long ptr long) @ stub BCryptDeleteContext @ stub BCryptDeriveKey @ stdcall BCryptDestroyHash(ptr) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index ccab676..9f9c8c1 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -693,6 +693,15 @@ NTSTATUS WINAPI BCryptEncrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp return STATUS_NOT_IMPLEMENTED; } +NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG input_len, + void *padding, UCHAR *iv, ULONG iv_len, UCHAR *output, + ULONG output_len, ULONG *ret_len, ULONG flags ) +{ + FIXME( "%p, %p, %u, %p, %p, %u, %p, %u, %p, %08x\n", handle, input, input_len, + padding, iv, iv_len, output, output_len, ret_len, flags ); + return STATUS_NOT_IMPLEMENTED; +} + BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) { switch (reason) diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec index 62a8128..739b1ce 100644 --- a/dlls/ncrypt/ncrypt.spec +++ b/dlls/ncrypt/ncrypt.spec @@ -5,7 +5,7 @@ @ stub BCryptConfigureContextFunction @ stub BCryptCreateContext @ stdcall BCryptCreateHash(ptr ptr ptr long ptr long long) bcrypt.BCryptCreateHash -@ stub BCryptDecrypt +@ stdcall BCryptDecrypt(ptr ptr long ptr ptr long ptr long ptr long) bcrypt.BCryptDecrypt @ stub BCryptDeleteContext @ stub BCryptDeriveKey @ stub BCryptDeriveKeyCapi

1 0

Huw Davies : usp10: Undefined characters above the BMP should be assigned to Script_Surrogates.
by Alexandre Julliard Aug. 16, 2017

Aug. 16, 2017

Module: wine Branch: master Commit: 866eec810e7342630d47887f8ad7e1fbb5a0e788 URL: http://source.winehq.org/git/wine.git/?a=commit;h=866eec810e7342630d47887f8… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Aug 16 11:01:51 2017 +0100 usp10: Undefined characters above the BMP should be assigned to Script_Surrogates. Signed-off-by: Huw Davies <huw(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 | 57 +++++++++++++++++++++++++++++++++++++++++------- dlls/usp10/usp10.c | 2 +- 2 files changed, 50 insertions(+), 9 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index d302714..f0eb500 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -228,7 +228,7 @@ static void test_ScriptItemize( void ) static const itemTest t2d2[6] = {{{0,0,0,0,0,0},0,0,0,0,0,latn_tag,FALSE},{{0,0,0,0,0,0},3,0,0,0,0,0,FALSE},{{0,0,0,0,0,0},4,0,0,0,0,latn_tag,FALSE},{{0,0,0,0,0,0},7,1,1,1,0,arab_tag,FALSE},{{0,0,0,0,0,0},10,0,0,0,0,0,FALSE},{{0,0,0,0,0,0},11,0,0,0,0,-1,FALSE}}; static const itemTest t2d3[5] = {{{0,0,0,0,0,0},0,0,0,2,0,latn_tag,FALSE},{{0,0,0,0,0,0},3,0,0,2,0,0,FALSE},{{0,0,0,0,0,0},4,0,0,2,0,latn_tag,FALSE},{{0,0,0,0,0,0},7,1,1,1,0,arab_tag,FALSE},{{0,0,0,0,0,0},11,0,0,0,0,-1,FALSE}}; static const itemTest t2d4[3] = {{{0,0,0,0,0,0},0,0,0,2,0,latn_tag,FALSE},{{0,0,0,0,0,0},7,1,1,1,0,arab_tag,FALSE},{{0,0,0,0,0,0},11,0,0,0,0,-1,FALSE}}; -static const itemTest t2d5[5] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE}, + static const itemTest t2d5[5] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE}, {{0,0,0,0,0,0},3,0,0,0,1,0,FALSE}, {{0,0,0,0,0,0},4,0,0,0,1,latn_tag,FALSE}, {{0,0,0,0,0,0},7,0,0,0,1,arab_tag,FALSE}, @@ -252,11 +252,10 @@ static const itemTest t2d5[5] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE}, static const int b43[2] = {4,4}; /* Arabic */ - static const WCHAR test5[] = -{0x0627,0x0644,0x0635,0x0651,0x0650,0x062d,0x0629,0x064f,' ',0x062a,0x064e, -0x0627,0x062c,0x064c,' ',0x0639,0x064e,0x0644,0x0649,' ', -0x0631,0x064f,0x0624,0x0648,0x0633,0x0650,' ',0x0627,0x0644 -,0x0623,0x0635,0x0650,0x062d,0x0651,0x064e,0x0627,0x0621,0x0650,0}; + static const WCHAR test5[] = {0x0627,0x0644,0x0635,0x0651,0x0650,0x062d,0x0629,0x064f,' ',0x062a,0x064e, + 0x0627,0x062c,0x064c,' ',0x0639,0x064e,0x0644,0x0649,' ', + 0x0631,0x064f,0x0624,0x0648,0x0633,0x0650,' ',0x0627,0x0644, + 0x0623,0x0635,0x0650,0x062d,0x0651,0x064e,0x0627,0x0621,0x0650,0}; static const itemTest t51[2] = {{{0,0,0,0,0,0},0,1,1,1,0,arab_tag,FALSE},{{0,0,0,0,0,0},38,0,0,0,0,-1,FALSE}}; static const itemTest t52[2] = {{{0,0,0,0,0,0},0,0,0,0,1,arab_tag,FALSE}, {{0,0,0,0,0,0},38,0,0,0,0,-1,FALSE}}; @@ -267,7 +266,7 @@ static const itemTest t2d5[5] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE}, static const itemTest t61[3] = {{{0,0,0,0,0,0},0,1,1,1,0,hebr_tag,TRUE,{-1,0,0,0,-1,-1}},{{0,0,0,0,0,0},4,0,0,0,0,0,FALSE},{{0,0,0,0,0,0},5,0,0,0,0,-1,FALSE}}; static const itemTest t62[3] = {{{0,0,0,0,0,0},0,1,1,1,0,hebr_tag,FALSE},{{0,0,0,0,0,0},4,1,1,1,0,0,FALSE},{{0,0,0,0,0,0},5,0,0,0,0,-1,FALSE}}; static const itemTest t63[2] = {{{0,0,0,0,0,0},0,1,1,1,0,hebr_tag,FALSE},{{0,0,0,0,0,0},5,0,0,0,0,-1,FALSE}}; -static const itemTest t64[3] = {{{0,0,0,0,0,0},0,0,0,0,1,hebr_tag,FALSE}, + static const itemTest t64[3] = {{{0,0,0,0,0,0},0,0,0,0,1,hebr_tag,FALSE}, {{0,0,0,0,0,0},4,0,0,0,1,0,FALSE}, {{0,0,0,0,0,0},5,0,0,0,0,-1,FALSE}}; @@ -276,7 +275,7 @@ static const itemTest t64[3] = {{{0,0,0,0,0,0},0,0,0,0,1,hebr_tag,FALSE}, static const itemTest t71[4] = {{{0,0,0,0,0,0},0,0,0,0,0,latn_tag,FALSE},{{0,0,0,0,0,0},9,1,1,1,0,hebr_tag,TRUE,{-1,0,0,0,-1,-1}},{{0,0,0,0,0,0},19,0,0,0,0,latn_tag,FALSE},{{0,0,0,0,0,0},29,0,0,0,0,-1,FALSE}}; static const itemTest t72[4] = {{{0,0,0,0,0,0},0,0,0,0,0,latn_tag,FALSE},{{0,0,0,0,0,0},9,1,1,1,0,hebr_tag,FALSE},{{0,0,0,0,0,0},18,0,0,0,0,latn_tag,FALSE},{{0,0,0,0,0,0},29,0,0,0,0,-1,FALSE}}; static const itemTest t73[4] = {{{0,0,0,0,0,0},0,0,0,2,0,latn_tag,FALSE},{{0,0,0,0,0,0},8,1,1,1,0,hebr_tag,FALSE},{{0,0,0,0,0,0},19,0,0,2,0,latn_tag,FALSE},{{0,0,0,0,0,0},29,0,0,0,0,-1,FALSE}}; -static const itemTest t74[4] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE}, + static const itemTest t74[4] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE}, {{0,0,0,0,0,0},9,0,0,0,1,hebr_tag,FALSE}, {{0,0,0,0,0,0},19,0,0,0,1,latn_tag,FALSE}, {{0,0,0,0,0,0},29,0,0,0,0,-1,FALSE}}; @@ -927,6 +926,47 @@ static const itemTest t74[4] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE}, test_items_ok(test58,13,&Control,&State,1,t582,FALSE,0); } +static void make_surrogate(DWORD i, WORD out[2]) +{ + static const DWORD mask = (1 << 10) - 1; + + if (i <= 0xffff) + { + out[0] = i; + out[1] = 0; + } + else + { + i -= 0x010000; + out[0] = ((i >> 10) & mask) + 0xd800; + out[1] = (i & mask) + 0xdc00; + } +} + +static void test_ScriptItemize_surrogates(void) +{ + HRESULT hr; + WCHAR surrogate[2]; + WORD Script_Surrogates; + SCRIPT_ITEM items[2]; + int num; + + /* Find Script_Surrogates */ + surrogate[0] = 0xd800; + hr = ScriptItemize( surrogate, 1, 2, NULL, NULL, items, &num ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( num == 1, "got %d\n", num ); + ok( items[0].a.eScript != SCRIPT_UNDEFINED, "got script %x\n", items[0].a.eScript ); + Script_Surrogates = items[0].a.eScript; + + /* Show that an invalid character has script Script_Surrogates */ + make_surrogate( 0x01ffff, surrogate ); + hr = ScriptItemize( surrogate, 2, 2, NULL, NULL, items, &num ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( num == 1, "got %d\n", num ); + ok( items[0].a.eScript == Script_Surrogates, "got script %x\n", items[0].a.eScript ); +} + static inline void _test_shape_ok(int valid, HDC hdc, LPCWSTR string, DWORD cchString, SCRIPT_CONTROL *Control, SCRIPT_STATE *State, DWORD item, DWORD nGlyphs, @@ -4003,6 +4043,7 @@ START_TEST(usp10) ok(hfont != NULL, "SelectObject failed: %p\n", hfont); test_ScriptItemize(); + test_ScriptItemize_surrogates(); test_ScriptItemIzeShapePlace(hdc,pwOutGlyphs); test_ScriptGetCMap(hdc, pwOutGlyphs); test_ScriptCacheGetHeight(hdc); diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index a6309ed..40fc89a 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -963,7 +963,7 @@ static enum usp10_script get_char_script(const WCHAR *str, unsigned int index, if (!(range = bsearch(&ch, script_ranges, ARRAY_SIZE(script_ranges), sizeof(*script_ranges), usp10_compare_script_range))) - return Script_Undefined; + return (*consumed == 2) ? Script_Surrogates : Script_Undefined; if (range->numericScript && (type & C1_DIGIT || type2 == C2_ARABICNUMBER)) return range->numericScript;

1 0