July 2014 - Wine-commits - list.winehq.org

Jactry Zeng : include: Fix wrong type in tom.idl.
by Alexandre Julliard 28 Jul '14

28 Jul '14

Module: wine Branch: master Commit: 58ba839be385bfa9e0501a5d98b3ca759f08d2f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58ba839be385bfa9e0501a5d9… Author: Jactry Zeng <wine(a)jactry.com> Date: Sun Jul 27 14:04:52 2014 +0800 include: Fix wrong type in tom.idl. --- include/tom.idl | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/include/tom.idl b/include/tom.idl index daa907b..769e31b 100644 --- a/include/tom.idl +++ b/include/tom.idl @@ -335,22 +335,22 @@ interface ITextFont : IDispatch HRESULT SetEngrave([in]LONG Value); HRESULT GetItalic([retval, out]LONG *pValue); HRESULT SetItalic([in]LONG Value); - HRESULT GetKerning([retval, out]LONG *pValue); - HRESULT SetKerning([in]LONG Value); + HRESULT GetKerning([retval, out]float *pValue); + HRESULT SetKerning([in]float Value); HRESULT GetLanguageID([retval, out]LONG *pValue); HRESULT SetLanguageID([in]LONG Value); HRESULT GetName([retval, out]BSTR *pValue); HRESULT SetName([in]BSTR Value); HRESULT GetOutline([retval, out]LONG *pValue); HRESULT SetOutline([in]LONG Value); - HRESULT GetPosition([retval, out]LONG *pValue); - HRESULT SetPosition([in]LONG Value); + HRESULT GetPosition([retval, out]float *pValue); + HRESULT SetPosition([in]float Value); HRESULT GetProtected([retval, out]LONG *pValue); HRESULT SetProtected([in]LONG Value); HRESULT GetShadow([retval, out]LONG *pValue); HRESULT SetShadow([in]LONG Value); - HRESULT GetSize([retval, out]LONG *pValue); - HRESULT SetSize([in]LONG Value); + HRESULT GetSize([retval, out]float *pValue); + HRESULT SetSize([in]float Value); HRESULT GetSmallCaps([retval, out]LONG *pValue); HRESULT SetSmallCaps([in]LONG Value); HRESULT GetSpacing([retval, out]float *pValue); @@ -398,8 +398,8 @@ interface ITextPara : IDispatch HRESULT SetListLevelIndex([in]LONG Value); HRESULT GetListStart([retval, out]LONG *pValue); HRESULT SetListStart([in]LONG Value); - HRESULT GetListTab([retval, out]LONG *pValue); - HRESULT SetListTab([in]LONG Value); + HRESULT GetListTab([retval, out]float *pValue); + HRESULT SetListTab([in]float Value); HRESULT GetListType([retval, out]LONG *pValue); HRESULT SetListType([in]LONG Value); HRESULT GetNoLineNumber([retval, out]LONG *pValue); @@ -414,8 +414,8 @@ interface ITextPara : IDispatch HRESULT SetSpaceAfter([in]float Value); HRESULT GetSpaceBefore([retval, out]float *pValue); HRESULT SetSpaceBefore([in]float Value); - HRESULT GetWindowControl([retval, out]float *pValue); - HRESULT SetWindowControl([in]float Value); + HRESULT GetWidowControl([retval, out]LONG *pValue); + HRESULT SetWidowControl([in]LONG Value); HRESULT GetTabCount([retval, out]LONG *pCount); HRESULT AddTab([in]float tbPos, [in]LONG tbAlign, [in]LONG tbLeader); HRESULT ClearAllTabs();

1 0

Thomas Faber : amstream: Destroy BaseFilter after MediaStreamFilterImpl child class.
by Alexandre Julliard 28 Jul '14

28 Jul '14

Module: wine Branch: master Commit: cc45c1373c493eca4cea535119ccfd50a1442e85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc45c1373c493eca4cea53511… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Tue Jul 22 15:19:44 2014 +0200 amstream: Destroy BaseFilter after MediaStreamFilterImpl child class. --- dlls/amstream/mediastreamfilter.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/amstream/mediastreamfilter.c b/dlls/amstream/mediastreamfilter.c index 8811455..8c26c8e 100644 --- a/dlls/amstream/mediastreamfilter.c +++ b/dlls/amstream/mediastreamfilter.c @@ -238,7 +238,7 @@ static ULONG WINAPI MediaStreamFilterImpl_AddRef(IMediaStreamFilter *iface) static ULONG WINAPI MediaStreamFilterImpl_Release(IMediaStreamFilter *iface) { IMediaStreamFilterImpl *This = impl_from_IMediaStreamFilter(iface); - ULONG ref = BaseFilterImpl_Release(&This->filter.IBaseFilter_iface); + ULONG ref = InterlockedDecrement(&This->filter.refCount); TRACE("(%p)->(): new ref = %u\n", iface, ref); @@ -250,6 +250,7 @@ static ULONG WINAPI MediaStreamFilterImpl_Release(IMediaStreamFilter *iface) IMediaStream_Release(This->streams[i]); IPin_Release(This->pins[i]); } + BaseFilter_Destroy(&This->filter); HeapFree(GetProcessHeap(), 0, This); }

1 0

Thomas Faber : quartz: Avoid side-effects in asserts.
by Alexandre Julliard 28 Jul '14

28 Jul '14

Module: wine Branch: master Commit: bab08e690ee7b11bd3e0aee5e4de247d30348d06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bab08e690ee7b11bd3e0aee5e… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Jul 26 22:04:29 2014 +0200 quartz: Avoid side-effects in asserts. --- dlls/quartz/avisplit.c | 22 +++++++++++++++++----- dlls/quartz/parser.c | 7 +++++-- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index d74c8ab..1f57045 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -151,6 +151,7 @@ static HRESULT AVISplitter_next_request(AVISplitterImpl *This, DWORD streamnumbe PullPin *pin = This->Parser.pInputPin; IMediaSample *sample = NULL; HRESULT hr; + ULONG ref; TRACE("(%p, %u)->()\n", This, streamnumber); @@ -264,7 +265,10 @@ static HRESULT AVISplitter_next_request(AVISplitterImpl *This, DWORD streamnumbe hr = IAsyncReader_Request(pin->pReader, sample, streamnumber); if (FAILED(hr)) - assert(IMediaSample_Release(sample) == 0); + { + ref = IMediaSample_Release(sample); + assert(ref == 0); + } } else { @@ -278,7 +282,8 @@ static HRESULT AVISplitter_next_request(AVISplitterImpl *This, DWORD streamnumbe if (sample) { ERR("There should be no sample!\n"); - assert(IMediaSample_Release(sample) == 0); + ref = IMediaSample_Release(sample); + assert(ref == 0); } } TRACE("--> %08x\n", hr); @@ -510,8 +515,8 @@ static HRESULT AVISplitter_first_request(LPVOID iface) static HRESULT AVISplitter_done_process(LPVOID iface) { AVISplitterImpl *This = iface; - DWORD x; + ULONG ref; for (x = 0; x < This->Parser.cStreams; ++x) { @@ -525,7 +530,10 @@ static HRESULT AVISplitter_done_process(LPVOID iface) stream->thread = NULL; if (stream->sample) - assert(IMediaSample_Release(stream->sample) == 0); + { + ref = IMediaSample_Release(stream->sample); + assert(ref == 0); + } stream->sample = NULL; ResetEvent(stream->packet_queued); @@ -1219,6 +1227,7 @@ static HRESULT AVISplitter_Flush(LPVOID iface) { AVISplitterImpl *This = iface; DWORD x; + ULONG ref; TRACE("(%p)->()\n", This); @@ -1227,7 +1236,10 @@ static HRESULT AVISplitter_Flush(LPVOID iface) StreamData *stream = This->streams + x; if (stream->sample) - assert(IMediaSample_Release(stream->sample) == 0); + { + ref = IMediaSample_Release(stream->sample); + assert(ref == 0); + } stream->sample = NULL; ResetEvent(stream->packet_queued); diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index b57bae4..cd8d93d 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -170,6 +170,7 @@ void Parser_Destroy(ParserImpl *This) { IPin *connected = NULL; ULONG pinref; + HRESULT hr; assert(!This->filter.refCount); PullPin_WaitForStateChange(This->pInputPin, INFINITE); @@ -178,9 +179,11 @@ void Parser_Destroy(ParserImpl *This) IPin_ConnectedTo(&This->pInputPin->pin.IPin_iface, &connected); if (connected) { - assert(IPin_Disconnect(connected) == S_OK); + hr = IPin_Disconnect(connected); + assert(hr == S_OK); IPin_Release(connected); - assert(IPin_Disconnect(&This->pInputPin->pin.IPin_iface) == S_OK); + hr = IPin_Disconnect(&This->pInputPin->pin.IPin_iface); + assert(hr == S_OK); } pinref = IPin_Release(&This->pInputPin->pin.IPin_iface); if (pinref)

1 0

Thomas Faber : quartz/tests: Fix memory leaks.
by Alexandre Julliard 28 Jul '14

28 Jul '14

Module: wine Branch: master Commit: cf45bec65b6ae1db6f4f96cf44eaa7f98026a9a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf45bec65b6ae1db6f4f96cf4… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Jul 26 23:52:29 2014 +0200 quartz/tests: Fix memory leaks. --- dlls/quartz/tests/filtergraph.c | 1 + dlls/quartz/tests/referenceclock.c | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 713df7b..2f56151 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -1884,6 +1884,7 @@ START_TEST(filtergraph) skip("Creating filtergraph returned %08x, skipping tests\n", hr); return; } + IGraphBuilder_Release(pgraph); test_render_run(avifile); test_render_run(mpegfile); test_graph_builder(); diff --git a/dlls/quartz/tests/referenceclock.c b/dlls/quartz/tests/referenceclock.c index a96bd48..eb6fbda 100644 --- a/dlls/quartz/tests/referenceclock.c +++ b/dlls/quartz/tests/referenceclock.c @@ -28,19 +28,21 @@ static void test_IReferenceClock_query_interface(const char * clockdesc, IReferenceClock * pClock) { HRESULT hr; - IUnknown *pF; + void *pF; - hr = IReferenceClock_QueryInterface(pClock, &IID_IUnknown, (LPVOID *)&pF); + hr = IReferenceClock_QueryInterface(pClock, &IID_IUnknown, &pF); ok(hr == S_OK, "IReferenceClock_QueryInterface returned %x\n", hr); ok(pF != NULL, "pF is NULL\n"); + if (SUCCEEDED(hr)) IUnknown_Release((IUnknown *)pF); - hr = IReferenceClock_QueryInterface(pClock, &IID_IDirectDraw, (LPVOID *)&pF); + hr = IReferenceClock_QueryInterface(pClock, &IID_IDirectDraw, &pF); ok(hr == E_NOINTERFACE, "IReferenceClock_QueryInterface returned %x\n", hr); ok(pF == NULL, "pF is not NULL\n"); - hr = IReferenceClock_QueryInterface(pClock, &IID_IReferenceClock, (LPVOID *)&pF); + hr = IReferenceClock_QueryInterface(pClock, &IID_IReferenceClock, &pF); ok(hr == S_OK, "IReferenceClock_QueryInterface returned %x\n", hr); ok(pF != NULL, "pF is NULL\n"); + if (SUCCEEDED(hr)) IReferenceClock_Release((IReferenceClock *)pF); } /* The following method expects a reference clock that will keep ticking for

1 0

Thomas Faber : dsound: Do not call CoUninitialize if CoInitialize failed.
by Alexandre Julliard 28 Jul '14

28 Jul '14

Module: wine Branch: master Commit: 78b96c8776e05b6becd574cf9a44178bd2cb2388 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78b96c8776e05b6becd574cf9… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sun Jul 27 12:41:23 2014 +0200 dsound: Do not call CoUninitialize if CoInitialize failed. --- dlls/dsound/dsound_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index 7a16366..0e3a313 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -178,7 +178,8 @@ static HRESULT get_mmdevenum(IMMDeviceEnumerator **devenum) hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)devenum); if(FAILED(hr)){ - CoUninitialize(); + if(SUCCEEDED(init_hr)) + CoUninitialize(); *devenum = NULL; ERR("CoCreateInstance failed: %08x\n", hr); return hr;

1 0

Gerald Pfeifer : winebuild: Remove unused empty_name_table.
by Alexandre Julliard 28 Jul '14

28 Jul '14

Module: wine Branch: master Commit: 4a8d186bbcadc65d7f3c944c971b22d45fc06662 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a8d186bbcadc65d7f3c944c9… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Jul 25 23:23:26 2014 +0200 winebuild: Remove unused empty_name_table. --- tools/winebuild/import.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 6bafd86..3ad5cab 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -115,15 +115,6 @@ static inline void remove_name( struct name_table *table, unsigned int idx ) table->count--; } -/* make a name table empty */ -static inline void empty_name_table( struct name_table *table ) -{ - unsigned int i; - - for (i = 0; i < table->count; i++) free( table->names[i] ); - table->count = 0; -} - /* locate a name in a (sorted) list */ static inline const char *find_name( const char *name, const struct name_table *table ) {

1 0

Gerald Pfeifer : winhttp: Remove unused constant proxymsg.
by Alexandre Julliard 28 Jul '14

28 Jul '14

Module: wine Branch: master Commit: 25bf35243e866644e77ae363f5b13597513ab69f URL: http://source.winehq.org/git/wine.git/?a=commit;h=25bf35243e866644e77ae363f… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Jul 25 23:32:00 2014 +0200 winhttp: Remove unused constant proxymsg. --- dlls/winhttp/tests/winhttp.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 6a2d8c6..f214879 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -1774,13 +1774,6 @@ static const char noauthmsg[] = "WWW-Authenticate: Basic realm=\"placebo\"\r\n" "\r\n"; -static const char proxymsg[] = -"HTTP/1.1 407 Proxy Authentication Required\r\n" -"Server: winetest\r\n" -"Proxy-Connection: close\r\n" -"Proxy-Authenticate: Basic realm=\"placebo\"\r\n" -"\r\n"; - struct server_info { HANDLE event;

1 0

Gerald Pfeifer : dbghelp: Do not try to ignore the return codes in PEV_ERROR and and PEV_ERROR1.
by Alexandre Julliard 28 Jul '14

28 Jul '14

Module: wine Branch: master Commit: a910704ccf6814c4aa0de247f68058bbd9fc8697 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a910704ccf6814c4aa0de247f… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Jul 26 00:18:42 2014 +0200 dbghelp: Do not try to ignore the return codes in PEV_ERROR and and PEV_ERROR1. --- dlls/dbghelp/msc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 5e8804f..636655f 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2924,8 +2924,8 @@ struct zvalue struct hash_table_elt elt; }; -#define PEV_ERROR(pev, msg) snprintf((pev)->error, sizeof((pev)->error), "%s", (msg)),FALSE -#define PEV_ERROR1(pev, msg, pmt) snprintf((pev)->error, sizeof((pev)->error), (msg), (pmt)),FALSE +#define PEV_ERROR(pev, msg) snprintf((pev)->error, sizeof((pev)->error), "%s", (msg)) +#define PEV_ERROR1(pev, msg, pmt) snprintf((pev)->error, sizeof((pev)->error), (msg), (pmt)) #if 0 static void pev_dump_stack(struct pevaluator* pev)

1 0

Thomas Faber : qcap: Reference module only on successful object creation.
by Alexandre Julliard 28 Jul '14

28 Jul '14

Module: wine Branch: master Commit: 33e0e6867f6e07853739b037de18483c60cc7248 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33e0e6867f6e07853739b037d… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sun Jul 27 11:03:40 2014 +0200 qcap: Reference module only on successful object creation. --- dlls/qcap/vfwcapture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 6d416b7..2cbf493 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -732,7 +732,6 @@ VfwPin_Construct( IBaseFilter * pBaseFilter, LPCRITICAL_SECTION pCritSec, piOutput.dir = PINDIR_OUTPUT; piOutput.pFilter = pBaseFilter; lstrcpyW(piOutput.achName, wszOutputPinName); - ObjectRefCount(TRUE); hr = BaseOutputPin_Construct(&VfwPin_Vtbl, sizeof(VfwPinImpl), &piOutput, &output_BaseOutputFuncTable, pCritSec, ppPin); @@ -740,6 +739,7 @@ VfwPin_Construct( IBaseFilter * pBaseFilter, LPCRITICAL_SECTION pCritSec, { VfwPinImpl *pPinImpl = (VfwPinImpl*)*ppPin; pPinImpl->KSP_VT = &KSP_VTable; + ObjectRefCount(TRUE); } return hr;

1 0

Thomas Faber : strmbase: Separate BasePin destructors from Release.
by Alexandre Julliard 28 Jul '14

28 Jul '14

Module: wine Branch: master Commit: 4ea1f35777c17c2a8896c1bfdb0619c6e7a72eea URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ea1f35777c17c2a8896c1bfd… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sun Jul 27 11:34:50 2014 +0200 strmbase: Separate BasePin destructors from Release. --- dlls/strmbase/pin.c | 34 +++++++++++++++++++++++----------- include/wine/strmbase.h | 2 ++ 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 4920784..02af5b3 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -401,11 +401,7 @@ ULONG WINAPI BaseOutputPinImpl_Release(IPin * iface) if (!refCount) { - FreeMediaType(&This->pin.mtCurrent); - if (This->pAllocator) - IMemAllocator_Release(This->pAllocator); - This->pAllocator = NULL; - CoTaskMemFree(This); + BaseOutputPin_Destroy(This); return 0; } return refCount; @@ -849,6 +845,16 @@ HRESULT WINAPI BaseOutputPin_Construct(const IPinVtbl *OutputPin_Vtbl, LONG outp return E_FAIL; } +HRESULT WINAPI BaseOutputPin_Destroy(BaseOutputPin *This) +{ + FreeMediaType(&This->pin.mtCurrent); + if (This->pAllocator) + IMemAllocator_Release(This->pAllocator); + This->pAllocator = NULL; + CoTaskMemFree(This); + return S_OK; +} + /*** Input Pin implementation ***/ static inline BaseInputPin *impl_BaseInputPin_from_IPin( IPin *iface ) @@ -900,12 +906,7 @@ ULONG WINAPI BaseInputPinImpl_Release(IPin * iface) if (!refCount) { - FreeMediaType(&This->pin.mtCurrent); - if (This->pAllocator) - IMemAllocator_Release(This->pAllocator); - This->pAllocator = NULL; - This->pin.IPin_iface.lpVtbl = NULL; - CoTaskMemFree(This); + BaseInputPin_Destroy(This); return 0; } else @@ -1273,3 +1274,14 @@ HRESULT BaseInputPin_Construct(const IPinVtbl *InputPin_Vtbl, LONG inputpin_size CoTaskMemFree(pPinImpl); return E_FAIL; } + +HRESULT WINAPI BaseInputPin_Destroy(BaseInputPin *This) +{ + FreeMediaType(&This->pin.mtCurrent); + if (This->pAllocator) + IMemAllocator_Release(This->pAllocator); + This->pAllocator = NULL; + This->pin.IPin_iface.lpVtbl = NULL; + CoTaskMemFree(This); + return S_OK; +} diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 1370198..841359d 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -136,6 +136,7 @@ HRESULT WINAPI BaseOutputPinImpl_DecideAllocator(BaseOutputPin *This, IMemInputP HRESULT WINAPI BaseOutputPinImpl_AttemptConnection(BasePin *This, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt); HRESULT WINAPI BaseOutputPin_Construct(const IPinVtbl *OutputPin_Vtbl, LONG outputpin_size, const PIN_INFO * pPinInfo, const BaseOutputPinFuncTable* pBaseOutputFuncsTable, LPCRITICAL_SECTION pCritSec, IPin ** ppPin); +HRESULT WINAPI BaseOutputPin_Destroy(BaseOutputPin *This); /* Base Input Pin */ HRESULT WINAPI BaseInputPinImpl_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv); @@ -151,6 +152,7 @@ HRESULT WINAPI BaseInputPinImpl_NewSegment(IPin * iface, REFERENCE_TIME tStart, HRESULT BaseInputPin_Construct(const IPinVtbl *InputPin_Vtbl, LONG inputpin_size, const PIN_INFO * pPinInfo, const BaseInputPinFuncTable* pBaseInputFuncsTable, LPCRITICAL_SECTION pCritSec, IMemAllocator *, IPin ** ppPin); +HRESULT WINAPI BaseInputPin_Destroy(BaseInputPin *This); typedef struct BaseFilter {

1 0