wine-commits August 2017

wine-commits@winehq.org

2 participants
351 discussions

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

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 hardware section to test report form
by Jeremy Newman 25 Aug '17

25 Aug '17

Module: appdb Branch: master Commit: 6aef8feeebe9d2e2d7f2e2d0cb865cd3dc9bbc35 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=6aef8feeebe9d2e2d7f2e2d0… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Wed Aug 23 13:46:37 2017 -0500 Add hardware section to test report form Fixes bug 16031. Currently only adds fields for the GPU and driver, but more fields could be added to track other hardware. Also changes the Installs? and Runs? dropdown lists to bootstrap form-inline to match the other dropdown lists. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> --- include/testData.php | 77 ++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 71 insertions(+), 6 deletions(-) diff --git a/include/testData.php b/include/testData.php index cd76375..49cfa69 100644 --- a/include/testData.php +++ b/include/testData.php @@ -24,6 +24,8 @@ class testData{ var $sComments; var $sSubmitTime; var $iSubmitterId; + var $sGpuMfr; + var $sGraphicsDriver; private $sState; // constructor, fetches the data. @@ -63,6 +65,8 @@ class testData{ $this->sSubmitTime = $oRow->submitTime; $this->iSubmitterId = $oRow->submitterId; $this->sState = $oRow->state; + $this->sGpuMfr = $oRow->gpuMfr; + $this->sGraphicsDriver = $oRow->graphicsDriver; } } @@ -80,10 +84,11 @@ class testData{ "testedRelease, staging, installs, runs,". "usedWorkaround, workarounds,". "testedRating, comments,". - "submitTime, submitterId, state)". + "submitTime, submitterId, state,". + "gpuMfr, graphicsDriver)". "VALUES('?', '?', '?', '?', '?', '?', '?',". "'?', '?', '?', '?', '?',". - "'?', '?', '?', '?', '?')", + "'?', '?', '?', '?', '?', '?', '?')", $this->iVersionId, $this->shWhatWorks, $this->shWhatDoesnt, @@ -100,7 +105,9 @@ class testData{ $this->sComments, "NOW()", $_SESSION['current']->iUserId, - $this->sState); + $this->sState, + $this->sGpuMfr, + $this->sGraphicsDriver); if($hResult) { @@ -247,7 +254,9 @@ class testData{ workarounds = '?', testedRating = '?', comments = '?', - state = '?' + state = '?', + gpuMfr = '?', + graphicsDriver = '?' WHERE testingId = '?'", $this->iVersionId, $this->shWhatWorks, @@ -264,6 +273,8 @@ class testData{ $this->sTestedRating, $this->sComments, $this->sState, + $this->sGpuMfr, + $this->sGraphicsDriver, $this->iTestingId)) { if($bUpdateRatingInfo && $this->sState == 'accepted') @@ -572,6 +583,7 @@ class testData{ "<p><b>What does not</b></p>\n<p>{$this->shWhatDoesnt}</p>\n". "<p><b>Workarounds</b></p>\n<p>{$this->shWorkarounds}</p>\n". "<p><b>What was not tested</b></p>\n<p>{$this->shWhatNotTested}</p>\n". + "<p><b>Hardware tested</b></p>\n<p><i>Graphics: </i></ul><li>GPU: {$this->sGpuMfr}</li><li>Driver: {$this->sGraphicsDriver}</li></ul></p>". "<p><b>Additional Comments</b></p>\n<pre style='white-space: pre-wrap;'>{$this->sComments}</pre>\n"; } @@ -898,6 +910,16 @@ class testData{ echo '<td><textarea name="sComments" id="extra_comments" rows=10 cols=65>'; echo $this->sComments.'</textarea></td></tr>',"\n"; + /* Graphics hardware/driver + this section could be expanded to include info on other hardware (e.g., CPU, audio) */ + echo '<tr><td><b>Hardware</b></td>',"\n"; + echo '<td>'; + echo 'Graphics: '; + echo testData::make_gpuMfr_list("sGpuMfr", $this->sGpuMfr); + // echo '<br>'; + echo testData::make_graphicsDriver_list('sGraphicsDriver', $this->sGraphicsDriver); + echo '</td></tr>'; + // Distribution $oDistribution = new distribution($this->iDistributionId); $sDistributionHelp = ""; @@ -971,6 +993,12 @@ class testData{ if (empty($aValues['sTestedRelease'])) $errors .= "<li>Please enter the version of Wine that you tested with.</li>\n"; + + if (empty($aValues['sGpuMfr'])) + $errors .= "<li>Please select your GPU manufacturer from the list. If you don't know, select Unknown.</li>\n"; + + if (empty($aValues['sGraphicsDriver'])) + $errors .= "<li>Please indicate whether your graphics driver is open source or proprietary. If you don't know, select unknown.</li>\n"; // Ask for confirmation if changing the tested Wine versions, becase we want users // to submit new reports instead of updating existing ones when testing new Wines @@ -1073,11 +1101,13 @@ class testData{ $this->sUsedWorkaround = $aValues['sUsedWorkaround']; $this->sTestedRating = $aValues['sTestedRating']; $this->sComments = $aValues['sComments']; + $this->sGpuMfr = $aValues['sGpuMfr']; + $this->sGraphicsDriver = $aValues['sGraphicsDriver']; } function make_Installs_list($sVarname, $sSelectedValue) { - echo "<select name='$sVarname'>\n"; + echo "<select name='$sVarname' class='form-control form-control-inline'>\n"; echo "<option value=\"\">Choose ...</option>\n"; $aRating = array('Yes', 'No', 'No, but has workaround', 'N/A'); $iMax = count($aRating); @@ -1094,7 +1124,7 @@ class testData{ function make_Runs_list($sVarname, $sSelectedValue) { - echo "<select name='$sVarname'>\n"; + echo "<select name='$sVarname' class='form-control form-control-inline'>\n"; echo "<option value=\"\">Choose ...</option>\n"; $aRating = array("Yes", "No", "Not installable"); $iMax = count($aRating); @@ -1108,6 +1138,41 @@ class testData{ } echo "</select>\n"; } + + function make_gpuMfr_list($sVarname, $sSelectedValue) + { + echo "<select name='$sVarname'class='form-control form-control-inline'>\n"; + echo "<option value=\"\">GPU manufacturer?</option>\n"; + $aGpuMfr = array('AMD', 'Intel', 'Nvidia', 'Other', 'Unknown'); + $iMax = count($aGpuMfr); + + for($i=0; $i < $iMax; $i++) + { + if($aGpuMfr[$i] == $sSelectedValue) + echo "<option value='".$aGpuMfr[$i]."' selected>".$aGpuMfr[$i]."\n"; + else + echo "<option value='".$aGpuMfr[$i]."'>".$aGpuMfr[$i]."\n"; + } + echo "</select>\n"; + } + + function make_graphicsDriver_list($sVarname, $sSelectedValue) + + { + echo "<select name='$sVarname' class='form-control form-control-inline'>\n"; + echo "<option value=\"\">Open source or proprietary driver?</option>\n"; + $aGraphicsDriver = array('open source', 'proprietary', 'unknown'); + $iMax = count($aGraphicsDriver); + + for($i=0; $i < $iMax; $i++) + { + if($aGraphicsDriver[$i] == $sSelectedValue) + echo "<option value='".$aGraphicsDriver[$i]."' selected>".$aGraphicsDriver[$i]."\n"; + else + echo "<option value='".$aGraphicsDriver[$i]."'>".$aGraphicsDriver[$i]."\n"; + } + echo "</select>\n"; + } public static function getTestResultsForUser($iUserId, $iVersionId) {

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: 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

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 : d2d1: Pass inline object effect through rendering context.
by Alexandre Julliard 24 Aug '17

24 Aug '17

Module: wine Branch: master Commit: 7316c96239a24da81f5b2accad3cd0d7bdba867f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7316c96239a24da81f5b2acca… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 24 17:33:07 2017 +0300 d2d1: Pass inline object effect through rendering context. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/render_target.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 2ac62e4..0428245 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -1982,10 +1982,26 @@ static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawStrikethrough(IDWriteText static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawInlineObject(IDWriteTextRenderer *iface, void *ctx, float origin_x, float origin_y, IDWriteInlineObject *object, BOOL is_sideways, BOOL is_rtl, IUnknown *effect) { + struct d2d_draw_text_layout_ctx *context = ctx; + ID2D1Brush *brush; + HRESULT hr; + TRACE("iface %p, ctx %p, origin_x %.8e, origin_y %.8e, object %p, is_sideways %#x, is_rtl %#x, effect %p.\n", iface, ctx, origin_x, origin_y, object, is_sideways, is_rtl, effect); - return IDWriteInlineObject_Draw(object, ctx, iface, origin_x, origin_y, is_sideways, is_rtl, effect); + /* Inline objects may not pass effects all the way down, when using layout object internally for example. + This is how default trimming sign object in DirectWrite works - it does not use effect passed to Draw(), + and resulting DrawGlyphRun() is always called with NULL effect, however original effect is used and correct + brush is selected at Direct2D level. */ + brush = context->brush; + context->brush = d2d_draw_get_text_brush(context, effect); + + hr = IDWriteInlineObject_Draw(object, ctx, iface, origin_x, origin_y, is_sideways, is_rtl, effect); + + ID2D1Brush_Release(context->brush); + context->brush = brush; + + return hr; } static const struct IDWriteTextRendererVtbl d2d_text_renderer_vtbl =

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

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

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

← Newer
1
...
8
9
10
11
12
13
14
...
36
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2017