March 2020 - Wine-Commits - list.winehq.org

Dmitry Timoshkov : adsldp/tests: Add some tests for IDirectorySearch.
by Alexandre Julliard March 26, 2020

March 26, 2020

Module: wine Branch: master Commit: 032d848ac4b31838158b4f9d9dbcd424f2949d02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=032d848ac4b31838158b4f9d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 26 16:04:26 2020 +0800 adsldp/tests: Add some tests for IDirectorySearch. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/tests/ldap.c | 245 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 245 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=032d848ac4b31838158b…

1 0

Rémi Bernon : winegstreamer: Check the callback list before waiting.
by Alexandre Julliard March 26, 2020

March 26, 2020

Module: wine Branch: master Commit: b3a33f065d7e96cb24624560ce05733860e3ecba URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3a33f065d7e96cb24624560… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Mar 26 00:03:18 2020 +0100 winegstreamer: Check the callback list before waiting. Some callbacks may be pushed during pipeline initialization and before the dispatch thread is actually started and waiting for them, which sometimes causes some hangs. This fixes Fallout 3 and Panzer Corps -and possibly others- intro videos hanging forever. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_cbs.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/winegstreamer/gst_cbs.c b/dlls/winegstreamer/gst_cbs.c index a0618798d8..bf7103b160 100644 --- a/dlls/winegstreamer/gst_cbs.c +++ b/dlls/winegstreamer/gst_cbs.c @@ -66,15 +66,11 @@ static DWORD WINAPI dispatch_thread(void *user) while (1) { - pthread_cond_wait(&cb_list_cond, &cb_list_lock); + while (list_empty(&cb_list)) pthread_cond_wait(&cb_list_cond, &cb_list_lock); - while (!list_empty(&cb_list)) - { - cbdata = LIST_ENTRY(list_head(&cb_list), struct cb_data, entry); - list_remove(&cbdata->entry); - - TrySubmitThreadpoolCallback(&perform_cb, cbdata, NULL); - } + cbdata = LIST_ENTRY(list_head(&cb_list), struct cb_data, entry); + list_remove(&cbdata->entry); + TrySubmitThreadpoolCallback(&perform_cb, cbdata, NULL); } pthread_mutex_unlock(&cb_list_lock);

1 0

Alistair Leslie-Hughes : dmime: Reimplement IDirectMusicAudioPath Activate.
by Alexandre Julliard March 26, 2020

March 26, 2020

Module: wine Branch: master Commit: f0d35a96b2eef4bd35674c59f2adc1665eb98797 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0d35a96b2eef4bd35674c59… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 26 19:09:26 2020 +0100 dmime: Reimplement IDirectMusicAudioPath Activate. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/audiopath.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/dmime/audiopath.c b/dlls/dmime/audiopath.c index 1aadba92ae..078d843d46 100644 --- a/dlls/dmime/audiopath.c +++ b/dlls/dmime/audiopath.c @@ -216,21 +216,23 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_GetObjectInPath (IDirectMusicAud return E_INVALIDARG; } -static HRESULT WINAPI IDirectMusicAudioPathImpl_Activate (IDirectMusicAudioPath *iface, BOOL fActivate) +static HRESULT WINAPI IDirectMusicAudioPathImpl_Activate(IDirectMusicAudioPath *iface, BOOL activate) { - struct IDirectMusicAudioPathImpl *This = impl_from_IDirectMusicAudioPath(iface); - FIXME("(%p, %d): stub\n", This, fActivate); - if (!fActivate) { - if (!This->fActive) return S_OK; - This->fActive = FALSE; - } else { - if (This->fActive) return S_OK; - This->fActive = TRUE; - if (NULL != This->pDSBuffer) { - IDirectSoundBuffer_Stop(This->pDSBuffer); + struct IDirectMusicAudioPathImpl *This = impl_from_IDirectMusicAudioPath(iface); + + FIXME("(%p, %d): semi-stub\n", This, activate); + + if (!!activate == This->fActive) + return S_FALSE; + + if (!activate && This->pDSBuffer) { + /* Path is being deactivated */ + IDirectSoundBuffer_Stop(This->pDSBuffer); } - } - return S_OK; + + This->fActive = !!activate; + + return S_OK; } static HRESULT WINAPI IDirectMusicAudioPathImpl_SetVolume (IDirectMusicAudioPath *iface, LONG lVolume, DWORD dwDuration)

1 0

Nikolay Sivov : mfplat: Add more event types to trace.
by Alexandre Julliard March 26, 2020

March 26, 2020

Module: wine Branch: master Commit: 1d047928b10d78b23fff7aa5633d99690c3c674c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d047928b10d78b23fff7aa5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 26 16:16:28 2020 +0300 mfplat: Add more event types to trace. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 13 +++++++++++++ include/mfobjects.idl | 13 +++++++++++++ 2 files changed, 26 insertions(+) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 8d9dffe075..e3cb35d866 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -2056,6 +2056,19 @@ static const char *debugstr_eventid(DWORD event) X(MEWMDRMProximityCompleted), X(MEWMDRMLicenseStoreCleaned), X(MEWMDRMRevocationDownloadCompleted), + X(METransformUnknown), + X(METransformNeedInput), + X(METransformHaveOutput), + X(METransformDrainComplete), + X(METransformMarker), + X(METransformInputStreamStateChanged), + X(MEByteStreamCharacteristicsChanged), + X(MEVideoCaptureDeviceRemoved), + X(MEVideoCaptureDevicePreempted), + X(MEStreamSinkFormatInvalidated), + X(MEEncodingParameters), + X(MEContentProtectionMetadata), + X(MEDeviceThermalStateChanged), #undef X }; diff --git a/include/mfobjects.idl b/include/mfobjects.idl index 8e3d65c77c..ee49be35af 100644 --- a/include/mfobjects.idl +++ b/include/mfobjects.idl @@ -567,6 +567,19 @@ enum { MEWMDRMLicenseStoreCleaned = 515, MEWMDRMRevocationDownloadCompleted = 516, MEWMDRMV1Anchor = MEWMDRMRevocationDownloadCompleted, + METransformUnknown = 600, + METransformNeedInput = 601, + METransformHaveOutput = 602, + METransformDrainComplete = 603, + METransformMarker = 604, + METransformInputStreamStateChanged = 605, + MEByteStreamCharacteristicsChanged = 700, + MEVideoCaptureDeviceRemoved = 800, + MEVideoCaptureDevicePreempted = 801, + MEStreamSinkFormatInvalidated = 802, + MEEncodingParameters = 803, + MEContentProtectionMetadata = 900, + MEDeviceThermalStateChanged = 950, MEReservedMax = 10000 };

1 0

Alistair Leslie-Hughes : dmime: Store flags when parsing track data.
by Alexandre Julliard March 26, 2020

March 26, 2020

Module: wine Branch: master Commit: 7dd53d89c33781089619d40281f332d910527415 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7dd53d89c33781089619d402… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 26 19:09:25 2020 +0100 dmime: Store flags when parsing track data. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/dmime_private.h | 1 + dlls/dmime/segment.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h index 576ebc1ae8..9759039a03 100644 --- a/dlls/dmime/dmime_private.h +++ b/dlls/dmime/dmime_private.h @@ -77,6 +77,7 @@ extern void set_audiopath_primary_dsound_buffer(IDirectMusicAudioPath*,IDirectSo typedef struct _DMUS_PRIVATE_SEGMENT_TRACK { struct list entry; /* for listing elements */ DWORD dwGroupBits; + DWORD flags; IDirectMusicTrack* pTrack; } DMUS_PRIVATE_SEGMENT_TRACK, *LPDMUS_PRIVATE_SEGMENT_TRACK; diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index 0455b6c5dd..f5dbf4b995 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -614,8 +614,9 @@ static HRESULT parse_track_form(IDirectMusicSegment8Impl *This, IStream *stream, IPersistStream *ps = NULL; IStream *clone; DMUS_IO_TRACK_HEADER thdr; - DMUS_IO_TRACK_EXTRAS_HEADER txhdr; + DMUS_IO_TRACK_EXTRAS_HEADER txhdr = {0}; HRESULT hr; + DMUS_PRIVATE_SEGMENT_TRACK *item; TRACE("Parsing track form in %p: %s\n", stream, debugstr_chunk(riff)); @@ -647,7 +648,7 @@ static HRESULT parse_track_form(IDirectMusicSegment8Impl *This, IStream *stream, if (chunk.id == DMUS_FOURCC_TRACK_EXTRAS_CHUNK && SUCCEEDED(stream_chunk_get_data(stream, &chunk, &txhdr, sizeof(txhdr)))) { - FIXME("DMUS_IO_TRACK_EXTRAS_HEADER chunk not handled\n"); + FIXME("DMUS_IO_TRACK_EXTRAS_HEADER chunk not fully handled\n"); TRACE("dwFlags: %#x, dwPriority: %u\n", txhdr.dwFlags, txhdr.dwPriority); } } @@ -672,6 +673,11 @@ static HRESULT parse_track_form(IDirectMusicSegment8Impl *This, IStream *stream, goto done; hr = IDirectMusicSegment8_InsertTrack(&This->IDirectMusicSegment8_iface, track, thdr.dwGroup); + if (FAILED(hr)) + goto done; + + item = LIST_ENTRY(list_tail(&This->Tracks), DMUS_PRIVATE_SEGMENT_TRACK, entry); + item->flags = txhdr.dwFlags; done: if (ps)

1 0

Dmitry Timoshkov : adsldp: Add support for special column name "ADsPath" to IDirectorySearch::GetColumn().
by Alexandre Julliard March 26, 2020

March 26, 2020

Module: wine Branch: master Commit: e5ecd3b465ec9667f167166804393806c343d0db URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5ecd3b465ec9667f1671668… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 26 15:10:40 2020 +0800 adsldp: Add support for special column name "ADsPath" to IDirectorySearch::GetColumn(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index fed9a8afca..7385a40e25 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1342,6 +1342,42 @@ static HRESULT WINAPI search_GetColumn(IDirectorySearch *iface, ADS_SEARCH_HANDL if (!res || !name || !ldap_ctx->entry) return E_ADS_BAD_PARAMETER; + if (!wcsicmp(name, L"ADsPath")) + { + WCHAR *dn = ldap_get_dnW(ldap->ld, ldap_ctx->entry); + + col->pADsValues = heap_alloc(sizeof(col->pADsValues[0])); + if (!col->pADsValues) + { + hr = E_OUTOFMEMORY; + goto exit; + } + + count = sizeof(L"LDAP://") + (wcslen(ldap->host) + 1 /* '/' */) * sizeof(WCHAR); + if (dn) count += wcslen(dn) * sizeof(WCHAR); + + col->pADsValues[0].u.CaseIgnoreString = heap_alloc(count); + if (!col->pADsValues[0].u.CaseIgnoreString) + { + hr = E_OUTOFMEMORY; + goto exit; + } + + wcscpy(col->pADsValues[0].u.CaseIgnoreString, L"LDAP://"); + wcscat(col->pADsValues[0].u.CaseIgnoreString, ldap->host); + wcscat(col->pADsValues[0].u.CaseIgnoreString, L"/"); + if (dn) wcscat(col->pADsValues[0].u.CaseIgnoreString, dn); + col->dwADsType = ADSTYPE_CASE_IGNORE_STRING; + col->dwNumValues = 1; + col->pszAttrName = strdupW(name); + + TRACE("=> %s\n", debugstr_w(col->pADsValues[0].u.CaseIgnoreString)); + hr = S_OK; +exit: + ldap_memfreeW(dn); + return hr; + } + values = ldap_get_values_lenW(ldap->ld, ldap_ctx->entry, name); if (!values) return ERROR_DS_NO_ATTRIBUTE_OR_VALUE;

1 0

Dmitry Timoshkov : adsldp: Add special column "ADsPath" at the end of the entry.
by Alexandre Julliard March 26, 2020

March 26, 2020

Module: wine Branch: master Commit: e53a00944e1f494e36fdb72356463f038af5de23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e53a00944e1f494e36fdb723… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 26 15:10:04 2020 +0800 adsldp: Add special column "ADsPath" at the end of the entry. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index b59b31b21a..859d42546f 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -401,6 +401,7 @@ struct ldap_search_context LDAPMessage *res, *entry; BerElement *ber; ULONG count, pos; + BOOL add_ADsPath; }; static inline LDAP_namespace *impl_from_IADs(IADs *iface) @@ -1274,7 +1275,10 @@ static HRESULT WINAPI search_GetNextColumnName(IDirectorySearch *iface, ADS_SEAR if (!name || !ldap_ctx || !ldap_ctx->entry) return E_ADS_BAD_PARAMETER; if (!ldap_ctx->ber) + { attr = ldap_first_attributeW(ldap->ld, ldap_ctx->entry, &ldap_ctx->ber); + ldap_ctx->add_ADsPath = TRUE; + } else attr = ldap_next_attributeW(ldap->ld, ldap_ctx->entry, ldap_ctx->ber); @@ -1285,6 +1289,13 @@ static HRESULT WINAPI search_GetNextColumnName(IDirectorySearch *iface, ADS_SEAR ldap_memfreeW(attr); return *name ? S_OK : E_OUTOFMEMORY; } + else if (ldap_ctx->add_ADsPath) + { + ldap_ctx->add_ADsPath = FALSE; + *name = AllocADsStr((WCHAR *)L"ADsPath"); + TRACE("=> %s\n", debugstr_w(*name)); + return *name ? S_OK : E_OUTOFMEMORY; + } *name = NULL; return S_ADS_NOMORE_COLUMNS;

1 0

Dmitry Timoshkov : adsldp: Improve IDirectorySearch::GetNextRow() end of entries detection logic.
by Alexandre Julliard March 26, 2020

March 26, 2020

Module: wine Branch: master Commit: d2ab8296d48e4c0148ab48bf61aa719d39af7bb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2ab8296d48e4c0148ab48bf… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 26 15:09:20 2020 +0800 adsldp: Improve IDirectorySearch::GetNextRow() end of entries detection logic. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index e3b0bce9a2..350523222a 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1211,11 +1211,9 @@ static HRESULT WINAPI search_GetFirstRow(IDirectorySearch *iface, ADS_SEARCH_HAN if (!res) return E_ADS_BAD_PARAMETER; - ldap_ctx->count = ldap_count_entries(ldap->ld, ldap_ctx->res); - ldap_ctx->pos = 0; - ldap_ctx->entry = ldap_first_entry(ldap->ld, ldap_ctx->res); + ldap_ctx->entry = NULL; - return ldap_ctx->entry ? S_OK : S_ADS_NOMORE_ROWS; + return IDirectorySearch_GetNextRow(iface, res); } static HRESULT WINAPI search_GetNextRow(IDirectorySearch *iface, ADS_SEARCH_HANDLE res) @@ -1233,6 +1231,10 @@ static HRESULT WINAPI search_GetNextRow(IDirectorySearch *iface, ADS_SEARCH_HAND { ldap_ctx->count = ldap_count_entries(ldap->ld, ldap_ctx->res); ldap_ctx->pos = 0; + + if (ldap_ctx->pos >= ldap_ctx->count) + return S_ADS_NOMORE_ROWS; + ldap_ctx->entry = ldap_first_entry(ldap->ld, ldap_ctx->res); } else @@ -1241,10 +1243,14 @@ static HRESULT WINAPI search_GetNextRow(IDirectorySearch *iface, ADS_SEARCH_HAND return S_ADS_NOMORE_ROWS; ldap_ctx->entry = ldap_next_entry(ldap->ld, ldap_ctx->res); - ldap_ctx->pos++; } - return ldap_ctx->entry ? S_OK : S_ADS_NOMORE_ROWS; + if (!ldap_ctx->entry) + return S_ADS_NOMORE_ROWS; + + ldap_ctx->pos++; + + return S_OK; } static HRESULT WINAPI search_GetPreviousRow(IDirectorySearch *iface, ADS_SEARCH_HANDLE res)

1 0

Nikolay Sivov : mf: Fix a typo when setting event attribute.
by Alexandre Julliard March 26, 2020

March 26, 2020

Module: wine Branch: master Commit: 875b0c40a9e9ce208223a9d3c43bf805a20c7fab URL: https://source.winehq.org/git/wine.git/?a=commit;h=875b0c40a9e9ce208223a9d3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 26 16:53:31 2020 +0300 mf: Fix a typo when setting event attribute. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 50f011dc52..2147f70cc8 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -1189,7 +1189,7 @@ static HRESULT session_set_current_topology(struct media_session *session, IMFTo { IMFMediaEvent_SetUINT64(event, &MF_EVENT_START_PRESENTATION_TIME, 0); IMFMediaEvent_SetUINT64(event, &MF_EVENT_PRESENTATION_TIME_OFFSET, 0); - IMFMediaEvent_GetUINT64(event, &MF_EVENT_START_PRESENTATION_TIME_AT_OUTPUT, 0); + IMFMediaEvent_SetUINT64(event, &MF_EVENT_START_PRESENTATION_TIME_AT_OUTPUT, 0); IMFMediaEventQueue_QueueEvent(session->event_queue, event); IMFMediaEvent_Release(event);

1 0

Matteo Bruni : wined3d: Skip loading current index buffer if the draw is not indexed.
by Alexandre Julliard March 26, 2020

March 26, 2020

Module: wine Branch: master Commit: b83b897b4a2f96be7446a7b8ac6678b1559e9386 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b83b897b4a2f96be7446a7b8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 26 13:26:00 2020 +0100 wined3d: Skip loading current index buffer if the draw is not indexed. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index c6a1d76267..2e363fb1d6 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4225,7 +4225,7 @@ static void context_load_stream_output_buffers(struct wined3d_context *context, /* Context activation is done by the caller. */ static BOOL context_apply_draw_state(struct wined3d_context *context, - const struct wined3d_device *device, const struct wined3d_state *state) + const struct wined3d_device *device, const struct wined3d_state *state, BOOL indexed) { const struct wined3d_state_entry *state_table = context->state_table; struct wined3d_context_gl *context_gl = wined3d_context_gl(context); @@ -4277,7 +4277,7 @@ static BOOL context_apply_draw_state(struct wined3d_context *context, if (isStateDirty(context, STATE_STREAMSRC)) context_update_stream_info(context, state); } - if (state->index_buffer) + if (indexed && state->index_buffer) { if (context->stream_info.all_vbo) wined3d_buffer_load(state->index_buffer, context, state); @@ -5194,7 +5194,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s if (parameters->indirect) wined3d_buffer_load(parameters->u.indirect.buffer, context, state); - if (!context_apply_draw_state(context, device, state)) + if (!context_apply_draw_state(context, device, state, parameters->indexed)) { context_release(context); WARN("Unable to apply draw state, skipping draw.\n");

1 0