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

Nikolay Sivov : dwrite: Split initial cluster computation by stage.
by Alexandre Julliard 24 Aug '17

24 Aug '17

Module: wine Branch: master Commit: 072a9b00cffd81599f40cd53a1bc38b27556f40d URL: http://source.winehq.org/git/wine.git/?a=commit;h=072a9b00cffd81599f40cd53a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 22 12:42:11 2017 +0300 dwrite: Split initial cluster computation by stage. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 5 +- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/layout.c | 374 ++++++++++++++++++++++++------------------- dlls/dwrite/main.c | 6 +- 4 files changed, 215 insertions(+), 172 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=072a9b00cffd81599f40c…

1 0

Rosanne DiMesio : Add Subscription to Licenses
by Jeremy Newman 23 Aug '17

23 Aug '17

Module: appdb Branch: master Commit: 37505dbac7b5c844d7239b7abd508885bcea25c5 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=37505dbac7b5c844d7239b7a… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Tue Aug 22 09:53:38 2017 -0500 Add Subscription to Licenses Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/version.php | 5 +++-- tables/alter.sql | 2 +- tables/appdb_tables.sql | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/version.php b/include/version.php index db38601..23f5df9 100644 --- a/include/version.php +++ b/include/version.php @@ -20,6 +20,7 @@ define("LICENSE_DEMO", "Demo"); define("LICENSE_RETAIL", "Retail"); define('LICENSE_FREETOUSE', 'Free to use'); define('LICENSE_FREETOSHARE', 'Free to use and share'); +define('LICENSE_SUBSCRIPTION', 'Subscription'); /** * Version class for handling versions. @@ -1392,7 +1393,7 @@ EOT; /* Returns an array containing the different software licences */ public static function getLicenses() { - return array(LICENSE_RETAIL, LICENSE_OPENSOURCE, LICENSE_FREETOUSE, + return array(LICENSE_RETAIL, LICENSE_SUBSCRIPTION, LICENSE_FREETOUSE, LICENSE_FREETOSHARE, LICENSE_DEMO, LICENSE_SHAREWARE); } @@ -1426,7 +1427,7 @@ EOT; /* In order to prevent MySQL injections. Returns matched license */ public static function checkLicense($sLicense) { - $aLicense = array(LICENSE_RETAIL, LICENSE_OPENSOURCE, LICENSE_FREETOUSE, + $aLicense = array(LICENSE_RETAIL, LICENSE_SUBSCRIPTION, LICENSE_FREETOUSE, LICENSE_FREETOSHARE, LICENSE_DEMO, LICENSE_SHAREWARE); foreach($aLicense as $sElement) diff --git a/tables/alter.sql b/tables/alter.sql index 0e977b2..508e3c8 100644 --- a/tables/alter.sql +++ b/tables/alter.sql @@ -1,3 +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 `appVersion` CHANGE `license` `license` ENUM('Retail','Subscription','Open Source','Demo','Shareware','Free to use','Free to use and share'); diff --git a/tables/appdb_tables.sql b/tables/appdb_tables.sql index 30af6ca..3330bab 100644 --- a/tables/appdb_tables.sql +++ b/tables/appdb_tables.sql @@ -59,7 +59,7 @@ create table appVersion ( ratingRelease text, submitTime datetime NOT NULL, submitterId int(11) NOT NULL default '0', - license enum('Retail','Open Source','Demo','Shareware','Free to use','Free to use and share'), + license enum('Retail','Subscription','Open Source','Demo','Shareware','Free to use','Free to use and share'), obsoleteBy int(11) NOT NULL default '0', state enum('accepted','queued','rejected','pending','deleted') NOT NULL default 'accepted', hasMaintainer enum('true','false') NOT NULL default 'false',

1 0

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

23 Aug '17

Module: appdb Branch: master Commit: aec3be07870ba152b80d4df43f2c068fab070fb2 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=aec3be07870ba152b80d4df4… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Aug 23 10:21:34 2017 -0500 take live --- tables/alter.sql | 1 - 1 file changed, 1 deletion(-) diff --git a/tables/alter.sql b/tables/alter.sql index 508e3c8..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 `appVersion` CHANGE `license` `license` ENUM('Retail','Subscription','Open Source','Demo','Shareware','Free to use','Free to use and share');

1 0

Jeremy Newman : use wildcards on docs pages to catch all subpages
by Jeremy Newman 22 Aug '17

22 Aug '17

Module: website Branch: master Commit: 5842b409583faeb7ad45068922854a0045803789 URL: http://source.winehq.org/git/website.git/?a=commit;h=5842b409583faeb7ad4506… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Aug 22 09:48:18 2017 -0500 use wildcards on docs pages to catch all subpages --- include/htaccess.sample | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/include/htaccess.sample b/include/htaccess.sample index ae04e8d..ae53268 100644 --- a/include/htaccess.sample +++ b/include/htaccess.sample @@ -72,16 +72,12 @@ RedirectMatch ^/site/wineconf/?$ https://wiki.winehq.org/WineConf RedirectMatch ^/wineconf/?$ https://wiki.winehq.org/WineConf # fix documentation links -RedirectMatch ^/docs/wineusr-guide$ https://wiki.winehq.org/Wine_User's_Guide -RedirectMatch ^/docs/winelib-guide$ https://wiki.winehq.org/Winelib_User's_Guide -RedirectMatch ^/docs/winedev-guide$ https://wiki.winehq.org/Wine_Developer's_Guide -RedirectMatch ^/site/docs$ https://www.winehq.org/documentation -RedirectMatch ^/docs$ https://www.winehq.org/documentation -RedirectMatch ^/Docs/(\w+-\w+)/$ https://www.winehq.org/docs/$1/index -RedirectMatch ^/Docs/(\w+-\w+)/(.*)\.shtml$ https://www.winehq.org/docs/$1/$2 -RedirectMatch ^/docs/(\w+-\w+)/$ https://www.winehq.org/docs/$1/index -RedirectMatch ^/docs/(\w+-\w+)/(.*)\.shtml$ https://www.winehq.org/docs/$1/$2 -RedirectMatch ^/docs/([a-z-]+)/$ https://www.winehq.org/docs/$1/index +RedirectMatch ^/docs/wineusr-guide.*$ https://wiki.winehq.org/Wine_User's_Guide +RedirectMatch ^/docs/winelib-guide.*$ https://wiki.winehq.org/Winelib_User's_Guide +RedirectMatch ^/docs/winedev-guide.*$ https://wiki.winehq.org/Wine_Developer's_Guide +RedirectMatch ^/site/docs.*$ https://www.winehq.org/documentation +RedirectMatch ^/docs.*$ https://www.winehq.org/documentation +RedirectMatch ^/Docs.*$ https://www.winehq.org/documentation # redirect winehq services to appropriate web sites RedirectMatch ^/(APPS|Apps|apps)$ https://appdb.winehq.org/

1 0

Andrey Gusev : Change background and title colors for Top-10 Platinum List.
by Jeremy Newman 21 Aug '17

21 Aug '17

Module: appdb Branch: master Commit: e9aa2b9c3e4b19d592c87cf8035d2b12d06d3326 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=e9aa2b9c3e4b19d592c87cf8… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sun Aug 20 12:56:34 2017 +0300 Change background and title colors for Top-10 Platinum List. Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- css/styles.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/css/styles.css b/css/styles.css index aa4157c..dcde735 100644 --- a/css/styles.css +++ b/css/styles.css @@ -588,8 +588,7 @@ div.topx_style { border: 2px solid #999999; border-radius: 5px; } -div.topx_style.platinum { background-color: #333333; } -div.topx_style.platinum div.rating_header { color: #ffffff; } +div.topx_style.platinum { background-color: #E5E4E2; } div.topx_style.gold { background-color: #FFF600; } div.topx_style.silver { background-color: #C0C0C0; } div.rating_header { padding: 8px; }

1 0

Alexandre Julliard : Wine release 2.15
by Alexandre Julliard 20 Aug '17

20 Aug '17

Module: website Branch: master Commit: c5635761d4b8df1a5453127918975d70125266ac URL: http://source.winehq.org/git/website.git/?a=commit;h=c5635761d4b8df1a545312… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Aug 20 14:02:41 2017 +0900 Wine release 2.15 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2017082001.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/en/2017082001.xml b/news/en/2017082001.xml new file mode 100644 index 0000000..f83a169 --- /dev/null +++ b/news/en/2017082001.xml @@ -0,0 +1,15 @@ +<news> +<date>August 20, 2017</date> +<title>Wine 2.15 Released</title> +<body> + The Wine development release 2.15 is now available. + <a href="{$root}/announce/2.15">What's new</a> in this release: +<ul> + <li>Support for AES encryption.</li> + <li>Improved Bezier support in Direct2D.</li> + <li>Chunked transfer improvements in WinInet.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/2.15/wine-2.15.tar.bz2">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>. +</body></news>

1 0

Jacek Caban : netprofm: Implement connection points as the same object as their container.
by Alexandre Julliard 20 Aug '17

20 Aug '17

Module: wine Branch: master Commit: ba156ed28b7bc39e7bdce41e6afd9c458c2a6eb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba156ed28b7bc39e7bdce41e6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 18 14:43:24 2017 +0200 netprofm: Implement connection points as the same object as their container. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netprofm/list.c | 78 ++++++++++++++++++++++------------------------ dlls/netprofm/tests/list.c | 20 ++++++++++-- 2 files changed, 55 insertions(+), 43 deletions(-) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index d59ee0c..3f57284 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -75,6 +75,15 @@ struct connection VARIANT_BOOL connected; }; +struct connection_point +{ + IConnectionPoint IConnectionPoint_iface; + IConnectionPointContainer *container; + IID iid; + struct list sinks; + DWORD cookie; +}; + struct list_manager { INetworkListManager INetworkListManager_iface; @@ -83,16 +92,9 @@ struct list_manager LONG refs; struct list networks; struct list connections; -}; - -struct connection_point -{ - IConnectionPoint IConnectionPoint_iface; - IConnectionPointContainer *container; - LONG refs; - IID iid; - struct list sinks; - DWORD cookie; + struct connection_point list_mgr_cp; + struct connection_point cost_mgr_cp; + struct connection_point conn_mgr_cp; }; struct sink_entry @@ -146,21 +148,14 @@ static ULONG WINAPI connection_point_AddRef( IConnectionPoint *iface ) { struct connection_point *cp = impl_from_IConnectionPoint( iface ); - return InterlockedIncrement( &cp->refs ); + return IConnectionPointContainer_AddRef( cp->container ); } static ULONG WINAPI connection_point_Release( IConnectionPoint *iface ) { struct connection_point *cp = impl_from_IConnectionPoint( iface ); - LONG refs = InterlockedDecrement( &cp->refs ); - if (!refs) - { - TRACE( "destroying %p\n", cp ); - IConnectionPointContainer_Release( cp->container ); - heap_free( cp ); - } - return refs; + return IConnectionPointContainer_Release( cp->container ); } static HRESULT WINAPI connection_point_GetConnectionInterface( @@ -271,27 +266,16 @@ static const IConnectionPointVtbl connection_point_vtbl = connection_point_EnumConnections }; -static HRESULT connection_point_create( - IConnectionPoint **obj, +static void connection_point_init( + struct connection_point *cp, REFIID riid, IConnectionPointContainer *container ) { - struct connection_point *cp; - TRACE( "%p, %s, %p\n", obj, debugstr_guid(riid), container ); - - if (!(cp = heap_alloc( sizeof(*cp) ))) return E_OUTOFMEMORY; cp->IConnectionPoint_iface.lpVtbl = &connection_point_vtbl; cp->container = container; - cp->refs = 1; cp->cookie = 0; cp->iid = *riid; list_init( &cp->sinks ); - - IConnectionPointContainer_AddRef( container ); - - *obj = &cp->IConnectionPoint_iface; - TRACE( "returning iface %p\n", *obj ); - return S_OK; } static inline struct network *impl_from_INetwork( @@ -1394,21 +1378,28 @@ static HRESULT WINAPI ConnectionPointContainer_FindConnectionPoint(IConnectionPo REFIID riid, IConnectionPoint **cp) { struct list_manager *This = impl_from_IConnectionPointContainer( iface ); + struct connection_point *ret; TRACE( "%p, %s, %p\n", This, debugstr_guid(riid), cp ); if (!riid || !cp) return E_POINTER; - if (IsEqualGUID( riid, &IID_INetworkListManagerEvents ) || - IsEqualGUID( riid, &IID_INetworkCostManagerEvents ) || - IsEqualGUID( riid, &IID_INetworkConnectionEvents )) - return connection_point_create( cp, riid, iface ); - - FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + if (IsEqualGUID( riid, &IID_INetworkListManagerEvents )) + ret = &This->list_mgr_cp; + else if (IsEqualGUID( riid, &IID_INetworkCostManagerEvents )) + ret = &This->cost_mgr_cp; + else if (IsEqualGUID( riid, &IID_INetworkConnectionEvents )) + ret = &This->conn_mgr_cp; + else + { + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + *cp = NULL; + return E_NOINTERFACE; + } - *cp = NULL; - return E_NOINTERFACE; + IConnectionPoint_AddRef( *cp = &ret->IConnectionPoint_iface ); + return S_OK; } static const struct IConnectionPointContainerVtbl cpc_vtbl = @@ -1784,6 +1775,13 @@ HRESULT list_manager_create( void **obj ) init_networks( mgr ); mgr->refs = 1; + connection_point_init( &mgr->list_mgr_cp, &IID_INetworkListManagerEvents, + &mgr->IConnectionPointContainer_iface ); + connection_point_init( &mgr->cost_mgr_cp, &IID_INetworkCostManagerEvents, + &mgr->IConnectionPointContainer_iface); + connection_point_init( &mgr->conn_mgr_cp, &IID_INetworkConnectionEvents, + &mgr->IConnectionPointContainer_iface ); + *obj = &mgr->INetworkListManager_iface; TRACE( "returning iface %p\n", *obj ); return S_OK; diff --git a/dlls/netprofm/tests/list.c b/dlls/netprofm/tests/list.c index 3937b2f..0a1f854 100644 --- a/dlls/netprofm/tests/list.c +++ b/dlls/netprofm/tests/list.c @@ -222,7 +222,7 @@ static void test_INetworkListManager( void ) INetworkCostManager *cost_mgr; NLM_CONNECTIVITY connectivity; VARIANT_BOOL connected; - IConnectionPoint *pt; + IConnectionPoint *pt, *pt2; IEnumNetworks *network_iter; INetwork *network; IEnumNetworkConnections *conn_iter; @@ -319,7 +319,10 @@ static void test_INetworkListManager( void ) hr = IConnectionPoint_Unadvise( pt, cookie ); ok( hr == S_OK, "Unadvise failed: %08x\n", hr ); - IConnectionPoint_Release( pt ); + hr = IConnectionPointContainer_FindConnectionPoint( cpc, &IID_INetworkListManagerEvents, &pt2 ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( pt == pt2, "pt != pt2\n"); + IConnectionPoint_Release( pt2 ); hr = IConnectionPointContainer_FindConnectionPoint( cpc, &IID_INetworkCostManagerEvents, &pt ); ok( hr == S_OK || hr == CO_E_FAILEDTOIMPERSONATE, "got %08x\n", hr ); @@ -355,7 +358,18 @@ static void test_INetworkListManager( void ) } IEnumNetworkConnections_Release( conn_iter ); } - INetworkListManager_Release( mgr ); + + /* cps and their container share the same ref count */ + IConnectionPoint_AddRef( pt ); + IConnectionPoint_AddRef( pt ); + + ref1 = IConnectionPoint_Release( pt ); + ref2 = INetworkListManager_Release( mgr ); + ok( ref2 == ref1 - 1, "ref = %u\n", ref1 ); + + IConnectionPoint_Release( pt ); + ref1 = IConnectionPoint_Release( pt ); + ok( !ref1, "ref = %u\n", ref1 ); } START_TEST( list )

1 0

Jacek Caban : netprofm: Release connection point sink entries in object destructor.
by Alexandre Julliard 20 Aug '17

20 Aug '17

Module: wine Branch: master Commit: c289169aaa38b847749d9064edbac32a81b17782 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c289169aaa38b847749d9064e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 18 14:43:39 2017 +0200 netprofm: Release connection point sink entries in object destructor. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netprofm/list.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index 3f57284..e28be12 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -222,6 +222,13 @@ static HRESULT WINAPI connection_point_Advise( return S_OK; } +static void sink_entry_release( struct sink_entry *entry ) +{ + list_remove( &entry->entry ); + IUnknown_Release( entry->unk ); + heap_free( entry ); +} + static HRESULT WINAPI connection_point_Unadvise( IConnectionPoint *iface, DWORD cookie ) @@ -234,9 +241,7 @@ static HRESULT WINAPI connection_point_Unadvise( LIST_FOR_EACH_ENTRY( iter, &cp->sinks, struct sink_entry, entry ) { if (iter->cookie != cookie) continue; - list_remove( &iter->entry ); - IUnknown_Release( iter->unk ); - heap_free( iter ); + sink_entry_release( iter ); return S_OK; } @@ -278,6 +283,12 @@ static void connection_point_init( list_init( &cp->sinks ); } +static void connection_point_release( struct connection_point *cp ) +{ + while (!list_empty( &cp->sinks )) + sink_entry_release( LIST_ENTRY( list_head( &cp->sinks ), struct sink_entry, entry ) ); +} + static inline struct network *impl_from_INetwork( INetwork *iface ) { @@ -1110,6 +1121,9 @@ static ULONG WINAPI list_manager_Release( TRACE( "destroying %p\n", mgr ); + connection_point_release( &mgr->conn_mgr_cp ); + connection_point_release( &mgr->cost_mgr_cp ); + connection_point_release( &mgr->list_mgr_cp ); while ((ptr = list_head( &mgr->networks ))) { struct network *network = LIST_ENTRY( ptr, struct network, entry );

1 0

Nikolay Sivov : qcap: Use wine_dbgstr_longlong() to trace REFERENCE_TIME arguments.
by Alexandre Julliard 20 Aug '17

20 Aug '17

Module: wine Branch: master Commit: ffc2c709366a87916922d5a043c288b5e1de7d60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffc2c709366a87916922d5a04… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 18 23:12:18 2017 +0300 qcap: Use wine_dbgstr_longlong() to trace REFERENCE_TIME arguments. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/audiorecord.c | 2 +- dlls/qcap/avimux.c | 9 ++++----- dlls/qcap/smartteefilter.c | 2 +- dlls/qcap/vfwcapture.c | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/qcap/audiorecord.c b/dlls/qcap/audiorecord.c index 7502288..1187d4a 100644 --- a/dlls/qcap/audiorecord.c +++ b/dlls/qcap/audiorecord.c @@ -148,7 +148,7 @@ static HRESULT WINAPI AudioRecord_Pause(IBaseFilter *iface) static HRESULT WINAPI AudioRecord_Run(IBaseFilter *iface, REFERENCE_TIME tStart) { AudioRecord *This = impl_from_IBaseFilter(iface); - FIXME("(%p, %x%08x): stub\n", This, (ULONG)(tStart >> 32), (ULONG)tStart); + FIXME("(%p, %s): stub\n", This, wine_dbgstr_longlong(tStart)); return E_NOTIMPL; } diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index 533db13..c335737 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -600,7 +600,7 @@ static HRESULT WINAPI AviMux_Run(IBaseFilter *iface, REFERENCE_TIME tStart) HRESULT hr; int i, stream_id; - TRACE("(%p)->(0x%x%08x)\n", This, (ULONG)(tStart >> 32), (ULONG)tStart); + TRACE("(%p)->(%s)\n", This, wine_dbgstr_longlong(tStart)); if(This->filter.state == State_Running) return S_OK; @@ -1484,8 +1484,7 @@ static HRESULT WINAPI AviMuxOut_NewSegment(IPin *iface, REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate) { AviMux *This = impl_from_out_IPin(iface); - TRACE("(%p)->(0x%x%08x 0x%x%08x %lf)\n", This, (ULONG)(tStart >> 32), - (ULONG)tStart, (ULONG)(tStop >> 32), (ULONG)tStop, dRate); + TRACE("(%p)->(%s %s %f)\n", This, wine_dbgstr_longlong(tStart), wine_dbgstr_longlong(tStop), dRate); return BasePinImpl_NewSegment(iface, tStart, tStop, dRate); } @@ -1960,8 +1959,8 @@ static HRESULT WINAPI AviMuxIn_NewSegment(IPin *iface, REFERENCE_TIME tStart, { AviMux *This = impl_from_in_IPin(iface); AviMuxIn *avimuxin = AviMuxIn_from_IPin(iface); - TRACE("(%p:%s)->(0x%x%08x 0x%x%08x %lf)\n", This, debugstr_w(avimuxin->pin.pin.pinInfo.achName), - (ULONG)(tStart >> 32), (ULONG)tStart, (ULONG)(tStop >> 32), (ULONG)tStop, dRate); + TRACE("(%p:%s)->(%s %s %f)\n", This, debugstr_w(avimuxin->pin.pin.pinInfo.achName), + wine_dbgstr_longlong(tStart), wine_dbgstr_longlong(tStop), dRate); return BasePinImpl_NewSegment(iface, tStart, tStop, dRate); } diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c index 3191577..55fcde5 100644 --- a/dlls/qcap/smartteefilter.c +++ b/dlls/qcap/smartteefilter.c @@ -167,7 +167,7 @@ static HRESULT WINAPI SmartTeeFilter_Run(IBaseFilter *iface, REFERENCE_TIME tSta { SmartTeeFilter *This = impl_from_IBaseFilter(iface); HRESULT hr = S_OK; - TRACE("(%p, %x%08x)\n", This, (ULONG)(tStart >> 32), (ULONG)tStart); + TRACE("(%p, %s)\n", This, wine_dbgstr_longlong(tStart)); EnterCriticalSection(&This->filter.csFilter); if(This->filter.state != State_Running) { /* We share an allocator among all pins, an allocator can only get committed diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 372e2ee..46ae6c0 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -294,7 +294,7 @@ static HRESULT WINAPI VfwCapture_Pause(IBaseFilter * iface) static HRESULT WINAPI VfwCapture_Run(IBaseFilter * iface, REFERENCE_TIME tStart) { VfwCapture *This = impl_from_IBaseFilter(iface); - TRACE("(%x%08x)\n", (ULONG)(tStart >> 32), (ULONG)tStart); + TRACE("(%s)\n", wine_dbgstr_longlong(tStart)); return qcap_driver_run(This->driver_info, &This->filter.state); }

1 0

Alexandre Julliard : Release 2.15.
by Alexandre Julliard 20 Aug '17

20 Aug '17

Module: wine Branch: master Commit: 67f6eb327ef78fe8acf45bf6ac6c93424ec89335 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67f6eb327ef78fe8acf45bf6a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Aug 20 13:58:58 2017 +0900 Release 2.15. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 399 +++++++++++++++++++++++++++++--------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +-- 4 files changed, 198 insertions(+), 222 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=67f6eb327ef78fe8acf45…

1 0