March 2018 - Wine-devel - list.winehq.org

[PATCH] testbot: Remove unneeded ObjectModel::PropertyDescriptor imports.
by Francois Gouget 08 Mar '18

08 Mar '18

ObjectModel::PropertyDescriptor is only used as a base class and should not be used directly. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/Collection.pm | 1 - testbot/lib/ObjectModel/Item.pm | 1 - testbot/lib/WineTestBot/Branches.pm | 1 - testbot/lib/WineTestBot/Jobs.pm | 1 - testbot/lib/WineTestBot/Patches.pm | 1 - testbot/lib/WineTestBot/PendingPatches.pm | 1 - testbot/lib/WineTestBot/RecordGroups.pm | 1 - testbot/lib/WineTestBot/Records.pm | 1 - testbot/lib/WineTestBot/Roles.pm | 1 - testbot/lib/WineTestBot/Steps.pm | 1 - testbot/lib/WineTestBot/StepsTasks.pm | 1 - testbot/lib/WineTestBot/Tasks.pm | 1 - testbot/lib/WineTestBot/UserRoles.pm | 1 - testbot/lib/WineTestBot/Users.pm | 1 - testbot/lib/WineTestBot/VMs.pm | 1 - testbot/web/JobDetails.pl | 1 - testbot/web/PatchesList.pl | 1 - testbot/web/admin/BranchesList.pl | 1 - testbot/web/admin/UsersList.pl | 1 - testbot/web/admin/VMsList.pl | 1 - 20 files changed, 20 deletions(-) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index 7fa977cda..a57a32942 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -46,7 +46,6 @@ require Exporter; use Scalar::Util qw(weaken); use ObjectModel::BackEnd; use ObjectModel::Item; -use ObjectModel::PropertyDescriptor; sub ComputeMasterKey($) diff --git a/testbot/lib/ObjectModel/Item.pm b/testbot/lib/ObjectModel/Item.pm index e1385b8c7..e90ebbe74 100644 --- a/testbot/lib/ObjectModel/Item.pm +++ b/testbot/lib/ObjectModel/Item.pm @@ -29,7 +29,6 @@ ObjectModel::Item - Base class for items use Scalar::Util qw(weaken); use ObjectModel::BackEnd; use ObjectModel::Collection; -use ObjectModel::PropertyDescriptor; use vars qw(@ISA @EXPORT_OK); diff --git a/testbot/lib/WineTestBot/Branches.pm b/testbot/lib/WineTestBot/Branches.pm index bfd24ddc7..f5bd9d982 100644 --- a/testbot/lib/WineTestBot/Branches.pm +++ b/testbot/lib/WineTestBot/Branches.pm @@ -51,7 +51,6 @@ WineTestBot::Branches - A collection of WineTestBot::Branch objects =cut use ObjectModel::BasicPropertyDescriptor; -use ObjectModel::PropertyDescriptor; use WineTestBot::WineTestBotObjects; use vars qw (@ISA @EXPORT @PropertyDescriptors); diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index b870d7b7d..1d0f8bb8f 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -395,7 +395,6 @@ use ObjectModel::BasicPropertyDescriptor; use ObjectModel::EnumPropertyDescriptor; use ObjectModel::DetailrefPropertyDescriptor; use ObjectModel::ItemrefPropertyDescriptor; -use ObjectModel::PropertyDescriptor; use WineTestBot::WineTestBotObjects; use WineTestBot::Branches; use WineTestBot::Config; diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index d572ec470..a1d963529 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -366,7 +366,6 @@ WineTestBot::Patches - A collection of WineTestBot::Patch objects =cut use ObjectModel::BasicPropertyDescriptor; -use ObjectModel::PropertyDescriptor; use WineTestBot::Config; use WineTestBot::WineTestBotObjects; diff --git a/testbot/lib/WineTestBot/PendingPatches.pm b/testbot/lib/WineTestBot/PendingPatches.pm index 67d19a71c..d63ff7e7d 100644 --- a/testbot/lib/WineTestBot/PendingPatches.pm +++ b/testbot/lib/WineTestBot/PendingPatches.pm @@ -48,7 +48,6 @@ WineTestBot::PendingPatches - A collection of WineTestBot::PendingPatch objects use ObjectModel::BasicPropertyDescriptor; use ObjectModel::ItemrefPropertyDescriptor; -use ObjectModel::PropertyDescriptor; use WineTestBot::Patches; use WineTestBot::WineTestBotObjects; diff --git a/testbot/lib/WineTestBot/RecordGroups.pm b/testbot/lib/WineTestBot/RecordGroups.pm index 707d0acd1..cde1a8da3 100644 --- a/testbot/lib/WineTestBot/RecordGroups.pm +++ b/testbot/lib/WineTestBot/RecordGroups.pm @@ -59,7 +59,6 @@ WineTestBot::RecordGroups - A collection of WineTestBot::RecordGroup objects use ObjectModel::BasicPropertyDescriptor; use ObjectModel::EnumPropertyDescriptor; use ObjectModel::DetailrefPropertyDescriptor; -use ObjectModel::PropertyDescriptor; use WineTestBot::WineTestBotObjects; use WineTestBot::Records; diff --git a/testbot/lib/WineTestBot/Records.pm b/testbot/lib/WineTestBot/Records.pm index ac1c0faff..46cf1fe43 100644 --- a/testbot/lib/WineTestBot/Records.pm +++ b/testbot/lib/WineTestBot/Records.pm @@ -64,7 +64,6 @@ WineTestBot::Records - A collection of WineTestBot::Record objects use ObjectModel::BasicPropertyDescriptor; use ObjectModel::EnumPropertyDescriptor; -use ObjectModel::PropertyDescriptor; use WineTestBot::WineTestBotObjects; use vars qw (@ISA @EXPORT @PropertyDescriptors @FlatPropertyDescriptors); diff --git a/testbot/lib/WineTestBot/Roles.pm b/testbot/lib/WineTestBot/Roles.pm index 7c59e6a4e..eed13c301 100644 --- a/testbot/lib/WineTestBot/Roles.pm +++ b/testbot/lib/WineTestBot/Roles.pm @@ -45,7 +45,6 @@ WineTestBot::Roles - A collection of WineTestBot::Role objects =cut -use ObjectModel::PropertyDescriptor; use ObjectModel::BasicPropertyDescriptor; use WineTestBot::WineTestBotObjects; diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index 40dfc0a44..b8dbaecb8 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -187,7 +187,6 @@ WineTestBot::Steps - A collection of Job Steps use ObjectModel::BasicPropertyDescriptor; use ObjectModel::EnumPropertyDescriptor; use ObjectModel::DetailrefPropertyDescriptor; -use ObjectModel::PropertyDescriptor; use WineTestBot::Tasks; use WineTestBot::WineTestBotObjects; diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index 33f99b0b0..79216d4e1 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -97,7 +97,6 @@ WineTestBot::StepsTasks - A collection of StepsTasks objects use ObjectModel::BasicPropertyDescriptor; use ObjectModel::ItemrefPropertyDescriptor; -use ObjectModel::PropertyDescriptor; use WineTestBot::Steps; use WineTestBot::Tasks; use WineTestBot::VMs; diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index e0b519222..373da5372 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -206,7 +206,6 @@ WineTestBot::Tasks - A collection of WineTestBot::Task objects use ObjectModel::BasicPropertyDescriptor; use ObjectModel::EnumPropertyDescriptor; use ObjectModel::ItemrefPropertyDescriptor; -use ObjectModel::PropertyDescriptor; use WineTestBot::VMs; use WineTestBot::WineTestBotObjects; diff --git a/testbot/lib/WineTestBot/UserRoles.pm b/testbot/lib/WineTestBot/UserRoles.pm index 2d1fab2c1..8f7899a9e 100644 --- a/testbot/lib/WineTestBot/UserRoles.pm +++ b/testbot/lib/WineTestBot/UserRoles.pm @@ -41,7 +41,6 @@ WineTestBot::UserRoles - A collection of WineTestBot::UserRole objects =cut use ObjectModel::ItemrefPropertyDescriptor; -use ObjectModel::PropertyDescriptor; use WineTestBot::Roles; use WineTestBot::WineTestBotObjects; diff --git a/testbot/lib/WineTestBot/Users.pm b/testbot/lib/WineTestBot/Users.pm index 7b18df977..b9745d804 100644 --- a/testbot/lib/WineTestBot/Users.pm +++ b/testbot/lib/WineTestBot/Users.pm @@ -299,7 +299,6 @@ use Net::LDAP; use ObjectModel::BasicPropertyDescriptor; use ObjectModel::EnumPropertyDescriptor; use ObjectModel::DetailrefPropertyDescriptor; -use ObjectModel::PropertyDescriptor; use WineTestBot::Config; use WineTestBot::UserRoles; use WineTestBot::WineTestBotObjects; diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index afc7af985..7a35ba742 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -632,7 +632,6 @@ role or status. use ObjectModel::BasicPropertyDescriptor; use ObjectModel::EnumPropertyDescriptor; -use ObjectModel::PropertyDescriptor; use WineTestBot::WineTestBotObjects; use vars qw (@ISA @EXPORT @PropertyDescriptors); diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 10a0d7c63..70fb0fe98 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -22,7 +22,6 @@ use strict; package JobDetailsPage; use URI::Escape; -use ObjectModel::PropertyDescriptor; use ObjectModel::CGI::CollectionPage; use WineTestBot::Config; use WineTestBot::Jobs; diff --git a/testbot/web/PatchesList.pl b/testbot/web/PatchesList.pl index 39e9dc100..f0571b126 100644 --- a/testbot/web/PatchesList.pl +++ b/testbot/web/PatchesList.pl @@ -22,7 +22,6 @@ use strict; package PatchesListPage; use URI::Escape; -use ObjectModel::PropertyDescriptor; use ObjectModel::CGI::CollectionPage; use WineTestBot::Patches; diff --git a/testbot/web/admin/BranchesList.pl b/testbot/web/admin/BranchesList.pl index 48916cf10..716fbd713 100644 --- a/testbot/web/admin/BranchesList.pl +++ b/testbot/web/admin/BranchesList.pl @@ -21,7 +21,6 @@ use strict; package BranchesListPage; -use ObjectModel::PropertyDescriptor; use ObjectModel::CGI::CollectionPage; use WineTestBot::Config; use WineTestBot::Branches; diff --git a/testbot/web/admin/UsersList.pl b/testbot/web/admin/UsersList.pl index d6ac86874..eb6c324c3 100644 --- a/testbot/web/admin/UsersList.pl +++ b/testbot/web/admin/UsersList.pl @@ -22,7 +22,6 @@ use strict; package UsersListPage; -use ObjectModel::PropertyDescriptor; use ObjectModel::CGI::CollectionPage; use WineTestBot::CGI::Sessions; use WineTestBot::Config; diff --git a/testbot/web/admin/VMsList.pl b/testbot/web/admin/VMsList.pl index 9984771b9..652fc8e1b 100644 --- a/testbot/web/admin/VMsList.pl +++ b/testbot/web/admin/VMsList.pl @@ -21,7 +21,6 @@ use strict; package VMsListPage; -use ObjectModel::PropertyDescriptor; use ObjectModel::CGI::CollectionPage; use WineTestBot::VMs; -- 2.16.1

1 0

[PATCH v2 1/2] wmp: Add IWMPMedia stub
by Anton Romanov 08 Mar '18

08 Mar '18

Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> --- dlls/wmp/oleobj.c | 1 + dlls/wmp/player.c | 293 +++++++++++++++++++++++++++++++++++++++++++-- dlls/wmp/tests/Makefile.in | 3 + dlls/wmp/tests/av.mp4 | Bin 0 -> 1493 bytes dlls/wmp/tests/oleobj.c | 85 +++++++++++++ dlls/wmp/tests/rsrc.rc | 22 ++++ dlls/wmp/wmp_private.h | 29 +++++ 7 files changed, 425 insertions(+), 8 deletions(-) create mode 100644 dlls/wmp/tests/av.mp4 create mode 100644 dlls/wmp/tests/rsrc.rc diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c index 25787fa759..cc0e9a9d98 100644 --- a/dlls/wmp/oleobj.c +++ b/dlls/wmp/oleobj.c @@ -308,6 +308,7 @@ static ULONG WINAPI OleObject_Release(IOleObject *iface) if(!ref) { release_client_site(This); ConnectionPointContainer_Destroy(This); + destroy_player(This); heap_free(This); } diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index 2628fa4b5d..1febb3f6ce 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -22,6 +22,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(wmp); +static inline WMPMedia *impl_from_IWMPMedia(IWMPMedia *iface) +{ + return CONTAINING_RECORD(iface, WMPMedia, IWMPMedia_iface); +} + static inline WindowsMediaPlayer *impl_from_IWMPPlayer4(IWMPPlayer4 *iface) { return CONTAINING_RECORD(iface, WindowsMediaPlayer, IWMPPlayer4_iface); @@ -98,15 +103,23 @@ static HRESULT WINAPI WMPPlayer4_close(IWMPPlayer4 *iface) static HRESULT WINAPI WMPPlayer4_get_URL(IWMPPlayer4 *iface, BSTR *pbstrURL) { WindowsMediaPlayer *This = impl_from_IWMPPlayer4(iface); - FIXME("(%p)->(%p)\n", This, pbstrURL); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, pbstrURL); + if(This->wmpmedia == NULL) { + return S_FALSE; + } + return IWMPMedia_get_sourceURL(This->wmpmedia, pbstrURL); } static HRESULT WINAPI WMPPlayer4_put_URL(IWMPPlayer4 *iface, BSTR url) { WindowsMediaPlayer *This = impl_from_IWMPPlayer4(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(url)); - return E_NOTIMPL; + IWMPMedia *media; + TRACE("(%p)->(%s)\n", This, debugstr_w(url)); + if(url == NULL) { + return E_POINTER; + } + media = create_media_from_url(url); + return IWMPPlayer4_put_currentMedia(iface, media); } static HRESULT WINAPI WMPPlayer4_get_openState(IWMPPlayer4 *iface, WMPOpenState *pwmpos) @@ -148,15 +161,28 @@ static HRESULT WINAPI WMPPlayer4_get_settings(IWMPPlayer4 *iface, IWMPSettings * static HRESULT WINAPI WMPPlayer4_get_currentMedia(IWMPPlayer4 *iface, IWMPMedia **ppMedia) { WindowsMediaPlayer *This = impl_from_IWMPPlayer4(iface); - FIXME("(%p)->(%p)\n", This, ppMedia); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, ppMedia); + if(This->wmpmedia == NULL) { + return S_FALSE; + } + IWMPMedia_AddRef(This->wmpmedia); + *ppMedia = This->wmpmedia; + return S_OK; } static HRESULT WINAPI WMPPlayer4_put_currentMedia(IWMPPlayer4 *iface, IWMPMedia *pMedia) { WindowsMediaPlayer *This = impl_from_IWMPPlayer4(iface); - FIXME("(%p)->(%p)\n", This, pMedia); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, pMedia); + if(pMedia == NULL) { + return E_POINTER; + } + if(This->wmpmedia != NULL) { + IWMPMedia_Release(This->wmpmedia); + } + This->wmpmedia = pMedia; + IWMPMedia_AddRef(This->wmpmedia); + return S_OK; } static HRESULT WINAPI WMPPlayer4_get_mediaCollection(IWMPPlayer4 *iface, IWMPMediaCollection **ppMediaCollection) @@ -1157,6 +1183,241 @@ static const IWMPControlsVtbl WMPControlsVtbl = { WMPControls_playItem, }; +static HRESULT WINAPI WMPMedia_QueryInterface(IWMPMedia *iface, REFIID riid, void **ppv) +{ + WMPMedia *This = impl_from_IWMPMedia(iface); + TRACE("(%p)\n", This); + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->IWMPMedia_iface; + }else if(IsEqualGUID(&IID_IDispatch, riid)) { + TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); + *ppv = &This->IWMPMedia_iface; + }else if(IsEqualGUID(&IID_IWMPMedia, riid)) { + TRACE("(%p)->(IID_IWMPMedia %p)\n", This, ppv); + *ppv = &This->IWMPMedia_iface; + }else { + WARN("Unsupported interface %s\n", debugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI WMPMedia_AddRef(IWMPMedia *iface) +{ + WMPMedia *This = impl_from_IWMPMedia(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI WMPMedia_Release(IWMPMedia *iface) +{ + WMPMedia *This = impl_from_IWMPMedia(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) { + heap_free(This->url); + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI WMPMedia_GetTypeInfoCount(IWMPMedia *iface, UINT *pctinfo) +{ + WMPMedia *This = impl_from_IWMPMedia(iface); + FIXME("(%p)->(%p)\n", This, pctinfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPMedia_GetTypeInfo(IWMPMedia *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + WMPMedia *This = impl_from_IWMPMedia(iface); + FIXME("(%p)->(%u %d %p)\n", This, iTInfo, lcid, ppTInfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPMedia_GetIDsOfNames(IWMPMedia *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + WMPMedia *This = impl_from_IWMPMedia(iface); + FIXME("(%p)->(%s %p %u %d %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPMedia_Invoke(IWMPMedia *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + WMPMedia *This = impl_from_IWMPMedia(iface); + FIXME("(%p)->(%d %s %d %x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPMedia_get_isIdentical(IWMPMedia *iface, IWMPMedia *other, VARIANT_BOOL *pvBool) +{ + WMPMedia *This = impl_from_IWMPMedia(iface); + FIXME("(%p)->(%p, %p)\n", This, other, pvBool); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPMedia_get_sourceURL(IWMPMedia *iface, BSTR *pbstrSourceUrl) +{ + WMPMedia *This = impl_from_IWMPMedia(iface); + FIXME("(%p)->(%p)\n", This, pbstrSourceUrl); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPMedia_get_name(IWMPMedia *iface, BSTR *pbstrName) +{ + WMPMedia *This = impl_from_IWMPMedia(iface); + FIXME("(%p)->(%p)\n", This, pbstrName); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPMedia_put_name(IWMPMedia *iface, BSTR pbstrName) +{ + WMPMedia *This = impl_from_IWMPMedia(iface); + FIXME("(%p)->(%s)\n", This, debugstr_w(pbstrName)); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPMedia_get_imageSourceWidth(IWMPMedia *iface, LONG *pWidth) +{ + WMPMedia *This = impl_from_IWMPMedia(iface); + FIXME("(%p)->(%p)\n", This, pWidth); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPMedia_get_imageSourceHeight(IWMPMedia *iface, LONG *pHeight) +{ + WMPMedia *This = impl_from_IWMPMedia(iface); + FIXME("(%p)->(%p)\n", This, pHeight); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPMedia_get_markerCount(IWMPMedia *iface, LONG* pMarkerCount) +{ + WMPMedia *This = impl_from_IWMPMedia(iface); + FIXME("(%p)->(%p)\n", This, pMarkerCount); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPMedia_getMarkerTime(IWMPMedia *iface, LONG MarkerNum, DOUBLE *pMarkerTime) +{ + WMPMedia *This = impl_from_IWMPMedia(iface); + FIXME("(%p)->(%d, %p)\n", This, MarkerNum, pMarkerTime); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPMedia_getMarkerName(IWMPMedia *iface, LONG MarkerNum, BSTR *pbstrMarkerName) +{ + WMPMedia *This = impl_from_IWMPMedia(iface); + FIXME("(%p)->(%d, %p)\n", This, MarkerNum, pbstrMarkerName); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPMedia_get_duration(IWMPMedia *iface, DOUBLE *pDuration) +{ + WMPMedia *This = impl_from_IWMPMedia(iface); + FIXME("(%p)->(%p)\n", This, pDuration); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPMedia_get_durationString(IWMPMedia *iface, BSTR *pbstrDuration) +{ + WMPMedia *This = impl_from_IWMPMedia(iface); + FIXME("(%p)->(%p)\n", This, pbstrDuration); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPMedia_get_attributeCount(IWMPMedia *iface, LONG *plCount) +{ + WMPMedia *This = impl_from_IWMPMedia(iface); + FIXME("(%p)->(%p)\n", This, plCount); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPMedia_getAttributeName(IWMPMedia *iface, LONG lIndex, BSTR *pbstrItemName) +{ + WMPMedia *This = impl_from_IWMPMedia(iface); + FIXME("(%p)->(%d, %p)\n", This, lIndex, pbstrItemName); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPMedia_getItemInfo(IWMPMedia *iface, BSTR bstrItemName, BSTR *pbstrVal) +{ + WMPMedia *This = impl_from_IWMPMedia(iface); + FIXME("(%p)->(%s, %p)\n", This, debugstr_w(bstrItemName), pbstrVal); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPMedia_setItemInfo(IWMPMedia *iface, BSTR bstrItemName, BSTR bstrVal) +{ + WMPMedia *This = impl_from_IWMPMedia(iface); + FIXME("(%p)->(%s, %s)\n", This, debugstr_w(bstrItemName), debugstr_w(bstrVal)); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPMedia_getItemInfoByAtom(IWMPMedia *iface, LONG lAtom, BSTR *pbstrVal) +{ + WMPMedia *This = impl_from_IWMPMedia(iface); + FIXME("(%p)->(%d, %p)\n", This, lAtom, pbstrVal); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPMedia_isMemberOf(IWMPMedia *iface, IWMPPlaylist *pPlaylist, VARIANT_BOOL *pvarfIsMemberOf) +{ + WMPMedia *This = impl_from_IWMPMedia(iface); + FIXME("(%p)->(%p, %p)\n", This, pPlaylist, pvarfIsMemberOf); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPMedia_isReadOnlyItem(IWMPMedia *iface, BSTR bstrItemName, VARIANT_BOOL *pvarfIsReadOnly) +{ + WMPMedia *This = impl_from_IWMPMedia(iface); + FIXME("(%p)->(%s, %p)\n", This, debugstr_w(bstrItemName), pvarfIsReadOnly); + return E_NOTIMPL; +} + +static const IWMPMediaVtbl WMPMediaVtbl = { + WMPMedia_QueryInterface, + WMPMedia_AddRef, + WMPMedia_Release, + WMPMedia_GetTypeInfoCount, + WMPMedia_GetTypeInfo, + WMPMedia_GetIDsOfNames, + WMPMedia_Invoke, + WMPMedia_get_isIdentical, + WMPMedia_get_sourceURL, + WMPMedia_get_name, + WMPMedia_put_name, + WMPMedia_get_imageSourceWidth, + WMPMedia_get_imageSourceHeight, + WMPMedia_get_markerCount, + WMPMedia_getMarkerTime, + WMPMedia_getMarkerName, + WMPMedia_get_duration, + WMPMedia_get_durationString, + WMPMedia_get_attributeCount, + WMPMedia_getAttributeName, + WMPMedia_getItemInfo, + WMPMedia_setItemInfo, + WMPMedia_getItemInfoByAtom, + WMPMedia_isMemberOf, + WMPMedia_isReadOnlyItem +}; + void init_player(WindowsMediaPlayer *wmp) { wmp->IWMPPlayer4_iface.lpVtbl = &WMPPlayer4Vtbl; @@ -1167,3 +1428,19 @@ void init_player(WindowsMediaPlayer *wmp) wmp->invoke_urls = VARIANT_TRUE; wmp->auto_start = VARIANT_TRUE; } + +void destroy_player(WindowsMediaPlayer *wmp) +{ + if(wmp->wmpmedia) + IWMPMedia_Release(wmp->wmpmedia); +} + +IWMPMedia* create_media_from_url(BSTR url){ + + WMPMedia *media = heap_alloc_zero(sizeof(WMPMedia)); + media->IWMPMedia_iface.lpVtbl = &WMPMediaVtbl; + media->url = heap_strdupW(url); + media->ref = 1; + + return &media->IWMPMedia_iface; +} diff --git a/dlls/wmp/tests/Makefile.in b/dlls/wmp/tests/Makefile.in index df770c78c6..dded3a4a7e 100644 --- a/dlls/wmp/tests/Makefile.in +++ b/dlls/wmp/tests/Makefile.in @@ -2,3 +2,6 @@ TESTDLL = wmp.dll IMPORTS = ole32 oleaut32 user32 gdi32 C_SRCS = oleobj.c + +RC_SRCS = \ + rsrc.rc diff --git a/dlls/wmp/tests/av.mp4 b/dlls/wmp/tests/av.mp4 new file mode 100644 index 0000000000000000000000000000000000000000..1431e98dd3f5bb28c282d3d732a3a1fc13cf3d63 GIT binary patch literal 1493 zcmeHHO-sW-5Z$D$cn}OyK`=rq^=7}c+G`IUJa`ik#7o*uZD_U$*=<2j`7uHf{1GDl z1OJ2v!Gm5r>6;{NZ56!et&eVJ_RZ{@-Py2=F|(~MeMfqNF`bdc*b#oM${1U02eu9V zMQ}^yjZE%({o(a)Y&97zZ2!~blBKX3W>_ST2tck=HTAD{cZ(a)Vo&eT`}nJY3bAx=4GZa z`b{u30X;KsOfrA+Qdsb;0;`MQx#~tW!HuCOUU|%5K~!R<&M$QfHdhiFrtM0VXpus! z8w+y59SdAe(a)Y%E99^ge_ClAreVu!myqQRus?~Q!2$C&d&tH)iNa<paP^xAL?DW*gV zJmyUv*c2zwHkSH<n(a)jvhshTeQ3#sJjGAQR1Zxn5mK=T+nGsvN>0=u^4bYPYW!*CPt zTN*aoSS3n(!+3qqfYDcs1sIL`ye3uDqbLP`;L_xqDBmInpmH=QpDe|$U`GJ2p{zzd z&Pvttk^tpyV>J6*S+Hlqjx2(a)qU;BwW2rS>HV~<gE;!E4QQ633y;7KMC5(a)ko$puM+W Ks#QwWO7#=93TT)B literal 0 HcmV?d00001 diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index 42ed858b85..62676445ce 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -18,12 +18,16 @@ #define WIN32_LEAN_AND_MEAN #define COBJMACROS +#include <stdarg.h> #include <initguid.h> +#include <windef.h> +#include <winbase.h> #include <windows.h> #include <wmp.h> #include <olectl.h> #include "wine/test.h" +#include "wine/heap.h" #define DEFINE_EXPECT(func) \ static BOOL expect_ ## func = FALSE, called_ ## func = FALSE @@ -49,6 +53,12 @@ expect_ ## func = called_ ## func = FALSE; \ }while(0) +#define CHECK_CALLED_OR_BROKEN(func) \ + do { \ + ok(called_ ## func || broken(1), "expected " #func "\n"); \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) + DEFINE_EXPECT(GetContainer); DEFINE_EXPECT(GetExtendedControl); DEFINE_EXPECT(GetWindow); @@ -60,6 +70,32 @@ DEFINE_EXPECT(GetWindowContext); DEFINE_EXPECT(ShowObject); DEFINE_EXPECT(OnShowWindow_FALSE); +static const WCHAR mp4file[] = {'a','v','.','m','p','4',0}; +static inline WCHAR *load_resource(const WCHAR *name) +{ + static WCHAR pathW[MAX_PATH]; + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + GetTempPathW(sizeof(pathW)/sizeof(WCHAR), pathW); + lstrcatW(pathW, name); + + file = CreateFileW(pathW, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %d\n", wine_dbgstr_w(pathW), + GetLastError()); + + res = FindResourceW(NULL, name, (LPCWSTR)RT_RCDATA); + ok( res != 0, "couldn't find resource\n" ); + ptr = LockResource( LoadResource( GetModuleHandleA(NULL), res )); + WriteFile( file, ptr, SizeofResource( GetModuleHandleA(NULL), res ), &written, NULL ); + ok( written == SizeofResource( GetModuleHandleA(NULL), res ), "couldn't write resource\n" ); + CloseHandle( file ); + + return pathW; +} + static HWND container_hwnd; static HRESULT WINAPI OleContainer_QueryInterface(IOleContainer *iface, REFIID riid, void **ppv) @@ -859,9 +895,12 @@ static void test_wmp_ifaces(IOleObject *oleobj) IWMPSettings *settings, *settings_qi; IWMPPlayer4 *player4; IWMPPlayer *player; + IWMPMedia *media; IWMPControls *controls; VARIANT_BOOL vbool; HRESULT hres; + BSTR filename; + BSTR url; hres = IOleObject_QueryInterface(oleobj, &IID_IWMPPlayer4, (void**)&player4); ok(hres == S_OK, "Could not get IWMPPlayer4 iface: %08x\n", hres); @@ -878,6 +917,51 @@ static void test_wmp_ifaces(IOleObject *oleobj) IWMPControls_Release(controls); + media = NULL; + hres = IWMPPlayer4_QueryInterface(player4, &IID_IWMPMedia, (void**)&media); + ok(hres == E_NOINTERFACE, "get_currentMedia SUCCEEDED: %08x\n", hres); + ok(media == NULL, "media != NULL\n"); + + /* Test media put/get */ + media = NULL; + hres = IWMPPlayer4_get_currentMedia(player4, &media); + ok(hres == S_FALSE, "get_currentMedia SUCCEEDED\n"); + ok(media == NULL, "media != NULL\n"); + + filename = SysAllocString(load_resource(mp4file)); + + + SET_EXPECT(GetContainer); + SET_EXPECT(Invoke_USERMODE); + hres = IWMPPlayer4_put_URL(player4, filename); + ok(hres == S_OK, "IWMPPlayer4_put_URL failed: %08x\n", hres); + todo_wine CHECK_CALLED_OR_BROKEN(GetContainer); + todo_wine CHECK_CALLED(Invoke_USERMODE); + + SET_EXPECT(Invoke_USERMODE); + hres = IWMPPlayer4_get_URL(player4, &url); + todo_wine ok(hres == S_OK, "IWMPPlayer4_get_URL failed: %08x\n", hres); + todo_wine ok(0 == lstrcmpW(url, filename), "%s != %s", wine_dbgstr_w(url), wine_dbgstr_w(filename)); + todo_wine CHECK_CALLED(Invoke_USERMODE); + SysFreeString(url); + + hres = IWMPPlayer4_get_currentMedia(player4, &media); + ok(hres == S_OK, "get_currentMedia failed: %08x\n", hres); + ok(media != NULL, "media = (%p)\n", media); + + SET_EXPECT(GetContainer); + hres = IWMPPlayer4_put_currentMedia(player4, media); + ok(hres == S_OK, "put_currentMedia failed: %08x\n", hres); + todo_wine CHECK_CALLED_OR_BROKEN(GetContainer); + + IWMPMedia_Release(media); + + hres = IWMPPlayer4_get_currentMedia(player4, &media); + ok(hres == S_OK, "get_currentMedia failed: %08x\n", hres); + ok(media != NULL, "media = (%p)\n", media); + + IWMPMedia_Release(media); + settings = NULL; hres = IWMPPlayer4_get_settings(player4, &settings); ok(hres == S_OK, "get_settings failed: %08x\n", hres); @@ -934,6 +1018,7 @@ static void test_wmp_ifaces(IOleObject *oleobj) IWMPSettings_Release(settings); IWMPPlayer_Release(player); + SysFreeString(filename); } #define test_rect_size(a,b,c) _test_rect_size(__LINE__,a,b,c) diff --git a/dlls/wmp/tests/rsrc.rc b/dlls/wmp/tests/rsrc.rc new file mode 100644 index 0000000000..fb30ae6940 --- /dev/null +++ b/dlls/wmp/tests/rsrc.rc @@ -0,0 +1,22 @@ +/* + * Resource file for wmp tests. + * + * 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 "windef.h" + +/* @makedep: av.mp4 */ +av.mp4 RCDATA "av.mp4" diff --git a/dlls/wmp/wmp_private.h b/dlls/wmp/wmp_private.h index a3baaf7206..465721bf4d 100644 --- a/dlls/wmp/wmp_private.h +++ b/dlls/wmp/wmp_private.h @@ -20,6 +20,7 @@ #include "windows.h" #include "wine/heap.h" +#include "wine/unicode.h" #include "ole2.h" #include "wmp.h" @@ -34,6 +35,14 @@ typedef struct { IID iid; } ConnectionPoint; +typedef struct { + IWMPMedia IWMPMedia_iface; + + LONG ref; + + WCHAR *url; +} WMPMedia; + struct WindowsMediaPlayer { IOleObject IOleObject_iface; IProvideClassInfo2 IProvideClassInfo2_iface; @@ -58,9 +67,13 @@ struct WindowsMediaPlayer { VARIANT_BOOL enable_error_dialogs; ConnectionPoint *wmpocx; + + IWMPMedia *wmpmedia; }; void init_player(WindowsMediaPlayer*) DECLSPEC_HIDDEN; +void destroy_player(WindowsMediaPlayer*) DECLSPEC_HIDDEN; +IWMPMedia* create_media_from_url(BSTR url); void ConnectionPointContainer_Init(WindowsMediaPlayer *wmp) DECLSPEC_HIDDEN; void ConnectionPointContainer_Destroy(WindowsMediaPlayer *wmp) DECLSPEC_HIDDEN; @@ -69,3 +82,19 @@ HRESULT WINAPI WMPFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) void unregister_wmp_class(void) DECLSPEC_HIDDEN; extern HINSTANCE wmp_instance DECLSPEC_HIDDEN; + +static inline WCHAR *heap_strdupW(const WCHAR *str) +{ + WCHAR *ret; + + if(str) { + size_t size = strlenW(str)+1; + ret = heap_alloc(size*sizeof(WCHAR)); + if(ret) + memcpy(ret, str, size*sizeof(WCHAR)); + }else { + ret = NULL; + } + + return ret; +} -- 2.16.2

2 3

[PATCH 1/2] mshtml: Use nsIDOMEvent directly to prevent default event handling in dispatch_event_object.
by Jacek Caban 08 Mar '18

08 Mar '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlevent.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[PATCH] api-ms-win-rtcore-ntuser-private-l1-1-4: Add dll.
by Andrey Gusev 08 Mar '18

08 Mar '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-rtcore-ntuser-private-l1-1-4/Makefile.in | 1 + .../api-ms-win-rtcore-ntuser-private-l1-1-4.spec | 2 ++ tools/make_specfiles | 1 + 5 files changed, 7 insertions(+) create mode 100644 dlls/api-ms-win-rtcore-ntuser-private-l1-1-4/Makefile.in create mode 100644 dlls/api-ms-win-rtcore-ntuser-private-l1-1-4/api-ms-win-rtcore-ntuser-private-l1-1-4.spec diff --git a/configure b/configure index e6e1d68c48..c7d6911f5c 100755 --- a/configure +++ b/configure @@ -1066,6 +1066,7 @@ enable_api_ms_win_perf_legacy_l1_1_0 enable_api_ms_win_power_base_l1_1_0 enable_api_ms_win_power_setting_l1_1_0 enable_api_ms_win_rtcore_ntuser_private_l1_1_0 +enable_api_ms_win_rtcore_ntuser_private_l1_1_4 enable_api_ms_win_rtcore_ntuser_window_l1_1_0 enable_api_ms_win_rtcore_ntuser_winevent_l1_1_0 enable_api_ms_win_rtcore_ntuser_wmpointer_l1_1_0 @@ -18353,6 +18354,7 @@ wine_fn_config_makefile dlls/api-ms-win-perf-legacy-l1-1-0 enable_api_ms_win_per wine_fn_config_makefile dlls/api-ms-win-power-base-l1-1-0 enable_api_ms_win_power_base_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-power-setting-l1-1-0 enable_api_ms_win_power_setting_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-rtcore-ntuser-private-l1-1-0 enable_api_ms_win_rtcore_ntuser_private_l1_1_0 +wine_fn_config_makefile dlls/api-ms-win-rtcore-ntuser-private-l1-1-4 enable_api_ms_win_rtcore_ntuser_private_l1_1_4 wine_fn_config_makefile dlls/api-ms-win-rtcore-ntuser-window-l1-1-0 enable_api_ms_win_rtcore_ntuser_window_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-rtcore-ntuser-winevent-l1-1-0 enable_api_ms_win_rtcore_ntuser_winevent_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0 enable_api_ms_win_rtcore_ntuser_wmpointer_l1_1_0 diff --git a/configure.ac b/configure.ac index e16cc3a11d..cc281fcbe5 100644 --- a/configure.ac +++ b/configure.ac @@ -2998,6 +2998,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-perf-legacy-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-power-base-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-power-setting-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-rtcore-ntuser-private-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-rtcore-ntuser-private-l1-1-4) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-rtcore-ntuser-window-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-rtcore-ntuser-winevent-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0) diff --git a/dlls/api-ms-win-rtcore-ntuser-private-l1-1-4/Makefile.in b/dlls/api-ms-win-rtcore-ntuser-private-l1-1-4/Makefile.in new file mode 100644 index 0000000000..4faf345534 --- /dev/null +++ b/dlls/api-ms-win-rtcore-ntuser-private-l1-1-4/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-rtcore-ntuser-private-l1-1-4.dll diff --git a/dlls/api-ms-win-rtcore-ntuser-private-l1-1-4/api-ms-win-rtcore-ntuser-private-l1-1-4.spec b/dlls/api-ms-win-rtcore-ntuser-private-l1-1-4/api-ms-win-rtcore-ntuser-private-l1-1-4.spec new file mode 100644 index 0000000000..4a0c462540 --- /dev/null +++ b/dlls/api-ms-win-rtcore-ntuser-private-l1-1-4/api-ms-win-rtcore-ntuser-private-l1-1-4.spec @@ -0,0 +1,2 @@ +2545 stub @ +2595 stub @ diff --git a/tools/make_specfiles b/tools/make_specfiles index 31d2f20122..2d37545f24 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -346,6 +346,7 @@ my @dll_groups = "api-ms-win-downlevel-user32-l1-1-0", "api-ms-win-ntuser-dc-access-l1-1-0", "api-ms-win-rtcore-ntuser-private-l1-1-0", + "api-ms-win-rtcore-ntuser-private-l1-1-4", "api-ms-win-rtcore-ntuser-window-l1-1-0", "api-ms-win-rtcore-ntuser-winevent-l1-1-0", "api-ms-win-rtcore-ntuser-wmpointer-l1-1-0", -- 2.13.6

1 0

[PATCH 2/2] d3d9/tests: Add test for readback from multisample front buffer.
by Henri Verbeet 08 Mar '18

08 Mar '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/tests/visual.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 557631c..3686fc6 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -16249,6 +16249,78 @@ done: DestroyWindow(window); } +static void test_multisample_get_front_buffer_data(void) +{ + IDirect3DSwapChain9 *swapchain; + D3DPRESENT_PARAMETERS d3dpp; + IDirect3DSurface9 *readback; + IDirect3DTexture9 *texture; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + ULONG refcount; + HWND window; + DWORD color; + HRESULT hr; + + window = create_window(); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create D3D object.\n"); + if (FAILED(IDirect3D9_CheckDeviceMultiSampleType(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_A8R8G8B8, TRUE, D3DMULTISAMPLE_2_SAMPLES, NULL))) + { + skip("Multisampling not supported for D3DFMT_A8R8G8B8.\n"); + goto done; + } + if (!(device = create_device(d3d, window, window, FALSE))) + { + skip("Failed to create D3D device.\n"); + goto done; + } + + hr = IDirect3DDevice9_GetSwapChain(device, 0, &swapchain); + ok(hr == D3D_OK, "Failed to get the implicit swapchain, hr %#x.\n", hr); + hr = IDirect3DSwapChain9_GetPresentParameters(swapchain, &d3dpp); + ok(hr == D3D_OK, "Failed to get present parameters, hr %#x.\n", hr); + IDirect3DSwapChain9_Release(swapchain); + d3dpp.MultiSampleType = D3DMULTISAMPLE_2_SAMPLES; + d3dpp.MultiSampleQuality = 0; + hr = IDirect3DDevice9_Reset(device, &d3dpp); + ok(hr == D3D_OK, "Failed to reset device, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x00f0ff0f, 0.0, 0); + ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 640, 480, D3DFMT_A8R8G8B8, + D3DPOOL_SYSTEMMEM, &readback, NULL); + ok(SUCCEEDED(hr), "Failed to create readback surface, hr %#x.\n", hr); + hr = IDirect3DDevice9_GetFrontBufferData(device, 0, readback); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + color = getPixelColorFromSurface(readback, 320, 240); + ok(color == 0x00f0ff0f, "Got unexpected color 0x%08x.\n", color); + IDirect3DSurface9_Release(readback); + + hr = IDirect3DDevice9_CreateTexture(device, 640, 480, 1, + 0, D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &texture, NULL); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + hr = IDirect3DTexture9_GetSurfaceLevel(texture, 0, &readback); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + hr = IDirect3DDevice9_GetFrontBufferData(device, 0, readback); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + color = getPixelColorFromSurface(readback, 320, 240); + ok(color == 0x00f0ff0f, "Got unexpected color 0x%08x.\n", color); + IDirect3DSurface9_Release(readback); + IDirect3DTexture9_Release(texture); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + static void multisampled_depth_buffer_test(void) { IDirect3DDevice9 *device = 0; @@ -23839,6 +23911,7 @@ START_TEST(visual) srgbwrite_format_test(); update_surface_test(); multisample_get_rtdata_test(); + test_multisample_get_front_buffer_data(); zenable_test(); fog_special_test(); volume_srgb_test(); -- 2.1.4

2 1

[PATCH 1/2] wined3d: Allow blits from drawable location when loading renderbuffer locations.
by Henri Verbeet 08 Mar '18

08 Mar '18

From: Józef Kucia <jkucia(a)codeweavers.com> Fixes a regression introduced by fb6b3cc872077e641cf68165e04012a95c94699d. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- Trivial conflict resolved. --- dlls/wined3d/surface.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 35aee73..201a563 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2358,6 +2358,10 @@ BOOL texture2d_load_renderbuffer(struct wined3d_texture *texture, unsigned int s src_location = WINED3D_LOCATION_RB_RESOLVED; else if (locations & WINED3D_LOCATION_TEXTURE_SRGB) src_location = WINED3D_LOCATION_TEXTURE_SRGB; + else if (locations & WINED3D_LOCATION_TEXTURE_RGB) + src_location = WINED3D_LOCATION_TEXTURE_RGB; + else if (locations & WINED3D_LOCATION_DRAWABLE) + src_location = WINED3D_LOCATION_DRAWABLE; else /* texture2d_blt_fbo() will load the source location if necessary. */ src_location = WINED3D_LOCATION_TEXTURE_RGB; -- 2.1.4

1 0

[PATCH 5/6] usp10: Use heap_calloc() in ScriptStringAnalyse().
by Henri Verbeet 08 Mar '18

08 Mar '18

Note that this changes the allocation size of analysis->pItem. I believe that change to be correct. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/usp10/usp10.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 983eb83..f3b3405 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -2012,8 +2012,10 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, if (cString < 1 || !pString) return E_INVALIDARG; if ((dwFlags & SSA_GLYPHS) && !hdc) return E_PENDING; - if (!(analysis = heap_alloc_zero(sizeof(StringAnalysis)))) return E_OUTOFMEMORY; - if (!(analysis->pItem = heap_alloc_zero(num_items * sizeof(SCRIPT_ITEM) + 1))) goto error; + if (!(analysis = heap_alloc_zero(sizeof(*analysis)))) + return E_OUTOFMEMORY; + if (!(analysis->pItem = heap_calloc(num_items + 1, sizeof(*analysis->pItem)))) + goto error; /* FIXME: handle clipping */ analysis->clip_len = cString; @@ -2032,8 +2034,7 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, if (dwFlags & SSA_PASSWORD) { - iString = heap_alloc(sizeof(WCHAR)*cString); - if (!iString) + if (!(iString = heap_calloc(cString, sizeof(*iString)))) { hr = E_OUTOFMEMORY; goto error; @@ -2058,18 +2059,16 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, if (dwFlags & SSA_BREAK) { - if ((analysis->logattrs = heap_alloc(sizeof(SCRIPT_LOGATTR) * cString))) - { - for (i = 0; i < analysis->numItems; i++) - ScriptBreak(&((WCHAR *)pString)[analysis->pItem[i].iCharPos], - analysis->pItem[i + 1].iCharPos - analysis->pItem[i].iCharPos, - &analysis->pItem[i].a, &analysis->logattrs[analysis->pItem[i].iCharPos]); - } - else + if (!(analysis->logattrs = heap_calloc(cString, sizeof(*analysis->logattrs)))) goto error; + + for (i = 0; i < analysis->numItems; ++i) + ScriptBreak(&((const WCHAR *)pString)[analysis->pItem[i].iCharPos], + analysis->pItem[i + 1].iCharPos - analysis->pItem[i].iCharPos, + &analysis->pItem[i].a, &analysis->logattrs[analysis->pItem[i].iCharPos]); } - if (!(analysis->logical2visual = heap_alloc_zero(sizeof(int) * analysis->numItems))) + if (!(analysis->logical2visual = heap_calloc(analysis->numItems, sizeof(*analysis->logical2visual)))) goto error; if (!(BidiLevel = heap_alloc_zero(analysis->numItems))) goto error; @@ -2077,7 +2076,8 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, if (dwFlags & SSA_GLYPHS) { int tab_x = 0; - if (!(analysis->glyphs = heap_alloc_zero(sizeof(StringGlyphs) * analysis->numItems))) + + if (!(analysis->glyphs = heap_calloc(analysis->numItems, sizeof(*analysis->glyphs)))) { heap_free(BidiLevel); goto error; @@ -2088,11 +2088,11 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, SCRIPT_CACHE *sc = (SCRIPT_CACHE*)&analysis->glyphs[i].sc; int cChar = analysis->pItem[i+1].iCharPos - analysis->pItem[i].iCharPos; int numGlyphs = 1.5 * cChar + 16; - WORD *glyphs = heap_alloc_zero(sizeof(WORD) * numGlyphs); - WORD *pwLogClust = heap_alloc_zero(sizeof(WORD) * cChar); - int *piAdvance = heap_alloc_zero(sizeof(int) * numGlyphs); - SCRIPT_VISATTR *psva = heap_alloc_zero(sizeof(SCRIPT_VISATTR) * numGlyphs); - GOFFSET *pGoffset = heap_alloc_zero(sizeof(GOFFSET) * numGlyphs); + WORD *glyphs = heap_calloc(numGlyphs, sizeof(*glyphs)); + WORD *pwLogClust = heap_calloc(cChar, sizeof(*pwLogClust)); + int *piAdvance = heap_calloc(numGlyphs, sizeof(*piAdvance)); + SCRIPT_VISATTR *psva = heap_calloc(numGlyphs, sizeof(*psva)); + GOFFSET *pGoffset = heap_calloc(numGlyphs, sizeof(*pGoffset)); int numGlyphsReturned; HFONT originalFont = 0x0; -- 2.1.4

2 1

[PATCH 5/5] usp10: Use heap_calloc() in ScriptShapeOpenType().
by Henri Verbeet 08 Mar '18

08 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/usp10/usp10.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 983eb83..52c7044 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3188,8 +3188,9 @@ HRESULT WINAPI ScriptShapeOpenType( HDC hdc, SCRIPT_CACHE *psc, WCHAR *rChars; if ((hr = SHAPE_CheckFontForRequiredFeatures(hdc, (ScriptCache *)*psc, psa)) != S_OK) return hr; - rChars = heap_alloc(sizeof(WCHAR) * cChars); - if (!rChars) return E_OUTOFMEMORY; + if (!(rChars = heap_calloc(cChars, sizeof(*rChars)))) + return E_OUTOFMEMORY; + for (i = 0, g = 0, cluster = 0; i < cChars; i++) { int idx = i; -- 2.1.4

2 1

[PATCH] taskmgr: Implement end process tree
by Zhiyi Zhang 08 Mar '18

08 Mar '18

This should get https://bugs.winehq.org/show_bug.cgi?id=39640 closed. Partially base on François's idea. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/taskmgr/endproc.c | 137 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 130 insertions(+), 7 deletions(-)

1 0

[PATCH 4/6] wined3d: Pass a texture and sub-resource index to read_from_framebuffer().
by Henri Verbeet 08 Mar '18

08 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b7bb604..12023e2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1346,18 +1346,16 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr return dst_texture; } -static void read_from_framebuffer(struct wined3d_surface *surface, - struct wined3d_context *old_ctx, DWORD src_location, DWORD dst_location) +static void texture2d_read_from_framebuffer(struct wined3d_texture *texture, unsigned int sub_resource_idx, + struct wined3d_context *context, DWORD src_location, DWORD dst_location) { - unsigned int sub_resource_idx = surface_get_sub_resource_idx(surface); - struct wined3d_texture *texture = surface->container; struct wined3d_device *device = texture->resource.device; - struct wined3d_context *context = old_ctx; - struct wined3d_surface *restore_rt = NULL; + struct wined3d_texture *restore_texture; const struct wined3d_gl_info *gl_info; unsigned int row_pitch, slice_pitch; unsigned int width, height, level; struct wined3d_bo_address data; + unsigned int restore_idx; BYTE *row, *top, *bottom; BOOL src_is_upside_down; unsigned int i; @@ -1365,16 +1363,18 @@ static void read_from_framebuffer(struct wined3d_surface *surface, wined3d_texture_get_memory(texture, sub_resource_idx, &data, dst_location); - restore_rt = context_get_rt_surface(old_ctx); - if (restore_rt != surface) + restore_texture = context->current_rt.texture; + restore_idx = context->current_rt.sub_resource_idx; + if (restore_texture != texture || restore_idx != sub_resource_idx) context = context_acquire(device, texture, sub_resource_idx); else - restore_rt = NULL; + restore_texture = NULL; gl_info = context->gl_info; if (src_location != texture->resource.draw_binding) { - context_apply_fbo_state_blit(context, GL_READ_FRAMEBUFFER, surface, NULL, src_location); + context_apply_fbo_state_blit(context, GL_READ_FRAMEBUFFER, + texture->sub_resources[sub_resource_idx].u.surface, NULL, src_location); context_check_fbo_status(context, GL_READ_FRAMEBUFFER); context_invalidate_state(context, STATE_FRAMEBUFFER); } @@ -1468,8 +1468,8 @@ error: checkGLcall("glBindBuffer"); } - if (restore_rt) - context_restore(context, restore_rt); + if (restore_texture) + context_restore(context, restore_texture->sub_resources[restore_idx].u.surface); } /* Read the framebuffer contents into a texture. Note that this function @@ -2080,7 +2080,8 @@ BOOL texture2d_load_sysmem(struct wined3d_texture *texture, unsigned int sub_res if (is_multisample_location(texture, WINED3D_LOCATION_TEXTURE_RGB)) { wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_RB_RESOLVED); - read_from_framebuffer(sub_resource->u.surface, context, WINED3D_LOCATION_RB_RESOLVED, dst_location); + texture2d_read_from_framebuffer(texture, sub_resource_idx, context, + WINED3D_LOCATION_RB_RESOLVED, dst_location); return TRUE; } else @@ -2103,7 +2104,8 @@ BOOL texture2d_load_sysmem(struct wined3d_texture *texture, unsigned int sub_res if (!(texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) && (sub_resource->locations & WINED3D_LOCATION_DRAWABLE)) { - read_from_framebuffer(sub_resource->u.surface, context, texture->resource.draw_binding, dst_location); + texture2d_read_from_framebuffer(texture, sub_resource_idx, context, + texture->resource.draw_binding, dst_location); return TRUE; } -- 2.1.4

1 0