April 2020 - Wine-devel - list.winehq.org

[PATCH] wineusb.sys: Correctly implement device removal.
by Zebediah Figura 24 Apr '20

24 Apr '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wineusb.sys/wineusb.c | 39 ++++++++++++++++++++++++++++++++++---- 1 file changed, 35 insertions(+), 4 deletions(-) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index 55bd84ea30..d79112b479 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -69,6 +69,7 @@ static struct list device_list = LIST_INIT(device_list); struct usb_device { struct list entry; + BOOL removed; DEVICE_OBJECT *device_obj; @@ -126,6 +127,7 @@ static void add_usb_device(libusb_device *libusb_device) EnterCriticalSection(&wineusb_cs); list_add_tail(&device_list, &device->entry); + device->removed = FALSE; LeaveCriticalSection(&wineusb_cs); IoInvalidateDeviceRelations(bus_pdo, BusRelations); @@ -142,15 +144,14 @@ static void remove_usb_device(libusb_device *libusb_device) { if (device->libusb_device == libusb_device) { - libusb_unref_device(device->libusb_device); - libusb_close(device->handle); list_remove(&device->entry); - IoInvalidateDeviceRelations(bus_pdo, BusRelations); - IoDeleteDevice(device->device_obj); + device->removed = TRUE; break; } } LeaveCriticalSection(&wineusb_cs); + + IoInvalidateDeviceRelations(bus_pdo, BusRelations); } static BOOL thread_shutdown; @@ -378,8 +379,38 @@ static NTSTATUS pdo_pnp(DEVICE_OBJECT *device_obj, IRP *irp) case IRP_MN_START_DEVICE: case IRP_MN_QUERY_CAPABILITIES: + case IRP_MN_SURPRISE_REMOVAL: + ret = STATUS_SUCCESS; + break; + + case IRP_MN_REMOVE_DEVICE: + { + LIST_ENTRY *entry; + + EnterCriticalSection(&wineusb_cs); + while ((entry = RemoveHeadList(&device->irp_list)) != &device->irp_list) + { + irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.ListEntry); + irp->IoStatus.Status = STATUS_CANCELLED; + irp->IoStatus.Information = 0; + IoCompleteRequest(irp, IO_NO_INCREMENT); + } + LeaveCriticalSection(&wineusb_cs); + + if (device->removed) + { + libusb_unref_device(device->libusb_device); + libusb_close(device->handle); + + irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(irp, IO_NO_INCREMENT); + IoDeleteDevice(device->device_obj); + return STATUS_SUCCESS; + } + ret = STATUS_SUCCESS; break; + } default: FIXME("Unhandled minor function %#x.\n", stack->MinorFunction); -- 2.26.2

1 0

[PATCH 2/2] mshtml: Support implicit RT_FILE resource type in res protocol.
by Jacek Caban 24 Apr '20

24 Apr '20

From: Damjan Jovanovic <damjan.jov(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47999 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/protocol.c | 13 +++++++++---- dlls/mshtml/tests/protocol.c | 32 ++++++++++++++++++++++++++++++++ dlls/mshtml/tests/rsrc.rc | 3 +++ 3 files changed, 44 insertions(+), 4 deletions(-)

1 0

[PATCH 1/2] mshtml: Fix handling res protocol resource type ids without leading '#'.
by Jacek Caban 24 Apr '20

24 Apr '20

From: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/protocol.c | 5 +++++ dlls/mshtml/tests/protocol.c | 7 +++++++ 2 files changed, 12 insertions(+)

1 0

[PATCH 2/3 v2] setupapi: Quiet down missing driver debug message
by Andrew Eikum 24 Apr '20

24 Apr '20

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/setupapi/devinst.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 5bd2b88a02..fca60402a5 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -4739,7 +4739,7 @@ BOOL WINAPI SetupDiSelectBestCompatDrv(HDEVINFO devinfo, SP_DEVINFO_DATA *device if (!device->driver_count) { - ERR("No compatible drivers were enumerated for device %s.\n", debugstr_w(device->instanceId)); + WARN("No compatible drivers were enumerated for device %s.\n", debugstr_w(device->instanceId)); SetLastError(ERROR_NO_COMPAT_DRIVERS); return FALSE; } -- 2.26.2

1 0

[PATCH 2/3] setupapi: Quiet down missing driver debug message
by Andrew Eikum 24 Apr '20

24 Apr '20

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/setupapi/devinst.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 5bd2b88a02..97dd84e880 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -4739,7 +4739,7 @@ BOOL WINAPI SetupDiSelectBestCompatDrv(HDEVINFO devinfo, SP_DEVINFO_DATA *device if (!device->driver_count) { - ERR("No compatible drivers were enumerated for device %s.\n", debugstr_w(device->instanceId)); + TRACE("No compatible drivers were enumerated for device %s.\n", debugstr_w(device->instanceId)); SetLastError(ERROR_NO_COMPAT_DRIVERS); return FALSE; } -- 2.26.2

2 1

[PATCH 3/3] ntoskrnl: Quiet down failed class installer debug message
by Andrew Eikum 24 Apr '20

24 Apr '20

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/ntoskrnl.exe/pnp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 75310f7b35..9e4c2c1416 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -298,7 +298,7 @@ static BOOL install_device_driver( DEVICE_OBJECT *device, HDEVINFO set, SP_DEVIN { if (!SetupDiCallClassInstaller(dif_list[i], set, sp_device) && GetLastError() != ERROR_DI_DO_DEFAULT) { - ERR("Install function %#x failed, error %#x.\n", dif_list[i], GetLastError()); + WARN("Install function %#x failed, error %#x.\n", dif_list[i], GetLastError()); return FALSE; } } -- 2.26.2

1 0

[PATCH v4 1/9] qedit: Move GetFilterInfo up and rename it.
by Gabriel Ivăncescu 24 Apr '20

24 Apr '20

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/qedit/mediadet.c | 70 +++++++++++++++++++++---------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index 0b64e18..4f84deb 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -70,6 +70,40 @@ static void MD_cleanup(MediaDetImpl *This) This->cur_stream = 0; } +/* From quartz, 2008/04/07 */ +static HRESULT get_filter_info(IMoniker *moniker, GUID *clsid, VARIANT *var) +{ + IPropertyBag *pPropBagCat = NULL; + HRESULT hr; + + VariantInit(var); + V_VT(var) = VT_BSTR; + + hr = IMoniker_BindToStorage(moniker, NULL, NULL, &IID_IPropertyBag, + (LPVOID *) &pPropBagCat); + + if (SUCCEEDED(hr)) + hr = IPropertyBag_Read(pPropBagCat, L"CLSID", var, NULL); + + if (SUCCEEDED(hr)) + { + hr = CLSIDFromString(V_BSTR(var), clsid); + VariantClear(var); + V_VT(var) = VT_BSTR; + } + + if (SUCCEEDED(hr)) + hr = IPropertyBag_Read(pPropBagCat, L"FriendlyName", var, NULL); + + if (SUCCEEDED(hr)) + TRACE("Moniker = %s - %s\n", debugstr_guid(clsid), debugstr_w(V_BSTR(var))); + + if (pPropBagCat) + IPropertyBag_Release(pPropBagCat); + + return hr; +} + /* MediaDet inner IUnknown */ static HRESULT WINAPI MediaDet_inner_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) { @@ -372,40 +406,6 @@ static HRESULT WINAPI MediaDet_get_Filename(IMediaDet* iface, BSTR *pVal) return S_OK; } -/* From quartz, 2008/04/07 */ -static HRESULT GetFilterInfo(IMoniker *pMoniker, GUID *pclsid, VARIANT *pvar) -{ - IPropertyBag *pPropBagCat = NULL; - HRESULT hr; - - VariantInit(pvar); - V_VT(pvar) = VT_BSTR; - - hr = IMoniker_BindToStorage(pMoniker, NULL, NULL, &IID_IPropertyBag, - (LPVOID *) &pPropBagCat); - - if (SUCCEEDED(hr)) - hr = IPropertyBag_Read(pPropBagCat, L"CLSID", pvar, NULL); - - if (SUCCEEDED(hr)) - { - hr = CLSIDFromString(V_BSTR(pvar), pclsid); - VariantClear(pvar); - V_VT(pvar) = VT_BSTR; - } - - if (SUCCEEDED(hr)) - hr = IPropertyBag_Read(pPropBagCat, L"FriendlyName", pvar, NULL); - - if (SUCCEEDED(hr)) - TRACE("Moniker = %s - %s\n", debugstr_guid(pclsid), debugstr_w(V_BSTR(pvar))); - - if (pPropBagCat) - IPropertyBag_Release(pPropBagCat); - - return hr; -} - static HRESULT GetSplitter(MediaDetImpl *This) { IFileSourceFilter *file; @@ -458,7 +458,7 @@ static HRESULT GetSplitter(MediaDetImpl *This) hr = E_NOINTERFACE; while (IEnumMoniker_Next(filters, 1, &mon, NULL) == S_OK) { - hr = GetFilterInfo(mon, &clsid, &var); + hr = get_filter_info(mon, &clsid, &var); IMoniker_Release(mon); if (FAILED(hr)) continue; -- 2.21.0

5 23

[PATCH] server: Make sure pids/tids are multiples of four.
by Rémi Bernon 24 Apr '20

24 Apr '20

See: https://devblogs.microsoft.com/oldnewthing/?p=23283 Street Fighter V unpacker relies on it when validating other processes for its anti-debug checks, it uses (PID&0xfffffffc)>>2 as an array index and then checks back indexes against PIDs, and terminates early if some PIDs do not match. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- server/process.c | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/server/process.c b/server/process.c index 73984f363f59..211207ed03b6 100644 --- a/server/process.c +++ b/server/process.c @@ -339,21 +339,24 @@ static void kill_all_processes(void); #define PTID_OFFSET 8 /* offset for first ptid value */ +static unsigned int index_from_ptid(unsigned int id) { return id / 4; } +static unsigned int ptid_from_index(unsigned int index) { return index * 4; } + /* allocate a new process or thread id */ unsigned int alloc_ptid( void *ptr ) { struct ptid_entry *entry; - unsigned int id; + unsigned int index; if (used_ptid_entries < alloc_ptid_entries) { - id = used_ptid_entries + PTID_OFFSET; + index = used_ptid_entries + PTID_OFFSET; entry = &ptid_entries[used_ptid_entries++]; } else if (next_free_ptid && num_free_ptids >= 256) { - id = next_free_ptid; - entry = &ptid_entries[id - PTID_OFFSET]; + index = next_free_ptid; + entry = &ptid_entries[index - PTID_OFFSET]; if (!(next_free_ptid = entry->next)) last_free_ptid = 0; num_free_ptids--; } @@ -368,35 +371,37 @@ unsigned int alloc_ptid( void *ptr ) } ptid_entries = entry; alloc_ptid_entries = count; - id = used_ptid_entries + PTID_OFFSET; + index = used_ptid_entries + PTID_OFFSET; entry = &ptid_entries[used_ptid_entries++]; } entry->ptr = ptr; - return id; + return ptid_from_index( index ); } /* free a process or thread id */ void free_ptid( unsigned int id ) { - struct ptid_entry *entry = &ptid_entries[id - PTID_OFFSET]; + unsigned int index = index_from_ptid( id ); + struct ptid_entry *entry = &ptid_entries[index - PTID_OFFSET]; entry->ptr = NULL; entry->next = 0; /* append to end of free list so that we don't reuse it too early */ - if (last_free_ptid) ptid_entries[last_free_ptid - PTID_OFFSET].next = id; - else next_free_ptid = id; - last_free_ptid = id; + if (last_free_ptid) ptid_entries[last_free_ptid - PTID_OFFSET].next = index; + else next_free_ptid = index; + last_free_ptid = index; num_free_ptids++; } /* retrieve the pointer corresponding to a process or thread id */ void *get_ptid_entry( unsigned int id ) { - if (id < PTID_OFFSET) return NULL; - if (id - PTID_OFFSET >= used_ptid_entries) return NULL; - return ptid_entries[id - PTID_OFFSET].ptr; + unsigned int index = index_from_ptid( id ); + if (index < PTID_OFFSET) return NULL; + if (index - PTID_OFFSET >= used_ptid_entries) return NULL; + return ptid_entries[index - PTID_OFFSET].ptr; } /* return the main thread of the process */ -- 2.26.1

2 1

[PATCH v2 1/3] ntdll/tests: Test updating TickCount in user_shared_data.
by Rémi Bernon 24 Apr '20

24 Apr '20

Original patch from: Andrew Wesie <awesie(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: This should fix a race condition with the previous version where the service could quit and detach USD view from other services although they would still be using it. This version now relies on both the processes and the service open predetermined named sections and each map it into its address space. The service can now start late or exit early without impacting the processes. It can now also catch up with previously started services and have the timestamp updates working for them as well. dlls/ntdll/tests/time.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/ntdll/tests/time.c b/dlls/ntdll/tests/time.c index 5382a952d8d..6ce56f39fd8 100644 --- a/dlls/ntdll/tests/time.c +++ b/dlls/ntdll/tests/time.c @@ -18,7 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define NONAMELESSUNION #include "ntdll_test.h" +#include "ddk/wdm.h" #define TICKSPERSEC 10000000 #define TICKSPERMSEC 10000 @@ -29,6 +31,7 @@ static VOID (WINAPI *pRtlTimeFieldsToTime)( PTIME_FIELDS TimeFields, PLARGE_IN static NTSTATUS (WINAPI *pNtQueryPerformanceCounter)( LARGE_INTEGER *counter, LARGE_INTEGER *frequency ); static NTSTATUS (WINAPI *pRtlQueryTimeZoneInformation)( RTL_TIME_ZONE_INFORMATION *); static NTSTATUS (WINAPI *pRtlQueryDynamicTimeZoneInformation)( RTL_DYNAMIC_TIME_ZONE_INFORMATION *); +static ULONG (WINAPI *pNtGetTickCount)(void); static const int MonthLengths[2][12] = { @@ -153,12 +156,35 @@ static void test_RtlQueryTimeZoneInformation(void) wine_dbgstr_w(tzinfo.DaylightName)); } +static void test_NtGetTickCount(void) +{ + KSHARED_USER_DATA *user_shared_data = (void *)0x7ffe0000; + ULONG diff; + int i; + + if (!pNtGetTickCount) + { + win_skip("NtGetTickCount is not available\n"); + return; + } + + for (i = 0; i < 5; ++i) + { + diff = (user_shared_data->u.TickCountQuad * user_shared_data->TickCountMultiplier) >> 24; + diff = pNtGetTickCount() - diff; + todo_wine + ok(diff < 100, "NtGetTickCount - TickCountQuad too high, expected < 100 got %d\n", diff); + Sleep(50); + } +} + START_TEST(time) { HMODULE mod = GetModuleHandleA("ntdll.dll"); pRtlTimeToTimeFields = (void *)GetProcAddress(mod,"RtlTimeToTimeFields"); pRtlTimeFieldsToTime = (void *)GetProcAddress(mod,"RtlTimeFieldsToTime"); pNtQueryPerformanceCounter = (void *)GetProcAddress(mod, "NtQueryPerformanceCounter"); + pNtGetTickCount = (void *)GetProcAddress(mod,"NtGetTickCount"); pRtlQueryTimeZoneInformation = (void *)GetProcAddress(mod, "RtlQueryTimeZoneInformation"); pRtlQueryDynamicTimeZoneInformation = @@ -169,5 +195,6 @@ START_TEST(time) else win_skip("Required time conversion functions are not available\n"); test_NtQueryPerformanceCounter(); + test_NtGetTickCount(); test_RtlQueryTimeZoneInformation(); } -- 2.26.1

3 10

[PATCH 1/2] mf: Handle null marker context for sample grabber stream.
by Nikolay Sivov 24 Apr '20

24 Apr '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/samplegrabber.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index 21f89c0ad0..2167b5001e 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -446,7 +446,7 @@ static HRESULT stream_place_marker(struct sample_grabber *grabber, MFSTREAMSINK_ const PROPVARIANT *context_value) { struct scheduled_item *item; - HRESULT hr; + HRESULT hr = S_OK; if (list_empty(&grabber->items)) { @@ -460,7 +460,9 @@ static HRESULT stream_place_marker(struct sample_grabber *grabber, MFSTREAMSINK_ item->type = ITEM_TYPE_MARKER; item->u.marker.type = marker_type; list_init(&item->entry); - hr = PropVariantCopy(&item->u.marker.context, context_value); + PropVariantInit(&item->u.marker.context); + if (context_value) + hr = PropVariantCopy(&item->u.marker.context, context_value); if (SUCCEEDED(hr)) list_add_tail(&grabber->items, &item->entry); else -- 2.26.2

1 1