November 2019 - Wine-commits

Zebediah Figura : wined3d: Pass the client stateblock state to wined3d stateblock methods.
by Alexandre Julliard 27 Nov '19

27 Nov '19

Module: wine Branch: master Commit: da6ea7ddc0a829dcdd9f3b0035b6353ae35b5166 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da6ea7ddc0a829dcdd9f3b00… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 26 22:58:26 2019 -0600 wined3d: Pass the client stateblock state to wined3d stateblock methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 10 +++++----- dlls/d3d9/device.c | 4 ++-- dlls/d3d9/stateblock.c | 6 +++--- dlls/ddraw/ddraw.c | 7 ++++--- dlls/ddraw/device.c | 8 ++++---- dlls/wined3d/stateblock.c | 32 +++++++++++++++++--------------- dlls/wined3d/wined3d.spec | 6 +++--- include/wine/wined3d.h | 8 +++++--- 8 files changed, 43 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=da6ea7ddc0a829dcdd9f…

1 0

Andrey Gusev : crypt32: Fix a typo in comment.
by Alexandre Julliard 27 Nov '19

27 Nov '19

Module: wine Branch: master Commit: a966ee7f4efcf825f5fc041586aaf23a71bc525b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a966ee7f4efcf825f5fc0415… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Nov 27 16:34:48 2019 +0200 crypt32: Fix a typo in comment. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/msg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index ea96248bd7..f591a5e72e 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -922,7 +922,7 @@ typedef struct _CSignedMsgData } CSignedMsgData; /* Constructs the signer handles for the signerIndex'th signer of msg_data. - * Assumes signerIndex is a valid idnex, and that msg_data's info has already + * Assumes signerIndex is a valid index, and that msg_data's info has already * been constructed. */ static BOOL CSignedMsgData_ConstructSignerHandles(CSignedMsgData *msg_data,

1 0

Zebediah Figura : qcap/avico: Call IMemInputPin::Receive() directly.
by Alexandre Julliard 27 Nov '19

27 Nov '19

Module: wine Branch: master Commit: b31cca343835348e7a5b46646d2ab1322925938d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b31cca343835348e7a5b4664… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 26 17:39:16 2019 -0600 qcap/avico: Call IMemInputPin::Receive() directly. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avico.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index 2e81a6b0c4..f0f60ae439 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -415,6 +415,7 @@ static HRESULT sink_query_interface(struct strmbase_pin *iface, REFIID iid, void static HRESULT WINAPI AVICompressorIn_Receive(struct strmbase_sink *base, IMediaSample *pSample) { AVICompressor *This = impl_from_strmbase_pin(&base->pin); + IMemInputPin *meminput = This->source.pMemInputPin; VIDEOINFOHEADER *src_videoinfo; REFERENCE_TIME start, stop; IMediaSample *out_sample; @@ -429,6 +430,12 @@ static HRESULT WINAPI AVICompressorIn_Receive(struct strmbase_sink *base, IMedia TRACE("(%p)->(%p)\n", base, pSample); + if (!meminput) + { + WARN("Source is not connected, returning VFW_E_NOT_CONNECTED.\n"); + return VFW_E_NOT_CONNECTED; + } + if(!This->hic) { FIXME("Driver not loaded\n"); return E_UNEXPECTED; @@ -490,7 +497,7 @@ static HRESULT WINAPI AVICompressorIn_Receive(struct strmbase_sink *base, IMedia else IMediaSample_SetMediaTime(out_sample, NULL, NULL); - hres = BaseOutputPinImpl_Deliver(&This->source, out_sample); + hres = IMemInputPin_Receive(meminput, out_sample); if(FAILED(hres)) WARN("Deliver failed: %08x\n", hres);

1 0

Zebediah Figura : qcap/smartteefilter: Call IMemInputPin::Receive() directly.
by Alexandre Julliard 27 Nov '19

27 Nov '19

Module: wine Branch: master Commit: 5aec70f6d0449e92d97b45eb5cd0c7271862665a URL: https://source.winehq.org/git/wine.git/?a=commit;h=5aec70f6d0449e92d97b45eb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 26 17:39:17 2019 -0600 qcap/smartteefilter: Call IMemInputPin::Receive() directly. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/smartteefilter.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c index fd0dd621e3..f63a43de50 100644 --- a/dlls/qcap/smartteefilter.c +++ b/dlls/qcap/smartteefilter.c @@ -261,8 +261,8 @@ static HRESULT WINAPI SmartTeeFilterInput_Receive(struct strmbase_sink *base, IM if (This->capture.pin.peer) hrCapture = copy_sample(inputSample, This->capture.pAllocator, &captureSample); LeaveCriticalSection(&This->filter.csFilter); - if (SUCCEEDED(hrCapture)) - hrCapture = BaseOutputPinImpl_Deliver(&This->capture, captureSample); + if (SUCCEEDED(hrCapture) && This->capture.pMemInputPin) + hrCapture = IMemInputPin_Receive(This->capture.pMemInputPin, captureSample); if (captureSample) IMediaSample_Release(captureSample); @@ -273,8 +273,8 @@ static HRESULT WINAPI SmartTeeFilterInput_Receive(struct strmbase_sink *base, IM /* No timestamps on preview stream: */ if (SUCCEEDED(hrPreview)) hrPreview = IMediaSample_SetTime(previewSample, NULL, NULL); - if (SUCCEEDED(hrPreview)) - hrPreview = BaseOutputPinImpl_Deliver(&This->preview, previewSample); + if (SUCCEEDED(hrPreview) && This->preview.pMemInputPin) + hrPreview = IMemInputPin_Receive(This->preview.pMemInputPin, previewSample); if (previewSample) IMediaSample_Release(previewSample);

1 0

Zebediah Figura : qcap/vfwcapture: Call IMemInputPin::Receive() directly.
by Alexandre Julliard 27 Nov '19

27 Nov '19

Module: wine Branch: master Commit: ce9af91cec2de2816d5809a30d3ecfe9890a8ced URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce9af91cec2de2816d5809a3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 26 17:39:18 2019 -0600 qcap/vfwcapture: Call IMemInputPin::Receive() directly. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/v4l.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index cdab38052b..17f1770f37 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -433,7 +433,7 @@ static DWORD WINAPI ReadThread(LPVOID lParam) } Resize(capBox, pTarget, image_data); - hr = BaseOutputPinImpl_Deliver(capBox->pin, pSample); + hr = IMemInputPin_Receive(capBox->pin->pMemInputPin, pSample); TRACE("%p -> Frame %u: %x\n", capBox, ++framecount, hr); IMediaSample_Release(pSample); } @@ -465,7 +465,7 @@ HRESULT qcap_driver_run(Capture *capBox, FILTER_STATE *state) capBox->stopped = FALSE; - if (*state == State_Stopped) + if (*state == State_Stopped && capBox->pin->pin.peer) { *state = State_Running; if (!capBox->iscommitted)

1 0

Zebediah Figura : strmbase: Get rid of BaseOutputPinImpl_Deliver().
by Alexandre Julliard 27 Nov '19

27 Nov '19

Module: wine Branch: master Commit: 8a05fe0fb551c6ff22799acf581befb02bdc49a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a05fe0fb551c6ff22799acf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 26 17:39:19 2019 -0600 strmbase: Get rid of BaseOutputPinImpl_Deliver(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pin.c | 40 ---------------------------------------- include/wine/strmbase.h | 1 - 2 files changed, 41 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 4606c25a78..755dd0928a 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -465,46 +465,6 @@ HRESULT WINAPI BaseOutputPinImpl_GetDeliveryBuffer(struct strmbase_source *This, return hr; } -/* replaces OutputPin_SendSample */ -HRESULT WINAPI BaseOutputPinImpl_Deliver(struct strmbase_source *This, IMediaSample *pSample) -{ - IMemInputPin * pMemConnected = NULL; - PIN_INFO pinInfo; - HRESULT hr; - - EnterCriticalSection(&This->pin.filter->csFilter); - { - if (!This->pin.peer || !This->pMemInputPin) - hr = VFW_E_NOT_CONNECTED; - else - { - /* we don't have the lock held when using This->pMemInputPin, - * so we need to AddRef it to stop it being deleted while we are - * using it. Same with its filter. */ - pMemConnected = This->pMemInputPin; - IMemInputPin_AddRef(pMemConnected); - hr = IPin_QueryPinInfo(This->pin.peer, &pinInfo); - } - } - LeaveCriticalSection(&This->pin.filter->csFilter); - - if (SUCCEEDED(hr)) - { - /* NOTE: if we are in a critical section when Receive is called - * then it causes some problems (most notably with the native Video - * Renderer) if we are re-entered for whatever reason */ - hr = IMemInputPin_Receive(pMemConnected, pSample); - - /* If the filter's destroyed, tell upstream to stop sending data */ - if(IBaseFilter_Release(pinInfo.pFilter) == 0 && SUCCEEDED(hr)) - hr = S_FALSE; - } - if (pMemConnected) - IMemInputPin_Release(pMemConnected); - - return hr; -} - /* replaces OutputPin_CommitAllocator */ HRESULT WINAPI BaseOutputPinImpl_Active(struct strmbase_source *This) { diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index dd2f8426bf..eace7c1e3b 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -123,7 +123,6 @@ HRESULT WINAPI BaseOutputPinImpl_EndFlush(IPin * iface); HRESULT WINAPI BaseOutputPinImpl_GetDeliveryBuffer(struct strmbase_source *pin, IMediaSample **sample, REFERENCE_TIME *start, REFERENCE_TIME *stop, DWORD flags); -HRESULT WINAPI BaseOutputPinImpl_Deliver(struct strmbase_source *pin, IMediaSample *sample); HRESULT WINAPI BaseOutputPinImpl_Active(struct strmbase_source *pin); HRESULT WINAPI BaseOutputPinImpl_Inactive(struct strmbase_source *pin); HRESULT WINAPI BaseOutputPinImpl_InitAllocator(struct strmbase_source *pin, IMemAllocator **allocator);

1 0

Zebediah Figura : strmbase: Move tracking of EOS state to the base renderer.
by Alexandre Julliard 27 Nov '19

27 Nov '19

Module: wine Branch: master Commit: 6773179a94df75d199d332a0b0bc06b854cfa71d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6773179a94df75d199d332a0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 26 17:39:20 2019 -0600 strmbase: Move tracking of EOS state to the base renderer. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pin.c | 4 +--- dlls/strmbase/renderer.c | 20 +++++++++----------- dlls/strmbase/transform.c | 4 +--- include/wine/strmbase.h | 4 +++- 4 files changed, 14 insertions(+), 18 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 755dd0928a..bdc827c6f6 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -690,8 +690,6 @@ HRESULT WINAPI BaseInputPinImpl_EndOfStream(IPin * iface) EnterCriticalSection(&This->pin.filter->csFilter); if (This->flushing) hr = S_FALSE; - else - This->end_of_stream = TRUE; LeaveCriticalSection(&This->pin.filter->csFilter); if (hr == S_OK) @@ -731,7 +729,7 @@ HRESULT WINAPI BaseInputPinImpl_EndFlush(IPin * iface) TRACE("(%p)->()\n", This); EnterCriticalSection(&This->pin.filter->csFilter); - This->flushing = This->end_of_stream = FALSE; + This->flushing = FALSE; hr = SendFurther(This, deliver_endflush, NULL); LeaveCriticalSection(&This->pin.filter->csFilter); diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index add999b4ec..dbb677e9ad 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -89,14 +89,11 @@ static HRESULT WINAPI BaseRenderer_InputPin_EndOfStream(IPin * iface) EnterCriticalSection(&pFilter->csRenderLock); EnterCriticalSection(&pFilter->filter.csFilter); - hr = BaseInputPinImpl_EndOfStream(iface); - if (SUCCEEDED(hr)) - { - if (pFilter->pFuncsTable->pfnEndOfStream) - hr = pFilter->pFuncsTable->pfnEndOfStream(pFilter); - else - hr = BaseRendererImpl_EndOfStream(pFilter); - } + pFilter->eos = TRUE; + if (pFilter->pFuncsTable->pfnEndOfStream) + hr = pFilter->pFuncsTable->pfnEndOfStream(pFilter); + else + hr = BaseRendererImpl_EndOfStream(pFilter); LeaveCriticalSection(&pFilter->filter.csFilter); LeaveCriticalSection(&pFilter->csRenderLock); return hr; @@ -128,6 +125,7 @@ static HRESULT WINAPI BaseRenderer_InputPin_EndFlush(IPin * iface) EnterCriticalSection(&pFilter->csRenderLock); EnterCriticalSection(&pFilter->filter.csFilter); + pFilter->eos = FALSE; hr = BaseInputPinImpl_EndFlush(iface); if (SUCCEEDED(hr)) { @@ -206,7 +204,7 @@ static HRESULT renderer_init_stream(struct strmbase_filter *iface) if (filter->sink.pin.peer) ResetEvent(filter->state_event); - filter->sink.end_of_stream = FALSE; + filter->eos = FALSE; BaseRendererImpl_ClearPendingSample(filter); ResetEvent(filter->flush_event); if (filter->pFuncsTable->renderer_init_stream) @@ -222,7 +220,7 @@ static HRESULT renderer_start_stream(struct strmbase_filter *iface, REFERENCE_TI filter->stream_start = start; SetEvent(filter->state_event); if (filter->sink.pin.peer) - filter->sink.end_of_stream = FALSE; + filter->eos = FALSE; QualityControlRender_Start(filter->qcimpl, filter->stream_start); if (filter->sink.pin.peer && filter->pFuncsTable->renderer_start_stream) filter->pFuncsTable->renderer_start_stream(filter); @@ -339,7 +337,7 @@ HRESULT WINAPI BaseRendererImpl_Receive(struct strmbase_renderer *This, IMediaSa TRACE("(%p)->%p\n", This, pSample); - if (This->sink.end_of_stream || This->sink.flushing) + if (This->eos || This->sink.flushing) return S_FALSE; if (This->filter.state == State_Stopped) diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 29c385793a..d39dbbd3ab 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -76,7 +76,7 @@ static HRESULT WINAPI TransformFilter_Input_Receive(struct strmbase_sink *This, return VFW_E_WRONG_STATE; } - if (This->end_of_stream || This->flushing) + if (This->flushing) { LeaveCriticalSection(&pTransform->csReceive); return S_FALSE; @@ -165,7 +165,6 @@ static HRESULT transform_init_stream(struct strmbase_filter *iface) EnterCriticalSection(&filter->csReceive); - filter->sink.end_of_stream = FALSE; if (filter->pFuncsTable->pfnStartStreaming) hr = filter->pFuncsTable->pfnStartStreaming(filter); if (SUCCEEDED(hr)) @@ -183,7 +182,6 @@ static HRESULT transform_cleanup_stream(struct strmbase_filter *iface) EnterCriticalSection(&filter->csReceive); - filter->sink.end_of_stream = FALSE; if (filter->pFuncsTable->pfnStopStreaming) hr = filter->pFuncsTable->pfnStopStreaming(filter); if (SUCCEEDED(hr)) diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index eace7c1e3b..d0a0da1b10 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -81,7 +81,7 @@ struct strmbase_sink IMemInputPin IMemInputPin_iface; IMemAllocator *pAllocator; - BOOL flushing, end_of_stream; + BOOL flushing; IMemAllocator *preferred_allocator; const struct strmbase_sink_ops *pFuncsTable; @@ -534,6 +534,8 @@ struct strmbase_renderer struct QualityControlImpl *qcimpl; const struct strmbase_renderer_ops *pFuncsTable; + + BOOL eos; }; typedef HRESULT (WINAPI *BaseRenderer_CheckMediaType)(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt);

1 0

Michael Stefaniuc : dmime: The group for a track in a segment cannot be zero.
by Alexandre Julliard 27 Nov '19

27 Nov '19

Module: wine Branch: master Commit: f5ecdbc3527b52bd25093851de4b6c4d9697abbd URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5ecdbc3527b52bd25093851… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Nov 27 00:49:53 2019 +0100 dmime: The group for a track in a segment cannot be zero. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/segment.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index 3c0d4ac567..e3acafe979 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -235,7 +235,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_GetTrackGroup(IDirectMusicSegment } static HRESULT WINAPI IDirectMusicSegment8Impl_InsertTrack(IDirectMusicSegment8 *iface, - IDirectMusicTrack *pTrack, DWORD dwGroupBits) + IDirectMusicTrack *pTrack, DWORD group) { IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); DWORD i = 0; @@ -243,7 +243,10 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_InsertTrack(IDirectMusicSegment8 LPDMUS_PRIVATE_SEGMENT_TRACK pIt = NULL; LPDMUS_PRIVATE_SEGMENT_TRACK pNewSegTrack = NULL; - TRACE("(%p, %p, %#x)\n", This, pTrack, dwGroupBits); + TRACE("(%p, %p, %#x)\n", This, pTrack, group); + + if (!group) + return E_INVALIDARG; LIST_FOR_EACH (pEntry, &This->Tracks) { i++; @@ -259,7 +262,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_InsertTrack(IDirectMusicSegment8 if (NULL == pNewSegTrack) return E_OUTOFMEMORY; - pNewSegTrack->dwGroupBits = dwGroupBits; + pNewSegTrack->dwGroupBits = group; pNewSegTrack->pTrack = pTrack; IDirectMusicTrack_Init(pTrack, (IDirectMusicSegment *)iface); IDirectMusicTrack_AddRef(pTrack);

1 0

Michael Stefaniuc : dmime/tests: Add some IDirectMusicSegment_GetTrack() tests.
by Alexandre Julliard 27 Nov '19

27 Nov '19

Module: wine Branch: master Commit: 88281f4b5f1c32c79237ddc7e0894710d186b7da URL: https://source.winehq.org/git/wine.git/?a=commit;h=88281f4b5f1c32c79237ddc7… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Nov 27 00:49:54 2019 +0100 dmime/tests: Add some IDirectMusicSegment_GetTrack() tests. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/tests/dmime.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 3fb0e8afd8..f561eb391e 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -524,6 +524,86 @@ static void test_segment(void) while (IDirectMusicSegment_Release(dms)); } +static void _add_track(IDirectMusicSegment8 *seg, REFCLSID class, const char *name, DWORD group) +{ + IDirectMusicTrack *track; + HRESULT hr; + + hr = CoCreateInstance(class, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack, + (void**)&track); + ok(hr == S_OK, "%s create failed: %08x, expected S_OK\n", name, hr); + hr = IDirectMusicSegment8_InsertTrack(seg, track, group); + if (group) + ok(hr == S_OK, "Inserting %s failed: %08x, expected S_OK\n", name, hr); + else + ok(hr == E_INVALIDARG, "Inserting %s failed: %08x, expected E_INVALIDARG\n", name, hr); + IDirectMusicTrack_Release(track); +} + +#define add_track(seg, class, group) _add_track(seg, &CLSID_DirectMusic ## class, #class, group) + +static void _expect_track(IDirectMusicSegment8 *seg, REFCLSID expect, const char *name, DWORD group, + DWORD index) +{ + IDirectMusicTrack *track; + IPersistStream *ps; + CLSID class; + HRESULT hr; + + hr = IDirectMusicSegment8_GetTrack(seg, &GUID_NULL, group, index, &track); + if (!expect) { + ok(hr == DMUS_E_NOT_FOUND, "GetTrack failed: %08x, expected DMUS_E_NOT_FOUND\n", hr); + return; + } + + ok(hr == S_OK, "GetTrack failed: %08x, expected S_OK\n", hr); + hr = IDirectMusicTrack_QueryInterface(track, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + hr = IPersistStream_GetClassID(ps, &class); + ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + ok(IsEqualGUID(&class, expect), "For group %#x index %u: Expected class %s got %s\n", + group, index, name, wine_dbgstr_guid(&class)); + + IPersistStream_Release(ps); + IDirectMusicTrack_Release(track); +} + +#define expect_track(seg, class, group, index) _expect_track(seg, &CLSID_DirectMusic ## class, #class, group, index) + +static void test_track_identify(void) +{ + IDirectMusicSegment8 *seg; + IDirectMusicTrack *track; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectMusicSegment, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicSegment8, (void**)&seg); + ok(hr == S_OK, "DirectMusicSegment create failed: %08x, expected S_OK\n", hr); + + add_track(seg, LyricsTrack, 0x0); /* failure */ + add_track(seg, LyricsTrack, 0x1); /* idx 0 group 1 */ + add_track(seg, ParamControlTrack, 0x3); /* idx 1 group 1, idx 0 group 2 */ + add_track(seg, SegmentTriggerTrack, 0x2); /* idx 1 group 2 */ + add_track(seg, SeqTrack, 0x1); /* idx 2 group 1 */ + add_track(seg, TempoTrack, 0x7); /* idx 3 group 1, idx 2 group 2, idx 0 group 3 */ + + hr = IDirectMusicSegment8_GetTrack(seg, &GUID_NULL, 0, 0, &track); + ok(hr == DMUS_E_NOT_FOUND, "GetTrack failed: %08x, expected DMUS_E_NOT_FOUND\n", hr); + + expect_track(seg, LyricsTrack, 0x1, 0); + expect_track(seg, ParamControlTrack, 0x1, 1); + expect_track(seg, SeqTrack, 0x1, 2); + expect_track(seg, TempoTrack, 0x1, 3); + _expect_track(seg, NULL, "", 0x1, 4); + expect_track(seg, ParamControlTrack, 0x2, 0); + expect_track(seg, SegmentTriggerTrack, 0x3, 2); /* groups 1+2 combined index */ + expect_track(seg, SeqTrack, 0x3, 3); /* groups 1+2 combined index */ + expect_track(seg, TempoTrack, 0x7, 4); /* groups 1+2+3 combined index */ + expect_track(seg, TempoTrack, 0xffffffff, 4); /* all groups combined index */ + + IDirectMusicSegment8_Release(seg); +} + static void test_track(void) { IDirectMusicTrack *dmt; @@ -956,6 +1036,7 @@ START_TEST(dmime) test_audiopathconfig(); test_graph(); test_segment(); + test_track_identify(); test_track(); test_parsedescriptor();

1 0

Zhiyi Zhang : include: Add more date formatting flags.
by Alexandre Julliard 27 Nov '19

27 Nov '19

Module: wine Branch: master Commit: fbb41150de6fca9d7bc401297cf220ce34f07b02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbb41150de6fca9d7bc40129… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Nov 27 15:00:07 2019 +0800 include: Add more date formatting flags. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnls.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/winnls.h b/include/winnls.h index b233f7f917..c7c2cfb240 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -411,6 +411,8 @@ static const WCHAR LOCALE_NAME_SYSTEM_DEFAULT[] = {'!','s','y','s','-','d','e',' #define DATE_YEARMONTH 0x08 /* Year/month format */ #define DATE_LTRREADING 0x10 /* Add LTR reading marks */ #define DATE_RTLREADING 0x20 /* Add RTL reading marks */ +#define DATE_AUTOLAYOUT 0x40 /* Add LTR or RTL reading marks automatically */ +#define DATE_MONTHDAY 0x80 /* Month/day format */ #define TIME_FORCE24HOURFORMAT 0x08 /* Always use 24 hour clock */ #define TIME_NOTIMEMARKER 0x04 /* show no AM/PM */

1 0