wine-commits June 2019

wine-commits@winehq.org

1 participants
865 discussions

Zebediah Figura : quartz/vmr9: Return S_OK when calling IVMRFilterConfig9: :SetNumberOfStreams(1).
by Alexandre Julliard 26 Jun '19

26 Jun '19

Module: wine Branch: master Commit: 46bb907d3a4b1670001ae00c5c0281d215488d71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=46bb907d3a4b1670001ae00c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 25 20:38:15 2019 -0500 quartz/vmr9: Return S_OK when calling IVMRFilterConfig9::SetNumberOfStreams(1). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47291 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 38c708b..e5efc16 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -1354,11 +1354,11 @@ static HRESULT WINAPI VMR9FilterConfig_SetImageCompositor(IVMRFilterConfig9 *ifa return E_NOTIMPL; } -static HRESULT WINAPI VMR9FilterConfig_SetNumberOfStreams(IVMRFilterConfig9 *iface, DWORD max) +static HRESULT WINAPI VMR9FilterConfig_SetNumberOfStreams(IVMRFilterConfig9 *iface, DWORD count) { - struct quartz_vmr *This = impl_from_IVMRFilterConfig9(iface); - - FIXME("(%p/%p)->(%u) stub\n", iface, This, max); + FIXME("iface %p, count %u, stub!\n", iface, count); + if (count == 1) + return S_OK; return E_NOTIMPL; }

1 0

Zebediah Figura : quartz/parser: Store the source pins as an array of Parser_OutputPin pointers.
by Alexandre Julliard 26 Jun '19

26 Jun '19

Module: wine Branch: master Commit: 8f4194f311ec38223349359fa73d8a4e5cfb1193 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f4194f311ec38223349359f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 25 20:38:14 2019 -0500 quartz/parser: Store the source pins as an array of Parser_OutputPin pointers. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/avisplit.c | 18 ++++------- dlls/quartz/mpegsplit.c | 12 +++---- dlls/quartz/parser.c | 82 +++++++++++++++++++++--------------------------- dlls/quartz/parser.h | 24 +++++++------- dlls/quartz/waveparser.c | 20 +++++------- 5 files changed, 66 insertions(+), 90 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8f4194f311ec38223349…

1 0

Zebediah Figura : quartz/parser: Don't store the sink pin in the "ppPins" array.
by Alexandre Julliard 26 Jun '19

26 Jun '19

Module: wine Branch: master Commit: e8510660e65c5441fee6342f0b452292d243b9a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8510660e65c5441fee6342f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 25 20:38:13 2019 -0500 quartz/parser: Don't store the sink pin in the "ppPins" array. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/avisplit.c | 8 ++++---- dlls/quartz/mpegsplit.c | 4 ++-- dlls/quartz/parser.c | 38 +++++++++++++++++++------------------- dlls/quartz/waveparser.c | 10 +++++----- 4 files changed, 30 insertions(+), 30 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e8510660e65c5441fee6…

1 0

Zebediah Figura : qcap/vfwcapture: Don' t expose IAMStreamConfig from the filter.
by Alexandre Julliard 26 Jun '19

26 Jun '19

Module: wine Branch: master Commit: 15b3eba742301147571f6b168255d52f728d14d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15b3eba742301147571f6b16… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 25 20:38:12 2019 -0500 qcap/vfwcapture: Don't expose IAMStreamConfig from the filter. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/qcap.c | 2 +- dlls/qcap/vfwcapture.c | 26 ++++++++++---------------- 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/dlls/qcap/tests/qcap.c b/dlls/qcap/tests/qcap.c index d880a26..df26b54 100644 --- a/dlls/qcap/tests/qcap.c +++ b/dlls/qcap/tests/qcap.c @@ -1809,7 +1809,7 @@ static void test_COM_vfwcapture(void) /* Unsupported interfaces */ hr = IBaseFilter_QueryInterface(bf, &IID_IAMStreamConfig, (void**)&unk); - todo_wine ok(hr == E_NOINTERFACE, "QueryInterface for IID_IAMStreamConfig failed: %08x\n", hr); + ok(hr == E_NOINTERFACE, "QueryInterface for IID_IAMStreamConfig failed: %08x\n", hr); hr = IBaseFilter_QueryInterface(bf, &IID_IAMVideoProcAmp, (void**)&unk); todo_wine ok(hr == E_NOINTERFACE, "QueryInterface for IID_IAMVideoProcAmp failed: %08x\n", hr); hr = IBaseFilter_QueryInterface(bf, &IID_IOverlayNotify, (void**)&unk); diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 83682b8..519543e 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -125,8 +125,6 @@ static HRESULT vfw_capture_query_interface(BaseFilter *iface, REFIID iid, void * if (IsEqualGUID(iid, &IID_IPersistPropertyBag)) *out = &filter->IPersistPropertyBag_iface; - else if (IsEqualGUID(iid, &IID_IAMStreamConfig)) - *out = &filter->IAMStreamConfig_iface; else if (IsEqualGUID(iid, &IID_IAMVideoProcAmp)) *out = &filter->IAMVideoProcAmp_iface; else @@ -187,26 +185,22 @@ static const IBaseFilterVtbl VfwCapture_Vtbl = }; /* AMStreamConfig interface, we only need to implement {G,S}etFormat */ -static HRESULT WINAPI AMStreamConfig_QueryInterface(IAMStreamConfig *iface, REFIID riid, - void **ret_iface) +static HRESULT WINAPI AMStreamConfig_QueryInterface(IAMStreamConfig *iface, REFIID iid, void **out) { - VfwCapture *This = impl_from_IAMStreamConfig(iface); - - return IUnknown_QueryInterface(This->filter.outer_unk, riid, ret_iface); + VfwCapture *filter = impl_from_IAMStreamConfig(iface); + return IPin_QueryInterface(&filter->source.pin.IPin_iface, iid, out); } -static ULONG WINAPI AMStreamConfig_AddRef( IAMStreamConfig * iface ) +static ULONG WINAPI AMStreamConfig_AddRef(IAMStreamConfig *iface) { - VfwCapture *This = impl_from_IAMStreamConfig(iface); - - return IUnknown_AddRef(This->filter.outer_unk); + VfwCapture *filter = impl_from_IAMStreamConfig(iface); + return IPin_AddRef(&filter->source.pin.IPin_iface); } -static ULONG WINAPI AMStreamConfig_Release( IAMStreamConfig * iface ) +static ULONG WINAPI AMStreamConfig_Release(IAMStreamConfig *iface) { - VfwCapture *This = impl_from_IAMStreamConfig(iface); - - return IUnknown_Release(This->filter.outer_unk); + VfwCapture *filter = impl_from_IAMStreamConfig(iface); + return IPin_Release(&filter->source.pin.IPin_iface); } static HRESULT WINAPI @@ -580,7 +574,7 @@ static HRESULT WINAPI VfwPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * else if (IsEqualIID(riid, &IID_IKsPropertySet)) *ppv = &filter->IKsPropertySet_iface; else if (IsEqualIID(riid, &IID_IAMStreamConfig)) - return IUnknown_QueryInterface(&filter->filter.IBaseFilter_iface, riid, ppv); + *ppv = &filter->IAMStreamConfig_iface; if (*ppv) {

1 0

Zebediah Figura : qcap/vfwcapture: Store the source pin inline in the VfwCapture structure.
by Alexandre Julliard 26 Jun '19

26 Jun '19

Module: wine Branch: master Commit: 16322578c485d4208b43172a8df1a2c670ae1a05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=16322578c485d4208b43172a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 25 20:38:11 2019 -0500 qcap/vfwcapture: Store the source pin inline in the VfwCapture structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/capture.h | 2 +- dlls/qcap/v4l.c | 26 +++---- dlls/qcap/vfwcapture.c | 190 ++++++++++++++++++------------------------------- 3 files changed, 80 insertions(+), 138 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=16322578c485d4208b43…

1 0

Julian Rüger : German translation for release 4.11.
by Alexandre Julliard 26 Jun '19

26 Jun '19

Module: website Branch: master Commit: 360ee1715bc848b78c1402dc16fa8b8a0f7bd51f URL: https://source.winehq.org/git/website.git/?a=commit;h=360ee1715bc848b78c140… Author: Julian Rüger <jr98(a)gmx.net> Date: Tue Jun 25 17:19:44 2019 +0200 German translation for release 4.11. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2019062101.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2019062101.xml b/news/de/2019062101.xml new file mode 100644 index 0000000..a0f667c --- /dev/null +++ b/news/de/2019062101.xml @@ -0,0 +1,16 @@ +<news> +<date>21. Juni 2019</date> +<title>Wine 4.11 freigegeben</title> +<body> + Die Entwicklungsversion 4.11 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/4.11">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Aktualisierte Version der Mono-Engine, einschließlich Windows.Forms.</li> + <li>Weitere DLLs standardmäßig als PE-Dateien übersetzt.</li> + <li>Schnellere Implementierung der Slim-Reader/Writer-Locks unter Linux.</li> + <li>Anfängliche Unterstützung für das Enumerieren von Anzeigegeräten.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/4.x/wine-4.11.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 4.10.
by Alexandre Julliard 26 Jun '19

26 Jun '19

Module: website Branch: master Commit: aff172424648f226c695a846da80ed10691b050d URL: https://source.winehq.org/git/website.git/?a=commit;h=aff172424648f226c695a… Author: Julian Rüger <jr98(a)gmx.net> Date: Tue Jun 25 17:16:38 2019 +0200 German translation for release 4.10. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2019061001.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2019061001.xml b/news/de/2019061001.xml new file mode 100644 index 0000000..b05dd57 --- /dev/null +++ b/news/de/2019061001.xml @@ -0,0 +1,16 @@ +<news> +<date>10. Juni 2019</date> +<title>Wine 4.10 freigegeben</title> +<body> + Die Entwicklungsversion 4.10 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/4.10">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Viele DLLs werden nun standardmäßig als PE-Dateien übersetzt.</li> + <li>Weitere Unterstützung Plug-and-Play-Treiber zu installieren.</li> + <li>Zeitgeber-Synchronisierung in der Media Foundation.</li> + <li>Lautstärkenanpassung in Audiotreibern.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/4.x/wine-4.10.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Zebediah Figura : services: Load root PnP drivers on startup.
by Alexandre Julliard 25 Jun '19

25 Jun '19

Module: wine Branch: master Commit: 887a57fadd00b39b266b421fe1a04ab09e0d917d URL: https://source.winehq.org/git/wine.git/?a=commit;h=887a57fadd00b39b266b421f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jun 22 10:12:34 2019 -0500 services: Load root PnP drivers on startup. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/Makefile.in | 2 +- programs/services/services.c | 29 ++++++++++++++++++++++++++++- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/programs/services/Makefile.in b/programs/services/Makefile.in index e06514c..560e277 100644 --- a/programs/services/Makefile.in +++ b/programs/services/Makefile.in @@ -1,5 +1,5 @@ MODULE = services.exe -IMPORTS = rpcrt4 advapi32 userenv +IMPORTS = rpcrt4 advapi32 userenv setupapi EXTRADLLFLAGS = -mconsole -mno-cygwin diff --git a/programs/services/services.c b/programs/services/services.c index ff5c4cb..67cd4fa 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -27,6 +27,7 @@ #include <winsvc.h> #include <rpc.h> #include <userenv.h> +#include <setupapi.h> #include "wine/debug.h" #include "wine/heap.h" @@ -423,25 +424,50 @@ static BOOL schedule_delayed_autostart(struct service_entry **services, unsigned return TRUE; } +static BOOL is_root_pnp_service(const struct service_entry *service, HDEVINFO set) +{ + SP_DEVINFO_DATA device = {sizeof(device)}; + WCHAR name[MAX_SERVICE_NAME]; + unsigned int i; + + for (i = 0; SetupDiEnumDeviceInfo(set, i, &device); ++i) + { + if (SetupDiGetDeviceRegistryPropertyW(set, &device, SPDRP_SERVICE, NULL, + (BYTE *)name, sizeof(name), NULL) + && !wcsicmp(name, service->name)) + { + return TRUE; + } + } + + return FALSE; +} + static void scmdatabase_autostart_services(struct scmdatabase *db) { + static const WCHAR rootW[] = {'R','O','O','T',0}; struct service_entry **services_list; unsigned int i = 0; unsigned int size = 32; unsigned int delayed_cnt = 0; struct service_entry *service; + HDEVINFO set; services_list = HeapAlloc(GetProcessHeap(), 0, size * sizeof(services_list[0])); if (!services_list) return; + if ((set = SetupDiGetClassDevsW( NULL, rootW, NULL, DIGCF_ALLCLASSES )) == INVALID_HANDLE_VALUE) + WINE_ERR("Failed to enumerate devices, error %#x.\n", GetLastError()); + scmdatabase_lock(db); LIST_FOR_EACH_ENTRY(service, &db->services, struct service_entry, entry) { if (service->config.dwStartType == SERVICE_BOOT_START || service->config.dwStartType == SERVICE_SYSTEM_START || - service->config.dwStartType == SERVICE_AUTO_START) + service->config.dwStartType == SERVICE_AUTO_START || + (set != INVALID_HANDLE_VALUE && is_root_pnp_service(set, service))) { if (i+1 >= size) { @@ -482,6 +508,7 @@ static void scmdatabase_autostart_services(struct scmdatabase *db) if (!delayed_cnt || !schedule_delayed_autostart(services_list, delayed_cnt)) heap_free(services_list); + SetupDiDestroyDeviceInfoList(set); } static void scmdatabase_wait_terminate(struct scmdatabase *db)

1 0

Zebediah Figura : setupapi: Delay-load user32.
by Alexandre Julliard 25 Jun '19

25 Jun '19

Module: wine Branch: master Commit: 00e71346329a79b32e6e62e1a4e8003aef8e00a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00e71346329a79b32e6e62e1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jun 22 10:12:33 2019 -0500 setupapi: Delay-load user32. We want to load setupapi from services.exe. We do not want to initialize user32 there, as that results in the creation of a window station. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/Makefile.in b/dlls/setupapi/Makefile.in index bf157cb..6bb9d59 100644 --- a/dlls/setupapi/Makefile.in +++ b/dlls/setupapi/Makefile.in @@ -1,8 +1,8 @@ EXTRADEFS = -D_SETUPAPI_ MODULE = setupapi.dll IMPORTLIB = setupapi -IMPORTS = uuid user32 version advapi32 rpcrt4 -DELAYIMPORTS = shell32 wintrust ole32 winspool comdlg32 +IMPORTS = uuid version advapi32 rpcrt4 +DELAYIMPORTS = shell32 wintrust ole32 winspool comdlg32 user32 C_SRCS = \ devinst.c \

1 0

Zebediah Figura : ntoskrnl.exe: Load a driver' s root PnP devices when the driver is started.
by Alexandre Julliard 25 Jun '19

25 Jun '19

Module: wine Branch: master Commit: b06740ecde72974bb709281dfac8709b9ec986b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b06740ecde72974bb709281d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jun 22 10:12:32 2019 -0500 ntoskrnl.exe: Load a driver's root PnP devices when the driver is started. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 + dlls/ntoskrnl.exe/ntoskrnl_private.h | 1 + dlls/ntoskrnl.exe/pnp.c | 109 ++++++++++++++++++++++++++++++++--- 3 files changed, 103 insertions(+), 9 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 5839072..92f9afa 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3648,6 +3648,8 @@ NTSTATUS WINAPI ZwLoadDriver( const UNICODE_STRING *service_name ) driver = WINE_RB_ENTRY_VALUE( entry, struct wine_driver, entry ); driver->service_handle = service_handle; + pnp_manager_enumerate_root_devices( service_name->Buffer + wcslen( servicesW ) ); + set_service_status( service_handle, SERVICE_RUNNING, SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN ); return STATUS_SUCCESS; diff --git a/dlls/ntoskrnl.exe/ntoskrnl_private.h b/dlls/ntoskrnl.exe/ntoskrnl_private.h index 1c5952f..b5244ef 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl_private.h +++ b/dlls/ntoskrnl.exe/ntoskrnl_private.h @@ -76,6 +76,7 @@ extern POBJECT_TYPE SeTokenObjectType; void ObReferenceObject( void *obj ) DECLSPEC_HIDDEN; +void pnp_manager_enumerate_root_devices( const WCHAR *driver_name ) DECLSPEC_HIDDEN; void pnp_manager_start(void) DECLSPEC_HIDDEN; void pnp_manager_stop(void) DECLSPEC_HIDDEN; diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 6f2283b..48430f3 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -375,6 +375,18 @@ static BOOL install_device_driver( DEVICE_OBJECT *device, HDEVINFO set, SP_DEVIN return TRUE; } +/* Load the function driver for a newly created PDO, if one is present, and + * send IRPs to start the device. */ +static void start_device( DEVICE_OBJECT *device, HDEVINFO set, SP_DEVINFO_DATA *sp_device ) +{ + load_function_driver( device, set, sp_device ); + if (device->DriverObject) + { + send_pnp_irp( device, IRP_MN_START_DEVICE ); + send_power_irp( device, PowerDeviceD0 ); + } +} + static void handle_bus_relations( DEVICE_OBJECT *device ) { static const WCHAR infpathW[] = {'I','n','f','P','a','t','h',0}; @@ -420,19 +432,14 @@ static void handle_bus_relations( DEVICE_OBJECT *device ) return; } - load_function_driver( device, set, &sp_device ); - if (device->DriverObject) - { - send_pnp_irp( device, IRP_MN_START_DEVICE ); - send_power_irp( device, PowerDeviceD0 ); - } + start_device( device, set, &sp_device ); SetupDiDestroyDeviceInfoList( set ); } -static void handle_removal_relations( DEVICE_OBJECT *device ) +static void remove_device( DEVICE_OBJECT *device ) { - TRACE( "(%p)\n", device ); + TRACE("Removing device %p.\n", device); send_power_irp( device, PowerDeviceD3 ); send_pnp_irp( device, IRP_MN_SURPRISE_REMOVAL ); @@ -452,7 +459,7 @@ void WINAPI IoInvalidateDeviceRelations( DEVICE_OBJECT *device_object, DEVICE_RE handle_bus_relations( device_object ); break; case RemovalRelations: - handle_removal_relations( device_object ); + remove_device( device_object ); break; default: FIXME("Unhandled relation %#x.\n", type); @@ -755,6 +762,23 @@ POWER_STATE WINAPI PoSetPowerState( DEVICE_OBJECT *device, POWER_STATE_TYPE type static DRIVER_OBJECT *pnp_manager; +struct root_pnp_device +{ + WCHAR id[MAX_DEVICE_ID_LEN]; + struct wine_rb_entry entry; + DEVICE_OBJECT *device; +}; + +static int root_pnp_devices_rb_compare( const void *key, const struct wine_rb_entry *entry ) +{ + const struct root_pnp_device *device = WINE_RB_ENTRY_VALUE( entry, const struct root_pnp_device, entry ); + const WCHAR *k = key; + + return wcsicmp( k, device->id ); +} + +static struct wine_rb_tree root_pnp_devices = { root_pnp_devices_rb_compare }; + static NTSTATUS WINAPI pnp_manager_device_pnp( DEVICE_OBJECT *device, IRP *irp ) { IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp ); @@ -783,7 +807,74 @@ void pnp_manager_start(void) ERR("Failed to create PnP manager driver, status %#x.\n", status); } +static void destroy_root_pnp_device( struct wine_rb_entry *entry, void *context ) +{ + struct root_pnp_device *device = WINE_RB_ENTRY_VALUE(entry, struct root_pnp_device, entry); + remove_device( device->device ); +} + void pnp_manager_stop(void) { + wine_rb_destroy( &root_pnp_devices, destroy_root_pnp_device, NULL ); IoDeleteDriver( pnp_manager ); } + +void pnp_manager_enumerate_root_devices( const WCHAR *driver_name ) +{ + static const WCHAR driverW[] = {'\\','D','r','i','v','e','r','\\',0}; + static const WCHAR rootW[] = {'R','O','O','T',0}; + WCHAR buffer[MAX_SERVICE_NAME + ARRAY_SIZE(driverW)], id[MAX_DEVICE_ID_LEN]; + SP_DEVINFO_DATA sp_device = {sizeof(sp_device)}; + struct root_pnp_device *pnp_device; + DEVICE_OBJECT *device; + NTSTATUS status; + unsigned int i; + HDEVINFO set; + + TRACE("Searching for new root-enumerated devices for driver %s.\n", debugstr_w(driver_name)); + + set = SetupDiGetClassDevsW( NULL, rootW, NULL, DIGCF_ALLCLASSES ); + if (set == INVALID_HANDLE_VALUE) + { + ERR("Failed to build device set, error %#x.\n", GetLastError()); + return; + } + + for (i = 0; SetupDiEnumDeviceInfo( set, i, &sp_device ); ++i) + { + if (!SetupDiGetDeviceRegistryPropertyW( set, &sp_device, SPDRP_SERVICE, + NULL, (BYTE *)buffer, sizeof(buffer), NULL ) + || lstrcmpiW( buffer, driver_name )) + { + continue; + } + + SetupDiGetDeviceInstanceIdW( set, &sp_device, id, ARRAY_SIZE(id), NULL ); + + if (wine_rb_get( &root_pnp_devices, id )) + continue; + + TRACE("Adding new root-enumerated device %s.\n", debugstr_w(id)); + + if ((status = IoCreateDevice( pnp_manager, sizeof(struct root_pnp_device), NULL, + FILE_DEVICE_CONTROLLER, FILE_AUTOGENERATED_DEVICE_NAME, FALSE, &device ))) + { + ERR("Failed to create root-enumerated PnP device %s, status %#x.\n", debugstr_w(id), status); + continue; + } + + pnp_device = device->DeviceExtension; + wcscpy( pnp_device->id, id ); + pnp_device->device = device; + if (wine_rb_put( &root_pnp_devices, id, &pnp_device->entry )) + { + ERR("Failed to insert device %s into tree.\n", debugstr_w(id)); + IoDeleteDevice( device ); + continue; + } + + start_device( device, set, &sp_device ); + } + + SetupDiDestroyDeviceInfoList(set); +}

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
87
Older →

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 June 2019