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

Hugh McMaster : regedit: Use the treeview item label in the 'Favourites' menu instead of the key path.
by Alexandre Julliard June 5, 2017

June 5, 2017

Module: wine Branch: master Commit: 46bff016ab9b6f698a5934d044a7c981704bf72e URL: http://source.winehq.org/git/wine.git/?a=commit;h=46bff016ab9b6f698a5934d04… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jun 5 00:58:04 2017 +0000 regedit: Use the treeview item label in the 'Favourites' menu instead of the key path. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/framewnd.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index e654d48..7e48513 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -646,15 +646,21 @@ static INT_PTR CALLBACK addtofavorites_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM w switch(uMsg) { case WM_INITDIALOG: { - HKEY hKeyRoot = NULL; - LPWSTR ItemPath = GetItemPath(g_pChildWnd->hTreeWnd, NULL, &hKeyRoot); + HTREEITEM selected; + TVITEMW item; + WCHAR buf[128]; + + selected = (HTREEITEM)SendMessageW(g_pChildWnd->hTreeWnd, TVM_GETNEXTITEM, TVGN_CARET, 0); + + item.mask = TVIF_HANDLE | TVIF_TEXT; + item.hItem = selected; + item.pszText = buf; + item.cchTextMax = COUNT_OF(buf); + SendMessageW(g_pChildWnd->hTreeWnd, TVM_GETITEMW, 0, (LPARAM)&item); - if(!ItemPath || !*ItemPath) - ItemPath = GetItemFullPath(g_pChildWnd->hTreeWnd, NULL, FALSE); EnableWindow(GetDlgItem(hwndDlg, IDOK), FALSE); - SetWindowTextW(hwndValue, ItemPath); + SetWindowTextW(hwndValue, buf); SendMessageW(hwndValue, EM_SETLIMITTEXT, 127, 0); - HeapFree(GetProcessHeap(), 0, ItemPath); return TRUE; } case WM_COMMAND:

1 0

Nikolay Sivov : mf: Added IMFMediaSession stub.
by Alexandre Julliard June 5, 2017

June 5, 2017

Module: wine Branch: master Commit: 58adb553e4b7181628d2a7e5712fd30ab417ccae URL: http://source.winehq.org/git/wine.git/?a=commit;h=58adb553e4b7181628d2a7e57… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 5 02:09:48 2017 +0300 mf: Added IMFMediaSession stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/Makefile.in | 1 + dlls/mf/mf.spec | 2 +- dlls/mf/session.c | 264 ++++++++++++++++++++++++++++++++++++++++++++++++++++ include/mfidl.idl | 1 + 4 files changed, 267 insertions(+), 1 deletion(-) diff --git a/dlls/mf/Makefile.in b/dlls/mf/Makefile.in index 6725d5b..9c61d94 100644 --- a/dlls/mf/Makefile.in +++ b/dlls/mf/Makefile.in @@ -3,4 +3,5 @@ IMPORTLIB = mf C_SRCS = \ main.c \ + session.c \ topology.c diff --git a/dlls/mf/mf.spec b/dlls/mf/mf.spec index cd6d3dc..3b02bd2 100644 --- a/dlls/mf/mf.spec +++ b/dlls/mf/mf.spec @@ -39,7 +39,7 @@ @ stub MFCreateMP3MediaSink @ stub MFCreateMPEG4MediaSink @ stub MFCreateMediaProcessor -@ stub MFCreateMediaSession +@ stdcall MFCreateMediaSession(ptr ptr) @ stub MFCreateNSCByteStreamPlugin @ stub MFCreateNetSchemePlugin @ stub MFCreatePMPHost diff --git a/dlls/mf/session.c b/dlls/mf/session.c new file mode 100644 index 0000000..18c5f3b --- /dev/null +++ b/dlls/mf/session.c @@ -0,0 +1,264 @@ +/* + * Copyright 2017 Nikolay Sivov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#include "config.h" + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "mfidl.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mfplat); + +typedef struct mfsession +{ + IMFMediaSession IMFMediaSession_iface; + LONG ref; +} mfsession; + +static inline mfsession *impl_from_IMFMediaSession(IMFMediaSession *iface) +{ + return CONTAINING_RECORD(iface, mfsession, IMFMediaSession_iface); +} + +static HRESULT WINAPI mfsession_QueryInterface(IMFMediaSession *iface, REFIID riid, void **out) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), out); + + if (IsEqualIID(riid, &IID_IMFMediaSession) || + IsEqualIID(riid, &IID_IMFMediaEventGenerator) || + IsEqualIID(riid, &IID_IUnknown)) + { + *out = &This->IMFMediaSession_iface; + } + else + { + FIXME("(%s, %p)\n", debugstr_guid(riid), out); + *out = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*out); + return S_OK; +} + +static ULONG WINAPI mfsession_AddRef(IMFMediaSession *iface) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + return ref; +} + +static ULONG WINAPI mfsession_Release(IMFMediaSession *iface) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + if (!ref) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI mfsession_GetEvent(IMFMediaSession *iface, DWORD flags, IMFMediaEvent **event) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + FIXME("(%p)->(%#x, %p)\n", This, flags, event); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsession_BeginGetEvent(IMFMediaSession *iface, IMFAsyncCallback *callback, IUnknown *state) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + FIXME("(%p)->(%p, %p)\n", This, callback, state); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsession_EndGetEvent(IMFMediaSession *iface, IMFAsyncResult *result, IMFMediaEvent **event) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + FIXME("(%p)->(%p, %p)\n", This, result, event); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsession_QueueEvent(IMFMediaSession *iface, MediaEventType event_type, REFGUID ext_type, + HRESULT hr, const PROPVARIANT *value) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + FIXME("(%p)->(%d, %s, %#x, %p)\n", This, event_type, debugstr_guid(ext_type), hr, value); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsession_SetTopology(IMFMediaSession *iface, DWORD flags, IMFTopology *topology) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + FIXME("(%p)->(%#x, %p)\n", This, flags, topology); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsession_ClearTopologies(IMFMediaSession *iface) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + FIXME("(%p)\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsession_Start(IMFMediaSession *iface, const GUID *format, const PROPVARIANT *start) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + FIXME("(%p)->(%s, %p)\n", This, debugstr_guid(format), start); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsession_Pause(IMFMediaSession *iface) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + FIXME("(%p)\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsession_Stop(IMFMediaSession *iface) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + FIXME("(%p)\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsession_Close(IMFMediaSession *iface) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + FIXME("(%p)\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsession_Shutdown(IMFMediaSession *iface) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + FIXME("(%p)\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsession_GetClock(IMFMediaSession *iface, IMFClock **clock) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + FIXME("(%p)->(%p)\n", This, clock); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsession_GetSessionCapabilities(IMFMediaSession *iface, DWORD *caps) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + FIXME("(%p)->(%p)\n", This, caps); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsession_GetFullTopology(IMFMediaSession *iface, DWORD flags, TOPOID id, IMFTopology **topology) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + FIXME("(%p)->(%#x, %s, %p)\n", This, flags, wine_dbgstr_longlong(id), topology); + + return E_NOTIMPL; +} + +static const IMFMediaSessionVtbl mfmediasessionvtbl = +{ + mfsession_QueryInterface, + mfsession_AddRef, + mfsession_Release, + mfsession_GetEvent, + mfsession_BeginGetEvent, + mfsession_EndGetEvent, + mfsession_QueueEvent, + mfsession_SetTopology, + mfsession_ClearTopologies, + mfsession_Start, + mfsession_Pause, + mfsession_Stop, + mfsession_Close, + mfsession_Shutdown, + mfsession_GetClock, + mfsession_GetSessionCapabilities, + mfsession_GetFullTopology, +}; + +/*********************************************************************** + * MFCreateTopology (mf.@) + */ +HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **session) +{ + mfsession *object; + + TRACE("(%p, %p)\n", config, session); + + if (!session) + return E_POINTER; + + if (config) + FIXME("session configuration ignored\n"); + + object = HeapAlloc(GetProcessHeap(), 0, sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + object->IMFMediaSession_iface.lpVtbl = &mfmediasessionvtbl; + object->ref = 1; + + *session = &object->IMFMediaSession_iface; + + return S_OK; +} diff --git a/include/mfidl.idl b/include/mfidl.idl index 767ff42..45b4957 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -163,5 +163,6 @@ interface IMFSourceResolver : IUnknown [local] HRESULT CanceObjectCreation([in] IUnknown *cancel_cookie); } +cpp_quote("HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **session);") cpp_quote("HRESULT WINAPI MFCreateSourceResolver(IMFSourceResolver **resolver);") cpp_quote("HRESULT WINAPI MFCreateTopology(IMFTopology **topology);")

1 0

Jeremy Newman : changes went live
by Jeremy Newman June 5, 2017

June 5, 2017

Module: appdb Branch: master Commit: 160b16a39334d26186f3d56875216c6a744ea43b URL: http://source.winehq.org/git/appdb.git/?a=commit;h=160b16a39334d26186f3d568… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Jun 5 15:55:13 2017 -0500 changes went live --- tables/alter.sql | 1 - 1 file changed, 1 deletion(-) diff --git a/tables/alter.sql b/tables/alter.sql index b8187cd..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 staging tinyint(1) not null default '0' AFTER testedRelease;

1 0

Rosanne DiMesio : Identify wine-staging versions in test data
by Jeremy Newman June 5, 2017

June 5, 2017

Module: appdb Branch: master Commit: b40e6593fa26587f1bf2b1929358c137287a0beb URL: http://source.winehq.org/git/appdb.git/?a=commit;h=b40e6593fa26587f1bf2b192… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Mon Jun 5 15:49:51 2017 -0500 Identify wine-staging versions in test data Adds a "staging" field to the testResults table and a checkbox for wine-staging to the tested release section of the test submission form. Appends -staging to the version displayed in the test results table when it is checked. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/testData.php | 37 +++++++++++++++++++++++++++---------- tables/alter.sql | 1 + tables/testResults.sql | 1 + 3 files changed, 29 insertions(+), 10 deletions(-) diff --git a/include/testData.php b/include/testData.php index 07918bb..6a375ba 100644 --- a/include/testData.php +++ b/include/testData.php @@ -13,6 +13,7 @@ class testData{ var $shWhatDoesnt; var $shWhatNotTested; var $sTestedRelease; + var $iStaging; var $iDistributionId; var $sTestedDate; var $sInstalls; @@ -50,6 +51,7 @@ class testData{ $this->sTestedDate = $oRow->testedDate; $this->iDistributionId = $oRow->distributionId; $this->sTestedRelease = $oRow->testedRelease; + $this->iStaging = $oRow->staging; $this->sInstalls = $oRow->installs; $this->sRuns = $oRow->runs; $this->sTestedRating = $oRow->testedRating; @@ -71,16 +73,17 @@ class testData{ $hResult = query_parameters("INSERT INTO testResults (versionId, whatWorks, whatDoesnt,". "whatNotTested, testedDate, distributionId, testedRelease,". - "installs, runs, testedRating, comments,". + "staging, installs, runs, testedRating, comments,". "submitTime, submitterId, state)". "VALUES('?', '?', '?', '?', '?', '?', '?',". - "'?', '?', '?', '?',". + "'?', '?', '?', '?', '?',". "?, '?', '?')", $this->iVersionId, $this->shWhatWorks, $this->shWhatDoesnt, $this->shWhatNotTested, $this->sTestedDate, $this->iDistributionId, - $this->sTestedRelease, $this->sInstalls, + $this->sTestedRelease, $this->iStaging, + $this->sInstalls, $this->sRuns, $this->sTestedRating, $this->sComments, "NOW()", @@ -201,6 +204,7 @@ class testData{ testedDate = '?', distributionId = '?', testedRelease = '?', + staging = '?', installs = '?', runs = '?', testedRating = '?', @@ -214,6 +218,7 @@ class testData{ $this->sTestedDate, $this->iDistributionId, $this->sTestedRelease, + $this->iStaging, $this->sInstalls, $this->sRuns, $this->sTestedRating, @@ -588,7 +593,7 @@ class testData{ $oTableRow->AddCell($oTableCell); $oTableRow->AddTextCell($oDistribution->objectMakeLink()); $oTableRow->AddTextCell(date("M d Y", mysqldatetime_to_unixtimestamp($this->sTestedDate))); - $oTableRow->AddTextCell($this->sTestedRelease.' '); + $oTableRow->AddTextCell(($this->sTestedRelease).($this->iStaging != 0 ? '-staging':'')); $oTableRow->AddTextCell($this->sInstalls.' '); $oTableRow->AddTextCell($this->sRuns.' '); $oTableCell = new TableCell($this->sTestedRating); @@ -728,7 +733,7 @@ class testData{ The $sDate parameter can be used to calculate the rating at a given point in time */ public static function getRatingInfoForVersionId($iVersionId, $sDate = 'NOW()') { - $sQuery = "SELECT testedRating,testedDate,testedRelease,versions.id as versionId + $sQuery = "SELECT testedRating,testedDate,testedRelease,staging,versions.id as versionId FROM testResults, ?.versions WHERE versions.value = testResults.testedRelease AND @@ -885,7 +890,15 @@ class testData{ echo '<tr><td class=color1><b>Tested release</b></td><td class=color0>',"\n"; echo make_bugzilla_version_list("sTestedRelease", $this->sTestedRelease); // Give the user some information about our available versions - echo "<span>Version not listed? Your Wine is too old, <a href=\"//winehq.org/download\">upgrade!</a></span>"; + echo "<span>Version not listed? Your Wine is too old, <a href=\"//winehq.org/download\">upgrade!</a></span><br>"; + // Checkbox for Wine-staging + echo '<label class="btn btn-secondary">'; + if($this->iStaging != 0) + echo '<input type="checkbox" name="iStaging" value="1" checked>'; + else + echo '<input type="checkbox" name="iStaging" value="1">'; + echo ' Wine-staging'; + echo '</label>'; echo '</td></tr>',"\n"; // Installs @@ -911,7 +924,8 @@ class testData{ // Display confirmation box for changing the Wine version $oOldTest = new testData($this->iTestingId); - if($this->iTestingId && $oOldTest->sTestedRelease != $this->sTestedRelease) + if($this->iTestingId && $oOldTest->sTestedRelease != $this->sTestedRelease + || $this-iTestingId && $oOldTest->iStaging != $this->iStaging) { if(getInput('bConfirmTestedVersionChange', $aClean) != 'true') { @@ -957,7 +971,9 @@ class testData{ // to submit new reports instead of updating existing ones when testing new Wines $oOldTest = new testData($this->iTestingId); if($this->iTestingId && $oOldTest->sTestedRelease != getInput('sTestedRelease', $aValues) && - getInput('bConfirmTestedVersionChange', $aValues) != 'true') + getInput('bConfirmTestedVersionChange', $aValues) != 'true' + || $this->iTestingId && $oOldTest->iStaging != getInput('iStaging', $aValues) && + getInput('bConfirmTestedVersionChange', $aValues) != 'true') { $errors .= '<li>Are you sure you want to change the Wine version of the report? Please submit a new '. 'test report for every Wine version you test; this is useful for tracking Wine\'s progress. '. @@ -1013,6 +1029,7 @@ class testData{ $this->sTestedDate = $aValues['sTestedDate']; $this->iDistributionId = $aValues['iDistributionId']; $this->sTestedRelease = $aValues['sTestedRelease']; + $this->iStaging = $aValues['iStaging']; $this->sInstalls = $aValues['sInstalls']; $this->sRuns = $aValues['sRuns']; $this->sTestedRating = $aValues['sTestedRating']; @@ -1079,7 +1096,7 @@ class testData{ /* List test data submitted by a given user. Ignore test results for queued applications/versions */ public static function listSubmittedBy($iUserId, $bQueued = true) { - $hResult = query_parameters("SELECT testResults.versionId, testResults.testedDate, testResults.testedRelease, testResults.testedRating, testResults.submitTime, testResults.testingId, appFamily.appName, appVersion.versionName from testResults, appFamily, appVersion WHERE testResults.versionId = appVersion.versionId AND appVersion.appId = appFamily.appId AND testResults.submitterId = '?' AND testResults.state = '?' ORDER BY testResults.testingId", $iUserId, $bQueued ? 'queued' : 'accepted'); + $hResult = query_parameters("SELECT testResults.versionId, testResults.testedDate, testResults.testedRelease, testResults.testedRating, testResults.staging, testResults.submitTime, testResults.testingId, appFamily.appName, appVersion.versionName from testResults, appFamily, appVersion WHERE testResults.versionId = appVersion.versionId AND appVersion.appId = appFamily.appId AND testResults.submitterId = '?' AND testResults.state = '?' ORDER BY testResults.testingId", $iUserId, $bQueued ? 'queued' : 'accepted'); if(!$hResult || !query_num_rows($hResult)) return false; @@ -1371,7 +1388,7 @@ class testData{ $oTableRow->AddCell(new TableCell($oUser->objectMakeLink())); $oTableRow->AddCell(new TableCell($oApp->objectMakeLink())); $oTableRow->AddCell(new TableCell($oVersion->objectMakeLink())); - $oTableRow->AddCell(new TableCell($this->sTestedRelease)); + $oTableRow->AddCell(new TableCell(($this->sTestedRelease) . ($this->iStaging != 0 ? '-staging':''))); $oTableRow->AddCell(new TableCell($bHasMaintainer ? "YES" : "no")); $oTableRow->AddCell(new TableCell($this->sTestedRating)); diff --git a/tables/alter.sql b/tables/alter.sql index 457f8d9..b8187cd 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 staging tinyint(1) not null default '0' AFTER testedRelease; diff --git a/tables/testResults.sql b/tables/testResults.sql index 7f88a54..44a52ae 100644 --- a/tables/testResults.sql +++ b/tables/testResults.sql @@ -14,6 +14,7 @@ create table testResults ( testedDate datetime not null, distributionId int not null, testedRelease tinytext, + 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', testedRating enum('Platinum','Gold','Silver','Bronze','Garbage') NOT NULL,

1 0

Francois Gouget : winetest/dissect: Provide more information when rejecting a report.
by Alexandre Julliard June 5, 2017

June 5, 2017

Module: tools Branch: master Commit: 3de458939d5bc9fdd2e03f55027ab4e7da42f342 URL: http://source.winehq.org/git/tools.git/?a=commit;h=3de458939d5bc9fdd2e03f55… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Jun 4 00:40:17 2017 +0200 winetest/dissect: Provide more information when rejecting a report. Log the test unit where the error occurred and the value of the limit that was exceeded. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 36ab635..99e50fb 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -334,7 +334,7 @@ while ($_ = <IN>) { elsif ($2 eq "skipped") { print SUM "- $module - skipped - - - - -\n"; - mydie "too many dlls skipped by user request" if ++$user_skips > $maxuserskips; + mydie "too many dlls skipped by user request (>$maxuserskips at $module)" if ++$user_skips > $maxuserskips; } } @@ -365,8 +365,8 @@ while (<IN>) { { $testbox->{data} .= "<div class=\"test result skipped\">Skipped by user request.</div>\n"; print SUM "- $dll $unit skipped - - - $source $rev\n"; + mydie "too many test units skipped by user request (>$maxuserskips at $dll:$unit)" if ++$user_skips > $maxuserskips; $dll = undef; - mydie "too many tests skipped by user request" if ++$user_skips > $maxuserskips; } } elsif (/^((?:[0-9a-f]+:)?$unit: (\d+) tests executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\.)\r?$/) { $lines++; @@ -388,11 +388,11 @@ while (<IN>) { if ($1 == 258) { $reason = "test failed: timed out"; } elsif ($1 < 0) { $reason = "test failed: crash"; } $testbox->{data} .= "<div class=\"test end\">$reason</div>\n"; - mydie "too many test failures" if ++$failed_tests > $maxfailedtests; + mydie "too many failed test units (>$maxfailedtests at $dll:$unit)" if ++$failed_tests > $maxfailedtests; } else { $result = "$total $todo $failed $skipped"; if ($failed && ++$failed_tests > $maxfailedtests) { - mydie "too many test failures"; + mydie "too many failed test units (>$maxfailedtests at $dll:$unit)"; } } print SUM "- $dll $unit $result $source $rev\n"; @@ -422,9 +422,9 @@ while (<IN>) { if (defined $dll) { # Either winetest crashed or the report file was cut off if ($filesize == $maxfilesize) { - mydie "report reached file limit (runaway test?)"; + mydie "report reached file size limit (>$maxfilesize bytes at $dll:$unit, runaway test?)"; } else { - mydie "report truncated (winetest crash?)"; + mydie "report truncated at $dll:$unit (winetest crash?)"; } } close SUM or mydie "error writing to '$tmpdir/summary.txt': $!";

1 0

Francois Gouget : winetest: Improve error reporting.
by Alexandre Julliard June 5, 2017

June 5, 2017

Module: tools Branch: master Commit: 91e530aba800b9146b16e5e6c5b466932da2da34 URL: http://source.winehq.org/git/tools.git/?a=commit;h=91e530aba800b9146b16e5e6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Jun 4 00:39:49 2017 +0200 winetest: Improve error reporting. Add a function to report errors. Always report renaming errors and the reason for the error. Standardize the file open error messages. die, and by extension mydie, does not need a trailing new-line. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-errors | 14 ++++++++++++- winetest/build-index | 33 +++++++++++++++++++++++------ winetest/dissect | 57 +++++++++++++++++++++++++++++---------------------- winetest/gather | 45 ++++++++++++++++++++++++++++------------ 4 files changed, 104 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=91e530aba800b9146b16…

1 0

Francois Gouget : testbot/WineRunTask: Add consistency checks for todo and skip messages.
by Alexandre Julliard June 5, 2017

June 5, 2017

Module: tools Branch: master Commit: 031792f30bc9cac6c3ed5cde070050fe997bc740 URL: http://source.winehq.org/git/tools.git/?a=commit;h=031792f30bc9cac6c3ed5cde… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Jun 4 00:39:03 2017 +0200 testbot/WineRunTask: Add consistency checks for todo and skip messages. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 38 +++++++++++++++++++++++++++++++------- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 12b83f2..7122c57 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -467,9 +467,11 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) if (open(my $LogFile, "<", $FullLogFileName)) { # There is more than one test unit when running the full test suite so keep - # track of the current one. Also note that for the TestBot we don't really - # care about the todos and skips - my ($CurrentDll, $CurrentUnit, $LineFailures, $SummaryFailures) = ("", "", 0, 0); + # track of the current one. Note that for the TestBot we don't count or + # complain about misplaced skips. + my ($CurrentDll, $CurrentUnit) = ("", ""); + my ($LineFailures, $LineTodos, $LineSkips) = (0, 0, 0); + my ($SummaryFailures, $SummaryTodos, $SummarySkips) = (0, 0, 0); my ($CurrentIsBroken, %CurrentPids, $CurrentRc, $LogFailures); sub CheckUnit($$) @@ -513,6 +515,8 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) if (!$CurrentIsBroken) { CheckSummaryCounter($LineFailures, $SummaryFailures, "failure"); + CheckSummaryCounter($LineTodos, $SummaryTodos, "todo"); + CheckSummaryCounter($LineSkips, $SummarySkips, "skip"); } # Note that the summary lines may count some failures twice @@ -556,7 +560,8 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) $LogFailures += $LineFailures; $CurrentDll = $CurrentUnit = ""; - $LineFailures = $SummaryFailures = 0; + $LineFailures = $LineTodos = $LineSkips = 0; + $SummaryFailures = $SummaryTodos = $SummarySkips = 0; $CurrentIsBroken = 0; $CurrentRc = undef; %CurrentPids = (); @@ -583,6 +588,23 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) CheckUnit($1, "failure"); $LineFailures++; } + elsif ($Line =~ /^([_a-z0-9]+)\.c:\d+: Test marked todo: / or + ($CurrentUnit ne "" and + $Line =~ /($CurrentUnit)\.c:\d+: Test marked todo: /)) + { + CheckUnit($1, "todo"); + $LineTodos++; + } + # TestLauncher's skip message is quite broken + elsif ($Line =~ /^([_a-z0-9]+)(?:\.c)?:\d+:? Tests? skipped: / or + ($CurrentUnit ne "" and + $Line =~ /($CurrentUnit)(?:\.c)?:\d+:? Tests? skipped: /)) + { + # Don't complain and don't count misplaced skips. Only complain if they + # are misreported (see CloseTestUnit). Also TestLauncher uses the wrong + # name in its skip message when skipping tests. + $LineSkips++ if ($1 eq $CurrentUnit or $1 eq $CurrentDll); + } elsif ($Line =~ /^Fatal: test '([_a-z0-9]+)' does not exist/) { # This also replaces a test summary line. @@ -607,11 +629,11 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) CheckUnit($Unit, "unhandled exception"); $LineFailures++; } - elsif ($Line =~ /^(?:([0-9a-f]+):)?([_a-z0-9]+): \d+ tests? executed $(\d+) marked as todo, (\d+) failures?$, \d+ skipped\./ or + elsif ($Line =~ /^(?:([0-9a-f]+):)?([_a-z0-9]+): \d+ tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./ or ($CurrentUnit ne "" and - $Line =~ /(?:([0-9a-f]+):)?($CurrentUnit): \d+ tests? executed $(\d+) marked as todo, (\d+) failures?$, \d+ skipped\./)) + $Line =~ /(?:([0-9a-f]+):)?($CurrentUnit): \d+ tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./)) { - my ($Pid, $Unit, $Todos, $Failures) = ($1, $2, $3, $4); + my ($Pid, $Unit, $Todos, $Failures, $Skips) = ($1, $2, $3, $4, $5); # Dlls that have only one test unit will run it even if there is # no argument. Also TestLauncher uses the wrong name in its test @@ -621,6 +643,8 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) # There may be more than one summary line due to child processes $CurrentPids{$Pid || 0} = 1; $SummaryFailures += $Failures; + $SummaryTodos += $Todos; + $SummarySkips += $Skips; $IsWineTest = 1; } else

1 0

Francois Gouget : winetest/dissect: Require the platform fields to be present.
by Alexandre Julliard June 5, 2017

June 5, 2017

Module: tools Branch: master Commit: 99a550fb03cc67fd9985bbfb3d329f18755e6c7f URL: http://source.winehq.org/git/tools.git/?a=commit;h=99a550fb03cc67fd9985bbfb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Jun 4 00:40:05 2017 +0200 winetest/dissect: Require the platform fields to be present. Without them we were getting a lot of undefined value perl errors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/winetest/dissect b/winetest/dissect index ccfb15f..36ab635 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -236,6 +236,10 @@ while (($_ = <IN>) =~ /^\s*([0-9a-zA-Z ]+)=(.*?)\r?$/) { } $box->{data} .= "</table>\n"; +if (!defined $plid or !defined $major or !defined $minor or !defined $product) { + mydie "missing a PlatformId, dwMajorVersion, dwMinorVersion or wProductType field"; +} + my @idmatch = ( # Describes how to match a platform's version information # with a dissect platform id: @@ -284,7 +288,7 @@ if ($wine) { "Darwin" => "mac", "FreeBSD" => "bsd", "SunOS" => "solaris" ); - $version = $host && defined($known_hosts{$host}) ? $known_hosts{$host} : "wine"; + $version = $known_hosts{$host || ""} || "wine"; } if ($wine_build) { my $wine_commit;

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_CreateLayer().
by Alexandre Julliard June 2, 2017

June 2, 2017

Module: wine Branch: master Commit: 6d638b9e287b3240bbfd37a08d1da0ac9d3e6bc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d638b9e287b3240bbfd37a08… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 2 17:56:31 2017 +0200 d2d1: Implement d2d_d3d_render_target_CreateLayer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/Makefile.in | 1 + dlls/d2d1/d2d1_private.h | 10 ++++ dlls/d2d1/layer.c | 115 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/d2d1/render_target.c | 11 ++++- dlls/d2d1/tests/d2d1.c | 45 ++++++++++++++++++ 5 files changed, 180 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/Makefile.in b/dlls/d2d1/Makefile.in index 68e9268..51b9627 100644 --- a/dlls/d2d1/Makefile.in +++ b/dlls/d2d1/Makefile.in @@ -11,6 +11,7 @@ C_SRCS = \ factory.c \ geometry.c \ hwnd_render_target.c \ + layer.c \ mesh.c \ render_target.c \ state_block.c \ diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 7d8027b..12a230b 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -236,6 +236,16 @@ struct d2d_stroke_style HRESULT d2d_stroke_style_init(struct d2d_stroke_style *style, ID2D1Factory *factory, const D2D1_STROKE_STYLE_PROPERTIES *desc, const float *dashes, UINT32 dash_count) DECLSPEC_HIDDEN; +struct d2d_layer +{ + ID2D1Layer ID2D1Layer_iface; + LONG refcount; + + ID2D1Factory *factory; +}; + +HRESULT d2d_layer_create(ID2D1Factory *factory, struct d2d_layer **layer) DECLSPEC_HIDDEN; + struct d2d_mesh { ID2D1Mesh ID2D1Mesh_iface; diff --git a/dlls/d2d1/layer.c b/dlls/d2d1/layer.c new file mode 100644 index 0000000..0fcd185 --- /dev/null +++ b/dlls/d2d1/layer.c @@ -0,0 +1,115 @@ +/* + * Copyright 2017 Henri Verbeet for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include "wine/port.h" + +#include "d2d1_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d2d); + +static inline struct d2d_layer *impl_from_ID2D1Layer(ID2D1Layer *iface) +{ + return CONTAINING_RECORD(iface, struct d2d_layer, ID2D1Layer_iface); +} + +static HRESULT STDMETHODCALLTYPE d2d_layer_QueryInterface(ID2D1Layer *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_ID2D1Layer) + || IsEqualGUID(iid, &IID_ID2D1Resource) + || IsEqualGUID(iid, &IID_IUnknown)) + { + ID2D1Layer_AddRef(iface); + *out = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d2d_layer_AddRef(ID2D1Layer *iface) +{ + struct d2d_layer *layer = impl_from_ID2D1Layer(iface); + ULONG refcount = InterlockedIncrement(&layer->refcount); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d2d_layer_Release(ID2D1Layer *iface) +{ + struct d2d_layer *layer = impl_from_ID2D1Layer(iface); + ULONG refcount = InterlockedDecrement(&layer->refcount); + + TRACE("%p decreasing refcount to %u.\n", iface, refcount); + + if (!refcount) + { + ID2D1Factory_Release(layer->factory); + HeapFree(GetProcessHeap(), 0, layer); + } + + return refcount; +} + +static void STDMETHODCALLTYPE d2d_layer_GetFactory(ID2D1Layer *iface, ID2D1Factory **factory) +{ + struct d2d_layer *layer = impl_from_ID2D1Layer(iface); + + TRACE("iface %p, factory %p.\n", iface, factory); + + ID2D1Factory_AddRef(*factory = layer->factory); +} + +static D2D1_SIZE_F * STDMETHODCALLTYPE d2d_layer_GetSize(ID2D1Layer *iface, D2D1_SIZE_F *size) +{ + FIXME("iface %p, size %p stub!\n", iface, size); + + size->width = 0; + size->height = 0; + return size; +} + +static const struct ID2D1LayerVtbl d2d_layer_vtbl = +{ + d2d_layer_QueryInterface, + d2d_layer_AddRef, + d2d_layer_Release, + d2d_layer_GetFactory, + d2d_layer_GetSize, +}; + +HRESULT d2d_layer_create(ID2D1Factory *factory, struct d2d_layer **layer) +{ + if (!(*layer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**layer)))) + return E_OUTOFMEMORY; + + (*layer)->ID2D1Layer_iface.lpVtbl = &d2d_layer_vtbl; + (*layer)->refcount = 1; + ID2D1Factory_AddRef((*layer)->factory = factory); + + TRACE("Created layer %p.\n", *layer); + + return S_OK; +} diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index c55401a..ecab51f 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -458,9 +458,16 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateCompatibleRenderTar static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateLayer(ID2D1RenderTarget *iface, const D2D1_SIZE_F *size, ID2D1Layer **layer) { - FIXME("iface %p, size %p, layer %p stub!\n", iface, size, layer); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_layer *object; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, size %p, layer %p.\n", iface, size, layer); + + if (SUCCEEDED(hr = d2d_layer_create(render_target->factory, &object))) + *layer = &object->ID2D1Layer_iface; + + return hr; } static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateMesh(ID2D1RenderTarget *iface, ID2D1Mesh **mesh) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index b26b7b1..72903ef 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -4528,6 +4528,50 @@ todo_wine ID2D1Factory_Release(factory); } +static void test_layer(void) +{ + ID2D1Factory *factory, *layer_factory; + IDXGISwapChain *swapchain; + ID2D1RenderTarget *rt; + ID3D10Device1 *device; + IDXGISurface *surface; + ID2D1Layer *layer; + ULONG refcount; + HWND window; + HRESULT hr; + + 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); + + hr = ID2D1RenderTarget_CreateLayer(rt, NULL, &layer); + ok(SUCCEEDED(hr), "Failed to create layer, hr %#x.\n", hr); + ID2D1Layer_GetFactory(layer, &layer_factory); + ok(layer_factory == factory, "Got unexpected layer factory %p, expected %p.\n", layer_factory, factory); + ID2D1Factory_Release(layer_factory); + ID2D1Layer_Release(layer); + + 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(); @@ -4552,4 +4596,5 @@ START_TEST(d2d1) test_gradient(); test_draw_geometry(); test_gdi_interop(); + test_layer(); }

1 0

Austin English : acledit: Fix ordinal ordering.
by Alexandre Julliard June 2, 2017

June 2, 2017

Module: wine Branch: master Commit: 4534261fcc9139e1464918524010d5d64185a1ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=4534261fcc9139e1464918524… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 25 17:48:22 2017 -0500 acledit: Fix ordinal ordering. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/acledit/acledit.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/acledit/acledit.spec b/dlls/acledit/acledit.spec index 7343290..8a9b634 100644 --- a/dlls/acledit/acledit.spec +++ b/dlls/acledit/acledit.spec @@ -1,8 +1,8 @@ 1 stub EditAuditInfo 2 stub EditOwnerInfo 3 stub EditPermissionInfo -4 stdcall -private DllMain(long long ptr) -5 stdcall FMExtensionProcW(long long long) +4 stdcall FMExtensionProcW(long long long) +5 stdcall -private DllMain(long long ptr) 6 stub SedDiscretionaryAclEditor 7 stub SedSystemAclEditor 8 stub SedTakeOwnership

1 0