May 2019 - Wine-commits - list.winehq.org

Zebediah Figura : quartz/vmr9: Implement IVMRWindowlessControl:: SetVideoClippingWindow().
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: 61b5f780e291073f4a05b7a67e01e0ad6f3ce6a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61b5f780e291073f4a05b7a6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat May 25 15:21:21 2019 -0500 quartz/vmr9: Implement IVMRWindowlessControl::SetVideoClippingWindow(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47258 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 847dc40..0178f36 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -1831,13 +1831,13 @@ static HRESULT WINAPI VMR7WindowlessControl_SetAspectRatioMode(IVMRWindowlessCon return E_NOTIMPL; } -static HRESULT WINAPI VMR7WindowlessControl_SetVideoClippingWindow(IVMRWindowlessControl *iface, - HWND hwnd) +static HRESULT WINAPI VMR7WindowlessControl_SetVideoClippingWindow(IVMRWindowlessControl *iface, HWND window) { - struct quartz_vmr *This = impl_from_IVMRWindowlessControl(iface); + struct quartz_vmr *filter = impl_from_IVMRWindowlessControl(iface); - FIXME("(%p/%p)->(...) stub\n", iface, This); - return E_NOTIMPL; + TRACE("iface %p, window %p.\n", iface, window); + + return IVMRWindowlessControl9_SetVideoClippingWindow(&filter->IVMRWindowlessControl9_iface, window); } static HRESULT WINAPI VMR7WindowlessControl_RepaintVideo(IVMRWindowlessControl *iface,

1 0

Zebediah Figura : strmbase/transform: Use BaseFilterImpl_Release().
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: b3065a8b0299955ff7e6dde3032bf521932a82c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3065a8b0299955ff7e6dde3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat May 25 15:21:22 2019 -0500 strmbase/transform: Use BaseFilterImpl_Release(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/transform.c | 71 +++++++++++++++++++++-------------------------- 1 file changed, 31 insertions(+), 40 deletions(-) diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 6a7636c..04ef23e 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -139,8 +139,38 @@ static IPin *transform_get_pin(BaseFilter *iface, unsigned int index) return filter->ppPins[index]; } +static void transform_destroy(BaseFilter *iface) +{ + TransformFilter *filter = impl_from_BaseFilter(iface); + ULONG i; + + for (i = 0; i < 2; ++i) + { + IPin *peer; + + if (SUCCEEDED(IPin_ConnectedTo(filter->ppPins[i], &peer))) + { + IPin_Disconnect(peer); + IPin_Release(peer); + } + IPin_Disconnect(filter->ppPins[i]); + IPin_Release(filter->ppPins[i]); + } + + CoTaskMemFree(filter->ppPins); + + filter->csReceive.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&filter->csReceive); + FreeMediaType(&filter->pmt); + QualityControlImpl_Destroy(filter->qcimpl); + IUnknown_Release(filter->seekthru_unk); + strmbase_filter_cleanup(&filter->filter); + CoTaskMemFree(filter); +} + static const BaseFilterFuncTable tfBaseFuncTable = { .filter_get_pin = transform_get_pin, + .filter_destroy = transform_destroy, }; static const BaseInputPinFuncTable tf_input_BaseInputFuncTable = { @@ -161,45 +191,6 @@ static const BaseOutputPinFuncTable tf_output_BaseOutputFuncTable = { BaseOutputPinImpl_DecideAllocator, }; -static ULONG WINAPI TransformFilterImpl_Release(IBaseFilter * iface) -{ - TransformFilter *This = impl_from_IBaseFilter(iface); - ULONG refCount = InterlockedDecrement(&This->filter.refCount); - - TRACE("(%p/%p)->() Release from %d\n", This, iface, refCount + 1); - - if (!refCount) - { - ULONG i; - - for (i = 0; i < 2; i++) - { - IPin *pConnectedTo; - - if (SUCCEEDED(IPin_ConnectedTo(This->ppPins[i], &pConnectedTo))) - { - IPin_Disconnect(pConnectedTo); - IPin_Release(pConnectedTo); - } - IPin_Disconnect(This->ppPins[i]); - - IPin_Release(This->ppPins[i]); - } - - CoTaskMemFree(This->ppPins); - - TRACE("Destroying transform filter\n"); - This->csReceive.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&This->csReceive); - FreeMediaType(&This->pmt); - QualityControlImpl_Destroy(This->qcimpl); - IUnknown_Release(This->seekthru_unk); - strmbase_filter_cleanup(&This->filter); - CoTaskMemFree(This); - } - return refCount; -} - static HRESULT WINAPI TransformFilterImpl_Stop(IBaseFilter *iface) { TransformFilter *This = impl_from_IBaseFilter(iface); @@ -275,7 +266,7 @@ static const IBaseFilterVtbl transform_vtbl = { BaseFilterImpl_QueryInterface, BaseFilterImpl_AddRef, - TransformFilterImpl_Release, + BaseFilterImpl_Release, BaseFilterImpl_GetClassID, TransformFilterImpl_Stop, TransformFilterImpl_Pause,

1 0

Zebediah Figura : qcap/avico: Use BaseFilterImpl_Release().
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: 912dd6ffae678d2037aff42427263e9eb07484e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=912dd6ffae678d2037aff424… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat May 25 15:21:23 2019 -0500 qcap/avico: Use BaseFilterImpl_Release(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avico.c | 40 +++++++++++++++++----------------------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index e2f21d0..67e7f50 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -147,28 +147,6 @@ static HRESULT WINAPI AVICompressor_QueryInterface(IBaseFilter *iface, REFIID ri } -static ULONG WINAPI AVICompressor_Release(IBaseFilter *iface) -{ - AVICompressor *This = impl_from_IBaseFilter(iface); - ULONG ref = InterlockedDecrement(&This->filter.refCount); - - TRACE("(%p) ref=%d\n", This, ref); - - if(!ref) { - if(This->hic) - ICClose(This->hic); - heap_free(This->videoinfo); - if(This->in) - BaseInputPinImpl_Release(&This->in->pin.IPin_iface); - if(This->out) - BaseOutputPinImpl_Release(&This->out->pin.IPin_iface); - strmbase_filter_cleanup(&This->filter); - heap_free(This); - } - - return ref; -} - static HRESULT WINAPI AVICompressor_Stop(IBaseFilter *iface) { AVICompressor *This = impl_from_IBaseFilter(iface); @@ -229,7 +207,7 @@ static HRESULT WINAPI AVICompressor_QueryVendorInfo(IBaseFilter *iface, LPWSTR * static const IBaseFilterVtbl AVICompressorVtbl = { AVICompressor_QueryInterface, BaseFilterImpl_AddRef, - AVICompressor_Release, + BaseFilterImpl_Release, BaseFilterImpl_GetClassID, AVICompressor_Stop, AVICompressor_Pause, @@ -260,8 +238,24 @@ static IPin *avi_compressor_get_pin(BaseFilter *iface, unsigned int index) return ret; } +static void avi_compressor_destroy(BaseFilter *iface) +{ + AVICompressor *filter = impl_from_BaseFilter(iface); + + if (filter->hic) + ICClose(filter->hic); + heap_free(filter->videoinfo); + if (filter->in) + BaseInputPinImpl_Release(&filter->in->pin.IPin_iface); + if (filter->out) + BaseOutputPinImpl_Release(&filter->out->pin.IPin_iface); + strmbase_filter_cleanup(&filter->filter); + heap_free(filter); +} + static const BaseFilterFuncTable filter_func_table = { .filter_get_pin = avi_compressor_get_pin, + .filter_destroy = avi_compressor_destroy, }; static AVICompressor *impl_from_IPersistPropertyBag(IPersistPropertyBag *iface)

1 0

Zebediah Figura : winegstreamer/gstdemux: Use BaseFilterImpl_Release().
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: 42699ad1ad2a7e5fb31255df5d899d2ba76d1fd3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42699ad1ad2a7e5fb31255df… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat May 25 15:21:24 2019 -0500 winegstreamer/gstdemux: Use BaseFilterImpl_Release(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 92 +++++++++++++++++++------------------------ 1 file changed, 41 insertions(+), 51 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 6d3d2a0..64b8dcf 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1213,8 +1213,48 @@ static IPin *gstdemux_get_pin(BaseFilter *base, unsigned int index) return pin; } +static void gstdemux_destroy(BaseFilter *iface) +{ + GSTImpl *filter = impl_from_IBaseFilter(&iface->IBaseFilter_iface); + IPin *connected = NULL; + ULONG pinref; + HRESULT hr; + + CloseHandle(filter->no_more_pads_event); + CloseHandle(filter->push_event); + + /* Don't need to clean up output pins, disconnecting input pin will do that */ + IPin_ConnectedTo((IPin *)&filter->pInputPin, &connected); + if (connected) + { + hr = IPin_Disconnect(connected); + assert(hr == S_OK); + IPin_Release(connected); + hr = IPin_Disconnect(&filter->pInputPin.pin.IPin_iface); + assert(hr == S_OK); + } + pinref = IPin_Release(&filter->pInputPin.pin.IPin_iface); + if (pinref) + { + /* Valgrind could find this, if I kill it here */ + ERR("pinref should be null, is %u, destroying anyway\n", pinref); + assert((LONG)pinref > 0); + + while (pinref) + pinref = IPin_Release(&filter->pInputPin.pin.IPin_iface); + } + if (filter->bus) + { + gst_bus_set_sync_handler(filter->bus, NULL, NULL, NULL); + gst_object_unref(filter->bus); + } + strmbase_filter_cleanup(&filter->filter); + CoTaskMemFree(filter); +} + static const BaseFilterFuncTable BaseFuncTable = { .filter_get_pin = gstdemux_get_pin, + .filter_destroy = gstdemux_destroy, }; IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *pUnkOuter, HRESULT *phr) @@ -1267,43 +1307,6 @@ IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *pUnkOuter, HRESULT *phr) return obj; } -static void GST_Destroy(GSTImpl *This) -{ - IPin *connected = NULL; - ULONG pinref; - HRESULT hr; - - TRACE("Destroying %p\n", This); - - CloseHandle(This->no_more_pads_event); - CloseHandle(This->push_event); - - /* Don't need to clean up output pins, disconnecting input pin will do that */ - IPin_ConnectedTo((IPin *)&This->pInputPin, &connected); - if (connected) { - hr = IPin_Disconnect(connected); - assert(hr == S_OK); - IPin_Release(connected); - hr = IPin_Disconnect(&This->pInputPin.pin.IPin_iface); - assert(hr == S_OK); - } - pinref = IPin_Release(&This->pInputPin.pin.IPin_iface); - if (pinref) { - /* Valgrind could find this, if I kill it here */ - ERR("pinref should be null, is %u, destroying anyway\n", pinref); - assert((LONG)pinref > 0); - - while (pinref) - pinref = IPin_Release(&This->pInputPin.pin.IPin_iface); - } - if (This->bus) { - gst_bus_set_sync_handler(This->bus, NULL, NULL, NULL); - gst_object_unref(This->bus); - } - strmbase_filter_cleanup(&This->filter); - CoTaskMemFree(This); -} - static HRESULT WINAPI GST_QueryInterface(IBaseFilter *iface, REFIID riid, LPVOID *ppv) { GSTImpl *This = impl_from_IBaseFilter(iface); @@ -1332,19 +1335,6 @@ static HRESULT WINAPI GST_QueryInterface(IBaseFilter *iface, REFIID riid, LPVOID return E_NOINTERFACE; } -static ULONG WINAPI GST_Release(IBaseFilter *iface) -{ - GSTImpl *This = impl_from_IBaseFilter(iface); - ULONG refCount = InterlockedDecrement(&This->filter.refCount); - - TRACE("(%p)->() Release from %d\n", This, refCount + 1); - - if (!refCount) - GST_Destroy(This); - - return refCount; -} - static HRESULT WINAPI GST_Stop(IBaseFilter *iface) { GSTImpl *This = impl_from_IBaseFilter(iface); @@ -1468,7 +1458,7 @@ static HRESULT WINAPI GST_GetState(IBaseFilter *iface, DWORD dwMilliSecsTimeout, static const IBaseFilterVtbl GST_Vtbl = { GST_QueryInterface, BaseFilterImpl_AddRef, - GST_Release, + BaseFilterImpl_Release, BaseFilterImpl_GetClassID, GST_Stop, GST_Pause,

1 0

Zebediah Figura : wineqtdecoder/qtsplitter: Use BaseFilterImpl_Release().
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: fefdc3232a3e68b512e5e8f097786a238be0dbe2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fefdc3232a3e68b512e5e8f0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat May 25 15:21:25 2019 -0500 wineqtdecoder/qtsplitter: Use BaseFilterImpl_Release(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/qtsplitter.c | 133 ++++++++++++++++++---------------------- 1 file changed, 60 insertions(+), 73 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index e900b91..11ff874 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -233,8 +233,67 @@ static IPin *qt_splitter_get_pin(BaseFilter *base, unsigned int index) return NULL; } +static void qt_splitter_destroy(BaseFilter *iface) +{ + QTSplitter *filter = impl_from_BaseFilter(iface); + IPin *peer = NULL; + ULONG pinref; + + EnterCriticalSection(&filter->csReceive); + /* Don't need to clean up output pins, disconnecting input pin will do that */ + IPin_ConnectedTo(&filter->pInputPin.pin.IPin_iface, &peer); + if (peer) + { + IPin_Disconnect(peer); + IPin_Release(peer); + } + pinref = IPin_Release(&filter->pInputPin.pin.IPin_iface); + if (pinref) + { + ERR("pinref should be null, is %u, destroying anyway\n", pinref); + assert((LONG)pinref > 0); + + while (pinref) + pinref = IPin_Release(&filter->pInputPin.pin.IPin_iface); + } + + if (filter->pQTMovie) + { + DisposeMovie(filter->pQTMovie); + filter->pQTMovie = NULL; + } + if (filter->vContext) + QTVisualContextRelease(filter->vContext); + if (filter->aSession) + MovieAudioExtractionEnd(filter->aSession); + + ExitMoviesOnThread(); + LeaveCriticalSection(&filter->csReceive); + + if (filter->loaderThread) + { + WaitForSingleObject(filter->loaderThread, INFINITE); + CloseHandle(filter->loaderThread); + } + if (filter->splitterThread) + { + SetEvent(filter->runEvent); + WaitForSingleObject(filter->splitterThread, INFINITE); + CloseHandle(filter->splitterThread); + } + + CloseHandle(filter->runEvent); + + filter->csReceive.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&filter->csReceive); + strmbase_filter_cleanup(&filter->filter); + + CoTaskMemFree(filter); +} + static const BaseFilterFuncTable BaseFuncTable = { .filter_get_pin = qt_splitter_get_pin, + .filter_destroy = qt_splitter_destroy, }; IUnknown * CALLBACK QTSplitter_create(IUnknown *punkout, HRESULT *phr) @@ -283,65 +342,6 @@ IUnknown * CALLBACK QTSplitter_create(IUnknown *punkout, HRESULT *phr) return obj; } -static void QT_Destroy(QTSplitter *This) -{ - IPin *connected = NULL; - ULONG pinref; - - TRACE("Destroying\n"); - - EnterCriticalSection(&This->csReceive); - /* Don't need to clean up output pins, disconnecting input pin will do that */ - IPin_ConnectedTo(&This->pInputPin.pin.IPin_iface, &connected); - if (connected) - { - IPin_Disconnect(connected); - IPin_Release(connected); - } - pinref = IPin_Release(&This->pInputPin.pin.IPin_iface); - if (pinref) - { - ERR("pinref should be null, is %u, destroying anyway\n", pinref); - assert((LONG)pinref > 0); - - while (pinref) - pinref = IPin_Release(&This->pInputPin.pin.IPin_iface); - } - - if (This->pQTMovie) - { - DisposeMovie(This->pQTMovie); - This->pQTMovie = NULL; - } - if (This->vContext) - QTVisualContextRelease(This->vContext); - if (This->aSession) - MovieAudioExtractionEnd(This->aSession); - - ExitMoviesOnThread(); - LeaveCriticalSection(&This->csReceive); - - if (This->loaderThread) - { - WaitForSingleObject(This->loaderThread, INFINITE); - CloseHandle(This->loaderThread); - } - if (This->splitterThread) - { - SetEvent(This->runEvent); - WaitForSingleObject(This->splitterThread, INFINITE); - CloseHandle(This->splitterThread); - } - - CloseHandle(This->runEvent); - - This->csReceive.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&This->csReceive); - strmbase_filter_cleanup(&This->filter); - - CoTaskMemFree(This); -} - static HRESULT WINAPI QT_QueryInterface(IBaseFilter *iface, REFIID riid, LPVOID *ppv) { QTSplitter *This = impl_from_IBaseFilter(iface); @@ -373,19 +373,6 @@ static HRESULT WINAPI QT_QueryInterface(IBaseFilter *iface, REFIID riid, LPVOID return E_NOINTERFACE; } -static ULONG WINAPI QT_Release(IBaseFilter *iface) -{ - QTSplitter *This = impl_from_IBaseFilter(iface); - ULONG refCount = InterlockedDecrement(&This->filter.refCount); - - TRACE("(%p)->() Release from %d\n", This, refCount + 1); - - if (!refCount) - QT_Destroy(This); - - return refCount; -} - static HRESULT WINAPI QT_Stop(IBaseFilter *iface) { QTSplitter *This = impl_from_IBaseFilter(iface); @@ -791,7 +778,7 @@ static HRESULT WINAPI QT_GetState(IBaseFilter *iface, DWORD dwMilliSecsTimeout, static const IBaseFilterVtbl QT_Vtbl = { QT_QueryInterface, BaseFilterImpl_AddRef, - QT_Release, + BaseFilterImpl_Release, BaseFilterImpl_GetClassID, QT_Stop, QT_Pause,

1 0

Sven Baars : kernel32/tests: Open and close the right file handle ( Coverity).
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: c34089014646c8ac203bd7bdf509b9a1431078c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c34089014646c8ac203bd7bd… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sun May 26 16:07:46 2019 +0200 kernel32/tests: Open and close the right file handle (Coverity). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 9bf80f6..b22ae19 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3735,13 +3735,13 @@ static void test_ReplaceFileA(void) /* replace file while replacement is opened */ ret = GetTempFileNameA(temp_path, prefix, 0, replacement); ok(ret != 0, "GetTempFileNameA error (replacement) %d\n", GetLastError()); - CreateFileA(replacement, GENERIC_READ | SYNCHRONIZE, FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, 0); + hReplacementFile = CreateFileA(replacement, GENERIC_READ | SYNCHRONIZE, FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, 0); ok(hReplacementFile != INVALID_HANDLE_VALUE, "unexpected error, replacement file should be able to be opened %d\n", GetLastError()); ret = pReplaceFileA(replaced, replacement, NULL, 0, 0, 0); ok(!ret, "expect failure\n"); ok(GetLastError() == ERROR_SHARING_VIOLATION, "expect ERROR_SHARING_VIOLATION, got %#x.\n", GetLastError()); - CloseHandle(hReplacedFile); + CloseHandle(hReplacementFile); /* replacement file still exists, make pass w/o "replaced" */ ret = DeleteFileA(replaced);

1 0

Alistair Leslie-Hughes : dinput/tests: Remove unrequired if (Coverity).
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: 87a8622ffe950e835a5cf2e144a1d103bdf1e571 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87a8622ffe950e835a5cf2e1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun May 26 22:49:21 2019 +0000 dinput/tests: Remove unrequired if (Coverity). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/keyboard.c | 2 +- dlls/dinput/tests/mouse.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index 9254123..d6ab5b5 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -479,7 +479,7 @@ static void test_GetDeviceInfo(IDirectInputA *pDI) wine_dbgstr_guid(&instA.guidProduct), wine_dbgstr_guid(&inst3A.guidProduct) ); ok(instA.dwDevType == inst3A.dwDevType, "got %d, %d\n", instA.dwDevType, inst3A.dwDevType); - if (pKey) IUnknown_Release(pKey); + IUnknown_Release(pKey); } static void keyboard_tests(DWORD version) diff --git a/dlls/dinput/tests/mouse.c b/dlls/dinput/tests/mouse.c index c5cb684..e4d24e8 100644 --- a/dlls/dinput/tests/mouse.c +++ b/dlls/dinput/tests/mouse.c @@ -224,7 +224,7 @@ static void test_GetDeviceInfo(IDirectInputA *pDI) wine_dbgstr_guid(&instA.guidProduct), wine_dbgstr_guid(&inst3A.guidProduct) ); ok(instA.dwDevType == inst3A.dwDevType, "got %d, %d\n", instA.dwDevType, inst3A.dwDevType); - if (pMouse) IUnknown_Release(pMouse); + IUnknown_Release(pMouse); } static BOOL CALLBACK EnumAxes(const DIDEVICEOBJECTINSTANCEA *pdidoi, void *pContext)

1 0

Jacek Caban : ntoskrnl.exe/tests: Always test DeviceIoControl result.
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: e1d932a9e11f0dd5dc5189f4c5f8aa813c76aade URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1d932a9e11f0dd5dc5189f4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 27 13:38:10 2019 +0200 ntoskrnl.exe/tests: Always test DeviceIoControl result. Spotted by Mathew Hodson. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 49490bb..d505643 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -233,6 +233,7 @@ static void test_overlapped(void) cancel_cnt = 0xdeadbeef; res = DeviceIoControl(file, IOCTL_WINETEST_GET_CANCEL_COUNT, NULL, 0, &cancel_cnt, sizeof(cancel_cnt), NULL, &overlapped); + ok(res, "DeviceIoControl failed: %u\n", GetLastError()); todo_wine ok(cancel_cnt == 2, "cancel_cnt = %u\n", cancel_cnt);

1 0

Jacek Caban : ntoskrnl.exe: Pass context as a structure to IRP dispatchers.
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: 6870bb74d4095fb0ee952d894a5e0b4342b9ef2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6870bb74d4095fb0ee952d89… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 27 13:38:27 2019 +0200 ntoskrnl.exe: Pass context as a structure to IRP dispatchers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 164 +++++++++++++++++++++---------------------- 1 file changed, 82 insertions(+), 82 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6870bb74d4095fb0ee95…

1 0

Jacek Caban : ntoskrnl.exe: Reuse IRP input buffer if it wasn't used.
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: 0138da5025a117bc598f85b98b644ec0820255c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0138da5025a117bc598f85b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 27 13:38:59 2019 +0200 ntoskrnl.exe: Reuse IRP input buffer if it wasn't used. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index c355c88..c9b56b7 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -633,7 +633,6 @@ static NTSTATUS dispatch_create( struct dispatch_context *context ) irp->Flags |= IRP_CREATE_OPERATION; dispatch_irp( device, irp, context ); - HeapFree( GetProcessHeap(), 0, context->in_buff ); return STATUS_SUCCESS; } @@ -671,7 +670,6 @@ static NTSTATUS dispatch_close( struct dispatch_context *context ) irp->Flags |= IRP_CLOSE_OPERATION; dispatch_irp( device, irp, context ); - HeapFree( GetProcessHeap(), 0, context->in_buff ); return STATUS_SUCCESS; } @@ -714,7 +712,6 @@ static NTSTATUS dispatch_read( struct dispatch_context *context ) irp->Flags |= IRP_DEALLOCATE_BUFFER; /* deallocate out_buff */ dispatch_irp( device, irp, context ); - HeapFree( GetProcessHeap(), 0, context->in_buff ); return STATUS_SUCCESS; } @@ -738,6 +735,7 @@ static NTSTATUS dispatch_write( struct dispatch_context *context ) if (!(irp = IoBuildSynchronousFsdRequest( IRP_MJ_WRITE, device, context->in_buff, context->in_size, &offset, NULL, NULL ))) return STATUS_NO_MEMORY; + context->in_buff = NULL; irp->Tail.Overlay.OriginalFileObject = file; irp->RequestorMode = UserMode; @@ -779,7 +777,6 @@ static NTSTATUS dispatch_flush( struct dispatch_context *context ) dispatch_irp( device, irp, context ); - HeapFree( GetProcessHeap(), 0, context->in_buff ); return STATUS_SUCCESS; } @@ -841,6 +838,7 @@ static NTSTATUS dispatch_ioctl( struct dispatch_context *context ) irp->Tail.Overlay.OriginalFileObject = file; irp->RequestorMode = UserMode; irp->AssociatedIrp.SystemBuffer = context->in_buff; + context->in_buff = NULL; irp->Flags |= IRP_DEALLOCATE_BUFFER; /* deallocate in_buff */ dispatch_irp( device, irp, context ); @@ -981,8 +979,7 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) if (status == STATUS_SUCCESS) { context.handle = 0; /* status reported by IoCompleteRequest */ - context.in_size = 4096; - context.in_buff = NULL; + if (!context.in_buff) context.in_size = 4096; } break; case STATUS_BUFFER_OVERFLOW:

1 0