wine-commits May 2019

wine-commits@winehq.org

2 participants
1019 discussions

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

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

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

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 : 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 : 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 : 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 : setupapi: Process the .Services subsection in SetupDiInstallDevice().
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: b2adecd5e429d0e651da123aa7e7bcbe204d0419 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2adecd5e429d0e651da123a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 24 23:33:55 2019 -0500 setupapi: Process the .Services subsection in SetupDiInstallDevice(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 9bedb73..0279d10 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -4688,6 +4688,8 @@ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) static const WCHAR infsectionW[] = {'I','n','f','S','e','c','t','i','o','n',0}; static const WCHAR infsectionextW[] = {'I','n','f','S','e','c','t','i','o','n','E','x','t',0}; static const WCHAR dothwW[] = {'.','H','W',0}; + static const WCHAR dotservicesW[] = {'.','S','e','r','v','i','c','e','s',0}; + static const WCHAR addserviceW[] = {'A','d','d','S','e','r','v','i','c','e',0}; WCHAR section[LINE_LEN], section_ext[LINE_LEN], subsection[LINE_LEN], inf_path[MAX_PATH], *extptr, *filepart; UINT install_flags = SPINST_ALL; HKEY driver_key, device_key; @@ -4747,6 +4749,26 @@ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) SetupInstallFromInfSectionW(NULL, hinf, subsection, install_flags, device_key, NULL, SP_COPY_NEWER_ONLY, SetupDefaultQueueCallbackW, callback_ctx, NULL, NULL); + strcpyW(subsection, section_ext); + strcatW(subsection, dotservicesW); + SetupInstallServicesFromInfSectionW(hinf, subsection, 0); + + if (SetupFindFirstLineW(hinf, subsection, addserviceW, &ctx)) + { + do + { + INT flags; + + if (SetupGetIntField(&ctx, 2, &flags) && (flags & SPSVCINST_ASSOCSERVICE)) + { + WCHAR svc_name[LINE_LEN]; + if (SetupGetStringFieldW(&ctx, 1, svc_name, ARRAY_SIZE(svc_name), NULL) && svc_name[0]) + RegSetValueExW(device->key, Service, 0, REG_SZ, (BYTE *)svc_name, strlenW(svc_name) * sizeof(WCHAR)); + break; + } + } while (SetupFindNextMatchLineW(&ctx, addserviceW, &ctx)); + } + SetupTermDefaultQueueCallback(callback_ctx); SetupCloseInfFile(hinf);

1 0

Zebediah Figura : setupapi: Process the .HW subsection in SetupDiInstallDevice().
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: cd6ee00cfd0f0fb5c47e36bdd00653d0b59ea2f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd6ee00cfd0f0fb5c47e36bd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 24 23:33:54 2019 -0500 setupapi: Process the .HW subsection in SetupDiInstallDevice(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 9d0cb99..9bedb73 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -4687,12 +4687,13 @@ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) static const WCHAR infpathW[] = {'I','n','f','P','a','t','h',0}; static const WCHAR infsectionW[] = {'I','n','f','S','e','c','t','i','o','n',0}; static const WCHAR infsectionextW[] = {'I','n','f','S','e','c','t','i','o','n','E','x','t',0}; - WCHAR section[LINE_LEN], section_ext[LINE_LEN], inf_path[MAX_PATH], *extptr, *filepart; + static const WCHAR dothwW[] = {'.','H','W',0}; + WCHAR section[LINE_LEN], section_ext[LINE_LEN], subsection[LINE_LEN], inf_path[MAX_PATH], *extptr, *filepart; UINT install_flags = SPINST_ALL; + HKEY driver_key, device_key; struct device *device; struct driver *driver; void *callback_ctx; - HKEY driver_key; INFCONTEXT ctx; HINF hinf; LONG l; @@ -4723,6 +4724,15 @@ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) return FALSE; } + if ((l = RegCreateKeyExW(device->key, DeviceParameters, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &device_key, NULL))) + { + SetLastError(l); + RegCloseKey(driver_key); + SetupCloseInfFile(hinf); + return FALSE; + } + if (device->params.Flags & DI_NOFILECOPY) install_flags &= ~SPINST_FILES; @@ -4731,6 +4741,12 @@ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) SetupInstallFromInfSectionW(NULL, hinf, section_ext, install_flags, driver_key, NULL, SP_COPY_NEWER_ONLY, SetupDefaultQueueCallbackW, callback_ctx, NULL, NULL); + strcpyW(subsection, section_ext); + strcatW(subsection, dothwW); + + SetupInstallFromInfSectionW(NULL, hinf, subsection, install_flags, device_key, NULL, + SP_COPY_NEWER_ONLY, SetupDefaultQueueCallbackW, callback_ctx, NULL, NULL); + SetupTermDefaultQueueCallback(callback_ctx); SetupCloseInfFile(hinf); @@ -4742,6 +4758,7 @@ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) if (extptr) RegSetValueExW(driver_key, infsectionextW, 0, REG_SZ, (BYTE *)extptr, strlenW(extptr) * sizeof(WCHAR)); + RegCloseKey(device_key); RegCloseKey(driver_key); return TRUE; }

1 0

Zebediah Figura : setupapi: Copy the INF file to C:/windows/inf/ and record it in the driver key.
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: d4c18c89d5437845a781c7e2a70301f05f0b82ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4c18c89d5437845a781c7e2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 24 23:33:53 2019 -0500 setupapi: Copy the INF file to C:/windows/inf/ and record it in the driver key. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index f60fd53..9d0cb99 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -4684,7 +4684,10 @@ BOOL WINAPI SetupDiInstallDriverFiles(HDEVINFO devinfo, SP_DEVINFO_DATA *device_ */ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) { - WCHAR section[LINE_LEN], section_ext[LINE_LEN]; + static const WCHAR infpathW[] = {'I','n','f','P','a','t','h',0}; + static const WCHAR infsectionW[] = {'I','n','f','S','e','c','t','i','o','n',0}; + static const WCHAR infsectionextW[] = {'I','n','f','S','e','c','t','i','o','n','E','x','t',0}; + WCHAR section[LINE_LEN], section_ext[LINE_LEN], inf_path[MAX_PATH], *extptr, *filepart; UINT install_flags = SPINST_ALL; struct device *device; struct driver *driver; @@ -4711,7 +4714,7 @@ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) SetupFindFirstLineW(hinf, driver->mfg_key, driver->description, &ctx); SetupGetStringFieldW(&ctx, 1, section, ARRAY_SIZE(section), NULL); - SetupDiGetActualSectionToInstallW(hinf, section, section_ext, ARRAY_SIZE(section_ext), NULL, NULL); + SetupDiGetActualSectionToInstallW(hinf, section, section_ext, ARRAY_SIZE(section_ext), NULL, &extptr); if ((l = create_driver_key(device, &driver_key))) { @@ -4730,6 +4733,15 @@ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) SetupTermDefaultQueueCallback(callback_ctx); SetupCloseInfFile(hinf); + + SetupCopyOEMInfW(driver->inf_path, NULL, SPOST_NONE, 0, inf_path, ARRAY_SIZE(inf_path), NULL, &filepart); + TRACE("Copied INF file %s to %s.\n", debugstr_w(driver->inf_path), debugstr_w(inf_path)); + + RegSetValueExW(driver_key, infpathW, 0, REG_SZ, (BYTE *)filepart, strlenW(filepart) * sizeof(WCHAR)); + RegSetValueExW(driver_key, infsectionW, 0, REG_SZ, (BYTE *)section, strlenW(section) * sizeof(WCHAR)); + if (extptr) + RegSetValueExW(driver_key, infsectionextW, 0, REG_SZ, (BYTE *)extptr, strlenW(extptr) * sizeof(WCHAR)); + RegCloseKey(driver_key); return TRUE; }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2019