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

Damjan Jovanovic : qcap: Get the SmartTee filter to a minimally functional level.
by Alexandre Julliard June 2, 2015

June 2, 2015

Module: wine Branch: master Commit: 419be23964d4b4048f451acb64e46eb883a35842 URL: http://source.winehq.org/git/wine.git/?a=commit;h=419be23964d4b4048f451acb6… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun May 31 20:11:44 2015 +0200 qcap: Get the SmartTee filter to a minimally functional level. --- dlls/qcap/smartteefilter.c | 161 +++++++++++++++++++++++++++++++++++++-- dlls/qcap/tests/smartteefilter.c | 16 ++-- 2 files changed, 161 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=419be23964d4b4048f451…

1 0

Damjan Jovanovic : qcap: Implement the SmartTee allocator functions.
by Alexandre Julliard June 2, 2015

June 2, 2015

Module: wine Branch: master Commit: 95c2b22c569757e0fccfc87967511fb3ea9b780a URL: http://source.winehq.org/git/wine.git/?a=commit;h=95c2b22c569757e0fccfc8796… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun May 31 20:10:30 2015 +0200 qcap: Implement the SmartTee allocator functions. --- dlls/qcap/smartteefilter.c | 29 ++++++++++++++++---------- dlls/qcap/tests/smartteefilter.c | 44 ++++++++++++++++++++++++++++++---------- 2 files changed, 51 insertions(+), 22 deletions(-) diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c index 9af2e9a..d550169 100644 --- a/dlls/qcap/smartteefilter.c +++ b/dlls/qcap/smartteefilter.c @@ -374,12 +374,13 @@ static HRESULT WINAPI SmartTeeFilterCapture_GetMediaType(BasePin *base, int iPos return S_FALSE; } -static HRESULT WINAPI SmartTeeFilterCapture_DecideBufferSize(BaseOutputPin *base, IMemAllocator *alloc, - ALLOCATOR_PROPERTIES *ppropInputRequest) +static HRESULT WINAPI SmartTeeFilterCapture_DecideAllocator(BaseOutputPin *base, IMemInputPin *pPin, IMemAllocator **pAlloc) { SmartTeeFilter *This = impl_from_BasePin(&base->pin); - FIXME("(%p, %p, %p): stub\n", This, alloc, ppropInputRequest); - return E_NOTIMPL; + TRACE("(%p, %p, %p)\n", This, pPin, pAlloc); + *pAlloc = This->input->pAllocator; + IMemAllocator_AddRef(This->input->pAllocator); + return IMemInputPin_NotifyAllocator(pPin, This->input->pAllocator, TRUE); } static HRESULT WINAPI SmartTeeFilterCapture_BreakConnect(BaseOutputPin *base) @@ -396,8 +397,8 @@ static const BaseOutputPinFuncTable SmartTeeFilterCaptureFuncs = { SmartTeeFilterCapture_GetMediaTypeVersion, SmartTeeFilterCapture_GetMediaType }, - SmartTeeFilterCapture_DecideBufferSize, - BaseOutputPinImpl_DecideAllocator, + NULL, + SmartTeeFilterCapture_DecideAllocator, SmartTeeFilterCapture_BreakConnect }; @@ -466,11 +467,13 @@ static HRESULT WINAPI SmartTeeFilterPreview_GetMediaType(BasePin *base, int iPos return S_FALSE; } -static HRESULT WINAPI SmartTeeFilterPreview_DecideBufferSize(BaseOutputPin *base, IMemAllocator *alloc, ALLOCATOR_PROPERTIES *ppropInputRequest) +static HRESULT WINAPI SmartTeeFilterPreview_DecideAllocator(BaseOutputPin *base, IMemInputPin *pPin, IMemAllocator **pAlloc) { SmartTeeFilter *This = impl_from_BasePin(&base->pin); - FIXME("(%p, %p, %p): stub\n", This, alloc, ppropInputRequest); - return E_NOTIMPL; + TRACE("(%p, %p, %p)\n", This, pPin, pAlloc); + *pAlloc = This->input->pAllocator; + IMemAllocator_AddRef(This->input->pAllocator); + return IMemInputPin_NotifyAllocator(pPin, This->input->pAllocator, TRUE); } static HRESULT WINAPI SmartTeeFilterPreview_BreakConnect(BaseOutputPin *base) @@ -487,8 +490,8 @@ static const BaseOutputPinFuncTable SmartTeeFilterPreviewFuncs = { SmartTeeFilterPreview_GetMediaTypeVersion, SmartTeeFilterPreview_GetMediaType }, - SmartTeeFilterPreview_DecideBufferSize, - BaseOutputPinImpl_DecideAllocator, + NULL, + SmartTeeFilterPreview_DecideAllocator, SmartTeeFilterPreview_BreakConnect }; IUnknown* WINAPI QCAP_createSmartTeeFilter(IUnknown *outer, HRESULT *phr) @@ -521,6 +524,10 @@ IUnknown* WINAPI QCAP_createSmartTeeFilter(IUnknown *outer, HRESULT *phr) &SmartTeeFilterInputFuncs, &This->filter.csFilter, NULL, (IPin**)&This->input); if (FAILED(hr)) goto end; + hr = CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, + &IID_IMemAllocator, (void**)&This->input->pAllocator); + if (FAILED(hr)) + goto end; capturePinInfo.pFilter = &This->filter.IBaseFilter_iface; hr = BaseOutputPin_Construct(&SmartTeeFilterCaptureVtbl, sizeof(BaseOutputPin), &capturePinInfo, diff --git a/dlls/qcap/tests/smartteefilter.c b/dlls/qcap/tests/smartteefilter.c index 1255887..e23e66f 100644 --- a/dlls/qcap/tests/smartteefilter.c +++ b/dlls/qcap/tests/smartteefilter.c @@ -41,6 +41,7 @@ typedef struct { DWORD receiveThreadId; IPin IPin_iface; IMemInputPin IMemInputPin_iface; + IMemAllocator *allocator; IBaseFilter *nullRenderer; IPin *nullRendererPin; IMemInputPin *nullRendererMemInputPin; @@ -106,6 +107,8 @@ static ULONG WINAPI SinkFilter_Release(IBaseFilter *iface) SinkFilter *This = impl_from_SinkFilter_IBaseFilter(iface); ULONG ref = InterlockedDecrement(&This->ref); if(!ref) { + if (This->allocator) + IMemAllocator_Release(This->allocator); IMemInputPin_Release(This->nullRendererMemInputPin); IPin_Release(This->nullRendererPin); IBaseFilter_Release(This->nullRenderer); @@ -493,6 +496,7 @@ static ULONG WINAPI SinkMemInputPin_Release(IMemInputPin *iface) static HRESULT WINAPI SinkMemInputPin_GetAllocator(IMemInputPin *iface, IMemAllocator **ppAllocator) { SinkFilter *This = impl_from_SinkFilter_IMemInputPin(iface); + ok(0, "SmartTeeFilter never calls IMemInputPin_GetAllocator()\n"); return IMemInputPin_GetAllocator(This->nullRendererMemInputPin, ppAllocator); } @@ -500,6 +504,9 @@ static HRESULT WINAPI SinkMemInputPin_NotifyAllocator(IMemInputPin *iface, IMemA BOOL bReadOnly) { SinkFilter *This = impl_from_SinkFilter_IMemInputPin(iface); + This->allocator = pAllocator; + IMemAllocator_AddRef(This->allocator); + ok(bReadOnly, "bReadOnly isn't supposed to be FALSE\n"); return IMemInputPin_NotifyAllocator(This->nullRendererMemInputPin, pAllocator, bReadOnly); } @@ -507,6 +514,7 @@ static HRESULT WINAPI SinkMemInputPin_GetAllocatorRequirements(IMemInputPin *ifa ALLOCATOR_PROPERTIES *pProps) { SinkFilter *This = impl_from_SinkFilter_IMemInputPin(iface); + ok(0, "SmartTeeFilter never calls IMemInputPin_GetAllocatorRequirements()\n"); return IMemInputPin_GetAllocatorRequirements(This->nullRendererMemInputPin, pProps); } @@ -727,7 +735,7 @@ static DWORD WINAPI media_thread(LPVOID param) } hr = IMemInputPin_Receive(This->memInputPin, sample); - ok(SUCCEEDED(hr), "delivering sample to SmartTeeFilter's Input pin failed, hr=0x%08x\n", hr); + todo_wine ok(SUCCEEDED(hr), "delivering sample to SmartTeeFilter's Input pin failed, hr=0x%08x\n", hr); IMediaSample_Release(sample); } @@ -1016,7 +1024,7 @@ static HRESULT WINAPI SourcePin_Connect(IPin *iface, IPin *pReceivePin, const AM hr = IPin_QueryInterface(pReceivePin, &IID_IMemInputPin, (void**)&This->memInputPin); if (SUCCEEDED(hr)) { hr = IMemInputPin_GetAllocator(This->memInputPin, &This->allocator); - todo_wine ok(SUCCEEDED(hr), "couldn't get allocator from SmartTeeFilter, hr=0x%08x\n", hr); + ok(SUCCEEDED(hr), "couldn't get allocator from SmartTeeFilter, hr=0x%08x\n", hr); if (SUCCEEDED(hr)) { ALLOCATOR_PROPERTIES requested, actual; ZeroMemory(&requested, sizeof(ALLOCATOR_PROPERTIES)); @@ -1272,6 +1280,7 @@ static void test_smart_tee_filter_in_graph(IBaseFilter *smartTeeFilter, IPin *in SourceFilter *sourceFilter = NULL; SinkFilter *captureSinkFilter = NULL; SinkFilter *previewSinkFilter = NULL; + DWORD endTime; hr = CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IGraphBuilder, (LPVOID*)&graphBuilder); @@ -1322,7 +1331,7 @@ static void test_smart_tee_filter_in_graph(IBaseFilter *smartTeeFilter, IPin *in goto end; hr = IGraphBuilder_Connect(graphBuilder, &sourceFilter->IPin_iface, inputPin); - todo_wine ok(SUCCEEDED(hr), "couldn't connect source filter to Input pin, hr=0x%08x\n", hr); + ok(SUCCEEDED(hr), "couldn't connect source filter to Input pin, hr=0x%08x\n", hr); if (FAILED(hr)) goto end; hr = IGraphBuilder_Connect(graphBuilder, capturePin, &captureSinkFilter->IPin_iface); @@ -1334,6 +1343,9 @@ static void test_smart_tee_filter_in_graph(IBaseFilter *smartTeeFilter, IPin *in if (FAILED(hr)) goto end; + ok(sourceFilter->allocator == captureSinkFilter->allocator, "input and capture allocators don't match\n"); + ok(sourceFilter->allocator == previewSinkFilter->allocator, "input and preview allocators don't match\n"); + hr = IGraphBuilder_QueryInterface(graphBuilder, &IID_IMediaControl, (void**)&mediaControl); ok(SUCCEEDED(hr), "couldn't get IMediaControl interface from IGraphBuilder, hr=0x%08x\n", hr); if (FAILED(hr)) @@ -1343,14 +1355,24 @@ static void test_smart_tee_filter_in_graph(IBaseFilter *smartTeeFilter, IPin *in if (FAILED(hr)) goto end; - while (previewSinkFilter->receiveThreadId == 0 || captureSinkFilter->receiveThreadId == 0) - WaitForSingleObject(event, INFINITE); - ok(sourceFilter->mediaThreadId != captureSinkFilter->receiveThreadId, - "sending thread should != capture receiving thread\n"); - ok(sourceFilter->mediaThreadId != previewSinkFilter->receiveThreadId, - "sending thread should != preview receiving thread\n"); - ok(captureSinkFilter->receiveThreadId != previewSinkFilter->receiveThreadId, - "capture receiving thread should != preview receiving thread"); + endTime = GetTickCount() + 5000; + while (previewSinkFilter->receiveThreadId == 0 || captureSinkFilter->receiveThreadId == 0) { + DWORD now = GetTickCount(); + if (now < endTime) + WaitForSingleObject(event, endTime - now); + else + break; + } + if (previewSinkFilter->receiveThreadId != 0 && captureSinkFilter->receiveThreadId != 0) { + ok(sourceFilter->mediaThreadId != captureSinkFilter->receiveThreadId, + "sending thread should != capture receiving thread\n"); + ok(sourceFilter->mediaThreadId != previewSinkFilter->receiveThreadId, + "sending thread should != preview receiving thread\n"); + ok(captureSinkFilter->receiveThreadId != previewSinkFilter->receiveThreadId, + "capture receiving thread should != preview receiving thread"); + } else { + todo_wine ok(0, "timeout: threads did not receive sample in time\n"); + } IMediaControl_Stop(mediaControl);

1 0

Damjan Jovanovic : qcap: Load the default renderer when it' s not specified.
by Alexandre Julliard June 2, 2015

June 2, 2015

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 June 2, 2015

June 2, 2015

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 the SmartTee filter automatically as necessary, and test this.
by Alexandre Julliard June 2, 2015

June 2, 2015

Module: wine Branch: master Commit: 982be1dea23915b02b05b4c5ebefd59e45754f5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=982be1dea23915b02b05b4c5e… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun May 31 20:12:05 2015 +0200 qcap: Add the SmartTee filter automatically as necessary, and test this. --- dlls/qcap/capturegraph.c | 147 +++++++++-- dlls/qcap/tests/qcap.c | 160 +----------- dlls/qcap/tests/smartteefilter.c | 508 +++++++++++++++++++++++++++++++++++++-- 3 files changed, 615 insertions(+), 200 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=982be1dea23915b02b05b…

1 0

Indrek Altpere : mshtml: Add NULL check to get_frame_by_name.
by Alexandre Julliard June 2, 2015

June 2, 2015

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

Andrey Gusev : Ukrainian translation for release 1.7.44
by Jeremy Newman June 1, 2015

June 1, 2015

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

Łukasz Wojniłowicz : Polish translation for release 1.7.44
by Jeremy Newman June 1, 2015

June 1, 2015

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

Nikolay Sivov : ole32: Avoid potential null pointer access (Coverity).
by Alexandre Julliard June 1, 2015

June 1, 2015

Module: wine Branch: master Commit: 5c0e48e8ca523dece3d2556a223c1d675abbedbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c0e48e8ca523dece3d2556a2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 31 15:03:50 2015 +0300 ole32: Avoid potential null pointer access (Coverity). --- dlls/ole32/moniker.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index 6f7afa0..fee205c 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -1211,10 +1211,10 @@ HRESULT WINAPI GetClassFile(LPCOLESTR filePathName,CLSID *pclsid) res=StgOpenStorage(filePathName,NULL,STGM_READ | STGM_SHARE_DENY_WRITE,NULL,0,&pstg); - if (SUCCEEDED(res)) + if (SUCCEEDED(res)) { res=ReadClassStg(pstg,pclsid); - - IStorage_Release(pstg); + IStorage_Release(pstg); + } return res; }

1 0

Nikolay Sivov : riched20: Implement GetText() for regular range.
by Alexandre Julliard June 1, 2015

June 1, 2015

Module: wine Branch: master Commit: b2e13bc6e746904aa413620929de994165a8853f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2e13bc6e746904aa41362092… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 31 19:40:29 2015 +0300 riched20: Implement GetText() for regular range. --- dlls/riched20/richole.c | 28 +++++++++++++++++++++++----- dlls/riched20/tests/richole.c | 20 ++++++-------------- 2 files changed, 29 insertions(+), 19 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 5b8cad5..5b921fe 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -1563,20 +1563,38 @@ static HRESULT WINAPI ITextRange_fnInvoke(ITextRange *me, DISPID dispIdMember, R return hr; } -static HRESULT WINAPI ITextRange_fnGetText(ITextRange *me, BSTR *pbstr) +static HRESULT WINAPI ITextRange_fnGetText(ITextRange *me, BSTR *str) { ITextRangeImpl *This = impl_from_ITextRange(me); + ME_Cursor start, end; + int length; + BOOL bEOP; - FIXME("(%p)->(%p): stub\n", This, pbstr); + TRACE("(%p)->(%p)\n", This, str); if (!This->reOle) return CO_E_RELEASED; - if (!pbstr) + if (!str) return E_INVALIDARG; - *pbstr = NULL; - return E_NOTIMPL; + /* return early for degenerate range */ + if (This->start == This->end) { + *str = NULL; + return S_OK; + } + + ME_CursorFromCharOfs(This->reOle->editor, This->start, &start); + ME_CursorFromCharOfs(This->reOle->editor, This->end, &end); + + length = This->end - This->start; + *str = SysAllocStringLen(NULL, length); + if (!*str) + return E_OUTOFMEMORY; + + bEOP = (end.pRun->next->type == diTextEnd && This->end > ME_GetTextLength(This->reOle->editor)); + ME_GetTextW(This->reOle->editor, *str, length, &start, length, FALSE, bEOP); + return S_OK; } static HRESULT WINAPI ITextRange_fnSetText(ITextRange *me, BSTR str) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 02aaefb..79c3c3d 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -544,27 +544,24 @@ static void test_GetText(void) hres = ITextDocument_Range(txtDoc, 0, 4, &range); ok(hres == S_OK, "got 0x%08x\n", hres); hres = ITextRange_GetText(range, &bstr); -todo_wine { ok(hres == S_OK, "got 0x%08x\n", hres); ok(!lstrcmpW(bstr, bufW1), "got wrong text: %s\n", wine_dbgstr_w(bstr)); -} + SysFreeString(bstr); ITextRange_Release(range); hres = ITextDocument_Range(txtDoc, 4, 0, &range); ok(hres == S_OK, "got 0x%08x\n", hres); hres = ITextRange_GetText(range, &bstr); -todo_wine { ok(hres == S_OK, "got 0x%08x\n", hres); ok(!lstrcmpW(bstr, bufW1), "got wrong text: %s\n", wine_dbgstr_w(bstr)); -} + SysFreeString(bstr); ITextRange_Release(range); hres = ITextDocument_Range(txtDoc, 1, 1, &range); ok(hres == S_OK, "got 0x%08x\n", hres); hres = ITextRange_GetText(range, &bstr); -todo_wine ok(hres == S_OK, "got 0x%08x\n", hres); ok(!bstr, "got wrong text: %s\n", wine_dbgstr_w(bstr)); if (!is64bit) @@ -577,37 +574,33 @@ todo_wine hres = ITextDocument_Range(txtDoc, 8, 12, &range); ok(hres == S_OK, "got 0x%08x\n", hres); hres = ITextRange_GetText(range, &bstr); -todo_wine { ok(hres == S_OK, "got 0x%08x\n", hres); ok(!lstrcmpW(bstr, bufW3), "got wrong text: %s\n", wine_dbgstr_w(bstr)); -} + SysFreeString(bstr); ITextRange_Release(range); hres = ITextDocument_Range(txtDoc, 8, 13, &range); ok(hres == S_OK, "got 0x%08x\n", hres); hres = ITextRange_GetText(range, &bstr); -todo_wine { ok(hres == S_OK, "got 0x%08x\n", hres); ok(!lstrcmpW(bstr, bufW2), "got wrong text: %s\n", wine_dbgstr_w(bstr)); -} + SysFreeString(bstr); ITextRange_Release(range); hres = ITextDocument_Range(txtDoc, 12, 13, &range); ok(hres == S_OK, "got 0x%08x\n", hres); hres = ITextRange_GetText(range, &bstr); -todo_wine { ok(hres == S_OK, "got 0x%08x\n", hres); ok(!lstrcmpW(bstr, bufW5), "got wrong text: %s\n", wine_dbgstr_w(bstr)); -} + SysFreeString(bstr); ITextRange_Release(range); hres = ITextDocument_Range(txtDoc, 0, -1, &range); ok(hres == S_OK, "got 0x%08x\n", hres); hres = ITextRange_GetText(range, &bstr); -todo_wine ok(hres == S_OK, "got 0x%08x\n", hres); ok(!bstr, "got wrong text: %s\n", wine_dbgstr_w(bstr)); ITextRange_Release(range); @@ -615,10 +608,9 @@ todo_wine hres = ITextDocument_Range(txtDoc, -1, 9, &range); ok(hres == S_OK, "got 0x%08x\n", hres); hres = ITextRange_GetText(range, &bstr); -todo_wine { ok(hres == S_OK, "got 0x%08x\n", hres); ok(!lstrcmpW(bstr, bufW6), "got wrong text: %s\n", wine_dbgstr_w(bstr)); -} + SysFreeString(bstr); release_interfaces(&w, &reOle, &txtDoc, NULL);

1 0