May 2016 - Wine-Commits - list.winehq.org

Alexandre Julliard : Import of upstream bugzilla release 4.4.12.
by Alexandre Julliard May 16, 2016

May 16, 2016

Module: bugzilla Branch: master Commit: 1cfc2f9e5b72aef8fb5ee0e840902e8c0fa06de3 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=1cfc2f9e5b72aef8fb5ee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 17 10:46:38 2016 +0900 Import of upstream bugzilla release 4.4.12. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Bugzilla/Constants.pm | 2 +- Bugzilla/Mailer.pm | 18 +----- Bugzilla/Template.pm | 7 +- attachment.cgi | 1 + docs/bugzilla.ent | 62 ------------------ docs/bugzilla.ent.tmpl | 6 +- docs/en/xml/bugzilla.ent | 62 ------------------ showdependencygraph.cgi | 8 ++- taskgraph.json | 78 +++++++++++++++++------ template/en/default/global/tabs.html.tmpl | 2 +- template/en/default/pages/release-notes.html.tmpl | 25 ++++++++ 11 files changed, 105 insertions(+), 166 deletions(-) Diff: http://source.winehq.org/git/bugzilla.git/?a=commitdiff;h=1cfc2f9e5b72aef8f…

1 0

Alexandre Julliard : Merge branch 'upstream'.
by Alexandre Julliard May 16, 2016

May 16, 2016

Module: bugzilla Branch: master Commit: 3ea1442a089010502942c2b63ab549f6e6ed13e8 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=3ea1442a089010502942c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 17 10:48:33 2016 +0900 Merge branch 'upstream'. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> ---

1 0

Alexandre Julliard : Import of upstream bugzilla release 4.4.12.
by Alexandre Julliard May 16, 2016

May 16, 2016

Module: bugzilla Branch: upstream Commit: 1cfc2f9e5b72aef8fb5ee0e840902e8c0fa06de3 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=1cfc2f9e5b72aef8fb5ee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 17 10:46:38 2016 +0900 Import of upstream bugzilla release 4.4.12. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Bugzilla/Constants.pm | 2 +- Bugzilla/Mailer.pm | 18 +----- Bugzilla/Template.pm | 7 +- attachment.cgi | 1 + docs/bugzilla.ent | 62 ------------------ docs/bugzilla.ent.tmpl | 6 +- docs/en/xml/bugzilla.ent | 62 ------------------ showdependencygraph.cgi | 8 ++- taskgraph.json | 78 +++++++++++++++++------ template/en/default/global/tabs.html.tmpl | 2 +- template/en/default/pages/release-notes.html.tmpl | 25 ++++++++ 11 files changed, 105 insertions(+), 166 deletions(-) Diff: http://source.winehq.org/git/bugzilla.git/?a=commitdiff;h=1cfc2f9e5b72aef8f…

1 0

Alexandre Julliard : Wine release 1.9.10
by Alexandre Julliard May 16, 2016

May 16, 2016

Module: website Branch: master Commit: 724c5cb0613baca8a090dc7df31b04a79bec9d48 URL: http://source.winehq.org/git/website.git/?a=commit;h=724c5cb0613baca8a090dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 17 00:36:55 2016 +0900 Wine release 1.9.10 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2016051701.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2016051701.xml b/news/en/2016051701.xml new file mode 100644 index 0000000..a347428 --- /dev/null +++ b/news/en/2016051701.xml @@ -0,0 +1,16 @@ +<news> +<date>May 17, 2016</date> +<title>Wine 1.9.10 Released</title> +<body> + The Wine development release 1.9.10 is now available. + <a href="{$root}/announce/1.9.10">What's new</a> in this release: +<ul> + <li>High resolution ("Retina") rendering option on Mac OS X.</li> + <li>More compatible directory enumeration.</li> + <li>A number of C++ runtime fixes.</li> + <li>Video output improvements.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.10.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Andrey Gusev : msvfw32: Fix a typo in TRACE() message.
by Alexandre Julliard May 16, 2016

May 16, 2016

Module: wine Branch: master Commit: 01e722a4fc5481fb2fdc37324f728892fd05af30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01e722a4fc5481fb2fdc37324… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon May 16 14:22:45 2016 +0300 msvfw32: Fix a typo in TRACE() message. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvfw32/msvideo_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index 4f1a2bf..0ae33ed 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -450,7 +450,7 @@ HIC VFWAPI ICOpen(DWORD fccType, DWORD fccHandler, UINT wMode) local = ICOpen(fccType, info.fccHandler, wMode); if (local != 0) { - TRACE("Returning %s as defult handler for %s\n", + TRACE("Returning %s as default handler for %s\n", wine_dbgstr_fcc(info.fccHandler), wine_dbgstr_fcc(fccType)); return local; }

1 0

Nikolay Sivov : msvcrt/tests: Fix a test failure on early XP versions.
by Alexandre Julliard May 16, 2016

May 16, 2016

Module: wine Branch: master Commit: 1b072058acae2398e190b8eb90ec4e7c6fe52825 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b072058acae2398e190b8eb9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 7 09:51:21 2016 +0300 msvcrt/tests: Fix a test failure on early XP versions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/heap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/tests/heap.c b/dlls/msvcrt/tests/heap.c index 82a5961..3d75cf1 100644 --- a/dlls/msvcrt/tests/heap.c +++ b/dlls/msvcrt/tests/heap.c @@ -474,8 +474,9 @@ static void test_calloc(void) errno = 0; ptr = calloc(~(size_t)0 / 2, ~(size_t)0 / 2); - ok(ptr == NULL, "got %p\n", ptr); + ok(ptr == NULL || broken(ptr != NULL) /* winxp sp0 */, "got %p\n", ptr); ok(errno == ENOMEM || broken(errno == 0) /* winxp, win2k3 */, "got errno %d\n", errno); + free(ptr); } START_TEST(heap)

1 0

Tag wine-1.9.10 : Alexandre Julliard : Release 1.9.10
by Alexandre Julliard May 16, 2016

May 16, 2016

Module: wine Branch: refs/tags/wine-1.9.10 Tag: bc964cab79161c2f63c8eca6436654af74912753 URL: http://source.winehq.org/git/wine.git/?a=tag;h=bc964cab79161c2f63c8eca64366… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 17 00:34:41 2016 +0900 Release 1.9.10

1 0

Alexandre Julliard : Release 1.9.10.
by Alexandre Julliard May 16, 2016

May 16, 2016

Module: wine Branch: master Commit: f7ac364b0c06bbe7a1ef5b715f2be46b5e6c04d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7ac364b0c06bbe7a1ef5b715… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 17 00:34:41 2016 +0900 Release 1.9.10. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .mailmap | 1 + ANNOUNCE | 720 ++++++++++++++++++++++++-------------------------------------- VERSION | 2 +- configure | 18 +- 4 files changed, 283 insertions(+), 458 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f7ac364b0c06bbe7a1ef5…

1 0

Andrew Eikum : qedit: Don' t require SampleGrabber to be playing to call callback.
by Alexandre Julliard May 16, 2016

May 16, 2016

Module: wine Branch: master Commit: 3104b17f86379035132a2579ea485512d0a17af3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3104b17f86379035132a2579e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon May 16 08:28:38 2016 -0500 qedit: Don't require SampleGrabber to be playing to call callback. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/samplegrabber.c | 2 +- dlls/qedit/tests/mediadet.c | 197 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 198 insertions(+), 1 deletion(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index e3f387b..151827e 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -765,7 +765,7 @@ SampleGrabber_IMemInputPin_Receive(IMemInputPin *iface, IMediaSample *sample) TRACE("(%p)->(%p) output = %p, grabber = %p\n", This, sample, This->memOutput, This->grabberIface); if (!sample) return E_POINTER; - if ((This->filter.state != State_Running) || (This->oneShot == OneShot_Past)) + if (This->oneShot == OneShot_Past) return S_FALSE; SampleGrabber_callback(This, sample); hr = This->memOutput ? IMemInputPin_Receive(This->memOutput, sample) : S_OK; diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index d5efe43..6bc20e5 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -353,6 +353,174 @@ static void test_mediadet(void) DeleteFileW(test_sound_avi_filename); } +static HRESULT WINAPI ms_QueryInterface(IMediaSample *iface, REFIID riid, + void **ppvObject) +{ + return E_NOTIMPL; +} + +static ULONG WINAPI ms_AddRef(IMediaSample *iface) +{ + return 2; +} + +static ULONG WINAPI ms_Release(IMediaSample *iface) +{ + return 1; +} + +static HRESULT WINAPI ms_GetPointer(IMediaSample *iface, BYTE **ppBuffer) +{ + return E_NOTIMPL; +} + +static LONG WINAPI ms_GetSize(IMediaSample *iface) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI ms_GetTime(IMediaSample *iface, REFERENCE_TIME *pTimeStart, + REFERENCE_TIME *pTimeEnd) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI ms_SetTime(IMediaSample *iface, REFERENCE_TIME *pTimeStart, + REFERENCE_TIME *pTimeEnd) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI ms_IsSyncPoint(IMediaSample *iface) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI ms_SetSyncPoint(IMediaSample *iface, BOOL bIsSyncPoint) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI ms_IsPreroll(IMediaSample *iface) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI ms_SetPreroll(IMediaSample *iface, BOOL bIsPreroll) +{ + return E_NOTIMPL; +} + +static LONG WINAPI ms_GetActualDataLength(IMediaSample *iface) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI ms_SetActualDataLength(IMediaSample *iface, LONG length) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI ms_GetMediaType(IMediaSample *iface, AM_MEDIA_TYPE + **ppMediaType) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI ms_SetMediaType(IMediaSample *iface, AM_MEDIA_TYPE *pMediaType) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI ms_IsDiscontinuity(IMediaSample *iface) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI ms_SetDiscontinuity(IMediaSample *iface, BOOL bDiscontinuity) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI ms_GetMediaTime(IMediaSample *iface, LONGLONG *pTimeStart, + LONGLONG *pTimeEnd) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI ms_SetMediaTime(IMediaSample *iface, LONGLONG *pTimeStart, + LONGLONG *pTimeEnd) +{ + return E_NOTIMPL; +} + +static const IMediaSampleVtbl my_sample_vt = { + ms_QueryInterface, + ms_AddRef, + ms_Release, + ms_GetPointer, + ms_GetSize, + ms_GetTime, + ms_SetTime, + ms_IsSyncPoint, + ms_SetSyncPoint, + ms_IsPreroll, + ms_SetPreroll, + ms_GetActualDataLength, + ms_SetActualDataLength, + ms_GetMediaType, + ms_SetMediaType, + ms_IsDiscontinuity, + ms_SetDiscontinuity, + ms_GetMediaTime, + ms_SetMediaTime +}; + +static IMediaSample my_sample = { &my_sample_vt }; + +static BOOL samplecb_called = FALSE; + +static HRESULT WINAPI sgcb_QueryInterface(ISampleGrabberCB *iface, REFIID riid, + void **ppvObject) +{ + return E_NOTIMPL; +} + +static ULONG WINAPI sgcb_AddRef(ISampleGrabberCB *iface) +{ + return E_NOTIMPL; +} + +static ULONG WINAPI sgcb_Release(ISampleGrabberCB *iface) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI sgcb_SampleCB(ISampleGrabberCB *iface, double SampleTime, + IMediaSample *pSample) +{ + ok(pSample == &my_sample, "Got wrong IMediaSample: %p, expected %p\n", pSample, &my_sample); + samplecb_called = TRUE; + return E_NOTIMPL; +} + +static HRESULT WINAPI sgcb_BufferCB(ISampleGrabberCB *iface, double SampleTime, + BYTE *pBuffer, LONG BufferLen) +{ + ok(0, "BufferCB should not have been called\n"); + return E_NOTIMPL; +} + +static const ISampleGrabberCBVtbl sgcb_vt = { + sgcb_QueryInterface, + sgcb_AddRef, + sgcb_Release, + sgcb_SampleCB, + sgcb_BufferCB +}; + +static ISampleGrabberCB my_sg_cb = { &sgcb_vt }; + static void test_samplegrabber(void) { struct unk_impl unk_obj = {{&unk_vtbl}, 19, NULL}; @@ -361,8 +529,12 @@ static void test_samplegrabber(void) IMediaFilter *mf; IPersist *persist; IUnknown *unk; + IPin *pin; + IMemInputPin *inpin; + IEnumPins *pins; ULONG refcount; HRESULT hr; + FILTER_STATE fstate; /* COM aggregation */ hr = CoCreateInstance(&CLSID_SampleGrabber, &unk_obj.IUnknown_iface, CLSCTX_INPROC_SERVER, @@ -415,6 +587,31 @@ static void test_samplegrabber(void) ok(refcount == 7, "refcount == %u, expected 7\n", refcount); refcount = IUnknown_Release(unk); + hr = ISampleGrabber_SetCallback(sg, &my_sg_cb, 0); + ok(hr == S_OK, "SetCallback failed: %08x\n", hr); + + hr = IBaseFilter_GetState(bf, 100, &fstate); + ok(hr == S_OK, "Failed to get filter state: %08x\n", hr); + ok(fstate == State_Stopped, "Got wrong filter state: %u\n", fstate); + + hr = IBaseFilter_EnumPins(bf, &pins); + ok(hr == S_OK, "EnumPins create failed: %08x, expected S_OK\n", hr); + + hr = IEnumPins_Next(pins, 1, &pin, NULL); + ok(hr == S_OK, "Next failed: %08x\n", hr); + + IEnumPins_Release(pins); + + hr = IPin_QueryInterface(pin, &IID_IMemInputPin, (void**)&inpin); + ok(hr == S_OK, "QueryInterface(IMemInputPin) failed: %08x\n", hr); + + hr = IMemInputPin_Receive(inpin, &my_sample); + ok(hr == S_OK, "Receive failed: %08x\n", hr); + ok(samplecb_called == TRUE, "SampleCB should have been called\n"); + + IMemInputPin_Release(inpin); + IPin_Release(pin); + /* Interfaces that native does not support */ hr = ISampleGrabber_QueryInterface(sg, &IID_IMediaPosition, (void**)&unk); todo_wine ok(hr == E_NOINTERFACE, "QueryInterface for IID_IMediaPosition failed: %08x\n", hr);

1 0

Andrew Eikum : qcap: Search the whole graph for an unconnected pin.
by Alexandre Julliard May 16, 2016

May 16, 2016

Module: wine Branch: master Commit: af05ff4b152cf3e3cd4544ffbfa6576a9bd856b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af05ff4b152cf3e3cd4544ffb… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon May 16 08:28:32 2016 -0500 qcap: Search the whole graph for an unconnected pin. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/capturegraph.c | 89 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 68 insertions(+), 21 deletions(-) diff --git a/dlls/qcap/capturegraph.c b/dlls/qcap/capturegraph.c index 372e16f..546b1f8 100644 --- a/dlls/qcap/capturegraph.c +++ b/dlls/qcap/capturegraph.c @@ -360,6 +360,66 @@ end: return hr; } +static HRESULT find_unconnected_pin(CaptureGraphImpl *This, + const GUID *pCategory, const GUID *pType, IUnknown *pSource, IPin **out_pin) +{ + int index = 0; + IPin *source_out; + HRESULT hr; + BOOL usedSmartTeePreviewPin = FALSE; + + /* depth-first search the graph for the first unconnected pin that matches + * the given category and type */ + for(;;){ + IPin *nextpin; + + if (pCategory && (IsEqualIID(pCategory, &PIN_CATEGORY_CAPTURE) || IsEqualIID(pCategory, &PIN_CATEGORY_PREVIEW))){ + IBaseFilter *sourceFilter = NULL; + hr = IUnknown_QueryInterface(pSource, &IID_IBaseFilter, (void**)&sourceFilter); + if (SUCCEEDED(hr)) { + hr = match_smart_tee_pin(This, pCategory, pType, pSource, &source_out); + if (hr == VFW_S_NOPREVIEWPIN) + usedSmartTeePreviewPin = TRUE; + IBaseFilter_Release(sourceFilter); + } else { + hr = ICaptureGraphBuilder2_FindPin(&This->ICaptureGraphBuilder2_iface, pSource, PINDIR_OUTPUT, pCategory, pType, FALSE, index, &source_out); + } + if (FAILED(hr)) + return E_INVALIDARG; + } else { + hr = ICaptureGraphBuilder2_FindPin(&This->ICaptureGraphBuilder2_iface, pSource, PINDIR_OUTPUT, pCategory, pType, FALSE, index, &source_out); + if (FAILED(hr)) + return E_INVALIDARG; + } + + hr = IPin_ConnectedTo(source_out, &nextpin); + if(SUCCEEDED(hr)){ + PIN_INFO info; + + IPin_Release(source_out); + + hr = IPin_QueryPinInfo(nextpin, &info); + if(FAILED(hr) || !info.pFilter){ + WARN("QueryPinInfo failed: %08x\n", hr); + return hr; + } + + hr = find_unconnected_pin(This, pCategory, pType, (IUnknown*)info.pFilter, out_pin); + + IBaseFilter_Release(info.pFilter); + + if(SUCCEEDED(hr)) + return hr; + }else{ + *out_pin = source_out; + if(usedSmartTeePreviewPin) + return VFW_S_NOPREVIEWPIN; + return S_OK; + } + + index++; + } +} static HRESULT WINAPI fnCaptureGraphBuilder2_RenderStream(ICaptureGraphBuilder2 * iface, @@ -372,8 +432,7 @@ fnCaptureGraphBuilder2_RenderStream(ICaptureGraphBuilder2 * iface, CaptureGraphImpl *This = impl_from_ICaptureGraphBuilder2(iface); IPin *source_out = NULL, *renderer_in; BOOL rendererNeedsRelease = FALSE; - BOOL usedSmartTeePreviewPin = FALSE; - HRESULT hr; + HRESULT hr, return_hr = S_OK; FIXME("(%p/%p)->(%s, %s, %p, %p, %p) semi-stub!\n", This, iface, debugstr_guid(pCategory), debugstr_guid(pType), @@ -388,25 +447,13 @@ fnCaptureGraphBuilder2_RenderStream(ICaptureGraphBuilder2 * iface, if (pCategory && IsEqualIID(pCategory, &PIN_CATEGORY_VBI)) { FIXME("Tee/Sink-to-Sink filter not supported\n"); return E_NOTIMPL; - } else if (pCategory && (IsEqualIID(pCategory, &PIN_CATEGORY_CAPTURE) || IsEqualIID(pCategory, &PIN_CATEGORY_PREVIEW))){ - IBaseFilter *sourceFilter = NULL; - hr = IUnknown_QueryInterface(pSource, &IID_IBaseFilter, (void**)&sourceFilter); - if (SUCCEEDED(hr)) { - hr = match_smart_tee_pin(This, pCategory, pType, pSource, &source_out); - if (hr == VFW_S_NOPREVIEWPIN) - usedSmartTeePreviewPin = TRUE; - IBaseFilter_Release(sourceFilter); - } else { - hr = ICaptureGraphBuilder2_FindPin(iface, pSource, PINDIR_OUTPUT, pCategory, pType, TRUE, 0, &source_out); - } - if (FAILED(hr)) - return E_INVALIDARG; - } else { - hr = ICaptureGraphBuilder2_FindPin(iface, pSource, PINDIR_OUTPUT, pCategory, pType, TRUE, 0, &source_out); - if (FAILED(hr)) - return E_INVALIDARG; } + hr = find_unconnected_pin(This, pCategory, pType, pSource, &source_out); + if (FAILED(hr)) + return hr; + return_hr = hr; + if (!pfRenderer) { IEnumMediaTypes *enumMedia = NULL; @@ -480,8 +527,8 @@ fnCaptureGraphBuilder2_RenderStream(ICaptureGraphBuilder2 * iface, IPin_Release(renderer_in); if (rendererNeedsRelease) IBaseFilter_Release(pfRenderer); - if (SUCCEEDED(hr) && usedSmartTeePreviewPin) - hr = VFW_S_NOPREVIEWPIN; + if (SUCCEEDED(hr)) + return return_hr; return hr; }

1 0