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

Zebediah Figura : msi: Report the real NT version number up to 6.3.
by Alexandre Julliard April 20, 2020

April 20, 2020

Module: wine Branch: master Commit: 658183a803fced017e1e29f4001cec8b48748327 URL: https://source.winehq.org/git/wine.git/?a=commit;h=658183a803fced017e1e29f4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 18 12:50:28 2020 -0500 msi: Report the real NT version number up to 6.3. MSI always reports 6.3 even without a manifest, but does not report anything higher. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48959 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/package.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 5065558827..7b64362b10 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -27,6 +27,7 @@ #include "winbase.h" #include "winreg.h" #include "winnls.h" +#include "winternl.h" #include "shlwapi.h" #include "wingdi.h" #include "msi.h" @@ -668,7 +669,7 @@ done: static VOID set_installer_properties(MSIPACKAGE *package) { WCHAR *ptr; - OSVERSIONINFOEXW OSVersion; + RTL_OSVERSIONINFOEXW OSVersion; MEMORYSTATUSEX msex; DWORD verval, len, type; WCHAR pth[MAX_PATH], verstr[11], bufstr[22]; @@ -860,9 +861,14 @@ static VOID set_installer_properties(MSIPACKAGE *package) msi_set_property( package->db, szPrivileged, szOne, -1 ); /* set the os things */ - OSVersion.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXW); - GetVersionExW((OSVERSIONINFOW *)&OSVersion); + OSVersion.dwOSVersionInfoSize = sizeof(OSVersion); + RtlGetVersion(&OSVersion); verval = OSVersion.dwMinorVersion + OSVersion.dwMajorVersion * 100; + if (verval > 603) + { + verval = 603; + OSVersion.dwBuildNumber = 9600; + } len = swprintf( verstr, ARRAY_SIZE(verstr), szFormat, verval ); switch (OSVersion.dwPlatformId) {

1 0

Nikolay Sivov : ole32: Do not allocate spyed memory array on freeing attempts.
by Alexandre Julliard April 20, 2020

April 20, 2020

Module: wine Branch: master Commit: ed53127580413b6d48c63e98e12ba7a801d64135 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed53127580413b6d48c63e98… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 20 10:59:18 2020 +0300 ole32: Do not allocate spyed memory array on freeing attempts. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ifs.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/ole32/ifs.c b/dlls/ole32/ifs.c index 1b19be424c..dfced20de2 100644 --- a/dlls/ole32/ifs.c +++ b/dlls/ole32/ifs.c @@ -128,22 +128,19 @@ static void** mallocspy_is_allocation_spyed(const void *mem) return current; } -static BOOL RemoveMemoryLocation(LPCVOID pMem) +static BOOL mallocspy_remove_spyed_memory(const void *mem) { - LPVOID * Current; + void **current; - /* allocate the table if not already allocated */ - if (!Malloc32.SpyedBlockTableLength && !SetSpyedBlockTableLength(0x1000)) - return FALSE; + if (!Malloc32.SpyedBlockTableLength) + return FALSE; - if (!(Current = mallocspy_is_allocation_spyed(pMem))) - return FALSE; + if (!(current = mallocspy_is_allocation_spyed(mem))) + return FALSE; - /* location found */ - Malloc32.SpyedAllocationsLeft--; - /*TRACE("%lu\n",Malloc32.SpyedAllocationsLeft);*/ - *Current = NULL; - return TRUE; + Malloc32.SpyedAllocationsLeft--; + *current = NULL; + return TRUE; } /****************************************************************************** @@ -216,7 +213,7 @@ static void * WINAPI IMalloc_fnRealloc(IMalloc *iface, void *pv, SIZE_T cb) BOOL fSpyed; EnterCriticalSection(&IMalloc32_SpyCS); - fSpyed = RemoveMemoryLocation(pv); + fSpyed = mallocspy_remove_spyed_memory(pv); cb = IMallocSpy_PreRealloc(Malloc32.pSpy, pv, cb, &pRealMemory, fSpyed); /* check if can release the spy */ @@ -268,7 +265,7 @@ static void WINAPI IMalloc_fnFree(IMalloc *iface, void *pv) if(Malloc32.pSpy) { EnterCriticalSection(&IMalloc32_SpyCS); - fSpyed = RemoveMemoryLocation(pv); + fSpyed = mallocspy_remove_spyed_memory(pv); pv = IMallocSpy_PreFree(Malloc32.pSpy, pv, fSpyed); }

1 0

Zebediah Figura : wineusb.sys: Implement URB_FUNCTION_SYNC_RESET_PIPE_AND_CLEAR_STALL.
by Alexandre Julliard April 20, 2020

April 20, 2020

Module: wine Branch: master Commit: bd2ab3aa0604910c6fb8e8a51381420f9516e829 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd2ab3aa0604910c6fb8e8a5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 17 18:03:09 2020 -0500 wineusb.sys: Implement URB_FUNCTION_SYNC_RESET_PIPE_AND_CLEAR_STALL. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineusb.sys/wineusb.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index 6a979b9126..55bd84ea30 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -535,6 +535,17 @@ static NTSTATUS usb_submit_urb(struct usb_device *device, IRP *irp) return STATUS_SUCCESS; } + case URB_FUNCTION_SYNC_RESET_PIPE_AND_CLEAR_STALL: + { + struct _URB_PIPE_REQUEST *req = &urb->UrbPipeRequest; + struct pipe pipe = get_pipe(req->PipeHandle); + + if ((ret = libusb_clear_halt(device->handle, pipe.endpoint)) < 0) + ERR("Failed to clear halt: %s\n", libusb_strerror(ret)); + + return STATUS_SUCCESS; + } + case URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER: { struct _URB_BULK_OR_INTERRUPT_TRANSFER *req = &urb->UrbBulkOrInterruptTransfer;

1 0

Zebediah Figura : wineusb.sys: Implement URB_FUNCTION_ABORT_PIPE.
by Alexandre Julliard April 20, 2020

April 20, 2020

Module: wine Branch: master Commit: 66bdf9f77cc6f4491b9c361cc1f4f88ec5edbfe5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66bdf9f77cc6f4491b9c361c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 17 18:03:08 2020 -0500 wineusb.sys: Implement URB_FUNCTION_ABORT_PIPE. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineusb.sys/wineusb.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index aa4f204415..6a979b9126 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -514,6 +514,27 @@ static NTSTATUS usb_submit_urb(struct usb_device *device, IRP *irp) switch (urb->UrbHeader.Function) { + case URB_FUNCTION_ABORT_PIPE: + { + LIST_ENTRY *entry, *mark; + + /* The documentation states that URB_FUNCTION_ABORT_PIPE may + * complete before outstanding requests complete, so we don't need + * to wait for them. */ + EnterCriticalSection(&wineusb_cs); + mark = &device->irp_list; + for (entry = mark->Flink; entry != mark; entry = entry->Flink) + { + IRP *queued_irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.ListEntry); + + if ((ret = libusb_cancel_transfer(queued_irp->Tail.Overlay.DriverContext[0])) < 0) + ERR("Failed to cancel transfer: %s\n", libusb_strerror(ret)); + } + LeaveCriticalSection(&wineusb_cs); + + return STATUS_SUCCESS; + } + case URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER: { struct _URB_BULK_OR_INTERRUPT_TRANSFER *req = &urb->UrbBulkOrInterruptTransfer;

1 0

Zebediah Figura : wineusb.sys: Implement URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE.
by Alexandre Julliard April 20, 2020

April 20, 2020

Module: wine Branch: master Commit: 65b9b2028b3b5db1ddb6f5af4168c1f46303dbb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65b9b2028b3b5db1ddb6f5af… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 17 18:03:04 2020 -0500 wineusb.sys: Implement URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineusb.sys/wineusb.c | 147 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 147 insertions(+) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index eb1b7a261f..ed82bd3a13 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -74,6 +74,8 @@ struct usb_device libusb_device *libusb_device; libusb_device_handle *handle; + + LIST_ENTRY irp_list; }; static DRIVER_OBJECT *driver_obj; @@ -120,6 +122,7 @@ static void add_usb_device(libusb_device *libusb_device) device->device_obj = device_obj; device->libusb_device = libusb_ref_device(libusb_device); device->handle = handle; + InitializeListHead(&device->irp_list); EnterCriticalSection(&wineusb_cs); list_add_tail(&device_list, &device->entry); @@ -394,6 +397,149 @@ static NTSTATUS WINAPI driver_pnp(DEVICE_OBJECT *device, IRP *irp) return pdo_pnp(device, irp); } +static NTSTATUS usbd_status_from_libusb(enum libusb_transfer_status status) +{ + switch (status) + { + case LIBUSB_TRANSFER_CANCELLED: + return USBD_STATUS_CANCELED; + case LIBUSB_TRANSFER_COMPLETED: + return USBD_STATUS_SUCCESS; + case LIBUSB_TRANSFER_NO_DEVICE: + return USBD_STATUS_DEVICE_GONE; + case LIBUSB_TRANSFER_STALL: + return USBD_STATUS_ENDPOINT_HALTED; + case LIBUSB_TRANSFER_TIMED_OUT: + return USBD_STATUS_TIMEOUT; + default: + FIXME("Unhandled status %#x.\n", status); + case LIBUSB_TRANSFER_ERROR: + return USBD_STATUS_REQUEST_FAILED; + } +} + +static void transfer_cb(struct libusb_transfer *transfer) +{ + IRP *irp = transfer->user_data; + URB *urb = IoGetCurrentIrpStackLocation(irp)->Parameters.Others.Argument1; + + TRACE("Completing IRP %p, status %#x.\n", irp, transfer->status); + + urb->UrbHeader.Status = usbd_status_from_libusb(transfer->status); + + if (transfer->status == LIBUSB_TRANSFER_COMPLETED) + { + switch (urb->UrbHeader.Function) + { + case URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE: + { + struct _URB_CONTROL_DESCRIPTOR_REQUEST *req = &urb->UrbControlDescriptorRequest; + req->TransferBufferLength = transfer->actual_length; + memcpy(req->TransferBuffer, libusb_control_transfer_get_data(transfer), transfer->actual_length); + break; + } + + default: + ERR("Unexpected function %#x.\n", urb->UrbHeader.Function); + } + } + + EnterCriticalSection(&wineusb_cs); + RemoveEntryList(&irp->Tail.Overlay.ListEntry); + LeaveCriticalSection(&wineusb_cs); + + irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(irp, IO_NO_INCREMENT); +} + +static void queue_irp(struct usb_device *device, IRP *irp, struct libusb_transfer *transfer) +{ + EnterCriticalSection(&wineusb_cs); + irp->Tail.Overlay.DriverContext[0] = transfer; + InsertTailList(&device->irp_list, &irp->Tail.Overlay.ListEntry); + LeaveCriticalSection(&wineusb_cs); +} + +static NTSTATUS usb_submit_urb(struct usb_device *device, IRP *irp) +{ + URB *urb = IoGetCurrentIrpStackLocation(irp)->Parameters.Others.Argument1; + struct libusb_transfer *transfer; + int ret; + + TRACE("type %#x.\n", urb->UrbHeader.Function); + + switch (urb->UrbHeader.Function) + { + case URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE: + { + struct _URB_CONTROL_DESCRIPTOR_REQUEST *req = &urb->UrbControlDescriptorRequest; + unsigned char *buffer; + + if (req->TransferBufferMDL) + FIXME("Unhandled MDL output buffer.\n"); + + if (!(transfer = libusb_alloc_transfer(0))) + return STATUS_NO_MEMORY; + + if (!(buffer = malloc(sizeof(struct libusb_control_setup) + req->TransferBufferLength))) + { + libusb_free_transfer(transfer); + return STATUS_NO_MEMORY; + } + + queue_irp(device, irp, transfer); + libusb_fill_control_setup(buffer, + LIBUSB_ENDPOINT_IN | LIBUSB_REQUEST_TYPE_STANDARD | LIBUSB_RECIPIENT_DEVICE, + LIBUSB_REQUEST_GET_DESCRIPTOR, (req->DescriptorType << 8) | req->Index, + req->LanguageId, req->TransferBufferLength); + libusb_fill_control_transfer(transfer, device->handle, buffer, transfer_cb, irp, 0); + transfer->flags = LIBUSB_TRANSFER_FREE_BUFFER | LIBUSB_TRANSFER_FREE_TRANSFER; + ret = libusb_submit_transfer(transfer); + if (ret < 0) + ERR("Failed to submit GET_DESRIPTOR transfer: %s\n", libusb_strerror(ret)); + + return STATUS_PENDING; + } + + default: + FIXME("Unhandled function %#x.\n", urb->UrbHeader.Function); + } + + return STATUS_NOT_IMPLEMENTED; +} + +static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device_obj, IRP *irp) +{ + IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); + ULONG code = stack->Parameters.DeviceIoControl.IoControlCode; + struct usb_device *device = device_obj->DeviceExtension; + NTSTATUS status = STATUS_NOT_IMPLEMENTED; + + TRACE("device_obj %p, irp %p, code %#x.\n", device_obj, irp, code); + + switch (code) + { + case IOCTL_INTERNAL_USB_SUBMIT_URB: + status = usb_submit_urb(device, irp); + break; + + default: + FIXME("Unhandled ioctl %#x (device %#x, access %#x, function %#x, method %#x).\n", + code, code >> 16, (code >> 14) & 3, (code >> 2) & 0xfff, code & 3); + } + + if (status == STATUS_PENDING) + { + IoMarkIrpPending(irp); + } + else + { + irp->IoStatus.Status = status; + IoCompleteRequest(irp, IO_NO_INCREMENT); + } + return status; +} + static NTSTATUS WINAPI driver_add_device(DRIVER_OBJECT *driver, DEVICE_OBJECT *pdo) { NTSTATUS ret; @@ -437,6 +583,7 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) driver->DriverExtension->AddDevice = driver_add_device; driver->DriverUnload = driver_unload; driver->MajorFunction[IRP_MJ_PNP] = driver_pnp; + driver->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = driver_internal_ioctl; return STATUS_SUCCESS; }

1 0

Zebediah Figura : wineusb.sys: Implement URB_FUNCTION_VENDOR_INTERFACE.
by Alexandre Julliard April 20, 2020

April 20, 2020

Module: wine Branch: master Commit: e5e2cc1024289ad8002d7d40ef3cb284e0f7048c URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5e2cc1024289ad8002d7d40… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 17 18:03:06 2020 -0500 wineusb.sys: Implement URB_FUNCTION_VENDOR_INTERFACE. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineusb.sys/wineusb.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index 2f436c1bd7..a926970047 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -439,6 +439,15 @@ static void transfer_cb(struct libusb_transfer *transfer) break; } + case URB_FUNCTION_VENDOR_INTERFACE: + { + struct _URB_CONTROL_VENDOR_OR_CLASS_REQUEST *req = &urb->UrbControlVendorClassRequest; + req->TransferBufferLength = transfer->actual_length; + if (req->TransferFlags & USBD_TRANSFER_DIRECTION_IN) + memcpy(req->TransferBuffer, libusb_control_transfer_get_data(transfer), transfer->actual_length); + break; + } + default: ERR("Unexpected function %#x.\n", urb->UrbHeader.Function); } @@ -540,6 +549,43 @@ static NTSTATUS usb_submit_urb(struct usb_device *device, IRP *irp) return STATUS_SUCCESS; } + case URB_FUNCTION_VENDOR_INTERFACE: + { + struct _URB_CONTROL_VENDOR_OR_CLASS_REQUEST *req = &urb->UrbControlVendorClassRequest; + uint8_t req_type = LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_INTERFACE; + unsigned char *buffer; + + if (req->TransferFlags & USBD_TRANSFER_DIRECTION_IN) + req_type |= LIBUSB_ENDPOINT_IN; + if (req->TransferFlags & ~USBD_TRANSFER_DIRECTION_IN) + FIXME("Unhandled flags %#x.\n", req->TransferFlags); + + if (req->TransferBufferMDL) + FIXME("Unhandled MDL output buffer.\n"); + + if (!(transfer = libusb_alloc_transfer(0))) + return STATUS_NO_MEMORY; + + if (!(buffer = malloc(sizeof(struct libusb_control_setup) + req->TransferBufferLength))) + { + libusb_free_transfer(transfer); + return STATUS_NO_MEMORY; + } + + queue_irp(device, irp, transfer); + libusb_fill_control_setup(buffer, req_type, req->Request, + req->Value, req->Index, req->TransferBufferLength); + if (!(req->TransferFlags & USBD_TRANSFER_DIRECTION_IN)) + memcpy(buffer + LIBUSB_CONTROL_SETUP_SIZE, req->TransferBuffer, req->TransferBufferLength); + libusb_fill_control_transfer(transfer, device->handle, buffer, transfer_cb, irp, 0); + transfer->flags = LIBUSB_TRANSFER_FREE_BUFFER | LIBUSB_TRANSFER_FREE_TRANSFER; + ret = libusb_submit_transfer(transfer); + if (ret < 0) + ERR("Failed to submit vendor-specific interface transfer: %s\n", libusb_strerror(ret)); + + return STATUS_PENDING; + } + default: FIXME("Unhandled function %#x.\n", urb->UrbHeader.Function); }

1 0

Gabriel Ivăncescu : qedit: Use "Source" as the name of the source filter.
by Alexandre Julliard April 20, 2020

April 20, 2020

Module: wine Branch: master Commit: ac15cc70583963766f9905355cd563fca31aee8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac15cc70583963766f990535… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Apr 17 15:02:09 2020 -0500 qedit: Use "Source" as the name of the source filter. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/mediadet.c | 2 +- dlls/qedit/tests/mediadet.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index f122b81b3a..0b64e18983 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -535,7 +535,7 @@ static HRESULT WINAPI MediaDet_put_Filename(IMediaDet* iface, BSTR newVal) if (FAILED(hr)) return hr; - if (FAILED(hr = IGraphBuilder_AddSourceFilter(gb, newVal, L"Reader", &bf))) + if (FAILED(hr = IGraphBuilder_AddSourceFilter(gb, newVal, L"Source", &bf))) { IGraphBuilder_Release(gb); return hr; diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index b7787f03ea..ea10f5783e 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -473,7 +473,7 @@ static void test_mediadet(void) hr = IBaseFilter_QueryFilterInfo(filter, &filter_info); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(!wcscmp(filter_info.achName, L"Source"), "Got name %s.\n", debugstr_w(filter_info.achName)); + ok(!wcscmp(filter_info.achName, L"Source"), "Got name %s.\n", debugstr_w(filter_info.achName)); IFilterGraph_Release(filter_info.pGraph); IBaseFilter_Release(filter);

1 0

Gabriel Ivăncescu : qedit: Implement IMediaDet::get_Filter().
by Alexandre Julliard April 20, 2020

April 20, 2020

Module: wine Branch: master Commit: 7a1a93a70a03ba56a205bab9e5e68aa5a90104fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a1a93a70a03ba56a205bab9… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Apr 17 15:02:08 2020 -0500 qedit: Implement IMediaDet::get_Filter(). Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/mediadet.c | 19 ++++++++++++++---- dlls/qedit/tests/mediadet.c | 49 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 63 insertions(+), 5 deletions(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index 0d0240aff3..f122b81b3a 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -144,11 +144,22 @@ static ULONG WINAPI MediaDet_Release(IMediaDet *iface) return IUnknown_Release(This->outer_unk); } -static HRESULT WINAPI MediaDet_get_Filter(IMediaDet* iface, IUnknown **pVal) +static HRESULT WINAPI MediaDet_get_Filter(IMediaDet *iface, IUnknown **filter) { - MediaDetImpl *This = impl_from_IMediaDet(iface); - FIXME("(%p)->(%p): not implemented!\n", This, pVal); - return E_NOTIMPL; + MediaDetImpl *detector = impl_from_IMediaDet(iface); + + TRACE("detector %p, filter %p.\n", detector, filter); + + if (!filter) + return E_POINTER; + + *filter = (IUnknown *)detector->source; + if (*filter) + IUnknown_AddRef(*filter); + else + return S_FALSE; + + return S_OK; } static HRESULT WINAPI MediaDet_put_Filter(IMediaDet* iface, IUnknown *newVal) diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index 7f1bdc7ab6..b7787f03ea 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -188,13 +188,19 @@ static BOOL init_tests(void) static void test_mediadet(void) { HRESULT hr; + FILTER_INFO filter_info; + AM_MEDIA_TYPE mt, *pmt; + IEnumMediaTypes *type; IMediaDet *pM = NULL; BSTR filename = NULL; + IBaseFilter *filter; + IEnumPins *enumpins; LONG nstrms = 0; + IUnknown *unk; + IPin *pin; LONG strm; GUID guid; BSTR bstr; - AM_MEDIA_TYPE mt; double fps; int flags; int i; @@ -256,6 +262,14 @@ static void test_mediadet(void) hr = IMediaDet_get_StreamTypeB(pM, NULL); ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + hr = IMediaDet_get_Filter(pM, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + unk = (IUnknown*)0xdeadbeef; + hr = IMediaDet_get_Filter(pM, &unk); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(!unk, "Got filter %p.\n", unk); + filename = SysAllocString(test_avi_filename); hr = IMediaDet_put_Filename(pM, filename); ok(hr == S_OK, "IMediaDet_put_Filename failed: %08x\n", hr); @@ -430,6 +444,39 @@ static void test_mediadet(void) ok(hr == S_OK, "IMediaDet_get_CurrentStream failed: %08x\n", hr); ok(strm == 1, "IMediaDet_get_CurrentStream: strm is %i\n", strm); + unk = NULL; + hr = IMediaDet_get_Filter(pM, &unk); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!!unk, "Expected a non-NULL filter.\n"); + hr = IUnknown_QueryInterface(unk, &IID_IBaseFilter, (void**)&filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IUnknown_Release(unk); + + hr = IBaseFilter_EnumPins(filter, &enumpins); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IEnumPins_Next(enumpins, 1, &pin, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IPin_EnumMediaTypes(pin, &type); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IEnumMediaTypes_Next(type, 1, &pmt, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(IsEqualGUID(&pmt->majortype, &MEDIATYPE_Stream), "Got major type %s.\n", + debugstr_guid(&pmt->majortype)); + IEnumMediaTypes_Release(type); + CoTaskMemFree(pmt->pbFormat); + CoTaskMemFree(pmt); + IPin_Release(pin); + + hr = IEnumPins_Next(enumpins, 1, &pin, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + IEnumPins_Release(enumpins); + + hr = IBaseFilter_QueryFilterInfo(filter, &filter_info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(!wcscmp(filter_info.achName, L"Source"), "Got name %s.\n", debugstr_w(filter_info.achName)); + IFilterGraph_Release(filter_info.pGraph); + IBaseFilter_Release(filter); + hr = IMediaDet_Release(pM); ok(hr == 0, "IMediaDet_Release returned: %x\n", hr);

1 0

Gabriel Ivăncescu : qedit: Implement IMediaDet::get_StreamTypeB().
by Alexandre Julliard April 20, 2020

April 20, 2020

Module: wine Branch: master Commit: 15ea804a17438b37c8d7ea580a9ff8a3c0fc0d42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15ea804a17438b37c8d7ea58… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Apr 17 15:02:07 2020 -0500 qedit: Implement IMediaDet::get_StreamTypeB(). Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/mediadet.c | 18 ++++++++++++++---- dlls/qedit/tests/mediadet.c | 25 +++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 4 deletions(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index 92c154a50a..0d0240aff3 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -301,11 +301,21 @@ static HRESULT WINAPI MediaDet_get_StreamType(IMediaDet *iface, GUID *majortype) return hr; } -static HRESULT WINAPI MediaDet_get_StreamTypeB(IMediaDet* iface, BSTR *pVal) +static HRESULT WINAPI MediaDet_get_StreamTypeB(IMediaDet *iface, BSTR *bstr) { - MediaDetImpl *This = impl_from_IMediaDet(iface); - FIXME("(%p)->(%p): not implemented!\n", This, pVal); - return E_NOTIMPL; + MediaDetImpl *detector = impl_from_IMediaDet(iface); + HRESULT hr; + GUID guid; + + TRACE("detector %p, bstr %p.\n", detector, bstr); + + if (SUCCEEDED(hr = IMediaDet_get_StreamType(iface, &guid))) + { + if (!(*bstr = SysAllocStringLen(NULL, CHARS_IN_GUID - 1))) + return E_OUTOFMEMORY; + StringFromGUID2(&guid, *bstr, CHARS_IN_GUID); + } + return hr; } static HRESULT WINAPI MediaDet_get_StreamLength(IMediaDet* iface, double *pVal) diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index 1d8db732c8..7f1bdc7ab6 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -193,6 +193,7 @@ static void test_mediadet(void) LONG nstrms = 0; LONG strm; GUID guid; + BSTR bstr; AM_MEDIA_TYPE mt; double fps; int flags; @@ -249,6 +250,12 @@ static void test_mediadet(void) hr = IMediaDet_get_StreamType(pM, NULL); ok(hr == E_POINTER, "Got hr %#x.\n", hr); + hr = IMediaDet_get_StreamTypeB(pM, &bstr); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IMediaDet_get_StreamTypeB(pM, NULL); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + filename = SysAllocString(test_avi_filename); hr = IMediaDet_put_Filename(pM, filename); ok(hr == S_OK, "IMediaDet_put_Filename failed: %08x\n", hr); @@ -269,6 +276,12 @@ static void test_mediadet(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(IsEqualGUID(&guid, &MEDIATYPE_Video), "Got major type %s.\n", debugstr_guid(&guid)); + hr = IMediaDet_get_StreamTypeB(pM, &bstr); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!wcscmp(bstr, L"{73646976-0000-0010-8000-00AA00389B71}"), + "Got major type %s.\n", debugstr_w(bstr)); + SysFreeString(bstr); + /* Even before get_OutputStreams. */ hr = IMediaDet_put_CurrentStream(pM, 1); ok(hr == E_INVALIDARG, "IMediaDet_put_CurrentStream failed: %08x\n", hr); @@ -326,6 +339,12 @@ static void test_mediadet(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(IsEqualGUID(&guid, &MEDIATYPE_Video), "Got major type %s.\n", debugstr_guid(&guid)); + hr = IMediaDet_get_StreamTypeB(pM, &bstr); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!wcscmp(bstr, L"{73646976-0000-0010-8000-00AA00389B71}"), + "Got major type %s.\n", debugstr_w(bstr)); + SysFreeString(bstr); + hr = IMediaDet_get_FrameRate(pM, NULL); ok(hr == E_POINTER, "IMediaDet_get_FrameRate failed: %08x\n", hr); @@ -389,6 +408,12 @@ static void test_mediadet(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(IsEqualGUID(&guid, &MEDIATYPE_Audio), "Got major type %s.\n", debugstr_guid(&guid)); + hr = IMediaDet_get_StreamTypeB(pM, &bstr); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!wcscmp(bstr, L"{73647561-0000-0010-8000-00AA00389B71}"), + "Got major type %s.\n", debugstr_w(bstr)); + SysFreeString(bstr); + hr = IMediaDet_get_FrameRate(pM, &fps); ok(hr == VFW_E_INVALIDMEDIATYPE, "IMediaDet_get_FrameRate failed: %08x\n", hr); }

1 0

Zebediah Figura : wineusb.sys: Partially implement URB_FUNCTION_SELECT_CONFIGURATION.
by Alexandre Julliard April 20, 2020

April 20, 2020

Module: wine Branch: master Commit: a103ee579413bf89456a02d5cf1e63147f0c9132 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a103ee579413bf89456a02d5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 17 18:03:05 2020 -0500 wineusb.sys: Partially implement URB_FUNCTION_SELECT_CONFIGURATION. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineusb.sys/wineusb.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index ed82bd3a13..2f436c1bd7 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -460,6 +460,25 @@ static void queue_irp(struct usb_device *device, IRP *irp, struct libusb_transfe LeaveCriticalSection(&wineusb_cs); } +struct pipe +{ + unsigned char endpoint; + unsigned char type; +}; + +static HANDLE make_pipe_handle(unsigned char endpoint, USBD_PIPE_TYPE type) +{ + union + { + struct pipe pipe; + HANDLE handle; + } u; + + u.pipe.endpoint = endpoint; + u.pipe.type = type; + return u.handle; +} + static NTSTATUS usb_submit_urb(struct usb_device *device, IRP *irp) { URB *urb = IoGetCurrentIrpStackLocation(irp)->Parameters.Others.Argument1; @@ -501,6 +520,26 @@ static NTSTATUS usb_submit_urb(struct usb_device *device, IRP *irp) return STATUS_PENDING; } + case URB_FUNCTION_SELECT_CONFIGURATION: + { + struct _URB_SELECT_CONFIGURATION *req = &urb->UrbSelectConfiguration; + ULONG i; + + /* FIXME: In theory, we'd call libusb_set_configuration() here, but + * the CASIO FX-9750GII (which has only one configuration) goes into + * an error state if it receives a SET_CONFIGURATION request. Maybe + * we should skip setting that if and only if the configuration is + * already active? */ + + for (i = 0; i < req->Interface.NumberOfPipes; ++i) + { + USBD_PIPE_INFORMATION *pipe = &req->Interface.Pipes[i]; + pipe->PipeHandle = make_pipe_handle(pipe->EndpointAddress, pipe->PipeType); + } + + return STATUS_SUCCESS; + } + default: FIXME("Unhandled function %#x.\n", urb->UrbHeader.Function); }

1 0