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

Jeremy Newman : take live
by Jeremy Newman Aug. 25, 2017

Aug. 25, 2017

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

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

Aug. 25, 2017

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 : Add hardware section to test report form
by Jeremy Newman Aug. 25, 2017

Aug. 25, 2017

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 Aug. 25, 2017

Aug. 25, 2017

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 Aug. 24, 2017

Aug. 24, 2017

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 Aug. 24, 2017

Aug. 24, 2017

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 Aug. 24, 2017

Aug. 24, 2017

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

Hugh McMaster : regedit/tests: Add Unicode tests for value deletion.
by Alexandre Julliard Aug. 24, 2017

Aug. 24, 2017

Module: wine Branch: master Commit: cbe95347fc0d3d06d818e624dc92c94d4785e212 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbe95347fc0d3d06d818e624d… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Aug 24 12:46:18 2017 +0000 regedit/tests: Add Unicode tests for value deletion. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 58 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index efd2aad..788c3b5 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -2690,6 +2690,63 @@ static void test_value_deletion(void) ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); } + +static void test_value_deletion_unicode(void) +{ + HKEY hkey; + LONG lr; + DWORD dword = 0x8; + BYTE hex[4] = {0x11, 0x22, 0x33, 0x44}; + + lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); + ok(lr == ERROR_SUCCESS || lr == ERROR_FILE_NOT_FOUND, "RegDeleteKeyA failed: %d\n", lr); + + exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n"); + + lr = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); + ok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: got %d, expected 0\n", lr); + + /* Test value deletion. We start by creating some registry values. */ + exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine46a\"=\"Test Value\"\n" + "\"Wine46b\"=dword:00000008\n" + "\"Wine46c\"=hex:11,22,33,44\n" + "\"Wine46d\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,\\\n" + " 63,00,6f,00,6e,00,63,00,61,00,74,00,\\\n" + " 65,00,6e,00,61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n" + "\"Wine46e\"=hex(2):25,00,50,00,41,00,54,00,48,00,25,00,00,00\n" + "\"Wine46f\"=hex(0):56,00,61,00,6c,00,75,00,65,00,00,00\n\n"); + verify_reg(hkey, "Wine46a", REG_SZ, "Test Value", 11, 0); + verify_reg(hkey, "Wine46b", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "Wine46c", REG_BINARY, hex, 4, 0); + verify_reg(hkey, "Wine46d", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + verify_reg(hkey, "Wine46e", REG_EXPAND_SZ, "%PATH%", 7, 0); + verify_reg(hkey, "Wine46f", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); + + exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine46a\"=-\n" + "\"Wine46b\"= -\n" + "\"Wine46c\"= \t-\t \n" + "\"Wine46d\"=-\"Test\"\n" + "\"Wine46e\"=- ;comment\n" + "\"Wine46f\"=- #comment\n\n"); + verify_reg_nonexist(hkey, "Wine46a"); + verify_reg_nonexist(hkey, "Wine46b"); + verify_reg_nonexist(hkey, "Wine46c"); + verify_reg(hkey, "Wine46d", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + verify_reg_nonexist(hkey, "Wine46e"); + verify_reg(hkey, "Wine46f", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); + + lr = RegCloseKey(hkey); + ok(lr == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", lr); + + lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); + ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); +} + START_TEST(regedit) { if(!exec_import_str("REGEDIT4\r\n\r\n")){ @@ -2709,4 +2766,5 @@ START_TEST(regedit) test_key_creation_and_deletion(); test_key_creation_and_deletion_unicode(); test_value_deletion(); + test_value_deletion_unicode(); }

1 0

Jacek Caban : mshtml: Properly expose IHTMLDocument6 interface to scripts.
by Alexandre Julliard Aug. 24, 2017

Aug. 24, 2017

Module: wine Branch: master Commit: d631268fa1ae03ce124fec9934043d98a24cd940 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d631268fa1ae03ce124fec993… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 24 12:29:17 2017 +0200 mshtml: Properly expose IHTMLDocument6 interface to scripts. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 19 ++++++++++++++++--- dlls/mshtml/tests/documentmode.js | 16 ++++++++++++++++ 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 8d48e18..ed3075b 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4887,19 +4887,32 @@ static const tid_t HTMLDocumentNode_iface_tids[] = { IHTMLDOMNode_tid, IHTMLDOMNode2_tid, IHTMLDocument2_tid, - IHTMLDocument3_tid, IHTMLDocument4_tid, IHTMLDocument5_tid, - IHTMLDocument6_tid, IDocumentSelector_tid, 0 }; +void HTMLDocumentNode_init_dispex_info(dispex_data_t *info, compat_mode_t mode) +{ + HTMLDOMNode_init_dispex_info(info, mode); + + /* Depending on compatibility version, we add interfaces in different order + * so that the right getElementById implementation is used. */ + if(mode < COMPAT_MODE_IE8) { + dispex_info_add_interface(info, IHTMLDocument3_tid, NULL); + dispex_info_add_interface(info, IHTMLDocument6_tid, NULL); + }else { + dispex_info_add_interface(info, IHTMLDocument6_tid, NULL); + dispex_info_add_interface(info, IHTMLDocument3_tid, NULL); + } +} + static dispex_static_data_t HTMLDocumentNode_dispex = { &HTMLDocumentNode_dispex_vtbl, DispHTMLDocument_tid, HTMLDocumentNode_iface_tids, - HTMLDOMNode_init_dispex_info + HTMLDocumentNode_init_dispex_info }; static HTMLDocumentNode *alloc_doc_node(HTMLDocumentObj *doc_obj, HTMLInnerWindow *window) diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 4224dfe..9453bdc 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -55,6 +55,21 @@ function test_doc_props() { next_test(); } +function test_elem_by_id() { + document.body.innerHTML = '<form id="testid" name="testname"></form>'; + + var id_elem = document.getElementById("testid"); + ok(id_elem.tagName === "FORM", "id_elem.tagName = " + id_elem.tagName); + + var name_elem = document.getElementById("testname"); + if(document.documentMode < 8) + ok(id_elem === name_elem, "id_elem != id_elem"); + else + ok(name_elem === null, "name_elem != null"); + + next_test(); +} + function test_doc_mode() { compat_version = parseInt(document.location.search.substring(1)); @@ -116,5 +131,6 @@ var tests = [ test_doc_mode, test_elem_props, test_doc_props, + test_elem_by_id, test_conditional_comments ];

1 0

Paul Gofman : d3d9/tests: Add tests for SW shaders creation in SWVP and MVP modes.
by Alexandre Julliard Aug. 24, 2017

Aug. 24, 2017

Module: wine Branch: master Commit: e81e14c8940b2c7310532cd353a37f6742841de7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e81e14c8940b2c7310532cd35… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Aug 23 17:17:54 2017 +0300 d3d9/tests: Add tests for SW shaders creation in SWVP and MVP modes. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index a129d4c..5f904a2 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -6547,6 +6547,7 @@ float4 main(const float4 color : COLOR) : SV_TARGET IDirect3DVertexShader9 *vs = NULL; IDirect3DPixelShader9 *ps = NULL; IDirect3DDevice9 *device; + struct device_desc desc; IDirect3D9 * d3d; ULONG refcount; D3DCAPS9 caps; @@ -6624,6 +6625,64 @@ float4 main(const float4 color : COLOR) : SV_TARGET if (ps) IDirect3DPixelShader9_Release(ps); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + + desc.device_window = window; + desc.width = 640; + desc.height = 480; + desc.flags = CREATE_DEVICE_SWVP_ONLY; + + if (!(device = create_device(d3d, window, &desc))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + vs = NULL; + hr = IDirect3DDevice9_CreateVertexShader(device, vs_1_256, &vs); + todo_wine + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + if (vs) + IDirect3DVertexShader9_Release(vs); + hr = IDirect3DDevice9_CreateVertexShader(device, vs_3_256, &vs); + todo_wine + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + if (vs) + IDirect3DVertexShader9_Release(vs); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + + desc.flags = CREATE_DEVICE_MIXED_ONLY; + if (!(device = create_device(d3d, window, &desc))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + hr = IDirect3DDevice9_SetSoftwareVertexProcessing(device, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateVertexShader(device, vs_1_256, &vs); + todo_wine + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetVertexShader(device, vs); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + if (vs) + IDirect3DVertexShader9_Release(vs); + + hr = IDirect3DDevice9_CreateVertexShader(device, vs_3_256, &vs); + todo_wine + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetVertexShader(device, vs); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + if (vs) + IDirect3DVertexShader9_Release(vs); + cleanup: refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0