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

Józef Kucia : tests: Add tests for loading stencil values from textures.
by Alexandre Julliard June 10, 2019

June 10, 2019

Module: vkd3d Branch: master Commit: cd059215bfc70aac12c9cb51576107ff97870c68 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=cd059215bfc70aac12c9cb5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 7 14:38:05 2019 +0200 tests: Add tests for loading stencil values from textures. With plane slice and component mapping. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 182 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 182 insertions(+) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=cd059215bfc70aac12c…

1 0

Józef Kucia : include: Add ID3D12Device1.
by Alexandre Julliard June 10, 2019

June 10, 2019

Module: vkd3d Branch: master Commit: e9b13936664aeb771a453d8bb8f5013ad2055be6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e9b13936664aeb771a453d8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 7 14:38:02 2019 +0200 include: Add ID3D12Device1. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3d12.idl | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index ec78c66..2b395aa 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -1639,6 +1639,23 @@ typedef struct D3D12_SUBRESOURCE_DATA LONG_PTR SlicePitch; } D3D12_SUBRESOURCE_DATA; +typedef enum D3D12_MULTIPLE_FENCE_WAIT_FLAGS +{ + D3D12_MULTIPLE_FENCE_WAIT_FLAG_NONE = 0x0, + D3D12_MULTIPLE_FENCE_WAIT_FLAG_ANY = 0x1, + D3D12_MULTIPLE_FENCE_WAIT_FLAG_ALL = 0x0, +} D3D12_MULTIPLE_FENCE_WAIT_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_MULTIPLE_FENCE_WAIT_FLAGS);") + +typedef enum D3D12_RESIDENCY_PRIORITY +{ + D3D12_RESIDENCY_PRIORITY_MINIMUM = 0x28000000, + D3D12_RESIDENCY_PRIORITY_LOW = 0x50000000, + D3D12_RESIDENCY_PRIORITY_NORMAL = 0x78000000, + D3D12_RESIDENCY_PRIORITY_HIGH = 0xa0010000, + D3D12_RESIDENCY_PRIORITY_MAXIMUM = 0xc8000000, +} D3D12_RESIDENCY_PRIORITY; + [ uuid(c4fec28f-7966-4e95-9f94-f431cb56c3b8), object, @@ -2285,6 +2302,23 @@ interface ID3D12Device : ID3D12Object } [ + uuid(77acce80-638e-4e65-8895-c1f23386863e), + object, + local, + pointer_default(unique) +] +interface ID3D12Device1 : ID3D12Device +{ + HRESULT CreatePipelineLibrary(const void *blob, SIZE_T blob_size, REFIID iid, void **lib); + + HRESULT SetEventOnMultipleFenceCompletion(ID3D12Fence * const *fences, + const UINT64 *values, UINT fence_count, D3D12_MULTIPLE_FENCE_WAIT_FLAGS flags, HANDLE event); + + HRESULT SetResidencyPriority(UINT object_count, ID3D12Pageable * const *objects, + const D3D12_RESIDENCY_PRIORITY *priorities); +} + +[ uuid(344488b7-6846-474b-b989-f027448245e0), object, local,

1 0

Andrey Gusev : quartz: Avoid cast for VMR9_ImagePresenter_QueryInterface.
by Alexandre Julliard June 6, 2019

June 6, 2019

Module: wine Branch: master Commit: e87322e9d40b8a5184919a1d1010b138f018ff84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e87322e9d40b8a5184919a1d… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Jun 6 13:40:02 2019 +0300 quartz: Avoid cast for VMR9_ImagePresenter_QueryInterface. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index d208b1c..751eeeb 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -2326,16 +2326,14 @@ HRESULT VMR9Impl_create(IUnknown *outer_unk, LPVOID *ppv) } -static HRESULT WINAPI VMR9_ImagePresenter_QueryInterface(IVMRImagePresenter9 *iface, REFIID riid, LPVOID * ppv) +static HRESULT WINAPI VMR9_ImagePresenter_QueryInterface(IVMRImagePresenter9 *iface, REFIID riid, void **ppv) { VMR9DefaultAllocatorPresenterImpl *This = impl_from_IVMRImagePresenter9(iface); TRACE("(%p/%p)->(%s, %p)\n", This, iface, qzdebugstr_guid(riid), ppv); *ppv = NULL; - if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = (LPVOID)&(This->IVMRImagePresenter9_iface); - else if (IsEqualIID(riid, &IID_IVMRImagePresenter9)) + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IVMRImagePresenter9)) *ppv = &This->IVMRImagePresenter9_iface; else if (IsEqualIID(riid, &IID_IVMRSurfaceAllocatorEx9)) *ppv = &This->IVMRSurfaceAllocatorEx9_iface;

1 0

Zebediah Figura : ntoskrnl.exe: Send PnP IRPs to the top of the device stack.
by Alexandre Julliard June 6, 2019

June 6, 2019

Module: wine Branch: master Commit: 9392aaa17fa029a05dbae780b0b85644ec72a1ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=9392aaa17fa029a05dbae780… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 6 11:12:52 2019 -0400 ntoskrnl.exe: Send PnP IRPs to the top of the device stack. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/pnp.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 20e1538..e7303b6 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -176,6 +176,8 @@ static NTSTATUS get_device_id( DEVICE_OBJECT *device, BUS_QUERY_ID_TYPE type, WC IO_STATUS_BLOCK irp_status; IRP *irp; + device = IoGetAttachedDevice( device ); + if (!(irp = IoBuildSynchronousFsdRequest( IRP_MJ_PNP, device, NULL, 0, NULL, NULL, &irp_status ))) return STATUS_NO_MEMORY; @@ -192,6 +194,8 @@ static NTSTATUS send_pnp_irp( DEVICE_OBJECT *device, UCHAR minor ) IO_STATUS_BLOCK irp_status; IRP *irp; + device = IoGetAttachedDevice( device ); + if (!(irp = IoBuildSynchronousFsdRequest( IRP_MJ_PNP, device, NULL, 0, NULL, NULL, &irp_status ))) return STATUS_NO_MEMORY; @@ -291,6 +295,8 @@ static NTSTATUS send_power_irp( DEVICE_OBJECT *device, DEVICE_POWER_STATE power IO_STACK_LOCATION *irpsp; IRP *irp; + device = IoGetAttachedDevice( device ); + if (!(irp = IoBuildSynchronousFsdRequest( IRP_MJ_POWER, device, NULL, 0, NULL, NULL, &irp_status ))) return STATUS_NO_MEMORY;

1 0

Zebediah Figura : qcap/avico: Use BaseFilterImpl_QueryFilterInfo().
by Alexandre Julliard June 6, 2019

June 6, 2019

Module: wine Branch: master Commit: ca77a7e0c16b9ae2e2dfc440fbae234a9fe99412 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca77a7e0c16b9ae2e2dfc440… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 6 11:22:55 2019 -0400 qcap/avico: Use BaseFilterImpl_QueryFilterInfo(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avico.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index 40bc82b..6ebe0fd 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -160,13 +160,6 @@ static HRESULT WINAPI AVICompressor_Run(IBaseFilter *iface, REFERENCE_TIME tStar return S_OK; } -static HRESULT WINAPI AVICompressor_QueryFilterInfo(IBaseFilter *iface, FILTER_INFO *pInfo) -{ - AVICompressor *This = impl_from_IBaseFilter(iface); - FIXME("(%p)->(%p)\n", This, pInfo); - return E_NOTIMPL; -} - static HRESULT WINAPI AVICompressor_QueryVendorInfo(IBaseFilter *iface, LPWSTR *pVendorInfo) { AVICompressor *This = impl_from_IBaseFilter(iface); @@ -187,7 +180,7 @@ static const IBaseFilterVtbl AVICompressorVtbl = { BaseFilterImpl_GetSyncSource, BaseFilterImpl_EnumPins, BaseFilterImpl_FindPin, - AVICompressor_QueryFilterInfo, + BaseFilterImpl_QueryFilterInfo, BaseFilterImpl_JoinFilterGraph, AVICompressor_QueryVendorInfo };

1 0

Henri Verbeet : wined3d: Move the "valid" field from struct wined3d_context to struct wined3d_context_gl.
by Alexandre Julliard June 6, 2019

June 6, 2019

Module: wine Branch: master Commit: e0d9bc3a874827a01655b2842533e57d7e105462 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0d9bc3a874827a01655b284… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 6 17:39:06 2019 +0430 wined3d: Move the "valid" field from struct wined3d_context to struct wined3d_context_gl. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 54 ++++++++++++++++++++---------------------- dlls/wined3d/cs.c | 10 ++++---- dlls/wined3d/device.c | 2 +- dlls/wined3d/surface.c | 4 ++-- dlls/wined3d/swapchain.c | 4 ++-- dlls/wined3d/wined3d_private.h | 34 +++++++++++++------------- 6 files changed, 53 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e0d9bc3a874827a01655…

1 0

Zebediah Figura : ntoskrnl.exe: Implement automatically generated device names.
by Alexandre Julliard June 6, 2019

June 6, 2019

Module: wine Branch: master Commit: 365f162fb1443d201177eec31f009a59b061e853 URL: https://source.winehq.org/git/wine.git/?a=commit;h=365f162fb1443d201177eec3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 6 11:12:53 2019 -0400 ntoskrnl.exe: Implement automatically generated device names. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 36 +++++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index ec24e08..a0812dc 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1466,9 +1466,12 @@ NTSTATUS WINAPI IoCreateDevice( DRIVER_OBJECT *driver, ULONG ext_size, ULONG characteristics, BOOLEAN exclusive, DEVICE_OBJECT **ret_device ) { + static const WCHAR auto_format[] = {'\\','D','e','v','i','c','e','\\','%','0','8','x',0}; NTSTATUS status; DEVICE_OBJECT *device; HANDLE manager = get_device_manager(); + static unsigned int auto_idx = 0; + WCHAR autoW[17]; TRACE( "(%p, %u, %s, %u, %x, %u, %p)\n", driver, ext_size, debugstr_us(name), type, characteristics, exclusive, ret_device ); @@ -1481,15 +1484,34 @@ NTSTATUS WINAPI IoCreateDevice( DRIVER_OBJECT *driver, ULONG ext_size, device->DeviceType = type; device->StackSize = 1; - SERVER_START_REQ( create_device ) + if (characteristics & FILE_AUTOGENERATED_DEVICE_NAME) { - req->rootdir = 0; - req->manager = wine_server_obj_handle( manager ); - req->user_ptr = wine_server_client_ptr( device ); - if (name) wine_server_add_data( req, name->Buffer, name->Length ); - status = wine_server_call( req ); + do + { + sprintfW( autoW, auto_format, auto_idx++ ); + SERVER_START_REQ( create_device ) + { + req->rootdir = 0; + req->manager = wine_server_obj_handle( manager ); + req->user_ptr = wine_server_client_ptr( device ); + wine_server_add_data( req, autoW, strlenW(autoW) * sizeof(WCHAR) ); + status = wine_server_call( req ); + } + SERVER_END_REQ; + } while (status == STATUS_OBJECT_NAME_COLLISION); + } + else + { + SERVER_START_REQ( create_device ) + { + req->rootdir = 0; + req->manager = wine_server_obj_handle( manager ); + req->user_ptr = wine_server_client_ptr( device ); + if (name) wine_server_add_data( req, name->Buffer, name->Length ); + status = wine_server_call( req ); + } + SERVER_END_REQ; } - SERVER_END_REQ; if (status) {

1 0

Zebediah Figura : ntoskrnl.exe: Dispatch user IRPs to the top of the device stack.
by Alexandre Julliard June 6, 2019

June 6, 2019

Module: wine Branch: master Commit: 4820d9d76ca2dba20c264354f776ed6633df0817 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4820d9d76ca2dba20c264354… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 6 11:12:51 2019 -0400 ntoskrnl.exe: Dispatch user IRPs to the top of the device stack. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 12 ++++++----- dlls/ntoskrnl.exe/tests/driver.c | 44 ++++++++++++++++++++++++++++++-------- dlls/ntoskrnl.exe/tests/driver.h | 1 + dlls/ntoskrnl.exe/tests/ntoskrnl.c | 11 ++++++++-- include/ddk/ntifs.h | 1 + 5 files changed, 53 insertions(+), 16 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index cf4d8cb..ec24e08 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -516,6 +516,8 @@ static NTSTATUS dispatch_create( struct dispatch_context *context ) file->Size = sizeof(*file); file->DeviceObject = device; + device = IoGetAttachedDevice( device ); + if (!(irp = IoAllocateIrp( device->StackSize, FALSE ))) return STATUS_NO_MEMORY; irpsp = IoGetNextIrpStackLocation( irp ); @@ -550,7 +552,7 @@ static NTSTATUS dispatch_close( struct dispatch_context *context ) if (!file) return STATUS_INVALID_HANDLE; - device = file->DeviceObject; + device = IoGetAttachedDevice( file->DeviceObject ); TRACE( "device %p file %p\n", device, file ); @@ -590,7 +592,7 @@ static NTSTATUS dispatch_read( struct dispatch_context *context ) if (!file) return STATUS_INVALID_HANDLE; - device = file->DeviceObject; + device = IoGetAttachedDevice( file->DeviceObject ); TRACE( "device %p file %p size %u\n", device, file, out_size ); @@ -630,7 +632,7 @@ static NTSTATUS dispatch_write( struct dispatch_context *context ) if (!file) return STATUS_INVALID_HANDLE; - device = file->DeviceObject; + device = IoGetAttachedDevice( file->DeviceObject ); TRACE( "device %p file %p size %u\n", device, file, context->in_size ); @@ -665,7 +667,7 @@ static NTSTATUS dispatch_flush( struct dispatch_context *context ) if (!file) return STATUS_INVALID_HANDLE; - device = file->DeviceObject; + device = IoGetAttachedDevice( file->DeviceObject ); TRACE( "device %p file %p\n", device, file ); @@ -697,7 +699,7 @@ static NTSTATUS dispatch_ioctl( struct dispatch_context *context ) if (!file) return STATUS_INVALID_HANDLE; - device = file->DeviceObject; + device = IoGetAttachedDevice( file->DeviceObject ); TRACE( "ioctl %x device %p file %p in_size %u out_size %u\n", context->params.ioctl.code, device, file, context->in_size, out_size ); diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 468b183..f5801a5 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -34,12 +34,15 @@ #include "driver.h" -static const WCHAR driver_device[] = {'\\','D','e','v','i','c','e', - '\\','W','i','n','e','T','e','s','t','D','r','i','v','e','r',0}; +static const WCHAR device_name[] = {'\\','D','e','v','i','c','e', + '\\','W','i','n','e','T','e','s','t','D','r','i','v','e','r',0}; +static const WCHAR upper_name[] = {'\\','D','e','v','i','c','e', + '\\','W','i','n','e','T','e','s','t','U','p','p','e','r',0}; static const WCHAR driver_link[] = {'\\','D','o','s','D','e','v','i','c','e','s', '\\','W','i','n','e','T','e','s','t','D','r','i','v','e','r',0}; static DRIVER_OBJECT *driver_obj; +static DEVICE_OBJECT *lower_device, *upper_device; static HANDLE okfile; static LONG successes; @@ -234,10 +237,11 @@ static void test_irp_struct(IRP *irp, DEVICE_OBJECT *device) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); + ok(device == upper_device, "Expected device %p, got %p.\n", upper_device, device); ok(last_created_file != NULL, "last_created_file = NULL\n"); ok(irpsp->FileObject == last_created_file, "FileObject != last_created_file\n"); - ok(irpsp->DeviceObject == device, "unexpected DeviceObject\n"); - ok(irpsp->FileObject->DeviceObject == device, "unexpected FileObject->DeviceObject\n"); + ok(irpsp->DeviceObject == upper_device, "unexpected DeviceObject\n"); + ok(irpsp->FileObject->DeviceObject == lower_device, "unexpected FileObject->DeviceObject\n"); ok(!irp->UserEvent, "UserEvent = %p\n", irp->UserEvent); ok(irp->Tail.Overlay.Thread == (PETHREAD)KeGetCurrentThread(), "IRP thread is not the current thread\n"); @@ -1591,7 +1595,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st if (main_test_work_item) return STATUS_UNEXPECTED_IO_ERROR; - main_test_work_item = IoAllocateWorkItem(device); + main_test_work_item = IoAllocateWorkItem(lower_device); ok(main_test_work_item != NULL, "main_test_work_item = NULL\n"); IoQueueWorkItem(main_test_work_item, main_test_task, DelayedWorkQueue, irp); @@ -1687,6 +1691,10 @@ static NTSTATUS WINAPI driver_IoControl(DEVICE_OBJECT *device, IRP *irp) case IOCTL_WINETEST_GET_CANCEL_COUNT: status = get_cancel_count(irp, stack, &irp->IoStatus.Information); break; + case IOCTL_WINETEST_DETACH: + IoDetachDevice(lower_device); + status = STATUS_SUCCESS; + break; default: break; } @@ -1703,6 +1711,7 @@ static NTSTATUS WINAPI driver_IoControl(DEVICE_OBJECT *device, IRP *irp) static NTSTATUS WINAPI driver_FlushBuffers(DEVICE_OBJECT *device, IRP *irp) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation(irp); + ok(device == lower_device, "Expected device %p, got %p.\n", lower_device, device); ok(irpsp->DeviceObject == device, "device != DeviceObject\n"); ok(irp->Tail.Overlay.Thread == (PETHREAD)KeGetCurrentThread(), "IRP thread is not the current thread\n"); @@ -1726,13 +1735,13 @@ static VOID WINAPI driver_Unload(DRIVER_OBJECT *driver) RtlInitUnicodeString(&linkW, driver_link); IoDeleteSymbolicLink(&linkW); - IoDeleteDevice(driver->DeviceObject); + IoDeleteDevice(upper_device); + IoDeleteDevice(lower_device); } NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry) { UNICODE_STRING nameW, linkW; - DEVICE_OBJECT *device; NTSTATUS status; DbgPrint("loading driver\n"); @@ -1748,12 +1757,29 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry) driver->MajorFunction[IRP_MJ_FLUSH_BUFFERS] = driver_FlushBuffers; driver->MajorFunction[IRP_MJ_CLOSE] = driver_Close; - RtlInitUnicodeString(&nameW, driver_device); + RtlInitUnicodeString(&nameW, device_name); RtlInitUnicodeString(&linkW, driver_link); if (!(status = IoCreateDevice(driver, 0, &nameW, FILE_DEVICE_UNKNOWN, - FILE_DEVICE_SECURE_OPEN, FALSE, &device))) + FILE_DEVICE_SECURE_OPEN, FALSE, &lower_device))) + { status = IoCreateSymbolicLink(&linkW, &nameW); + lower_device->Flags &= ~DO_DEVICE_INITIALIZING; + } + + if (!status) + { + RtlInitUnicodeString(&nameW, upper_name); + + status = IoCreateDevice(driver, 0, &nameW, FILE_DEVICE_UNKNOWN, + FILE_DEVICE_SECURE_OPEN, FALSE, &upper_device); + } + + if (!status) + { + IoAttachDeviceToDeviceStack(upper_device, lower_device); + upper_device->Flags &= ~DO_DEVICE_INITIALIZING; + } return status; } diff --git a/dlls/ntoskrnl.exe/tests/driver.h b/dlls/ntoskrnl.exe/tests/driver.h index 1e75529..d5ff09a 100644 --- a/dlls/ntoskrnl.exe/tests/driver.h +++ b/dlls/ntoskrnl.exe/tests/driver.h @@ -28,6 +28,7 @@ #define IOCTL_WINETEST_RESET_CANCEL CTL_CODE(FILE_DEVICE_UNKNOWN, 0x803, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_WINETEST_TEST_CANCEL CTL_CODE(FILE_DEVICE_UNKNOWN, 0x804, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_WINETEST_GET_CANCEL_COUNT CTL_CODE(FILE_DEVICE_UNKNOWN, 0x805, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_WINETEST_DETACH CTL_CODE(FILE_DEVICE_UNKNOWN, 0x806, METHOD_BUFFERED, FILE_ANY_ACCESS) static const char teststr[] = "Wine is not an emulator"; diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 43418f3..19eeca2 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -63,8 +63,6 @@ static void unload_driver(SC_HANDLE service) { SERVICE_STATUS status; - CloseHandle(device); - ControlService(service, SERVICE_CONTROL_STOP, &status); while (status.dwCurrentState == SERVICE_STOP_PENDING) { @@ -343,6 +341,8 @@ START_TEST(ntoskrnl) { char filename[MAX_PATH], filename2[MAX_PATH]; SC_HANDLE service, service2; + DWORD written; + BOOL ret; HMODULE hntdll = GetModuleHandleA("ntdll.dll"); pRtlDosPathNameToNtPathName_U = (void *)GetProcAddress(hntdll, "RtlDosPathNameToNtPathName_U"); @@ -368,6 +368,13 @@ START_TEST(ntoskrnl) test_overlapped(); test_load_driver(service2); + /* We need a separate ioctl to call IoDetachDevice(); calling it in the + * driver unload routine causes a live-lock. */ + ret = DeviceIoControl(device, IOCTL_WINETEST_DETACH, NULL, 0, NULL, 0, &written, NULL); + ok(ret, "DeviceIoControl failed: %u\n", GetLastError()); + + CloseHandle(device); + unload_driver(service2); unload_driver(service); ok(DeleteFileA(filename), "DeleteFile failed: %u\n", GetLastError()); diff --git a/include/ddk/ntifs.h b/include/ddk/ntifs.h index acdd232..b287b06 100644 --- a/include/ddk/ntifs.h +++ b/include/ddk/ntifs.h @@ -130,6 +130,7 @@ typedef struct _FS_FILTER_CALLBACKS } FS_FILTER_CALLBACKS, *PFS_FILTER_CALLBACKS; BOOLEAN WINAPI FsRtlIsNameInExpression(PUNICODE_STRING, PUNICODE_STRING, BOOLEAN, PWCH); +DEVICE_OBJECT * WINAPI IoGetAttachedDevice(DEVICE_OBJECT*); NTSTATUS WINAPI ObOpenObjectByPointer(void*,ULONG,PACCESS_STATE,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE,HANDLE*); NTSTATUS WINAPI ObQueryNameString(PVOID,POBJECT_NAME_INFORMATION,ULONG,PULONG); BOOLEAN WINAPI PsIsSystemThread(PETHREAD);

1 0

Zebediah Figura : hidclass.sys: Use PDRIVER_ADD_DEVICE.
by Alexandre Julliard June 6, 2019

June 6, 2019

Module: wine Branch: master Commit: 700633ee0ff65a73bb6383b4e9796b5b54bb2d4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=700633ee0ff65a73bb6383b4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 6 11:12:49 2019 -0400 hidclass.sys: Use PDRIVER_ADD_DEVICE. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/hid.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h index ff2e7ef..b9bf135 100644 --- a/dlls/hidclass.sys/hid.h +++ b/dlls/hidclass.sys/hid.h @@ -34,8 +34,6 @@ #define DEFAULT_POLL_INTERVAL 200 #define MAX_POLL_INTERVAL_MSEC 10000 -typedef NTSTATUS (WINAPI *pAddDevice)(DRIVER_OBJECT *DriverObject, DEVICE_OBJECT *PhysicalDeviceObject); - /* Ring buffer functions */ struct ReportRingBuffer; @@ -85,7 +83,7 @@ typedef struct _minidriver PDRIVER_UNLOAD DriverUnload; - pAddDevice AddDevice; + PDRIVER_ADD_DEVICE AddDevice; PDRIVER_DISPATCH PNPDispatch; struct list device_list; } minidriver;

1 0

Zebediah Figura : strmbase: Support aggregation in the base transform filter.
by Alexandre Julliard June 6, 2019

June 6, 2019

Module: wine Branch: master Commit: f500b1dc196e709da666c5045ca8e0da8242f8a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f500b1dc196e709da666c504… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 6 11:22:53 2019 -0400 strmbase: Support aggregation in the base transform filter. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/acmwrapper.c | 13 ++++--------- dlls/quartz/avidec.c | 13 ++++--------- dlls/quartz/tests/acmwrapper.c | 3 +-- dlls/quartz/tests/avidec.c | 3 +-- dlls/strmbase/transform.c | 8 ++++---- dlls/winegstreamer/gsttffilter.c | 9 ++++----- dlls/wineqtdecoder/qtvdecoder.c | 14 +++----------- include/wine/strmbase.h | 2 +- 8 files changed, 22 insertions(+), 43 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index b38f435..adfb022 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -375,25 +375,20 @@ static const TransformFilterFuncTable ACMWrapper_FuncsTable = { NULL }; -HRESULT ACMWrapper_create(IUnknown * pUnkOuter, LPVOID * ppv) +HRESULT ACMWrapper_create(IUnknown *outer, void **out) { HRESULT hr; ACMWrapperImpl* This; - TRACE("(%p, %p)\n", pUnkOuter, ppv); + *out = NULL; - *ppv = NULL; - - if (pUnkOuter) - return CLASS_E_NOAGGREGATION; - - hr = strmbase_transform_create(sizeof(ACMWrapperImpl), &CLSID_ACMWrapper, + hr = strmbase_transform_create(sizeof(ACMWrapperImpl), outer, &CLSID_ACMWrapper, &ACMWrapper_FuncsTable, (IBaseFilter **)&This); if (FAILED(hr)) return hr; - *ppv = &This->tf.filter.IBaseFilter_iface; + *out = &This->tf.filter.IUnknown_inner; This->lasttime_real = This->lasttime_sent = -1; return hr; diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index a12cad1..4aefd35 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -390,19 +390,14 @@ static const TransformFilterFuncTable AVIDec_FuncsTable = { AVIDec_NotifyDrop }; -HRESULT AVIDec_create(IUnknown * pUnkOuter, LPVOID * ppv) +HRESULT AVIDec_create(IUnknown *outer, void **out) { HRESULT hr; AVIDecImpl * This; - TRACE("(%p, %p)\n", pUnkOuter, ppv); + *out = NULL; - *ppv = NULL; - - if (pUnkOuter) - return CLASS_E_NOAGGREGATION; - - hr = strmbase_transform_create(sizeof(AVIDecImpl), &CLSID_AVIDec, + hr = strmbase_transform_create(sizeof(AVIDecImpl), outer, &CLSID_AVIDec, &AVIDec_FuncsTable, (IBaseFilter **)&This); if (FAILED(hr)) @@ -412,7 +407,7 @@ HRESULT AVIDec_create(IUnknown * pUnkOuter, LPVOID * ppv) This->pBihIn = NULL; This->pBihOut = NULL; - *ppv = &This->tf.filter.IBaseFilter_iface; + *out = &This->tf.filter.IUnknown_inner; return hr; } diff --git a/dlls/quartz/tests/acmwrapper.c b/dlls/quartz/tests/acmwrapper.c index 48451f80..1c41872 100644 --- a/dlls/quartz/tests/acmwrapper.c +++ b/dlls/quartz/tests/acmwrapper.c @@ -158,8 +158,7 @@ static void test_aggregation(void) hr = CoCreateInstance(&CLSID_ACMWrapper, &test_outer, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - if (FAILED(hr)) return; + ok(hr == S_OK, "Got hr %#x.\n", hr); ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); ok(unk != &test_outer, "Returned IUnknown should not be outer IUnknown.\n"); ref = get_refcount(unk); diff --git a/dlls/quartz/tests/avidec.c b/dlls/quartz/tests/avidec.c index fe86d33..0183e0b 100644 --- a/dlls/quartz/tests/avidec.c +++ b/dlls/quartz/tests/avidec.c @@ -183,8 +183,7 @@ static void test_aggregation(void) hr = CoCreateInstance(&CLSID_AVIDec, &test_outer, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - if (FAILED(hr)) return; + ok(hr == S_OK, "Got hr %#x.\n", hr); ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); ok(unk != &test_outer, "Returned IUnknown should not be outer IUnknown.\n"); ref = get_refcount(unk); diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index bfe87a1..a7c47b5 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -281,14 +281,14 @@ static const IBaseFilterVtbl transform_vtbl = BaseFilterImpl_QueryVendorInfo }; -static HRESULT strmbase_transform_init(const CLSID *clsid, +static HRESULT strmbase_transform_init(IUnknown *outer, const CLSID *clsid, const TransformFilterFuncTable *func_table, TransformFilter *filter) { HRESULT hr; PIN_INFO piInput; PIN_INFO piOutput; - strmbase_filter_init(&filter->filter, &transform_vtbl, NULL, clsid, + strmbase_filter_init(&filter->filter, &transform_vtbl, outer, clsid, (DWORD_PTR)(__FILE__ ": TransformFilter.csFilter"), &tfBaseFuncTable); InitializeCriticalSection(&filter->csReceive); @@ -349,7 +349,7 @@ static HRESULT strmbase_transform_init(const CLSID *clsid, return hr; } -HRESULT strmbase_transform_create(LONG filter_size, const CLSID *pClsid, +HRESULT strmbase_transform_create(LONG filter_size, IUnknown *outer, const CLSID *pClsid, const TransformFilterFuncTable *pFuncsTable, IBaseFilter **ppTransformFilter) { TransformFilter* pTf; @@ -365,7 +365,7 @@ HRESULT strmbase_transform_create(LONG filter_size, const CLSID *pClsid, ZeroMemory(pTf, filter_size); - if (SUCCEEDED(strmbase_transform_init(pClsid, pFuncsTable, pTf))) + if (SUCCEEDED(strmbase_transform_init(outer, pClsid, pFuncsTable, pTf))) { *ppTransformFilter = &pTf->filter.IBaseFilter_iface; return S_OK; diff --git a/dlls/winegstreamer/gsttffilter.c b/dlls/winegstreamer/gsttffilter.c index b45d844..60697e5 100644 --- a/dlls/winegstreamer/gsttffilter.c +++ b/dlls/winegstreamer/gsttffilter.c @@ -489,17 +489,16 @@ static HRESULT WINAPI Gstreamer_transform_QOS(TransformFilter *iface, IBaseFilte return TransformFilterImpl_Notify(iface, sender, qm); } -static HRESULT Gstreamer_transform_create(IUnknown *punkouter, const CLSID *clsid, const char *name, const TransformFilterFuncTable *vtbl, void **obj) +static HRESULT Gstreamer_transform_create(IUnknown *outer, const CLSID *clsid, + const char *name, const TransformFilterFuncTable *vtbl, void **obj) { GstTfImpl *This; - TRACE("%p, %p, %p, %p, %p\n", punkouter, clsid, name, vtbl, obj); - - if (FAILED(strmbase_transform_create(sizeof(GstTfImpl), clsid, vtbl, (IBaseFilter **)&This))) + if (FAILED(strmbase_transform_create(sizeof(GstTfImpl), outer, clsid, vtbl, (IBaseFilter **)&This))) return E_OUTOFMEMORY; This->gstreamer_name = name; - *obj = This; + *obj = &This->tf.filter.IUnknown_inner; TRACE("returning %p\n", This); diff --git a/dlls/wineqtdecoder/qtvdecoder.c b/dlls/wineqtdecoder/qtvdecoder.c index 4ad73d8..57101d4 100644 --- a/dlls/wineqtdecoder/qtvdecoder.c +++ b/dlls/wineqtdecoder/qtvdecoder.c @@ -518,22 +518,14 @@ static const TransformFilterFuncTable QTVDecoder_FuncsTable = { NULL }; -IUnknown * CALLBACK QTVDecoder_create(IUnknown * pUnkOuter, HRESULT* phr) +IUnknown * CALLBACK QTVDecoder_create(IUnknown *outer, HRESULT* phr) { HRESULT hr; QTVDecoderImpl * This; - TRACE("(%p, %p)\n", pUnkOuter, phr); - *phr = S_OK; - if (pUnkOuter) - { - *phr = CLASS_E_NOAGGREGATION; - return NULL; - } - - hr = strmbase_transform_create(sizeof(QTVDecoderImpl), &CLSID_QTVDecoder, + hr = strmbase_transform_create(sizeof(QTVDecoderImpl), outer, &CLSID_QTVDecoder, &QTVDecoder_FuncsTable, (IBaseFilter **)&This); if (FAILED(hr)) @@ -543,5 +535,5 @@ IUnknown * CALLBACK QTVDecoder_create(IUnknown * pUnkOuter, HRESULT* phr) } *phr = hr; - return (IUnknown*)This; + return &This->tf.filter.IUnknown_inner; } diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 7ee8be6..56560ed 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -249,7 +249,7 @@ typedef struct TransformFilterFuncTable { HRESULT WINAPI TransformFilterImpl_Notify(TransformFilter *iface, IBaseFilter *sender, Quality qm); -HRESULT strmbase_transform_create(LONG filter_size, const CLSID *clsid, +HRESULT strmbase_transform_create(LONG filter_size, IUnknown *outer, const CLSID *clsid, const TransformFilterFuncTable *func_table, IBaseFilter **filter); /* Source Seeking */

1 0