wine-commits May 2019

wine-commits@winehq.org

2 participants
1019 discussions

Zebediah Figura : qedit/samplegrabber: Use strmbase_filter_cleanup().
by Alexandre Julliard 23 May '19

23 May '19

Module: wine Branch: master Commit: 68368a17b8dd3f60a92219e09f69db9044346ba6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=68368a17b8dd3f60a92219e0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 22 21:44:54 2019 -0500 qedit/samplegrabber: Use strmbase_filter_cleanup(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/samplegrabber.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index 56947a1..bc91f72 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -319,13 +319,14 @@ static ULONG WINAPI SampleGrabber_AddRef(IUnknown *iface) static ULONG WINAPI SampleGrabber_Release(IUnknown *iface) { SG_Impl *This = impl_from_IUnknown(iface); - ULONG ref = BaseFilterImpl_Release(&This->filter.IBaseFilter_iface); + ULONG ref = InterlockedDecrement(&This->filter.refCount); TRACE("(%p) ref=%d\n", This, ref); if (ref == 0) { SampleGrabber_cleanup(This); + strmbase_filter_cleanup(&This->filter); CoTaskMemFree(This); } return ref;

1 0

Zebediah Figura : qcap/audiorecord: Use strmbase_filter_cleanup().
by Alexandre Julliard 23 May '19

23 May '19

Module: wine Branch: master Commit: 1e0d9935f82fcd325d7d9ef6d07a2383cc25efbe URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e0d9935f82fcd325d7d9ef6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 22 21:44:53 2019 -0500 qcap/audiorecord: Use strmbase_filter_cleanup(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/audiorecord.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/qcap/audiorecord.c b/dlls/qcap/audiorecord.c index 12b62a4..373bc9a 100644 --- a/dlls/qcap/audiorecord.c +++ b/dlls/qcap/audiorecord.c @@ -99,9 +99,10 @@ static ULONG WINAPI Unknown_AddRef(IUnknown *iface) static ULONG WINAPI Unknown_Release(IUnknown *iface) { AudioRecord *This = impl_from_IUnknown(iface); - ULONG ref = BaseFilterImpl_Release(&This->filter.IBaseFilter_iface); + ULONG ref = InterlockedDecrement(&This->filter.refCount); TRACE("(%p/%p)->() ref=%d\n", iface, This, ref); if (!ref) { + strmbase_filter_cleanup(&This->filter); CoTaskMemFree(This); } return ref;

1 0

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

23 May '19

Module: wine Branch: master Commit: fb08e32e655444db7b444be1954df14349aacab3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb08e32e655444db7b444be1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 22 21:44:52 2019 -0500 qcap/avico: Use strmbase_filter_cleanup(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avico.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index 83a7804..5ea4016 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -150,7 +150,7 @@ static HRESULT WINAPI AVICompressor_QueryInterface(IBaseFilter *iface, REFIID ri static ULONG WINAPI AVICompressor_Release(IBaseFilter *iface) { AVICompressor *This = impl_from_IBaseFilter(iface); - ULONG ref = BaseFilterImpl_Release(&This->filter.IBaseFilter_iface); + ULONG ref = InterlockedDecrement(&This->filter.refCount); TRACE("(%p) ref=%d\n", This, ref); @@ -162,6 +162,7 @@ static ULONG WINAPI AVICompressor_Release(IBaseFilter *iface) 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); } @@ -685,7 +686,7 @@ IUnknown* WINAPI QCAP_createAVICompressor(IUnknown *outer, HRESULT *phr) hres = BaseInputPin_Construct(&AVICompressorInputPinVtbl, sizeof(BaseInputPin), &in_pin_info, &AVICompressorBaseInputPinVtbl, &compressor->filter.csFilter, NULL, (IPin**)&compressor->in); if(FAILED(hres)) { - IBaseFilter_Release(&compressor->filter.IBaseFilter_iface); + strmbase_filter_cleanup(&compressor->filter); *phr = hres; return NULL; } @@ -694,7 +695,7 @@ IUnknown* WINAPI QCAP_createAVICompressor(IUnknown *outer, HRESULT *phr) hres = BaseOutputPin_Construct(&AVICompressorOutputPinVtbl, sizeof(BaseOutputPin), &out_pin_info, &AVICompressorBaseOutputPinVtbl, &compressor->filter.csFilter, (IPin**)&compressor->out); if(FAILED(hres)) { - IBaseFilter_Release(&compressor->filter.IBaseFilter_iface); + strmbase_filter_cleanup(&compressor->filter); *phr = hres; return NULL; }

1 0

Zebediah Figura : qcap/smartteefilter: Use strmbase_filter_cleanup().
by Alexandre Julliard 23 May '19

23 May '19

Module: wine Branch: master Commit: 80e61defa1053c32a2947e040c3a5260f9ad0acc URL: https://source.winehq.org/git/wine.git/?a=commit;h=80e61defa1053c32a2947e04… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 22 21:44:51 2019 -0500 qcap/smartteefilter: Use strmbase_filter_cleanup(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/smartteefilter.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c index 268e7a2..cbcbc45 100644 --- a/dlls/qcap/smartteefilter.c +++ b/dlls/qcap/smartteefilter.c @@ -104,7 +104,7 @@ static ULONG WINAPI Unknown_AddRef(IUnknown *iface) static ULONG WINAPI Unknown_Release(IUnknown *iface) { SmartTeeFilter *This = impl_from_IUnknown(iface); - ULONG ref = BaseFilterImpl_Release(&This->filter.IBaseFilter_iface); + ULONG ref = InterlockedDecrement(&This->filter.refCount); TRACE("(%p)->() ref=%d\n", This, ref); @@ -115,6 +115,7 @@ static ULONG WINAPI Unknown_Release(IUnknown *iface) BaseOutputPinImpl_Release(&This->capture->pin.IPin_iface); if(This->preview) BaseOutputPinImpl_Release(&This->preview->pin.IPin_iface); + strmbase_filter_cleanup(&This->filter); CoTaskMemFree(This); } return ref; @@ -597,8 +598,8 @@ IUnknown* WINAPI QCAP_createSmartTeeFilter(IUnknown *outer, HRESULT *phr) This = CoTaskMemAlloc(sizeof(*This)); if (This == NULL) { - hr = E_OUTOFMEMORY; - goto end; + *phr = E_OUTOFMEMORY; + return NULL; } memset(This, 0, sizeof(*This)); This->IUnknown_iface.lpVtbl = &UnknownVtbl; @@ -638,8 +639,7 @@ end: else return (IUnknown*)&This->filter.IBaseFilter_iface; } else { - if (This) - IBaseFilter_Release(&This->filter.IBaseFilter_iface); + strmbase_filter_cleanup(&This->filter); return NULL; } }

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 22 May '19

22 May '19

Module: wine Branch: master Commit: 9cfe6094773929d9dd61db51da094324337ecab0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9cfe6094773929d9dd61db51… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed May 22 21:27:42 2019 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 48 +++++++++++++++--------------------------------- 1 file changed, 15 insertions(+), 33 deletions(-) diff --git a/po/lt.po b/po/lt.po index 6f4d295..981c4cb 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2019-04-05 06:56+0300\n" +"PO-Revision-Date: 2019-05-22 21:25+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -6820,10 +6820,8 @@ msgid "Begin request has already been made.\n" msgstr "Pradžios užklausa jau padaryta.\n" #: mferror.mc:599 -#, fuzzy -#| msgid "Object is not initialized.\n" msgid "Sink has not been finalized.\n" -msgstr "Objektas neinicijuotas.\n" +msgstr "Rinktuvas nebuvo užbaigtas.\n" #: mferror.mc:32 msgid "Media Foundation platform is not initialized.\n" @@ -7098,68 +7096,52 @@ msgid "Unsupported media source characteristics.\n" msgstr "Nepalaikomos medijos šaltinio charakteristikos.\n" #: mferror.mc:536 -#, fuzzy -#| msgid "Rate change was preempted.\n" msgid "Stream sink was removed.\n" -msgstr "Dažnio pakeitimui užkirstas kelias.\n" +msgstr "Srauto rinktuvas buvo pašalintas.\n" #: mferror.mc:543 msgid "Stream sinks are out of sync.\n" -msgstr "" +msgstr "Srauto rinktuvai nesutampa.\n" #: mferror.mc:550 -#, fuzzy -#| msgid "Media stream has no duration set.\n" msgid "Media sink stream sinks set is fixed.\n" -msgstr "Medijos srautui nenustatyta trukmė.\n" +msgstr "Medijos rinktuvo srauto rinktuvai fiksuoti.\n" #: mferror.mc:557 -#, fuzzy -#| msgid "Domain already exists.\n" msgid "Stream sink already exists.\n" -msgstr "Sritis jau egzistuoja.\n" +msgstr "Srauto rinktuvas jau egzistuoja.\n" #: mferror.mc:564 -#, fuzzy -#| msgid "Operation was cancelled.\n" msgid "Sample allocation was canceled.\n" -msgstr "Operacija nutraukta.\n" +msgstr "Elemento paskyrimas nutrauktas.\n" #: mferror.mc:571 -#, fuzzy -#| msgid "Directory is not empty.\n" msgid "Sample allocator is empty.\n" -msgstr "Katalogas netuščias.\n" +msgstr "Elementų skirstytuvas tuščias.\n" #: mferror.mc:578 -#, fuzzy -#| msgid "Clock state was already set.\n" msgid "Sink was already stopped.\n" -msgstr "Laikrodžio būsena jau nustatyta.\n" +msgstr "Rinktuvas jau sustabdytas.\n" #: mferror.mc:585 msgid "Bitrate was unknown for ASF file sink.\n" -msgstr "" +msgstr "Pralaidumas buvo nežinomas ASF failo rinktuvui.\n" #: mferror.mc:592 -#, fuzzy -#| msgid "No media streams were selected.\n" msgid "No streams were selected for the sink.\n" -msgstr "Nepasirinktas nė vienas medijos srautas.\n" +msgstr "Nepasirinktas nė vienas srautas rinktuvui.\n" #: mferror.mc:606 -#, fuzzy -#| msgid "File name is too long.\n" msgid "Metadata was too long.\n" -msgstr "Failo vardas per ilgas.\n" +msgstr "Metaduomenys per ilgi.\n" #: mferror.mc:613 msgid "No samples were processed by the sink.\n" -msgstr "" +msgstr "Rinktuvas neapdorojo nė vieno elemento.\n" #: mferror.mc:620 msgid "Sink was not provided with required headers.\n" -msgstr "" +msgstr "Rinktuvui nebuvo pateiktos reikalingos antraštės.\n" #: mferror.mc:627 msgid "Optional node is invalid.\n" @@ -7207,7 +7189,7 @@ msgstr "Trūksta šaltinio.\n" #: mferror.mc:704 msgid "Topology loader does not support sink activates.\n" -msgstr "Topologijos įkėlyklė nepalaiko „sink“ aktyvatorių.\n" +msgstr "Topologijos įkėlyklė nepalaiko rinktuvų aktyvatorių.\n" #: mferror.mc:711 msgid "Clock has no time source set.\n"

1 0

Zebediah Figura : setupapi: Implement device-specific co-installers in SetupDiCallClassInstaller().
by Alexandre Julliard 22 May '19

22 May '19

Module: wine Branch: master Commit: a3a4751a763846ee9beb72c21059ffbf10ec3482 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3a4751a763846ee9beb72c2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 22 11:15:42 2019 -0500 setupapi: Implement device-specific co-installers in SetupDiCallClassInstaller(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 6ef5df3..07288e5 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -3581,6 +3581,7 @@ BOOL WINAPI SetupDiCallClassInstaller(DI_FUNCTION function, HDEVINFO devinfo, SP '\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t', '\\','C','o','n','t','r','o','l', '\\','C','o','D','e','v','i','c','e','I','n','s','t','a','l','l','e','r','s',0}; + static const WCHAR coinstallers32W[] = {'C','o','I','n','s','t','a','l','l','e','r','s','3','2',0}; static const WCHAR installer32W[] = {'I','n','s','t','a','l','l','e','r','3','2',0}; DWORD (CALLBACK *classinst_proc)(DI_FUNCTION, HDEVINFO, SP_DEVINFO_DATA *); DWORD ret = ERROR_DI_DO_DEFAULT; @@ -3614,6 +3615,18 @@ BOOL WINAPI SetupDiCallClassInstaller(DI_FUNCTION function, HDEVINFO devinfo, SP if (!coret) return FALSE; + if (!open_driver_key(device, KEY_READ, &coinst_key)) + { + if (!RegGetValueW(coinst_key, NULL, coinstallers32W, RRF_RT_REG_MULTI_SZ, NULL, NULL, &size)) + { + path = heap_alloc(size); + if (!RegGetValueW(coinst_key, NULL, coinstallers32W, RRF_RT_REG_MULTI_SZ, NULL, path, &size)) + coret = call_coinstallers(path, function, devinfo, device_data); + heap_free(path); + } + RegCloseKey(coinst_key); + } + if ((class_key = SetupDiOpenClassRegKey(&device->class, KEY_READ)) != INVALID_HANDLE_VALUE) { if (!RegGetValueW(class_key, NULL, installer32W, RRF_RT_REG_SZ, NULL, NULL, &size))

1 0

Zebediah Figura : setupapi: Implement class co-installers in SetupDiCallClassInstaller().
by Alexandre Julliard 22 May '19

22 May '19

Module: wine Branch: master Commit: 8b1050c7f4b73d8b0703bc8f6423f3b8f2c92a29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b1050c7f4b73d8b0703bc8f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 22 11:15:41 2019 -0500 setupapi: Implement class co-installers in SetupDiCallClassInstaller(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 72 +++++++++++++++++++++++- dlls/setupapi/tests/coinst.c | 20 +++++++ dlls/setupapi/tests/coinst.spec | 3 + dlls/setupapi/tests/devinst.c | 121 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 215 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8b1050c7f4b73d8b0703…

1 0

Zebediah Figura : setupapi: Call DIF_DESTROYPRIVATEDATA when deleting a device.
by Alexandre Julliard 22 May '19

22 May '19

Module: wine Branch: master Commit: afba7d9d93b38e91ef41b4ae3027dca6b468d237 URL: https://source.winehq.org/git/wine.git/?a=commit;h=afba7d9d93b38e91ef41b4ae… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 22 11:15:40 2019 -0500 setupapi: Call DIF_DESTROYPRIVATEDATA when deleting a device. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 5 +++++ dlls/setupapi/tests/devinst.c | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index ea7e74f..2737ee0 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -724,6 +724,11 @@ static void remove_device(struct device *device) static void delete_device(struct device *device) { struct device_iface *iface, *next; + SP_DEVINFO_DATA device_data; + + device_data.cbSize = sizeof(device_data); + copy_device_data(&device_data, device); + SetupDiCallClassInstaller(DIF_DESTROYPRIVATEDATA, device->set, &device_data); if (device->phantom) remove_device(device); diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 7604062..374c8ca 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -2420,8 +2420,8 @@ static void test_class_installer(void) SetupDiDestroyDeviceInfoList(set); - todo_wine ok(*coinst_callback_count == 1, "Got %d callbacks.\n", *coinst_callback_count); - todo_wine ok(*coinst_last_message == DIF_DESTROYPRIVATEDATA, "Got unexpected message %#x.\n", *coinst_last_message); + ok(*coinst_callback_count == 1, "Got %d callbacks.\n", *coinst_callback_count); + ok(*coinst_last_message == DIF_DESTROYPRIVATEDATA, "Got unexpected message %#x.\n", *coinst_last_message); *coinst_callback_count = 0; /* Test returning an error. */ @@ -2498,8 +2498,8 @@ static void test_class_installer(void) SetupDiDestroyDeviceInfoList(set); - todo_wine ok(*coinst_callback_count == 1, "Got %d callbacks.\n", *coinst_callback_count); - todo_wine ok(*coinst_last_message == DIF_DESTROYPRIVATEDATA, "Got unexpected message %#x.\n", *coinst_last_message); + ok(*coinst_callback_count == 1, "Got %d callbacks.\n", *coinst_callback_count); + ok(*coinst_last_message == DIF_DESTROYPRIVATEDATA, "Got unexpected message %#x.\n", *coinst_last_message); *coinst_callback_count = 0; res = RegDeleteKeyA(class_key, "");

1 0

Zebediah Figura : setupapi: Implement custom class installers in SetupDiCallClassInstaller().
by Alexandre Julliard 22 May '19

22 May '19

Module: wine Branch: master Commit: fce26e60cc2400f3f3da27c221dce95593dd400e URL: https://source.winehq.org/git/wine.git/?a=commit;h=fce26e60cc2400f3f3da27c2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 22 11:15:39 2019 -0500 setupapi: Implement custom class installers in SetupDiCallClassInstaller(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 91 ++++++++++++++++----- dlls/setupapi/tests/Makefile.in | 5 +- dlls/setupapi/tests/coinst.c | 51 ++++++++++++ dlls/setupapi/tests/coinst.spec | 6 ++ dlls/setupapi/tests/devinst.c | 177 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 309 insertions(+), 21 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fce26e60cc2400f3f3da…

1 0

Zebediah Figura : setupapi: Add a basic implementation of SetupDiCallClassInstaller().
by Alexandre Julliard 22 May '19

22 May '19

Module: wine Branch: master Commit: 43ee138d4747722cfc7d27e59014a47c3003a898 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43ee138d4747722cfc7d27e5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 22 11:15:38 2019 -0500 setupapi: Add a basic implementation of SetupDiCallClassInstaller(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 33 ++++++++++++++++++++++------- dlls/setupapi/tests/devinst.c | 48 +++++++++++++++++++++++++++++++++++++++++++ include/setupapi.h | 1 + 3 files changed, 75 insertions(+), 7 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 5c6ec55..721ca3e 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -3520,15 +3520,34 @@ BOOL WINAPI SetupDiSetClassInstallParamsW( } /*********************************************************************** - * SetupDiCallClassInstaller (SETUPAPI.@) + * SetupDiCallClassInstaller (SETUPAPI.@) */ -BOOL WINAPI SetupDiCallClassInstaller( - DI_FUNCTION InstallFunction, - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData) +BOOL WINAPI SetupDiCallClassInstaller(DI_FUNCTION function, HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) { - FIXME("%d %p %p\n", InstallFunction, DeviceInfoSet, DeviceInfoData); - return FALSE; + TRACE("function %#x, devinfo %p, device_data %p.\n", function, devinfo, device_data); + + switch (function) + { + case DIF_REGISTERDEVICE: + return SetupDiRegisterDeviceInfo(devinfo, device_data, 0, NULL, NULL, NULL); + case DIF_REMOVE: + return SetupDiRemoveDevice(devinfo, device_data); + case DIF_SELECTBESTCOMPATDRV: + return SetupDiSelectBestCompatDrv(devinfo, device_data); + case DIF_REGISTER_COINSTALLERS: + return SetupDiRegisterCoDeviceInstallers(devinfo, device_data); + case DIF_FINISHINSTALL_ACTION: + case DIF_INSTALLDEVICE: + case DIF_INSTALLDEVICEFILES: + case DIF_INSTALLINTERFACES: + case DIF_PROPERTYCHANGE: + case DIF_SELECTDEVICE: + case DIF_UNREMOVE: + FIXME("Unhandled function %#x.\n", function); + default: + SetLastError(ERROR_DI_DO_DEFAULT); + return FALSE; + } } /*********************************************************************** diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index f9631c7..a2ccef1 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -2336,6 +2336,53 @@ static void test_driver_list(void) DeleteFileA("C:/windows/inf/wine_test2.pnf"); } +static BOOL device_is_registered(HDEVINFO set, SP_DEVINFO_DATA *device) +{ + HKEY key = SetupDiOpenDevRegKey(set, device, DICS_FLAG_GLOBAL, 0, DIREG_DRV, 0); + ok(key == INVALID_HANDLE_VALUE, "Expected failure.\n"); + RegCloseKey(key); + return GetLastError() == ERROR_KEY_DOES_NOT_EXIST; +} + +static void test_call_class_installer(void) +{ + SP_DEVINFO_DATA device = {sizeof(device)}; + HDEVINFO set; + BOOL ret; + + if (wow64) + { + skip("SetupDiCallClassInstaller() does not work on WoW64.\n"); + return; + } + + set = SetupDiCreateDeviceInfoList(&guid, NULL); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); + ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0000", &guid, NULL, NULL, 0, &device); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + + ok(!device_is_registered(set, &device), "Expected device not to be registered.\n"); + ret = SetupDiCallClassInstaller(DIF_REGISTERDEVICE, set, &device); + ok(ret, "Failed to call class installer, error %#x.\n", GetLastError()); + ok(device_is_registered(set, &device), "Expected device to be registered.\n"); + + /* This is probably not failure per se, but rather an indication that no + * class installer was called and no default handler exists. */ + ret = SetupDiCallClassInstaller(DIF_ALLOW_INSTALL, set, &device); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_DI_DO_DEFAULT, "Got unexpected error %#x.\n", GetLastError()); + + ret = SetupDiCallClassInstaller(0xdeadbeef, set, &device); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_DI_DO_DEFAULT, "Got unexpected error %#x.\n", GetLastError()); + + ret = SetupDiCallClassInstaller(DIF_REMOVE, set, &device); + ok(ret, "Failed to call class installer, error %#x.\n", GetLastError()); + ok(!device_is_registered(set, &device), "Expected device not to be registered.\n"); + + SetupDiDestroyDeviceInfoList(set); +} + START_TEST(devinst) { static BOOL (WINAPI *pIsWow64Process)(HANDLE, BOOL *); @@ -2372,4 +2419,5 @@ START_TEST(devinst) test_device_interface_key(); test_device_install_params(); test_driver_list(); + test_call_class_installer(); } diff --git a/include/setupapi.h b/include/setupapi.h index 4491617..818cc12 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -1106,6 +1106,7 @@ DECL_WINELIB_SETUPAPI_TYPE_AW(PSP_INF_SIGNER_INFO) #define DIF_POWERMESSAGEWAKE 0x27 #define DIF_ADDREMOTEPROPERTYPAGE_ADVANCED 0x28 #define DIF_UPDATEDRIVER_UI 0x29 +#define DIF_FINISHINSTALL_ACTION 0x2a #define DIF_RESERVED2 0x30 /* Directory ids */

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