June 2015 - Wine-commits - list.winehq.org

Damjan Jovanovic : qcap: Load the default renderer when it' s not specified.
by Alexandre Julliard 02 Jun '15

02 Jun '15

Module: wine Branch: master Commit: 3f3e719551ad4f2b2efc0ff525ac15e352f97a33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f3e719551ad4f2b2efc0ff52… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun May 31 20:13:12 2015 +0200 qcap: Load the default renderer when it's not specified. --- dlls/qcap/capturegraph.c | 44 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 39 insertions(+), 5 deletions(-) diff --git a/dlls/qcap/capturegraph.c b/dlls/qcap/capturegraph.c index b414d54..372e16f 100644 --- a/dlls/qcap/capturegraph.c +++ b/dlls/qcap/capturegraph.c @@ -371,6 +371,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; @@ -383,11 +384,6 @@ fnCaptureGraphBuilder2_RenderStream(ICaptureGraphBuilder2 * iface, FIXME("Need a capture graph\n"); return E_UNEXPECTED; } - if (!pfRenderer) - { - FIXME("pfRenderer == NULL not yet supported\n"); - return E_NOTIMPL; - } if (pCategory && IsEqualIID(pCategory, &PIN_CATEGORY_VBI)) { FIXME("Tee/Sink-to-Sink filter not supported\n"); @@ -411,9 +407,45 @@ fnCaptureGraphBuilder2_RenderStream(ICaptureGraphBuilder2 * iface, return E_INVALIDARG; } + if (!pfRenderer) + { + IEnumMediaTypes *enumMedia = NULL; + hr = IPin_EnumMediaTypes(source_out, &enumMedia); + if (SUCCEEDED(hr)) { + AM_MEDIA_TYPE *mediaType; + hr = IEnumMediaTypes_Next(enumMedia, 1, &mediaType, NULL); + if (SUCCEEDED(hr)) { + if (IsEqualIID(&mediaType->majortype, &MEDIATYPE_Video)) { + hr = CoCreateInstance(&CLSID_VideoRenderer, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void**)&pfRenderer); + } else if (IsEqualIID(&mediaType->majortype, &MEDIATYPE_Audio)) { + hr = CoCreateInstance(&CLSID_DSoundRender, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void**)&pfRenderer); + } else { + FIXME("cannot automatically load renderer for majortype %s\n", debugstr_guid(&mediaType->majortype)); + hr = E_FAIL; + } + if (SUCCEEDED(hr)) { + rendererNeedsRelease = TRUE; + hr = IGraphBuilder_AddFilter(This->mygraph, pfRenderer, NULL); + } + DeleteMediaType(mediaType); + } + IEnumMediaTypes_Release(enumMedia); + } + if (FAILED(hr)) { + if (rendererNeedsRelease) + IBaseFilter_Release(pfRenderer); + IPin_Release(source_out); + return hr; + } + } + hr = ICaptureGraphBuilder2_FindPin(iface, (IUnknown*)pfRenderer, PINDIR_INPUT, NULL, NULL, TRUE, 0, &renderer_in); if (FAILED(hr)) { + if (rendererNeedsRelease) + IBaseFilter_Release(pfRenderer); IPin_Release(source_out); return hr; } @@ -446,6 +478,8 @@ fnCaptureGraphBuilder2_RenderStream(ICaptureGraphBuilder2 * iface, IPin_Release(source_out); IPin_Release(renderer_in); + if (rendererNeedsRelease) + IBaseFilter_Release(pfRenderer); if (SUCCEEDED(hr) && usedSmartTeePreviewPin) hr = VFW_S_NOPREVIEWPIN; return hr;

1 0

Damjan Jovanovic : qcap: If we have a single VfwCapture pin, its category should be PIN_CATEGORY_CAPTURE.
by Alexandre Julliard 02 Jun '15

02 Jun '15

Module: wine Branch: master Commit: 916dfb12b6113d876410f5747aeea07c9adfff24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=916dfb12b6113d876410f5747… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun May 31 20:13:35 2015 +0200 qcap: If we have a single VfwCapture pin, its category should be PIN_CATEGORY_CAPTURE. --- dlls/qcap/vfwcapture.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 23f7407..5d128f2 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -642,8 +642,8 @@ KSP_Get( IKsPropertySet * iface, REFGUID guidPropSet, DWORD dwPropID, if (cbPropData < sizeof(GUID)) return E_UNEXPECTED; pGuid = pPropData; - *pGuid = PIN_CATEGORY_PREVIEW; - FIXME("() Not adding a pin with PIN_CATEGORY_CAPTURE\n"); + *pGuid = PIN_CATEGORY_CAPTURE; + FIXME("() Not adding a pin with PIN_CATEGORY_PREVIEW\n"); return S_OK; }

1 0

Damjan Jovanovic : qcap: Add initial audio capture filter.
by Alexandre Julliard 02 Jun '15

02 Jun '15

Module: wine Branch: master Commit: 9c922b6ab5e43e9af7ebac7ba6eae1abfaa763f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c922b6ab5e43e9af7ebac7ba… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun May 31 20:14:43 2015 +0200 qcap: Add initial audio capture filter. --- dlls/qcap/Makefile.in | 1 + dlls/qcap/audiorecord.c | 302 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/qcap/qcap_main.c | 2 +- 3 files changed, 304 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9c922b6ab5e43e9af7eba…

1 0

Damjan Jovanovic : qcap: The VfwCapture filter's GetNumberOfCapabilities() should set the capability count to zero.
by Alexandre Julliard 02 Jun '15

02 Jun '15

Module: wine Branch: master Commit: bd5e184bfbc228a486ad74d2490e8afef6f2a5a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd5e184bfbc228a486ad74d24… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun May 31 20:15:20 2015 +0200 qcap: The VfwCapture filter's GetNumberOfCapabilities() should set the capability count to zero. --- dlls/qcap/vfwcapture.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 5d128f2..efae931 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -374,6 +374,7 @@ AMStreamConfig_GetNumberOfCapabilities( IAMStreamConfig *iface, int *piCount, int *piSize ) { FIXME("%p: %p %p - stub, intentional\n", iface, piCount, piSize); + *piCount = 0; return E_NOTIMPL; /* Not implemented for this interface */ }

1 0

Indrek Altpere : mshtml: Add NULL check to avoid crashing due to Gecko bug.
by Alexandre Julliard 02 Jun '15

02 Jun '15

Module: wine Branch: master Commit: 55c03ad4d219ae8ba78ec30e6ff1ad82070bd2ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=55c03ad4d219ae8ba78ec30e6… Author: Indrek Altpere <efbiaiinzinz(a)hotmail.com> Date: Mon Jun 1 14:11:21 2015 +0300 mshtml: Add NULL check to avoid crashing due to Gecko bug. --- dlls/mshtml/htmlcurstyle.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index 5f6cb35..f0b0d98 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -1343,6 +1343,11 @@ HRESULT HTMLCurrentStyle_Create(HTMLElement *elem, IHTMLCurrentStyle **p) return E_FAIL; } + if(!nsstyle) { + ERR("GetComputedStyle returned NULL nsstyle\n"); + return E_FAIL; + } + ret = heap_alloc_zero(sizeof(HTMLCurrentStyle)); if(!ret) { nsIDOMCSSStyleDeclaration_Release(nsstyle);

1 0

Indrek Altpere : mshtml: Add NULL check to get_frame_by_name.
by Alexandre Julliard 02 Jun '15

02 Jun '15

Module: wine Branch: master Commit: 2676488fcd95c70ff18404660877f63ac6838789 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2676488fcd95c70ff18404660… Author: Indrek Altpere <efbiaiinzinz(a)hotmail.com> Date: Fri May 29 16:51:50 2015 +0300 mshtml: Add NULL check to get_frame_by_name. --- dlls/mshtml/htmlwindow.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 618648e..c53ea16 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -406,6 +406,11 @@ HRESULT get_frame_by_name(HTMLOuterWindow *This, const WCHAR *name, BOOL deep, H nsIDOMWindow_Release(nswindow); + if(!window_iter) { + WARN("nsIDOMWindow without HTMLOuterWindow: %p\n", nswindow); + continue; + } + hres = IHTMLElement_get_id(&window_iter->frame_element->element.IHTMLElement_iface, &id); if(FAILED(hres)) { FIXME("IHTMLElement_get_id failed: 0x%08x\n", hres);

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.44
by Jeremy Newman 01 Jun '15

01 Jun '15

Module: website Branch: master Commit: 509e9a8921665b568a9d9755421ed35b4415eeec URL: http://source.winehq.org/git/website.git/?a=commit;h=509e9a8921665b568a9d97… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat May 30 06:50:48 2015 +0200 Polish translation for release 1.7.44 --- news/pl/2015052901.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/pl/2015052901.xml b/news/pl/2015052901.xml new file mode 100644 index 0000000..89b450f --- /dev/null +++ b/news/pl/2015052901.xml @@ -0,0 +1,16 @@ +<news> +<date>Maj 29, 2015</date> +<title>Wydano Wine 1.7.44</title> +<body> + Wydanie rozwojowe Wine 1.7.44 jest już dostępne. + <a href="{$root}/announce/1.7.44">Co nowego</a> w tym wydaniu: +<ul> + <li>Szersze wsparcie dla interfejsów COM w kontrolkach RichEdit.</li> + <li>Wstępna wersja filtra SmartTee.</li> + <li>Trochę szersze wsparcie dla platformy ARM64.</li> + <li>Wsparcie dla obiektów jądra w postaci urządzeń zerowych.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.44.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Andrey Gusev : Ukrainian translation for release 1.7.44
by Jeremy Newman 01 Jun '15

01 Jun '15

Module: website Branch: master Commit: 36e30b8e60f221e7b578ab186f8f6f70697f653e URL: http://source.winehq.org/git/website.git/?a=commit;h=36e30b8e60f221e7b578ab… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat May 30 15:47:46 2015 +0300 Ukrainian translation for release 1.7.44 --- news/uk/2015052901.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/uk/2015052901.xml b/news/uk/2015052901.xml new file mode 100644 index 0000000..c1e4a5a --- /dev/null +++ b/news/uk/2015052901.xml @@ -0,0 +1,16 @@ +<news> +<date>29 травня 2015</date> +<title>Випущено Wine 1.7.44</title> +<body> + Розробницький реліз Wine 1.7.44 наразі доступний. + <a href="{$root}/announce/1.7.44">Що нового</a> в цьому релізі: +<ul> + <li>Більша підтримка для COM-інтерфейсів управління RichEdit.</li> + <li>Початкова реалізація фільтра SmartTee.</li> + <li>Більша підтримка для платформи ARM64.</li> + <li>Підтримка об'єктів ядра null device.</li> + <li>Виправлення різних помилок.</li> +</ul> +Вихідний код <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.44.tar.bz2">вже доступний</a>. +Готові пакунки в процесі створення і в найближчий час будуть доступні у відповідних <a href="{$root}/download">місцях</a>. +</body></news>

1 0

Jacek Caban : jscript: Correctly handle pvarResult in ParseScriptText.
by Alexandre Julliard 01 Jun '15

01 Jun '15

Module: wine Branch: master Commit: ccccd1c43576943f958ee76b654f2f9c0aedf06b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccccd1c43576943f958ee76b6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 29 18:07:37 2015 +0200 jscript: Correctly handle pvarResult in ParseScriptText. --- dlls/jscript/jscript.c | 14 ++++++++++--- dlls/jscript/tests/run.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 4a32c4d..9519479 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -795,7 +795,11 @@ static HRESULT WINAPI JScriptParse_ParseScriptText(IActiveScriptParse *iface, return hres; } - if(!is_started(This->ctx)) { + /* + * Although pvarResult is not really used without SCRIPTTEXT_ISEXPRESSION flag, if it's not NULL, + * script is executed immediately, even if it's not in started state yet. + */ + if(!pvarResult && !is_started(This->ctx)) { if(This->queue_tail) This->queue_tail = This->queue_tail->next = code; else @@ -804,9 +808,13 @@ static HRESULT WINAPI JScriptParse_ParseScriptText(IActiveScriptParse *iface, } hres = exec_global_code(This, code); - release_bytecode(code); - return hres; + if(FAILED(hres)) + return hres; + + if(pvarResult) + V_VT(pvarResult) = VT_EMPTY; + return S_OK; } static const IActiveScriptParseVtbl JScriptParseVtbl = { diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 97799db..40a1245 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -2016,6 +2016,56 @@ static HRESULT parse_script_expr(const char *expr, VARIANT *res, IActiveScript * return hres; } +static void test_retval(void) +{ + BSTR str = a2bstr("reportSuccess(), true"); + IActiveScriptParse *parser; + IActiveScript *engine; + SCRIPTSTATE state; + VARIANT res; + HRESULT hres; + + engine = create_script(); + + hres = IActiveScript_QueryInterface(engine, &IID_IActiveScriptParse, (void**)&parser); + ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres); + + hres = IActiveScriptParse_InitNew(parser); + ok(hres == S_OK, "InitNew failed: %08x\n", hres); + + hres = IActiveScript_SetScriptSite(engine, &ActiveScriptSite); + ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); + + SET_EXPECT(GetItemInfo_testVal); + hres = IActiveScript_AddNamedItem(engine, test_valW, + SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE|SCRIPTITEM_GLOBALMEMBERS); + ok(hres == S_OK, "AddNamedItem failed: %08x\n", hres); + CHECK_CALLED(GetItemInfo_testVal); + + V_VT(&res) = VT_NULL; + SET_EXPECT(global_success_d); + SET_EXPECT(global_success_i); + hres = IActiveScriptParse_ParseScriptText(parser, str, NULL, NULL, NULL, 0, 0, 0, &res, NULL); + CHECK_CALLED(global_success_d); + CHECK_CALLED(global_success_i); + ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); + ok(V_VT(&res) == VT_EMPTY, "V_VT(&res) = %d\n", V_VT(&res)); + + hres = IActiveScript_GetScriptState(engine, &state); + ok(hres == S_OK, "GetScriptState failed: %08x\n", hres); + ok(state == SCRIPTSTATE_INITIALIZED, "state = %d\n", state); + + hres = IActiveScript_SetScriptState(engine, SCRIPTSTATE_STARTED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_STARTED) failed: %08x\n", hres); + + hres = IActiveScript_Close(engine); + ok(hres == S_OK, "Close failed: %08x\n", hres); + + IActiveScriptParse_Release(parser); + IActiveScript_Release(engine); + SysFreeString(str); +} + static void test_default_value(void) { DISPPARAMS dp = {0}; @@ -2084,6 +2134,7 @@ static void test_script_exprs(void) CHECK_CALLED(global_success_i); test_default_value(); + test_retval(); testing_expr = FALSE; }

1 0

Nikolay Sivov : mshtml/tests: Fix use-after-free in events tests.
by Alexandre Julliard 01 Jun '15

01 Jun '15

Module: wine Branch: master Commit: a3916f636d9bebf18dcb0bdd3411fc047a60f3fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3916f636d9bebf18dcb0bdd3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 29 19:12:12 2015 +0300 mshtml/tests: Fix use-after-free in events tests. --- dlls/mshtml/tests/events.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 11a91da..07549e3 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -1076,13 +1076,13 @@ static HRESULT WINAPI submit_onclick_setret(IDispatchEx *iface, DISPID id, LCID hres = IHTMLEventObj_put_returnValue(event, onclick_event_retval); ok(hres == S_OK, "put_returnValue failed: %08x\n", hres); - IHTMLEventObj_Release(event); V_VT(&v) = VT_ERROR; hres = IHTMLEventObj_get_returnValue(event, &v); ok(hres == S_OK, "get_returnValue failed: %08x\n", hres); ok(VarCmp(&v, &onclick_event_retval, 0, 0) == VARCMP_EQ, "unexpected returnValue\n"); + IHTMLEventObj_Release(event); *pvarRes = onclick_retval; return S_OK; } @@ -1108,9 +1108,9 @@ static HRESULT WINAPI submit_onclick_cancel(IDispatchEx *iface, DISPID id, LCID hres = IHTMLEventObj_put_cancelBubble(event, VARIANT_TRUE); ok(hres == S_OK, "put_returnValue failed: %08x\n", hres); - IHTMLEventObj_Release(event); test_event_cancelbubble(event, VARIANT_TRUE); + IHTMLEventObj_Release(event); return S_OK; }

1 0