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

Rosanne DiMesio : Use form-control-inline for distributions dropdown list
by Jeremy Newman 25 Aug '17

25 Aug '17

Module: appdb Branch: master Commit: b76031ac4a7293e2add90706710719b62d9b8ce8 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=b76031ac4a7293e2add90706… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Wed Aug 23 15:13:15 2017 -0500 Use form-control-inline for distributions dropdown list Matches the style of the other dropdown lists in the test report form. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> --- include/distribution.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/distribution.php b/include/distribution.php index 40eeb7c..8e5ca35 100644 --- a/include/distribution.php +++ b/include/distribution.php @@ -454,7 +454,7 @@ class distribution { $hResult = query_parameters($sQuery); if(!$hResult) return; - echo "<select name='$varname'>\n"; + echo "<select name='$varname' class='form-control form-control-inline'>\n"; echo "<option value=\"\">Choose your operating system</option>\n"; while(list($name, $value) = query_fetch_row($hResult)) {

1 0

Rosanne DiMesio : Add two columns to testResults table
by Jeremy Newman 25 Aug '17

25 Aug '17

Module: appdb Branch: master Commit: 12988ba00e1f03b494daef160c1a069ca2317d19 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=12988ba00e1f03b494daef16… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Wed Aug 23 13:45:38 2017 -0500 Add two columns to testResults table Adds gpuMfr and graphicsDriver. First step toward fixing bug 16031. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> --- tables/alter.sql | 1 + tables/testResults.sql | 2 ++ 2 files changed, 3 insertions(+) diff --git a/tables/alter.sql b/tables/alter.sql index 457f8d9..4304234 100644 --- a/tables/alter.sql +++ b/tables/alter.sql @@ -1,2 +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 gpuMfr ENUM('AMD', 'Intel', 'Nvidia', 'Other', 'Unknown') DEFAULT NULL, ADD COLUMN graphicsDriver ENUM('open source', 'proprietary', 'unknown') DEFAULT NULL; diff --git a/tables/testResults.sql b/tables/testResults.sql index 5d35a00..511c115 100644 --- a/tables/testResults.sql +++ b/tables/testResults.sql @@ -24,5 +24,7 @@ create table testResults ( submitTime datetime NOT NULL, submitterId int(11) NOT NULL default '0', state enum('accepted','queued','rejected','pending','deleted') NOT NULL default 'accepted', + gpuMfr enum('AMD', 'Intel', 'Nvidia', 'Other', 'Unknown') default NULL, + graphicsDriver enum('open source', 'proprietary', 'unknown') default NULL, key(testingId) );

1 0

Jeremy Newman : take live
by Jeremy Newman 25 Aug '17

25 Aug '17

Module: appdb Branch: master Commit: d311fde7358ebd03ec65f23461de91ff79f59813 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=d311fde7358ebd03ec65f234… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Aug 25 09:12:01 2017 -0500 take live --- tables/alter.sql | 1 - 1 file changed, 1 deletion(-) diff --git a/tables/alter.sql b/tables/alter.sql index 4304234..457f8d9 100644 --- a/tables/alter.sql +++ b/tables/alter.sql @@ -1,3 +1,2 @@ /* 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 gpuMfr ENUM('AMD', 'Intel', 'Nvidia', 'Other', 'Unknown') DEFAULT NULL, ADD COLUMN graphicsDriver ENUM('open source', 'proprietary', 'unknown') DEFAULT NULL;

1 0

Gijs Vermeulen : Fix broken link.
by Alexandre Julliard 25 Aug '17

25 Aug '17

Module: website Branch: master Commit: a42df538a399b9d76db1c3baf0a01bb2c9ab9baa URL: http://source.winehq.org/git/website.git/?a=commit;h=a42df538a399b9d76db1c3… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri Aug 25 03:11:48 2017 +0200 Fix broken link. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2017082001.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/news/en/2017082001.xml b/news/en/2017082001.xml index f83a169..a27a098 100644 --- a/news/en/2017082001.xml +++ b/news/en/2017082001.xml @@ -10,6 +10,6 @@ <li>Chunked transfer improvements in WinInet.</li> <li>Various bug fixes.</li> </ul> -<p>The source is <a href="//dl.winehq.org/wine/source/2.15/wine-2.15.tar.bz2">available now</a>. +<p>The source is <a href="//dl.winehq.org/wine/source/2.x/wine-2.15.tar.xz">available now</a>. Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. </p></body></news>

1 0

Nikolay Sivov : dwrite: Don't use drawing effect for trimming signs.
by Alexandre Julliard 24 Aug '17

24 Aug '17

Module: wine Branch: master Commit: d58166d47c9894bbec88225957232c18878cc697 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d58166d47c9894bbec8822595… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 24 14:25:06 2017 +0300 dwrite: Don't use drawing effect for trimming signs. 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/layout.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 1acf134..ff09c78 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -5030,20 +5030,15 @@ static HRESULT WINAPI dwritetrimmingsign_Draw(IDWriteInlineObject *iface, void * FLOAT originX, FLOAT originY, BOOL is_sideways, BOOL is_rtl, IUnknown *effect) { struct dwrite_trimmingsign *This = impl_from_IDWriteInlineObject(iface); - DWRITE_TEXT_RANGE range = { 0, ~0u }; DWRITE_TEXT_METRICS metrics; DWRITE_LINE_METRICS line; UINT32 line_count; - HRESULT hr; TRACE("(%p)->(%p %p %.2f %.2f %d %d %p)\n", This, context, renderer, originX, originY, is_sideways, is_rtl, effect); - IDWriteTextLayout_SetDrawingEffect(This->layout, effect, range); IDWriteTextLayout_GetLineMetrics(This->layout, &line, 1, &line_count); IDWriteTextLayout_GetMetrics(This->layout, &metrics); - hr = IDWriteTextLayout_Draw(This->layout, context, renderer, originX, originY - line.baseline); - IDWriteTextLayout_SetDrawingEffect(This->layout, NULL, range); - return hr; + return IDWriteTextLayout_Draw(This->layout, context, renderer, originX, originY - line.baseline); } static HRESULT WINAPI dwritetrimmingsign_GetMetrics(IDWriteInlineObject *iface, DWRITE_INLINE_OBJECT_METRICS *ret) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index c4034a1..c03d684 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1228,12 +1228,13 @@ static void test_GetLocaleName(void) } static const struct drawcall_entry drawellipsis_seq[] = { - { DRAW_GLYPHRUN, {0x2026, 0}, {'e','n','-','u','s',0}, 1 }, + { DRAW_GLYPHRUN, {0x2026, 0}, {'e','n','-','g','b',0}, 1 }, { DRAW_LAST_KIND } }; static void test_CreateEllipsisTrimmingSign(void) { + static const WCHAR engbW[] = {'e','n','-','G','B',0}; DWRITE_INLINE_OBJECT_METRICS metrics; DWRITE_BREAK_CONDITION before, after; IDWriteTextFormat *format; @@ -1245,7 +1246,7 @@ static void test_CreateEllipsisTrimmingSign(void) factory = create_factory(); hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, - DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); + DWRITE_FONT_STRETCH_NORMAL, 10.0, engbW, &format); ok(hr == S_OK, "got 0x%08x\n", hr); EXPECT_REF(format, 1); @@ -1286,12 +1287,19 @@ if (0) {/* crashes on native */ effect = create_test_effect(); EXPECT_REF(effect, 1); + flush_sequence(sequences, RENDERER_ID); hr = IDWriteInlineObject_Draw(sign, NULL, &testrenderer, 0.0f, 0.0f, FALSE, FALSE, effect); ok(hr == S_OK, "Failed to draw trimming sign, hr %#x.\n", hr); + ok_sequence(sequences, RENDERER_ID, drawellipsis_seq, "ellipsis sign draw with effect test", FALSE); EXPECT_REF(effect, 1); IUnknown_Release(effect); + flush_sequence(sequences, RENDERER_ID); + hr = IDWriteInlineObject_Draw(sign, NULL, &testrenderer, 0.0f, 0.0f, FALSE, FALSE, (void *)0xdeadbeef); + ok(hr == S_OK, "Failed to draw trimming sign, hr %#x.\n", hr); + ok_sequence(sequences, RENDERER_ID, drawellipsis_seq, "ellipsis sign draw with effect test", FALSE); + IDWriteInlineObject_Release(sign); /* non-orthogonal flow/reading combination */

1 0

Nikolay Sivov : dwrite: Set leading text alignment for default trimming sign.
by Alexandre Julliard 24 Aug '17

24 Aug '17

Module: wine Branch: master Commit: cc49c40f05a600327b80711f6f80844608dde366 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc49c40f05a600327b80711f6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 24 14:25:07 2017 +0300 dwrite: Set leading text alignment for default trimming sign. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 2 ++ dlls/dwrite/tests/layout.c | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index ff09c78..4e901fa 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -5148,6 +5148,8 @@ HRESULT create_trimmingsign(IDWriteFactory5 *factory, IDWriteTextFormat *format, IDWriteTextLayout_SetWordWrapping(This->layout, DWRITE_WORD_WRAPPING_NO_WRAP); IDWriteTextLayout_SetParagraphAlignment(This->layout, DWRITE_PARAGRAPH_ALIGNMENT_NEAR); + IDWriteTextLayout_SetTextAlignment(This->layout, DWRITE_TEXT_ALIGNMENT_LEADING); + *sign = &This->IDWriteInlineObject_iface; return S_OK; diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index c03d684..8ca50f0 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1237,6 +1237,7 @@ static void test_CreateEllipsisTrimmingSign(void) static const WCHAR engbW[] = {'e','n','-','G','B',0}; DWRITE_INLINE_OBJECT_METRICS metrics; DWRITE_BREAK_CONDITION before, after; + struct renderer_context ctxt; IDWriteTextFormat *format; IDWriteInlineObject *sign; IDWriteFactory *factory; @@ -1300,6 +1301,25 @@ if (0) {/* crashes on native */ ok(hr == S_OK, "Failed to draw trimming sign, hr %#x.\n", hr); ok_sequence(sequences, RENDERER_ID, drawellipsis_seq, "ellipsis sign draw with effect test", FALSE); + memset(&ctxt, 0, sizeof(ctxt)); + hr = IDWriteInlineObject_Draw(sign, &ctxt, &testrenderer, 123.0f, 456.0f, FALSE, FALSE, NULL); + ok(hr == S_OK, "Failed to draw trimming sign, hr %#x.\n", hr); + ok(ctxt.originX == 123.0f && ctxt.originY == 456.0f, "Unexpected drawing origin\n"); + + IDWriteInlineObject_Release(sign); + + /* Centered format */ + hr = IDWriteTextFormat_SetTextAlignment(format, DWRITE_TEXT_ALIGNMENT_CENTER); + ok(hr == S_OK, "Failed to set text alignment, hr %#x.\n", hr); + + hr = IDWriteFactory_CreateEllipsisTrimmingSign(factory, format, &sign); + ok(hr == S_OK, "got 0x%08x\n", hr); + + memset(&ctxt, 0, sizeof(ctxt)); + hr = IDWriteInlineObject_Draw(sign, &ctxt, &testrenderer, 123.0f, 456.0f, FALSE, FALSE, NULL); + ok(hr == S_OK, "Failed to draw trimming sign, hr %#x.\n", hr); + ok(ctxt.originX == 123.0f && ctxt.originY == 456.0f, "Unexpected drawing origin\n"); + IDWriteInlineObject_Release(sign); /* non-orthogonal flow/reading combination */

1 0

Hugh McMaster : regedit/tests: Add Unicode tests for importing invalid registry data.
by Alexandre Julliard 24 Aug '17

24 Aug '17

Module: wine Branch: master Commit: d78767b63cbe00ae15867eb2f74cc69ac3443a0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d78767b63cbe00ae15867eb2f… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Aug 24 12:46:27 2017 +0000 regedit/tests: Add Unicode tests for importing invalid registry data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 510 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 510 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d78767b63cbe00ae15867…

1 0

Nikolay Sivov : gdiplus: Use defined constants for wrap modes.
by Alexandre Julliard 24 Aug '17

24 Aug '17

Module: wine Branch: master Commit: 42e5d2702e692c5829f42c0fe238bb2d738109c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42e5d2702e692c5829f42c0fe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 24 14:24:34 2017 +0300 gdiplus: Use defined constants for wrap modes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index d20df77..80e565b 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -898,9 +898,8 @@ static ARGB sample_bitmap_pixel(GDIPCONST GpRect *src_rect, LPBYTE bits, UINT wi if (y < 0) y = height*2 + y % (height * 2); - if ((attributes->wrap & 1) == 1) + if (attributes->wrap & WrapModeTileFlipX) { - /* Flip X */ if ((x / width) % 2 == 0) x = x % width; else @@ -909,9 +908,8 @@ static ARGB sample_bitmap_pixel(GDIPCONST GpRect *src_rect, LPBYTE bits, UINT wi else x = x % width; - if ((attributes->wrap & 2) == 2) + if (attributes->wrap & WrapModeTileFlipY) { - /* Flip Y */ if ((y / height) % 2 == 0) y = y % height; else

1 0

Nikolay Sivov : dwrite/tests: A test to draw trimming sign with drawing effect.
by Alexandre Julliard 24 Aug '17

24 Aug '17

Module: wine Branch: master Commit: 65014bcab536a7618069c7c157656ff3a510df1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=65014bcab536a7618069c7c15… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 24 14:25:04 2017 +0300 dwrite/tests: A test to draw trimming sign with drawing effect. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/layout.c | 66 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 55 insertions(+), 11 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 1d9d38a..c4034a1 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -782,6 +782,17 @@ static IDWriteInlineObject testinlineobj = { &testinlineobjvtbl }; static IDWriteInlineObject testinlineobj2 = { &testinlineobjvtbl }; static IDWriteInlineObject testinlineobj3 = { &testinlineobjvtbl2 }; +struct test_effect +{ + IUnknown IUnknown_iface; + LONG ref; +}; + +static inline struct test_effect *test_effect_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct test_effect, IUnknown_iface); +} + static HRESULT WINAPI testeffect_QI(IUnknown *iface, REFIID riid, void **obj) { if (IsEqualIID(riid, &IID_IUnknown)) { @@ -790,18 +801,26 @@ static HRESULT WINAPI testeffect_QI(IUnknown *iface, REFIID riid, void **obj) return S_OK; } + ok(0, "Unexpected riid %s.\n", wine_dbgstr_guid(riid)); *obj = NULL; return E_NOINTERFACE; } static ULONG WINAPI testeffect_AddRef(IUnknown *iface) { - return 2; + struct test_effect *effect = test_effect_from_IUnknown(iface); + return InterlockedIncrement(&effect->ref); } static ULONG WINAPI testeffect_Release(IUnknown *iface) { - return 1; + struct test_effect *effect = test_effect_from_IUnknown(iface); + LONG ref = InterlockedDecrement(&effect->ref); + + if (!ref) + HeapFree(GetProcessHeap(), 0, effect); + + return ref; } static const IUnknownVtbl testeffectvtbl = { @@ -810,7 +829,16 @@ static const IUnknownVtbl testeffectvtbl = { testeffect_Release }; -static IUnknown testeffect = { &testeffectvtbl }; +static IUnknown *create_test_effect(void) +{ + struct test_effect *effect; + + effect = HeapAlloc(GetProcessHeap(), 0, sizeof(*effect)); + effect->IUnknown_iface.lpVtbl = &testeffectvtbl; + effect->ref = 1; + + return &effect->IUnknown_iface; +} static void test_CreateTextLayout(void) { @@ -1211,7 +1239,7 @@ static void test_CreateEllipsisTrimmingSign(void) IDWriteTextFormat *format; IDWriteInlineObject *sign; IDWriteFactory *factory; - IUnknown *unk; + IUnknown *unk, *effect; HRESULT hr; factory = create_factory(); @@ -1254,6 +1282,16 @@ if (0) {/* crashes on native */ hr = IDWriteInlineObject_Draw(sign, NULL, &testrenderer, 0.0, 0.0, FALSE, FALSE, NULL); ok(hr == S_OK, "got 0x%08x\n", hr); ok_sequence(sequences, RENDERER_ID, drawellipsis_seq, "ellipsis sign draw test", FALSE); + + effect = create_test_effect(); + + EXPECT_REF(effect, 1); + hr = IDWriteInlineObject_Draw(sign, NULL, &testrenderer, 0.0f, 0.0f, FALSE, FALSE, effect); + ok(hr == S_OK, "Failed to draw trimming sign, hr %#x.\n", hr); + EXPECT_REF(effect, 1); + + IUnknown_Release(effect); + IDWriteInlineObject_Release(sign); /* non-orthogonal flow/reading combination */ @@ -3265,12 +3303,15 @@ static void test_SetDrawingEffect(void) IDWriteTextFormat *format; IDWriteTextLayout *layout; IDWriteFactory *factory; + IUnknown *unk, *effect; DWRITE_TEXT_RANGE r; - IUnknown *unk; HRESULT hr; + LONG ref; factory = create_factory(); + effect = create_test_effect(); + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -3282,13 +3323,14 @@ static void test_SetDrawingEffect(void) /* set effect past the end of text */ r.startPosition = 100; r.length = 10; - hr = IDWriteTextLayout_SetDrawingEffect(layout, &testeffect, r); + hr = IDWriteTextLayout_SetDrawingEffect(layout, effect, r); ok(hr == S_OK, "got 0x%08x\n", hr); r.startPosition = r.length = 0; hr = IDWriteTextLayout_GetDrawingEffect(layout, 101, &unk, &r); ok(hr == S_OK, "got 0x%08x\n", hr); ok(r.startPosition == 100 && r.length == 10, "got %u, %u\n", r.startPosition, r.length); + IUnknown_Release(unk); r.startPosition = r.length = 0; unk = (void*)0xdeadbeef; @@ -3300,7 +3342,7 @@ static void test_SetDrawingEffect(void) /* effect is applied to clusters, not individual text positions */ r.startPosition = 0; r.length = 2; - hr = IDWriteTextLayout_SetDrawingEffect(layout, &testeffect, r); + hr = IDWriteTextLayout_SetDrawingEffect(layout, effect, r); ok(hr == S_OK, "got 0x%08x\n", hr); flush_sequence(sequences, RENDERER_ID); @@ -3315,7 +3357,7 @@ static void test_SetDrawingEffect(void) r.startPosition = 0; r.length = 2; - hr = IDWriteTextLayout_SetDrawingEffect(layout, &testeffect, r); + hr = IDWriteTextLayout_SetDrawingEffect(layout, effect, r); ok(hr == S_OK, "got 0x%08x\n", hr); flush_sequence(sequences, RENDERER_ID); @@ -3336,7 +3378,7 @@ static void test_SetDrawingEffect(void) hr = IDWriteTextLayout_SetInlineObject(layout, sign, r); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IDWriteTextLayout_SetDrawingEffect(layout, &testeffect, r); + hr = IDWriteTextLayout_SetDrawingEffect(layout, effect, r); ok(hr == S_OK, "got 0x%08x\n", hr); flush_sequence(sequences, RENDERER_ID); @@ -3350,7 +3392,7 @@ static void test_SetDrawingEffect(void) r.startPosition = 1; r.length = 1; - hr = IDWriteTextLayout_SetDrawingEffect(layout, &testeffect, r); + hr = IDWriteTextLayout_SetDrawingEffect(layout, effect, r); ok(hr == S_OK, "got 0x%08x\n", hr); /* no effect is reported in this case */ @@ -3366,7 +3408,7 @@ static void test_SetDrawingEffect(void) r.startPosition = 0; r.length = 1; - hr = IDWriteTextLayout_SetDrawingEffect(layout, &testeffect, r); + hr = IDWriteTextLayout_SetDrawingEffect(layout, effect, r); ok(hr == S_OK, "got 0x%08x\n", hr); /* first range position is all that matters for inline ranges */ @@ -3377,6 +3419,8 @@ static void test_SetDrawingEffect(void) IDWriteTextLayout_Release(layout); + ref = IUnknown_Release(effect); + ok(ref == 0, "Unexpected effect refcount %u\n", ref); IDWriteInlineObject_Release(sign); IDWriteTextFormat_Release(format); IDWriteFactory_Release(factory);

1 0

Alex Henrie : include: Allow programs to take the address of byte-swapping functions.
by Alexandre Julliard 24 Aug '17

24 Aug '17

Module: wine Branch: master Commit: 99684bc4256b56580d49c882df68fa8632b45c12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99684bc4256b56580d49c882d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 17 09:11:57 2017 -0600 include: Allow programs to take the address of byte-swapping functions. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winsock.h | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/include/winsock.h b/include/winsock.h index cf9adf5..8bb067f 100644 --- a/include/winsock.h +++ b/include/winsock.h @@ -519,10 +519,18 @@ int WINAPI __WSAFDIsSet(SOCKET,WS(fd_set)*); #ifdef WORDS_BIGENDIAN -#define htonl(l) ((ULONG)(l)) -#define htons(s) ((u_short)(s)) -#define ntohl(l) ((ULONG)(l)) -#define ntohs(s) ((u_short)(s)) +static inline u_short __wine_ushort_noop(u_short s) +{ + return s; +} +static inline ULONG __wine_ulong_noop(ULONG l) +{ + return l; +} +#define htonl __wine_ulong_noop +#define htons __wine_ushort_noop +#define ntohl __wine_ulong_noop +#define ntohs __wine_ushort_noop #else /* WORDS_BIGENDIAN */ @@ -534,10 +542,10 @@ static inline ULONG __wine_ulong_swap(ULONG l) { return ((ULONG)__wine_ushort_swap((u_short)l) << 16) | __wine_ushort_swap((u_short)(l >> 16)); } -#define htonl(l) __wine_ulong_swap(l) -#define htons(s) __wine_ushort_swap(s) -#define ntohl(l) __wine_ulong_swap(l) -#define ntohs(s) __wine_ushort_swap(s) +#define htonl __wine_ulong_swap +#define htons __wine_ushort_swap +#define ntohl __wine_ulong_swap +#define ntohs __wine_ushort_swap #endif /* WORDS_BIGENDIAN */

1 0