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

Jacek Caban : kernelbase: Invalidate console wait handle in FreeConsole.
by Alexandre Julliard July 1, 2020

July 1, 2020

Module: wine Branch: master Commit: 4031265f6963925e620e771165a7898ce9a2a20a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4031265f6963925e620e7711… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 1 16:27:05 2020 +0200 kernelbase: Invalidate console wait handle in FreeConsole. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 22 ++++++++++++++++++++++ dlls/kernelbase/kernelbase.h | 1 + dlls/kernelbase/sync.c | 20 +------------------- 3 files changed, 24 insertions(+), 19 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 5fb84c0bd9..bd927c9b83 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -53,6 +53,8 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION console_section = { &critsect_debug, -1, 0, 0, 0, 0 }; +static HANDLE console_wait_event; + static WCHAR input_exe[MAX_PATH + 1]; struct ctrl_handler @@ -345,12 +347,31 @@ BOOL WINAPI DECLSPEC_HOTPATCH FillConsoleOutputCharacterW( HANDLE handle, WCHAR return ret; } +HANDLE get_console_wait_handle( HANDLE handle ) +{ + HANDLE event = 0; + + SERVER_START_REQ( get_console_wait_event ) + { + req->handle = wine_server_obj_handle( console_handle_map( handle )); + if (!wine_server_call( req )) event = wine_server_ptr_handle( reply->event ); + } + SERVER_END_REQ; + if (event) + { + if (InterlockedCompareExchangePointer( &console_wait_event, event, 0 )) NtClose( event ); + handle = console_wait_event; + } + return handle; +} + /*********************************************************************** * FreeConsole (kernelbase.@) */ BOOL WINAPI DECLSPEC_HOTPATCH FreeConsole(void) { + HANDLE event; BOOL ret; SERVER_START_REQ( free_console ) @@ -358,6 +379,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH FreeConsole(void) ret = !wine_server_call_err( req ); } SERVER_END_REQ; + if ((event = InterlockedExchangePointer( &console_wait_event, NULL ))) NtClose( event ); return ret; } diff --git a/dlls/kernelbase/kernelbase.h b/dlls/kernelbase/kernelbase.h index 88765df3d1..9fb4434fbb 100644 --- a/dlls/kernelbase/kernelbase.h +++ b/dlls/kernelbase/kernelbase.h @@ -28,6 +28,7 @@ extern WCHAR *file_name_AtoW( LPCSTR name, BOOL alloc ) DECLSPEC_HIDDEN; extern DWORD file_name_WtoA( LPCWSTR src, INT srclen, LPSTR dest, INT destlen ) DECLSPEC_HIDDEN; extern void init_startup_info( RTL_USER_PROCESS_PARAMETERS *params ) DECLSPEC_HIDDEN; extern void init_locale(void) DECLSPEC_HIDDEN; +extern HANDLE get_console_wait_handle( HANDLE handle ) DECLSPEC_HIDDEN; extern const WCHAR windows_dir[] DECLSPEC_HIDDEN; extern const WCHAR system_dir[] DECLSPEC_HIDDEN; diff --git a/dlls/kernelbase/sync.c b/dlls/kernelbase/sync.c index 7ea70202c2..13a9938e7c 100644 --- a/dlls/kernelbase/sync.c +++ b/dlls/kernelbase/sync.c @@ -213,8 +213,6 @@ ULONGLONG WINAPI DECLSPEC_HOTPATCH GetTickCount64(void) static HANDLE normalize_handle_if_console( HANDLE handle ) { - static HANDLE wait_event; - if ((handle == (HANDLE)STD_INPUT_HANDLE) || (handle == (HANDLE)STD_OUTPUT_HANDLE) || (handle == (HANDLE)STD_ERROR_HANDLE)) @@ -223,23 +221,7 @@ static HANDLE normalize_handle_if_console( HANDLE handle ) /* even screen buffer console handles are waitable, and are * handled as a handle to the console itself */ - if (is_console_handle( handle )) - { - HANDLE event = 0; - - SERVER_START_REQ( get_console_wait_event ) - { - req->handle = wine_server_obj_handle( console_handle_map( handle )); - if (!wine_server_call( req )) event = wine_server_ptr_handle( reply->event ); - } - SERVER_END_REQ; - if (event) - { - if (InterlockedCompareExchangePointer( &wait_event, event, 0 )) NtClose( event ); - handle = wait_event; - } - } - return handle; + return is_console_handle( handle ) ? get_console_wait_handle( handle ) : handle; }

1 0

Nikolay Sivov : evr: Added MFCreateVideoMixerAndPresenter().
by Alexandre Julliard July 1, 2020

July 1, 2020

Module: wine Branch: master Commit: 9630f9779887216eb3e079764a32240040580ff3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9630f9779887216eb3e07976… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 1 15:55:46 2020 +0300 evr: Added MFCreateVideoMixerAndPresenter(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/evr.spec | 2 +- dlls/evr/main.c | 28 ++++++++++++++++++++++++++++ dlls/evr/tests/evr.c | 13 +++++++++++++ include/evr.idl | 3 ++- 4 files changed, 44 insertions(+), 2 deletions(-) diff --git a/dlls/evr/evr.spec b/dlls/evr/evr.spec index e46cb04f64..73cbf05b46 100644 --- a/dlls/evr/evr.spec +++ b/dlls/evr/evr.spec @@ -14,7 +14,7 @@ @ stub MFCreateVideoMediaTypeFromVideoInfoHeader2 @ stub MFCreateVideoMediaTypeFromVideoInfoHeader @ stdcall MFCreateVideoMixer(ptr ptr ptr ptr) -@ stub MFCreateVideoMixerAndPresenter +@ stdcall MFCreateVideoMixerAndPresenter(ptr ptr ptr ptr ptr ptr) @ stub MFCreateVideoOTA @ stub MFCreateVideoPresenter2 @ stdcall MFCreateVideoPresenter(ptr ptr ptr ptr) diff --git a/dlls/evr/main.c b/dlls/evr/main.c index 2c6db8430b..301330a51e 100644 --- a/dlls/evr/main.c +++ b/dlls/evr/main.c @@ -196,3 +196,31 @@ HRESULT WINAPI DllUnregisterServer(void) { return __wine_unregister_resources(instance_evr); } + +HRESULT WINAPI MFCreateVideoMixerAndPresenter(IUnknown *mixer_outer, IUnknown *presenter_outer, + REFIID riid_mixer, void **mixer, REFIID riid_presenter, void **presenter) +{ + HRESULT hr; + + TRACE("%p, %p, %s, %p, %s, %p.\n", mixer_outer, presenter_outer, debugstr_guid(riid_mixer), mixer, + debugstr_guid(riid_presenter), presenter); + + if (!mixer || !presenter) + return E_POINTER; + + *mixer = *presenter = NULL; + + if (SUCCEEDED(hr = CoCreateInstance(&CLSID_MFVideoMixer9, mixer_outer, CLSCTX_INPROC_SERVER, riid_mixer, mixer))) + hr = CoCreateInstance(&CLSID_MFVideoPresenter9, presenter_outer, CLSCTX_INPROC_SERVER, riid_presenter, presenter); + + if (FAILED(hr)) + { + if (*mixer) + IUnknown_Release((IUnknown *)*mixer); + if (*presenter) + IUnknown_Release((IUnknown *)*presenter); + *mixer = *presenter = NULL; + } + + return hr; +} diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 1046e70312..b9f86eb252 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -950,6 +950,18 @@ static void test_default_presenter(void) IMFVideoPresenter_Release(presenter); } +static void test_MFCreateVideoMixerAndPresenter(void) +{ + IUnknown *mixer, *presenter; + HRESULT hr; + + hr = MFCreateVideoMixerAndPresenter(NULL, NULL, &IID_IUnknown, (void **)&mixer, &IID_IUnknown, (void **)&presenter); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IUnknown_Release(mixer); + IUnknown_Release(presenter); +} + START_TEST(evr) { CoInitialize(NULL); @@ -965,6 +977,7 @@ START_TEST(evr) test_default_mixer_type_negotiation(); test_surface_sample(); test_default_presenter(); + test_MFCreateVideoMixerAndPresenter(); CoUninitialize(); } diff --git a/include/evr.idl b/include/evr.idl index 384a051944..8628e111a3 100644 --- a/include/evr.idl +++ b/include/evr.idl @@ -299,7 +299,8 @@ cpp_quote("DEFINE_GUID(MR_VIDEO_MIXER_SERVICE, 0x073cd2fc, 0x6cf4, 0x40b7, 0x88, cpp_quote("DEFINE_GUID(MR_VIDEO_ACCELERATION_SERVICE, 0xefef5175, 0x5c7d, 0x4ce2, 0xbb, 0xbd, 0x34, 0xff, 0x8b, 0xca, 0x65, 0x54);") cpp_quote("DEFINE_GUID(MR_BUFFER_SERVICE, 0xa562248c, 0x9ac6, 0x4ffc, 0x9f, 0xba, 0x3a, 0xf8, 0xf8, 0xad, 0x1a, 0x4d);") cpp_quote("DEFINE_GUID(VIDEO_ZOOM_RECT, 0x7aaa1638, 0x1b7f, 0x4c93, 0xbd, 0x89, 0x5b, 0x9c, 0x9f, 0xb6, 0xfc, 0xf0);") - cpp_quote("HRESULT WINAPI MFCreateVideoMixer(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj);") +cpp_quote("HRESULT WINAPI MFCreateVideoMixerAndPresenter(IUnknown *mixer_outer, IUnknown *presenter_outer, ") +cpp_quote(" REFIID riid_mixer, void **mixer, REFIID riid_presenter, void **presenter);") cpp_quote("HRESULT WINAPI MFCreateVideoPresenter(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj);") cpp_quote("HRESULT WINAPI MFCreateVideoSampleFromSurface(IUnknown *surface, IMFSample **sample);")

1 0

Nikolay Sivov : evr: Add aggregation support for default mixer object.
by Alexandre Julliard July 1, 2020

July 1, 2020

Module: wine Branch: master Commit: 1caf8ade07a95610f383de8205fa35b16a82253a URL: https://source.winehq.org/git/wine.git/?a=commit;h=1caf8ade07a95610f383de82… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 1 15:55:45 2020 +0300 evr: Add aggregation support for default mixer object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 58 +++++++++++++++++++++++++++++++++++++++++----------- dlls/evr/tests/evr.c | 17 +++++++++++++++ 2 files changed, 63 insertions(+), 12 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 23994375d4..c8bd300b0d 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -60,6 +60,8 @@ struct video_mixer IMFVideoMixerBitmap IMFVideoMixerBitmap_iface; IMFVideoPositionMapper IMFVideoPositionMapper_iface; IMFVideoProcessor IMFVideoProcessor_iface; + IUnknown IUnknown_inner; + IUnknown *outer_unk; LONG refcount; struct input_stream inputs[MAX_MIXER_INPUT_STREAMS]; @@ -74,6 +76,11 @@ struct video_mixer CRITICAL_SECTION cs; }; +static struct video_mixer *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct video_mixer, IUnknown_inner); +} + static struct video_mixer *impl_from_IMFTransform(IMFTransform *iface) { return CONTAINING_RECORD(iface, struct video_mixer, IMFTransform_iface); @@ -155,17 +162,20 @@ static void video_mixer_clear_types(struct video_mixer *mixer) mixer->output.media_type = NULL; } -static HRESULT WINAPI video_mixer_transform_QueryInterface(IMFTransform *iface, REFIID riid, void **obj) +static HRESULT WINAPI video_mixer_inner_QueryInterface(IUnknown *iface, REFIID riid, void **obj) { - struct video_mixer *mixer = impl_from_IMFTransform(iface); + struct video_mixer *mixer = impl_from_IUnknown(iface); TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); - if (IsEqualIID(riid, &IID_IMFTransform) || - IsEqualIID(riid, &IID_IUnknown)) + if (IsEqualIID(riid, &IID_IUnknown)) { *obj = iface; } + else if (IsEqualIID(riid, &IID_IMFTransform)) + { + *obj = &mixer->IMFTransform_iface; + } else if (IsEqualIID(riid, &IID_IMFVideoDeviceID)) { *obj = &mixer->IMFVideoDeviceID_iface; @@ -206,9 +216,9 @@ static HRESULT WINAPI video_mixer_transform_QueryInterface(IMFTransform *iface, return S_OK; } -static ULONG WINAPI video_mixer_transform_AddRef(IMFTransform *iface) +static ULONG WINAPI video_mixer_inner_AddRef(IUnknown *iface) { - struct video_mixer *mixer = impl_from_IMFTransform(iface); + struct video_mixer *mixer = impl_from_IUnknown(iface); ULONG refcount = InterlockedIncrement(&mixer->refcount); TRACE("%p, refcount %u.\n", iface, refcount); @@ -216,9 +226,9 @@ static ULONG WINAPI video_mixer_transform_AddRef(IMFTransform *iface) return refcount; } -static ULONG WINAPI video_mixer_transform_Release(IMFTransform *iface) +static ULONG WINAPI video_mixer_inner_Release(IUnknown *iface) { - struct video_mixer *mixer = impl_from_IMFTransform(iface); + struct video_mixer *mixer = impl_from_IUnknown(iface); ULONG refcount = InterlockedDecrement(&mixer->refcount); unsigned int i; @@ -241,6 +251,31 @@ static ULONG WINAPI video_mixer_transform_Release(IMFTransform *iface) return refcount; } +static const IUnknownVtbl video_mixer_inner_vtbl = +{ + video_mixer_inner_QueryInterface, + video_mixer_inner_AddRef, + video_mixer_inner_Release, +}; + +static HRESULT WINAPI video_mixer_transform_QueryInterface(IMFTransform *iface, REFIID riid, void **obj) +{ + struct video_mixer *mixer = impl_from_IMFTransform(iface); + return IUnknown_QueryInterface(mixer->outer_unk, riid, obj); +} + +static ULONG WINAPI video_mixer_transform_AddRef(IMFTransform *iface) +{ + struct video_mixer *mixer = impl_from_IMFTransform(iface); + return IUnknown_AddRef(mixer->outer_unk); +} + +static ULONG WINAPI video_mixer_transform_Release(IMFTransform *iface) +{ + struct video_mixer *mixer = impl_from_IMFTransform(iface); + return IUnknown_Release(mixer->outer_unk); +} + static HRESULT WINAPI video_mixer_transform_GetStreamLimits(IMFTransform *iface, DWORD *input_minimum, DWORD *input_maximum, DWORD *output_minimum, DWORD *output_maximum) { @@ -1251,9 +1286,6 @@ HRESULT evr_mixer_create(IUnknown *outer, void **out) { struct video_mixer *object; - if (outer) - return E_NOINTERFACE; - if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; @@ -1265,12 +1297,14 @@ HRESULT evr_mixer_create(IUnknown *outer, void **out) object->IMFVideoMixerBitmap_iface.lpVtbl = &video_mixer_bitmap_vtbl; object->IMFVideoPositionMapper_iface.lpVtbl = &video_mixer_position_mapper_vtbl; object->IMFVideoProcessor_iface.lpVtbl = &video_mixer_processor_vtbl; + object->IUnknown_inner.lpVtbl = &video_mixer_inner_vtbl; + object->outer_unk = outer ? outer : &object->IUnknown_inner; object->refcount = 1; object->input_count = 1; video_mixer_init_input(&object->inputs[0]); InitializeCriticalSection(&object->cs); - *out = &object->IMFTransform_iface; + *out = &object->IUnknown_inner; return S_OK; } diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index dd3fbbe028..1046e70312 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -119,6 +119,7 @@ static void test_aggregation(void) IBaseFilter *filter, *filter2; IMFVideoPresenter *presenter; IUnknown *unk, *unk2; + IMFTransform *mixer; HRESULT hr; ULONG ref; @@ -191,6 +192,22 @@ static void test_aggregation(void) IUnknown_Release(unk); } + + /* Default mixer. */ + presenter = (void *)0xdeadbeef; + hr = CoCreateInstance(&CLSID_MFVideoMixer9, &test_outer, CLSCTX_INPROC_SERVER, &IID_IMFTransform, + (void **)&mixer); + ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + ok(!mixer, "Got interface %p.\n", mixer); + + hr = CoCreateInstance(&CLSID_MFVideoMixer9, &test_outer, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Unexpected 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); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + IUnknown_Release(unk); } #define check_interface(a, b, c) check_interface_(__LINE__, a, b, c)

1 0

Nikolay Sivov : evr: Partially implement InitServicePointers() for the presenter.
by Alexandre Julliard July 1, 2020

July 1, 2020

Module: wine Branch: master Commit: 17e7de4bdfc5b5bb7aac42a2a7da109677167c35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17e7de4bdfc5b5bb7aac42a2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 1 15:55:44 2020 +0300 evr: Partially implement InitServicePointers() for the presenter. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 68 insertions(+), 3 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index c70b83d072..a7da070492 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -50,6 +50,10 @@ struct video_presenter IUnknown *outer_unk; LONG refcount; + IMFTransform *mixer; + IMFClock *clock; + IMediaEventSink *event_sink; + unsigned int state; CRITICAL_SECTION cs; }; @@ -136,6 +140,19 @@ static ULONG WINAPI video_presenter_inner_AddRef(IUnknown *iface) return refcount; } +static void video_presenter_clear_container(struct video_presenter *presenter) +{ + if (presenter->clock) + IMFClock_Release(presenter->clock); + if (presenter->mixer) + IMFTransform_Release(presenter->mixer); + if (presenter->event_sink) + IMediaEventSink_Release(presenter->event_sink); + presenter->clock = NULL; + presenter->mixer = NULL; + presenter->event_sink = NULL; +} + static ULONG WINAPI video_presenter_inner_Release(IUnknown *iface) { struct video_presenter *presenter = impl_from_IUnknown(iface); @@ -145,6 +162,7 @@ static ULONG WINAPI video_presenter_inner_Release(IUnknown *iface) if (!refcount) { + video_presenter_clear_container(presenter); DeleteCriticalSection(&presenter->cs); heap_free(presenter); } @@ -324,9 +342,53 @@ static ULONG WINAPI video_presenter_service_client_Release(IMFTopologyServiceLoo static HRESULT WINAPI video_presenter_service_client_InitServicePointers(IMFTopologyServiceLookupClient *iface, IMFTopologyServiceLookup *service_lookup) { - FIXME("%p, %p.\n", iface, service_lookup); + struct video_presenter *presenter = impl_from_IMFTopologyServiceLookupClient(iface); + unsigned int count; + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, service_lookup); + + if (!service_lookup) + return E_POINTER; + + EnterCriticalSection(&presenter->cs); + + if (presenter->state == PRESENTER_STATE_STARTED || + presenter->state == PRESENTER_STATE_PAUSED) + { + hr = MF_E_INVALIDREQUEST; + } + else + { + video_presenter_clear_container(presenter); + + count = 1; + IMFTopologyServiceLookup_LookupService(service_lookup, MF_SERVICE_LOOKUP_GLOBAL, 0, + &MR_VIDEO_RENDER_SERVICE, &IID_IMFClock, (void **)&presenter->clock, &count); + + count = 1; + if (SUCCEEDED(hr = IMFTopologyServiceLookup_LookupService(service_lookup, MF_SERVICE_LOOKUP_GLOBAL, 0, + &MR_VIDEO_MIXER_SERVICE, &IID_IMFTransform, (void **)&presenter->mixer, &count))) + { + /* FIXME: presumably should validate mixer's device id. */ + } + else + WARN("Failed to get mixer interface, hr %#x.\n", hr); + + count = 1; + if (FAILED(hr = IMFTopologyServiceLookup_LookupService(service_lookup, MF_SERVICE_LOOKUP_GLOBAL, 0, + &MR_VIDEO_RENDER_SERVICE, &IID_IMediaEventSink, (void **)&presenter->event_sink, &count))) + { + WARN("Failed to get renderer event sink, hr %#x.\n", hr); + } + + if (SUCCEEDED(hr)) + presenter->state = PRESENTER_STATE_STOPPED; + } + + LeaveCriticalSection(&presenter->cs); + + return hr; } static HRESULT WINAPI video_presenter_service_client_ReleaseServicePointers(IMFTopologyServiceLookupClient *iface) @@ -336,7 +398,10 @@ static HRESULT WINAPI video_presenter_service_client_ReleaseServicePointers(IMFT TRACE("%p.\n", iface); EnterCriticalSection(&presenter->cs); + presenter->state = PRESENTER_STATE_SHUT_DOWN; + video_presenter_clear_container(presenter); + LeaveCriticalSection(&presenter->cs); return S_OK; @@ -527,7 +592,7 @@ HRESULT evr_presenter_create(IUnknown *outer, void **out) { struct video_presenter *object; - if (!(object = heap_alloc(sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; object->IMFVideoPresenter_iface.lpVtbl = &video_presenter_vtbl;

1 0

Brendan Shanks : user32: Implement QueryDisplayConfig().
by Alexandre Julliard July 1, 2020

July 1, 2020

Module: wine Branch: master Commit: 5fba152eea0bd8b7a2553beea05370dc140ed740 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5fba152eea0bd8b7a2553bee… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Jun 29 21:55:23 2020 -0700 user32: Implement QueryDisplayConfig(). Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 239 +++++++++++++++++++++++++++++++++++++++++++- dlls/user32/tests/monitor.c | 8 ++ 2 files changed, 244 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5fba152eea0bd8b7a255…

1 0

Brendan Shanks : user32/tests: Test additional flag values with GetDisplayConfigBufferSizes().
by Alexandre Julliard July 1, 2020

July 1, 2020

Module: wine Branch: master Commit: 2e1c48f3517fa967ae9f9a0794c88e6d4e5e77f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e1c48f3517fa967ae9f9a07… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Jun 29 21:55:22 2020 -0700 user32/tests: Test additional flag values with GetDisplayConfigBufferSizes(). Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 37 ++++++++++++++++++++++++++++--------- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index afde67cd03..3e711ce1ef 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -1126,15 +1126,6 @@ static void test_GetDisplayConfigBufferSizes(void) ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); ok(modes == 100, "got %u\n", modes); - paths = modes = 0; - ret = pGetDisplayConfigBufferSizes(QDC_ALL_PATHS, &paths, &modes); - if (!ret) - ok(paths > 0 && modes > 0, "got %u, %u\n", paths, modes); - else - ok(ret == ERROR_NOT_SUPPORTED, "got %d\n", ret); - - /* Invalid flags, non-zero invalid flags validation is version (or driver?) dependent, - it's unreliable to use in tests. */ ret = pGetDisplayConfigBufferSizes(0, NULL, NULL); ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); @@ -1148,10 +1139,38 @@ static void test_GetDisplayConfigBufferSizes(void) ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); ok(modes == 100, "got %u\n", modes); + /* Flag validation on Windows is driver-dependent */ paths = modes = 100; ret = pGetDisplayConfigBufferSizes(0, &paths, &modes); ok(ret == ERROR_INVALID_PARAMETER || ret == ERROR_NOT_SUPPORTED, "got %d\n", ret); ok((modes == 0 || modes == 100) && paths == 0, "got %u, %u\n", modes, paths); + + paths = modes = 100; + ret = pGetDisplayConfigBufferSizes(0xFF, &paths, &modes); + ok(ret == ERROR_INVALID_PARAMETER || ret == ERROR_NOT_SUPPORTED, "got %d\n", ret); + ok((modes == 0 || modes == 100) && paths == 0, "got %u, %u\n", modes, paths); + + /* Test success */ + paths = modes = 0; + ret = pGetDisplayConfigBufferSizes(QDC_ALL_PATHS, &paths, &modes); + if (!ret) + ok(paths > 0 && modes > 0, "got %u, %u\n", paths, modes); + else + ok(ret == ERROR_NOT_SUPPORTED, "got %d\n", ret); + + paths = modes = 0; + ret = pGetDisplayConfigBufferSizes(QDC_ONLY_ACTIVE_PATHS, &paths, &modes); + if (!ret) + ok(paths > 0 && modes > 0, "got %u, %u\n", paths, modes); + else + ok(ret == ERROR_NOT_SUPPORTED, "got %d\n", ret); + + paths = modes = 0; + ret = pGetDisplayConfigBufferSizes(QDC_DATABASE_CURRENT, &paths, &modes); + if (!ret) + ok(paths > 0 && modes > 0, "got %u, %u\n", paths, modes); + else + ok(ret == ERROR_NOT_SUPPORTED, "got %d\n", ret); } static BOOL CALLBACK test_EnumDisplayMonitors_normal_cb(HMONITOR monitor, HDC hdc, LPRECT rect,

1 0

Paul Gofman : ntdll/tests: Add test for x86_64 KiUserExceptionDispatcher().
by Alexandre Julliard July 1, 2020

July 1, 2020

Module: wine Branch: master Commit: 824f40596cfa68b41156e579a8003bd282abd114 URL: https://source.winehq.org/git/wine.git/?a=commit;h=824f40596cfa68b41156e579… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jun 30 23:34:35 2020 +0300 ntdll/tests: Add test for x86_64 KiUserExceptionDispatcher(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 114 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 114 insertions(+) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 411439f180..95d25375f7 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -2659,6 +2659,119 @@ static void test_wow64_context(void) pNtTerminateProcess(pi.hProcess, 0); } +static BYTE saved_KiUserExceptionDispatcher_bytes[12]; +static void *pKiUserExceptionDispatcher; +static BOOL hook_called; +static void *hook_KiUserExceptionDispatcher_rip; +static void *dbg_except_continue_handler_rip; +static void *hook_exception_address; + +static DWORD dbg_except_continue_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, + CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher) +{ + ok(hook_called, "Hook was not called.\n"); + got_exception = 1; + dbg_except_continue_handler_rip = (void *)context->Rip; + ++context->Rip; + return ExceptionContinueExecution; +} + +void WINAPI hook_KiUserExceptionDispatcher(EXCEPTION_RECORD *rec, CONTEXT *context) +{ + trace("rec %p, context %p.\n", rec, context); + trace("context->Rip %#lx, context->Rsp %#lx, ContextFlags %#lx.\n", sizeof(*context), + context->Rip, context->Rsp, context->ContextFlags); + + hook_called = TRUE; + /* Broken on Win2008, probably rec offset in stack is different. */ + ok(rec->ExceptionCode == 0x80000003 || broken(!rec->ExceptionCode), + "Got unexpected ExceptionCode %#x.\n", rec->ExceptionCode); + + hook_KiUserExceptionDispatcher_rip = (void *)context->Rip; + hook_exception_address = rec->ExceptionAddress; + memcpy(pKiUserExceptionDispatcher, saved_KiUserExceptionDispatcher_bytes, sizeof(saved_KiUserExceptionDispatcher_bytes)); +} + +static void test_kiuserexceptiondispatcher(void) +{ + HMODULE hntdll = GetModuleHandleA("ntdll.dll"); + static const BYTE except_code[] = + { + 0xcc, /* int3 */ + 0xc3, /* ret */ + }; + static BYTE hook_trampoline[] = + { + 0x48, 0x89, 0xe2, /* mov %rsp,%rdx */ + 0x48, 0x8d, 0x8c, 0x24, 0xf0, 0x04, 0x00, 0x00, + /* lea 0x4f0(%rsp),%rcx */ + + 0xff, 0x14, 0x25, + /* offset: 14 bytes */ + 0x00, 0x00, 0x00, 0x00, /* callq *addr */ /* call hook implementation. */ + 0x48, 0x31, 0xc9, /* xor %rcx, %rcx */ + 0x48, 0x31, 0xd2, /* xor %rdx, %rdx */ + + 0xff, 0x24, 0x25, + /* offset: 27 bytes */ + 0x00, 0x00, 0x00, 0x00, /* jmpq *addr */ /* jump to original function. */ + }; + void *phook_KiUserExceptionDispatcher = hook_KiUserExceptionDispatcher; + DWORD old_protect1, old_protect2; + BYTE *ptr; + BOOL ret; + + pKiUserExceptionDispatcher = (void *)GetProcAddress(hntdll, "KiUserExceptionDispatcher"); + if (!pKiUserExceptionDispatcher) + { + win_skip("KiUserExceptionDispatcher is not available.\n"); + return; + } + + ok(((ULONG64)&phook_KiUserExceptionDispatcher & 0xffffffff) == ((ULONG64)&phook_KiUserExceptionDispatcher), + "Address is too long.\n"); + ok(((ULONG64)&pKiUserExceptionDispatcher & 0xffffffff) == ((ULONG64)&pKiUserExceptionDispatcher), + "Address is too long.\n"); + + *(unsigned int *)(hook_trampoline + 14) = (unsigned int)(ULONG_PTR)&phook_KiUserExceptionDispatcher; + *(unsigned int *)(hook_trampoline + 27) = (unsigned int)(ULONG_PTR)&pKiUserExceptionDispatcher; + + ret = VirtualProtect(hook_trampoline, ARRAY_SIZE(hook_trampoline), PAGE_EXECUTE_READWRITE, &old_protect1); + ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); + + ret = VirtualProtect(pKiUserExceptionDispatcher, 5, PAGE_EXECUTE_READWRITE, &old_protect2); + ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); + + memcpy(saved_KiUserExceptionDispatcher_bytes, pKiUserExceptionDispatcher, sizeof(saved_KiUserExceptionDispatcher_bytes)); + ptr = (BYTE *)pKiUserExceptionDispatcher; + /* mov hook_trampoline, %rax */ + *ptr++ = 0x48; + *ptr++ = 0xb8; + *(void **)ptr = hook_trampoline; + ptr += sizeof(ULONG64); + /* jmp *rax */ + *ptr++ = 0xff; + *ptr++ = 0xe0; + + got_exception = 0; + run_exception_test(dbg_except_continue_handler, NULL, except_code, ARRAY_SIZE(except_code), PAGE_EXECUTE_READ); + ok(got_exception, "Handler was not called.\n"); + ok(hook_called, "Hook was not called.\n"); + + ok(hook_exception_address == code_mem || broken(!hook_exception_address) /* Win2008 */, + "Got unexpected exception address %p, expected %p.\n", + hook_exception_address, code_mem); + todo_wine ok(hook_KiUserExceptionDispatcher_rip == code_mem, "Got unexpected exception address %p, expected %p.\n", + hook_KiUserExceptionDispatcher_rip, code_mem); + ok(dbg_except_continue_handler_rip == code_mem, "Got unexpected exception address %p, expected %p.\n", + dbg_except_continue_handler_rip, code_mem); + + ret = VirtualProtect(pKiUserExceptionDispatcher, 5, old_protect2, &old_protect2); + ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); + ret = VirtualProtect(hook_trampoline, ARRAY_SIZE(hook_trampoline), old_protect1, &old_protect1); + ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); +} + #endif /* __x86_64__ */ #if defined(__i386__) || defined(__x86_64__) @@ -3638,6 +3751,7 @@ START_TEST(exception) test_suspend_thread(); test_suspend_process(); test_unload_trace(); + test_kiuserexceptiondispatcher(); if (pRtlAddFunctionTable && pRtlDeleteFunctionTable && pRtlInstallFunctionTableCallback && pRtlLookupFunctionEntry) test_dynamic_unwind();

1 0

Brendan Shanks : include: Add d3dkmdt.h.
by Alexandre Julliard July 1, 2020

July 1, 2020

Module: wine Branch: master Commit: 1899830b02218b89bb1669c265bd04d6750347fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=1899830b02218b89bb1669c2… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Jun 29 21:55:19 2020 -0700 include: Add d3dkmdt.h. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/d3dkmdt.h | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 90fb873f20..56c5220daf 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -119,6 +119,7 @@ SOURCES = \ d3dcommon.idl \ d3dcompiler.h \ d3dhal.h \ + d3dkmdt.h \ d3drm.h \ d3drmdef.h \ d3drmobj.h \ diff --git a/include/d3dkmdt.h b/include/d3dkmdt.h new file mode 100644 index 0000000000..f47688cf40 --- /dev/null +++ b/include/d3dkmdt.h @@ -0,0 +1,59 @@ +/* + * Copyright 2020 Brendan Shanks for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_D3DKMDT_H +#define __WINE_D3DKMDT_H + +typedef enum _D3DKMDT_VIDEO_SIGNAL_STANDARD +{ + D3DKMDT_VSS_UNINITIALIZED = 0, + D3DKMDT_VSS_VESA_DMT = 1, + D3DKMDT_VSS_VESA_GTF = 2, + D3DKMDT_VSS_VESA_CVT = 3, + D3DKMDT_VSS_IBM = 4, + D3DKMDT_VSS_APPLE = 5, + D3DKMDT_VSS_NTSC_M = 6, + D3DKMDT_VSS_NTSC_J = 7, + D3DKMDT_VSS_NTSC_443 = 8, + D3DKMDT_VSS_PAL_B = 9, + D3DKMDT_VSS_PAL_B1 = 10, + D3DKMDT_VSS_PAL_G = 11, + D3DKMDT_VSS_PAL_H = 12, + D3DKMDT_VSS_PAL_I = 13, + D3DKMDT_VSS_PAL_D = 14, + D3DKMDT_VSS_PAL_N = 15, + D3DKMDT_VSS_PAL_NC = 16, + D3DKMDT_VSS_SECAM_B = 17, + D3DKMDT_VSS_SECAM_D = 18, + D3DKMDT_VSS_SECAM_G = 19, + D3DKMDT_VSS_SECAM_H = 20, + D3DKMDT_VSS_SECAM_K = 21, + D3DKMDT_VSS_SECAM_K1 = 22, + D3DKMDT_VSS_SECAM_L = 23, + D3DKMDT_VSS_SECAM_L1 = 24, + D3DKMDT_VSS_EIA_861 = 25, + D3DKMDT_VSS_EIA_861A = 26, + D3DKMDT_VSS_EIA_861B = 27, + D3DKMDT_VSS_PAL_K = 28, + D3DKMDT_VSS_PAL_K1 = 29, + D3DKMDT_VSS_PAL_L = 30, + D3DKMDT_VSS_PAL_M = 31, + D3DKMDT_VSS_OTHER = 255 +} D3DKMDT_VIDEO_SIGNAL_STANDARD; + +#endif /* __WINE_D3DKMDT_H */

1 0

Brendan Shanks : user32: Implement GetDisplayConfigBufferSizes().
by Alexandre Julliard July 1, 2020

July 1, 2020

Module: wine Branch: master Commit: a94101672e1f98a364e0605bf8299474cf950821 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a94101672e1f98a364e0605b… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Jun 29 21:55:21 2020 -0700 user32: Implement GetDisplayConfigBufferSizes(). Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 48 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 45 insertions(+), 3 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 768aeb5d4f..402a8309eb 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -4504,14 +4504,56 @@ BOOL WINAPI PhysicalToLogicalPoint( HWND hwnd, POINT *point ) */ LONG WINAPI GetDisplayConfigBufferSizes(UINT32 flags, UINT32 *num_path_info, UINT32 *num_mode_info) { - FIXME("(0x%x %p %p): stub\n", flags, num_path_info, num_mode_info); + LONG ret = ERROR_GEN_FAILURE; + HANDLE mutex; + HDEVINFO devinfo; + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + DWORD monitor_index = 0, state_flags, type; + + FIXME("(0x%x %p %p): semi-stub\n", flags, num_path_info, num_mode_info); if (!num_path_info || !num_mode_info) return ERROR_INVALID_PARAMETER; *num_path_info = 0; - *num_mode_info = 0; - return ERROR_NOT_SUPPORTED; + + if (flags != QDC_ALL_PATHS && + flags != QDC_ONLY_ACTIVE_PATHS && + flags != QDC_DATABASE_CURRENT) + return ERROR_INVALID_PARAMETER; + + if (flags != QDC_ONLY_ACTIVE_PATHS) + FIXME("only returning active paths\n"); + + wait_graphics_driver_ready(); + mutex = get_display_device_init_mutex(); + + /* Iterate through "targets"/monitors. + * Each target corresponds to a path, and each path references a source and a target mode. + */ + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_MONITOR, DISPLAY, NULL, DIGCF_PRESENT); + if (devinfo == INVALID_HANDLE_VALUE) + goto done; + + while (SetupDiEnumDeviceInfo(devinfo, monitor_index++, &device_data)) + { + /* Only count active monitors */ + if (!SetupDiGetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_STATEFLAGS, + &type, (BYTE *)&state_flags, sizeof(state_flags), NULL, 0)) + goto done; + + if (state_flags & DISPLAY_DEVICE_ACTIVE) + (*num_path_info)++; + } + + *num_mode_info = *num_path_info * 2; + ret = ERROR_SUCCESS; + TRACE("returning %u path(s) %u mode(s)\n", *num_path_info, *num_mode_info); + +done: + SetupDiDestroyDeviceInfoList(devinfo); + release_display_device_init_mutex(mutex); + return ret; } /***********************************************************************

1 0

Brendan Shanks : user32/tests: Add more QueryDisplayConfig() tests.
by Alexandre Julliard July 1, 2020

July 1, 2020

Module: wine Branch: master Commit: cb127e11ad381789b11a3c40913f6186a48d0f37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb127e11ad381789b11a3c40… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Jun 29 21:55:24 2020 -0700 user32/tests: Add more QueryDisplayConfig() tests. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 47 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 8b3e7236c7..f469111a26 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -1288,7 +1288,8 @@ static void test_EnumDisplayMonitors(void) } } -static void test_QueryDisplayConfig_result(UINT32 paths, const DISPLAYCONFIG_PATH_INFO *pi, UINT32 modes, const DISPLAYCONFIG_MODE_INFO *mi) +static void test_QueryDisplayConfig_result(UINT32 flags, + UINT32 paths, const DISPLAYCONFIG_PATH_INFO *pi, UINT32 modes, const DISPLAYCONFIG_MODE_INFO *mi) { UINT32 i; LONG ret; @@ -1385,6 +1386,24 @@ static void test_QueryDisplayConfig_result(UINT32 paths, const DISPLAYCONFIG_PAT "Expected LUID %08x:%08x, got %08x:%08x\n", pi[i].targetInfo.adapterId.HighPart, pi[i].targetInfo.adapterId.LowPart, mi[pi[i].targetInfo.modeInfoIdx].adapterId.HighPart, mi[pi[i].targetInfo.modeInfoIdx].adapterId.LowPart); + ok(mi[pi[i].targetInfo.modeInfoIdx].targetMode.targetVideoSignalInfo.activeSize.cx > 0 && + mi[pi[i].targetInfo.modeInfoIdx].targetMode.targetVideoSignalInfo.activeSize.cy > 0, + "Expected non-zero height/width, got %ux%u\n", + mi[pi[i].targetInfo.modeInfoIdx].targetMode.targetVideoSignalInfo.activeSize.cx, + mi[pi[i].targetInfo.modeInfoIdx].targetMode.targetVideoSignalInfo.activeSize.cy); + + if (flags == QDC_DATABASE_CURRENT) + ok(mi[pi[i].targetInfo.modeInfoIdx].targetMode.targetVideoSignalInfo.totalSize.cx == 0 && + mi[pi[i].targetInfo.modeInfoIdx].targetMode.targetVideoSignalInfo.totalSize.cy == 0, + "Expected zero height/width, got %ux%u\n", + mi[pi[i].targetInfo.modeInfoIdx].targetMode.targetVideoSignalInfo.totalSize.cx, + mi[pi[i].targetInfo.modeInfoIdx].targetMode.targetVideoSignalInfo.totalSize.cy); + else + ok(mi[pi[i].targetInfo.modeInfoIdx].targetMode.targetVideoSignalInfo.totalSize.cx > 0 && + mi[pi[i].targetInfo.modeInfoIdx].targetMode.targetVideoSignalInfo.totalSize.cy > 0, + "Expected non-zero height/width, got %ux%u\n", + mi[pi[i].targetInfo.modeInfoIdx].targetMode.targetVideoSignalInfo.totalSize.cx, + mi[pi[i].targetInfo.modeInfoIdx].targetMode.targetVideoSignalInfo.totalSize.cy); } } @@ -1393,6 +1412,7 @@ static void test_QueryDisplayConfig(void) UINT32 paths, modes; DISPLAYCONFIG_PATH_INFO pi[10]; DISPLAYCONFIG_MODE_INFO mi[20]; + DISPLAYCONFIG_TOPOLOGY_ID topologyid; LONG ret; ret = pQueryDisplayConfig(QDC_ALL_PATHS, NULL, NULL, NULL, NULL, NULL); @@ -1435,6 +1455,18 @@ static void test_QueryDisplayConfig(void) ret = pQueryDisplayConfig(0, &paths, pi, &modes, mi, NULL); ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + paths = modes = 1; + ret = pQueryDisplayConfig(0xFF, &paths, pi, &modes, mi, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + + paths = modes = 1; + ret = pQueryDisplayConfig(QDC_DATABASE_CURRENT, &paths, pi, &modes, mi, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + + paths = modes = 1; + ret = pQueryDisplayConfig(QDC_ALL_PATHS, &paths, pi, &modes, mi, &topologyid); + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + /* Below this point, test functionality that requires a WDDM driver on Windows */ paths = modes = 1; memset(pi, 0xFF, sizeof(pi[0])); @@ -1458,7 +1490,18 @@ static void test_QueryDisplayConfig(void) ok(!ret, "got %d\n", ret); ok(paths > 0 && modes > 0, "got %u, %u\n", paths, modes); if (!ret && paths > 0 && modes > 0) - test_QueryDisplayConfig_result(paths, pi, modes, mi); + test_QueryDisplayConfig_result(QDC_ONLY_ACTIVE_PATHS, paths, pi, modes, mi); + + paths = ARRAY_SIZE(pi); + modes = ARRAY_SIZE(mi); + memset(pi, 0xFF, sizeof(pi)); + memset(mi, 0xFF, sizeof(mi)); + topologyid = 0xFF; + ret = pQueryDisplayConfig(QDC_DATABASE_CURRENT, &paths, pi, &modes, mi, &topologyid); + ok(!ret, "got %d\n", ret); + ok(topologyid != 0xFF, "expected topologyid to be set, got %d\n", topologyid); + if (!ret && paths > 0 && modes > 0) + test_QueryDisplayConfig_result(QDC_DATABASE_CURRENT, paths, pi, modes, mi); } static void test_DisplayConfigGetDeviceInfo(void)

1 0