June 2020 - Wine-Devel - list.winehq.org

compiling wine (wow64) with opengl 1.3
by Alois Schlögl June 16, 2020

June 16, 2020

Hello, I'd like testing some cross-compile qt5 applications, in the past I was able to use wine for testing. However, recently this does not work anymore, the application runs on windows but crashes on wine (if you want, I can send details ). I suspect that recent versions of qt5 require opengl 1.3. Therefore, I'm trying to compile wine (actually wow64) from source with opengl 1.3 support, and was trying to follow the documentation [1,2]. I'm testing on debian 10 and did apt-get build-dep wine cd ../wine-source/dlls/opengl32 && ./make_opengl 1.3 cd ~/wine-dirs/build64 make distclean ../wine-source/configure --enable-win64 make Configuration complains about the following issues: configure: MinGW compiler not found, cross-compiling PE files won't be supported. configure: libhal 64-bit development files not found, no legacy dynamic device support. configure: libusb-1.0 64-bit development files not found (or too old), USB devices won't be supported. configure: OSS sound system found but too old (OSSv4 needed), OSS won't be supported. I believe these are not relevant. However, compilation fails, the log file is attached). What I'm missing here? What is your recommendation how to address this issue? Cheers, Alois [1] https://wiki.winehq.org/Building_Wine [2] https://wiki.winehq.org/Wine_Developer%27s_Guide/Wine_and_OpenGL

4 4

[PATCH 3/3] windowscodecs: Fix MIME types of DDS decoder.
by Ziqing Hui June 16, 2020

June 16, 2020

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/regsvr.c | 2 +- dlls/windowscodecs/tests/info.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-)

2 1

[PATCH 2/3] windowscodecs/tests: Add decoder info tests for DDS decoder.
by Ziqing Hui June 16, 2020

June 16, 2020

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/info.c | 7 +++++++ 1 file changed, 7 insertions(+)

2 1

[PATCH 1/4] quartz: Try to connect all source pins when autoplugging from the registry.
by Zebediah Figura June 16, 2020

June 16, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/filtergraph.c | 41 +++++++++++++-------------------- dlls/quartz/tests/filtergraph.c | 22 +++++++++--------- 2 files changed, 27 insertions(+), 36 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index fa20d98981b..cb212e4961b 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1327,7 +1327,6 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, while (IEnumMoniker_Next(pEnumMoniker, 1, &pMoniker, NULL) == S_OK) { VARIANT var; - IPin* ppinfilter = NULL; IBaseFilter* pfilter = NULL; IAMGraphBuilderCallback *callback = NULL; @@ -1390,35 +1389,27 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, goto error; } - hr = IEnumPins_Next(penumpins, 1, &ppinfilter, NULL); - IEnumPins_Release(penumpins); - - if (FAILED(hr)) { - WARN("Obtaining next pin: (%x)\n", hr); - goto error; - } - if (hr == S_FALSE) { - WARN("Cannot use this filter: no pins\n"); - goto error; - } - - hr = IFilterGraph2_ConnectDirect(iface, ppinOut, ppinfilter, NULL); - if (FAILED(hr)) { - TRACE("Cannot connect to filter (%x), trying next one\n", hr); - goto error; - } - TRACE("Successfully connected to filter, follow chain...\n"); - - if (SUCCEEDED(hr = connect_output_pin(This, pfilter, ppinIn))) + while (IEnumPins_Next(penumpins, 1, &pin, NULL) == S_OK) { - IPin_Release(ppinfilter); - IBaseFilter_Release(pfilter); - break; + if (SUCCEEDED(IFilterGraph2_ConnectDirect(iface, ppinOut, pin, NULL))) + { + if (SUCCEEDED(hr = connect_output_pin(This, pfilter, ppinIn))) + { + IPin_Release(pin); + IEnumPins_Release(penumpins); + IBaseFilter_Release(pfilter); + IEnumMoniker_Release(pEnumMoniker); + goto out; + } + IFilterGraph2_Disconnect(iface, pin); + IFilterGraph2_Disconnect(iface, ppinOut); + } + IPin_Release(pin); } + IEnumPins_Release(penumpins); error: VariantClear(&var); - if (ppinfilter) IPin_Release(ppinfilter); if (pfilter) { IFilterGraph2_RemoveFilter(iface, pfilter); IBaseFilter_Release(pfilter); diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 4f4abeac9b9..d062ea39c61 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -2136,9 +2136,9 @@ static void test_graph_builder_connect(void) testfilter_init(&parser1, parser1_pins, 3); parser1.pin_count = 2; - testsink_init(&parser2_pins[0]); - testsource_init(&parser2_pins[1], &sink_type, 1); - parser2_pins[1].request_mt = &sink_type; + testsource_init(&parser2_pins[0], &sink_type, 1); + testsink_init(&parser2_pins[1]); + parser2_pins[0].request_mt = &sink_type; testfilter_init(&parser2, parser2_pins, 2); testsink_init(&parser3_pins[0]); @@ -2215,8 +2215,8 @@ static void test_graph_builder_connect(void) sink_pin.accept_mt = &sink_type; hr = IFilterGraph2_Connect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(source_pin.peer == &parser2_pins[0].IPin_iface, "Got peer %p.\n", source_pin.peer); - ok(sink_pin.peer == &parser2_pins[1].IPin_iface, "Got peer %p.\n", sink_pin.peer); + ok(source_pin.peer == &parser2_pins[1].IPin_iface, "Got peer %p.\n", source_pin.peer); + ok(sink_pin.peer == &parser2_pins[0].IPin_iface, "Got peer %p.\n", sink_pin.peer); IFilterGraph2_Disconnect(graph, source_pin.peer); IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); IFilterGraph2_Disconnect(graph, sink_pin.peer); @@ -2227,8 +2227,8 @@ static void test_graph_builder_connect(void) { hr = IFilterGraph2_Connect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface); ok(hr == S_OK, "Got hr %#x for Connect() hr %#x.\n", hr, source_pin.Connect_hr); - ok(source_pin.peer == &parser2_pins[0].IPin_iface, "Got peer %p.\n", source_pin.peer); - ok(sink_pin.peer == &parser2_pins[1].IPin_iface, "Got peer %p.\n", sink_pin.peer); + ok(source_pin.peer == &parser2_pins[1].IPin_iface, "Got peer %p.\n", source_pin.peer); + ok(sink_pin.peer == &parser2_pins[0].IPin_iface, "Got peer %p.\n", sink_pin.peer); IFilterGraph2_Disconnect(graph, source_pin.peer); IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); IFilterGraph2_Disconnect(graph, sink_pin.peer); @@ -2379,9 +2379,9 @@ todo_wine hr = IFilterGraph2_Connect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(source_pin.peer == &parser1_pins[0].IPin_iface - || source_pin.peer == &parser2_pins[0].IPin_iface, "Got peer %p.\n", source_pin.peer); + || source_pin.peer == &parser2_pins[1].IPin_iface, "Got peer %p.\n", source_pin.peer); ok(sink_pin.peer == &parser1_pins[1].IPin_iface - || sink_pin.peer == &parser2_pins[1].IPin_iface, "Got peer %p.\n", sink_pin.peer); + || sink_pin.peer == &parser2_pins[0].IPin_iface, "Got peer %p.\n", sink_pin.peer); ref = IFilterGraph2_Release(graph); ok(!ref, "Got outstanding refcount %d.\n", ref); @@ -2417,8 +2417,8 @@ todo_wine hr = IFilterGraph2_Connect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(source_pin.peer == &parser2_pins[0].IPin_iface, "Got peer %p.\n", source_pin.peer); - ok(sink_pin.peer == &parser2_pins[1].IPin_iface, "Got peer %p.\n", sink_pin.peer); + ok(source_pin.peer == &parser2_pins[1].IPin_iface, "Got peer %p.\n", source_pin.peer); + ok(sink_pin.peer == &parser2_pins[0].IPin_iface, "Got peer %p.\n", sink_pin.peer); ref = IFilterGraph2_Release(graph); ok(!ref, "Got outstanding refcount %d.\n", ref); -- 2.27.0

2 5

[PATCH 1/3] windowscodecs/tests: Add tests for DdsFrameDecode_GetPixelFormat().
by Ziqing Hui June 16, 2020

June 16, 2020

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-)

1 0

[PATCH 2/3] msado15/tests: Add tests for IConnectionPoint::Advise/Unadvise.
by Aaro Altonen June 16, 2020

June 16, 2020

Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> --- dlls/msado15/tests/msado15.c | 172 +++++++++++++++++++++++++++++++++++ 1 file changed, 172 insertions(+) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 59c00948c8..3e3997ed41 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -837,10 +837,141 @@ static void test_Command(void) _Command_Release( command ); } +static HRESULT WINAPI conneventvt_QueryInterface( ConnectionEventsVt *iface, REFIID riid, void **obj ) +{ + if (IsEqualGUID( &IID_ConnectionEventsVt, riid )) + { + *obj = iface; + return S_OK; + } + + ok( 0, "unexpected call\n" ); + return E_NOINTERFACE; +} + +static ULONG WINAPI conneventvt_AddRef( ConnectionEventsVt *iface ) +{ + return 2; +} + +static ULONG WINAPI conneventvt_Release( ConnectionEventsVt *iface ) +{ + return 1; +} + +static HRESULT WINAPI conneventvt_InfoMessage( ConnectionEventsVt *iface, Error *error, + EventStatusEnum *status, _Connection *Connection ) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI conneventvt_BeginTransComplete( ConnectionEventsVt *iface, LONG TransactionLevel, + Error *error, EventStatusEnum *status, _Connection *connection ) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI conneventvt_CommitTransComplete( ConnectionEventsVt *iface, Error *error, + EventStatusEnum *status, _Connection *connection ) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI conneventvt_RollbackTransComplete( ConnectionEventsVt *iface, Error *error, + EventStatusEnum *status, _Connection *connection ) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI conneventvt_WillExecute( ConnectionEventsVt *iface, BSTR *source, + CursorTypeEnum *cursor_type, LockTypeEnum *lock_type, LONG *options, EventStatusEnum *status, + _Command *command, _Recordset *record_set, _Connection *connection ) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI conneventvt_ExecuteComplete( ConnectionEventsVt *iface, LONG records_affected, + Error *error, EventStatusEnum *status, _Command *command, _Recordset *record_set, + _Connection *connection ) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI conneventvt_WillConnect( ConnectionEventsVt *iface, BSTR *string, BSTR *userid, + BSTR *password, LONG *options, EventStatusEnum *status, _Connection *connection ) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI conneventvt_ConnectComplete( ConnectionEventsVt *iface, Error *error, + EventStatusEnum *status, _Connection *connection ) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI conneventvt_Disconnect( ConnectionEventsVt *iface, EventStatusEnum *status, + _Connection *connection ) +{ + return E_NOTIMPL; +} + +static const ConnectionEventsVtVtbl conneventvt_vtbl = { + conneventvt_QueryInterface, + conneventvt_AddRef, + conneventvt_Release, + conneventvt_InfoMessage, + conneventvt_BeginTransComplete, + conneventvt_CommitTransComplete, + conneventvt_RollbackTransComplete, + conneventvt_WillExecute, + conneventvt_ExecuteComplete, + conneventvt_WillConnect, + conneventvt_ConnectComplete, + conneventvt_Disconnect +}; + +static HRESULT WINAPI supporterror_QueryInterface( ISupportErrorInfo *iface, REFIID riid, void **obj ) +{ + if (IsEqualGUID( &IID_ISupportErrorInfo, riid )) + { + *obj = iface; + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI supporterror_AddRef( ISupportErrorInfo *iface ) +{ + return 2; +} + +static ULONG WINAPI supporterror_Release( ISupportErrorInfo *iface ) +{ + return 1; +} + +static HRESULT WINAPI supporterror_InterfaceSupportsErrorInfo( ISupportErrorInfo *iface, REFIID riid ) +{ + return E_NOTIMPL; +} + +static const struct ISupportErrorInfoVtbl support_error_vtbl = +{ + supporterror_QueryInterface, + supporterror_AddRef, + supporterror_Release, + supporterror_InterfaceSupportsErrorInfo +}; + +static ConnectionEventsVt conn_event_sink = { &conneventvt_vtbl }; +static ISupportErrorInfo support_err_sink = { &support_error_vtbl }; + static void test_ConnectionPoint(void) { HRESULT hr; ULONG refs; + DWORD cookie; IConnectionPoint *point; IConnectionPointContainer *pointcontainer; @@ -856,6 +987,47 @@ static void test_ConnectionPoint(void) hr = IConnectionPointContainer_FindConnectionPoint( pointcontainer, &DIID_ConnectionEvents, &point ); ok( hr == S_OK, "got %08x\n", hr ); +todo_wine { + /* nothing advised yet */ + hr = IConnectionPoint_Unadvise( point, 3 ); + ok( hr == E_FAIL, "got %08x\n", hr ); + + hr = IConnectionPoint_Advise( point, NULL, NULL ); + ok( hr == E_FAIL, "got %08x\n", hr ); + + hr = IConnectionPoint_Advise( point, (void*)&conn_event_sink, NULL ); + ok( hr == E_FAIL, "got %08x\n", hr ); + + cookie = 0xdeadbeef; + hr = IConnectionPoint_Advise( point, NULL, &cookie ); + ok( hr == E_FAIL, "got %08x\n", hr ); +} + ok( cookie == 0xdeadbeef, "got %08x\n", cookie ); + +todo_wine { + /* unsupported sink */ + cookie = 0xdeadbeef; + hr = IConnectionPoint_Advise( point, (void*)&support_err_sink, &cookie ); + ok( hr == E_FAIL, "got %08x\n", hr ); + ok( !cookie, "got %08x\n", cookie ); + + cookie = 0; + hr = IConnectionPoint_Advise( point, (void*)&conn_event_sink, &cookie ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( cookie, "got %08x\n", cookie ); + + /* invalid cookie */ + hr = IConnectionPoint_Unadvise( point, 0 ); + ok( hr == E_FAIL, "got %08x\n", hr ); + + /* wrong cookie */ + hr = IConnectionPoint_Unadvise( point, cookie + 1 ); + ok( hr == E_FAIL, "got %08x\n", hr ); + + hr = IConnectionPoint_Unadvise( point, cookie ); + ok( hr == S_OK, "got %08x\n", hr ); +} + refs = IConnectionPoint_Release( point ); ok( refs == 1, "got %u", refs ); -- 2.27.0

1 0

[PATCH 1/3] include: Add ConnectionEventsVt definition.
by Aaro Altonen June 16, 2020

June 16, 2020

Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> --- include/msado15_backcompat.idl | 65 ++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/include/msado15_backcompat.idl b/include/msado15_backcompat.idl index 5ea9f51c1f..362f699b08 100644 --- a/include/msado15_backcompat.idl +++ b/include/msado15_backcompat.idl @@ -47,6 +47,7 @@ interface Property; interface Recordset15; interface Recordset20; interface Recordset21; +interface ConnectionEventsVt; dispinterface ConnectionEvents; dispinterface RecordsetEvents; @@ -1581,6 +1582,70 @@ interface _Command : Command25 [out, retval] VARIANT_BOOL *named_parameters); }; +[ + uuid(00000402-0000-0010-8000-00aa006d2ea4), + odl, + hidden +] +interface ConnectionEventsVt : IUnknown +{ + HRESULT InfoMessage( + [in] Error *error, + [in, out] EventStatusEnum *status, + [in] _Connection *Connection); + + HRESULT BeginTransComplete( + [in] LONG TransactionLevel, + [in] Error *error, + [in, out] EventStatusEnum *status, + [in] _Connection *connection); + + HRESULT CommitTransComplete( + [in] Error *error, + [in, out] EventStatusEnum *status, + [in] _Connection *connection); + + HRESULT RollbackTransComplete( + [in] Error *error, + [in, out] EventStatusEnum *status, + [in] _Connection *connection); + + HRESULT WillExecute( + [in, out] BSTR *source, + [in, out] CursorTypeEnum *cursor_type, + [in, out] LockTypeEnum *lock_type, + [in, out] LONG *options, + [in, out] EventStatusEnum *status, + [in] _Command *command, + [in] _Recordset *record_set, + [in] _Connection *connection); + + HRESULT ExecuteComplete( + [in] LONG records_affected, + [in] Error *error, + [in, out] EventStatusEnum *status, + [in] _Command *command, + [in] _Recordset *record_set, + [in] _Connection *connection); + + HRESULT WillConnect( + [in, out] BSTR *string, + [in, out] BSTR *userid, + [in, out] BSTR *password, + [in, out] LONG *options, + [in, out] EventStatusEnum *status, + [in] _Connection *connection); + + HRESULT ConnectComplete( + [in] Error *error, + [in, out] EventStatusEnum *status, + [in] _Connection *connection); + + HRESULT Disconnect( + [in, out] EventStatusEnum *status, + [in] _Connection *connection); +}; + [ uuid(00000400-0000-0010-8000-00aa006d2ea4) ] -- 2.27.0

1 0

[PATCH] rpcrt4: Fix getting underlying typeinfo of IDispatch.
by Porot Mo June 16, 2020

June 16, 2020

Signed-off-by: Porot Mo <porotmjp(a)gmail.com> --- dlls/rpcrt4/ndr_typelib.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)

2 2

[PATCH 1/2] ntoskrnl.exe/tests: Test completion callback parameters.
by Zebediah Figura June 15, 2020

June 15, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/tests/driver.c | 47 ++++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/tests/driver.h | 1 + include/ddk/wdm.h | 8 ++++++ 3 files changed, 56 insertions(+) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index fa8d7b20e3..f4b373264f 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -1570,6 +1570,33 @@ static void test_stack_limits(void) ok(low < (ULONG_PTR)&low && (ULONG_PTR)&low < high, "stack variable is not in stack limits\n"); } +static unsigned int got_completion; + +static NTSTATUS WINAPI completion_cb(DEVICE_OBJECT *device, IRP *irp, void *context) +{ + todo_wine ok(device == context, "Got device %p; expected %p.\n", device, context); + ++got_completion; + return STATUS_SUCCESS; +} + +static void test_completion(void) +{ + IO_STATUS_BLOCK io; + NTSTATUS ret; + KEVENT event; + IRP *irp; + + KeInitializeEvent(&event, NotificationEvent, FALSE); + + irp = IoBuildDeviceIoControlRequest(IOCTL_WINETEST_COMPLETION, upper_device, + NULL, 0, NULL, 0, FALSE, &event, &io); + + IoSetCompletionRoutine(irp, completion_cb, NULL, TRUE, TRUE, TRUE); + ret = IoCallDriver(upper_device, irp); + ok(ret == STATUS_SUCCESS, "IoCallDriver returned %#x\n", ret); + ok(got_completion == 2, "got %u calls to completion routine\n"); +} + static void test_IoAttachDeviceToDeviceStack(void) { DEVICE_OBJECT *dev1, *dev2, *dev3, *ret; @@ -1714,6 +1741,7 @@ static void WINAPI main_test_task(DEVICE_OBJECT *device, void *context) test_call_driver(device); test_cancel_irp(device); test_stack_limits(); + test_completion(); /* print process report */ if (winetest_debug) @@ -2174,6 +2202,23 @@ static NTSTATUS test_mismatched_status_ioctl(IRP *irp, IO_STACK_LOCATION *stack, return STATUS_SUCCESS; } +static NTSTATUS test_completion_ioctl(DEVICE_OBJECT *device, IRP *irp) +{ + if (device == upper_device) + { + IoCopyCurrentIrpStackLocationToNext(irp); + IoSetCompletionRoutine(irp, completion_cb, upper_device, TRUE, TRUE, TRUE); + return IoCallDriver(lower_device, irp); + } + else + { + ok(device == lower_device, "Got wrong device.\n"); + irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; + } +} + static NTSTATUS WINAPI driver_Create(DEVICE_OBJECT *device, IRP *irp) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); @@ -2237,6 +2282,8 @@ static NTSTATUS WINAPI driver_IoControl(DEVICE_OBJECT *device, IRP *irp) break; case IOCTL_WINETEST_MISMATCHED_STATUS: return test_mismatched_status_ioctl(irp, stack, &irp->IoStatus.Information); + case IOCTL_WINETEST_COMPLETION: + return test_completion_ioctl(device, irp); default: break; } diff --git a/dlls/ntoskrnl.exe/tests/driver.h b/dlls/ntoskrnl.exe/tests/driver.h index 6012efc41c..4b70046b8e 100644 --- a/dlls/ntoskrnl.exe/tests/driver.h +++ b/dlls/ntoskrnl.exe/tests/driver.h @@ -34,6 +34,7 @@ #define IOCTL_WINETEST_GET_FSCONTEXT CTL_CODE(FILE_DEVICE_UNKNOWN, 0x809, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_WINETEST_RETURN_STATUS CTL_CODE(FILE_DEVICE_UNKNOWN, 0x80a, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_WINETEST_MISMATCHED_STATUS CTL_CODE(FILE_DEVICE_UNKNOWN, 0x80b, METHOD_NEITHER, FILE_ANY_ACCESS) +#define IOCTL_WINETEST_COMPLETION CTL_CODE(FILE_DEVICE_UNKNOWN, 0x80c, METHOD_NEITHER, FILE_ANY_ACCESS) static const char teststr[] = "Wine is not an emulator"; diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 78667a95db..e2108b9852 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1606,6 +1606,14 @@ static inline void IoMarkIrpPending(IRP *irp) IoGetCurrentIrpStackLocation(irp)->Control |= SL_PENDING_RETURNED; } +static inline void IoCopyCurrentIrpStackLocationToNext(IRP *irp) +{ + IO_STACK_LOCATION *current = IoGetCurrentIrpStackLocation(irp); + IO_STACK_LOCATION *next = IoGetNextIrpStackLocation(irp); + memcpy(next, current, FIELD_OFFSET(IO_STACK_LOCATION, CompletionRoutine)); + next->Control = 0; +} + #define KernelMode 0 #define UserMode 1 -- 2.27.0

2 2

[PATCH v2 1/2] ntoskrnl.exe/tests: Test completion callback parameters.
by Zebediah Figura June 15, 2020

June 15, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/tests/driver.c | 47 ++++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/tests/driver.h | 1 + include/ddk/wdm.h | 8 ++++++ 3 files changed, 56 insertions(+) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index fa8d7b20e3..f4b373264f 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -1570,6 +1570,33 @@ static void test_stack_limits(void) ok(low < (ULONG_PTR)&low && (ULONG_PTR)&low < high, "stack variable is not in stack limits\n"); } +static unsigned int got_completion; + +static NTSTATUS WINAPI completion_cb(DEVICE_OBJECT *device, IRP *irp, void *context) +{ + todo_wine ok(device == context, "Got device %p; expected %p.\n", device, context); + ++got_completion; + return STATUS_SUCCESS; +} + +static void test_completion(void) +{ + IO_STATUS_BLOCK io; + NTSTATUS ret; + KEVENT event; + IRP *irp; + + KeInitializeEvent(&event, NotificationEvent, FALSE); + + irp = IoBuildDeviceIoControlRequest(IOCTL_WINETEST_COMPLETION, upper_device, + NULL, 0, NULL, 0, FALSE, &event, &io); + + IoSetCompletionRoutine(irp, completion_cb, NULL, TRUE, TRUE, TRUE); + ret = IoCallDriver(upper_device, irp); + ok(ret == STATUS_SUCCESS, "IoCallDriver returned %#x\n", ret); + ok(got_completion == 2, "got %u calls to completion routine\n"); +} + static void test_IoAttachDeviceToDeviceStack(void) { DEVICE_OBJECT *dev1, *dev2, *dev3, *ret; @@ -1714,6 +1741,7 @@ static void WINAPI main_test_task(DEVICE_OBJECT *device, void *context) test_call_driver(device); test_cancel_irp(device); test_stack_limits(); + test_completion(); /* print process report */ if (winetest_debug) @@ -2174,6 +2202,23 @@ static NTSTATUS test_mismatched_status_ioctl(IRP *irp, IO_STACK_LOCATION *stack, return STATUS_SUCCESS; } +static NTSTATUS test_completion_ioctl(DEVICE_OBJECT *device, IRP *irp) +{ + if (device == upper_device) + { + IoCopyCurrentIrpStackLocationToNext(irp); + IoSetCompletionRoutine(irp, completion_cb, upper_device, TRUE, TRUE, TRUE); + return IoCallDriver(lower_device, irp); + } + else + { + ok(device == lower_device, "Got wrong device.\n"); + irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; + } +} + static NTSTATUS WINAPI driver_Create(DEVICE_OBJECT *device, IRP *irp) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); @@ -2237,6 +2282,8 @@ static NTSTATUS WINAPI driver_IoControl(DEVICE_OBJECT *device, IRP *irp) break; case IOCTL_WINETEST_MISMATCHED_STATUS: return test_mismatched_status_ioctl(irp, stack, &irp->IoStatus.Information); + case IOCTL_WINETEST_COMPLETION: + return test_completion_ioctl(device, irp); default: break; } diff --git a/dlls/ntoskrnl.exe/tests/driver.h b/dlls/ntoskrnl.exe/tests/driver.h index 6012efc41c..4b70046b8e 100644 --- a/dlls/ntoskrnl.exe/tests/driver.h +++ b/dlls/ntoskrnl.exe/tests/driver.h @@ -34,6 +34,7 @@ #define IOCTL_WINETEST_GET_FSCONTEXT CTL_CODE(FILE_DEVICE_UNKNOWN, 0x809, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_WINETEST_RETURN_STATUS CTL_CODE(FILE_DEVICE_UNKNOWN, 0x80a, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_WINETEST_MISMATCHED_STATUS CTL_CODE(FILE_DEVICE_UNKNOWN, 0x80b, METHOD_NEITHER, FILE_ANY_ACCESS) +#define IOCTL_WINETEST_COMPLETION CTL_CODE(FILE_DEVICE_UNKNOWN, 0x80c, METHOD_NEITHER, FILE_ANY_ACCESS) static const char teststr[] = "Wine is not an emulator"; diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 78667a95db..e2108b9852 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1606,6 +1606,14 @@ static inline void IoMarkIrpPending(IRP *irp) IoGetCurrentIrpStackLocation(irp)->Control |= SL_PENDING_RETURNED; } +static inline void IoCopyCurrentIrpStackLocationToNext(IRP *irp) +{ + IO_STACK_LOCATION *current = IoGetCurrentIrpStackLocation(irp); + IO_STACK_LOCATION *next = IoGetNextIrpStackLocation(irp); + memcpy(next, current, FIELD_OFFSET(IO_STACK_LOCATION, CompletionRoutine)); + next->Control = 0; +} + #define KernelMode 0 #define UserMode 1 -- 2.27.0

1 1