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

Zebediah Figura : dmusic: Implement the master clock object.
by Alexandre Julliard June 17, 2019

June 17, 2019

Module: wine Branch: master Commit: 6e3c9d6e49ee1f5defee8e070b272590b3a3a8bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e3c9d6e49ee1f5defee8e07… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 14 11:42:45 2019 -0500 dmusic: Implement the master clock object. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/dmusic.c | 125 ++++++++++++++++++++++++++++++++++++++++++++- dlls/dmusic/tests/dmusic.c | 12 ++--- 2 files changed, 130 insertions(+), 7 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index a74a31e..cc798ce 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -22,9 +22,132 @@ #include <stdio.h> #include "dmusic_private.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(dmusic); +struct master_clock { + IReferenceClock IReferenceClock_iface; + LONG ref; + double freq; + REFERENCE_TIME last_time; +}; + +static inline struct master_clock *impl_from_IReferenceClock(IReferenceClock *iface) +{ + return CONTAINING_RECORD(iface, struct master_clock, IReferenceClock_iface); +} + +static HRESULT WINAPI master_IReferenceClock_QueryInterface(IReferenceClock *iface, REFIID riid, + void **ret_iface) +{ + TRACE("(%p, %s, %p)\n", iface, debugstr_dmguid(riid), ret_iface); + + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IReferenceClock)) + *ret_iface = iface; + else { + WARN("no interface for %s\n", debugstr_dmguid(riid)); + *ret_iface = NULL; + return E_NOINTERFACE; + } + + IReferenceClock_AddRef(iface); + + return S_OK; +} + +static ULONG WINAPI master_IReferenceClock_AddRef(IReferenceClock *iface) +{ + struct master_clock *This = impl_from_IReferenceClock(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref = %u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI master_IReferenceClock_Release(IReferenceClock *iface) +{ + struct master_clock *This = impl_from_IReferenceClock(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref = %u\n", iface, ref); + + if (!ref) + heap_free(This); + + return ref; +} + +static HRESULT WINAPI master_IReferenceClock_GetTime(IReferenceClock *iface, + REFERENCE_TIME *time) +{ + struct master_clock *This = impl_from_IReferenceClock(iface); + LARGE_INTEGER counter; + HRESULT hr; + + TRACE("(%p, %p)\n", iface, time); + + QueryPerformanceCounter(&counter); + *time = counter.QuadPart * This->freq; + hr = (*time == This->last_time) ? S_FALSE : S_OK; + This->last_time = *time; + + return hr; +} + +static HRESULT WINAPI master_IReferenceClock_AdviseTime(IReferenceClock *iface, + REFERENCE_TIME base, REFERENCE_TIME offset, HANDLE event, DWORD *cookie) +{ + TRACE("(%p, %s, %s, %p, %p): method not implemented\n", iface, wine_dbgstr_longlong(base), + wine_dbgstr_longlong(offset), event, cookie); + return E_NOTIMPL; +} + +static HRESULT WINAPI master_IReferenceClock_AdvisePeriodic(IReferenceClock *iface, + REFERENCE_TIME start, REFERENCE_TIME period, HANDLE semaphore, DWORD *cookie) +{ + TRACE("(%p, %s, %s, %p, %p): method not implemented\n", iface, wine_dbgstr_longlong(start), + wine_dbgstr_longlong(period), semaphore, cookie); + return E_NOTIMPL; +} + +static HRESULT WINAPI master_IReferenceClock_Unadvise(IReferenceClock *iface, DWORD cookie) +{ + TRACE("(%p, %#x): method not implemented\n", iface, cookie); + return E_NOTIMPL; +} + +static const IReferenceClockVtbl master_clock_vtbl = { + master_IReferenceClock_QueryInterface, + master_IReferenceClock_AddRef, + master_IReferenceClock_Release, + master_IReferenceClock_GetTime, + master_IReferenceClock_AdviseTime, + master_IReferenceClock_AdvisePeriodic, + master_IReferenceClock_Unadvise, +}; + +static HRESULT master_clock_create(IReferenceClock **clock) +{ + struct master_clock *obj; + LARGE_INTEGER freq; + + TRACE("(%p)\n", clock); + + if (!(obj = heap_alloc_zero(sizeof(*obj)))) + return E_OUTOFMEMORY; + + obj->IReferenceClock_iface.lpVtbl = &master_clock_vtbl; + obj->ref = 1; + QueryPerformanceFrequency(&freq); + obj->freq = 10000000.0 / freq.QuadPart; + + *clock = &obj->IReferenceClock_iface; + + return S_OK; +} + static inline IDirectMusic8Impl *impl_from_IDirectMusic8(IDirectMusic8 *iface) { return CONTAINING_RECORD(iface, IDirectMusic8Impl, IDirectMusic8_iface); @@ -483,7 +606,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicImpl(LPCGUID riid, LPVOID* ret_iface, LPU dmusic->IDirectMusic8_iface.lpVtbl = &DirectMusic8_Vtbl; dmusic->ref = 1; - ret = DMUSIC_CreateReferenceClockImpl(&IID_IReferenceClock, (void **)&dmusic->master_clock, NULL); + ret = master_clock_create(&dmusic->master_clock); if (FAILED(ret)) { HeapFree(GetProcessHeap(), 0, dmusic); return ret; diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index d071e1c..f6c417a 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -801,26 +801,26 @@ static void test_master_clock(void) hr = IReferenceClock_GetTime(clock, &time1); ok(hr == S_OK, "Got hr %#x.\n", hr); time2 = counter.QuadPart * 10000000.0 / freq.QuadPart; - todo_wine ok(abs(time1 - time2) < 20 * 10000, "Expected about %s, got %s.\n", + ok(abs(time1 - time2) < 20 * 10000, "Expected about %s, got %s.\n", wine_dbgstr_longlong(time2), wine_dbgstr_longlong(time1)); hr = IReferenceClock_GetTime(clock, &time2); - todo_wine ok(hr == (time2 == time1 ? S_FALSE : S_OK), "Got hr %#x.\n", hr); + ok(hr == (time2 == time1 ? S_FALSE : S_OK), "Got hr %#x.\n", hr); Sleep(100); hr = IReferenceClock_GetTime(clock, &time2); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(time2 - time1 > 80 * 10000, "Expected about %s, but got %s.\n", + ok(time2 - time1 > 80 * 10000, "Expected about %s, but got %s.\n", wine_dbgstr_longlong(time1 + 100 * 10000), wine_dbgstr_longlong(time2)); hr = IReferenceClock_AdviseTime(clock, 0, 0, NULL, &cookie); - todo_wine ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); hr = IReferenceClock_AdvisePeriodic(clock, 0, 0, NULL, &cookie); - todo_wine ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); hr = IReferenceClock_Unadvise(clock, 0); - todo_wine ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); IReferenceClock_Release(clock);

1 0

Alexandre Julliard : npptools: Build with msvcrt.
by Alexandre Julliard June 17, 2019

June 17, 2019

Module: wine Branch: master Commit: 2cad63d7ce4653f088fce6023491186aa8cc7d35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2cad63d7ce4653f088fce602… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 17 09:25:59 2019 +0200 npptools: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/npptools/Makefile.in | 2 ++ dlls/npptools/main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/npptools/Makefile.in b/dlls/npptools/Makefile.in index a9bbd35..64ff969 100644 --- a/dlls/npptools/Makefile.in +++ b/dlls/npptools/Makefile.in @@ -1,4 +1,6 @@ MODULE = npptools.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/npptools/main.c b/dlls/npptools/main.c index a72f634..ad2b893 100644 --- a/dlls/npptools/main.c +++ b/dlls/npptools/main.c @@ -16,7 +16,6 @@ * 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>

1 0

Alexandre Julliard : npmshtml: Build with msvcrt.
by Alexandre Julliard June 17, 2019

June 17, 2019

Module: wine Branch: master Commit: adc203e56338e5479ba51b6658367bcf34e55c61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=adc203e56338e5479ba51b66… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 17 09:25:50 2019 +0200 npmshtml: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/npmshtml/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/npmshtml/Makefile.in b/dlls/npmshtml/Makefile.in index aaaad83..61e057c 100644 --- a/dlls/npmshtml/Makefile.in +++ b/dlls/npmshtml/Makefile.in @@ -1,5 +1,7 @@ MODULE = npmshtml.dll IMPORTS = mshtml +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = main.c RC_SRCS = rsrc.rc

1 0

Zebediah Figura : strmbase/transform: Share pin and filter reference counts.
by Alexandre Julliard June 17, 2019

June 17, 2019

Module: wine Branch: master Commit: 7f3d463b4578a33a983fbc693c7f429f608f0a09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f3d463b4578a33a983fbc69… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 16 19:35:03 2019 -0500 strmbase/transform: Share pin and filter reference counts. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/acmwrapper.c | 10 +++------- dlls/quartz/tests/avidec.c | 10 +++------- dlls/strmbase/transform.c | 36 ++++++++++++++++++++++++++++++------ 3 files changed, 36 insertions(+), 20 deletions(-) diff --git a/dlls/quartz/tests/acmwrapper.c b/dlls/quartz/tests/acmwrapper.c index 1c41872..1f07e50 100644 --- a/dlls/quartz/tests/acmwrapper.c +++ b/dlls/quartz/tests/acmwrapper.c @@ -229,10 +229,8 @@ static void test_enum_pins(void) hr = IEnumPins_Next(enum1, 1, pins, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); ref = get_refcount(filter); -todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pins[0]); -todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(enum1); ok(ref == 1, "Got unexpected refcount %d.\n", ref); @@ -243,10 +241,8 @@ todo_wine hr = IEnumPins_Next(enum1, 1, pins, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); ref = get_refcount(filter); -todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pins[0]); -todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(enum1); ok(ref == 1, "Got unexpected refcount %d.\n", ref); @@ -383,7 +379,7 @@ static void test_pin_info(void) hr = IBaseFilter_FindPin(filter, sink_id, &pin); ok(hr == S_OK, "Got hr %#x.\n", hr); ref = get_refcount(filter); - todo_wine ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pin); ok(ref == 2, "Got unexpected refcount %d.\n", ref); @@ -394,9 +390,9 @@ static void test_pin_info(void) todo_wine ok(!lstrcmpW(info.achName, sink_name), "Got name %s.\n", wine_dbgstr_w(info.achName)); ref = get_refcount(filter); - todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pin); - todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); IBaseFilter_Release(info.pFilter); hr = IPin_QueryDirection(pin, &dir); diff --git a/dlls/quartz/tests/avidec.c b/dlls/quartz/tests/avidec.c index 0183e0b..3f92876 100644 --- a/dlls/quartz/tests/avidec.c +++ b/dlls/quartz/tests/avidec.c @@ -254,10 +254,8 @@ static void test_enum_pins(void) hr = IEnumPins_Next(enum1, 1, pins, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); ref = get_refcount(filter); -todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pins[0]); -todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(enum1); ok(ref == 1, "Got unexpected refcount %d.\n", ref); @@ -268,10 +266,8 @@ todo_wine hr = IEnumPins_Next(enum1, 1, pins, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); ref = get_refcount(filter); -todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pins[0]); -todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(enum1); ok(ref == 1, "Got unexpected refcount %d.\n", ref); @@ -408,7 +404,7 @@ static void test_pin_info(void) hr = IBaseFilter_FindPin(filter, sink_id, &pin); ok(hr == S_OK, "Got hr %#x.\n", hr); ref = get_refcount(filter); - todo_wine ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pin); ok(ref == 2, "Got unexpected refcount %d.\n", ref); @@ -418,9 +414,9 @@ static void test_pin_info(void) ok(info.dir == PINDIR_INPUT, "Got direction %d.\n", info.dir); todo_wine ok(!lstrcmpW(info.achName, sink_name), "Got name %s.\n", wine_dbgstr_w(info.achName)); ref = get_refcount(filter); - todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pin); - todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); IBaseFilter_Release(info.pFilter); hr = IPin_QueryDirection(pin, &dir); diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index fe54ebe..4c32d67 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -153,9 +153,11 @@ static void transform_destroy(BaseFilter *iface) IPin_Release(peer); } IPin_Disconnect(filter->ppPins[i]); - IPin_Release(filter->ppPins[i]); } + BaseInputPin_Destroy(impl_BaseInputPin_from_IPin(filter->ppPins[0])); + BaseOutputPin_Destroy(impl_BaseOutputPin_from_IPin(filter->ppPins[1])); + CoTaskMemFree(filter->ppPins); filter->csReceive.DebugInfo->Spare[0] = 0; @@ -379,7 +381,17 @@ HRESULT WINAPI TransformFilterImpl_Notify(TransformFilter *iface, IBaseFilter *s return QualityControlImpl_Notify((IQualityControl*)iface->qcimpl, sender, qm); } -/** IBaseFilter implementation **/ +static ULONG WINAPI TransformFilter_InputPin_AddRef(IPin *iface) +{ + BaseInputPin *pin = impl_BaseInputPin_from_IPin(iface); + return IBaseFilter_AddRef(pin->pin.pinInfo.pFilter); +} + +static ULONG WINAPI TransformFilter_InputPin_Release(IPin *iface) +{ + BaseInputPin *pin = impl_BaseInputPin_from_IPin(iface); + return IBaseFilter_Release(pin->pin.pinInfo.pFilter); +} static HRESULT WINAPI TransformFilter_InputPin_EndOfStream(IPin * iface) { @@ -504,8 +516,8 @@ static HRESULT WINAPI TransformFilter_InputPin_NewSegment(IPin * iface, REFERENC static const IPinVtbl TransformFilter_InputPin_Vtbl = { BaseInputPinImpl_QueryInterface, - BasePinImpl_AddRef, - BaseInputPinImpl_Release, + TransformFilter_InputPin_AddRef, + TransformFilter_InputPin_Release, BaseInputPinImpl_Connect, TransformFilter_InputPin_ReceiveConnection, TransformFilter_InputPin_Disconnect, @@ -543,11 +555,23 @@ static HRESULT WINAPI transform_source_QueryInterface(IPin *iface, REFIID iid, v return S_OK; } +static ULONG WINAPI transform_source_AddRef(IPin *iface) +{ + BaseOutputPin *pin = impl_BaseOutputPin_from_IPin(iface); + return IBaseFilter_AddRef(pin->pin.pinInfo.pFilter); +} + +static ULONG WINAPI transform_source_Release(IPin *iface) +{ + BaseOutputPin *pin = impl_BaseOutputPin_from_IPin(iface); + return IBaseFilter_Release(pin->pin.pinInfo.pFilter); +} + static const IPinVtbl TransformFilter_OutputPin_Vtbl = { transform_source_QueryInterface, - BasePinImpl_AddRef, - BaseOutputPinImpl_Release, + transform_source_AddRef, + transform_source_Release, BaseOutputPinImpl_Connect, BaseOutputPinImpl_ReceiveConnection, BaseOutputPinImpl_Disconnect,

1 0

Zebediah Figura : quartz/parser: Share source pin and filter reference counts.
by Alexandre Julliard June 17, 2019

June 17, 2019

Module: wine Branch: master Commit: 08473519e97cd18e94488d2ccf762e89b580b69e URL: https://source.winehq.org/git/wine.git/?a=commit;h=08473519e97cd18e94488d2c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 16 19:35:02 2019 -0500 quartz/parser: Share source pin and filter reference counts. Uniquely, native quartz doesn't do this. But it doesn't make much sense to follow native quartz in this case, and it leads to simpler code on our part. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/parser.c | 49 +++++++++++++++++++------------------------------ 1 file changed, 19 insertions(+), 30 deletions(-) diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index 7e705cc..5743a53 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -383,26 +383,27 @@ HRESULT Parser_AddPin(ParserImpl * This, const PIN_INFO * piOutput, ALLOCATOR_PR return hr; } -static HRESULT WINAPI break_connection(IPin *iface) +static void free_source_pin(IPin *iface) { Parser_OutputPin *pin = unsafe_impl_Parser_OutputPin_from_IPin(iface); - HRESULT hr; - if (!pin->pin.pin.pConnectedTo || !pin->pin.pMemInputPin) - hr = VFW_E_NOT_CONNECTED; - else + if (pin->pin.pin.pConnectedTo) { - hr = IPin_Disconnect(pin->pin.pin.pConnectedTo); + IPin_Disconnect(pin->pin.pin.pConnectedTo); IPin_Disconnect(iface); } - return hr; + FreeMediaType(pin->pmt); + CoTaskMemFree(pin->pmt); + FreeMediaType(&pin->pin.pin.mtCurrent); + if (pin->pin.pAllocator) + IMemAllocator_Release(pin->pin.pAllocator); + CoTaskMemFree(pin); } static HRESULT Parser_RemoveOutputPins(ParserImpl * This) { /* NOTE: should be in critical section when calling this function */ - HRESULT hr; ULONG i; IPin ** ppOldPins = This->ppPins; @@ -413,11 +414,7 @@ static HRESULT Parser_RemoveOutputPins(ParserImpl * This) memcpy(This->ppPins, ppOldPins, sizeof(IPin *) * 1); for (i = 0; i < This->cStreams; i++) - { - hr = break_connection(ppOldPins[i + 1]); - TRACE("Disconnect: %08x\n", hr); - IPin_Release(ppOldPins[i + 1]); - } + free_source_pin(ppOldPins[i + 1]); BaseFilterImpl_IncrementPinVersion(&This->filter); This->cStreams = 0; @@ -567,24 +564,16 @@ static HRESULT WINAPI Parser_OutputPin_QueryInterface(IPin * iface, REFIID riid, return E_NOINTERFACE; } -static ULONG WINAPI Parser_OutputPin_Release(IPin * iface) +static ULONG WINAPI Parser_OutputPin_AddRef(IPin *iface) { - Parser_OutputPin *This = unsafe_impl_Parser_OutputPin_from_IPin(iface); - ULONG refCount = InterlockedDecrement(&This->pin.pin.refCount); - - TRACE("(%p)->() Release from %d\n", iface, refCount + 1); + Parser_OutputPin *pin = unsafe_impl_Parser_OutputPin_from_IPin(iface); + return IBaseFilter_AddRef(pin->pin.pin.pinInfo.pFilter); +} - if (!refCount) - { - FreeMediaType(This->pmt); - CoTaskMemFree(This->pmt); - FreeMediaType(&This->pin.pin.mtCurrent); - if (This->pin.pAllocator) - IMemAllocator_Release(This->pin.pAllocator); - CoTaskMemFree(This); - return 0; - } - return refCount; +static ULONG WINAPI Parser_OutputPin_Release(IPin * iface) +{ + Parser_OutputPin *pin = unsafe_impl_Parser_OutputPin_from_IPin(iface); + return IBaseFilter_Release(pin->pin.pin.pinInfo.pFilter); } static HRESULT WINAPI Parser_OutputPin_Connect(IPin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt) @@ -612,7 +601,7 @@ static HRESULT WINAPI Parser_OutputPin_CheckMediaType(BasePin *pin, const AM_MED static const IPinVtbl Parser_OutputPin_Vtbl = { Parser_OutputPin_QueryInterface, - BasePinImpl_AddRef, + Parser_OutputPin_AddRef, Parser_OutputPin_Release, Parser_OutputPin_Connect, BaseOutputPinImpl_ReceiveConnection,

1 0

Zebediah Figura : quartz/parser: Share sink pin and filter reference counts.
by Alexandre Julliard June 17, 2019

June 17, 2019

Module: wine Branch: master Commit: 5b612c3045f767a32488d7e151eca18b5bee7516 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b612c3045f767a32488d7e1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 16 19:35:01 2019 -0500 quartz/parser: Share sink pin and filter reference counts. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/parser.c | 13 ++---------- dlls/quartz/pin.c | 48 ++++++++++++++++++++++-------------------- dlls/quartz/pin.h | 4 +++- dlls/quartz/tests/avisplit.c | 3 --- dlls/quartz/tests/mpegsplit.c | 4 +--- dlls/quartz/tests/waveparser.c | 3 --- 6 files changed, 31 insertions(+), 44 deletions(-) diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index 2666eb7..7e705cc 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -155,7 +155,6 @@ ULONG WINAPI Parser_AddRef(IBaseFilter * iface) void Parser_Destroy(ParserImpl *This) { IPin *connected = NULL; - ULONG pinref; HRESULT hr; PullPin_WaitForStateChange(This->pInputPin, INFINITE); @@ -170,16 +169,8 @@ void Parser_Destroy(ParserImpl *This) hr = IPin_Disconnect(&This->pInputPin->pin.IPin_iface); assert(hr == S_OK); } - pinref = IPin_Release(&This->pInputPin->pin.IPin_iface); - if (pinref) - { - /* Valgrind could find this, if I kill it here */ - ERR("pinref should be null, is %u, destroying anyway\n", pinref); - assert((LONG)pinref > 0); - while (pinref) - pinref = IPin_Release(&This->pInputPin->pin.IPin_iface); - } + PullPin_destroy(This->pInputPin); CoTaskMemFree(This->ppPins); strmbase_filter_cleanup(&This->filter); @@ -734,7 +725,7 @@ static HRESULT WINAPI Parser_PullPin_EnumMediaTypes(IPin *iface, IEnumMediaTypes static const IPinVtbl Parser_InputPin_Vtbl = { Parser_PullPin_QueryInterface, - BasePinImpl_AddRef, + PullPin_AddRef, PullPin_Release, BaseInputPinImpl_Connect, Parser_PullPin_ReceiveConnection, diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index a3674f2..5c1fcdc 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -364,32 +364,34 @@ HRESULT WINAPI PullPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv) return E_NOINTERFACE; } -ULONG WINAPI PullPin_Release(IPin *iface) +void PullPin_destroy(PullPin *pin) { - PullPin *This = impl_PullPin_from_IPin(iface); - ULONG refCount = InterlockedDecrement(&This->pin.refCount); - - TRACE("(%p)->() Release from %d\n", This, refCount + 1); + WaitForSingleObject(pin->hEventStateChanged, INFINITE); + assert(!pin->hThread); + + if (pin->prefAlloc) + IMemAllocator_Release(pin->prefAlloc); + if (pin->pAlloc) + IMemAllocator_Release(pin->pAlloc); + if (pin->pReader) + IAsyncReader_Release(pin->pReader); + CloseHandle(pin->thread_sleepy); + CloseHandle(pin->hEventStateChanged); + pin->thread_lock.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&pin->thread_lock); + CoTaskMemFree(pin); +} - if (!refCount) - { - WaitForSingleObject(This->hEventStateChanged, INFINITE); - assert(!This->hThread); +ULONG WINAPI PullPin_AddRef(IPin *iface) +{ + PullPin *pin = impl_PullPin_from_IPin(iface); + return IBaseFilter_AddRef(pin->pin.pinInfo.pFilter); +} - if(This->prefAlloc) - IMemAllocator_Release(This->prefAlloc); - if(This->pAlloc) - IMemAllocator_Release(This->pAlloc); - if(This->pReader) - IAsyncReader_Release(This->pReader); - CloseHandle(This->thread_sleepy); - CloseHandle(This->hEventStateChanged); - This->thread_lock.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&This->thread_lock); - CoTaskMemFree(This); - return 0; - } - return refCount; +ULONG WINAPI PullPin_Release(IPin *iface) +{ + PullPin *pin = impl_PullPin_from_IPin(iface); + return IBaseFilter_Release(pin->pin.pinInfo.pFilter); } static void PullPin_Flush(PullPin *This) diff --git a/dlls/quartz/pin.h b/dlls/quartz/pin.h index 2f29c92..b65d223 100644 --- a/dlls/quartz/pin.h +++ b/dlls/quartz/pin.h @@ -106,6 +106,7 @@ HRESULT PullPin_Construct(const IPinVtbl *PullPin_Vtbl, const PIN_INFO * pPinInf SAMPLEPROC_PULL pSampleProc, LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, CLEANUPPROC pCleanUp, REQUESTPROC pCustomRequest, STOPPROCESSPROC pDone, LPCRITICAL_SECTION pCritSec, IPin ** ppPin); +void PullPin_destroy(PullPin *pin) DECLSPEC_HIDDEN; /**************************/ /*** Pin Implementation ***/ @@ -114,7 +115,8 @@ HRESULT PullPin_Construct(const IPinVtbl *PullPin_Vtbl, const PIN_INFO * pPinInf HRESULT WINAPI PullPin_ReceiveConnection(IPin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt); HRESULT WINAPI PullPin_Disconnect(IPin * iface); HRESULT WINAPI PullPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv); -ULONG WINAPI PullPin_Release(IPin * iface); +ULONG WINAPI PullPin_AddRef(IPin *iface) DECLSPEC_HIDDEN; +ULONG WINAPI PullPin_Release(IPin *iface) DECLSPEC_HIDDEN; HRESULT WINAPI PullPin_EndOfStream(IPin * iface); HRESULT WINAPI PullPin_QueryAccept(IPin * iface, const AM_MEDIA_TYPE * pmt); HRESULT WINAPI PullPin_BeginFlush(IPin * iface); diff --git a/dlls/quartz/tests/avisplit.c b/dlls/quartz/tests/avisplit.c index 59edb38..fb42783 100644 --- a/dlls/quartz/tests/avisplit.c +++ b/dlls/quartz/tests/avisplit.c @@ -296,10 +296,8 @@ static void test_enum_pins(void) hr = IEnumPins_Next(enum1, 1, pins, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); ref = get_refcount(filter); -todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pins[0]); -todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(enum1); ok(ref == 1, "Got unexpected refcount %d.\n", ref); @@ -487,7 +485,6 @@ static void test_pin_info(void) ref = get_refcount(filter); ok(ref == expect_ref + 1, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pin); -todo_wine ok(ref == expect_ref + 1, "Got unexpected refcount %d.\n", ref); IBaseFilter_Release(info.pFilter); diff --git a/dlls/quartz/tests/mpegsplit.c b/dlls/quartz/tests/mpegsplit.c index c82c5b6..9853a19 100644 --- a/dlls/quartz/tests/mpegsplit.c +++ b/dlls/quartz/tests/mpegsplit.c @@ -293,10 +293,8 @@ static void test_enum_pins(void) hr = IEnumPins_Next(enum1, 1, pins, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); ref = get_refcount(filter); -todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pins[0]); -todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(enum1); ok(ref == 1, "Got unexpected refcount %d.\n", ref); @@ -480,7 +478,7 @@ static void test_pin_info(void) ref = get_refcount(filter); ok(ref == expect_ref + 1, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pin); - todo_wine ok(ref == expect_ref + 1, "Got unexpected refcount %d.\n", ref); + ok(ref == expect_ref + 1, "Got unexpected refcount %d.\n", ref); IBaseFilter_Release(info.pFilter); hr = IPin_QueryDirection(pin, &dir); diff --git a/dlls/quartz/tests/waveparser.c b/dlls/quartz/tests/waveparser.c index fd65099..84288c4 100644 --- a/dlls/quartz/tests/waveparser.c +++ b/dlls/quartz/tests/waveparser.c @@ -293,10 +293,8 @@ static void test_enum_pins(void) hr = IEnumPins_Next(enum1, 1, pins, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); ref = get_refcount(filter); -todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pins[0]); -todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(enum1); ok(ref == 1, "Got unexpected refcount %d.\n", ref); @@ -480,7 +478,6 @@ static void test_pin_info(void) ref = get_refcount(filter); ok(ref == expect_ref + 1, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pin); -todo_wine ok(ref == expect_ref + 1, "Got unexpected refcount %d.\n", ref); IBaseFilter_Release(info.pFilter);

1 0

Zebediah Figura : quartz/filesource: Share pin and filter reference counts.
by Alexandre Julliard June 17, 2019

June 17, 2019

Module: wine Branch: master Commit: 5f08add0b32eb4d2386ce170f2dd3f3c98ff0ac0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f08add0b32eb4d2386ce170… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 16 19:35:00 2019 -0500 quartz/filesource: Share pin and filter reference counts. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filesource.c | 112 ++++++++++++++++++++--------------------- dlls/quartz/tests/filesource.c | 6 --- 2 files changed, 55 insertions(+), 63 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 34601da..25bffe6 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -50,6 +50,37 @@ static const AM_MEDIA_TYPE default_mt = NULL }; +typedef struct DATAREQUEST +{ + IMediaSample *pSample; + DWORD_PTR dwUserData; + OVERLAPPED ovl; +} DATAREQUEST; + +typedef struct FileAsyncReader +{ + BaseOutputPin pin; + IAsyncReader IAsyncReader_iface; + + ALLOCATOR_PROPERTIES allocProps; + HANDLE hFile; + BOOL bFlushing; + /* Why would you need more? Every sample has its own handle */ + LONG queued_number; + LONG samples; + LONG oldest_sample; + CRITICAL_SECTION csList; + DATAREQUEST *sample_list; + + /* Have a handle for every sample, and then one more as flushing handle */ + HANDLE *handle_list; +} FileAsyncReader; + +static inline FileAsyncReader *impl_from_IPin(IPin *iface) +{ + return CONTAINING_RECORD(iface, FileAsyncReader, pin.pin.IPin_iface); +} + typedef struct AsyncReader { BaseFilter filter; @@ -407,14 +438,28 @@ static void async_reader_destroy(BaseFilter *iface) if (filter->pOutputPin) { + FileAsyncReader *pin = impl_from_IPin(filter->pOutputPin); + unsigned int i; IPin *peer; + if (SUCCEEDED(IPin_ConnectedTo(filter->pOutputPin, &peer))) { IPin_Disconnect(peer); IPin_Release(peer); } IPin_Disconnect(filter->pOutputPin); - IPin_Release(filter->pOutputPin); + + CoTaskMemFree(pin->sample_list); + if (pin->handle_list) + { + for (i = 0; i <= pin->samples; ++i) + CloseHandle(pin->handle_list[i]); + CoTaskMemFree(pin->handle_list); + } + CloseHandle(pin->hFile); + pin->csList.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&pin->csList); + BaseOutputPin_Destroy(&pin->pin); } CoTaskMemFree(filter->pszFileName); if (filter->pmt) @@ -658,39 +703,6 @@ static const IFileSourceFilterVtbl FileSource_Vtbl = FileSource_GetCurFile }; - -/* the dwUserData passed back to user */ -typedef struct DATAREQUEST -{ - IMediaSample * pSample; /* sample passed to us by user */ - DWORD_PTR dwUserData; /* user data passed to us */ - OVERLAPPED ovl; /* our overlapped structure */ -} DATAREQUEST; - -typedef struct FileAsyncReader -{ - BaseOutputPin pin; - IAsyncReader IAsyncReader_iface; - - ALLOCATOR_PROPERTIES allocProps; - HANDLE hFile; - BOOL bFlushing; - /* Why would you need more? Every sample has its own handle */ - LONG queued_number; - LONG samples; - LONG oldest_sample; - CRITICAL_SECTION csList; /* critical section to prevent concurrency issues */ - DATAREQUEST *sample_list; - - /* Have a handle for every sample, and then one more as flushing handle */ - HANDLE *handle_list; -} FileAsyncReader; - -static inline FileAsyncReader *impl_from_IPin(IPin *iface) -{ - return CONTAINING_RECORD(iface, FileAsyncReader, pin.pin.IPin_iface); -} - static inline FileAsyncReader *impl_from_BasePin(BasePin *iface) { return CONTAINING_RECORD(iface, FileAsyncReader, pin.pin); @@ -765,36 +777,22 @@ static HRESULT WINAPI FileAsyncReaderPin_QueryInterface(IPin * iface, REFIID rii return E_NOINTERFACE; } -static ULONG WINAPI FileAsyncReaderPin_Release(IPin * iface) +static ULONG WINAPI FileAsyncReaderPin_AddRef(IPin *iface) { - FileAsyncReader *This = impl_from_IPin(iface); - ULONG refCount = InterlockedDecrement(&This->pin.pin.refCount); - int x; - - TRACE("(%p)->() Release from %d\n", This, refCount + 1); + FileAsyncReader *pin = impl_from_IPin(iface); + return IBaseFilter_AddRef(pin->pin.pin.pinInfo.pFilter); +} - if (!refCount) - { - CoTaskMemFree(This->sample_list); - if (This->handle_list) - { - for (x = 0; x <= This->samples; ++x) - CloseHandle(This->handle_list[x]); - CoTaskMemFree(This->handle_list); - } - CloseHandle(This->hFile); - This->csList.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&This->csList); - BaseOutputPin_Destroy(&This->pin); - return 0; - } - return refCount; +static ULONG WINAPI FileAsyncReaderPin_Release(IPin * iface) +{ + FileAsyncReader *pin = impl_from_IPin(iface); + return IBaseFilter_Release(pin->pin.pin.pinInfo.pFilter); } static const IPinVtbl FileAsyncReaderPin_Vtbl = { FileAsyncReaderPin_QueryInterface, - BasePinImpl_AddRef, + FileAsyncReaderPin_AddRef, FileAsyncReaderPin_Release, BaseOutputPinImpl_Connect, BaseOutputPinImpl_ReceiveConnection, diff --git a/dlls/quartz/tests/filesource.c b/dlls/quartz/tests/filesource.c index 0bac51d..b1a8399 100644 --- a/dlls/quartz/tests/filesource.c +++ b/dlls/quartz/tests/filesource.c @@ -539,10 +539,8 @@ todo_wine hr = IEnumPins_Next(enum1, 1, pins, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); ref = get_refcount(filter); -todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pins[0]); -todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(enum1); ok(ref == 1, "Got unexpected refcount %d.\n", ref); @@ -624,7 +622,6 @@ static void test_find_pin(void) hr = IBaseFilter_FindPin(filter, source_id, &pin); ok(hr == S_OK, "Got hr %#x.\n", hr); ref = get_refcount(filter); -todo_wine ok(ref == 2, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pin); ok(ref == 2, "Got unexpected refcount %d.\n", ref); @@ -662,7 +659,6 @@ static void test_pin_info(void) hr = IBaseFilter_FindPin(filter, source_id, &pin); ok(hr == S_OK, "Got hr %#x.\n", hr); ref = get_refcount(filter); -todo_wine ok(ref == 2, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pin); ok(ref == 2, "Got unexpected refcount %d.\n", ref); @@ -673,10 +669,8 @@ todo_wine ok(info.dir == PINDIR_OUTPUT, "Got direction %d.\n", info.dir); ok(!lstrcmpW(info.achName, source_id), "Got name %s.\n", wine_dbgstr_w(info.achName)); ref = get_refcount(filter); -todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pin); -todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); IBaseFilter_Release(info.pFilter);

1 0

Zebediah Figura : dmusic/tests: Add some tests for the master clock.
by Alexandre Julliard June 17, 2019

June 17, 2019

Module: wine Branch: master Commit: 78901fead47982a58d7571368cfd1ca0f359294d URL: https://source.winehq.org/git/wine.git/?a=commit;h=78901fead47982a58d757136… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 14 11:42:43 2019 -0500 dmusic/tests: Add some tests for the master clock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/tests/dmusic.c | 123 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 101 insertions(+), 22 deletions(-) diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index a4fbd4a..d071e1c 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -38,20 +38,10 @@ static void test_dmusic(void) DMUS_PORTCAPS port_caps; DMUS_PORTPARAMS port_params; IDirectMusicPort *port = NULL; - DMUS_CLOCKINFO clock_info; - GUID guid_clock; - IReferenceClock *clock = NULL; hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic, (LPVOID*)&dmusic); ok(hr == S_OK, "Cannot create DirectMusic object (%x)\n", hr); - hr = IDirectMusic_GetMasterClock(dmusic, &guid_clock, &clock); - ok(hr == S_OK, "IDirectMusic_GetMasterClock returned: %x\n", hr); - ok(clock != NULL, "No clock returned\n"); - trace(" guidPort = %s\n", wine_dbgstr_guid(&guid_clock)); - if (clock) - IReferenceClock_Release(clock); - port_params.dwSize = sizeof(port_params); port_params.dwValidParams = DMUS_PORTPARAMS_CHANNELGROUPS | DMUS_PORTPARAMS_AUDIOCHANNELS; port_params.dwChannelGroups = 1; @@ -96,18 +86,6 @@ static void test_dmusic(void) index++; } - index = 0; - clock_info.dwSize = sizeof(clock_info); - while (IDirectMusic_EnumMasterClock(dmusic, index, &clock_info) == S_OK) - { - ok(clock_info.dwSize == sizeof(clock_info), "DMUS_CLOCKINFO dwSize member is wrong (%u)\n", clock_info.dwSize); - trace("Clock %u:\n", index); - trace(" ctType = %u\n", clock_info.ctType); - trace(" guidClock = %s\n", wine_dbgstr_guid(&clock_info.guidClock)); - trace(" wszDescription = %s\n", wine_dbgstr_w(clock_info.wszDescription)); - index++; - } - if (port) IDirectMusicPort_Release(port); IDirectMusic_Release(dmusic); @@ -776,6 +754,106 @@ static void test_parsedescriptor(void) IDirectMusicObject_Release(dmo); } +static void test_master_clock(void) +{ + static const GUID guid_system_clock = {0x58d58419, 0x71b4, 0x11d1, {0xa7, 0x4c, 0x00, 0x00, 0xf8, 0x75, 0xac, 0x12}}; + static const GUID guid_dsound_clock = {0x58d58420, 0x71b4, 0x11d1, {0xa7, 0x4c, 0x00, 0x00, 0xf8, 0x75, 0xac, 0x12}}; + IReferenceClock *clock, *clock2; + REFERENCE_TIME time1, time2; + LARGE_INTEGER counter, freq; + DMUS_CLOCKINFO clock_info; + IDirectMusic *dmusic; + DWORD cookie; + HRESULT hr; + ULONG ref; + GUID guid; + + hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic, (void **)&dmusic); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectMusic_GetMasterClock(dmusic, NULL, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + memset(&guid, 0xcc, sizeof(guid)); + hr = IDirectMusic_GetMasterClock(dmusic, &guid, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(IsEqualGUID(&guid, &guid_system_clock), "Got guid %s.\n", wine_dbgstr_guid(&guid)); + + clock = (IReferenceClock *)0xdeadbeef; + hr = IDirectMusic_GetMasterClock(dmusic, NULL, &clock); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(clock && clock != (IReferenceClock *)0xdeadbeef, "Got clock %p.\n", clock); + + hr = IDirectMusic_GetMasterClock(dmusic, NULL, &clock2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(clock2 == clock, "Clocks didn't match.\n"); + IReferenceClock_Release(clock2); + + memset(&guid, 0xcc, sizeof(guid)); + hr = IDirectMusic_GetMasterClock(dmusic, &guid, &clock2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(IsEqualGUID(&guid, &guid_system_clock), "Got guid %s.\n", wine_dbgstr_guid(&guid)); + ok(clock2 == clock, "Clocks didn't match.\n"); + IReferenceClock_Release(clock2); + + QueryPerformanceFrequency(&freq); + QueryPerformanceCounter(&counter); + hr = IReferenceClock_GetTime(clock, &time1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + time2 = counter.QuadPart * 10000000.0 / freq.QuadPart; + todo_wine ok(abs(time1 - time2) < 20 * 10000, "Expected about %s, got %s.\n", + wine_dbgstr_longlong(time2), wine_dbgstr_longlong(time1)); + + hr = IReferenceClock_GetTime(clock, &time2); + todo_wine ok(hr == (time2 == time1 ? S_FALSE : S_OK), "Got hr %#x.\n", hr); + + Sleep(100); + hr = IReferenceClock_GetTime(clock, &time2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(time2 - time1 > 80 * 10000, "Expected about %s, but got %s.\n", + wine_dbgstr_longlong(time1 + 100 * 10000), wine_dbgstr_longlong(time2)); + + hr = IReferenceClock_AdviseTime(clock, 0, 0, NULL, &cookie); + todo_wine ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + hr = IReferenceClock_AdvisePeriodic(clock, 0, 0, NULL, &cookie); + todo_wine ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + hr = IReferenceClock_Unadvise(clock, 0); + todo_wine ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + IReferenceClock_Release(clock); + + hr = IDirectMusic_EnumMasterClock(dmusic, 0, NULL); + todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + memset(&clock_info, 0xcc, sizeof(DMUS_CLOCKINFO)); + clock_info.dwSize = sizeof(DMUS_CLOCKINFO7); + hr = IDirectMusic_EnumMasterClock(dmusic, 0, &clock_info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(clock_info.ctType == DMUS_CLOCK_SYSTEM, "Got type %#x.\n", clock_info.ctType); + ok(IsEqualGUID(&clock_info.guidClock, &guid_system_clock), "Got guid %s.\n", + wine_dbgstr_guid(&clock_info.guidClock)); + ok(clock_info.dwFlags == 0xcccccccc, "Got flags %#x.\n", clock_info.dwFlags); + + memset(&clock_info, 0xcc, sizeof(DMUS_CLOCKINFO)); + clock_info.dwSize = sizeof(DMUS_CLOCKINFO7); + hr = IDirectMusic_EnumMasterClock(dmusic, 1, &clock_info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(clock_info.ctType == DMUS_CLOCK_SYSTEM, "Got type %#x.\n", clock_info.ctType); + ok(IsEqualGUID(&clock_info.guidClock, &guid_dsound_clock), "Got guid %s.\n", + wine_dbgstr_guid(&clock_info.guidClock)); + ok(clock_info.dwFlags == 0xcccccccc, "Got flags %#x.\n", clock_info.dwFlags); + + memset(&clock_info, 0xcc, sizeof(DMUS_CLOCKINFO)); + clock_info.dwSize = sizeof(DMUS_CLOCKINFO7); + hr = IDirectMusic_EnumMasterClock(dmusic, 2, &clock_info); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + ref = IDirectMusic_Release(dmusic); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(dmusic) { CoInitializeEx(NULL, COINIT_MULTITHREADED); @@ -794,6 +872,7 @@ START_TEST(dmusic) test_dmbuffer(); test_dmcoll(); test_parsedescriptor(); + test_master_clock(); CoUninitialize(); }

1 0

Alexandre Julliard : ntoskrnl: Make the standard C functions available for importing.
by Alexandre Julliard June 17, 2019

June 17, 2019

Module: wine Branch: master Commit: 7cee5e2bdce49f9daedd0cb159828f334ebe4ec1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7cee5e2bdce49f9daedd0cb1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 17 09:25:06 2019 +0200 ntoskrnl: Make the standard C functions available for importing. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 170 ++++++++++++++++++------------------ dlls/ntoskrnl.exe/tests/driver.c | 37 ++------ 2 files changed, 92 insertions(+), 115 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7cee5e2bdce49f9daedd…

1 0

Alexandre Julliard : ntdsapi: Build with msvcrt.
by Alexandre Julliard June 17, 2019

June 17, 2019

Module: wine Branch: master Commit: 921e0457c5f2f692503a5b56d873bd21a609d3c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=921e0457c5f2f692503a5b56… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 17 09:26:13 2019 +0200 ntdsapi: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdsapi/Makefile.in | 2 ++ dlls/ntdsapi/ntdsapi.c | 27 +++++++++++++-------------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/ntdsapi/Makefile.in b/dlls/ntdsapi/Makefile.in index 4e82a1e..afe29a3 100644 --- a/dlls/ntdsapi/Makefile.in +++ b/dlls/ntdsapi/Makefile.in @@ -2,5 +2,7 @@ MODULE = ntdsapi.dll IMPORTLIB = ntdsapi IMPORTS = user32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ ntdsapi.c diff --git a/dlls/ntdsapi/ntdsapi.c b/dlls/ntdsapi/ntdsapi.c index 003b1a2..8966a67 100644 --- a/dlls/ntdsapi/ntdsapi.c +++ b/dlls/ntdsapi/ntdsapi.c @@ -24,7 +24,6 @@ #include "winuser.h" #include "ntdsapi.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(ntdsapi); @@ -83,11 +82,11 @@ DWORD WINAPI DsMakeSpnW(LPCWSTR svc_class, LPCWSTR svc_name, if (!svc_class || !svc_name) return ERROR_INVALID_PARAMETER; - new_spn_length = strlenW(svc_class) + 1 /* for '/' */ + 1 /* for terminating '\0' */; + new_spn_length = lstrlenW(svc_class) + 1 /* for '/' */ + 1 /* for terminating '\0' */; if (inst_name) - new_spn_length += strlenW(inst_name); + new_spn_length += lstrlenW(inst_name); else - new_spn_length += strlenW(svc_name); + new_spn_length += lstrlenW(svc_name); if (inst_port) { USHORT n = inst_port; @@ -99,7 +98,7 @@ DWORD WINAPI DsMakeSpnW(LPCWSTR svc_class, LPCWSTR svc_name, } while (n != 0); } if (inst_name) - new_spn_length += 1 /* for '/' */ + strlenW(svc_name); + new_spn_length += 1 /* for '/' */ + lstrlenW(svc_name); if (*spn_length < new_spn_length) { @@ -109,21 +108,21 @@ DWORD WINAPI DsMakeSpnW(LPCWSTR svc_class, LPCWSTR svc_name, *spn_length = new_spn_length; p = spn; - len = strlenW(svc_class); + len = lstrlenW(svc_class); memcpy(p, svc_class, len * sizeof(WCHAR)); p += len; *p = '/'; p++; if (inst_name) { - len = strlenW(inst_name); + len = lstrlenW(inst_name); memcpy(p, inst_name, len * sizeof(WCHAR)); p += len; *p = '\0'; } else { - len = strlenW(svc_name); + len = lstrlenW(svc_name); memcpy(p, svc_name, len * sizeof(WCHAR)); p += len; *p = '\0'; @@ -135,14 +134,14 @@ DWORD WINAPI DsMakeSpnW(LPCWSTR svc_class, LPCWSTR svc_name, *p = ':'; p++; wsprintfW(p, percentU, inst_port); - p += strlenW(p); + p += lstrlenW(p); } if (inst_name) { *p = '/'; p++; - len = strlenW(svc_name); + len = lstrlenW(svc_name); memcpy(p, svc_name, len * sizeof(WCHAR)); p += len; *p = '\0'; @@ -216,7 +215,7 @@ DWORD WINAPI DsClientMakeSpnForTargetServerW(LPCWSTR class, LPCWSTR name, DWORD if (!class || !name || !buflen) return ERROR_INVALID_PARAMETER; - len = strlenW(class) + 1 + strlenW(name) + 1; + len = lstrlenW(class) + 1 + lstrlenW(name) + 1; if (*buflen < len) { *buflen = len; @@ -224,10 +223,10 @@ DWORD WINAPI DsClientMakeSpnForTargetServerW(LPCWSTR class, LPCWSTR name, DWORD } *buflen = len; - memcpy(buf, class, strlenW(class) * sizeof(WCHAR)); - p = buf + strlenW(class); + memcpy(buf, class, lstrlenW(class) * sizeof(WCHAR)); + p = buf + lstrlenW(class); *p++ = '/'; - memcpy(p, name, strlenW(name) * sizeof(WCHAR)); + memcpy(p, name, lstrlenW(name) * sizeof(WCHAR)); buf[len - 1] = 0; return ERROR_SUCCESS;

1 0