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

Zebediah Figura : strmbase: Use an unsigned int for the GetPin() callback.
by Alexandre Julliard 24 May '19

24 May '19

Module: wine Branch: master Commit: 97546ca0b71287bd028da1d21d1e043480ae2897 URL: https://source.winehq.org/git/wine.git/?a=commit;h=97546ca0b71287bd028da1d2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 23 17:06:30 2019 -0500 strmbase: Use an unsigned int for the GetPin() callback. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/evr.c | 4 ++-- dlls/qcap/audiorecord.c | 5 ++--- dlls/qcap/avico.c | 15 ++++----------- dlls/qcap/avimux.c | 15 ++++++++------- dlls/qcap/smartteefilter.c | 18 +++++------------- dlls/qcap/vfwcapture.c | 4 ++-- dlls/qedit/samplegrabber.c | 6 +++--- dlls/quartz/filesource.c | 6 ++---- dlls/quartz/parser.c | 14 +++++--------- dlls/strmbase/filter.c | 2 +- dlls/strmbase/renderer.c | 4 ++-- dlls/strmbase/transform.c | 4 ++-- dlls/winegstreamer/gstdemux.c | 10 ++++------ dlls/wineqtdecoder/qtsplitter.c | 2 +- include/wine/strmbase.h | 2 +- 15 files changed, 44 insertions(+), 67 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=97546ca0b71287bd028d…

1 0

Zebediah Figura : strmbase: Rename pfnGetPin to filter_get_pin.
by Alexandre Julliard 24 May '19

24 May '19

Module: wine Branch: master Commit: 8a8c5a82292b428b083975a977a6d75b6dcf4bba URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a8c5a82292b428b083975a9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 23 17:06:31 2019 -0500 strmbase: Rename pfnGetPin to filter_get_pin. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/evr.c | 4 ++-- dlls/qcap/audiorecord.c | 4 ++-- dlls/qcap/avico.c | 4 ++-- dlls/qcap/avimux.c | 4 ++-- dlls/qcap/smartteefilter.c | 4 ++-- dlls/qcap/vfwcapture.c | 4 ++-- dlls/qedit/samplegrabber.c | 4 ++-- dlls/quartz/filesource.c | 4 ++-- dlls/quartz/parser.c | 4 ++-- dlls/strmbase/enumpins.c | 6 +++--- dlls/strmbase/filter.c | 2 +- dlls/strmbase/renderer.c | 4 ++-- dlls/strmbase/transform.c | 4 ++-- dlls/winegstreamer/gstdemux.c | 4 ++-- dlls/wineqtdecoder/qtsplitter.c | 4 ++-- include/wine/strmbase.h | 8 +++----- 16 files changed, 33 insertions(+), 35 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8a8c5a82292b428b0839…

1 0

Zebediah Figura : strmbase: Remove unnecessary calling convention from the filter_get_pin() callback.
by Alexandre Julliard 24 May '19

24 May '19

Module: wine Branch: master Commit: 1fc5c6b75d8d36808bd97f282a778980078f0231 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1fc5c6b75d8d36808bd97f28… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 23 17:06:32 2019 -0500 strmbase: Remove unnecessary calling convention from the filter_get_pin() callback. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/evr.c | 2 +- dlls/qcap/audiorecord.c | 2 +- dlls/qcap/avico.c | 2 +- dlls/qcap/avimux.c | 2 +- dlls/qcap/smartteefilter.c | 2 +- dlls/qcap/vfwcapture.c | 2 +- dlls/qedit/samplegrabber.c | 2 +- dlls/quartz/filesource.c | 2 +- dlls/quartz/parser.c | 2 +- dlls/strmbase/renderer.c | 2 +- dlls/strmbase/transform.c | 2 +- dlls/winegstreamer/gstdemux.c | 2 +- dlls/wineqtdecoder/qtsplitter.c | 2 +- include/wine/strmbase.h | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/evr/evr.c b/dlls/evr/evr.c index 6121068..8341c40 100644 --- a/dlls/evr/evr.c +++ b/dlls/evr/evr.c @@ -191,7 +191,7 @@ static const IBaseFilterVtbl basefilter_vtbl = BaseFilterImpl_QueryVendorInfo }; -static IPin * WINAPI evr_get_pin(BaseFilter *iface, unsigned int index) +static IPin *evr_get_pin(BaseFilter *iface, unsigned int index) { FIXME("iface %p, index %u, stub!\n", iface, index); return NULL; diff --git a/dlls/qcap/audiorecord.c b/dlls/qcap/audiorecord.c index d6b99ee..bc1b452 100644 --- a/dlls/qcap/audiorecord.c +++ b/dlls/qcap/audiorecord.c @@ -171,7 +171,7 @@ static const IBaseFilterVtbl AudioRecordVtbl = { BaseFilterImpl_QueryVendorInfo }; -static IPin * WINAPI audio_record_get_pin(BaseFilter *iface, unsigned int index) +static IPin *audio_record_get_pin(BaseFilter *iface, unsigned int index) { FIXME("iface %p, index %u, stub!\n", iface, index); return NULL; diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index 2e147a5..e2f21d0 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -244,7 +244,7 @@ static const IBaseFilterVtbl AVICompressorVtbl = { AVICompressor_QueryVendorInfo }; -static IPin * WINAPI avi_compressor_get_pin(BaseFilter *iface, unsigned int index) +static IPin *avi_compressor_get_pin(BaseFilter *iface, unsigned int index) { AVICompressor *This = impl_from_BaseFilter(iface); IPin *ret; diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index 9272960..77e5898 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -116,7 +116,7 @@ static inline AviMux* impl_from_BaseFilter(BaseFilter *filter) return CONTAINING_RECORD(filter, AviMux, filter); } -static IPin * WINAPI avi_mux_get_pin(BaseFilter *iface, unsigned int index) +static IPin *avi_mux_get_pin(BaseFilter *iface, unsigned int index) { AviMux *This = impl_from_BaseFilter(iface); diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c index b3a8748..7496fe6 100644 --- a/dlls/qcap/smartteefilter.c +++ b/dlls/qcap/smartteefilter.c @@ -199,7 +199,7 @@ static const IBaseFilterVtbl SmartTeeFilterVtbl = { BaseFilterImpl_QueryVendorInfo }; -static IPin * WINAPI smart_tee_get_pin(BaseFilter *iface, unsigned int index) +static IPin *smart_tee_get_pin(BaseFilter *iface, unsigned int index) { SmartTeeFilter *This = impl_from_BaseFilter(iface); IPin *ret; diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index e5dfead..a795a1e 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -192,7 +192,7 @@ static const IUnknownVtbl unknown_inner_vtbl = unknown_inner_Release, }; -static IPin * WINAPI vfw_capture_get_pin(BaseFilter *iface, unsigned int index) +static IPin *vfw_capture_get_pin(BaseFilter *iface, unsigned int index) { VfwCapture *This = impl_from_BaseFilter(iface); diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index 9877523..76dc3d7 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -339,7 +339,7 @@ static const IUnknownVtbl samplegrabber_vtbl = SampleGrabber_Release, }; -static IPin * WINAPI sample_grabber_get_pin(BaseFilter *iface, unsigned int index) +static IPin *sample_grabber_get_pin(BaseFilter *iface, unsigned int index) { SG_Impl *This = impl_from_BaseFilter(iface); IPin *pin; diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index b10a7ff..269fa27 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -392,7 +392,7 @@ HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, GUID * return hr; } -static IPin * WINAPI async_reader_get_pin(BaseFilter *iface, unsigned int index) +static IPin *async_reader_get_pin(BaseFilter *iface, unsigned int index) { AsyncReader *This = impl_from_BaseFilter(iface); diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index 6863947..fdefa3d 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -62,7 +62,7 @@ static inline ParserImpl *impl_from_BaseFilter( BaseFilter *iface ) return CONTAINING_RECORD(iface, ParserImpl, filter); } -static IPin * WINAPI parser_get_pin(BaseFilter *iface, unsigned int index) +static IPin *parser_get_pin(BaseFilter *iface, unsigned int index) { ParserImpl *filter = impl_from_BaseFilter(iface); diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 278bf0a..ea1be8b 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -183,7 +183,7 @@ static const IPinVtbl BaseRenderer_InputPin_Vtbl = BaseInputPinImpl_NewSegment }; -static IPin * WINAPI renderer_get_pin(BaseFilter *iface, unsigned int index) +static IPin *renderer_get_pin(BaseFilter *iface, unsigned int index) { BaseRenderer *This = impl_from_BaseFilter(iface); diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index e19f3ef..6a7636c 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -128,7 +128,7 @@ static HRESULT WINAPI TransformFilter_Output_GetMediaType(BasePin *This, int iPo return S_OK; } -static IPin * WINAPI transform_get_pin(BaseFilter *iface, unsigned int index) +static IPin *transform_get_pin(BaseFilter *iface, unsigned int index) { TransformFilter *filter = impl_from_BaseFilter(iface); diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 3482d3e..6d3d2a0 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1196,7 +1196,7 @@ static inline GSTOutPin *impl_from_IMediaSeeking( IMediaSeeking *iface ) return CONTAINING_RECORD(iface, GSTOutPin, seek.IMediaSeeking_iface); } -static IPin * WINAPI gstdemux_get_pin(BaseFilter *base, unsigned int index) +static IPin *gstdemux_get_pin(BaseFilter *base, unsigned int index) { GSTImpl *This = impl_from_IBaseFilter(&base->IBaseFilter_iface); IPin *pin; diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 3b00a01..e900b91 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -202,7 +202,7 @@ static inline QTSplitter *impl_from_IBaseFilter( IBaseFilter *iface ) * Base Filter */ -static IPin * WINAPI qt_splitter_get_pin(BaseFilter *base, unsigned int index) +static IPin *qt_splitter_get_pin(BaseFilter *base, unsigned int index) { QTSplitter *filter = impl_from_BaseFilter(base); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 17a58a1..7c44b36 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -170,7 +170,7 @@ typedef struct BaseFilter typedef struct BaseFilterFuncTable { - IPin *(WINAPI *filter_get_pin)(BaseFilter *iface, unsigned int index); + IPin *(*filter_get_pin)(BaseFilter *iface, unsigned int index); } BaseFilterFuncTable; HRESULT WINAPI BaseFilterImpl_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv);

1 0

Zebediah Figura : strmbase: Reimplement BaseFilterImpl_Release() using a destructor callback.
by Alexandre Julliard 24 May '19

24 May '19

Module: wine Branch: master Commit: 3c98e11b601fcdf1b4fdf59aa45dff36c0c45a17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c98e11b601fcdf1b4fdf59a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 23 17:06:33 2019 -0500 strmbase: Reimplement BaseFilterImpl_Release() using a destructor callback. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/filter.c | 4 ++-- include/wine/strmbase.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index f9dd72c..cf8000f 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -54,7 +54,7 @@ ULONG WINAPI BaseFilterImpl_AddRef(IBaseFilter * iface) return refCount; } -ULONG WINAPI BaseFilterImpl_Release(IBaseFilter * iface) +ULONG WINAPI BaseFilterImpl_Release(IBaseFilter *iface) { BaseFilter *This = impl_from_IBaseFilter(iface); ULONG refCount = InterlockedDecrement(&This->refCount); @@ -62,7 +62,7 @@ ULONG WINAPI BaseFilterImpl_Release(IBaseFilter * iface) TRACE("(%p)->() Release from %d\n", This, refCount + 1); if (!refCount) - strmbase_filter_cleanup(This); + This->pFuncsTable->filter_destroy(This); return refCount; } diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 7c44b36..307204e 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -171,6 +171,7 @@ typedef struct BaseFilter typedef struct BaseFilterFuncTable { IPin *(*filter_get_pin)(BaseFilter *iface, unsigned int index); + void (*filter_destroy)(BaseFilter *iface); } BaseFilterFuncTable; HRESULT WINAPI BaseFilterImpl_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv);

1 0

Zebediah Figura : quartz/filesource: Use BaseFilterImpl_Release().
by Alexandre Julliard 24 May '19

24 May '19

Module: wine Branch: master Commit: b9735fc69e89706f8f9733e8be4b5016053ac2ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9735fc69e89706f8f9733e8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 23 17:06:34 2019 -0500 quartz/filesource: Use BaseFilterImpl_Release(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filesource.c | 59 +++++++++++++++++++++--------------------------- 1 file changed, 26 insertions(+), 33 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 269fa27..bb0f162 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -403,8 +403,32 @@ static IPin *async_reader_get_pin(BaseFilter *iface, unsigned int index) return This->pOutputPin; } -static const BaseFilterFuncTable BaseFuncTable = { +static void async_reader_destroy(BaseFilter *iface) +{ + AsyncReader *filter = impl_from_BaseFilter(iface); + + if (filter->pOutputPin) + { + IPin *peer; + if (SUCCEEDED(IPin_ConnectedTo(filter->pOutputPin, &peer))) + { + IPin_Disconnect(peer); + IPin_Release(peer); + } + IPin_Disconnect(filter->pOutputPin); + IPin_Release(filter->pOutputPin); + } + CoTaskMemFree(filter->pszFileName); + if (filter->pmt) + DeleteMediaType(filter->pmt); + strmbase_filter_cleanup(&filter->filter); + CoTaskMemFree(filter); +} + +static const BaseFilterFuncTable BaseFuncTable = +{ .filter_get_pin = async_reader_get_pin, + .filter_destroy = async_reader_destroy, }; HRESULT AsyncReader_create(IUnknown * pUnkOuter, LPVOID * ppv) @@ -468,37 +492,6 @@ static HRESULT WINAPI AsyncReader_QueryInterface(IBaseFilter * iface, REFIID rii return E_NOINTERFACE; } -static ULONG WINAPI AsyncReader_Release(IBaseFilter * iface) -{ - AsyncReader *This = impl_from_IBaseFilter(iface); - ULONG refCount = InterlockedDecrement(&This->filter.refCount); - - TRACE("%p->() Release from %d\n", This, refCount + 1); - - if (!refCount) - { - if (This->pOutputPin) - { - IPin *pConnectedTo; - if(SUCCEEDED(IPin_ConnectedTo(This->pOutputPin, &pConnectedTo))) - { - IPin_Disconnect(pConnectedTo); - IPin_Release(pConnectedTo); - } - IPin_Disconnect(This->pOutputPin); - IPin_Release(This->pOutputPin); - } - CoTaskMemFree(This->pszFileName); - if (This->pmt) - DeleteMediaType(This->pmt); - strmbase_filter_cleanup(&This->filter); - CoTaskMemFree(This); - return 0; - } - else - return refCount; -} - /** IMediaFilter methods **/ static HRESULT WINAPI AsyncReader_Stop(IBaseFilter * iface) @@ -538,7 +531,7 @@ static const IBaseFilterVtbl AsyncReader_Vtbl = { AsyncReader_QueryInterface, BaseFilterImpl_AddRef, - AsyncReader_Release, + BaseFilterImpl_Release, BaseFilterImpl_GetClassID, AsyncReader_Stop, AsyncReader_Pause,

1 0

Zebediah Figura : setupapi/tests: Clean up and expand tests for SetupCopyOEMInf().
by Alexandre Julliard 24 May '19

24 May '19

Module: wine Branch: master Commit: 097e224af72f50f036ce5e1ac4c8ef49b19feb64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=097e224af72f50f036ce5e1a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 23 18:00:45 2019 -0500 setupapi/tests: Clean up and expand tests for SetupCopyOEMInf(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/misc.c | 298 +++++++++++++++++++++------------------------ 1 file changed, 142 insertions(+), 156 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=097e224af72f50f036ce…

1 0

Zebediah Figura : setupapi: Check all INF files in SetupCopyOEMInf().
by Alexandre Julliard 24 May '19

24 May '19

Module: wine Branch: master Commit: 29f65bc6a209643c56330b63aefbe36cb96d7cbe URL: https://source.winehq.org/git/wine.git/?a=commit;h=29f65bc6a209643c56330b63… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 23 18:00:46 2019 -0500 setupapi: Check all INF files in SetupCopyOEMInf(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/misc.c | 138 +++++++++++++++++++++++++++------------------ dlls/setupapi/tests/misc.c | 8 --- 2 files changed, 83 insertions(+), 63 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=29f65bc6a209643c5633…

1 0

Zebediah Figura : setupapi: Implement SetupDiInstallDriverFiles().
by Alexandre Julliard 23 May '19

23 May '19

Module: wine Branch: master Commit: 1c25cc09b51b40c8c562bd697a08a59790401082 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c25cc09b51b40c8c562bd69… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 22 22:55:53 2019 -0500 setupapi: Implement SetupDiInstallDriverFiles(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 43 ++++++++++++++++++++++++++++++++++++++++++- dlls/setupapi/setupapi.spec | 2 +- 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 07288e5..9903c48 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -3674,9 +3674,10 @@ BOOL WINAPI SetupDiCallClassInstaller(DI_FUNCTION function, HDEVINFO devinfo, SP return SetupDiSelectBestCompatDrv(devinfo, device_data); case DIF_REGISTER_COINSTALLERS: return SetupDiRegisterCoDeviceInstallers(devinfo, device_data); + case DIF_INSTALLDEVICEFILES: + return SetupDiInstallDriverFiles(devinfo, device_data); case DIF_FINISHINSTALL_ACTION: case DIF_INSTALLDEVICE: - case DIF_INSTALLDEVICEFILES: case DIF_INSTALLINTERFACES: case DIF_PROPERTYCHANGE: case DIF_SELECTDEVICE: @@ -4552,3 +4553,43 @@ BOOL WINAPI SetupDiSelectBestCompatDrv(HDEVINFO devinfo, SP_DEVINFO_DATA *device return TRUE; } + +/*********************************************************************** + * SetupDiInstallDriverFiles (SETUPAPI.@) + */ +BOOL WINAPI SetupDiInstallDriverFiles(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) +{ + WCHAR section[LINE_LEN], section_ext[LINE_LEN]; + struct device *device; + struct driver *driver; + void *callback_ctx; + INFCONTEXT ctx; + HINF hinf; + + TRACE("devinfo %p, device_data %p.\n", devinfo, device_data); + + if (!(device = get_device(devinfo, device_data))) + return FALSE; + + if (!(driver = device->selected_driver)) + { + ERR("No driver selected for device %p.\n", devinfo); + SetLastError(ERROR_NO_DRIVER_SELECTED); + return FALSE; + } + + if ((hinf = SetupOpenInfFileW(driver->inf_path, NULL, INF_STYLE_WIN4, NULL)) == INVALID_HANDLE_VALUE) + return FALSE; + + 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); + + callback_ctx = SetupInitDefaultQueueCallback(NULL); + SetupInstallFromInfSectionW(NULL, hinf, section_ext, SPINST_FILES, NULL, NULL, + SP_COPY_NEWER_ONLY, SetupDefaultQueueCallbackW, callback_ctx, NULL, NULL); + SetupTermDefaultQueueCallback(callback_ctx); + + SetupCloseInfFile(hinf); + return TRUE; +} diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 1d18870..97347f5 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -368,7 +368,7 @@ @ stdcall SetupDiInstallClassW(long wstr long ptr) @ stub SetupDiInstallDevice @ stdcall SetupDiInstallDeviceInterfaces(ptr ptr) -@ stub SetupDiInstallDriverFiles +@ stdcall SetupDiInstallDriverFiles(ptr ptr) @ stdcall SetupDiLoadClassIcon(ptr ptr ptr) @ stub SetupDiMoveDuplicateDevice @ stdcall SetupDiOpenClassRegKey(ptr long)

1 0

Zebediah Figura : setupapi: Process interface sections in SetupDiInstallDriverFiles().
by Alexandre Julliard 23 May '19

23 May '19

Module: wine Branch: master Commit: 94256fccaeb0fe28732b8c7bf808609c0b4923f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94256fccaeb0fe28732b8c7b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 22 22:55:55 2019 -0500 setupapi: Process interface sections in SetupDiInstallDriverFiles(). 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, 15 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 9903c48..cb7ede6 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -101,6 +101,8 @@ static const WCHAR Phantom[] = {'P','h','a','n','t','o','m',0}; static const WCHAR SymbolicLink[] = {'S','y','m','b','o','l','i','c','L','i','n','k',0}; static const WCHAR Control[] = {'C','o','n','t','r','o','l',0}; static const WCHAR Linked[] = {'L','i','n','k','e','d',0}; +static const WCHAR dotInterfaces[] = {'.','I','n','t','e','r','f','a','c','e','s',0}; +static const WCHAR AddInterface[] = {'A','d','d','I','n','t','e','r','f','a','c','e',0}; static const WCHAR backslashW[] = {'\\',0}; static const WCHAR emptyW[] = {0}; @@ -4559,7 +4561,7 @@ BOOL WINAPI SetupDiSelectBestCompatDrv(HDEVINFO devinfo, SP_DEVINFO_DATA *device */ BOOL WINAPI SetupDiInstallDriverFiles(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) { - WCHAR section[LINE_LEN], section_ext[LINE_LEN]; + WCHAR section[LINE_LEN], section_ext[LINE_LEN], iface_section[LINE_LEN]; struct device *device; struct driver *driver; void *callback_ctx; @@ -4586,8 +4588,20 @@ BOOL WINAPI SetupDiInstallDriverFiles(HDEVINFO devinfo, SP_DEVINFO_DATA *device_ SetupDiGetActualSectionToInstallW(hinf, section, section_ext, ARRAY_SIZE(section_ext), NULL, NULL); callback_ctx = SetupInitDefaultQueueCallback(NULL); + SetupInstallFromInfSectionW(NULL, hinf, section_ext, SPINST_FILES, NULL, NULL, SP_COPY_NEWER_ONLY, SetupDefaultQueueCallbackW, callback_ctx, NULL, NULL); + + lstrcatW(section_ext, dotInterfaces); + if (SetupFindFirstLineW(hinf, section_ext, AddInterface, &ctx)) + { + do { + SetupGetStringFieldW(&ctx, 3, iface_section, ARRAY_SIZE(iface_section), NULL); + SetupInstallFromInfSectionW(NULL, hinf, iface_section, SPINST_FILES, NULL, NULL, + SP_COPY_NEWER_ONLY, SetupDefaultQueueCallbackW, callback_ctx, NULL, NULL); + } while (SetupFindNextMatchLineW(&ctx, AddInterface, &ctx)); + } + SetupTermDefaultQueueCallback(callback_ctx); SetupCloseInfFile(hinf);

1 0

Zebediah Figura : setupapi: Implement SetupDiInstallDeviceInterfaces().
by Alexandre Julliard 23 May '19

23 May '19

Module: wine Branch: master Commit: a37c4262e9f21e67d9ada0e57daeab65c3d2b051 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a37c4262e9f21e67d9ada0e5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 22 22:55:57 2019 -0500 setupapi: Implement SetupDiInstallDeviceInterfaces(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 84 ++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 77 insertions(+), 7 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index cb7ede6..864e6dd 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -2619,6 +2619,11 @@ HKEY WINAPI SetupDiCreateDeviceInterfaceRegKeyA( return key; } +static LONG create_iface_key(const struct device_iface *iface, REGSAM access, HKEY *key) +{ + return RegCreateKeyExW(iface->refstr_key, DeviceParameters, 0, NULL, 0, access, NULL, key, NULL); +} + /*********************************************************************** * SetupDiCreateDeviceInterfaceRegKeyW (SETUPAPI.@) */ @@ -2642,8 +2647,7 @@ HKEY WINAPI SetupDiCreateDeviceInterfaceRegKeyW(HDEVINFO devinfo, return INVALID_HANDLE_VALUE; } - ret = RegCreateKeyExW(iface->refstr_key, DeviceParameters, 0, NULL, 0, access, - NULL, &params_key, NULL); + ret = create_iface_key(iface, access, &params_key); if (ret) { SetLastError(ret); @@ -3678,9 +3682,10 @@ BOOL WINAPI SetupDiCallClassInstaller(DI_FUNCTION function, HDEVINFO devinfo, SP return SetupDiRegisterCoDeviceInstallers(devinfo, device_data); case DIF_INSTALLDEVICEFILES: return SetupDiInstallDriverFiles(devinfo, device_data); + case DIF_INSTALLINTERFACES: + return SetupDiInstallDeviceInterfaces(devinfo, device_data); case DIF_FINISHINSTALL_ACTION: case DIF_INSTALLDEVICE: - case DIF_INSTALLINTERFACES: case DIF_PROPERTYCHANGE: case DIF_SELECTDEVICE: case DIF_UNREMOVE: @@ -4227,12 +4232,77 @@ BOOL WINAPI SetupDiGetDevicePropertyW(HDEVINFO devinfo, PSP_DEVINFO_DATA device_ /*********************************************************************** * SetupDiInstallDeviceInterfaces (SETUPAPI.@) */ -BOOL WINAPI SetupDiInstallDeviceInterfaces(HDEVINFO dev, PSP_DEVINFO_DATA info_data) +BOOL WINAPI SetupDiInstallDeviceInterfaces(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) { - FIXME("%p, %p stub\n", dev, info_data); + WCHAR section[LINE_LEN], section_ext[LINE_LEN], iface_section[LINE_LEN], refstr[LINE_LEN], guidstr[39]; + UINT install_flags = SPINST_ALL; + struct device_iface *iface; + struct device *device; + struct driver *driver; + void *callback_ctx; + GUID iface_guid; + INFCONTEXT ctx; + HKEY iface_key; + HINF hinf; + LONG l; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + TRACE("devinfo %p, device_data %p.\n", devinfo, device_data); + + if (!(device = get_device(devinfo, device_data))) + return FALSE; + + if (!(driver = device->selected_driver)) + { + ERR("No driver selected for device %p.\n", devinfo); + SetLastError(ERROR_NO_DRIVER_SELECTED); + return FALSE; + } + + if ((hinf = SetupOpenInfFileW(driver->inf_path, NULL, INF_STYLE_WIN4, NULL)) == INVALID_HANDLE_VALUE) + return FALSE; + + 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); + + if (device->params.Flags & DI_NOFILECOPY) + install_flags &= ~SPINST_FILES; + + callback_ctx = SetupInitDefaultQueueCallback(NULL); + + lstrcatW(section_ext, dotInterfaces); + if (SetupFindFirstLineW(hinf, section_ext, AddInterface, &ctx)) + { + do { + SetupGetStringFieldW(&ctx, 1, guidstr, ARRAY_SIZE(guidstr), NULL); + SetupGetStringFieldW(&ctx, 2, refstr, ARRAY_SIZE(refstr), NULL); + guidstr[37] = 0; + UuidFromStringW(&guidstr[1], &iface_guid); + + if (!(iface = SETUPDI_CreateDeviceInterface(device, &iface_guid, refstr))) + { + ERR("Failed to create device interface, error %#x.\n", GetLastError()); + continue; + } + + if ((l = create_iface_key(iface, KEY_ALL_ACCESS, &iface_key))) + { + ERR("Failed to create interface key, error %u.\n", l); + continue; + } + + SetupGetStringFieldW(&ctx, 3, iface_section, ARRAY_SIZE(iface_section), NULL); + SetupInstallFromInfSectionW(NULL, hinf, iface_section, install_flags, iface_key, + NULL, SP_COPY_NEWER_ONLY, SetupDefaultQueueCallbackW, callback_ctx, NULL, NULL); + + RegCloseKey(iface_key); + } while (SetupFindNextMatchLineW(&ctx, AddInterface, &ctx)); + } + + SetupTermDefaultQueueCallback(callback_ctx); + + SetupCloseInfFile(hinf); + return TRUE; } /***********************************************************************

1 0