June 2019 - Wine-Commits - list.winehq.org

Zebediah Figura : ntoskrnl.exe: Handle IRP_MN_QUERY_ID for root PnP devices.
by Alexandre Julliard June 26, 2019

June 26, 2019

Module: wine Branch: master Commit: 816e25c1949a6d0bc6c98e599923768eba9e91b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=816e25c1949a6d0bc6c98e59… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 25 21:35:16 2019 -0500 ntoskrnl.exe: Handle IRP_MN_QUERY_ID for root PnP devices. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/pnp.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 90da2b7..f531527 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -782,6 +782,7 @@ 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 ); + struct root_pnp_device *root_device = device->DeviceExtension; TRACE("device %p, irp %p, minor function %#x.\n", device, irp, stack->MinorFunction); @@ -793,6 +794,49 @@ static NTSTATUS WINAPI pnp_manager_device_pnp( DEVICE_OBJECT *device, IRP *irp ) /* Nothing to do. */ irp->IoStatus.u.Status = STATUS_SUCCESS; break; + case IRP_MN_QUERY_ID: + { + BUS_QUERY_ID_TYPE type = stack->Parameters.QueryId.IdType; + WCHAR *id, *p; + + TRACE("Received IRP_MN_QUERY_ID, type %#x.\n", type); + + switch (type) + { + case BusQueryDeviceID: + p = wcsrchr( root_device->id, '\\' ); + if ((id = ExAllocatePool( NonPagedPool, (p - root_device->id + 1) * sizeof(WCHAR) ))) + { + memcpy( id, root_device->id, (p - root_device->id) * sizeof(WCHAR) ); + id[p - root_device->id] = 0; + irp->IoStatus.Information = (ULONG_PTR)id; + irp->IoStatus.u.Status = STATUS_SUCCESS; + } + else + { + irp->IoStatus.Information = 0; + irp->IoStatus.u.Status = STATUS_NO_MEMORY; + } + break; + case BusQueryInstanceID: + p = wcsrchr( root_device->id, '\\' ); + if ((id = ExAllocatePool( NonPagedPool, (wcslen( p + 1 ) + 1) * sizeof(WCHAR) ))) + { + wcscpy( id, p + 1 ); + irp->IoStatus.Information = (ULONG_PTR)id; + irp->IoStatus.u.Status = STATUS_SUCCESS; + } + else + { + irp->IoStatus.Information = 0; + irp->IoStatus.u.Status = STATUS_NO_MEMORY; + } + break; + default: + FIXME("Unhandled IRP_MN_QUERY_ID type %#x.\n", type); + } + break; + } default: FIXME("Unhandled PnP request %#x.\n", stack->MinorFunction); }

1 0

Zebediah Figura : ntoskrnl.exe: Handle some no-op PnP requests.
by Alexandre Julliard June 26, 2019

June 26, 2019

Module: wine Branch: master Commit: 13e9d4312786ef2a33bdd5ecdd98879057fb2bc0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13e9d4312786ef2a33bdd5ec… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 25 21:35:15 2019 -0500 ntoskrnl.exe: Handle some no-op PnP requests. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/pnp.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 48430f3..90da2b7 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -785,6 +785,18 @@ static NTSTATUS WINAPI pnp_manager_device_pnp( DEVICE_OBJECT *device, IRP *irp ) TRACE("device %p, irp %p, minor function %#x.\n", device, irp, stack->MinorFunction); + switch (stack->MinorFunction) + { + case IRP_MN_START_DEVICE: + case IRP_MN_SURPRISE_REMOVAL: + case IRP_MN_REMOVE_DEVICE: + /* Nothing to do. */ + irp->IoStatus.u.Status = STATUS_SUCCESS; + break; + default: + FIXME("Unhandled PnP request %#x.\n", stack->MinorFunction); + } + IoCompleteRequest( irp, IO_NO_INCREMENT ); return irp->IoStatus.u.Status; }

1 0

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

June 26, 2019

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: Store the source pin inline in the VfwCapture structure.
by Alexandre Julliard June 26, 2019

June 26, 2019

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

Zebediah Figura : qcap/vfwcapture: Don' t expose IAMStreamConfig from the filter.
by Alexandre Julliard June 26, 2019

June 26, 2019

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

Julian Rüger : German translation for release 4.11.
by Alexandre Julliard June 26, 2019

June 26, 2019

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

June 26, 2019

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

June 25, 2019

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

June 25, 2019

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 : wine.inf: Add the GUID_DEVCLASS_SYSTEM class key.
by Alexandre Julliard June 25, 2019

June 25, 2019

Module: wine Branch: master Commit: f79da3991a9e829bd6b4fd4b971fefd49bf81742 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f79da3991a9e829bd6b4fd4b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jun 22 10:12:30 2019 -0500 wine.inf: Add the GUID_DEVCLASS_SYSTEM class key. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 844f7c6..c3d3b77 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -461,6 +461,8 @@ HKLM,System\CurrentControlSet\Control\Class\{4d36e967-e325-11ce-bfc1-08002be1031 HKLM,System\CurrentControlSet\Control\Class\{4d36e967-e325-11ce-bfc1-08002be10318},"Class",,"DiskDrive" HKLM,System\CurrentControlSet\Control\Class\{4d36e978-e325-11ce-bfc1-08002be10318},,,"Ports (COM & LPT)" HKLM,System\CurrentControlSet\Control\Class\{4d36e978-e325-11ce-bfc1-08002be10318},"Class",,"Ports" +HKLM,System\CurrentControlSet\Control\Class\{4d36e97d-e325-11ce-bfc1-08002be10318},,,"System devices" +HKLM,System\CurrentControlSet\Control\Class\{4d36e97d-e325-11ce-bfc1-08002be10318},"Class",,"System" HKLM,System\CurrentControlSet\Control\Class\{6bdd1fc6-810f-11d0-bec7-08002be2092f},,,"Imaging devices" HKLM,System\CurrentControlSet\Control\Class\{6bdd1fc6-810f-11d0-bec7-08002be2092f},"Class",,"Image" HKLM,System\CurrentControlSet\Control\Class\{745a17a0-74d3-11d0-b6fe-00a0c90f57da},,,"Human Interface Devices"

1 0